From 59fd9f387a96f7b5975b867a50582d45f730a445 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Mon, 23 Feb 2026 20:13:00 +0100 Subject: [PATCH 01/35] Fix incorrect forward declare keywords (#3107) Mixups of class/struct keyword in forward declares. Doesn't seem to matter on MWCC, but causes name mangling mismatching on modern platforms. --- include/JSystem/J3DGraphAnimator/J3DAnimation.h | 2 +- include/JSystem/J3DGraphBase/J3DShape.h | 2 +- include/JSystem/JAudio2/JAISeq.h | 2 +- include/JSystem/JAudio2/JAISound.h | 4 ++-- include/JSystem/JAudio2/JAIStreamMgr.h | 2 +- include/JSystem/JAudio2/JASBank.h | 2 +- include/JSystem/JAudio2/JASHeapCtrl.h | 2 +- include/JSystem/JAudio2/JASSeqParser.h | 2 +- include/JSystem/JAudio2/JAUSectionHeap.h | 12 ++++++------ include/d/d_meter2_info.h | 2 +- include/m_Do/m_Do_ext.h | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 596e5a36e7e..b75b092c287 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -6,7 +6,7 @@ #include #include "global.h" -class J3DTransformInfo; +struct J3DTransformInfo; struct JUTDataBlockHeader { /* 0x0 */ u32 mType; diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h index ed26d736942..9380c39328b 100644 --- a/include/JSystem/J3DGraphBase/J3DShape.h +++ b/include/JSystem/J3DGraphBase/J3DShape.h @@ -100,7 +100,7 @@ class J3DShapeMtx { class J3DMaterial; class J3DVertexData; -class J3DDrawMtxData; +struct J3DDrawMtxData; enum J3DShpFlag { J3DShpFlag_Visible = 0x0001, diff --git a/include/JSystem/JAudio2/JAISeq.h b/include/JSystem/JAudio2/JAISeq.h index 3752e0adc78..3f272159f3b 100644 --- a/include/JSystem/JAudio2/JAISeq.h +++ b/include/JSystem/JAudio2/JAISeq.h @@ -6,7 +6,7 @@ #include "JSystem/JSupport/JSUList.h" class JAISeqMgr; -class JAISoundChild; +struct JAISoundChild; /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h index 3e1e36b9ade..96e6d96d9a4 100644 --- a/include/JSystem/JAudio2/JAISound.h +++ b/include/JSystem/JAudio2/JAISound.h @@ -250,10 +250,10 @@ class JAITempoMgr { class JAISoundHandle; class JAIAudible; -class JAIAudience; +struct JAIAudience; class JAISe; class JAISeq; -class JAISoundChild; +struct JAISoundChild; class JAIStream; class JAITempoMgr; diff --git a/include/JSystem/JAudio2/JAIStreamMgr.h b/include/JSystem/JAudio2/JAIStreamMgr.h index 3b2b9c7f421..7c8e68a852f 100644 --- a/include/JSystem/JAudio2/JAIStreamMgr.h +++ b/include/JSystem/JAudio2/JAIStreamMgr.h @@ -6,7 +6,7 @@ #include "JSystem/JUtility/JUTAssert.h" class JAIStreamAramMgr; -class JAIStreamDataMgr; +struct JAIStreamDataMgr; /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASBank.h b/include/JSystem/JAudio2/JASBank.h index f99d245d89f..9c70772a10c 100644 --- a/include/JSystem/JAudio2/JASBank.h +++ b/include/JSystem/JAudio2/JASBank.h @@ -4,7 +4,7 @@ #include class JASChannel; -class JASInstParam; +struct JASInstParam; class JASWaveBank; namespace JASDsp { diff --git a/include/JSystem/JAudio2/JASHeapCtrl.h b/include/JSystem/JAudio2/JASHeapCtrl.h index 6c219ac091e..90d2fe728e3 100644 --- a/include/JSystem/JAudio2/JASHeapCtrl.h +++ b/include/JSystem/JAudio2/JASHeapCtrl.h @@ -7,7 +7,7 @@ #include #include -class JASDisposer; +struct JASDisposer; class JKRHeap; class JKRSolidHeap; diff --git a/include/JSystem/JAudio2/JASSeqParser.h b/include/JSystem/JAudio2/JASSeqParser.h index b9368b28edb..e8f425de848 100644 --- a/include/JSystem/JAudio2/JASSeqParser.h +++ b/include/JSystem/JAudio2/JASSeqParser.h @@ -3,7 +3,7 @@ #include -class JASTrack; +struct JASTrack; /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JAUSectionHeap.h b/include/JSystem/JAudio2/JAUSectionHeap.h index a7535500a4f..e02b7df164c 100644 --- a/include/JSystem/JAudio2/JAUSectionHeap.h +++ b/include/JSystem/JAudio2/JAUSectionHeap.h @@ -6,16 +6,16 @@ #include "JSystem/JKernel/JKRDisposer.h" #include -class JAISeqData; -class JAISeqDataMgr; -class JAISeqDataUser; -class JAIStreamDataMgr; +struct JAISeqData; +struct JAISeqDataMgr; +struct JAISeqDataUser; +struct JAIStreamDataMgr; class JASVoiceBank; class JAUBankTableLink; class JAUDisposer_; class JAUSectionHeap; -class JAUSoundTable; -class JAUSoundNameTable; +struct JAUSoundTable; +struct JAUSoundNameTable; class JKRArchive; class JKRSolidHeap; diff --git a/include/d/d_meter2_info.h b/include/d/d_meter2_info.h index eee959a9a31..72ca6ad9b23 100644 --- a/include/d/d_meter2_info.h +++ b/include/d/d_meter2_info.h @@ -5,7 +5,7 @@ class CPaneMgr; class J2DTextBox; -struct JMSMesgEntry_c; +class JMSMesgEntry_c; class JUTFont; struct dMenu_LetterData { diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 35e81f00597..c351ddad9d1 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -221,7 +221,7 @@ class mDoExt_blkAnm : public mDoExt_baseAnm { /* 0x14 */ J3DAnmCluster* mpAnm; }; -class J3DTransformInfo; +struct J3DTransformInfo; class mDoExt_AnmRatioPack { public: From 96ffd91c9a2cd145c0a40fb05de47af695fa6ffb Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Mon, 23 Feb 2026 20:17:37 +0100 Subject: [PATCH 02/35] Fix JASGlobalInstance instance definitions (#3108) There are a few places where JASGlobalInstance have their sInstance storage implemented via template specialization. The problem is that these have no initializer, which means that they are not proper definitions (only declarations) in standards-compliant C++. MSVC and (evidently) MWCC accept this, but modern Clang and GCC do not and won't emit symbols. I've added a macro that properly initializes these outside MWCC. Also, JASGlobalInstance was only being declared in each actor file that used it, which sounds incorrect? Not sure about this but I added it to m_Do_main too, again behind MWERKS check. --- include/JSystem/JAudio2/JASGadget.h | 6 ++++ src/Z2AudioCS/SpkSystem.cpp | 4 +-- src/m_Do/m_Do_main.cpp | 51 ++++++++++++++++------------- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/include/JSystem/JAudio2/JASGadget.h b/include/JSystem/JAudio2/JASGadget.h index 718ce02069d..53eaefb6a48 100644 --- a/include/JSystem/JAudio2/JASGadget.h +++ b/include/JSystem/JAudio2/JASGadget.h @@ -4,6 +4,12 @@ #include "JSystem/JUtility/JUTAssert.h" #include +#ifdef __MWERKS__ +#define JAS_GLOBAL_INSTANCE_INIT +#else +#define JAS_GLOBAL_INSTANCE_INIT {} +#endif + /** * @ingroup jsystem-jaudio * diff --git a/src/Z2AudioCS/SpkSystem.cpp b/src/Z2AudioCS/SpkSystem.cpp index 9e245f7503b..ebb4c71ff66 100644 --- a/src/Z2AudioCS/SpkSystem.cpp +++ b/src/Z2AudioCS/SpkSystem.cpp @@ -7,8 +7,8 @@ #include "JSystem/JAudio2/JASHeapCtrl.h" #include "JSystem/JKernel/JKRHeap.h" -template<> SpkSystem* JASGlobalInstance::sInstance; -template<> SpkSoundHolder* JASGlobalInstance::sInstance; +template<> SpkSystem* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; +template<> SpkSoundHolder* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; const static s32 cConfigVolumeMax = 15; diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 632c374ef14..901b8c980b0 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -939,70 +939,75 @@ bool JKRHeap::dump_sort() { } template<> -Z2WolfHowlMgr* JASGlobalInstance::sInstance; +Z2WolfHowlMgr* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -Z2EnvSeMgr* JASGlobalInstance::sInstance; +Z2EnvSeMgr* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -Z2FxLineMgr* JASGlobalInstance::sInstance; +Z2FxLineMgr* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -Z2Audience* JASGlobalInstance::sInstance; +Z2Audience* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -Z2SoundObjMgr* JASGlobalInstance::sInstance; +Z2SoundObjMgr* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -Z2SoundInfo* JASGlobalInstance::sInstance; +Z2SoundInfo* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -JAUSoundInfo* JASGlobalInstance::sInstance; +JAUSoundInfo* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -JAUSoundNameTable* JASGlobalInstance::sInstance; +JAUSoundNameTable* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -JAUSoundTable* JASGlobalInstance::sInstance; +JAUSoundTable* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -JAISoundInfo* JASGlobalInstance::sInstance; +JAISoundInfo* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -Z2SoundMgr* JASGlobalInstance::sInstance; +Z2SoundMgr* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -JAIStreamMgr* JASGlobalInstance::sInstance; +JAIStreamMgr* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -JAISeqMgr* JASGlobalInstance::sInstance; +JAISeqMgr* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -JAISeMgr* JASGlobalInstance::sInstance; +JAISeMgr* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -Z2SpeechMgr2* JASGlobalInstance::sInstance; +Z2SpeechMgr2* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -Z2SoundStarter* JASGlobalInstance::sInstance; +Z2SoundStarter* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -JAISoundStarter* JASGlobalInstance::sInstance; +JAISoundStarter* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -Z2StatusMgr* JASGlobalInstance::sInstance; +Z2StatusMgr* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -Z2SceneMgr* JASGlobalInstance::sInstance; +Z2SceneMgr* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -Z2SeqMgr* JASGlobalInstance::sInstance; +Z2SeqMgr* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -Z2SeMgr* JASGlobalInstance::sInstance; +Z2SeMgr* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -JASAudioThread* JASGlobalInstance::sInstance; +JASAudioThread* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; template<> -JASDefaultBankTable* JASGlobalInstance::sInstance; +JASDefaultBankTable* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; + +#ifndef __MWERKS__ +template<> +JAUSectionHeap* JASGlobalInstance::sInstance JAS_GLOBAL_INSTANCE_INIT; +#endif From 02607a457168ed8a2f02bc6f562c2395aa1c4203 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Tue, 24 Feb 2026 23:20:11 +0100 Subject: [PATCH 03/35] Minor JKRSolidHeap fixes (#3109) 64-bit compat --- src/JSystem/JKernel/JKRSolidHeap.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp index 01ead7728ba..a12cb8835ab 100644 --- a/src/JSystem/JKernel/JKRSolidHeap.cpp +++ b/src/JSystem/JKernel/JKRSolidHeap.cpp @@ -106,9 +106,9 @@ void* JKRSolidHeap::do_alloc(u32 size, int alignment) { } void* JKRSolidHeap::allocFromHead(u32 size, int alignment) { - size = ALIGN_NEXT(size, 0x4); + size = ALIGN_NEXT(size, sizeof(void*)); void* ptr = NULL; - u32 alignedStart = (alignment - 1 + (uintptr_t)mSolidHead) & ~(alignment - 1); + uintptr_t alignedStart = (alignment - 1 + (uintptr_t)mSolidHead) & ~(alignment - 1); u32 totalSize = size + (alignedStart - (uintptr_t)mSolidHead); if (totalSize <= mFreeSize) { #if DEBUG @@ -133,9 +133,9 @@ void* JKRSolidHeap::allocFromHead(u32 size, int alignment) { } void* JKRSolidHeap::allocFromTail(u32 size, int alignment) { - size = ALIGN_NEXT(size, 4); + size = ALIGN_NEXT(size, sizeof(void*)); void* ptr = NULL; - u32 alignedStart = ALIGN_PREV((uintptr_t)mSolidTail - size, alignment); + uintptr_t alignedStart = ALIGN_PREV((uintptr_t)mSolidTail - size, alignment); u32 totalSize = (uintptr_t)mSolidTail - (uintptr_t)alignedStart; if (totalSize <= mFreeSize) { ptr = (void*)alignedStart; From f54661f878732696679ab6925efd1c1c95fde76d Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Tue, 24 Feb 2026 23:20:45 +0100 Subject: [PATCH 04/35] Fix MORE wrong forward declares (struct/class) (#3110) --- include/JSystem/JAWExtSystem/JAWExtSystem.h | 2 +- include/JSystem/JAWExtSystem/JAWWindow.h | 2 +- include/JSystem/JAWWinLib/JAWHioReceiver.h | 2 +- include/JSystem/JAudio2/JASAramStream.h | 2 +- include/JSystem/JAudio2/JASBank.h | 2 +- include/JSystem/JAudio2/JASTrack.h | 2 +- include/JSystem/JAudio2/JAUSeqCollection.h | 4 ++-- include/JSystem/JAudio2/JAUSeqDataBlockMgr.h | 4 ++-- include/JSystem/JHostIO/JORReflexible.h | 4 ++-- include/JSystem/JParticle/JPABaseShape.h | 2 +- include/JSystem/JParticle/JPAChildShape.h | 2 +- include/JSystem/JParticle/JPADynamicsBlock.h | 2 +- include/JSystem/JParticle/JPAExTexShape.h | 2 +- include/JSystem/JParticle/JPAExtraShape.h | 2 +- include/JSystem/JParticle/JPAFieldBlock.h | 2 +- include/JSystem/JParticle/JPAResource.h | 2 +- .../JSystem/JStudio/JStudio_JPreviewer/control.h | 2 +- include/SSystem/SComponent/c_m3d.h | 2 +- include/Z2AudioLib/Z2LinkMgr.h | 2 +- include/Z2AudioLib/Z2SoundObject.h | 2 +- include/d/actor/d_a_b_yo.h | 2 +- include/d/d_event_data.h | 2 +- include/d/d_jcam_editor.h | 2 +- include/d/d_jpreviewer.h | 2 +- include/d/d_kankyo.h | 14 +++++++------- include/d/d_kankyo_wether.h | 2 +- include/d/d_msg_flow.h | 2 +- include/f_op/f_op_msg_mng.h | 2 +- include/m_Do/m_Do_ext.h | 2 +- 29 files changed, 38 insertions(+), 38 deletions(-) diff --git a/include/JSystem/JAWExtSystem/JAWExtSystem.h b/include/JSystem/JAWExtSystem/JAWExtSystem.h index 609592d832e..a0a9fce32b0 100644 --- a/include/JSystem/JAWExtSystem/JAWExtSystem.h +++ b/include/JSystem/JAWExtSystem/JAWExtSystem.h @@ -5,7 +5,7 @@ #include "JSystem/JGadget/std-list.h" class JAWWindow; -class JUTGamePad; +struct JUTGamePad; namespace JAWExtSystem { BOOL registWindow(u32, JAWWindow*, int, int); diff --git a/include/JSystem/JAWExtSystem/JAWWindow.h b/include/JSystem/JAWExtSystem/JAWWindow.h index 6228c103765..7a570565cd6 100644 --- a/include/JSystem/JAWExtSystem/JAWWindow.h +++ b/include/JSystem/JAWExtSystem/JAWWindow.h @@ -7,7 +7,7 @@ #include "JSystem/JGeometry.h" class JAWGraphContext; -class JUTGamePad; +struct JUTGamePad; class JUTPoint { public: diff --git a/include/JSystem/JAWWinLib/JAWHioReceiver.h b/include/JSystem/JAWWinLib/JAWHioReceiver.h index bf89b700405..a38506f6af9 100644 --- a/include/JSystem/JAWWinLib/JAWHioReceiver.h +++ b/include/JSystem/JAWWinLib/JAWHioReceiver.h @@ -6,7 +6,7 @@ #include "JSystem/JHostIO/JHICommonMem.h" #include "JSystem/JAudio2/JAISound.h" -class JAISeqData; +struct JAISeqData; class JADHioReceiver : JHITag { public: diff --git a/include/JSystem/JAudio2/JASAramStream.h b/include/JSystem/JAudio2/JASAramStream.h index f737f76cd3f..385b47f627f 100644 --- a/include/JSystem/JAudio2/JASAramStream.h +++ b/include/JSystem/JAudio2/JASAramStream.h @@ -8,7 +8,7 @@ class JASChannel; namespace JASDsp { - class TChannel; + struct TChannel; } /** diff --git a/include/JSystem/JAudio2/JASBank.h b/include/JSystem/JAudio2/JASBank.h index 9c70772a10c..1a99601f3db 100644 --- a/include/JSystem/JAudio2/JASBank.h +++ b/include/JSystem/JAudio2/JASBank.h @@ -8,7 +8,7 @@ struct JASInstParam; class JASWaveBank; namespace JASDsp { - class TChannel; + struct TChannel; } /** diff --git a/include/JSystem/JAudio2/JASTrack.h b/include/JSystem/JAudio2/JASTrack.h index 4b0d3ea0fa4..06a54ebec84 100644 --- a/include/JSystem/JAudio2/JASTrack.h +++ b/include/JSystem/JAudio2/JASTrack.h @@ -12,7 +12,7 @@ struct JASSoundParams; namespace JASDsp { - class TChannel; + struct TChannel; extern const u32 FILTER_MODE_IIR; }; diff --git a/include/JSystem/JAudio2/JAUSeqCollection.h b/include/JSystem/JAudio2/JAUSeqCollection.h index fae2688bedc..37c5afc6d3b 100644 --- a/include/JSystem/JAudio2/JAUSeqCollection.h +++ b/include/JSystem/JAudio2/JAUSeqCollection.h @@ -3,8 +3,8 @@ #include "JSystem/JAudio2/JAISeqDataMgr.h" -class JAISeqData; -class JAISeqDataRegion; +struct JAISeqData; +struct JAISeqDataRegion; /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h b/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h index aa77383a4fd..5c04bf66d39 100644 --- a/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h +++ b/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h @@ -4,8 +4,8 @@ #include "JSystem/JAudio2/JAISeqDataMgr.h" #include "JSystem/JSupport/JSUList.h" -class JAISeqData; -class JAISeqDataUser; +struct JAISeqData; +struct JAISeqDataUser; class JKRArchive; /** diff --git a/include/JSystem/JHostIO/JORReflexible.h b/include/JSystem/JHostIO/JORReflexible.h index a0e0aeaaa36..6af87805150 100644 --- a/include/JSystem/JHostIO/JORReflexible.h +++ b/include/JSystem/JHostIO/JORReflexible.h @@ -33,8 +33,8 @@ struct JORNodeEvent : JOREvent { /* 0x00 */ u32 field_0x0; }; -struct JORMContext; -struct JORServer; +class JORMContext; +class JORServer; class JOREventListener { public: diff --git a/include/JSystem/JParticle/JPABaseShape.h b/include/JSystem/JParticle/JPABaseShape.h index 6e7605baacc..9bab6d815a4 100644 --- a/include/JSystem/JParticle/JPABaseShape.h +++ b/include/JSystem/JParticle/JPABaseShape.h @@ -3,7 +3,7 @@ #include -class JPAEmitterWorkData; +struct JPAEmitterWorkData; class JPABaseParticle; class JKRHeap; diff --git a/include/JSystem/JParticle/JPAChildShape.h b/include/JSystem/JParticle/JPAChildShape.h index 9cfc484460d..ff22d2d69ef 100644 --- a/include/JSystem/JParticle/JPAChildShape.h +++ b/include/JSystem/JParticle/JPAChildShape.h @@ -3,7 +3,7 @@ #include -class JPAEmitterWorkData; +struct JPAEmitterWorkData; class JPABaseParticle; /** diff --git a/include/JSystem/JParticle/JPADynamicsBlock.h b/include/JSystem/JParticle/JPADynamicsBlock.h index 02b3961e5af..5b891924982 100644 --- a/include/JSystem/JParticle/JPADynamicsBlock.h +++ b/include/JSystem/JParticle/JPADynamicsBlock.h @@ -5,7 +5,7 @@ #include -class JPAEmitterWorkData; +struct JPAEmitterWorkData; /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JParticle/JPAExTexShape.h b/include/JSystem/JParticle/JPAExTexShape.h index 841b0e052c0..8a0c345c10a 100644 --- a/include/JSystem/JParticle/JPAExTexShape.h +++ b/include/JSystem/JParticle/JPAExTexShape.h @@ -3,7 +3,7 @@ #include -class JPAEmitterWorkData; +struct JPAEmitterWorkData; /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JParticle/JPAExtraShape.h b/include/JSystem/JParticle/JPAExtraShape.h index 9e9f315ff5f..613413711c9 100644 --- a/include/JSystem/JParticle/JPAExtraShape.h +++ b/include/JSystem/JParticle/JPAExtraShape.h @@ -3,7 +3,7 @@ #include -class JPAEmitterWorkData; +struct JPAEmitterWorkData; class JPABaseParticle; /** diff --git a/include/JSystem/JParticle/JPAFieldBlock.h b/include/JSystem/JParticle/JPAFieldBlock.h index ccca5336221..a43488c7818 100644 --- a/include/JSystem/JParticle/JPAFieldBlock.h +++ b/include/JSystem/JParticle/JPAFieldBlock.h @@ -5,7 +5,7 @@ #include class JKRHeap; -class JPAEmitterWorkData; +struct JPAEmitterWorkData; class JPABaseParticle; class JPAFieldBlock; diff --git a/include/JSystem/JParticle/JPAResource.h b/include/JSystem/JParticle/JPAResource.h index 707725c9af7..0088c497c22 100644 --- a/include/JSystem/JParticle/JPAResource.h +++ b/include/JSystem/JParticle/JPAResource.h @@ -4,7 +4,7 @@ #include class JKRHeap; -class JPAEmitterWorkData; +struct JPAEmitterWorkData; class JPABaseEmitter; class JPABaseParticle; diff --git a/include/JSystem/JStudio/JStudio_JPreviewer/control.h b/include/JSystem/JStudio/JStudio_JPreviewer/control.h index 5d19028ca98..09576201683 100644 --- a/include/JSystem/JStudio/JStudio_JPreviewer/control.h +++ b/include/JSystem/JStudio/JStudio_JPreviewer/control.h @@ -8,7 +8,7 @@ class J2DOrthoGraph; class JUTFont; -class JUTGamePad; +struct JUTGamePad; namespace JStudio { class TControl; diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index 12303b9a659..58f0e28753b 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -12,7 +12,7 @@ class cM3dGPla; class cM3dGSph; class cM3dGTri; class csXyz; -class cXyz; +struct cXyz; struct cM3d_Range { /* 0x0 */ f32 mMin; diff --git a/include/Z2AudioLib/Z2LinkMgr.h b/include/Z2AudioLib/Z2LinkMgr.h index 7432a2bc829..cf05ed14d9b 100644 --- a/include/Z2AudioLib/Z2LinkMgr.h +++ b/include/Z2AudioLib/Z2LinkMgr.h @@ -61,7 +61,7 @@ class Z2CreatureLink : public Z2Creature, public Z2LinkSoundStarter { static Z2CreatureLink* getLink() { return mLinkPtr; } friend class Z2LinkSoundStarter; - friend class Z2RideSoundStarter; + friend struct Z2RideSoundStarter; private: /* 0x90 Z2LinkSoundStarter */ diff --git a/include/Z2AudioLib/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject.h index 46256aeda7e..ca4b69a5202 100644 --- a/include/Z2AudioLib/Z2SoundObject.h +++ b/include/Z2AudioLib/Z2SoundObject.h @@ -4,7 +4,7 @@ #include "Z2AudioLib/Z2SoundHandles.h" #include "JSystem/JAudio2/JAUSoundAnimator.h" -class Z2SoundStarter; +struct Z2SoundStarter; class Z2SoundObjBase : public Z2SoundHandles #if DEBUG diff --git a/include/d/actor/d_a_b_yo.h b/include/d/actor/d_a_b_yo.h index b4cef6d648a..a133d364d6b 100644 --- a/include/d/actor/d_a_b_yo.h +++ b/include/d/actor/d_a_b_yo.h @@ -8,7 +8,7 @@ #include "d/d_bg_s_acch.h" class dBgW; -class msg_class; +struct msg_class; /** * @ingroup actors-enemies diff --git a/include/d/d_event_data.h b/include/d/d_event_data.h index 17549363c1b..22a835ec248 100644 --- a/include/d/d_event_data.h +++ b/include/d/d_event_data.h @@ -4,7 +4,7 @@ #include "global.h" #include "f_pc/f_pc_base.h" -class msg_class; +struct msg_class; struct event_binary_data_header { /* 0x00 */ u32 eventTop; // offset to Event chunk diff --git a/include/d/d_jcam_editor.h b/include/d/d_jcam_editor.h index 87f0c890b0c..3662f1c9562 100644 --- a/include/d/d_jcam_editor.h +++ b/include/d/d_jcam_editor.h @@ -6,7 +6,7 @@ #include "JSystem/JUtility/JUTResFont.h" #include "JSystem/JKernel/JKRExpHeap.h" -class JUTGamePad; +struct JUTGamePad; class dJcame_c { public: diff --git a/include/d/d_jpreviewer.h b/include/d/d_jpreviewer.h index b34880c1c0e..9971fa66741 100644 --- a/include/d/d_jpreviewer.h +++ b/include/d/d_jpreviewer.h @@ -10,7 +10,7 @@ namespace JStudio { class J2DOrthoGraph; class JKRExpHeap; -class JUTGamePad; +struct JUTGamePad; class JUTResFont; class tParse_; diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h index 277e6d6dbc2..3c81f08d101 100644 --- a/include/d/d_kankyo.h +++ b/include/d/d_kankyo.h @@ -12,7 +12,7 @@ class JPABaseEmitter; class cBgS_PolyInfo; -class color_RGB_class; +struct color_RGB_class; struct LIGHT_INFLUENCE { /* 0x00 */ cXyz mPosition; @@ -148,12 +148,12 @@ struct LightStatus { }; // Size: 0xE8 class fopAc_ac_c; -class dKyd_lightSchejule; -class stage_palette_info_class; -class stage_pselect_info_class; -class stage_envr_info_class; -class stage_vrboxcol_info_class; -class stage_plight_info_class; +struct dKyd_lightSchejule; +struct stage_palette_info_class; +struct stage_pselect_info_class; +struct stage_envr_info_class; +struct stage_vrboxcol_info_class; +struct stage_plight_info_class; class kytag08_class; struct dKy_pol_arg_struct { diff --git a/include/d/d_kankyo_wether.h b/include/d/d_kankyo_wether.h index 14a8d006571..31aa1fd8e36 100644 --- a/include/d/d_kankyo_wether.h +++ b/include/d/d_kankyo_wether.h @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" -class WIND_INFLUENCE; +struct WIND_INFLUENCE; void dKyw_wether_draw(); void dKyw_wether_delete(); diff --git a/include/d/d_msg_flow.h b/include/d/d_msg_flow.h index 89037d78cb7..8f242f3eec4 100644 --- a/include/d/d_msg_flow.h +++ b/include/d/d_msg_flow.h @@ -16,7 +16,7 @@ enum { }; class fopAc_ac_c; -class msg_class; +struct msg_class; // all mesg_flow_node structs members might be wrong struct mesg_flow_node { diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index 214d38da8e2..9bb8bc0ff3e 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -8,7 +8,7 @@ class JKRExpHeap; class JKRHeap; class fopAc_ac_c; -class msg_class; +struct msg_class; struct msg_process_profile_definition { /* 0x00 */ leaf_process_profile_definition base; diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index c351ddad9d1..44780980646 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -832,7 +832,7 @@ intptr_t mDoExt_getSafeZeldaHeapSize(); JKRHeap* mDoExt_createHostIOHeap(u32, JKRHeap*); #endif -struct JUTFont; +class JUTFont; JUTFont* mDoExt_getMesgFont(); JUTFont* mDoExt_getSubFont(); JUTFont* mDoExt_getRubyFont(); From a096caa8deaab245402c56dd5d54bfe4a0bbe2e5 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Wed, 25 Feb 2026 23:06:37 +0100 Subject: [PATCH 05/35] Fix broken J3DTexture assert (#3111) --- include/JSystem/J3DGraphBase/J3DTexture.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index da8276e767d..f179764e9b3 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -19,7 +19,7 @@ class J3DTexture { public: J3DTexture(u16 num, ResTIMG* res) : mNum(num), unk_0x2(0), mpRes(res) { - J3D_ASSERT_NULLPTR(52, res && num); + J3D_ASSERT_NULLPTR(52, res != NULL || num == 0); } void loadGX(u16, GXTexMapID) const; From d017a3cd36dacdcbd6a62640a85b8715540d82e5 Mon Sep 17 00:00:00 2001 From: Max Roncace Date: Fri, 27 Feb 2026 13:20:39 -0500 Subject: [PATCH 06/35] d_a_alink debug improvements (#3112) --- config/RZDE01_02/symbols.txt | 2 +- config/ShieldD/symbols.txt | 22 +- include/d/actor/d_a_alink.h | 7874 ++++++++++++++-------------- include/d/actor/d_a_player.h | 46 +- include/d/d_bg_s_acch.h | 14 +- include/d/d_jnt_col.h | 3 +- include/d/d_particle.h | 2 +- include/d/dolzel_base.pch | 23 +- src/d/actor/d_a_alink.cpp | 1560 +++--- src/d/actor/d_a_alink_HIO.inc | 193 +- src/d/actor/d_a_alink_bottle.inc | 3 +- src/d/actor/d_a_alink_bow.inc | 1 + src/d/actor/d_a_alink_crawl.inc | 17 +- src/d/actor/d_a_alink_cut.inc | 3 +- src/d/actor/d_a_alink_damage.inc | 2 +- src/d/actor/d_a_alink_demo.inc | 58 +- src/d/actor/d_a_alink_effect.inc | 265 +- src/d/actor/d_a_alink_grab.inc | 6 +- src/d/actor/d_a_alink_guard.inc | 13 +- src/d/actor/d_a_alink_hang.inc | 14 +- src/d/actor/d_a_alink_hook.inc | 79 +- src/d/actor/d_a_alink_horse.inc | 25 +- src/d/actor/d_a_alink_iceleaf.inc | 35 +- src/d/actor/d_a_alink_ironball.inc | 37 +- src/d/actor/d_a_alink_sumou.inc | 2 +- src/d/actor/d_a_alink_swim.inc | 11 +- src/d/actor/d_a_alink_swindow.inc | 2 + src/d/actor/d_a_alink_wolf.inc | 231 +- 28 files changed, 5357 insertions(+), 5186 deletions(-) diff --git a/config/RZDE01_02/symbols.txt b/config/RZDE01_02/symbols.txt index bb699751bfd..9822431b820 100644 --- a/config/RZDE01_02/symbols.txt +++ b/config/RZDE01_02/symbols.txt @@ -32765,7 +32765,7 @@ j3dDefaultColInfo = .sdata2:0x80526310; // type:object size:0x4 data:byte j3dDefaultAmbInfo = .sdata2:0x80526314; // type:object size:0x4 data:byte j3dDefaultNumChans = .sdata2:0x80526318; // type:object size:0x1 data:byte j3dDefaultTevOrderInfoNull = .sdata2:0x80526319; // type:object size:0x4 data:4byte -j3dDefaultIndTexOrderNull = .sdata2:0x8052631D; // type:object size:0x4 +j3dDefaultIndTexOrderNull = .sdata2:0x8052631D; // type:object size:0x4 data:4byte j3dDefaultTevColor = .sdata2:0x80526322; // type:object size:0x8 scope:global align:2 data:2byte j3dDefaultTevKColor = .sdata2:0x8052632A; // type:object size:0x4 data:byte j3dDefaultTevSwapModeTable = .sdata2:0x8052632E; // type:object size:0x4 diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt index f8feb186b6d..8dd19512906 100644 --- a/config/ShieldD/symbols.txt +++ b/config/ShieldD/symbols.txt @@ -64510,21 +64510,21 @@ l_HIO_before = .sbss:0x8074C880; // type:object size:0x4 scope:global data:4byte l_HIO_top = .sbss:0x8074C884; // type:object size:0x4 scope:global data:4byte hash:0xCA8DD4EC l_debugMode = .sbss:0x8074C888; // type:object size:0x4 scope:local data:4byte hash:0x5F325704 l_jumpTop = .sbss:0x8074C88C; // type:object size:0x4 scope:global align:4 data:float hash:0xEC66737F -lbl_8074C890 = .sbss:0x8074C890; // type:object size:0x1 data:byte hash:0xB74E392C dhash:0xBD2F6E4C -lbl_8074C891 = .sbss:0x8074C891; // type:object size:0x1 data:byte hash:0xC3C1301D dhash:0xBD2F6E4C -lbl_8074C892 = .sbss:0x8074C892; // type:object size:0x1 data:byte hash:0xC3C1345F dhash:0xBD2F6E4C -lbl_8074C893 = .sbss:0x8074C893; // type:object size:0x1 data:byte hash:0xC3C1491D dhash:0xBD2F6E4C +@GUARD@setGrabItemPos__9daAlink_cFv@grabCarryOffset0 = .sbss:0x8074C890; // type:object size:0x1 data:byte hash:0xB74E392C dhash:0xBD2F6E4C +@GUARD@setGrabItemPos__9daAlink_cFv@grabCarryOffset1@0 = .sbss:0x8074C891; // type:object size:0x1 data:byte hash:0xC3C1301D dhash:0xBD2F6E4C +@GUARD@setGrabItemPos__9daAlink_cFv@grabCarryOffset2@1 = .sbss:0x8074C892; // type:object size:0x1 data:byte hash:0xC3C1345F dhash:0xBD2F6E4C +@GUARD@setGrabItemPos__9daAlink_cFv@grabCarryOffset3@2 = .sbss:0x8074C893; // type:object size:0x1 data:byte hash:0xC3C1491D dhash:0xBD2F6E4C @GUARD@daAlink_c_getDemoIDData__FP13dDemo_actor_cPiPiPiPUsPiPi@dummy = .sbss:0x8074C894; // type:object size:0x1 data:byte hash:0x2C9C4113 dhash:0xC335850F @GUARD@daAlink_c_getDemoIDData__FP13dDemo_actor_cPiPiPiPUsPiPi@it@0 = .sbss:0x8074C895; // type:object size:0x1 data:byte hash:0xABFECE16 dhash:0xC335850F @LOCAL@daAlink_c_getDemoIDData__FP13dDemo_actor_cPiPiPiPUsPiPi@it@0 = .sbss:0x8074C898; // type:object size:0x4 scope:local hash:0x7C41017E dhash:0x7A3314A7 -lbl_8074C89C = .sbss:0x8074C89C; // type:object size:0x1 data:byte hash:0x91B5CF4E dhash:0x3C2D8E6B -lbl_8074C89D = .sbss:0x8074C89D; // type:object size:0x1 data:byte hash:0x1F6B40C0 dhash:0x3C2D8E6B -lbl_8074C89E = .sbss:0x8074C89E; // type:object size:0x1 data:byte hash:0xD59F6F35 dhash:0x3C2D8E6B -lbl_8074C89F = .sbss:0x8074C89F; // type:object size:0x1 data:byte hash:0xBFD7E77E dhash:0x3C2D8E6B -lbl_8074C8A0 = .sbss:0x8074C8A0; // type:object size:0x1 data:byte hash:0x884DAA68 dhash:0xBFFC4EEF -lbl_8074C8A1 = .sbss:0x8074C8A1; // type:object size:0x1 data:byte hash:0x928CCDC6 dhash:0xB10E2121 +@GUARD@setCutTurnEffect__9daAlink_cFv@leftRotNormal@4 = .sbss:0x8074C89C; // type:object size:0x1 data:byte hash:0x91B5CF4E dhash:0x3C2D8E6B +@GUARD@setCutTurnEffect__9daAlink_cFv@leftRotLight@7 = .sbss:0x8074C89D; // type:object size:0x1 data:byte hash:0x1F6B40C0 dhash:0x3C2D8E6B +@GUARD@setCutTurnEffect__9daAlink_cFv@leftRotLarge@10 = .sbss:0x8074C89E; // type:object size:0x1 data:byte hash:0xD59F6F35 dhash:0x3C2D8E6B +@GUARD@setCutTurnEffect__9daAlink_cFv@leftRotWater@13 = .sbss:0x8074C89F; // type:object size:0x1 data:byte hash:0xBFD7E77E dhash:0x3C2D8E6B +m_eye_move_flg__16daAlink_matAnm_c = .sbss:0x8074C8A0; // type:object size:0x1 data:byte hash:0x884DAA68 dhash:0xBFFC4EEF +m_morf_frame__16daAlink_matAnm_c = .sbss:0x8074C8A1; // type:object size:0x1 data:byte hash:0x928CCDC6 dhash:0xB10E2121 @LOCAL@create__9daAlink_cFv@bgWaitFlg = .sbss:0x8074C8A4; // type:object size:0x4 scope:local data:4byte hash:0xFEC9AC5E dhash:0x74C6C5AD -lbl_8074C8A8 = .sbss:0x8074C8A8; // type:object size:0x1 data:byte hash:0xCB96DED7 dhash:0x895D6088 +@GUARD@setAtCollision__9daAlink_cFv@rodTopOffset@0 = .sbss:0x8074C8A8; // type:object size:0x1 data:byte hash:0xCB96DED7 dhash:0x895D6088 sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .sbss:0x8074C8AC; // type:object size:0x4 scope:global data:4byte hash:0x5128911C dhash:0xCE3C9FF9 l_HIO = .sbss:0x8074C8B0; // type:object size:0x8 scope:local hash:0x0A6D83D8 lbl_8074C8B8 = .sbss:0x8074C8B8; // type:object size:0x1 data:byte hash:0x98E99A3B diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index 9e0dc7c7126..ced12d318e8 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -28,62 +28,43 @@ class daAlinkHIO_anm_c; class daScex_c; class fopEn_enemy_c; -class daAlink_lockCursor_c : public dDlst_base_c { -public: - daAlink_lockCursor_c() {} - BOOL create(); - void update(); - virtual void draw(); - virtual ~daAlink_lockCursor_c() {} - - void initFrame() { - field_0x4 = 0; - mLockCursorAngle = 4.0f; - field_0x30 = 0.0f; - } +class daAlink_c; +typedef int (daAlink_c::*daAlink_procFunc)(); +typedef void (daAlink_c::*EffParamProc)(); - void setPos(f32 i_posX, f32 i_posY) { - mPosX = i_posX; - mPosY = i_posY; - } +class daAlinkHIO_c; +class daAlink_matAnm_c : public J3DMaterialAnm { public: - /* 0x04 */ u8 field_0x4; - /* 0x05 */ u8 field_0x5[3]; - /* 0x08 */ J2DScreen* mScrn; - /* 0x0C */ J2DPane* field_0xc; - /* 0x10 */ J2DPane* mCursor0; - /* 0x14 */ J2DPane* mCursor1; - /* 0x18 */ J2DPane* mCursor2; - /* 0x1C */ J2DAnmTevRegKey* field_0x1c; - /* 0x20 */ J2DAnmTevRegKey* field_0x20; - /* 0x24 */ J2DAnmColorKey* field_0x24; - /* 0x28 */ J2DAnmTransformKey* field_0x28; - /* 0x2C */ f32 mLockCursorAngle; - /* 0x30 */ f32 field_0x30; - /* 0x34 */ f32 mPosX; - /* 0x38 */ f32 mPosY; -}; + daAlink_matAnm_c() { init(); } -class daAlink_sight_c : public daPy_sightPacket_c { -public: - daAlink_sight_c() {} - BOOL create(); - void onLockFlg(); + void init(); + void offSetFlg() { mSetFlag = FALSE; } - virtual void draw(); - virtual ~daAlink_sight_c() {} + virtual ~daAlink_matAnm_c() {} + virtual void calc(J3DMaterial* i_material) const; - void update() { - mLockCursor.update(); - } + static void decMorfFrame() { cLib_calcTimer(&m_morf_frame); } + static void setMorfFrame(u8 i_frame) { m_morf_frame = i_frame; } + static u8 getMorfFrame() { return m_morf_frame; } - u8 getLockFlg() { return mLockFlag; } - void offLockFlg() { mLockFlag = false; } + static void onEyeMoveFlg() { m_eye_move_flg = true; } + static void offEyeMoveFlg() { m_eye_move_flg = false; } + static bool getEyeMoveFlg() { return m_eye_move_flg; } - /* 0x4C */ u8 mLockFlag; - /* 0x4D */ u8 field_0x4d[3]; - /* 0x50 */ daAlink_lockCursor_c mLockCursor; + f32* getNowOffsetXP() { return &mNowOffsetX; } + f32* getNowOffsetYP() { return &mNowOffsetY; } + void setNowOffsetX(f32 i_offset) { mNowOffsetX = i_offset; } + void setNowOffsetY(f32 i_offset) { mNowOffsetY = i_offset; } + + static bool m_eye_move_flg; + static u8 m_morf_frame; + + /* 0x0F4 */ mutable f32 field_0xf4; + /* 0x0F8 */ mutable f32 field_0xf8; + /* 0x0FC */ mutable f32 mNowOffsetX; + /* 0x100 */ mutable f32 mNowOffsetY; + /* 0x104 */ mutable int mSetFlag; }; class daAlink_blur_c : public J3DPacket { @@ -135,6 +116,64 @@ class dAlink_bottleWaterPcallBack_c : public JPAParticleCallBack { /* 0x0C */ cXyz mHitPos; }; // Size = 0x18 +class daAlink_lockCursor_c : public dDlst_base_c { +public: + daAlink_lockCursor_c() {} + BOOL create(); + void update(); + virtual void draw(); + virtual ~daAlink_lockCursor_c() {} + + void initFrame() { + field_0x4 = 0; + mLockCursorAngle = 4.0f; + field_0x30 = 0.0f; + } + + void setPos(f32 i_posX, f32 i_posY) { + mPosX = i_posX; + mPosY = i_posY; + } + +public: + /* 0x04 */ u8 field_0x4; + /* 0x05 */ u8 field_0x5[3]; + /* 0x08 */ J2DScreen* mScrn; + /* 0x0C */ J2DPane* field_0xc; + /* 0x10 */ J2DPane* mCursor0; + /* 0x14 */ J2DPane* mCursor1; + /* 0x18 */ J2DPane* mCursor2; + /* 0x1C */ J2DAnmTevRegKey* field_0x1c; + /* 0x20 */ J2DAnmTevRegKey* field_0x20; + /* 0x24 */ J2DAnmColorKey* field_0x24; + /* 0x28 */ J2DAnmTransformKey* field_0x28; + /* 0x2C */ f32 mLockCursorAngle; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 mPosX; + /* 0x38 */ f32 mPosY; +}; + +class daAlink_sight_c : public daPy_sightPacket_c { +public: + daAlink_sight_c() {} + BOOL create(); + void onLockFlg(); + + virtual void draw(); + virtual ~daAlink_sight_c() {} + + void update() { + mLockCursor.update(); + } + + u8 getLockFlg() { return mLockFlag; } + void offLockFlg() { mLockFlag = false; } + + /* 0x4C */ u8 mLockFlag; + /* 0x4D */ u8 field_0x4d[3]; + /* 0x50 */ daAlink_lockCursor_c mLockCursor; +}; + class daAlink_footData_c { public: /* 0x00 */ u8 field_0x0; @@ -148,39 +187,6 @@ class daAlink_footData_c { STATIC_ASSERT(sizeof(daAlink_footData_c) == 0xA4); -class daAlink_matAnm_c : public J3DMaterialAnm { -public: - daAlink_matAnm_c() { init(); } - - void init(); - void offSetFlg() { mSetFlag = FALSE; } - - virtual ~daAlink_matAnm_c() {} - virtual void calc(J3DMaterial* i_material) const; - - static void decMorfFrame() { cLib_calcTimer(&m_morf_frame); } - static void setMorfFrame(u8 i_frame) { m_morf_frame = i_frame; } - static u8 getMorfFrame() { return m_morf_frame; } - - static void onEyeMoveFlg() { m_eye_move_flg = true; } - static void offEyeMoveFlg() { m_eye_move_flg = false; } - static bool getEyeMoveFlg() { return m_eye_move_flg; } - - f32* getNowOffsetXP() { return &mNowOffsetX; } - f32* getNowOffsetYP() { return &mNowOffsetY; } - void setNowOffsetX(f32 i_offset) { mNowOffsetX = i_offset; } - void setNowOffsetY(f32 i_offset) { mNowOffsetY = i_offset; } - - static bool m_eye_move_flg; - static u8 m_morf_frame; - - /* 0x0F4 */ mutable f32 field_0xf4; - /* 0x0F8 */ mutable f32 field_0xf8; - /* 0x0FC */ mutable f32 mNowOffsetX; - /* 0x100 */ mutable f32 mNowOffsetY; - /* 0x104 */ mutable int mSetFlag; -}; - // this class is mostly a complete guess class daAlink_hsChainLight_c : public dKy_tevstr_c { public: @@ -213,3857 +219,12 @@ struct daAlink_WlAnmData { /* 0x4 */ s8 m_voiceFrames[4]; }; // Size: 0x8 -class daAlinkHIO_data_c : public JORReflexible { -public: -#if DEBUG - daAlinkHIO_data_c(); - virtual ~daAlinkHIO_data_c(); - - void setStructData(char*); - void checkDataSize(); - void baseCopy(); - void update(); - -#if DEBUG - virtual void listenPropertyEvent(const JORPropertyEvent* event); -#endif -#endif - -public: -#if DEBUG - /* 0x04 */ int m_anm_num; - /* 0x08 */ int m_u8_num; - /* 0x0C */ int m_s16_num; - /* 0x10 */ int m_f32_num; - /* 0x14 */ int f14; - /* 0x18 */ int f18; - /* 0x1C */ int f1c; - /* 0x20 */ u32 m_len; - /* 0x24 */ void* mp_src_data; - /* 0x28 */ void* mp_data; - /* 0x2C */ const char* m_name_string; - /* 0x30 */ daAlinkHIO_data_c* mpNext; -#endif -}; - -struct daAlinkHIO_basic_c1 { - /* 0x00 */ bool mOneHitKill; - /* 0x02 */ s16 mHeadMaxTurnHorizontal; - /* 0x04 */ s16 mHeadMaxTurnUp; - /* 0x06 */ s16 mHeadMaxTurnDown; - /* 0x08 */ s16 field_0x08; - /* 0x0A */ s16 mHotspringRecoverTime; - /* 0x0C */ s16 mWiiCamSpeedV; - /* 0x0E */ s16 mWiiCamSpeedH; - /* 0x10 */ s16 mTransformBlockFarAngle; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 mBasicInterpolation; - /* 0x1C */ f32 mRotationASpeed; - /* 0x20 */ f32 mStandingGuardInterpolation; - /* 0x24 */ f32 mWaterSurfaceEffectHeight; - /* 0x28 */ f32 mWolfWaterSurfaceEffectHeight; - /* 0x2C */ f32 mMaxWindInfluenceDist; - /* 0x30 */ f32 mNoWindInfluenceDist; - /* 0x34 */ f32 mMaxWindSpeed; - /* 0x38 */ f32 mLavaDeathDepth; - /* 0x3C */ f32 mLinkToWolfCancelFrame; - /* 0x40 */ f32 mWolfToLinkCancelFrame; - /* 0x44 */ f32 mIndoorSpeedFactor; - /* 0x48 */ f32 mSandSinkSpeed; - /* 0x4C */ f32 mSandSurfaceSpeed; - /* 0x50 */ f32 mTransformBlockNearDis; - /* 0x54 */ f32 mTransformBlockFarDis; -}; - -class daAlinkHIO_basic_c0 { -public: - static daAlinkHIO_basic_c1 const m; -}; - -class daAlinkHIO_basic_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_basic_c(); - ~daAlinkHIO_basic_c() {} - - virtual void genMessage(JORMContext*); -#endif +struct daAlink_procInitTable { + /* 0x0 */ daAlink_procFunc m_procFunc; + /* 0xC */ u32 m_mode; +}; // Size: 0x10 -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_basic_c1 m; -#endif -}; - -struct daAlinkHIO_anm_c { - /* 0x00 */ s16 mEndFrame; - /* 0x04 */ f32 mSpeed; - /* 0x08 */ f32 mStartFrame; - /* 0x0C */ f32 mInterpolation; - /* 0x10 */ f32 mCancelFrame; -}; // size: 0x14 - -class daAlinkHIO_move_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mSlideAnm; - /* 0x14 */ s16 mMaxTurnAngle; - /* 0x16 */ s16 mMinTurnAngle; - /* 0x18 */ s16 mTurnAngleRate; - /* 0x1C */ f32 mWaitAnmSpeed; - /* 0x20 */ f32 mWalkAnmSpeed; - /* 0x24 */ f32 mRunAnmSpeed; - /* 0x28 */ f32 mWalkChangeRate; - /* 0x2C */ f32 mRunChangeRate; - /* 0x30 */ f32 mMaxSpeed; - /* 0x34 */ f32 mAcceleration; - /* 0x38 */ f32 mDeceleration; - /* 0x3C */ f32 mSlideThresholdSpeed; // speed needed to trigger a slide - /* 0x40 */ f32 mSlideSpeed; - /* 0x44 */ f32 mSlideDeceleration; - /* 0x48 */ f32 mFootPositionRatio; - /* 0x4C */ f32 mWaitBInterpolation; - /* 0x50 */ f32 mMinWalkRate; - /* 0x54 */ f32 mMinTiredWalkRate; -}; // Size: 0x58 - -class daAlinkHIO_move_c0 { -public: - static daAlinkHIO_move_c1 const m; -}; - -class daAlinkHIO_move_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_move_c(); - ~daAlinkHIO_move_c() {} - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_move_c1 m; -#endif -}; - -class daAlinkHIO_noActAtnMove_c1 { -public: - /* 0x00 */ s16 mMaxTurnAngle; - /* 0x02 */ s16 mMinTurnAngle; - /* 0x04 */ s16 mTurnAngleRate; - /* 0x08 */ f32 mWaitAnmSpeed; - /* 0x0C */ f32 mWalkAnmSpeed; - /* 0x10 */ f32 mRunAnmSpeed; - /* 0x14 */ f32 mWalkChangeRate; - /* 0x18 */ f32 mRunChangeRate; - /* 0x1C */ f32 mMaxSpeed; - /* 0x20 */ f32 mAcceleration; - /* 0x24 */ f32 mDeceleration; - /* 0x28 */ f32 mBackWalkAnmSpeed; - /* 0x2C */ f32 mBackRunAnmSpeed; - /* 0x30 */ f32 mBackWalkChangeRate; - /* 0x34 */ f32 mBackRunChangeRate; - /* 0x38 */ f32 mMaxBackwardsSpeed; - /* 0x3C */ f32 mBackAcceleration; - /* 0x40 */ f32 mBackDeceleration; - /* 0x44 */ f32 mMinWalkFrame; - /* 0x48 */ f32 mMinBackWalkFrame; - /* 0x4C */ f32 mWalkForwardAnmSpeed; - /* 0x50 */ f32 mRunForwardAnmSpeed; -}; // Size: 0x54 - -class daAlinkHIO_noActAtnMove_c0 { -public: - static daAlinkHIO_noActAtnMove_c1 const m; -}; - -class daAlinkHIO_noActAtnMove_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_noActAtnMove_c(); - ~daAlinkHIO_noActAtnMove_c() {} - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_noActAtnMove_c1 m; -#endif -}; - -class daAlinkHIO_frontRoll_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mRollAnm; - /* 0x14 */ daAlinkHIO_anm_c mCrashAnm; - /* 0x28 */ daAlinkHIO_anm_c mCrashHitAnm; // ? - /* 0x3C */ s16 mCrashAngleThreshold; - /* 0x3E */ s16 mTurnRate; - /* 0x40 */ s16 mMaxTurnAngle; - /* 0x42 */ s16 mTurnMinAngle; - /* 0x44 */ f32 mInitSpeed; - /* 0x48 */ f32 mSpeedRate; - /* 0x4C */ f32 mMinSpeed; - /* 0x50 */ f32 mCrashSpeedThreshold; - /* 0x54 */ f32 mCrashInitF; - /* 0x58 */ f32 mCrashEndF; - /* 0x5C */ f32 mCrashSpeedH; - /* 0x60 */ f32 mCrashSpeedV; - /* 0x64 */ f32 mBootsAttackInitF; - /* 0x68 */ f32 mBootsAttackEndF; - /* 0x6C */ f32 mBootsAttackRadius; -}; // Size: 0x70 - -class daAlinkHIO_frontRoll_c0 { -public: - static daAlinkHIO_frontRoll_c1 const m; -}; - -class daAlinkHIO_frontRoll_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_frontRoll_c(); - ~daAlinkHIO_frontRoll_c() {} - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_frontRoll_c1 m; -#endif -}; - -class daAlinkHIO_backJump_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mBackflipAnm; - /* 0x14 */ daAlinkHIO_anm_c mLandAnm; - /* 0x28 */ f32 mBackflipSpeedH; - /* 0x2C */ f32 mBackflipSpeedV; - /* 0x30 */ f32 mFallHeight; - /* 0x34 */ f32 mFallInterpolation; -}; // Size: 0x38 - -class daAlinkHIO_backJump_c0 { -public: - static daAlinkHIO_backJump_c1 const m; -}; - -class daAlinkHIO_backJump_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_backJump_c(); - ~daAlinkHIO_backJump_c() {} - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_backJump_c1 m; -#endif -}; - -class daAlinkHIO_sideStep_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mSideJumpAnm; - /* 0x14 */ daAlinkHIO_anm_c mSideLandAnm; - /* 0x28 */ daAlinkHIO_anm_c mBackJumpAnm; - /* 0x3C */ daAlinkHIO_anm_c mBackLandAnm; - /* 0x50 */ f32 mSideJumpSpeedH; - /* 0x54 */ f32 mSideJumpSpeedV; - /* 0x58 */ f32 mBackJumpSpeedH; - /* 0x5C */ f32 mBackJumpSpeedV; - /* 0x60 */ f32 mFallHeight; - /* 0x64 */ f32 mFallInterpolation; -}; // Size: 0x68 - -class daAlinkHIO_sideStep_c0 { -public: - static daAlinkHIO_sideStep_c1 const m; -}; - -class daAlinkHIO_sideStep_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_sideStep_c(); - ~daAlinkHIO_sideStep_c() {} - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_sideStep_c1 m; -#endif -}; - -class daAlinkHIO_slide_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mForwardSlideAnm; - /* 0x14 */ daAlinkHIO_anm_c mBackwardSlideAnm; - /* 0x28 */ daAlinkHIO_anm_c mForwardLandAnm; - /* 0x3C */ daAlinkHIO_anm_c mBackwardLandAnm; - /* 0x50 */ f32 mMaxSpeed; - /* 0x54 */ f32 mAcceleration; - /* 0x58 */ f32 mSlideAngle; - /* 0x5C */ f32 mClimbAngle; - /* 0x60 */ f32 mClimbAnmMinSpeed; - /* 0x64 */ f32 mMaxClimbSpeed; - /* 0x68 */ f32 mLV2MinibossFloorSlideAngle; - /* 0x6C */ f32 mLV2MinibossFloorWeakSlideAngle; - /* 0x70 */ f32 mLV2MinibossFloorWeakSlideSpeed; - /* 0x74 */ f32 mMaxClimbAnmSpeed; -}; // Size: 0x78 - -class daAlinkHIO_slide_c0 { -public: - static daAlinkHIO_slide_c1 const m; -}; - -class daAlinkHIO_slide_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_slide_c(); - ~daAlinkHIO_slide_c() {} - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_slide_c1 m; -#endif -}; - -class daAlinkHIO_atnMove_c1 { -public: - /* 0x00 */ s16 mMaxTurnAngle; - /* 0x02 */ s16 mMinTurnAngle; - /* 0x04 */ s16 mTurnAngleRate; - /* 0x08 */ f32 mWaitAnmSpeed; - /* 0x0C */ f32 mWalkAnmSpeed; - /* 0x10 */ f32 mRunAnmSpeed; - /* 0x14 */ f32 mWalkChangeRate; - /* 0x18 */ f32 mRunChangeRate; - /* 0x1C */ f32 mMaxSpeed; - /* 0x20 */ f32 mAcceleration; - /* 0x24 */ f32 mDeceleration; - /* 0x28 */ f32 mBackWalkAnmSpeed; - /* 0x2C */ f32 mBackRunAnmSpeed; - /* 0x30 */ f32 mBackWalkChangeRate; - /* 0x34 */ f32 mBackRunChangeRate; - /* 0x38 */ f32 mMaxBackwardsSpeed; - /* 0x3C */ f32 mBackAcceleration; - /* 0x40 */ f32 mBackDeceleration; - /* 0x44 */ f32 mMinWalkFrame; - /* 0x48 */ f32 mMinBackWalkFrame; - /* 0x4C */ f32 mWalkForwardAnmSpeed; - /* 0x50 */ f32 mRunForwardAnmSpeed; -}; // Size: 0x54 - -class daAlinkHIO_atnMove_c0 { -public: - static daAlinkHIO_atnMove_c1 const m; -}; - -class daAlinkHIO_atnMove_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_atnMove_c(); - ~daAlinkHIO_atnMove_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_atnMove_c1 m; -#endif -}; - -class daAlinkHIO_cutNormal_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mCutAnm; - /* 0x14 */ f32 mSpeed; - /* 0x18 */ f32 mAttackStartFrame; - /* 0x1C */ f32 mAttackEndFrame; -}; // Size: 0x20 - -class daAlinkHIO_cutNmV_c0 { -public: - static daAlinkHIO_cutNormal_c1 const m; -}; - -class daAlinkHIO_cutNmL_c0 { -public: - static daAlinkHIO_cutNormal_c1 const m; -}; - -class daAlinkHIO_cutNmR_c0 { -public: - static daAlinkHIO_cutNormal_c1 const m; -}; - -class daAlinkHIO_cutNmSL_c0 { -public: - static daAlinkHIO_cutNormal_c1 const m; -}; - -class daAlinkHIO_cutNmSR_c0 { -public: - static daAlinkHIO_cutNormal_c1 const m; -}; - -class daAlinkHIO_cutNormal_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_cutNormal_c(int, float); - ~daAlinkHIO_cutNormal_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: - /* 0x34 */ f32 field_0x34; - /* 0x38 */ daAlinkHIO_cutNormal_c1 m; -}; // Size: 0x58 - -class daAlinkHIO_cutFinish_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mCutAnm; - /* 0x14 */ s16 mStopTime; - /* 0x16 */ s16 mComboStopTime; - /* 0x18 */ f32 mSpeed; - /* 0x1C */ f32 mAttackStartFrame; - /* 0x20 */ f32 mAttackEndFrame; - /* 0x24 */ f32 mComboCheckFrame; - /* 0x28 */ f32 mComboStartFrame; -}; // Size: 0x2C - -class daAlinkHIO_cutFnL_c0 { -public: - static daAlinkHIO_cutFinish_c1 const m; -}; - -class daAlinkHIO_cutFnV_c0 { -public: - static daAlinkHIO_cutFinish_c1 const m; -}; - -class daAlinkHIO_cutFnS_c0 { -public: - static daAlinkHIO_cutFinish_c1 const m; -}; - -class daAlinkHIO_cutFnSl_c0 { -public: - static daAlinkHIO_cutFinish_c1 const m; -}; - -class daAlinkHIO_cutFnSm_c0 { -public: - static daAlinkHIO_cutFinish_c1 const m; -}; - -class daAlinkHIO_cutFnR_c0 { -public: - static daAlinkHIO_cutFinish_c1 const m; -}; - -class daAlinkHIO_cutFinish_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_cutFinish_c(int, float); - ~daAlinkHIO_cutFinish_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: - /* 0x34 */ f32 field_0x34; - /* 0x38 */ daAlinkHIO_cutFinish_c1 m; -}; - -class daAlinkHIO_cutFnJU_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mCutAnm; - /* 0x14 */ daAlinkHIO_anm_c mLandAnm; - /* 0x28 */ s16 mStopTime; - /* 0x2A */ s16 mComboStopTime; - /* 0x2C */ f32 mSpeedH; - /* 0x30 */ f32 mSpeedV; - /* 0x34 */ f32 mAttackStartFrame; - /* 0x38 */ f32 mAttackEndFrame; - /* 0x3C */ f32 mComboCheckFrame; - /* 0x40 */ f32 mComboStartFrame; - /* 0x44 */ f32 mFallHeight; - /* 0x48 */ f32 mFallInterpolation; - /* 0x4C */ f32 mAttackRadius; - /* 0x50 */ f32 mAttackOffset; -}; // Size: 0x54 - -class daAlinkHIO_cutFnJU_c0 { -public: - static daAlinkHIO_cutFnJU_c1 const m; -}; - -class daAlinkHIO_cutFnJU_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_cutFnJU_c(); - ~daAlinkHIO_cutFnJU_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_cutFnJU_c1 m; -#endif -}; // Size: 0x88 - -class daAlinkHIO_cutDash_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mCutAnm; - /* 0x14 */ f32 mAttackStartFrame; - /* 0x18 */ f32 mAttackEndFrame; -}; // Size: 0x1C - -class daAlinkHIO_cutDaL_c0 { -public: - static daAlinkHIO_cutDash_c1 const m; -}; - -class daAlinkHIO_cutDaR_c0 { -public: - static daAlinkHIO_cutDash_c1 const m; -}; - -class daAlinkHIO_cutDaCharge_c0 { -public: - static daAlinkHIO_cutDash_c1 const m; -}; - -class daAlinkHIO_cutDash_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_cutDash_c(int, float); - ~daAlinkHIO_cutDash_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: - /* 0x34 */ f32 field_0x34; - /* 0x38 */ daAlinkHIO_cutDash_c1 m; -}; - -class daAlinkHIO_cutJump_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mCutAnm; - /* 0x14 */ daAlinkHIO_anm_c mLandAnm; - /* 0x28 */ f32 mBaseJumpSpeedH; - /* 0x2C */ f32 mBaseJumpSpeedV; - /* 0x30 */ f32 mAirJumpSpeedH; - /* 0x34 */ f32 mAirJumpSpeedV; - /* 0x38 */ f32 mStartAttackFrame; - /* 0x3C */ f32 mEndAttackFrame; - /* 0x40 */ f32 mJumpSpinDelay; -}; // Size: 0x44 - -class daAlinkHIO_cutJump_c0 { -public: - static daAlinkHIO_cutJump_c1 const m; -}; - -class daAlinkHIO_cutJump_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_cutJump_c(); - ~daAlinkHIO_cutJump_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_cutJump_c1 m; -#endif -}; // Size: 0x78 - -class daAlinkHIO_cutTurn_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mRightTurnAnm; - /* 0x14 */ daAlinkHIO_anm_c mChargeAnm; - /* 0x28 */ daAlinkHIO_anm_c mLeftTurnAnm; - /* 0x3C */ s16 mStopTime; - /* 0x3E */ s16 field_0x3E; - /* 0x40 */ f32 mRightTurnInputStartFrame; - /* 0x44 */ f32 mRightAttackStartFrame; - /* 0x48 */ f32 mRightAttackEndFrame; - /* 0x4C */ f32 mMoveFBAnmSpeed; - /* 0x50 */ f32 mMoveFBInterpolation; - /* 0x54 */ f32 mMoveLRAnmSpeed; - /* 0x58 */ f32 mMoveLRInterpolation; - /* 0x5C */ f32 mMaxSpeed; - /* 0x60 */ f32 mChargeMoveAccel; - /* 0x64 */ f32 mChargeMoveDecel; - /* 0x68 */ f32 mSpeed; - /* 0x6C */ f32 mRightComboStartFrame; - /* 0x70 */ f32 mAttackRadius; - /* 0x74 */ f32 mLeftTurnInputStartFrame; - /* 0x78 */ f32 mLeftAttackStartFrame; - /* 0x7C */ f32 mLeftAttackEndFrame; - /* 0x80 */ f32 mLeftComboStartFrame; - /* 0x84 */ f32 mAttackRadiusAccel; - /* 0x88 */ f32 mLightAttackRadius; - /* 0x8C */ f32 mLightAttackRadiusAccel; - /* 0x90 */ f32 mLargeAttackRadius; - /* 0x94 */ f32 mLargeAttackAccel; -}; // Size: 0x98 - -class daAlinkHIO_cutTurn_c0 { -public: - static daAlinkHIO_cutTurn_c1 const m; -}; - -class daAlinkHIO_cutTurn_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_cutTurn_c(); - ~daAlinkHIO_cutTurn_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_cutTurn_c1 m; -#endif -}; // Size: 0xCC - -class daAlinkHIO_hoCut_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mCutAnm; - /* 0x14 */ f32 mAttackStartFrame; - /* 0x18 */ f32 mAttackEndFrame; - /* 0x1C */ f32 mAfterCutMorf; -}; // Size: 0x20 - -class daAlinkHIO_hoCutLA_c0 { -public: - static daAlinkHIO_hoCut_c1 const m; -}; - -class daAlinkHIO_hoCutLB_c0 { -public: - static daAlinkHIO_hoCut_c1 const m; -}; - -class daAlinkHIO_hoCutRA_c0 { -public: - static daAlinkHIO_hoCut_c1 const m; -}; - -class daAlinkHIO_hoCutRB_c0 { -public: - static daAlinkHIO_hoCut_c1 const m; -}; - -class daAlinkHIO_hoCut_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_hoCut_c(int, float); - ~daAlinkHIO_hoCut_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: - /* 0x34 */ f32 field_0x34; - /* 0x38 */ daAlinkHIO_hoCut_c1 m; -}; // Size: 0x58 - -class daAlinkHIO_hoCutCharge_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mChargeAnm; - /* 0x14 */ daAlinkHIO_anm_c mCutAnm; - /* 0x28 */ daAlinkHIO_anm_c mSpinAnm; - /* 0x3C */ s16 mCutStopTime; - /* 0x3E */ s16 mSpinStopTime; - /* 0x40 */ f32 mCutAttackStartFrame; - /* 0x44 */ f32 mCutAttackEndFrame; - /* 0x48 */ f32 mSpinAttackStartFrame; - /* 0x4C */ f32 mSpinAttackEndFrame; - /* 0x50 */ f32 mSpinAttackRadius; -}; // Size: 0x54 - -class daAlinkHIO_hoCutCharge_c0 { -public: - static daAlinkHIO_hoCutCharge_c1 const m; -}; - -class daAlinkHIO_hoCutCharge_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_hoCutCharge_c(); - ~daAlinkHIO_hoCutCharge_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_hoCutCharge_c1 m; -#endif -}; // Size: 0x88 - -class daAlinkHIO_cutDown_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; - /* 0x14 */ daAlinkHIO_anm_c mFallAnm; - /* 0x28 */ daAlinkHIO_anm_c mLandAnm; - /* 0x3C */ daAlinkHIO_anm_c mMissAnm; - /* 0x50 */ daAlinkHIO_anm_c mRecoverAnm; - /* 0x64 */ s16 mSuccessStopTime; - /* 0x66 */ s16 mFailStopTime; - /* 0x68 */ f32 mRecoverSpeedH; - /* 0x6C */ f32 mRecoverSpeedV; - /* 0x70 */ f32 mSpeedV; -}; // Size: 0x74 - -class daAlinkHIO_cutDown_c0 { -public: - static daAlinkHIO_cutDown_c1 const m; -}; - -class daAlinkHIO_cutDown_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_cutDown_c(); - ~daAlinkHIO_cutDown_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_cutDown_c1 m; -#endif -}; // Size: 0xA8 - -class daAlinkHIO_cutHead_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; - /* 0x14 */ daAlinkHIO_anm_c mCutAnm; - /* 0x28 */ daAlinkHIO_anm_c mLandAnm; - /* 0x3C */ f32 mGravity; - /* 0x40 */ f32 mMaxHeight; - /* 0x44 */ f32 mMaxDistance; - /* 0x48 */ f32 mAddSpeedV; - /* 0x4C */ f32 mAddSpeedH; - /* 0x50 */ f32 mAttackStartFrame; - /* 0x54 */ f32 mAttackEndFrame; - /* 0x58 */ f32 mSwordRadius; - /* 0x5C */ f32 mSwordLength; -}; // Size: 0x60 - -class daAlinkHIO_cutHead_c0 { -public: - static daAlinkHIO_cutHead_c1 const m; -}; - -class daAlinkHIO_cutHead_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_cutHead_c(); - ~daAlinkHIO_cutHead_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_cutHead_c1 m; -#endif -}; // Size: 0x94 - -class daAlinkHIO_cutLargeJump_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mChargeAnm; - /* 0x14 */ daAlinkHIO_anm_c mChargeMoveAnm; - /* 0x28 */ daAlinkHIO_anm_c mCutAnm; - /* 0x3C */ daAlinkHIO_anm_c mLandAnm; - /* 0x50 */ f32 mCutSpeedH; - /* 0x54 */ f32 mCutSpeedV; - /* 0x58 */ f32 mJumpAttackStartFrame; - /* 0x5C */ f32 mJumpAttackEndFrame; - /* 0x60 */ f32 mCutInitFrame; - /* 0x64 */ f32 mLandAttackInitFrame; - /* 0x68 */ f32 mLandAttackEndFrame; - /* 0x6C */ f32 mLandAttackRadius; - /* 0x70 */ f32 mSpinSlashCheckFrame; -}; // Size: 0x74 - -class daAlinkHIO_cutLargeJump_c0 { -public: - static daAlinkHIO_cutLargeJump_c1 const m; -}; - -class daAlinkHIO_cutLargeJump_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_cutLargeJump_c(); - ~daAlinkHIO_cutLargeJump_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_cutLargeJump_c1 m; -#endif -}; // Size: 0xA8 - -class daAlinkHIO_cut_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mEquipAnm; - /* 0x14 */ daAlinkHIO_anm_c mUnequipAnm; - /* 0x28 */ daAlinkHIO_anm_c mRecoilAnm; - /* 0x3C */ daAlinkHIO_anm_c mStabAnm; - /* 0x50 */ bool mForceHitCombo; - /* 0x52 */ s16 mComboDuration; - /* 0x54 */ s16 mBlurAlpha; - /* 0x56 */ s16 mNormalSwingDuration; - /* 0x58 */ s16 mDashBlurAlpha; - /* 0x5A */ s16 mUnkTime; // might be related to flourish - /* 0x5C */ s16 mFlourishTime; - /* 0x5E */ s16 mUnkBodyDownwards; // ? - /* 0x60 */ s16 mUnkBodyUpwards; // ? - /* 0x62 */ s16 mSpinSlashWait; // ? maybe related to wii? - /* 0x64 */ f32 mRecoilSpeed; - /* 0x68 */ f32 mRecoilDeceleration; - /* 0x6C */ f32 mFlourishAnmSpeed; - /* 0x70 */ f32 mFlourishEndAnmSpeed; - /* 0x74 */ f32 mSwordLength; - /* 0x78 */ f32 mSwordRadius; - /* 0x7C */ f32 mSwordLengthHorseback; - /* 0x80 */ f32 mSwordRadiusHorseback; - /* 0x84 */ f32 mRunCutLength; - /* 0x88 */ f32 mRunCutRadius; - /* 0x8C */ f32 mFastUnequipAnmSpeed; - /* 0x90 */ f32 mSwordLengthHorsebackFight; - /* 0x94 */ f32 mSwordRadiusHorsebackFight; - /* 0x98 */ f32 mFlourishControlStartFrame; -}; // Size: 0x9C - -class daAlinkHIO_cut_c0 { -public: - static daAlinkHIO_cutNmV_c0 const mCutVertical; - static daAlinkHIO_cutNmL_c0 const mCutLeft; - static daAlinkHIO_cutNmR_c0 const mCutRight; - static daAlinkHIO_cutNmSL_c0 const mCutLeftStab; - static daAlinkHIO_cutNmSR_c0 const mCutRightStab; - static daAlinkHIO_cutFnL_c0 const mCutFinishLeft; - static daAlinkHIO_cutFnV_c0 const mCutFinishVertical; - static daAlinkHIO_cutFnS_c0 const mCutFinishStab; - static daAlinkHIO_cutFnSl_c0 const mCutFinishSweep; - static daAlinkHIO_cutFnSm_c0 const mCutFinishSlash; - static daAlinkHIO_cutFnR_c0 const mCutFinishRight; - static daAlinkHIO_cutFnJU_c0 const mCutFinishJumpUppercut; - static daAlinkHIO_cutJump_c0 const mCutJump; - static daAlinkHIO_cutTurn_c0 const mCutTurn; - static daAlinkHIO_hoCutLA_c0 const mHorseCutLeftA; - static daAlinkHIO_hoCutLB_c0 const mHorseCutLeftB; - static daAlinkHIO_hoCutRA_c0 const mHorseCutRightA; - static daAlinkHIO_hoCutRB_c0 const mHorseCutRightB; - static daAlinkHIO_hoCutCharge_c0 const mHorseCutCharge; - static daAlinkHIO_cutDaL_c0 const mCutDashLeft; - static daAlinkHIO_cutDaR_c0 const mCutDashRight; - static daAlinkHIO_cutDaCharge_c0 const mCutDashCharge; - static daAlinkHIO_cutDown_c0 const mCutDown; - static daAlinkHIO_cutHead_c0 const mCutHead; - static daAlinkHIO_cutLargeJump_c0 const mCutLargeJump; - static daAlinkHIO_cut_c1 const m; -}; - -class daAlinkHIO_cut_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_cut_c(); - ~daAlinkHIO_cut_c(); - - virtual void genMessage(JORMContext*); -#else - ~daAlinkHIO_cut_c(); -#endif - -public: -#if DEBUG - /* 0x034 */ daAlinkHIO_cutNormal_c mCutVertical; - /* 0x08C */ daAlinkHIO_cutNormal_c mCutLeft; - /* 0x0E4 */ daAlinkHIO_cutNormal_c mCutRight; - /* 0x13C */ daAlinkHIO_cutNormal_c mCutLeftStab; - /* 0x194 */ daAlinkHIO_cutNormal_c mCutRightStab; - /* 0x1EC */ daAlinkHIO_cutFinish_c mCutFinishLeft; - /* 0x250 */ daAlinkHIO_cutFinish_c mCutFinishVertical; - /* 0x2B4 */ daAlinkHIO_cutFinish_c mCutFinishStab; - /* 0x318 */ daAlinkHIO_cutFinish_c mCutFinishSweep; - /* 0x37C */ daAlinkHIO_cutFinish_c mCutFinishSlash; - /* 0x3E0 */ daAlinkHIO_cutFinish_c mCutFinishRight; - /* 0x444 */ daAlinkHIO_cutFnJU_c mCutFinishJumpUppercut; - /* 0x4CC */ daAlinkHIO_cutJump_c mCutJump; - /* 0x544 */ daAlinkHIO_cutTurn_c mCutTurn; - /* 0x610 */ daAlinkHIO_hoCut_c mHorseCutLeftA; - /* 0x668 */ daAlinkHIO_hoCut_c mHorseCutLeftB; - /* 0x6C0 */ daAlinkHIO_hoCut_c mHorseCutRightA; - /* 0x718 */ daAlinkHIO_hoCut_c mHorseCutRightB; - /* 0x770 */ daAlinkHIO_hoCutCharge_c mHorseCutCharge; - /* 0x7F8 */ daAlinkHIO_cutDash_c mCutDashLeft; - /* 0x84C */ daAlinkHIO_cutDash_c mCutDashRight; - /* 0x8A0 */ daAlinkHIO_cutDash_c mCutDashCharge; - /* 0x8F4 */ daAlinkHIO_cutDown_c mCutDown; - /* 0x99C */ daAlinkHIO_cutHead_c mCutHead; - /* 0xA30 */ daAlinkHIO_cutLargeJump_c mCutLargeJump; - /* 0xAD8 */ daAlinkHIO_cut_c1 m; -#endif -}; // Size: 0xB74 - -class daAlinkHIO_guardAttack_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mAttackAnm; - /* 0x14 */ f32 mSpeed; - /* 0x18 */ f32 mAttackStartFrame; - /* 0x1C */ f32 mAttackEndFrame; - /* 0x20 */ f32 mSlashCheckFrame; -}; // Size: 0x24 - -class daAlinkHIO_gAtPush_c0 { -public: - static daAlinkHIO_guardAttack_c1 const m; -}; - -class daAlinkHIO_gAtKick_c0 { -public: - static daAlinkHIO_guardAttack_c1 const m; -}; - -class daAlinkHIO_guardAttack_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_guardAttack_c(int, float); - ~daAlinkHIO_guardAttack_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: - /* 0x34 */ f32 field_0x34; - /* 0x38 */ daAlinkHIO_guardAttack_c1 m; -}; - -class daAlinkHIO_turnMove_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mTurnAnm; - /* 0x14 */ s16 mTurnSpeedRate; - /* 0x16 */ s16 mMaxTurnSpeed; - /* 0x18 */ s16 mMinTurnSpeed; - /* 0x1A */ s16 mMaxHalfTurnSpeed; - /* 0x1C */ f32 mHalfTurnAnmSpeed; - /* 0x20 */ f32 mTwirlCutDelayF; - /* 0x24 */ f32 mSideRollAnmSpeed; - /* 0x28 */ f32 mSideRollSpeed; -}; // Size: 0x2C - -class daAlinkHIO_turnMove_c0 { -public: - static daAlinkHIO_turnMove_c1 const m; -}; - -class daAlinkHIO_turnMove_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_turnMove_c(); - ~daAlinkHIO_turnMove_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_turnMove_c1 m; -#endif -}; - -class daAlinkHIO_guard_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mGuardHitAnm; - /* 0x14 */ daAlinkHIO_anm_c mCrouchGuardHitAnm; // Unused - /* 0x28 */ daAlinkHIO_anm_c mRecoilAnm; - /* 0x3C */ daAlinkHIO_anm_c mGuardBreakAnm; - /* 0x50 */ s16 mGuardLRAngleMax; - /* 0x52 */ s16 mGuardFBAngleMax; - /* 0x54 */ s16 mGuardBodyInterpolation; - /* 0x56 */ s16 mSmallGuardLRAngleMax; - /* 0x58 */ s16 mSmallGuardFBAngleMax; - /* 0x5C */ f32 mCrouchGuardAnmSpeed; // Unused - /* 0x60 */ f32 mCrouchGuardInterpolation; // Unused - /* 0x64 */ f32 mGuardSpeedNormal; - /* 0x68 */ f32 mGuardSpeedLarge; - /* 0x6C */ f32 mGuardSpeedHuge; - /* 0x70 */ f32 mAttackPosOffset; - /* 0x74 */ f32 mAttackRadius; - /* 0x78 */ f32 mMagneGuardSpeed; - /* 0x7C */ f32 mMagneHvyGuardSpeed; -}; // Size: 0x80 - -class daAlinkHIO_guard_c0 { -public: - static daAlinkHIO_gAtPush_c0 const mAtPush; - static daAlinkHIO_gAtKick_c0 const mAtKick; - static daAlinkHIO_turnMove_c0 const mTurnMove; - static daAlinkHIO_guard_c1 const m; -}; - -class daAlinkHIO_guard_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_guard_c(); - ~daAlinkHIO_guard_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x034 */ daAlinkHIO_guardAttack_c mAtPush; - /* 0x090 */ daAlinkHIO_guardAttack_c mAtKick; - /* 0x0EC */ daAlinkHIO_turnMove_c mTurnMove; - /* 0x14C */ daAlinkHIO_guard_c1 m; -#endif -}; - -class daAlinkHIO_crouch_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mCrawlStartAnm; - /* 0x14 */ daAlinkHIO_anm_c mCrawlEndAnm; - /* 0x28 */ s16 mCrawlTurnRate; - /* 0x2A */ s16 mCrawlTurnMax; - /* 0x2C */ s16 mCrawlTurnMin; - /* 0x30 */ f32 mCrouchAnmSpeed; - /* 0x34 */ f32 mCrouchInterpolation; - /* 0x38 */ f32 mStandInterpolation; - /* 0x3C */ f32 mCrawlMoveRate; - /* 0x40 */ f32 mCrawlAnmSpeedMax; - /* 0x44 */ f32 mCrawlAnmSpeedMin; - /* 0x48 */ f32 mCrawlInterpolation; -}; // Size: 0x4C - -class daAlinkHIO_crouch_c0 { -public: - static daAlinkHIO_crouch_c1 const m; -}; - -class daAlinkHIO_crouch_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_crouch_c(); - ~daAlinkHIO_crouch_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_crouch_c1 m; -#endif -}; - -class daAlinkHIO_autoJump_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; - /* 0x14 */ daAlinkHIO_anm_c mLandAnm; - /* 0x28 */ daAlinkHIO_anm_c mDiveAnm; - /* 0x3C */ daAlinkHIO_anm_c mDiveConnectAnm; - /* 0x50 */ bool mAlwaysMaxSpeedJump; - /* 0x52 */ s16 mJumpAngle; - /* 0x54 */ s16 mSpinJumpRotateSpeed; - /* 0x56 */ s16 mSpinJumpLandStopTime; - /* 0x58 */ s16 mCuccoJumpAngle; - /* 0x5C */ f32 mJumpSpeedLimit; - /* 0x60 */ f32 mMinJumpSpeed; - /* 0x64 */ f32 mJumpSpeedRate; - /* 0x68 */ f32 mAirborneInterpolation; - /* 0x6C */ f32 mJumpFallInterpolation; - /* 0x70 */ f32 mFallInterpolation; - /* 0x74 */ f32 mGravity; - /* 0x78 */ f32 mMaxFallSpeed; - /* 0x7C */ f32 mMaxJumpSpeed; - /* 0x80 */ f32 mSpinJumpInterpolation; - /* 0x84 */ f32 mSpinJumpFallInterpolation; - /* 0x88 */ f32 mSpinJumpAddSpeed; - /* 0x8C */ f32 mSpinJumpAccel; - /* 0x90 */ f32 mHangHeightLimit; - /* 0x94 */ f32 mGrabHeightLimit; - /* 0x98 */ f32 mOoccooJumpMaxSpeed; - /* 0x9C */ f32 mDiveSpeedV; - /* 0xA0 */ f32 mDiveSpeedH; - /* 0xA4 */ f32 mDiveGravity; - /* 0xA8 */ f32 mCuccoJumpMaxSpeed; - /* 0xAC */ f32 mCuccoFallMaxSpeed; - /* 0xB0 */ f32 mCuccoStartSpeed; -}; // size = 0xB4 - -class daAlinkHIO_autoJump_c0 { -public: - static daAlinkHIO_autoJump_c1 const m; -}; - -class daAlinkHIO_autoJump_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_autoJump_c(); - ~daAlinkHIO_autoJump_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - daAlinkHIO_autoJump_c1 m; -#endif -}; - -class daAlinkHIO_smallJump_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mSmallJumpAnm; - /* 0x14 */ daAlinkHIO_anm_c mStepClimbAnm; - /* 0x28 */ daAlinkHIO_anm_c mStepLandAnm; - /* 0x3C */ f32 mSpeedH; - /* 0x40 */ f32 mTargetHeightOffset; - /* 0x44 */ f32 mFallInterpolation; -}; // Size: 0x48 - -class daAlinkHIO_smallJump_c0 { -public: - static daAlinkHIO_smallJump_c1 const m; -}; - -class daAlinkHIO_smallJump_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_smallJump_c(); - ~daAlinkHIO_smallJump_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - daAlinkHIO_smallJump_c1 m; -#endif -}; - -class daAlinkHIO_wallCatch_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mGrabAAnm; - /* 0x14 */ daAlinkHIO_anm_c mGrabBAnm; - /* 0x28 */ daAlinkHIO_anm_c mClimbAnm; - /* 0x3C */ daAlinkHIO_anm_c mJumpAnm; - /* 0x50 */ f32 mClimbStartFrame; -}; // Size: 0x54 - -class daAlinkHIO_wallCatch_c0 { -public: - static daAlinkHIO_wallCatch_c1 const m; -}; - -class daAlinkHIO_wallCatch_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wallCatch_c(); - ~daAlinkHIO_wallCatch_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - daAlinkHIO_wallCatch_c1 m; -#endif -}; - -class daAlinkHIO_wallFall_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mOneHandGrabAnm; - /* 0x14 */ daAlinkHIO_anm_c mTwoHandGrabAnm; -}; // Size: 0x28 - -class daAlinkHIO_wallFall_c0 { -public: - static daAlinkHIO_wallFall_c1 const m; -}; - -class daAlinkHIO_wallFall_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wallFall_c(); - ~daAlinkHIO_wallFall_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - daAlinkHIO_wallFall_c1 m; -#endif -}; - -class daAlinkHIO_wallMove_c1 { -public: - /* 0x00 */ f32 mMinAnmSpeed; - /* 0x04 */ f32 mMaxAnmSpeed; - /* 0x08 */ f32 mInterpolation; - /* 0x0C */ f32 mMinSpeed; - /* 0x10 */ f32 mMaxSpeed; -}; // Size: 0x14 - -class daAlinkHIO_wallMove_c0 { -public: - static daAlinkHIO_wallMove_c1 const m; -}; - -class daAlinkHIO_wallMove_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wallMove_c(); - ~daAlinkHIO_wallMove_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - daAlinkHIO_wallMove_c1 m; -#endif -}; - -class daAlinkHIO_wallHang_c1 { -public: - /* 0x00 */ s16 small_jump_input_time; - /* 0x02 */ s16 grab_input_time; - /* 0x04 */ f32 auto_walk_height; - /* 0x08 */ f32 small_jump_height; - /* 0x0C */ f32 climb_height; - /* 0x10 */ f32 jump_climb_height; - /* 0x14 */ f32 jump_hang_height; - /* 0x18 */ f32 hang_foot_pos_height; -}; // Size: 0x1C - -class daAlinkHIO_wallHang_c0 { -public: - static daAlinkHIO_smallJump_c0 const mSmallJump; - static daAlinkHIO_wallCatch_c0 const mWallCatch; - static daAlinkHIO_wallFall_c0 const mWallFall; - static daAlinkHIO_wallMove_c0 const mWallMove; - static daAlinkHIO_wallHang_c1 const m; -}; - -class daAlinkHIO_wallHang_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wallHang_c(); - ~daAlinkHIO_wallHang_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_smallJump_c mSmallJump; - /* 0x00 */ daAlinkHIO_wallCatch_c mWallCatch; - /* 0x00 */ daAlinkHIO_wallFall_c mWallFall; - /* 0x00 */ daAlinkHIO_wallMove_c mWallMove; - /* 0x00 */ daAlinkHIO_wallHang_c1 m; -#endif -}; - -class daAlinkHIO_pushpull_c1 { -public: - /* 0x00 */ u8 mEnableSumoWaitRotation; - /* 0x02 */ s16 mSumoMaxGauge; - /* 0x04 */ s16 mSumoIncreaseGauge; - /* 0x06 */ s16 mSumoPenaltyTime; - /* 0x08 */ s16 mSumoPower3To2Switch; - /* 0x0A */ s16 mSumoPower2To1Switch; - /* 0x0C */ s16 mSumoRotationAllowPower; - /* 0x0E */ s16 mSumoRotationAngle; - /* 0x10 */ f32 mStandbyASpeed; - /* 0x14 */ f32 mStandbyInterpolation; - /* 0x18 */ f32 mPushASpeed; - /* 0x1C */ f32 mPushInterpolation; - /* 0x20 */ f32 field_0x20; - /* 0x24 */ f32 mPullInterpolation; - /* 0x28 */ f32 mSumoPushASpeed; - /* 0x2C */ f32 mSumoPushAddASpeed; - /* 0x30 */ f32 mSumoPushedASpeed; - /* 0x34 */ f32 mSumoPushedAddASpeed; - /* 0x38 */ f32 mPushASpeedHeavy; -}; // Size: 0x3C - -class daAlinkHIO_pushpull_c0 { -public: - static daAlinkHIO_pushpull_c1 const m; -}; - -class daAlinkHIO_pushpull_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_pushpull_c(); - ~daAlinkHIO_pushpull_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - daAlinkHIO_pushpull_c1 m; -#endif -}; - -class daAlinkHIO_damNormal_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mFrontAnm; - /* 0x14 */ daAlinkHIO_anm_c mRearAnm; - /* 0x28 */ daAlinkHIO_anm_c mLeftAnm; - /* 0x3C */ daAlinkHIO_anm_c mRightAnm; - /* 0x50 */ s16 mFrontBackBodyMaxAngle; - /* 0x52 */ s16 mLeftRightBodyMaxAngle; - /* 0x54 */ f32 mInitialSpeed; - /* 0x58 */ f32 mAttackSpeedRate; - /* 0x5C */ f32 mDeceleration; - /* 0x60 */ f32 mIceDamageASpeed; -}; // Size: 0x64 - -class daAlinkHIO_damNormal_c0 { -public: - static daAlinkHIO_damNormal_c1 const m; -}; - -class daAlinkHIO_damNormal_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_damNormal_c(); - ~daAlinkHIO_damNormal_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - daAlinkHIO_damNormal_c1 m; -#endif -}; - -class daAlinkHIO_damLaHu_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mFrontGetUpAnm; - /* 0x14 */ daAlinkHIO_anm_c mBackGetUpAnm; - /* 0x28 */ daAlinkHIO_anm_c mLeftGetUpAnm; - /* 0x3C */ daAlinkHIO_anm_c mRightGetUpAnm; - /* 0x50 */ daAlinkHIO_anm_c mFrontWallHitAnm; - /* 0x64 */ daAlinkHIO_anm_c mBackWallHitAnm; - /* 0x78 */ daAlinkHIO_anm_c mLeftWallHitAnm; - /* 0x8C */ daAlinkHIO_anm_c mRightWallHitAnm; - /* 0xA0 */ s16 mBodyRotateRate; - /* 0xA4 */ f32 mGravity; - /* 0xA8 */ f32 mDamageBlend; - /* 0xAC */ f32 mHorizontalSpeed; - /* 0xB0 */ f32 mVerticalSpeed; - /* 0xB4 */ f32 mBounceSpeed; - /* 0xB8 */ f32 mDeceleration; -}; // Size: 0xBC - -class daAlinkHIO_damLarge_c0 { -public: - static daAlinkHIO_damLaHu_c1 const m; -}; - -class daAlinkHIO_damHuge_c0 { -public: - static daAlinkHIO_damLaHu_c1 const m; -}; - -class daAlinkHIO_damLaHu_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_damLaHu_c(int); - ~daAlinkHIO_damLaHu_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - daAlinkHIO_damLaHu_c1 m; -#endif -}; - -class daAlinkHIO_damHorse_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mNoDirectionAnm; - /* 0x14 */ daAlinkHIO_anm_c mWithDirectionAnm; - /* 0x28 */ s16 mFrontBackBodyMaxAngle; - /* 0x2A */ s16 mLeftRightBodyMaxAngle; -}; // Size: 0x2C - -class daAlinkHIO_damHorse_c0 { -public: - static daAlinkHIO_damHorse_c1 const m; -}; - -class daAlinkHIO_damHorse_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_damHorse_c(); - ~daAlinkHIO_damHorse_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_damHorse_c1 m; -#endif -}; - -class daAlinkHIO_damFall_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mLandAnm; - /* 0x14 */ daAlinkHIO_anm_c mStandAnm; - /* 0x28 */ s16 mSmallStopTime; - /* 0x2A */ s16 mBigStopTime; - /* 0x2C */ f32 mMinRollHeight; - /* 0x30 */ f32 mMaxRollHeight; - /* 0x34 */ f32 mSmallDmgHeight; - /* 0x38 */ f32 mBigDmgHeight; - /* 0x3C */ f32 mSmallDmgLandStartFrame; - /* 0x40 */ f32 mFallAnmTransitionHeight; - /* 0x44 */ f32 mFallAnmMorf; -}; // Size: 0x48 - -class daAlinkHIO_damFall_c0 { -public: - static daAlinkHIO_damFall_c1 const m; -}; - -class daAlinkHIO_damFall_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_damFall_c(); - ~daAlinkHIO_damFall_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_damFall_c1 m; -#endif -}; - -class daAlinkHIO_damCaught_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mEscapeAnm; - /* 0x14 */ s16 mGrabDuration; - /* 0x16 */ s16 mInputFadeTime; - /* 0x18 */ f32 mStandbySpeed; - /* 0x1C */ f32 mStandbyInterp; - /* 0x20 */ f32 mStandbyAddASpeed; -}; // Size: 0x24 - -class daAlinkHIO_damCaught_c0 { -public: - static daAlinkHIO_damCaught_c1 const m; -}; - -class daAlinkHIO_damCaught_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_damCaught_c(); - ~daAlinkHIO_damCaught_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_damCaught_c1 m; -#endif -}; - -class daAlinkHIO_damSwim_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mFrontAnm; - /* 0x14 */ daAlinkHIO_anm_c mRearAnm; - /* 0x28 */ daAlinkHIO_anm_c mLeftAnm; - /* 0x3C */ daAlinkHIO_anm_c mRightAnm; - /* 0x50 */ daAlinkHIO_anm_c mSinkAnm; - /* 0x64 */ daAlinkHIO_anm_c mSurfaceAnm; - /* 0x78 */ s16 mFrontBackBodyMaxAngle; - /* 0x7A */ s16 mLeftRightBodyMaxAngle; - /* 0x7C */ f32 mInitialSpeed; - /* 0x80 */ f32 mAttackSpeedRate; - /* 0x84 */ f32 mDeceleration; - /* 0x88 */ f32 mMaxSpeed; -}; // Size: 0x8C - -class daAlinkHIO_damSwim_c0 { -public: - static daAlinkHIO_damSwim_c1 const m; -}; - -class daAlinkHIO_damSwim_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_damSwim_c(); - ~daAlinkHIO_damSwim_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_damSwim_c1 m; -#endif -}; - -class daAlinkHIO_damage_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mFloorDmgAnm; - /* 0x14 */ daAlinkHIO_anm_c mDashDmgAnm; - /* 0x28 */ u8 mInvincible; - /* 0x2A */ s16 mInvincibleTime; - /* 0x2C */ s16 mWolfFloorInvincibleTime; - /* 0x2E */ s16 mFreezeTime; - /* 0x30 */ s16 mFreezeInitR; - /* 0x32 */ s16 mFreezeInitG; - /* 0x34 */ s16 mFreezeInitB; - /* 0x36 */ s16 mDamageR0; - /* 0x38 */ s16 mDamageG0; - /* 0x3A */ s16 mDamageB0; - /* 0x3C */ s16 mDamageR1; - /* 0x3E */ s16 mDamageG1; - /* 0x40 */ s16 mDamageB1; - /* 0x42 */ s16 mDamageR2; - /* 0x44 */ s16 mDamageG2; - /* 0x46 */ s16 mDamageB2; - /* 0x48 */ s16 mFreezeR; - /* 0x4A */ s16 mFreezeG; - /* 0x4C */ s16 mFreezeB; - /* 0x50 */ f32 mRecoverStandAnmSpeed; - /* 0x54 */ f32 mInvertedFallInterpolation; -}; // Size: 0x58 - -class daAlinkHIO_damage_c0 { -public: - static daAlinkHIO_damage_c1 const m; - static daAlinkHIO_damNormal_c0 const mDamNormal; - static daAlinkHIO_damLarge_c0 const mDamLarge; - static daAlinkHIO_damHuge_c0 const mDamHuge; - static daAlinkHIO_damHorse_c0 const mDamHorse; - static daAlinkHIO_damFall_c0 const mDamFall; - static daAlinkHIO_damCaught_c0 const mDamCaught; - static daAlinkHIO_damSwim_c0 const mDamSwim; -}; - -class daAlinkHIO_damage_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_damage_c(); - ~daAlinkHIO_damage_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_damage_c1 m; - /* 0x34 */ daAlinkHIO_damNormal_c mDamNormal; - /* 0x00 */ daAlinkHIO_damLaHu_c mDamLarge; - /* 0x00 */ daAlinkHIO_damLaHu_c mDamHuge; - /* 0x00 */ daAlinkHIO_damHorse_c mDamHorse; - /* 0x00 */ daAlinkHIO_damFall_c mDamFall; - /* 0x00 */ daAlinkHIO_damCaught_c mDamCaught; - /* 0x00 */ daAlinkHIO_damSwim_c mDamSwim; -#endif -}; - -class daAlinkHIO_horse_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mWalkOutAnm; - /* 0x14 */ daAlinkHIO_anm_c mRunOutAnm; - /* 0x28 */ daAlinkHIO_anm_c mWhipAnm; - /* 0x3C */ daAlinkHIO_anm_c mWhipRunOutAnm; - /* 0x50 */ s16 mSwordUpTime; - /* 0x52 */ s16 mSearchRangeAngle; - /* 0x54 */ s16 mWalkOutProhibitionTime; - /* 0x56 */ s16 mWhipWaitTime; - /* 0x58 */ s16 mSubjectiveDownwardMaxAngle; - /* 0x5A */ s16 mSubjectiveUpwardMaxAngle; - /* 0x5C */ f32 mSwordUpAnmSpeed; - /* 0x60 */ f32 mSwordUpInterpolation; - /* 0x64 */ f32 mHorseWalkStartFrame; - /* 0x68 */ f32 mTiredWaitInterpolation; -}; // Size: 0x6C - -class daAlinkHIO_horse_c0 { -public: - static daAlinkHIO_horse_c1 const m; -}; - -class daAlinkHIO_horse_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_horse_c(); - ~daAlinkHIO_horse_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_horse_c1 m; -#endif -}; - -class daAlinkHIO_canoe_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mLeftRightChangeAnm; - /* 0x14 */ s16 mMaxTurnAngle; - /* 0x16 */ s16 mMaxTurnAngle_RiverRide; - /* 0x18 */ f32 mStickRowAnmSpeed; - /* 0x1C */ f32 mBtnRowAnmSpeed; - /* 0x20 */ f32 mSpeedRate; - /* 0x24 */ f32 mMaxSpeed; - /* 0x28 */ f32 mDeceleration; - /* 0x2C */ f32 mStickRowStartAnmSpeed; - /* 0x30 */ f32 mBtnRowStartAnmSpeed; - /* 0x34 */ f32 mBackSpeedRate; - /* 0x38 */ f32 mBackMaxSpeed; - /* 0x3C */ f32 mMaxSpeed_RiverRide; - /* 0x40 */ f32 mSpeedRate_RiverRide; - /* 0x44 */ f32 mDeceleration_RiverRide; -}; // Size: 0x48 - -class daAlinkHIO_canoe_c0 { -public: - static daAlinkHIO_canoe_c1 const m; -}; - -class daAlinkHIO_canoe_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_canoe_c(); - ~daAlinkHIO_canoe_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_canoe_c1 m; -#endif -}; - -class daAlinkHIO_bow_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mShootAnm; - /* 0x14 */ daAlinkHIO_anm_c mLoadAnm; - /* 0x28 */ s16 mChargeArrowTime; - /* 0x2A */ s16 mBombArrowHoldTime; - /* 0x2C */ s16 mBombArrowFlyExplodeTime; - /* 0x30 */ f32 mStartInterpolation; - /* 0x34 */ f32 mArrowSpeed; - /* 0x38 */ f32 mArrowDistance; - /* 0x3C */ f32 mChargeArrowSpeed; - /* 0x40 */ f32 mChargeArrowDistance; - /* 0x44 */ f32 mArrowAttackRadius; - /* 0x48 */ f32 mBombArrowSpeed; - /* 0x4C */ f32 mBombArrowDistance; - /* 0x50 */ f32 mChargeBombArrowSpeed; - /* 0x54 */ f32 mChargeBombArrowDistance; - /* 0x58 */ f32 mScopeArrowSpeed; - /* 0x5C */ f32 mScopeArrowDistance; - /* 0x60 */ f32 mArrowIncAttackMaxStart; - /* 0x64 */ f32 mArrowIncAttackMax; - /* 0x68 */ f32 mSlingshotSpeed; - /* 0x6C */ f32 mSlingshotDistance; -}; // Size: 0x70 - -class daAlinkHIO_bow_c0 { -public: - static daAlinkHIO_bow_c1 const m; -}; - -class daAlinkHIO_bow_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_bow_c(); - ~daAlinkHIO_bow_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_bow_c1 m; -#endif -}; - -class daAlinkHIO_boom_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mThrowAnm; - /* 0x14 */ daAlinkHIO_anm_c mCatchAnm; - /* 0x28 */ s16 mChargeTime; - /* 0x2A */ s16 mBgThroughTime; - /* 0x2C */ f32 mIdleAnmSpeed; - /* 0x30 */ f32 mStartInterpolation; - /* 0x34 */ f32 mFlySpeed; - /* 0x38 */ f32 mChargeFlySpeed; - /* 0x3C */ f32 mFlyDistMax; - /* 0x40 */ f32 mHorsebackFlyDistMax; - /* 0x44 */ f32 mLockDistMax; - /* 0x48 */ f32 mCatchSpeed; -}; // Size: 0x4C - -class daAlinkHIO_boom_c0 { -public: - static daAlinkHIO_boom_c1 const m; -}; - -class daAlinkHIO_boom_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_boom_c(); - ~daAlinkHIO_boom_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_boom_c1 m; -#endif -}; - -class daAlinkHIO_bomb_c1 { -public: - /* 0x00 */ s16 mExplodeTime; - /* 0x02 */ s16 mEnemyBombColorR; - /* 0x04 */ s16 mBombInsectLimitAngle; - /* 0x08 */ f32 mGravity; - /* 0x0C */ f32 mMaxFallSpeed; - /* 0x10 */ f32 mBoundRate; - /* 0x14 */ f32 mStopSpeedY; - /* 0x18 */ f32 mMaxSpeedY; - /* 0x1C */ f32 mEffScale; - /* 0x20 */ f32 mAttackRadius; - /* 0x24 */ f32 mPokeBombTrackRate; - /* 0x28 */ f32 mWaterGravity; - /* 0x2C */ f32 mWaterMaxFallSpeed; - /* 0x30 */ f32 mThrowSpeedH; - /* 0x34 */ f32 mThrowSpeedV; - /* 0x38 */ f32 mWaterThrowSpeedH; - /* 0x3C */ f32 mWaterThrowSpeedV; - /* 0x40 */ f32 mWolfThrowSpeedH; - /* 0x44 */ f32 mWolfThrowSpeedV; - /* 0x48 */ f32 mExplodeWaterEffectLimit; -}; // Size: 0x4C - -class daAlinkHIO_bomb_c0 { -public: - static daAlinkHIO_bomb_c1 const m; -}; - -class daAlinkHIO_bomb_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_bomb_c(); - ~daAlinkHIO_bomb_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_bomb_c1 m; -#endif -}; - -class daAlinkHIO_huLight_c1 { -public: - /* 0x00 */ u8 mAngleAttenuationType; - /* 0x01 */ u8 mDistanceAttenuationType; - /* 0x02 */ s16 mAlpha; - /* 0x04 */ s16 mColorR; - /* 0x06 */ s16 mColorG; - /* 0x08 */ s16 mColorB; - /* 0x0A */ s16 mXAngle; - /* 0x0C */ f32 mPower; - /* 0x10 */ f32 mWidth; - /* 0x14 */ f32 mYOffset; - /* 0x18 */ f32 mZOffset; -}; // Size: 0x1C - -class daAlinkHIO_huLight_c0 { -public: - static daAlinkHIO_huLight_c1 const m; -}; - -class daAlinkHIO_wlLight_c1 { -public: - /* 0x00 */ s16 field_0x0; - /* 0x02 */ s16 field_0x2; - /* 0x04 */ s16 field_0x4; - /* 0x06 */ s16 field_0x6; - /* 0x08 */ s16 field_0x8; - /* 0x0A */ s16 field_0xA; - /* 0x0C */ f32 field_0xC; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; -}; // Size: 0x1C - -class daAlinkHIO_wlLight_c0 { -public: - static daAlinkHIO_wlLight_c1 const m; -}; - -class daAlinkHIO_zwLight_c1 { // may be wrong -public: - /* 0x00 */ s16 field_0x0; - /* 0x02 */ s16 field_0x2; - /* 0x04 */ s16 field_0x4; - /* 0x06 */ s16 field_0x6; - /* 0x08 */ s16 field_0x8; - /* 0x0A */ s16 field_0xA; - /* 0x0C */ f32 field_0xC; - /* 0x10 */ f32 field_0x10; - /* 0x14 */ f32 field_0x14; - /* 0x18 */ f32 field_0x18; -}; // Size: 0x1C - -class daAlinkHIO_zwLight_c0 { -public: - static daAlinkHIO_zwLight_c1 const m; -}; - -class daAlinkHIO_light_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_light_c(int); - ~daAlinkHIO_light_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_huLight_c1 m; -#endif -}; - -class daAlinkHIO_kandelaar_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mShakeAnm; - /* 0x14 */ daAlinkHIO_anm_c mBeginUnkAnm; - /* 0x28 */ daAlinkHIO_anm_c mEndUnkAnm; - /* 0x3C */ s16 mColorReg1R; - /* 0x3E */ s16 mColorReg1G; - /* 0x40 */ s16 mColorReg1B; - /* 0x42 */ s16 mColorReg2R; - /* 0x44 */ s16 mColorReg2G; - /* 0x46 */ s16 mColorReg2B; - /* 0x48 */ s16 mNormalOilLoss; - /* 0x4A */ s16 mShakeOilLoss; - /* 0x4C */ f32 mFlameTrackRate; -}; // Size: 0x50 - -class daAlinkHIO_kandelaar_c0 { -public: - static daAlinkHIO_kandelaar_c1 const m; -}; - -class daAlinkHIO_kandelaar_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_kandelaar_c(); - ~daAlinkHIO_kandelaar_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_kandelaar_c1 m; -#endif -}; - -class daAlinkHIO_magneBoots_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mEquipAnm; - /* 0x14 */ f32 mInputFactor; - /* 0x18 */ f32 mFeetPositionRatio; - /* 0x1C */ f32 mWalkAnmSpeedMax; - /* 0x20 */ f32 mWalkAnmSpeedMin; - /* 0x24 */ f32 mWaterInputFactor; - /* 0x28 */ f32 mWaterWalkAnmRate; - /* 0x2C */ f32 mWaterStartWalkAnmRate; - /* 0x30 */ f32 mMaxMagneFlySpeed; - /* 0x34 */ f32 mMagneFlyAccelRate; - /* 0x38 */ f32 mWaterVelocityY; - /* 0x3C */ f32 mWaterVelocityX; - /* 0x40 */ f32 mWaterVelRateSword; - /* 0x44 */ f32 mZoraWaterInputFactor; - /* 0x48 */ f32 mZoraWaterAnmSpeed; -}; // Size: 0x4C - -class daAlinkHIO_magneBoots_c0 { -public: - static daAlinkHIO_magneBoots_c1 const m; -}; - -class daAlinkHIO_magneBoots_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_magneBoots_c(); - ~daAlinkHIO_magneBoots_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_magneBoots_c1 m; -#endif -}; - -class daAlinkHIO_fmChain_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mGripAnm; - /* 0x14 */ daAlinkHIO_anm_c mUnfinishedAnm; -}; // Size: 0x28 - -class daAlinkHIO_fmChain_c0 { -public: - static daAlinkHIO_fmChain_c1 const m; -}; - -class daAlinkHIO_fmChain_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_fmChain_c(); - ~daAlinkHIO_fmChain_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_fmChain_c1 m; -#endif -}; - -class daAlinkHIO_hookshot_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mShootAnm; - /* 0x14 */ daAlinkHIO_anm_c mRoofHangAnm; - /* 0x28 */ daAlinkHIO_anm_c mWallHangAnm; - /* 0x3C */ u8 mForceStick; - /* 0x40 */ f32 mWaitAnmSpeed; - /* 0x44 */ f32 mStartInterpolation; - /* 0x48 */ f32 mMaxLength; - /* 0x4C */ f32 mShootSpeed; - /* 0x50 */ f32 mReturnSpeed; - /* 0x54 */ f32 mStickReturnSpeed; - /* 0x58 */ f32 mRoofHangRiseSpeed; - /* 0x5C */ f32 mRoofHangDecendSpeed; - /* 0x60 */ f32 mBossMaxLength; - /* 0x64 */ f32 mBossShootSpeed; - /* 0x68 */ f32 mBossReturnSpeed; - /* 0x6C */ f32 mBossStickReturnSpeed; -}; // Size: 0x70 - -class daAlinkHIO_hookshot_c0 { -public: - static daAlinkHIO_hookshot_c1 const m; -}; - -class daAlinkHIO_hookshot_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_hookshot_c(); - ~daAlinkHIO_hookshot_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_hookshot_c1 m; -#endif -}; - -class daAlinkHIO_spinner_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mKickAnm; - /* 0x14 */ s16 mRideMoveTime; - /* 0x16 */ s16 mBoardWaitTime; - /* 0x18 */ s16 mRideRotAngleMax; - /* 0x1A */ s16 mRideRotAngleMin; - /* 0x1C */ s16 mBossRideMoveTime; - /* 0x20 */ f32 mGravity; - /* 0x24 */ f32 mMaxFallSpeed; - /* 0x28 */ f32 mJumpRate; - /* 0x2C */ f32 mRideSpeed; - /* 0x30 */ f32 mDecelSpeedMax; - /* 0x34 */ f32 mDecelSpeedMin; - /* 0x38 */ f32 mDecelRate; - /* 0x3C */ f32 mBossRideSpeed; -}; // Size: 0x40 - -class daAlinkHIO_spinner_c0 { -public: - static daAlinkHIO_spinner_c1 const m; -}; - -class daAlinkHIO_spinner_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_spinner_c(); - ~daAlinkHIO_spinner_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_spinner_c1 m; -#endif -}; - -class daAlinkHIO_ironBall_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mCatchAnm; - /* 0x14 */ s16 mThrowChainNum; - /* 0x16 */ s16 mReturnChainRemoveNum; - /* 0x18 */ f32 mWaitAnmSpeed; - /* 0x1C */ f32 mPrepareAnmSpeed; - /* 0x20 */ f32 mPrepareInterpolation; - /* 0x24 */ f32 mTurnAnmSpeed; - /* 0x28 */ f32 mTurnInterpolation; - /* 0x2C */ f32 mPreThrowAnmSpeed; - /* 0x30 */ f32 mPreThrowAnmInterpolation; - /* 0x34 */ f32 mThrowAnmSpeed; - /* 0x38 */ f32 mThrowInterpolation; - /* 0x3C */ f32 mPullAnmSpeed; - /* 0x40 */ f32 mPullInterpolation; - /* 0x44 */ f32 mChainSpeedRate; - /* 0x48 */ f32 mChainGravity; - /* 0x4C */ f32 mReturnChainAccelY; - /* 0x50 */ f32 mReturnChainRate; - /* 0x54 */ f32 mThrowChainAccelZ; - /* 0x58 */ f32 mThrowChainAccelY; - /* 0x5C */ f32 mThrowChainGravity; - /* 0x60 */ f32 mBallGravity; - /* 0x64 */ f32 mThrowBallGravity; - /* 0x68 */ f32 mBallMaxFallSpeed; - /* 0x6C */ f32 field_0x6C; - /* 0x70 */ f32 mThrowSpeedZ; - /* 0x74 */ f32 mThrowSpeedY; - /* 0x78 */ f32 mReturnBallGravity; - /* 0x7C */ f32 mAttackRadius; - /* 0x80 */ f32 mFeetPosRatio; - /* 0x84 */ f32 mWalkAnmSpeedMax; - /* 0x88 */ f32 mWalkAnmSpeedMin; -}; // Size: 0x8C - -class daAlinkHIO_ironBall_c0 { -public: - static daAlinkHIO_ironBall_c1 const m; -}; - -class daAlinkHIO_ironBall_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_ironBall_c(); - ~daAlinkHIO_ironBall_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_ironBall_c1 m; -#endif -}; - -class daAlinkHIO_copyRod_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mSwingAnm; - /* 0x14 */ daAlinkHIO_anm_c mBigSwingAnm; - /* 0x28 */ f32 mBallSpeed; - /* 0x2c */ f32 mBallMaxDistance; - /* 0x30 */ f32 mBallReturnSpeed; - /* 0x34 */ f32 mBossBallMaxDistance; -}; // Size: 0x38 - -class daAlinkHIO_copyRod_c0 { -public: - static daAlinkHIO_copyRod_c1 const m; -}; - -class daAlinkHIO_copyRod_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_copyRod_c(); - ~daAlinkHIO_copyRod_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_copyRod_c1 m; -#endif -}; - -class daAlinkHIO_pickUp_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mGrabAnm; - /* 0x14 */ daAlinkHIO_anm_c mPlaceAnm; - /* 0x28 */ f32 field_0x28; - /* 0x2C */ f32 field_0x2C; -}; // Size: 0x30 - -class daAlinkHIO_pickUp_c0 { -public: - static daAlinkHIO_pickUp_c1 const m; -}; - -class daAlinkHIO_pickUp_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_pickUp_c(); - ~daAlinkHIO_pickUp_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_pickUp_c1 m; -#endif -}; - -class daAlinkHIO_board_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; // might be wrong - /* 0x14 */ daAlinkHIO_anm_c mAirborneAnm; - /* 0x28 */ daAlinkHIO_anm_c mLandAnm; - /* 0x3C */ daAlinkHIO_anm_c mSpinAnm; - /* 0x50 */ f32 mMaxSpeed; - /* 0x54 */ f32 mPushAccel; - /* 0x58 */ f32 mMinJumpSpeedY; - /* 0x5C */ f32 mMaxJumpSpeedY; - /* 0x60 */ f32 mStandAnmSpeed; - /* 0x64 */ f32 mStandInterpolation; - /* 0x68 */ f32 mSitAnmSpeed; - /* 0x6C */ f32 mSitInterpolation; - /* 0x70 */ f32 mStartMinSpeed; - /* 0x74 */ f32 mStartAddSpeed; - /* 0x78 */ f32 mPushAnmMaxSpeed; - /* 0x7C */ f32 mFastPushSwitchSpeed; - /* 0x80 */ f32 mFastPushInterpolation; - /* 0x84 */ f32 mPushInterpolation; - /* 0x88 */ f32 mPushAnmMinSpeed; - /* 0x8C */ f32 mMaxPushSpeed; - /* 0x90 */ f32 mSpinMinJumpSpeedY; - /* 0x94 */ f32 mSpinMaxJumpSpeedY; - /* 0x98 */ f32 mEffectMaxSpeed; -}; // Size: 0x9C - -class daAlinkHIO_board_c0 { -public: - static daAlinkHIO_board_c1 const m; -}; - -class daAlinkHIO_board_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_board_c(); - ~daAlinkHIO_board_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_board_c1 m; -#endif -}; - -class daAlinkHIO_bottle_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mStartDrinkAnm; - /* 0x14 */ daAlinkHIO_anm_c mEndDrinkAnm; - /* 0x28 */ daAlinkHIO_anm_c mOpenBottleAnm; - /* 0x3C */ daAlinkHIO_anm_c mPourAnm; - /* 0x50 */ daAlinkHIO_anm_c mSwingDownAnm; - /* 0x64 */ daAlinkHIO_anm_c mSwingSideAnm; - /* 0x78 */ daAlinkHIO_anm_c mGetAnm; - /* 0x8C */ daAlinkHIO_anm_c mDrinkNastyAnm; - /* 0xA0 */ daAlinkHIO_anm_c mScoopAnm; -}; // Size: 0xB4 - -class daAlinkHIO_bottle_c0 { -public: - static daAlinkHIO_bottle_c1 const m; -}; - -class daAlinkHIO_bottle_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_bottle_c(); - ~daAlinkHIO_bottle_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_bottle_c1 m; -#endif -}; - -class daAlinkHIO_item_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mOneHandEquipAnm; - /* 0x14 */ daAlinkHIO_anm_c mTwoHandEquipAnm; - /* 0x28 */ s16 mItemFPTransitionTimer; - /* 0x2A */ s16 mItemFPMaxUnk; - /* 0x2C */ s16 mItemFPUpMaxUnk; - /* 0x2E */ s16 mWiiItemFPDownMaxUnk; - /* 0x30 */ s16 mWiiItemFPUpMaxUnk; - /* 0x34 */ f32 mOneHandReleaseAnmSpeed; - /* 0x38 */ f32 mTwoHandReleaseAnmSpeed; -}; // Size: 0x3C - -class daAlinkHIO_item_c0 { -public: - static daAlinkHIO_bow_c0 const mBow; - static daAlinkHIO_boom_c0 const mBoomerang; - static daAlinkHIO_bomb_c0 const mBomb; - static daAlinkHIO_huLight_c0 const mLanternPL; - static daAlinkHIO_kandelaar_c0 const mLantern; - static daAlinkHIO_fmChain_c0 const mFmChain; - static daAlinkHIO_magneBoots_c0 const mIronBoots; - static daAlinkHIO_pickUp_c0 const mPickUp; - static daAlinkHIO_board_c0 const mBoard; - static daAlinkHIO_bottle_c0 const mBottle; - static daAlinkHIO_hookshot_c0 const mHookshot; - static daAlinkHIO_spinner_c0 const mSpinner; - static daAlinkHIO_ironBall_c0 const mIronBall; - static daAlinkHIO_copyRod_c0 const mCopyRod; - static daAlinkHIO_zwLight_c0 const mZoraArmorPL; - static daAlinkHIO_item_c1 const m; -}; - -class daAlinkHIO_item_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_item_c(); - ~daAlinkHIO_item_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_bow_c mBow; - /* 0x00 */ daAlinkHIO_boom_c mBoomerang; - /* 0x00 */ daAlinkHIO_bomb_c mBomb; - /* 0x00 */ daAlinkHIO_light_c mLanternPL; - /* 0x00 */ daAlinkHIO_kandelaar_c mLantern; - /* 0x00 */ daAlinkHIO_fmChain_c mFmChain; - /* 0x00 */ daAlinkHIO_magneBoots_c mIronBoots; - /* 0x00 */ daAlinkHIO_pickUp_c mPickUp; - /* 0x00 */ daAlinkHIO_board_c mBoard; - /* 0x00 */ daAlinkHIO_bottle_c mBottle; - /* 0x00 */ daAlinkHIO_hookshot_c mHookshot; - /* 0x00 */ daAlinkHIO_spinner_c mSpinner; - /* 0x00 */ daAlinkHIO_ironBall_c mIronBall; - /* 0x00 */ daAlinkHIO_copyRod_c mCopyRod; - /* 0x00 */ daAlinkHIO_light_c mZoraArmorPL; - /* 0x00 */ daAlinkHIO_item_c1 m; -#endif -}; - -class daAlinkHIO_ladder_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mWallAttachAnm; - /* 0x14 */ daAlinkHIO_anm_c mWallAttachMissAnm; - /* 0x28 */ f32 mClimbUpStartASpeed; - /* 0x2C */ f32 mClimbUpStartInterp; - /* 0x30 */ f32 mClimbUpEndASpeed; - /* 0x34 */ f32 mClimbUpEndInterp; - /* 0x38 */ f32 mClimbDownStartASpeed; - /* 0x3C */ f32 mClimbDownStartInterp; - /* 0x40 */ f32 mClimbDownEndASpeed; - /* 0x44 */ f32 mClimbDownEndInterp; - /* 0x48 */ f32 mMoveMinASpeed; - /* 0x4C */ f32 mMoveMaxSpeed; - /* 0x50 */ f32 mMoveInterp; - /* 0x54 */ f32 mClimbDownEndCF; - /* 0x58 */ f32 mClimbUpEndCF; - /* 0x5C */ f32 mWallHorizontalMinAnmSpeed; - /* 0x60 */ f32 mWallHorizontalMaxAnmSpeed; - /* 0x64 */ f32 mWallVerticalMinAnmSpeed; - /* 0x68 */ f32 mWallVerticalMaxAnmSpeed; - /* 0x6C */ f32 mWallApproachOffset; -}; // Size: 0x70 - -class daAlinkHIO_ladder_c0 { -public: - static daAlinkHIO_ladder_c1 const m; -}; - -class daAlinkHIO_ladder_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_ladder_c(); - ~daAlinkHIO_ladder_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_ladder_c1 m; -#endif -}; - -class daAlinkHIO_roofHang_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mRoofHangAnm; - /* 0x14 */ s16 mTurnAngleRate; - /* 0x16 */ s16 mMaxTurnAngle; - /* 0x18 */ s16 mMinTurnAngle; - /* 0x1C */ f32 mStandbyASpeed; - /* 0x20 */ f32 mStandbyInterp; - /* 0x24 */ f32 mVertMoveMinASpeed; - /* 0x28 */ f32 mVertMoveMaxASpeed; - /* 0x2C */ f32 mVertMoveInterp; - /* 0x30 */ f32 mVertMoveMinSpeed; - /* 0x34 */ f32 mVertMoveMaxSpeed; - /* 0x38 */ f32 mHorizMoveMinASpeed; - /* 0x3C */ f32 mHorizMoveMaxASpeed; - /* 0x40 */ f32 mHorizMoveInterp; - /* 0x44 */ f32 mInvertASpeed; - /* 0x48 */ f32 mInvertInterp; -}; // Size: 0x4C - -class daAlinkHIO_roofHang_c0 { -public: - static daAlinkHIO_roofHang_c1 const m; -}; - -class daAlinkHIO_roofHang_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_roofHang_c(); - ~daAlinkHIO_roofHang_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_roofHang_c1 m; -#endif -}; - -class daAlinkHIO_grab_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mPrepareAnm; - /* 0x14 */ daAlinkHIO_anm_c mLiftBackAnm; - /* 0x28 */ daAlinkHIO_anm_c mStandReverseAnm; - /* 0x3C */ daAlinkHIO_anm_c mLiftAnm; - /* 0x50 */ daAlinkHIO_anm_c mThrowAnm; - /* 0x64 */ daAlinkHIO_anm_c mCarryAnm; - /* 0x78 */ daAlinkHIO_anm_c mRecoilAnm; - /* 0x8C */ daAlinkHIO_anm_c mFailAnm; - /* 0xA0 */ daAlinkHIO_anm_c mCarryLiftAnm; - /* 0xB4 */ daAlinkHIO_anm_c mCarryPlaceReverseAnm; - /* 0xC8 */ daAlinkHIO_anm_c mIronBallThrowAnm; - /* 0xDC */ s16 mForceWeightSpec; - /* 0xDE */ s16 mFailStopTime; - /* 0xE0 */ f32 field_0xE0; -}; // Size: 0xE4 - -class daAlinkHIO_grab_c0 { -public: - static daAlinkHIO_grab_c1 const m; -}; - -class daAlinkHIO_grab_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_grab_c(); - ~daAlinkHIO_grab_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_grab_c1 m; -#endif -}; - -class daAlinkHIO_swim_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mFloatUpAnm; - /* 0x14 */ daAlinkHIO_anm_c mDiveAnm; - /* 0x28 */ daAlinkHIO_anm_c mUnderwaterDiveAnm; - /* 0x3C */ daAlinkHIO_anm_c mDashAnm; - /* 0x50 */ s16 mTurnRate; - /* 0x52 */ s16 mMinTurn; - /* 0x54 */ s16 mMaxTurn; - /* 0x56 */ s16 mUnderwaterTurnRate; - /* 0x58 */ s16 mUnderwaterMinTurn; - /* 0x5A */ s16 mUnderwaterMaxTurn; - /* 0x5C */ s16 field_0x5c; // related to dash - /* 0x5E */ s16 field_0x5e; // related to dash - /* 0x60 */ f32 mStartHeight; - /* 0x64 */ f32 mFloatUpHeight; - /* 0x68 */ f32 mForwardMaxSpeed; - /* 0x6C */ f32 mStrafeMaxSpeed; - /* 0x70 */ f32 mBackwardMaxSpeed; - /* 0x74 */ f32 mUnderwaterMaxSpeed; - /* 0x78 */ f32 mUnderwaterFallMaxSpeed; - /* 0x7C */ f32 mAcceleration; - /* 0x80 */ f32 mDeceleration; - /* 0x84 */ f32 mMaxFallSpeed; - /* 0x88 */ f32 mMaxFloatUpSpeed; - /* 0x8C */ f32 mBuoyancy; - /* 0x90 */ f32 mWaitAnmSpeed; - /* 0x94 */ f32 mWaitInterpolation; - /* 0x98 */ f32 mWaitUpDownShakeAmount; - /* 0x9C */ f32 mForwardMinAnmSpeed; - /* 0xA0 */ f32 mForwardMaxAnmSpeed; - /* 0xA4 */ f32 mStrafeMinAnmSpeed; - /* 0xA8 */ f32 mStrafeMaxAnmSpeed; - /* 0xAC */ f32 mBackwardMinAnmSpeed; - /* 0xB0 */ f32 mBackwardMaxAnmSpeed; - /* 0xB4 */ f32 mUnderwaterMinAnmSpeed; - /* 0xB8 */ f32 mUnderwaterMaxAnmSpeed; - /* 0xBC */ f32 mMoveInterpolation; - /* 0xC0 */ f32 mClimbHeight; - /* 0xC4 */ f32 mClimbWaterSurfaceUnder; - /* 0xC8 */ f32 mForwardMinSpeed; - /* 0xCC */ f32 mStandingMaxFallSpeed; - /* 0xD0 */ f32 mBootsMaxFallSpeed; - /* 0xD4 */ f32 mNormalBuoyancyWaterDepth; - /* 0xD8 */ f32 mZoraClothesBuoyancy; - /* 0xDC */ f32 mUnderwaterButtonAdditionalSpeed; - /* 0xE0 */ f32 mUnderwaterAdditionalAnmSpeed; - /* 0xE4 */ f32 mBootsGravity; - /* 0xE8 */ f32 mFloatUpSwimSpeedRate; - /* 0xEC */ f32 mDashMaxSpeed; - /* 0xF0 */ f32 mDashDeceleration; - /* 0xF4 */ f32 mDashMinAnmSpeed; - /* 0xF8 */ f32 mDashMaxAnmSpeed; -}; // Size: 0xFC - -class daAlinkHIO_swim_c0 { -public: - static daAlinkHIO_swim_c1 const m; -}; - -class daAlinkHIO_swim_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_swim_c(); - ~daAlinkHIO_swim_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_swim_c1 m; -#endif -}; - -class daAlinkHIO_wlMove_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mSlipAnm; - /* 0x14 */ daAlinkHIO_anm_c mReverseAnm; - /* 0x28 */ daAlinkHIO_anm_c mADashAnm; - /* 0x3C */ daAlinkHIO_anm_c mDashReboundAnm; - /* 0x50 */ s16 mTurnMax; - /* 0x52 */ s16 mTurnMin; - /* 0x54 */ s16 mTurnAngleRate; - /* 0x56 */ s16 mADashDuration; - /* 0x58 */ s16 mADashCooldownTime; - /* 0x5A */ s16 mADashDurationSlow; - /* 0x5C */ s16 mADashCooldownTimeSlow; - /* 0x5E */ s16 mADashDurationSlow2; - /* 0x60 */ s16 mADashCooldownTimeSlow2; - /* 0x64 */ f32 mMaxSpeed; - /* 0x68 */ f32 mAcceleration; - /* 0x6C */ f32 mDeceleration; - /* 0x70 */ f32 mIdleAnmSpeed; - /* 0x74 */ f32 mWalkAnmSpeed; - /* 0x78 */ f32 mBriskWalkAnmSpeed; - /* 0x7C */ f32 mRunAnmSpeed; - /* 0x80 */ f32 mQuickRunAnmSpeed; - /* 0x84 */ f32 mIdleToWalkRate; - /* 0x88 */ f32 mWalkToBriskWalkRate; - /* 0x8C */ f32 mStandbyRunToRunRate; - /* 0x90 */ f32 mRunToQuickRunRate; - /* 0x94 */ f32 mNormalInterpolation; - /* 0x98 */ f32 mWalkRunInterpolation; - /* 0x9C */ f32 mRunAnmMinBlendRate; - /* 0xA0 */ f32 mSlipStartRate; - /* 0xA4 */ f32 mSlipInitSpeedRate; - /* 0xA8 */ f32 mSlipDeceleration; - /* 0xAC */ f32 mReverseSpeed; - /* 0xB0 */ f32 mIdleReverseStartFrame; - /* 0xB4 */ f32 mGazeMaxSpeed; - /* 0xB8 */ f32 mGazeIdleAnmSpeed; - /* 0xBC */ f32 mIdleInterpolation; - /* 0xC0 */ f32 mReverseFallHeight; - /* 0xC4 */ f32 mReverseFallInterpolation; - /* 0xC8 */ f32 mADashMaxSpeed; - /* 0xCC */ f32 mADashQuickRunAnmSpeed; - /* 0xD0 */ f32 mADashAcceleration; - /* 0xD4 */ f32 mADashInitSpeed; - /* 0xD8 */ f32 mDashReboundHorizontalSpeed; - /* 0xDC */ f32 mDashReboundVerticalSpeed; - /* 0xE0 */ f32 mADashMaxSpeedSlow; - /* 0xE4 */ f32 mADashInitSpeedSlow; - /* 0xE8 */ f32 mADashQuickRunASpeedSlow; - /* 0xEC */ f32 mADashAccelerationSlow; - /* 0xF0 */ f32 mADashMaxSpeedSlow2; - /* 0xF4 */ f32 mADashInitSpeedSlow2; - /* 0xF8 */ f32 mADashQuickRunASpeedSlow2; - /* 0xFC */ f32 mADashAccelerationSlow2; -}; // Size: 0x100 - -class daAlinkHIO_wlMove_c0 { -public: - static daAlinkHIO_wlMove_c1 const m; -}; - -class daAlinkHIO_wlMove_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlMove_c(); - ~daAlinkHIO_wlMove_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_wlMove_c1 m; -#endif -}; - -class daAlinkHIO_wlMoveNoP_c1 { -public: - /* 0x00 */ s16 mTurnMax; - /* 0x02 */ s16 mTurnMin; - /* 0x04 */ s16 mTurnAngleRate; - /* 0x08 */ f32 mMaxSpeed; - /* 0x0C */ f32 mAcceleration; - /* 0x10 */ f32 mDeceleration; - /* 0x14 */ f32 mIdleAnmSpeed; - /* 0x18 */ f32 mWalkAnmSpeed; - /* 0x1C */ f32 mJogAnmSpeed; - /* 0x20 */ f32 mRunAnmSpeed; - /* 0x24 */ f32 mIdleToWalkRate; - /* 0x28 */ f32 mWalkToJogRate; - /* 0x2C */ f32 mJogToRunRate; - /* 0x30 */ f32 mWalkRunInterpolation; - /* 0x34 */ f32 mRunAnmMinBlendRate; - /* 0x38 */ f32 mSlideStartRate; - /* 0x3C */ f32 mSlideInitSpeed; - /* 0x40 */ f32 mSlideDeceleration; - /* 0x44 */ f32 mReverseSpeed; -}; // Size: 0x48 - -class daAlinkHIO_wlMoveNoP_c0 { -public: - static daAlinkHIO_wlMoveNoP_c1 const m; -}; - -class daAlinkHIO_wlMoveNoP_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlMoveNoP_c(); - ~daAlinkHIO_wlMoveNoP_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlMoveNoP_c1 m; -#endif -}; - -class daAlinkHIO_wlAtnMove_c1 { -public: - /* 0x00 */ s16 mTurnAngleMax; - /* 0x02 */ s16 mTurnAngleMin; - /* 0x04 */ s16 mTurnAngleRate; - /* 0x08 */ f32 mWalkAnmSpeed; - /* 0x0C */ f32 mRunAnmSpeed; - /* 0x10 */ f32 mWalkChangeRate; - /* 0x14 */ f32 mRunChangeRate; - /* 0x18 */ f32 mMaxSpeed; - /* 0x1C */ f32 mAcceleration; - /* 0x20 */ f32 mDeceleration; - /* 0x24 */ f32 mRearWalkAnmSpeed; - /* 0x28 */ f32 mRearWalkChangeRate; - /* 0x2C */ f32 mRearMaxSpeed; - /* 0x30 */ f32 mRearAcceleration; - /* 0x34 */ f32 mRearDeceleration; -}; // Size: 0x38 - -class daAlinkHIO_wlAtnMove_c0 { -public: - static daAlinkHIO_wlAtnMove_c1 const m; -}; - -class daAlinkHIO_wlAtnMove_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlAtnMove_c(); - ~daAlinkHIO_wlAtnMove_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlAtnMove_c1 m; -#endif -}; - -class daAlinkHIO_wlHowl_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mHowlAnm; - /* 0x14 */ daAlinkHIO_anm_c mSittingHowlAnm; - /* 0x28 */ daAlinkHIO_anm_c mThreatAnm; - /* 0x3C */ daAlinkHIO_anm_c mThreatStanceAnm; - /* 0x50 */ f32 mThreatMoveInterp; - /* 0x54 */ f32 mThreatMoveRate; - /* 0x58 */ f32 mThreatMoveMaxAnmSpeed; - /* 0x5C */ f32 mThreatMoveMinAnmSpeed; -}; // Size: 0x60 - -class daAlinkHIO_wlHowl_c0 { -public: - static daAlinkHIO_wlHowl_c1 const m; -}; - -class daAlinkHIO_wlHowl_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlHowl_c(); - ~daAlinkHIO_wlHowl_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlHowl_c1 m; -#endif -}; - -class daAlinkHIO_wlSideStep_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mSideJumpAnm; - /* 0x14 */ daAlinkHIO_anm_c mSideLandAnm; - /* 0x28 */ daAlinkHIO_anm_c mBackJumpAnm; - /* 0x3C */ daAlinkHIO_anm_c mBackLandAnm; - /* 0x50 */ f32 mSideJumpHorizSpeed; - /* 0x54 */ f32 mSideJumpVertSpeed; - /* 0x58 */ f32 mBackJumpHorizSpeed; - /* 0x5C */ f32 mBackJumpVertSpeed; - /* 0x60 */ f32 mFallHeight; - /* 0x64 */ f32 mFallInterp; -}; // Size: 0x68 - -class daAlinkHIO_wlSideStep_c0 { -public: - static daAlinkHIO_wlSideStep_c1 const m; -}; - -class daAlinkHIO_wlSideStep_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlSideStep_c(); - ~daAlinkHIO_wlSideStep_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlSideStep_c1 m; -#endif -}; - -class daAlinkHIO_wlBackJump_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mBackJumpAnm; - /* 0x14 */ daAlinkHIO_anm_c mBackLandAnm; - /* 0x28 */ f32 mBackJumpHorizSpeed; - /* 0x2C */ f32 mBackJumpVertSpeed; - /* 0x30 */ f32 mFallHeight; - /* 0x34 */ f32 mFallInterp; -}; // Size: 0x38 - -class daAlinkHIO_wlBackJump_c0 { -public: - static daAlinkHIO_wlBackJump_c1 const m; -}; - -class daAlinkHIO_wlBackJump_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlBackJump_c(); - ~daAlinkHIO_wlBackJump_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlBackJump_c1 m; -#endif -}; - -class daAlinkHIO_wlAutoJump_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; - /* 0x14 */ daAlinkHIO_anm_c mLandingAnm; - /* 0x28 */ daAlinkHIO_anm_c mClimbAnm; - /* 0x3C */ u8 mAlwaysMaxSpeedJump; - /* 0x3E */ s16 field_0x3e; - /* 0x40 */ s16 mJumpAngle; - /* 0x42 */ s16 mWeakJumpAngle; - /* 0x44 */ f32 mJumpLimitSpeed; - /* 0x48 */ f32 mJumpMinSpeed; - /* 0x4C */ f32 mJumpSpeedRate; - /* 0x50 */ f32 mJumpFallInterp; - /* 0x54 */ f32 mNormalFallInterp; - /* 0x58 */ f32 mGravity; - /* 0x5C */ f32 mMaxFallSpeed; - /* 0x60 */ f32 mWeakJumpAnmSpeed; - /* 0x64 */ f32 mWeakJumpLimitSpeed; - /* 0x68 */ f32 mWeakJumpMinSpeed; - /* 0x6C */ f32 mWeakJumpSpeedRate; - /* 0x70 */ f32 mJumpMaxSpeed; - /* 0x74 */ f32 mWeakJumpMaxSpeed; - /* 0x78 */ f32 mHangLimitHeight; -}; // size = 0x7C - -class daAlinkHIO_wlAutoJump_c0 { -public: - static daAlinkHIO_wlAutoJump_c1 const m; -}; - -class daAlinkHIO_wlAutoJump_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlAutoJump_c(); - ~daAlinkHIO_wlAutoJump_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlAutoJump_c1 m; -#endif -}; - -class daAlinkHIO_wlPush_c1 { -public: - /* 0x00 */ f32 mIdleAnmSpeed; - /* 0x04 */ f32 mIdleInterp; - /* 0x08 */ f32 mPushAnmSpeed; - /* 0x0C */ f32 mPushInterp; - /* 0x10 */ f32 mHeavyPushAnmSpeed; -}; // Size: 0x14 - -class daAlinkHIO_wlPush_c0 { -public: - static daAlinkHIO_wlPush_c1 const m; -}; - -class daAlinkHIO_wlPush_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlPush_c(); - ~daAlinkHIO_wlPush_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlPush_c1 m; -#endif -}; - -class daAlinkHIO_wlLie_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mSittingAnm; - /* 0x14 */ daAlinkHIO_anm_c mProneStartAnm; - /* 0x28 */ s16 mProneTurnRate; - /* 0x2A */ s16 mProneTurnMax; - /* 0x2C */ s16 mProneTurnMin; - /* 0x30 */ f32 mStandUpInterp; - /* 0x34 */ f32 mProneMoveRate; - /* 0x38 */ f32 mProneMaxAnmSpeed; - /* 0x3C */ f32 mProneMinAnmSpeed; - /* 0x40 */ f32 mProneMoveInterp; - /* 0x44 */ f32 mSittingIdleAnmSpeed; - /* 0x48 */ f32 mSittingIdleInterp; -}; // Size: 0x4C - -class daAlinkHIO_wlLie_c0 { -public: - static daAlinkHIO_wlLie_c1 const m; -}; - -class daAlinkHIO_wlLie_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlLie_c(); - ~daAlinkHIO_wlLie_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlLie_c1 m; -#endif -}; - -class daAlinkHIO_wlWallHang_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mPreGrabJumpAnm; - /* 0x14 */ daAlinkHIO_anm_c mClimbAnm; - /* 0x28 */ daAlinkHIO_anm_c mFallGrabAnm; - /* 0x3C */ daAlinkHIO_anm_c mWallGrabAnm; - /* 0x50 */ daAlinkHIO_anm_c mLedgeClimbAnm; - /* 0x64 */ daAlinkHIO_anm_c mLedgeLandAnm; - /* 0x78 */ f32 mAutoWalkHeight; - /* 0x7C */ f32 mSmallJumpHeight; - /* 0x80 */ f32 mWallGrabHeight; - /* 0x84 */ f32 mClimbHeight; - /* 0x88 */ f32 mHangingFootHeight; - /* 0x8C */ f32 mJumpHorizontalSpeed; - /* 0x90 */ f32 mJumpTargetHeightOffset; - /* 0x94 */ f32 mJumpToFallInterp; - /* 0x98 */ f32 mHangingFallInterp; -}; // Size: 0x9C - -class daAlinkHIO_wlWallHang_c0 { -public: - static daAlinkHIO_wlWallHang_c1 const m; -}; - -class daAlinkHIO_wlWallHang_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlWallHang_c(); - ~daAlinkHIO_wlWallHang_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlWallHang_c1 m; -#endif -}; - -class daAlinkHIO_wlDamNormal_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mForwardAnm; - /* 0x14 */ daAlinkHIO_anm_c mBackwardAnm; - /* 0x28 */ daAlinkHIO_anm_c mLeftAnm; - /* 0x3C */ daAlinkHIO_anm_c mRightAnm; - /* 0x50 */ f32 mInitSpeed; - /* 0x54 */ f32 mAttackSpeedRate; - /* 0x58 */ f32 mDeceleration; - /* 0x5C */ f32 mIceDamageAnmSpeed; -}; // Size: 0x60 - -class daAlinkHIO_wlDamNormal_c0 { -public: - static daAlinkHIO_wlDamNormal_c1 const m; -}; - -class daAlinkHIO_wlDamNormal_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlDamNormal_c(); - ~daAlinkHIO_wlDamNormal_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlDamNormal_c1 m; -#endif -}; - -class daAlinkHIO_wlDamLaHu_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mFrontRiseAnm; - /* 0x14 */ daAlinkHIO_anm_c mBackRiseAnm; - /* 0x28 */ daAlinkHIO_anm_c mLeftRiseAnm; - /* 0x3C */ daAlinkHIO_anm_c mRightRiseAnm; - /* 0x50 */ s16 mBodyRotationSpeed; - /* 0x54 */ f32 mGravity; - /* 0x58 */ f32 mDamageInterp; - /* 0x5C */ f32 mHorizontalSpeed; - /* 0x60 */ f32 mVerticalSpeed; - /* 0x64 */ f32 mBounceSpeed; - /* 0x68 */ f32 mDeceleration; -}; // Size: 0x6C - -class daAlinkHIO_wlDamLarge_c0 { -public: - static daAlinkHIO_wlDamLaHu_c1 const m; -}; - -class daAlinkHIO_wlDamHuge_c0 { -public: - static daAlinkHIO_wlDamLaHu_c1 const m; -}; - -class daAlinkHIO_wlDamLaHu_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlDamLaHu_c(int); - ~daAlinkHIO_wlDamLaHu_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlDamLaHu_c1 m; -#endif -}; - -class daAlinkHIO_wlDamCaught_c1 { -public: - /* 0x00 */ s16 mCaughtTime; - /* 0x02 */ s16 mInputDecayTime; - /* 0x04 */ f32 mCaughtSpeed; - /* 0x08 */ f32 mWaitInterp; - /* 0x0C */ f32 mWaitAddAnmSpeed; -}; // Size: 0x10 - -class daAlinkHIO_wlDamCaught_c0 { -public: - static daAlinkHIO_wlDamCaught_c1 const m; -}; - -class daAlinkHIO_wlDamCaught_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlDamCaught_c(); - ~daAlinkHIO_wlDamCaught_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlDamCaught_c1 m; -#endif -}; - -class daAlinkHIO_wlDamFall_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mLandingAnm; - /* 0x14 */ daAlinkHIO_anm_c mRightRiseAnm; - /* 0x28 */ s16 mSmallStopTime; - /* 0x2A */ s16 mLargeStopTime; - /* 0x2C */ f32 mSmallDamageHeight; - /* 0x30 */ f32 mLargeDamageHeight; - /* 0x34 */ f32 mSmallDamageLandingStartFrame; - /* 0x38 */ f32 mAirAnmTransitionHeight; - /* 0x3C */ f32 mAirAnmInterp; -}; // Size: 0x40 - -class daAlinkHIO_wlDamFall_c0 { -public: - static daAlinkHIO_wlDamFall_c1 const m; -}; - -class daAlinkHIO_wlDamFall_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlDamFall_c(); - ~daAlinkHIO_wlDamFall_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlDamFall_c1 m; -#endif -}; - -class daAlinkHIO_wlDamage_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mRunningAnm; - /* 0x14 */ daAlinkHIO_anm_c mPolygonAnm; - /* 0x28 */ f32 mReturnWakeupAnmSpeed; -}; // Size: 0x2C - -class daAlinkHIO_wlDamage_c0 { -public: - static daAlinkHIO_wlDamage_c1 const m; - static daAlinkHIO_wlDamNormal_c0 const mNormal; - static daAlinkHIO_wlDamLarge_c0 const mLarge; - static daAlinkHIO_wlDamHuge_c0 const mHuge; - static daAlinkHIO_wlDamFall_c0 const mFall; - static daAlinkHIO_wlDamCaught_c0 const mCapture; -}; - -class daAlinkHIO_wlDamage_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlDamage_c(); - ~daAlinkHIO_wlDamage_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_wlDamage_c1 m; -#endif - /* 0x00 */ daAlinkHIO_wlDamNormal_c mNormal; - /* 0x00 */ daAlinkHIO_wlDamLaHu_c mLarge; - /* 0x00 */ daAlinkHIO_wlDamLaHu_c mHuge; - /* 0x00 */ daAlinkHIO_wlDamFall_c mFall; - /* 0x00 */ daAlinkHIO_wlDamCaught_c mCapture; -}; - -class daAlinkHIO_wlSlide_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mFrontSlideAnm; - /* 0x14 */ daAlinkHIO_anm_c mBackSlideAnm; - /* 0x28 */ daAlinkHIO_anm_c mLandingAnm; - /* 0x3c */ daAlinkHIO_anm_c mSlipDownRecoveryAnm; - /* 0x50 */ s16 mSlipDownRotationMax; - /* 0x52 */ s16 mSlipDownRotationMin; - /* 0x54 */ f32 mMaxSpeed; - /* 0x58 */ f32 mAcceleration; - /* 0x5c */ f32 mSlidingAngle; - /* 0x60 */ f32 mClimbingAngle; - /* 0x64 */ f32 mClimbingAnmSpeed; - /* 0x68 */ f32 mClimbingMaxSpeed; - /* 0x6c */ f32 mClimbingAnmSpeedWeak; - /* 0x70 */ f32 mClimbingMaxSpeedWeak; - /* 0x74 */ f32 mSlipDownAcceleration; - /* 0x78 */ f32 mSlipDownMaxSpeed; -}; // Size: 0x7C - -class daAlinkHIO_wlSlide_c0 { -public: - static daAlinkHIO_wlSlide_c1 const m; -}; - -class daAlinkHIO_wlSlide_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlSlide_c(); - ~daAlinkHIO_wlSlide_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlSlide_c1 m; -#endif -}; - -class daAlinkHIO_wlRope_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mFlipAnm; - /* 0x14 */ s16 mSwingAngle; - /* 0x16 */ s16 mMovementSwayTransitionTime; - /* 0x18 */ f32 mMovementMinAnmSpeed; - /* 0x1c */ f32 mMovementMaxAnmSpeed; - /* 0x20 */ f32 mMovementInterpolation; - /* 0x24 */ f32 mMovementRate; - /* 0x28 */ f32 mTwistClimbAnmSpeed; - /* 0x2c */ f32 mFallInterpolation; - /* 0x30 */ f32 mTwistClimbInterpolation; - /* 0x34 */ f32 mBackMovementMaxAnmSpeed; -}; // Size: 0x38 - -class daAlinkHIO_wlRope_c0 { -public: - static daAlinkHIO_wlRope_c1 const m; -}; - -class daAlinkHIO_wlRope_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlRope_c(); - ~daAlinkHIO_wlRope_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlRope_c1 m; -#endif -}; - -class daAlinkHIO_wlAtWait_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mAttackAnm; - /* 0x14 */ s16 mStopTime; - /* 0x16 */ s16 mComboMidStopTime; - /* 0x18 */ f32 mSpeed; - /* 0x1C */ f32 mSpeedAddForward; - /* 0x20 */ f32 mAttackJudgmentStartForward; - /* 0x24 */ f32 mAttackJudgmentEndForward; - /* 0x28 */ f32 mComboMidCF; - /* 0x2C */ f32 mComboMidStartF; - /* 0x30 */ f32 mAttackRadiusOffset; - /* 0x34 */ f32 mAttackRadius; - /* 0x38 */ f32 mAttackHeight; -}; // Size: 0x3C - -class daAlinkHIO_wlAtWaTl_c0 { -public: - static daAlinkHIO_wlAtWait_c1 const m; -}; - -class daAlinkHIO_wlAtWaSc_c0 { -public: - static daAlinkHIO_wlAtWait_c1 const m; -}; - -class daAlinkHIO_wlAtWaLr_c0 { -public: - static daAlinkHIO_wlAtWait_c1 const m; -}; - -class daAlinkHIO_wlAtWait_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlAtWait_c(int, float); - ~daAlinkHIO_wlAtWait_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: - /* 0x34 */ f32 field_0x34; - /* 0x38 */ daAlinkHIO_wlAtWait_c1 m; -}; // Size: 0x74 - -class daAlinkHIO_wlAtRoll_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mAttackAnm; - /* 0x14 */ f32 mAttackRadius; - /* 0x18 */ f32 mAttackSpeed; - /* 0x1c */ f32 mSpiderThreadEscapeStartF; -}; // Size: 0x20 - -class daAlinkHIO_wlAtRoll_c0 { -public: - static daAlinkHIO_wlAtRoll_c1 const m; -}; - -class daAlinkHIO_wlAtRoll_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlAtRoll_c(); - ~daAlinkHIO_wlAtRoll_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_wlAtRoll_c1 m; -#endif -}; // Size: 0x54 - -class daAlinkHIO_wlAtNjump_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mAerialAttackAnm; - /* 0x14 */ f32 mAttackInitSpeed; - /* 0x18 */ f32 mMaxHorizontalSpeed; - /* 0x1c */ f32 mMaxVerticalSpeed; - /* 0x20 */ f32 mMinVerticalSpeed; - /* 0x24 */ f32 mAerialAnmSpeed; - /* 0x28 */ f32 mAerialInterpolation; - /* 0x2c */ f32 mAttackRadiusOffset; - /* 0x30 */ f32 mAttackRadius; - /* 0x34 */ f32 mAttackHeight; - /* 0x38 */ f32 mMinHorizontalSpeed; -}; // Size: 0x3C - -class daAlinkHIO_wlAtNjump_c0 { -public: - static daAlinkHIO_wlAtNjump_c1 const m; -}; - -class daAlinkHIO_wlAtNjump_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlAtNjump_c(); - ~daAlinkHIO_wlAtNjump_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_wlAtNjump_c1 m; -#endif -}; // Size: 0x70 - -class daAlinkHIO_wlAtCjump_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mAerialAttackAnm; - /* 0x14 */ daAlinkHIO_anm_c mFlipKickAnm; - /* 0x28 */ f32 mAttackInitSpeed; - /* 0x2c */ f32 mMaxHorizontalSpeed; - /* 0x30 */ f32 mMaxVerticalSpeed; - /* 0x34 */ f32 mMinVerticalSpeed; - /* 0x38 */ f32 mAerialAnmSpeed; - /* 0x3c */ f32 mAerialInterpolation; - /* 0x40 */ f32 mFlipKickPostStartF; - /* 0x44 */ f32 mFlipKickPostAnmSpeed; - /* 0x48 */ f32 mAttackRadiusOffset; - /* 0x4c */ f32 mAttackRadius; - /* 0x50 */ f32 mAttackHeight; - /* 0x54 */ f32 mMinHorizontalSpeed; - /* 0x58 */ f32 mHitDecelRate; - /* 0x5c */ f32 mHitMinSpeed; - /* 0x60 */ f32 mHitDecel; -}; // Size: 0x64 - -class daAlinkHIO_wlAtCjump_c0 { -public: - static daAlinkHIO_wlAtCjump_c1 const m; -}; - -class daAlinkHIO_wlAtCjump_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlAtCjump_c(); - ~daAlinkHIO_wlAtCjump_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_wlAtCjump_c1 m; -#endif -}; // Size: 0x98 - -class daAlinkHIO_wlAtLand_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mNormalLandingAnm; - /* 0x14 */ daAlinkHIO_anm_c mFrontSlideAnm; - /* 0x28 */ daAlinkHIO_anm_c mBackSlideAnm; - /* 0x3C */ f32 mSlideDeceleration; -}; // Size: 0x40 - -class daAlinkHIO_wlAtLand_c0 { -public: - static daAlinkHIO_wlAtLand_c1 const m; -}; - -class daAlinkHIO_wlAtLand_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlAtLand_c(); - ~daAlinkHIO_wlAtLand_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_wlAtLand_c1 m; -#endif -}; // Size: 0x74 - -class daAlinkHIO_wlAtDown_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mLowStanceAnm; - /* 0x14 */ daAlinkHIO_anm_c mPushDownAnm; - /* 0x28 */ daAlinkHIO_anm_c mFrontRollAnm; - /* 0x3C */ daAlinkHIO_anm_c mCrouchAnm; - /* 0x50 */ daAlinkHIO_anm_c mBackRollAnm; - /* 0x64 */ daAlinkHIO_anm_c mRollOverAnm; - /* 0x78 */ daAlinkHIO_anm_c mProneGetUpAnm; - /* 0x8C */ s16 field_0x8C; - /* 0x8E */ s16 mFallDuration; - /* 0x90 */ f32 mSideRollMovementWidth; - /* 0x94 */ f32 mLandingSideRollMovementWidth; - /* 0x98 */ f32 mLandingFrontBackMovementWidth; -}; // Size: 0x9C - -class daAlinkHIO_wlAtDown_c0 { -public: - static daAlinkHIO_wlAtDown_c1 const m; -}; - -class daAlinkHIO_wlAtDown_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlAtDown_c(); - ~daAlinkHIO_wlAtDown_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_wlAtDown_c1 m; -#endif -}; // Size: 0xD0 - -class daAlinkHIO_wlAtLock_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mFrontLandingAnm; - /* 0x14 */ daAlinkHIO_anm_c mRearLandingAnm; - /* 0x28 */ s16 mAutoActivationTime; - /* 0x2C */ f32 mStartRadius; - /* 0x30 */ f32 mMaxRadius; - /* 0x34 */ f32 mRadiusAcceleration; - /* 0x38 */ f32 mAttackSpeed; - /* 0x3C */ f32 mAttackRadiusOffset; - /* 0x40 */ f32 mAttackRadius; - /* 0x44 */ f32 mAttackHeight; - /* 0x48 */ f32 mGravity; - /* 0x4C */ f32 mMaxJumpHeight; - /* 0x50 */ f32 mMaxJumpDistance; -}; // Size: 0x54 - -class daAlinkHIO_wlAtLock_c0 { -public: - static daAlinkHIO_wlAtLock_c1 const m; -}; - -class daAlinkHIO_wlAtLock_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlAtLock_c(); - ~daAlinkHIO_wlAtLock_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_wlAtLock_c1 m; -#endif -}; // Size: 0x88 - -class daAlinkHIO_wlAtBite_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mBitePreparationAnm; - /* 0x14 */ daAlinkHIO_anm_c mHangingBitePreparationAnm; - /* 0x28 */ s16 mBiteAttachTime; - /* 0x2A */ s16 field_0x2A; - /* 0x2C */ f32 mEnemyBiteThrowAnmSpeed; - /* 0x30 */ f32 mEnemyBiteThrowInterpolation; - /* 0x34 */ f32 mEnemyBiteThrowCF; - /* 0x38 */ f32 mBitePreparationMidStartF; - /* 0x3C */ f32 mBiteMidAnmSpeedMin; - /* 0x40 */ f32 mHangingBiteMidAnmSpeedMin; - /* 0x44 */ f32 mBiteMidAnmSpeedMax; - /* 0x48 */ f32 mHangingBiteMidAnmSpeedMax; - /* 0x4C */ f32 mBiteMidAnmSpeedAcceleration; - /* 0x50 */ f32 mHangingBiteMidAnmSpeedAcceleration; - /* 0x54 */ f32 mBiteMidAnmSpeedDeceleration; - /* 0x58 */ f32 mHangingBiteMidAnmSpeedDeceleration; -}; // Size: 0x5C - -class daAlinkHIO_wlAtBite_c0 { -public: - static daAlinkHIO_wlAtBite_c1 const m; -}; - -class daAlinkHIO_wlAtBite_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlAtBite_c(); - ~daAlinkHIO_wlAtBite_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_wlAtBite_c1 m; -#endif -}; // Size: 0x90 - -class daAlinkHIO_wlAttack_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mJumpBackLandAnm; - /* 0x14 */ s16 mChargeTime; - /* 0x16 */ s16 mComboDuration; - /* 0x18 */ f32 mFallHeight; - /* 0x1C */ f32 mFallInterpolation; - /* 0x20 */ f32 mReadyInterpolation; - /* 0x24 */ f32 mAttackRange; - /* 0x28 */ f32 mJumpBackSpeedH; - /* 0x2C */ f32 mJumpBackSpeedV; - /* 0x30 */ f32 mJumpAttackSpeedV; - /* 0x34 */ f32 mJumpAttackSpeedH; -}; // Size: 0x38 - -class daAlinkHIO_wlAttack_c0 { -public: - static daAlinkHIO_wlAtWaLr_c0 const mHorizontalAttack; - static daAlinkHIO_wlAtWaSc_c0 const mScratchAttack; - static daAlinkHIO_wlAtWaTl_c0 const mTailAttack; - static daAlinkHIO_wlAtRoll_c0 const mAtRoll; - static daAlinkHIO_wlAtNjump_c0 const mWlAtNjump; - static daAlinkHIO_wlAtCjump_c0 const mWlAtCjump; - static daAlinkHIO_wlAtLand_c0 const mWlAtLand; - static daAlinkHIO_wlAtDown_c0 const mWlAtDown; - static daAlinkHIO_wlAtLock_c0 const mWlAtLock; - static daAlinkHIO_wlAtBite_c0 const mWlAtBite; - static daAlinkHIO_wlAttack_c1 const m; -}; - -class daAlinkHIO_wlAttack_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlAttack_c(); - ~daAlinkHIO_wlAttack_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: - /* 0x034 */ daAlinkHIO_wlAtWait_c mHorizontalAttack; - /* 0x0A8 */ daAlinkHIO_wlAtWait_c mScratchAttack; - /* 0x11C */ daAlinkHIO_wlAtWait_c mTailAttack; - /* 0x190 */ daAlinkHIO_wlAtRoll_c mAtRoll; - /* 0x1E4 */ daAlinkHIO_wlAtNjump_c mWlAtNjump; - /* 0x254 */ daAlinkHIO_wlAtCjump_c mWlAtCjump; - /* 0x2EC */ daAlinkHIO_wlAtLand_c mWlAtLand; - /* 0x360 */ daAlinkHIO_wlAtDown_c mWlAtDown; - /* 0x430 */ daAlinkHIO_wlAtLock_c mWlAtLock; - /* 0x4B8 */ daAlinkHIO_wlAtBite_c mWlAtBite; - /* 0x548 */ daAlinkHIO_wlAttack_c1 m; -}; - -class daAlinkHIO_wlPoint_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mForwardJumpAnm; - /* 0x14 */ daAlinkHIO_anm_c mBackwardJumpAnm; - /* 0x28 */ daAlinkHIO_anm_c mLandingAnm; - /* 0x3C */ daAlinkHIO_anm_c mTagLandingAnm; - /* 0x50 */ s16 mLockJumpStopTime; - /* 0x54 */ f32 mIdleAnmSpeed; - /* 0x58 */ f32 mIdleInterpolation; - /* 0x5C */ f32 mAerialInterpolation; - /* 0x60 */ f32 mJumpSpeed; - /* 0x64 */ f32 mFailureJumpSpeed; - /* 0x68 */ f32 mTagJumpSpeed; - /* 0x6C */ f32 mLockLandingIceInitSpeed; - /* 0x70 */ f32 mLockLandingIceDecelRate; - /* 0x74 */ f32 mLockLandingIceMaxDecel; - /* 0x78 */ f32 mLockLandingIceMinDecel; -}; // Size: 0x7C - -class daAlinkHIO_wlPoint_c0 { -public: - static daAlinkHIO_wlPoint_c1 const m; -}; - -class daAlinkHIO_wlPoint_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlPoint_c(); - ~daAlinkHIO_wlPoint_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlPoint_c1 m; -#endif -}; - -class daAlinkHIO_wlChain_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mLoweringStartAnm; - /* 0x14 */ daAlinkHIO_anm_c mDigAnm; - /* 0x28 */ daAlinkHIO_anm_c mDigFallAnm; - /* 0x3C */ s16 mTensionWaitTime; - /* 0x3E */ s16 mReleaseWaitTime; - /* 0x40 */ f32 mWaitAnmSpeed; - /* 0x44 */ f32 mWaitInterp; - /* 0x48 */ f32 mSwingAnmSpeed; - /* 0x4C */ f32 mSwingInterp; - /* 0x50 */ f32 mFallSpeed; - /* 0x54 */ f32 mSniffAnmSpeed; - /* 0x58 */ f32 mSniffInterp; -}; // Size: 0x5C - -class daAlinkHIO_wlChain_c0 { -public: - static daAlinkHIO_wlChain_c1 const m; -}; - -class daAlinkHIO_wlChain_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlChain_c(); - ~daAlinkHIO_wlChain_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlChain_c1 m; -#endif -}; - -class daAlinkHIO_wlSwim_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mSurfacingAnm; - /* 0x14 */ daAlinkHIO_anm_c mWaterSplashIdleAnm; - /* 0x28 */ daAlinkHIO_anm_c mDashAnm; - /* 0x3C */ s16 mTurnRate; - /* 0x3E */ s16 mTurnMin; - /* 0x40 */ s16 mTurnMax; - /* 0x42 */ s16 mIdleTurnRate; - /* 0x44 */ s16 mIdleTurnMin; - /* 0x46 */ s16 mIdleTurnMax; - /* 0x48 */ f32 mStartHeight; - /* 0x4C */ f32 mSurfacingHeight; - /* 0x50 */ f32 mMaxSpeed; - /* 0x54 */ f32 mDeceleration; - /* 0x58 */ f32 mMaxFallSpeed; - /* 0x5C */ f32 mMaxSurfacingSpeed; - /* 0x60 */ f32 mBuoyancy; - /* 0x64 */ f32 mIdleAnmSpeed; - /* 0x68 */ f32 mIdleInterp; - /* 0x6C */ f32 mIdleUpDownSwayAmount; - /* 0x70 */ f32 mMoveMinAnmSpeed; - /* 0x74 */ f32 mMoveMaxAnmSpeed; - /* 0x78 */ f32 mMoveInterp; - /* 0x7C */ f32 mClimbHeight; - /* 0x80 */ f32 mMaxSpeedWeak; - /* 0x84 */ f32 mDecelerationWeak; - /* 0x88 */ f32 mIdleAnmSpeedWeak; - /* 0x8C */ f32 mMoveMinAnmSpeedWeak; - /* 0x90 */ f32 mMoveMaxAnmSpeedWeak; - /* 0x94 */ f32 mClimbBelowWaterSurface; - /* 0x98 */ f32 mHeavyIdleUpDownSwayAmount; - /* 0x9C */ f32 mHeavyBuoyancy; - /* 0xA0 */ f32 mHeavyMaxFallSpeed; - /* 0xA4 */ f32 mHeavyMaxSurfacingSpeed; -}; // Size: 0xA8 - -class daAlinkHIO_wlSwim_c0 { -public: - static daAlinkHIO_wlSwim_c1 const m; -}; - -class daAlinkHIO_wlSwim_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlSwim_c(); - ~daAlinkHIO_wlSwim_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlSwim_c1 m; -#endif -}; - -class daAlinkHIO_wlGrab_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mPotGrabAnm; - /* 0x14 */ daAlinkHIO_anm_c mPotReleaseAnm; - /* 0x28 */ daAlinkHIO_anm_c mBoneGrabAnm; - /* 0x3C */ daAlinkHIO_anm_c mBoneReleaseAnm; - /* 0x50 */ daAlinkHIO_anm_c mThrowAnm; -}; // Size: 0x64 - -class daAlinkHIO_wlGrab_c0 { -public: - static daAlinkHIO_wlGrab_c1 const m; -}; - -class daAlinkHIO_wlGrab_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlGrab_c(); - ~daAlinkHIO_wlGrab_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlGrab_c1 m; -#endif -}; - -class daAlinkHIO_wlBall_c1 { -public: - /* 0x00 */ daAlinkHIO_anm_c mFullBodyAnm; - /* 0x14 */ daAlinkHIO_anm_c mNeckAnm; - /* 0x28 */ s16 mMpConsumptionTime; - /* 0x2C */ f32 mLifeOrbGravity; - /* 0x30 */ f32 mLifeOrbHorizSpeed; - /* 0x34 */ f32 mLifeOrbVertSpeed; -}; // Size: 0x38 - -class daAlinkHIO_wlBall_c0 { -public: - static daAlinkHIO_wlBall_c1 const m; -}; - -class daAlinkHIO_wlBall_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wlBall_c(); - ~daAlinkHIO_wlBall_c(); - - virtual void genMessage(JORMContext*); -#endif - -public: -#if DEBUG - /* 0x00 */ daAlinkHIO_wlBall_c1 m; -#endif -}; - -class daAlinkHIO_wolf_c1 { -public: - /* 0x00 */ s16 mMaxNeckTurnH; - /* 0x02 */ s16 mMaxNeckTurnUp; - /* 0x04 */ s16 mMaxNeckTurnDown; - /* 0x06 */ s16 mMaxTiredNeckTurnH; - /* 0x08 */ s16 mMaxTiredNeckTurnUp; - /* 0x0A */ s16 mMaxTiredNeckTurnDown; - /* 0x0C */ s16 mSensesLingerTime; // ? - /* 0x0E */ s16 mLightDropR; - /* 0x10 */ s16 mLightDropG; - /* 0x12 */ s16 mLightDropB; - /* 0x14 */ f32 mUnderwaterInputRate; -}; // Size: 0x18 - -class daAlinkHIO_wolf_c0 { -public: - static daAlinkHIO_wlMove_c0 const mWlMove; - static daAlinkHIO_wlMoveNoP_c0 const mWlMoveNoP; - static daAlinkHIO_wlAtnMove_c0 const mWlAtnMove; - static daAlinkHIO_wlSideStep_c0 const mWlSideStep; - static daAlinkHIO_wlBackJump_c0 const mWlBackJump; - static daAlinkHIO_wlHowl_c0 const mWlHowl; - static daAlinkHIO_wlAutoJump_c0 const mWlAutoJump; - static daAlinkHIO_wlPush_c0 const mWlPush; - static daAlinkHIO_wlLie_c0 const mWlLie; - static daAlinkHIO_wlLight_c0 const mLight; - static daAlinkHIO_wlWallHang_c0 const mWlWallHang; - static daAlinkHIO_wlDamage_c0 const mWlDamage; - static daAlinkHIO_wlSlide_c0 const mWlSlide; - static daAlinkHIO_wlRope_c0 const mWlRope; - static daAlinkHIO_wlAttack_c0 const mWlAttack; - static daAlinkHIO_wlPoint_c0 const mWlPoint; - static daAlinkHIO_wlChain_c0 const mWlChain; - static daAlinkHIO_wlSwim_c0 const mWlSwim; - static daAlinkHIO_wlGrab_c0 const mWlGrab; - static daAlinkHIO_wlBall_c0 const mWlBall; - static daAlinkHIO_wolf_c1 const m; -}; - -class daAlinkHIO_wolf_c : public daAlinkHIO_data_c { -public: -#if DEBUG - daAlinkHIO_wolf_c(); - ~daAlinkHIO_wolf_c(); - - virtual void genMessage(JORMContext*); -#else - ~daAlinkHIO_wolf_c(); -#endif - -public: -#if DEBUG - /* 0x34 */ daAlinkHIO_wlMove_c mWlMove; - /* 0x00 */ daAlinkHIO_wlMoveNoP_c mWlMoveNoP; - /* 0x00 */ daAlinkHIO_wlAtnMove_c mWlAtnMove; - /* 0x00 */ daAlinkHIO_wlSideStep_c mWlSideStep; - /* 0x00 */ daAlinkHIO_wlBackJump_c mWlBackJump; - /* 0x00 */ daAlinkHIO_wlHowl_c mWlHowl; - /* 0x00 */ daAlinkHIO_wlAutoJump_c mWlAutoJump; - /* 0x00 */ daAlinkHIO_wlPush_c mWlPush; - /* 0x00 */ daAlinkHIO_wlLie_c mWlLie; - /* 0x00 */ daAlinkHIO_light_c mLight; - /* 0x00 */ daAlinkHIO_wlWallHang_c mWlWallHang; - /* 0x00 */ daAlinkHIO_wlDamage_c mWlDamage; - /* 0x00 */ daAlinkHIO_wlSlide_c mWlSlide; - /* 0x00 */ daAlinkHIO_wlRope_c mWlRope; - /* 0x00 */ daAlinkHIO_wlAttack_c mWlAttack; - /* 0x00 */ daAlinkHIO_wlPoint_c mWlPoint; - /* 0x00 */ daAlinkHIO_wlChain_c mWlChain; - /* 0x00 */ daAlinkHIO_wlSwim_c mWlSwim; - /* 0x00 */ daAlinkHIO_wlGrab_c mWlGrab; - /* 0x00 */ daAlinkHIO_wlBall_c mWlBall; - /* 0x00 */ daAlinkHIO_wolf_c1 m; -#endif -}; - -class daAlinkHIO_c -#if DEBUG - : public mDoHIO_entry_c -#endif -{ -public: - daAlinkHIO_c(); - virtual ~daAlinkHIO_c(); - - void jumpStateUpdate(const cXyz*, const cXyz*, f32); - void genMessage(JORMContext*); -#if DEBUG - void readFileData(char*); - size_t makeFileOutData(char*, char*); - void listenPropertyEvent(const JORPropertyEvent*); - - enum PropertyID_e { - PROPERTY_POS_DISP_e = 0x4000002, - PROPERTY_RESET_e = 0x4000003, - PROPERTY_SAVE_FILE_e = 0x4000004, - PROPERTY_LOAD_FILE_e = 0x4000005, - PROPERTY_JUMP_HDIST_DISP_e = 0x4000006, - PROPERTY_JUMP_VDIST_DISP_e = 0x4000007, - }; - - /* 0x0008 */ daAlinkHIO_basic_c mBasic; - /* 0x0094 */ daAlinkHIO_move_c mMove; - /* 0x0120 */ daAlinkHIO_atnMove_c mAtnMove; - /* 0x01A8 */ daAlinkHIO_noActAtnMove_c mNoActAtnMove; - /* 0x0230 */ daAlinkHIO_frontRoll_c mFrontRoll; - /* 0x02D4 */ daAlinkHIO_backJump_c mBackJump; - /* 0x0340 */ daAlinkHIO_sideStep_c mSideStep; - /* 0x03DC */ daAlinkHIO_slide_c mSlide; - /* 0x0488 */ daAlinkHIO_cut_c mCut; - /* 0x0FFC */ daAlinkHIO_guard_c mGuard; - /* 0x11C8 */ daAlinkHIO_crouch_c mCrouch; - /* 0x1248 */ daAlinkHIO_autoJump_c mAutoJump; - /* 0x1330 */ daAlinkHIO_wallHang_c mWallHang; - /* 0x1528 */ daAlinkHIO_pushpull_c mPushpull; - /* 0x1598 */ daAlinkHIO_damage_c mDamage; - /* 0x1A90 */ daAlinkHIO_horse_c mHorse; - /* 0x1B30 */ daAlinkHIO_canoe_c mCanoe; - /* 0x1BAC */ daAlinkHIO_item_c mItem; - /* 0x2420 */ daAlinkHIO_ladder_c mLadder; - /* 0x24C4 */ daAlinkHIO_roofHang_c mRoofHang; - /* 0x2544 */ daAlinkHIO_grab_c mGrab; - /* 0x265C */ daAlinkHIO_swim_c mSwim; - /* 0x278C */ daAlinkHIO_wolf_c mWolf; -#else - // TODO: What's with these first few members on retail? - // The individual HIO members (e.g. mCut) have their class changed on retail compared to debug (_c -> _c0). - // But it seems like the debug _c members might also exist on retail based on the dtor. - // But they can't have the same name as they do on debug since those names are reserved for the _c0 version. - /* 0x04 */ u8 field_0x4[0xC - 0x4]; - /* 0x0C */ daAlinkHIO_cut_c mCut_2; - /* 0x0D */ u8 field_0xD[0x4B - 0xD]; - /* 0x4B */ daAlinkHIO_wolf_c mWolf_2; - - daAlinkHIO_basic_c0 mBasic; - daAlinkHIO_move_c0 mMove; - daAlinkHIO_atnMove_c0 mAtnMove; - daAlinkHIO_noActAtnMove_c0 mNoActAtnMove; - daAlinkHIO_frontRoll_c0 mFrontRoll; - daAlinkHIO_backJump_c0 mBackJump; - daAlinkHIO_sideStep_c0 mSideStep; - daAlinkHIO_slide_c0 mSlide; - daAlinkHIO_cut_c0 mCut; - daAlinkHIO_guard_c0 mGuard; - daAlinkHIO_crouch_c0 mCrouch; - daAlinkHIO_autoJump_c0 mAutoJump; - daAlinkHIO_wallHang_c0 mWallHang; - daAlinkHIO_pushpull_c0 mPushpull; - daAlinkHIO_damage_c0 mDamage; - daAlinkHIO_horse_c0 mHorse; - daAlinkHIO_canoe_c0 mCanoe; - daAlinkHIO_item_c0 mItem; - daAlinkHIO_ladder_c0 mLadder; - daAlinkHIO_roofHang_c0 mRoofHang; - daAlinkHIO_grab_c0 mGrab; - daAlinkHIO_swim_c0 mSwim; - daAlinkHIO_wolf_c0 mWolf; - - u8 padding[0x6C - 0x64]; -#endif -}; - -class daAlink_c; -typedef int (daAlink_c::*daAlink_procFunc)(); -typedef void (daAlink_c::*EffParamProc)(); - -struct daAlink_procInitTable { - /* 0x0 */ daAlink_procFunc m_procFunc; - /* 0xC */ u32 m_mode; -}; // Size: 0x10 - -class daAlink_c : public daPy_py_c { +class daAlink_c : public daPy_py_c { public: enum daAlink_ANM { /* 0x000 */ ANM_ATN_RETURN_FROM_WALK, @@ -5236,7 +1397,7 @@ class daAlink_c : public daPy_py_c { EFFPROC_SUMOU, EFFPROC_NONE, }; - + enum daAlink_RIDETYPE { RIDETYPE_HORSE = 1, RIDETYPE_BOAR, @@ -6560,7 +2721,7 @@ class daAlink_c : public daPy_py_c { int setTalkStartBack(cXyz*); void setShapeAngleToTalkActor(); void setTalkAnime(); - u8 setTradeItemAnime(); + bool setTradeItemAnime(); void setTradeItemOutHand(); BOOL checkEndMessage(u32 i_msgIdx); u8 setDemoRightHandIndex(u16); @@ -7004,7 +3165,7 @@ class daAlink_c : public daPy_py_c { return NULL; } } - + virtual s16 getSumouCounter() const { return mProcVar2.field_0x300c; } virtual s16 checkSumouWithstand() const { return mProcVar3.field_0x300e; } virtual void setMidnaMsgNum(fopAc_ac_c* i_msgTag, u16 i_msgNum) { @@ -7759,9 +3920,9 @@ class daAlink_c : public daPy_py_c { static Vec const m_handLeftInSidePos; static Vec const m_handRightInSidePos; - static daAlink_procInitTable m_procInitTable[]; + static const daAlink_procInitTable m_procInitTable[]; static daAlink_procFunc m_demoInitTable[]; - static EffParamProc m_fEffParamProc[]; + static const EffParamProc m_fEffParamProc[]; /* 0x0062C */ request_of_phase_process_class mPhaseReq; /* 0x00634 */ const char* mArcName; @@ -8388,6 +4549,3847 @@ class daAlink_c : public daPy_py_c { /* 0x03850 */ daAlink_procFunc mpProcFunc; }; // Size: 0x385C +class daAlinkHIO_data_c : public JORReflexible { +public: +#if DEBUG + daAlinkHIO_data_c(); + virtual ~daAlinkHIO_data_c(); + + void setStructData(char*); + void checkDataSize(); + void baseCopy(); + void update(); + +#if DEBUG + virtual void listenPropertyEvent(const JORPropertyEvent* event); +#endif +#endif + +public: +#if DEBUG + /* 0x04 */ int m_anm_num; + /* 0x08 */ int m_u8_num; + /* 0x0C */ int m_s16_num; + /* 0x10 */ int m_f32_num; + /* 0x14 */ int f14; + /* 0x18 */ int f18; + /* 0x1C */ int f1c; + /* 0x20 */ u32 m_len; + /* 0x24 */ void* mp_src_data; + /* 0x28 */ void* mp_data; + /* 0x2C */ const char* m_name_string; + /* 0x30 */ daAlinkHIO_data_c* mpNext; +#endif +}; + +struct daAlinkHIO_basic_c1 { + /* 0x00 */ bool mOneHitKill; + /* 0x02 */ s16 mHeadMaxTurnHorizontal; + /* 0x04 */ s16 mHeadMaxTurnUp; + /* 0x06 */ s16 mHeadMaxTurnDown; + /* 0x08 */ s16 field_0x08; + /* 0x0A */ s16 mHotspringRecoverTime; + /* 0x0C */ s16 mWiiCamSpeedV; + /* 0x0E */ s16 mWiiCamSpeedH; + /* 0x10 */ s16 mTransformBlockFarAngle; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 mBasicInterpolation; + /* 0x1C */ f32 mRotationASpeed; + /* 0x20 */ f32 mStandingGuardInterpolation; + /* 0x24 */ f32 mWaterSurfaceEffectHeight; + /* 0x28 */ f32 mWolfWaterSurfaceEffectHeight; + /* 0x2C */ f32 mMaxWindInfluenceDist; + /* 0x30 */ f32 mNoWindInfluenceDist; + /* 0x34 */ f32 mMaxWindSpeed; + /* 0x38 */ f32 mLavaDeathDepth; + /* 0x3C */ f32 mLinkToWolfCancelFrame; + /* 0x40 */ f32 mWolfToLinkCancelFrame; + /* 0x44 */ f32 mIndoorSpeedFactor; + /* 0x48 */ f32 mSandSinkSpeed; + /* 0x4C */ f32 mSandSurfaceSpeed; + /* 0x50 */ f32 mTransformBlockNearDis; + /* 0x54 */ f32 mTransformBlockFarDis; +}; + +class daAlinkHIO_basic_c0 { +public: + static daAlinkHIO_basic_c1 const m; +}; + +class daAlinkHIO_basic_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_basic_c(); + ~daAlinkHIO_basic_c() {} + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_basic_c1 m; +#endif +}; + +struct daAlinkHIO_anm_c { + /* 0x00 */ s16 mEndFrame; + /* 0x04 */ f32 mSpeed; + /* 0x08 */ f32 mStartFrame; + /* 0x0C */ f32 mInterpolation; + /* 0x10 */ f32 mCancelFrame; +}; // size: 0x14 + +class daAlinkHIO_move_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mSlideAnm; + /* 0x14 */ s16 mMaxTurnAngle; + /* 0x16 */ s16 mMinTurnAngle; + /* 0x18 */ s16 mTurnAngleRate; + /* 0x1C */ f32 mWaitAnmSpeed; + /* 0x20 */ f32 mWalkAnmSpeed; + /* 0x24 */ f32 mRunAnmSpeed; + /* 0x28 */ f32 mWalkChangeRate; + /* 0x2C */ f32 mRunChangeRate; + /* 0x30 */ f32 mMaxSpeed; + /* 0x34 */ f32 mAcceleration; + /* 0x38 */ f32 mDeceleration; + /* 0x3C */ f32 mSlideThresholdSpeed; // speed needed to trigger a slide + /* 0x40 */ f32 mSlideSpeed; + /* 0x44 */ f32 mSlideDeceleration; + /* 0x48 */ f32 mFootPositionRatio; + /* 0x4C */ f32 mWaitBInterpolation; + /* 0x50 */ f32 mMinWalkRate; + /* 0x54 */ f32 mMinTiredWalkRate; +}; // Size: 0x58 + +class daAlinkHIO_move_c0 { +public: + static daAlinkHIO_move_c1 const m; +}; + +class daAlinkHIO_move_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_move_c(); + ~daAlinkHIO_move_c() {} + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_move_c1 m; +#endif +}; + +class daAlinkHIO_atnMove_c1 { +public: + /* 0x00 */ s16 mMaxTurnAngle; + /* 0x02 */ s16 mMinTurnAngle; + /* 0x04 */ s16 mTurnAngleRate; + /* 0x08 */ f32 mWaitAnmSpeed; + /* 0x0C */ f32 mWalkAnmSpeed; + /* 0x10 */ f32 mRunAnmSpeed; + /* 0x14 */ f32 mWalkChangeRate; + /* 0x18 */ f32 mRunChangeRate; + /* 0x1C */ f32 mMaxSpeed; + /* 0x20 */ f32 mAcceleration; + /* 0x24 */ f32 mDeceleration; + /* 0x28 */ f32 mBackWalkAnmSpeed; + /* 0x2C */ f32 mBackRunAnmSpeed; + /* 0x30 */ f32 mBackWalkChangeRate; + /* 0x34 */ f32 mBackRunChangeRate; + /* 0x38 */ f32 mMaxBackwardsSpeed; + /* 0x3C */ f32 mBackAcceleration; + /* 0x40 */ f32 mBackDeceleration; + /* 0x44 */ f32 mMinWalkFrame; + /* 0x48 */ f32 mMinBackWalkFrame; + /* 0x4C */ f32 mWalkForwardAnmSpeed; + /* 0x50 */ f32 mRunForwardAnmSpeed; +}; // Size: 0x54 + +class daAlinkHIO_atnMove_c0 { +public: + static daAlinkHIO_atnMove_c1 const m; +}; + +class daAlinkHIO_atnMove_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_atnMove_c(); + ~daAlinkHIO_atnMove_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_atnMove_c1 m; +#endif +}; + +class daAlinkHIO_noActAtnMove_c1 { +public: + /* 0x00 */ s16 mMaxTurnAngle; + /* 0x02 */ s16 mMinTurnAngle; + /* 0x04 */ s16 mTurnAngleRate; + /* 0x08 */ f32 mWaitAnmSpeed; + /* 0x0C */ f32 mWalkAnmSpeed; + /* 0x10 */ f32 mRunAnmSpeed; + /* 0x14 */ f32 mWalkChangeRate; + /* 0x18 */ f32 mRunChangeRate; + /* 0x1C */ f32 mMaxSpeed; + /* 0x20 */ f32 mAcceleration; + /* 0x24 */ f32 mDeceleration; + /* 0x28 */ f32 mBackWalkAnmSpeed; + /* 0x2C */ f32 mBackRunAnmSpeed; + /* 0x30 */ f32 mBackWalkChangeRate; + /* 0x34 */ f32 mBackRunChangeRate; + /* 0x38 */ f32 mMaxBackwardsSpeed; + /* 0x3C */ f32 mBackAcceleration; + /* 0x40 */ f32 mBackDeceleration; + /* 0x44 */ f32 mMinWalkFrame; + /* 0x48 */ f32 mMinBackWalkFrame; + /* 0x4C */ f32 mWalkForwardAnmSpeed; + /* 0x50 */ f32 mRunForwardAnmSpeed; +}; // Size: 0x54 + +class daAlinkHIO_noActAtnMove_c0 { +public: + static daAlinkHIO_noActAtnMove_c1 const m; +}; + +class daAlinkHIO_noActAtnMove_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_noActAtnMove_c(); + ~daAlinkHIO_noActAtnMove_c() {} + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_noActAtnMove_c1 m; +#endif +}; + +class daAlinkHIO_frontRoll_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mRollAnm; + /* 0x14 */ daAlinkHIO_anm_c mCrashAnm; + /* 0x28 */ daAlinkHIO_anm_c mCrashHitAnm; // ? + /* 0x3C */ s16 mCrashAngleThreshold; + /* 0x3E */ s16 mTurnRate; + /* 0x40 */ s16 mMaxTurnAngle; + /* 0x42 */ s16 mTurnMinAngle; + /* 0x44 */ f32 mInitSpeed; + /* 0x48 */ f32 mSpeedRate; + /* 0x4C */ f32 mMinSpeed; + /* 0x50 */ f32 mCrashSpeedThreshold; + /* 0x54 */ f32 mCrashInitF; + /* 0x58 */ f32 mCrashEndF; + /* 0x5C */ f32 mCrashSpeedH; + /* 0x60 */ f32 mCrashSpeedV; + /* 0x64 */ f32 mBootsAttackInitF; + /* 0x68 */ f32 mBootsAttackEndF; + /* 0x6C */ f32 mBootsAttackRadius; +}; // Size: 0x70 + +class daAlinkHIO_frontRoll_c0 { +public: + static daAlinkHIO_frontRoll_c1 const m; +}; + +class daAlinkHIO_frontRoll_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_frontRoll_c(); + ~daAlinkHIO_frontRoll_c() {} + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_frontRoll_c1 m; +#endif +}; + +class daAlinkHIO_backJump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mBackflipAnm; + /* 0x14 */ daAlinkHIO_anm_c mLandAnm; + /* 0x28 */ f32 mBackflipSpeedH; + /* 0x2C */ f32 mBackflipSpeedV; + /* 0x30 */ f32 mFallHeight; + /* 0x34 */ f32 mFallInterpolation; +}; // Size: 0x38 + +class daAlinkHIO_backJump_c0 { +public: + static daAlinkHIO_backJump_c1 const m; +}; + +class daAlinkHIO_backJump_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_backJump_c(); + ~daAlinkHIO_backJump_c() {} + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_backJump_c1 m; +#endif +}; + +class daAlinkHIO_sideStep_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mSideJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mSideLandAnm; + /* 0x28 */ daAlinkHIO_anm_c mBackJumpAnm; + /* 0x3C */ daAlinkHIO_anm_c mBackLandAnm; + /* 0x50 */ f32 mSideJumpSpeedH; + /* 0x54 */ f32 mSideJumpSpeedV; + /* 0x58 */ f32 mBackJumpSpeedH; + /* 0x5C */ f32 mBackJumpSpeedV; + /* 0x60 */ f32 mFallHeight; + /* 0x64 */ f32 mFallInterpolation; +}; // Size: 0x68 + +class daAlinkHIO_sideStep_c0 { +public: + static daAlinkHIO_sideStep_c1 const m; +}; + +class daAlinkHIO_sideStep_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_sideStep_c(); + ~daAlinkHIO_sideStep_c() {} + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_sideStep_c1 m; +#endif +}; + +class daAlinkHIO_slide_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mForwardSlideAnm; + /* 0x14 */ daAlinkHIO_anm_c mBackwardSlideAnm; + /* 0x28 */ daAlinkHIO_anm_c mForwardLandAnm; + /* 0x3C */ daAlinkHIO_anm_c mBackwardLandAnm; + /* 0x50 */ f32 mMaxSpeed; + /* 0x54 */ f32 mAcceleration; + /* 0x58 */ f32 mSlideAngle; + /* 0x5C */ f32 mClimbAngle; + /* 0x60 */ f32 mClimbAnmMinSpeed; + /* 0x64 */ f32 mMaxClimbSpeed; + /* 0x68 */ f32 mLV2MinibossFloorSlideAngle; + /* 0x6C */ f32 mLV2MinibossFloorWeakSlideAngle; + /* 0x70 */ f32 mLV2MinibossFloorWeakSlideSpeed; + /* 0x74 */ f32 mMaxClimbAnmSpeed; +}; // Size: 0x78 + +class daAlinkHIO_slide_c0 { +public: + static daAlinkHIO_slide_c1 const m; +}; + +class daAlinkHIO_slide_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_slide_c(); + ~daAlinkHIO_slide_c() {} + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_slide_c1 m; +#endif +}; + +class daAlinkHIO_cutNormal_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mCutAnm; + /* 0x14 */ f32 mSpeed; + /* 0x18 */ f32 mAttackStartFrame; + /* 0x1C */ f32 mAttackEndFrame; +}; // Size: 0x20 + +class daAlinkHIO_cutNmV_c0 { +public: + static daAlinkHIO_cutNormal_c1 const m; +}; + +class daAlinkHIO_cutNmL_c0 { +public: + static daAlinkHIO_cutNormal_c1 const m; +}; + +class daAlinkHIO_cutNmR_c0 { +public: + static daAlinkHIO_cutNormal_c1 const m; +}; + +class daAlinkHIO_cutNmSL_c0 { +public: + static daAlinkHIO_cutNormal_c1 const m; +}; + +class daAlinkHIO_cutNmSR_c0 { +public: + static daAlinkHIO_cutNormal_c1 const m; +}; + +class daAlinkHIO_cutNormal_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_cutNormal_c(int, float); + ~daAlinkHIO_cutNormal_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: + /* 0x34 */ f32 field_0x34; + /* 0x38 */ daAlinkHIO_cutNormal_c1 m; +}; // Size: 0x58 + +class daAlinkHIO_cutFinish_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mCutAnm; + /* 0x14 */ s16 mStopTime; + /* 0x16 */ s16 mComboStopTime; + /* 0x18 */ f32 mSpeed; + /* 0x1C */ f32 mAttackStartFrame; + /* 0x20 */ f32 mAttackEndFrame; + /* 0x24 */ f32 mComboCheckFrame; + /* 0x28 */ f32 mComboStartFrame; +}; // Size: 0x2C + +class daAlinkHIO_cutFnL_c0 { +public: + static daAlinkHIO_cutFinish_c1 const m; +}; + +class daAlinkHIO_cutFnV_c0 { +public: + static daAlinkHIO_cutFinish_c1 const m; +}; + +class daAlinkHIO_cutFnS_c0 { +public: + static daAlinkHIO_cutFinish_c1 const m; +}; + +class daAlinkHIO_cutFnSl_c0 { +public: + static daAlinkHIO_cutFinish_c1 const m; +}; + +class daAlinkHIO_cutFnSm_c0 { +public: + static daAlinkHIO_cutFinish_c1 const m; +}; + +class daAlinkHIO_cutFnR_c0 { +public: + static daAlinkHIO_cutFinish_c1 const m; +}; + +class daAlinkHIO_cutFinish_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_cutFinish_c(int, float); + ~daAlinkHIO_cutFinish_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: + /* 0x34 */ f32 field_0x34; + /* 0x38 */ daAlinkHIO_cutFinish_c1 m; +}; + +class daAlinkHIO_cutFnJU_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mCutAnm; + /* 0x14 */ daAlinkHIO_anm_c mLandAnm; + /* 0x28 */ s16 mStopTime; + /* 0x2A */ s16 mComboStopTime; + /* 0x2C */ f32 mSpeedH; + /* 0x30 */ f32 mSpeedV; + /* 0x34 */ f32 mAttackStartFrame; + /* 0x38 */ f32 mAttackEndFrame; + /* 0x3C */ f32 mComboCheckFrame; + /* 0x40 */ f32 mComboStartFrame; + /* 0x44 */ f32 mFallHeight; + /* 0x48 */ f32 mFallInterpolation; + /* 0x4C */ f32 mAttackRadius; + /* 0x50 */ f32 mAttackOffset; +}; // Size: 0x54 + +class daAlinkHIO_cutFnJU_c0 { +public: + static daAlinkHIO_cutFnJU_c1 const m; +}; + +class daAlinkHIO_cutFnJU_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_cutFnJU_c(); + ~daAlinkHIO_cutFnJU_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_cutFnJU_c1 m; +#endif +}; // Size: 0x88 + +class daAlinkHIO_cutDash_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mCutAnm; + /* 0x14 */ f32 mAttackStartFrame; + /* 0x18 */ f32 mAttackEndFrame; +}; // Size: 0x1C + +class daAlinkHIO_cutDaL_c0 { +public: + static daAlinkHIO_cutDash_c1 const m; +}; + +class daAlinkHIO_cutDaR_c0 { +public: + static daAlinkHIO_cutDash_c1 const m; +}; + +class daAlinkHIO_cutDaCharge_c0 { +public: + static daAlinkHIO_cutDash_c1 const m; +}; + +class daAlinkHIO_cutDash_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_cutDash_c(int, float); + ~daAlinkHIO_cutDash_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: + /* 0x34 */ f32 field_0x34; + /* 0x38 */ daAlinkHIO_cutDash_c1 m; +}; + +class daAlinkHIO_cutJump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mCutAnm; + /* 0x14 */ daAlinkHIO_anm_c mLandAnm; + /* 0x28 */ f32 mBaseJumpSpeedH; + /* 0x2C */ f32 mBaseJumpSpeedV; + /* 0x30 */ f32 mAirJumpSpeedH; + /* 0x34 */ f32 mAirJumpSpeedV; + /* 0x38 */ f32 mStartAttackFrame; + /* 0x3C */ f32 mEndAttackFrame; + /* 0x40 */ f32 mJumpSpinDelay; +}; // Size: 0x44 + +class daAlinkHIO_cutJump_c0 { +public: + static daAlinkHIO_cutJump_c1 const m; +}; + +class daAlinkHIO_cutJump_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_cutJump_c(); + ~daAlinkHIO_cutJump_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_cutJump_c1 m; +#endif +}; // Size: 0x78 + +class daAlinkHIO_cutTurn_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mRightTurnAnm; + /* 0x14 */ daAlinkHIO_anm_c mChargeAnm; + /* 0x28 */ daAlinkHIO_anm_c mLeftTurnAnm; + /* 0x3C */ s16 mStopTime; + /* 0x3E */ s16 field_0x3E; + /* 0x40 */ f32 mRightTurnInputStartFrame; + /* 0x44 */ f32 mRightAttackStartFrame; + /* 0x48 */ f32 mRightAttackEndFrame; + /* 0x4C */ f32 mMoveFBAnmSpeed; + /* 0x50 */ f32 mMoveFBInterpolation; + /* 0x54 */ f32 mMoveLRAnmSpeed; + /* 0x58 */ f32 mMoveLRInterpolation; + /* 0x5C */ f32 mMaxSpeed; + /* 0x60 */ f32 mChargeMoveAccel; + /* 0x64 */ f32 mChargeMoveDecel; + /* 0x68 */ f32 mSpeed; + /* 0x6C */ f32 mRightComboStartFrame; + /* 0x70 */ f32 mAttackRadius; + /* 0x74 */ f32 mLeftTurnInputStartFrame; + /* 0x78 */ f32 mLeftAttackStartFrame; + /* 0x7C */ f32 mLeftAttackEndFrame; + /* 0x80 */ f32 mLeftComboStartFrame; + /* 0x84 */ f32 mAttackRadiusAccel; + /* 0x88 */ f32 mLightAttackRadius; + /* 0x8C */ f32 mLightAttackRadiusAccel; + /* 0x90 */ f32 mLargeAttackRadius; + /* 0x94 */ f32 mLargeAttackAccel; +}; // Size: 0x98 + +class daAlinkHIO_cutTurn_c0 { +public: + static daAlinkHIO_cutTurn_c1 const m; +}; + +class daAlinkHIO_cutTurn_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_cutTurn_c(); + ~daAlinkHIO_cutTurn_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_cutTurn_c1 m; +#endif +}; // Size: 0xCC + +class daAlinkHIO_hoCut_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mCutAnm; + /* 0x14 */ f32 mAttackStartFrame; + /* 0x18 */ f32 mAttackEndFrame; + /* 0x1C */ f32 mAfterCutMorf; +}; // Size: 0x20 + +class daAlinkHIO_hoCutLA_c0 { +public: + static daAlinkHIO_hoCut_c1 const m; +}; + +class daAlinkHIO_hoCutLB_c0 { +public: + static daAlinkHIO_hoCut_c1 const m; +}; + +class daAlinkHIO_hoCutRA_c0 { +public: + static daAlinkHIO_hoCut_c1 const m; +}; + +class daAlinkHIO_hoCutRB_c0 { +public: + static daAlinkHIO_hoCut_c1 const m; +}; + +class daAlinkHIO_hoCut_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_hoCut_c(int, float); + ~daAlinkHIO_hoCut_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: + /* 0x34 */ f32 field_0x34; + /* 0x38 */ daAlinkHIO_hoCut_c1 m; +}; // Size: 0x58 + +class daAlinkHIO_hoCutCharge_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mChargeAnm; + /* 0x14 */ daAlinkHIO_anm_c mCutAnm; + /* 0x28 */ daAlinkHIO_anm_c mSpinAnm; + /* 0x3C */ s16 mCutStopTime; + /* 0x3E */ s16 mSpinStopTime; + /* 0x40 */ f32 mCutAttackStartFrame; + /* 0x44 */ f32 mCutAttackEndFrame; + /* 0x48 */ f32 mSpinAttackStartFrame; + /* 0x4C */ f32 mSpinAttackEndFrame; + /* 0x50 */ f32 mSpinAttackRadius; +}; // Size: 0x54 + +class daAlinkHIO_hoCutCharge_c0 { +public: + static daAlinkHIO_hoCutCharge_c1 const m; +}; + +class daAlinkHIO_hoCutCharge_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_hoCutCharge_c(); + ~daAlinkHIO_hoCutCharge_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_hoCutCharge_c1 m; +#endif +}; // Size: 0x88 + +class daAlinkHIO_cutDown_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mFallAnm; + /* 0x28 */ daAlinkHIO_anm_c mLandAnm; + /* 0x3C */ daAlinkHIO_anm_c mMissAnm; + /* 0x50 */ daAlinkHIO_anm_c mRecoverAnm; + /* 0x64 */ s16 mSuccessStopTime; + /* 0x66 */ s16 mFailStopTime; + /* 0x68 */ f32 mRecoverSpeedH; + /* 0x6C */ f32 mRecoverSpeedV; + /* 0x70 */ f32 mSpeedV; +}; // Size: 0x74 + +class daAlinkHIO_cutDown_c0 { +public: + static daAlinkHIO_cutDown_c1 const m; +}; + +class daAlinkHIO_cutDown_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_cutDown_c(); + ~daAlinkHIO_cutDown_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_cutDown_c1 m; +#endif +}; // Size: 0xA8 + +class daAlinkHIO_cutHead_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mCutAnm; + /* 0x28 */ daAlinkHIO_anm_c mLandAnm; + /* 0x3C */ f32 mGravity; + /* 0x40 */ f32 mMaxHeight; + /* 0x44 */ f32 mMaxDistance; + /* 0x48 */ f32 mAddSpeedV; + /* 0x4C */ f32 mAddSpeedH; + /* 0x50 */ f32 mAttackStartFrame; + /* 0x54 */ f32 mAttackEndFrame; + /* 0x58 */ f32 mSwordRadius; + /* 0x5C */ f32 mSwordLength; +}; // Size: 0x60 + +class daAlinkHIO_cutHead_c0 { +public: + static daAlinkHIO_cutHead_c1 const m; +}; + +class daAlinkHIO_cutHead_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_cutHead_c(); + ~daAlinkHIO_cutHead_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_cutHead_c1 m; +#endif +}; // Size: 0x94 + +class daAlinkHIO_cutLargeJump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mChargeAnm; + /* 0x14 */ daAlinkHIO_anm_c mChargeMoveAnm; + /* 0x28 */ daAlinkHIO_anm_c mCutAnm; + /* 0x3C */ daAlinkHIO_anm_c mLandAnm; + /* 0x50 */ f32 mCutSpeedH; + /* 0x54 */ f32 mCutSpeedV; + /* 0x58 */ f32 mJumpAttackStartFrame; + /* 0x5C */ f32 mJumpAttackEndFrame; + /* 0x60 */ f32 mCutInitFrame; + /* 0x64 */ f32 mLandAttackInitFrame; + /* 0x68 */ f32 mLandAttackEndFrame; + /* 0x6C */ f32 mLandAttackRadius; + /* 0x70 */ f32 mSpinSlashCheckFrame; +}; // Size: 0x74 + +class daAlinkHIO_cutLargeJump_c0 { +public: + static daAlinkHIO_cutLargeJump_c1 const m; +}; + +class daAlinkHIO_cutLargeJump_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_cutLargeJump_c(); + ~daAlinkHIO_cutLargeJump_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_cutLargeJump_c1 m; +#endif +}; // Size: 0xA8 + +class daAlinkHIO_cut_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mEquipAnm; + /* 0x14 */ daAlinkHIO_anm_c mUnequipAnm; + /* 0x28 */ daAlinkHIO_anm_c mRecoilAnm; + /* 0x3C */ daAlinkHIO_anm_c mStabAnm; + /* 0x50 */ bool mForceHitCombo; + /* 0x52 */ s16 mComboDuration; + /* 0x54 */ s16 mBlurAlpha; + /* 0x56 */ s16 mNormalSwingDuration; + /* 0x58 */ s16 mDashBlurAlpha; + /* 0x5A */ s16 mUnkTime; // might be related to flourish + /* 0x5C */ s16 mFlourishTime; + /* 0x5E */ s16 mUnkBodyDownwards; // ? + /* 0x60 */ s16 mUnkBodyUpwards; // ? + /* 0x62 */ s16 mSpinSlashWait; // ? maybe related to wii? + /* 0x64 */ f32 mRecoilSpeed; + /* 0x68 */ f32 mRecoilDeceleration; + /* 0x6C */ f32 mFlourishAnmSpeed; + /* 0x70 */ f32 mFlourishEndAnmSpeed; + /* 0x74 */ f32 mSwordLength; + /* 0x78 */ f32 mSwordRadius; + /* 0x7C */ f32 mSwordLengthHorseback; + /* 0x80 */ f32 mSwordRadiusHorseback; + /* 0x84 */ f32 mRunCutLength; + /* 0x88 */ f32 mRunCutRadius; + /* 0x8C */ f32 mFastUnequipAnmSpeed; + /* 0x90 */ f32 mSwordLengthHorsebackFight; + /* 0x94 */ f32 mSwordRadiusHorsebackFight; + /* 0x98 */ f32 mFlourishControlStartFrame; +}; // Size: 0x9C + +class daAlinkHIO_cut_c0 { +public: + static daAlinkHIO_cutNmV_c0 const mCutVertical; + static daAlinkHIO_cutNmL_c0 const mCutLeft; + static daAlinkHIO_cutNmR_c0 const mCutRight; + static daAlinkHIO_cutNmSL_c0 const mCutLeftStab; + static daAlinkHIO_cutNmSR_c0 const mCutRightStab; + static daAlinkHIO_cutFnL_c0 const mCutFinishLeft; + static daAlinkHIO_cutFnV_c0 const mCutFinishVertical; + static daAlinkHIO_cutFnS_c0 const mCutFinishStab; + static daAlinkHIO_cutFnSl_c0 const mCutFinishSweep; + static daAlinkHIO_cutFnSm_c0 const mCutFinishSlash; + static daAlinkHIO_cutFnR_c0 const mCutFinishRight; + static daAlinkHIO_cutFnJU_c0 const mCutFinishJumpUppercut; + static daAlinkHIO_cutJump_c0 const mCutJump; + static daAlinkHIO_cutTurn_c0 const mCutTurn; + static daAlinkHIO_hoCutLA_c0 const mHorseCutLeftA; + static daAlinkHIO_hoCutLB_c0 const mHorseCutLeftB; + static daAlinkHIO_hoCutRA_c0 const mHorseCutRightA; + static daAlinkHIO_hoCutRB_c0 const mHorseCutRightB; + static daAlinkHIO_hoCutCharge_c0 const mHorseCutCharge; + static daAlinkHIO_cutDaL_c0 const mCutDashLeft; + static daAlinkHIO_cutDaR_c0 const mCutDashRight; + static daAlinkHIO_cutDaCharge_c0 const mCutDashCharge; + static daAlinkHIO_cutDown_c0 const mCutDown; + static daAlinkHIO_cutHead_c0 const mCutHead; + static daAlinkHIO_cutLargeJump_c0 const mCutLargeJump; + static daAlinkHIO_cut_c1 const m; +}; + +class daAlinkHIO_cut_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_cut_c(); + ~daAlinkHIO_cut_c(); + + virtual void genMessage(JORMContext*); +#else + ~daAlinkHIO_cut_c(); +#endif + +public: +#if DEBUG + /* 0x034 */ daAlinkHIO_cutNormal_c mCutVertical; + /* 0x08C */ daAlinkHIO_cutNormal_c mCutLeft; + /* 0x0E4 */ daAlinkHIO_cutNormal_c mCutRight; + /* 0x13C */ daAlinkHIO_cutNormal_c mCutLeftStab; + /* 0x194 */ daAlinkHIO_cutNormal_c mCutRightStab; + /* 0x1EC */ daAlinkHIO_cutFinish_c mCutFinishLeft; + /* 0x250 */ daAlinkHIO_cutFinish_c mCutFinishVertical; + /* 0x2B4 */ daAlinkHIO_cutFinish_c mCutFinishStab; + /* 0x318 */ daAlinkHIO_cutFinish_c mCutFinishSweep; + /* 0x37C */ daAlinkHIO_cutFinish_c mCutFinishSlash; + /* 0x3E0 */ daAlinkHIO_cutFinish_c mCutFinishRight; + /* 0x444 */ daAlinkHIO_cutFnJU_c mCutFinishJumpUppercut; + /* 0x4CC */ daAlinkHIO_cutJump_c mCutJump; + /* 0x544 */ daAlinkHIO_cutTurn_c mCutTurn; + /* 0x610 */ daAlinkHIO_hoCut_c mHorseCutLeftA; + /* 0x668 */ daAlinkHIO_hoCut_c mHorseCutLeftB; + /* 0x6C0 */ daAlinkHIO_hoCut_c mHorseCutRightA; + /* 0x718 */ daAlinkHIO_hoCut_c mHorseCutRightB; + /* 0x770 */ daAlinkHIO_hoCutCharge_c mHorseCutCharge; + /* 0x7F8 */ daAlinkHIO_cutDash_c mCutDashLeft; + /* 0x84C */ daAlinkHIO_cutDash_c mCutDashRight; + /* 0x8A0 */ daAlinkHIO_cutDash_c mCutDashCharge; + /* 0x8F4 */ daAlinkHIO_cutDown_c mCutDown; + /* 0x99C */ daAlinkHIO_cutHead_c mCutHead; + /* 0xA30 */ daAlinkHIO_cutLargeJump_c mCutLargeJump; + /* 0xAD8 */ daAlinkHIO_cut_c1 m; +#endif +}; // Size: 0xB74 + +class daAlinkHIO_guardAttack_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mAttackAnm; + /* 0x14 */ f32 mSpeed; + /* 0x18 */ f32 mAttackStartFrame; + /* 0x1C */ f32 mAttackEndFrame; + /* 0x20 */ f32 mSlashCheckFrame; +}; // Size: 0x24 + +class daAlinkHIO_gAtPush_c0 { +public: + static daAlinkHIO_guardAttack_c1 const m; +}; + +class daAlinkHIO_gAtKick_c0 { +public: + static daAlinkHIO_guardAttack_c1 const m; +}; + +class daAlinkHIO_guardAttack_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_guardAttack_c(int, float); + ~daAlinkHIO_guardAttack_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: + /* 0x34 */ f32 field_0x34; + /* 0x38 */ daAlinkHIO_guardAttack_c1 m; +}; + +class daAlinkHIO_turnMove_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mTurnAnm; + /* 0x14 */ s16 mTurnSpeedRate; + /* 0x16 */ s16 mMaxTurnSpeed; + /* 0x18 */ s16 mMinTurnSpeed; + /* 0x1A */ s16 mMaxHalfTurnSpeed; + /* 0x1C */ f32 mHalfTurnAnmSpeed; + /* 0x20 */ f32 mTwirlCutDelayF; + /* 0x24 */ f32 mSideRollAnmSpeed; + /* 0x28 */ f32 mSideRollSpeed; +}; // Size: 0x2C + +class daAlinkHIO_turnMove_c0 { +public: + static daAlinkHIO_turnMove_c1 const m; +}; + +class daAlinkHIO_turnMove_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_turnMove_c(); + ~daAlinkHIO_turnMove_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_turnMove_c1 m; +#endif +}; + +class daAlinkHIO_guard_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mGuardHitAnm; + /* 0x14 */ daAlinkHIO_anm_c mCrouchGuardHitAnm; // Unused + /* 0x28 */ daAlinkHIO_anm_c mRecoilAnm; + /* 0x3C */ daAlinkHIO_anm_c mGuardBreakAnm; + /* 0x50 */ s16 mGuardLRAngleMax; + /* 0x52 */ s16 mGuardFBAngleMax; + /* 0x54 */ s16 mGuardBodyInterpolation; + /* 0x56 */ s16 mSmallGuardLRAngleMax; + /* 0x58 */ s16 mSmallGuardFBAngleMax; + /* 0x5C */ f32 mCrouchGuardAnmSpeed; // Unused + /* 0x60 */ f32 mCrouchGuardInterpolation; // Unused + /* 0x64 */ f32 mGuardSpeedNormal; + /* 0x68 */ f32 mGuardSpeedLarge; + /* 0x6C */ f32 mGuardSpeedHuge; + /* 0x70 */ f32 mAttackPosOffset; + /* 0x74 */ f32 mAttackRadius; + /* 0x78 */ f32 mMagneGuardSpeed; + /* 0x7C */ f32 mMagneHvyGuardSpeed; +}; // Size: 0x80 + +class daAlinkHIO_guard_c0 { +public: + static daAlinkHIO_gAtPush_c0 const mAtPush; + static daAlinkHIO_gAtKick_c0 const mAtKick; + static daAlinkHIO_turnMove_c0 const mTurnMove; + static daAlinkHIO_guard_c1 const m; +}; + +class daAlinkHIO_guard_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_guard_c(); + ~daAlinkHIO_guard_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x034 */ daAlinkHIO_guardAttack_c mAtPush; + /* 0x090 */ daAlinkHIO_guardAttack_c mAtKick; + /* 0x0EC */ daAlinkHIO_turnMove_c mTurnMove; + /* 0x14C */ daAlinkHIO_guard_c1 m; +#endif +}; + +class daAlinkHIO_crouch_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mCrawlStartAnm; + /* 0x14 */ daAlinkHIO_anm_c mCrawlEndAnm; + /* 0x28 */ s16 mCrawlTurnRate; + /* 0x2A */ s16 mCrawlTurnMax; + /* 0x2C */ s16 mCrawlTurnMin; + /* 0x30 */ f32 mCrouchAnmSpeed; + /* 0x34 */ f32 mCrouchInterpolation; + /* 0x38 */ f32 mStandInterpolation; + /* 0x3C */ f32 mCrawlMoveRate; + /* 0x40 */ f32 mCrawlAnmSpeedMax; + /* 0x44 */ f32 mCrawlAnmSpeedMin; + /* 0x48 */ f32 mCrawlInterpolation; +}; // Size: 0x4C + +class daAlinkHIO_crouch_c0 { +public: + static daAlinkHIO_crouch_c1 const m; +}; + +class daAlinkHIO_crouch_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_crouch_c(); + ~daAlinkHIO_crouch_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_crouch_c1 m; +#endif +}; + +class daAlinkHIO_autoJump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mLandAnm; + /* 0x28 */ daAlinkHIO_anm_c mDiveAnm; + /* 0x3C */ daAlinkHIO_anm_c mDiveConnectAnm; + /* 0x50 */ bool mAlwaysMaxSpeedJump; + /* 0x52 */ s16 mJumpAngle; + /* 0x54 */ s16 mSpinJumpRotateSpeed; + /* 0x56 */ s16 mSpinJumpLandStopTime; + /* 0x58 */ s16 mCuccoJumpAngle; + /* 0x5C */ f32 mJumpSpeedLimit; + /* 0x60 */ f32 mMinJumpSpeed; + /* 0x64 */ f32 mJumpSpeedRate; + /* 0x68 */ f32 mAirborneInterpolation; + /* 0x6C */ f32 mJumpFallInterpolation; + /* 0x70 */ f32 mFallInterpolation; + /* 0x74 */ f32 mGravity; + /* 0x78 */ f32 mMaxFallSpeed; + /* 0x7C */ f32 mMaxJumpSpeed; + /* 0x80 */ f32 mSpinJumpInterpolation; + /* 0x84 */ f32 mSpinJumpFallInterpolation; + /* 0x88 */ f32 mSpinJumpAddSpeed; + /* 0x8C */ f32 mSpinJumpAccel; + /* 0x90 */ f32 mHangHeightLimit; + /* 0x94 */ f32 mGrabHeightLimit; + /* 0x98 */ f32 mOoccooJumpMaxSpeed; + /* 0x9C */ f32 mDiveSpeedV; + /* 0xA0 */ f32 mDiveSpeedH; + /* 0xA4 */ f32 mDiveGravity; + /* 0xA8 */ f32 mCuccoJumpMaxSpeed; + /* 0xAC */ f32 mCuccoFallMaxSpeed; + /* 0xB0 */ f32 mCuccoStartSpeed; +}; // size = 0xB4 + +class daAlinkHIO_autoJump_c0 { +public: + static daAlinkHIO_autoJump_c1 const m; +}; + +class daAlinkHIO_autoJump_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_autoJump_c(); + ~daAlinkHIO_autoJump_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + daAlinkHIO_autoJump_c1 m; +#endif +}; + +class daAlinkHIO_smallJump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mSmallJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mStepClimbAnm; + /* 0x28 */ daAlinkHIO_anm_c mStepLandAnm; + /* 0x3C */ f32 mSpeedH; + /* 0x40 */ f32 mTargetHeightOffset; + /* 0x44 */ f32 mFallInterpolation; +}; // Size: 0x48 + +class daAlinkHIO_smallJump_c0 { +public: + static daAlinkHIO_smallJump_c1 const m; +}; + +class daAlinkHIO_smallJump_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_smallJump_c(); + ~daAlinkHIO_smallJump_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + daAlinkHIO_smallJump_c1 m; +#endif +}; + +class daAlinkHIO_wallCatch_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mGrabAAnm; + /* 0x14 */ daAlinkHIO_anm_c mGrabBAnm; + /* 0x28 */ daAlinkHIO_anm_c mClimbAnm; + /* 0x3C */ daAlinkHIO_anm_c mJumpAnm; + /* 0x50 */ f32 mClimbStartFrame; +}; // Size: 0x54 + +class daAlinkHIO_wallCatch_c0 { +public: + static daAlinkHIO_wallCatch_c1 const m; +}; + +class daAlinkHIO_wallCatch_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wallCatch_c(); + ~daAlinkHIO_wallCatch_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + daAlinkHIO_wallCatch_c1 m; +#endif +}; + +class daAlinkHIO_wallFall_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mOneHandGrabAnm; + /* 0x14 */ daAlinkHIO_anm_c mTwoHandGrabAnm; +}; // Size: 0x28 + +class daAlinkHIO_wallFall_c0 { +public: + static daAlinkHIO_wallFall_c1 const m; +}; + +class daAlinkHIO_wallFall_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wallFall_c(); + ~daAlinkHIO_wallFall_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + daAlinkHIO_wallFall_c1 m; +#endif +}; + +class daAlinkHIO_wallMove_c1 { +public: + /* 0x00 */ f32 mMinAnmSpeed; + /* 0x04 */ f32 mMaxAnmSpeed; + /* 0x08 */ f32 mInterpolation; + /* 0x0C */ f32 mMinSpeed; + /* 0x10 */ f32 mMaxSpeed; +}; // Size: 0x14 + +class daAlinkHIO_wallMove_c0 { +public: + static daAlinkHIO_wallMove_c1 const m; +}; + +class daAlinkHIO_wallMove_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wallMove_c(); + ~daAlinkHIO_wallMove_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + daAlinkHIO_wallMove_c1 m; +#endif +}; + +class daAlinkHIO_wallHang_c1 { +public: + /* 0x00 */ s16 small_jump_input_time; + /* 0x02 */ s16 grab_input_time; + /* 0x04 */ f32 auto_walk_height; + /* 0x08 */ f32 small_jump_height; + /* 0x0C */ f32 climb_height; + /* 0x10 */ f32 jump_climb_height; + /* 0x14 */ f32 jump_hang_height; + /* 0x18 */ f32 hang_foot_pos_height; +}; // Size: 0x1C + +class daAlinkHIO_wallHang_c0 { +public: + static daAlinkHIO_smallJump_c0 const mSmallJump; + static daAlinkHIO_wallCatch_c0 const mWallCatch; + static daAlinkHIO_wallFall_c0 const mWallFall; + static daAlinkHIO_wallMove_c0 const mWallMove; + static daAlinkHIO_wallHang_c1 const m; +}; + +class daAlinkHIO_wallHang_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wallHang_c(); + ~daAlinkHIO_wallHang_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_smallJump_c mSmallJump; + /* 0x00 */ daAlinkHIO_wallCatch_c mWallCatch; + /* 0x00 */ daAlinkHIO_wallFall_c mWallFall; + /* 0x00 */ daAlinkHIO_wallMove_c mWallMove; + /* 0x00 */ daAlinkHIO_wallHang_c1 m; +#endif +}; + +class daAlinkHIO_pushpull_c1 { +public: + /* 0x00 */ u8 mEnableSumoWaitRotation; + /* 0x02 */ s16 mSumoMaxGauge; + /* 0x04 */ s16 mSumoIncreaseGauge; + /* 0x06 */ s16 mSumoPenaltyTime; + /* 0x08 */ s16 mSumoPower3To2Switch; + /* 0x0A */ s16 mSumoPower2To1Switch; + /* 0x0C */ s16 mSumoRotationAllowPower; + /* 0x0E */ s16 mSumoRotationAngle; + /* 0x10 */ f32 mStandbyASpeed; + /* 0x14 */ f32 mStandbyInterpolation; + /* 0x18 */ f32 mPushASpeed; + /* 0x1C */ f32 mPushInterpolation; + /* 0x20 */ f32 field_0x20; + /* 0x24 */ f32 mPullInterpolation; + /* 0x28 */ f32 mSumoPushASpeed; + /* 0x2C */ f32 mSumoPushAddASpeed; + /* 0x30 */ f32 mSumoPushedASpeed; + /* 0x34 */ f32 mSumoPushedAddASpeed; + /* 0x38 */ f32 mPushASpeedHeavy; +}; // Size: 0x3C + +class daAlinkHIO_pushpull_c0 { +public: + static daAlinkHIO_pushpull_c1 const m; +}; + +class daAlinkHIO_pushpull_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_pushpull_c(); + ~daAlinkHIO_pushpull_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + daAlinkHIO_pushpull_c1 m; +#endif +}; + +class daAlinkHIO_damNormal_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mFrontAnm; + /* 0x14 */ daAlinkHIO_anm_c mRearAnm; + /* 0x28 */ daAlinkHIO_anm_c mLeftAnm; + /* 0x3C */ daAlinkHIO_anm_c mRightAnm; + /* 0x50 */ s16 mFrontBackBodyMaxAngle; + /* 0x52 */ s16 mLeftRightBodyMaxAngle; + /* 0x54 */ f32 mInitialSpeed; + /* 0x58 */ f32 mAttackSpeedRate; + /* 0x5C */ f32 mDeceleration; + /* 0x60 */ f32 mIceDamageASpeed; +}; // Size: 0x64 + +class daAlinkHIO_damNormal_c0 { +public: + static daAlinkHIO_damNormal_c1 const m; +}; + +class daAlinkHIO_damNormal_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_damNormal_c(); + ~daAlinkHIO_damNormal_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + daAlinkHIO_damNormal_c1 m; +#endif +}; + +class daAlinkHIO_damLaHu_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mFrontGetUpAnm; + /* 0x14 */ daAlinkHIO_anm_c mBackGetUpAnm; + /* 0x28 */ daAlinkHIO_anm_c mLeftGetUpAnm; + /* 0x3C */ daAlinkHIO_anm_c mRightGetUpAnm; + /* 0x50 */ daAlinkHIO_anm_c mFrontWallHitAnm; + /* 0x64 */ daAlinkHIO_anm_c mBackWallHitAnm; + /* 0x78 */ daAlinkHIO_anm_c mLeftWallHitAnm; + /* 0x8C */ daAlinkHIO_anm_c mRightWallHitAnm; + /* 0xA0 */ s16 mBodyRotateRate; + /* 0xA4 */ f32 mGravity; + /* 0xA8 */ f32 mDamageBlend; + /* 0xAC */ f32 mHorizontalSpeed; + /* 0xB0 */ f32 mVerticalSpeed; + /* 0xB4 */ f32 mBounceSpeed; + /* 0xB8 */ f32 mDeceleration; +}; // Size: 0xBC + +class daAlinkHIO_damLarge_c0 { +public: + static daAlinkHIO_damLaHu_c1 const m; +}; + +class daAlinkHIO_damHuge_c0 { +public: + static daAlinkHIO_damLaHu_c1 const m; +}; + +class daAlinkHIO_damLaHu_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_damLaHu_c(int); + ~daAlinkHIO_damLaHu_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + daAlinkHIO_damLaHu_c1 m; +#endif +}; + +class daAlinkHIO_damHorse_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mNoDirectionAnm; + /* 0x14 */ daAlinkHIO_anm_c mWithDirectionAnm; + /* 0x28 */ s16 mFrontBackBodyMaxAngle; + /* 0x2A */ s16 mLeftRightBodyMaxAngle; +}; // Size: 0x2C + +class daAlinkHIO_damHorse_c0 { +public: + static daAlinkHIO_damHorse_c1 const m; +}; + +class daAlinkHIO_damHorse_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_damHorse_c(); + ~daAlinkHIO_damHorse_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_damHorse_c1 m; +#endif +}; + +class daAlinkHIO_damFall_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mLandAnm; + /* 0x14 */ daAlinkHIO_anm_c mStandAnm; + /* 0x28 */ s16 mSmallStopTime; + /* 0x2A */ s16 mBigStopTime; + /* 0x2C */ f32 mMinRollHeight; + /* 0x30 */ f32 mMaxRollHeight; + /* 0x34 */ f32 mSmallDmgHeight; + /* 0x38 */ f32 mBigDmgHeight; + /* 0x3C */ f32 mSmallDmgLandStartFrame; + /* 0x40 */ f32 mFallAnmTransitionHeight; + /* 0x44 */ f32 mFallAnmMorf; +}; // Size: 0x48 + +class daAlinkHIO_damFall_c0 { +public: + static daAlinkHIO_damFall_c1 const m; +}; + +class daAlinkHIO_damFall_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_damFall_c(); + ~daAlinkHIO_damFall_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_damFall_c1 m; +#endif +}; + +class daAlinkHIO_damCaught_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mEscapeAnm; + /* 0x14 */ s16 mGrabDuration; + /* 0x16 */ s16 mInputFadeTime; + /* 0x18 */ f32 mStandbySpeed; + /* 0x1C */ f32 mStandbyInterp; + /* 0x20 */ f32 mStandbyAddASpeed; +}; // Size: 0x24 + +class daAlinkHIO_damCaught_c0 { +public: + static daAlinkHIO_damCaught_c1 const m; +}; + +class daAlinkHIO_damCaught_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_damCaught_c(); + ~daAlinkHIO_damCaught_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_damCaught_c1 m; +#endif +}; + +class daAlinkHIO_damSwim_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mFrontAnm; + /* 0x14 */ daAlinkHIO_anm_c mRearAnm; + /* 0x28 */ daAlinkHIO_anm_c mLeftAnm; + /* 0x3C */ daAlinkHIO_anm_c mRightAnm; + /* 0x50 */ daAlinkHIO_anm_c mSinkAnm; + /* 0x64 */ daAlinkHIO_anm_c mSurfaceAnm; + /* 0x78 */ s16 mFrontBackBodyMaxAngle; + /* 0x7A */ s16 mLeftRightBodyMaxAngle; + /* 0x7C */ f32 mInitialSpeed; + /* 0x80 */ f32 mAttackSpeedRate; + /* 0x84 */ f32 mDeceleration; + /* 0x88 */ f32 mMaxSpeed; +}; // Size: 0x8C + +class daAlinkHIO_damSwim_c0 { +public: + static daAlinkHIO_damSwim_c1 const m; +}; + +class daAlinkHIO_damSwim_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_damSwim_c(); + ~daAlinkHIO_damSwim_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_damSwim_c1 m; +#endif +}; + +class daAlinkHIO_damage_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mFloorDmgAnm; + /* 0x14 */ daAlinkHIO_anm_c mDashDmgAnm; + /* 0x28 */ u8 mInvincible; + /* 0x2A */ s16 mInvincibleTime; + /* 0x2C */ s16 mWolfFloorInvincibleTime; + /* 0x2E */ s16 mFreezeTime; + /* 0x30 */ s16 mFreezeInitR; + /* 0x32 */ s16 mFreezeInitG; + /* 0x34 */ s16 mFreezeInitB; + /* 0x36 */ s16 mDamageR0; + /* 0x38 */ s16 mDamageG0; + /* 0x3A */ s16 mDamageB0; + /* 0x3C */ s16 mDamageR1; + /* 0x3E */ s16 mDamageG1; + /* 0x40 */ s16 mDamageB1; + /* 0x42 */ s16 mDamageR2; + /* 0x44 */ s16 mDamageG2; + /* 0x46 */ s16 mDamageB2; + /* 0x48 */ s16 mFreezeR; + /* 0x4A */ s16 mFreezeG; + /* 0x4C */ s16 mFreezeB; + /* 0x50 */ f32 mRecoverStandAnmSpeed; + /* 0x54 */ f32 mInvertedFallInterpolation; +}; // Size: 0x58 + +class daAlinkHIO_damage_c0 { +public: + static daAlinkHIO_damage_c1 const m; + static daAlinkHIO_damNormal_c0 const mDamNormal; + static daAlinkHIO_damLarge_c0 const mDamLarge; + static daAlinkHIO_damHuge_c0 const mDamHuge; + static daAlinkHIO_damHorse_c0 const mDamHorse; + static daAlinkHIO_damFall_c0 const mDamFall; + static daAlinkHIO_damCaught_c0 const mDamCaught; + static daAlinkHIO_damSwim_c0 const mDamSwim; +}; + +class daAlinkHIO_damage_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_damage_c(); + ~daAlinkHIO_damage_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_damage_c1 m; + /* 0x34 */ daAlinkHIO_damNormal_c mDamNormal; + /* 0x00 */ daAlinkHIO_damLaHu_c mDamLarge; + /* 0x00 */ daAlinkHIO_damLaHu_c mDamHuge; + /* 0x00 */ daAlinkHIO_damHorse_c mDamHorse; + /* 0x00 */ daAlinkHIO_damFall_c mDamFall; + /* 0x00 */ daAlinkHIO_damCaught_c mDamCaught; + /* 0x00 */ daAlinkHIO_damSwim_c mDamSwim; +#endif +}; + +class daAlinkHIO_horse_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mWalkOutAnm; + /* 0x14 */ daAlinkHIO_anm_c mRunOutAnm; + /* 0x28 */ daAlinkHIO_anm_c mWhipAnm; + /* 0x3C */ daAlinkHIO_anm_c mWhipRunOutAnm; + /* 0x50 */ s16 mSwordUpTime; + /* 0x52 */ s16 mSearchRangeAngle; + /* 0x54 */ s16 mWalkOutProhibitionTime; + /* 0x56 */ s16 mWhipWaitTime; + /* 0x58 */ s16 mSubjectiveDownwardMaxAngle; + /* 0x5A */ s16 mSubjectiveUpwardMaxAngle; + /* 0x5C */ f32 mSwordUpAnmSpeed; + /* 0x60 */ f32 mSwordUpInterpolation; + /* 0x64 */ f32 mHorseWalkStartFrame; + /* 0x68 */ f32 mTiredWaitInterpolation; +}; // Size: 0x6C + +class daAlinkHIO_horse_c0 { +public: + static daAlinkHIO_horse_c1 const m; +}; + +class daAlinkHIO_horse_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_horse_c(); + ~daAlinkHIO_horse_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_horse_c1 m; +#endif +}; + +class daAlinkHIO_canoe_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mLeftRightChangeAnm; + /* 0x14 */ s16 mMaxTurnAngle; + /* 0x16 */ s16 mMaxTurnAngle_RiverRide; + /* 0x18 */ f32 mStickRowAnmSpeed; + /* 0x1C */ f32 mBtnRowAnmSpeed; + /* 0x20 */ f32 mSpeedRate; + /* 0x24 */ f32 mMaxSpeed; + /* 0x28 */ f32 mDeceleration; + /* 0x2C */ f32 mStickRowStartAnmSpeed; + /* 0x30 */ f32 mBtnRowStartAnmSpeed; + /* 0x34 */ f32 mBackSpeedRate; + /* 0x38 */ f32 mBackMaxSpeed; + /* 0x3C */ f32 mMaxSpeed_RiverRide; + /* 0x40 */ f32 mSpeedRate_RiverRide; + /* 0x44 */ f32 mDeceleration_RiverRide; +}; // Size: 0x48 + +class daAlinkHIO_canoe_c0 { +public: + static daAlinkHIO_canoe_c1 const m; +}; + +class daAlinkHIO_canoe_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_canoe_c(); + ~daAlinkHIO_canoe_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_canoe_c1 m; +#endif +}; + +class daAlinkHIO_bow_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mShootAnm; + /* 0x14 */ daAlinkHIO_anm_c mLoadAnm; + /* 0x28 */ s16 mChargeArrowTime; + /* 0x2A */ s16 mBombArrowHoldTime; + /* 0x2C */ s16 mBombArrowFlyExplodeTime; + /* 0x30 */ f32 mStartInterpolation; + /* 0x34 */ f32 mArrowSpeed; + /* 0x38 */ f32 mArrowDistance; + /* 0x3C */ f32 mChargeArrowSpeed; + /* 0x40 */ f32 mChargeArrowDistance; + /* 0x44 */ f32 mArrowAttackRadius; + /* 0x48 */ f32 mBombArrowSpeed; + /* 0x4C */ f32 mBombArrowDistance; + /* 0x50 */ f32 mChargeBombArrowSpeed; + /* 0x54 */ f32 mChargeBombArrowDistance; + /* 0x58 */ f32 mScopeArrowSpeed; + /* 0x5C */ f32 mScopeArrowDistance; + /* 0x60 */ f32 mArrowIncAttackMaxStart; + /* 0x64 */ f32 mArrowIncAttackMax; + /* 0x68 */ f32 mSlingshotSpeed; + /* 0x6C */ f32 mSlingshotDistance; +}; // Size: 0x70 + +class daAlinkHIO_bow_c0 { +public: + static daAlinkHIO_bow_c1 const m; +}; + +class daAlinkHIO_bow_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_bow_c(); + ~daAlinkHIO_bow_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_bow_c1 m; +#endif +}; + +class daAlinkHIO_boom_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mThrowAnm; + /* 0x14 */ daAlinkHIO_anm_c mCatchAnm; + /* 0x28 */ s16 mChargeTime; + /* 0x2A */ s16 mBgThroughTime; + /* 0x2C */ f32 mIdleAnmSpeed; + /* 0x30 */ f32 mStartInterpolation; + /* 0x34 */ f32 mFlySpeed; + /* 0x38 */ f32 mChargeFlySpeed; + /* 0x3C */ f32 mFlyDistMax; + /* 0x40 */ f32 mHorsebackFlyDistMax; + /* 0x44 */ f32 mLockDistMax; + /* 0x48 */ f32 mCatchSpeed; +}; // Size: 0x4C + +class daAlinkHIO_boom_c0 { +public: + static daAlinkHIO_boom_c1 const m; +}; + +class daAlinkHIO_boom_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_boom_c(); + ~daAlinkHIO_boom_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_boom_c1 m; +#endif +}; + +class daAlinkHIO_bomb_c1 { +public: + /* 0x00 */ s16 mExplodeTime; + /* 0x02 */ s16 mEnemyBombColorR; + /* 0x04 */ s16 mBombInsectLimitAngle; + /* 0x08 */ f32 mGravity; + /* 0x0C */ f32 mMaxFallSpeed; + /* 0x10 */ f32 mBoundRate; + /* 0x14 */ f32 mStopSpeedY; + /* 0x18 */ f32 mMaxSpeedY; + /* 0x1C */ f32 mEffScale; + /* 0x20 */ f32 mAttackRadius; + /* 0x24 */ f32 mPokeBombTrackRate; + /* 0x28 */ f32 mWaterGravity; + /* 0x2C */ f32 mWaterMaxFallSpeed; + /* 0x30 */ f32 mThrowSpeedH; + /* 0x34 */ f32 mThrowSpeedV; + /* 0x38 */ f32 mWaterThrowSpeedH; + /* 0x3C */ f32 mWaterThrowSpeedV; + /* 0x40 */ f32 mWolfThrowSpeedH; + /* 0x44 */ f32 mWolfThrowSpeedV; + /* 0x48 */ f32 mExplodeWaterEffectLimit; +}; // Size: 0x4C + +class daAlinkHIO_bomb_c0 { +public: + static daAlinkHIO_bomb_c1 const m; +}; + +class daAlinkHIO_bomb_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_bomb_c(); + ~daAlinkHIO_bomb_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_bomb_c1 m; +#endif +}; + +class daAlinkHIO_huLight_c1 { +public: + /* 0x00 */ u8 mAngleAttenuationType; + /* 0x01 */ u8 mDistanceAttenuationType; + /* 0x02 */ s16 mAlpha; + /* 0x04 */ s16 mColorR; + /* 0x06 */ s16 mColorG; + /* 0x08 */ s16 mColorB; + /* 0x0A */ s16 mXAngle; + /* 0x0C */ f32 mPower; + /* 0x10 */ f32 mWidth; + /* 0x14 */ f32 mYOffset; + /* 0x18 */ f32 mZOffset; +}; // Size: 0x1C + +class daAlinkHIO_huLight_c0 { +public: + static daAlinkHIO_huLight_c1 const m; +}; + +class daAlinkHIO_wlLight_c1 { +public: + /* 0x00 */ s16 field_0x0; + /* 0x02 */ s16 field_0x2; + /* 0x04 */ s16 field_0x4; + /* 0x06 */ s16 field_0x6; + /* 0x08 */ s16 field_0x8; + /* 0x0A */ s16 field_0xA; + /* 0x0C */ f32 field_0xC; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; +}; // Size: 0x1C + +class daAlinkHIO_wlLight_c0 { +public: + static daAlinkHIO_wlLight_c1 const m; +}; + +class daAlinkHIO_zwLight_c1 { // may be wrong +public: + /* 0x00 */ s16 field_0x0; + /* 0x02 */ s16 field_0x2; + /* 0x04 */ s16 field_0x4; + /* 0x06 */ s16 field_0x6; + /* 0x08 */ s16 field_0x8; + /* 0x0A */ s16 field_0xA; + /* 0x0C */ f32 field_0xC; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ f32 field_0x18; +}; // Size: 0x1C + +class daAlinkHIO_zwLight_c0 { +public: + static daAlinkHIO_zwLight_c1 const m; +}; + +class daAlinkHIO_light_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_light_c(int); + ~daAlinkHIO_light_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_huLight_c1 m; +#endif +}; + +class daAlinkHIO_kandelaar_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mShakeAnm; + /* 0x14 */ daAlinkHIO_anm_c mBeginUnkAnm; + /* 0x28 */ daAlinkHIO_anm_c mEndUnkAnm; + /* 0x3C */ s16 mColorReg1R; + /* 0x3E */ s16 mColorReg1G; + /* 0x40 */ s16 mColorReg1B; + /* 0x42 */ s16 mColorReg2R; + /* 0x44 */ s16 mColorReg2G; + /* 0x46 */ s16 mColorReg2B; + /* 0x48 */ s16 mNormalOilLoss; + /* 0x4A */ s16 mShakeOilLoss; + /* 0x4C */ f32 mFlameTrackRate; +}; // Size: 0x50 + +class daAlinkHIO_kandelaar_c0 { +public: + static daAlinkHIO_kandelaar_c1 const m; +}; + +class daAlinkHIO_kandelaar_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_kandelaar_c(); + ~daAlinkHIO_kandelaar_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_kandelaar_c1 m; +#endif +}; + +class daAlinkHIO_magneBoots_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mEquipAnm; + /* 0x14 */ f32 mInputFactor; + /* 0x18 */ f32 mFeetPositionRatio; + /* 0x1C */ f32 mWalkAnmSpeedMax; + /* 0x20 */ f32 mWalkAnmSpeedMin; + /* 0x24 */ f32 mWaterInputFactor; + /* 0x28 */ f32 mWaterWalkAnmRate; + /* 0x2C */ f32 mWaterStartWalkAnmRate; + /* 0x30 */ f32 mMaxMagneFlySpeed; + /* 0x34 */ f32 mMagneFlyAccelRate; + /* 0x38 */ f32 mWaterVelocityY; + /* 0x3C */ f32 mWaterVelocityX; + /* 0x40 */ f32 mWaterVelRateSword; + /* 0x44 */ f32 mZoraWaterInputFactor; + /* 0x48 */ f32 mZoraWaterAnmSpeed; +}; // Size: 0x4C + +class daAlinkHIO_magneBoots_c0 { +public: + static daAlinkHIO_magneBoots_c1 const m; +}; + +class daAlinkHIO_magneBoots_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_magneBoots_c(); + ~daAlinkHIO_magneBoots_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_magneBoots_c1 m; +#endif +}; + +class daAlinkHIO_fmChain_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mGripAnm; + /* 0x14 */ daAlinkHIO_anm_c mUnfinishedAnm; +}; // Size: 0x28 + +class daAlinkHIO_fmChain_c0 { +public: + static daAlinkHIO_fmChain_c1 const m; +}; + +class daAlinkHIO_fmChain_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_fmChain_c(); + ~daAlinkHIO_fmChain_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_fmChain_c1 m; +#endif +}; + +class daAlinkHIO_hookshot_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mShootAnm; + /* 0x14 */ daAlinkHIO_anm_c mRoofHangAnm; + /* 0x28 */ daAlinkHIO_anm_c mWallHangAnm; + /* 0x3C */ u8 mForceStick; + /* 0x40 */ f32 mWaitAnmSpeed; + /* 0x44 */ f32 mStartInterpolation; + /* 0x48 */ f32 mMaxLength; + /* 0x4C */ f32 mShootSpeed; + /* 0x50 */ f32 mReturnSpeed; + /* 0x54 */ f32 mStickReturnSpeed; + /* 0x58 */ f32 mRoofHangRiseSpeed; + /* 0x5C */ f32 mRoofHangDecendSpeed; + /* 0x60 */ f32 mBossMaxLength; + /* 0x64 */ f32 mBossShootSpeed; + /* 0x68 */ f32 mBossReturnSpeed; + /* 0x6C */ f32 mBossStickReturnSpeed; +}; // Size: 0x70 + +class daAlinkHIO_hookshot_c0 { +public: + static daAlinkHIO_hookshot_c1 const m; +}; + +class daAlinkHIO_hookshot_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_hookshot_c(); + ~daAlinkHIO_hookshot_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_hookshot_c1 m; +#endif +}; + +class daAlinkHIO_spinner_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mKickAnm; + /* 0x14 */ s16 mRideMoveTime; + /* 0x16 */ s16 mBoardWaitTime; + /* 0x18 */ s16 mRideRotAngleMax; + /* 0x1A */ s16 mRideRotAngleMin; + /* 0x1C */ s16 mBossRideMoveTime; + /* 0x20 */ f32 mGravity; + /* 0x24 */ f32 mMaxFallSpeed; + /* 0x28 */ f32 mJumpRate; + /* 0x2C */ f32 mRideSpeed; + /* 0x30 */ f32 mDecelSpeedMax; + /* 0x34 */ f32 mDecelSpeedMin; + /* 0x38 */ f32 mDecelRate; + /* 0x3C */ f32 mBossRideSpeed; +}; // Size: 0x40 + +class daAlinkHIO_spinner_c0 { +public: + static daAlinkHIO_spinner_c1 const m; +}; + +class daAlinkHIO_spinner_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_spinner_c(); + ~daAlinkHIO_spinner_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_spinner_c1 m; +#endif +}; + +class daAlinkHIO_ironBall_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mCatchAnm; + /* 0x14 */ s16 mThrowChainNum; + /* 0x16 */ s16 mReturnChainRemoveNum; + /* 0x18 */ f32 mWaitAnmSpeed; + /* 0x1C */ f32 mPrepareAnmSpeed; + /* 0x20 */ f32 mPrepareInterpolation; + /* 0x24 */ f32 mTurnAnmSpeed; + /* 0x28 */ f32 mTurnInterpolation; + /* 0x2C */ f32 mPreThrowAnmSpeed; + /* 0x30 */ f32 mPreThrowAnmInterpolation; + /* 0x34 */ f32 mThrowAnmSpeed; + /* 0x38 */ f32 mThrowInterpolation; + /* 0x3C */ f32 mPullAnmSpeed; + /* 0x40 */ f32 mPullInterpolation; + /* 0x44 */ f32 mChainSpeedRate; + /* 0x48 */ f32 mChainGravity; + /* 0x4C */ f32 mReturnChainAccelY; + /* 0x50 */ f32 mReturnChainRate; + /* 0x54 */ f32 mThrowChainAccelZ; + /* 0x58 */ f32 mThrowChainAccelY; + /* 0x5C */ f32 mThrowChainGravity; + /* 0x60 */ f32 mBallGravity; + /* 0x64 */ f32 mThrowBallGravity; + /* 0x68 */ f32 mBallMaxFallSpeed; + /* 0x6C */ f32 field_0x6C; + /* 0x70 */ f32 mThrowSpeedZ; + /* 0x74 */ f32 mThrowSpeedY; + /* 0x78 */ f32 mReturnBallGravity; + /* 0x7C */ f32 mAttackRadius; + /* 0x80 */ f32 mFeetPosRatio; + /* 0x84 */ f32 mWalkAnmSpeedMax; + /* 0x88 */ f32 mWalkAnmSpeedMin; +}; // Size: 0x8C + +class daAlinkHIO_ironBall_c0 { +public: + static daAlinkHIO_ironBall_c1 const m; +}; + +class daAlinkHIO_ironBall_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_ironBall_c(); + ~daAlinkHIO_ironBall_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_ironBall_c1 m; +#endif +}; + +class daAlinkHIO_copyRod_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mSwingAnm; + /* 0x14 */ daAlinkHIO_anm_c mBigSwingAnm; + /* 0x28 */ f32 mBallSpeed; + /* 0x2c */ f32 mBallMaxDistance; + /* 0x30 */ f32 mBallReturnSpeed; + /* 0x34 */ f32 mBossBallMaxDistance; +}; // Size: 0x38 + +class daAlinkHIO_copyRod_c0 { +public: + static daAlinkHIO_copyRod_c1 const m; +}; + +class daAlinkHIO_copyRod_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_copyRod_c(); + ~daAlinkHIO_copyRod_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_copyRod_c1 m; +#endif +}; + +class daAlinkHIO_pickUp_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mGrabAnm; + /* 0x14 */ daAlinkHIO_anm_c mPlaceAnm; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2C; +}; // Size: 0x30 + +class daAlinkHIO_pickUp_c0 { +public: + static daAlinkHIO_pickUp_c1 const m; +}; + +class daAlinkHIO_pickUp_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_pickUp_c(); + ~daAlinkHIO_pickUp_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_pickUp_c1 m; +#endif +}; + +class daAlinkHIO_board_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; // might be wrong + /* 0x14 */ daAlinkHIO_anm_c mAirborneAnm; + /* 0x28 */ daAlinkHIO_anm_c mLandAnm; + /* 0x3C */ daAlinkHIO_anm_c mSpinAnm; + /* 0x50 */ f32 mMaxSpeed; + /* 0x54 */ f32 mPushAccel; + /* 0x58 */ f32 mMinJumpSpeedY; + /* 0x5C */ f32 mMaxJumpSpeedY; + /* 0x60 */ f32 mStandAnmSpeed; + /* 0x64 */ f32 mStandInterpolation; + /* 0x68 */ f32 mSitAnmSpeed; + /* 0x6C */ f32 mSitInterpolation; + /* 0x70 */ f32 mStartMinSpeed; + /* 0x74 */ f32 mStartAddSpeed; + /* 0x78 */ f32 mPushAnmMaxSpeed; + /* 0x7C */ f32 mFastPushSwitchSpeed; + /* 0x80 */ f32 mFastPushInterpolation; + /* 0x84 */ f32 mPushInterpolation; + /* 0x88 */ f32 mPushAnmMinSpeed; + /* 0x8C */ f32 mMaxPushSpeed; + /* 0x90 */ f32 mSpinMinJumpSpeedY; + /* 0x94 */ f32 mSpinMaxJumpSpeedY; + /* 0x98 */ f32 mEffectMaxSpeed; +}; // Size: 0x9C + +class daAlinkHIO_board_c0 { +public: + static daAlinkHIO_board_c1 const m; +}; + +class daAlinkHIO_board_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_board_c(); + ~daAlinkHIO_board_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_board_c1 m; +#endif +}; + +class daAlinkHIO_bottle_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mStartDrinkAnm; + /* 0x14 */ daAlinkHIO_anm_c mEndDrinkAnm; + /* 0x28 */ daAlinkHIO_anm_c mOpenBottleAnm; + /* 0x3C */ daAlinkHIO_anm_c mPourAnm; + /* 0x50 */ daAlinkHIO_anm_c mSwingDownAnm; + /* 0x64 */ daAlinkHIO_anm_c mSwingSideAnm; + /* 0x78 */ daAlinkHIO_anm_c mGetAnm; + /* 0x8C */ daAlinkHIO_anm_c mDrinkNastyAnm; + /* 0xA0 */ daAlinkHIO_anm_c mScoopAnm; +}; // Size: 0xB4 + +class daAlinkHIO_bottle_c0 { +public: + static daAlinkHIO_bottle_c1 const m; +}; + +class daAlinkHIO_bottle_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_bottle_c(); + ~daAlinkHIO_bottle_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_bottle_c1 m; +#endif +}; + +class daAlinkHIO_item_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mOneHandEquipAnm; + /* 0x14 */ daAlinkHIO_anm_c mTwoHandEquipAnm; + /* 0x28 */ s16 mItemFPTransitionTimer; + /* 0x2A */ s16 mItemFPMaxUnk; + /* 0x2C */ s16 mItemFPUpMaxUnk; + /* 0x2E */ s16 mWiiItemFPDownMaxUnk; + /* 0x30 */ s16 mWiiItemFPUpMaxUnk; + /* 0x34 */ f32 mOneHandReleaseAnmSpeed; + /* 0x38 */ f32 mTwoHandReleaseAnmSpeed; +}; // Size: 0x3C + +class daAlinkHIO_item_c0 { +public: + static daAlinkHIO_bow_c0 const mBow; + static daAlinkHIO_boom_c0 const mBoomerang; + static daAlinkHIO_bomb_c0 const mBomb; + static daAlinkHIO_huLight_c0 const mLanternPL; + static daAlinkHIO_kandelaar_c0 const mLantern; + static daAlinkHIO_fmChain_c0 const mFmChain; + static daAlinkHIO_magneBoots_c0 const mIronBoots; + static daAlinkHIO_pickUp_c0 const mPickUp; + static daAlinkHIO_board_c0 const mBoard; + static daAlinkHIO_bottle_c0 const mBottle; + static daAlinkHIO_hookshot_c0 const mHookshot; + static daAlinkHIO_spinner_c0 const mSpinner; + static daAlinkHIO_ironBall_c0 const mIronBall; + static daAlinkHIO_copyRod_c0 const mCopyRod; + static daAlinkHIO_zwLight_c0 const mZoraArmorPL; + static daAlinkHIO_item_c1 const m; +}; + +class daAlinkHIO_item_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_item_c(); + ~daAlinkHIO_item_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_bow_c mBow; + /* 0x00 */ daAlinkHIO_boom_c mBoomerang; + /* 0x00 */ daAlinkHIO_bomb_c mBomb; + /* 0x00 */ daAlinkHIO_light_c mLanternPL; + /* 0x00 */ daAlinkHIO_kandelaar_c mLantern; + /* 0x00 */ daAlinkHIO_fmChain_c mFmChain; + /* 0x00 */ daAlinkHIO_magneBoots_c mIronBoots; + /* 0x00 */ daAlinkHIO_pickUp_c mPickUp; + /* 0x00 */ daAlinkHIO_board_c mBoard; + /* 0x00 */ daAlinkHIO_bottle_c mBottle; + /* 0x00 */ daAlinkHIO_hookshot_c mHookshot; + /* 0x00 */ daAlinkHIO_spinner_c mSpinner; + /* 0x00 */ daAlinkHIO_ironBall_c mIronBall; + /* 0x00 */ daAlinkHIO_copyRod_c mCopyRod; + /* 0x00 */ daAlinkHIO_light_c mZoraArmorPL; + /* 0x00 */ daAlinkHIO_item_c1 m; +#endif +}; + +class daAlinkHIO_ladder_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mWallAttachAnm; + /* 0x14 */ daAlinkHIO_anm_c mWallAttachMissAnm; + /* 0x28 */ f32 mClimbUpStartASpeed; + /* 0x2C */ f32 mClimbUpStartInterp; + /* 0x30 */ f32 mClimbUpEndASpeed; + /* 0x34 */ f32 mClimbUpEndInterp; + /* 0x38 */ f32 mClimbDownStartASpeed; + /* 0x3C */ f32 mClimbDownStartInterp; + /* 0x40 */ f32 mClimbDownEndASpeed; + /* 0x44 */ f32 mClimbDownEndInterp; + /* 0x48 */ f32 mMoveMinASpeed; + /* 0x4C */ f32 mMoveMaxSpeed; + /* 0x50 */ f32 mMoveInterp; + /* 0x54 */ f32 mClimbDownEndCF; + /* 0x58 */ f32 mClimbUpEndCF; + /* 0x5C */ f32 mWallHorizontalMinAnmSpeed; + /* 0x60 */ f32 mWallHorizontalMaxAnmSpeed; + /* 0x64 */ f32 mWallVerticalMinAnmSpeed; + /* 0x68 */ f32 mWallVerticalMaxAnmSpeed; + /* 0x6C */ f32 mWallApproachOffset; +}; // Size: 0x70 + +class daAlinkHIO_ladder_c0 { +public: + static daAlinkHIO_ladder_c1 const m; +}; + +class daAlinkHIO_ladder_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_ladder_c(); + ~daAlinkHIO_ladder_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_ladder_c1 m; +#endif +}; + +class daAlinkHIO_roofHang_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mRoofHangAnm; + /* 0x14 */ s16 mTurnAngleRate; + /* 0x16 */ s16 mMaxTurnAngle; + /* 0x18 */ s16 mMinTurnAngle; + /* 0x1C */ f32 mStandbyASpeed; + /* 0x20 */ f32 mStandbyInterp; + /* 0x24 */ f32 mVertMoveMinASpeed; + /* 0x28 */ f32 mVertMoveMaxASpeed; + /* 0x2C */ f32 mVertMoveInterp; + /* 0x30 */ f32 mVertMoveMinSpeed; + /* 0x34 */ f32 mVertMoveMaxSpeed; + /* 0x38 */ f32 mHorizMoveMinASpeed; + /* 0x3C */ f32 mHorizMoveMaxASpeed; + /* 0x40 */ f32 mHorizMoveInterp; + /* 0x44 */ f32 mInvertASpeed; + /* 0x48 */ f32 mInvertInterp; +}; // Size: 0x4C + +class daAlinkHIO_roofHang_c0 { +public: + static daAlinkHIO_roofHang_c1 const m; +}; + +class daAlinkHIO_roofHang_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_roofHang_c(); + ~daAlinkHIO_roofHang_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_roofHang_c1 m; +#endif +}; + +class daAlinkHIO_grab_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mPrepareAnm; + /* 0x14 */ daAlinkHIO_anm_c mLiftBackAnm; + /* 0x28 */ daAlinkHIO_anm_c mStandReverseAnm; + /* 0x3C */ daAlinkHIO_anm_c mLiftAnm; + /* 0x50 */ daAlinkHIO_anm_c mThrowAnm; + /* 0x64 */ daAlinkHIO_anm_c mCarryAnm; + /* 0x78 */ daAlinkHIO_anm_c mRecoilAnm; + /* 0x8C */ daAlinkHIO_anm_c mFailAnm; + /* 0xA0 */ daAlinkHIO_anm_c mCarryLiftAnm; + /* 0xB4 */ daAlinkHIO_anm_c mCarryPlaceReverseAnm; + /* 0xC8 */ daAlinkHIO_anm_c mIronBallThrowAnm; + /* 0xDC */ s16 mForceWeightSpec; + /* 0xDE */ s16 mFailStopTime; + /* 0xE0 */ f32 field_0xE0; +}; // Size: 0xE4 + +class daAlinkHIO_grab_c0 { +public: + static daAlinkHIO_grab_c1 const m; +}; + +class daAlinkHIO_grab_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_grab_c(); + ~daAlinkHIO_grab_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_grab_c1 m; +#endif +}; + +class daAlinkHIO_swim_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mFloatUpAnm; + /* 0x14 */ daAlinkHIO_anm_c mDiveAnm; + /* 0x28 */ daAlinkHIO_anm_c mUnderwaterDiveAnm; + /* 0x3C */ daAlinkHIO_anm_c mDashAnm; + /* 0x50 */ s16 mTurnRate; + /* 0x52 */ s16 mMinTurn; + /* 0x54 */ s16 mMaxTurn; + /* 0x56 */ s16 mUnderwaterTurnRate; + /* 0x58 */ s16 mUnderwaterMinTurn; + /* 0x5A */ s16 mUnderwaterMaxTurn; + /* 0x5C */ s16 field_0x5c; // related to dash + /* 0x5E */ s16 field_0x5e; // related to dash + /* 0x60 */ f32 mStartHeight; + /* 0x64 */ f32 mFloatUpHeight; + /* 0x68 */ f32 mForwardMaxSpeed; + /* 0x6C */ f32 mStrafeMaxSpeed; + /* 0x70 */ f32 mBackwardMaxSpeed; + /* 0x74 */ f32 mUnderwaterMaxSpeed; + /* 0x78 */ f32 mUnderwaterFallMaxSpeed; + /* 0x7C */ f32 mAcceleration; + /* 0x80 */ f32 mDeceleration; + /* 0x84 */ f32 mMaxFallSpeed; + /* 0x88 */ f32 mMaxFloatUpSpeed; + /* 0x8C */ f32 mBuoyancy; + /* 0x90 */ f32 mWaitAnmSpeed; + /* 0x94 */ f32 mWaitInterpolation; + /* 0x98 */ f32 mWaitUpDownShakeAmount; + /* 0x9C */ f32 mForwardMinAnmSpeed; + /* 0xA0 */ f32 mForwardMaxAnmSpeed; + /* 0xA4 */ f32 mStrafeMinAnmSpeed; + /* 0xA8 */ f32 mStrafeMaxAnmSpeed; + /* 0xAC */ f32 mBackwardMinAnmSpeed; + /* 0xB0 */ f32 mBackwardMaxAnmSpeed; + /* 0xB4 */ f32 mUnderwaterMinAnmSpeed; + /* 0xB8 */ f32 mUnderwaterMaxAnmSpeed; + /* 0xBC */ f32 mMoveInterpolation; + /* 0xC0 */ f32 mClimbHeight; + /* 0xC4 */ f32 mClimbWaterSurfaceUnder; + /* 0xC8 */ f32 mForwardMinSpeed; + /* 0xCC */ f32 mStandingMaxFallSpeed; + /* 0xD0 */ f32 mBootsMaxFallSpeed; + /* 0xD4 */ f32 mNormalBuoyancyWaterDepth; + /* 0xD8 */ f32 mZoraClothesBuoyancy; + /* 0xDC */ f32 mUnderwaterButtonAdditionalSpeed; + /* 0xE0 */ f32 mUnderwaterAdditionalAnmSpeed; + /* 0xE4 */ f32 mBootsGravity; + /* 0xE8 */ f32 mFloatUpSwimSpeedRate; + /* 0xEC */ f32 mDashMaxSpeed; + /* 0xF0 */ f32 mDashDeceleration; + /* 0xF4 */ f32 mDashMinAnmSpeed; + /* 0xF8 */ f32 mDashMaxAnmSpeed; +}; // Size: 0xFC + +class daAlinkHIO_swim_c0 { +public: + static daAlinkHIO_swim_c1 const m; +}; + +class daAlinkHIO_swim_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_swim_c(); + ~daAlinkHIO_swim_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_swim_c1 m; +#endif +}; + +class daAlinkHIO_wlMove_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mSlipAnm; + /* 0x14 */ daAlinkHIO_anm_c mReverseAnm; + /* 0x28 */ daAlinkHIO_anm_c mADashAnm; + /* 0x3C */ daAlinkHIO_anm_c mDashReboundAnm; + /* 0x50 */ s16 mTurnMax; + /* 0x52 */ s16 mTurnMin; + /* 0x54 */ s16 mTurnAngleRate; + /* 0x56 */ s16 mADashDuration; + /* 0x58 */ s16 mADashCooldownTime; + /* 0x5A */ s16 mADashDurationSlow; + /* 0x5C */ s16 mADashCooldownTimeSlow; + /* 0x5E */ s16 mADashDurationSlow2; + /* 0x60 */ s16 mADashCooldownTimeSlow2; + /* 0x64 */ f32 mMaxSpeed; + /* 0x68 */ f32 mAcceleration; + /* 0x6C */ f32 mDeceleration; + /* 0x70 */ f32 mIdleAnmSpeed; + /* 0x74 */ f32 mWalkAnmSpeed; + /* 0x78 */ f32 mBriskWalkAnmSpeed; + /* 0x7C */ f32 mRunAnmSpeed; + /* 0x80 */ f32 mQuickRunAnmSpeed; + /* 0x84 */ f32 mIdleToWalkRate; + /* 0x88 */ f32 mWalkToBriskWalkRate; + /* 0x8C */ f32 mStandbyRunToRunRate; + /* 0x90 */ f32 mRunToQuickRunRate; + /* 0x94 */ f32 mNormalInterpolation; + /* 0x98 */ f32 mWalkRunInterpolation; + /* 0x9C */ f32 mRunAnmMinBlendRate; + /* 0xA0 */ f32 mSlipStartRate; + /* 0xA4 */ f32 mSlipInitSpeedRate; + /* 0xA8 */ f32 mSlipDeceleration; + /* 0xAC */ f32 mReverseSpeed; + /* 0xB0 */ f32 mIdleReverseStartFrame; + /* 0xB4 */ f32 mGazeMaxSpeed; + /* 0xB8 */ f32 mGazeIdleAnmSpeed; + /* 0xBC */ f32 mIdleInterpolation; + /* 0xC0 */ f32 mReverseFallHeight; + /* 0xC4 */ f32 mReverseFallInterpolation; + /* 0xC8 */ f32 mADashMaxSpeed; + /* 0xCC */ f32 mADashQuickRunAnmSpeed; + /* 0xD0 */ f32 mADashAcceleration; + /* 0xD4 */ f32 mADashInitSpeed; + /* 0xD8 */ f32 mDashReboundHorizontalSpeed; + /* 0xDC */ f32 mDashReboundVerticalSpeed; + /* 0xE0 */ f32 mADashMaxSpeedSlow; + /* 0xE4 */ f32 mADashInitSpeedSlow; + /* 0xE8 */ f32 mADashQuickRunASpeedSlow; + /* 0xEC */ f32 mADashAccelerationSlow; + /* 0xF0 */ f32 mADashMaxSpeedSlow2; + /* 0xF4 */ f32 mADashInitSpeedSlow2; + /* 0xF8 */ f32 mADashQuickRunASpeedSlow2; + /* 0xFC */ f32 mADashAccelerationSlow2; +}; // Size: 0x100 + +class daAlinkHIO_wlMove_c0 { +public: + static daAlinkHIO_wlMove_c1 const m; +}; + +class daAlinkHIO_wlMove_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlMove_c(); + ~daAlinkHIO_wlMove_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_wlMove_c1 m; +#endif +}; + +class daAlinkHIO_wlMoveNoP_c1 { +public: + /* 0x00 */ s16 mTurnMax; + /* 0x02 */ s16 mTurnMin; + /* 0x04 */ s16 mTurnAngleRate; + /* 0x08 */ f32 mMaxSpeed; + /* 0x0C */ f32 mAcceleration; + /* 0x10 */ f32 mDeceleration; + /* 0x14 */ f32 mIdleAnmSpeed; + /* 0x18 */ f32 mWalkAnmSpeed; + /* 0x1C */ f32 mJogAnmSpeed; + /* 0x20 */ f32 mRunAnmSpeed; + /* 0x24 */ f32 mIdleToWalkRate; + /* 0x28 */ f32 mWalkToJogRate; + /* 0x2C */ f32 mJogToRunRate; + /* 0x30 */ f32 mWalkRunInterpolation; + /* 0x34 */ f32 mRunAnmMinBlendRate; + /* 0x38 */ f32 mSlideStartRate; + /* 0x3C */ f32 mSlideInitSpeed; + /* 0x40 */ f32 mSlideDeceleration; + /* 0x44 */ f32 mReverseSpeed; +}; // Size: 0x48 + +class daAlinkHIO_wlMoveNoP_c0 { +public: + static daAlinkHIO_wlMoveNoP_c1 const m; +}; + +class daAlinkHIO_wlMoveNoP_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlMoveNoP_c(); + ~daAlinkHIO_wlMoveNoP_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlMoveNoP_c1 m; +#endif +}; + +class daAlinkHIO_wlAtnMove_c1 { +public: + /* 0x00 */ s16 mTurnAngleMax; + /* 0x02 */ s16 mTurnAngleMin; + /* 0x04 */ s16 mTurnAngleRate; + /* 0x08 */ f32 mWalkAnmSpeed; + /* 0x0C */ f32 mRunAnmSpeed; + /* 0x10 */ f32 mWalkChangeRate; + /* 0x14 */ f32 mRunChangeRate; + /* 0x18 */ f32 mMaxSpeed; + /* 0x1C */ f32 mAcceleration; + /* 0x20 */ f32 mDeceleration; + /* 0x24 */ f32 mRearWalkAnmSpeed; + /* 0x28 */ f32 mRearWalkChangeRate; + /* 0x2C */ f32 mRearMaxSpeed; + /* 0x30 */ f32 mRearAcceleration; + /* 0x34 */ f32 mRearDeceleration; +}; // Size: 0x38 + +class daAlinkHIO_wlAtnMove_c0 { +public: + static daAlinkHIO_wlAtnMove_c1 const m; +}; + +class daAlinkHIO_wlAtnMove_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlAtnMove_c(); + ~daAlinkHIO_wlAtnMove_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlAtnMove_c1 m; +#endif +}; + +class daAlinkHIO_wlHowl_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mHowlAnm; + /* 0x14 */ daAlinkHIO_anm_c mSittingHowlAnm; + /* 0x28 */ daAlinkHIO_anm_c mThreatAnm; + /* 0x3C */ daAlinkHIO_anm_c mThreatStanceAnm; + /* 0x50 */ f32 mThreatMoveInterp; + /* 0x54 */ f32 mThreatMoveRate; + /* 0x58 */ f32 mThreatMoveMaxAnmSpeed; + /* 0x5C */ f32 mThreatMoveMinAnmSpeed; +}; // Size: 0x60 + +class daAlinkHIO_wlHowl_c0 { +public: + static daAlinkHIO_wlHowl_c1 const m; +}; + +class daAlinkHIO_wlHowl_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlHowl_c(); + ~daAlinkHIO_wlHowl_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlHowl_c1 m; +#endif +}; + +class daAlinkHIO_wlSideStep_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mSideJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mSideLandAnm; + /* 0x28 */ daAlinkHIO_anm_c mBackJumpAnm; + /* 0x3C */ daAlinkHIO_anm_c mBackLandAnm; + /* 0x50 */ f32 mSideJumpHorizSpeed; + /* 0x54 */ f32 mSideJumpVertSpeed; + /* 0x58 */ f32 mBackJumpHorizSpeed; + /* 0x5C */ f32 mBackJumpVertSpeed; + /* 0x60 */ f32 mFallHeight; + /* 0x64 */ f32 mFallInterp; +}; // Size: 0x68 + +class daAlinkHIO_wlSideStep_c0 { +public: + static daAlinkHIO_wlSideStep_c1 const m; +}; + +class daAlinkHIO_wlSideStep_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlSideStep_c(); + ~daAlinkHIO_wlSideStep_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlSideStep_c1 m; +#endif +}; + +class daAlinkHIO_wlBackJump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mBackJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mBackLandAnm; + /* 0x28 */ f32 mBackJumpHorizSpeed; + /* 0x2C */ f32 mBackJumpVertSpeed; + /* 0x30 */ f32 mFallHeight; + /* 0x34 */ f32 mFallInterp; +}; // Size: 0x38 + +class daAlinkHIO_wlBackJump_c0 { +public: + static daAlinkHIO_wlBackJump_c1 const m; +}; + +class daAlinkHIO_wlBackJump_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlBackJump_c(); + ~daAlinkHIO_wlBackJump_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlBackJump_c1 m; +#endif +}; + +class daAlinkHIO_wlAutoJump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mLandingAnm; + /* 0x28 */ daAlinkHIO_anm_c mClimbAnm; + /* 0x3C */ u8 mAlwaysMaxSpeedJump; + /* 0x3E */ s16 field_0x3e; + /* 0x40 */ s16 mJumpAngle; + /* 0x42 */ s16 mWeakJumpAngle; + /* 0x44 */ f32 mJumpLimitSpeed; + /* 0x48 */ f32 mJumpMinSpeed; + /* 0x4C */ f32 mJumpSpeedRate; + /* 0x50 */ f32 mJumpFallInterp; + /* 0x54 */ f32 mNormalFallInterp; + /* 0x58 */ f32 mGravity; + /* 0x5C */ f32 mMaxFallSpeed; + /* 0x60 */ f32 mWeakJumpAnmSpeed; + /* 0x64 */ f32 mWeakJumpLimitSpeed; + /* 0x68 */ f32 mWeakJumpMinSpeed; + /* 0x6C */ f32 mWeakJumpSpeedRate; + /* 0x70 */ f32 mJumpMaxSpeed; + /* 0x74 */ f32 mWeakJumpMaxSpeed; + /* 0x78 */ f32 mHangLimitHeight; +}; // size = 0x7C + +class daAlinkHIO_wlAutoJump_c0 { +public: + static daAlinkHIO_wlAutoJump_c1 const m; +}; + +class daAlinkHIO_wlAutoJump_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlAutoJump_c(); + ~daAlinkHIO_wlAutoJump_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlAutoJump_c1 m; +#endif +}; + +class daAlinkHIO_wlPush_c1 { +public: + /* 0x00 */ f32 mIdleAnmSpeed; + /* 0x04 */ f32 mIdleInterp; + /* 0x08 */ f32 mPushAnmSpeed; + /* 0x0C */ f32 mPushInterp; + /* 0x10 */ f32 mHeavyPushAnmSpeed; +}; // Size: 0x14 + +class daAlinkHIO_wlPush_c0 { +public: + static daAlinkHIO_wlPush_c1 const m; +}; + +class daAlinkHIO_wlPush_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlPush_c(); + ~daAlinkHIO_wlPush_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlPush_c1 m; +#endif +}; + +class daAlinkHIO_wlLie_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mSittingAnm; + /* 0x14 */ daAlinkHIO_anm_c mProneStartAnm; + /* 0x28 */ s16 mProneTurnRate; + /* 0x2A */ s16 mProneTurnMax; + /* 0x2C */ s16 mProneTurnMin; + /* 0x30 */ f32 mStandUpInterp; + /* 0x34 */ f32 mProneMoveRate; + /* 0x38 */ f32 mProneMaxAnmSpeed; + /* 0x3C */ f32 mProneMinAnmSpeed; + /* 0x40 */ f32 mProneMoveInterp; + /* 0x44 */ f32 mSittingIdleAnmSpeed; + /* 0x48 */ f32 mSittingIdleInterp; +}; // Size: 0x4C + +class daAlinkHIO_wlLie_c0 { +public: + static daAlinkHIO_wlLie_c1 const m; +}; + +class daAlinkHIO_wlLie_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlLie_c(); + ~daAlinkHIO_wlLie_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlLie_c1 m; +#endif +}; + +class daAlinkHIO_wlWallHang_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mPreGrabJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mClimbAnm; + /* 0x28 */ daAlinkHIO_anm_c mFallGrabAnm; + /* 0x3C */ daAlinkHIO_anm_c mWallGrabAnm; + /* 0x50 */ daAlinkHIO_anm_c mLedgeClimbAnm; + /* 0x64 */ daAlinkHIO_anm_c mLedgeLandAnm; + /* 0x78 */ f32 mAutoWalkHeight; + /* 0x7C */ f32 mSmallJumpHeight; + /* 0x80 */ f32 mWallGrabHeight; + /* 0x84 */ f32 mClimbHeight; + /* 0x88 */ f32 mHangingFootHeight; + /* 0x8C */ f32 mJumpHorizontalSpeed; + /* 0x90 */ f32 mJumpTargetHeightOffset; + /* 0x94 */ f32 mJumpToFallInterp; + /* 0x98 */ f32 mHangingFallInterp; +}; // Size: 0x9C + +class daAlinkHIO_wlWallHang_c0 { +public: + static daAlinkHIO_wlWallHang_c1 const m; +}; + +class daAlinkHIO_wlWallHang_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlWallHang_c(); + ~daAlinkHIO_wlWallHang_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlWallHang_c1 m; +#endif +}; + +class daAlinkHIO_wlDamNormal_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mForwardAnm; + /* 0x14 */ daAlinkHIO_anm_c mBackwardAnm; + /* 0x28 */ daAlinkHIO_anm_c mLeftAnm; + /* 0x3C */ daAlinkHIO_anm_c mRightAnm; + /* 0x50 */ f32 mInitSpeed; + /* 0x54 */ f32 mAttackSpeedRate; + /* 0x58 */ f32 mDeceleration; + /* 0x5C */ f32 mIceDamageAnmSpeed; +}; // Size: 0x60 + +class daAlinkHIO_wlDamNormal_c0 { +public: + static daAlinkHIO_wlDamNormal_c1 const m; +}; + +class daAlinkHIO_wlDamNormal_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlDamNormal_c(); + ~daAlinkHIO_wlDamNormal_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlDamNormal_c1 m; +#endif +}; + +class daAlinkHIO_wlDamLaHu_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mFrontRiseAnm; + /* 0x14 */ daAlinkHIO_anm_c mBackRiseAnm; + /* 0x28 */ daAlinkHIO_anm_c mLeftRiseAnm; + /* 0x3C */ daAlinkHIO_anm_c mRightRiseAnm; + /* 0x50 */ s16 mBodyRotationSpeed; + /* 0x54 */ f32 mGravity; + /* 0x58 */ f32 mDamageInterp; + /* 0x5C */ f32 mHorizontalSpeed; + /* 0x60 */ f32 mVerticalSpeed; + /* 0x64 */ f32 mBounceSpeed; + /* 0x68 */ f32 mDeceleration; +}; // Size: 0x6C + +class daAlinkHIO_wlDamLarge_c0 { +public: + static daAlinkHIO_wlDamLaHu_c1 const m; +}; + +class daAlinkHIO_wlDamHuge_c0 { +public: + static daAlinkHIO_wlDamLaHu_c1 const m; +}; + +class daAlinkHIO_wlDamLaHu_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlDamLaHu_c(int); + ~daAlinkHIO_wlDamLaHu_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlDamLaHu_c1 m; +#endif +}; + +class daAlinkHIO_wlDamCaught_c1 { +public: + /* 0x00 */ s16 mCaughtTime; + /* 0x02 */ s16 mInputDecayTime; + /* 0x04 */ f32 mCaughtSpeed; + /* 0x08 */ f32 mWaitInterp; + /* 0x0C */ f32 mWaitAddAnmSpeed; +}; // Size: 0x10 + +class daAlinkHIO_wlDamCaught_c0 { +public: + static daAlinkHIO_wlDamCaught_c1 const m; +}; + +class daAlinkHIO_wlDamCaught_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlDamCaught_c(); + ~daAlinkHIO_wlDamCaught_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlDamCaught_c1 m; +#endif +}; + +class daAlinkHIO_wlDamFall_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mLandingAnm; + /* 0x14 */ daAlinkHIO_anm_c mRightRiseAnm; + /* 0x28 */ s16 mSmallStopTime; + /* 0x2A */ s16 mLargeStopTime; + /* 0x2C */ f32 mSmallDamageHeight; + /* 0x30 */ f32 mLargeDamageHeight; + /* 0x34 */ f32 mSmallDamageLandingStartFrame; + /* 0x38 */ f32 mAirAnmTransitionHeight; + /* 0x3C */ f32 mAirAnmInterp; +}; // Size: 0x40 + +class daAlinkHIO_wlDamFall_c0 { +public: + static daAlinkHIO_wlDamFall_c1 const m; +}; + +class daAlinkHIO_wlDamFall_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlDamFall_c(); + ~daAlinkHIO_wlDamFall_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlDamFall_c1 m; +#endif +}; + +class daAlinkHIO_wlDamage_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mRunningAnm; + /* 0x14 */ daAlinkHIO_anm_c mPolygonAnm; + /* 0x28 */ f32 mReturnWakeupAnmSpeed; +}; // Size: 0x2C + +class daAlinkHIO_wlDamage_c0 { +public: + static daAlinkHIO_wlDamage_c1 const m; + static daAlinkHIO_wlDamNormal_c0 const mNormal; + static daAlinkHIO_wlDamLarge_c0 const mLarge; + static daAlinkHIO_wlDamHuge_c0 const mHuge; + static daAlinkHIO_wlDamFall_c0 const mFall; + static daAlinkHIO_wlDamCaught_c0 const mCapture; +}; + +class daAlinkHIO_wlDamage_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlDamage_c(); + ~daAlinkHIO_wlDamage_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_wlDamage_c1 m; +#endif + /* 0x00 */ daAlinkHIO_wlDamNormal_c mNormal; + /* 0x00 */ daAlinkHIO_wlDamLaHu_c mLarge; + /* 0x00 */ daAlinkHIO_wlDamLaHu_c mHuge; + /* 0x00 */ daAlinkHIO_wlDamFall_c mFall; + /* 0x00 */ daAlinkHIO_wlDamCaught_c mCapture; +}; + +class daAlinkHIO_wlSlide_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mFrontSlideAnm; + /* 0x14 */ daAlinkHIO_anm_c mBackSlideAnm; + /* 0x28 */ daAlinkHIO_anm_c mLandingAnm; + /* 0x3c */ daAlinkHIO_anm_c mSlipDownRecoveryAnm; + /* 0x50 */ s16 mSlipDownRotationMax; + /* 0x52 */ s16 mSlipDownRotationMin; + /* 0x54 */ f32 mMaxSpeed; + /* 0x58 */ f32 mAcceleration; + /* 0x5c */ f32 mSlidingAngle; + /* 0x60 */ f32 mClimbingAngle; + /* 0x64 */ f32 mClimbingAnmSpeed; + /* 0x68 */ f32 mClimbingMaxSpeed; + /* 0x6c */ f32 mClimbingAnmSpeedWeak; + /* 0x70 */ f32 mClimbingMaxSpeedWeak; + /* 0x74 */ f32 mSlipDownAcceleration; + /* 0x78 */ f32 mSlipDownMaxSpeed; +}; // Size: 0x7C + +class daAlinkHIO_wlSlide_c0 { +public: + static daAlinkHIO_wlSlide_c1 const m; +}; + +class daAlinkHIO_wlSlide_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlSlide_c(); + ~daAlinkHIO_wlSlide_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlSlide_c1 m; +#endif +}; + +class daAlinkHIO_wlRope_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mFlipAnm; + /* 0x14 */ s16 mSwingAngle; + /* 0x16 */ s16 mMovementSwayTransitionTime; + /* 0x18 */ f32 mMovementMinAnmSpeed; + /* 0x1c */ f32 mMovementMaxAnmSpeed; + /* 0x20 */ f32 mMovementInterpolation; + /* 0x24 */ f32 mMovementRate; + /* 0x28 */ f32 mTwistClimbAnmSpeed; + /* 0x2c */ f32 mFallInterpolation; + /* 0x30 */ f32 mTwistClimbInterpolation; + /* 0x34 */ f32 mBackMovementMaxAnmSpeed; +}; // Size: 0x38 + +class daAlinkHIO_wlRope_c0 { +public: + static daAlinkHIO_wlRope_c1 const m; +}; + +class daAlinkHIO_wlRope_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlRope_c(); + ~daAlinkHIO_wlRope_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlRope_c1 m; +#endif +}; + +class daAlinkHIO_wlAtWait_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mAttackAnm; + /* 0x14 */ s16 mStopTime; + /* 0x16 */ s16 mComboMidStopTime; + /* 0x18 */ f32 mSpeed; + /* 0x1C */ f32 mSpeedAddForward; + /* 0x20 */ f32 mAttackJudgmentStartForward; + /* 0x24 */ f32 mAttackJudgmentEndForward; + /* 0x28 */ f32 mComboMidCF; + /* 0x2C */ f32 mComboMidStartF; + /* 0x30 */ f32 mAttackRadiusOffset; + /* 0x34 */ f32 mAttackRadius; + /* 0x38 */ f32 mAttackHeight; +}; // Size: 0x3C + +class daAlinkHIO_wlAtWaTl_c0 { +public: + static daAlinkHIO_wlAtWait_c1 const m; +}; + +class daAlinkHIO_wlAtWaSc_c0 { +public: + static daAlinkHIO_wlAtWait_c1 const m; +}; + +class daAlinkHIO_wlAtWaLr_c0 { +public: + static daAlinkHIO_wlAtWait_c1 const m; +}; + +class daAlinkHIO_wlAtWait_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlAtWait_c(int, float); + ~daAlinkHIO_wlAtWait_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: + /* 0x34 */ f32 field_0x34; + /* 0x38 */ daAlinkHIO_wlAtWait_c1 m; +}; // Size: 0x74 + +class daAlinkHIO_wlAtRoll_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mAttackAnm; + /* 0x14 */ f32 mAttackRadius; + /* 0x18 */ f32 mAttackSpeed; + /* 0x1c */ f32 mSpiderThreadEscapeStartF; +}; // Size: 0x20 + +class daAlinkHIO_wlAtRoll_c0 { +public: + static daAlinkHIO_wlAtRoll_c1 const m; +}; + +class daAlinkHIO_wlAtRoll_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlAtRoll_c(); + ~daAlinkHIO_wlAtRoll_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_wlAtRoll_c1 m; +#endif +}; // Size: 0x54 + +class daAlinkHIO_wlAtNjump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mAerialAttackAnm; + /* 0x14 */ f32 mAttackInitSpeed; + /* 0x18 */ f32 mMaxHorizontalSpeed; + /* 0x1c */ f32 mMaxVerticalSpeed; + /* 0x20 */ f32 mMinVerticalSpeed; + /* 0x24 */ f32 mAerialAnmSpeed; + /* 0x28 */ f32 mAerialInterpolation; + /* 0x2c */ f32 mAttackRadiusOffset; + /* 0x30 */ f32 mAttackRadius; + /* 0x34 */ f32 mAttackHeight; + /* 0x38 */ f32 mMinHorizontalSpeed; +}; // Size: 0x3C + +class daAlinkHIO_wlAtNjump_c0 { +public: + static daAlinkHIO_wlAtNjump_c1 const m; +}; + +class daAlinkHIO_wlAtNjump_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlAtNjump_c(); + ~daAlinkHIO_wlAtNjump_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_wlAtNjump_c1 m; +#endif +}; // Size: 0x70 + +class daAlinkHIO_wlAtCjump_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mAerialAttackAnm; + /* 0x14 */ daAlinkHIO_anm_c mFlipKickAnm; + /* 0x28 */ f32 mAttackInitSpeed; + /* 0x2c */ f32 mMaxHorizontalSpeed; + /* 0x30 */ f32 mMaxVerticalSpeed; + /* 0x34 */ f32 mMinVerticalSpeed; + /* 0x38 */ f32 mAerialAnmSpeed; + /* 0x3c */ f32 mAerialInterpolation; + /* 0x40 */ f32 mFlipKickPostStartF; + /* 0x44 */ f32 mFlipKickPostAnmSpeed; + /* 0x48 */ f32 mAttackRadiusOffset; + /* 0x4c */ f32 mAttackRadius; + /* 0x50 */ f32 mAttackHeight; + /* 0x54 */ f32 mMinHorizontalSpeed; + /* 0x58 */ f32 mHitDecelRate; + /* 0x5c */ f32 mHitMinSpeed; + /* 0x60 */ f32 mHitDecel; +}; // Size: 0x64 + +class daAlinkHIO_wlAtCjump_c0 { +public: + static daAlinkHIO_wlAtCjump_c1 const m; +}; + +class daAlinkHIO_wlAtCjump_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlAtCjump_c(); + ~daAlinkHIO_wlAtCjump_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_wlAtCjump_c1 m; +#endif +}; // Size: 0x98 + +class daAlinkHIO_wlAtLand_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mNormalLandingAnm; + /* 0x14 */ daAlinkHIO_anm_c mFrontSlideAnm; + /* 0x28 */ daAlinkHIO_anm_c mBackSlideAnm; + /* 0x3C */ f32 mSlideDeceleration; +}; // Size: 0x40 + +class daAlinkHIO_wlAtLand_c0 { +public: + static daAlinkHIO_wlAtLand_c1 const m; +}; + +class daAlinkHIO_wlAtLand_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlAtLand_c(); + ~daAlinkHIO_wlAtLand_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_wlAtLand_c1 m; +#endif +}; // Size: 0x74 + +class daAlinkHIO_wlAtDown_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mLowStanceAnm; + /* 0x14 */ daAlinkHIO_anm_c mPushDownAnm; + /* 0x28 */ daAlinkHIO_anm_c mFrontRollAnm; + /* 0x3C */ daAlinkHIO_anm_c mCrouchAnm; + /* 0x50 */ daAlinkHIO_anm_c mBackRollAnm; + /* 0x64 */ daAlinkHIO_anm_c mRollOverAnm; + /* 0x78 */ daAlinkHIO_anm_c mProneGetUpAnm; + /* 0x8C */ s16 field_0x8C; + /* 0x8E */ s16 mFallDuration; + /* 0x90 */ f32 mSideRollMovementWidth; + /* 0x94 */ f32 mLandingSideRollMovementWidth; + /* 0x98 */ f32 mLandingFrontBackMovementWidth; +}; // Size: 0x9C + +class daAlinkHIO_wlAtDown_c0 { +public: + static daAlinkHIO_wlAtDown_c1 const m; +}; + +class daAlinkHIO_wlAtDown_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlAtDown_c(); + ~daAlinkHIO_wlAtDown_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_wlAtDown_c1 m; +#endif +}; // Size: 0xD0 + +class daAlinkHIO_wlAtLock_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mFrontLandingAnm; + /* 0x14 */ daAlinkHIO_anm_c mRearLandingAnm; + /* 0x28 */ s16 mAutoActivationTime; + /* 0x2C */ f32 mStartRadius; + /* 0x30 */ f32 mMaxRadius; + /* 0x34 */ f32 mRadiusAcceleration; + /* 0x38 */ f32 mAttackSpeed; + /* 0x3C */ f32 mAttackRadiusOffset; + /* 0x40 */ f32 mAttackRadius; + /* 0x44 */ f32 mAttackHeight; + /* 0x48 */ f32 mGravity; + /* 0x4C */ f32 mMaxJumpHeight; + /* 0x50 */ f32 mMaxJumpDistance; +}; // Size: 0x54 + +class daAlinkHIO_wlAtLock_c0 { +public: + static daAlinkHIO_wlAtLock_c1 const m; +}; + +class daAlinkHIO_wlAtLock_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlAtLock_c(); + ~daAlinkHIO_wlAtLock_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_wlAtLock_c1 m; +#endif +}; // Size: 0x88 + +class daAlinkHIO_wlAtBite_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mBitePreparationAnm; + /* 0x14 */ daAlinkHIO_anm_c mHangingBitePreparationAnm; + /* 0x28 */ s16 mBiteAttachTime; + /* 0x2A */ s16 field_0x2A; + /* 0x2C */ f32 mEnemyBiteThrowAnmSpeed; + /* 0x30 */ f32 mEnemyBiteThrowInterpolation; + /* 0x34 */ f32 mEnemyBiteThrowCF; + /* 0x38 */ f32 mBitePreparationMidStartF; + /* 0x3C */ f32 mBiteMidAnmSpeedMin; + /* 0x40 */ f32 mHangingBiteMidAnmSpeedMin; + /* 0x44 */ f32 mBiteMidAnmSpeedMax; + /* 0x48 */ f32 mHangingBiteMidAnmSpeedMax; + /* 0x4C */ f32 mBiteMidAnmSpeedAcceleration; + /* 0x50 */ f32 mHangingBiteMidAnmSpeedAcceleration; + /* 0x54 */ f32 mBiteMidAnmSpeedDeceleration; + /* 0x58 */ f32 mHangingBiteMidAnmSpeedDeceleration; +}; // Size: 0x5C + +class daAlinkHIO_wlAtBite_c0 { +public: + static daAlinkHIO_wlAtBite_c1 const m; +}; + +class daAlinkHIO_wlAtBite_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlAtBite_c(); + ~daAlinkHIO_wlAtBite_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_wlAtBite_c1 m; +#endif +}; // Size: 0x90 + +class daAlinkHIO_wlAttack_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mJumpBackLandAnm; + /* 0x14 */ s16 mChargeTime; + /* 0x16 */ s16 mComboDuration; + /* 0x18 */ f32 mFallHeight; + /* 0x1C */ f32 mFallInterpolation; + /* 0x20 */ f32 mReadyInterpolation; + /* 0x24 */ f32 mAttackRange; + /* 0x28 */ f32 mJumpBackSpeedH; + /* 0x2C */ f32 mJumpBackSpeedV; + /* 0x30 */ f32 mJumpAttackSpeedV; + /* 0x34 */ f32 mJumpAttackSpeedH; +}; // Size: 0x38 + +class daAlinkHIO_wlAttack_c0 { +public: + static daAlinkHIO_wlAtWaLr_c0 const mHorizontalAttack; + static daAlinkHIO_wlAtWaSc_c0 const mScratchAttack; + static daAlinkHIO_wlAtWaTl_c0 const mTailAttack; + static daAlinkHIO_wlAtRoll_c0 const mAtRoll; + static daAlinkHIO_wlAtNjump_c0 const mWlAtNjump; + static daAlinkHIO_wlAtCjump_c0 const mWlAtCjump; + static daAlinkHIO_wlAtLand_c0 const mWlAtLand; + static daAlinkHIO_wlAtDown_c0 const mWlAtDown; + static daAlinkHIO_wlAtLock_c0 const mWlAtLock; + static daAlinkHIO_wlAtBite_c0 const mWlAtBite; + static daAlinkHIO_wlAttack_c1 const m; +}; + +class daAlinkHIO_wlAttack_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlAttack_c(); + ~daAlinkHIO_wlAttack_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: + /* 0x034 */ daAlinkHIO_wlAtWait_c mHorizontalAttack; + /* 0x0A8 */ daAlinkHIO_wlAtWait_c mScratchAttack; + /* 0x11C */ daAlinkHIO_wlAtWait_c mTailAttack; + /* 0x190 */ daAlinkHIO_wlAtRoll_c mAtRoll; + /* 0x1E4 */ daAlinkHIO_wlAtNjump_c mWlAtNjump; + /* 0x254 */ daAlinkHIO_wlAtCjump_c mWlAtCjump; + /* 0x2EC */ daAlinkHIO_wlAtLand_c mWlAtLand; + /* 0x360 */ daAlinkHIO_wlAtDown_c mWlAtDown; + /* 0x430 */ daAlinkHIO_wlAtLock_c mWlAtLock; + /* 0x4B8 */ daAlinkHIO_wlAtBite_c mWlAtBite; + /* 0x548 */ daAlinkHIO_wlAttack_c1 m; +}; + +class daAlinkHIO_wlPoint_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mForwardJumpAnm; + /* 0x14 */ daAlinkHIO_anm_c mBackwardJumpAnm; + /* 0x28 */ daAlinkHIO_anm_c mLandingAnm; + /* 0x3C */ daAlinkHIO_anm_c mTagLandingAnm; + /* 0x50 */ s16 mLockJumpStopTime; + /* 0x54 */ f32 mIdleAnmSpeed; + /* 0x58 */ f32 mIdleInterpolation; + /* 0x5C */ f32 mAerialInterpolation; + /* 0x60 */ f32 mJumpSpeed; + /* 0x64 */ f32 mFailureJumpSpeed; + /* 0x68 */ f32 mTagJumpSpeed; + /* 0x6C */ f32 mLockLandingIceInitSpeed; + /* 0x70 */ f32 mLockLandingIceDecelRate; + /* 0x74 */ f32 mLockLandingIceMaxDecel; + /* 0x78 */ f32 mLockLandingIceMinDecel; +}; // Size: 0x7C + +class daAlinkHIO_wlPoint_c0 { +public: + static daAlinkHIO_wlPoint_c1 const m; +}; + +class daAlinkHIO_wlPoint_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlPoint_c(); + ~daAlinkHIO_wlPoint_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlPoint_c1 m; +#endif +}; + +class daAlinkHIO_wlChain_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mLoweringStartAnm; + /* 0x14 */ daAlinkHIO_anm_c mDigAnm; + /* 0x28 */ daAlinkHIO_anm_c mDigFallAnm; + /* 0x3C */ s16 mTensionWaitTime; + /* 0x3E */ s16 mReleaseWaitTime; + /* 0x40 */ f32 mWaitAnmSpeed; + /* 0x44 */ f32 mWaitInterp; + /* 0x48 */ f32 mSwingAnmSpeed; + /* 0x4C */ f32 mSwingInterp; + /* 0x50 */ f32 mFallSpeed; + /* 0x54 */ f32 mSniffAnmSpeed; + /* 0x58 */ f32 mSniffInterp; +}; // Size: 0x5C + +class daAlinkHIO_wlChain_c0 { +public: + static daAlinkHIO_wlChain_c1 const m; +}; + +class daAlinkHIO_wlChain_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlChain_c(); + ~daAlinkHIO_wlChain_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlChain_c1 m; +#endif +}; + +class daAlinkHIO_wlSwim_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mSurfacingAnm; + /* 0x14 */ daAlinkHIO_anm_c mWaterSplashIdleAnm; + /* 0x28 */ daAlinkHIO_anm_c mDashAnm; + /* 0x3C */ s16 mTurnRate; + /* 0x3E */ s16 mTurnMin; + /* 0x40 */ s16 mTurnMax; + /* 0x42 */ s16 mIdleTurnRate; + /* 0x44 */ s16 mIdleTurnMin; + /* 0x46 */ s16 mIdleTurnMax; + /* 0x48 */ f32 mStartHeight; + /* 0x4C */ f32 mSurfacingHeight; + /* 0x50 */ f32 mMaxSpeed; + /* 0x54 */ f32 mDeceleration; + /* 0x58 */ f32 mMaxFallSpeed; + /* 0x5C */ f32 mMaxSurfacingSpeed; + /* 0x60 */ f32 mBuoyancy; + /* 0x64 */ f32 mIdleAnmSpeed; + /* 0x68 */ f32 mIdleInterp; + /* 0x6C */ f32 mIdleUpDownSwayAmount; + /* 0x70 */ f32 mMoveMinAnmSpeed; + /* 0x74 */ f32 mMoveMaxAnmSpeed; + /* 0x78 */ f32 mMoveInterp; + /* 0x7C */ f32 mClimbHeight; + /* 0x80 */ f32 mMaxSpeedWeak; + /* 0x84 */ f32 mDecelerationWeak; + /* 0x88 */ f32 mIdleAnmSpeedWeak; + /* 0x8C */ f32 mMoveMinAnmSpeedWeak; + /* 0x90 */ f32 mMoveMaxAnmSpeedWeak; + /* 0x94 */ f32 mClimbBelowWaterSurface; + /* 0x98 */ f32 mHeavyIdleUpDownSwayAmount; + /* 0x9C */ f32 mHeavyBuoyancy; + /* 0xA0 */ f32 mHeavyMaxFallSpeed; + /* 0xA4 */ f32 mHeavyMaxSurfacingSpeed; +}; // Size: 0xA8 + +class daAlinkHIO_wlSwim_c0 { +public: + static daAlinkHIO_wlSwim_c1 const m; +}; + +class daAlinkHIO_wlSwim_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlSwim_c(); + ~daAlinkHIO_wlSwim_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlSwim_c1 m; +#endif +}; + +class daAlinkHIO_wlGrab_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mPotGrabAnm; + /* 0x14 */ daAlinkHIO_anm_c mPotReleaseAnm; + /* 0x28 */ daAlinkHIO_anm_c mBoneGrabAnm; + /* 0x3C */ daAlinkHIO_anm_c mBoneReleaseAnm; + /* 0x50 */ daAlinkHIO_anm_c mThrowAnm; +}; // Size: 0x64 + +class daAlinkHIO_wlGrab_c0 { +public: + static daAlinkHIO_wlGrab_c1 const m; +}; + +class daAlinkHIO_wlGrab_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlGrab_c(); + ~daAlinkHIO_wlGrab_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlGrab_c1 m; +#endif +}; + +class daAlinkHIO_wlBall_c1 { +public: + /* 0x00 */ daAlinkHIO_anm_c mFullBodyAnm; + /* 0x14 */ daAlinkHIO_anm_c mNeckAnm; + /* 0x28 */ s16 mMpConsumptionTime; + /* 0x2C */ f32 mLifeOrbGravity; + /* 0x30 */ f32 mLifeOrbHorizSpeed; + /* 0x34 */ f32 mLifeOrbVertSpeed; +}; // Size: 0x38 + +class daAlinkHIO_wlBall_c0 { +public: + static daAlinkHIO_wlBall_c1 const m; +}; + +class daAlinkHIO_wlBall_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wlBall_c(); + ~daAlinkHIO_wlBall_c(); + + virtual void genMessage(JORMContext*); +#endif + +public: +#if DEBUG + /* 0x00 */ daAlinkHIO_wlBall_c1 m; +#endif +}; + +class daAlinkHIO_wolf_c1 { +public: + /* 0x00 */ s16 mMaxNeckTurnH; + /* 0x02 */ s16 mMaxNeckTurnUp; + /* 0x04 */ s16 mMaxNeckTurnDown; + /* 0x06 */ s16 mMaxTiredNeckTurnH; + /* 0x08 */ s16 mMaxTiredNeckTurnUp; + /* 0x0A */ s16 mMaxTiredNeckTurnDown; + /* 0x0C */ s16 mSensesLingerTime; // ? + /* 0x0E */ s16 mLightDropR; + /* 0x10 */ s16 mLightDropG; + /* 0x12 */ s16 mLightDropB; + /* 0x14 */ f32 mUnderwaterInputRate; +}; // Size: 0x18 + +class daAlinkHIO_wolf_c0 { +public: + static daAlinkHIO_wlMove_c0 const mWlMove; + static daAlinkHIO_wlMoveNoP_c0 const mWlMoveNoP; + static daAlinkHIO_wlAtnMove_c0 const mWlAtnMove; + static daAlinkHIO_wlSideStep_c0 const mWlSideStep; + static daAlinkHIO_wlBackJump_c0 const mWlBackJump; + static daAlinkHIO_wlHowl_c0 const mWlHowl; + static daAlinkHIO_wlAutoJump_c0 const mWlAutoJump; + static daAlinkHIO_wlPush_c0 const mWlPush; + static daAlinkHIO_wlLie_c0 const mWlLie; + static daAlinkHIO_wlLight_c0 const mLight; + static daAlinkHIO_wlWallHang_c0 const mWlWallHang; + static daAlinkHIO_wlDamage_c0 const mWlDamage; + static daAlinkHIO_wlSlide_c0 const mWlSlide; + static daAlinkHIO_wlRope_c0 const mWlRope; + static daAlinkHIO_wlAttack_c0 const mWlAttack; + static daAlinkHIO_wlPoint_c0 const mWlPoint; + static daAlinkHIO_wlChain_c0 const mWlChain; + static daAlinkHIO_wlSwim_c0 const mWlSwim; + static daAlinkHIO_wlGrab_c0 const mWlGrab; + static daAlinkHIO_wlBall_c0 const mWlBall; + static daAlinkHIO_wolf_c1 const m; +}; + +class daAlinkHIO_wolf_c : public daAlinkHIO_data_c { +public: +#if DEBUG + daAlinkHIO_wolf_c(); + ~daAlinkHIO_wolf_c(); + + virtual void genMessage(JORMContext*); +#else + ~daAlinkHIO_wolf_c(); +#endif + +public: +#if DEBUG + /* 0x34 */ daAlinkHIO_wlMove_c mWlMove; + /* 0x00 */ daAlinkHIO_wlMoveNoP_c mWlMoveNoP; + /* 0x00 */ daAlinkHIO_wlAtnMove_c mWlAtnMove; + /* 0x00 */ daAlinkHIO_wlSideStep_c mWlSideStep; + /* 0x00 */ daAlinkHIO_wlBackJump_c mWlBackJump; + /* 0x00 */ daAlinkHIO_wlHowl_c mWlHowl; + /* 0x00 */ daAlinkHIO_wlAutoJump_c mWlAutoJump; + /* 0x00 */ daAlinkHIO_wlPush_c mWlPush; + /* 0x00 */ daAlinkHIO_wlLie_c mWlLie; + /* 0x00 */ daAlinkHIO_light_c mLight; + /* 0x00 */ daAlinkHIO_wlWallHang_c mWlWallHang; + /* 0x00 */ daAlinkHIO_wlDamage_c mWlDamage; + /* 0x00 */ daAlinkHIO_wlSlide_c mWlSlide; + /* 0x00 */ daAlinkHIO_wlRope_c mWlRope; + /* 0x00 */ daAlinkHIO_wlAttack_c mWlAttack; + /* 0x00 */ daAlinkHIO_wlPoint_c mWlPoint; + /* 0x00 */ daAlinkHIO_wlChain_c mWlChain; + /* 0x00 */ daAlinkHIO_wlSwim_c mWlSwim; + /* 0x00 */ daAlinkHIO_wlGrab_c mWlGrab; + /* 0x00 */ daAlinkHIO_wlBall_c mWlBall; + /* 0x00 */ daAlinkHIO_wolf_c1 m; +#endif +}; + +class daAlinkHIO_c +#if DEBUG + : public mDoHIO_entry_c +#endif +{ +public: + daAlinkHIO_c(); + virtual ~daAlinkHIO_c(); + + void jumpStateUpdate(const cXyz*, const cXyz*, f32); + void genMessage(JORMContext*); +#if DEBUG + void readFileData(char*); + size_t makeFileOutData(char*, char*); + void listenPropertyEvent(const JORPropertyEvent*); + + enum PropertyID_e { + PROPERTY_POS_DISP_e = 0x4000002, + PROPERTY_RESET_e = 0x4000003, + PROPERTY_SAVE_FILE_e = 0x4000004, + PROPERTY_LOAD_FILE_e = 0x4000005, + PROPERTY_JUMP_HDIST_DISP_e = 0x4000006, + PROPERTY_JUMP_VDIST_DISP_e = 0x4000007, + }; + + /* 0x0008 */ daAlinkHIO_basic_c mBasic; + /* 0x0094 */ daAlinkHIO_move_c mMove; + /* 0x0120 */ daAlinkHIO_atnMove_c mAtnMove; + /* 0x01A8 */ daAlinkHIO_noActAtnMove_c mNoActAtnMove; + /* 0x0230 */ daAlinkHIO_frontRoll_c mFrontRoll; + /* 0x02D4 */ daAlinkHIO_backJump_c mBackJump; + /* 0x0340 */ daAlinkHIO_sideStep_c mSideStep; + /* 0x03DC */ daAlinkHIO_slide_c mSlide; + /* 0x0488 */ daAlinkHIO_cut_c mCut; + /* 0x0FFC */ daAlinkHIO_guard_c mGuard; + /* 0x11C8 */ daAlinkHIO_crouch_c mCrouch; + /* 0x1248 */ daAlinkHIO_autoJump_c mAutoJump; + /* 0x1330 */ daAlinkHIO_wallHang_c mWallHang; + /* 0x1528 */ daAlinkHIO_pushpull_c mPushpull; + /* 0x1598 */ daAlinkHIO_damage_c mDamage; + /* 0x1A90 */ daAlinkHIO_horse_c mHorse; + /* 0x1B30 */ daAlinkHIO_canoe_c mCanoe; + /* 0x1BAC */ daAlinkHIO_item_c mItem; + /* 0x2420 */ daAlinkHIO_ladder_c mLadder; + /* 0x24C4 */ daAlinkHIO_roofHang_c mRoofHang; + /* 0x2544 */ daAlinkHIO_grab_c mGrab; + /* 0x265C */ daAlinkHIO_swim_c mSwim; + /* 0x278C */ daAlinkHIO_wolf_c mWolf; +#else + // TODO: What's with these first few members on retail? + // The individual HIO members (e.g. mCut) have their class changed on retail compared to debug (_c -> _c0). + // But it seems like the debug _c members might also exist on retail based on the dtor. + // But they can't have the same name as they do on debug since those names are reserved for the _c0 version. + /* 0x04 */ u8 field_0x4[0xC - 0x4]; + /* 0x0C */ daAlinkHIO_cut_c mCut_2; + /* 0x0D */ u8 field_0xD[0x4B - 0xD]; + /* 0x4B */ daAlinkHIO_wolf_c mWolf_2; + + daAlinkHIO_basic_c0 mBasic; + daAlinkHIO_move_c0 mMove; + daAlinkHIO_atnMove_c0 mAtnMove; + daAlinkHIO_noActAtnMove_c0 mNoActAtnMove; + daAlinkHIO_frontRoll_c0 mFrontRoll; + daAlinkHIO_backJump_c0 mBackJump; + daAlinkHIO_sideStep_c0 mSideStep; + daAlinkHIO_slide_c0 mSlide; + daAlinkHIO_cut_c0 mCut; + daAlinkHIO_guard_c0 mGuard; + daAlinkHIO_crouch_c0 mCrouch; + daAlinkHIO_autoJump_c0 mAutoJump; + daAlinkHIO_wallHang_c0 mWallHang; + daAlinkHIO_pushpull_c0 mPushpull; + daAlinkHIO_damage_c0 mDamage; + daAlinkHIO_horse_c0 mHorse; + daAlinkHIO_canoe_c0 mCanoe; + daAlinkHIO_item_c0 mItem; + daAlinkHIO_ladder_c0 mLadder; + daAlinkHIO_roofHang_c0 mRoofHang; + daAlinkHIO_grab_c0 mGrab; + daAlinkHIO_swim_c0 mSwim; + daAlinkHIO_wolf_c0 mWolf; + + u8 padding[0x6C - 0x64]; +#endif +}; + static bool daAlink_checkLightBallA(fopAc_ac_c* i_actor); static bool daAlink_checkLightBallB(fopAc_ac_c* i_actor); static fopAc_ac_c* daAlink_searchCoach(fopAc_ac_c* i_actor, void* param_1); diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index fdbb0bc0f7d..0b3dbed490c 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -7,6 +7,29 @@ struct ResTIMG; +class daPy_frameCtrl_c : public J3DFrameCtrl { +public: + virtual ~daPy_frameCtrl_c() {} + daPy_frameCtrl_c() {} + bool checkAnmEnd(); + void updateFrame(); + void setFrameCtrl(u8 i_attribute, s16 i_start, s16 i_end, f32 i_rate, f32 i_frame); + + u16 getEndFlg() const { return mEndFlg; } + u16 getNowSetFlg() const { return mNowSetFlg; } + void onEndFlg() { mEndFlg = 1; } + void onNowSetFlg() { mNowSetFlg = 1; } + void offNowSetFlg() { mNowSetFlg = 0; } + void offEndFlg() { + mEndFlg = 0; + mNowSetFlg = 0; + } + +private: + /* 0x14 */ u16 mEndFlg; + /* 0x16 */ u16 mNowSetFlg; +}; + class daPy_sightPacket_c : public dDlst_base_c { public: daPy_sightPacket_c() {} @@ -111,29 +134,6 @@ class daPy_actorKeep_c { /* 0x4 */ fopAc_ac_c* mActor; }; // Size: 0x8 -class daPy_frameCtrl_c : public J3DFrameCtrl { -public: - virtual ~daPy_frameCtrl_c() {} - daPy_frameCtrl_c() {} - bool checkAnmEnd(); - void updateFrame(); - void setFrameCtrl(u8 i_attribute, s16 i_start, s16 i_end, f32 i_rate, f32 i_frame); - - u16 getEndFlg() const { return mEndFlg; } - u16 getNowSetFlg() const { return mNowSetFlg; } - void onEndFlg() { mEndFlg = 1; } - void onNowSetFlg() { mNowSetFlg = 1; } - void offNowSetFlg() { mNowSetFlg = 0; } - void offEndFlg() { - mEndFlg = 0; - mNowSetFlg = 0; - } - -private: - /* 0x14 */ u16 mEndFlg; - /* 0x16 */ u16 mNowSetFlg; -}; - class Z2WolfHowlMgr; class daBoomerang_c; diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index 712aa3c47ab..4f97961dde9 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -239,13 +239,6 @@ class dBgS_Acch : public cBgS_Chk, public dBgS_Chk { /* 0x1D4 */ u8 m_wtr_mode; }; // Size: 0x1D8 -class dBgS_LinkAcch : public dBgS_Acch { -public: - dBgS_LinkAcch() { SetLink(); } - - virtual ~dBgS_LinkAcch() {} -}; - class dBgS_ObjAcch : public dBgS_Acch { public: dBgS_ObjAcch() { @@ -255,6 +248,13 @@ class dBgS_ObjAcch : public dBgS_Acch { virtual ~dBgS_ObjAcch() {} }; // Size: 0x1D8 +class dBgS_LinkAcch : public dBgS_Acch { +public: + dBgS_LinkAcch() { SetLink(); } + + virtual ~dBgS_LinkAcch() {} +}; + STATIC_ASSERT(sizeof(dBgS_ObjAcch) == 0x1D8); class dBgS_StatueAcch : public dBgS_Acch { diff --git a/include/d/d_jnt_col.h b/include/d/d_jnt_col.h index 763b41db529..c239bf8a695 100644 --- a/include/d/d_jnt_col.h +++ b/include/d/d_jnt_col.h @@ -2,6 +2,7 @@ #define D_D_JNT_COL_H #include "JSystem/J3DGraphAnimator/J3DModel.h" +#include "JSystem/JHostIO/JORReflexible.h" #include "SSystem/SComponent/c_m3d_g_lin.h" #include "SSystem/SComponent/c_sxyz.h" @@ -33,7 +34,7 @@ class dJntCol_c { bool checkShieldType(int i) { return getType(i) == 3; } s8 getType(int i) { return mData[i].mType; } - int getJntNum(int i) { return mData[i].mJntNum; } + int getJntNum(int i) { return (s16)mData[i].mJntNum; } /* 0x00 */ const dJntColData_c* mData; /* 0x04 */ J3DModel* mModel; diff --git a/include/d/d_particle.h b/include/d/d_particle.h index fc52a637ea2..ab8a3be5742 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -6,7 +6,7 @@ #include "JSystem/JParticle/JPAEmitter.h" #include "JSystem/JParticle/JPAParticle.h" #include "d/d_particle_name.h" -#include "d/d_kankyo.h" +#include "d/d_kankyo_tev_str.h" void dPa_cleanupGX(); diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch index 6da4ed7986a..f360763e7c0 100644 --- a/include/d/dolzel_base.pch +++ b/include/d/dolzel_base.pch @@ -4,26 +4,28 @@ // Fixes weak .bss #include "weak_bss_1109_to_1009.h" // IWYU pragma: export -// Fixes weak .data -#include // IWYU pragma: export -#include // IWYU pragma: export -#include "JSystem/J3DGraphBase/J3DMatBlock.h" // IWYU pragma: export -#include "Z2AudioLib/Z2Calc.h" // IWYU pragma: export - -// Fixes weak function/RTTI ordering #include // IWYU pragma: export #include // IWYU pragma: export +// Provides float constants from sqrt implementation +#include // IWYU pragma: export +// Provides signaling NaN constants +#include // IWYU pragma: export #include "Z2AudioLib/Z2AudioArcLoader.h" // IWYU pragma: export #include "JSystem/JAudio2/JAUStreamAramMgr.h" // IWYU pragma: export #include "JSystem/JKernel/JKRDisposer.h" // IWYU pragma: export #include "JSystem/JGadget/linklist.h" // IWYU pragma: export +#include "JSystem/JUtility/JUTGamePad.h" // IWYU pragma: export +// Provides AttnArr (u8 array) +#include "JSystem/J3DGraphBase/J3DMatBlock.h" // IWYU pragma: export +// Provides Z2Calc::cNullVec +#include "Z2AudioLib/Z2Calc.h" // IWYU pragma: export +#include "JSystem/J3DGraphBase/J3DTexture.h" // IWYU pragma: export #include "JSystem/J3DGraphBase/J3DPacket.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DAnimation.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export -#include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DShapeTable.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DJoint.h" // IWYU pragma: export -#include "JSystem/JUtility/JUTGamePad.h" // IWYU pragma: export +#include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" // IWYU pragma: export #include "JSystem/J3DGraphBase/J3DSys.h" // IWYU pragma: export #include "JSystem/JHostIO/JHICommonMem.h" // IWYU pragma: export #include "JSystem/JHostIO/JORReflexible.h" // IWYU pragma: export @@ -36,7 +38,10 @@ #include "SSystem/SComponent/c_m3d_g_cyl.h" // IWYU pragma: export #include "m_Do/m_Do_hostIO.h" // IWYU pragma: export #include "f_op/f_op_actor.h" // IWYU pragma: export +#include "JSystem/JParticle/JPAEmitter.h" // IWYU pragma: export +#include "JSystem/JParticle/JPAParticle.h" // IWYU pragma: export #include "d/d_bg_s_gnd_chk.h" // IWYU pragma: export +#include "d/d_particle.h" // IWYU pragma: export #include "d/d_bg_s_chk.h" // IWYU pragma: export #include "d/d_bg_w.h" // IWYU pragma: export #include "d/d_drawlist.h" // IWYU pragma: export diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index f0041d01d65..e6f8548beff 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -63,8 +63,6 @@ BOOL daAlink_c::getE3Zhint() { return false; } -#include "d/actor/d_a_alink_HIO.inc" - #if DEBUG static BOOL l_debugMode; #endif @@ -85,6 +83,11 @@ static const char l_cWShdArcName[] = "CWShd"; static const char l_sWShdArcName[] = "SWShd"; +#include "d/actor/d_a_alink_HIO.inc" + +static const f32 l_boardSlopeAngleMin = 910.0f; +static const f32 l_boardSlopeRowAngleMin = 2000.0f; + static const char l_arcName[] = "Alink"; const char* daAlink_c::getAlinkArcName() { @@ -96,8 +99,9 @@ static void daAlink_tgHitCallback(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjIn static_cast(i_tgActor)->tgHitCallback(i_atActor, i_tgObjInf, i_atObjInf); } -static void daAlink_coHitCallback(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, fopAc_ac_c* i_coActorB, - dCcD_GObjInf* i_coObjInfB) { +static void daAlink_coHitCallback(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, + fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) { + UNUSED(i_coActorB); UNUSED(i_coObjInfB); static_cast(i_coActorA)->coHitCallback(i_coActorB, i_coObjInfA); } @@ -142,459 +146,6 @@ static char const l_defaultGetEventName[16] = "DEFAULT_GETITEM"; static char l_peepEventName[10] = "PEEP_HOLE"; -daAlink_procInitTable daAlink_c::m_procInitTable[] = { - { &daAlink_c::procPreActionUnequip, 0x21 }, - { &daAlink_c::procServiceWait, 0x10000085 }, - { &daAlink_c::procTiredWait, 0x10001185 }, - { &daAlink_c::procWait, 0x10001185 }, - { &daAlink_c::procMove, 0x10001184 }, - { &daAlink_c::procAtnMove, 0x10001184 }, - { &daAlink_c::procAtnActorWait, 0x10001185 }, - { &daAlink_c::procAtnActorMove, 0x10001184 }, - { &daAlink_c::procWaitTurn, 0x10001085 }, - { &daAlink_c::procMoveTurn, 0x10001084 }, - { &daAlink_c::procSideStep, 0x10001186 }, - { &daAlink_c::procSideStepLand, 0x10001185 }, - { &daAlink_c::procSlide, 0x0 }, - { &daAlink_c::procSlideLand, 0x4 }, - { &daAlink_c::procFrontRoll, 0x8200 }, - { &daAlink_c::procFrontRollCrash, 0x2 }, - { &daAlink_c::procFrontRollSuccess, 0x0 }, - { &daAlink_c::procSideRoll, 0x8000 }, - { &daAlink_c::procBackJump, 0x8001086 }, - { &daAlink_c::procBackJumpLand, 0x1185 }, - { &daAlink_c::procSlip, 0x0 }, - { &daAlink_c::procAutoJump, 0x1006 }, - { &daAlink_c::procDiveJump, 0x2 }, - { &daAlink_c::procRollJump, 0x2 }, - { &daAlink_c::procFall, 0x1006 }, - { &daAlink_c::procLand, 0x1005 }, - { &daAlink_c::procSmallJump, 0x1000 }, - { &daAlink_c::procStepMove, 0x10001184 }, - { &daAlink_c::procCrouch, 0x800001 }, - { &daAlink_c::procGuardSlip, 0x60000000 }, - { &daAlink_c::procGuardAttack, 0x100 }, - { &daAlink_c::procGuardBreak, 0x100 }, - { &daAlink_c::procTurnMove, 0x8000 }, - { &daAlink_c::procCutNormal, 0x20000300 }, - { &daAlink_c::procCutFinish, 0x20000320 }, - { &daAlink_c::procCutFinishJumpUp, 0x102 }, - { &daAlink_c::procCutFinishJumpUpLand, 0x100 }, - { &daAlink_c::procCutReverse, 0x200 }, - { &daAlink_c::procCutJump, 0x8000202 }, - { &daAlink_c::procCutJumpLand, 0x8000201 }, - { &daAlink_c::procCutTurn, 0x200 }, - { &daAlink_c::procCutTurnCharge, 0x101 }, - { &daAlink_c::procCutTurnMove, 0x101 }, - { &daAlink_c::procCutDown, 0x8000022 }, - { &daAlink_c::procCutDownLand, 0x8002001 }, - { &daAlink_c::procCutHead, 0x222 }, - { &daAlink_c::procCutHeadLand, 0x201 }, - { &daAlink_c::procCutLargeJumpCharge, 0x101 }, - { &daAlink_c::procCutLargeJump, 0x200 }, - { &daAlink_c::procCutLargeJumpLand, 0x201 }, - { &daAlink_c::procDamage, 0x8 }, - { &daAlink_c::procLargeDamageUp, 0xa008008 }, - { &daAlink_c::procLandDamage, 0x9 }, - { &daAlink_c::procCrawlStart, 0x300a000 }, - { &daAlink_c::procCrawlMove, 0xb00e000 }, - { &daAlink_c::procCrawlAutoMove, 0xf00a000 }, - { &daAlink_c::procCrawlEnd, 0x300a000 }, - { &daAlink_c::procPullMove, 0x202000 }, - { &daAlink_c::procHorseRide, 0x4002400 }, - { &daAlink_c::procHorseGetOff, 0x4002400 }, - { &daAlink_c::procHorseWait, 0x10003585 }, - { &daAlink_c::procHorseTurn, 0x2500 }, - { &daAlink_c::procHorseJump, 0x2502 }, - { &daAlink_c::procHorseLand, 0x2500 }, - { &daAlink_c::procHorseSubjectivity, 0x60003404 }, - { &daAlink_c::procHorseCut, 0x2500 }, - { &daAlink_c::procHorseCutChargeReady, 0x2500 }, - { &daAlink_c::procHorseCutTurn, 0x2500 }, - { &daAlink_c::procHorseDamage, 0x2408 }, - { &daAlink_c::procHorseBowSubject, 0x60003404 }, - { &daAlink_c::procHorseBowMove, 0x60003404 }, - { &daAlink_c::procHorseGrabMove, 0x3404 }, - { &daAlink_c::procHorseBoomerangSubject, 0x60003404 }, - { &daAlink_c::procHorseBoomerangMove, 0x60003404 }, - { &daAlink_c::procHorseHookshotSubject, 0x60003404 }, - { &daAlink_c::procHorseHookshotMove, 0x60003404 }, - { &daAlink_c::procHorseBottleDrink, 0x2401 }, - { &daAlink_c::procHorseComeback, 0x2409 }, - { &daAlink_c::procHorseKandelaarPour, 0x2401 }, - { &daAlink_c::procHorseRun, 0x2400 }, - { &daAlink_c::procHorseHang, 0x2400 }, - { &daAlink_c::procHorseGetKey, 0x2401 }, - { &daAlink_c::procHorseLookDown, 0x2401 }, - { &daAlink_c::procBoarRun, 0x2400 }, - { &daAlink_c::procSwordUnequipSp, 0x1 }, - { &daAlink_c::procHangStart, 0x4041 }, - { &daAlink_c::procHangFallStart, 0x4041 }, - { &daAlink_c::procHangUp, 0x4041 }, - { &daAlink_c::procHangWait, 0x4041 }, - { &daAlink_c::procHangMove, 0x4040 }, - { &daAlink_c::procHangClimb, 0x4040 }, - { &daAlink_c::procHangWallCatch, 0x4040 }, - { &daAlink_c::procHangReady, 0x1 }, - { &daAlink_c::procHangLeverDown, 0x21 }, - { &daAlink_c::procBowSubject, 0x20001005 }, - { &daAlink_c::procBowMove, 0x20001004 }, - { &daAlink_c::procBoomerangSubject, 0x30001005 }, - { &daAlink_c::procBoomerangMove, 0x30001004 }, - { &daAlink_c::procBoomerangCatch, 0x1001 }, - { &daAlink_c::procCopyRodSubject, 0x30001005 }, - { &daAlink_c::procCopyRodMove, 0x30001004 }, - { &daAlink_c::procCopyRodSwing, 0x1 }, - { &daAlink_c::procCopyRodRevive, 0x1 }, - { &daAlink_c::procLadderUpStart, 0x10000 }, - { &daAlink_c::procLadderUpEnd, 0x10000 }, - { &daAlink_c::procLadderDownStart, 0x10000 }, - { &daAlink_c::procLadderDownEnd, 0x10000 }, - { &daAlink_c::procLadderMove, 0x10000 }, - { &daAlink_c::procGrabReady, 0x100001 }, - { &daAlink_c::procGrabUp, 0x100001 }, - { &daAlink_c::procGrabMiss, 0x100001 }, - { &daAlink_c::procGrabThrow, 0x100201 }, - { &daAlink_c::procGrabPut, 0x100001 }, - { &daAlink_c::procGrabWait, 0x1105 }, - { &daAlink_c::procGrabRebound, 0x100001 }, - { &daAlink_c::procGrabStand, 0x1 }, - { &daAlink_c::procInsectCatch, 0x21 }, - { &daAlink_c::procPickUp, 0x100001 }, - { &daAlink_c::procPickPut, 0x100001 }, - { &daAlink_c::procStEscape, 0x1 }, - { &daAlink_c::procDkCaught, 0x4000000 }, - { &daAlink_c::procSwimUp, 0x40000 }, - { &daAlink_c::procSwimWait, 0x40105 }, - { &daAlink_c::procSwimMove, 0x40104 }, - { &daAlink_c::procSwimDive, 0x40000 }, - { &daAlink_c::procSwimHookshotSubject, 0x20041005 }, - { &daAlink_c::procSwimHookshotMove, 0x20041004 }, - { &daAlink_c::procSwimDamage, 0x40008 }, - { &daAlink_c::procClimbUpStart, 0x10000 }, - { &daAlink_c::procClimbDownStart, 0x10000 }, - { &daAlink_c::procClimbMoveUpDown, 0x10000 }, - { &daAlink_c::procClimbMoveSide, 0x10000 }, - { &daAlink_c::procClimbWait, 0x10000 }, - { &daAlink_c::procClimbToRoof, 0x10000 }, - { &daAlink_c::procRoofHangStart, 0x10 }, - { &daAlink_c::procRoofHangWait, 0x11 }, - { &daAlink_c::procRoofHangFrontMove, 0x10 }, - { &daAlink_c::procRoofHangSideMove, 0x10 }, - { &daAlink_c::procRoofHangTurn, 0x10 }, - { &daAlink_c::procRoofSwitchHang, 0x2030 }, - { &daAlink_c::procCanoeRide, 0x4002400 }, - { &daAlink_c::procCanoeJumpRide, 0x4002400 }, - { &daAlink_c::procCanoeGetOff, 0x4002400 }, - { &daAlink_c::procCanoeWait, 0x14003504 }, - { &daAlink_c::procCanoeRow, 0x4002504 }, - { &daAlink_c::procCanoePaddleShift, 0x4002504 }, - { &daAlink_c::procCanoePaddlePut, 0x4002400 }, - { &daAlink_c::procCanoePaddleGrab, 0x4002400 }, - { &daAlink_c::procCanoeRodGrab, 0x4002400 }, - { &daAlink_c::procCanoeFishingWait, 0x44002404 }, - { &daAlink_c::procCanoeFishingReel, 0x44002500 }, - { &daAlink_c::procCanoeFishingGet, 0x4002400 }, - { &daAlink_c::procCanoeSubjectivity, 0x64002404 }, - { &daAlink_c::procCanoeBowSubject, 0x64003404 }, - { &daAlink_c::procCanoeBowMove, 0x64003404 }, - { &daAlink_c::procCanoeGrabMove, 0x4103404 }, - { &daAlink_c::procCanoeBoomerangSubject, 0x64003404 }, - { &daAlink_c::procCanoeBoomerangMove, 0x64003404 }, - { &daAlink_c::procCanoeHookshotSubject, 0x64003404 }, - { &daAlink_c::procCanoeHookshotMove, 0x64003404 }, - { &daAlink_c::procCanoeBottleDrink, 0x2401 }, - { &daAlink_c::procCanoeKandelaarPour, 0x2401 }, - { &daAlink_c::procFishingCast, 0x2101 }, - { &daAlink_c::procFishingFood, 0x2001 }, - { &daAlink_c::procSpinnerReady, 0x2002 }, - { &daAlink_c::procSpinnerWait, 0x2500 }, - { &daAlink_c::procBoardRide, 0x22 }, - { &daAlink_c::procBoardWait, 0x10001504 }, - { &daAlink_c::procBoardRow, 0x1504 }, - { &daAlink_c::procBoardTurn, 0x1504 }, - { &daAlink_c::procBoardJump, 0x1406 }, - { &daAlink_c::procBoardSubjectivity, 0x60000404 }, - { &daAlink_c::procBoardCut, 0x504 }, - { &daAlink_c::procBoardCutTurn, 0x400 }, - { &daAlink_c::procFmChainUp, 0x101 }, - { &daAlink_c::procFmChainStrongPull, 0x1001 }, - { &daAlink_c::procDoorOpen, 0x4000 }, - { &daAlink_c::procMonkeyMove, 0x800 }, - { &daAlink_c::procDemoBoomerangCatch, 0x10000101 }, - { &daAlink_c::procBottleDrink, 0x2001 }, - { &daAlink_c::procBottleOpen, 0x2001 }, - { &daAlink_c::procBottleSwing, 0x21 }, - { &daAlink_c::procBottleGet, 0x1 }, - { &daAlink_c::procKandelaarSwing, 0x1 }, - { &daAlink_c::procKandelaarPour, 0x2001 }, - { &daAlink_c::procGrassWhistleGet, 0x21 }, - { &daAlink_c::procGrassWhistleWait, 0x2001 }, - { &daAlink_c::procHawkCatch, 0x1 }, - { &daAlink_c::procHawkSubject, 0x20000021 }, - { &daAlink_c::procFloorDownRebound, 0x10001185 }, - { &daAlink_c::procGoronRideWait, 0x101 }, - { &daAlink_c::procGoatMove, 0x4002121 }, - { &daAlink_c::procGoatCatch, 0x400a021 }, - { &daAlink_c::procGoatStroke, 0x2121 }, - { &daAlink_c::procGoronMove, 0x101 }, - { &daAlink_c::procDemoCommon, 0x1 }, - { &daAlink_c::procHookshotSubject, 0x20001005 }, - { &daAlink_c::procHookshotMove, 0x20001004 }, - { &daAlink_c::procHookshotFly, 0x6002 }, - { &daAlink_c::procHookshotRoofWait, 0x6802 }, - { &daAlink_c::procHookshotRoofShoot, 0x6902 }, - { &daAlink_c::procHookshotRoofBoots, 0x6902 }, - { &daAlink_c::procHookshotWallWait, 0x6802 }, - { &daAlink_c::procHookshotWallShoot, 0x6902 }, - { &daAlink_c::procMagneBootsFly, 0x2 }, - { &daAlink_c::procBootsEquip, 0x1103 }, - { &daAlink_c::procSumouReady, 0xa000 }, - { &daAlink_c::procSumouMove, 0xa000 }, - { &daAlink_c::procSumouSideMove, 0xa000 }, - { &daAlink_c::procSumouAction, 0xa000 }, - { &daAlink_c::procSumouStagger, 0xa000 }, - { &daAlink_c::procSumouWinLose, 0x2002 }, - { &daAlink_c::procSumouShiko, 0xa000 }, - { &daAlink_c::procLookUp, 0x101 }, - { &daAlink_c::procLookUpToGetItem, 0x101 }, - { &daAlink_c::procHandPat, 0x101 }, - { &daAlink_c::procIronBallSubject, 0x20001005 }, - { &daAlink_c::procIronBallMove, 0x20001004 }, - { &daAlink_c::procIronBallThrow, 0x20000000 }, - { &daAlink_c::procIronBallReturn, 0x1 }, - { &daAlink_c::procBossBodyHang, 0x6029 }, - { &daAlink_c::procOctaIealSpit, 0x42008 }, - { &daAlink_c::procScreamWait, 0x1 }, - { &daAlink_c::procGoatStopReady, 0x1 }, - { &daAlink_c::procZoraMove, 0xe000 }, - { &daAlink_c::procLookAroundTurn, 0x1 }, - { &daAlink_c::procTradeItemOut, 0x80121 }, - { &daAlink_c::procNotUseItem, 0x2021 }, - { &daAlink_c::procSwordReady, 0x1 }, - { &daAlink_c::procSwordPush, 0x1 }, - { &daAlink_c::procGanonFinish, 0xe000 }, - { &daAlink_c::procCutFastReady, 0x1 }, - { &daAlink_c::procMasterSwordStick, 0x6001 }, - { &daAlink_c::procMasterSwordPull, 0x6001 }, - { &daAlink_c::procDungeonWarpReady, 0x2021 }, - { &daAlink_c::procDungeonWarp, 0x6003 }, - { &daAlink_c::procDungeonWarpSceneStart, 0x6003 }, - { &daAlink_c::procWolfHowlDemo, 0x800021 }, - { &daAlink_c::procWolfServiceWait, 0x1001 }, - { &daAlink_c::procWolfTiredWait, 0x1101 }, - { &daAlink_c::procWolfMidnaRideShock, 0x1 }, - { &daAlink_c::procWolfWait, 0x1101 }, - { &daAlink_c::procWolfMove, 0x1100 }, - { &daAlink_c::procWolfDash, 0x1100 }, - { &daAlink_c::procWolfDashReverse, 0x2 }, - { &daAlink_c::procWolfWaitTurn, 0x1001 }, - { &daAlink_c::procWolfAtnActorMove, 0x1100 }, - { &daAlink_c::procWolfSideStep, 0x1102 }, - { &daAlink_c::procWolfSideStepLand, 0x1101 }, - { &daAlink_c::procWolfBackJump, 0x1002 }, - { &daAlink_c::procWolfBackJumpLand, 0x1001 }, - { &daAlink_c::procWolfHowl, 0x1 }, - { &daAlink_c::procWolfAutoJump, 0x1002 }, - { &daAlink_c::procWolfFall, 0x1002 }, - { &daAlink_c::procWolfLand, 0x1001 }, - { &daAlink_c::procWolfSit, 0x800101 }, - { &daAlink_c::procWolfLieStart, 0x1000100 }, - { &daAlink_c::procWolfLieMove, 0x1000100 }, - { &daAlink_c::procWolfLieAutoMove, 0x5002000 }, - { &daAlink_c::procWolfHangReady, 0x1001 }, - { &daAlink_c::procWolfStepMove, 0x10001100 }, - { &daAlink_c::procWolfHangWallCatch, 0x10005040 }, - { &daAlink_c::procWolfHangFallStart, 0x10005041 }, - { &daAlink_c::procWolfDamage, 0x8 }, - { &daAlink_c::procWolfLargeDamageUp, 0x12008008 }, - { &daAlink_c::procWolfLandDamage, 0x9 }, - { &daAlink_c::procWolfScreamWait, 0x1 }, - { &daAlink_c::procWolfSlip, 0x10001000 }, - { &daAlink_c::procWolfSlipTurn, 0x10001000 }, - { &daAlink_c::procWolfSlipTurnLand, 0x10001000 }, - { &daAlink_c::procWolfSlideReady, 0x10008000 }, - { &daAlink_c::procWolfSlide, 0x1000 }, - { &daAlink_c::procWolfSlideLand, 0x1000 }, - { &daAlink_c::procWolfWaitSlip, 0x1100 }, - { &daAlink_c::procWolfSlopeStart, 0x1000 }, - { &daAlink_c::procWolfRopeMove, 0x23100 }, - { &daAlink_c::procWolfRopeHang, 0x10023000 }, - { &daAlink_c::procWolfRopeTurn, 0x10023000 }, - { &daAlink_c::procWolfRopeStagger, 0x10023000 }, - { &daAlink_c::procWolfRopeSubjectivity, 0x23001 }, - { &daAlink_c::procWolfTagJump, 0x1022 }, - { &daAlink_c::procWolfTagJumpLand, 0x120 }, - { &daAlink_c::procWolfRollAttackCharge, 0x100 }, - { &daAlink_c::procWolfRollAttackMove, 0x100 }, - { &daAlink_c::procWolfJumpAttack, 0x2 }, - { &daAlink_c::procWolfJumpAttackKick, 0x2 }, - { &daAlink_c::procWolfJumpAttackSlideLand, 0x0 }, - { &daAlink_c::procWolfJumpAttackNormalLand, 0x0 }, - { &daAlink_c::procWolfWaitAttack, 0x0 }, - { &daAlink_c::procWolfRollAttack, 0x0 }, - { &daAlink_c::procWolfDownAttack, 0x22 }, - { &daAlink_c::procWolfDownAtLand, 0x8002021 }, - { &daAlink_c::procWolfDownAtMissLand, 0x0 }, - { &daAlink_c::procWolfLockAttack, 0x2002 }, - { &daAlink_c::procWolfLockAttackTurn, 0x0 }, - { &daAlink_c::procWolfSwimUp, 0x40000 }, - { &daAlink_c::procWolfSwimWait, 0x40101 }, - { &daAlink_c::procWolfSwimMove, 0x40100 }, - { &daAlink_c::procWolfSwimEndWait, 0x1001 }, - { &daAlink_c::procWolfGrabUp, 0x100001 }, - { &daAlink_c::procWolfGrabPut, 0x100001 }, - { &daAlink_c::procWolfGrabThrow, 0x100001 }, - { &daAlink_c::procWolfChainUp, 0x1 }, - { &daAlink_c::procWolfPush, 0x20 }, - { &daAlink_c::procWolfChainReady, 0x20000 }, - { &daAlink_c::procWolfChainWait, 0x10020000 }, - { &daAlink_c::procWolfDig, 0xa020 }, - { &daAlink_c::procWolfDigThrough, 0xe000 }, - { &daAlink_c::procWolfAttackReverse, 0x2 }, - { &daAlink_c::procWolfEnemyThrow, 0x0 }, - { &daAlink_c::procWolfEnemyHangBite, 0xe002 }, - { &daAlink_c::procWolfGiantPuzzle, 0x100 }, - { &daAlink_c::procWolfCargoCarry, 0x400e022 }, - { &daAlink_c::procWolfGetSmell, 0xe021 }, - { &daAlink_c::procDemoCommon, 0x1 }, - { &daAlink_c::procWolfSnowEscape, 0xa000 }, - { &daAlink_c::procWolfGanonCatch, 0x4002021 }, - { &daAlink_c::procCoToolDemo, 0x8000 }, - { &daAlink_c::procCoSubjectivity, 0x20001005 }, - { &daAlink_c::procCoSwimSubjectivity, 0x20041001 }, - { &daAlink_c::procCoPeepSubjectivity, 0x2000200b }, - { &daAlink_c::procCoPolyDamage, 0x9 }, - { &daAlink_c::procCoElecDamage, 0x9 }, - { &daAlink_c::procCoPushPullWait, 0x202001 }, - { &daAlink_c::procCoPushMove, 0x202000 }, - { &daAlink_c::procCoTalk, 0x80101 }, - { &daAlink_c::procCoOpenTreasure, 0xe001 }, - { &daAlink_c::procCoUnequip, 0x1 }, - { &daAlink_c::procCoGetItem, 0x800e001 }, - { &daAlink_c::procCoTurnBack, 0x1 }, - { &daAlink_c::procCoLookWait, 0x1101 }, - { &daAlink_c::procDemoCommon, 0x200001 }, - { &daAlink_c::procDemoCommon, 0x200000 }, - { &daAlink_c::procCoMetamorphose, 0x8001 }, - { &daAlink_c::procCoMetamorphoseOnly, 0x6001 }, - { &daAlink_c::procCoWarp, 0x1 }, - { &daAlink_c::procCoDead, 0xa009 }, - { &daAlink_c::procCoFogDead, 0xa009 }, - { &daAlink_c::procCoLookAround, 0x0 }, - { &daAlink_c::procDemoCommon, 0xe000 }, - { &daAlink_c::procCoSandWallHit, 0xa }, - { &daAlink_c::procCoLavaReturn, 0x42009 }, - { &daAlink_c::procCoSwimFreezeReturn, 0x42009 }, - { &daAlink_c::procCoGetReadySit, 0xa001 }, - { &daAlink_c::procCoTwGate, 0xe002 }, - { &daAlink_c::procCoLargeDamage, 0xa }, - { &daAlink_c::procCoLargeDamageWall, 0xa }, - { &daAlink_c::procCoNod, 0x80001 }, - { &daAlink_c::procDemoCommon, 0x80001 }, - { &daAlink_c::procCoGlare, 0x80001 }, - { &daAlink_c::procCoHorseCallWait, 0x1 }, - { &daAlink_c::procDemoCommon, 0x1 }, -}; - -daAlink_procFunc daAlink_c::m_demoInitTable[] = { - NULL, - NULL, - NULL, - NULL, - NULL, - &daAlink_c::commonWaitTurnInit, - NULL, - NULL, - NULL, - NULL, - &daAlink_c::procCoOpenTreasureInit, - &daAlink_c::procCoGetItemInit, - &daAlink_c::procCoUnequipInit, - &daAlink_c::commonGrabPutInit, - NULL, - NULL, - NULL, - NULL, - NULL, - &daAlink_c::procMonkeyMoveInit, - &daAlink_c::procCoLookAroundInit, - NULL, - NULL, - NULL, - NULL, - &daAlink_c::procCoTurnBackInit, - NULL, - NULL, - &daAlink_c::procDemoBoomerangCatchInit, - &daAlink_c::procHawkCatchInit, - &daAlink_c::procSwordUnequipSpInit, - NULL, - &daAlink_c::procCoDemoPushPullWaitInit, - &daAlink_c::procCoDemoPushMoveInit, - &daAlink_c::procBossAtnWaitInit, - &daAlink_c::procDoorOpenInit, - NULL, - &daAlink_c::procTradeItemOutInit, - NULL, - &daAlink_c::procKandelaarSwingInit, - &daAlink_c::procFrontRollInit, - &daAlink_c::procCrouchInit, - NULL, - NULL, - NULL, - NULL, - &daAlink_c::procCoCaughtInit, - &daAlink_c::procLookUpInit, - &daAlink_c::procLookUpToGetItemInit, - &daAlink_c::procHandPatInit, - &daAlink_c::procWolfMidnaRideShockInit, - &daAlink_c::procSumouShikoInit, - &daAlink_c::procCoFogDeadInit, - &daAlink_c::procWolfSmellWaitInit, - NULL, - NULL, - &daAlink_c::procWolfCargoCarryInit, - &daAlink_c::procCoMetamorphoseInit, - &daAlink_c::procCoMetamorphoseInit, - &daAlink_c::procHorseGetKeyInit, - &daAlink_c::procCoNodInit, - &daAlink_c::procCoGlareInit, - &daAlink_c::procCoEyeAwayInit, - &daAlink_c::procGoatStopReadyInit, - &daAlink_c::procCoGetReadySitInit, - NULL, - &daAlink_c::procCoTwGateInit, - &daAlink_c::procFmChainStrongPullInit, - &daAlink_c::procWolfSnowEscapeInit, - &daAlink_c::procZoraMoveInit, - &daAlink_c::procCoMetamorphoseOnlyInit, - &daAlink_c::procCoMetamorphoseOnlyInit, - &daAlink_c::procLookAroundTurnInit, - NULL, - &daAlink_c::procCoQuakeWaitInit, - &daAlink_c::procGuardAttackInit, - &daAlink_c::procSwordReadyInit, - &daAlink_c::procDungeonWarpInit, - &daAlink_c::procDungeonWarpSceneStartInit, - &daAlink_c::procMasterSwordStickInit, - &daAlink_c::procMasterSwordPullInit, - &daAlink_c::procCutDownInit, - NULL, - &daAlink_c::procCutHeadInit, - NULL, - NULL, - &daAlink_c::procCutLargeJumpInit, - &daAlink_c::procCutFastReadyInit, - &daAlink_c::procCopyRodReviveInit, - &daAlink_c::procSwordPushInit, - &daAlink_c::procGanonFinishInit, - NULL, - NULL, - &daAlink_c::procHorseLookDownInit, - NULL, -}; - static f32 const l_crawlStartFrontOffset[3] = {0.0f, 30.0f, 112.0f}; static Vec const l_crawlFrontOffset = {0.0f, 30.0f, 80.0f}; @@ -1454,59 +1005,468 @@ daAlink_FaceTexData const daAlink_c::m_faceTexDataTable[] = { {dRes_ID_ALANM_BTP_WL_FC_e, dRes_ID_ALANM_BTK_WL_FA_e}, }; -#include "d/actor/d_a_alink_link.inc" - -#include "d/actor/d_a_alink_cut.inc" - -#include "d/actor/d_a_alink_damage.inc" - -#include "d/actor/d_a_alink_guard.inc" - -#include "d/actor/d_a_alink_bow.inc" - -#include "d/actor/d_a_alink_boom.inc" - -#include "d/actor/d_a_alink_copyrod.inc" - -#include "d/actor/d_a_alink_hvyboots.inc" +const daAlink_procInitTable daAlink_c::m_procInitTable[] = { + { &daAlink_c::procPreActionUnequip, 0x21 }, + { &daAlink_c::procServiceWait, 0x10000085 }, + { &daAlink_c::procTiredWait, 0x10001185 }, + { &daAlink_c::procWait, 0x10001185 }, + { &daAlink_c::procMove, 0x10001184 }, + { &daAlink_c::procAtnMove, 0x10001184 }, + { &daAlink_c::procAtnActorWait, 0x10001185 }, + { &daAlink_c::procAtnActorMove, 0x10001184 }, + { &daAlink_c::procWaitTurn, 0x10001085 }, + { &daAlink_c::procMoveTurn, 0x10001084 }, + { &daAlink_c::procSideStep, 0x10001186 }, + { &daAlink_c::procSideStepLand, 0x10001185 }, + { &daAlink_c::procSlide, 0x0 }, + { &daAlink_c::procSlideLand, 0x4 }, + { &daAlink_c::procFrontRoll, 0x8200 }, + { &daAlink_c::procFrontRollCrash, 0x2 }, + { &daAlink_c::procFrontRollSuccess, 0x0 }, + { &daAlink_c::procSideRoll, 0x8000 }, + { &daAlink_c::procBackJump, 0x8001086 }, + { &daAlink_c::procBackJumpLand, 0x1185 }, + { &daAlink_c::procSlip, 0x0 }, + { &daAlink_c::procAutoJump, 0x1006 }, + { &daAlink_c::procDiveJump, 0x2 }, + { &daAlink_c::procRollJump, 0x2 }, + { &daAlink_c::procFall, 0x1006 }, + { &daAlink_c::procLand, 0x1005 }, + { &daAlink_c::procSmallJump, 0x1000 }, + { &daAlink_c::procStepMove, 0x10001184 }, + { &daAlink_c::procCrouch, 0x800001 }, + { &daAlink_c::procGuardSlip, 0x60000000 }, + { &daAlink_c::procGuardAttack, 0x100 }, + { &daAlink_c::procGuardBreak, 0x100 }, + { &daAlink_c::procTurnMove, 0x8000 }, + { &daAlink_c::procCutNormal, 0x20000300 }, + { &daAlink_c::procCutFinish, 0x20000320 }, + { &daAlink_c::procCutFinishJumpUp, 0x102 }, + { &daAlink_c::procCutFinishJumpUpLand, 0x100 }, + { &daAlink_c::procCutReverse, 0x200 }, + { &daAlink_c::procCutJump, 0x8000202 }, + { &daAlink_c::procCutJumpLand, 0x8000201 }, + { &daAlink_c::procCutTurn, 0x200 }, + { &daAlink_c::procCutTurnCharge, 0x101 }, + { &daAlink_c::procCutTurnMove, 0x101 }, + { &daAlink_c::procCutDown, 0x8000022 }, + { &daAlink_c::procCutDownLand, 0x8002001 }, + { &daAlink_c::procCutHead, 0x222 }, + { &daAlink_c::procCutHeadLand, 0x201 }, + { &daAlink_c::procCutLargeJumpCharge, 0x101 }, + { &daAlink_c::procCutLargeJump, 0x200 }, + { &daAlink_c::procCutLargeJumpLand, 0x201 }, + { &daAlink_c::procDamage, 0x8 }, + { &daAlink_c::procLargeDamageUp, 0xa008008 }, + { &daAlink_c::procLandDamage, 0x9 }, + { &daAlink_c::procCrawlStart, 0x300a000 }, + { &daAlink_c::procCrawlMove, 0xb00e000 }, + { &daAlink_c::procCrawlAutoMove, 0xf00a000 }, + { &daAlink_c::procCrawlEnd, 0x300a000 }, + { &daAlink_c::procPullMove, 0x202000 }, + { &daAlink_c::procHorseRide, 0x4002400 }, + { &daAlink_c::procHorseGetOff, 0x4002400 }, + { &daAlink_c::procHorseWait, 0x10003585 }, + { &daAlink_c::procHorseTurn, 0x2500 }, + { &daAlink_c::procHorseJump, 0x2502 }, + { &daAlink_c::procHorseLand, 0x2500 }, + { &daAlink_c::procHorseSubjectivity, 0x60003404 }, + { &daAlink_c::procHorseCut, 0x2500 }, + { &daAlink_c::procHorseCutChargeReady, 0x2500 }, + { &daAlink_c::procHorseCutTurn, 0x2500 }, + { &daAlink_c::procHorseDamage, 0x2408 }, + { &daAlink_c::procHorseBowSubject, 0x60003404 }, + { &daAlink_c::procHorseBowMove, 0x60003404 }, + { &daAlink_c::procHorseGrabMove, 0x3404 }, + { &daAlink_c::procHorseBoomerangSubject, 0x60003404 }, + { &daAlink_c::procHorseBoomerangMove, 0x60003404 }, + { &daAlink_c::procHorseHookshotSubject, 0x60003404 }, + { &daAlink_c::procHorseHookshotMove, 0x60003404 }, + { &daAlink_c::procHorseBottleDrink, 0x2401 }, + { &daAlink_c::procHorseComeback, 0x2409 }, + { &daAlink_c::procHorseKandelaarPour, 0x2401 }, + { &daAlink_c::procHorseRun, 0x2400 }, + { &daAlink_c::procHorseHang, 0x2400 }, + { &daAlink_c::procHorseGetKey, 0x2401 }, + { &daAlink_c::procHorseLookDown, 0x2401 }, + { &daAlink_c::procBoarRun, 0x2400 }, + { &daAlink_c::procSwordUnequipSp, 0x1 }, + { &daAlink_c::procHangStart, 0x4041 }, + { &daAlink_c::procHangFallStart, 0x4041 }, + { &daAlink_c::procHangUp, 0x4041 }, + { &daAlink_c::procHangWait, 0x4041 }, + { &daAlink_c::procHangMove, 0x4040 }, + { &daAlink_c::procHangClimb, 0x4040 }, + { &daAlink_c::procHangWallCatch, 0x4040 }, + { &daAlink_c::procHangReady, 0x1 }, + { &daAlink_c::procHangLeverDown, 0x21 }, + { &daAlink_c::procBowSubject, 0x20001005 }, + { &daAlink_c::procBowMove, 0x20001004 }, + { &daAlink_c::procBoomerangSubject, 0x30001005 }, + { &daAlink_c::procBoomerangMove, 0x30001004 }, + { &daAlink_c::procBoomerangCatch, 0x1001 }, + { &daAlink_c::procCopyRodSubject, 0x30001005 }, + { &daAlink_c::procCopyRodMove, 0x30001004 }, + { &daAlink_c::procCopyRodSwing, 0x1 }, + { &daAlink_c::procCopyRodRevive, 0x1 }, + { &daAlink_c::procLadderUpStart, 0x10000 }, + { &daAlink_c::procLadderUpEnd, 0x10000 }, + { &daAlink_c::procLadderDownStart, 0x10000 }, + { &daAlink_c::procLadderDownEnd, 0x10000 }, + { &daAlink_c::procLadderMove, 0x10000 }, + { &daAlink_c::procGrabReady, 0x100001 }, + { &daAlink_c::procGrabUp, 0x100001 }, + { &daAlink_c::procGrabMiss, 0x100001 }, + { &daAlink_c::procGrabThrow, 0x100201 }, + { &daAlink_c::procGrabPut, 0x100001 }, + { &daAlink_c::procGrabWait, 0x1105 }, + { &daAlink_c::procGrabRebound, 0x100001 }, + { &daAlink_c::procGrabStand, 0x1 }, + { &daAlink_c::procInsectCatch, 0x21 }, + { &daAlink_c::procPickUp, 0x100001 }, + { &daAlink_c::procPickPut, 0x100001 }, + { &daAlink_c::procStEscape, 0x1 }, + { &daAlink_c::procDkCaught, 0x4000000 }, + { &daAlink_c::procSwimUp, 0x40000 }, + { &daAlink_c::procSwimWait, 0x40105 }, + { &daAlink_c::procSwimMove, 0x40104 }, + { &daAlink_c::procSwimDive, 0x40000 }, + { &daAlink_c::procSwimHookshotSubject, 0x20041005 }, + { &daAlink_c::procSwimHookshotMove, 0x20041004 }, + { &daAlink_c::procSwimDamage, 0x40008 }, + { &daAlink_c::procClimbUpStart, 0x10000 }, + { &daAlink_c::procClimbDownStart, 0x10000 }, + { &daAlink_c::procClimbMoveUpDown, 0x10000 }, + { &daAlink_c::procClimbMoveSide, 0x10000 }, + { &daAlink_c::procClimbWait, 0x10000 }, + { &daAlink_c::procClimbToRoof, 0x10000 }, + { &daAlink_c::procRoofHangStart, 0x10 }, + { &daAlink_c::procRoofHangWait, 0x11 }, + { &daAlink_c::procRoofHangFrontMove, 0x10 }, + { &daAlink_c::procRoofHangSideMove, 0x10 }, + { &daAlink_c::procRoofHangTurn, 0x10 }, + { &daAlink_c::procRoofSwitchHang, 0x2030 }, + { &daAlink_c::procCanoeRide, 0x4002400 }, + { &daAlink_c::procCanoeJumpRide, 0x4002400 }, + { &daAlink_c::procCanoeGetOff, 0x4002400 }, + { &daAlink_c::procCanoeWait, 0x14003504 }, + { &daAlink_c::procCanoeRow, 0x4002504 }, + { &daAlink_c::procCanoePaddleShift, 0x4002504 }, + { &daAlink_c::procCanoePaddlePut, 0x4002400 }, + { &daAlink_c::procCanoePaddleGrab, 0x4002400 }, + { &daAlink_c::procCanoeRodGrab, 0x4002400 }, + { &daAlink_c::procCanoeFishingWait, 0x44002404 }, + { &daAlink_c::procCanoeFishingReel, 0x44002500 }, + { &daAlink_c::procCanoeFishingGet, 0x4002400 }, + { &daAlink_c::procCanoeSubjectivity, 0x64002404 }, + { &daAlink_c::procCanoeBowSubject, 0x64003404 }, + { &daAlink_c::procCanoeBowMove, 0x64003404 }, + { &daAlink_c::procCanoeGrabMove, 0x4103404 }, + { &daAlink_c::procCanoeBoomerangSubject, 0x64003404 }, + { &daAlink_c::procCanoeBoomerangMove, 0x64003404 }, + { &daAlink_c::procCanoeHookshotSubject, 0x64003404 }, + { &daAlink_c::procCanoeHookshotMove, 0x64003404 }, + { &daAlink_c::procCanoeBottleDrink, 0x2401 }, + { &daAlink_c::procCanoeKandelaarPour, 0x2401 }, + { &daAlink_c::procFishingCast, 0x2101 }, + { &daAlink_c::procFishingFood, 0x2001 }, + { &daAlink_c::procSpinnerReady, 0x2002 }, + { &daAlink_c::procSpinnerWait, 0x2500 }, + { &daAlink_c::procBoardRide, 0x22 }, + { &daAlink_c::procBoardWait, 0x10001504 }, + { &daAlink_c::procBoardRow, 0x1504 }, + { &daAlink_c::procBoardTurn, 0x1504 }, + { &daAlink_c::procBoardJump, 0x1406 }, + { &daAlink_c::procBoardSubjectivity, 0x60000404 }, + { &daAlink_c::procBoardCut, 0x504 }, + { &daAlink_c::procBoardCutTurn, 0x400 }, + { &daAlink_c::procFmChainUp, 0x101 }, + { &daAlink_c::procFmChainStrongPull, 0x1001 }, + { &daAlink_c::procDoorOpen, 0x4000 }, + { &daAlink_c::procMonkeyMove, 0x800 }, + { &daAlink_c::procDemoBoomerangCatch, 0x10000101 }, + { &daAlink_c::procBottleDrink, 0x2001 }, + { &daAlink_c::procBottleOpen, 0x2001 }, + { &daAlink_c::procBottleSwing, 0x21 }, + { &daAlink_c::procBottleGet, 0x1 }, + { &daAlink_c::procKandelaarSwing, 0x1 }, + { &daAlink_c::procKandelaarPour, 0x2001 }, + { &daAlink_c::procGrassWhistleGet, 0x21 }, + { &daAlink_c::procGrassWhistleWait, 0x2001 }, + { &daAlink_c::procHawkCatch, 0x1 }, + { &daAlink_c::procHawkSubject, 0x20000021 }, + { &daAlink_c::procFloorDownRebound, 0x10001185 }, + { &daAlink_c::procGoronRideWait, 0x101 }, + { &daAlink_c::procGoatMove, 0x4002121 }, + { &daAlink_c::procGoatCatch, 0x400a021 }, + { &daAlink_c::procGoatStroke, 0x2121 }, + { &daAlink_c::procGoronMove, 0x101 }, + { &daAlink_c::procDemoCommon, 0x1 }, + { &daAlink_c::procHookshotSubject, 0x20001005 }, + { &daAlink_c::procHookshotMove, 0x20001004 }, + { &daAlink_c::procHookshotFly, 0x6002 }, + { &daAlink_c::procHookshotRoofWait, 0x6802 }, + { &daAlink_c::procHookshotRoofShoot, 0x6902 }, + { &daAlink_c::procHookshotRoofBoots, 0x6902 }, + { &daAlink_c::procHookshotWallWait, 0x6802 }, + { &daAlink_c::procHookshotWallShoot, 0x6902 }, + { &daAlink_c::procMagneBootsFly, 0x2 }, + { &daAlink_c::procBootsEquip, 0x1103 }, + { &daAlink_c::procSumouReady, 0xa000 }, + { &daAlink_c::procSumouMove, 0xa000 }, + { &daAlink_c::procSumouSideMove, 0xa000 }, + { &daAlink_c::procSumouAction, 0xa000 }, + { &daAlink_c::procSumouStagger, 0xa000 }, + { &daAlink_c::procSumouWinLose, 0x2002 }, + { &daAlink_c::procSumouShiko, 0xa000 }, + { &daAlink_c::procLookUp, 0x101 }, + { &daAlink_c::procLookUpToGetItem, 0x101 }, + { &daAlink_c::procHandPat, 0x101 }, + { &daAlink_c::procIronBallSubject, 0x20001005 }, + { &daAlink_c::procIronBallMove, 0x20001004 }, + { &daAlink_c::procIronBallThrow, 0x20000000 }, + { &daAlink_c::procIronBallReturn, 0x1 }, + { &daAlink_c::procBossBodyHang, 0x6029 }, + { &daAlink_c::procOctaIealSpit, 0x42008 }, + { &daAlink_c::procScreamWait, 0x1 }, + { &daAlink_c::procGoatStopReady, 0x1 }, + { &daAlink_c::procZoraMove, 0xe000 }, + { &daAlink_c::procLookAroundTurn, 0x1 }, + { &daAlink_c::procTradeItemOut, 0x80121 }, + { &daAlink_c::procNotUseItem, 0x2021 }, + { &daAlink_c::procSwordReady, 0x1 }, + { &daAlink_c::procSwordPush, 0x1 }, + { &daAlink_c::procGanonFinish, 0xe000 }, + { &daAlink_c::procCutFastReady, 0x1 }, + { &daAlink_c::procMasterSwordStick, 0x6001 }, + { &daAlink_c::procMasterSwordPull, 0x6001 }, + { &daAlink_c::procDungeonWarpReady, 0x2021 }, + { &daAlink_c::procDungeonWarp, 0x6003 }, + { &daAlink_c::procDungeonWarpSceneStart, 0x6003 }, + { &daAlink_c::procWolfHowlDemo, 0x800021 }, + { &daAlink_c::procWolfServiceWait, 0x1001 }, + { &daAlink_c::procWolfTiredWait, 0x1101 }, + { &daAlink_c::procWolfMidnaRideShock, 0x1 }, + { &daAlink_c::procWolfWait, 0x1101 }, + { &daAlink_c::procWolfMove, 0x1100 }, + { &daAlink_c::procWolfDash, 0x1100 }, + { &daAlink_c::procWolfDashReverse, 0x2 }, + { &daAlink_c::procWolfWaitTurn, 0x1001 }, + { &daAlink_c::procWolfAtnActorMove, 0x1100 }, + { &daAlink_c::procWolfSideStep, 0x1102 }, + { &daAlink_c::procWolfSideStepLand, 0x1101 }, + { &daAlink_c::procWolfBackJump, 0x1002 }, + { &daAlink_c::procWolfBackJumpLand, 0x1001 }, + { &daAlink_c::procWolfHowl, 0x1 }, + { &daAlink_c::procWolfAutoJump, 0x1002 }, + { &daAlink_c::procWolfFall, 0x1002 }, + { &daAlink_c::procWolfLand, 0x1001 }, + { &daAlink_c::procWolfSit, 0x800101 }, + { &daAlink_c::procWolfLieStart, 0x1000100 }, + { &daAlink_c::procWolfLieMove, 0x1000100 }, + { &daAlink_c::procWolfLieAutoMove, 0x5002000 }, + { &daAlink_c::procWolfHangReady, 0x1001 }, + { &daAlink_c::procWolfStepMove, 0x10001100 }, + { &daAlink_c::procWolfHangWallCatch, 0x10005040 }, + { &daAlink_c::procWolfHangFallStart, 0x10005041 }, + { &daAlink_c::procWolfDamage, 0x8 }, + { &daAlink_c::procWolfLargeDamageUp, 0x12008008 }, + { &daAlink_c::procWolfLandDamage, 0x9 }, + { &daAlink_c::procWolfScreamWait, 0x1 }, + { &daAlink_c::procWolfSlip, 0x10001000 }, + { &daAlink_c::procWolfSlipTurn, 0x10001000 }, + { &daAlink_c::procWolfSlipTurnLand, 0x10001000 }, + { &daAlink_c::procWolfSlideReady, 0x10008000 }, + { &daAlink_c::procWolfSlide, 0x1000 }, + { &daAlink_c::procWolfSlideLand, 0x1000 }, + { &daAlink_c::procWolfWaitSlip, 0x1100 }, + { &daAlink_c::procWolfSlopeStart, 0x1000 }, + { &daAlink_c::procWolfRopeMove, 0x23100 }, + { &daAlink_c::procWolfRopeHang, 0x10023000 }, + { &daAlink_c::procWolfRopeTurn, 0x10023000 }, + { &daAlink_c::procWolfRopeStagger, 0x10023000 }, + { &daAlink_c::procWolfRopeSubjectivity, 0x23001 }, + { &daAlink_c::procWolfTagJump, 0x1022 }, + { &daAlink_c::procWolfTagJumpLand, 0x120 }, + { &daAlink_c::procWolfRollAttackCharge, 0x100 }, + { &daAlink_c::procWolfRollAttackMove, 0x100 }, + { &daAlink_c::procWolfJumpAttack, 0x2 }, + { &daAlink_c::procWolfJumpAttackKick, 0x2 }, + { &daAlink_c::procWolfJumpAttackSlideLand, 0x0 }, + { &daAlink_c::procWolfJumpAttackNormalLand, 0x0 }, + { &daAlink_c::procWolfWaitAttack, 0x0 }, + { &daAlink_c::procWolfRollAttack, 0x0 }, + { &daAlink_c::procWolfDownAttack, 0x22 }, + { &daAlink_c::procWolfDownAtLand, 0x8002021 }, + { &daAlink_c::procWolfDownAtMissLand, 0x0 }, + { &daAlink_c::procWolfLockAttack, 0x2002 }, + { &daAlink_c::procWolfLockAttackTurn, 0x0 }, + { &daAlink_c::procWolfSwimUp, 0x40000 }, + { &daAlink_c::procWolfSwimWait, 0x40101 }, + { &daAlink_c::procWolfSwimMove, 0x40100 }, + { &daAlink_c::procWolfSwimEndWait, 0x1001 }, + { &daAlink_c::procWolfGrabUp, 0x100001 }, + { &daAlink_c::procWolfGrabPut, 0x100001 }, + { &daAlink_c::procWolfGrabThrow, 0x100001 }, + { &daAlink_c::procWolfChainUp, 0x1 }, + { &daAlink_c::procWolfPush, 0x20 }, + { &daAlink_c::procWolfChainReady, 0x20000 }, + { &daAlink_c::procWolfChainWait, 0x10020000 }, + { &daAlink_c::procWolfDig, 0xa020 }, + { &daAlink_c::procWolfDigThrough, 0xe000 }, + { &daAlink_c::procWolfAttackReverse, 0x2 }, + { &daAlink_c::procWolfEnemyThrow, 0x0 }, + { &daAlink_c::procWolfEnemyHangBite, 0xe002 }, + { &daAlink_c::procWolfGiantPuzzle, 0x100 }, + { &daAlink_c::procWolfCargoCarry, 0x400e022 }, + { &daAlink_c::procWolfGetSmell, 0xe021 }, + { &daAlink_c::procDemoCommon, 0x1 }, + { &daAlink_c::procWolfSnowEscape, 0xa000 }, + { &daAlink_c::procWolfGanonCatch, 0x4002021 }, + { &daAlink_c::procCoToolDemo, 0x8000 }, + { &daAlink_c::procCoSubjectivity, 0x20001005 }, + { &daAlink_c::procCoSwimSubjectivity, 0x20041001 }, + { &daAlink_c::procCoPeepSubjectivity, 0x2000200b }, + { &daAlink_c::procCoPolyDamage, 0x9 }, + { &daAlink_c::procCoElecDamage, 0x9 }, + { &daAlink_c::procCoPushPullWait, 0x202001 }, + { &daAlink_c::procCoPushMove, 0x202000 }, + { &daAlink_c::procCoTalk, 0x80101 }, + { &daAlink_c::procCoOpenTreasure, 0xe001 }, + { &daAlink_c::procCoUnequip, 0x1 }, + { &daAlink_c::procCoGetItem, 0x800e001 }, + { &daAlink_c::procCoTurnBack, 0x1 }, + { &daAlink_c::procCoLookWait, 0x1101 }, + { &daAlink_c::procDemoCommon, 0x200001 }, + { &daAlink_c::procDemoCommon, 0x200000 }, + { &daAlink_c::procCoMetamorphose, 0x8001 }, + { &daAlink_c::procCoMetamorphoseOnly, 0x6001 }, + { &daAlink_c::procCoWarp, 0x1 }, + { &daAlink_c::procCoDead, 0xa009 }, + { &daAlink_c::procCoFogDead, 0xa009 }, + { &daAlink_c::procCoLookAround, 0x0 }, + { &daAlink_c::procDemoCommon, 0xe000 }, + { &daAlink_c::procCoSandWallHit, 0xa }, + { &daAlink_c::procCoLavaReturn, 0x42009 }, + { &daAlink_c::procCoSwimFreezeReturn, 0x42009 }, + { &daAlink_c::procCoGetReadySit, 0xa001 }, + { &daAlink_c::procCoTwGate, 0xe002 }, + { &daAlink_c::procCoLargeDamage, 0xa }, + { &daAlink_c::procCoLargeDamageWall, 0xa }, + { &daAlink_c::procCoNod, 0x80001 }, + { &daAlink_c::procDemoCommon, 0x80001 }, + { &daAlink_c::procCoGlare, 0x80001 }, + { &daAlink_c::procCoHorseCallWait, 0x1 }, + { &daAlink_c::procDemoCommon, 0x1 }, +}; -#include "d/actor/d_a_alink_bomb.inc" +daAlink_procFunc daAlink_c::m_demoInitTable[] = { + NULL, + NULL, + NULL, + NULL, + NULL, + &daAlink_c::commonWaitTurnInit, + NULL, + NULL, + NULL, + NULL, + &daAlink_c::procCoOpenTreasureInit, + &daAlink_c::procCoGetItemInit, + &daAlink_c::procCoUnequipInit, + &daAlink_c::commonGrabPutInit, + NULL, + NULL, + NULL, + NULL, + NULL, + &daAlink_c::procMonkeyMoveInit, + &daAlink_c::procCoLookAroundInit, + NULL, + NULL, + NULL, + NULL, + &daAlink_c::procCoTurnBackInit, + NULL, + NULL, + &daAlink_c::procDemoBoomerangCatchInit, + &daAlink_c::procHawkCatchInit, + &daAlink_c::procSwordUnequipSpInit, + NULL, + &daAlink_c::procCoDemoPushPullWaitInit, + &daAlink_c::procCoDemoPushMoveInit, + &daAlink_c::procBossAtnWaitInit, + &daAlink_c::procDoorOpenInit, + NULL, + &daAlink_c::procTradeItemOutInit, + NULL, + &daAlink_c::procKandelaarSwingInit, + &daAlink_c::procFrontRollInit, + &daAlink_c::procCrouchInit, + NULL, + NULL, + NULL, + NULL, + &daAlink_c::procCoCaughtInit, + &daAlink_c::procLookUpInit, + &daAlink_c::procLookUpToGetItemInit, + &daAlink_c::procHandPatInit, + &daAlink_c::procWolfMidnaRideShockInit, + &daAlink_c::procSumouShikoInit, + &daAlink_c::procCoFogDeadInit, + &daAlink_c::procWolfSmellWaitInit, + NULL, + NULL, + &daAlink_c::procWolfCargoCarryInit, + &daAlink_c::procCoMetamorphoseInit, + &daAlink_c::procCoMetamorphoseInit, + &daAlink_c::procHorseGetKeyInit, + &daAlink_c::procCoNodInit, + &daAlink_c::procCoGlareInit, + &daAlink_c::procCoEyeAwayInit, + &daAlink_c::procGoatStopReadyInit, + &daAlink_c::procCoGetReadySitInit, + NULL, + &daAlink_c::procCoTwGateInit, + &daAlink_c::procFmChainStrongPullInit, + &daAlink_c::procWolfSnowEscapeInit, + &daAlink_c::procZoraMoveInit, + &daAlink_c::procCoMetamorphoseOnlyInit, + &daAlink_c::procCoMetamorphoseOnlyInit, + &daAlink_c::procLookAroundTurnInit, + NULL, + &daAlink_c::procCoQuakeWaitInit, + &daAlink_c::procGuardAttackInit, + &daAlink_c::procSwordReadyInit, + &daAlink_c::procDungeonWarpInit, + &daAlink_c::procDungeonWarpSceneStartInit, + &daAlink_c::procMasterSwordStickInit, + &daAlink_c::procMasterSwordPullInit, + &daAlink_c::procCutDownInit, + NULL, + &daAlink_c::procCutHeadInit, + NULL, + NULL, + &daAlink_c::procCutLargeJumpInit, + &daAlink_c::procCutFastReadyInit, + &daAlink_c::procCopyRodReviveInit, + &daAlink_c::procSwordPushInit, + &daAlink_c::procGanonFinishInit, + NULL, + NULL, + &daAlink_c::procHorseLookDownInit, + NULL, +}; static f32 l_autoUpHeight = 30.010000228881836f; static f32 l_autoDownHeight = -30.010000228881836f; -#include "d/actor/d_a_alink_grab.inc" - -#include "d/actor/d_a_alink_sumou.inc" - -#include "d/actor/d_a_alink_horse.inc" - -#include "d/actor/d_a_alink_canoe.inc" - -#include "d/actor/d_a_alink_crawl.inc" - static f32 l_ladderAnmBaseTransY = 102.00054168701172f; -#include "d/actor/d_a_alink_hang.inc" - -#include "d/actor/d_a_alink_swim.inc" - -#include "d/actor/d_a_alink_iceleaf.inc" - -#include "d/actor/d_a_alink_hook.inc" - -#include "d/actor/d_a_alink_spinner.inc" - -#include "d/actor/d_a_alink_bottle.inc" - -#include "d/actor/d_a_alink_kandelaar.inc" - -#include "d/actor/d_a_alink_whistle.inc" - static dCcD_SrcCyl l_cylSrc = { { - {0, {{AT_TYPE_WOLF_ATTACK, 3, 0x1A}, {0xD8FFFDFF, 5}, 0x73}}, + {0, {{AT_TYPE_WOLF_ATTACK, 3, 0x1A}, {(s32)0xD8FFFDFF, 5}, 0x73}}, {dCcD_SE_WOLF_BITE, 3, 1, 0, {1}}, {dCcD_SE_NONE, 6, 0, 0, {0}}, {0}, @@ -1522,7 +1482,7 @@ static dCcD_SrcCyl l_cylSrc = { static dCcD_SrcSph l_sphSrc = { { - {0, {{AT_TYPE_NORMAL_SWORD, 3, 0x1A}, {0xD8FBFDFF, 5}, 0x73}}, + {0, {{AT_TYPE_NORMAL_SWORD, 3, 0x1A}, {(s32)0xD8FBFDFF, 5}, 0x73}}, {dCcD_SE_SWORD, 3, 1, 0, {1}}, {dCcD_SE_NONE, 6, 0, 0, {0}}, {0}, @@ -1940,6 +1900,50 @@ static dJntColData_c l_wolfJntColData[] = { }, }; +#include "d/actor/d_a_alink_link.inc" + +#include "d/actor/d_a_alink_cut.inc" + +#include "d/actor/d_a_alink_damage.inc" + +#include "d/actor/d_a_alink_guard.inc" + +#include "d/actor/d_a_alink_bow.inc" + +#include "d/actor/d_a_alink_boom.inc" + +#include "d/actor/d_a_alink_copyrod.inc" + +#include "d/actor/d_a_alink_hvyboots.inc" + +#include "d/actor/d_a_alink_bomb.inc" + +#include "d/actor/d_a_alink_grab.inc" + +#include "d/actor/d_a_alink_sumou.inc" + +#include "d/actor/d_a_alink_horse.inc" + +#include "d/actor/d_a_alink_canoe.inc" + +#include "d/actor/d_a_alink_crawl.inc" + +#include "d/actor/d_a_alink_hang.inc" + +#include "d/actor/d_a_alink_swim.inc" + +#include "d/actor/d_a_alink_iceleaf.inc" + +#include "d/actor/d_a_alink_hook.inc" + +#include "d/actor/d_a_alink_spinner.inc" + +#include "d/actor/d_a_alink_bottle.inc" + +#include "d/actor/d_a_alink_kandelaar.inc" + +#include "d/actor/d_a_alink_whistle.inc" + #include "d/actor/d_a_alink_ironball.inc" #include "d/actor/d_a_alink_demo.inc" @@ -2012,24 +2016,24 @@ void daAlink_matAnm_c::calc(J3DMaterial* i_material) const { if (!daAlink_getAlinkActorClass()->checkStatusWindowDraw()) { for (u32 i = 0; i < 8; i++) { if (getTexMtxAnm(i).getAnmFlag()) { - J3DTexMtxInfo* info = &i_material->getTexGenBlock()->getTexMtx(i)->getTexMtxInfo(); + J3DTextureSRTInfo* srt = &i_material->getTexGenBlock()->getTexMtx(i)->getTexMtxInfo().mSRT; if (m_morf_frame != 0) { if (!mSetFlag) { f32 var_f31 = 1.0f / (m_morf_frame + 1); - info->mSRT.mTranslationX = field_0xf4 * (1.0f - var_f31) + info->mSRT.mTranslationX * var_f31; - info->mSRT.mTranslationY = field_0xf8 * (1.0f - var_f31) + info->mSRT.mTranslationY * var_f31; + srt->mTranslationX = field_0xf4 * (1.0f - var_f31) + srt->mTranslationX * var_f31; + srt->mTranslationY = field_0xf8 * (1.0f - var_f31) + srt->mTranslationY * var_f31; mSetFlag = 1; } else { - info->mSRT.mTranslationX = field_0xf4; - info->mSRT.mTranslationY = field_0xf8; + srt->mTranslationX = field_0xf4; + srt->mTranslationY = field_0xf8; } } else if (m_eye_move_flg) { - info->mSRT.mTranslationX = mNowOffsetX; - info->mSRT.mTranslationY = mNowOffsetY; + srt->mTranslationX = mNowOffsetX; + srt->mTranslationY = mNowOffsetY; } - field_0xf4 = info->mSRT.mTranslationX; - field_0xf8 = info->mSRT.mTranslationY; + field_0xf4 = srt->mTranslationX; + field_0xf8 = srt->mTranslationY; } } } @@ -2433,7 +2437,8 @@ bool daAlink_c::modelCallBack(int i_jointNo) { } static int daAlink_modelCallBack(J3DJoint* i_joint, int param_1) { - int jntNo = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jntNo = joint->getJntNo(); daAlink_c* i_this = (daAlink_c*)j3dSys.getModel()->getUserArea(); if (param_1 == 0) { @@ -2491,7 +2496,8 @@ int daAlink_c::headModelCallBack(int i_jointNo) { } static int daAlink_headModelCallBack(J3DJoint* i_joint, int param_1) { - int joint_no = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int joint_no = joint->getJntNo(); daAlink_c* i_this = (daAlink_c*)j3dSys.getModel()->getUserArea(); if (param_1 == 0) { @@ -2514,7 +2520,8 @@ int daAlink_c::wolfModelCallBack(int i_jointNo) { } static int daAlink_wolfModelCallBack(J3DJoint* i_joint, int param_1) { - int joint_no = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int joint_no = joint->getJntNo(); daAlink_c* i_this = (daAlink_c*)j3dSys.getModel()->getUserArea(); if (param_1 == 0) { @@ -2538,6 +2545,9 @@ void daAlink_c::setHatAngle() { cXyz sp9C; cXyz sp90; + f32 sp40; + f32 sp3C; + int sp38; if (checkNoResetFlg2(daPy_FLG2(FLG2_UNK_100000 | FLG2_UNK_80000))) { sp38 = 0; @@ -2546,6 +2556,7 @@ void daAlink_c::setHatAngle() { } mDoMtx_multVecZero(mpLinkHatModel->getAnmMtx(sp38), &spA8); + sp3C = field_0x34e0.y - mpLinkHatModel->getAnmMtx(0)[1][3]; BOOL sp34; if (!checkEndResetFlg1(ERFLG1_UNK_80000) @@ -2556,7 +2567,6 @@ void daAlink_c::setHatAngle() { sp34 = FALSE; } - f32 sp40; dKyw_get_AllWind_vec(&spA8, &spB4, &sp40); if (checkModeFlg(0x40000) || checkEndResetFlg1(ERFLG1_UNK_80000)) { @@ -2569,6 +2579,8 @@ void daAlink_c::setHatAngle() { f32 var_f28; f32 temp_f26 = 25.0f * (sp40 * sp40); + s16 sp18; + s16 sp16; s16 sp14 = field_0x3060; s16 sp12 = field_0x3062; cXyz sp84 = eyePos - field_0x34e0; @@ -2578,10 +2590,12 @@ void daAlink_c::setHatAngle() { mDoMtx_multVecZero(mpLinkHatModel->getAnmMtx(0), &sp90); sp90 = field_0x34e0 - sp90; mDoMtx_multVecSR(mMagneBootInvMtx, &sp90, &sp90); + sp3C = sp90.y; } field_0x3062 = sp84.atan2sX_Z(); + s16 sp10; s16 spE; if (mProcID == PROC_GOAT_CATCH) { mDoMtx_multVecSR(mpLinkModel->getAnmMtx(1), &cXyz::BaseY, &sp90); @@ -2601,14 +2615,14 @@ void daAlink_c::setHatAngle() { field_0x3060 = sp84.atan2sY_XZ(); } - f32 temp_f1 = sp84.absXZ(); - if (temp_f1 < 0.01f) { + f32 var_f31 = sp84.absXZ(); + if (var_f31 < 0.01f) { var_f29 = cM_ssin(spE); var_f28 = cM_scos(spE); } else { - f32 temp_f31 = 1.0f / temp_f1; - var_f29 = sp84.x * temp_f31; - var_f28 = sp84.z * temp_f31; + var_f31 = 1.0f / var_f31; + var_f29 = sp84.x * var_f31; + var_f28 = sp84.z * var_f31; } s16 spC; @@ -2653,11 +2667,11 @@ void daAlink_c::setHatAngle() { } if (fabsf(sp9C.x) < 0.01f) { - sp9C.x = (f32) 0.0f; + sp9C.x = 0.0f; } if (fabsf(sp9C.z) < 0.01f) { - sp9C.z = (f32) 0.0f; + sp9C.z = 0.0f; } if (checkMagneBootsOn()) { @@ -2672,9 +2686,6 @@ void daAlink_c::setHatAngle() { mDoMtx_stack_c::multVecSR(&cXyz::BaseY, &sp78); mDoMtx_stack_c::multVec(&cXyz::BaseX, &sp6C); - s16 sp18; - s16 sp16; - int sp30; if (sp6C.y < mDoMtx_stack_c::get()[1][3] && !checkUnderMove0BckNoArc(ANM_DIE)) { sp30 = cM_atan2s(-sp78.y, -sp78.absXZ()); @@ -2693,7 +2704,7 @@ void daAlink_c::setHatAngle() { sp16 = *temp_r28; f32 temp_f27 = (sp9C.z * var_f28) + (sp9C.x * var_f29); - s16 sp10 = cM_atan2s(sp9C.y, -temp_f27); + sp10 = cM_atan2s(sp9C.y, -temp_f27); int sp24 = cLib_minMaxLimit(sp10 - field_0x3060, -0x3800, 0x3800); sp10 = (sp24 + field_0x3060); @@ -2728,9 +2739,10 @@ void daAlink_c::setHatAngle() { sp2C++; sp28++; - for (int i = 1; i < 3; i++, temp_r29++, temp_r28++, sp2C++, sp28++) { - temp_r29[0] -= ((s16)(temp_r29[-1] - sp18) >> 1); - temp_r28[0] -= ((s16)(temp_r28[-1] - sp16) >> 1); + int i; + for (i = 1; i < 3; i++, temp_r29++, temp_r28++, sp2C++, sp28++) { + ANGLE_SUB_2(temp_r29[0], ((s16)(temp_r29[-1] - sp18) >> 1)); + ANGLE_SUB_2(temp_r28[0], ((s16)(temp_r28[-1] - sp16) >> 1)); sp18 = temp_r29[0]; sp16 = temp_r28[0]; @@ -2746,7 +2758,7 @@ void daAlink_c::setHatAngle() { sp10 += temp_r29[0]; if (sp10 < sp30) { - temp_r29[0] += (sp30 - sp10); + ANGLE_ADD_2(temp_r29[0], sp30 - sp10); sp10 = sp30; } @@ -2770,7 +2782,7 @@ void daAlink_c::setHatAngle() { s16 sp8 = 1500.0f + (4060.0f * var_f30); field_0x3064 += sp8; - for (int i = 0; i < 3; i++) { + for (i = 0; i < 3; i++) { field_0x3066[i] = var_f25 * cM_deg2s(((i + 1) * 4)) * cM_scos((field_0x3064 - ((i + 3) * sp8))); } @@ -2788,6 +2800,8 @@ void daAlink_c::setHairAngle(cXyz* param_0, f32 param_1, f32 param_2) { f32 temp_f27 = param_0->absXZ(); if (var_f31 < 1.0f || temp_f27 < 1.0f) { + int dummy; // force stack pointer into r31 for debug + calcHairAngle(&field_0x302c[1]); calcHairAngle(&field_0x3040[1]); calcHairAngle(&field_0x302c[2]); @@ -2904,6 +2918,7 @@ bool daAlink_c::checkActorPosAngle(fopAc_ac_c* i_actor, cXyz** o_ppos) { } cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) { + cXyz* sp1C; fopAc_ac_c* look_actor = NULL; s16 spA = field_0x311c; field_0x311c = 0; @@ -2970,7 +2985,7 @@ cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) { field_0x28fc = fopAcM_GetID(lock_actor); } } else { - field_0x30f8 -= 1; + field_0x30f8--; } } } else { @@ -2984,7 +2999,6 @@ cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) { look_actor = dCam_getBody()->GetForceLockOnActor(); } - cXyz* sp1C; if (checkActorPosAngle(look_actor, &sp1C)) { return sp1C; } @@ -3293,7 +3307,7 @@ void daAlink_c::setEyeMove(cXyz* param_0, s16 param_1, s16 param_2) { var_f31 = 0.0f; } else if (!checkEventRun() && checkModeFlg(1) && checkNoResetFlg1(FLG1_UNK_2000) && (checkNoUpperAnime() || checkGrabAnime()) && (mProcID == PROC_WAIT || mProcID == PROC_GRAB_WAIT || mProcID == PROC_CROUCH || mProcID == PROC_HORSE_WAIT || mProcID == PROC_WOLF_WAIT)) { if (temp_r28 != 0) { - field_0x2fa7 = temp_r28 - 1; + field_0x2fa7 = --temp_r28; field_0x3418 = sp18; field_0x341c = sp14; } else if (0.0f != sp18 || 0.0f != sp14) { @@ -3487,12 +3501,12 @@ void daAlink_c::setMoveSlantAngle() { if (mProcID == PROC_WOLF_SWIM_MOVE) { if (var_r29 >= 0) { - var_r29 -= 0x100; + ANGLE_SUB_2(var_r29, 0x100); if (var_r29 < 0) { var_r29 = 0; } } else { - var_r29 += 0x100; + ANGLE_ADD_2(var_r29, 0x100); if (var_r29 > 0) { var_r29 = 0; } @@ -3500,7 +3514,7 @@ void daAlink_c::setMoveSlantAngle() { } var_r29 = cLib_minMaxLimit((s16)var_r29, -0x300, 0x300); - var_r29 *= 8; + var_r29 <<= 3; } else { var_r28 = 0; var_r29 = 0; @@ -3516,13 +3530,13 @@ void daAlink_c::setMoveSlantAngle() { cLib_addCalcAngleS(&field_0x2fec, var_r29, 4, 1200, 200); } } else if (mProcID != PROC_CAUGHT) { - shape_angle.z = (field_0x2fee >> 1); - mBodyAngle.z = shape_angle.z; + shape_angle.z = field_0x2fee >> 1; + mBodyAngle.z = (s16)shape_angle.z; if (mProcID == PROC_MOVE || mProcID == PROC_WAIT) { var_r29 = (s16)(shape_angle.y - mPrevAngleY) * 2; if (mProcID == PROC_WAIT) { - var_r29 *= 2; + var_r29 <<= 1; } var_r29 = cLib_minMaxLimit((s16)var_r29, -0xC00, 0xC00); @@ -3536,9 +3550,9 @@ void daAlink_c::setMoveSlantAngle() { } int daAlink_c::setArmMatrix() { + static const u16 armJointTable[] = {0x0007,0x000C}; static Vec const arm1Vec = {29.0f, 0.0f, 0.0f}; static Vec const arm2Vec = {26.5f, 0.0f, 0.0f}; - static const u16 armJointTable[] = {0x0007,0x000C}; daAlink_footData_c* var_r29 = mFootData2; @@ -3602,16 +3616,17 @@ int daAlink_c::setArmMatrix() { } int daAlink_c::setFootMatrix() { + static const u16 footJointTable[] = {0x0012, 0x0017}; static Vec const leg1Vec = {30.0f, 0.0f, 0.0f}; static Vec const leg2Vec = {39.363499f, 0.0f, 0.0f}; static Vec const footVec = {14.18f, 0.0f, 0.0f}; - static const u16 footJointTable[] = {0x0012, 0x0017}; daAlink_footData_c* var_r30 = mFootData1; int i; + int j; for (i = 0; i < 2; i++, var_r30++) { - for (int j = 0; j < 3; j++) { + for (j = 0; j < 3; j++) { cMtx_copy(mpLinkModel->getAnmMtx(j + footJointTable[i]), var_r30->field_0x14[j]); } @@ -3627,14 +3642,15 @@ int daAlink_c::setFootMatrix() { if (mProcID == PROC_HORSE_GETOFF) { current.angle.y = shape_angle.y; if (field_0x2fc0 == 0) { - shape_angle.y -= 0x4000; + ANGLE_SUB_2(shape_angle.y, 0x4000); } else { - shape_angle.y += 0x4000; + ANGLE_ADD_2(shape_angle.y, 0x4000); } } + u16 temp_r29; for (i = 0; i < 2; i++, var_r30++) { - u16 temp_r29 = footJointTable[i]; + temp_r29 = footJointTable[i]; setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(temp_r29), var_r30->field_0x6, 0, 0, 0, NULL); mDoMtx_stack_c::multVec(&leg1Vec, &sp10); @@ -3645,8 +3661,8 @@ int daAlink_c::setFootMatrix() { temp_r29++; setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(temp_r29), var_r30->field_0x2, 0, 0, 0, &sp10); - temp_r29++; mDoMtx_stack_c::multVec(&footVec, &sp10); + temp_r29++; setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(temp_r29), var_r30->field_0x2, 0, 0, 0, &sp10); } @@ -3741,22 +3757,23 @@ int daAlink_c::setLegAngle(f32 param_0, daAlink_footData_c* param_1, s16* param_ } cXyz sp50 = sp5C - spA4; - f32 temp_f1 = sp50.abs2(); - if (cM3d_IsZero(temp_f1)) { + f32 var_f31 = sp50.abs2(); + if (cM3d_IsZero(var_f31)) { return 0; } - f32 temp_f28 = sp74.abs2(); - f32 temp_f26 = sp68.abs2(); + f32 var_f29; + f32 var_f28 = sp74.abs2(); + f32 var_f26 = sp68.abs2(); - if (JMAFastSqrt(temp_f28) + JMAFastSqrt(temp_f26) <= JMAFastSqrt(temp_f1)) { + if (JMAFastSqrt(var_f28) + JMAFastSqrt(var_f26) <= JMAFastSqrt(var_f31)) { return 0; } - f32 temp_f27 = ((temp_f1 + temp_f28) - temp_f26) / (2.0f * temp_f1); - cXyz sp44 = spA4 + (sp50 * temp_f27); + f32 var_f27 = ((var_f31 + var_f28) - var_f26) / (2.0f * var_f31); + cXyz sp44 = spA4 + (sp50 * var_f27); - f32 var_f30 = temp_f28 - (temp_f27 * (temp_f1 * temp_f27)); + f32 var_f30 = var_f28 - (var_f27 * (var_f31 * var_f27)); if (var_f30 < 0.0f) { var_f30 = 0.0f; } @@ -3774,20 +3791,24 @@ int daAlink_c::setLegAngle(f32 param_0, daAlink_footData_c* param_1, s16* param_ sp80.set(-sp50.y, sp50.x, 0.0f); } - f32 temp_f1_2 = sp80.abs(); - if (cM3d_IsZero(temp_f1_2)) { + var_f29 = sp80.abs(); + if (cM3d_IsZero(var_f29)) { return 0; } - cXyz sp38 = sp44 + (sp80 * (var_f30 / temp_f1_2)); + var_f29 = var_f30 / var_f29; + cXyz sp38 = sp44 + (sp80 * var_f29); cXyz sp2C = sp38 - spA4; cXyz sp20 = sp5C - sp38; + s16 temp_r30; + s16 var_r29; + s16 temp_r0; if (param_4 != 0) { - s16 temp_r30 = cM_atan2s(sp2C.y, sp2C.z); - s16 var_r29 = cM_atan2s(sp20.y, sp20.z); - s16 temp_r0 = var_r29 - temp_r30; + temp_r30 = cM_atan2s(sp2C.y, sp2C.z); + var_r29 = cM_atan2s(sp20.y, sp20.z); + temp_r0 = var_r29 - temp_r30; if (checkWolf()) { if (temp_r0 < 0) { @@ -3804,11 +3825,11 @@ int daAlink_c::setLegAngle(f32 param_0, daAlink_footData_c* param_1, s16* param_ *param_2 = cM_atan2s(sp74.y, sp74.z) - temp_r30; *param_3 = cM_atan2s(sp68.y, sp68.z) - var_r29; } else { - s16 temp_r30_2 = cM_atan2s(sp2C.x, sp2C.y); - s16 temp_r29 = cM_atan2s(sp20.x, sp20.y); + temp_r30 = cM_atan2s(sp2C.x, sp2C.y); + var_r29 = cM_atan2s(sp20.x, sp20.y); - *param_2 = cM_atan2s(sp74.x, sp74.y) - temp_r30_2; - *param_3 = cM_atan2s(sp68.x, sp68.y) - temp_r29; + *param_2 = cM_atan2s(sp74.x, sp74.y) - temp_r30; + *param_3 = cM_atan2s(sp68.x, sp68.y) - var_r29; } return 1; @@ -4049,6 +4070,7 @@ JKRHeap* daAlink_c::setItemHeap() { * The latter 3 digits are the resource ID */ void daAlink_c::setIdxMask(u16* o_arcNo, u16* o_resIdx) { + UNUSED(o_resIdx); if (*o_arcNo == 0xFFFF) { u16 arc_id = (*o_resIdx >> 12) & 0xF; *o_resIdx &= 0xFFF; @@ -4513,16 +4535,16 @@ void daAlink_c::playerInit() { m_nSwordBtk->searchUpdateMaterialID(modelData); modelData->entryTexMtxAnimator(m_nSwordBtk); - J3DModelData* modelData2 = mpSwMModel->getModelData(); + modelData = mpSwMModel->getModelData(); m_mSwordBtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_ID_ALINK_BTK_AL_SWM_e); JUT_ASSERT(4767, m_mSwordBtk); - m_mSwordBtk->searchUpdateMaterialID(modelData2); - modelData2->entryTexMtxAnimator(m_mSwordBtk); + m_mSwordBtk->searchUpdateMaterialID(modelData); + modelData->entryTexMtxAnimator(m_mSwordBtk); m_mSwordBrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, dRes_ID_ALINK_BRK_AL_SWM_e); JUT_ASSERT(4774, m_mSwordBrk != NULL); - m_mSwordBrk->searchUpdateMaterialID(modelData2); - modelData2->entryTevRegAnimator(m_mSwordBrk); + m_mSwordBrk->searchUpdateMaterialID(modelData); + modelData->entryTevRegAnimator(m_mSwordBrk); mWaterY = -G_CM3D_F_INF; field_0x33b8 = -G_CM3D_F_INF; @@ -4585,8 +4607,9 @@ void daAlink_c::playerInit() { field_0x2f96 = -1; field_0x2f97 = -1; - for (int i = 0; i < 16; i++) { - mShieldArrowIDs[i] = fpcM_ERROR_PROCESS_ID_e; + int i2; + for (i2 = 0; i2 < 16; i2++) { + mShieldArrowIDs[i2] = fpcM_ERROR_PROCESS_ID_e; } mAtnActorID = fpcM_ERROR_PROCESS_ID_e; @@ -4616,6 +4639,10 @@ void daAlink_c::playerInit() { } } +void dummy(fopAc_ac_c* i_this) { + fopAcM_RegisterCreateID(i_this, "ALINK"); +} + BOOL daAlink_c::checkHorseStart(u32 i_lastMode, int i_startMode) { return i_lastMode == 1 || i_startMode == 2 || i_lastMode == 8; } @@ -4785,7 +4812,7 @@ int daAlink_c::setStartProcInit() { mMoveAngle = shape_angle.y; if (last_mode == 3) { - shape_angle.y += 0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); current.angle.y = shape_angle.y; mPrevAngleY = shape_angle.y; } @@ -5493,6 +5520,7 @@ void daAlink_c::setBodyPartPos() { static Vec const boardLocalEyeFromRoot = {9.5f, 47.0f, 24.5f}; static Vec const horseLocalEyeFromRoot = {1.75f, 55.0f, 25.5f}; static Vec const canoeLocalEyeFromRoot = {0.0f, 55.0f, 25.0f}; + static Vec const wlLocalEyeFromRoot = {0.0f, -6.0f, 85.5f}; if (checkWolf()) { cMtx_multVec(mpLinkModel->getAnmMtx(4), &wlLocalEye, &eyePos); @@ -5570,7 +5598,6 @@ int daAlink_c::setRollJump(f32 i_speedH, f32 i_speedV, s16 i_angle) { } void daAlink_c::setAttentionPos() { - static Vec const wlLocalEyeFromRoot = {0.0f, -6.0f, 85.5f}; static Vec const normalOffset = {0.0f, 150.0f, 0.0f}; static Vec const crawlOffset = {0.0f, 40.0f, 30.0f}; static Vec const crouchOffset = {0.0f, 95.0f, 0.0f}; @@ -6228,6 +6255,8 @@ void daAlink_c::setWolfAtCollision() { mTgCyls[i].OnAtSetBit(); } } + + (void)0; } else { mAtCyl.MoveCAt(sp8); } @@ -6608,7 +6637,8 @@ void daAlink_c::cancelLockAt() { void daAlink_c::setCollisionPos() { cXyz sp74; mDoMtx_multVecZero(mpLinkModel->getAnmMtx(0), &sp74); - cXyz sp68 = (sp74 + mHeadTopPos) * 0.5f; + cXyz sp68; + sp68 = (sp74 + mHeadTopPos) * 0.5f; f32 var_f31; if (sp74.y > mHeadTopPos.y) { @@ -6628,30 +6658,29 @@ void daAlink_c::setCollisionPos() { mTgCyls[2].SetH(var_f31); sp68 = (((mLeftFootPos + mRightFootPos) * 0.5f) + sp74) * 0.5f; - f32 var_f0 = mLeftFootPos.y > mRightFootPos.y ? mRightFootPos.y : mLeftFootPos.y; + f32 var_f30 = mLeftFootPos.y > mRightFootPos.y ? mRightFootPos.y : mLeftFootPos.y; - f32 var_f31_2; - if (sp74.y > var_f0) { - sp68.y = var_f0; - var_f31_2 = sp74.y - var_f0; + if (sp74.y > var_f30) { + sp68.y = var_f30; + var_f31 = sp74.y - var_f30; } else { sp68.y = sp74.y; - var_f31_2 = var_f0 - sp74.y; + var_f31 = var_f30 - sp74.y; } - if (var_f31_2 < 60.0f) { - sp68.y -= 0.5f * (60.0f - var_f31_2); - var_f31_2 = 60.0f; + if (var_f31 < 60.0f) { + sp68.y -= 0.5f * (60.0f - var_f31); + var_f31 = 60.0f; } mTgCyls[0].SetC(sp68); - mTgCyls[0].SetH(var_f31_2); + mTgCyls[0].SetH(var_f31); sp68 = (mTgCyls[0].GetC() + mTgCyls[2].GetC()) * 0.5f; - f32 temp_f31 = 0.5f * (mTgCyls[0].GetH() + mTgCyls[2].GetH()); + var_f31 = 0.5f * (mTgCyls[0].GetH() + mTgCyls[2].GetH()); mTgCyls[1].SetC(sp68); - mTgCyls[1].SetH(temp_f31); + mTgCyls[1].SetH(var_f31); field_0x3454 = field_0x3834.y; } @@ -7689,6 +7718,8 @@ void daAlink_c::setBlendMoveAnime(f32 i_morf) { field_0x2f97 = 6; } } + + (void)0; } else if (var_f31 < mpHIO->mMove.m.mRunChangeRate) { var_f28 = (var_f31 - mpHIO->mMove.m.mWalkChangeRate) / (mpHIO->mMove.m.mRunChangeRate - mpHIO->mMove.m.mWalkChangeRate); setDoubleAnime(var_f28, var_f29, sp2C, var_r28, sp18, 1, i_morf); @@ -8543,8 +8574,8 @@ void daAlink_c::setFrontWallType() { sp40 = linchk_tri.getSignedLenPos(¤t.pos); field_0x34ec.set(current.pos.x - (sp40 * linchk_tri.mNormal.x), current.pos.y, current.pos.z - (sp40 * linchk_tri.mNormal.z)); - int temp_r3 = dComIfG_Bgsp().GetWallCode(mLinkLinChk); - if (temp_r3 != 4 && temp_r3 != 5) { + wall_code = dComIfG_Bgsp().GetWallCode(mLinkLinChk); + if (wall_code != 4 && wall_code != 5) { line_start_pos.x = current.pos.x; line_start_pos.z = current.pos.z; line_end_pos.x = line_start_pos.x - (2.0f * sp40 * linchk_tri.mNormal.x); @@ -8607,6 +8638,7 @@ void daAlink_c::setFrontWallType() { field_0x27fc = dComIfG_Bgsp().GetActorPointer(mLinkLinChk); } + f32 sp38; if (checkNoResetFlg0(daPy_FLG0(FLG0_WATER_IN_MOVE | FLG0_SWIM_UP))) { if (var_r29 == 6 && !checkModeFlg(0x40002)) { setDoStatus(BUTTON_STATUS_ENTER); @@ -8641,7 +8673,7 @@ void daAlink_c::setFrontWallType() { line_start_pos.set(field_0x34ec.x - (15.0f * linchk_tri.mNormal.x), 150.0f + sp34, field_0x34ec.z - (15.0f * linchk_tri.mNormal.z)); mLinkGndChk.SetPos(&line_start_pos); - f32 sp38 = dComIfG_Bgsp().GroundCross(&mLinkGndChk); + sp38 = dComIfG_Bgsp().GroundCross(&mLinkGndChk); if (sp38 >= current.pos.y && dBgS_CheckBGroundPoly(mLinkGndChk)) { cM3dGPla spB8; @@ -8750,7 +8782,7 @@ void daAlink_c::setFrontWallType() { line_start_pos.set(field_0x34ec.x - (1.5f * linchk_tri.mNormal.x), body_height + (0.01f + hang_height), field_0x34ec.z - (1.5f * linchk_tri.mNormal.z)); mLinkGndChk.SetPos(&line_start_pos); - f32 sp38 = dComIfG_Bgsp().GroundCross(&mLinkGndChk); + sp38 = dComIfG_Bgsp().GroundCross(&mLinkGndChk); if (-G_CM3D_F_INF != sp38 && fabsf(sp1C - sp38) < l_autoUpHeight) { found_gnd_tri = dComIfG_Bgsp().GetTriPla(mLinkGndChk, &gndchk_tri); @@ -9314,8 +9346,7 @@ void daAlink_c::setStickData() { mDemo.setMoveAngle(getSceneExitMoveAngle()); if (checkHorseRide()) { - s16 angle = mDemo.getMoveAngle(); - dComIfGp_getHorseActor()->changeDemoMoveAngle(angle); + dComIfGp_getHorseActor()->changeDemoMoveAngle(mDemo.getMoveAngle()); } } else { mStickValue = 0.0f; @@ -9381,47 +9412,47 @@ void daAlink_c::setStickData() { } if (mDoCPd_c::getTrigB(PAD_1)) { - mItemTrigger |= BTN_B; + mItemTrigger |= (daAlink_ITEM_BTN)BTN_B; } if (mDoCPd_c::getTrigA(PAD_1)) { - mItemTrigger |= BTN_A; + mItemTrigger |= (daAlink_ITEM_BTN)BTN_A; } if (mDoCPd_c::getTrigX(PAD_1)) { - mItemTrigger |= BTN_X; + mItemTrigger |= (daAlink_ITEM_BTN)BTN_X; } if (mDoCPd_c::getTrigY(PAD_1)) { - mItemTrigger |= BTN_Y; + mItemTrigger |= (daAlink_ITEM_BTN)BTN_Y; } if (mDoCPd_c::getTrigZ(PAD_1)) { - mItemTrigger |= BTN_Z; + mItemTrigger |= (daAlink_ITEM_BTN)BTN_Z; } if (mDoCPd_c::getTrigL(PAD_1)) { - mItemTrigger |= BTN_L; + mItemTrigger |= (daAlink_ITEM_BTN)BTN_L; } if (mDoCPd_c::getTrigLockR(PAD_1)) { - mItemTrigger |= BTN_R; + mItemTrigger |= (daAlink_ITEM_BTN)BTN_R; } if (mDoCPd_c::getHoldA(PAD_1)) { - mItemButton |= BTN_A; + mItemButton |= (daAlink_ITEM_BTN)BTN_A; } if (mDoCPd_c::getHoldB(PAD_1)) { - mItemButton |= BTN_B; + mItemButton |= (daAlink_ITEM_BTN)BTN_B; } if (mDoCPd_c::getHoldX(PAD_1)) { - mItemButton |= BTN_X; + mItemButton |= (daAlink_ITEM_BTN)BTN_X; } if (mDoCPd_c::getHoldY(PAD_1)) { - mItemButton |= BTN_Y; + mItemButton |= (daAlink_ITEM_BTN)BTN_Y; } if (mDoCPd_c::getHoldZ(PAD_1)) { - mItemButton |= BTN_Z; + mItemButton |= (daAlink_ITEM_BTN)BTN_Z; } if (mDoCPd_c::getHoldL(PAD_1)) { - mItemButton |= BTN_L; + mItemButton |= (daAlink_ITEM_BTN)BTN_L; } if (mDoCPd_c::getHoldLockR(PAD_1)) { - mItemButton |= BTN_R; + mItemButton |= (daAlink_ITEM_BTN)BTN_R; } if (checkHeavyStateOn(TRUE, TRUE) && @@ -9682,7 +9713,7 @@ s16 daAlink_c::getShapeAngleYAtnActor() { } if (checkWolfShapeReverse()) { - var_r29 += 0x8000; + ANGLE_ADD_2(var_r29, 0x8000); } } else { var_r29 = shape_angle.y; @@ -9799,8 +9830,9 @@ void daAlink_c::setNormalSpeedF(f32 i_speed, f32 i_deceleration) { ) { dBgS_AcchCir* acch_cir = mAcchCir; + int i; if (mLinkAcch.ChkWallHit()) { - for (int i = 0; i < 3; i++, acch_cir++) { + for (i = 0; i < 3; i++, acch_cir++) { if (acch_cir->ChkWallHit()) { var_r29 = (current.angle.y + 0x8000) - acch_cir->GetWallAngleY(); break; @@ -9810,7 +9842,10 @@ void daAlink_c::setNormalSpeedF(f32 i_speed, f32 i_deceleration) { field_0x30fc = 3; field_0x30fa = cM_atan2s(field_0x342c, field_0x3430); var_r29 = (current.angle.y + 0x8000) - field_0x30fa; - } else if (field_0x30fc == 1 && mGrabItemAcKeep.getActor() != NULL && current.pos.abs2(field_0x3540) < 1.0f && dComIfG_Bgsp().ChkPolySafe(mPolyInfo4)) { + } else if (field_0x30fc == 1 && + mGrabItemAcKeep.getActor() != NULL && + current.pos.abs2(field_0x3540) < 1.0f && + dComIfG_Bgsp().ChkPolySafe(mPolyInfo4)) { field_0x30fc = 3; } @@ -9823,16 +9858,16 @@ void daAlink_c::setNormalSpeedF(f32 i_speed, f32 i_deceleration) { } if (checkNoResetFlg1(FLG1_UNK_20000000)) { - s16 temp_r29 = (current.angle.y + 0x8000) - field_0x3092; + var_r29 = (current.angle.y + 0x8000) - field_0x3092; - int temp_r3_2 = abs(temp_r29); + int temp_r3_2 = abs(var_r29); if (temp_r3_2 < 0x4000) { if (checkModeFlg(0x40000)) { - max_speed *= 1.0f - (0.8f * cM_scos(temp_r29)); + max_speed *= 1.0f - (0.8f * cM_scos(var_r29)); } else if (temp_r3_2 < 0x600) { max_speed = 0.0f; } else { - max_speed *= 1.0f - cM_scos(temp_r29); + max_speed *= 1.0f - cM_scos(var_r29); } if (!checkWolf() && !checkMagneBootsOn()) { @@ -9891,7 +9926,9 @@ void daAlink_c::setSpeedAndAngleNormal() { dBgS_AcchCir* acchCir = mAcchCir; for (int i = 0; i < 3; i++, acchCir++) { if (acchCir->ChkWallHit()) { - abs((s16)((current.angle.y + 0x8000) - acchCir->GetWallAngleY())); + if (abs((s16)((current.angle.y + 0x8000) - acchCir->GetWallAngleY())) < 0x4000) { + var_r26 = true; + } break; } } @@ -9994,34 +10031,34 @@ void daAlink_c::setSpeedAndAngleNormal() { void daAlink_c::setSpeedAndAngleAtn() { int var_r29 = field_0x2f98; + s16 angleRate; + s16 angleMaxStep; + s16 angleMinStep; + + f32 speed; + f32 acceleration; + f32 deceleration; + if (checkInputOnR()) { - s16 temp_r0 = mMoveAngle - shape_angle.y; - f32 temp_f27 = cM_ssin(temp_r0); - f32 temp_f29 = cM_scos(temp_r0); + s16 var_r24 = mMoveAngle - shape_angle.y; + f32 var_f27 = cM_ssin(var_r24); + f32 var_f31 = cM_scos(var_r24); - if (mTargetedActor == NULL && !checkGoatStopGame() && (temp_f29 <= -0.99f || temp_f29 >= 0.99f)) { - if (temp_f29 <= -0.99f) { + if (mTargetedActor == NULL && !checkGoatStopGame() && (var_f31 <= -0.99f || var_f31 >= 0.99f)) { + if (var_f31 <= -0.99f) { var_r29 = 1; } else { var_r29 = 0; } - } else if (temp_f29 < -0.866f) { + } else if (var_f31 < -0.866f) { var_r29 = 1; - } else if (temp_f27 > 0.0f) { + } else if (var_f27 > 0.0f) { var_r29 = 2; - } else if (temp_f27 < 0.0f) { + } else if (var_f27 < 0.0f) { var_r29 = 3; } } - s16 angleRate; - s16 angleMaxStep; - s16 angleMinStep; - - f32 acceleration; - f32 deceleration; - f32 speed; - if (mTargetedActor != NULL) { angleRate = mpHIO->mAtnMove.m.mTurnAngleRate; angleMaxStep = mpHIO->mAtnMove.m.mMaxTurnAngle; @@ -10038,7 +10075,7 @@ void daAlink_c::setSpeedAndAngleAtn() { if (var_r29 == 0) { if (checkInputOnR()) { if (getDirectionFromCurrentAngle() == DIR_BACKWARD) { - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); mNormalSpeed *= -1.0f; } if (checkZeroSpeedF()) { @@ -10065,7 +10102,7 @@ void daAlink_c::setSpeedAndAngleAtn() { if (checkInputOnR()) { if (getDirectionFromCurrentAngle() == DIR_BACKWARD) { - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); mNormalSpeed *= -1.0f; } @@ -10228,6 +10265,7 @@ void daAlink_c::decideCommonDoStatus() { } else if (mFastShotTime != 0) { setDoStatus(BUTTON_STATUS_BACK); } + (void)0; } else if (checkWolf()) { if (checkDownAttackState()) { setDoStatusEmphasys(BUTTON_STATUS_FINISH); @@ -10270,6 +10308,7 @@ void daAlink_c::decideCommonDoStatus() { { setDoStatus(BUTTON_STATUS_NONE); } + (void)0; } else { int direction = getDirectionFromShapeAngle(); f32 frontRollRate = getFrontRollRate(); @@ -10369,6 +10408,7 @@ void daAlink_c::decideDoStatus() { if (field_0x2f91 == 7 || field_0x2f91 == 8 || field_0x2f91 == 6 || field_0x2f91 == 9) { setDoStatus(BUTTON_STATUS_UNK_32); } + (void)0; } else { if (searchFmChainPos()) { setChainGrabStatus(BUTTON_STATUS_UNK_150); @@ -11913,7 +11953,12 @@ void daAlink_c::swordUnequip() { anm_speed = mpHIO->mCut.m.mUnequipAnm.mSpeed; } - u16 anm_id = checkReinRide() ? (u16)dRes_ID_ALANM_BCK_WAITHATOHS_e : (u16)dRes_ID_ALANM_BCK_WAITATOS_e; + u16 anm_id; + if (checkReinRide()) { + anm_id = (u16)dRes_ID_ALANM_BCK_WAITHATOHS_e; + } else { + anm_id = (u16)dRes_ID_ALANM_BCK_WAITATOS_e; + } setUpperAnime(anm_id, UPPER_2, anm_speed, mpHIO->mCut.m.mUnequipAnm.mStartFrame, mpHIO->mCut.m.mUnequipAnm.mEndFrame, @@ -12819,6 +12864,7 @@ void daAlink_c::transAnimeProc(cXyz* param_0, f32 param_1, f32 param_2) { } void daAlink_c::setFootSpeed() { + int i; cXyz sp18[2]; f32 var_f31; @@ -12846,12 +12892,12 @@ void daAlink_c::setFootSpeed() { } else { var_f31 = 0.0f; - for (int i = 0; i < 2; i++) { + for (i = 0; i < 2; i++) { sp18[i] = current.pos; } } - for (int i = 0; i < 2; i++) { + for (i = 0; i < 2; i++) { field_0x37b0[i] = sp18[i]; } @@ -12899,7 +12945,7 @@ void daAlink_c::posMove() { speedF *= mpHIO->mSwim.m.mFloatUpSwimSpeedRate; } - f32 var_f31 = speedF; + f32 sp28 = speedF; speedF *= cM_scos(var_r26); if (var_r26 < 0 && !checkBoardRide() && !checkModeFlg(MODE_SWIMMING)) { @@ -12928,20 +12974,20 @@ void daAlink_c::posMove() { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, &plane); - f32 temp_f0 = cM_sht2d(cM_atan2s(plane.mNormal.absXZ(), plane.mNormal.y)); + f32 sp24 = cM_sht2d(cM_atan2s(plane.mNormal.absXZ(), plane.mNormal.y)); - if (temp_f0 >= mpHIO->mSlide.m.mLV2MinibossFloorWeakSlideAngle && - temp_f0 <= mpHIO->mSlide.m.mLV2MinibossFloorSlideAngle) + if (sp24 >= mpHIO->mSlide.m.mLV2MinibossFloorWeakSlideAngle && + sp24 <= mpHIO->mSlide.m.mLV2MinibossFloorSlideAngle) { - temp_f0 = ((temp_f0 - mpHIO->mSlide.m.mLV2MinibossFloorWeakSlideAngle) * + f32 sp20 = ((sp24 - mpHIO->mSlide.m.mLV2MinibossFloorWeakSlideAngle) * mpHIO->mSlide.m.mLV2MinibossFloorWeakSlideSpeed) / (mpHIO->mSlide.m.mLV2MinibossFloorSlideAngle - mpHIO->mSlide.m.mLV2MinibossFloorWeakSlideAngle); plane.mNormal.y = 0.0f; plane.mNormal.normalizeZP(); - speed.x += temp_f0 * plane.mNormal.x; - speed.z += temp_f0 * plane.mNormal.z; + speed.x += sp20 * plane.mNormal.x; + speed.z += sp20 * plane.mNormal.z; } } } @@ -12971,7 +13017,7 @@ void daAlink_c::posMove() { } } } else if (!checkEquipHeavyBoots() && getZoraSwim()) { - speed.y = -var_f31 * cM_ssin(var_r26); + speed.y = -sp28 * cM_ssin(var_r26); } else if ((checkBootsOrArmorHeavy() && mProcID != PROC_DEAD) || mProcID == PROC_SWIM_DIVE) { speed.y += gravity; @@ -13026,7 +13072,13 @@ void daAlink_c::posMove() { } setIceSlipSpeed(); - var_f31 = current.pos.y; + f32 sp1C = current.pos.y; + + f32 sp18; + f32 sp14; + f32 sp10; + f32 sp0C; + f32 sp08; if (!checkModeFlg(0x400) || checkBoardRide()) { if (checkMagneBootsOn()) { @@ -13034,7 +13086,7 @@ void daAlink_c::posMove() { mDoMtx_stack_c::YrotM(current.angle.y); Vec spFC = {0.0f, 0.0f, 0.0f}; - spFC.z = speedF; + sp08 = spFC.z = speedF; mDoMtx_stack_c::multVecSR(&spFC, &speed); current.pos += speed; current.pos.x += field_0x342c; @@ -13055,7 +13107,7 @@ void daAlink_c::posMove() { } if (getSumouMode() && mProcID != PROC_SUMOU_WIN_LOSE) { - current.pos.y = var_f31 - 1.0f; + current.pos.y = sp1C - 1.0f; speed.y = gravity; } @@ -13078,11 +13130,11 @@ void daAlink_c::posMove() { } if (mLinkAcch.ChkGroundHit() && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd)) { - s16 angle1 = getGroundAngle(&mLinkAcch.m_gnd, 0); - current.pos.z += field_0x35c4.z * cM_scos(angle1); + s16 angle = getGroundAngle(&mLinkAcch.m_gnd, 0); + current.pos.z += field_0x35c4.z * cM_scos(angle); - s16 angle2 = getGroundAngle(&mLinkAcch.m_gnd, 0x4000); - current.pos.x += field_0x35c4.x * cM_scos(angle2); + angle = getGroundAngle(&mLinkAcch.m_gnd, 0x4000); + current.pos.x += field_0x35c4.x * cM_scos(angle); if (checkZeroSpeedF() && field_0x35c4.abs2() > SQUARE(3.0f)) { seStartOnlyReverbLevel(Z2SE_AL_ICE_SLIP); @@ -13101,29 +13153,31 @@ void daAlink_c::posMove() { current.pos += field_0x3594; } } else if (checkOctaIealSpecialCollect()) { - f32 temp_f1 = getHookshotTopPos()->abs(current.pos); + sp18 = getHookshotTopPos()->abs(current.pos); current.pos += *mCcStts.GetCCMoveP(); - f32 temp_f31 = getHookshotTopPos()->abs(current.pos); - if (temp_f31 > temp_f1) { - current.pos.y += temp_f31 - temp_f1; + sp14 = getHookshotTopPos()->abs(current.pos); + if (sp14 > sp18) { + current.pos.y += sp14 - sp18; } + + (void)0; } else if (!eventRunning && (mProcID == PROC_HANG_MOVE || mProcID == PROC_CLIMB_MOVE_SIDE || mProcID == PROC_CLIMB_MOVE_UPDOWN || mProcID == PROC_CLIMB_WAIT || mProcID == PROC_HANG_WAIT)) { - f32 temp_f31 = mCcStts.GetCCMoveP()->absXZ(); + f32 var_f29 = mCcStts.GetCCMoveP()->absXZ(); var_r27 = TRUE; - if (temp_f31 > 1.0f) { - s16 var_r23 = (s16)(mCcStts.GetCCMoveP()->atan2sX_Z() - shape_angle.y); - if (var_r23 >= 0) { - current.pos.x += temp_f31 * temp_f29; - current.pos.z -= temp_f31 * temp_f30; + if (var_f29 > 1.0f) { + s16 var_r23 = mCcStts.GetCCMoveP()->atan2sX_Z(); + if ((s16)(var_r23 - shape_angle.y) >= 0) { + current.pos.x += var_f29 * temp_f29; + current.pos.z -= var_f29 * temp_f30; } else { - current.pos.x -= temp_f31 * temp_f29; - current.pos.z += temp_f31 * temp_f30; + current.pos.x -= var_f29 * temp_f29; + current.pos.z += var_f29 * temp_f30; } } } @@ -13131,12 +13185,12 @@ void daAlink_c::posMove() { if (checkModeFlg(MODE_SWIMMING) && checkNoResetFlg0(FLG0_SWIM_UP)) { cXyz sp84 = current.pos - field_0x3798; - f32 temp_f3 = sp84.absXZ() * cM_ssin(getGroundAngle(&mLinkAcch.m_wtr, sp84.atan2sX_Z())); - if (temp_f3 < 0.0f) { - temp_f3 = 0.0f; + sp10 = sp84.absXZ() * cM_ssin(getGroundAngle(&mLinkAcch.m_wtr, sp84.atan2sX_Z())); + if (sp10 < 0.0f) { + sp10 = 0.0f; } - if (!(current.pos.y > mWaterY + l_autoUpHeight + temp_f3) && mProcID != PROC_SWIM_DIVE) { + if (!(current.pos.y > mWaterY + l_autoUpHeight + sp10) && mProcID != PROC_SWIM_DIVE) { current.pos.y = mWaterY; } } @@ -13154,11 +13208,10 @@ void daAlink_c::posMove() { sp78 = cXyz::Zero; } - f32 var_f0; if (checkModeFlg(MODE_PLAYER_FLY)) { - var_f0 = 1.0f; + sp0C = 1.0f; } else { - var_f0 = cM_scos(field_0x2ff0); + sp0C = cM_scos(field_0x2ff0); } if (!checkRootTransZClearMode()) { @@ -13169,8 +13222,8 @@ void daAlink_c::posMove() { sp78.x = 0.0f; } - field_0x3464 = var_f0 * (sp78.z * temp_f30 + sp78.x * temp_f29); - field_0x3468 = var_f0 * (sp78.z * temp_f29 - sp78.x * temp_f30); + field_0x3464 = sp0C * (sp78.z * temp_f30 + sp78.x * temp_f29); + field_0x3468 = sp0C * (sp78.z * temp_f29 - sp78.x * temp_f30); if (checkMagneBootsOn()) { cXyz spD8; @@ -13209,16 +13262,14 @@ void daAlink_c::posMove() { if (commonLineCheck(&spC0, &spB4)) { dComIfG_Bgsp().GetTriPla(mLinkLinChk, &plane); - f32 temp_f31 = spB4.abs(mLinkLinChk.GetCross()); + f32 var_f28 = spB4.abs(mLinkLinChk.GetCross()); mDoMtx_multVecSR(mMagneBootInvMtx, &plane.mNormal, &spCC); if (cBgW_CheckBWall(spCC.y)) { - f32 temp_f1 = spCC.absXZ(); - - f32 div = temp_f31 / temp_f1; - spCC.x *= div; + var_f28 /= spCC.absXZ(); + spCC.x *= var_f28; spCC.y = 0.0f; - spCC.z *= div; + spCC.z *= var_f28; mDoMtx_multVecSR(mMagneBootMtx, &spCC, &spCC); current.pos += spCC; @@ -13226,7 +13277,7 @@ void daAlink_c::posMove() { } } - var_r27 += 0x2000; + ANGLE_ADD_2(var_r27, 0x2000); } } else if (var_r27) { cXyz sp9C = cXyz::Zero; @@ -13361,7 +13412,7 @@ bool daAlink_c::startPeepChange() { dComIfGs_setTurnRestart(current.pos, shape_angle.y, fopAcM_GetRoomNo(this), param); } - dStage_changeScene(mPeepExitID, 0.0f, mode, fopAcM_GetRoomNo(this), + dStage_changeScene(mPeepExitID, 0.0f, mode, (int)fopAcM_GetRoomNo(this), shape_angle.y, -1); return 1; } @@ -13419,7 +13470,7 @@ void daAlink_c::setLastSceneMode(u32* o_mode) { } if (mSwordUpTimer != 0) { - *o_mode |= (mSwordUpTimer & 0xFFFE) << 0xA; + *o_mode |= (mSwordUpTimer / 2) << 11; } } @@ -13747,7 +13798,7 @@ int daAlink_c::checkSceneChange(int i_exitID) { } else { if (mExitID != 0x3F) { isScnChange = dStage_changeScene(mExitID & 0xFF, exit_speed, exit_mode, - fopAcM_GetRoomNo(this), shape_angle.y, -1); + (int)fopAcM_GetRoomNo(this), shape_angle.y, -1); if (isScnChange) { onNoResetFlg2(FLG2_SCENE_CHANGE_START); if (mpScnChg != NULL && fopAcM_GetName(mpScnChg) == PROC_SCENE_EXIT) { @@ -13760,7 +13811,7 @@ int daAlink_c::checkSceneChange(int i_exitID) { } } else { isScnChange = dStage_changeSceneExitId(mLinkAcch.m_gnd, exit_speed, exit_mode, - fopAcM_GetRoomNo(this), shape_angle.y); + (int)fopAcM_GetRoomNo(this), shape_angle.y); field_0x2f58 = dPath_GetRoomPath(dComIfG_Bgsp().GetRoomPathId(mLinkAcch.m_gnd), fopAcM_GetRoomNo(this)); } @@ -13921,6 +13972,7 @@ BOOL daAlink_c::checkSightLine(f32 i_maxDist, cXyz* o_sightPos) { line_start_pos = &mItemAcKeep.getActor()->current.pos; } + BOOL isLineCross; s16 temp_r27 = shape_angle.y + mBodyAngle.y; f32 temp_f31 = cM_scos(mBodyAngle.x); sp3C.set(temp_f31 * cM_ssin(temp_r27), -cM_ssin(mBodyAngle.x), temp_f31 * cM_scos(temp_r27)); @@ -13958,7 +14010,7 @@ BOOL daAlink_c::checkSightLine(f32 i_maxDist, cXyz* o_sightPos) { linechk->Set(line_start_pos, o_sightPos, this); - BOOL isLineCross = dComIfG_Bgsp().LineCross(linechk); + isLineCross = dComIfG_Bgsp().LineCross(linechk); if (isLineCross) { *o_sightPos = linechk->GetCross(); onResetFlg0(RFLG0_ITEM_SIGHT_BG_HIT); @@ -13968,7 +14020,13 @@ BOOL daAlink_c::checkSightLine(f32 i_maxDist, cXyz* o_sightPos) { } void daAlink_c::setMetamorphoseModel(BOOL i_isChangeToWolf) { - J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(i_isChangeToWolf ? (u16)dRes_ID_ALANM_BCK_WFCHANGEATOW_e : (u16)dRes_ID_ALANM_BCK_WFCHANGEWTOA_e); + u16 var_r30; + if (i_isChangeToWolf) { + var_r30 = (u16)dRes_ID_ALANM_BCK_WFCHANGEATOW_e; + } else { + var_r30 = (u16)dRes_ID_ALANM_BCK_WFCHANGEWTOA_e; + } + J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(var_r30); JKRHeap* heap = setItemHeap(); mHeldItemModel = initModel(loadAramBmd(dRes_ID_ALANM_BMD_AL_WF_e, 0x6000), 0); @@ -14487,7 +14545,7 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { cXyz sp20; s16 var_r30 = 0; - for (int i = 0; i < 4; i++, var_r30 += 0x2000) { + for (int i = 0; i < 4; i++, ANGLE_ADD_2(var_r30, 0x2000)) { sp2C.x = sp38.x + cM_ssin(var_r30) * 120.0f; sp2C.z = sp38.z + cM_scos(var_r30) * 120.0f; @@ -14542,6 +14600,8 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { { return ITEM_PROC_PICK_PUT; } + + (void)0; } } } else if (sel_item != fpcNm_ITEM_NONE && mEquipItem != sel_item) { @@ -14695,11 +14755,12 @@ void daAlink_c::setLight() { u16 effName; dPa_levelEcallBack* callbackp; + JPABaseEmitter* emitterp; if (checkKandelaarSwingAnime() || mProcID == PROC_KANDELAAR_SWING) { effName = ID_ZI_J_KANTERA_SWINGFIRE; callbackp = &field_0x2f20; - JPABaseEmitter* emitterp = dComIfGp_particle_getEmitter(field_0x31c4); + emitterp = dComIfGp_particle_getEmitter(field_0x31c4); if (emitterp != NULL && emitterp->getEmitterCallBackPtr() == NULL) { emitterp->stopDrawParticle(); } @@ -14770,34 +14831,29 @@ void daAlink_c::setLight() { cXyz spB8; f32 var_f27; if (field_0x33fc > 0.0f) { - GXColor spF0 = {0x00, 0x00, 0x00, 0xFF}; - spF0.r = light_m->mColorR; - spF0.g = light_m->mColorG; - spF0.b = light_m->mColorB; + GXColor sp30 = {(u8)light_m->mColorR, (u8)light_m->mColorG, (u8)light_m->mColorB, 0xFF}; - Vec spC4 = {0.0f, 0.0f, 0.0f}; - spC4.y = light_m->mYOffset; - spC4.z = light_m->mZOffset; + Vec sp5C = {0.0f, light_m->mYOffset, light_m->mZOffset}; f32 var_f26; if ((uintptr_t)light_m == (uintptr_t)&mpHIO->mWolf.mLight.m) { cXyz spD0 = eyePos - field_0x34e0; - s16 sp104 = spD0.atan2sY_XZ(); - s16 sp106 = spD0.atan2sX_Z(); + s16 sp1C = spD0.atan2sY_XZ(); + s16 sp1A = spD0.atan2sX_Z(); mDoMtx_stack_c::transS(eyePos); - mDoMtx_stack_c::ZXYrotM(sp104, sp106, 0); - mDoMtx_stack_c::multVec(&spC4, &spB8); + mDoMtx_stack_c::ZXYrotM(sp1C, sp1A, 0); + mDoMtx_stack_c::multVec(&sp5C, &spB8); - var_f27 = cM_sht2d((s16)-(sp104 + mBodyAngle.x)) * 0.5f; - var_f26 = cM_sht2d(-sp106); + var_f27 = cM_sht2d((s16)(-sp1C - mBodyAngle.x)) * 0.5f; + var_f26 = cM_sht2d(-sp1A); } else { if (var_r28) { spB8 = (mSwordTopPos + field_0x3498) * 0.5f; - spF0.r = var_f30 * 150.0f; - spF0.g = var_f30 * 174.0f; - spF0.b = var_f30 * 141.0f; + sp30.r = var_f30 * 150.0f; + sp30.g = var_f30 * 174.0f; + sp30.b = var_f30 * 141.0f; } else { spB8 = mKandelaarFlamePos; } @@ -14806,7 +14862,7 @@ void daAlink_c::setLight() { var_f26 = cM_sht2d(-shape_angle.y); } - dKy_WolfEyeLight_set(&spB8, var_f27 + light_m->mXAngle, var_f26, (light_m->mWidth * field_0x33fc) / light_m->mPower, &spF0, field_0x33fc, light_m->mAngleAttenuationType, light_m->mDistanceAttenuationType); + dKy_WolfEyeLight_set(&spB8, var_f27 + light_m->mXAngle, var_f26, (light_m->mWidth * field_0x33fc) / light_m->mPower, &sp30, field_0x33fc, light_m->mAngleAttenuationType, light_m->mDistanceAttenuationType); } } @@ -14868,6 +14924,8 @@ void daAlink_c::changeWarpMaterial(daAlink_c::daAlink_WARP_MAT_MODE i_matMode) { } void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { + int i; + if (mProcID == PROC_TOOL_DEMO) { speed.y = 0.0f; resetDemoBck(); @@ -14879,7 +14937,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { changeWarpMaterial(WARP_MAT_MODE_1); } } else if (mProcID == PROC_GRAB_STAND) { - for (int i = 0; i < 2; i++) { + for (i = 0; i < 2; i++) { field_0x312a[i] = csXyz::Zero; field_0x3136[i] = csXyz::Zero; } @@ -14924,7 +14982,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { resetWolfEnemyBiteAll(); } else if (checkWolfShapeReverse()) { setOldRootQuaternion(0, -0x8000, 0); - shape_angle.y += 0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); field_0x2fe4 = shape_angle.y; shape_angle.x = -shape_angle.x; mPrevAngleY = shape_angle.y; @@ -15096,8 +15154,6 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { field_0x2f99 = 0x50; } - int i; - if (checkModeFlg(MODE_NO_COLLISION) || mProcID == PROC_STEP_MOVE || mProcID == PROC_WOLF_TAG_JUMP) { mLinkAcch.OffLineCheck(); mLinkAcch.OnLineCheckNone(); @@ -15986,7 +16042,12 @@ int daAlink_c::procFrontRollInit() { BOOL is_dive_jump = mProcID == PROC_DIVE_JUMP; commonProcInit(PROC_FRONT_ROLL); - f32 roll_anm_speed = is_dive_jump ? 6.0f : mpHIO->mFrontRoll.m.mRollAnm.mStartFrame; + f32 roll_anm_speed; + if (is_dive_jump) { + roll_anm_speed = 6.0f; + } else { + roll_anm_speed = mpHIO->mFrontRoll.m.mRollAnm.mStartFrame; + } setSingleAnime(ANM_FRONT_ROLL, mpHIO->mFrontRoll.m.mRollAnm.mSpeed, roll_anm_speed, mpHIO->mFrontRoll.m.mRollAnm.mEndFrame, @@ -16143,7 +16204,7 @@ int daAlink_c::procFrontRollCrashInit() { speed.y *= mpHIO->mItem.mIronBoots.m.mWaterVelocityY; } - current.angle.y -= -0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); setFrontRollCrashShock(mRollCrashFlg); voiceStart(Z2SE_AL_V_ZENTEN_FAIL); onResetFlg0(RFLG0_FRONT_ROLL_CRASH); @@ -16382,7 +16443,7 @@ int daAlink_c::procBackJumpInit(int param_0) { } if (is_prev_ganonFinish) { - shape_angle.y -= -0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); setOldRootQuaternion(0, -0x8000, 0); field_0x2060->getOldFrameTransInfo(0)->mTranslate.z += 55.0f; onNoResetFlg3(FLG3_UNK_4000000); @@ -16399,6 +16460,8 @@ int daAlink_c::procBackJumpInit(int param_0) { } int daAlink_c::procBackJump() { + daPy_frameCtrl_c* temp = mUnderFrameCtrl; + if (mProcVar0.field_0x3008 != 0) { mProcVar0.field_0x3008--; } else { @@ -16487,7 +16550,7 @@ int daAlink_c::procSlip() { if (checkZeroSpeedF()) { if (checkInputOnR()) { current.angle.y = shape_angle.y + 0x8000; - shape_angle.y += 0x100; + ANGLE_ADD_2(shape_angle.y, 0x100); mNormalSpeed = mMaxSpeed * 0.5f; procMoveTurnInit(0); } else { @@ -17633,7 +17696,9 @@ int daAlink_c::execute() { l_autoDownHeight = -l_autoUpHeight; #endif - if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != fpcNm_ITEM_KANTERA && checkItemSetButton(fpcNm_ITEM_KANTERA) == 2) { + if (checkNoResetFlg2(FLG2_UNK_1) != FALSE && + mEquipItem != fpcNm_ITEM_KANTERA && + checkItemSetButton(fpcNm_ITEM_KANTERA) == 2) { offKandelaarModel(); } @@ -18131,9 +18196,7 @@ int daAlink_c::execute() { mDoMtx_stack_c::transS(old_pos); mDoMtx_stack_c::YrotM(shape_angle.y); - Vec tmp = {0.0f, 0.0f, 0.0f}; - tmp.x = ti.mTranslate.x; - tmp.z = ti.mTranslate.z; + Vec tmp = {ti.mTranslate.x, 0.0f, ti.mTranslate.z}; mDoMtx_stack_c::multVec(&tmp, ¤t.pos); speed.y = 0.0f; @@ -18521,8 +18584,9 @@ int daAlink_c::execute() { } if (!checkWolf()) { + u8 tmp; for (u8 i = 0; i < 2; i++) { - u8 tmp = (i + 1) % 2; + tmp = (i + 1) % 2; if (dComIfGp_getSelectItem(i) == fpcNm_ITEM_EMPTY_BOTTLE && (mUseButtonFlags & (1 << i)) && dComIfGp_getSelectItem(tmp) == fpcNm_ITEM_EMPTY_BOTTLE) { @@ -18677,7 +18741,7 @@ int daAlink_c::execute() { shape_angle.y = getMagneBootsLocalAngleY(shape_angle.y, 0); } else if (checkModeFlg(MODE_VINE_CLIMB)) { field_0x3108 = shape_angle.y; - shape_angle.y += field_0x308c; + ANGLE_ADD_2(shape_angle.y, field_0x308c); } else if (checkCargoCarry() && mCargoCarryAcKeep.getActor() != NULL) { field_0x3108 = shape_angle.y; shape_angle.y = mCargoCarryAcKeep.getActor()->shape_angle.y; @@ -18845,9 +18909,11 @@ bool daAlink_c::checkItemDraw() { int daAlink_c::initShadowScaleLight() { dKy_shadow_mode_set(4); + f32 var_f27; if (checkWolf()) { - f32 temp_f26 = 0.5f * mTgCyls[0].GetH(); - mTgCyls[0].GetC(); + var_f27 = mTgCyls[0].GetC().y + 0.5f * mTgCyls[0].GetH(); + } else { + var_f27 = field_0x3834.y; } cXyz sp20(tevStr.mLightPosWorld.x - field_0x3834.x, tevStr.mLightPosWorld.y - field_0x3454, tevStr.mLightPosWorld.z - field_0x3834.z); @@ -18919,9 +18985,9 @@ int daAlink_c::moveShadowScaleLight() { s16 temp_r0 = field_0x2ff6 - field_0x2ff8; if (abs(temp_r0) < 0x4000) { if (temp_r0 >= 0) { - field_0x2ff8 -= 0x4000; + ANGLE_SUB_2(field_0x2ff8, 0x4000); } else { - field_0x2ff8 += 0x4000; + ANGLE_ADD_2(field_0x2ff8, 0x4000); } if (cLib_distanceAngleS(field_0x2ff8, field_0x2ffa) < 0x100) { @@ -19023,6 +19089,7 @@ void daAlink_c::shadowDraw() { dComIfGd_addRealShadow(shadowID, mShieldModel); } + fopAc_ac_c* actor; if (checkWolf()) { if (checkMidnaRide() && !checkCloudSea() && !midna->checkShadowNoDraw() && !midna->checkShadowModelDraw()) { dComIfGd_addRealShadow(shadowID, mpWlMidnaModel); @@ -19054,10 +19121,12 @@ void daAlink_c::shadowDraw() { if (mEquipItem == fpcNm_ITEM_IRONBALL) { if (mItemVar0.field_0x3018 == 0 || mItemVar0.field_0x3018 == 8) { dComIfGd_addRealShadow(shadowID, mHeldItemModel); - } else { - if (fopAcM_gc_c::gndCheck(&mIronBallBgChkPos)) { - field_0x32d4 = dComIfGd_setShadow(field_0x32d4, 0, mHeldItemModel, &mIronBallCenterPos, 150.0f, 32.0f, mIronBallBgChkPos.y, fopAcM_gc_c::getGroundY(), *fopAcM_gc_c::getGroundCheck(), &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); - } + } else if (fopAcM_gc_c::gndCheck(&mIronBallBgChkPos)) { + field_0x32d4 = + dComIfGd_setShadow(field_0x32d4, 0, mHeldItemModel, + &mIronBallCenterPos, 150.0f, 32.0f, mIronBallBgChkPos.y, + fopAcM_gc_c::getGroundY(), *fopAcM_gc_c::getGroundCheck(), &tevStr, + 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); } } else { changeHookshotDrawModel(); @@ -19068,7 +19137,9 @@ void daAlink_c::shadowDraw() { dComIfGd_addRealShadow(shadowID, mpHookTipModel); } - if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT && !checkPlayerGuardAndAttack() && !checkNoResetFlg0(FLG0_UNK_2)) { + if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT && + !checkPlayerGuardAndAttack() && + !checkNoResetFlg0(FLG0_UNK_2)) { dComIfGd_addRealShadow(shadowID, field_0x0710); if (!dComIfGp_checkPlayerStatus1(0, 0x10000)) { @@ -19092,24 +19163,25 @@ void daAlink_c::shadowDraw() { } if (checkSpinnerRide()) { - fopAc_ac_c* spinnerActor = fopAcM_SearchByID(mRideAcKeep.getID()); - if (spinnerActor != NULL) { - dComIfGd_addRealShadow(shadowID, spinnerActor->model); + actor = fopAcM_SearchByID(mRideAcKeep.getID()); + if (actor != NULL) { + dComIfGd_addRealShadow(shadowID, actor->model); } } } if (mGrabItemAcKeep.getID() != fpcM_ERROR_PROCESS_ID_e) { - fopAc_ac_c* grabActor = fopAcM_SearchByID(mGrabItemAcKeep.getID()); - if (grabActor != NULL && grabActor->model != NULL) { - dComIfGd_addRealShadow(shadowID, grabActor->model); + actor = fopAcM_SearchByID(mGrabItemAcKeep.getID()); + if (actor != NULL && actor->model != NULL) { + dComIfGd_addRealShadow(shadowID, actor->model); } } - if (dComIfGp_checkPlayerStatus1(0, 0x10000) && mCargoCarryAcKeep.getID() != fpcM_ERROR_PROCESS_ID_e) { - fopAc_ac_c* carryActor = fopAcM_SearchByID(mCargoCarryAcKeep.getID()); - if (carryActor != NULL && carryActor->model != NULL) { - dComIfGd_addRealShadow(shadowID, carryActor->model); + if (dComIfGp_checkPlayerStatus1(0, 0x10000) && + mCargoCarryAcKeep.getID() != fpcM_ERROR_PROCESS_ID_e) { + actor = fopAcM_SearchByID(mCargoCarryAcKeep.getID()); + if (actor != NULL && actor->model != NULL) { + dComIfGd_addRealShadow(shadowID, actor->model); } } } @@ -19372,7 +19444,11 @@ int daAlink_c::draw() { field_0x06f0->hide(); +#if PLATFORM_SHIELD + if (mProcID == PROC_HOOKSHOT_WALL_SHOOT || mProcID == PROC_HOOKSHOT_SUBJECT) { +#else if (checkHookshotReadyMaterialOffMode()) { +#endif for (u16 i = 0; i < mFallVoiceInit; i++) { if (!(field_0x32cc & (1 << i))) { field_0x064C->getMaterialNodePointer(i)->getShape()->hide(); @@ -19384,7 +19460,11 @@ int daAlink_c::draw() { modelDraw(mpLinkModel, isPlayerNoDraw); if (dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x20)) { +#if PLATFORM_SHIELD + if (mProcID == PROC_HOOKSHOT_WALL_SHOOT || mProcID == PROC_HOOKSHOT_SUBJECT) { +#else if (checkHookshotReadyMaterialOffMode()) { +#endif for (u16 i = 0; i < mFallVoiceInit; i++) { if (!(field_0x32cc & (1 << i))) { field_0x064C->getMaterialNodePointer(i)->getShape()->show(); @@ -19508,9 +19588,7 @@ int daAlink_c::draw() { if (checkEquipHeavyBoots()) { GXColorS10 color = tevStr.TevColor; for (int i = 0; i < 2; i++) { - JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(field_0x3228[i][0]); - - if (emitter_p != NULL) { + if (dComIfGp_particle_getEmitter(field_0x3228[i][0]) != NULL) { tevStr.TevColor.r = 5; tevStr.TevColor.g = tevStr.TevColor.r; tevStr.TevColor.b = tevStr.TevColor.r; @@ -19583,7 +19661,7 @@ daAlink_c::~daAlink_c() { } static int daAlink_Delete(daAlink_c* i_this) { - fpc_ProcID id = fopAcM_GetID(i_this); + fopAcM_RegisterDeleteID(i_this, "ALINK"); if (i_this->getClothesChangeWaitTimer() != 0) { i_this->loadModelDVD(); @@ -19604,7 +19682,7 @@ static actor_method_class l_daAlink_Method = { }; actor_process_profile_definition g_profile_ALINK = { - fpcLy_CURRENT_e, + (u32)fpcLy_CURRENT_e, 5, fpcPi_CURRENT_e, PROC_ALINK, diff --git a/src/d/actor/d_a_alink_HIO.inc b/src/d/actor/d_a_alink_HIO.inc index aec8ad2a89e..b7b24593de0 100644 --- a/src/d/actor/d_a_alink_HIO.inc +++ b/src/d/actor/d_a_alink_HIO.inc @@ -685,16 +685,16 @@ void daAlinkHIO_cutNormal_c::genMessage(JORMContext* ctx) { daAlinkHIO_cutNormal_c::daAlinkHIO_cutNormal_c(int param_0, float param_1) { field_0x34 = param_1; + static const char plabel0[] = "const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmV_c0::m = {\n"; + static const char plabel1[] = "const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmL_c0::m = {\n"; + static const char plabel2[] = "const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmR_c0::m = {\n"; + static const char plabel3[] = "const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSL_c0::m = {\n"; + static const char plabel4[] = "const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSR_c0::m = {\n"; + static const char* plabel[] = {plabel0, plabel1, plabel2, plabel3, plabel4}; static void* baseP[5] = {(void*)&daAlinkHIO_cutNmV_c0::m, (void*)&daAlinkHIO_cutNmL_c0::m, (void*)&daAlinkHIO_cutNmR_c0::m, (void*)&daAlinkHIO_cutNmSL_c0::m, (void*)&daAlinkHIO_cutNmSR_c0::m}; - static const char* plabel[] = {"const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSL_c0::m = {\n", - "const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmV_c0::m = {\n", - "const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmL_c0::m = {\n", - "const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSR_c0::m = {\n", - "const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmR_c0::m = {\n"}; - m_len = 32; mp_src_data = baseP[param_0]; mp_data = (void*)&m; @@ -734,19 +734,18 @@ void daAlinkHIO_cutFinish_c::genMessage(JORMContext* ctx) { daAlinkHIO_cutFinish_c::daAlinkHIO_cutFinish_c(int param_0, float param_1) { field_0x34 = param_1; + static const char plabel0[] = "const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnL_c0::m = {\n"; + static const char plabel1[] = "const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnV_c0::m = {\n"; + static const char plabel2[] = "const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnS_c0::m = {\n"; + static const char plabel3[] = "const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSl_c0::m = {\n"; + static const char plabel4[] = "const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSm_c0::m = {\n"; + static const char plabel5[] = "const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnR_c0::m = {\n"; + static const char* plabel[] = {plabel0, plabel1, plabel2, plabel3, plabel4, plabel5}; + static void* baseP[6] = {(void*)&daAlinkHIO_cutFnL_c0::m, (void*)&daAlinkHIO_cutFnV_c0::m, (void*)&daAlinkHIO_cutFnS_c0::m, (void*)&daAlinkHIO_cutFnSl_c0::m, (void*)&daAlinkHIO_cutFnSm_c0::m, (void*)&daAlinkHIO_cutFnR_c0::m}; - static const char* plabel[] = { - "const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnL_c0::m = {\n", - "const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnV_c0::m = {\n", - "const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnS_c0::m = {\n", - "const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSl_c0::m = {\n", - "const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSm_c0::m = {\n", - "const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnR_c0::m = {\n", - }; - m_len = 44; mp_src_data = baseP[param_0]; mp_data = (void*)&m; @@ -826,18 +825,17 @@ void daAlinkHIO_cutDash_c::genMessage(JORMContext* ctx) { daAlinkHIO_cutDash_c::daAlinkHIO_cutDash_c(int param_0, float param_1) { field_0x34 = param_1; + static const char plabel0[] = "const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaL_c0::m = {\n"; + static const char plabel1[] = "const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaR_c0::m = {\n"; + static const char plabel2[] = "const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaCharge_c0::m = {\n"; + static const char* plabel[] = {plabel0, plabel1, plabel2}; + static void* baseP[3] = { (void*)&daAlinkHIO_cutDaL_c0::m, (void*)&daAlinkHIO_cutDaR_c0::m, (void*)&daAlinkHIO_cutDaCharge_c0::m, }; - static const char* plabel[] = { - "const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaL_c0::m = {\n", - "const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaR_c0::m = {\n", - "const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaCharge_c0::m = {\n", - }; - m_len = 28; mp_src_data = baseP[param_0]; mp_data = (void*)&m; @@ -983,6 +981,12 @@ void daAlinkHIO_hoCut_c::genMessage(JORMContext* ctx) { daAlinkHIO_hoCut_c::daAlinkHIO_hoCut_c(int param_0, float param_1) { field_0x34 = param_1; + static const char plabel0[] = "const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLA_c0::m = {\n"; + static const char plabel1[] = "const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLB_c0::m = {\n"; + static const char plabel2[] = "const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRA_c0::m = {\n"; + static const char plabel3[] = "const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRB_c0::m = {\n"; + static const char* plabel[] = {plabel0, plabel1, plabel2, plabel3}; + static void* baseP[4] = { (void*)&daAlinkHIO_hoCutLA_c0::m, (void*)&daAlinkHIO_hoCutLB_c0::m, @@ -990,13 +994,6 @@ daAlinkHIO_hoCut_c::daAlinkHIO_hoCut_c(int param_0, float param_1) { (void*)&daAlinkHIO_hoCutRB_c0::m, }; - static const char* plabel[] = { - "const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLA_c0::m = {\n", - "const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLB_c0::m = {\n", - "const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRA_c0::m = {\n", - "const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRB_c0::m = {\n", - }; - m_len = 32; mp_src_data = baseP[param_0]; mp_data = (void*)&m; @@ -1357,16 +1354,15 @@ void daAlinkHIO_guardAttack_c::genMessage(JORMContext* ctx) { daAlinkHIO_guardAttack_c::daAlinkHIO_guardAttack_c(int param_0, float param_1) { field_0x34 = param_1; + static const char plabel0[] = "const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtPush_c0::m = {\n"; + static const char plabel1[] = "const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtKick_c0::m = {\n"; + static const char* plabel[] = {plabel0, plabel1}; + static void* baseP[2] = { (void*)&daAlinkHIO_gAtPush_c0::m, (void*)&daAlinkHIO_gAtKick_c0::m, }; - static const char* plabel[] = { - "const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtPush_c0::m = {\n", - "const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtKick_c0::m = {\n", - }; - m_len = 36; mp_src_data = baseP[param_0]; mp_data = (void*)&m; @@ -1385,24 +1381,24 @@ daAlinkHIO_guardAttack_c::daAlinkHIO_guardAttack_c(int param_0, float param_1) { void daAlinkHIO_turnMove_c::genMessage(JORMContext* ctx) { // Reset ctx->genButton("リセット", 0x4000003); - // - daAlinkHIO_setAnmGenMessage((daAlinkHIO_anm_c*)(this + 0x34), ctx, "回込", 27.0, 1); - // - ctx->genSlider("半回転回込Ａ速度", (float*)(this + 0x50), 0.0, 10.0); - // - ctx->genSlider("斬上げＣＦ", (float*)(this + 0x54), 0.0, 28.0); - // - ctx->genSlider("回転速度率", (short*)(this + 0x48), 0, 100); - // - ctx->genSlider("回転速度最大", (short*)(this + 0x4a), 0, 0x7fff); - // - ctx->genSlider("回転速度最小", (short*)(this + 0x4c), 0, 0x7fff); - // - ctx->genSlider("半回転速度最大", (short*)(this + 0x4e), 0, 0x7fff); - // - ctx->genSlider("通常側転Ａ速度", (float*)(this + 0x58), 0.0, 10.0); - // - ctx->genSlider("通常側転速度", (float*)(this + 0x5c), 0.0, 100.0); + // Return + daAlinkHIO_setAnmGenMessage(&m.mTurnAnm, ctx, "回込", 27.0f, 1); + // Half-turn rotation A speed + ctx->genSlider("半回転回込Ａ速度", &m.mHalfTurnAnmSpeed, 0.0f, 10.0f); + // Slash up CF + ctx->genSlider("斬上げＣＦ", &m.mTwirlCutDelayF, 0.0f, 28.0f); + // Rotation speed + ctx->genSlider("回転速度率", &m.mTurnSpeedRate, 0, 100); + // Maximum rotation speed + ctx->genSlider("回転速度最大", &m.mMaxTurnSpeed, 0, 0x7fff); + // Minimum rotation speed + ctx->genSlider("回転速度最小", &m.mMinTurnSpeed, 0, 0x7fff); + // Half rotation speed maximum + ctx->genSlider("半回転速度最大", &m.mMaxHalfTurnSpeed, 0, 0x7fff); + // Normal side roll A speed + ctx->genSlider("通常側転Ａ速度", &m.mSideRollAnmSpeed, 0.0f, 10.0f); + // Normal side roll speed + ctx->genSlider("通常側転速度", &m.mSideRollSpeed, 0.0f, 100.0f); } daAlinkHIO_turnMove_c::daAlinkHIO_turnMove_c() { @@ -1929,16 +1925,16 @@ void daAlinkHIO_damLaHu_c::genMessage(JORMContext* ctx) { } daAlinkHIO_damLaHu_c::daAlinkHIO_damLaHu_c(int param_0) { + + static const char plabel0[] = "const daAlinkHIO_damLaHu_c1 daAlinkHIO_damLarge_c0::m = {\n"; + static const char plabel1[] = "const daAlinkHIO_damLaHu_c1 daAlinkHIO_damHuge_c0::m = {\n"; + static const char* plabel[] = {plabel0, plabel1}; + static void* baseP[2] = { (void*)&daAlinkHIO_damLarge_c0::m, (void*)&daAlinkHIO_damHuge_c0::m, }; - static const char* plabel[] = { - "const daAlinkHIO_guardAttack_c1 daAlinkHIO_damLarge_c0::m = {\n", - "const daAlinkHIO_guardAttack_c1 daAlinkHIO_damHuge_c0::m = {\n", - }; - m_len = 188; mp_src_data = baseP[param_0]; mp_data = (void*)&m; @@ -2083,8 +2079,8 @@ void daAlinkHIO_damSwim_c::genMessage(JORMContext* ctx) { ctx->genSlider("最高速", &m.mMaxSpeed, 0.0f, 30.0f); // Deceleration ctx->genSlider("減速", &m.mDeceleration, 0.0f, 10.0f); - // Sink - daAlinkHIO_setAnmGenMessage(&m.mSinkAnm, ctx, "下沈", 10.0f, 0); + // Swimming + daAlinkHIO_setAnmGenMessage(&m.mSinkAnm, ctx, "泳ぎ", 10.0f, 0); // Water surface daAlinkHIO_setAnmGenMessage(&m.mSurfaceAnm, ctx, "水面", 11.0f, 1); } @@ -2129,8 +2125,8 @@ void daAlinkHIO_damage_c::genMessage(JORMContext* ctx) { ctx->genSlider("無敵時間", &m.mInvincibleTime, 0, 0x96); // Wolf floor invincible time ctx->genSlider("狼ポリゴン時無敵時間", &m.mWolfFloorInvincibleTime, 0, 0x96); - // Floor get up - daAlinkHIO_setAnmGenMessage(&m.mFloorDmgAnm, ctx, "床起き", 14.0f, 1); + // Floor + daAlinkHIO_setAnmGenMessage(&m.mFloorDmgAnm, ctx, "床", 14.0f, 1); // Dash daAlinkHIO_setAnmGenMessage(&m.mDashDmgAnm, ctx, "ダッシュ", 9.0f, 0); // Recover stand anm speed @@ -2421,8 +2417,8 @@ void daAlinkHIO_bomb_c::genMessage(JORMContext* ctx) { ctx->genSlider("投げ水平速度", &m.mThrowSpeedH, 0.0f, 100.0f); // Throw vertical speed ctx->genSlider("投げ垂直速度", &m.mThrowSpeedV, 0.0f, 100.0f); - // Bound rate - ctx->genSlider("バウンド率", &m.mBoundRate, 0.0f, 1.0f); + // Bounce rate + ctx->genSlider("跳返率", &m.mBoundRate, 0.0f, 1.0f); // Vertical stop speed ctx->genSlider("垂直停止速度", &m.mStopSpeedY, 0.0f, 20.0f); // Bounce time max speed @@ -2520,17 +2516,16 @@ void daAlinkHIO_light_c::genMessage(JORMContext* ctx) { } daAlinkHIO_light_c::daAlinkHIO_light_c(int param_0) { + + static const char plabel0[] = "const daAlinkHIO_light_c1 daAlinkHIO_huLight_c0::m = {\n"; + static const char plabel1[] = "const daAlinkHIO_light_c1 daAlinkHIO_wlLight_c0::m = {\n"; + static const char plabel2[] = "const daAlinkHIO_light_c1 daAlinkHIO_zwLight_c0::m = {\n"; + static const char* plabel[] = {plabel0, plabel1, plabel2}; + static void* baseP[] = { (void*)&daAlinkHIO_huLight_c0::m, (void*)&daAlinkHIO_wlLight_c0::m, (void*)&daAlinkHIO_zwLight_c0::m, - - }; - - static const char* plabel[] = { - "const daAlinkHIO_light_c1 daAlinkHIO_huLight_c0::m = {\n", - "const daAlinkHIO_light_c1 daAlinkHIO_wlLight_c0::m = {\n", - "const daAlinkHIO_light_c1 daAlinkHIO_zwLight_c0::m = {\n", }; m_len = 28; @@ -2994,19 +2989,19 @@ void daAlinkHIO_bottle_c::genMessage(JORMContext* ctx) { // Start drink daAlinkHIO_setAnmGenMessage(&m.mStartDrinkAnm, ctx, "飲む始め", 56.0f, 0); // End drink - daAlinkHIO_setAnmGenMessage(&m.mEndDrinkAnm, ctx, "飲み終", 39.0f, 0); + daAlinkHIO_setAnmGenMessage(&m.mEndDrinkAnm, ctx, "飲終", 39.0f, 0); // Milk end drink - daAlinkHIO_setAnmGenMessage(&m.mEndDrinkAnm, ctx, "ミルク飲み終", 86.0f, 0); + daAlinkHIO_setAnmGenMessage(&m.mEndDrinkAnm, ctx, "まずい飲終", 86.0f, 0); // Open daAlinkHIO_setAnmGenMessage(&m.mOpenBottleAnm, ctx, "開ける", 49.0f, 0); // Scoop - daAlinkHIO_setAnmGenMessage(&m.mScoopAnm, ctx, "すくう", 54.0f, 0); + daAlinkHIO_setAnmGenMessage(&m.mPourAnm, ctx, "出す", 54.0f, 0); // Swing down daAlinkHIO_setAnmGenMessage(&m.mSwingDownAnm, ctx, "下振り", 24.0f, 1); // Swing side daAlinkHIO_setAnmGenMessage(&m.mSwingSideAnm, ctx, "横振り", 19.0f, 1); // Medicine - daAlinkHIO_setAnmGenMessage(&m.mDrinkNastyAnm, ctx, "くすり", 29.0f, 0); + daAlinkHIO_setAnmGenMessage(&m.mScoopAnm, ctx, "掬う", 29.0f, 0); // Get daAlinkHIO_setAnmGenMessage(&m.mGetAnm, ctx, "ゲット", 47.0f, 0); } @@ -3238,26 +3233,26 @@ void daAlinkHIO_grab_c::genMessage(JORMContext* ctx) { ctx->genSlider("強制重さ指定", &m.mForceWeightSpec, 0, 3); // Preparation daAlinkHIO_setAnmGenMessage(&m.mPrepareAnm, ctx, "準備", 4.0f, 0); - // Lift up - daAlinkHIO_setAnmGenMessage(&m.mLiftAnm, ctx, "持上", 9.0f, 1); + // Lift + daAlinkHIO_setAnmGenMessage(&m.mLiftBackAnm, ctx, "持上", 9.0f, 1); // Throw - daAlinkHIO_setAnmGenMessage(&m.mThrowAnm, ctx, "投げる", 39.0f, 1); - // Carry - daAlinkHIO_setAnmGenMessage(&m.mCarryAnm, ctx, "運び", 12.0f, 1); - // Lift back - daAlinkHIO_setReverseAnmGenMessage(&m.mLiftBackAnm, ctx, "持ち上げ後", 9.0f, 0); - // Stand reverse + daAlinkHIO_setAnmGenMessage(&m.mLiftAnm, ctx, "投げる", 39.0f, 1); + // One-handed throw + daAlinkHIO_setAnmGenMessage(&m.mCarryPlaceReverseAnm, ctx, "片手投げ", 12.0f, 1); + // Place + daAlinkHIO_setReverseAnmGenMessage(&m.mThrowAnm, ctx, "置く", 9.0f, 0); + // Stand daAlinkHIO_setReverseAnmGenMessage(&m.mStandReverseAnm, ctx, "立つ", 4.0f, 1); // Recoil - daAlinkHIO_setAnmGenMessage(&m.mRecoilAnm, ctx, "反動", 19.0f, 1); + daAlinkHIO_setAnmGenMessage(&m.mCarryAnm, ctx, "反動", 19.0f, 1); // Failure - daAlinkHIO_setAnmGenMessage(&m.mFailAnm, ctx, "失敗", 19.0f, 1); + daAlinkHIO_setAnmGenMessage(&m.mRecoilAnm, ctx, "失敗", 19.0f, 1); // Failure stop time ctx->genSlider("失敗停止時間", &m.mFailStopTime, 0, 300); - // Carry lift - daAlinkHIO_setAnmGenMessage(&m.mCarryLiftAnm, ctx, "抱え上げ", 39.0f, 0); - // Carry place reverse - daAlinkHIO_setReverseAnmGenMessage(&m.mCarryPlaceReverseAnm, ctx, "抱え置き", 39.0f, 1); + // Lift up + daAlinkHIO_setAnmGenMessage(&m.mFailAnm, ctx, "抱え上げ", 39.0f, 0); + // Hold + daAlinkHIO_setReverseAnmGenMessage(&m.mCarryLiftAnm, ctx, "抱え置き", 39.0f, 1); // Iron ball throw daAlinkHIO_setAnmGenMessage(&m.mIronBallThrowAnm, ctx, "鉄玉投げ", 49.0f, 1); } @@ -4010,16 +4005,15 @@ void daAlinkHIO_wlDamLaHu_c::genMessage(JORMContext* ctx) { } daAlinkHIO_wlDamLaHu_c::daAlinkHIO_wlDamLaHu_c(int param_0) { + static const char plabel0[] = "const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamLarge_c0::m = {\n"; + static const char plabel1[] = "const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamHuge_c0::m = {\n"; + static const char* plabel[] = {plabel0, plabel1}; + static void* baseP[] = { (void*)&daAlinkHIO_wlDamLarge_c0::m, (void*)&daAlinkHIO_wlDamHuge_c0::m, }; - static const char* plabel[] = { - "const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamLarge_c0::m = {\n", - "const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamHuge_c0::m = {\n", - }; - m_len = 108; mp_src_data = baseP[param_0]; mp_data = (void*)&m; @@ -4278,16 +4272,15 @@ void daAlinkHIO_wlAtWait_c::genMessage(JORMContext* ctx) { daAlinkHIO_wlAtWait_c::daAlinkHIO_wlAtWait_c(int param_0, float param_1) { field_0x34 = param_1; + static const char plabel0[] = "const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaLr_c0::m = {\n"; + static const char plabel1[] = "const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaSc_c0::m = {\n"; + static const char plabel2[] = "const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaTl_c0::m = {\n"; + static const char* plabel[] = {plabel0, plabel1, plabel2}; + static void* baseP[] = { (void*)&daAlinkHIO_wlAtWaLr_c0::m, - (void*)&daAlinkHIO_wlAtWaTl_c0::m, (void*)&daAlinkHIO_wlAtWaSc_c0::m, - }; - - static const char* plabel[] = { - "const daAlinkHIO_cutNormal_c1 daAlinkHIO_wlAtWaLr_c0::m = {\n", - "const daAlinkHIO_cutNormal_c1 daAlinkHIO_wlAtWaTl_c0::m = {\n", - "const daAlinkHIO_cutNormal_c1 daAlinkHIO_wlAtWaSc_c0::m = {\n", + (void*)&daAlinkHIO_wlAtWaTl_c0::m, }; m_len = 60; @@ -5043,7 +5036,7 @@ daAlinkHIO_wlMoveNoP_c::~daAlinkHIO_wlMoveNoP_c() {} daAlinkHIO_wlMove_c::~daAlinkHIO_wlMove_c() {} void daAlinkHIO_c::jumpStateUpdate(const cXyz* param_0, const cXyz* param_1, f32 param_2) { - char buf[68]; + char buf[64]; f32 xDiff = param_0->x - param_1->x; f32 zDiff = param_0->z - param_1->z; diff --git a/src/d/actor/d_a_alink_bottle.inc b/src/d/actor/d_a_alink_bottle.inc index bba785875f8..b3a39c34981 100644 --- a/src/d/actor/d_a_alink_bottle.inc +++ b/src/d/actor/d_a_alink_bottle.inc @@ -23,6 +23,7 @@ int daAlink_c::bottleModelCallBack() { static int daAlink_bottleModelCallBack(J3DJoint* i_joint, int param_1) { UNUSED(i_joint); + UNUSED(param_1); daAlink_c* player_p = (daAlink_c*)j3dSys.getModel()->getUserArea(); @@ -568,7 +569,7 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* i_catchActor, int param_1) { catchActorName = PROC_ALINK; } - if (catchActorName == PROC_OBJ_OILTUBO || catchActorName == PROC_TAG_SSDRINK || + if (catchActorName == PROC_TAG_SSDRINK || catchActorName == PROC_OBJ_OILTUBO || catchActorName == PROC_TAG_BTLITM || mEquipItem == fpcNm_ITEM_KANTERA) { setSingleAnimeParam(ANM_BOTTLE_SCOOP, &mpHIO->mItem.mBottle.m.mScoopAnm); diff --git a/src/d/actor/d_a_alink_bow.inc b/src/d/actor/d_a_alink_bow.inc index 4d7a3542890..207f463cd7a 100644 --- a/src/d/actor/d_a_alink_bow.inc +++ b/src/d/actor/d_a_alink_bow.inc @@ -352,6 +352,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { if (mEquipItem == fpcNm_ITEM_BOW) { field_0x301e = 0; } + (void)0; } else { changeArrowType(); } diff --git a/src/d/actor/d_a_alink_crawl.inc b/src/d/actor/d_a_alink_crawl.inc index e90c87ac888..5f46d5e557d 100644 --- a/src/d/actor/d_a_alink_crawl.inc +++ b/src/d/actor/d_a_alink_crawl.inc @@ -389,12 +389,19 @@ void daAlink_c::setCrawlMoveAngle() { } mLinkGndChk.SetPos(&sp20); - // Fakematch: +#if PLATFORM_SHIELD + sp2C.set(sp20.x - sp38.x, dComIfG_Bgsp().GroundCross(&mLinkGndChk) - sp38.y, + sp20.z - sp38.z); +#else + // Likely fakematch: // dBgS::GroundCross is implicitly inlined to cBgS::GroundCross, but for some - // reason here that breaks the match. This is the only place in the code so - // far (September 2025) where it causes issues. - sp2C.set(sp20.x - sp38.x, dComIfG_Bgsp().cBgS::GroundCross(&mLinkGndChk) - sp38.y, + // reason here that breaks instruction ordering. This is the only place in the code + // where it causes issues. + // It _is_ possible that this is caused by an actual version difference in Shield, given + // that the Wii versions need the cast but Shield prod does not. + sp2C.set(sp20.x - sp38.x, ((cBgS&)dComIfG_Bgsp()).GroundCross(&mLinkGndChk) - sp38.y, sp20.z - sp38.z); +#endif if (cLib_distanceAngleS(sp2C.atan2sY_XZ(), shape_angle.x) > 0x800) { shape_angle.y = current.angle.y; @@ -458,7 +465,7 @@ void daAlink_c::setCrawlAutoMoveAimPos() { mProcVar3.field_0x300e = 0; mProcVar0.field_0x3008 = -1; } else if ((shape_angle.y == current.angle.y && direction == DIR_BACKWARD) || (shape_angle.y != current.angle.y && direction == DIR_FORWARD)) { - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); field_0x37c8.x -= 1.5f * (95.0f * cM_ssin(current.angle.y)); field_0x37c8.z -= 1.5f * (95.0f * cM_scos(current.angle.y)); diff --git a/src/d/actor/d_a_alink_cut.inc b/src/d/actor/d_a_alink_cut.inc index c988a12cb7d..24b4f143c45 100644 --- a/src/d/actor/d_a_alink_cut.inc +++ b/src/d/actor/d_a_alink_cut.inc @@ -1233,6 +1233,7 @@ int daAlink_c::procCutFinishInit(int i_type) { field_0x3588 = l_halfAtnWaitBaseAnime; if (mCutType == CUT_TYPE_MORTAL_DRAW_A || mCutType == CUT_TYPE_FINISH_STAB) { + int dummy; // dummy decl to force stack pointer into r31 for debug field_0x2f99 = 13; } @@ -1586,7 +1587,7 @@ int daAlink_c::procCutJump() { daPy_frameCtrl_c* framectrl = mUnderFrameCtrl; if (current.angle.y == shape_angle.y && changeCutReverseProc(ANM_CUT_JUMP)) { - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); mNormalSpeed = 27.0f; dComIfGp_getVibration().StartShock(VIBMODE_S_POWER5, 31, cXyz(0.0f, 1.0f, 0.0f)); } else if (current.angle.y != shape_angle.y) { diff --git a/src/d/actor/d_a_alink_damage.inc b/src/d/actor/d_a_alink_damage.inc index 38cf05d3e6d..56229e2e4fc 100644 --- a/src/d/actor/d_a_alink_damage.inc +++ b/src/d/actor/d_a_alink_damage.inc @@ -1805,7 +1805,7 @@ int daAlink_c::procDkCaught() { f32 var_f30; if (checkInputOnR()) { if (getDirectionFromCurrentAngle() == DIR_BACKWARD) { - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); mNormalSpeed *= -1.0f; } diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc index 98dcb83804d..c601c35695a 100644 --- a/src/d/actor/d_a_alink_demo.inc +++ b/src/d/actor/d_a_alink_demo.inc @@ -268,10 +268,10 @@ int daAlink_c::checkDemoAction() { } // TODO: reconcile - #if VERSION == VERSION_SHIELD_DEBUG - int type = prm0 - 20; - if (type >= 0 && type < 6) { - return procCutFinishInit(type); + #if VERSION == VERSION_SHIELD_DEBUG || 1 + prm0 -= 20; + if (prm0 >= 0 && prm0 < 6) { + return procCutFinishInit(prm0); } else { return procCutTurnInit(1, 1); } @@ -364,7 +364,13 @@ int daAlink_c::checkDemoAction() { return procCutLargeJumpChargeInit(); } else if (demoMode == daPy_demo_c::DEMO_UNK_73_e) { onNoResetFlg0(FLG0_UNK_100000); - return procSideRollInit(mDemo.getParam0() ? 3 : 2); + int temp; + if (!mDemo.getParam0()) { + temp = 2; + } else { + temp = 3; + } + return procSideRollInit(temp); } else if (demoMode == daPy_demo_c::DEMO_UNK_16_e) { onNoResetFlg0(FLG0_UNK_100000); if (checkWolf()) { @@ -584,6 +590,7 @@ void daAlink_c::setDemoData() { if (mMidnaTalkDelayTimer != 0) { mMidnaTalkDelayTimer--; } + (void)0; } else { dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID); cXyz* pos_p = NULL; @@ -763,6 +770,7 @@ void daAlink_c::setDemoData() { dComIfGp_evmng_cutEnd(mAlinkStaffId); } } + (void)0; } else { if (mDemo.getDemoType() == daPy_demo_c::DEMO_TYPE_TOOL_e || (mDemo.getDemoType() == daPy_demo_c::DEMO_TYPE_SYSTEM_e && mAlinkStaffId != -1)) { if (prm0_p != NULL) { @@ -1093,7 +1101,7 @@ void daAlink_c::setTalkAnime() { } } -u8 daAlink_c::setTradeItemAnime() { +bool daAlink_c::setTradeItemAnime() { setSingleAnimeBase(ANM_TRADE_ITEM_PULL_OUT); offModeFlg(0x100); @@ -1110,7 +1118,7 @@ u8 daAlink_c::setTradeItemAnime() { } keepItemData(); - return 1; + return true; } void daAlink_c::setTradeItemOutHand() { @@ -1146,7 +1154,7 @@ u8 daAlink_c::setDemoRightHandIndex(u16 param_0) { mProcVar4.field_0x3010 = 1; return 6; } else if (param_0 == 0xFC) { - field_0x2fab |= 0x10; + field_0x2fab |= (u8)0x10; return 5; } else if (param_0 == 0xFB) { if (mpDemoHRTmpModel != NULL) { @@ -1169,7 +1177,7 @@ u8 daAlink_c::setDemoLeftHandIndex(u16 param_0) { } return 0; } else if (param_0 == 0xFC) { - field_0x2fab |= 0x8; + field_0x2fab |= (u8)0x8; return 0; } else if (param_0 == 0xFB) { if (mpDemoHLTmpModel != NULL) { @@ -1527,11 +1535,11 @@ int daAlink_c::procCoToolDemo() { } } else if (arg1 == 7) { if (resID == 1) { - field_0x2fab |= 2; + field_0x2fab |= (u8)0x2; } } else if (arg1 == 8) { if (resID == 1) { - field_0x2fab |= 1; + field_0x2fab |= (u8)0x1; } } else if (arg1 == 0) { if (arg2 == 1) { @@ -2042,7 +2050,11 @@ void daAlink_c::setGetSubBgm(int i_itemNo) { /* fpcNm_ITEM_RED_BOTTLE */ SETYPE_ITEM_GET_MINI, /* fpcNm_ITEM_GREEN_BOTTLE */ SETYPE_ITEM_GET_MINI, /* fpcNm_ITEM_BLUE_BOTTLE */ SETYPE_ITEM_GET_MINI, +#if PLATFORM_SHIELD + /* fpcNm_ITEM_MILK_BOTTLE */ SETYPE_ITEM_GET, +#else /* fpcNm_ITEM_MILK_BOTTLE */ SETYPE_ITEM_GET_MINI, +#endif /* fpcNm_ITEM_HALF_MILK_BOTTLE */ SETYPE_ITEM_GET, /* fpcNm_ITEM_OIL_BOTTLE */ SETYPE_ITEM_GET_MINI, /* fpcNm_ITEM_WATER_BOTTLE */ SETYPE_NONE, @@ -2217,6 +2229,8 @@ void daAlink_c::setGetSubBgm(int i_itemNo) { } BOOL daAlink_c::checkTreasureRupeeReturn(int i_itemNo) const { + static const int dummy = 0; + if (i_itemNo == fpcNm_ITEM_LINKS_SAVINGS) { i_itemNo = fpcNm_ITEM_PURPLE_RUPEE; } @@ -3244,7 +3258,7 @@ int daAlink_c::procHandPatInit() { mNormalSpeed = 0.0f; setOldRootQuaternion(0, -0x8000, 0); - shape_angle.y += 0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); mProcVar2.field_0x300c = 0; mProcVar3.field_0x300e = 0; return 1; @@ -3270,7 +3284,7 @@ int daAlink_c::procHandPat() { if (checkAnmEnd(frameCtrl_p)) { setSingleAnimeBase(ANM_WAIT_B_TO_A); mProcVar2.field_0x300c = 1; - shape_angle.y += 0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); mPrevAngleY = shape_angle.y; current.angle.y = shape_angle.y; setOldRootQuaternion(0, -0x8000, 0); @@ -3335,11 +3349,12 @@ int daAlink_c::procCoFogDead() { } } + int roomNo; if (mProcVar0.field_0x3008 > 0) { mProcVar0.field_0x3008--; } else if (mProcVar0.field_0x3008 == 0) { - if (dStage_changeScene(daTagMist_c::getPlayerNo(), 0.0f, 5, fopAcM_GetRoomNo(this), - shape_angle.y, -1)) + roomNo = fopAcM_GetRoomNo(this); + if (dStage_changeScene(daTagMist_c::getPlayerNo(), 0.0f, 5, roomNo, shape_angle.y, -1)) { seStartSystem(Z2SE_FORCE_BACK); mProcVar0.field_0x3008--; @@ -3600,7 +3615,7 @@ int daAlink_c::procWolfSnowEscape() { if (checkAnmEnd(frameCtrl_p)) { setOldRootQuaternion(0, -0x8000, 0); - shape_angle.y += 0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); mPrevAngleY = shape_angle.y; current.angle.y = shape_angle.y; @@ -4216,7 +4231,7 @@ int daAlink_c::procDungeonWarpSceneStartInit() { #endif current.pos.y += 120.0f; - shape_angle.y += 0x7F7A; + ANGLE_ADD_2(shape_angle.y, 0x7F7A); scale.set(0.0f, 1.5f, 0.0f); mpLinkModel->setBaseScale(scale); @@ -4247,7 +4262,7 @@ int daAlink_c::procDungeonWarpSceneStart() { if (!var_r31) { current.pos.y -= 5.0f; } else { - mProcVar2.field_0x300c -= 0x200; + ANGLE_SUB_2(mProcVar2.field_0x300c, 0x200); if (mProcVar2.field_0x300c < 0) { return checkNextAction(0); } @@ -4336,7 +4351,7 @@ void daAlink_c::skipPortalObjWarp() { if (checkNoResetFlg3(FLG3_WARP_OBJ_DEMO) && (dComIfGp_TargetWarpPt_get() == 9 && dComIfGp_TransportWarp_check())) { - dStage_changeScene(2, 0.0f, 0, fopAcM_GetRoomNo(this), shape_angle.y, -1); + dStage_changeScene(2, 0.0f, 0, (int)fopAcM_GetRoomNo(this), shape_angle.y, -1); } else { dComIfGs_setTurnRestart(dMeter2Info_getWarpPos(), dMeter2Info_getWarpPlayerNo(), dMeter2Info_getWarpRoomNo(), setParamData(dMeter2Info_getWarpRoomNo(), 0, 0xCA, 0)); @@ -4605,8 +4620,9 @@ int daAlink_c::procCoWarp() { if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_45_e) { if (mProcVar1.field_0x300a != 0) { if (mGroundCode == 4) { - dComIfGp_setNextStage(dComIfGp_getStartStageName(), mProcVar4.field_0x3010, - fopAcM_GetRoomNo(this), -1, 0.0f, 5, 1, 0, + dComIfGp_setNextStage(dComIfGp_getStartStageName(), + mProcVar4.field_0x3010, + (int)fopAcM_GetRoomNo(this), -1, 0.0f, 5, 1, 0, shape_angle.y, 1, 0); changeOriginalDemo(); changeDemoMode(1, 0, 0, 0); diff --git a/src/d/actor/d_a_alink_effect.inc b/src/d/actor/d_a_alink_effect.inc index 97e4d1dc7c5..f21068f2fa3 100644 --- a/src/d/actor/d_a_alink_effect.inc +++ b/src/d/actor/d_a_alink_effect.inc @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_k_wmark.h" -EffParamProc daAlink_c::m_fEffParamProc[] = { +const EffParamProc daAlink_c::m_fEffParamProc[] = { &daAlink_c::setEffectFrontRollParam, &daAlink_c::setEffectSlipParam, &daAlink_c::setEffectSmallLandParam, @@ -554,7 +554,7 @@ void daAlink_c::setEffect() { (field_0x3198 == 0x14C || field_0x3198 == 0x14D || field_0x3198 == 0x155)) { sp3C = TRUE; - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); } f32 temp_f30 = field_0x3798.absXZ(current.pos); @@ -643,7 +643,7 @@ void daAlink_c::setEffect() { } if (sp3C) { - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); } setFirePointDamageEffect(); @@ -869,10 +869,6 @@ void daAlink_c::setSwordChargeEffect() { } void daAlink_c::setElecDamageEffect() { - static Vec const localOffset = {0.0f, -10.0f, -10.0f}; - static Vec const localScale0 = {0.69999999f, 0.85f, 1.5f}; - static Vec const localScale1 = {1.0f, 0.85f, 1.5f}; - static const u16 effName0[] = { dPa_RM(ID_ZI_S_LK_BIRIBIRIA_A), dPa_RM(ID_ZI_S_LK_BIRIBIRIA_B), @@ -885,6 +881,10 @@ void daAlink_c::setElecDamageEffect() { dPa_RM(ID_ZI_S_LK_BIRIBIRIC_C), }; + static Vec const localOffset = {0.0f, -10.0f, -10.0f}; + static Vec const localScale0 = {0.69999999f, 0.85f, 1.5f}; + static Vec const localScale1 = {1.0f, 0.85f, 1.5f}; + cXyz pos; const u16* effNameList; @@ -938,11 +938,30 @@ void daAlink_c::clearCutTurnEffectID() { } void daAlink_c::setCutTurnEffect() { + if (mUnderFrameCtrl[0].getFrame() < mProcVar1.field_0x300a) { + return; + } + + static Vec const waterEffScale = {1.5f, 1.5f, 1.5f}; + + static const int unused0 = 0; + static const int unused1 = 0; + static const int unused2 = 0; + static const u16 effNameNormal[] = { ID_ZI_J_KAITENGIRI_A, ID_ZI_J_KAITENGIRI_B, }; + static s16 leftRotNormal[] = { + cM_deg2s(180), cM_deg2s(45), cM_deg2s(13), cM_deg2s(180), cM_deg2s(45), cM_deg2s(13), + }; + + static Vec const leftTransNormal[] = { + {0.0f, 0.0f, 0.0f}, + {0.0f, 30.0f, 0.0f}, + }; + static const u16 effNameLight[] = { ID_ZI_J_KAITENGIRIL_A, ID_ZI_J_KAITENGIRIL_B, @@ -950,25 +969,18 @@ void daAlink_c::setCutTurnEffect() { ID_ZI_J_KAITENGIRIL_D, }; - static const u16 effNameWater[] = { - ID_ZI_J_KAITENGIRI_INWTR_A, - ID_ZI_J_KAITENGIRI_INWTR_B, + static s16 leftRotLight[] = { + cM_deg2s(180), cM_deg2s(100), cM_deg2s(13), cM_deg2s(180), cM_deg2s(80), cM_deg2s(13), + cM_deg2s(180), cM_deg2s(80), cM_deg2s(13), cM_deg2s(180), cM_deg2s(80), cM_deg2s(13), }; - static Vec const waterEffScale = {1.5f, 1.5f, 1.5f}; - - static Vec const leftTransNormal[] = { - {0.0f, 0.0f, 0.0f}, - {0.0f, 30.0f, 0.0f}, - }; - static Vec const leftTransLight[] = { {0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {0.0f, 35.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, }; - + static u16 const effNameLarge[] = { ID_ZI_J_KAITENGIRID_A, ID_ZI_J_KAITENGIRID_B, @@ -977,7 +989,13 @@ void daAlink_c::setCutTurnEffect() { ID_ZI_J_KAITENGIRID_E, ID_ZI_J_KAITENGIRID_F, }; - + + static s16 leftRotLarge[] = { + cM_deg2s(180), cM_deg2s(45), cM_deg2s(13), cM_deg2s(180), cM_deg2s(45), cM_deg2s(13), + cM_deg2s(180), cM_deg2s(60), cM_deg2s(13), cM_deg2s(180), cM_deg2s(60), cM_deg2s(13), + cM_deg2s(180), cM_deg2s(60), cM_deg2s(13), cM_deg2s(180), cM_deg2s(60), cM_deg2s(13), + }; + static Vec const leftTransLarge[] = { {0.0f, 0.0f, 0.0f}, {0.0f, 35.0f, 0.0f}, @@ -987,97 +1005,86 @@ void daAlink_c::setCutTurnEffect() { {0.0f, 50.0f, 0.0f}, }; + static const u16 effNameWater[] = { + ID_ZI_J_KAITENGIRI_INWTR_A, + ID_ZI_J_KAITENGIRI_INWTR_B, + }; + + static s16 leftRotWater[] = { + cM_deg2s(-90), cM_deg2s(0), cM_deg2s(180), cM_deg2s(0), cM_deg2s(0), cM_deg2s(180), + }; + static Vec const leftTransWater[] = { {0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, }; - if (!(mUnderFrameCtrl[0].getFrame() < mProcVar1.field_0x300a)) { - static s16 leftRotNormal[] = { - cM_deg2s(180), cM_deg2s(45), cM_deg2s(13), cM_deg2s(180), cM_deg2s(45), cM_deg2s(13), - }; - - static s16 leftRotLight[] = { - cM_deg2s(180), cM_deg2s(100), cM_deg2s(13), cM_deg2s(180), cM_deg2s(80), cM_deg2s(13), - cM_deg2s(180), cM_deg2s(80), cM_deg2s(13), cM_deg2s(180), cM_deg2s(80), cM_deg2s(13), - }; - - static s16 leftRotLarge[] = { - cM_deg2s(180), cM_deg2s(45), cM_deg2s(13), cM_deg2s(180), cM_deg2s(45), cM_deg2s(13), - cM_deg2s(180), cM_deg2s(60), cM_deg2s(13), cM_deg2s(180), cM_deg2s(60), cM_deg2s(13), - cM_deg2s(180), cM_deg2s(60), cM_deg2s(13), cM_deg2s(180), cM_deg2s(60), cM_deg2s(13), - }; - - static s16 leftRotWater[] = { - cM_deg2s(-90), cM_deg2s(0), cM_deg2s(180), cM_deg2s(0), cM_deg2s(0), cM_deg2s(180), - }; - - u32* emitterId = field_0x3204; - const u16* effNameList; - JGeometry::TVec3* rot; - JGeometry::TVec3* trans; - int effNum; - BOOL sp18 = FALSE; - - if (checkNoResetFlg0(FLG0_WATER_IN_MOVE)) { - if (checkZoraWearAbility()) { - effNameList = effNameWater; - rot = (JGeometry::TVec3*)leftRotWater; - trans = (JGeometry::TVec3*)leftTransWater; - effNum = 2; - if (mCutType == CUT_TYPE_LARGE_TURN_RIGHT || mCutType == CUT_TYPE_LARGE_TURN_LEFT) { - sp18 = TRUE; - } - } else { - return; + JPABaseEmitter* emitter; + u32* emitterId = field_0x3204; + const u16* effNameList; + JGeometry::TVec3* rot; + JGeometry::TVec3* trans; + int effNum; + BOOL sp18 = FALSE; + + if (checkNoResetFlg0(FLG0_WATER_IN_MOVE)) { + if (checkZoraWearAbility()) { + effNameList = effNameWater; + rot = (JGeometry::TVec3*)leftRotWater; + trans = (JGeometry::TVec3*)leftTransWater; + effNum = 2; + if (mCutType == CUT_TYPE_LARGE_TURN_RIGHT || mCutType == CUT_TYPE_LARGE_TURN_LEFT) { + sp18 = TRUE; } - } else if (mCutType == CUT_TYPE_LARGE_TURN_RIGHT || mCutType == CUT_TYPE_LARGE_TURN_LEFT) { - effNameList = effNameLarge; - rot = (JGeometry::TVec3*)leftRotLarge; - trans = (JGeometry::TVec3*)leftTransLarge; - effNum = 6; - } else if (checkNoResetFlg3(FLG3_UNK_100000)) { - effNameList = effNameLight; - rot = (JGeometry::TVec3*)leftRotLight; - trans = (JGeometry::TVec3*)leftTransLight; - effNum = 4; } else { - effNameList = effNameNormal; - rot = (JGeometry::TVec3*)leftRotNormal; - trans = (JGeometry::TVec3*)leftTransNormal; - effNum = 2; + return; } + } else if (mCutType == CUT_TYPE_LARGE_TURN_RIGHT || mCutType == CUT_TYPE_LARGE_TURN_LEFT) { + effNameList = effNameLarge; + rot = (JGeometry::TVec3*)leftRotLarge; + trans = (JGeometry::TVec3*)leftTransLarge; + effNum = 6; + } else if (checkNoResetFlg3(FLG3_UNK_100000)) { + effNameList = effNameLight; + rot = (JGeometry::TVec3*)leftRotLight; + trans = (JGeometry::TVec3*)leftTransLight; + effNum = 4; + } else { + effNameList = effNameNormal; + rot = (JGeometry::TVec3*)leftRotNormal; + trans = (JGeometry::TVec3*)leftTransNormal; + effNum = 2; + } - cXyz pos; - mDoMtx_multVecZero(mpLinkModel->getAnmMtx(1), &pos); + cXyz pos; + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(1), &pos); - if (checkMagneBootsOn()) { - mDoMtx_stack_c::transS(pos); - mDoMtx_stack_c::concat(mMagneBootMtx); - mDoMtx_stack_c::ZXYrotM(shape_angle); - } + if (checkMagneBootsOn()) { + mDoMtx_stack_c::transS(pos); + mDoMtx_stack_c::concat(mMagneBootMtx); + mDoMtx_stack_c::ZXYrotM(shape_angle); + } - for (int i = 0; i < effNum; i++, emitterId++, effNameList++, rot++, trans++) { - JPABaseEmitter* emitter = setEmitter(emitterId, *effNameList, &pos, &shape_angle); - if (emitter != NULL) { - if (checkMagneBootsOn()) { - emitter->setGlobalRTMatrix(mDoMtx_stack_c::get()); - } + for (int i = 0; i < effNum; i++, emitterId++, effNameList++, rot++, trans++) { + emitter = setEmitter(emitterId, *effNameList, &pos, &shape_angle); + if (emitter != NULL) { + if (checkMagneBootsOn()) { + emitter->setGlobalRTMatrix(mDoMtx_stack_c::get()); + } - if (mProcVar4.field_0x3010 == 0) { - emitter->setLocalRotation(*rot); - if (trans->y > 1.0f) { - emitter->setLocalTranslation(*trans); - } + if (mProcVar4.field_0x3010 == 0) { + emitter->setLocalRotation(*rot); + if (trans->y > 1.0f) { + emitter->setLocalTranslation(*trans); } + } - if (sp18) { - if (i == 0) { - emitter->setGlobalParticleScale(waterEffScale); - } else { - emitter->setVolumeSize(225); - emitter->setAwayFromAxisSpeed(15.0f); - } + if (sp18) { + if (i == 0) { + emitter->setGlobalParticleScale(waterEffScale); + } else { + emitter->setVolumeSize(225); + emitter->setAwayFromAxisSpeed(15.0f); } } } @@ -1094,6 +1101,8 @@ void daAlink_c::setHorseCutTurnEffect() { } void daAlink_c::setCutLargeJumpLandEffect() { + static const int dummy = 0; + cXyz pos(current.pos.x + cM_ssin(shape_angle.y) * 20.0f, current.pos.y + 50.0f, current.pos.z + cM_scos(shape_angle.y) * 20.0f); csXyz rot; cM3dGPla tripla; @@ -1195,7 +1204,7 @@ void daAlink_c::setWolfRollAttackEffect() { csXyz rot(shape_angle.x, shape_angle.y, 0); if (mProcVar2.field_0x300c == 0) { - rot.x += 0x8000; + ANGLE_ADD_2(rot.x, 0x8000); } setEmitter(&field_0x3204[0], ID_ZI_J_WL_KAITENAT_A, &pos, &rot); @@ -1243,6 +1252,7 @@ void daAlink_c::setWolfDigEffect() { emitter->setAwayFromAxisSpeed(var_f30); dComIfGp_particle_levelEmitterOnEventMove(field_0x32cc); } + (void)0; } else if (field_0x3198 == 7) { var_r29 = 0; var_r28 = ID_ZI_J_DASHWTRA_C; @@ -1364,6 +1374,7 @@ void daAlink_c::setWolfJumpAttackEffect() { } void daAlink_c::setWolfBarrierHitEffect(dBgS_LinChk& i_linchk) { + static const int dummy = 0; static const u16 normalNameID[] = { dPa_RM(ID_ZI_S_NSBARRIER_COLL_A), dPa_RM(ID_ZI_S_NSBARRIER_COLL_B), @@ -1406,6 +1417,8 @@ void daAlink_c::setCutWaterDropEffect() { } void daAlink_c::setWaterDropEffect() { + static const int dummy1 = 0; + static const int dummy2 = 0; static const u16 effDataTable[] = { ID_ZI_J_LK_NUREPOTA_BACKBONE2, ID_ZI_J_LK_NUREPOTA_WAIST, @@ -1467,7 +1480,7 @@ void daAlink_c::setWaterDropEffect() { if (field_0x32c0[i] != 0) { if (field_0x32a0[i].a > -20) { - field_0x32a0[i].a -= 2; + field_0x32a0[i].a -= (s16)2; if (field_0x32a0[i].a < -20) { field_0x32a0[i].a = -20; @@ -1507,6 +1520,8 @@ void daAlink_c::setSwordUpColorEffect() { } void daAlink_c::setSwordCutSplash() { + static Vec const swordCutSplashScale = {0.6f, 0.6f, 0.6f}; + static const u16 cutSplashName[] = { ID_ZI_J_DOWNWTRA_A, ID_ZI_J_DOWNWTRA_B, @@ -1514,8 +1529,6 @@ void daAlink_c::setSwordCutSplash() { ID_ZI_J_DOWNWTRA_D, }; - static Vec const swordCutSplashScale = {0.6f, 0.6f, 0.6f}; - if (mCutType != 0 && mProcID != PROC_CUT_TURN && getCutAtFlg() && checkNoResetFlg0(FLG0_UNK_80) && mEquipItem == 0x103) { if (mSwordTopPos.y <= mWaterY && field_0x34b0.y > mWaterY) { cXyz sp14(mSwordTopPos.x, mWaterY, mSwordTopPos.z); @@ -1543,7 +1556,7 @@ void daAlink_c::setMetamorphoseEffectStartLink() { JPABaseEmitter* emitter = setEmitter(&field_0x3200, ID_ZI_J_ATOW_C, &cXyz::Zero, NULL); #if VERSION == VERSION_SHIELD_DEBUG - static Vec effScale = {1.33f, 1.0f, 1.0f}; + static const Vec effScale = {1.33f, 1.0f, 1.0f}; if (emitter != NULL) { emitter->setGlobalParticleScale(effScale); } @@ -1752,28 +1765,30 @@ void daAlink_c::initFirePointDamageEffect(cXyz const* param_0, dCcD_GObjInf* i_h } } - if (i != 4) { - cXyz* dmg_vec = getDamageVec(i_hitObj); - - csXyz sp38(dmg_vec->atan2sY_XZ(), dmg_vec->atan2sX_Z(), 0); - csXyz sp40; - cXyz sp30; + if (i == 4) { + return; + } - int var_r30 = field_0x2e44.getHitmarkPosAndAngle(param_0, &sp38, &sp30, &sp40, 0); - if (var_r30 == -1 || (!checkWolf() && (var_r30 == 1 || var_r30 == 15 || var_r30 == 16))) { - return; - } + cXyz* dmg_vec = getDamageVec(i_hitObj); - eff->field_0x2 = field_0x2e44.getJntNum(var_r30); - eff->field_0xc = *param_0; - eff->field_0x24 = cXyz::Zero; - eff->field_0x0 = 1; - eff->field_0x4 = 0; + csXyz sp38(dmg_vec->atan2sY_XZ(), dmg_vec->atan2sX_Z(), 0); + csXyz sp40; + cXyz sp30; - mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(eff->field_0x2)); - mDoMtx_stack_c::inverse(); - mDoMtx_stack_c::multVec(&sp30, &eff->field_0x18); + int var_r30 = field_0x2e44.getHitmarkPosAndAngle(param_0, &sp38, &sp30, &sp40, 0); + if (var_r30 == -1 || (!checkWolf() && (var_r30 == 1 || var_r30 == 15 || var_r30 == 16))) { + return; } + + eff->field_0x2 = field_0x2e44.getJntNum(var_r30); + eff->field_0xc = *param_0; + eff->field_0x24 = cXyz::Zero; + eff->field_0x0 = 1; + eff->field_0x4 = 0; + + mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(eff->field_0x2)); + mDoMtx_stack_c::inverse(); + mDoMtx_stack_c::multVec(&sp30, &eff->field_0x18); } void daAlink_c::setFirePointDamageEffect() { @@ -1827,6 +1842,11 @@ void daAlink_c::setFirePointDamageEffect() { } void daAlink_c::setFreezeEffect() { + static const int dummy = 0; + static const u16 effName[] = { + dPa_RM(ID_ZI_S_LK_FREEZEND_A), + dPa_RM(ID_ZI_S_LK_FREEZEND_B), + }; static Vec const effScale = {1.0f, 1.8f, 1.0f}; static Vec const wolfEffScale = {1.0f, 1.0f, 1.5f}; static Vec const offsetPos = {0.0f, 0.0f, -10.0f}; @@ -1859,10 +1879,6 @@ void daAlink_c::setFreezeEffect() { } for (int i = 0; i < 2; i++) { - static const u16 effName[] = { - dPa_RM(ID_ZI_S_LK_FREEZEND_A), - dPa_RM(ID_ZI_S_LK_FREEZEND_B), - }; dComIfGp_particle_setColor(effName[i], &pos, &tevStr, NULL, NULL, 0.0f, 0xFF); } @@ -1900,6 +1916,7 @@ void daAlink_c::clearWoodShieldBurnEffect() { } void daAlink_c::setWoodShieldBurnOutEffect() { + static const int dummy = 0; static const u16 effName[] = { ID_ZI_J_LK_SH_BURN_C, ID_ZI_J_LK_SH_BURN_D, @@ -2061,7 +2078,7 @@ void daAlink_blur_c::draw() { GXTexCoord2s16(var_r27, 0); var_r27 = var_r28; - var_r28 += temp_r26; + ANGLE_ADD_2(var_r28, temp_r26); } GXEnd(); diff --git a/src/d/actor/d_a_alink_grab.inc b/src/d/actor/d_a_alink_grab.inc index 6175baea5dc..5f9a02e8e9b 100644 --- a/src/d/actor/d_a_alink_grab.inc +++ b/src/d/actor/d_a_alink_grab.inc @@ -2103,7 +2103,7 @@ int daAlink_c::procGoatMove() { int temp_r27 = abs(mMoveAngle); if (checkInputOnR() && temp_r27 > 0x800 && temp_r27 < 0x7800 && (fabsf(sp8.x) < 250.0f || (sp8.x > 0.0f && mMoveAngle < 0) || (sp8.x < 0.0f && mMoveAngle > 0))) { if (abs((s16)(mMoveAngle - current.angle.y)) > 0x4000) { - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); mNormalSpeed *= -1.0f; if (field_0x2f98 == 3) { @@ -2294,7 +2294,7 @@ int daAlink_c::procGoatCatch() { if (checkAnmEnd(framectrl)) { if (mProcVar5.field_0x3012 == 0) { setOldRootQuaternion(0, -0x8000, 0); - shape_angle.y += 0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); current.angle.y = shape_angle.y; field_0x2fe4 = shape_angle.y; } @@ -2537,7 +2537,7 @@ int daAlink_c::procGoronMove() { f32 var_f31; if (checkInputOnR() && temp_r28 > 0x800 && temp_r28 < 0x7800) { if (abs((s16)(mMoveAngle - current.angle.y)) > 0x4000) { - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); mNormalSpeed *= -1.0f; if (field_0x2f98 == 3) { diff --git a/src/d/actor/d_a_alink_guard.inc b/src/d/actor/d_a_alink_guard.inc index a238b98735f..e5bb97e7374 100644 --- a/src/d/actor/d_a_alink_guard.inc +++ b/src/d/actor/d_a_alink_guard.inc @@ -92,14 +92,13 @@ void daAlink_c::setArrowShieldActor(fopAc_ac_c* i_actor, int param_1) { fopAcM_delete(first_arrow); } - int i = 0; - for (; i < 15; i++) { - mShieldArrowIDs[i] = mShieldArrowIDs[i + 1]; - field_0x2f7c[i] = field_0x2f7c[i + 1]; + for (arrow_num = 0; arrow_num < 15; arrow_num++) { + mShieldArrowIDs[arrow_num] = mShieldArrowIDs[arrow_num + 1]; + field_0x2f7c[arrow_num] = field_0x2f7c[arrow_num + 1]; } - mShieldArrowIDs[i] = new_arrow_id; - field_0x2f7c[i] = 10; + mShieldArrowIDs[arrow_num] = new_arrow_id; + field_0x2f7c[arrow_num] = 10; dComIfGp_setItemArrowNumCount(1); fopAcM_createItemForSimpleDemo(¤t.pos, fpcNm_ITEM_ARROW_10, -1, NULL, NULL, 0.0f, 0.0f); @@ -201,6 +200,7 @@ void daAlink_c::setShieldGuard() { void daAlink_c::setGuardSe(dCcD_GObjInf* i_objinf) { int var_r31; + u32 hit_se; BOOL isRebound; if (checkWoodShieldEquipNotIronBall() && !checkMagicArmorNoDamage()) { @@ -211,7 +211,6 @@ void daAlink_c::setGuardSe(dCcD_GObjInf* i_objinf) { isRebound = TRUE; } - u32 hit_se; if (i_objinf->GetTgHitGObj() != NULL && i_objinf->GetTgHitGObj()->GetAtType() == AT_TYPE_BOMB) { hit_se = Z2SE_HIT_METAL_WEAPON; } else { diff --git a/src/d/actor/d_a_alink_hang.inc b/src/d/actor/d_a_alink_hang.inc index 2b6847a56a4..563bb9c9056 100644 --- a/src/d/actor/d_a_alink_hang.inc +++ b/src/d/actor/d_a_alink_hang.inc @@ -35,6 +35,8 @@ int daAlink_c::getHangDirectionFromAngle() { } BOOL daAlink_c::hangMoveBgCheck(s16 param_0, cXyz* param_1) { + static const int dummy = 0; + BOOL rt = false; cM3dGPla sp78; @@ -902,7 +904,7 @@ int daAlink_c::setDragonHangPos() { cXyz sp18; mDoMtx_stack_c::multVecSR(&cXyz::BaseY, &sp18); if (sp18.y < 0.0f) { - shape_angle.y += 0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); shape_angle.x = 0x8000 - shape_angle.x; shape_angle.z *= -1; } @@ -1418,7 +1420,7 @@ int daAlink_c::procLadderDownStartInit() { dComIfGp_setPlayerStatus0(0, 0x2000000); setOldRootQuaternion(0, 0x8000, 0); - shape_angle.y += 0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); current.angle.y = shape_angle.y; f32 var_f31 = cM_ssin(field_0x306e); @@ -2457,7 +2459,7 @@ int daAlink_c::procClimbToRoof() { field_0x2f99 = 2; if (checkAnmEnd(frameCtrl)) { - shape_angle.y += 0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); current.angle.y = shape_angle.y; mPrevAngleY = shape_angle.y; setOldRootQuaternion(0, 0x8000, 0); @@ -2495,7 +2497,7 @@ void daAlink_c::setRoofHangHandOnSE(cBgS_PolyInfo* unused) { if (frame_ctrl->checkPass(field_0x3478)) { return; } else if (frame_ctrl->checkPass(field_0x347c)) { - + (void)0; } } @@ -2842,7 +2844,7 @@ int daAlink_c::procRoofHangTurnInit() { if ((s16)(mMoveAngle - shape_angle.y) < 0) { anm_speed = -mpHIO->mRoofHang.m.mInvertASpeed; mProcVar0.field_0x3008 = 1; - shape_angle.y += 0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); setOldRootQuaternion(0, -0x8000, 0); field_0x2060->getOldFrameTransInfo(0)->mTranslate.z = -8.899365425109863f; mProcVar2.field_0x300c = mMoveAngle; @@ -2881,7 +2883,7 @@ int daAlink_c::procRoofHangTurn() { daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl; if (checkAnmEnd(frame_ctrl)) { if (mProcVar0.field_0x3008 == 0) { - shape_angle.y += 0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); current.angle.y = shape_angle.y; setOldRootQuaternion(0, -0x8000, 0); field_0x2060->getOldFrameTransInfo(0)->mTranslate.z += 17.798730850219727f; diff --git a/src/d/actor/d_a_alink_hook.inc b/src/d/actor/d_a_alink_hook.inc index efcb3b8bc07..5f609a7017c 100644 --- a/src/d/actor/d_a_alink_hook.inc +++ b/src/d/actor/d_a_alink_hook.inc @@ -18,6 +18,8 @@ enum { }; void daAlink_c::hsChainShape_c::draw() { + static const int dummy = 0; + daAlink_c* alink = (daAlink_c*)getUserArea(); J3DModelData* modelData = alink->getItemModelData(); J3DMaterial* material = modelData->getMaterialNodePointer(0); @@ -50,7 +52,8 @@ void daAlink_c::hsChainShape_c::draw() { ppos++; pangle++; - for (int i = 0; i < 101; i++, ppos++, pangle++) { + int i; + for (i = 0; i < 101; i++, ppos++, pangle++) { mDoMtx_stack_c::copy(j3dSys.getViewMtx()); mDoMtx_stack_c::transM(*ppos); mDoMtx_stack_c::ZXYrotM(*pangle); @@ -65,7 +68,7 @@ void daAlink_c::hsChainShape_c::draw() { cXyz spC8; cXyz spBC; - for (int i = 0; i < 2; i++) { + for (i = 0; i < 2; i++) { cXyz* sp48; csXyz* sp44; @@ -91,7 +94,7 @@ void daAlink_c::hsChainShape_c::draw() { spE = -0x3000; } - sp10 = sp44->y; + sp10 = (s16)sp44->y; sp14 = sp44->z + spE; f32 var_f29 = spC8.abs(); @@ -144,7 +147,7 @@ void daAlink_c::hsChainShape_c::draw() { csXyz sp64(sp6C); f32 sp34 = M_PI / maxDistanceF; - + f32 temp_f27; f32 var_f26 = 0.0f; f32 var_f28; @@ -153,6 +156,7 @@ void daAlink_c::hsChainShape_c::draw() { if (alink->getHookshotStopTime() & 1) { var_f28 *= -1.0f; } + (void)0; while (maxDistanceF > var_f30) { temp_f27 = var_f28 * cM_fsin(sp34 * var_f30); @@ -172,7 +176,7 @@ void daAlink_c::hsChainShape_c::draw() { material->getShape()->simpleDrawCache(); - sp64.z += 0x3000; + ANGLE_ADD_2(sp64.z, 0x3000); var_f26 = temp_f27; var_f30 += fabsf(cM_scos(spC)) * 5.0f; @@ -183,15 +187,15 @@ void daAlink_c::hsChainShape_c::draw() { const cXyz& subChainTopPos = alink->getHsSubChainTopPos(); maxDistance = subChainRootPos - subChainTopPos; - f32 temp_f1 = maxDistance.abs(); - if (temp_f1 > 1.0f) { - maxDistance *= (1.0f / temp_f1); + maxDistanceF = maxDistance.abs(); + if (maxDistanceF > 1.0f) { + maxDistance *= (1.0f / maxDistanceF); var_f30 = 0.0f; - + sp98 = subChainTopPos; sp6C.set(maxDistance.atan2sY_XZ(), maxDistance.atan2sX_Z(), 0); - while (temp_f1 > var_f30) { + while (maxDistanceF > var_f30) { mDoMtx_stack_c::copy(j3dSys.getViewMtx()); mDoMtx_stack_c::transM(sp98); mDoMtx_stack_c::ZXYrotM(sp6C); @@ -202,7 +206,7 @@ void daAlink_c::hsChainShape_c::draw() { material->getShape()->simpleDrawCache(); sp98 += maxDistance * 5.0f; - sp6C.z += 0x3000; + ANGLE_ADD_2(sp6C.z, 0x3000); var_f30 += 5.0f; } } @@ -212,8 +216,7 @@ void daAlink_c::hsChainShape_c::draw() { void daAlink_c::hookshotAtHitCallBack(dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf) { if (i_tgActor != NULL && fopAcM_IsActor(i_tgActor) && !i_tgObjInf->ChkTgHookshotThrough()) { - cXyz* hit_pos_p = i_atObjInf->GetAtHitPosP(); - f32 dist_to_hitpos = getHsChainTopPos().abs(*hit_pos_p); + f32 dist_to_hitpos = getHsChainTopPos().abs(*i_atObjInf->GetAtHitPosP()); if (dist_to_hitpos < mSearchBallScale) { mSearchBallScale = dist_to_hitpos; @@ -709,7 +712,13 @@ void daAlink_c::setHookshotReturnEnd() { field_0x2060->initOldFrameMorf(3.0f, field_0x30a8, field_0x30aa); } else if (checkHookshotShootAnime()) { int _; - setUpperAnimeBaseSpeed(dRes_ID_ALANM_BCK_HSWAIT_e, checkAttentionLock() ? mpHIO->mItem.mHookshot.m.mWaitAnmSpeed : 0.0f, 3.0f); + f32 anmSpeed; + if (!checkAttentionLock()) { + anmSpeed = 0.0f; + } else { + anmSpeed = mpHIO->mItem.mHookshot.m.mWaitAnmSpeed; + } + setUpperAnimeBaseSpeed(dRes_ID_ALANM_BCK_HSWAIT_e, anmSpeed, 3.0f); } mFastShotTime = 0; @@ -796,25 +805,24 @@ void daAlink_c::setHookshotPos() { mDoMtx_stack_c::transM(-2.0f, 1.0f, 1.0f); mDoMtx_stack_c::XYZrotM(cM_deg2s(5.7f), cM_deg2s(162.0f), 0); - J3DModel* var_r27; + J3DModel* model; if (field_0x3020 == 0) { - var_r27 = mHeldItemModel; + model = mHeldItemModel; } else { - var_r27 = field_0x0710; + model = field_0x0710; } - var_r27->setBaseTRMtx(mDoMtx_stack_c::get()); + model->setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(mRightItemJntNo)); mDoMtx_stack_c::transM(-2.0f, 0.0f, 1.0f); mDoMtx_stack_c::XYZrotM(cM_deg2s(-78.0f), cM_deg2s(182.0f), cM_deg2s(-99.0f)); - J3DModel* var_r27_2; if (field_0x3020 == 0) { - var_r27_2 = field_0x0710; + model = field_0x0710; } else { - var_r27_2 = mHeldItemModel; + model = mHeldItemModel; } - var_r27_2->setBaseTRMtx(mDoMtx_stack_c::get()); + model->setBaseTRMtx(mDoMtx_stack_c::get()); if (mItemMode == 2 || mItemMode == HS_MODE_SHOOT_e) { field_0x33dc += 1.0f; @@ -865,6 +873,7 @@ void daAlink_c::setHookshotPos() { mpHookSound->framework(0, mVoiceReverbIntensity); fopAc_ac_c* targetAc_p = mHookTargetAcKeep.getActor(); + f32 var_f29; f32 return_speed; f32 shoot_speed; f32 max_length; @@ -981,7 +990,7 @@ void daAlink_c::setHookshotPos() { if (mHookTargetAcKeep.getActor() != NULL) { mHookshotTopPos = field_0x381c; - fopAc_ac_c* targetAc_p = mHookTargetAcKeep.getActor(); + targetAc_p = mHookTargetAcKeep.getActor(); if (targetAc_p != NULL && (targetAc_p->actor_status & 0x280000)) { mHookTargetAcKeep.setData(targetAc_p); mIronBallCenterPos = mHookshotTopPos - targetAc_p->current.pos; @@ -1026,12 +1035,12 @@ void daAlink_c::setHookshotPos() { } cXyz sp17C = mHookshotTopPos - mHeldItemRootPos; - f32 temp_f1 = sp17C.abs(); - sp17C *= 1.0f / temp_f1; + var_f29 = sp17C.abs(); + sp17C *= 1.0f / var_f29; - f32 temp_f26 = max_length - 15.0f; - if (temp_f1 >= temp_f26) { - mHookshotTopPos = mHeldItemRootPos + (sp17C * temp_f26); + f32 var_f26 = max_length - 15.0f; + if (var_f29 >= var_f26) { + mHookshotTopPos = mHeldItemRootPos + (sp17C * var_f26); mItemMode = HS_MODE_RETURN_e; } @@ -1070,9 +1079,9 @@ void daAlink_c::setHookshotPos() { mPolyInfo2.SetPolyInfo(mRopeLinChk); if (dComIfG_Bgsp().ChkMoveBG_NoDABg(mRopeLinChk)) { - fopAc_ac_c* target_ac = dComIfG_Bgsp().GetActorPointer(mRopeLinChk); - mHookTargetAcKeep.setData(target_ac); - fopAcM_setHookCarryNow(target_ac); + targetAc_p = dComIfG_Bgsp().GetActorPointer(mRopeLinChk); + mHookTargetAcKeep.setData(targetAc_p); + fopAcM_setHookCarryNow(targetAc_p); } } else { int poly_att0 = dComIfG_Bgsp().GetPolyAtt0(mRopeLinChk); @@ -1131,7 +1140,7 @@ void daAlink_c::setHookshotPos() { if (dComIfG_Bgsp().LineCross(mpHookshotLinChk) && dComIfG_Bgsp().GetPolyAtt0(*mpHookshotLinChk) != 6) { - fpc_ProcID id = fopKyM_createWpillar(mpHookshotLinChk->GetCrossP(), 0.5f, 0); + fopKyM_createWpillar(mpHookshotLinChk->GetCrossP(), 0.5f, 0); mDoAud_seStart(Z2SE_CM_BODYFALL_WATER_S, mpHookshotLinChk->GetCrossP(), 0, mVoiceReverbIntensity); } @@ -1217,7 +1226,7 @@ void daAlink_c::hookshotRoofTurn() { if (checkInputOnR()) { int stick_direction = getDirectionFromAngle(mStickAngle); - int angle = (int)(1024.0f * mMoveValue * mMoveValue); + s16 angle = 1024.0f * mMoveValue * mMoveValue; if (stick_direction == DIR_LEFT) { shape_angle.y += angle; @@ -1252,11 +1261,11 @@ void daAlink_c::hookshotRoofTurn() { u8 status_dir = 0; if (current.pos.y < max_rise_y) { - status_dir |= 8; + status_dir |= (u8)0x8; } if (current.pos.y > min_descend_y) { - status_dir |= 2; + status_dir |= (u8)0x2; } if (!checkEventRun()) { diff --git a/src/d/actor/d_a_alink_horse.inc b/src/d/actor/d_a_alink_horse.inc index 69cf4cfe577..a637ef42cb3 100644 --- a/src/d/actor/d_a_alink_horse.inc +++ b/src/d/actor/d_a_alink_horse.inc @@ -281,9 +281,14 @@ void daAlink_c::setHorseSwordUpAnime() { void daAlink_c::setHorseTurnUpperAnime(BOOL i_isTurnL) { if (checkHorseNoUpperAnime() || (!i_isTurnL && checkHorseTurnRAnime()) || - (i_isTurnL == TRUE && checkHorseTurnLAnime())) - { - setUpperAnimeBaseMorf(!i_isTurnL ? (u16)dRes_ID_ALANM_BCK_TURNLS_e : (u16)dRes_ID_ALANM_BCK_TURNRS_e, 4.0f); + (i_isTurnL == TRUE && checkHorseTurnLAnime())) { + u16 anmResIdx; + if (i_isTurnL == FALSE) { + anmResIdx = (u16)dRes_ID_ALANM_BCK_TURNLS_e; + } else { + anmResIdx = (u16)dRes_ID_ALANM_BCK_TURNRS_e; + } + setUpperAnimeBaseMorf(anmResIdx, 4.0f); } } @@ -1095,7 +1100,11 @@ int daAlink_c::checkHorseGetOffDirection() { lin_end_pos.set(ride_actor_p->current.pos.x + cM_ssin(var_r28) * 125.0f, lin_start_pos.y, ride_actor_p->current.pos.z + cM_scos(var_r28) * 125.0f); +#if PLATFORM_SHIELD + f32 check_y[3]; +#else f32 check_y[3] = {0.0f, 0.0f, 0.0f}; +#endif check_y[0] = current.pos.y; check_y[1] = ride_actor_p->current.pos.y + (current.pos.y - ride_actor_p->current.pos.y) * 0.5f; @@ -1103,8 +1112,7 @@ int daAlink_c::checkHorseGetOffDirection() { check_y[2] = var_f31; int check_no; - int i; - for (i = 0; i < 2; i++) { + for (int i = 0; i < 2; i++) { for (check_no = 0; check_no < 3; check_no++) { lin_start_pos.y = check_y[check_no]; lin_end_pos.y = lin_start_pos.y; @@ -1123,7 +1131,7 @@ int daAlink_c::checkHorseGetOffDirection() { lin_end_pos.x = lin_start_pos.x * 2.0f - lin_end_pos.x; lin_end_pos.z = lin_start_pos.z * 2.0f - lin_end_pos.z; - var_r28 += 0x8000; + ANGLE_ADD_2(var_r28, 0x8000); } return 2; @@ -1319,7 +1327,7 @@ int daAlink_c::procHorseRideInit() { } field_0x2fc0 = 1; } - + if (mDemo.getDemoMode() != daPy_demo_c::DEMO_UNK_7_e) { setOldRootQuaternion(0, (s16)(shape_angle.y - field_0x27f4->shape_angle.y), 0); } @@ -1670,7 +1678,8 @@ int daAlink_c::procHorseWaitInit() { initServiceWaitTime(); checkHorseGetOffAndSetDoStatus(); - setSyncRide((!checkHorseNoUpperAnime() && !checkEquipAnime()) || checkInputOnR() || !checkHorseGetOff() || checkHorseGetOffDirection() == 2); + setSyncRide(!((checkHorseNoUpperAnime() || checkEquipAnime()) && !checkInputOnR() && + checkHorseGetOff() && checkHorseGetOffDirection() != 2)); field_0x33f0 = 0.0f; return 1; } diff --git a/src/d/actor/d_a_alink_iceleaf.inc b/src/d/actor/d_a_alink_iceleaf.inc index 9959c04fef2..46d70785d33 100644 --- a/src/d/actor/d_a_alink_iceleaf.inc +++ b/src/d/actor/d_a_alink_iceleaf.inc @@ -18,7 +18,8 @@ static fopAc_ac_c* daAlink_searchIceLeaf(fopAc_ac_c* i_actor, void* i_data) { } bool daAlink_c::checkSnowCode() const { - return mGndPolySpecialCode == dBgW_SPCODE_HEAVY_SNOW || mGndPolySpecialCode == dBgW_SPCODE_LIGHT_SNOW; + return mGndPolySpecialCode == dBgW_SPCODE_HEAVY_SNOW || + mGndPolySpecialCode == dBgW_SPCODE_LIGHT_SNOW; } bool daAlink_c::checkSnowCodePolygon(cBgS_PolyInfo& i_polyinfo) { @@ -27,7 +28,8 @@ bool daAlink_c::checkSnowCodePolygon(cBgS_PolyInfo& i_polyinfo) { } bool daAlink_c::checkBoardRestart() { - return (mRideStatus == 0 && mRideAcKeep.getActor() != NULL) && fopAcM_GetName(mRideAcKeep.getActor()) == PROC_Obj_IceLeaf; + return (mRideStatus == 0 && mRideAcKeep.getActor() != NULL) && + fopAcM_GetName(mRideAcKeep.getActor()) == PROC_Obj_IceLeaf; } int daAlink_c::boardCommon(BOOL i_canMove) { @@ -47,7 +49,9 @@ int daAlink_c::boardCommon(BOOL i_canMove) { s16 sp8 = current.angle.y + 0x8000; for (int i = 0; i < 3; i++) { - if (mAcchCir[i].ChkWallHit() && cLib_distanceAngleS(sp8, mAcchCir[i].GetWallAngleY()) <= 0x2000 && mNormalSpeed > 30.0f) { + if (mAcchCir[i].ChkWallHit() && + cLib_distanceAngleS(sp8, mAcchCir[i].GetWallAngleY()) <= 0x2000 && + mNormalSpeed > 30.0f) { setJumpMode(); return procCoLargeDamageInit(-4, TRUE, 0, 0, NULL, 0); } @@ -110,12 +114,22 @@ int daAlink_c::boardCommon(BOOL i_canMove) { var_f30 = (temp_f29 * mNormalSpeed) / 5.0f; } - if (checkZeroSpeedF() && temp_r26 > 0x7000 && mProcID == PROC_BOARD_WAIT && !checkModeFlg(2)) { - if (mProcVar3.field_0x300e <= 910.0f && checkUnderMove0BckNoArc(ANM_RIDE_WAIT) && mLinkAcch.ChkGroundHit()) { + if (checkZeroSpeedF() && + temp_r26 > 0x7000 && + mProcID == PROC_BOARD_WAIT && + !checkModeFlg(2)) { + if (mProcVar3.field_0x300e <= l_boardSlopeAngleMin && + checkUnderMove0BckNoArc(ANM_RIDE_WAIT) && + mLinkAcch.ChkGroundHit()) { return procBoardTurnInit(); } } - } else if (temp_r26 < 0x2000 && field_0x2f8c == 0xB && mProcID == PROC_BOARD_WAIT && !checkModeFlg(2) && mLinkAcch.ChkGroundHit() && (mProcVar3.field_0x300e < field_0x3122) && (checkUnderMove0BckNoArc(ANM_RIDE_WAIT) || checkUnderMove0BckNoArc(ANM_RIDE_FRONT))) { + } else if (temp_r26 < 0x2000 && + field_0x2f8c == 0xB && + mProcID == PROC_BOARD_WAIT && + !checkModeFlg(2) && mLinkAcch.ChkGroundHit() && + (mProcVar3.field_0x300e < field_0x3122) && + (checkUnderMove0BckNoArc(ANM_RIDE_WAIT) || checkUnderMove0BckNoArc(ANM_RIDE_FRONT))) { if (mNormalSpeed <= mpHIO->mItem.mBoard.m.mMaxPushSpeed) { return procBoardRowInit(); } @@ -160,7 +174,10 @@ int daAlink_c::boardCommon(BOOL i_canMove) { offModeFlg(2); speed.y = 0.0f; } else { - if (mProcVar3.field_0x300e > 910.0f && (mProcID != PROC_BOARD_ROW || !(mProcVar3.field_0x300e < 2000.0f))) { + if (mProcVar3.field_0x300e > l_boardSlopeAngleMin && + (mProcID != PROC_BOARD_ROW || !(mProcVar3.field_0x300e < l_boardSlopeRowAngleMin))) { + f32 temp_f27; + f32 temp_f26; f32 var_f25 = (f32)mProcVar3.field_0x300e / (f32)field_0x3122; if (var_f25 > 1.0f) { var_f25 = 1.0f; @@ -176,8 +193,8 @@ int daAlink_c::boardCommon(BOOL i_canMove) { var_f31 *= cM_fsin(1.5707964f * var_f25); if (var_f31 > 0.1f) { - f32 temp_f27 = (var_f31 * cM_ssin(var_r27)) + (mNormalSpeed * cM_ssin(shape_angle.y)); - f32 temp_f26 = (var_f31 * cM_scos(var_r27)) + (mNormalSpeed * cM_scos(shape_angle.y)); + temp_f27 = (var_f31 * cM_ssin(var_r27)) + (mNormalSpeed * cM_ssin(shape_angle.y)); + temp_f26 = (var_f31 * cM_scos(var_r27)) + (mNormalSpeed * cM_scos(shape_angle.y)); mNormalSpeed = JMAFastSqrt((temp_f27 * temp_f27) + (temp_f26 * temp_f26)); if (mNormalSpeed > mMaxSpeed) { diff --git a/src/d/actor/d_a_alink_ironball.inc b/src/d/actor/d_a_alink_ironball.inc index 76eb232c22a..c0c4d6508a6 100644 --- a/src/d/actor/d_a_alink_ironball.inc +++ b/src/d/actor/d_a_alink_ironball.inc @@ -213,6 +213,11 @@ void daAlink_c::setIronBallChainPos() { int sp38; int sp34; + f32 var_f30; + f32 var_f31; + f32 var_f29; + f32 var_f28; + f32 var_f27; if (mItemVar0.field_0x3018 == 2) { var_r29 = mIronBallChainPos + 1; var_r27 = var_r29 - 1; @@ -293,20 +298,20 @@ void daAlink_c::setIronBallChainPos() { daPy_frameCtrl_c* framectrl = &mUnderFrameCtrl[0]; if (mItemVar0.field_0x3018 == 1) { - f32 temp_f25 = framectrl->getEnd() - 13.0f; - f32 temp_f29 = (framectrl->getFrame() - 13.0f) / temp_f25; - s16 sp12 = -16384.0f - (14336.0f * temp_f29); + var_f29 = (framectrl->getFrame() - 13.0f) / (framectrl->getEnd() - 13.0f); + s16 sp12 = -16384.0f - (14336.0f * var_f29); mDoMtx_stack_c::ZXYrotS(mBodyAngle.x, shape_angle.y, 0); mDoMtx_stack_c::YrotM(sp12); mDoMtx_stack_c::multVec(&cXyz::BaseZ, &sp298); - sp298 *= 15.0f * (1.0f + temp_f29); + sp298 *= 15.0f * (1.0f + var_f29); sp38 = 1000; } else if (mItemVar0.field_0x3018 == 4) { Vec sp268 = {0.0f, 0.0f, 0.0f}; sp268.y = mpHIO->mItem.mIronBall.m.mThrowChainAccelY; - sp268.z = mpHIO->mItem.mIronBall.m.mThrowChainAccelZ; + f32 throwAccelZ = mpHIO->mItem.mIronBall.m.mThrowChainAccelZ; + sp268.z = throwAccelZ; mDoMtx_stack_c::ZXYrotS(mBodyAngle.x, shape_angle.y, 0); mDoMtx_stack_c::multVec(&sp268, &sp298); @@ -355,10 +360,8 @@ void daAlink_c::setIronBallChainPos() { sp2A4 += sp298; } - s16 temp_r25 = sp2A4.atan2sX_Z(); - mIronBallChainAngle->set(sp2A4.atan2sY_XZ(), temp_r25, 0); + mIronBallChainAngle->set(sp2A4.atan2sY_XZ(), sp2A4.atan2sX_Z(), 0); } else { - f32 var_f30; if (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5) { var_f30 = mpHIO->mItem.mIronBall.m.mThrowChainGravity; } else { @@ -384,9 +387,9 @@ void daAlink_c::setIronBallChainPos() { BOOL sp2C = ((mItemVar0.field_0x3018 == 0 && checkUnderMove1BckNoArc(ANM_IRONBALL_WALK)) && mNowAnmPackUnder[1].getRatio() > 0.8f) && (mUnderFrameCtrl[1].getFrame() >= 24.0f || mUnderFrameCtrl[1].getFrame() <= 3.0f); - f32 temp_f31 = 5.0f * (5.0f * (mNowAnmPackUnder[1].getRatio() - 0.8f)); - f32 temp_f28 = temp_f31 * cM_scos(shape_angle.y); - temp_f31 *= cM_ssin(shape_angle.y); + var_f31 = 5.0f * (5.0f * (mNowAnmPackUnder[1].getRatio() - 0.8f)); + var_f28 = var_f31 * cM_scos(shape_angle.y); + var_f31 *= cM_ssin(shape_angle.y); for (i = mItemMode; i > 0; i--, var_r29--, var_r26--) { sp28C = *var_r29; @@ -396,8 +399,8 @@ void daAlink_c::setIronBallChainPos() { } else { sp2A4 = (*var_r29 - *var_r27) + *var_r26; if (sp2C) { - sp2A4.x += temp_f31; - sp2A4.z += temp_f28; + sp2A4.x += var_f31; + sp2A4.z += var_f28; } sp2A4.y += var_f30; @@ -421,10 +424,10 @@ void daAlink_c::setIronBallChainPos() { s16 sp10; s16 spE = mIronBallChainAngle->z + 0x3000; - for (i = 0; i < mItemMode; i++, sp3C++, var_r29++, spE += 0x3000) { + for (i = 0; i < mItemMode; i++, sp3C++, var_r29++, ANGLE_ADD_2(spE, 0x3000)) { sp2A4 = (*var_r27 - *var_r29); - f32 var_f27 = sp2A4.absXZ(); + var_f27 = sp2A4.absXZ(); if (var_f27 < 1.0f) { sp10 = sp3C[-1].y; } else { @@ -721,7 +724,7 @@ void daAlink_c::setIronBallPos() { } if (mItemMode > 6) { - mItemMode -= var_r22; + ANGLE_SUB_2(mItemMode, var_r22); if (mItemMode <= 6) { mItemVar0.field_0x3018 = 8; } @@ -749,7 +752,7 @@ void daAlink_c::setIronBallPos() { mDoMtx_stack_c::multVec(&ironBallPosVec, mIronBallChainPos); if (mItemMode > 6) { - mItemMode -= 10; + mItemMode -= (s16)10; if (mItemMode < 6) { mItemMode = 6; } diff --git a/src/d/actor/d_a_alink_sumou.inc b/src/d/actor/d_a_alink_sumou.inc index 7e40b91cb5b..836b1b29dee 100644 --- a/src/d/actor/d_a_alink_sumou.inc +++ b/src/d/actor/d_a_alink_sumou.inc @@ -374,7 +374,7 @@ int daAlink_c::procSumouSideMove() { f32 var_f1; if (checkInputOnR() && temp_r30_2 > 0x800 && temp_r30_2 < 0x7800) { if (abs((s16)(mMoveAngle - current.angle.y)) > 0x4000) { - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); mNormalSpeed *= -1.0f; if (field_0x2f98 == 3) { diff --git a/src/d/actor/d_a_alink_swim.inc b/src/d/actor/d_a_alink_swim.inc index 986f3336a31..857a3693f6a 100644 --- a/src/d/actor/d_a_alink_swim.inc +++ b/src/d/actor/d_a_alink_swim.inc @@ -254,7 +254,7 @@ void daAlink_c::setSpeedAndAngleSwim() { if (checkInputOnR()) { if (getDirectionFromCurrentAngle() == DIR_BACKWARD) { - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); mNormalSpeed *= -1.0f; } @@ -1413,12 +1413,13 @@ int daAlink_c::procSwimDamageInit(dCcD_GObjInf* i_hitObj) { dmg_vec->z * var_f29 + dmg_vec->x * var_f30); mProcVar0.field_0x3008 = - cLib_minMaxLimit(cM_atan2s(sp24.z, sp24.y), (s16)-mpHIO->mDamage.mDamSwim.m.mFrontBackBodyMaxAngle, - (s16)mpHIO->mDamage.mDamSwim.m.mFrontBackBodyMaxAngle); + cLib_minMaxLimit(cM_atan2s(sp24.z, sp24.y), + -mpHIO->mDamage.mDamSwim.m.mFrontBackBodyMaxAngle, + mpHIO->mDamage.mDamSwim.m.mFrontBackBodyMaxAngle); - mProcVar1.field_0x300a = cLib_minMaxLimit( + mProcVar1.field_0x300a = cLib_minMaxLimit( cM_atan2s(sp24.x, -JMAFastSqrt(sp24.y * sp24.y + sp24.z * sp24.z)), - (s16)-mpHIO->mDamage.mDamSwim.m.mLeftRightBodyMaxAngle, (s16)mpHIO->mDamage.mDamSwim.m.mLeftRightBodyMaxAngle); + -mpHIO->mDamage.mDamSwim.m.mLeftRightBodyMaxAngle, mpHIO->mDamage.mDamSwim.m.mLeftRightBodyMaxAngle); int dir = getDirectionFromAngle(cM_atan2s(-sp24.x, -sp24.z)); if (bvar4) { diff --git a/src/d/actor/d_a_alink_swindow.inc b/src/d/actor/d_a_alink_swindow.inc index d990f8a9e12..63d4765864c 100644 --- a/src/d/actor/d_a_alink_swindow.inc +++ b/src/d/actor/d_a_alink_swindow.inc @@ -272,6 +272,7 @@ void daAlink_c::initStatusWindow() { JUT_ASSERT(437, tmpBuffer); JKRReadIdxResource(tmpBuffer, 0x400, btpResIdx, dComIfGp_getAnmArchive()); + // this should call J3DAnmLoaderDataBase::load(const void*) but it breaks retail J3DAnmTexPattern* btp = (J3DAnmTexPattern*)J3DAnmLoaderDataBase::load(tmpBuffer, J3DLOADER_UNK_FLAG0); btp->setFrame(0.0f); btp->searchUpdateMaterialID(field_0x06c0); @@ -281,6 +282,7 @@ void daAlink_c::initStatusWindow() { JUT_ASSERT(449, tmpBuffer); JKRReadIdxResource(tmpBuffer, 0x400, btkResIdx, dComIfGp_getAnmArchive()); + // this should call J3DAnmLoaderDataBase::load(const void*) but it breaks retail J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)J3DAnmLoaderDataBase::load(tmpBuffer, J3DLOADER_UNK_FLAG0); btk->setFrame(0.0f); btk->searchUpdateMaterialID(field_0x06c0); diff --git a/src/d/actor/d_a_alink_wolf.inc b/src/d/actor/d_a_alink_wolf.inc index 6805311b9ea..bc08d640390 100644 --- a/src/d/actor/d_a_alink_wolf.inc +++ b/src/d/actor/d_a_alink_wolf.inc @@ -722,7 +722,7 @@ void daAlink_c::setSpeedAndAngleWolf() { var_r4 = mMoveAngle; } - cLib_addCalcAngleS(&shape_angle.y, var_r4, turn_rate, turn_max * 2, turn_min * 2); + cLib_addCalcAngleS(&shape_angle.y, var_r4, turn_rate, (s16)turn_max * 2, (s16)turn_min * 2); int temp_r3 = (s16)(temp_r26 - current.angle.y) * (s16)(shape_angle.y - current.angle.y); if (temp_r3 <= 0 && temp_r3 >= -0x1000000) { @@ -766,7 +766,7 @@ void daAlink_c::setSpeedAndAngleWolfAtn() { if (getDirectionFromCurrentAngle() == DIR_BACKWARD && (field_0x2f98 == 0 || field_0x2f98 == 1)) { - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); mNormalSpeed *= -1.0f; if (checkWolfAtnMoveBack((s16)(current.angle.y - shape_angle.y))) { @@ -816,7 +816,7 @@ void daAlink_c::setSpeedAndAngleWolfAtn() { } cLib_addCalcAngleS(&shape_angle.y, var_r26, mpHIO->mWolf.mWlAtnMove.m.mTurnAngleRate, - turn_max * 2, mpHIO->mWolf.mWlAtnMove.m.mTurnAngleMin * 2); + (s16)turn_max * 2, mpHIO->mWolf.mWlAtnMove.m.mTurnAngleMin * 2); } setNormalSpeedF(speed, deceleration); @@ -839,19 +839,9 @@ BOOL daAlink_c::checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM i_anm) const } void daAlink_c::setBlendWolfMoveAnime(f32 param_0) { - f32 sp8; - if (mGroundCode == 8) { - sp8 = 1.0f; - } else { - sp8 = cM_scos(field_0x2ff0); - } - - f32 var_f31; - f32 temp_f30 = fabsf(mNormalSpeed * sp8) / mMaxSpeed; - - daPy_frameCtrl_c* framectrl0 = &mUnderFrameCtrl[0]; - daPy_frameCtrl_c* framectrl1 = &mUnderFrameCtrl[1]; - + f32 temp_f30; + daPy_frameCtrl_c* framectrl0; + daPy_frameCtrl_c* framectrl1; f32 idleAnmSpeed; f32 walkAnmSpeed; f32 jogAnmSpeed; @@ -862,6 +852,21 @@ void daAlink_c::setBlendWolfMoveAnime(f32 param_0) { f32 jogToRunRate; f32 walkRunMorf; f32 runAnmMinBlendRate; + f32 spC; + + f32 sp8; + if (mGroundCode == 8) { + sp8 = 1.0f; + } else { + sp8 = cM_scos(field_0x2ff0); + } + + f32 var_f31; + temp_f30 = fabsf(mNormalSpeed * sp8) / mMaxSpeed; + + framectrl0 = &mUnderFrameCtrl[0]; + framectrl1 = &mUnderFrameCtrl[1]; + if (checkWolfDashMode()) { walkToJogRate = mpHIO->mWolf.mWlMove.m.mWalkToBriskWalkRate; walkRunMorf = mpHIO->mWolf.mWlMove.m.mWalkRunInterpolation; @@ -986,7 +991,6 @@ void daAlink_c::setBlendWolfMoveAnime(f32 param_0) { var_f31 = 1.0f; } - f32 spC; if (checkNoResetFlg1(FLG1_DASH_MODE)) { if (checkWolfSlowDash()) { spC = mpHIO->mWolf.mWlMove.m.mADashQuickRunASpeedSlow; @@ -1075,7 +1079,7 @@ void daAlink_c::setWolfAtnMoveDirection() { } } else if (mProcID != PROC_WOLF_ROLL_ATTACK_MOVE) { if (field_0x2f98 == 1) { - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); mNormalSpeed *= -1.0f; } @@ -1155,20 +1159,12 @@ void daAlink_c::setBlendWolfAtnMoveAnime(f32 param_0) { void daAlink_c::setBlendWolfAtnBackMoveAnime(f32 param_0) { mMaxSpeed = mpHIO->mWolf.mWlAtnMove.m.mRearMaxSpeed; - f32 var_f28; - if (mGroundCode == 8) { - var_f28 = 1.0f; - } else { - var_f28 = cM_scos(field_0x2ff0); - } - - f32 temp_f31 = fabsf(mNormalSpeed * var_f28) / mMaxSpeed; - f32 var_f30; + f32 var_f31 = fabsf(mNormalSpeed * (mGroundCode == 8 ? 1.0f : cM_scos(field_0x2ff0))) / mMaxSpeed; field_0x2fc1 = 3; - if (temp_f31 < mpHIO->mWolf.mWlAtnMove.m.mRearWalkChangeRate) { - f32 temp_f29 = temp_f31 / mpHIO->mWolf.mWlAtnMove.m.mRearWalkChangeRate; + if (var_f31 < mpHIO->mWolf.mWlAtnMove.m.mRearWalkChangeRate) { + f32 var_f29 = var_f31 / mpHIO->mWolf.mWlAtnMove.m.mRearWalkChangeRate; int var_r29; if (checkModeFlg(1)) { @@ -1178,6 +1174,7 @@ void daAlink_c::setBlendWolfAtnBackMoveAnime(f32 param_0) { } daAlink_WANM var_r28; + f32 var_f30; if (checkWolfAtnWait()) { var_r28 = WANM_ATN; var_f30 = mpHIO->mWolf.mWlMove.m.mGazeIdleAnmSpeed; @@ -1186,7 +1183,7 @@ void daAlink_c::setBlendWolfAtnBackMoveAnime(f32 param_0) { var_f30 = mpHIO->mWolf.mWlMoveNoP.m.mIdleAnmSpeed; } - setDoubleAnimeWolf(temp_f29, var_f30, mpHIO->mWolf.mWlAtnMove.m.mRearWalkAnmSpeed, var_r28, + setDoubleAnimeWolf(var_f29, var_f30, mpHIO->mWolf.mWlAtnMove.m.mRearWalkAnmSpeed, var_r28, WANM_ATN_LOCK_WALK_BACK, var_r29, param_0); } else { setDoubleAnimeWolf(1.0f, mpHIO->mWolf.mWlAtnMove.m.mRearWalkAnmSpeed, @@ -1274,7 +1271,7 @@ int daAlink_c::setSingleAnimeWolf(daAlink_c::daAlink_WANM i_anmID, f32 i_speed, // "Is Adult Link but setting Wolf animation\n" OS_REPORT("リンクなのに狼アニメ設定\n"); JUT_ASSERT(2214, FALSE); - } + } J3DAnmTransform* var_r30 = getAnimeResource(&mUnderAnmHeap[0], m_wlAnmDataTable[i_anmID].m_bckID, 0x10800); if (var_r30 == NULL) { @@ -1688,7 +1685,7 @@ void daAlink_c::wolfBgCheck() { if (var_r28 != 0 || var_r25 != 0) { onNoResetFlg1(FLG1_UNK_20000000); - + if (var_r28 != 0 && var_r25 != 0) { if (sp20.abs2() > sp14.abs2()) { sp8 = sp20; @@ -1819,8 +1816,9 @@ void daAlink_c::setWolfFootMatrix() { daAlink_footData_c* footData = mFootData1; int i, j; + int var_r31; for (i = 0; i < 2; i++, footData++) { - int var_r31 = fFootJoint[i]; + var_r31 = fFootJoint[i]; for (j = 0; j < 3; j++, var_r31++) { cMtx_copy(mpLinkModel->getAnmMtx(var_r31), footData->field_0x14[j]); if (j == 1) { @@ -1831,9 +1829,9 @@ void daAlink_c::setWolfFootMatrix() { footData = mFootData2; - for (int i = 0; i < 2; i++, footData++) { - int var_r31 = bFootJoint[i]; - for (int j = 0; j < 3; j++, var_r31++) { + for (i = 0; i < 2; i++, footData++) { + var_r31 = bFootJoint[i]; + for (j = 0; j < 3; j++, var_r31++) { cMtx_copy(mpLinkModel->getAnmMtx(var_r31), footData->field_0x14[j]); if (j == 0) { var_r31++; @@ -1841,64 +1839,66 @@ void daAlink_c::setWolfFootMatrix() { } } - if (field_0x2060->getOldFrameFlg()) { - cXyz sp40[4]; - cXyz sp34(0.0f, 0.0f, 0.0f); - cXyz sp28; - - footData = mFootData1; - - for (i = 0; i < 2; i++, footData++) { - int var_r31 = fFootJoint[i]; - for (j = 0; j < 4; j++, var_r31++) { - mDoMtx_multVecZero(mpLinkModel->getAnmMtx(var_r31), &sp40[j]); - } + if (!field_0x2060->getOldFrameFlg()) { + return; + } - int temp_r31 = fFootJoint[i]; - setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(temp_r31), footData->field_0x6, 0, 0, 0, NULL); - - sp34.x = sp40[0].abs(sp40[1]); - mDoMtx_stack_c::multVec(&sp34, &sp28); - temp_r31++; - setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(temp_r31), footData->field_0x4, 0, 0, 0, &sp28); + cXyz sp40[4]; + cXyz sp34(0.0f, 0.0f, 0.0f); + cXyz sp28; - sp34.x = sp40[1].abs(sp40[2]); - mDoMtx_stack_c::multVec(&sp34, &sp28); - temp_r31++; - setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(temp_r31), footData->field_0x4, 0, 0, 0, &sp28); + footData = mFootData1; - sp34.x = sp40[2].abs(sp40[3]); - mDoMtx_stack_c::multVec(&sp34, &sp28); - temp_r31++; - setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(temp_r31), footData->field_0x2, 0, 0, 0, &sp28); + for (i = 0; i < 2; i++, footData++) { + var_r31 = fFootJoint[i]; + for (j = 0; j < 4; j++, var_r31++) { + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(var_r31), &sp40[j]); } - footData = mFootData2; + var_r31 = fFootJoint[i]; + setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(var_r31), footData->field_0x6, 0, 0, 0, NULL); - for (i = 0; i < 2; i++, footData++) { - int var_r31 = bFootJoint[i]; - for (j = 0; j < 4; j++, var_r31++) { - mDoMtx_multVecZero(mpLinkModel->getAnmMtx(var_r31), &sp40[j]); - } + sp34.x = sp40[0].abs(sp40[1]); + mDoMtx_stack_c::multVec(&sp34, &sp28); + var_r31++; + setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(var_r31), footData->field_0x4, 0, 0, 0, &sp28); - int temp_r31 = bFootJoint[i]; - setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(temp_r31), footData->field_0x6, 0, 0, 0, NULL); - - sp34.x = sp40[0].abs(sp40[1]); - mDoMtx_stack_c::multVec(&sp34, &sp28); - temp_r31++; - setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(temp_r31), footData->field_0x6, 0, 0, 0, &sp28); + sp34.x = sp40[1].abs(sp40[2]); + mDoMtx_stack_c::multVec(&sp34, &sp28); + var_r31++; + setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(var_r31), footData->field_0x4, 0, 0, 0, &sp28); + + sp34.x = sp40[2].abs(sp40[3]); + mDoMtx_stack_c::multVec(&sp34, &sp28); + var_r31++; + setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(var_r31), footData->field_0x2, 0, 0, 0, &sp28); + } - sp34.x = sp40[1].abs(sp40[2]); - mDoMtx_stack_c::multVec(&sp34, &sp28); - temp_r31++; - setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(temp_r31), footData->field_0x4, 0, 0, 0, &sp28); + footData = mFootData2; - sp34.x = sp40[2].abs(sp40[3]); - mDoMtx_stack_c::multVec(&sp34, &sp28); - temp_r31++; - setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(temp_r31), footData->field_0x2, 0, 0, 0, &sp28); + for (i = 0; i < 2; i++, footData++) { + var_r31 = bFootJoint[i]; + for (j = 0; j < 4; j++, var_r31++) { + mDoMtx_multVecZero(mpLinkModel->getAnmMtx(var_r31), &sp40[j]); } + + var_r31 = bFootJoint[i]; + setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(var_r31), footData->field_0x6, 0, 0, 0, NULL); + + sp34.x = sp40[0].abs(sp40[1]); + mDoMtx_stack_c::multVec(&sp34, &sp28); + var_r31++; + setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(var_r31), footData->field_0x6, 0, 0, 0, &sp28); + + sp34.x = sp40[1].abs(sp40[2]); + mDoMtx_stack_c::multVec(&sp34, &sp28); + var_r31++; + setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(var_r31), footData->field_0x4, 0, 0, 0, &sp28); + + sp34.x = sp40[2].abs(sp40[3]); + mDoMtx_stack_c::multVec(&sp34, &sp28); + var_r31++; + setMatrixWorldAxisRot(mpLinkModel->getAnmMtx(var_r31), footData->field_0x2, 0, 0, 0, &sp28); } } @@ -2039,7 +2039,7 @@ void daAlink_c::wolfFootBgCheck() { } if (temp_f30 > 0.0f || sp30) { - if (!setLegAngle(temp_f30, footData, &sp58[i][j], &sp50[i][j], 1)) { + if (!setLegAngle(temp_f30, footData, &sp58[i][j], &sp50[i][j], 1)) { sp58[i][j] = 0; sp50[i][j] = 0; } @@ -2051,7 +2051,7 @@ void daAlink_c::wolfFootBgCheck() { cLib_addCalcAngleS(&footData->field_0x6, sp58[i][j], 2, 0x1800, 0x10); cLib_addCalcAngleS(&footData->field_0x4, sp50[i][j], 2, 0x1800, 0x10); - + s16 spE; if (mProcID == PROC_WOLF_SLIDE_READY) { spE = shape_angle.x; @@ -2180,6 +2180,8 @@ f32 daAlink_c::setWolfWaitSlip() { void daAlink_c::checkWolfAtnDoCharge() {} void daAlink_c::setWolfChainPos() { + static const int dummy1 = 0; + static const int dummy2 = 0; static Vec const wolfChainBaseOffset = {22.0f, 0.0f, -12.0f}; static Vec const wolfChainVec = {0.0f, 0.0f, -9.0f}; @@ -2228,7 +2230,7 @@ void daAlink_c::setWolfChainPos() { var_r29->y -= 9.0f; *var_r30 = *(var_r30 - 1); - var_r30->z += 0x4000; + ANGLE_ADD_2(var_r30->z, 0x4000); *var_r26 = cXyz::Zero; } @@ -2292,9 +2294,9 @@ void daAlink_c::setWolfChainPos() { sp8 = var_r30[-1].z - var_r30->z; if ((sp8 >= 0 && sp8 <= 0x4000) || sp8 < -0x4000) { - var_r30->z -= 0x2000; + ANGLE_SUB_2(var_r30->z, 0x2000); } else { - var_r30->z += 0x2000; + ANGLE_ADD_2(var_r30->z, 0x2000); } mDoMtx_stack_c::transS(sp78); @@ -2682,7 +2684,7 @@ int daAlink_c::procWolfDashReverseInit(int param_0) { } else { mNormalSpeed = mpHIO->mWolf.mWlMove.m.mDashReboundHorizontalSpeed; speed.y = mpHIO->mWolf.mWlMove.m.mDashReboundVerticalSpeed; - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); mProcVar2.field_0x300c = 0; } @@ -3888,19 +3890,19 @@ int daAlink_c::procWolfHowlDemoInit() { sp8.z = sp14.z - var_f30; if (!commonLineCheck(&sp14, &sp8)) { - shape_angle.y += 0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); } else { sp8.x = sp14.x + var_f30; sp8.z = sp14.z - var_f31; if (!commonLineCheck(&sp14, &sp8)) { - shape_angle.y += 0x4000; + ANGLE_ADD_2(shape_angle.y, 0x4000); } else { sp8.x = sp14.x - var_f30; sp8.z = sp14.z + var_f31; if (!commonLineCheck(&sp14, &sp8)) { - shape_angle.y -= 0x4000; + ANGLE_SUB_2(shape_angle.y, 0x4000); } } } @@ -4567,10 +4569,10 @@ int daAlink_c::procWolfRopeHangInit(int param_0) { mProcVar2.field_0x300c = 0; if (param_0 == 2) { - shape_angle.y -= 0x4000; + ANGLE_SUB_2(shape_angle.y, 0x4000); mProcVar4.field_0x3010 = -mProcVar4.field_0x3010; } else { - shape_angle.y += 0x4000; + ANGLE_ADD(shape_angle.y, 0x4000); } wolfRopeSwingInc(50.0f); @@ -4597,12 +4599,12 @@ int daAlink_c::procWolfRopeHang() { field_0x2060->getOldFrameTransInfo(0)->mTranslate.z -= 15.0f; if (field_0x3198 == 2) { - shape_angle.y += 0x4000; + ANGLE_ADD_2(shape_angle.y, 0x4000); setOldRootQuaternion(0, -0x4000, 0); shape_angle.x = -shape_angle.z; return procWolfRopeMoveInit(0, 0); } else { - shape_angle.y -= 0x4000; + ANGLE_SUB_2(shape_angle.y, 0x4000); setOldRootQuaternion(0, 0x4000, 0); shape_angle.x = shape_angle.z; return procWolfRopeMoveInit(1, 0); @@ -5292,11 +5294,11 @@ int daAlink_c::procWolfGiantPuzzle() { field_0x3478 = mMaxSpeed; } } else if (direction == DIR_LEFT) { - mProcVar2.mPuzzleAimAngle += 0x4000; + ANGLE_ADD_2(mProcVar2.mPuzzleAimAngle, 0x4000); } else if (direction == DIR_RIGHT) { - mProcVar2.mPuzzleAimAngle -= 0x4000; + ANGLE_SUB_2(mProcVar2.mPuzzleAimAngle, 0x4000); } else { - mProcVar2.mPuzzleAimAngle += 0x8000; + ANGLE_ADD_2(mProcVar2.mPuzzleAimAngle, 0x8000); } } } @@ -6028,7 +6030,8 @@ BOOL daAlink_c::checkMidnaDisappearMode() const { return mProcID == PROC_WOLF_DIG_THROUGH || (checkWolf() && dComIfGp_checkPlayerStatus0(0, 0x8000000) && !dComIfGp_checkPlayerStatus0(0, 0x10) && - (mTargetedActor == NULL || !(mTargetedActor->attention_info.flags & fopAc_AttnFlag_UNK_0x800000))); + !(mTargetedActor != NULL && + mTargetedActor->attention_info.flags & fopAc_AttnFlag_UNK_0x800000)); } BOOL daAlink_c::checkWolfLieContinue(int param_0) { @@ -6271,7 +6274,7 @@ int daAlink_c::procWolfLieMove() { } else { spA = mMoveAngle + 0x8000; } - + cLib_addCalcAngleS(&shape_angle.y, spA, mpHIO->mWolf.mWlLie.m.mProneTurnRate, mpHIO->mWolf.mWlLie.m.mProneTurnMax, mpHIO->mWolf.mWlLie.m.mProneTurnMin); } @@ -6379,7 +6382,7 @@ int daAlink_c::procWolfLieAutoMove() { } else { int var_r28 = 1; if (mProcVar1.field_0x300a > 0) { - mProcVar1.field_0x300a -= 1; + mProcVar1.field_0x300a--; } if (mProcVar3.field_0x300e != 0) { @@ -7202,7 +7205,7 @@ int daAlink_c::procWolfJumpAttackInit(int param_0) { f32 attack_init_speed; f32 var_f30; f32 var_f29; - + if (param_0 == 1) { setCutType(CUT_TYPE_WOLF_JUMP); setCylAtParam(AT_TYPE_WOLF_ATTACK, dCcG_At_Spl_UNK_1, 3, dCcD_SE_WOLF_BITE, 3, mpHIO->mWolf.mWlAttack.mWlAtCjump.m.mAttackRadius, mpHIO->mWolf.mWlAttack.mWlAtCjump.m.mAttackHeight); @@ -7271,7 +7274,7 @@ int daAlink_c::procWolfJumpAttackInit(int param_0) { if (mProcVar0.field_0x3008 != 0) { var_f30 -= 10.0f; } - + if (var_f30 > 0.0f) { var_f29 = JMAFastSqrt((2.0f * var_f30) / -gravity); } else { @@ -7286,6 +7289,8 @@ int daAlink_c::procWolfJumpAttackInit(int param_0) { mNormalSpeed = attack_init_speed; speed.y = min_vertical_speed; } + + (void)0; } } else { mNormalSpeed = attack_init_speed; @@ -7548,7 +7553,7 @@ int daAlink_c::procWolfJumpAttackNormalLand() { checkNextActionWolf(0); } else if (frameCtrl->getFrame() > mpHIO->mWolf.mWlAttack.mWlAtLand.m.mNormalLandingAnm.mCancelFrame) { if (mProcVar2.field_0x300c != 0) { - shape_angle.y -= -0x8000; + ANGLE_ADD_2(shape_angle.y, 0x8000); return procWolfJumpAttackInit(3); } @@ -7565,7 +7570,7 @@ int daAlink_c::procWolfWaitAttackInit(int i_attackType) { /* 0x0 */ daAlink_c::daAlink_WANM m_anmID; /* 0x4 */ u8 m_cutType; }; // Size: 0x8 - + static const daAlink_WCutParamTbl dataTabl[] = { { daAlink_c::WANM_ATTACK_B_LEFT, @@ -8105,7 +8110,7 @@ int daAlink_c::procWolfLockAttackTurn() { if (mWolfLockNum != 0) { s16 target_angle = cLib_targetAngleY(¤t.pos, &mWolfLockAcKeep[0].getActor()->eyePos); if (mProcVar2.field_0x300c != 0) { - target_angle += 0x8000; + ANGLE_ADD_2(target_angle, 0x8000); } cLib_addCalcAngleS(&shape_angle.y, target_angle, 2, 0x2000, 0x800); @@ -8135,7 +8140,7 @@ int daAlink_c::procWolfAttackReverseInit() { mNormalSpeed = mpHIO->mWolf.mWlAttack.m.mJumpBackSpeedH; speed.y = mpHIO->mWolf.mWlAttack.m.mJumpBackSpeedV; - current.angle.y += 0x8000; + ANGLE_ADD_2(current.angle.y, 0x8000); dComIfGp_getVibration().StartShock(5, 15, cXyz(0.0f, 1.0f, 0.0f)); dKy_Sound_set(current.pos, 100, fopAcM_GetID(this), 5); @@ -8808,7 +8813,7 @@ int daAlink_c::procWolfChainReady() { shape_angle.y = cLib_targetAngleY(¤t.pos, &chain->getJumpAimPos()); current.angle.y = shape_angle.y; mProcVar3.field_0x300e = 1; - + cXyz vec1 = chain->getJumpAimPos() - field_0x34e0; f32 dist_xz = vec1.absXZ(); f32 dist = vec1.abs(); @@ -8998,7 +9003,7 @@ int daAlink_c::procWolfDigInit() { s16 var_r27 = fopAcM_searchActorAngleY(this, var_r29); if (abs((s16)(var_r27 - shape_angle.y)) > 0x4000) { - var_r27 += 0x8000; + ANGLE_ADD_2(var_r27, 0x8000); } shape_angle.y = var_r27; @@ -9132,7 +9137,7 @@ int daAlink_c::procWolfDig() { ((daObjDigpl_c*)dig_actor)->onDigFlg(); field_0x280c.clearData(); } - + if (frame_ctrl->getFrame() >= 11.0f) { if (frame_ctrl->getFrame() <= 41.0f) { if (mProcVar0.field_0x3008 == 0) { @@ -9153,6 +9158,8 @@ int daAlink_c::procWolfDig() { } int daAlink_c::procWolfDigThroughInit(int param_0) { + static const int dummy = 0; + static const u16 snowID[] = { dPa_RM(ID_ZI_S_DIGTHROUGHSNOW_A), dPa_RM(ID_ZI_S_DIGTHROUGHSNOW_B), From c900a043b89786d5e594ec883d9acd92e0db6bc7 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sat, 28 Feb 2026 13:11:00 -0700 Subject: [PATCH 07/35] Some GCC compilation fixes (#3114) * Fix 6-byte multichar literals * Add `struct` to `e_ga_class::ga_s` * Fix remaining wrong forward declares (struct/class) * Replace `#include ` with `#include ` * Guard FLT_EPSILON define to prevent redefinition * Add missing `#include ` for direct cstring function usage --- .../J3DGraphLoader/J3DMaterialFactory.h | 2 +- .../J3DGraphLoader/J3DMaterialFactory_v21.h | 2 +- .../JSystem/J3DGraphLoader/J3DModelLoader.h | 2 +- include/JSystem/JAudio2/JAISound.h | 2 +- include/JSystem/JAudio2/JASChannel.h | 2 +- include/JSystem/JAudio2/JASCmdStack.h | 2 +- include/JSystem/JAudio2/JASSeqCtrl.h | 2 +- include/JSystem/JAudio2/JASWSParser.h | 4 +- include/JSystem/JGadget/search.h | 1 + include/JSystem/JGadget/std-streambuf.h | 2 +- include/JSystem/JGeometry.h | 2 + include/SSystem/SComponent/c_m2d.h | 2 +- include/d/actor/d_a_e_ga.h | 2 +- include/d/actor/d_a_e_pm.h | 2 +- include/d/actor/d_a_npc.h | 1 + include/d/actor/d_a_npc_bou.h | 1 + include/d/actor/d_a_npc_cdn3.h | 1 + include/d/actor/d_a_npc_kn.h | 1 + include/d/actor/d_a_npc_kolin.h | 1 + include/d/actor/d_a_npc_the.h | 1 + include/d/actor/d_a_obj_cblock.h | 2 +- include/d/actor/d_a_passer_mng.h | 2 +- include/d/d_bg_s_cap_poly.h | 2 +- include/d/d_bg_w.h | 2 +- include/d/d_bg_w_base.h | 2 +- include/d/d_bg_w_kcol.h | 4 +- include/d/d_com_inf_game.h | 1 + include/d/d_debug_camera.h | 1 + include/d/d_map.h | 1 + include/d/d_menu_fmap_map.h | 1 + include/d/d_msg_object.h | 1 + include/d/d_name.h | 1 + include/m_Do/m_Do_hostIO.h | 2 +- src/JSystem/J2DGraph/J2DPrint.cpp | 1 + src/JSystem/J2DGraph/J2DTextBox.cpp | 1 + src/JSystem/JAHostIO/JAHioNode.cpp | 1 + src/JSystem/JAudio2/JAUSectionHeap.cpp | 1 + src/JSystem/JUtility/JUTCacheFont.cpp | 1 + src/JSystem/JUtility/JUTDbPrint.cpp | 1 + src/JSystem/JUtility/JUTException.cpp | 1 + src/Z2AudioCS/SpkSpeakerCtrl.cpp | 1 + src/Z2AudioLib/Z2AudioArcLoader.cpp | 1 + src/Z2AudioLib/Z2SceneMgr.cpp | 1 + src/Z2AudioLib/Z2SoundObjMgr.cpp | 1 + src/Z2AudioLib/Z2StatusMgr.cpp | 1 + src/c/c_dylink.cpp | 1 + src/d/actor/d_a_alink.cpp | 1 + src/d/actor/d_a_alink_HIO.inc | 1 + src/d/actor/d_a_alink_demo.inc | 1 + src/d/actor/d_a_b_gg.cpp | 1 + src/d/actor/d_a_b_tn.cpp | 1 + src/d/actor/d_a_b_yo.cpp | 1 + src/d/actor/d_a_balloon_2D.cpp | 1 + src/d/actor/d_a_bd.cpp | 1 + src/d/actor/d_a_bg.cpp | 1 + src/d/actor/d_a_bg_obj.cpp | 1 + src/d/actor/d_a_canoe.cpp | 1 + src/d/actor/d_a_coach_2D.cpp | 1 + src/d/actor/d_a_cow.cpp | 1 + src/d/actor/d_a_cstaF.cpp | 1 + src/d/actor/d_a_demo00.cpp | 1 + src/d/actor/d_a_demo_item.cpp | 1 + src/d/actor/d_a_do.cpp | 1 + src/d/actor/d_a_door_bossL1.cpp | 1 + src/d/actor/d_a_door_knob00.cpp | 1 + src/d/actor/d_a_door_shutter.cpp | 1 + src/d/actor/d_a_e_bi.cpp | 1 + src/d/actor/d_a_e_bug.cpp | 1 + src/d/actor/d_a_e_dn.cpp | 1 + src/d/actor/d_a_e_fs.cpp | 1 + src/d/actor/d_a_e_gb.cpp | 1 + src/d/actor/d_a_e_hp.cpp | 1 + src/d/actor/d_a_e_mf.cpp | 1 + src/d/actor/d_a_e_mk.cpp | 1 + src/d/actor/d_a_e_ms.cpp | 1 + src/d/actor/d_a_e_nest.cpp | 1 + src/d/actor/d_a_e_oc.cpp | 1 + src/d/actor/d_a_e_ph.cpp | 1 + src/d/actor/d_a_e_po.cpp | 1 + src/d/actor/d_a_e_rd.cpp | 1 + src/d/actor/d_a_e_rdb.cpp | 1 + src/d/actor/d_a_e_rdy.cpp | 1 + src/d/actor/d_a_e_s1.cpp | 1 + src/d/actor/d_a_e_sf.cpp | 1 + src/d/actor/d_a_e_sm.cpp | 1 + src/d/actor/d_a_e_sm2.cpp | 1 + src/d/actor/d_a_e_st.cpp | 1 + src/d/actor/d_a_e_warpappear.cpp | 1 + src/d/actor/d_a_e_wb.cpp | 1 + src/d/actor/d_a_e_ww.cpp | 1 + src/d/actor/d_a_e_ym.cpp | 1 + src/d/actor/d_a_e_zh.cpp | 1 + src/d/actor/d_a_fr.cpp | 1 + src/d/actor/d_a_horse.cpp | 1 + src/d/actor/d_a_kago.cpp | 1 + src/d/actor/d_a_kytag04.cpp | 1 + src/d/actor/d_a_kytag06.cpp | 1 + src/d/actor/d_a_kytag12.cpp | 1 + src/d/actor/d_a_kytag13.cpp | 1 + src/d/actor/d_a_kytag15.cpp | 1 + src/d/actor/d_a_kytag16.cpp | 1 + src/d/actor/d_a_mg_fish.cpp | 1 + src/d/actor/d_a_mg_rod.cpp | 1 + src/d/actor/d_a_movie_player.cpp | 1 + src/d/actor/d_a_myna.cpp | 1 + src/d/actor/d_a_nbomb.cpp | 1 + src/d/actor/d_a_ni.cpp | 1 + src/d/actor/d_a_npc.cpp | 1 + src/d/actor/d_a_npc_aru.cpp | 1 + src/d/actor/d_a_npc_ash.cpp | 1 + src/d/actor/d_a_npc_ashB.cpp | 1 + src/d/actor/d_a_npc_bans.cpp | 1 + src/d/actor/d_a_npc_besu.cpp | 1 + src/d/actor/d_a_npc_bou.cpp | 1 + src/d/actor/d_a_npc_bouS.cpp | 53 ++++++++++--------- src/d/actor/d_a_npc_cd.cpp | 1 + src/d/actor/d_a_npc_cd2_HIO.inc | 1 + src/d/actor/d_a_npc_cdn3.cpp | 1 + src/d/actor/d_a_npc_clerka.cpp | 1 + src/d/actor/d_a_npc_clerkb.cpp | 1 + src/d/actor/d_a_npc_clerkt.cpp | 1 + src/d/actor/d_a_npc_coach.cpp | 1 + src/d/actor/d_a_npc_doc.cpp | 1 + src/d/actor/d_a_npc_fairy.cpp | 1 + src/d/actor/d_a_npc_fairy_seirei.cpp | 1 + src/d/actor/d_a_npc_fish.cpp | 1 + src/d/actor/d_a_npc_gnd.cpp | 1 + src/d/actor/d_a_npc_gra.cpp | 1 + src/d/actor/d_a_npc_grc.cpp | 1 + src/d/actor/d_a_npc_grm.cpp | 1 + src/d/actor/d_a_npc_grmc.cpp | 1 + src/d/actor/d_a_npc_gro.cpp | 1 + src/d/actor/d_a_npc_grr.cpp | 1 + src/d/actor/d_a_npc_grs.cpp | 1 + src/d/actor/d_a_npc_grz.cpp | 1 + src/d/actor/d_a_npc_hanjo.cpp | 1 + src/d/actor/d_a_npc_henna.cpp | 1 + src/d/actor/d_a_npc_hoz.cpp | 1 + src/d/actor/d_a_npc_impal.cpp | 1 + src/d/actor/d_a_npc_ins.cpp | 1 + src/d/actor/d_a_npc_jagar.cpp | 1 + src/d/actor/d_a_npc_kakashi.cpp | 1 + src/d/actor/d_a_npc_kkri.cpp | 1 + src/d/actor/d_a_npc_kn.cpp | 1 + src/d/actor/d_a_npc_kn_base.inc | 1 + src/d/actor/d_a_npc_knj.cpp | 1 + src/d/actor/d_a_npc_kolin.cpp | 1 + src/d/actor/d_a_npc_kolinb.cpp | 1 + src/d/actor/d_a_npc_ks.cpp | 1 + src/d/actor/d_a_npc_kyury.cpp | 1 + src/d/actor/d_a_npc_len.cpp | 1 + src/d/actor/d_a_npc_lud.cpp | 1 + src/d/actor/d_a_npc_maro.cpp | 1 + src/d/actor/d_a_npc_midp.cpp | 1 + src/d/actor/d_a_npc_moi.cpp | 1 + src/d/actor/d_a_npc_moir.cpp | 1 + src/d/actor/d_a_npc_myna2.cpp | 1 + src/d/actor/d_a_npc_ne.cpp | 1 + src/d/actor/d_a_npc_pachi_besu.cpp | 1 + src/d/actor/d_a_npc_pachi_maro.cpp | 1 + src/d/actor/d_a_npc_pachi_taro.cpp | 1 + src/d/actor/d_a_npc_post.cpp | 1 + src/d/actor/d_a_npc_pouya.cpp | 1 + src/d/actor/d_a_npc_raca.cpp | 1 + src/d/actor/d_a_npc_rafrel.cpp | 1 + src/d/actor/d_a_npc_saru.cpp | 1 + src/d/actor/d_a_npc_seib.cpp | 1 + src/d/actor/d_a_npc_seic.cpp | 1 + src/d/actor/d_a_npc_seid.cpp | 1 + src/d/actor/d_a_npc_seira.cpp | 1 + src/d/actor/d_a_npc_seira2.cpp | 1 + src/d/actor/d_a_npc_seirei.cpp | 1 + src/d/actor/d_a_npc_shad.cpp | 1 + src/d/actor/d_a_npc_shaman.cpp | 1 + src/d/actor/d_a_npc_shop0.cpp | 1 + src/d/actor/d_a_npc_sola.cpp | 1 + src/d/actor/d_a_npc_taro.cpp | 1 + src/d/actor/d_a_npc_the.cpp | 1 + src/d/actor/d_a_npc_theB.cpp | 53 ++++++++++--------- src/d/actor/d_a_npc_tk.cpp | 1 + src/d/actor/d_a_npc_tkc.cpp | 1 + src/d/actor/d_a_npc_tkj.cpp | 1 + src/d/actor/d_a_npc_tkj2.cpp | 1 + src/d/actor/d_a_npc_tks.cpp | 1 + src/d/actor/d_a_npc_toby.cpp | 1 + src/d/actor/d_a_npc_uri.cpp | 1 + src/d/actor/d_a_npc_wrestler.cpp | 1 + src/d/actor/d_a_npc_yamid.cpp | 1 + src/d/actor/d_a_npc_yamis.cpp | 1 + src/d/actor/d_a_npc_yamit.cpp | 1 + src/d/actor/d_a_npc_yelia.cpp | 1 + src/d/actor/d_a_npc_ykm.cpp | 1 + src/d/actor/d_a_npc_ykw.cpp | 1 + src/d/actor/d_a_npc_zanb.cpp | 1 + src/d/actor/d_a_npc_zant.cpp | 1 + src/d/actor/d_a_npc_zelR.cpp | 1 + src/d/actor/d_a_npc_zelRo.cpp | 1 + src/d/actor/d_a_npc_zelda.cpp | 1 + src/d/actor/d_a_npc_zra.cpp | 1 + src/d/actor/d_a_npc_zrz.cpp | 1 + src/d/actor/d_a_obj_ari.cpp | 1 + src/d/actor/d_a_obj_batta.cpp | 1 + src/d/actor/d_a_obj_bemos.cpp | 1 + src/d/actor/d_a_obj_bky_rock.cpp | 1 + src/d/actor/d_a_obj_bosswarp.cpp | 1 + src/d/actor/d_a_obj_brg.cpp | 1 + src/d/actor/d_a_obj_carry.cpp | 1 + src/d/actor/d_a_obj_cho.cpp | 1 + src/d/actor/d_a_obj_crystal.cpp | 1 + src/d/actor/d_a_obj_dan.cpp | 1 + src/d/actor/d_a_obj_dmelevator.cpp | 1 + src/d/actor/d_a_obj_drop.cpp | 1 + src/d/actor/d_a_obj_fchain.cpp | 1 + src/d/actor/d_a_obj_gadget.cpp | 1 + src/d/actor/d_a_obj_ganonwall.cpp | 1 + src/d/actor/d_a_obj_ganonwall2.cpp | 1 + src/d/actor/d_a_obj_gb.cpp | 1 + src/d/actor/d_a_obj_gra2.cpp | 1 + src/d/actor/d_a_obj_gra2_soldier.inc | 1 + src/d/actor/d_a_obj_ihasi.cpp | 1 + src/d/actor/d_a_obj_itamato.cpp | 1 + src/d/actor/d_a_obj_kabuto.cpp | 1 + src/d/actor/d_a_obj_kag.cpp | 1 + src/d/actor/d_a_obj_kago.cpp | 1 + src/d/actor/d_a_obj_kaisou.cpp | 1 + src/d/actor/d_a_obj_kamakiri.cpp | 1 + src/d/actor/d_a_obj_katatsumuri.cpp | 1 + src/d/actor/d_a_obj_kbacket.cpp | 1 + src/d/actor/d_a_obj_key.cpp | 1 + src/d/actor/d_a_obj_kkanban.cpp | 1 + src/d/actor/d_a_obj_kuwagata.cpp | 1 + src/d/actor/d_a_obj_life_container.cpp | 1 + src/d/actor/d_a_obj_lp.cpp | 1 + src/d/actor/d_a_obj_lv6bemos2.cpp | 1 + src/d/actor/d_a_obj_maki.cpp | 1 + src/d/actor/d_a_obj_mirror_table.cpp | 1 + src/d/actor/d_a_obj_nan.cpp | 1 + src/d/actor/d_a_obj_octhashi.cpp | 1 + src/d/actor/d_a_obj_picture.cpp | 1 + src/d/actor/d_a_obj_pillar.cpp | 1 + src/d/actor/d_a_obj_pumpkin.cpp | 1 + src/d/actor/d_a_obj_rope_bridge.cpp | 1 + src/d/actor/d_a_obj_scannon.cpp | 1 + src/d/actor/d_a_obj_scannon_crs.cpp | 1 + src/d/actor/d_a_obj_scannon_ten.cpp | 1 + src/d/actor/d_a_obj_sekizoa.cpp | 1 + src/d/actor/d_a_obj_smallkey.cpp | 1 + src/d/actor/d_a_obj_snow_soup.cpp | 1 + src/d/actor/d_a_obj_so.cpp | 1 + src/d/actor/d_a_obj_swLight.cpp | 1 + src/d/actor/d_a_obj_swhang.cpp | 1 + src/d/actor/d_a_obj_swpropeller.cpp | 1 + src/d/actor/d_a_obj_swpush.cpp | 1 + src/d/actor/d_a_obj_ten.cpp | 1 + src/d/actor/d_a_obj_toby.cpp | 1 + src/d/actor/d_a_obj_tobyhouse.cpp | 1 + src/d/actor/d_a_obj_tombo.cpp | 1 + src/d/actor/d_a_obj_volcbom.cpp | 1 + src/d/actor/d_a_obj_warp_kbrg.cpp | 1 + src/d/actor/d_a_obj_warp_obrg.cpp | 1 + src/d/actor/d_a_obj_ystone.cpp | 1 + src/d/actor/d_a_shop_item.cpp | 1 + src/d/actor/d_a_swhit0.cpp | 1 + src/d/actor/d_a_tag_Lv8Gate.cpp | 1 + src/d/actor/d_a_tag_allmato.cpp | 1 + src/d/actor/d_a_tag_evt.cpp | 1 + src/d/actor/d_a_tag_lantern.cpp | 1 + src/d/actor/d_a_tag_mhint.cpp | 1 + src/d/actor/d_a_tag_msg.cpp | 1 + src/d/actor/d_a_tag_shop_item.cpp | 1 + src/d/actor/d_a_tag_smk_emt.cpp | 1 + src/d/actor/d_a_tag_sppath.cpp | 1 + src/d/actor/d_a_tbox.cpp | 1 + src/d/actor/d_a_tbox2.cpp | 1 + src/d/actor/d_a_vrbox2.cpp | 1 + src/d/actor/d_a_ykgr.cpp | 1 + src/d/actor/d_grass.inc | 1 + src/d/d_attention.cpp | 1 + src/d/d_bg_parts.cpp | 1 + src/d/d_cam_param.cpp | 1 + src/d/d_camera.cpp | 1 + src/d/d_com_inf_game.cpp | 1 + src/d/d_com_static.cpp | 1 + src/d/d_debug_camera.cpp | 1 + src/d/d_demo.cpp | 1 + src/d/d_ev_camera.cpp | 1 + src/d/d_event.cpp | 1 + src/d/d_event_data.cpp | 1 + src/d/d_eye_hl.cpp | 1 + src/d/d_file_sel_info.cpp | 1 + src/d/d_file_select.cpp | 1 + src/d/d_gameover.cpp | 1 + src/d/d_item.cpp | 1 + src/d/d_jnt_col.cpp | 1 + src/d/d_kankyo.cpp | 1 + src/d/d_kankyo_debug.cpp | 1 + src/d/d_kankyo_rain.cpp | 1 + src/d/d_ky_thunder.cpp | 1 + src/d/d_kyeff.cpp | 1 + src/d/d_map.cpp | 1 + src/d/d_map_path.cpp | 1 + src/d/d_map_path_fmap.cpp | 1 + src/d/d_menu_calibration.cpp | 1 + src/d/d_menu_collect.cpp | 1 + src/d/d_menu_dmap.cpp | 1 + src/d/d_menu_fishing.cpp | 1 + src/d/d_menu_fmap.cpp | 1 + src/d/d_menu_fmap2D.cpp | 1 + src/d/d_menu_fmap_map.cpp | 1 + src/d/d_menu_insect.cpp | 1 + src/d/d_menu_item_explain.cpp | 1 + src/d/d_menu_letter.cpp | 1 + src/d/d_menu_save.cpp | 1 + src/d/d_menu_skill.cpp | 1 + src/d/d_meter2.cpp | 1 + src/d/d_meter2_info.cpp | 1 + src/d/d_meter_HIO.cpp | 1 + src/d/d_meter_button.cpp | 1 + src/d/d_meter_hakusha.cpp | 1 + src/d/d_meter_map.cpp | 1 + src/d/d_meter_string.cpp | 1 + src/d/d_msg_class.cpp | 1 + src/d/d_msg_flow.cpp | 1 + src/d/d_msg_object.cpp | 1 + src/d/d_msg_scrn_explain.cpp | 1 + src/d/d_msg_scrn_item.cpp | 1 + src/d/d_msg_scrn_jimaku.cpp | 1 + src/d/d_msg_scrn_talk.cpp | 1 + src/d/d_msg_string_base.cpp | 1 + src/d/d_msg_unit.cpp | 1 + src/d/d_name.cpp | 1 + src/d/d_resorce.cpp | 1 + src/d/d_s_logo.cpp | 1 + src/d/d_s_menu.cpp | 1 + src/d/d_s_play.cpp | 1 + src/d/d_s_room.cpp | 1 + src/d/d_save.cpp | 1 + src/d/d_select_cursor.cpp | 1 + src/d/d_shop_system.cpp | 1 + src/d/d_stage.cpp | 1 + src/d/d_timer.cpp | 1 + src/f_ap/f_ap_game.cpp | 1 + src/m_Do/m_Do_MemCard.cpp | 1 + src/m_Do/m_Do_MemCardRWmng.cpp | 1 + src/m_Do/m_Do_ext.cpp | 1 + src/m_Do/m_Do_ext2.cpp | 1 + src/m_Do/m_Do_graphic.cpp | 1 + 347 files changed, 402 insertions(+), 73 deletions(-) diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h index bed19cd6933..6c5f371b1d9 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h +++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h @@ -84,7 +84,7 @@ struct J3DDisplayListInit { }; // size 8 struct J3DTexCoord2Info; -struct J3DCurrentMtxInfo; +class J3DCurrentMtxInfo; /** * @ingroup jsystem-j3d diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h index af166e1b130..e59d1589597 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h +++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h @@ -7,7 +7,7 @@ class J3DMaterial; struct J3DTexCoord2Info; -struct J3DCurrentMtxInfo; +class J3DCurrentMtxInfo; /** * @ingroup jsystem-j3d diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/include/JSystem/J3DGraphLoader/J3DModelLoader.h index a06260f3dc8..e2569cee19c 100644 --- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DModelLoader.h @@ -6,7 +6,7 @@ class J3DModelData; class J3DMaterialTable; -class J3DModelHierarchy; +struct J3DModelHierarchy; /** * @ingroup jsystem-j3d diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h index 96e6d96d9a4..5e414ade24c 100644 --- a/include/JSystem/JAudio2/JAISound.h +++ b/include/JSystem/JAudio2/JAISound.h @@ -68,7 +68,7 @@ class JAISoundID { } id_; }; -class JASTrack; +struct JASTrack; /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASChannel.h b/include/JSystem/JAudio2/JASChannel.h index 5b4a959372b..8c80268d461 100644 --- a/include/JSystem/JAudio2/JASChannel.h +++ b/include/JSystem/JAudio2/JASChannel.h @@ -8,7 +8,7 @@ #include "JSystem/JAudio2/JASWaveInfo.h" #include -class JASDSPChannel; +struct JASDSPChannel; namespace JASDsp { struct TChannel; diff --git a/include/JSystem/JAudio2/JASCmdStack.h b/include/JSystem/JAudio2/JASCmdStack.h index c35a1146cb7..2ad327362b9 100644 --- a/include/JSystem/JAudio2/JASCmdStack.h +++ b/include/JSystem/JAudio2/JASCmdStack.h @@ -3,7 +3,7 @@ #include "JSystem/JSupport/JSUList.h" -class JASTrack; +struct JASTrack; /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASSeqCtrl.h b/include/JSystem/JAudio2/JASSeqCtrl.h index 974f1c7065d..d481192d6f8 100644 --- a/include/JSystem/JAudio2/JASSeqCtrl.h +++ b/include/JSystem/JAudio2/JASSeqCtrl.h @@ -3,7 +3,7 @@ #include "JSystem/JAudio2/JASSeqReader.h" -class JASTrack; +struct JASTrack; class JASSeqParser; /** diff --git a/include/JSystem/JAudio2/JASWSParser.h b/include/JSystem/JAudio2/JASWSParser.h index 000aee00695..1dc68674cfc 100644 --- a/include/JSystem/JAudio2/JASWSParser.h +++ b/include/JSystem/JAudio2/JASWSParser.h @@ -5,8 +5,8 @@ class JKRHeap; class JASWaveBank; -class JASBasicWaveBank; -class JASSimpleWaveBank; +struct JASBasicWaveBank; +struct JASSimpleWaveBank; /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JGadget/search.h b/include/JSystem/JGadget/search.h index bbc5c9ce6c2..12507f3dc73 100644 --- a/include/JSystem/JGadget/search.h +++ b/include/JSystem/JGadget/search.h @@ -5,6 +5,7 @@ #include #include #include +#include namespace JGadget { namespace search { diff --git a/include/JSystem/JGadget/std-streambuf.h b/include/JSystem/JGadget/std-streambuf.h index d6bf291415a..dae56d317c8 100644 --- a/include/JSystem/JGadget/std-streambuf.h +++ b/include/JSystem/JGadget/std-streambuf.h @@ -2,7 +2,7 @@ #define JGADGET_STD_STREAMBUF_H #include -#include +#include namespace JGadget { template diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index 696d2f60a49..d0e7c8c03e2 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -7,8 +7,10 @@ #ifndef __MWERKS__ #include +#if !defined(FLT_EPSILON) #define FLT_EPSILON std::numeric_limits::epsilon() #endif +#endif namespace JGeometry { diff --git a/include/SSystem/SComponent/c_m2d.h b/include/SSystem/SComponent/c_m2d.h index f6fe537a76a..482dcab0e39 100644 --- a/include/SSystem/SComponent/c_m2d.h +++ b/include/SSystem/SComponent/c_m2d.h @@ -2,7 +2,7 @@ #define C_M2D_H -struct cM2dGCir; +class cM2dGCir; void cM2d_CrossCirLin(cM2dGCir&, float, float, float, float, float*, float*); diff --git a/include/d/actor/d_a_e_ga.h b/include/d/actor/d_a_e_ga.h index 1b357771c61..e690a68fc82 100644 --- a/include/d/actor/d_a_e_ga.h +++ b/include/d/actor/d_a_e_ga.h @@ -34,7 +34,7 @@ class e_ga_class { /* 0x0570 */ u8 prm0; /* 0x0571 */ u8 prm1; /* 0x0572 */ u8 prm2; - /* 0x0574 */ ga_s ga_s[256]; + /* 0x0574 */ struct ga_s ga_s[256]; /* 0x4D74 */ int ga_num; /* 0x4D78 */ u8 HIOInit; /* 0x4D79 */ u8 initialized; diff --git a/include/d/actor/d_a_e_pm.h b/include/d/actor/d_a_e_pm.h index 9077a4d56d9..edec93c6a25 100644 --- a/include/d/actor/d_a_e_pm.h +++ b/include/d/actor/d_a_e_pm.h @@ -9,7 +9,7 @@ #include "d/d_cc_uty.h" #include "d/d_msg_flow.h" -class dPath; +struct dPath; /** * @ingroup actors-enemies diff --git a/include/d/actor/d_a_npc.h b/include/d/actor/d_a_npc.h index 205a2420501..ea081165be4 100644 --- a/include/d/actor/d_a_npc.h +++ b/include/d/actor/d_a_npc.h @@ -10,6 +10,7 @@ #include "d/d_msg_flow.h" #include "d/d_particle_copoly.h" #include "global.h" +#include struct daNpc_GetParam1 { // name unknown /* 0x0 */ int fileIdx; diff --git a/include/d/actor/d_a_npc_bou.h b/include/d/actor/d_a_npc_bou.h index 9a1b460ae4b..583c90ff3ea 100644 --- a/include/d/actor/d_a_npc_bou.h +++ b/include/d/actor/d_a_npc_bou.h @@ -2,6 +2,7 @@ #define D_A_NPC_BOU_H #include "d/actor/d_a_npc.h" +#include struct daNpc_Bou_HIOParam { /* 0x00 */ daNpcT_HIOParam common; diff --git a/include/d/actor/d_a_npc_cdn3.h b/include/d/actor/d_a_npc_cdn3.h index 890f362862c..6a2e9d7b553 100644 --- a/include/d/actor/d_a_npc_cdn3.h +++ b/include/d/actor/d_a_npc_cdn3.h @@ -4,6 +4,7 @@ #include "d/actor/d_a_npc.h" #include "d/actor/d_a_npc_cd2.h" #include "d/actor/d_a_tag_schedule.h" +#include /** * @ingroup actors-npcs diff --git a/include/d/actor/d_a_npc_kn.h b/include/d/actor/d_a_npc_kn.h index fe30a4769f1..a14a89aefe9 100644 --- a/include/d/actor/d_a_npc_kn.h +++ b/include/d/actor/d_a_npc_kn.h @@ -2,6 +2,7 @@ #define D_A_NPC_KN_H #include "d/actor/d_a_npc.h" +#include struct daNpc_Kn_HIOParam { /* 0x00 */ daNpcT_HIOParam common; diff --git a/include/d/actor/d_a_npc_kolin.h b/include/d/actor/d_a_npc_kolin.h index 314a29541b1..b6fded937b3 100644 --- a/include/d/actor/d_a_npc_kolin.h +++ b/include/d/actor/d_a_npc_kolin.h @@ -2,6 +2,7 @@ #define D_A_NPC_KOLIN_H #include "d/actor/d_a_npc.h" +#include struct daNpc_Kolin_HIOParam { /* 0x00 */ daNpcT_HIOParam common; diff --git a/include/d/actor/d_a_npc_the.h b/include/d/actor/d_a_npc_the.h index 6e9a24d42b2..bc78a939255 100644 --- a/include/d/actor/d_a_npc_the.h +++ b/include/d/actor/d_a_npc_the.h @@ -2,6 +2,7 @@ #define D_A_NPC_THE_H #include "d/actor/d_a_npc4.h" +#include struct daNpcThe_HIOParam { /* 0x00 */ daNpcF_HIOParam common; diff --git a/include/d/actor/d_a_obj_cblock.h b/include/d/actor/d_a_obj_cblock.h index 1a7119a9aaa..04881776ece 100644 --- a/include/d/actor/d_a_obj_cblock.h +++ b/include/d/actor/d_a_obj_cblock.h @@ -5,7 +5,7 @@ #include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" -class dPath; +struct dPath; /** * @ingroup actors-objects diff --git a/include/d/actor/d_a_passer_mng.h b/include/d/actor/d_a_passer_mng.h index f0ee36903fe..aa2a55c00f6 100644 --- a/include/d/actor/d_a_passer_mng.h +++ b/include/d/actor/d_a_passer_mng.h @@ -5,7 +5,7 @@ #include "d/d_kankyo.h" #include "f_op/f_op_actor_mng.h" -class dPath; +struct dPath; /** * @ingroup actors-unsorted diff --git a/include/d/d_bg_s_cap_poly.h b/include/d/d_bg_s_cap_poly.h index 0cda04c7390..ca4a38542c1 100644 --- a/include/d/d_bg_s_cap_poly.h +++ b/include/d/d_bg_s_cap_poly.h @@ -4,7 +4,7 @@ #include "d/d_bg_s_chk.h" #include "SSystem/SComponent/c_m3d_g_aab.h" -struct dBgS_CaptPoly; +class dBgS_CaptPoly; typedef void (*CaptPolyCallback)(dBgS_CaptPoly&, cBgD_Vtx_t*, u16, u16, u16, cM3dGPla*); diff --git a/include/d/d_bg_w.h b/include/d/d_bg_w.h index fa4ba70105e..f7f38688f7f 100644 --- a/include/d/d_bg_w.h +++ b/include/d/d_bg_w.h @@ -11,7 +11,7 @@ class cBgS_GrpPassChk; class cBgS_PolyPassChk; class fopAc_ac_c; struct cBgD_Vtx_t; -struct dBgS_CaptPoly; +class dBgS_CaptPoly; class cBgW_TriElm { public: diff --git a/include/d/d_bg_w_base.h b/include/d/d_bg_w_base.h index 0a05467820b..089af244b87 100644 --- a/include/d/d_bg_w_base.h +++ b/include/d/d_bg_w_base.h @@ -11,7 +11,7 @@ class cBgS_GndChk; class cBgS_LinChk; class cBgS_ShdwDraw; class dBgS_Acch; -struct dBgS_CaptPoly; +class dBgS_CaptPoly; class dBgS_RoofChk; class dBgS_SphChk; class dBgS_SplGrpChk; diff --git a/include/d/d_bg_w_kcol.h b/include/d/d_bg_w_kcol.h index 36e2f9d970b..7bb96ccbd4d 100644 --- a/include/d/d_bg_w_kcol.h +++ b/include/d/d_bg_w_kcol.h @@ -9,8 +9,8 @@ class cBgS_GrpPassChk; class cBgS_PolyPassChk; -struct dBgPc; -struct dBgS_CaptPoly; +class dBgPc; +class dBgS_CaptPoly; struct KC_PrismData { /* 0x0 */ f32 height; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 25f48c5fd63..c4278cb3cb5 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -15,6 +15,7 @@ #include "global.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include enum dComIfG_ButtonStatus { /* 0x00 */ BUTTON_STATUS_NONE, diff --git a/include/d/d_debug_camera.h b/include/d/d_debug_camera.h index d5cd7403ac6..2292f468593 100644 --- a/include/d/d_debug_camera.h +++ b/include/d/d_debug_camera.h @@ -3,6 +3,7 @@ #include "d/d_camera.h" #include "JSystem/JHostIO/JORFile.h" +#include enum dDbgCam_KeyAction { /* | */ dDbgCam_KeyAction_FIXEDFRM, diff --git a/include/d/d_map.h b/include/d/d_map.h index bbd21787ca9..5718e331b23 100644 --- a/include/d/d_map.h +++ b/include/d/d_map.h @@ -3,6 +3,7 @@ #include "d/d_map_path_dmap.h" #include "JSystem/JHostIO/JORReflexible.h" +#include struct dMap_HIO_prm_other_s { /* 0x00 */ u8 field_0x0; diff --git a/include/d/d_menu_fmap_map.h b/include/d/d_menu_fmap_map.h index b5b6f7e8d18..b77e43ba702 100644 --- a/include/d/d_menu_fmap_map.h +++ b/include/d/d_menu_fmap_map.h @@ -3,6 +3,7 @@ #include "SSystem/SComponent/c_counter.h" #include +#include #include "d/d_menu_fmap.h" #include "d/d_map.h" #include "d/d_map_path.h" diff --git a/include/d/d_msg_object.h b/include/d/d_msg_object.h index ef7135f09d6..2ef3f0ad69b 100644 --- a/include/d/d_msg_object.h +++ b/include/d/d_msg_object.h @@ -4,6 +4,7 @@ #include "JSystem/JMessage/control.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_msg.h" +#include class COutFont_c; class J2DTextBox; diff --git a/include/d/d_name.h b/include/d/d_name.h index 16ff3414f64..0d877e6b09a 100644 --- a/include/d/d_name.h +++ b/include/d/d_name.h @@ -2,6 +2,7 @@ #define D_D_NAME_H #include "d/d_select_cursor.h" +#include class CPaneMgr; class CPaneMgrAlpha; diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h index 4542ff4ab93..fa4eb8b1aff 100644 --- a/include/m_Do/m_Do_hostIO.h +++ b/include/m_Do/m_Do_hostIO.h @@ -2,7 +2,7 @@ #define M_DO_M_DO_HOSTIO_H #include "JSystem/JHostIO/JORReflexible.h" -#include +#include class mDoHIO_child_c { public: diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp index b6c8876aee7..1dbaf1c6815 100644 --- a/src/JSystem/J2DGraph/J2DPrint.cpp +++ b/src/JSystem/J2DGraph/J2DPrint.cpp @@ -5,6 +5,7 @@ #include "JSystem/JUtility/JUTFont.h" #include #include +#include char* J2DPrint::mStrBuff; diff --git a/src/JSystem/J2DGraph/J2DTextBox.cpp b/src/JSystem/J2DGraph/J2DTextBox.cpp index d82fd375868..8f8a1681049 100644 --- a/src/JSystem/J2DGraph/J2DTextBox.cpp +++ b/src/JSystem/J2DGraph/J2DTextBox.cpp @@ -5,6 +5,7 @@ #include "JSystem/JSupport/JSURandomInputStream.h" #include "JSystem/JUtility/JUTResFont.h" #include "JSystem/JUtility/JUTResource.h" +#include J2DTextBox::J2DTextBox() : mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() { diff --git a/src/JSystem/JAHostIO/JAHioNode.cpp b/src/JSystem/JAHostIO/JAHioNode.cpp index abca30fb395..5eef2f7e923 100644 --- a/src/JSystem/JAHostIO/JAHioNode.cpp +++ b/src/JSystem/JAHostIO/JAHioNode.cpp @@ -4,6 +4,7 @@ #include "JSystem/JAHostIO/JAHioMessage.h" #include "JSystem/JAHostIO/JAHioMgr.h" #include "JSystem/JHostIO/JORServer.h" +#include JAHioNode::JAHioNode(const char* name) : mTree(this) { mLastChild = NULL; diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/src/JSystem/JAudio2/JAUSectionHeap.cpp index ad2b5beb956..8a9bbf8277a 100644 --- a/src/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/src/JSystem/JAudio2/JAUSectionHeap.cpp @@ -15,6 +15,7 @@ #include "JSystem/JAudio2/JAUStreamFileTable.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include +#include namespace { class TPushCurrentHeap { diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp index 3dac794756a..e58f619871e 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/src/JSystem/JUtility/JUTCacheFont.cpp @@ -7,6 +7,7 @@ #include "JSystem/JKernel/JKRAram.h" #include #include +#include #include "angle_utils.h" JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_heap) { diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp index 11d901b260e..c037db9b2cc 100644 --- a/src/JSystem/JUtility/JUTDbPrint.cpp +++ b/src/JSystem/JUtility/JUTDbPrint.cpp @@ -5,6 +5,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" #include +#include JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) { mFont = pFont; diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp index 01e91964fae..13c370797c1 100644 --- a/src/JSystem/JUtility/JUTException.cpp +++ b/src/JSystem/JUtility/JUTException.cpp @@ -9,6 +9,7 @@ #include #include #include +#include struct CallbackObject { /* 0x00 */ JUTExceptionUserCallback callback; diff --git a/src/Z2AudioCS/SpkSpeakerCtrl.cpp b/src/Z2AudioCS/SpkSpeakerCtrl.cpp index 112dfd3a2f2..5e29cea3dfc 100644 --- a/src/Z2AudioCS/SpkSpeakerCtrl.cpp +++ b/src/Z2AudioCS/SpkSpeakerCtrl.cpp @@ -5,6 +5,7 @@ #include "JSystem/JAudio2/JASCriticalSection.h" #include #include +#include OSAlarm sSpeakerAlarm; SpeakerInfo sSpeakerInfo[WPAD_MAX_CONTROLLERS]; diff --git a/src/Z2AudioLib/Z2AudioArcLoader.cpp b/src/Z2AudioLib/Z2AudioArcLoader.cpp index 93343014c57..1b4ab57e910 100644 --- a/src/Z2AudioLib/Z2AudioArcLoader.cpp +++ b/src/Z2AudioLib/Z2AudioArcLoader.cpp @@ -5,6 +5,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "Z2AudioLib/Z2FxLineMgr.h" #include "m_Do/m_Do_ext.h" +#include Z2AudioArcLoader::Z2AudioArcLoader(JAUSection* section) : JAUAudioArcLoader(section) {} diff --git a/src/Z2AudioLib/Z2SceneMgr.cpp b/src/Z2AudioLib/Z2SceneMgr.cpp index 3aa7e99950c..9e3bf2c91c6 100644 --- a/src/Z2AudioLib/Z2SceneMgr.cpp +++ b/src/Z2AudioLib/Z2SceneMgr.cpp @@ -11,6 +11,7 @@ #include "Z2AudioLib/Z2SoundObjMgr.h" #include "Z2AudioLib/Z2StatusMgr.h" #include "d/d_com_inf_game.h" +#include Z2SceneMgr::Z2SceneMgr() : JASGlobalInstance(true) { sceneNum = -1; diff --git a/src/Z2AudioLib/Z2SoundObjMgr.cpp b/src/Z2AudioLib/Z2SoundObjMgr.cpp index a1d87e6633c..6b080134fb2 100644 --- a/src/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/src/Z2AudioLib/Z2SoundObjMgr.cpp @@ -4,6 +4,7 @@ #include "Z2AudioLib/Z2Calc.h" #include "Z2AudioLib/Z2SceneMgr.h" #include "Z2AudioLib/Z2LinkMgr.h" +#include Z2SoundObjMgr::Z2SoundObjMgr() : JASGlobalInstance(true) { ghostEnemyState_ = 0; diff --git a/src/Z2AudioLib/Z2StatusMgr.cpp b/src/Z2AudioLib/Z2StatusMgr.cpp index c86b86eee32..fd907b48c8f 100644 --- a/src/Z2AudioLib/Z2StatusMgr.cpp +++ b/src/Z2AudioLib/Z2StatusMgr.cpp @@ -2,6 +2,7 @@ #include "Z2AudioLib/Z2Param.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +#include static const char* sSpotName[] = { "F_SP00", diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index 27113d7a2a2..f175c04b54a 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -9,6 +9,7 @@ #include "JSystem/JKernel/JKRSolidHeap.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" +#include #if DEBUG #include "f_pc/f_pc_debug_sv.h" diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index e6f8548beff..8977c2c0769 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -52,6 +52,7 @@ #include "d/d_s_play.h" #include "res/Object/Alink.h" +#include static int daAlink_Create(fopAc_ac_c* i_this); static int daAlink_Delete(daAlink_c* i_this); diff --git a/src/d/actor/d_a_alink_HIO.inc b/src/d/actor/d_a_alink_HIO.inc index b7b24593de0..a2692ae4adc 100644 --- a/src/d/actor/d_a_alink_HIO.inc +++ b/src/d/actor/d_a_alink_HIO.inc @@ -6,6 +6,7 @@ #include "JSystem/JHostIO/JORFile.h" #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" +#include #if DEBUG diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc index c601c35695a..6ef8241974d 100644 --- a/src/d/actor/d_a_alink_demo.inc +++ b/src/d/actor/d_a_alink_demo.inc @@ -21,6 +21,7 @@ #include "d/actor/d_a_npc_zra.h" #include "d/actor/d_a_obj_tks.h" #include "d/actor/d_a_npc_tkc.h" +#include BOOL daAlink_c::checkEventRun() const { return dComIfGp_event_runCheck() || checkPlayerDemoMode(); diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index 90a24c0150f..dc37eae4e83 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -12,6 +12,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include class daB_GG_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 608cbf63368..82e0f3d8443 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_b_tn.h" #include +#include #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_nbomb.h" diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index 61f7610b591..c837457a8d9 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -23,6 +23,7 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" +#include class daB_YO_HIO_c { public: diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp index 4584d696ff0..d7df1327edf 100644 --- a/src/d/actor/d_a_balloon_2D.cpp +++ b/src/d/actor/d_a_balloon_2D.cpp @@ -18,6 +18,7 @@ #include "d/d_pane_class.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" +#include class daBalloon2D_HIO_c : public mDoHIO_entry_c { public: diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index f006f90dbe3..76ecb886072 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -13,6 +13,7 @@ #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 39f7e079902..825ace2314f 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -16,6 +16,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" +#include const char* daBg_c::setArcName() { static char arcName[32]; diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index bf131498f51..599a69d4524 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -9,6 +9,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include #include +#include #include "d/actor/d_a_set_bgobj.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index c5650cc69e4..7a0e4706e62 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -14,6 +14,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "JSystem/JAudio2/JAUSectionHeap.h" #include "Z2AudioLib/Z2Instances.h" +#include #if DEBUG static BOOL l_debugMode; diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index fd21f2dac03..660d279218d 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -12,6 +12,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" +#include class daCoach2D_HIO_c : public mDoHIO_entry_c { public: diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index d4d7bff17bb..8244ee8446c 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -16,6 +16,7 @@ #include "d/d_meter2_info.h" #include "d/d_timer.h" #include +#include #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_ext.h" diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index 833a9f58927..f680728f54d 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_alink.h" #include "d/actor/d_a_crod.h" #include "d/d_bg_w.h" +#include enum daCstaF_Action { ACTION_WAIT, diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index c9eda759178..f4b3b1de5ce 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -20,6 +20,7 @@ #include "d/actor/d_a_movie_player.h" #if DEBUG #include "d/d_debug_viewer.h" +#include #endif struct UnknownLightData { diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index aaac0e030b6..0c69f34b52b 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_player.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "Z2AudioLib/Z2Instances.h" +#include static cXyz l_player_offset = cXyz(0.0f, 115.0f, 54.0f); diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index f8632be6c9c..6a6dee60675 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -15,6 +15,7 @@ #include "d/d_a_item_static.h" #include "m_Do/m_Do_controller_pad.h" #include "Z2AudioLib/Z2Instances.h" +#include static bool noFallCheck; static bool hio_set; diff --git a/src/d/actor/d_a_door_bossL1.cpp b/src/d/actor/d_a_door_bossL1.cpp index 83e9454a61a..8a5fd0c752b 100644 --- a/src/d/actor/d_a_door_bossL1.cpp +++ b/src/d/actor/d_a_door_bossL1.cpp @@ -13,6 +13,7 @@ #include "d/d_meter2_info.h" #include "SSystem/SComponent/c_math.h" #include "f_op/f_op_actor_mng.h" +#include static char* l_stageName[20] = { "D_MN05", diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index 05958a9b457..68872b4bbe9 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -12,6 +12,7 @@ #include "d/d_meter2_info.h" #include "SSystem/SComponent/c_math.h" #include +#include u32 knob_param_c::getDoorModel(fopAc_ac_c* i_this) { return fopAcM_GetParamBit(i_this, 5, 3); diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 4689faed0ab..60bde824e62 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -15,6 +15,7 @@ #include "d/d_map_path_dmap.h" #include "SSystem/SComponent/c_math.h" #include +#include char* daDoor20_c::getStopBmdName() { switch (door_param2_c::getKind(this)) { diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index c93217979a8..8be64c55a87 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_obj_fw.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_actor_enemy.h" +#include class daE_BI_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_bug.cpp b/src/d/actor/d_a_e_bug.cpp index c58787169d8..ec098f20b4b 100644 --- a/src/d/actor/d_a_e_bug.cpp +++ b/src/d/actor/d_a_e_bug.cpp @@ -10,6 +10,7 @@ #include "d/d_path.h" #include "d/actor/d_a_nbomb.h" #include "Z2AudioLib/Z2Instances.h" +#include enum E_bug_RES_File_ID { /* BMDG */ diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp index a4c76df7cc2..728f9787e55 100644 --- a/src/d/actor/d_a_e_dn.cpp +++ b/src/d/actor/d_a_e_dn.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_horse.h" #include "f_op/f_op_actor_enemy.h" #include "Z2AudioLib/Z2Instances.h" +#include class daE_DN_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index 7e57585d0ec..2014c21ebc4 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -16,6 +16,7 @@ #include "d/d_s_play.h" #include "f_op/f_op_actor_enemy.h" #include "Z2AudioLib/Z2Instances.h" +#include class daE_Fs_HIO_c { public: diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index 747ac44ec9b..47215b96909 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_obj_smallkey.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include enum Head_Action { /* 0x0 */ HEAD_ACTION_WAIT, diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index f51abeba265..49d563fec3f 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_alink.h" #include "d/d_debug_viewer.h" #include "f_op/f_op_actor_enemy.h" +#include class daE_HP_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp index 42ad76cfd72..8477c6d3513 100644 --- a/src/d/actor/d_a_e_mf.cpp +++ b/src/d/actor/d_a_e_mf.cpp @@ -13,6 +13,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "d/actor/d_a_horse.h" #include "d/d_com_inf_game.h" +#include class daE_MF_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index fef3a866755..a5a3bf869c4 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -19,6 +19,7 @@ #include "d/d_camera.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include class daE_MK_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index a70515fe132..61690490abc 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -11,6 +11,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "d/d_s_play.h" #include "f_op/f_op_actor_enemy.h" +#include class daE_MS_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 2b5a540bbef..37d3ad8d957 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -14,6 +14,7 @@ #include "d/d_bomb.h" #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" +#include static bool hio_set; diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index 248d48c1972..b1f7d965f47 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -14,6 +14,7 @@ #include "d/d_cc_uty.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include enum OC_ACTIONS { diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index e2d853a1a80..3d766b8e3e8 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" +#include #define PH_BMD 20 diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 8b500de1b89..9a13c7e1825 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -12,6 +12,7 @@ #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include static s16 mAttackNo = 3; diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index 92a2d12f15e..585cdcb63f5 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -24,6 +24,7 @@ #include "d/actor/d_a_npc_tk.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_actor_enemy.h" +#include class daE_RD_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index f5c533fcb7e..f1d8fb180b3 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -14,6 +14,7 @@ #include "m_Do/m_Do_graphic.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include class daE_RDB_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index 5ed41b451bc..05971e055f1 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -19,6 +19,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_actor_enemy.h" #include "m_Do/m_Do_graphic.h" +#include class daE_RDY_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index 352cdb985f6..f91adc3e2e8 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -14,6 +14,7 @@ #include "d/d_s_play.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include class daE_S1_HIO_c { public: diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index 55414997c4c..22e73cfb0b9 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -11,6 +11,7 @@ #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include enum E_sf_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index b04d99b964b..51e7972f245 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_arrow.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_camera_mng.h" +#include enum E_SM_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index 066a8243e24..e1bd691a5d5 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -12,6 +12,7 @@ #include "SSystem/SComponent/c_counter.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include class daE_SM2_HIO_c : public fOpAcm_HIO_entry_c { public: diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index e5b148b07ae..8a7392d32ce 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -9,6 +9,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "f_op/f_op_actor_enemy.h" #include "Z2AudioLib/Z2Instances.h" +#include enum E_st_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index 820b084ca72..ca93e3a89de 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_horse.h" #include "d/actor/d_a_obj_ihasi.h" #include "f_op/f_op_camera_mng.h" +#include static int daE_Warpappear_Draw(e_warpappear_class* i_this) { int sw = (fopAcM_GetParam(i_this) >> 8) & 0xFF; diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index 905bd9df396..70a9b87e56b 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -18,6 +18,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "res/Object/Always.h" +#include class daE_WB_HIO_c : public JORReflexible { diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index 3e6730e94f9..4385f5e916c 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -11,6 +11,7 @@ #include "d/d_cc_uty.h" #include "f_op/f_op_actor_enemy.h" #include "Z2AudioLib/Z2Instances.h" +#include enum E_ww_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index 15c0179abf0..1bcc56551d5 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -14,6 +14,7 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" +#include class daE_YM_HIO_c: public JORReflexible { public: diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 4cae4a1adc2..099d07ce37e 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -13,6 +13,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/d_debug_viewer.h" #include "f_op/f_op_camera_mng.h" +#include enum E_ZH_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp index 47c90ee0a7f..4daceb2679a 100644 --- a/src/d/actor/d_a_fr.cpp +++ b/src/d/actor/d_a_fr.cpp @@ -14,6 +14,7 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "f_op/f_op_kankyo_mng.h" +#include class daFr_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 84e51945e62..433a9030b1c 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -18,6 +18,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "JSystem/JAudio2/JAUSectionHeap.h" #include +#include #define ANM_HS_BACK_WALK 6 #define ANM_HS_WALK_START 7 diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 654c2d8a222..6eb85ad6f75 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -11,6 +11,7 @@ #include "d/d_msg_object.h" #include +#include #include "d/actor/d_a_balloon_2D.h" #include "d/actor/d_a_e_ym.h" diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 353bb396b5b..f1b6f691b42 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_npc4.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" +#include static int daKytag04_Draw(kytag04_class* i_this) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 7271bcf924f..b4e1b871313 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -12,6 +12,7 @@ #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include static void dice_wether_init(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) { dScnKy_env_light_c* env_light = dKy_getEnvlight(); diff --git a/src/d/actor/d_a_kytag12.cpp b/src/d/actor/d_a_kytag12.cpp index 04d8c94f392..b19ee7a35a9 100644 --- a/src/d/actor/d_a_kytag12.cpp +++ b/src/d/actor/d_a_kytag12.cpp @@ -11,6 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" #include "d/d_kankyo_wether.h" +#include static BOOL d_kytag12_cut_turn_check() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); diff --git a/src/d/actor/d_a_kytag13.cpp b/src/d/actor/d_a_kytag13.cpp index 7af7ae597dc..a320e1b8752 100644 --- a/src/d/actor/d_a_kytag13.cpp +++ b/src/d/actor/d_a_kytag13.cpp @@ -10,6 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" #include "f_op/f_op_camera_mng.h" +#include static int daKytag13_Draw(kytag13_class* i_this) { return 1; diff --git a/src/d/actor/d_a_kytag15.cpp b/src/d/actor/d_a_kytag15.cpp index dd5abd20a6c..4483f376b93 100644 --- a/src/d/actor/d_a_kytag15.cpp +++ b/src/d/actor/d_a_kytag15.cpp @@ -9,6 +9,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include static int daKytag15_Draw(kytag15_class* i_this) { cXyz scale; diff --git a/src/d/actor/d_a_kytag16.cpp b/src/d/actor/d_a_kytag16.cpp index 9e05cd57788..0216dc67b5b 100644 --- a/src/d/actor/d_a_kytag16.cpp +++ b/src/d/actor/d_a_kytag16.cpp @@ -10,6 +10,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include static int daKytag16_Draw(kytag16_class* i_this) { return 1; diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index 7a351d1b502..04ed18875ef 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -22,6 +22,7 @@ #include "d/d_s_play.h" #include "d/d_vibration.h" #include "f_op/f_op_kankyo_mng.h" +#include #define ANM_MG_FISH_MOUTH_CLOSE 4 #define ANM_MG_FISH_MOUTH_OPEN 5 diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index 92cca278227..c849337c1eb 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -23,6 +23,7 @@ #include "SSystem/SComponent/c_counter.h" #include "Z2AudioLib/Z2Instances.h" #include +#include class dmg_rod_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index f6b727f0cd0..94cdc99ce53 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -20,6 +20,7 @@ #include "d/actor/d_a_movie_player.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_overlap_mng.h" +#include inline s32 daMP_NEXT_READ_SIZE(daMP_THPReadBuffer* readBuf) { return *(s32*)readBuf->ptr; diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp index 6e28336fd29..73eaf967c64 100644 --- a/src/d/actor/d_a_myna.cpp +++ b/src/d/actor/d_a_myna.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_tag_myna_light.h" #include "Z2AudioLib/Z2Instances.h" #include "d/d_s_play.h" +#include static daMyna_c::ProcFunc init_proc[] = { &daMyna_c::attack_wait_init, diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 6e1f937010d..5090950574f 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -14,6 +14,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "d/actor/d_a_mirror.h" #include "JSystem/JAudio2/JAUSectionHeap.h" +#include void daNbomb_c::coHitCallback(fopAc_ac_c* i_hitActor) { if (fopAcM_GetGroup(i_hitActor) == fopAc_ENEMY_e || diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp index 5ded6087c41..9d31126b3e5 100644 --- a/src/d/actor/d_a_ni.cpp +++ b/src/d/actor/d_a_ni.cpp @@ -13,6 +13,7 @@ #include "c/c_damagereaction.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_camera_mng.h" +#include enum Joint { /* 0x0 */ JNT_WAIST, diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index c625bf0cb54..de72aae604a 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -12,6 +12,7 @@ #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_kankyo_mng.h" #include "m_Do/m_Do_lib.h" +#include #if DEBUG void daNpcT_cmnListenPropertyEvent(char* param_0, int* param_1, daNpcT_HIOParam* param_2) { diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index ef1bb9d3ff7..9dc918bc66a 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -17,6 +17,7 @@ #if DEBUG #include "JSystem/JHostIO/JORFile.h" #include "d/d_debug_viewer.h" +#include #endif enum Aru_RES_File_ID { diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp index 5f285ace080..0e3c0028ea0 100644 --- a/src/d/actor/d_a_npc_ash.cpp +++ b/src/d/actor/d_a_npc_ash.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" +#include const daNpcAsh_HIOParam daNpcAsh_Param_c::m = { 35.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 237c93aa587..6f2c60dc2c2 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_ashB.h" #include "d/actor/d_a_npc.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" +#include const daNpcAshB_HIOParam daNpcAshB_Param_c::m = { 205.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index 8bb1ec62609..98fec991305 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "d/actor/d_a_tag_kmsg.h" #include "d/actor/d_a_npc_len.h" +#include enum Bans_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index 366dcacb2ee..6a586c0eaec 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -13,6 +13,7 @@ #if DEBUG #include "JSystem/JHostIO/JORFile.h" #include "d/d_debug_viewer.h" +#include #endif enum Besu_RES_File_ID { diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp index fe6f44846ea..7bf2689db12 100644 --- a/src/d/actor/d_a_npc_bou.cpp +++ b/src/d/actor/d_a_npc_bou.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_npc_jagar.h" #include "d/actor/d_a_tag_push.h" #include "d/d_meter2_info.h" +#include static int l_bmdData[1][2] = { {11, 1}, diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index 2eb763f0424..6d807edacd5 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -12,6 +12,7 @@ #include "d/actor/d_a_npc_wrestler.h" #include "Z2AudioLib/Z2Instances.h" #include "d/d_camera.h" +#include enum Bou_RES_File_ID { /* BCK */ @@ -1360,22 +1361,22 @@ int daNpcBouS_c::EvCut_BousIntroSumo1(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': setLookMode(LOOK_PLAYER_TALK); mActorMngrs[0].entry(daPy_getPlayerActorClass()); break; - case '0x0002': - case '0x0003': - case '0x0005': - case '0x0006': - case '0x0007': - case '0x0008': - case '0x0009': + case '0002': + case '0003': + case '0005': + case '0006': + case '0007': + case '0008': + case '0009': initTalk(9, NULL); break; - case '0x0004': + case '0004': setExpressionAnm(ANM_FH_TALK_B, true); break; @@ -1396,17 +1397,17 @@ int daNpcBouS_c::EvCut_BousIntroSumo1(int i_staffId) { } switch (*cutName) { - case '0x0001': - case '0x0004': + case '0001': + case '0004': return 1; - case '0x0002': - case '0x0003': - case '0x0005': - case '0x0006': - case '0x0007': - case '0x0008': - case '0x0009': + case '0002': + case '0003': + case '0005': + case '0006': + case '0007': + case '0008': + case '0009': if (talkProc(NULL, TRUE, NULL)) { s32 choiceNo = mFlow.getChoiceNo(); OS_REPORT("二択分岐 %s\n", choiceNo == 0 ? "はい" : "いいえ"); @@ -1434,7 +1435,7 @@ int daNpcBouS_c::EvCut_BousIntroSumo2(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': initTalk(9, NULL); setLookMode(LOOK_PLAYER_TALK); mActorMngrs[0].entry(daPy_getPlayerActorClass()); @@ -1456,7 +1457,7 @@ int daNpcBouS_c::EvCut_BousIntroSumo2(int i_staffId) { } switch (*cutName) { - case '0x0001': + case '0001': if (mCurAngle.y == fopAcM_searchPlayerAngleY(this)) { if (talkProc(NULL, TRUE, NULL)) { int choiceNo = mFlow.getChoiceNo(); @@ -1489,15 +1490,15 @@ int daNpcBouS_c::EvCut_BousIntroSumo3(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': setLookMode(LOOK_PLAYER_TALK); mActorMngrs[0].entry(daPy_getPlayerActorClass()); break; - case '0x0003': + case '0003': setMotion(MOT_WALK, -1.0f, 0); // fallthrough - case '0x0002': + case '0002': setAngle(-0x2AAA); initTalk(9, NULL); break; @@ -1521,16 +1522,16 @@ int daNpcBouS_c::EvCut_BousIntroSumo3(int i_staffId) { } switch (*cutName) { - case '0x0001': + case '0001': return 1; - case '0x0002': + case '0002': if (talkProc(NULL, TRUE, NULL)) { return 1; } break; - case '0x0003': { + case '0003': { cXyz* pos = dComIfGp_evmng_getMyXyzP(i_staffId, "pos"); if (pos != NULL) { if (cLib_chaseAngleS(&shape_angle.y, cLib_targetAngleY(¤t.pos, pos), 0x100)) { diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp index 629f029a926..1c9cc3c89dd 100644 --- a/src/d/actor/d_a_npc_cd.cpp +++ b/src/d/actor/d_a_npc_cd.cpp @@ -2,6 +2,7 @@ #include "d/actor/d_a_npc_cd.h" #include "d/actor/d_a_player.h" +#include static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) { if (param_1 == 0) { diff --git a/src/d/actor/d_a_npc_cd2_HIO.inc b/src/d/actor/d_a_npc_cd2_HIO.inc index 463a6f2e649..f0677570d54 100644 --- a/src/d/actor/d_a_npc_cd2_HIO.inc +++ b/src/d/actor/d_a_npc_cd2_HIO.inc @@ -1,4 +1,5 @@ #include "d/actor/d_a_npc_cd2.h" +#include daNpcCd2_HIO_c::daNpcCd2_HIO_c() { static daNpcCd2_HIO_Jnt_UnkStruct_s a_jntTbl_M[16][19] = { diff --git a/src/d/actor/d_a_npc_cdn3.cpp b/src/d/actor/d_a_npc_cdn3.cpp index 6f7a28e6a37..ff0e484c8d9 100644 --- a/src/d/actor/d_a_npc_cdn3.cpp +++ b/src/d/actor/d_a_npc_cdn3.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_cdn3.h" #include "d/d_msg_object.h" #include "d/d_s_play.h" +#include const daNpcCdn3_c::ActionPair daNpcCdn3_c::ActionTable[8] = { {&daNpcCdn3_c::initWait, &daNpcCdn3_c::executeWait}, diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp index 21b089eb678..e6f6404cbba 100644 --- a/src/d/actor/d_a_npc_clerka.cpp +++ b/src/d/actor/d_a_npc_clerka.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_clerka.h" #include "d/d_msg_object.h" +#include const daNpc_clerkA_HIOParam daNpc_clerkA_Param_c::m = { 220.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp index c6400f90a09..39e08d5a277 100644 --- a/src/d/actor/d_a_npc_clerkb.cpp +++ b/src/d/actor/d_a_npc_clerkb.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_clerkb.h" #include "d/d_msg_object.h" +#include const daNpc_clerkB_HIOParam daNpc_clerkB_Param_c::m = { 220.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp index 21398595bed..2e47b5f836a 100644 --- a/src/d/actor/d_a_npc_clerkt.cpp +++ b/src/d/actor/d_a_npc_clerkt.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_clerkt.h" #include "d/d_msg_object.h" +#include const daNpcClerkt_HIOParam daNpcClerkt_Param_c::m = { 120.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index 759f9b82bed..1ae9adda9fc 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -13,6 +13,7 @@ #include "d/d_bg_w.h" #include "d/d_meter2_info.h" #include "d/d_tresure.h" +#include enum Coach_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index 3300891133d..bffee6496bc 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_doc.h" #include "Z2AudioLib/Z2Instances.h" +#include static int l_bmdData[1][2] = { {14, 1}, diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index c1187ab9e5c..850c5baa7bc 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_npc4.h" #include "d/d_s_play.h" #include "JSystem/JHostIO/JORFile.h" +#include enum fairy_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_fairy_seirei.cpp b/src/d/actor/d_a_npc_fairy_seirei.cpp index f5cc87f8f46..df6fc76ebba 100644 --- a/src/d/actor/d_a_npc_fairy_seirei.cpp +++ b/src/d/actor/d_a_npc_fairy_seirei.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_fairy_seirei.h" #include "d/actor/d_a_npc4.h" +#include static daNpcT_evtData_c l_evtList[1] = { diff --git a/src/d/actor/d_a_npc_fish.cpp b/src/d/actor/d_a_npc_fish.cpp index 64a8f81e018..8e023bd44a3 100644 --- a/src/d/actor/d_a_npc_fish.cpp +++ b/src/d/actor/d_a_npc_fish.cpp @@ -5,6 +5,7 @@ #include "d/actor/d_a_npc_fish.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" +#include static int daNpc_Fish_Draw(npc_fish_class* i_this) { return 1; diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp index 8856e476d02..a1bfe2dd16d 100644 --- a/src/d/actor/d_a_npc_gnd.cpp +++ b/src/d/actor/d_a_npc_gnd.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_gnd.h" +#include static int l_bmdData[1][2] = { {11, 1}, diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index d6978ec3cb9..c4865729327 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -12,6 +12,7 @@ #include "d/actor/d_a_npc_gra.h" #include "d/actor/d_a_tag_gra.h" #include "Z2AudioLib/Z2Instances.h" +#include const daNpc_grA_HIOParam daNpc_grA_Param_c::m = { {90.0f, -4.0f, 1.0f, 850.0f, 255.0f, 280.0f, 40.0f, 100.0f, 0.0f, 0.0f, 20.0f, diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index 39637c03173..c19b264a19c 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_grc.h" #include "d/actor/d_a_npc.h" #include "Z2AudioLib/Z2Instances.h" +#include enum grC_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index 96e22082a0f..819b40db8c8 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_grm.h" +#include enum grA_Base_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index d88ff0fa3da..0f61ac33d0d 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_grmc.h" #include "d/actor/d_a_npc4.h" +#include enum grC_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index 564d0b1d8b2..afe283c125d 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -11,6 +11,7 @@ #include "d/d_debug_viewer.h" #include "d/actor/d_a_tag_push.h" #include "Z2AudioLib/Z2Instances.h" +#include enum grO_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index a01093ccb62..5af37cf19ad 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_grr.h" #include "d/actor/d_a_npc.h" #include "Z2AudioLib/Z2Instances.h" +#include enum grR_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 760b8a61395..ba99deac5d0 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -9,6 +9,7 @@ #include "d/d_debug_viewer.h" #include "d/actor/d_a_tag_push.h" #include "Z2AudioLib/Z2Instances.h" +#include enum Event_Cut_Nums { NUM_EVT_CUTS_e = 2, diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index 39f3b84bd13..7aade0ff2e6 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_npc.h" #include "d/actor/d_a_obj_grz_rock.h" #include "Z2AudioLib/Z2Instances.h" +#include enum grZ_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index b03f22d716c..06dc3c57a79 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "d/d_cc_uty.h" #include "Z2AudioLib/Z2Instances.h" +#include static int l_bmdData[4][2] = { {14, 1}, {26, 2}, diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index b6936f96f51..53eb4bb2d83 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -12,6 +12,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "c/c_damagereaction.h" #include +#include #include "d/actor/d_a_alink.h" #include "d/actor/d_a_canoe.h" #include "d/actor/d_a_mg_fshop.h" diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index 0b67504bb8f..bf45bcd0821 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_arrow.h" #include "d/actor/d_a_canoe.h" #include "d/d_meter2_info.h" +#include static int l_bmdData[2][2] = { {13, 1}, diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index 00e9a02905b..db4505f9eb2 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_impal.h" #include "d/actor/d_a_npc.h" +#include daNpcImpal_HIOParam const daNpcImpal_Param_c::m = { 135.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp index c228481ad2a..865c12ea59b 100644 --- a/src/d/actor/d_a_npc_ins.cpp +++ b/src/d/actor/d_a_npc_ins.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_npc.h" #include "d/d_meter2_info.h" #include "d/d_msg_object.h" +#include enum Ins_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index b27eb6f554a..118f536b5c2 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_npc_bou.h" #include "d/d_meter2_info.h" #include "d/actor/d_a_tag_push.h" +#include enum Jagar_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_kakashi.cpp b/src/d/actor/d_a_npc_kakashi.cpp index efa8931a47c..3da4a5eea57 100644 --- a/src/d/actor/d_a_npc_kakashi.cpp +++ b/src/d/actor/d_a_npc_kakashi.cpp @@ -9,6 +9,7 @@ #include "d/d_com_static.h" #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" +#include static int l_bmdData[3][2] = { {10, 1}, diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index 9be15f2f638..1a086a2c6fb 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_kkri.h" #include "d/actor/d_a_e_ym.h" +#include static int l_bmdData[2][2] = { {35, 1}, diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index 3419650c5e6..6a6568f9d51 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -14,6 +14,7 @@ #if DEBUG #include "JSystem/JHostIO/JORFile.h" #include "d/d_debug_viewer.h" +#include #endif dCcD_SrcCyl daNpc_Kn_c::mCcDCyl = { diff --git a/src/d/actor/d_a_npc_kn_base.inc b/src/d/actor/d_a_npc_kn_base.inc index aa331fb4d52..547a8877e3a 100644 --- a/src/d/actor/d_a_npc_kn_base.inc +++ b/src/d/actor/d_a_npc_kn_base.inc @@ -1,6 +1,7 @@ #include "d/actor/d_a_npc_kn.h" #include "d/d_msg_object.h" #include "d/d_k_wmark.h" +#include void daNpc_Kn_c::tgHitCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf, fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf) { diff --git a/src/d/actor/d_a_npc_knj.cpp b/src/d/actor/d_a_npc_knj.cpp index 7a6993223ff..31bdb993a9b 100644 --- a/src/d/actor/d_a_npc_knj.cpp +++ b/src/d/actor/d_a_npc_knj.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_knj.h" +#include const daNpc_Knj_HIOParam daNpc_Knj_Param_c::m = { 0.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index b4cd80eb38f..a68846b7eb2 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_npc_len.h" #include "d/actor/d_a_horse.h" #include "d/actor/d_a_tag_evtarea.h" +#include enum Kolin_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index a9036c679d9..32d72973821 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kolinb.h" +#include enum Kolinb_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index fc55d7a6d44..0633f526805 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -21,6 +21,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" +#include class daNpc_Ks_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp index fc17e0fa54e..8c103bde0c4 100644 --- a/src/d/actor/d_a_npc_kyury.cpp +++ b/src/d/actor/d_a_npc_kyury.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kyury.h" +#include const daNpc_Kyury_HIOParam daNpc_Kyury_Param_c::m = { 200.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index 6d3586be20a..b8cc97f1abb 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_len.h" #include "d/actor/d_a_tag_push.h" +#include enum Type { /* 0x0 */ TYPE_0, diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp index b15297f89d3..265901426dc 100644 --- a/src/d/actor/d_a_npc_lud.cpp +++ b/src/d/actor/d_a_npc_lud.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_len.h" #include "d/actor/d_a_npc_lud.h" +#include const daNpc_Lud_HIOParam daNpc_Lud_Param_c::m = { 160.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index 709e27cb5cc..2301e4fc8a2 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -19,6 +19,7 @@ #include "d/d_timer.h" #if DEBUG #include "d/d_debug_viewer.h" +#include #endif const daNpc_Maro_HIOParam daNpc_Maro_Param_c::m = { diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp index 91228a5fc59..8593541b7c0 100644 --- a/src/d/actor/d_a_npc_midp.cpp +++ b/src/d/actor/d_a_npc_midp.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_midp.h" +#include enum midP_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index 50462a6f250..5bd49a1db5a 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_npc4.h" #include "d/actor/d_a_npc_moi.h" #include "d/actor/d_a_npc_uri.h" +#include const daNpc_Moi_HIOParam daNpc_Moi_Param_c::m = { 200.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index 64ab83e0d95..963c646ea8f 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_moir.h" #include "d/actor/d_a_ni.h" #include "d/actor/d_a_npc_tk.h" +#include enum MoiR_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index e8725b9f70c..8c2aa84525f 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_npc.h" #include "d/actor/d_a_player.h" #include "Z2AudioLib/Z2Instances.h" +#include enum { NUM_EVT_CUTS_e = 5, diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index a02e60a4e38..5d1c8bde1eb 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -18,6 +18,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "c/c_damagereaction.h" #include "Z2AudioLib/Z2Instances.h" +#include static home_path_pnt home_path[38] = { {0, {561.0f, 87.0f, -1110.0f}}, diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index 637836d06f3..e8f8cb604fa 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_pachi_besu.h" #include "d/actor/d_a_npc_pachi_taro.h" #include "Z2AudioLib/Z2Instances.h" +#include enum Besu_RES_File_ID { /* BMDR */ diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index c22bd4ccb02..161f563c5c6 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -9,6 +9,7 @@ #include "JSystem/JHostIO/JORFile.h" #include "d/d_debug_viewer.h" #include "d/actor/d_a_npc_pachi_taro.h" +#include enum Maro_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index da1530e99eb..d7f674810f1 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_npc_pachi_maro.h" #include "d/actor/d_a_npc_pachi_besu.h" #include "d/d_debug_viewer.h" +#include enum Taro_RES_File_ID { /* BMDR */ diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp index 7b8fb2018c1..cd04616d266 100644 --- a/src/d/actor/d_a_npc_post.cpp +++ b/src/d/actor/d_a_npc_post.cpp @@ -12,6 +12,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "d/d_debug_viewer.h" #include "Z2AudioLib/Z2Instances.h" +#include enum post_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp index 2129c5c52f0..5190ccd5c26 100644 --- a/src/d/actor/d_a_npc_pouya.cpp +++ b/src/d/actor/d_a_npc_pouya.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_pouya.h" +#include const daNpc_Pouya_HIOParam daNpc_Pouya_Param_c::m = { 120.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index b32a06b630a..75293bd87a9 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_raca.h" #include "d/actor/d_a_tag_evtarea.h" #include "d/d_s_play.h" +#include enum Raca_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index 152b9fc5d2c..71d6ec6e749 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_rafrel.h" #include "d/actor/d_a_npc.h" #include "d/d_debug_viewer.h" +#include static daNpc_GetParam2 l_bckGetParamList[29] = { {-1, 2, 0}, diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index 32440db991a..af50f2f7695 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_npc_ks.h" #include "d/actor/d_a_obj_so.h" #include "d/actor/d_a_e_ym.h" +#include enum saru_TW_RES_File_ID { /* BMDR */ diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp index 3d430c0e47c..382a5350f59 100644 --- a/src/d/actor/d_a_npc_seib.cpp +++ b/src/d/actor/d_a_npc_seib.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_seib.h" +#include static int l_bmdData[2][1] = {12, 1}; diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index 5b75031fd4c..b3a688f7218 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_seic.h" #include "SSystem/SComponent/c_counter.h" +#include static int l_bmdData[1][2] = { {9, 1} diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index de3a3c2c72c..ba0e82bd491 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_seid.h" #include "SSystem/SComponent/c_counter.h" +#include static int l_bmdData[1][2] = { {5, 1} diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp index a0ec617f872..6969645ed10 100644 --- a/src/d/actor/d_a_npc_seira.cpp +++ b/src/d/actor/d_a_npc_seira.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_seira.h" #include "d/d_meter_HIO.h" +#include static int l_bmdData[2][2] = { diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp index 7f79648d9a8..ed9e2ea3c9d 100644 --- a/src/d/actor/d_a_npc_seira2.cpp +++ b/src/d/actor/d_a_npc_seira2.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_seira2.h" +#include static int l_bmdData[2][2] = { {4, 3}, diff --git a/src/d/actor/d_a_npc_seirei.cpp b/src/d/actor/d_a_npc_seirei.cpp index 306df2a3324..87216b3ee14 100644 --- a/src/d/actor/d_a_npc_seirei.cpp +++ b/src/d/actor/d_a_npc_seirei.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_seirei.h" #include "d/d_meter2_info.h" +#include enum Seirei_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index bffc93e883b..395d5a0f87a 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_npc.h" #include "d/actor/d_a_tag_evtarea.h" #include "d/d_msg_object.h" +#include const daNpcShad_HIOParam daNpcShad_Param_c::m = { 35.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp index aedba3e5f97..d1c31ea12e3 100644 --- a/src/d/actor/d_a_npc_shaman.cpp +++ b/src/d/actor/d_a_npc_shaman.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_shaman.h" #include "JSystem/JHostIO/JORFile.h" +#include #if DEBUG daNpc_Sha_HIO_c::daNpc_Sha_HIO_c() { diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index 78157b3ba8a..1c6d3d1c36e 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_shop0.h" +#include static int createHeapCallBack(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); diff --git a/src/d/actor/d_a_npc_sola.cpp b/src/d/actor/d_a_npc_sola.cpp index a8361e6b7eb..cf026eb2435 100644 --- a/src/d/actor/d_a_npc_sola.cpp +++ b/src/d/actor/d_a_npc_sola.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_sola.h" +#include enum Bans_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 32956de232f..4e501fcb670 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -19,6 +19,7 @@ #include "f_op/f_op_actor.h" #include "f_op/f_op_camera_mng.h" #include +#include daNpc_Maro_c::actionFunc dummy_lit_3931() { return &daNpc_Maro_c::choccai; diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 79c169935da..06b9686bc71 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" +#include const daNpcThe_HIOParam daNpcThe_Param_c::m = { 220.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp index 67a19b84685..5cde34a6328 100644 --- a/src/d/actor/d_a_npc_theB.cpp +++ b/src/d/actor/d_a_npc_theB.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_npc_coach.h" #include "d/actor/d_a_startAndGoal.h" #include "d/actor/d_a_coach_2D.h" +#include enum Coach_RES_File_ID { /* BCK */ @@ -1176,10 +1177,10 @@ int daNpcTheB_c::EvCut_PersonalCombatIntro(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': break; - case '0x0002': + case '0002': initTalk(0x16, NULL); setLookMode(LOOK_PLAYER); mActorMngrs[0].entry(daPy_getPlayerActorClass()); @@ -1204,10 +1205,10 @@ int daNpcTheB_c::EvCut_PersonalCombatIntro(int i_staffId) { } switch (*cutName) { - case '0x0001': + case '0001': return 1; - case '0x0002': + case '0002': if (talkProc(NULL, TRUE, NULL)) { dComIfGs_onSaveDunSwitch(52); dComIfGs_onSaveDunSwitch(53); @@ -1229,7 +1230,7 @@ int daNpcTheB_c::EvCut_PersonalCombatRevenge(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': { + case '0001': { fopAc_ac_c* actor_p = getEvtAreaTagP(5, 0); cXyz* pos = dComIfGp_evmng_getMyXyzP(i_staffId, "pos"); int* angle = dComIfGp_evmng_getMyIntegerP(i_staffId, "angle"); @@ -1248,13 +1249,13 @@ int daNpcTheB_c::EvCut_PersonalCombatRevenge(int i_staffId) { break; } - case '0x0002': + case '0002': initTalk(0x17, NULL); setLookMode(LOOK_PLAYER); mActorMngrs[0].entry(daPy_getPlayerActorClass()); break; - case '0x0003': + case '0003': break; default: @@ -1282,19 +1283,19 @@ int daNpcTheB_c::EvCut_PersonalCombatRevenge(int i_staffId) { } switch (*cutName) { - case '0x0001': + case '0001': if (getCoachSpeed() == 0.0f) { return 1; } break; - case '0x0002': + case '0002': if (talkProc(NULL, TRUE, NULL)) { return 1; } break; - case '0x0003': + case '0003': return 1; default: @@ -1411,7 +1412,7 @@ int daNpcTheB_c::EvCut_AnnulationFieldRace(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': if (startAndGoal_p != NULL) { startAndGoal_p->readyStartTimer(); } @@ -1424,7 +1425,7 @@ int daNpcTheB_c::EvCut_AnnulationFieldRace(int i_staffId) { } switch (*cutName) { - case '0x0001': + case '0001': if (startAndGoal_p != NULL && startAndGoal_p->isStartCheck()) { return 1; } @@ -1444,15 +1445,15 @@ int daNpcTheB_c::EvCut_TheBHint(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': setMotionAnm(ANM_SIT, 0.0f); break; - case '0x0002': + case '0002': initTalk(mHintMsgNo, NULL); break; - case '0x0003': { + case '0003': { cXyz pos; csXyz angle; daNpcF_getPlayerInfoFromPlayerList(field_0xe04, mRoomNo, pos, angle); @@ -1479,11 +1480,11 @@ int daNpcTheB_c::EvCut_TheBHint(int i_staffId) { } switch (*cutName) { - case '0x0001': - case '0x0003': + case '0001': + case '0003': return 1; - case '0x0002': + case '0002': if (talkProc(NULL, TRUE, NULL)) { mHintEvtFlag = 0; return 1; @@ -1504,22 +1505,22 @@ int daNpcTheB_c::EvCut_CoachGuardGameOver(int i_staffId) { if (eventManager.getIsAddvance(i_staffId)) { switch (*cutName) { - case '0x0001': + case '0001': Z2GetAudioMgr()->bgmStart(Z2BGM_GAME_OVER, 0, 0); break; - case '0x0002': { + case '0002': { daNpcCoach_c* coach_p = (daNpcCoach_c*)fopAcM_SearchByID(parentActorID); cXyz pos(0.0f, -30000.0f, 0.0f); coach_p->setPosAngle(pos, shape_angle); break; } - case '0x0003': + case '0003': ((daCoach2D_c*)fpcM_SearchByName(PROC_COACH2D))->hide(); break; - case '0x0004': + case '0004': break; default: @@ -1529,12 +1530,12 @@ int daNpcTheB_c::EvCut_CoachGuardGameOver(int i_staffId) { } switch (*cutName) { - case '0x0001': - case '0x0002': - case '0x0003': + case '0001': + case '0002': + case '0003': return 1; - case '0x0004': + case '0004': daPy_getPlayerActorClass()->onForceGameOver(); return 1; diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index 0bfefbe1d5a..09e5a645142 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -16,6 +16,7 @@ #include "d/d_cc_d.h" #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" +#include class daNPC_TK_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp index bb9581eca19..a0a89a007d2 100644 --- a/src/d/actor/d_a_npc_tkc.cpp +++ b/src/d/actor/d_a_npc_tkc.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_tkc.h" #include "d/actor/d_a_npc.h" #include "d/d_camera.h" +#include enum Tkc_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp index 8cf5ac02500..74589199c97 100644 --- a/src/d/actor/d_a_npc_tkj.cpp +++ b/src/d/actor/d_a_npc_tkj.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_tkj.h" #include "d/actor/d_a_npc4.h" +#include static int l_bmdData[1][2] = { {12, 1}, diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index 5d047e150b8..103a9d57f25 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_tkj2.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" +#include enum Tkj2_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index 0f1a529b5c8..ef740d3c265 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -11,6 +11,7 @@ #include "d/d_a_obj.h" #include "d/d_meter2_info.h" #include "f_op/f_op_kankyo_mng.h" +#include enum TKS_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index 232d107471c..bbd636138b1 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -14,6 +14,7 @@ #include "d/actor/d_a_obj_automata.h" #include "d/d_msg_object.h" #include "d/actor/d_a_obj_scannon.h" +#include const daNpc_Toby_HIOParam daNpc_Toby_Param_c::m = { 160.0f, diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index c3d835e6a30..2d0db6e9b8e 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -8,6 +8,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_npc_uri.h" #include "m_Do/m_Do_graphic.h" +#include const daNpc_Uri_HIOParam daNpc_Uri_Param_c::m = { 200.0f, // attention_offset diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 3d9eefe1e74..e385f97b430 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_npc_wrestler.h" #include "d/d_timer.h" #include +#include #include "d/actor/d_a_tag_arena.h" #include "d/actor/d_a_npc_gra.h" #include "d/actor/d_a_npc_bouS.h" diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp index ea0f13ea942..f55f755e044 100644 --- a/src/d/actor/d_a_npc_yamid.cpp +++ b/src/d/actor/d_a_npc_yamid.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_yamid.h" #include "JSystem/JHostIO/JORFile.h" +#include enum yamiD_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp index 64d36e12f23..6db606a991e 100644 --- a/src/d/actor/d_a_npc_yamis.cpp +++ b/src/d/actor/d_a_npc_yamis.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_yamis.h" +#include enum RES_Name { /* 0x0 */ NONE, diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp index 611bdc9feba..fb74a15e521 100644 --- a/src/d/actor/d_a_npc_yamit.cpp +++ b/src/d/actor/d_a_npc_yamit.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_yamit.h" #include "d/actor/d_a_tag_yami.h" +#include enum RES_Name { /* 0x0 */ NONE, diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index 55e13fd4a14..d26b030a49b 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_npc_yelia.h" #include "d/actor/d_a_demo_item.h" +#include static daNpc_GetParam1 l_bmdData[3] = { {3, 1}, diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 08b90870929..1cae05166ab 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -18,6 +18,7 @@ #include "d/d_meter2_info.h" #include "d/d_timer.h" #include "d/d_tresure.h" +#include enum ykM_RES_File_ID { diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index 36c55f22e7e..7aac0c13405 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -18,6 +18,7 @@ #include "d/d_tresure.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_ext.h" +#include #if DEBUG class daNpc_ykW_HIO_c : public mDoHIO_entry_c { diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index 93058921fc0..296e81c21b1 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zanb.h" +#include enum zanB_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp index 0353f6ccc82..3fdcf6d84c0 100644 --- a/src/d/actor/d_a_npc_zant.cpp +++ b/src/d/actor/d_a_npc_zant.cpp @@ -9,6 +9,7 @@ #include "SSystem/SComponent/c_counter.h" #include "f_op/f_op_actor_mng.h" #include "SSystem/SComponent/c_counter.h" +#include static int l_bmdData[2] = { 7, 1 diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp index 0e5da0c5c2b..dee038bd59e 100644 --- a/src/d/actor/d_a_npc_zelR.cpp +++ b/src/d/actor/d_a_npc_zelR.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zelR.h" +#include enum RES_Name { /* 0x0 */ NONE, diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index f1bd201c7a4..7d8c74cad59 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zelRo.h" +#include enum zelRo_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index 563fcea24c1..42dc79070a2 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -10,6 +10,7 @@ #include "SSystem/SComponent/c_counter.h" #include "d/actor/d_a_hozelda.h" #include "d/d_debug_viewer.h" +#include static u32 l_bmdData[2] = { 11, 1 }; diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp index aa787299891..4386b54190c 100644 --- a/src/d/actor/d_a_npc_zra.cpp +++ b/src/d/actor/d_a_npc_zra.cpp @@ -18,6 +18,7 @@ #include "d/actor/d_a_canoe.h" #include "d/actor/d_a_npc_hoz.h" #include "d/actor/d_a_obj_zraMark.h" +#include static NPC_ZRA_HIO_CLASS l_HIO; diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index a600f217cce..6adc1e99d73 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -12,6 +12,7 @@ #include "d/actor/d_a_obj_grave_stone.h" #include "d/actor/d_a_obj_zra_rock.h" #include "Z2AudioLib/Z2Instances.h" +#include static NPC_ZRZ_HIO_CLASS l_HIO; diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index f97e72aa493..09568aa6f6f 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -12,6 +12,7 @@ #include "d/d_menu_insect.h" #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" +#include static bool hio_set; diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 03dc4587752..23ce104482d 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -12,6 +12,7 @@ #include "d/d_com_inf_game.h" #include "d/d_menu_insect.h" #include "f_pc/f_pc_name.h" +#include class daObj_BattaHIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 25dd1587ef9..4503e9435c1 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -16,6 +16,7 @@ #endif #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" +#include enum Action_e { /* 0x0 */ ACTION_SW_WAIT_e, diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index f5894f7c7aa..d2918eeaeb1 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -10,6 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_model.h" #include "d/d_com_inf_game.h" +#include static int daBkyRock_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp index ab8f014d15d..19fe7f3a415 100644 --- a/src/d/actor/d_a_obj_bosswarp.cpp +++ b/src/d/actor/d_a_obj_bosswarp.cpp @@ -12,6 +12,7 @@ #include "d/d_procname.h" #include "d/actor/d_a_obj_life_container.h" #include "d/actor/d_a_obj_ystone.h" +#include static char* l_arcName = "ef_Portal"; diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index 243f10f978c..2085c5e0e14 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -14,6 +14,7 @@ #include "d/d_path.h" #include "Z2AudioLib/Z2Instances.h" #include "f_op/f_op_camera_mng.h" +#include static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) { obj_brg_class* a_this = (obj_brg_class*)i_bgActor; diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index a666ca8d439..41787639656 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_carry.h" #include "d/actor/d_a_player.h" #include +#include #include "d/d_com_inf_game.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_obj_swBallA.h" diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index 33088afbddb..8082da406a3 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -12,6 +12,7 @@ #include "d/d_menu_insect.h" #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" +#include static bool hio_set; diff --git a/src/d/actor/d_a_obj_crystal.cpp b/src/d/actor/d_a_obj_crystal.cpp index bca278b9447..0c490dca022 100644 --- a/src/d/actor/d_a_obj_crystal.cpp +++ b/src/d/actor/d_a_obj_crystal.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_crystal.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include static int CheckCreateHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->CreateHeap(); diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index 3c5f1cc2260..e8497b29854 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -12,6 +12,7 @@ #include "d/d_menu_insect.h" #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" +#include static bool hio_set; diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index 69123a477a4..2e89ee2f859 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/d_bg_w.h" #include "d/d_path.h" +#include static const Vec l_swOffset = { 0.0f, diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index eff54e3af1c..549bda0bb92 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_drop.h" #include "SSystem/SComponent/c_math.h" #include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_camera.h" diff --git a/src/d/actor/d_a_obj_fchain.cpp b/src/d/actor/d_a_obj_fchain.cpp index 390e1ab36b8..0dc8a9c3008 100644 --- a/src/d/actor/d_a_obj_fchain.cpp +++ b/src/d/actor/d_a_obj_fchain.cpp @@ -10,6 +10,7 @@ #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" +#include static char const l_arcName[] = "Fchain"; diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp index 43b33177702..73bcda8a77a 100644 --- a/src/d/actor/d_a_obj_gadget.cpp +++ b/src/d/actor/d_a_obj_gadget.cpp @@ -13,6 +13,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "SSystem/SComponent/c_counter.h" #include "JSystem/JHostIO/JORFile.h" +#include #if DEBUG #define PARAM field_0x568->mAttr diff --git a/src/d/actor/d_a_obj_ganonwall.cpp b/src/d/actor/d_a_obj_ganonwall.cpp index 7f6704af478..71c103bc2ce 100644 --- a/src/d/actor/d_a_obj_ganonwall.cpp +++ b/src/d/actor/d_a_obj_ganonwall.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_ganonwall.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +#include static u8 const l_idx[24][4] = { {0x17, 0x05, 0x06, 0x01}, {0x17, 0x05, 0x06, 0x02}, {0x17, 0x05, 0x06, 0x03}, diff --git a/src/d/actor/d_a_obj_ganonwall2.cpp b/src/d/actor/d_a_obj_ganonwall2.cpp index 80513d1bc13..2663d8fc6d8 100644 --- a/src/d/actor/d_a_obj_ganonwall2.cpp +++ b/src/d/actor/d_a_obj_ganonwall2.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_obj_ganonwall2.h" #include "d/d_com_inf_game.h" +#include static u8 const l_idx[24][4] = { 0x17, 0x05, 0x06, 0x01, 0x17, 0x05, 0x06, 0x02, 0x17, 0x05, 0x06, 0x03, 0x17, 0x05, 0x06, 0x04, diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp index 238099a0f61..55e2bd5ecfb 100644 --- a/src/d/actor/d_a_obj_gb.cpp +++ b/src/d/actor/d_a_obj_gb.cpp @@ -10,6 +10,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" +#include static int daObj_Gb_Draw(obj_gb_class* i_this) { g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr); diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index 9ac731d7acd..7a883902692 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -18,6 +18,7 @@ #include "d/d_msg_object.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include class daObj_GrA_Param_c { public: diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index f31da3b0fee..b94a6117e66 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -2,6 +2,7 @@ #include "d/d_camera.h" #include "d/actor/d_a_tag_gra.h" #include +#include f32 daObj_GrA_c::getSrchCircleR() { f32 srchCircleR; diff --git a/src/d/actor/d_a_obj_ihasi.cpp b/src/d/actor/d_a_obj_ihasi.cpp index f0feb4a3b94..b5e62fb9d0b 100644 --- a/src/d/actor/d_a_obj_ihasi.cpp +++ b/src/d/actor/d_a_obj_ihasi.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_obj_ihasi.h" #include "d/d_com_inf_game.h" +#include static int daObj_Ihasi_Draw(obj_ihasi_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp index c4c4775bf2c..d577fda4f37 100644 --- a/src/d/actor/d_a_obj_itamato.cpp +++ b/src/d/actor/d_a_obj_itamato.cpp @@ -9,6 +9,7 @@ #include "d/d_cc_d.h" #include "d/actor/d_a_npc.h" #include "JSystem/JHostIO/JORFile.h" +#include struct daObj_ItaMato_HIOParam { /* 0x00 */ f32 attn_offset; diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index 4e5413fa63b..c1435c9724e 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -12,6 +12,7 @@ #include "d/d_menu_insect.h" #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" +#include static bool hio_set; diff --git a/src/d/actor/d_a_obj_kag.cpp b/src/d/actor/d_a_obj_kag.cpp index 22db0ab5cb6..0b6f0dfcc35 100644 --- a/src/d/actor/d_a_obj_kag.cpp +++ b/src/d/actor/d_a_obj_kag.cpp @@ -9,6 +9,7 @@ #include "d/d_menu_insect.h" #include "d/d_s_play.h" #include "d/d_cc_uty.h" +#include enum I_Kag_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp index 9b0361f48ad..904166228e5 100644 --- a/src/d/actor/d_a_obj_kago.cpp +++ b/src/d/actor/d_a_obj_kago.cpp @@ -13,6 +13,7 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" +#include daObj_Kago_HIOParam const daObj_Kago_Param_c::m = { 0.0f, diff --git a/src/d/actor/d_a_obj_kaisou.cpp b/src/d/actor/d_a_obj_kaisou.cpp index d8547413500..7899d06e9cc 100644 --- a/src/d/actor/d_a_obj_kaisou.cpp +++ b/src/d/actor/d_a_obj_kaisou.cpp @@ -9,6 +9,7 @@ #include "d/d_cc_d.h" #include "d/actor/d_a_player.h" #include "d/d_s_play.h" +#include enum Joint { /* 0x0 */ JNT_JOINT1, diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index b8cc58c5fa4..b654e91fa5c 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -13,6 +13,7 @@ #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_lib.h" +#include static u8 hio_set; diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index d3fd476cd50..9f1e3a555f0 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -13,6 +13,7 @@ #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_lib.h" +#include static u8 hio_set; diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index 24ef2eae4d0..d200074e31c 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" +#include static s32 l_bmdData[4] = { 8, 0, 9, 0 }; diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp index 3ba6a097c85..904dd8a9e55 100644 --- a/src/d/actor/d_a_obj_key.cpp +++ b/src/d/actor/d_a_obj_key.cpp @@ -16,6 +16,7 @@ #include "d/actor/d_a_e_oc.h" #include "d/actor/d_a_e_db.h" #include "SSystem/SComponent/c_counter.h" +#include class daObj_Key_HIO_c : public JORReflexible{ public: diff --git a/src/d/actor/d_a_obj_kkanban.cpp b/src/d/actor/d_a_obj_kkanban.cpp index fbd4e582231..ccfc068e3d9 100644 --- a/src/d/actor/d_a_obj_kkanban.cpp +++ b/src/d/actor/d_a_obj_kkanban.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_kkanban.h" #include "SSystem/SComponent/c_math.h" #include "d/d_procname.h" +#include static int nodeCallBack(J3DJoint* i_joint, int param_1) { if (param_1 == 0) { diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index fd99731c64c..31481c7faff 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -11,6 +11,7 @@ #include "d/d_cc_d.h" #include "d/d_menu_insect.h" #include "f_pc/f_pc_name.h" +#include class daObj_KuwHIO_c : public JORReflexible{ public: diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp index 8f89c82a045..8365818ea33 100644 --- a/src/d/actor/d_a_obj_life_container.cpp +++ b/src/d/actor/d_a_obj_life_container.cpp @@ -10,6 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/d_item_data.h" #include "SSystem/SComponent/c_math.h" +#include const static dCcD_SrcCyl l_cyl_src = { { diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index 5148a8a6e21..4d75aacb08b 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -12,6 +12,7 @@ #include "d/actor/d_a_player.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include static int daObj_Lp_Draw(obj_lp_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor; diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index b56db1563e3..c7e58cc22a0 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -11,6 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_camera.h" #include "d/d_s_play.h" +#include enum E_bm6_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index c5553357451..9d79d4847c2 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -20,6 +20,7 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" #include +#include daObj_Maki_HIO_c::daObj_Maki_HIO_c() { field_0x4 = -1; diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp index 5746ad13d10..2ccb112a266 100644 --- a/src/d/actor/d_a_obj_mirror_table.cpp +++ b/src/d/actor/d_a_obj_mirror_table.cpp @@ -10,6 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/d_procname.h" +#include static char const* l_arcName = "MR-Table"; diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp index 03284cf3d9e..26e2ede5f1b 100644 --- a/src/d/actor/d_a_obj_nan.cpp +++ b/src/d/actor/d_a_obj_nan.cpp @@ -10,6 +10,7 @@ #include "d/d_menu_insect.h" #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" +#include class daObj_NanHIO_c { public: diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index b1f99c034ea..7dc32dbb152 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -11,6 +11,7 @@ #include "d/d_bg_w.h" #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" +#include const static dCcD_SrcSph ccSphSrc = { { diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index 35943067e0c..69e508971d0 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -6,6 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_picture.h" +#include static int daObjPicture_c_createHeap(fopAc_ac_c* i_this) { return ((daObjPicture_c*)i_this)->createHeap(); diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp index 24064df7526..4640d5693cc 100644 --- a/src/d/actor/d_a_obj_pillar.cpp +++ b/src/d/actor/d_a_obj_pillar.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_obj_carry.h" #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" +#include #define ACTION_WAIT 0 #define ACTION_SWON 1 diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index 57e374dc9f1..2d77fbaa4d6 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -14,6 +14,7 @@ #if DEBUG #include "SSystem/SComponent/c_counter.h" #include "JSystem/JHostIO/JORFile.h" +#include #endif const daObj_Pumpkin_HIOParam daObj_Pumpkin_Param_c::m = { diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp index c50e0ed155f..9c0874ccab1 100644 --- a/src/d/actor/d_a_obj_rope_bridge.cpp +++ b/src/d/actor/d_a_obj_rope_bridge.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_rope_bridge.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +#include static char* l_arcName[2] = {"L_RopeB_S", "L_RopeB_L"}; diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index 475dddbe5df..4a67dd0f3aa 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_obj_scannon.h" #include "d/actor/d_a_player.h" #include "d/d_s_play.h" +#include char* l_arcName_Comp = "SkyCannon"; diff --git a/src/d/actor/d_a_obj_scannon_crs.cpp b/src/d/actor/d_a_obj_scannon_crs.cpp index d682aec9cb8..e911437d427 100644 --- a/src/d/actor/d_a_obj_scannon_crs.cpp +++ b/src/d/actor/d_a_obj_scannon_crs.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_scannon_crs.h" #include "d/actor/d_a_player.h" #include "d/d_meter2_info.h" +#include static int daSCannonCrs_c_createHeap(fopAc_ac_c* i_this) { return ((daSCannonCrs_c*)i_this)->createHeap(); diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index 6d9025f0792..233e442b066 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" +#include static char* l_arcName = "SCanTen"; diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index 490005649bd..1e2ff2ccbd8 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "d/actor/d_a_tag_kmsg.h" #include +#include #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg.h" diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index d20800fdd76..c5e18e4756b 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -11,6 +11,7 @@ #include "d/d_item_data.h" #include "d/d_tresure.h" #include "f_op/f_op_camera_mng.h" +#include const static dCcD_SrcCyl l_cyl_src = { { diff --git a/src/d/actor/d_a_obj_snow_soup.cpp b/src/d/actor/d_a_obj_snow_soup.cpp index 9fca736a548..7a2d491b63d 100644 --- a/src/d/actor/d_a_obj_snow_soup.cpp +++ b/src/d/actor/d_a_obj_snow_soup.cpp @@ -9,6 +9,7 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" #include "d/d_procname.h" +#include static int daObjSnowSoup_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 3dce537dab6..0431d31851f 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -15,6 +15,7 @@ #include "d/d_cc_uty.h" #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" +#include daObj_So_HIO_c::daObj_So_HIO_c() { field_0x4 = -1; diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 2ed7130f138..c127fffa5fd 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_swLight.h" #include "d/d_cc_d.h" #include "d/d_s_play.h" +#include #if DEBUG class daObjSwLight_HIO_c : public mDoHIO_entry_c { diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp index 8b75c9b5db8..d6834c37044 100644 --- a/src/d/actor/d_a_obj_swhang.cpp +++ b/src/d/actor/d_a_obj_swhang.cpp @@ -11,6 +11,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +#include static u32 const l_bmdIdx[5] = { 4, 4, 4, 4, 4, diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp index 5c4f1c6b4bb..4dfa1888622 100644 --- a/src/d/actor/d_a_obj_swpropeller.cpp +++ b/src/d/actor/d_a_obj_swpropeller.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_swpropeller.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include #define MODEL_K_PURO 0 #define MODEL_LV9_PURO 1 diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index f4866be6ad5..5b8f23d3b61 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" +#include enum Kbota_00_RES_File_ID { /* BMDR */ diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index 1404757c2c1..3b93a8ee2ee 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -15,6 +15,7 @@ #include "SSystem/SComponent/c_lib.h" #include "m_Do/m_Do_lib.h" #include "d/d_menu_insect.h" +#include daObj_TenHIO_c::daObj_TenHIO_c() { field_0x4 = -1; diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index 6e98282eb1f..246b26e4235 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -16,6 +16,7 @@ #if DEBUG #include "d/d_debug_viewer.h" +#include #endif static s8 r05yuka_image[192] = { diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index ae0b8604677..d184d922171 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -12,6 +12,7 @@ #include "d/d_bomb.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" +#include #if DEBUG daObjTobyHouse_HIO_c l_HIO; diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 4dcf667b728..60ef3736c8f 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -13,6 +13,7 @@ #include "f_op/f_op_camera_mng.h" #include "f_pc/f_pc_name.h" #include "m_Do/m_Do_lib.h" +#include class daObj_TomHIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 1c239ff1290..8e2d138d59e 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -14,6 +14,7 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" +#include #if DEBUG daObjVolcBom_HIO_c::daObjVolcBom_HIO_c() { diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index 7532b31a0af..367144686c1 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -12,6 +12,7 @@ #include "d/d_s_play.h" #include "d/d_bg_w.h" #include "d/d_meter2_info.h" +#include static const int l_bmd_idx[] = {9, 11}; diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp index c040f6b6b5f..e974f99f9b8 100644 --- a/src/d/actor/d_a_obj_warp_obrg.cpp +++ b/src/d/actor/d_a_obj_warp_obrg.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_midna.h" #include "d/d_bg_w.h" +#include static char* l_arcName = "Obj_obrg"; diff --git a/src/d/actor/d_a_obj_ystone.cpp b/src/d/actor/d_a_obj_ystone.cpp index e7352efcab2..9d8efbff089 100644 --- a/src/d/actor/d_a_obj_ystone.cpp +++ b/src/d/actor/d_a_obj_ystone.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_obj_ystone.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" +#include static char const* l_arcName[7] = { "N_gD_mskF", diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 64748a1dae4..136d429b9ac 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -9,6 +9,7 @@ #include "JSystem/JKernel/JKRSolidHeap.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" +#include const char* daShopItem_c::getShopArcname() { switch (m_itemNo) { diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 040e6987544..43c72561765 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_swhit0.h" #include "d/d_com_inf_game.h" +#include #define COLOR_YELLOW 0 #define COLOR_BLUE 1 diff --git a/src/d/actor/d_a_tag_Lv8Gate.cpp b/src/d/actor/d_a_tag_Lv8Gate.cpp index 892653e6ed7..6927449e869 100644 --- a/src/d/actor/d_a_tag_Lv8Gate.cpp +++ b/src/d/actor/d_a_tag_Lv8Gate.cpp @@ -7,6 +7,7 @@ #include "d/d_com_inf_game.h" #include "d/d_procname.h" #include "d/actor/d_a_obj_mirror_table.h" +#include static char* l_arcName = "Lv8Gate"; diff --git a/src/d/actor/d_a_tag_allmato.cpp b/src/d/actor/d_a_tag_allmato.cpp index bf833803ec7..b1a4549e2c5 100644 --- a/src/d/actor/d_a_tag_allmato.cpp +++ b/src/d/actor/d_a_tag_allmato.cpp @@ -6,6 +6,7 @@ #include "d/actor/d_a_obj_itamato.h" #include "d/actor/d_a_arrow.h" #include "f_op/f_op_camera_mng.h" +#include static daNpcT_evtData_c l_evtList[8] = { {"", 0}, diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp index 81ada5a6fec..47606b7e02d 100644 --- a/src/d/actor/d_a_tag_evt.cpp +++ b/src/d/actor/d_a_tag_evt.cpp @@ -6,6 +6,7 @@ #include "d/d_com_static.h" #include "d/d_save.h" #include "f_op/f_op_actor_mng.h" +#include static char* l_evtNameList[] = { NULL, diff --git a/src/d/actor/d_a_tag_lantern.cpp b/src/d/actor/d_a_tag_lantern.cpp index b27a4facc95..7475077177e 100644 --- a/src/d/actor/d_a_tag_lantern.cpp +++ b/src/d/actor/d_a_tag_lantern.cpp @@ -10,6 +10,7 @@ #include "JSystem/JHostIO/JORFile.h" #include "d/d_debug_viewer.h" #include "d/d_procname.h" +#include static TAG_LANTERN_HIO_CLASS l_HIO; diff --git a/src/d/actor/d_a_tag_mhint.cpp b/src/d/actor/d_a_tag_mhint.cpp index ee66c938b7b..d1ac38d8ad2 100644 --- a/src/d/actor/d_a_tag_mhint.cpp +++ b/src/d/actor/d_a_tag_mhint.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_procname.h" #include "d/d_meter2_info.h" +#include int daTagMhint_c::create() { fopAcM_ct(this, daTagMhint_c); diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index d9cbd2bf664..ececc7926ef 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_tag_msg.h" #include "d/d_com_inf_game.h" #include "d/d_debug_viewer.h" +#include static int createHeapCallBack(fopAc_ac_c* i_this) { daTag_Msg_c* msg = (daTag_Msg_c*)i_this; diff --git a/src/d/actor/d_a_tag_shop_item.cpp b/src/d/actor/d_a_tag_shop_item.cpp index 0671f063741..d4c9a9cad11 100644 --- a/src/d/actor/d_a_tag_shop_item.cpp +++ b/src/d/actor/d_a_tag_shop_item.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_tag_shop_item.h" #include "d/d_procname.h" +#include int daTag_ShopItem_c::create() { fopAcM_ct(this, daTag_ShopItem_c); diff --git a/src/d/actor/d_a_tag_smk_emt.cpp b/src/d/actor/d_a_tag_smk_emt.cpp index 8e91fcb7ca1..865474bc18f 100644 --- a/src/d/actor/d_a_tag_smk_emt.cpp +++ b/src/d/actor/d_a_tag_smk_emt.cpp @@ -7,6 +7,7 @@ #include "d/actor/d_a_tag_smk_emt.h" #include "d/d_procname.h" +#include daTagSmkEmt_c::daTagSmkEmt_c() { memset(&mParticles,0,0xc); diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index 162facf5ccd..f1d2cb6a1a3 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_tag_sppath.h" #include "d/actor/d_a_player.h" #include +#include static dCcD_SrcCyl l_cylSrc = { { diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index a9a58b44fd7..12b0d6468ee 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -10,6 +10,7 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" #include +#include static const f32 l_cull_size_box[6] = { -150.0f, -10.0f, -150.0f, 150.0f, 300.0f, 100.0f }; diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index d148a5343f4..0d0d62397db 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -8,6 +8,7 @@ #include "d/actor/d_a_tbox2.h" #include "d/d_bg_w.h" #include "d/actor/d_a_midna.h" +#include void daTbox2_c::initBaseMtx() { mpModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index deb1905c741..33d9a277625 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -12,6 +12,7 @@ #include "f_op/f_op_camera_mng.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" +#include static int daVrbox2_color_set(vrbox2_class* param_0); diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index cb267e5ef6b..1225cad07b7 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -11,6 +11,7 @@ #include "f_op/f_op_camera_mng.h" #include "JSystem/JKernel/JKRHeap.h" #include "Z2AudioLib/Z2Instances.h" +#include struct daYkgr_HIO_c : public mDoHIO_entry_c { daYkgr_HIO_c(); diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc index 11553d5e05c..b78ccd81123 100644 --- a/src/d/actor/d_grass.inc +++ b/src/d/actor/d_grass.inc @@ -6,6 +6,7 @@ #include "SSystem/SComponent/c_lib.h" #include "f_op/f_op_overlap_mng.h" #include +#include #include "d/d_camera.h" #include "f_op/f_op_camera_mng.h" diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 237a1a7770c..f3318b63c2d 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -10,6 +10,7 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "SSystem/SComponent/c_counter.h" +#include #define DRAW_TYPE_YELLOW 0 #define DRAW_TYPE_RED 1 diff --git a/src/d/d_bg_parts.cpp b/src/d/d_bg_parts.cpp index 3799fe52da0..d4e8ff019a6 100644 --- a/src/d/d_bg_parts.cpp +++ b/src/d/d_bg_parts.cpp @@ -6,6 +6,7 @@ #include "f_op/f_op_camera_mng.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" +#include void dBgp_c::material_c::draw() { material_c* material = this; diff --git a/src/d/d_cam_param.cpp b/src/d/d_cam_param.cpp index 015325d6a1e..45c45d60385 100644 --- a/src/d/d_cam_param.cpp +++ b/src/d/d_cam_param.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_player.h" #include "d/d_camera.h" #include "d/d_com_inf_game.h" +#include enum CameraFlags { CAM_PARAM_GAPX, CAM_PARAM_GAPZ, diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 9e7bf7c9d2c..4d3c2811630 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -21,6 +21,7 @@ #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" #include +#include #if DEBUG #include "d/d_debug_pad.h" diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 117d23da6f2..c2ec47a9862 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -23,6 +23,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include +#include void dComIfG_play_c::ct() { mWindowNum = 0; diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index 806efb56378..ee05d341706 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -17,6 +17,7 @@ #include "d/actor/d_grass.h" #include "d/actor/d_flower.h" #include +#include s16 const daObjMovebox::Act_c::M_dir_base[4] = { 0x0000, diff --git a/src/d/d_debug_camera.cpp b/src/d/d_debug_camera.cpp index b2ebdf699ea..10c5edd71f9 100644 --- a/src/d/d_debug_camera.cpp +++ b/src/d/d_debug_camera.cpp @@ -8,6 +8,7 @@ #include "JSystem/JHostIO/JORServer.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTReport.h" +#include namespace zevwork { const int CutMaxNum = 32; diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 023f1fcbdc4..9c38bcb3a2e 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -9,6 +9,7 @@ #include "d/actor/d_a_movie_player.h" #include "JSystem/JGadget/pointer.h" #include "JSystem/JGadget/define.h" +#include s16 dDemo_c::m_branchId = -1; diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index 1cd4c3e3b77..287aa9f3d8a 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -11,6 +11,7 @@ #include "m_Do/m_Do_lib.h" #include "d/d_drawlist.h" #include "d/actor/d_a_alink.h" +#include namespace { static bool isStageEvent(int param_0) { diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index 7958ea5fad3..cdf3a9efe8e 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -11,6 +11,7 @@ #include "d/actor/d_a_tag_mstop.h" #include "d/d_event_debug.h" #include "SSystem/SComponent/c_counter.h" +#include namespace { static u8 event_debug_evnt() { diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index 55ba5f71b9c..421ab79c737 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -13,6 +13,7 @@ #include "d/d_msg_object.h" #include "m_Do/m_Do_graphic.h" #include "SSystem/SComponent/c_counter.h" +#include inline BOOL dEvDtFlagCheck(int i_flag) { return dComIfGp_getEventManager().getFlags().flagCheck(i_flag); diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index 668e948ecfb..16161b5ee79 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -9,6 +9,7 @@ #include "JSystem/J3DGraphBase/J3DTexture.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +#include void dEyeHL_c::entry(J3DModelData* p_mData, char const* name) { J3DTexture* tex = p_mData->getTexture(); diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index 313d73bb5cb..8c64684010b 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -12,6 +12,7 @@ #include "d/d_meter2_info.h" #include "d/d_pane_class_alpha.h" #include +#include dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) { mArchive = i_archive; diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 19db401276f..b2104bc00a6 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -21,6 +21,7 @@ #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include static s32 SelStartFrameTbl[3] = { 59, diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 4bf16c7e42d..6b4838c3b71 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -12,6 +12,7 @@ #include "d/d_pane_class.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/J2DGraph/J2DGrafContext.h" +#include class dGov_HIO_c : public mDoHIO_entry_c { public: diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index 905ec191eb7..0a7314fb31d 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -8,6 +8,7 @@ #include "d/d_item.h" #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" +#include static void (*item_func_ptr[256])() = { item_func_HEART, diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp index c50b551992a..7cf0d4af2b7 100644 --- a/src/d/d_jnt_col.cpp +++ b/src/d/d_jnt_col.cpp @@ -12,6 +12,7 @@ #include "SSystem/SComponent/c_m3d_g_cyl.h" #include "d/d_debug_viewer.h" #include "f_op/f_op_actor_mng.h" +#include #if DEBUG dJntCol_HIO_c l_HIO; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 1a8596eb742..8ac0947461e 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -25,6 +25,7 @@ #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" #include +#include static void GxXFog_set(); diff --git a/src/d/d_kankyo_debug.cpp b/src/d/d_kankyo_debug.cpp index 973f2811193..db88bf37d3b 100644 --- a/src/d/d_kankyo_debug.cpp +++ b/src/d/d_kankyo_debug.cpp @@ -7,6 +7,7 @@ #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include static void add_update_proc(u8* mode, s16* param_1, s16* param_2, s16* param_3) { int value; diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 3769ab6f10a..73e9af07ccb 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -11,6 +11,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" +#include static void vectle_calc(DOUBLE_POS* i_pos, cXyz* o_out) { double s = sqrt(i_pos->x * i_pos->x + i_pos->y * i_pos->y + i_pos->z * i_pos->z); diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 77545a769cc..0dd064f69ac 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -13,6 +13,7 @@ #include "d/d_kankyo_rain.h" #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_kankyo_mng.h" +#include #define EF_THUNDER01_BMD 0x1E #define EF_THUNDER02_BMD 0x1F diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index d3223fd46c6..92d4b97b8e6 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -8,6 +8,7 @@ #include "d/d_kyeff.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_wether.h" +#include #if DEBUG class dKyeff_HIO_c : public JORReflexible { diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp index 6678e6d9afc..2455f691be7 100644 --- a/src/d/d_map.cpp +++ b/src/d/d_map.cpp @@ -13,6 +13,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" +#include #if DEBUG void dMap_HIO_c::genMessage(JORMContext* mctx) { diff --git a/src/d/d_map_path.cpp b/src/d/d_map_path.cpp index 7e39f4a6852..2ddd0815ec4 100644 --- a/src/d/d_map_path.cpp +++ b/src/d/d_map_path.cpp @@ -12,6 +12,7 @@ #include "d/d_com_inf_game.h" #include "d/d_map_path.h" #include "m_Do/m_Do_lib.h" +#include void dMpath_n::dTexObjAggregate_c::create() { static int const data[7] = { diff --git a/src/d/d_map_path_fmap.cpp b/src/d/d_map_path_fmap.cpp index f3fbef9441e..8cf6a4a5806 100644 --- a/src/d/d_map_path_fmap.cpp +++ b/src/d/d_map_path_fmap.cpp @@ -2,6 +2,7 @@ #include "d/d_com_inf_game.h" #include "d/d_map_path_fmap.h" +#include void fmpTresTypeGroupDataList_c::addTypeGroupData(u8 i_typeGroupNo, dTres_c::data_s const* i_tresData) { diff --git a/src/d/d_menu_calibration.cpp b/src/d/d_menu_calibration.cpp index 72ec058eec2..69f28f41090 100644 --- a/src/d/d_menu_calibration.cpp +++ b/src/d/d_menu_calibration.cpp @@ -12,6 +12,7 @@ #include "d/d_meter_HIO.h" #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" +#include // Need 0xC bytes of padding with no symbol between dMenu_Calibration_c::__vtable and the end of .data // This is likely caused by the vtable of an abstract base class getting put there and then stripped out. diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index 0351608c18d..ba9728c1a5a 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -28,6 +28,7 @@ #include "d/d_lib.h" #include "d/d_meter2_info.h" #include +#include #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_mtx.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index b20fcedee07..70367af4e3a 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -23,6 +23,7 @@ #include "d/d_menu_window.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_graphic.h" +#include #if (PLATFORM_WII || PLATFORM_SHIELD) #define POINTER_OPT dComIfGs_getOptPointer() diff --git a/src/d/d_menu_fishing.cpp b/src/d/d_menu_fishing.cpp index 09aa3b057a1..315d820e59f 100644 --- a/src/d/d_menu_fishing.cpp +++ b/src/d/d_menu_fishing.cpp @@ -14,6 +14,7 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include typedef void (dMenu_Fishing_c::*initFunc)(); initFunc map_init_process[] = { diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index 5c89256e06e..a9e88c8696d 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -6,6 +6,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" #include +#include #include "f_op/f_op_msg_mng.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" diff --git a/src/d/d_menu_fmap2D.cpp b/src/d/d_menu_fmap2D.cpp index 3815e83bad6..20d798b9472 100644 --- a/src/d/d_menu_fmap2D.cpp +++ b/src/d/d_menu_fmap2D.cpp @@ -17,6 +17,7 @@ #include "d/d_msg_scrn_explain.h" #include "m_Do/m_Do_graphic.h" #include "d/actor/d_a_midna.h" +#include dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { dMeter2Info_setMapDrugFlag(0); diff --git a/src/d/d_menu_fmap_map.cpp b/src/d/d_menu_fmap_map.cpp index fb518454978..39e23e5ef84 100644 --- a/src/d/d_menu_fmap_map.cpp +++ b/src/d/d_menu_fmap_map.cpp @@ -8,6 +8,7 @@ #include "d/d_debug_viewer.h" #include "d/d_menu_fmap_map.h" #include "m_Do/m_Do_graphic.h" +#include static u8 twoValueLineInterpolation(u8 i_value1, u8 i_value2, f32 i_param) { return (u8)((f32)i_value1 + i_param * ((f32)i_value2 - (f32)i_value1)); diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index c8f8cc6d51a..239195a51b4 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -20,6 +20,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include +#include typedef void (dMenu_Insect_c::*initFunc)(); static initFunc map_init_process[] = { diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index 0f2f0fcf55b..0e4fd1ffe98 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -10,6 +10,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTTexture.h" #include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index faf96802cb7..ee1be7dc6aa 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -11,6 +11,7 @@ #include "d/d_meter_HIO.h" #include "d/d_msg_string.h" #include +#include #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "d/d_msg_scrn_arrow.h" diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index 823ea577fc1..78ff06dc244 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -4,6 +4,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" #include +#include #include "d/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" diff --git a/src/d/d_menu_skill.cpp b/src/d/d_menu_skill.cpp index 8aaececff30..59a46103091 100644 --- a/src/d/d_menu_skill.cpp +++ b/src/d/d_menu_skill.cpp @@ -16,6 +16,7 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include typedef void (dMenu_Skill_c::*initFunc)(); static initFunc map_init_process[] = { diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index e4261c8d3e6..28cebd533b6 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -22,6 +22,7 @@ #include "d/d_meter_string.h" #include "f_op/f_op_msg_mng.h" #include "d/actor/d_a_horse.h" +#include int dMeter2_c::_create() { stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo(); diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index 138c15eb33c..dba0acf6fb7 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -11,6 +11,7 @@ #include "d/d_meter_map.h" #include "d/d_msg_class.h" #include "d/d_msg_object.h" +#include enum ITEMICON_RES_FILE_ID { ITEMICON_BTI_ARI_MESU_00=0x3, diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index 7d3513aaded..73fe999993d 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -10,6 +10,7 @@ #include "d/d_menu_fmap_map.h" #include "d/d_meter_map.h" #include "m_Do/m_Do_ext.h" +#include dMeter_menuHIO_c::dMeter_menuHIO_c() { mGameover = 70; diff --git a/src/d/d_meter_button.cpp b/src/d/d_meter_button.cpp index 7147e97bc33..82be060e441 100644 --- a/src/d/d_meter_button.cpp +++ b/src/d/d_meter_button.cpp @@ -16,6 +16,7 @@ #include "d/d_msg_out_font.h" #include "d/d_msg_string.h" #include "d/d_pane_class.h" +#include #if VERSION == VERSION_GCN_JPN #define STR_BUF_LEN 528 diff --git a/src/d/d_meter_hakusha.cpp b/src/d/d_meter_hakusha.cpp index ab9a0fc833a..8e11b767572 100644 --- a/src/d/d_meter_hakusha.cpp +++ b/src/d/d_meter_hakusha.cpp @@ -13,6 +13,7 @@ #include "d/d_meter2_info.h" #include "d/d_meter_HIO.h" #include "d/d_pane_class.h" +#include dMeterHakusha_c::dMeterHakusha_c(void* i_screen) { field_0x004 = (J2DScreen*)i_screen; diff --git a/src/d/d_meter_map.cpp b/src/d/d_meter_map.cpp index 08050a230d7..79bffe00183 100644 --- a/src/d/d_meter_map.cpp +++ b/src/d/d_meter_map.cpp @@ -16,6 +16,7 @@ #include "f_op/f_op_overlap_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "d/d_camera.h" +#include #if (PLATFORM_WII || PLATFORM_SHIELD) dMeter_map_HIO_c g_meter_mapHIO; diff --git a/src/d/d_meter_string.cpp b/src/d/d_meter_string.cpp index c416244d18c..cd0b4025050 100644 --- a/src/d/d_meter_string.cpp +++ b/src/d/d_meter_string.cpp @@ -16,6 +16,7 @@ #include "d/d_meter2_info.h" #include "d/d_meter_HIO.h" #include "d/d_pane_class.h" +#include dMeterString_c::dMeterString_c(int i_stringID) { mpMapArchive = dComIfGp_getAllMapArchive(); diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index eb9e9552f03..1c7edf2dd43 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -2,6 +2,7 @@ #include "d/d_msg_class.h" #include +#include #include "d/d_meter2_info.h" #include "d/d_msg_object.h" #include "d/d_msg_unit.h" diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index 29075fe5977..ef60b8ab695 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -13,6 +13,7 @@ #include "d/actor/d_a_myna.h" #include "d/actor/d_a_obj_ss_base.h" #include "SSystem/SComponent/c_math.h" +#include dMsgFlow_c::dMsgFlow_c() { mNonStopJunpFlowFlag = 0; diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 920c35d2cf2..aa2a6957aa8 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -23,6 +23,7 @@ #include "d/actor/d_a_midna.h" #include "f_op/f_op_msg_mng.h" #include +#include #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_lib.h" #include "JSystem/JKernel/JKRExpHeap.h" diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index 60d1379b50b..a68029cc233 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -12,6 +12,7 @@ #include "d/d_pane_class.h" #include "m_Do/m_Do_controller_pad.h" #include +#include #if VERSION == VERSION_GCN_JPN #define STR_BUF_LEN 528 diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp index e6cd7f582af..e85eaa69072 100644 --- a/src/d/d_msg_scrn_item.cpp +++ b/src/d/d_msg_scrn_item.cpp @@ -22,6 +22,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTTexture.h" +#include dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { if (param_3 != NULL) { diff --git a/src/d/d_msg_scrn_jimaku.cpp b/src/d/d_msg_scrn_jimaku.cpp index 53d83df3207..d921c160d3b 100644 --- a/src/d/d_msg_scrn_jimaku.cpp +++ b/src/d/d_msg_scrn_jimaku.cpp @@ -13,6 +13,7 @@ #include "d/d_msg_object.h" #include "d/d_msg_scrn_light.h" #include "d/d_pane_class.h" +#include dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { if (i_heap != NULL) { diff --git a/src/d/d_msg_scrn_talk.cpp b/src/d/d_msg_scrn_talk.cpp index 5324728edcc..6bc36825161 100644 --- a/src/d/d_msg_scrn_talk.cpp +++ b/src/d/d_msg_scrn_talk.cpp @@ -18,6 +18,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" +#include dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { if (param_3 != NULL) { diff --git a/src/d/d_msg_string_base.cpp b/src/d/d_msg_string_base.cpp index 2e3124e6bd2..2a57a87fb87 100644 --- a/src/d/d_msg_string_base.cpp +++ b/src/d/d_msg_string_base.cpp @@ -10,6 +10,7 @@ #include "d/d_meter2_info.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/J2DGraph/J2DTextBox.h" +#include dMsgStringBase_c::dMsgStringBase_c() { field_0x20 = 0; diff --git a/src/d/d_msg_unit.cpp b/src/d/d_msg_unit.cpp index 7ea51119587..bfa7d7b6670 100644 --- a/src/d/d_msg_unit.cpp +++ b/src/d/d_msg_unit.cpp @@ -3,6 +3,7 @@ #include "d/d_msg_unit.h" #include "d/d_com_inf_game.h" #include +#include #include "d/d_kankyo.h" #include "d/d_meter2_info.h" diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index e45a9ee0d1d..f83eda6abb3 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -7,6 +7,7 @@ #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_controller_pad.h" #include +#include #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index f39c537ed60..88b32030490 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -17,6 +17,7 @@ #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_graphic.h" #include +#include dRes_info_c::dRes_info_c() { mCount = 0; diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index e9052227173..5ccdcd95a2a 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -17,6 +17,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" +#include #if PLATFORM_WII #include "d/d_cursor_mng.h" diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index bc7414f8e4a..8fb2ff819b2 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -20,6 +20,7 @@ #include "JSystem/JUtility/JUTReport.h" #include +#include #if DEBUG void dScnMenu_setItem(int i_slotNo, u8 i_itemNo); diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 5e6e97467d4..69512ffea20 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -26,6 +26,7 @@ #include "m_Do/m_Do_graphic.h" #include "d/actor/d_a_suspend.h" #include "d/actor/d_a_ykgr.h" +#include #if PLATFORM_WII #include "d/d_cursor_mng.h" diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 9b858680ff1..4e87bcef371 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -12,6 +12,7 @@ #include "d/d_bg_parts.h" #include "m_Do/m_Do_Reset.h" #include +#include static int dScnRoom_Draw(room_of_scene_class* i_this) { return 1; diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 8d54b31fa08..01bdb19ddfb 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -14,6 +14,7 @@ #include "d/d_save_init.h" #include "f_op/f_op_scene_mng.h" #include +#include #if PLATFORM_WII || PLATFORM_SHIELD #include diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp index c2fc86ab0de..6bbd3faa911 100644 --- a/src/d/d_select_cursor.cpp +++ b/src/d/d_select_cursor.cpp @@ -5,6 +5,7 @@ #include "d/d_com_inf_game.h" #include "JSystem/J2DGraph/J2DAnimation.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" +#include dSelect_cursorHIO_c::dSelect_cursorHIO_c() { field_0x8 = 1.0f; diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp index 155e010da15..a10ef7556e2 100644 --- a/src/d/d_shop_system.cpp +++ b/src/d/d_shop_system.cpp @@ -17,6 +17,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_lib.h" #include "d/actor/d_a_tag_shop_item.h" +#include static daTag_ShopItem_c* dShopSystem_itemActor[7] = { diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 22d3b156fb8..22e7b00c64b 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -20,6 +20,7 @@ #include "global.h" #include "m_Do/m_Do_Reset.h" #include +#include void dStage_nextStage_c::set(const char* i_stage, s8 i_roomId, s16 i_point, s8 i_layer, s8 i_wipe, u8 i_speed) { diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 4bb87da478d..4ae3a54280e 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -21,6 +21,7 @@ #include "d/d_pane_class.h" #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_lib.h" +#include static int dTimer_createStart2D(s32 param_0, u16 param_1); diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp index b03bdc25617..014d0b1e3a5 100644 --- a/src/f_ap/f_ap_game.cpp +++ b/src/f_ap/f_ap_game.cpp @@ -19,6 +19,7 @@ #include "d/d_model.h" #include "d/actor/d_a_grass.h" #include "d/d_tresure.h" +#include fapGm_HIO_c::fapGm_HIO_c() { mUsingHostIO = true; diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp index 1467bd56c25..29c72ac1876 100644 --- a/src/m_Do/m_Do_MemCard.cpp +++ b/src/m_Do/m_Do_MemCard.cpp @@ -13,6 +13,7 @@ #if PLATFORM_WII || PLATFORM_SHIELD #include #include +#include #endif #define SLOT_A 0 diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index d04abc96eef..d1d0352daac 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -9,6 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_save.h" #include +#include #if VERSION == VERSION_GCN_JPN #define HEADER_TITLE "ゼルダの伝説 ﾄﾜｲﾗｲﾄﾌﾟﾘﾝｾｽ" diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 7f4bf6f8f90..310fe4f5b1c 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -23,6 +23,7 @@ #include "m_Do/m_Do_main.h" #include "m_Do/m_Do_mtx.h" #include +#include u8 mDoExt::CurrentHeapAdjustVerbose; u8 mDoExt::HeapAdjustVerbose; diff --git a/src/m_Do/m_Do_ext2.cpp b/src/m_Do/m_Do_ext2.cpp index 9d4c18228f3..2dad761fc70 100644 --- a/src/m_Do/m_Do_ext2.cpp +++ b/src/m_Do/m_Do_ext2.cpp @@ -2,6 +2,7 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "m_Do/m_Do_ext2.h" +#include FixedMemoryCheck* FixedMemoryCheck::sFirst; diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 08842cd7920..5fab98666f5 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -31,6 +31,7 @@ #include "d/d_meter2_info.h" #include "d/d_s_play.h" #include "DynamicLink.h" +#include #if PLATFORM_WII || PLATFORM_SHIELD #include From ebe7c7aabc32e0842aaaf1c5cf1ab6cf5737417f Mon Sep 17 00:00:00 2001 From: Max Roncace Date: Sat, 28 Feb 2026 15:13:57 -0500 Subject: [PATCH 08/35] ShieldD: Clean up a bunch of 99% matching TUs (#3113) * d_a_npc_ks debug code 100% * d_a_npc_rafrel debug code 100% * d_a_npc_inko minor improvements * d_a_npc_gro debug code 100% * d_a_npc_pachi_taro debug code 100% * d_a_npc_passer debug code 100% * d_a_npc_pachi_maro debug code 100% * d_a_npc_post debug code 100% * d_a_obj_bemos debug improvements * d_a_obj_scannon_ten debug code 100% * d_a_b_mgn debug code 100% * d_a_e_fb debug code 100% * d_a_e_gb debug code 100% * d_a_e_hz debug code 100% * d_a_e_cr_egg debug code 100% * d_a_e_md debug code 100% * d_a_e_wb debug code 100% * d_a_obj_mirror_6pole debug code 100% * d_a_obj_spinLift debug data fixes * d_a_obj_pdwall debug data fixes * d_a_obj_ss_drink debug code almost matching * d_a_obj_poFire debug code 100% * d_a_obj_picture debug code 100% * d_a_obj_dust debug code 100% * d_a_obj_fallobj debug code 100% * d_a_obj_itamato debug code almost matching * d_a_obj_syRock debug code 100% * d_a_obj_katatsumuri debug code 100% * d_a_obj_wood_statue debug code 100% * d_a_obj_lv6egate debug code 100% * d_a_tag_qs minor debug symbol fixes * d_a_obj_twGate debug code 100% * d_a_obj_lv6SwGate debug code 100% * d_a_obj_lv6swturn debug code 100% * d_a_obj_lv6Tenbin debug code 100% * d_a_obj_kwheel01 debug code 100% * Fix RTTI order regression (cM3dGCyl vs cBgS_*) --- config/ShieldD/rels/d_a_b_mgnD/splits.txt | 2 +- config/ShieldD/rels/d_a_b_mgnD/symbols.txt | 14 +- config/ShieldD/rels/d_a_e_cr_eggD/symbols.txt | 6 +- config/ShieldD/rels/d_a_e_fbD/symbols.txt | 16 +- config/ShieldD/rels/d_a_e_gbD/splits.txt | 2 +- config/ShieldD/rels/d_a_e_gbD/symbols.txt | 8 +- config/ShieldD/rels/d_a_e_hzD/symbols.txt | 17 +- config/ShieldD/rels/d_a_e_mdD/symbols.txt | 4 +- config/ShieldD/rels/d_a_e_wbD/symbols.txt | 31 +- config/ShieldD/rels/d_a_npc_groD/symbols.txt | 20 +- config/ShieldD/rels/d_a_npc_inkoD/symbols.txt | 10 +- config/ShieldD/rels/d_a_npc_ksD/symbols.txt | 14 +- .../rels/d_a_npc_pachi_maroD/symbols.txt | 19 +- .../rels/d_a_npc_pachi_taroD/symbols.txt | 19 +- .../ShieldD/rels/d_a_npc_passerD/symbols.txt | 6 +- config/ShieldD/rels/d_a_npc_postD/symbols.txt | 21 +- .../ShieldD/rels/d_a_npc_rafrelD/symbols.txt | 18 +- .../ShieldD/rels/d_a_obj_bemosD/symbols.txt | 25 +- config/ShieldD/rels/d_a_obj_dustD/symbols.txt | 4 +- .../ShieldD/rels/d_a_obj_fallobjD/symbols.txt | 14 +- .../ShieldD/rels/d_a_obj_itamatoD/symbols.txt | 10 +- .../rels/d_a_obj_katatsumuriD/splits.txt | 2 +- .../rels/d_a_obj_katatsumuriD/symbols.txt | 12 +- .../rels/d_a_obj_kwheel01D/symbols.txt | 10 +- .../rels/d_a_obj_lv6SwGateD/symbols.txt | 14 +- .../rels/d_a_obj_lv6TenbinD/symbols.txt | 10 +- .../rels/d_a_obj_lv6egateD/symbols.txt | 6 +- .../rels/d_a_obj_lv6swturnD/symbols.txt | 14 +- .../rels/d_a_obj_mirror_6poleD/symbols.txt | 14 +- .../ShieldD/rels/d_a_obj_pdwallD/symbols.txt | 14 +- .../ShieldD/rels/d_a_obj_pictureD/symbols.txt | 14 +- .../ShieldD/rels/d_a_obj_poFireD/symbols.txt | 4 +- .../rels/d_a_obj_scannon_tenD/symbols.txt | 18 +- .../rels/d_a_obj_spinLiftD/symbols.txt | 14 +- .../rels/d_a_obj_ss_drinkD/symbols.txt | 6 +- .../ShieldD/rels/d_a_obj_syRockD/symbols.txt | 14 +- .../ShieldD/rels/d_a_obj_twGateD/symbols.txt | 14 +- .../rels/d_a_obj_wood_statueD/symbols.txt | 6 +- config/ShieldD/rels/d_a_tag_qsD/symbols.txt | 4 +- include/d/actor/d_a_e_md.h | 2 +- include/d/actor/d_a_itembase.h | 1 + include/d/actor/d_a_obj_itamato.h | 32 +- include/d/actor/d_a_obj_katatsumuri.h | 19 - include/d/actor/d_a_obj_mirror_6pole.h | 10 +- include/d/actor/d_a_obj_scannon_ten.h | 6 +- include/d/actor/d_a_obj_twGate.h | 10 - include/d/d_attention.h | 6 +- include/d/d_bg_w.h | 2 +- include/d/d_com_inf_game.h | 6 +- include/d/d_s_play.h | 1 + include/d/dolzel_base.pch | 1 + include/f_op/f_op_actor_mng.h | 1 + include/f_op/f_op_scene_tag.h | 1 - include/f_pc/f_pc_create_req.h | 7 +- include/f_pc/f_pc_stdcreate_req.h | 20 - src/d/actor/d_a_b_mgn.cpp | 5 +- src/d/actor/d_a_e_cr_egg.cpp | 8 +- src/d/actor/d_a_e_fb.cpp | 24 +- src/d/actor/d_a_e_gb.cpp | 383 +++++++++--------- src/d/actor/d_a_e_hz.cpp | 262 ++++++------ src/d/actor/d_a_e_md.cpp | 68 ++-- src/d/actor/d_a_e_wb.cpp | 207 +++++----- src/d/actor/d_a_npc_gro.cpp | 30 +- src/d/actor/d_a_npc_inko.cpp | 45 +- src/d/actor/d_a_npc_ks.cpp | 28 +- src/d/actor/d_a_npc_pachi_maro.cpp | 52 ++- src/d/actor/d_a_npc_pachi_taro.cpp | 151 +++---- src/d/actor/d_a_npc_passer.cpp | 56 +-- src/d/actor/d_a_npc_post.cpp | 146 +++---- src/d/actor/d_a_npc_rafrel.cpp | 4 +- src/d/actor/d_a_obj_bemos.cpp | 206 ++++++---- src/d/actor/d_a_obj_dust.cpp | 26 +- src/d/actor/d_a_obj_fallobj.cpp | 49 +-- src/d/actor/d_a_obj_itamato.cpp | 66 +-- src/d/actor/d_a_obj_katatsumuri.cpp | 35 +- src/d/actor/d_a_obj_kwheel01.cpp | 162 ++++---- src/d/actor/d_a_obj_lv6SwGate.cpp | 10 +- src/d/actor/d_a_obj_lv6Tenbin.cpp | 20 +- src/d/actor/d_a_obj_lv6egate.cpp | 26 +- src/d/actor/d_a_obj_lv6swturn.cpp | 16 +- src/d/actor/d_a_obj_pdwall.cpp | 16 +- src/d/actor/d_a_obj_picture.cpp | 3 +- src/d/actor/d_a_obj_poFire.cpp | 4 +- src/d/actor/d_a_obj_scannon_ten.cpp | 46 ++- src/d/actor/d_a_obj_spinLift.cpp | 6 +- src/d/actor/d_a_obj_ss_drink.cpp | 21 +- src/d/actor/d_a_obj_syRock.cpp | 126 +++--- src/d/actor/d_a_obj_twGate.cpp | 32 +- src/d/actor/d_a_obj_wood_statue.cpp | 85 ++-- src/f_pc/f_pc_create_req.cpp | 1 + src/f_pc/f_pc_fstcreate_req.cpp | 1 + src/f_pc/f_pc_stdcreate_req.cpp | 13 + 92 files changed, 1753 insertions(+), 1281 deletions(-) diff --git a/config/ShieldD/rels/d_a_b_mgnD/splits.txt b/config/ShieldD/rels/d_a_b_mgnD/splits.txt index 844de77e48b..2a84f81103c 100644 --- a/config/ShieldD/rels/d_a_b_mgnD/splits.txt +++ b/config/ShieldD/rels/d_a_b_mgnD/splits.txt @@ -14,4 +14,4 @@ d/actor/d_a_b_mgn.cpp: .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000002AC .data start:0x00000000 end:0x00000734 - .bss start:0x00000004 end:0x00000028 + .bss start:0x00000000 end:0x00000028 diff --git a/config/ShieldD/rels/d_a_b_mgnD/symbols.txt b/config/ShieldD/rels/d_a_b_mgnD/symbols.txt index 21d253a8067..8edfe0dec0d 100644 --- a/config/ShieldD/rels/d_a_b_mgnD/symbols.txt +++ b/config/ShieldD/rels/d_a_b_mgnD/symbols.txt @@ -231,7 +231,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @122971 = .rodata:0x00000284; // type:object size:0x4 scope:local align:4 data:float cNullVec__6Z2Calc = .rodata:0x00000288; // type:object size:0xC scope:global @46916 = .rodata:0x00000294; // type:object size:0x4 scope:local -lbl_139_rodata_298 = .rodata:0x00000298; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000298; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000002A0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000002A8; // type:object size:0x4 align:4 data:float @LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_prim = .data:0x00000000; // type:object size:0x8 scope:local @LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_env@0 = .data:0x00000008; // type:object size:0x8 scope:local @LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@eff_id@1 = .data:0x00000010; // type:object size:0x6 scope:local @@ -294,6 +296,14 @@ lbl_139_data_440 = .data:0x00000440; // type:object size:0x24 @123082 = .data:0x00000648; // type:object size:0xC scope:local @123083 = .data:0x0000066C; // type:object size:0x11 scope:local data:string @123084 = .data:0x00000694; // type:object size:0xD scope:local data:string -lbl_139_data_6A1 = .data:0x000006A1; // type:object size:0x93 +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x000006B0; // type:object size:0x5 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x000006B8; // type:object size:0xF scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x000006C8; // type:object size:0x14 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x000006DC; // type:object size:0xF scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x000006EC; // type:object size:0x5 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x000006F4; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000708; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x0000071C; // type:object size:0x14 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000730; // type:object size:0x3 scope:local data:string hio_set = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte l_HIO = .bss:0x00000004; // type:object size:0x24 scope:global data:byte diff --git a/config/ShieldD/rels/d_a_e_cr_eggD/symbols.txt b/config/ShieldD/rels/d_a_e_cr_eggD/symbols.txt index 99508c1b30a..de37f54aaa9 100644 --- a/config/ShieldD/rels/d_a_e_cr_eggD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_cr_eggD/symbols.txt @@ -30,7 +30,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @116845 = .rodata:0x00000038; // type:object size:0x4 scope:local align:4 data:float cNullVec__6Z2Calc = .rodata:0x0000003C; // type:object size:0xC scope:global @46916 = .rodata:0x00000048; // type:object size:0x4 scope:local -lbl_172_rodata_4C = .rodata:0x0000004C; // type:object size:0x18 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000050; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000058; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000060; // type:object size:0x4 align:4 data:float @LOCAL@e_cr_egg_move__FP14e_cr_egg_class@spy = .data:0x00000000; // type:object size:0xC scope:local @116895 = .data:0x0000000C; // type:object size:0x1B scope:local data:string @116896 = .data:0x00000028; // type:object size:0x5 scope:local data:string @@ -60,4 +62,4 @@ lbl_172_data_178 = .data:0x00000178; // type:object size:0x24 @117050 = .data:0x000002F8; // type:object size:0x10 scope:local data:string @117051 = .data:0x0000031C; // type:object size:0x9 scope:local data:string @117052 = .data:0x0000033C; // type:object size:0x9 scope:local data:string -lbl_172_data_345 = .data:0x00000345; // type:object size:0xF +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000350; // type:object size:0x3 data:string diff --git a/config/ShieldD/rels/d_a_e_fbD/symbols.txt b/config/ShieldD/rels/d_a_e_fbD/symbols.txt index 64f5efc8aa3..e370f1f2534 100644 --- a/config/ShieldD/rels/d_a_e_fbD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_fbD/symbols.txt @@ -81,7 +81,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @117898 = .rodata:0x000000A0; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x000000A4; // type:object size:0xC scope:global @46916 = .rodata:0x000000B0; // type:object size:0x4 scope:local -lbl_179_rodata_B4 = .rodata:0x000000B4; // type:object size:0x18 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000B8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000C0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000C8; // type:object size:0x4 align:4 data:float @117003 = .data:0x00000000; // type:object size:0xF scope:local @117004 = .data:0x00000010; // type:object size:0xD scope:local @117007 = .data:0x00000020; // type:object size:0x13 scope:local @@ -142,8 +144,16 @@ lbl_179_data_320 = .data:0x00000320; // type:object size:0x24 @118009 = .data:0x00000508; // type:object size:0xC scope:local @118010 = .data:0x0000052C; // type:object size:0x11 scope:local data:string @118011 = .data:0x00000554; // type:object size:0xD scope:local data:string -lbl_179_data_561 = .data:0x00000561; // type:object size:0x93 +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000570; // type:object size:0x5 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000578; // type:object size:0xF scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000588; // type:object size:0x14 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x0000059C; // type:object size:0xF scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x000005AC; // type:object size:0x5 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x000005B4; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x000005C8; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x000005DC; // type:object size:0x14 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000005F0; // type:object size:0x3 scope:local data:string hio_set = .bss:0x00000000; // type:object size:0x1 scope:local data:byte l_HIO = .bss:0x00000004; // type:object size:0x24 scope:global data:byte mFireTimer = .bss:0x00000028; // type:object size:0x4 scope:global data:4byte -lbl_179_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte +lbl_188_bss_7C = .bss:0x0000002C; // type:object size:0x1 data:byte diff --git a/config/ShieldD/rels/d_a_e_gbD/splits.txt b/config/ShieldD/rels/d_a_e_gbD/splits.txt index 6fd046b30a4..35e79ce364a 100644 --- a/config/ShieldD/rels/d_a_e_gbD/splits.txt +++ b/config/ShieldD/rels/d_a_e_gbD/splits.txt @@ -14,4 +14,4 @@ d/actor/d_a_e_gb.cpp: .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000001D4 .data start:0x00000000 end:0x00000644 - .bss start:0x00000008 end:0x00000028 + .bss start:0x00000000 end:0x00000028 diff --git a/config/ShieldD/rels/d_a_e_gbD/symbols.txt b/config/ShieldD/rels/d_a_e_gbD/symbols.txt index d1d4b707f4c..271c35ffede 100644 --- a/config/ShieldD/rels/d_a_e_gbD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_gbD/symbols.txt @@ -156,7 +156,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @120500 = .rodata:0x000001A8; // type:object size:0x4 scope:local align:4 data:float cNullVec__6Z2Calc = .rodata:0x000001AC; // type:object size:0xC scope:global @46916 = .rodata:0x000001B8; // type:object size:0x4 scope:local -lbl_183_rodata_1BC = .rodata:0x000001BC; // type:object size:0x18 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000001C0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000001C8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000001D0; // type:object size:0x4 align:4 data:float @LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_prim = .data:0x00000000; // type:object size:0x8 scope:local @LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_env@0 = .data:0x00000008; // type:object size:0x8 scope:local @LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@eff_id@1 = .data:0x00000010; // type:object size:0x6 scope:local @@ -219,6 +221,6 @@ lbl_183_data_3D0 = .data:0x000003D0; // type:object size:0x24 @120617 = .data:0x000005D8; // type:object size:0xC scope:local @120618 = .data:0x000005FC; // type:object size:0x11 scope:local data:string @120619 = .data:0x00000624; // type:object size:0xD scope:local data:string -lbl_183_data_631 = .data:0x00000631; // type:object size:0x13 -lbl_183_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000640; // type:object size:0x3 data:string +data_806C7928 = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000008; // type:object size:0x20 scope:global data:byte diff --git a/config/ShieldD/rels/d_a_e_hzD/symbols.txt b/config/ShieldD/rels/d_a_e_hzD/symbols.txt index bf20797347f..575edf3c1ea 100644 --- a/config/ShieldD/rels/d_a_e_hzD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_hzD/symbols.txt @@ -133,7 +133,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @122055 = .rodata:0x000000F0; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x000000F4; // type:object size:0xC scope:global @46916 = .rodata:0x00000100; // type:object size:0x4 scope:local -lbl_192_rodata_104 = .rodata:0x00000104; // type:object size:0x18 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000108; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000110; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000118; // type:object size:0x4 align:4 data:float @LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_prim = .data:0x00000000; // type:object size:0x8 scope:local @LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@e_env@0 = .data:0x00000008; // type:object size:0x8 scope:local @LOCAL@setMidnaBindEffect__FP13fopEn_enemy_cP15Z2CreatureEnemyP4cXyzP4cXyz@eff_id@1 = .data:0x00000010; // type:object size:0x6 scope:local @@ -193,11 +195,20 @@ lbl_192_data_308 = .data:0x00000308; // type:object size:0x24 @122166 = .data:0x000004E0; // type:object size:0xE scope:local data:string @122167 = .data:0x000004F0; // type:object size:0xC scope:local @122168 = .data:0x00000514; // type:object size:0x11 scope:local data:string -lbl_192_data_525 = .data:0x00000525; // type:object size:0x8F +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000530; // type:object size:0x5 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000538; // type:object size:0xF scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000548; // type:object size:0x14 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x0000055C; // type:object size:0xF scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x0000056C; // type:object size:0x5 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x00000574; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000588; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x0000059C; // type:object size:0x14 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000005B0; // type:object size:0x3 scope:local data:string ...bss.0 = .bss:0x00000000; // type:label scope:local +hio_set = .bss:0x00000000; // type:object size:0x1 scope:global data:byte l_HIO = .bss:0x00000004; // type:object size:0x3C scope:global data:byte m_near_bomb = .bss:0x00000040; // type:object size:0x4 scope:global m_near_carry = .bss:0x00000044; // type:object size:0x4 scope:global m_near_weapon = .bss:0x00000048; // type:object size:0x4 scope:global -lbl_192_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +@GUARD@setWaterEffect__8daE_HZ_cFv@sc = .bss:0x0000004C; // type:object size:0x1 data:byte @LOCAL@setWaterEffect__8daE_HZ_cFv@sc = .bss:0x00000050; // type:object size:0xC scope:local diff --git a/config/ShieldD/rels/d_a_e_mdD/symbols.txt b/config/ShieldD/rels/d_a_e_mdD/symbols.txt index 6928f5195de..de79b5d906b 100644 --- a/config/ShieldD/rels/d_a_e_mdD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_mdD/symbols.txt @@ -53,7 +53,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @118886 = .rodata:0x00000090; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000094; // type:object size:0xC scope:global @46916 = .rodata:0x000000A0; // type:object size:0x4 scope:local -lbl_199_rodata_A4 = .rodata:0x000000A4; // type:object size:0x18 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000A8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000B0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000B8; // type:object size:0x4 align:4 data:float @118502 = .data:0x00000000; // type:object size:0x5 scope:local data:string l_daE_MD_Method = .data:0x00000008; // type:object size:0x20 scope:global g_profile_E_MD = .data:0x00000028; // type:object size:0x30 scope:global diff --git a/config/ShieldD/rels/d_a_e_wbD/symbols.txt b/config/ShieldD/rels/d_a_e_wbD/symbols.txt index 9e69f4c5cfb..9374e2f8d1e 100644 --- a/config/ShieldD/rels/d_a_e_wbD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_wbD/symbols.txt @@ -437,7 +437,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @138571 = .rodata:0x00000554; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000558; // type:object size:0xC scope:global @46916 = .rodata:0x00000564; // type:object size:0x4 scope:local -lbl_235_rodata_568 = .rodata:0x00000568; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000568; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000570; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000578; // type:object size:0x4 align:4 data:float @134436 = .data:0x00000000; // type:object size:0xB scope:local @134437 = .data:0x0000000C; // type:object size:0xB scope:local @134440 = .data:0x00000018; // type:object size:0x11 scope:local @@ -538,30 +540,37 @@ __vt__18mDoExt_3DlineMat_c = .data:0x00000958; // type:object size:0x14 scope:gl @138563 = .data:0x00000AA0; // type:object size:0xE scope:local data:string @138564 = .data:0x00000AB0; // type:object size:0xC scope:local @138565 = .data:0x00000AD4; // type:object size:0x11 scope:local data:string -lbl_235_data_AE5 = .data:0x00000AE5; // type:object size:0x4B +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000AF0; // type:object size:0x5 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000AF8; // type:object size:0xF scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000B08; // type:object size:0x14 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000B1C; // type:object size:0xF scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000B2C; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global ...bss.0 = .bss:0x00000008; // type:label scope:local data:byte -lbl_235_bss_9 = .bss:0x00000009; // type:object size:0x1 data:byte -lbl_235_bss_A = .bss:0x0000000A; // type:object size:0x1 data:byte -lbl_235_bss_B = .bss:0x0000000B; // type:object size:0x1 data:byte +lbl_244_bss_45 = .bss:0x00000008; // type:object size:0x1 data:byte +lbl_244_bss_46 = .bss:0x00000009; // type:object size:0x1 data:byte +lbl_244_bss_47 = .bss:0x0000000A; // type:object size:0x1 data:byte +hio_set = .bss:0x0000000B; // type:object size:0x1 data:byte l_HIO = .bss:0x0000000C; // type:object size:0x5C scope:global data:byte @134689 = .bss:0x00000068; // type:object size:0xC scope:local b_path = .bss:0x00000078; // type:object size:0x60 scope:global @135400 = .bss:0x000000D8; // type:object size:0xC scope:local b_path2 = .bss:0x000000E8; // type:object size:0x60 scope:global -lbl_235_bss_148 = .bss:0x00000148; // type:object size:0x1 data:byte +@GUARD@arrow_rd_set__FP10e_wb_class@arrow_rd_pos = .bss:0x00000148; // type:object size:0x1 data:byte @LOCAL@arrow_rd_set__FP10e_wb_class@arrow_rd_pos = .bss:0x0000014C; // type:object size:0xC scope:local saku_p = .bss:0x00000158; // type:object size:0xC scope:global saku_p2 = .bss:0x00000164; // type:object size:0xC scope:global +@GUARD@e_wb_b_ikki__FP10e_wb_class@ikki_pos = .bss:0x00000170; // type:object size:0x1 scope:local data:byte @LOCAL@e_wb_b_ikki__FP10e_wb_class@ikki_pos = .bss:0x00000178; // type:object size:0x18 scope:local +@GUARD@e_wb_b_ikki__FP10e_wb_class@f_pos@0 = .bss:0x00000190; // type:object size:0x1 scope:local data:byte @LOCAL@e_wb_b_ikki__FP10e_wb_class@f_pos@0 = .bss:0x00000198; // type:object size:0x18 scope:local -lbl_235_bss_1B0 = .bss:0x000001B0; // type:object size:0x8 data:byte +@GUARD@e_wb_b_ikki2__FP10e_wb_class@ikki2_pos = .bss:0x000001B0; // type:object size:0x1 scope:local data:byte @LOCAL@e_wb_b_ikki2__FP10e_wb_class@ikki2_pos = .bss:0x000001B8; // type:object size:0x18 scope:local align:4 data:float -lbl_235_bss_1D0 = .bss:0x000001D0; // type:object size:0x1 data:byte -@LOCAL@effect_set__FP10e_wb_class@sc@3 = .bss:0x000001D4; // type:object size:0xC scope:local +@GUARD@effect_set__FP10e_wb_class@sc@3 = .bss:0x000001D0; // type:object size:0x1 scope:local data:byte +@LOCAL@effect_set__FP10e_wb_class@sc@3 = .bss:0x000001D4; // type:object size:0xC scope:local data:byte rd_count = .bss:0x000001E0; // type:object size:0x4 scope:global data:4byte -lbl_235_bss_1E4 = .bss:0x000001E4; // type:object size:0x1 data:byte +@GUARD@e_wb_c_run__FP10e_wb_class@sh_pos = .bss:0x000001E4; // type:object size:0x1 scope:local data:byte @LOCAL@e_wb_c_run__FP10e_wb_class@sh_pos = .bss:0x000001E8; // type:object size:0x24 scope:local -lbl_235_bss_20C = .bss:0x0000020C; // type:object size:0x1 data:byte +@GUARD@e_wb_c_run__FP10e_wb_class@sh_posH@0 = .bss:0x0000020C; // type:object size:0x1 scope:local data:byte @LOCAL@e_wb_c_run__FP10e_wb_class@sh_posH@0 = .bss:0x00000210; // type:object size:0x24 scope:local c_start = .bss:0x00000234; // type:object size:0x4 scope:global data:4byte diff --git a/config/ShieldD/rels/d_a_npc_groD/symbols.txt b/config/ShieldD/rels/d_a_npc_groD/symbols.txt index 75463eb86c4..153f5502305 100644 --- a/config/ShieldD/rels/d_a_npc_groD/symbols.txt +++ b/config/ShieldD/rels/d_a_npc_groD/symbols.txt @@ -142,7 +142,9 @@ m__17daNpc_grO_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob @125834 = .rodata:0x0000025C; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000260; // type:object size:0xC scope:global @46916 = .rodata:0x0000026C; // type:object size:0x4 scope:local -lbl_303_rodata_270 = .rodata:0x00000270; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000270; // type:object size:0x8 scope:local data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000278; // type:object size:0x8 scope:local data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000280; // type:object size:0x4 scope:local data:float @124426 = .data:0x00000000; // type:object size:0xC scope:local l_bmdGetParamList = .data:0x00000010; // type:object size:0x18 scope:global l_bckGetParamList = .data:0x00000028; // type:object size:0xB8 scope:global @@ -233,9 +235,21 @@ lbl_303_data_5E7 = .data:0x000005E7; // type:object size:0x2D @126214 = .data:0x00000838; // type:object size:0x11 scope:local data:string @126215 = .data:0x00000864; // type:object size:0xC scope:local data:string @126216 = .data:0x00000884; // type:object size:0xD scope:local data:string -lbl_303_data_891 = .data:0x00000891; // type:object size:0xDB +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x000008A0; // type:object size:0x5 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x000008A8; // type:object size:0xF scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x000008B8; // type:object size:0x14 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x000008CC; // type:object size:0xF scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x000008DC; // type:object size:0x5 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x000008E4; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x000008F8; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x0000090C; // type:object size:0x14 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs@2 = .data:0x00000920; // type:object size:0x5 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs@1 = .data:0x00000928; // type:object size:0x11 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs@0 = .data:0x0000093C; // type:object size:0x16 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs = .data:0x00000954; // type:object size:0x11 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000968; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @124480 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x74 scope:global -lbl_303_bss_88 = .bss:0x00000088; // type:object size:0x1 data:byte +@GUARD@setAttnPos__11daNpc_grO_cFv@eyeOffset = .bss:0x00000088; // type:object size:0x1 data:byte @LOCAL@setAttnPos__11daNpc_grO_cFv@eyeOffset = .bss:0x0000008C; // type:object size:0xC scope:local align:4 data:float diff --git a/config/ShieldD/rels/d_a_npc_inkoD/symbols.txt b/config/ShieldD/rels/d_a_npc_inkoD/symbols.txt index 6b1e682b1db..b0b39b1cc34 100644 --- a/config/ShieldD/rels/d_a_npc_inkoD/symbols.txt +++ b/config/ShieldD/rels/d_a_npc_inkoD/symbols.txt @@ -57,7 +57,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @119073 = .rodata:0x0000009C; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x000000A0; // type:object size:0xC scope:global @46916 = .rodata:0x000000AC; // type:object size:0x4 scope:local -lbl_313_rodata_B0 = .rodata:0x000000B0; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000B0; // type:object size:0x8 +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000B8; // type:object size:0x8 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000C0; // type:object size:0x4 @118624 = .data:0x00000000; // type:object size:0x9 scope:local data:string @LOCAL@daNpc_Inko_Execute__FP14npc_inko_class@mes_0 = .data:0x00000010; // type:object size:0x10 scope:local @LOCAL@daNpc_Inko_Execute__FP14npc_inko_class@mes_1@0 = .data:0x00000020; // type:object size:0x10 scope:local @@ -68,4 +70,8 @@ lbl_313_rodata_B0 = .rodata:0x000000B0; // type:object size:0x14 @119071 = .data:0x000000B0; // type:object size:0x21 scope:local data:string l_daNpc_Inko_Method = .data:0x000000D8; // type:object size:0x20 scope:global g_profile_NPC_INKO = .data:0x000000F8; // type:object size:0x30 scope:global -lbl_313_data_128 = .data:0x00000128; // type:object size:0x40 +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000128; // type:object size:0x5 data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000130; // type:object size:0xF data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000140; // type:object size:0x14 data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000154; // type:object size:0xF data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000164; // type:object size:0x3 data:string diff --git a/config/ShieldD/rels/d_a_npc_ksD/symbols.txt b/config/ShieldD/rels/d_a_npc_ksD/symbols.txt index bccced50944..c574c4637e4 100644 --- a/config/ShieldD/rels/d_a_npc_ksD/symbols.txt +++ b/config/ShieldD/rels/d_a_npc_ksD/symbols.txt @@ -432,7 +432,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @129036 = .rodata:0x00000514; // type:object size:0x4 scope:local align:4 data:float cNullVec__6Z2Calc = .rodata:0x00000518; // type:object size:0xC scope:global @46916 = .rodata:0x00000524; // type:object size:0x4 scope:local -lbl_323_rodata_528 = .rodata:0x00000528; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000528; // type:object size:0x8 scope:local data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000530; // type:object size:0x8 scope:local data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000538; // type:object size:0x4 scope:local data:float @124084 = .data:0x00000000; // type:object size:0x9 scope:local @124085 = .data:0x0000000C; // type:object size:0xA scope:local @124086 = .data:0x00000018; // type:object size:0x20 scope:local @@ -526,18 +528,22 @@ lbl_323_data_1C78 = .data:0x00001C78; // type:object size:0x24 @129144 = .data:0x00001E60; // type:object size:0xC scope:local @129145 = .data:0x00001E84; // type:object size:0x11 scope:local data:string @129146 = .data:0x00001EAC; // type:object size:0xD scope:local data:string -lbl_323_data_1EB9 = .data:0x00001EB9; // type:object size:0x4F +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00001EC8; // type:object size:0x5 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00001ED0; // type:object size:0xF scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00001EE0; // type:object size:0x14 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00001EF4; // type:object size:0xF scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00001F04; // type:object size:0x3 scope:local data:string ...bss.0 = .bss:0x00000000; // type:label scope:local obj_pos = .bss:0x00000000; // type:object size:0xC scope:global leader = .bss:0x0000000C; // type:object size:0x4 scope:global data:4byte call_pt = .bss:0x00000010; // type:object size:0x4 scope:global data:4byte -lbl_323_bss_14 = .bss:0x00000014; // type:object size:0x1 data:byte +hio_set = .bss:0x00000014; // type:object size:0x1 data:byte l_HIO = .bss:0x00000018; // type:object size:0x38 scope:global data:byte saru_p = .bss:0x00000050; // type:object size:0x20 scope:global data:4byte target_info = .bss:0x00000070; // type:object size:0x28 scope:global target_info_count = .bss:0x00000098; // type:object size:0x4 scope:global data:4byte target_bgc = .bss:0x000000A0; // type:object size:0x28 scope:global @LOCAL@npc_ks_hang__FP12npc_ks_class@start_pya = .bss:0x000000C8; // type:object size:0x2 scope:local data:2byte -lbl_323_bss_CA = .bss:0x000000CA; // type:object size:0x1 data:byte +@GUARD@npc_ks_option__FP12npc_ks_class@sc = .bss:0x000000CA; // type:object size:0x1 data:byte @LOCAL@npc_ks_option__FP12npc_ks_class@sc = .bss:0x000000CC; // type:object size:0xC scope:local c_start = .bss:0x000000D8; // type:object size:0x4 scope:global data:4byte diff --git a/config/ShieldD/rels/d_a_npc_pachi_maroD/symbols.txt b/config/ShieldD/rels/d_a_npc_pachi_maroD/symbols.txt index 9cdb65f1e21..a92c62336ff 100644 --- a/config/ShieldD/rels/d_a_npc_pachi_maroD/symbols.txt +++ b/config/ShieldD/rels/d_a_npc_pachi_maroD/symbols.txt @@ -152,7 +152,9 @@ m__24daNpc_Pachi_Maro_Param_c = .rodata:0x00000000; // type:object size:0x90 sco @122402 = .rodata:0x000000F4; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x000000F8; // type:object size:0xC scope:global @46916 = .rodata:0x00000104; // type:object size:0x4 scope:local -lbl_335_rodata_108 = .rodata:0x00000108; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000108; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000110; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000118; // type:object size:0x4 align:4 data:float @121352 = .data:0x00000000; // type:object size:0x1B scope:local @121353 = .data:0x0000001C; // type:object size:0x1C scope:local data:string @121354 = .data:0x00000038; // type:object size:0x17 scope:local data:string @@ -255,7 +257,20 @@ lbl_335_data_9A0 = .data:0x000009A0; // type:object size:0x24 @122736 = .data:0x00000C34; // type:object size:0xD scope:local data:string @STRING@__ct__18daNpc_Pachi_Maro_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc = .data:0x00000C50; // type:object size:0x2F scope:local @STRING@__ct__8daNpcT_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc = .data:0x00000C80; // type:object size:0x25 scope:local -lbl_335_data_CA5 = .data:0x00000CA5; // type:object size:0xF3 +@STRING@__dt__8daNpcT_cFv = .data:0x00000CA8; // type:object size:0x23 +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000CCC; // type:object size:0x5 data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000CD4; // type:object size:0xF data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000CE4; // type:object size:0x14 data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000CF8; // type:object size:0xF data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x00000D08; // type:object size:0x5 data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x00000D10; // type:object size:0x14 data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000D24; // type:object size:0x14 data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x00000D38; // type:object size:0x14 data:string +@STRING@calc__11J3DTexNoAnmCFPUs@2 = .data:0x00000D4C; // type:object size:0x5 data:string +@STRING@calc__11J3DTexNoAnmCFPUs@1 = .data:0x00000D54; // type:object size:0x11 data:string +@STRING@calc__11J3DTexNoAnmCFPUs@0 = .data:0x00000D68; // type:object size:0x16 data:string +@STRING@calc__11J3DTexNoAnmCFPUs = .data:0x00000D80; // type:object size:0x11 data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000D94; // type:object size:0x3 data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @121396 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x98 scope:global diff --git a/config/ShieldD/rels/d_a_npc_pachi_taroD/symbols.txt b/config/ShieldD/rels/d_a_npc_pachi_taroD/symbols.txt index 41842f1cde5..3fa487a312a 100644 --- a/config/ShieldD/rels/d_a_npc_pachi_taroD/symbols.txt +++ b/config/ShieldD/rels/d_a_npc_pachi_taroD/symbols.txt @@ -201,7 +201,9 @@ m__24daNpc_Pachi_Taro_Param_c = .rodata:0x00000000; // type:object size:0x8C sco @LOCAL@_cut1stHit_KakasiBody_Init__18daNpc_Pachi_Taro_cFRCi@sHitMsg = .rodata:0x00000168; // type:object size:0xC scope:local cNullVec__6Z2Calc = .rodata:0x00000174; // type:object size:0xC scope:global @46916 = .rodata:0x00000180; // type:object size:0x4 scope:local -lbl_336_rodata_184 = .rodata:0x00000184; // type:object size:0x18 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000188; // type:object size:0x8 scope:local align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000190; // type:object size:0x8 scope:local align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000198; // type:object size:0x4 scope:local align:4 data:float @121602 = .data:0x00000000; // type:object size:0x1B scope:local @121603 = .data:0x0000001C; // type:object size:0x1C scope:local data:string @121604 = .data:0x00000038; // type:object size:0x17 scope:local data:string @@ -321,7 +323,20 @@ lbl_336_data_1598 = .data:0x00001598; // type:object size:0x24 @123586 = .data:0x0000182C; // type:object size:0xD scope:local data:string @STRING@__ct__18daNpc_Pachi_Taro_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc = .data:0x00001848; // type:object size:0x2F scope:local @STRING@__ct__8daNpcT_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc = .data:0x00001878; // type:object size:0x25 scope:local -lbl_336_data_189D = .data:0x0000189D; // type:object size:0xF3 +@STRING@__dt__8daNpcT_cFv = .data:0x000018A0; // type:object size:0x23 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x000018C4; // type:object size:0x5 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x000018CC; // type:object size:0xF scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x000018DC; // type:object size:0x14 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x000018F0; // type:object size:0xF scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x00001900; // type:object size:0x5 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x00001908; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x0000191C; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x00001930; // type:object size:0x14 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs@2 = .data:0x00001944; // type:object size:0x5 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs@1 = .data:0x0000194C; // type:object size:0x11 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs@0 = .data:0x00001960; // type:object size:0x16 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs = .data:0x00001978; // type:object size:0x11 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x0000198C; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @121647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x94 scope:global diff --git a/config/ShieldD/rels/d_a_npc_passerD/symbols.txt b/config/ShieldD/rels/d_a_npc_passerD/symbols.txt index 439b44315bf..23567e5d908 100644 --- a/config/ShieldD/rels/d_a_npc_passerD/symbols.txt +++ b/config/ShieldD/rels/d_a_npc_passerD/symbols.txt @@ -116,7 +116,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @120694 = .rodata:0x00000060; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000064; // type:object size:0xC scope:global @46916 = .rodata:0x00000070; // type:object size:0x4 scope:local -lbl_337_rodata_74 = .rodata:0x00000074; // type:object size:0x18 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000078; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000080; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000088; // type:object size:0x4 align:4 data:float ActionTable__13daNpcPasser_c = .data:0x00000000; // type:object size:0x78 scope:global @120137 = .data:0x00000078; // type:object size:0x3A scope:local @120138 = .data:0x000000B4; // type:object size:0x3C scope:local @@ -187,4 +189,4 @@ lbl_337_data_780 = .data:0x00000780; // type:object size:0x24 @121030 = .data:0x00000938; // type:object size:0x10 scope:local data:string @121031 = .data:0x0000095C; // type:object size:0x9 scope:local data:string @121032 = .data:0x0000097C; // type:object size:0x9 scope:local data:string -lbl_337_data_985 = .data:0x00000985; // type:object size:0xF +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000990; // type:object size:0x3 data:string diff --git a/config/ShieldD/rels/d_a_npc_postD/symbols.txt b/config/ShieldD/rels/d_a_npc_postD/symbols.txt index 9e181c5d559..ac647e5293f 100644 --- a/config/ShieldD/rels/d_a_npc_postD/symbols.txt +++ b/config/ShieldD/rels/d_a_npc_postD/symbols.txt @@ -145,7 +145,9 @@ m__18daNpc_Post_Param_c = .rodata:0x00000000; // type:object size:0x94 scope:glo @122364 = .rodata:0x00000164; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000168; // type:object size:0xC scope:global @46916 = .rodata:0x00000174; // type:object size:0x4 scope:local -lbl_339_rodata_178 = .rodata:0x00000178; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000178; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000180; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000188; // type:object size:0x4 align:4 data:float @121142 = .data:0x00000000; // type:object size:0x1B scope:local @121143 = .data:0x0000001C; // type:object size:0x15 scope:local @121144 = .data:0x00000034; // type:object size:0x15 scope:local @@ -247,9 +249,22 @@ lbl_339_data_AE8 = .data:0x00000AE8; // type:object size:0x24 @122487 = .data:0x00000D7C; // type:object size:0xD scope:local data:string @STRING@__ct__12daNpc_Post_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc = .data:0x00000D98; // type:object size:0x29 scope:local @STRING@__ct__8daNpcT_cFPC26daNpcT_faceMotionAnmData_cPC22daNpcT_motionAnmData_cPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPCQ222daNpcT_MotionSeqMngr_c18sequenceStepData_ciPC16daNpcT_evtData_cPPc = .data:0x00000DC4; // type:object size:0x25 scope:local -lbl_339_data_DE9 = .data:0x00000DE9; // type:object size:0xF3 +@STRING@__dt__8daNpcT_cFv = .data:0x00000DEC; // type:object size:0x23 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000E10; // type:object size:0x5 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000E18; // type:object size:0xF scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000E28; // type:object size:0x14 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000E3C; // type:object size:0xF scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x00000E4C; // type:object size:0x5 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x00000E54; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000E68; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x00000E7C; // type:object size:0x14 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs@2 = .data:0x00000E90; // type:object size:0x5 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs@1 = .data:0x00000E98; // type:object size:0x11 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs@0 = .data:0x00000EAC; // type:object size:0x16 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs = .data:0x00000EC4; // type:object size:0x11 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000ED8; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @121184 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x9C scope:global -lbl_339_bss_B0 = .bss:0x000000B0; // type:object size:0x1 data:byte +@GUARD@setAttnPos__12daNpc_Post_cFv@prtclScl = .bss:0x000000B0; // type:object size:0x1 data:byte @LOCAL@setAttnPos__12daNpc_Post_cFv@prtclScl = .bss:0x000000B4; // type:object size:0xC scope:local diff --git a/config/ShieldD/rels/d_a_npc_rafrelD/symbols.txt b/config/ShieldD/rels/d_a_npc_rafrelD/symbols.txt index a01b4777f63..c5e2712d1ce 100644 --- a/config/ShieldD/rels/d_a_npc_rafrelD/symbols.txt +++ b/config/ShieldD/rels/d_a_npc_rafrelD/symbols.txt @@ -160,7 +160,9 @@ m__19daNpcRafrel_Param_c = .rodata:0x00000000; // type:object size:0x74 scope:gl @121605 = .rodata:0x000002B4; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x000002B8; // type:object size:0xC scope:global @46916 = .rodata:0x000002C4; // type:object size:0x4 scope:local -lbl_343_rodata_2C8 = .rodata:0x000002C8; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000002C8; // type:object size:0x8 +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000002D0; // type:object size:0x8 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000002D8; // type:object size:0x4 l_bckGetParamList = .data:0x00000000; // type:object size:0x15C scope:global l_btpGetParamList = .data:0x00000160; // type:object size:0x30 scope:global l_btkGetParamList = .data:0x00000190; // type:object size:0x3C scope:global data:4byte @@ -298,7 +300,19 @@ lbl_343_data_627 = .data:0x00000627; // type:object size:0x2D @STRING@setExpressionAnm__13daNpcRafrel_cFib@0 = .data:0x00000B5C; // type:object size:0x13 scope:local data:string @STRING@setExpressionAnm__13daNpcRafrel_cFib = .data:0x00000B70; // type:object size:0x31 scope:local @STRING@main__13daNpcRafrel_cFv = .data:0x00000BA8; // type:object size:0x10 scope:local data:string -lbl_343_data_BB8 = .data:0x00000BB8; // type:object size:0xCC +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000BB8; // type:object size:0x5 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000BC0; // type:object size:0xF scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000BD0; // type:object size:0x14 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000BE4; // type:object size:0xF scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x00000BF4; // type:object size:0x5 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x00000BFC; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000C10; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x00000C24; // type:object size:0x14 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs@2 = .data:0x00000C38; // type:object size:0x5 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs@1 = .data:0x00000C40; // type:object size:0x11 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs@0 = .data:0x00000C54; // type:object size:0x16 scope:local data:string +@STRING@calc__11J3DTexNoAnmCFPUs = .data:0x00000C6C; // type:object size:0x11 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000C80; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @119738 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x7C scope:global diff --git a/config/ShieldD/rels/d_a_obj_bemosD/symbols.txt b/config/ShieldD/rels/d_a_obj_bemosD/symbols.txt index 51262a1182b..2adc712b00b 100644 --- a/config/ShieldD/rels/d_a_obj_bemosD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_bemosD/symbols.txt @@ -154,7 +154,9 @@ M_lin20__Q29daObjBm_c5Bgc_c = .rodata:0x00000170; // type:object size:0x170 scop @LOCAL@PPCallBack__9daObjBm_cFP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel@pp_field = .rodata:0x0000033C; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000340; // type:object size:0xC scope:global @46916 = .rodata:0x0000034C; // type:object size:0x4 scope:local -lbl_394_rodata_350 = .rodata:0x00000350; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000350; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000358; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000360; // type:object size:0x4 align:4 data:float @118420 = .data:0x00000000; // type:object size:0x7 scope:local data:string l_arcName = .data:0x00000008; // type:object size:0x4 scope:global data:4byte @118421 = .data:0x0000000C; // type:object size:0x6 scope:local data:string @@ -250,13 +252,29 @@ lbl_394_data_7C1 = .data:0x000007C1; // type:object size:0x3F @120144 = .data:0x000008C0; // type:object size:0xC scope:local data:string @120145 = .data:0x000008CC; // type:object size:0x14 scope:local @120146 = .data:0x000008E8; // type:object size:0xE scope:local data:string -lbl_394_data_8F6 = .data:0x000008F6; // type:object size:0xFA +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000900; // type:object size:0x5 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000908; // type:object size:0xF scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000918; // type:object size:0x14 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x0000092C; // type:object size:0xF scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x0000093C; // type:object size:0x5 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x00000944; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000958; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x0000096C; // type:object size:0x14 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x00000980; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x00000988; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x00000994; // type:object size:0x16 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x000009AC; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x000009B8; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x000009C0; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x000009CC; // type:object size:0x14 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x000009E0; // type:object size:0x9 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000009EC; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global ...bss.0 = .bss:0x00000008; // type:label scope:local l_joint_table = .bss:0x00000008; // type:object size:0x14 scope:global data:4byte @118435 = .bss:0x0000001C; // type:object size:0xC scope:local l_HIO = .bss:0x00000028; // type:object size:0x40 scope:global data:2byte -lbl_394_bss_68 = .bss:0x00000068; // type:object size:0x8 data:byte +@GUARD@mode_walk__9daObjBm_cFv@dir_vec = .bss:0x00000068; // type:object size:0x1 scope:local data:byte @LOCAL@mode_walk__9daObjBm_cFv@dir_vec = .bss:0x00000070; // type:object size:0x30 scope:local @119374 = .bss:0x000000A0; // type:object size:0xC scope:local M_gnd_work__Q29daObjBm_c5Bgc_c = .bss:0x000000AC; // type:object size:0x78C scope:global @@ -264,5 +282,6 @@ M_gnd_work__Q29daObjBm_c5Bgc_c = .bss:0x000000AC; // type:object size:0x78C scop M_wrt_work__Q29daObjBm_c5Bgc_c = .bss:0x00000844; // type:object size:0x54 scope:global @119377 = .bss:0x00000898; // type:object size:0xC scope:local M_wall_work__Q29daObjBm_c5Bgc_c = .bss:0x000008A8; // type:object size:0xA10 scope:global +@GUARD@chk_wall_touch__Q29daObjBm_c5Bgc_cFPC10fopAc_ac_cPCQ29daObjBm_c8BgcSrc_cs@touch_work = .bss:0x000012B8; // type:object size:0x1 scope:local data:byte @119489 = .bss:0x000012BC; // type:object size:0xC scope:local @LOCAL@chk_wall_touch__Q29daObjBm_c5Bgc_cFPC10fopAc_ac_cPCQ29daObjBm_c8BgcSrc_cs@touch_work = .bss:0x000012C8; // type:object size:0x70 scope:local diff --git a/config/ShieldD/rels/d_a_obj_dustD/symbols.txt b/config/ShieldD/rels/d_a_obj_dustD/symbols.txt index ad0f2c1d007..e1a0eb01415 100644 --- a/config/ShieldD/rels/d_a_obj_dustD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_dustD/symbols.txt @@ -57,7 +57,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @117182 = .rodata:0x00000084; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000088; // type:object size:0xC scope:global @46916 = .rodata:0x00000094; // type:object size:0x4 scope:local -lbl_428_rodata_98 = .rodata:0x00000098; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000098; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000A0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000A8; // type:object size:0x4 align:4 data:float @116816 = .data:0x00000000; // type:object size:0x7 scope:local data:string l_arcName = .data:0x00000008; // type:object size:0x4 scope:global data:4byte l_daObjDust_Method = .data:0x00000010; // type:object size:0x20 scope:global diff --git a/config/ShieldD/rels/d_a_obj_fallobjD/symbols.txt b/config/ShieldD/rels/d_a_obj_fallobjD/symbols.txt index 2d5a44ffc0d..31711f548ec 100644 --- a/config/ShieldD/rels/d_a_obj_fallobjD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_fallobjD/symbols.txt @@ -62,7 +62,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @117180 = .rodata:0x00000054; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000058; // type:object size:0xC scope:local @46916 = .rodata:0x00000064; // type:object size:0x4 scope:local -lbl_430_rodata_68 = .rodata:0x00000068; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000068; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000070; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000078; // type:object size:0x4 align:4 data:float @116786 = .data:0x00000000; // type:object size:0xA scope:local data:string l_arcName = .data:0x0000000C; // type:object size:0x4 scope:local data:4byte l_cull_box = .data:0x00000010; // type:object size:0x18 scope:local align:4 data:float @@ -95,7 +97,15 @@ __RTTI__14daObjFallObj_c = .data:0x000001B8; // type:object size:0x8 scope:globa @117272 = .data:0x00000230; // type:object size:0xE scope:local data:string @117273 = .data:0x00000240; // type:object size:0xC scope:local @117274 = .data:0x00000258; // type:object size:0x11 scope:local data:string -lbl_430_data_269 = .data:0x00000269; // type:object size:0x7F +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x00000278; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x00000280; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x0000028C; // type:object size:0x16 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x000002A4; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x000002B0; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x000002B8; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x000002C4; // type:object size:0x14 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x000002D8; // type:object size:0x9 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000002E4; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @116795 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local data:byte diff --git a/config/ShieldD/rels/d_a_obj_itamatoD/symbols.txt b/config/ShieldD/rels/d_a_obj_itamatoD/symbols.txt index 7a906cef10e..284be91a8da 100644 --- a/config/ShieldD/rels/d_a_obj_itamatoD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_itamatoD/symbols.txt @@ -69,7 +69,9 @@ l_ccDObjData = .rodata:0x00000030; // type:object size:0x30 scope:global data:4b @LOCAL@setPrtcls__15daObj_ItaMato_cFv@id = .rodata:0x000000B8; // type:object size:0x6 scope:local cNullVec__6Z2Calc = .rodata:0x000000C0; // type:object size:0xC scope:global @46916 = .rodata:0x000000CC; // type:object size:0x4 scope:local -lbl_474_rodata_D0 = .rodata:0x000000D0; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000D0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000D8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000E0; // type:object size:0x4 align:4 data:float @119776 = .data:0x00000000; // type:object size:0x1B scope:local @119777 = .data:0x0000001C; // type:object size:0x1B scope:local @119778 = .data:0x00000038; // type:object size:0x11 scope:local @@ -126,7 +128,11 @@ lbl_474_data_2F0 = .data:0x000002F0; // type:object size:0x24 @120313 = .data:0x00000530; // type:object size:0xE scope:local data:string @120314 = .data:0x00000540; // type:object size:0xC scope:local @120315 = .data:0x00000558; // type:object size:0x11 scope:local data:string -lbl_474_data_569 = .data:0x00000569; // type:object size:0x57 +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@2 = .data:0x00000578; // type:object size:0x5 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@1 = .data:0x00000580; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs@0 = .data:0x00000594; // type:object size:0x14 scope:local data:string +@STRING@getMaterialNodePointer__16J3DMaterialTableCFUs = .data:0x000005A8; // type:object size:0x14 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000005BC; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global ...bss.0 = .bss:0x00000008; // type:label scope:local l_ccDSph = .bss:0x00000008; // type:object size:0x40 scope:global data:4byte diff --git a/config/ShieldD/rels/d_a_obj_katatsumuriD/splits.txt b/config/ShieldD/rels/d_a_obj_katatsumuriD/splits.txt index 45a9d60ffc6..ce30df462b7 100644 --- a/config/ShieldD/rels/d_a_obj_katatsumuriD/splits.txt +++ b/config/ShieldD/rels/d_a_obj_katatsumuriD/splits.txt @@ -14,4 +14,4 @@ d/actor/d_a_obj_katatsumuri.cpp: .ctors start:0x00000000 end:0x00000004 .rodata start:0x00000000 end:0x000000FC .data start:0x00000000 end:0x000004DC - .bss start:0x00000008 end:0x00000018 + .bss start:0x00000000 end:0x00000018 diff --git a/config/ShieldD/rels/d_a_obj_katatsumuriD/symbols.txt b/config/ShieldD/rels/d_a_obj_katatsumuriD/symbols.txt index fee0f48ce05..02db687e441 100644 --- a/config/ShieldD/rels/d_a_obj_katatsumuriD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_katatsumuriD/symbols.txt @@ -80,7 +80,9 @@ l_musiya_num = .rodata:0x000000C8; // type:object size:0x4 scope:global data:2by @119184 = .rodata:0x000000D4; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x000000D8; // type:object size:0xC scope:global @46916 = .rodata:0x000000E4; // type:object size:0x4 scope:local -lbl_482_rodata_E8 = .rodata:0x000000E8; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000E8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000F0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000F8; // type:object size:0x4 align:8 data:float @118433 = .data:0x00000000; // type:object size:0x13 scope:local @118434 = .data:0x00000014; // type:object size:0x15 scope:local @118437 = .data:0x0000002C; // type:object size:0x15 scope:local @@ -136,6 +138,10 @@ lbl_482_data_178 = .data:0x00000178; // type:object size:0x2C @STRING@CreateHeap__10daObjKAT_cFv@1 = .data:0x00000470; // type:object size:0xF scope:local data:string @STRING@CreateHeap__10daObjKAT_cFv@0 = .data:0x00000480; // type:object size:0x18 scope:local data:string @STRING@CreateHeap__10daObjKAT_cFv = .data:0x00000498; // type:object size:0x4 scope:local data:string -lbl_482_data_49C = .data:0x0000049C; // type:object size:0x40 -lbl_482_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x0000049C; // type:object size:0x5 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x000004A4; // type:object size:0xF scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x000004B4; // type:object size:0x14 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x000004C8; // type:object size:0xF scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000004D8; // type:object size:0x3 scope:local data:string +hio_set = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000008; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/ShieldD/rels/d_a_obj_kwheel01D/symbols.txt b/config/ShieldD/rels/d_a_obj_kwheel01D/symbols.txt index 5f46cc0aa14..2fa721fb4bc 100644 --- a/config/ShieldD/rels/d_a_obj_kwheel01D/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_kwheel01D/symbols.txt @@ -79,7 +79,15 @@ __RTTI__30request_of_phase_process_class = .data:0x000002C0; // type:object size @114652 = .data:0x000002C8; // type:object size:0xE scope:local data:string @114653 = .data:0x000002D8; // type:object size:0xC scope:local @114654 = .data:0x000002F0; // type:object size:0x11 scope:local data:string -lbl_497_data_301 = .data:0x00000301; // type:object size:0x7F +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x00000310; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x00000318; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x00000324; // type:object size:0x16 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x0000033C; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x00000348; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x00000350; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x0000035C; // type:object size:0x14 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x00000370; // type:object size:0x9 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x0000037C; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @114291 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:2byte diff --git a/config/ShieldD/rels/d_a_obj_lv6SwGateD/symbols.txt b/config/ShieldD/rels/d_a_obj_lv6SwGateD/symbols.txt index 93a6f114bd2..e317938a97d 100644 --- a/config/ShieldD/rels/d_a_obj_lv6SwGateD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_lv6SwGateD/symbols.txt @@ -53,7 +53,9 @@ mCcDObjInfo__13daLv6SwGate_c = .rodata:0x00000018; // type:object size:0x30 scop @114481 = .rodata:0x000000A0; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x000000A4; // type:object size:0xC scope:global @46916 = .rodata:0x000000B0; // type:object size:0x4 scope:local -lbl_540_rodata_B4 = .rodata:0x000000B4; // type:object size:0x18 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000B8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000C0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000C8; // type:object size:0x4 align:4 data:float @114216 = .data:0x00000000; // type:object size:0xD scope:local @114217 = .data:0x00000010; // type:object size:0x5 scope:local @114220 = .data:0x00000018; // type:object size:0x10 scope:local @@ -92,7 +94,15 @@ __RTTI__13daLv6SwGate_c = .data:0x00000208; // type:object size:0x8 scope:global @114627 = .data:0x00000318; // type:object size:0xE scope:local data:string @114628 = .data:0x00000328; // type:object size:0xC scope:local @114629 = .data:0x00000340; // type:object size:0x11 scope:local data:string -lbl_540_data_351 = .data:0x00000351; // type:object size:0x7F +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x00000360; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x00000368; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x00000374; // type:object size:0x16 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x0000038C; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x00000398; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x000003A0; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x000003AC; // type:object size:0x14 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x000003C0; // type:object size:0x9 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000003CC; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global ...bss.0 = .bss:0x00000008; // type:label scope:local @114194 = .bss:0x00000008; // type:object size:0xC scope:local data:4byte diff --git a/config/ShieldD/rels/d_a_obj_lv6TenbinD/symbols.txt b/config/ShieldD/rels/d_a_obj_lv6TenbinD/symbols.txt index a760849cf0a..545ffdd7e61 100644 --- a/config/ShieldD/rels/d_a_obj_lv6TenbinD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_lv6TenbinD/symbols.txt @@ -97,7 +97,15 @@ __RTTI__10daTenbin_c = .data:0x00000240; // type:object size:0x8 scope:global @117454 = .data:0x000002B8; // type:object size:0xE scope:local data:string @117455 = .data:0x000002C8; // type:object size:0xC scope:local @117456 = .data:0x000002E0; // type:object size:0x11 scope:local data:string -lbl_543_data_2F1 = .data:0x000002F1; // type:object size:0x7F +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x00000300; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x00000308; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x00000314; // type:object size:0x16 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x0000032C; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x00000338; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x00000340; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x0000034C; // type:object size:0x14 scope:local data:float +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x00000360; // type:object size:0x9 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x0000036C; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @117072 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x48 scope:global align:4 data:float diff --git a/config/ShieldD/rels/d_a_obj_lv6egateD/symbols.txt b/config/ShieldD/rels/d_a_obj_lv6egateD/symbols.txt index 58bffdd5c6d..935be10cf8e 100644 --- a/config/ShieldD/rels/d_a_obj_lv6egateD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_lv6egateD/symbols.txt @@ -34,7 +34,9 @@ l_cull_box = .rodata:0x00000008; // type:object size:0x18 scope:global align:4 d @114401 = .rodata:0x0000003C; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000040; // type:object size:0xC scope:global @46916 = .rodata:0x0000004C; // type:object size:0x4 scope:local -lbl_536_rodata_50 = .rodata:0x00000050; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000050; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000058; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000060; // type:object size:0x4 align:4 data:float @114241 = .data:0x00000000; // type:object size:0x9 scope:local data:string l_arcName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte l_cc_cyl_src = .data:0x00000010; // type:object size:0x44 scope:global @@ -56,4 +58,4 @@ __RTTI__15daObjLv6EGate_c = .data:0x00000190; // type:object size:0x8 scope:glob __RTTI__30request_of_phase_process_class = .data:0x000001F8; // type:object size:0x8 scope:global @114518 = .data:0x0000020C; // type:object size:0x9 scope:local data:string @114519 = .data:0x0000022C; // type:object size:0x9 scope:local data:string -lbl_536_data_235 = .data:0x00000235; // type:object size:0xF +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000240; // type:object size:0x3 scope:local data:string diff --git a/config/ShieldD/rels/d_a_obj_lv6swturnD/symbols.txt b/config/ShieldD/rels/d_a_obj_lv6swturnD/symbols.txt index 411c09e85be..83c047a370c 100644 --- a/config/ShieldD/rels/d_a_obj_lv6swturnD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_lv6swturnD/symbols.txt @@ -48,7 +48,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @LOCAL@PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel@pp_field = .rodata:0x0000001C; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000020; // type:object size:0xC scope:global @46916 = .rodata:0x0000002C; // type:object size:0x4 scope:local -lbl_541_rodata_30 = .rodata:0x00000030; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000030; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000038; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000040; // type:object size:0x4 align:4 data:float @116783 = .data:0x00000000; // type:object size:0xA scope:local data:string l_arcName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte @116805 = .data:0x00000010; // type:object size:0x13 scope:local @@ -79,7 +81,15 @@ __RTTI__16daObjLv6SwTurn_c = .data:0x000001E0; // type:object size:0x8 scope:glo @117203 = .data:0x00000258; // type:object size:0xE scope:local data:string @117204 = .data:0x00000268; // type:object size:0xC scope:local @117205 = .data:0x00000280; // type:object size:0x11 scope:local data:string -lbl_541_data_291 = .data:0x00000291; // type:object size:0x7F +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x000002A0; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x000002A8; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x000002B4; // type:object size:0x16 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x000002CC; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x000002D8; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x000002E0; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x000002EC; // type:object size:0x14 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x00000300; // type:object size:0x9 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x0000030C; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @116792 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:byte diff --git a/config/ShieldD/rels/d_a_obj_mirror_6poleD/symbols.txt b/config/ShieldD/rels/d_a_obj_mirror_6poleD/symbols.txt index da62224b056..22b16810168 100644 --- a/config/ShieldD/rels/d_a_obj_mirror_6poleD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_mirror_6poleD/symbols.txt @@ -54,4 +54,16 @@ g_profile_Obj_Mirror6Pole = .data:0x000000B8; // type:object size:0x30 scope:glo @STRING@setAction__18daObjMirror6Pole_cFQ218daObjMirror6Pole_c6Mode_e@1 = .data:0x000001B8; // type:object size:0x19 scope:local data:string @STRING@setAction__18daObjMirror6Pole_cFQ218daObjMirror6Pole_c6Mode_e@0 = .data:0x000001D4; // type:object size:0x16 scope:local data:string @STRING@setAction__18daObjMirror6Pole_cFQ218daObjMirror6Pole_c6Mode_e = .data:0x000001EC; // type:object size:0x19 scope:local data:string -lbl_561_data_205 = .data:0x00000205; // type:object size:0xAF +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000208; // type:object size:0x5 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000210; // type:object size:0xF scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000220; // type:object size:0x14 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x00000234; // type:object size:0xF scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x00000244; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x0000024C; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x00000258; // type:object size:0x16 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x00000270; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x0000027C; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x00000284; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x00000290; // type:object size:0x14 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x000002A4; // type:object size:0x9 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000002B0; // type:object size:0x3 scope:local data:string diff --git a/config/ShieldD/rels/d_a_obj_pdwallD/symbols.txt b/config/ShieldD/rels/d_a_obj_pdwallD/symbols.txt index c6de2921107..001832fc4d4 100644 --- a/config/ShieldD/rels/d_a_obj_pdwallD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_pdwallD/symbols.txt @@ -32,7 +32,9 @@ l_cull_box = .rodata:0x00000008; // type:object size:0x18 scope:global @114392 = .rodata:0x00000040; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000044; // type:object size:0xC scope:global @46916 = .rodata:0x00000050; // type:object size:0x4 scope:local -lbl_580_rodata_54 = .rodata:0x00000054; // type:object size:0x18 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000058; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000060; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000068; // type:object size:0x4 align:4 data:float @114233 = .data:0x00000000; // type:object size:0x8 scope:local data:string l_arcName = .data:0x00000008; // type:object size:0x4 scope:global data:4byte @114315 = .data:0x0000000C; // type:object size:0x13 scope:local data:string @@ -49,4 +51,12 @@ __RTTI__13daObjPDwall_c = .data:0x000000E0; // type:object size:0x8 scope:global @114501 = .data:0x00000110; // type:object size:0xB scope:local data:string @114502 = .data:0x00000128; // type:object size:0x1F scope:local data:string __RTTI__30request_of_phase_process_class = .data:0x00000148; // type:object size:0x8 scope:global -lbl_580_data_150 = .data:0x00000150; // type:object size:0x70 +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x00000150; // type:object size:0x5 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x00000158; // type:object size:0x9 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x00000164; // type:object size:0x16 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x0000017C; // type:object size:0x9 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x00000188; // type:object size:0x5 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x00000190; // type:object size:0x9 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x0000019C; // type:object size:0x14 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x000001B0; // type:object size:0x9 data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000001BC; // type:object size:0x3 data:string diff --git a/config/ShieldD/rels/d_a_obj_pictureD/symbols.txt b/config/ShieldD/rels/d_a_obj_pictureD/symbols.txt index 53e0b6be241..43801cff3e6 100644 --- a/config/ShieldD/rels/d_a_obj_pictureD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_pictureD/symbols.txt @@ -73,7 +73,9 @@ s_CcDCps__14daObjPicture_c = .rodata:0x000000A8; // type:object size:0x4C scope: s_CcDCyl_pic_at__14daObjPicture_c = .rodata:0x000000F4; // type:object size:0x44 scope:global cNullVec__6Z2Calc = .rodata:0x00000138; // type:object size:0xC scope:global @46916 = .rodata:0x00000144; // type:object size:0x4 scope:local -lbl_581_rodata_148 = .rodata:0x00000148; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000148; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000150; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000158; // type:object size:0x4 align:4 data:float @114141 = .data:0x00000000; // type:object size:0xA scope:local data:string l_arcName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte l_LINE_OFFSET_POS = .data:0x00000010; // type:object size:0x18 scope:global @@ -96,4 +98,12 @@ __vt__18mDoExt_3DlineMat_c = .data:0x00000158; // type:object size:0x14 scope:gl __RTTI__30request_of_phase_process_class = .data:0x000001C0; // type:object size:0x8 scope:global @114732 = .data:0x000001D4; // type:object size:0x9 scope:local data:string @114733 = .data:0x000001F4; // type:object size:0x9 scope:local data:string -lbl_581_data_1FD = .data:0x000001FD; // type:object size:0x7B +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x00000208; // type:object size:0x5 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x00000210; // type:object size:0x9 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x0000021C; // type:object size:0x16 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x00000234; // type:object size:0x9 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x00000240; // type:object size:0x5 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x00000248; // type:object size:0x9 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x00000254; // type:object size:0x14 data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x00000268; // type:object size:0x9 data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000274; // type:object size:0x3 data:string diff --git a/config/ShieldD/rels/d_a_obj_poFireD/symbols.txt b/config/ShieldD/rels/d_a_obj_poFireD/symbols.txt index 1213d9d70f4..b8ab8cf217f 100644 --- a/config/ShieldD/rels/d_a_obj_poFireD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_poFireD/symbols.txt @@ -86,7 +86,9 @@ itemNo = .rodata:0x0000002C; // type:object size:0x4 scope:global @117287 = .rodata:0x000000C0; // type:object size:0x4 scope:local align:4 data:float cNullVec__6Z2Calc = .rodata:0x000000C4; // type:object size:0xC scope:global @46916 = .rodata:0x000000D0; // type:object size:0x4 scope:local -lbl_585_rodata_D4 = .rodata:0x000000D4; // type:object size:0x18 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000D8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_2_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000E0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000E8; // type:object size:0x4 align:4 data:float @116931 = .data:0x00000000; // type:object size:0xB scope:local @116934 = .data:0x0000000C; // type:object size:0x2 scope:local data:string @116935 = .data:0x00000010; // type:object size:0x5 scope:local diff --git a/config/ShieldD/rels/d_a_obj_scannon_tenD/symbols.txt b/config/ShieldD/rels/d_a_obj_scannon_tenD/symbols.txt index 12c73424deb..7de99033411 100644 --- a/config/ShieldD/rels/d_a_obj_scannon_tenD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_scannon_tenD/symbols.txt @@ -69,7 +69,9 @@ s_demoExeProc__17daObjSCannonTen_c = .rodata:0x00000048; // type:object size:0x9 @LOCAL@changeScene__17daObjSCannonTen_cFv@a_exit_id = .rodata:0x00000108; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x0000010C; // type:object size:0xC scope:global @46916 = .rodata:0x00000118; // type:object size:0x4 scope:local -lbl_604_rodata_11C = .rodata:0x0000011C; // type:object size:0x18 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000120; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000128; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000130; // type:object size:0x4 align:4 data:float @118208 = .data:0x00000000; // type:object size:0x8 scope:local data:string l_arcName = .data:0x00000008; // type:object size:0x4 scope:global data:4byte l_staffName = .data:0x0000000C; // type:object size:0x4 scope:global data:4byte @@ -115,4 +117,16 @@ __RTTI__30request_of_phase_process_class = .data:0x000003A0; // type:object size @118855 = .data:0x000003C0; // type:object size:0x11 scope:local data:string @118856 = .data:0x000003E0; // type:object size:0x10 scope:local data:string @118857 = .data:0x00000404; // type:object size:0xD scope:local data:string -lbl_604_data_411 = .data:0x00000411; // type:object size:0xBB +@STRING@getJointNodePointer__12J3DJointTreeCFUs@2 = .data:0x00000420; // type:object size:0x5 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@1 = .data:0x00000428; // type:object size:0xF scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs@0 = .data:0x00000438; // type:object size:0x14 scope:local data:string +@STRING@getJointNodePointer__12J3DJointTreeCFUs = .data:0x0000044C; // type:object size:0xF scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x0000045C; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x00000464; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x00000470; // type:object size:0x16 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x00000488; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x00000494; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x0000049C; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x000004A8; // type:object size:0x14 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x000004BC; // type:object size:0x9 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000004C8; // type:object size:0x3 scope:local data:string diff --git a/config/ShieldD/rels/d_a_obj_spinLiftD/symbols.txt b/config/ShieldD/rels/d_a_obj_spinLiftD/symbols.txt index d4b700fffcd..146ff491404 100644 --- a/config/ShieldD/rels/d_a_obj_spinLiftD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_spinLiftD/symbols.txt @@ -52,7 +52,9 @@ l_dzbIdx = .rodata:0x0000002C; // type:object size:0x24 scope:global @114440 = .rodata:0x000000A8; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x000000AC; // type:object size:0xC scope:global @46916 = .rodata:0x000000B8; // type:object size:0x4 scope:local -lbl_618_rodata_BC = .rodata:0x000000BC; // type:object size:0x18 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000C0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000C8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000D0; // type:object size:0x4 align:4 data:float @114220 = .data:0x00000000; // type:object size:0xE scope:local @114221 = .data:0x00000010; // type:object size:0x5 scope:local @114223 = .data:0x00000018; // type:object size:0x5 scope:local @@ -98,7 +100,15 @@ __RTTI__12daSpinLift_c = .data:0x00000268; // type:object size:0x8 scope:global @114540 = .data:0x000002E0; // type:object size:0xE scope:local data:string @114541 = .data:0x000002F0; // type:object size:0xC scope:local @114542 = .data:0x00000308; // type:object size:0x11 scope:local data:string -lbl_618_data_319 = .data:0x00000319; // type:object size:0x7F +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x00000328; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x00000330; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x0000033C; // type:object size:0x16 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x00000354; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x00000360; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x00000368; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x00000374; // type:object size:0x14 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x00000388; // type:object size:0x9 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000394; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @114206 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/ShieldD/rels/d_a_obj_ss_drinkD/symbols.txt b/config/ShieldD/rels/d_a_obj_ss_drinkD/symbols.txt index 9987e105286..98988463c6d 100644 --- a/config/ShieldD/rels/d_a_obj_ss_drinkD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_ss_drinkD/symbols.txt @@ -68,7 +68,9 @@ mCcDObjInfo__15daObj_SSDrink_c = .rodata:0x00000000; // type:object size:0x30 sc @120036 = .rodata:0x00000058; // type:object size:0x8 scope:local align:8 data:double cNullVec__6Z2Calc = .rodata:0x00000060; // type:object size:0xC scope:global @46916 = .rodata:0x0000006C; // type:object size:0x4 scope:local -lbl_619_rodata_70 = .rodata:0x00000070; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000070; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000078; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000080; // type:object size:0x4 align:4 data:float @119562 = .data:0x00000000; // type:object size:0x8 scope:local data:string l_resFileName = .data:0x00000008; // type:object size:0x4 scope:global data:4byte @119563 = .data:0x0000000C; // type:object size:0xE scope:local data:string @@ -117,5 +119,5 @@ lbl_619_data_1B4 = .data:0x000001B4; // type:object size:0x30 @120251 = .data:0x0000039C; // type:object size:0x9 scope:local data:string @120252 = .data:0x000003BC; // type:object size:0x9 scope:local data:string @120253 = .data:0x000003DC; // type:object size:0xD scope:local data:string -lbl_619_data_3E9 = .data:0x000003E9; // type:object size:0x13 +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x000003F8; // type:object size:0x3 data:string mCcDCyl__15daObj_SSDrink_c = .bss:0x00000000; // type:object size:0x44 scope:global diff --git a/config/ShieldD/rels/d_a_obj_syRockD/symbols.txt b/config/ShieldD/rels/d_a_obj_syRockD/symbols.txt index 9d1434cfac9..b5713710658 100644 --- a/config/ShieldD/rels/d_a_obj_syRockD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_syRockD/symbols.txt @@ -91,7 +91,9 @@ mCcDObjInfo__10daSyRock_c = .rodata:0x00000048; // type:object size:0x30 scope:g @117450 = .rodata:0x000000E4; // type:object size:0x4 scope:local align:4 data:float cNullVec__6Z2Calc = .rodata:0x000000E8; // type:object size:0xC scope:global @46916 = .rodata:0x000000F4; // type:object size:0x4 scope:local -lbl_637_rodata_F8 = .rodata:0x000000F8; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000F8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000100; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000108; // type:object size:0x4 align:4 data:float @116978 = .data:0x00000000; // type:object size:0x10 scope:local @116979 = .data:0x00000010; // type:object size:0xA scope:local data:string @116980 = .data:0x0000001C; // type:object size:0x9 scope:local @@ -164,7 +166,15 @@ __RTTI__30request_of_phase_process_class = .data:0x000004E0; // type:object size @117576 = .data:0x00000578; // type:object size:0xE scope:local data:string @117577 = .data:0x00000588; // type:object size:0xC scope:local @117578 = .data:0x000005A0; // type:object size:0x11 scope:local data:string -lbl_637_data_5B1 = .data:0x000005B1; // type:object size:0x7F +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x000005C0; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x000005C8; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x000005D4; // type:object size:0x16 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x000005EC; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x000005F8; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x00000600; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x0000060C; // type:object size:0x14 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x00000620; // type:object size:0x9 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x0000062C; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global ...bss.0 = .bss:0x00000008; // type:label scope:local @116955 = .bss:0x00000008; // type:object size:0xC scope:local data:4byte diff --git a/config/ShieldD/rels/d_a_obj_twGateD/symbols.txt b/config/ShieldD/rels/d_a_obj_twGateD/symbols.txt index bc25a2170b9..ed053eaabeb 100644 --- a/config/ShieldD/rels/d_a_obj_twGateD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_twGateD/symbols.txt @@ -37,7 +37,9 @@ l_cheeckPos1 = .rodata:0x000001AC; // type:object size:0x9C scope:local @114294 = .rodata:0x0000024C; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000250; // type:object size:0xC scope:global @46916 = .rodata:0x0000025C; // type:object size:0x4 scope:local -lbl_662_rodata_260 = .rodata:0x00000260; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000260; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000268; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000270; // type:object size:0x4 align:4 data:float @114210 = .data:0x00000000; // type:object size:0x5 scope:local @114215 = .data:0x00000008; // type:object size:0x9 scope:local data:string @114216 = .data:0x00000014; // type:object size:0xA scope:local data:string @@ -80,7 +82,15 @@ __RTTI__10daTwGate_c = .data:0x00000260; // type:object size:0x8 scope:global @114473 = .data:0x00000360; // type:object size:0xC scope:local @114474 = .data:0x00000378; // type:object size:0x11 scope:local data:string @114475 = .data:0x000003A4; // type:object size:0xD scope:local data:string -lbl_662_data_3B1 = .data:0x000003B1; // type:object size:0x7F +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@6 = .data:0x000003C0; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@5 = .data:0x000003C8; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@4 = .data:0x000003D4; // type:object size:0x16 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@3 = .data:0x000003EC; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@2 = .data:0x000003F8; // type:object size:0x5 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@1 = .data:0x00000400; // type:object size:0x9 scope:local data:string +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi@0 = .data:0x0000040C; // type:object size:0x14 scope:local data:float +@STRING@setDrawBuffer__6J3DSysFP13J3DDrawBufferi = .data:0x00000420; // type:object size:0x9 scope:local data:string +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x0000042C; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @114190 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:local align:4 data:float diff --git a/config/ShieldD/rels/d_a_obj_wood_statueD/symbols.txt b/config/ShieldD/rels/d_a_obj_wood_statueD/symbols.txt index 3a5ba0b070b..52ad45d5078 100644 --- a/config/ShieldD/rels/d_a_obj_wood_statueD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_wood_statueD/symbols.txt @@ -67,7 +67,9 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @LOCAL@execute__14daObjWStatue_cFv@l_demoFunc = .rodata:0x00000084; // type:object size:0x3C scope:local cNullVec__6Z2Calc = .rodata:0x000000C0; // type:object size:0xC scope:global @46916 = .rodata:0x000000CC; // type:object size:0x4 scope:local -lbl_682_rodata_D0 = .rodata:0x000000D0; // type:object size:0x14 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000D0; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x000000D8; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x000000E0; // type:object size:0x4 align:4 data:float @118603 = .data:0x00000000; // type:object size:0x7 scope:local data:string l_arcName = .data:0x00000008; // type:object size:0x4 scope:global @118604 = .data:0x00000010; // type:object size:0x10 scope:local data:string @@ -131,7 +133,7 @@ lbl_682_data_330 = .data:0x00000330; // type:object size:0x2C @119236 = .data:0x000005E8; // type:object size:0xE scope:local data:string @119237 = .data:0x000005F8; // type:object size:0xC scope:local @119238 = .data:0x00000610; // type:object size:0x11 scope:local data:string -lbl_682_data_621 = .data:0x00000621; // type:object size:0x13 +@STRING@showAssert__12JUTAssertionFUlPCciPCc = .data:0x00000630; // type:object size:0x3 scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @118617 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/ShieldD/rels/d_a_tag_qsD/symbols.txt b/config/ShieldD/rels/d_a_tag_qsD/symbols.txt index c7bee9eadda..c1226f7ac5e 100644 --- a/config/ShieldD/rels/d_a_tag_qsD/symbols.txt +++ b/config/ShieldD/rels/d_a_tag_qsD/symbols.txt @@ -49,7 +49,9 @@ _dtors = .dtors:0x00000000; // type:label scope:global @117348 = .rodata:0x00000040; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .rodata:0x00000044; // type:object size:0xC scope:global @46916 = .rodata:0x00000050; // type:object size:0x4 scope:local -lbl_725_rodata_54 = .rodata:0x00000054; // type:object size:0x18 +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000058; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN_2__Q23std17numeric_limitsFv@x = .rodata:0x00000060; // type:object size:0x8 align:8 data:float +@LOCAL@signaling_NaN__Q23std17numeric_limitsFv@x = .rodata:0x00000068; // type:object size:0x4 align:4 data:float @117050 = .data:0x00000000; // type:object size:0x5 scope:local @117051 = .data:0x00000008; // type:object size:0x13 scope:local @117054 = .data:0x0000001C; // type:object size:0xD scope:local diff --git a/include/d/actor/d_a_e_md.h b/include/d/actor/d_a_e_md.h index 440b22b4772..0c52030a774 100644 --- a/include/d/actor/d_a_e_md.h +++ b/include/d/actor/d_a_e_md.h @@ -23,7 +23,7 @@ class daE_MD_c : public fopEn_enemy_c { void CheckHit(); void WaitAction(); void HalfBreakAction(); - bool VibAction(); + u8 VibAction(); void DummyAction(); void RealAction(); void Action(); diff --git a/include/d/actor/d_a_itembase.h b/include/d/actor/d_a_itembase.h index ccac214e457..fa4d2460620 100644 --- a/include/d/actor/d_a_itembase.h +++ b/include/d/actor/d_a_itembase.h @@ -6,6 +6,7 @@ #include "d/d_a_itembase_static.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" +#include "SSystem/SComponent/c_phase.h" struct daItemBase_data { /* 0x00 */ f32 mGravity; diff --git a/include/d/actor/d_a_obj_itamato.h b/include/d/actor/d_a_obj_itamato.h index cb358289eb3..0aece512cdc 100644 --- a/include/d/actor/d_a_obj_itamato.h +++ b/include/d/actor/d_a_obj_itamato.h @@ -15,11 +15,39 @@ * */ -class daObj_ItaMato_HIO_c; +struct daObj_ItaMato_HIOParam { + /* 0x00 */ f32 attn_offset; + /* 0x04 */ f32 gravity; + /* 0x08 */ f32 scale; + /* 0x0C */ f32 real_shadow_size; + /* 0x10 */ f32 shake_pow; +}; + +class daObj_ItaMato_Param_c { +public: + virtual ~daObj_ItaMato_Param_c() {} + + static daObj_ItaMato_HIOParam const m; +}; + +#if DEBUG +#define OBJ_ITAMATO_HIO_CLASS daObj_ItaMato_HIO_c + +class daObj_ItaMato_HIO_c : public mDoHIO_entry_c { +public: + daObj_ItaMato_HIO_c(); + void genMessage(JORMContext* ctx); + void listenPropertyEvent(const JORPropertyEvent*); + + /* 0x8 */ daObj_ItaMato_HIOParam m; +}; +#else +#define OBJ_ITAMATO_HIO_CLASS daObj_ItaMato_Param_c +#endif class daObj_ItaMato_c : public fopAc_ac_c { private: - /* 0x568 */ daObj_ItaMato_HIO_c* mHIO; + /* 0x568 */ OBJ_ITAMATO_HIO_CLASS* mHIO; /* 0x56C */ request_of_phase_process_class mPhase; /* 0x574 */ J3DModel* mpModels[2]; /* 0x57C */ dBgS_ObjAcch mBgc; diff --git a/include/d/actor/d_a_obj_katatsumuri.h b/include/d/actor/d_a_obj_katatsumuri.h index 9a49e04a0ca..e481d3eb3ab 100644 --- a/include/d/actor/d_a_obj_katatsumuri.h +++ b/include/d/actor/d_a_obj_katatsumuri.h @@ -93,23 +93,4 @@ class daObjKAT_c : public dInsect_c { STATIC_ASSERT(sizeof(daObjKAT_c) == 0xa74); -class daObj_KatHIO_c : public JORReflexible { -public: - daObj_KatHIO_c(); - virtual ~daObj_KatHIO_c() {} - - void genMessage(JORMContext* ctx) { - // Golden Snail - ctx->genLabel("黄金蟲(カタツムリ)", 0x80000001); - // Model scale (male) - ctx->genSlider("モデルスケール(オス)", &this->mScaleMale, 0.1f, 4.0f); - // Model scale (female) - ctx->genSlider("モデルスケール(メス)", &this->mScaleFemale, 0.1f, 4.0f); - } - - s8 field_0x4; - f32 mScaleFemale; - f32 mScaleMale; -}; - #endif /* D_A_OBJ_KATATSUMURI_H */ diff --git a/include/d/actor/d_a_obj_mirror_6pole.h b/include/d/actor/d_a_obj_mirror_6pole.h index 99ccd3f82fc..702b1cb66be 100644 --- a/include/d/actor/d_a_obj_mirror_6pole.h +++ b/include/d/actor/d_a_obj_mirror_6pole.h @@ -43,11 +43,11 @@ class daObjMirror6Pole_c : public fopAc_ac_c { void setAnmSpeed(f32 speed) { mpBck->setPlaySpeed(speed); } bool isSwitch() { - return fopAcM_isSwitch(this, getSwitchNo()) || - /* dSv_event_flag_c::F_0361 - Arbiter's Grounds - Spun the spinning pillars */ - dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) || - /* dSv_event_flag_c::F_0354 - Cutscene - [cutscene] Mirror complete */ - dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]); + return (fopAcM_isSwitch(this, getSwitchNo()) || + /* dSv_event_flag_c::F_0361 - Arbiter's Grounds - Spun the spinning pillars */ + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361]) || + /* dSv_event_flag_c::F_0354 - Cutscene - [cutscene] Mirror complete */ + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) != false; } inline void setAction(Mode_e i_action); diff --git a/include/d/actor/d_a_obj_scannon_ten.h b/include/d/actor/d_a_obj_scannon_ten.h index 6847257840b..503a1e05223 100644 --- a/include/d/actor/d_a_obj_scannon_ten.h +++ b/include/d/actor/d_a_obj_scannon_ten.h @@ -13,6 +13,8 @@ */ class daObjSCannonTen_c : public fopAc_ac_c, public request_of_phase_process_class { public: + typedef void (daObjSCannonTen_c::*ExeProc)(void); + enum daSCannonTen_exeMode { MODE_WAIT, MODE_ORDER_EVT, @@ -55,8 +57,8 @@ class daObjSCannonTen_c : public fopAc_ac_c, public request_of_phase_process_cla void exeEmtLine(); void delEmtAll(); - static void (daObjSCannonTen_c::*s_exeProc[])(); - static void (daObjSCannonTen_c::*s_demoExeProc[][2])(); + static const ExeProc s_exeProc[]; + static const ExeProc s_demoExeProc[][2]; private: /* 0x574 */ J3DModel* mpModel; diff --git a/include/d/actor/d_a_obj_twGate.h b/include/d/actor/d_a_obj_twGate.h index 5ba018a2e01..683a7f18fb7 100644 --- a/include/d/actor/d_a_obj_twGate.h +++ b/include/d/actor/d_a_obj_twGate.h @@ -34,14 +34,4 @@ class daTwGate_c : public dBgS_MoveBgActor { STATIC_ASSERT(sizeof(daTwGate_c) == 0x5fc); -class daTwGate_HIO_c : public fOpAcm_HIO_entry_c { -public: - daTwGate_HIO_c(); - ~daTwGate_HIO_c() {} - - void genMessage(JORMContext* ctx); - - /* 0x4 */ f32 mRange; -}; - #endif /* D_A_OBJ_TWGATE_H */ diff --git a/include/d/d_attention.h b/include/d/d_attention.h index 61b640d4ffc..455516e54ff 100644 --- a/include/d/d_attention.h +++ b/include/d/d_attention.h @@ -271,10 +271,10 @@ class dAttention_c { } fopAc_ac_c* getCatghTarget() { return mCatghTarget.getCatghTarget(); } u8 getCatchChgItem() { return mCatghTarget.getChangeItem(); } - void CatchRequest(fopAc_ac_c* param_0, u8 param_1, f32 i_horizontalDist, f32 i_upDist, + int CatchRequest(fopAc_ac_c* param_0, u8 param_1, f32 i_horizontalDist, f32 i_upDist, f32 i_downDist, s16 i_angle, int param_5) { - mCatghTarget.request(param_0, param_1, i_horizontalDist, i_upDist, i_downDist, i_angle, - param_5); + return mCatghTarget.request(param_0, param_1, i_horizontalDist, i_upDist, i_downDist, + i_angle, param_5); } fopAc_ac_c* getLookTarget() { return mLookTarget.getLookTarget(); diff --git a/include/d/d_bg_w.h b/include/d/d_bg_w.h index f7f38688f7f..bf65baccdf5 100644 --- a/include/d/d_bg_w.h +++ b/include/d/d_bg_w.h @@ -220,7 +220,7 @@ class cBgW : public dBgW_Base { bool ChkNoCalcVtx() { return mFlags & NO_CALC_VTX_e; } bool ChkFlush() { return field_0x91 & 8; } void SetLock() { mFlags |= (u8)LOCK_e; } - void OffRoofRegist() { field_0x91 |= 0x4; } + void OffRoofRegist() { field_0x91 |= (u8)0x4; } void OnRoofRegist() { field_0x91 &= ~0x04; } bool ChkRoofRegist() { return field_0x91 & 4;} cBgD_Vtx_t* GetVtxTbl() const { return pm_vtx_tbl; } diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index c4278cb3cb5..20101bc074e 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -2761,10 +2761,10 @@ inline u8 dComIfGp_att_getCatchChgItem() { return dComIfGp_getAttention()->getCatchChgItem(); } -inline void dComIfGp_att_CatchRequest(fopAc_ac_c* param_0, u8 param_1, f32 i_horizontalDist, +inline int dComIfGp_att_CatchRequest(fopAc_ac_c* param_0, u8 param_1, f32 i_horizontalDist, f32 i_upDist, f32 i_downDist, s16 i_angle, int param_5) { - dComIfGp_getAttention()->CatchRequest(param_0, param_1, i_horizontalDist, i_upDist, i_downDist, - i_angle, param_5); + return dComIfGp_getAttention()->CatchRequest(param_0, param_1, i_horizontalDist, i_upDist, + i_downDist, i_angle, param_5); } inline fopAc_ac_c* dComIfGp_att_getLookTarget() { diff --git a/include/d/d_s_play.h b/include/d/d_s_play.h index 6698a628e9b..7181cf0b60c 100644 --- a/include/d/d_s_play.h +++ b/include/d/d_s_play.h @@ -4,6 +4,7 @@ #include "d/d_s_play_env.h" #include "f_op/f_op_scene.h" #include "m_Do/m_Do_hostIO.h" +#include "SSystem/SComponent/c_phase.h" class mDoDvdThd_mountXArchive_c; class mDoDvdThd_toMainRam_c; diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch index f360763e7c0..ac45474890c 100644 --- a/include/d/dolzel_base.pch +++ b/include/d/dolzel_base.pch @@ -36,6 +36,7 @@ #include "SSystem/SComponent/c_bg_s_poly_info.h" // IWYU pragma: export #include "SSystem/SComponent/c_bg_s_gnd_chk.h" // IWYU pragma: export #include "SSystem/SComponent/c_m3d_g_cyl.h" // IWYU pragma: export +#include "SSystem/SComponent/c_phase.h" // IWYU pragma: export #include "m_Do/m_Do_hostIO.h" // IWYU pragma: export #include "f_op/f_op_actor.h" // IWYU pragma: export #include "JSystem/JParticle/JPAEmitter.h" // IWYU pragma: export diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 868671d2d87..83f009a41e4 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -11,6 +11,7 @@ #include "f_op/f_op_draw_tag.h" #include "f_pc/f_pc_manager.h" #include "m_Do/m_Do_hostIO.h" +#include "SSystem/SComponent/c_phase.h" #define fopAcM_ct(ptr, ClassName) \ if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \ diff --git a/include/f_op/f_op_scene_tag.h b/include/f_op/f_op_scene_tag.h index f96ab41f485..ad26ab35649 100644 --- a/include/f_op/f_op_scene_tag.h +++ b/include/f_op/f_op_scene_tag.h @@ -2,7 +2,6 @@ #define F_F_OP_SCENE_TAG_H_ #include "f_pc/f_pc_node.h" -#include "SSystem/SComponent/c_phase.h" class scene_tag_class { public: diff --git a/include/f_pc/f_pc_create_req.h b/include/f_pc/f_pc_create_req.h index fa8dd1b6aee..eaff9ed3a6b 100644 --- a/include/f_pc/f_pc_create_req.h +++ b/include/f_pc/f_pc_create_req.h @@ -2,7 +2,6 @@ #ifndef F_PC_CREATE_REQ_H_ #define F_PC_CREATE_REQ_H_ -#include "SSystem/SComponent/c_phase.h" #include "f_pc/f_pc_create_tag.h" #include "f_pc/f_pc_method.h" #include "f_pc/f_pc_method_tag.h" @@ -11,8 +10,12 @@ typedef struct base_process_class base_process_class; typedef struct layer_class layer_class; +// declare our own typedef instead of cPhs__Handler to avoid pulling in c_phase.h +// (which causes RTTI ordering issues in relation to cM3dGCyl) +typedef int (*fpcCtRq_phase_handler)(void*); + typedef struct create_request_method_class { - /* 0x0 */ cPhs__Handler phase_handler; + /* 0x0 */ fpcCtRq_phase_handler phase_handler; /* 0x4 */ process_method_func cancel_method; /* 0x8 */ process_method_func delete_method; } create_request_method_class; diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h index 5c561f8bdc4..8037f1bfcd3 100644 --- a/include/f_pc/f_pc_stdcreate_req.h +++ b/include/f_pc/f_pc_stdcreate_req.h @@ -7,26 +7,6 @@ typedef struct layer_class layer_class; typedef int (*stdCreateFunc)(void*, void*); -typedef struct standard_create_request_class { - /* 0x00 */ create_request base; - /* 0x48 */ request_of_phase_process_class phase_request; - /* 0x50 */ s16 process_name; - /* 0x54 */ void* process_append; - /* 0x58 */ stdCreateFunc create_post_method; - /* 0x5C */ void* unk_0x5C; -#if DEBUG - /* 0x60 */ int unk_0x60; -#endif -} standard_create_request_class; - -int fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request); -int fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request); -int fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request); -int fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request); -int fpcSCtRq_phase_Done(standard_create_request_class* i_request); -int fpcSCtRq_Handler(standard_create_request_class* i_request); -int fpcSCtRq_Delete(standard_create_request_class* i_request); -int fpcSCtRq_Cancel(standard_create_request_class* i_request); fpc_ProcID fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc, void* param_4, void* i_append); diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index 077ac211aa6..f08b4bc9a67 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -251,8 +251,8 @@ static u8 body_front_sph[15] = { } // namespace int daB_MGN_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { - u16 jntNo = i_joint->getJntNo(); - int jointNo = jntNo; + J3DJoint* joint = i_joint; + int jointNo = joint->getJntNo(); mDoMtx_stack_c::copy(i_model->getAnmMtx(jointNo)); if (jointNo == JNT_BACKBONE1) { @@ -2488,6 +2488,7 @@ void daB_MGN_c::executeFall() { } void daB_MGN_c::demo_skip(int param_1) { + UNUSED(param_1); camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); mBlurRate = 0.0f; diff --git a/src/d/actor/d_a_e_cr_egg.cpp b/src/d/actor/d_a_e_cr_egg.cpp index ebb18c0874d..1ef1231f629 100644 --- a/src/d/actor/d_a_e_cr_egg.cpp +++ b/src/d/actor/d_a_e_cr_egg.cpp @@ -29,7 +29,7 @@ static void e_cr_egg_move(e_cr_egg_class* a_this) { a_this->mode = 1; a_this->timers[0] = 150; actor->speedF = 5.0f + cM_rndF(3.0f); - actor->current.angle.y += (int)cM_rndFX(10000.0f); + actor->current.angle.y += (s16)cM_rndFX(10000.0f); case 1: case 2: case 3: @@ -43,7 +43,7 @@ static void e_cr_egg_move(e_cr_egg_class* a_this) { if (a_this->mode < 4) { static f32 spy[] = {17.0f, 8.0f, 5.0f}; actor->speed.y = spy[a_this->mode - 1]; - actor->current.angle.y += (int)cM_rndFX(8000.0f); + actor->current.angle.y += (s16)cM_rndFX(8000.0f); int sp28[3] = {40, 20, 10}; Z2GetAudioMgr()->seStart(Z2SE_EN_CR_EGG_BOUND, &actor->current.pos, sp28[a_this->mode], 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -79,7 +79,7 @@ static void action(e_cr_egg_class* a_this) { break; } - actor->current.angle.x += (int)(actor->speedF * (700.0f + TREG_F(9))); + actor->current.angle.x += (s16)(actor->speedF * (700.0f + TREG_F(9))); cMtx_YrotS(*calc_mtx, actor->current.angle.y); mae.x = 0.0f; @@ -140,7 +140,7 @@ static int daE_CR_EGG_IsDelete(e_cr_egg_class* a_this) { static int daE_CR_EGG_Delete(e_cr_egg_class* a_this) { fopAc_ac_c* actor = &a_this->enemy; - fopAcM_RegisterDeleteID(actor, "E_CR_EGG"); + fopAcM_RegisterDeleteID(a_this, "E_CR_EGG"); dComIfG_resDelete(&a_this->phase, "E_CR"); a_this->sound.stopAnime(); return 1; diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp index 1fbbbc2410b..6f5c2343df4 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -22,10 +22,10 @@ daE_FB_HIO_c::daE_FB_HIO_c() { maximum_rotation_width = 0x300; minimum_turning_range = 0x10; rotation_width_stairs = 120; - color_register_1r = 0x87; - color_register_1g = 0x96; - color_register_1b = 0x91; - color_register_1a = 0xB6; + color_register_1r = 135; + color_register_1g = 150; + color_register_1b = 145; + color_register_1a = 182; maximum_rotation_width_2 = 120; } @@ -159,18 +159,18 @@ int daE_FB_c::draw() { cStack_44.set(player->current.pos); cStack_44.y += 100.0f; GXColor local_48; - local_48.r = 0x82; - local_48.g = 0xff; - local_48.b = 0x82; - local_48.a = 0xfa; + local_48.r = 130; + local_48.g = 255; + local_48.b = 130; + local_48.a = 250; dDbVw_drawLineXlu(attention_info.position, cStack_44, local_48, 1, 0xc); } #endif - GXTexObj* tex_obj = dDlst_shadowControl_c::getSimpleTex(); mShadowKey = dComIfGd_setShadow(mShadowKey, 1, model, &my_vec, BREG_F(19) + 1300.0f, 0.0f, current.pos.y, - mObjAcch.GetGroundH(), mObjAcch.m_gnd, &tevStr, 0, 1.0f, tex_obj); + mObjAcch.GetGroundH(), mObjAcch.m_gnd, &tevStr, 0, 1.0f, + dDlst_shadowControl_c::getSimpleTex()); return 1; } @@ -293,14 +293,14 @@ bool daE_FB_c::search_check() { if (fopAcM_searchPlayerDistance(this) <= l_HIO.player_detection_range) { if (!field_0x69c) { mRotation = fopAcM_searchPlayerAngleY(this); - field_0x69c = 0x1E; + field_0x69c = 30; field_0x696 = 0; } retval = true; } else if (mActionMode != 1 && !field_0x69c) { mRotation = home.angle.y; - field_0x69c = 0x1E; + field_0x69c = 30; field_0x696 = 0; } diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index 47215b96909..bb1305d96ea 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -394,35 +394,37 @@ static void e_gb_damage(e_gb_class* i_this) { i_this->invulnerabilityTimer = 35; switch (i_this->mode) { - case 0: - i_this->mode = 1; - if ((s16)(i_this->angleYTarget - actor->current.angle.y) < 0) { - ANGLE_ADD(actor->current.angle.y, KREG_S(6) + 0x2000); - } else { - ANGLE_SUB(actor->current.angle.y, KREG_S(6) + 0x2000); - } + case 0: + i_this->mode = 1; + s16 angleDiff = i_this->angleYTarget - actor->current.angle.y; + if (angleDiff < 0) { + ANGLE_ADD(actor->current.angle.y, KREG_S(6) + 0x2000); + } else { + ANGLE_SUB(actor->current.angle.y, KREG_S(6) + 0x2000); + } - cMtx_YrotS(*calc_mtx, actor->current.angle.y); - work.x = 0.0f; - work.y = AREG_F(2) + 50.0f; - work.z = AREG_F(1) + 800.0f; - MtxPosition(&work, &i_this->currentPosTarget); - i_this->currentPosTarget += actor->home.pos; - actor->speed.x = fabsf(actor->current.pos.x - i_this->currentPosTarget.x) * 0.2f; - actor->speed.y = fabsf(actor->current.pos.y - i_this->currentPosTarget.y) * 0.2f; - actor->speed.z = fabsf(actor->current.pos.z - i_this->currentPosTarget.z) * 0.2f; - i_this->timer[0] = KREG_S(7) + 15; - // fallthrough - case 1: - if (i_this->timer[0] == 0) { - if (actor->health <= 0) { - i_this->headAction = HEAD_ACTION_END; - i_this->mode = 0; - } else { - i_this->headAction = HEAD_ACTION_WAIT; - i_this->mode = -2; - } + cMtx_YrotS(*calc_mtx, actor->current.angle.y); + work.x = 0.0f; + work.y = AREG_F(2) + 50.0f; + work.z = AREG_F(1) + 800.0f; + MtxPosition(&work, &i_this->currentPosTarget); + i_this->currentPosTarget += actor->home.pos; + actor->speed.x = fabsf(actor->current.pos.x - i_this->currentPosTarget.x) * 0.2f; + actor->speed.y = fabsf(actor->current.pos.y - i_this->currentPosTarget.y) * 0.2f; + actor->speed.z = fabsf(actor->current.pos.z - i_this->currentPosTarget.z) * 0.2f; + i_this->timer[0] = KREG_S(7) + 15; + // fallthrough + case 1: + if (i_this->timer[0] == 0) { + if (actor->health <= 0) { + i_this->headAction = HEAD_ACTION_END; + i_this->mode = 0; + } else { + i_this->headAction = HEAD_ACTION_WAIT; + i_this->mode = -2; } + } + break; } cLib_addCalc2(&actor->current.pos.x, i_this->currentPosTarget.x, 0.1f, actor->speed.x); @@ -1107,183 +1109,183 @@ static void demo_camera(e_gb_class* i_this) { camera_class* camera2 = dComIfGp_getCamera(0); fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); cXyz work, pos, sp34, sp40; - int swBit; switch (i_this->demoMode) { - case 1: - if (!actor->eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(actor, 2, 0xFFFF, 0); - actor->eventInfo.onCondition(dEvtCnd_CANDEMO_e); - return; - } - - camera->mCamera.Stop(); - i_this->demoMode = 2; - i_this->demoCamFovy = 55.0f; - i_this->demoCounter = 0; - camera->mCamera.SetTrimSize(3); - daPy_getPlayerActorClass()->changeOriginalDemo(); - i_this->keyPos.set(-5750.0f, 4410.0f, 10684.0f); - i_this->keyYRot = KREG_S(4) + 0x5000; - i_this->demoCamCenter.set(-5689.0f, 4747.0f, 15000.0f); - i_this->demoCamEye.set(-5700.0f, 4740.0f, 14644.0f); - i_this->demoCamCenterTarget.set(-5689.0f, 4740.0f, 14643.0f); - i_this->demoCamEyeTarget.set(-5723.0f, 4733.0f, 14293.0f); - i_this->demoCamEyeTargetDist.x = fabsf(i_this->demoCamEyeTarget.x - i_this->demoCamEye.x); - i_this->demoCamEyeTargetDist.y = fabsf(i_this->demoCamEyeTarget.y - i_this->demoCamEye.y); - i_this->demoCamEyeTargetDist.z = fabsf(i_this->demoCamEyeTarget.z - i_this->demoCamEye.z); - i_this->demoCamCenterTargetDist.x = fabsf(i_this->demoCamCenterTarget.x - i_this->demoCamCenter.x); - i_this->demoCamCenterTargetDist.y = fabsf(i_this->demoCamCenterTarget.y - i_this->demoCamCenter.y); - i_this->demoCamCenterTargetDist.z = fabsf(i_this->demoCamCenterTarget.z - i_this->demoCamCenter.z); - i_this->demoCamStepScale = 0.0; - - Z2GetAudioMgr()->setBattleBgmOff(true); - dComIfGp_getEvent()->startCheckSkipEdge(actor); - swBit = (fopAcM_GetParam(actor) & 0xFF00) >> 8; - dComIfGs_onSwitch(swBit, fopAcM_GetRoomNo(actor)); - // fallthrough - case 2: - pos.set(-5700.0f, 4350.0f, 9670.0f); - daPy_getPlayerActorClass()->setPlayerPosAndAngle(&pos, 0, 0); - if (i_this->demoCounter > 50) { - cam_3d_morf(i_this, 0.1f); - cLib_addCalc2(&i_this->demoCamStepScale, 0.02f, 1.0f, 0.0005f); - } - - if (i_this->demoCounter != 170) break; - i_this->demoCamCenter.set(-5690.0f, 4432.0f, 9610.0f); - i_this->demoCamEye.set(-5709.0f, 4445.0f, 9961.0f); - i_this->demoCamCenterTarget.set(-5741.0f, 4432.0f, 10530.0f); - i_this->demoCamEyeTarget.set(-5760.0f, 4496.0f, 10896.0f); - i_this->demoCamEyeTargetDist.x = fabsf(i_this->demoCamEyeTarget.x - i_this->demoCamEye.x); - i_this->demoCamEyeTargetDist.y = fabsf(i_this->demoCamEyeTarget.y - i_this->demoCamEye.y); - i_this->demoCamEyeTargetDist.z = fabsf(i_this->demoCamEyeTarget.z - i_this->demoCamEye.z); - i_this->demoCamCenterTargetDist.x = fabsf(i_this->demoCamCenterTarget.x - i_this->demoCamCenter.x); - i_this->demoCamCenterTargetDist.y = fabsf(i_this->demoCamCenterTarget.y - i_this->demoCamCenter.y); - i_this->demoCamCenterTargetDist.z = fabsf(i_this->demoCamCenterTarget.z - i_this->demoCamCenter.z); - i_this->demoCamStepScale = 0.0f; - i_this->demoMode = 3; - i_this->demoCamFovy = 55.0f; - i_this->demoCounter = 0; - // fallthrough - case 3: - if (i_this->demoCounter > 30) { - cam_3d_morf(i_this, 0.1f); - cLib_addCalc2(&i_this->demoCamStepScale, 0.02f, 1.0f, 0.0005f); - } + case 1: { + if (!actor->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(actor, 2, 0xFFFF, 0); + actor->eventInfo.onCondition(dEvtCnd_CANDEMO_e); + return; + } - if (i_this->demoCounter == 130) { - i_this->mode++; - } + camera->mCamera.Stop(); + i_this->demoMode = 2; + i_this->demoCamFovy = 55.0f; + i_this->demoCounter = 0; + camera->mCamera.SetTrimSize(3); + daPy_getPlayerActorClass()->changeOriginalDemo(); + i_this->keyPos.set(-5750.0f, 4410.0f, 10684.0f); + i_this->keyYRot = KREG_S(4) + 0x5000; + i_this->demoCamCenter.set(-5689.0f, 4747.0f, 15000.0f); + i_this->demoCamEye.set(-5700.0f, 4740.0f, 14644.0f); + i_this->demoCamCenterTarget.set(-5689.0f, 4740.0f, 14643.0f); + i_this->demoCamEyeTarget.set(-5723.0f, 4733.0f, 14293.0f); + i_this->demoCamEyeTargetDist.x = fabsf(i_this->demoCamEyeTarget.x - i_this->demoCamEye.x); + i_this->demoCamEyeTargetDist.y = fabsf(i_this->demoCamEyeTarget.y - i_this->demoCamEye.y); + i_this->demoCamEyeTargetDist.z = fabsf(i_this->demoCamEyeTarget.z - i_this->demoCamEye.z); + i_this->demoCamCenterTargetDist.x = fabsf(i_this->demoCamCenterTarget.x - i_this->demoCamCenter.x); + i_this->demoCamCenterTargetDist.y = fabsf(i_this->demoCamCenterTarget.y - i_this->demoCamCenter.y); + i_this->demoCamCenterTargetDist.z = fabsf(i_this->demoCamCenterTarget.z - i_this->demoCamCenter.z); + i_this->demoCamStepScale = 0.0; + + Z2GetAudioMgr()->setBattleBgmOff(true); + dComIfGp_getEvent()->startCheckSkipEdge(actor); + int swBit = (fopAcM_GetParam(actor) & 0xFF00) >> 8; + dComIfGs_onSwitch(swBit, fopAcM_GetRoomNo(actor)); + // fallthrough + } + case 2: + pos.set(-5700.0f, 4350.0f, 9670.0f); + daPy_getPlayerActorClass()->setPlayerPosAndAngle(&pos, 0, 0); + if (i_this->demoCounter > 50) { + cam_3d_morf(i_this, 0.1f); + cLib_addCalc2(&i_this->demoCamStepScale, 0.02f, 1.0f, 0.0005f); + } - if (i_this->demoCounter == 135) { - i_this->sound.startCreatureSound(Z2SE_EN_GB_SWINGHEAD, 0, -1); - } + if (i_this->demoCounter != 170) break; + i_this->demoCamCenter.set(-5690.0f, 4432.0f, 9610.0f); + i_this->demoCamEye.set(-5709.0f, 4445.0f, 9961.0f); + i_this->demoCamCenterTarget.set(-5741.0f, 4432.0f, 10530.0f); + i_this->demoCamEyeTarget.set(-5760.0f, 4496.0f, 10896.0f); + i_this->demoCamEyeTargetDist.x = fabsf(i_this->demoCamEyeTarget.x - i_this->demoCamEye.x); + i_this->demoCamEyeTargetDist.y = fabsf(i_this->demoCamEyeTarget.y - i_this->demoCamEye.y); + i_this->demoCamEyeTargetDist.z = fabsf(i_this->demoCamEyeTarget.z - i_this->demoCamEye.z); + i_this->demoCamCenterTargetDist.x = fabsf(i_this->demoCamCenterTarget.x - i_this->demoCamCenter.x); + i_this->demoCamCenterTargetDist.y = fabsf(i_this->demoCamCenterTarget.y - i_this->demoCamCenter.y); + i_this->demoCamCenterTargetDist.z = fabsf(i_this->demoCamCenterTarget.z - i_this->demoCamCenter.z); + i_this->demoCamStepScale = 0.0f; + i_this->demoMode = 3; + i_this->demoCamFovy = 55.0f; + i_this->demoCounter = 0; + // fallthrough + case 3: + if (i_this->demoCounter > 30) { + cam_3d_morf(i_this, 0.1f); + cLib_addCalc2(&i_this->demoCamStepScale, 0.02f, 1.0f, 0.0005f); + } - if (i_this->demoCounter == 143) { - i_this->field_0x670 = 2; - } + if (i_this->demoCounter == 130) { + i_this->mode++; + } - if (i_this->demoCounter == 162) { - daPy_getPlayerActorClass()->changeDemoMode(23, 1, 2, 0); - } + if (i_this->demoCounter == 135) { + i_this->sound.startCreatureSound(Z2SE_EN_GB_SWINGHEAD, 0, -1); + } - if (i_this->demoCounter != 190) break; - i_this->mode++; - i_this->demoMode = 4; - i_this->demoCounter = 0; - body_anm_init(i_this, dRes_ID_E_GB_BCK_GF_OPEN_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - mDoAud_seStart(Z2SE_EN_GF_OPEN, &actor->home.pos, 0, 0); - i_this->demoCamCenter.set(-5706.0f, 4526.0f, 11379.0f); - i_this->demoCamEye.set(-5687.0f, 4505.0f, 11008.0f); - i_this->demoCamCenterTarget.set(-5624.0f, 4439.0f, 9818.0f); - i_this->demoCamEyeTarget.set(-5604.0f, 4418.0f, 9447.0f); - i_this->demoCamEyeTargetDist.x = fabsf(i_this->demoCamEyeTarget.x - i_this->demoCamEye.x); - i_this->demoCamEyeTargetDist.y = fabsf(i_this->demoCamEyeTarget.y - i_this->demoCamEye.y); - i_this->demoCamEyeTargetDist.z = fabsf(i_this->demoCamEyeTarget.z - i_this->demoCamEye.z); - i_this->demoCamCenterTargetDist.x = fabsf(i_this->demoCamCenterTarget.x - i_this->demoCamCenter.x); - i_this->demoCamCenterTargetDist.y = fabsf(i_this->demoCamCenterTarget.y - i_this->demoCamCenter.y); - i_this->demoCamCenterTargetDist.z = fabsf(i_this->demoCamCenterTarget.z - i_this->demoCamCenter.z); - i_this->demoCamStepScale = 0.0f; - i_this->demoCamCenter.y = 4584.0f; - // fallthrough - case 4: - if (i_this->demoCounter == (s16)(NREG_S(5) + 48)) { - head_anm_init(i_this, dRes_ID_E_GB_BCK_GB_DEMO_DROPKEY_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - i_this->sound.startCreatureSound(Z2SE_EN_GB_DROPKEY, 0, -1); - } + if (i_this->demoCounter == 143) { + i_this->field_0x670 = 2; + } - if (i_this->demoCounter == (s16)(NREG_S(6) + 54)) { - head_anm_init(i_this, dRes_ID_E_GB_BCK_GB_DEMO_DROPKEY_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - i_this->keyPos = actor->home.pos; - i_this->keyPos.y += NREG_F(9) + 400.0f; - i_this->field_0x670 = 1; - } + if (i_this->demoCounter == 162) { + daPy_getPlayerActorClass()->changeDemoMode(23, 1, 2, 0); + } - if (i_this->demoCounter == (s16)(NREG_S(7) + 68)) { - body_anm_init(i_this, dRes_ID_E_GB_BCK_GF_CLOSE_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - mDoAud_seStart(Z2SE_EN_GF_CLOSE, &actor->home.pos, 0, 0); - i_this->keyStatus = 0; - } + if (i_this->demoCounter != 190) break; + i_this->mode++; + i_this->demoMode = 4; + i_this->demoCounter = 0; + body_anm_init(i_this, dRes_ID_E_GB_BCK_GF_OPEN_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + mDoAud_seStart(Z2SE_EN_GF_OPEN, &actor->home.pos, 0, 0); + i_this->demoCamCenter.set(-5706.0f, 4526.0f, 11379.0f); + i_this->demoCamEye.set(-5687.0f, 4505.0f, 11008.0f); + i_this->demoCamCenterTarget.set(-5624.0f, 4439.0f, 9818.0f); + i_this->demoCamEyeTarget.set(-5604.0f, 4418.0f, 9447.0f); + i_this->demoCamEyeTargetDist.x = fabsf(i_this->demoCamEyeTarget.x - i_this->demoCamEye.x); + i_this->demoCamEyeTargetDist.y = fabsf(i_this->demoCamEyeTarget.y - i_this->demoCamEye.y); + i_this->demoCamEyeTargetDist.z = fabsf(i_this->demoCamEyeTarget.z - i_this->demoCamEye.z); + i_this->demoCamCenterTargetDist.x = fabsf(i_this->demoCamCenterTarget.x - i_this->demoCamCenter.x); + i_this->demoCamCenterTargetDist.y = fabsf(i_this->demoCamCenterTarget.y - i_this->demoCamCenter.y); + i_this->demoCamCenterTargetDist.z = fabsf(i_this->demoCamCenterTarget.z - i_this->demoCamCenter.z); + i_this->demoCamStepScale = 0.0f; + i_this->demoCamCenter.y = 4584.0f; + // fallthrough + case 4: + if (i_this->demoCounter == (s16)(NREG_S(5) + 48)) { + head_anm_init(i_this, dRes_ID_E_GB_BCK_GB_DEMO_DROPKEY_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + i_this->sound.startCreatureSound(Z2SE_EN_GB_DROPKEY, 0, -1); + } - if (i_this->demoCounter > 150) { - cam_3d_morf(i_this, 0.2f); - cLib_addCalc2(&i_this->demoCamStepScale, 0.04f, 1.0f, 0.002f); - } else if (i_this->demoCounter >= 80) { - cLib_addCalc2(&i_this->demoCamCenter.y, 4526.0f, 0.05f, 1.0f); - } + if (i_this->demoCounter == (s16)(NREG_S(6) + 54)) { + head_anm_init(i_this, dRes_ID_E_GB_BCK_GB_DEMO_DROPKEY_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + i_this->keyPos = actor->home.pos; + i_this->keyPos.y += NREG_F(9) + 400.0f; + i_this->field_0x670 = 1; + } - if (i_this->bodyAnmNo == dRes_ID_E_GB_BCK_GF_CLOSE_e && i_this->flowerAnmP->isStop()) { - body_anm_init(i_this, dRes_ID_E_GB_BCK_GF_WAIT_CLOSE_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); - } + if (i_this->demoCounter == (s16)(NREG_S(7) + 68)) { + body_anm_init(i_this, dRes_ID_E_GB_BCK_GF_CLOSE_e, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + mDoAud_seStart(Z2SE_EN_GF_CLOSE, &actor->home.pos, 0, 0); + i_this->keyStatus = 0; + } - if (i_this->demoCounter == 220) { - i_this->demoMode = 100; - i_this->headAction = HEAD_ACTION_WAIT; - i_this->mode = 0; - i_this->flowerAction = FLOWER_ACTION_WAIT; - i_this->flowerMode = 0; - Z2GetAudioMgr()->setBattleBgmOff(false); - } - break; + if (i_this->demoCounter > 150) { + cam_3d_morf(i_this, 0.2f); + cLib_addCalc2(&i_this->demoCamStepScale, 0.04f, 1.0f, 0.002f); + } else if (i_this->demoCounter >= 80) { + cLib_addCalc2(&i_this->demoCamCenter.y, 4526.0f, 0.05f, 1.0f); + } - case 10: - if (!actor->eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(actor, 2, 0xFFFF, 0); - actor->eventInfo.onCondition(dEvtCnd_CANDEMO_e); - return; - } + if (i_this->bodyAnmNo == dRes_ID_E_GB_BCK_GF_CLOSE_e && i_this->flowerAnmP->isStop()) { + body_anm_init(i_this, dRes_ID_E_GB_BCK_GF_WAIT_CLOSE_e, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); + } - camera->mCamera.Stop(); - i_this->demoMode = 11; - i_this->demoCamFovy = 55.0; - i_this->demoCounter = 0; - camera->mCamera.SetTrimSize(3); - // fallthrough - case 11: - i_this->demoCamCenter = actor->home.pos; - i_this->demoCamCenter.y += YREG_F(12) + 100.0f; - i_this->demoCamEye = actor->home.pos; - i_this->demoCamEye.x += YREG_F(13); - i_this->demoCamEye.y += YREG_F(14) + 300.0f; - i_this->demoCamEye.z += YREG_F(15) + -600.0f; - - if (i_this->demoCounter == 100) { - i_this->demoMode = 100; - } - break; + if (i_this->demoCounter == 220) { + i_this->demoMode = 100; + i_this->headAction = HEAD_ACTION_WAIT; + i_this->mode = 0; + i_this->flowerAction = FLOWER_ACTION_WAIT; + i_this->flowerMode = 0; + Z2GetAudioMgr()->setBattleBgmOff(false); + } + break; - case 100: - camera->mCamera.Reset(i_this->demoCamCenter, i_this->demoCamEye); - camera->mCamera.Start(); - camera->mCamera.SetTrimSize(0); - dComIfGp_event_reset(); - daPy_getPlayerActorClass()->cancelOriginalDemo(); - i_this->demoMode = 0; - break; + case 10: + if (!actor->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(actor, 2, 0xFFFF, 0); + actor->eventInfo.onCondition(dEvtCnd_CANDEMO_e); + return; + } - case 0: - break; + camera->mCamera.Stop(); + i_this->demoMode = 11; + i_this->demoCamFovy = 55.0; + i_this->demoCounter = 0; + camera->mCamera.SetTrimSize(3); + // fallthrough + case 11: + i_this->demoCamCenter = actor->home.pos; + i_this->demoCamCenter.y += YREG_F(12) + 100.0f; + i_this->demoCamEye = actor->home.pos; + i_this->demoCamEye.x += YREG_F(13); + i_this->demoCamEye.y += YREG_F(14) + 300.0f; + i_this->demoCamEye.z += YREG_F(15) + -600.0f; + + if (i_this->demoCounter == 100) { + i_this->demoMode = 100; + } + break; + + case 100: + camera->mCamera.Reset(i_this->demoCamCenter, i_this->demoCamEye); + camera->mCamera.Start(); + camera->mCamera.SetTrimSize(0); + dComIfGp_event_reset(); + daPy_getPlayerActorClass()->cancelOriginalDemo(); + i_this->demoMode = 0; + break; + + case 0: + break; } if (i_this->demoMode != 0) { @@ -1291,7 +1293,7 @@ static void demo_camera(e_gb_class* i_this) { i_this->demoCounter++; if (i_this->demoMode < 10) { - dComIfGp_getEvent()->setSkipProc(i_this, dEv_defaultSkipProc, 0); + dComIfGp_getEvent()->setSkipProc(actor, dEv_defaultSkipProc, 0); if (dComIfGp_getEvent()->checkSkipEdge()) { i_this->demoMode = 100; cMtx_YrotS(*calc_mtx, player->shape_angle.y); @@ -1324,6 +1326,7 @@ static int daE_GB_Execute(e_gb_class* i_this) { fopEn_enemy_c* actor = &i_this->actor; cXyz work, pos; + J3DModel* model; i_this->frameCounter++; @@ -1358,7 +1361,7 @@ static int daE_GB_Execute(e_gb_class* i_this) { f32 scale = l_HIO.face_size; mDoMtx_stack_c::scaleM(scale, scale, scale); - J3DModel* model = i_this->anmP->getModel(); + model = i_this->anmP->getModel(); model->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->anmP->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(actor)), 0); i_this->anmP->modelCalc(); diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index 258b7fb7cf6..5d926a4d571 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -169,10 +169,14 @@ static fopAc_ac_c* m_near_carry; static fopAc_ac_c* m_near_weapon; static void* s_obj_sub(void* i_actor, void* i_data) { + f32 actor_dist; + + UNUSED(i_data); + if (fopAcM_IsActor(i_actor)) { if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && !fopAcM_checkCarryNow((fopAc_ac_c*)i_actor)) { - f32 actor_dist = fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data); + actor_dist = fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data); if (actor_dist < 100.0f && !fopAcM_GetSpeedF((fopAc_ac_c*)i_actor) && !fopAcM_GetSpeed((fopAc_ac_c*)i_actor).y) @@ -713,8 +717,12 @@ void daE_HZ_c::initBackWalk() { linChk.Set(&start, &end, NULL); if (dComIfG_Bgsp().LineCross(&linChk)) { - cLib_offsetPos(&field_0x678, &home.pos, modifiedTargetAngleY & 0x4000 ? (s16)((targetAngleY + 0x4000) & 0x8000) : - (s16)((targetAngleY & 0x8000) + 0x4000), &position); + if (modifiedTargetAngleY & 0x4000) { + targetAngleY = (s16)(targetAngleY + 0x4000 & 0x8000); + } else { + targetAngleY = (s16)((targetAngleY & 0x8000) + 0x4000); + } + cLib_offsetPos(&field_0x678, &home.pos, targetAngleY, &position); } } } @@ -863,6 +871,7 @@ void daE_HZ_c::executeWind() { dBgS_GndChk gndChk; dBgS_LinChk linChk; BOOL bVar = false; + f32 deltaY; f32 frame = mpMorfSO->getFrame(); f32 playerDist; f32 groundCross; @@ -890,12 +899,12 @@ void daE_HZ_c::executeWind() { field_0x6cc = (s16)((playerDist * 15.0f) / 1000.0f); /* fallthrough */ case 1: - frame = 6.0f - frame / 3.0f; - if (frame < 0.0f) { - frame = 0.0f; + deltaY = 6.0f - frame / 3.0f; + if (deltaY < 0.0f) { + deltaY = 0.0f; } - current.pos.y += frame; + current.pos.y += deltaY; ANGLE_SUB(shape_angle.y, 0x7D0); if (mpMorfSO->checkFrame(field_0x6cc) || mpBoomerangActor == NULL || @@ -1345,15 +1354,14 @@ void daE_HZ_c::executeWindWalk() { } void daE_HZ_c::setWaterEffect() { + cXyz position(current.pos.x, mGroundCross, current.pos.z); + static cXyz sc(2.0f, 2.0f, 2.0f); static u16 w_eff_id[4] = { ID_ZI_J_DOWNWTRA_A, ID_ZI_J_DOWNWTRA_B, ID_ZI_J_DOWNWTRA_C, ID_ZI_J_DOWNWTRA_D, }; - - cXyz position(current.pos.x, mGroundCross, current.pos.z); - static cXyz sc(2.0f, 2.0f, 2.0f); for (int i = 0; i < 4; i++) { mWaterEffects[i] = dComIfGp_particle_set(mWaterEffects[i], w_eff_id[i], &position, &tevStr, @@ -1453,7 +1461,7 @@ void daE_HZ_c::executeDeathWait() { } void daE_HZ_c::damage_check() { - s16 angle; + s16 targetAngleY; if (mAction != 1 || mMode < 4) { if (mSpheres[0].ChkTgHit() && mSpheres[0].GetTgHitObj()->ChkAtType(AT_TYPE_BOOMERANG)) { @@ -1533,68 +1541,68 @@ void daE_HZ_c::damage_check() { } setActionMode(ACTION_DEATH); - return; - } - - if (mAction == ACTION_AWAY) { - if (bVar) { - field_0x6cc = 1; - setActionMode(ACTION_DAMAGE); - return; - } + } else { + if (mAction == ACTION_AWAY) { + if (bVar) { + field_0x6cc = 1; + setActionMode(ACTION_DAMAGE); + return; + } - angle = cLib_targetAngleY(&mSpheres[1].GetCoCP(), &player_pos) - shape_angle.y; - if (i == 1) { - if (abs(angle) >= 0x4000) { - if (bVar) { - mBackbone1YZRot.z = 0x5000; - mBackbone2YZRot.z = -0x4000; - mBackbone3YZRot.z = 0; + targetAngleY = cLib_targetAngleY(&mSpheres[1].GetCoCP(), &player_pos); + targetAngleY = (s16)(targetAngleY - shape_angle.y); + if (i == 1) { + if (abs(targetAngleY) >= 0x4000) { + if (bVar) { + mBackbone1YZRot.z = 0x5000; + mBackbone2YZRot.z = -0x4000; + mBackbone3YZRot.z = 0; + } else { + mBackbone1YZRot.z = 0x3000; + } + + } else if (bVar) { + mBackbone1YZRot.z = -0x3000; + mBackbone2YZRot.z = -0x2000; + mBackbone3YZRot.z = -0x1000; } else { - mBackbone1YZRot.z = 0x3000; + mBackbone1YZRot.z = -0x2000; + mBackbone2YZRot.z = -0x1000; + mBackbone3YZRot.z = -0x800; } - + speedF = 0.0f; } else if (bVar) { - mBackbone1YZRot.z = -0x3000; - mBackbone2YZRot.z = -0x2000; - mBackbone3YZRot.z = -0x1000; + mBackbone1YZRot.z = 0x5000; + mBackbone2YZRot.z = -0x4000; + mBackbone3YZRot.z = 0; } else { - mBackbone1YZRot.z = -0x2000; - mBackbone2YZRot.z = -0x1000; - mBackbone3YZRot.z = -0x800; + mBackbone1YZRot.z = 0x3000; } - speedF = 0.0f; - } else if (bVar) { - mBackbone1YZRot.z = 0x5000; - mBackbone2YZRot.z = -0x4000; - mBackbone3YZRot.z = 0; - } else { - mBackbone1YZRot.z = 0x3000; - } - if (angle < -0x2800) { - angle = -0x2800; - } + if (targetAngleY < -0x2800) { + targetAngleY = -0x2800; + } + + if (targetAngleY > 0x2800) { + targetAngleY = 0x2800; + } - if (angle > 0x2800) { - angle = 0x2800; + mBackbone1YZRot.y = targetAngleY; + mSound.startCreatureVoice(Z2SE_EN_HZ_V_DAMAGE, -1); + return; } - mBackbone1YZRot.y = angle; - mSound.startCreatureVoice(Z2SE_EN_HZ_V_DAMAGE, -1); - return; - } - - if (bVar) { - field_0x6cc = 1; - } else { - field_0x6cc = 0; - if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_SHIELD_ATTACK)) { - field_0x6cc = 2; + if (bVar) { + field_0x6cc = 1; + } else { + field_0x6cc = 0; + if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_SHIELD_ATTACK)) { + field_0x6cc = 2; + } } - } - setActionMode(ACTION_DAMAGE); + setActionMode(ACTION_DAMAGE); + } return; } } @@ -1605,13 +1613,8 @@ void daE_HZ_c::damage_check() { bool daE_HZ_c::checkWaterSurface() { dBgS_ObjGndChk_Spl spline; - Vec modified_pos /* = current.pos; */; - // this might not match in debug since it's not calling - // Vec::operator_= in debug - // For retail, it's no problem since it gets optimized out - modified_pos.x = current.pos.x; - modified_pos.y = current.pos.y; - modified_pos.z = current.pos.z; + Vec modified_pos; + modified_pos = current.pos; modified_pos.y += 500.0f; spline.SetPos(&modified_pos); mGroundCross = dComIfG_Bgsp().GroundCross(&spline); @@ -1722,59 +1725,64 @@ void daE_HZ_c::action() { void daE_HZ_c::mtx_set() { mDoMtx_stack_c::transS(home.pos.x, home.pos.y - 13.0f, home.pos.z); mpModel2->setBaseTRMtx(mDoMtx_stack_c::get()); - if (field_0x6e8 == 0) { - mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); - mDoMtx_stack_c::ZXYrotM(shape_angle); - mDoMtx_stack_c::scaleM(l_HIO.basic_size, l_HIO.basic_size, l_HIO.basic_size); - J3DModel* morfModel = mpMorfSO->getModel(); - morfModel->setBaseTRMtx(mDoMtx_stack_c::get()); - mpMorfSO->modelCalc(); - MtxP anmMtx = morfModel->getAnmMtx(7); - mpModel->setBaseTRMtx(anmMtx); - mSmokeEffectPosition.set(anmMtx[0][3], anmMtx[1][3], anmMtx[2][3]); - if (mSetModelAnmMtx) { - mSetModelAnmMtx = false; - mDoMtx_stack_c::copy(anmMtx); - mDoMtx_stack_c::ZrotM(-0x4000); - mDoMtx_stack_c::transM(0.0f, 14.0f, 0.0f); - MTXCopy(mDoMtx_stack_c::get(), mMtx); - } else { - mDoMtx_stack_c::transS(home.pos); - MTXCopy(mDoMtx_stack_c::get(), mMtx); - } - if (mpBgW != NULL) { - mpBgW->Move(); - } + if (field_0x6e8 != 0) { + return; + } + + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle); + mDoMtx_stack_c::scaleM(l_HIO.basic_size, l_HIO.basic_size, l_HIO.basic_size); + J3DModel* morfModel = mpMorfSO->getModel(); + morfModel->setBaseTRMtx(mDoMtx_stack_c::get()); + mpMorfSO->modelCalc(); + MtxP anmMtx = morfModel->getAnmMtx(7); + mpModel->setBaseTRMtx(anmMtx); + mSmokeEffectPosition.set(anmMtx[0][3], anmMtx[1][3], anmMtx[2][3]); + if (mSetModelAnmMtx) { + mSetModelAnmMtx = false; + mDoMtx_stack_c::copy(anmMtx); + mDoMtx_stack_c::ZrotM(-0x4000); + mDoMtx_stack_c::transM(0.0f, 14.0f, 0.0f); + cMtx_copy(mDoMtx_stack_c::get(), mMtx); + } else { + mDoMtx_stack_c::transS(home.pos); + cMtx_copy(mDoMtx_stack_c::get(), mMtx); + } + + if (mpBgW != NULL) { + mpBgW->Move(); } } void daE_HZ_c::cc_set() { - if (field_0x6e8 == 0) { - cXyz pos; - J3DModel* morfModel = mpMorfSO->getModel(); - - attention_info.position = eyePos = mSmokeEffectPosition; - attention_info.position.y += 30.0f; - - MTXCopy(morfModel->getAnmMtx(7), mDoMtx_stack_c::get()); - mDoMtx_stack_c::multVecZero(&pos); - mSpheres[0].SetC(pos); - mSpheres[0].SetR(80.0f); - dComIfG_Ccsp()->Set(&mSpheres[0]); - - MTXCopy(morfModel->getAnmMtx(1), mDoMtx_stack_c::get()); - mDoMtx_stack_c::multVecZero(&pos); - mSpheres[1].SetC(pos); - mSpheres[1].SetR(80.0f); - dComIfG_Ccsp()->Set(&mSpheres[1]); - - MTXCopy(morfModel->getAnmMtx(0x12), mDoMtx_stack_c::get()); - mDoMtx_stack_c::multVecZero(&pos); - mSpheres[2].SetC(pos); - mSpheres[2].SetR(80.0f); - dComIfG_Ccsp()->Set(&mSpheres[2]); + if (field_0x6e8 != 0) { + return; } + + cXyz pos; + J3DModel* morfModel = mpMorfSO->getModel(); + + attention_info.position = eyePos = mSmokeEffectPosition; + attention_info.position.y += 30.0f; + + MTXCopy(morfModel->getAnmMtx(7), mDoMtx_stack_c::get()); + mDoMtx_stack_c::multVecZero(&pos); + mSpheres[0].SetC(pos); + mSpheres[0].SetR(80.0f); + dComIfG_Ccsp()->Set(&mSpheres[0]); + + MTXCopy(morfModel->getAnmMtx(1), mDoMtx_stack_c::get()); + mDoMtx_stack_c::multVecZero(&pos); + mSpheres[1].SetC(pos); + mSpheres[1].SetR(80.0f); + dComIfG_Ccsp()->Set(&mSpheres[1]); + + MTXCopy(morfModel->getAnmMtx(0x12), mDoMtx_stack_c::get()); + mDoMtx_stack_c::multVecZero(&pos); + mSpheres[2].SetC(pos); + mSpheres[2].SetR(80.0f); + dComIfG_Ccsp()->Set(&mSpheres[2]); } int daE_HZ_c::execute() { @@ -1875,7 +1883,8 @@ static int daE_HZ_Delete(daE_HZ_c* i_this) { } int daE_HZ_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { - int joint_no = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int joint_no = joint->getJntNo(); mDoMtx_stack_c::copy(i_model->getAnmMtx(joint_no)); @@ -1897,7 +1906,7 @@ int daE_HZ_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { } i_model->setAnmMtx(joint_no, mDoMtx_stack_c::get()); - MTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); + cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); return 1; } @@ -2007,11 +2016,11 @@ int daE_HZ_c::create() { static dCcD_SrcSph cc_sph_src2 = { { - {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0}, {0xd8fafdff, 0x3}, 0x75}}, // mObj - {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf + {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0}, {(s32)0xd8fafdff, 0x3}, 0x75}}, // mObj + {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf { {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph } // mSphAttr @@ -2026,7 +2035,10 @@ int daE_HZ_c::create() { return phase; } - if ((fopAcM_GetParam(this) >> 8 & 0xFF) == 1) { + u8 param = (fopAcM_GetParam(this) >> 8) & 0xFF; + if (param == 1) { + int dummy; // force debug to use r31 as stack pointer + mpName = "E_hzp2"; } else { mpName = "E_hzp"; @@ -2035,7 +2047,7 @@ int daE_HZ_c::create() { phase = dComIfG_resLoad(&mPhaseReq2, mpName); if (phase == cPhs_COMPLEATE_e) { OS_REPORT("E_HZ PARAM %x\n", fopAcM_GetParam(this)); - + if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x2C20)) { return cPhs_ERROR_e; } @@ -2046,7 +2058,7 @@ int daE_HZ_c::create() { if (!hio_set) { mHIOInit = true; hio_set = true; - l_HIO.enemy_sample = mDoHIO_CREATE_CHILD("Hajiki-san", &l_HIO); + l_HIO.enemy_sample = mDoHIO_CREATE_CHILD("ハジキさん", &l_HIO); } fopAcM_SetMtx(this, mpMorfSO->getModel()->getBaseTRMtx()); diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index dbc3cdf3ff0..30e5b5422b9 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -57,13 +57,13 @@ void daE_MD_c::setCcCylinder(f32 i_height) { } int daE_MD_c::CreateHeap() { - void* modelData; + J3DModelData* modelData; if (mType != TYPE_LV9) { - modelData = dComIfG_getObjectRes("E_MD", 0xB); + modelData = (J3DModelData*)dComIfG_getObjectRes("E_MD", 0xB); } else if (mType == TYPE_LV9) { - modelData = dComIfG_getObjectRes("E_MD", 9); + modelData = (J3DModelData*)dComIfG_getObjectRes("E_MD", 9); } else { - modelData = dComIfG_getObjectRes("E_MD", 9); + modelData = (J3DModelData*)dComIfG_getObjectRes("E_MD", 9); } JUT_ASSERT(180, modelData != NULL); @@ -74,19 +74,20 @@ int daE_MD_c::CreateHeap() { } if (mType == TYPE_DUMMY) { - modelData = dComIfG_getObjectRes("E_MD", 0xD); + modelData = (J3DModelData*)dComIfG_getObjectRes("E_MD", 0xD); mpYariModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, NULL, 0x80000, 0x11000084); if (mpYariModelMorf == NULL || mpYariModelMorf->getModel() == NULL) { return 0; } } else if (mType == TYPE_LV9) { - modelData = dComIfG_getObjectRes("E_MD", 0xA); + modelData = (J3DModelData*)dComIfG_getObjectRes("E_MD", 0xA); mpYariModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, NULL, 0x80000, 0x11000084); if (mpYariModelMorf == NULL || mpYariModelMorf->getModel() == NULL) { return 0; } } else { - mpTbModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("E_MD", 0xC), 0x80000, 0x11000084); + modelData = (J3DModelData*)dComIfG_getObjectRes("E_MD", 0xC); + mpTbModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpTbModel == NULL) { return 0; } @@ -126,8 +127,9 @@ void daE_MD_c::At_Check() { if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT)) { mAtInfo.mAttackPower = 0; } - - u8 at_se = ((dCcD_GObjInf*)mAtInfo.mpCollider)->GetAtSe(); + + dCcD_GObjInf* collider = (dCcD_GObjInf*)mAtInfo.mpCollider; + int at_se = collider->GetAtSe(); if (mAtInfo.mpSound != NULL && mAtInfo.field_0x18 != 0) { mAtInfo.mpSound->startCollisionSE(dCcD_GObjInf::getHitSeID(at_se, 0), mAtInfo.field_0x18); } @@ -148,6 +150,10 @@ void daE_MD_c::CheckHit() { cCcD_Obj* hit_obj = mCyl.GetTgHitObj(); fopAc_ac_c* hit_actor = dCc_GetAc(hit_obj->GetAc()); + //TODO: probably a fakematch (debug) + UNUSED(hit_obj); + UNUSED(hit_actor); + if ((hit_obj->ChkAtType(AT_TYPE_IRON_BALL) || fopAcM_GetName(hit_actor) == PROC_E_TH_BALL || fopAcM_GetName(hit_actor) == PROC_B_TN) && (mType == TYPE_DUMMY || mType == TYPE_LV9)) { if (mAction == ACTION_WAIT) { mCyl.OffTgIronBallRebound(); @@ -164,8 +170,8 @@ void daE_MD_c::CheckHit() { mBreakTimer = 10; Z2GetAudioMgr()->seStart(Z2SE_OBJ_ARMOR_HIT, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - - u32 bu_params = (mSwbit << 0x18) | 0xFF0000 | 0x2FFF; + + u32 bu_params = (mSwbit << 0x18) | 0xFF2FFF; if (mCanCreateBu && mType == TYPE_DUMMY) { fopAcM_create(PROC_E_BU, bu_params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } @@ -223,7 +229,7 @@ void daE_MD_c::HalfBreakAction() { } } -bool daE_MD_c::VibAction() { +u8 daE_MD_c::VibAction() { shape_angle.x = field_0x5ca * cM_ssin(field_0x5ce); cLib_addCalcAngleS(&field_0x5cc, 0x10, 3.0f + nREG_F(3), 0x100, 0); field_0x5ce += field_0x5cc; @@ -313,7 +319,7 @@ int daE_MD_c::Execute() { return 1; } -int daE_MD_c::Delete() { +inline int daE_MD_c::Delete() { dComIfG_resDelete(&mPhase, "E_MD"); if (heap != NULL) { mpModelMorf->stopZelAnime(); @@ -384,7 +390,7 @@ static int daE_MD_Execute(daE_MD_c* i_this) { return i_this->Execute(); } -int daE_MD_c::create() { +inline int daE_MD_c::create() { fopAcM_ct(this, daE_MD_c); int phase_state = dComIfG_resLoad(&mPhase, "E_MD"); @@ -396,7 +402,7 @@ int daE_MD_c::create() { mSwbit = (fopAcM_GetParam(this) & 0xFF00) >> 8; - u8 type = fopAcM_GetParam(this) & 0xFF; + u8 type = fopAcM_GetParam(this) & 0x0FFFFFFF; if (type == 1) { mType = TYPE_DUMMY; mCanCreateBu = TRUE; @@ -428,7 +434,7 @@ int daE_MD_c::create() { mAcchCir.SetWall(100.0f, 10.0f); fopAcM_setCullSizeBox(this, -1500.0f, 0.0f, -1500.0f, 1000.0f, 1500.0f, 1500.0f); mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), NULL, NULL); - + cXyz sp1C(current.pos.x, 100.0f + current.pos.y, current.pos.z); if (fopAcM_gc_c::gndCheck(&sp1C)) { field_0x5bc = fopAcM_gc_c::getGroundY(); @@ -458,18 +464,18 @@ static actor_method_class l_daE_MD_Method = { }; actor_process_profile_definition g_profile_E_MD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_MD_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 132, // mPriority - &l_daE_MD_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_E_MD, // mProcName + &g_fpcLf_Method.base, // sub_method + sizeof(daE_MD_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 132, // mPriority + &l_daE_MD_Method, // sub_method + 0x00044100, // mStatus + fopAc_ENV_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType + }; diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index 70a9b87e56b..e1a404ed1d5 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -1658,7 +1658,7 @@ static void e_wb_b_run(e_wb_class* i_this) { i_this->mMovementType = 1; break; - case 3: + case 3: i_this->mPursuitFlag = 1; target_speed = l_HIO.max_speed; acceleration = 3.0f; @@ -2461,7 +2461,7 @@ static int e_wb_damage(e_wb_class* i_this) { ANGLE_ADD(a_this->current.angle.y, cM_rndFX(3000.0f)); i_this->mStatusFlags |= (u16)0x40; break; - + case 1: if (i_this->mAcch.ChkGroundHit()) { i_this->mActionMode = 2; @@ -2471,7 +2471,7 @@ static int e_wb_damage(e_wb_class* i_this) { i_this->field_0x6b4.y = (s16)cM_rndFX(2000.0f + YREG_F(4)); } break; - + case 2: if (i_this->mpModelMorf->isStop()) { i_this->mActionMode = 3; @@ -2485,7 +2485,7 @@ static int e_wb_damage(e_wb_class* i_this) { i_this->field_0x698[0] = (s16)(cM_rndF(40.0f) + 70.0f); } break; - + case 3: local_48 = TRUE; if (i_this->mpModelMorf->isStop()) { @@ -2495,12 +2495,12 @@ static int e_wb_damage(e_wb_class* i_this) { anm_init(i_this, 0x13, 3.0f, 2, 1.0f); } } - + if (i_this->mAcch.ChkGroundHit()) { a_this->speedF = 0.0f; cLib_addCalcAngleS2(&i_this->field_0x6b4.y, 0, 1, 0x96 + YREG_S(3)); } - + if (i_this->field_0x698[0] == 0 && i_this->field_0x6ae.x > -0x200) { if (i_this->field_0x6e4 == 0) { anm_init(i_this, 0x10, 2.0f, 0, 1.0f); @@ -2510,7 +2510,7 @@ static int e_wb_damage(e_wb_class* i_this) { i_this->mActionMode = 4; } break; - + case 4: if (i_this->mpModelMorf->isStop()) { i_this->mActionID = ACT_WAIT; @@ -2538,9 +2538,9 @@ static int e_wb_bg_damage(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; cXyz local_30, unused; BOOL return_value = FALSE; - + i_this->field_0x6a0 = 10; - + switch (i_this->mActionMode) { case 0: dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(&i_this->mEnemy), 5); @@ -2550,7 +2550,7 @@ static int e_wb_bg_damage(e_wb_class* i_this) { i_this->mStatusFlags |= (u16)0x80; i_this->field_0x1432 = 0; break; - + case 1: if (i_this->mpModelMorf->isStop()) { i_this->mActionMode = 2; @@ -2558,7 +2558,7 @@ static int e_wb_bg_damage(e_wb_class* i_this) { i_this->field_0x698[0] = (s16)(cM_rndF(60.0f) + 150.0f); } break; - + case 2: return_value = TRUE; if (i_this->field_0x698[0] == 0) { @@ -2566,7 +2566,7 @@ static int e_wb_bg_damage(e_wb_class* i_this) { i_this->mActionMode = 3; } break; - + case 3: if (i_this->mpModelMorf->isStop()) { i_this->mActionID = ACT_WAIT; @@ -2574,7 +2574,7 @@ static int e_wb_bg_damage(e_wb_class* i_this) { } break; } - + return return_value; } @@ -2583,9 +2583,9 @@ static int e_wb_lr_damage(e_wb_class* i_this) { cXyz local_2c; cXyz local_38; BOOL return_value = FALSE; - + i_this->field_0x6a0 = 10; - + switch (i_this->mActionMode) { case 0: { if (cM_rndF(1.0f) < 0.5f || i_this->field_0x1720 != 0) { @@ -2683,7 +2683,7 @@ static int e_wb_lr_damage(e_wb_class* i_this) { cLib_addCalc0(&a_this->speedF, 1.0f, 1.5f + YREG_F(11)); i_this->field_0x6ae.y += i_this->field_0x6b4.y; - + return return_value; } @@ -2701,15 +2701,15 @@ static void e_wb_kiba_start(e_wb_class* i_this) { default: break; } - + cLib_addCalc2(&a_this->speedF, target, 1.0f, 5.0f); } static void e_wb_kiba_end(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - + i_this->field_0x6a0 = 10; - + switch (i_this->mActionMode) { case 0: if (i_this->mAnmID != 0x20) { @@ -2718,7 +2718,7 @@ static void e_wb_kiba_end(e_wb_class* i_this) { i_this->mActionMode = 1; i_this->field_0x169e = 1; break; - + case 1: i_this->mMovementType = 1; i_this->mAnimDuration = 60.0f + YREG_F(10); @@ -2734,14 +2734,14 @@ static void e_wb_kiba_end(e_wb_class* i_this) { i_this->mStatusFlags |= (u16)0x100; } break; - + case 2: if (a_this->speed.y < 10.0f) { anm_init(i_this, 0x19, 10.0f, 0, 1.0f); i_this->mActionMode = 3; } break; - + case 3: if (i_this->mAnmID == 0x19) { if (a_this->speed.y < -30.0f + JREG_F(9) || i_this->mAcch.ChkGroundHit()) { @@ -2758,25 +2758,25 @@ static void e_wb_kiba_end(e_wb_class* i_this) { case 4: break; } - + cLib_addCalc2(&a_this->speedF, 40.0f, 1.0f, 5.0f); } static void damage_check(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; fopAc_ac_c* player = dComIfGp_getPlayer(0); - + a_this->health = 100; - + if (i_this->field_0x6ba != 0) { i_this->field_0x6ba--; } - + for (int i = 0; i <= 2; i++) { if (i_this->field_0xa00[i].ChkCoHit()) { fopAc_ac_c* hit_actor = dCc_GetAc(i_this->field_0xa00[i].GetCoHitObj()->GetAc()); - if (!daAlink_getAlinkActorClass()->checkBoarRideOwn(a_this) && + if (!daAlink_getAlinkActorClass()->checkBoarRideOwn(a_this) && i_this->field_0x6a0 == 0 && a_this->speedF < 1.0f && fopAcM_GetName(hit_actor) == PROC_ALINK) { ANGLE_ADD(i_this->field_0x6ba, 2); @@ -2806,7 +2806,7 @@ static void damage_check(e_wb_class* i_this) { if (i_this->field_0x79d >= 2 && a_this->speedF >= 30.0f) { i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_RDB_V_RUNDOWN, -1); i_this->mZ2Ride.startCreatureSound(Z2SE_EN_BB_RUNDOWN, 0, -1); - + e_rd_class* rider = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); rider->field_0x998 = 20; } else { @@ -2821,7 +2821,7 @@ static void damage_check(e_wb_class* i_this) { { cXyz pos_diff = hit_actor->current.pos - a_this->current.pos; s16 angle = cM_atan2s(pos_diff.x, pos_diff.z) - a_this->shape_angle.y; - + if (angle < 0) { i_this->field_0x5de = 0x1000; ANGLE_ADD(a_this->current.angle.y, 0x800); @@ -2835,16 +2835,16 @@ static void damage_check(e_wb_class* i_this) { } } } - + i_this->mStts.Move(); - + if (i_this->field_0x6a0 == 0) { dCcU_AtInfo at_info; - + for (int i = 0; i <= 6; i++) { if (i_this->field_0xa00[i].ChkTgHit()) { i_this->field_0x13c0.mpCollider = i_this->field_0xa00[i].GetTgHitObj(); - + if (i_this->field_0x79d != 0 || (daPy_getPlayerActorClass()->checkHorseRide() && (i_this->mStatusFlags & 3) != 0)) { if (i_this->field_0x79d != 0) { @@ -2853,7 +2853,7 @@ static void damage_check(e_wb_class* i_this) { } else { at_power_check(&i_this->field_0x13c0); cc_at_check(a_this, &i_this->field_0x13c0); - + if ((i_this->mStatusFlags & 3) != 0) { if (i_this->field_0x13c0.mAttackPower < 30) { i_this->field_0x692 = i_this->mActionID; @@ -2867,13 +2867,13 @@ static void damage_check(e_wb_class* i_this) { i_this->mActionMode = 0; } } - + if (i_this->field_0x13c0.mpCollider->ChkAtType(AT_TYPE_UNK)) { i_this->field_0x6a0 = 20; } else { i_this->field_0x6a0 = 10; } - + i_this->mAnimDuration = 30.0f; return; } @@ -2887,19 +2887,19 @@ static void effect_set(e_wb_class* i_this) { cXyz effect_pos; dBgS_GndChk gnd_chk; dBgS_ObjGndChk_Spl obj_gnd_chk; - + pos = a_this->current.pos; pos.y += 100.0f; gnd_chk.SetPos(&pos); obj_gnd_chk.SetPos(&pos); - + s8 is_water = false; s8 in_water = false; f32 ground_y = dComIfG_Bgsp().GroundCross(&gnd_chk); if (dComIfG_Bgsp().GroundCross(&obj_gnd_chk) - ground_y > 0.0f) { is_water = true; } - + if (i_this->mMovementType == 1) { if (i_this->mpModelMorf->checkFrame(11.0f)) { i_this->mCollisionFlags |= (u8)4; @@ -2910,7 +2910,7 @@ static void effect_set(e_wb_class* i_this) { pos.set(0.0f, 0.0f, 0.0f); J3DModel* model = i_this->mpModelMorf->getModel(); int foot_idx = (i_this->field_0x68e & 2) >> 1; - + static int footd[2] = { 6, 10, @@ -2927,49 +2927,49 @@ static void effect_set(e_wb_class* i_this) { MTXCopy(model->getAnmMtx(footd[foot_idx]), *calc_mtx); } MtxPosition(&pos, &effect_pos); - + if (is_water) { in_water = true; } else if ((i_this->field_0x68e & 1) == 0) { - fopAcM_effSmokeSet2(&i_this->field_0x13e8[foot_idx], + fopAcM_effSmokeSet2(&i_this->field_0x13e8[foot_idx], &i_this->field_0x1408[foot_idx], &effect_pos, &a_this->shape_angle, a_this->scale.z * 2.0f, &a_this->tevStr); } } - + if (i_this->mCollisionFlags != 0) { J3DModel* model = i_this->mpModelMorf->getModel(); pos.set(0.0f, 0.0f, 0.0f); - + if ((i_this->mCollisionFlags & 1) != 0) { MTXCopy(model->getAnmMtx(10), *calc_mtx); MtxPosition(&pos, &effect_pos); if (is_water) { in_water = true; } else { - fopAcM_effSmokeSet2(i_this->field_0x13e8 + 1, + fopAcM_effSmokeSet2(i_this->field_0x13e8 + 1, i_this->field_0x1408 + 1, &effect_pos, &a_this->shape_angle, a_this->scale.z * 2.0f, &a_this->tevStr); if (i_this->mMovementType != 0) { - i_this->field_0x13fc = dComIfGp_particle_set(i_this->field_0x13fc, dPa_RM(ID_ZI_S_WBCLOD_A), + i_this->field_0x13fc = dComIfGp_particle_set(i_this->field_0x13fc, dPa_RM(ID_ZI_S_WBCLOD_A), &effect_pos, &a_this->shape_angle, 0); } } } - + if ((i_this->mCollisionFlags & 2) != 0) { MTXCopy(model->getAnmMtx(6), *calc_mtx); MtxPosition(&pos, &effect_pos); if (is_water) { in_water = true; } else { - fopAcM_effSmokeSet2(i_this->field_0x13e8, + fopAcM_effSmokeSet2(i_this->field_0x13e8, i_this->field_0x1408, &effect_pos, &a_this->shape_angle, a_this->scale.z * 2.0f, &a_this->tevStr); if (i_this->mMovementType != 0) { - i_this->field_0x13f8 = dComIfGp_particle_set(i_this->field_0x13f8, dPa_RM(ID_ZI_S_WBCLOD_A), + i_this->field_0x13f8 = dComIfGp_particle_set(i_this->field_0x13f8, dPa_RM(ID_ZI_S_WBCLOD_A), &effect_pos, &a_this->shape_angle, 0); } } } - + if ((i_this->mCollisionFlags & 4) != 0) { if (i_this->field_0x79d != 0) { MTXCopy(model->getAnmMtx(29), *calc_mtx); @@ -2980,15 +2980,15 @@ static void effect_set(e_wb_class* i_this) { if (is_water) { in_water = true; } else { - fopAcM_effSmokeSet2(&i_this->field_0x13f0, + fopAcM_effSmokeSet2(&i_this->field_0x13f0, &i_this->field_0x1410, &effect_pos, &a_this->shape_angle, a_this->scale.z * 2.0f, &a_this->tevStr); if (i_this->mMovementType != 0) { - i_this->field_0x1400 = dComIfGp_particle_set(i_this->field_0x1400, dPa_RM(ID_ZI_S_WBCLOD_A), + i_this->field_0x1400 = dComIfGp_particle_set(i_this->field_0x1400, dPa_RM(ID_ZI_S_WBCLOD_A), &effect_pos, &a_this->shape_angle, 0); } } } - + if ((i_this->mCollisionFlags & 8) != 0) { if (i_this->field_0x79d != 0) { MTXCopy(model->getAnmMtx(24), *calc_mtx); @@ -2999,16 +2999,16 @@ static void effect_set(e_wb_class* i_this) { if (is_water) { in_water = true; } else { - fopAcM_effSmokeSet2(&i_this->field_0x13f4, + fopAcM_effSmokeSet2(&i_this->field_0x13f4, &i_this->field_0x1414, &effect_pos, &a_this->shape_angle, a_this->scale.z * 2.0f, &a_this->tevStr); if (i_this->mMovementType != 0) { - i_this->field_0x1404 = dComIfGp_particle_set(i_this->field_0x1404, dPa_RM(ID_ZI_S_WBCLOD_A), + i_this->field_0x1404 = dComIfGp_particle_set(i_this->field_0x1404, dPa_RM(ID_ZI_S_WBCLOD_A), &effect_pos, &a_this->shape_angle, 0); } } } } - + if (i_this->mLandingFlag != 0) { if (is_water) { in_water = true; @@ -3017,11 +3017,11 @@ static void effect_set(e_wb_class* i_this) { MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(i_this->field_0x688 + 0xb), *calc_mtx); MtxPosition(&pos, &effect_pos); - fopAcM_effSmokeSet1(&i_this->field_0x1418, + fopAcM_effSmokeSet1(&i_this->field_0x1418, &i_this->field_0x141c, &effect_pos, NULL, a_this->scale.z * 2.0f, &a_this->tevStr, 1); } } - + if (in_water) { f32 v = 2.0f; cXyz scale(v, v, v); @@ -3038,21 +3038,21 @@ static void effect_set(e_wb_class* i_this) { dPa_RM(ID_ZI_S_ENEMY_DOWNWTRA_B), dPa_RM(ID_ZI_S_ENEMY_DOWNWTRA_C), }; - + for (int i = 0; i < 3; i++) { if (i_this->mMovementType == 2) { - i_this->field_0x1420[i] = dComIfGp_particle_set(i_this->field_0x1420[i], + i_this->field_0x1420[i] = dComIfGp_particle_set(i_this->field_0x1420[i], w_eff_name2[i], &effect_pos, &a_this->tevStr, &angle, &scale, 0xff, 0, -1, 0, 0, 0); } else { - i_this->field_0x1420[i] = dComIfGp_particle_set(i_this->field_0x1420[i], + i_this->field_0x1420[i] = dComIfGp_particle_set(i_this->field_0x1420[i], w_eff_name[i], &effect_pos, &a_this->tevStr, &angle, &scale, 0xff, 0, -1, 0, 0, 0); } } } - + if (is_water && i_this->field_0x1721 != 0) { static cXyz sc(4.0f, 4.0f, 4.0f); - + for (int i = 0; i < 4; i++) { static u16 w_eff_id[4] = { ID_ZI_J_DOWNWTRA_A, @@ -3061,13 +3061,13 @@ static void effect_set(e_wb_class* i_this) { ID_ZI_J_DOWNWTRA_D, }; - i_this->field_0x17d0[i] = dComIfGp_particle_set(i_this->field_0x17d0[i], + i_this->field_0x17d0[i] = dComIfGp_particle_set(i_this->field_0x17d0[i], w_eff_id[i], &a_this->current.pos, &a_this->tevStr, &a_this->shape_angle, &sc, 0xff, 0, -1, 0, 0, 0); } i_this->field_0x1721 = 0; } - + i_this->mMovementType = 0; i_this->mCollisionFlags = 0; i_this->mLandingFlag = 0; @@ -3077,7 +3077,7 @@ static void wb_rd_reset(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz pos = a_this->current.pos; - + if (i_this->mParam2 == 1 || i_this->mParam2 == 2) { fopAcM_create(PROC_E_RD, 0xff010301, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); fopAcM_create(PROC_E_RD, 0xff010302, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); @@ -3229,7 +3229,7 @@ static s8 e_wb_c_run(e_wb_class* i_this) { i_this->field_0x17e1 = 1; } } break; - + case 2: { if (i_this->field_0x7a6 == 0) { anm_init(i_this, 0x1b, 3.0f, 0, 1.0f); @@ -3288,7 +3288,7 @@ static s8 e_wb_c_run(e_wb_class* i_this) { i_this->field_0x5d0 = sp88; } - + if (!behind_obstacle) { static cXyz sh_pos[3] = { cXyz(400.0f, 200.0f, 200.0f), @@ -3324,7 +3324,7 @@ static s8 e_wb_c_run(e_wb_class* i_this) { sp94 = i_this->field_0x5c4 - a_this->current.pos; f32 dist = JMAFastSqrt(sp94.x * sp94.x + sp94.z * sp94.z); - + if (dist < 500.0f) { target_speed = l_HIO.normal_speed_vi; } else if (dist > 3000.0f && i_this->field_0x5bf) { @@ -3718,7 +3718,7 @@ static void demo_camera(e_wb_class* i_this) { rdb = (e_rdb_class*)fopAcM_SearchByName(PROC_E_RDB); } cXyz local_3c, cStack_48, cStack_54, cStack_60; - + switch (i_this->field_0x169e) { case 1: { if (!a_this->eventInfo.checkCommandDemoAccrpt()) { @@ -3740,7 +3740,7 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x1704 = 0x2000 + XREG_S(0); daPy_getPlayerActorClass()->changeOriginalDemo(); horse->changeOriginalDemo(); - fpcM_Search(s_wbdel_sub, a_this); + fpcM_Search(s_wbdel_sub, i_this); dComIfGp_getEvent()->startCheckSkipEdge(a_this); } // fallthrough @@ -3999,7 +3999,8 @@ static void demo_camera(e_wb_class* i_this) { dComIfGp_event_reset(); i_this->field_0x169e = 0; } - } break; + break; + } case 0x19: { if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); @@ -4454,7 +4455,7 @@ static void demo_camera(e_wb_class* i_this) { } else { break; } - } + } // fallthrough case 0x34: { cLib_addCalc0(&rdb->field_0x6e0, 1.0f, 0.3f + KREG_F(3)); @@ -4993,7 +4994,7 @@ static void demo_camera(e_wb_class* i_this) { static void anm_se_eff_set(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; J3DModel* model = i_this->mpModelMorf->getModel(); - + if (i_this->mAnmID == 12 || i_this->mAnmID == 13) { if (i_this->mpModelMorf->checkFrame(9.0f)) { i_this->mZ2Ride.startCreatureSound(Z2SE_CM_BODYFALL_L, 0, -1); @@ -5001,19 +5002,19 @@ static void anm_se_eff_set(e_wb_class* i_this) { } } else if (i_this->mAnmID == 38) { i_this->field_0x17c4 = dComIfGp_particle_set( - i_this->field_0x17c4, dPa_RM(ID_ZI_S_BB_STARTHANAIKI), + i_this->field_0x17c4, dPa_RM(ID_ZI_S_BB_STARTHANAIKI), &a_this->current.pos, &a_this->tevStr); JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->field_0x17c4); if (emitter != NULL) { emitter->setGlobalSRTMatrix(model->getAnmMtx(15)); } - + if (i_this->mpModelMorf->checkFrame(1.0f)) { cXyz scale(a_this->scale.z, a_this->scale.z, a_this->scale.z); - dComIfGp_particle_set(dPa_RM(ID_ZI_S_BB_STARTCLOD), &a_this->current.pos, + dComIfGp_particle_set(dPa_RM(ID_ZI_S_BB_STARTCLOD), &a_this->current.pos, &a_this->tevStr, &a_this->shape_angle, &scale); - dComIfGp_particle_set(dPa_RM(ID_ZI_S_BB_STARTFOOTMARK), &a_this->current.pos, + dComIfGp_particle_set(dPa_RM(ID_ZI_S_BB_STARTFOOTMARK), &a_this->current.pos, &a_this->tevStr, &a_this->shape_angle, &scale); } } else if (i_this->mAnmID == 5) { @@ -5084,7 +5085,7 @@ static void anm_se_eff_set(e_wb_class* i_this) { i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_BREATH, -1); } } - + // Special sound effects for the leader Bulblin if (i_this->field_0x79d != 0) { if (i_this->mAnmID == 0x20 || i_this->mAnmID == 0x21) { @@ -5113,7 +5114,7 @@ static int c_start; static f32 dummy(){return 35.f;} #endif -static int daE_WB_Execute(e_wb_class* i_this) { +static int daE_WB_Execute(e_wb_class* i_this) { if (c_start == 0) { if (dComIfGp_event_runCheck()) { if (lbl_244_bss_46 != 0 || cDmrNowMidnaTalk()) { @@ -5121,7 +5122,7 @@ static int daE_WB_Execute(e_wb_class* i_this) { } } } - + if (i_this->field_0x169e == 1000) { return 1; } @@ -5130,47 +5131,47 @@ static int daE_WB_Execute(e_wb_class* i_this) { cXyz local_130; cXyz local_13c; - + a_this->scale.z = l_HIO.base_size; - + if (fopAcM_CheckCondition(a_this, fopAcCnd_NODRAW_e)) { i_this->field_0x5bf = 1; } else { i_this->field_0x5bf = 0; } - + if (i_this->field_0x79d != 0) { a_this->scale.z = a_this->scale.z * l_HIO.leader_size_ratio; } - + i_this->field_0x68e++; - + if (i_this->field_0x1430 == 0) { fopAcM_OffStatus(a_this, 0); a_this->attention_info.flags = 0; i_this->mStatusFlags &= (u16)3; - + for (int i = 0; i < 4; i++) { if (i_this->field_0x698[i] != 0) { i_this->field_0x698[i]--; } } - + if (i_this->field_0x6a0 != 0) { i_this->field_0x6a0--; } - + if (i_this->field_0x1432 != 0) { i_this->field_0x1432--; } - + action(i_this); } - + if (i_this->field_0x79d != 0 || i_this->field_0x169e != 0) { demo_camera(i_this); } - + if (i_this->field_0x1430 != 0) { a_this->eyePos = a_this->current.pos; return 1; @@ -5185,7 +5186,7 @@ static int daE_WB_Execute(e_wb_class* i_this) { a_this->current.pos.z += move_p->z * move_scale; } } - + if ((i_this->field_0x5bf == 0) && !dComIfGp_event_runCheck()) { s16 wall_check = e_wb_wall_check(i_this); if (wall_check != 0 && wall_check > -0x2000 && wall_check < 0x2000) { @@ -5211,18 +5212,18 @@ static int daE_WB_Execute(e_wb_class* i_this) { i_this->mActionMode = 0; } } - + if (i_this->mActionID != ACT_PL_RIDE2) { a_this->current.pos = a_this->old.pos; } } - + dBgS_LinChk linChk; cXyz pos1; pos1 = a_this->current.pos; pos1.y += 100.0f; linChk.Set(&pos1, &a_this->eyePos, a_this); - + if (dComIfG_Bgsp().LineCross(&linChk)) { cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); local_130.x = 0.0f; @@ -5230,29 +5231,29 @@ static int daE_WB_Execute(e_wb_class* i_this) { local_130.z = KREG_F(11) + -20.0f; MtxPosition(&local_130, &local_13c); a_this->current.pos += local_13c; - + if (i_this->mActionID != ACT_PL_RIDE2) { a_this->speedF = 0.0f; } } } } - + i_this->mAcch.CrrPos(dComIfG_Bgsp()); cLib_addCalcAngleS2(&a_this->shape_angle.y, a_this->current.angle.y, 4, 0x2000); - + if (i_this->mAcch.ChkGroundHit()) { dBgS_GndChk gndChk; Vec local_154; cXyz pos2; - + cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); local_130.x = 0.0f; local_130.y = 200.0f; local_130.z = 100.0f; MtxPosition(&local_130, &local_13c); local_13c += a_this->current.pos; - + local_130.z = -100.0f; MtxPosition(&local_130, &pos2); pos2 += a_this->current.pos; @@ -5263,14 +5264,14 @@ static int daE_WB_Execute(e_wb_class* i_this) { gndChk.SetPos(&local_154); local_13c.y = dComIfG_Bgsp().GroundCross(&gndChk); - + local_154.x = pos2.x; local_154.y = pos2.y; local_154.z = pos2.z; gndChk.SetPos(&local_154); pos2.y = dComIfG_Bgsp().GroundCross(&gndChk); - + if (fabsf(local_13c.y - pos2.y) <= 200.0f) { a_this->current.angle.x = -cM_atan2s(local_13c.y - pos2.y, 200.0f); } diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index afe283c125d..e76709c58c5 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -409,6 +409,8 @@ cPhs_Step daNpc_grO_c::create() { cPhs_Step phase; int res = 0; int i = 0; + J3DModelData* mdlData_p; + int sp10 = i; for (; l_loadRes_list[mType][i] >= 0; i++) { phase = dComIfG_resLoad(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]); if (phase == cPhs_ERROR_e || phase == cPhs_UNK3_e) { @@ -429,7 +431,7 @@ cPhs_Step daNpc_grO_c::create() { return cPhs_ERROR_e; } - J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData(); + mdlData_p = mAnm_p->getModel()->getModelData(); fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -535,7 +537,8 @@ int daNpc_grO_c::Draw() { } int daNpc_grO_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { - int jntNo = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jntNo = joint->getJntNo(); int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD}; if (jntNo == JNT_CENTER) { @@ -566,7 +569,7 @@ int daNpc_grO_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { } i_model->setAnmMtx(jntNo, mDoMtx_stack_c::get()); - MTXCopy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); + cMtx_copy(mDoMtx_stack_c::get(), J3DSys::mCurrentMtx); if ((jntNo == JNT_HEAD || jntNo == JNT_MOUTH) && (mAnmFlags & ANM_PLAY_BCK) != 0) { J3DAnmTransform* anm = mBckAnm.getBckAnm(); @@ -632,6 +635,8 @@ void daNpc_grO_c::setParam() { } BOOL daNpc_grO_c::main() { + u16 mapToolId = 0xFFFF; + if (!doEvent()) { doNormalAction(1); } @@ -640,12 +645,14 @@ BOOL daNpc_grO_c::main() { attention_info.flags = 0; } - if (!mpHIO->m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { + if (!mpHIO->m.common.debug_mode_ON && + (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { if (mOrderEvtNo != EVT_NONE) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); } - orderEvent(mUnkFlag, l_evtNames[l_evtGetParamList[mOrderEvtNo].fileIdx], 0xFFFF, 40, 0xFF, 1); + orderEvent(mUnkFlag, l_evtNames[l_evtGetParamList[mOrderEvtNo].fileIdx], mapToolId, 40, + 0xFF, 1); } if (field_0x9ee) { @@ -1287,11 +1294,12 @@ void daNpc_grO_c::doNormalAction(int param_1) { } BOOL daNpc_grO_c::doEvent() { - int evtCutNo = 0; + dEvent_manager_c* eventManager = NULL; + int evtCutNo; BOOL rv = FALSE; if (dComIfGp_event_runCheck()) { - dEvent_manager_c& eventManager = dComIfGp_getEventManager(); + eventManager = &dComIfGp_getEventManager(); if ((eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) && !mUnkFlag) { mOrderNewEvt = false; @@ -1311,22 +1319,22 @@ BOOL daNpc_grO_c::doEvent() { mItemID = fpcM_ERROR_PROCESS_ID_e; } - int staffId = eventManager.getMyStaffId(l_myName, NULL, 0); + int staffId = eventManager->getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { mStaffID = staffId; - evtCutNo = eventManager.getMyActIdx(staffId, mEvtCutNameList, 3, 0, 0); + evtCutNo = eventManager->getMyActIdx(staffId, mEvtCutNameList, 3, 0, 0); JUT_ASSERT(1844, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e)); JUT_ASSERT(1845, NULL != mEvtCutList[evtCutNo]); if ((this->*mEvtCutList[evtCutNo])(staffId)) { - eventManager.cutEnd(staffId); + eventManager->cutEnd(staffId); } rv = TRUE; } - if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && eventManager.endCheck(mEventIdx) != 0) { + if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && eventManager->endCheck(mEventIdx) != 0) { switch (mOrderEvtNo) { default: break; diff --git a/src/d/actor/d_a_npc_inko.cpp b/src/d/actor/d_a_npc_inko.cpp index b5e812256a6..c977ba8b74b 100644 --- a/src/d/actor/d_a_npc_inko.cpp +++ b/src/d/actor/d_a_npc_inko.cpp @@ -14,9 +14,11 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { if (param_1 == 0) { - int jnt_no = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jnt_no = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); npc_inko_class* i_this = (npc_inko_class*)model->getUserArea(); + npc_inko_class* sp10 = i_this; if (i_this != NULL) { MTXCopy(model->getAnmMtx(jnt_no), *calc_mtx); @@ -54,16 +56,22 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { static int daNpc_Inko_Draw(npc_inko_class* i_this) { fopAc_ac_c* actor = &i_this->actor; g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr); - g_env_light.setLightTevColorType_MAJI(i_this->anm_p->getModel(), &actor->tevStr); + J3DModel* model = i_this->anm_p->getModel(); + g_env_light.setLightTevColorType_MAJI(model, &actor->tevStr); i_this->anm_p->entryDL(); return 1; } static void anm_init(npc_inko_class* i_this, int i_anmId, f32 i_morf, u8 i_mode, f32 i_speed) { - i_this->anm_p->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Npc_inko", i_anmId), i_mode, i_morf, i_speed, 0.0f, -1.0f, NULL); + i_this->anm_p->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Npc_inko", i_anmId), i_mode, + i_morf, i_speed, 0.0f, -1.0f, NULL); i_this->anmId = i_anmId; } +// DEBUG NONMATCHING +// Two indirect branches (b/bne -> b) need to be direct somehow. +// This can be matched by wrapping the relevant section with do...while(0) +// and adding break statements, but this is almost certainly a fakematch. static int daNpc_Inko_Execute(npc_inko_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)i_this; cXyz sp78; @@ -96,7 +104,8 @@ static int daNpc_Inko_Execute(npc_inko_class* i_this) { mDoMtx_stack_c::YrotM(i_this->field_0x59a); mDoMtx_stack_c::transM(0.0f, i_this->field_0x5e8, 40.0f + JREG_F(2)); mDoMtx_stack_c::multVecZero(&i_this->field_0x5b4); - cLib_addCalcAngleS2(&actor->shape_angle.y, (i_this->field_0x5c0.y + i_this->field_0x59a), 1, 0xA00); + cLib_addCalcAngleS2(&actor->shape_angle.y, (i_this->field_0x5c0.y + i_this->field_0x59a), + 1, 0xA00); cLib_addCalcAngleS2(&actor->shape_angle.x, i_this->field_0x5ec, 1, 0xA00); } @@ -156,7 +165,8 @@ static int daNpc_Inko_Execute(npc_inko_class* i_this) { i_this->field_0x59a = (sp14 - i_this->field_0x5c0.y) + (s16)cM_rndFX(7000.0f); u16 sp10 = i_this->field_0x59a; - if (cM_rndF(1.0f) < 0.5f && ((sp10 < 0x5000 && sp10 > 0xA000) || sp10 < 0x3000 || sp10 > 0xD000)) { + if (cM_rndF(1.0f) < 0.5f && + ((sp10 < 0x5000 && sp10 > 0xA000) || sp10 < 0x3000 || sp10 > 0xD000)) { i_this->field_0x5e8 = -(70.0f + cM_rndF(8.0f)); i_this->field_0x5ec = -8000; } else { @@ -294,7 +304,8 @@ static int daNpc_Inko_Execute(npc_inko_class* i_this) { cLib_addCalcAngleS2(&i_this->field_0x5d4[i], i_this->field_0x5d8[i], 2, 0x1F4); } - mDoMtx_stack_c::transS(actor->current.pos.x, actor->current.pos.y + var_f31, actor->current.pos.z); + mDoMtx_stack_c::transS(actor->current.pos.x, actor->current.pos.y + var_f31, + actor->current.pos.z); mDoMtx_stack_c::YrotM(BREG_S(0) + (actor->shape_angle.y + sp18)); mDoMtx_stack_c::XrotM(BREG_S(1) + (actor->shape_angle.x + sp1A)); mDoMtx_stack_c::ZrotM(actor->shape_angle.z); @@ -317,7 +328,7 @@ static int daNpc_Inko_Execute(npc_inko_class* i_this) { npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); if (henna != NULL) { henna->field_0x7b5 = 40; - data_80450C9D |= 0x40; + data_80450C9D |= (u8)0x40; } } @@ -329,7 +340,9 @@ static int daNpc_Inko_Execute(npc_inko_class* i_this) { return 1; } - if (dComIfGp_event_runCheck() && actor->eventInfo.checkCommandTalk() && i_this->field_0x5f4 == 0) { + if (dComIfGp_event_runCheck() && + actor->eventInfo.checkCommandTalk() && + i_this->field_0x5f4 == 0) { int flowId; if (cM_rndF(1.0f) < 0.1f) { flowId = 0x361; @@ -364,14 +377,15 @@ static int daNpc_Inko_Execute(npc_inko_class* i_this) { i_this->field_0x5f4 = 1; data_80450C9D++; - data_80450C9D &= 0xC3; + data_80450C9D &= (u8)0xC3; } fopAc_ac_c* player = dComIfGp_getPlayer(0); f32 temp_f28 = kage->actor.current.pos.x - player->current.pos.x; f32 temp_f27 = kage->actor.current.pos.z - player->current.pos.z; - if ((data_80450C9D & 0x80) && i_this->field_0x59c[3] < 15 && (SQUARE(temp_f28) + SQUARE(temp_f27)) < 23000.0f) { + if ((data_80450C9D & 0x80) && i_this->field_0x59c[3] < 15 && + (SQUARE(temp_f28) + SQUARE(temp_f27)) < 23000.0f) { s16 spC = fopAcM_searchPlayerAngleY(actor); spC = (spC - player->shape_angle.y) + 0x8000; if (spC < 0x1800 && spC > -0x1800) { @@ -391,11 +405,13 @@ static int daNpc_Inko_Execute(npc_inko_class* i_this) { actor->attention_info.position = actor->eyePos; actor->attention_info.position.y += 20.0f; fopAcM_OnStatus(actor, 0); - cLib_onBit(actor->attention_info.flags, fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e); + cLib_onBit(actor->attention_info.flags, + fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e); actor->eventInfo.onCondition(1); } else { fopAcM_OffStatus(actor, 0); - cLib_offBit(actor->attention_info.flags, fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e); + cLib_offBit(actor->attention_info.flags, + fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e); } return 1; @@ -419,7 +435,8 @@ static int daNpc_Inko_Delete(npc_inko_class* i_this) { static int useHeapInit(fopAc_ac_c* actor) { npc_inko_class* i_this = (npc_inko_class*)actor; - i_this->anm_p = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Npc_inko", 8), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, 0, 0x80000, 0x11000084); + i_this->anm_p = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Npc_inko", 8), NULL, + NULL, NULL, 0, 1.0f, 0, -1, 1, 0, 0x80000, 0x11000084); if (i_this->anm_p == NULL || i_this->anm_p->getModel() == NULL) { return 0; } @@ -438,7 +455,7 @@ static int useHeapInit(fopAc_ac_c* actor) { static int daNpc_Inko_Create(fopAc_ac_c* actor) { npc_inko_class* i_this = (npc_inko_class*)actor; - fopAcM_ct(actor, npc_inko_class); + fopAcM_ct(&i_this->actor, npc_inko_class); int phase_state = dComIfG_resLoad(&i_this->phase, "Npc_inko"); if (phase_state == cPhs_COMPLEATE_e) { diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 0633f526805..851fe491aef 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -1875,7 +1875,6 @@ static void npc_ks_hang(npc_ks_class* i_this) { start_pya = i_this->target_angle; } - s16 sVar1; switch (i_this->mode) { case 0: i_this->timer[0] = 0; @@ -1926,11 +1925,13 @@ static void npc_ks_hang(npc_ks_class* i_this) { anm_init(i_this, 24, 3.0f, 2, 1.0f); } - sVar1 = start_pya - sw_p->actor.current.angle.y; - if (sVar1 < 0x4000 && sVar1 > -0x4000) { - actor->home.angle.y = sw_p->actor.current.angle.y + 0x8000; - } else { - actor->home.angle.y = sw_p->actor.current.angle.y; + { + s16 sVar1 = start_pya - sw_p->actor.current.angle.y; + if (sVar1 < 0x4000 && sVar1 > -0x4000) { + actor->home.angle.y = sw_p->actor.current.angle.y + 0x8000; + } else { + actor->home.angle.y = sw_p->actor.current.angle.y; + } } break; @@ -2060,7 +2061,6 @@ static void npc_ks_hang_s(npc_ks_class* i_this) { cXyz mae, ato; cLib_addCalcAngleS2(&actor->current.angle.y, actor->home.angle.y + 0x4000, 2, 0x800); - s16 sVar1; switch (i_this->mode) { case 0: int asdf; @@ -2109,11 +2109,13 @@ static void npc_ks_hang_s(npc_ks_class* i_this) { anm_init(i_this, 24, 3.0f, 2, 1.0f); } - sVar1 = i_this->target_angle - sw_p->actor.current.angle.y; - if (sVar1 < 0x4000 && sVar1 > -0x4000) { - actor->home.angle.y = sw_p->actor.current.angle.y + 0x8000; - } else { - actor->home.angle.y = sw_p->actor.current.angle.y; + { + s16 sVar1 = i_this->target_angle - sw_p->actor.current.angle.y; + if (sVar1 < 0x4000 && sVar1 > -0x4000) { + actor->home.angle.y = sw_p->actor.current.angle.y + 0x8000; + } else { + actor->home.angle.y = sw_p->actor.current.angle.y; + } } break; @@ -2212,7 +2214,7 @@ static void npc_ks_e_hang(npc_ks_class* i_this) { break; case 3: - if (i_this->field_0x5fa == s16(YREG_S(7) - 0x3800)) { + if (i_this->field_0x5fa == s16(YREG_S(7) + 0xC800)) { actor->health = 10; i_this->mode = 20; i_this->timer[0] = 0; diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index 161f563c5c6..8566c2b03c8 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -752,8 +752,11 @@ void daNpc_Pachi_Maro_c::setParam() { u32 flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e; s16 talk_distance = mpHIO->m.common.talk_distance; s16 talk_angle = mpHIO->m.common.talk_angle; + s16 attn_dist = mpHIO->m.common.attention_distance; + s16 attn_angle = mpHIO->m.common.attention_angle; - attention_info.distances[fopAc_attn_LOCK_e] = daNpcT_getDistTableIdx(mpHIO->m.common.attention_distance, mpHIO->m.common.attention_angle); + attention_info.distances[fopAc_attn_LOCK_e] = + daNpcT_getDistTableIdx(attn_dist, attn_angle); attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e]; attention_info.distances[fopAc_attn_SPEAK_e] = daNpcT_getDistTableIdx(talk_distance, talk_angle); attention_info.flags = flags; @@ -1093,11 +1096,9 @@ int daNpc_Pachi_Maro_c::wait(void* param_1) { srchPlayerActor(); } } - - switch (mJntAnm.getMode()) { - case 0: - default: - break; + + if (mJntAnm.getMode() == 0) { + (s32)mType; } } break; @@ -1198,18 +1199,26 @@ BOOL daNpc_Pachi_Maro_c::cutTutrialBegin(int i_staffId) { BOOL daNpc_Pachi_Maro_c::_cutTutrialBegin_Init(int const& i_cutId) { switch (i_cutId) { - default: - return TRUE; + case 10: + break; + default: + break; } + + return TRUE; } BOOL daNpc_Pachi_Maro_c::_cutTutrialBegin_Main(int const& i_cutId) { BOOL rv = FALSE; switch (i_cutId) { - default: - return rv;; + case 10: + break; + default: + break; } + + return rv; } BOOL daNpc_Pachi_Maro_c::cutTutrialBegin_Skip(int i_staffId) { @@ -1230,18 +1239,26 @@ BOOL daNpc_Pachi_Maro_c::cutTutrialBegin_Skip(int i_staffId) { BOOL daNpc_Pachi_Maro_c::_cutTutrialBegin_Skip_Init(int const& i_cutId) { switch (i_cutId) { - default: - return TRUE; + case 10: + break; + default: + break; } + + return TRUE; } BOOL daNpc_Pachi_Maro_c::_cutTutrialBegin_Skip_Main(int const& i_cutId) { BOOL rv = FALSE; switch (i_cutId) { - default: - return rv; + case 10: + break; + default: + break; } + + return rv; } BOOL daNpc_Pachi_Maro_c::cutTutrialClear(int i_staffId) { @@ -1565,9 +1582,12 @@ BOOL daNpc_Pachi_Maro_c::cutTutrialContinue(int i_staffId) { BOOL daNpc_Pachi_Maro_c::_cutTutrialContinue_Init(int const& i_cutId) { switch (i_cutId) { - default: - return TRUE; + case 10: + break; + default: + break; } + return TRUE; } BOOL daNpc_Pachi_Maro_c::_cutTutrialContinue_Main(int const& i_cutId) { diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index d7f674810f1..04740912c54 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -844,7 +844,9 @@ int daNpc_Pachi_Taro_c::CreateHeap() { J3DModel* model = NULL; int bmdIdx = mTwilight == true ? TARO0 : NONE; - modelData = static_cast(dComIfG_getObjectRes(l_resNameList[l_bmdData[bmdIdx][1]], l_bmdData[bmdIdx][0])); + int resNameIdx = l_bmdData[bmdIdx][1]; + int resIdx = l_bmdData[bmdIdx][0]; + modelData = static_cast(dComIfG_getObjectRes(l_resNameList[resNameIdx], resIdx)); if (modelData == NULL) { return 1; } @@ -1011,9 +1013,12 @@ void daNpc_Pachi_Taro_c::setParam() { s16 talk_distance = mpHIO->m.common.talk_distance; s16 talk_angle = mpHIO->m.common.talk_angle; - attention_info.distances[fopAc_attn_LOCK_e] = daNpcT_getDistTableIdx(mpHIO->m.common.attention_distance, mpHIO->m.common.attention_angle); + s16 attnDist = mpHIO->m.common.attention_distance; + s16 attnAngle = mpHIO->m.common.attention_angle; + attention_info.distances[fopAc_attn_LOCK_e] = daNpcT_getDistTableIdx(attnDist, attnAngle); attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e]; - attention_info.distances[fopAc_attn_SPEAK_e] = daNpcT_getDistTableIdx(talk_distance, talk_angle); + attention_info.distances[fopAc_attn_SPEAK_e] = + daNpcT_getDistTableIdx(talk_distance, talk_angle); attention_info.flags = flags; scale.set(mpHIO->m.common.scale, mpHIO->m.common.scale, mpHIO->m.common.scale); @@ -1031,10 +1036,12 @@ void daNpc_Pachi_Taro_c::setParam() { BOOL daNpc_Pachi_Taro_c::checkChangeEvt() { switch (mType) { - default: - break; + case 0: + break; + default: + break; } - + return FALSE; } @@ -1113,21 +1120,21 @@ fopAc_ac_c* daNpc_Pachi_Taro_c::srchDistTag1() { } void* daNpc_Pachi_Taro_c::_srch_DistTag1_main(void* i_actor, void* i_data) { - daTagPati_c* actor = (daTagPati_c*)i_actor; - - if (!fopAcM_IsActor(actor)) { + UNUSED(i_data); + + if (!fopAcM_IsActor(i_actor)) { return NULL; - } - - if (fopAcM_GetName(actor) != PROC_TAG_PATI) { + } + + if (fopAcM_GetName(i_actor) != PROC_TAG_PATI) { return NULL; - } - - if (!actor->isDistChkTag1()) { + } + + if (!((daTagPati_c*)i_actor)->isDistChkTag1()) { return NULL; } - return actor; + return i_actor; } fopAc_ac_c* daNpc_Pachi_Taro_c::srchDistTag2() { @@ -1135,21 +1142,21 @@ fopAc_ac_c* daNpc_Pachi_Taro_c::srchDistTag2() { } void* daNpc_Pachi_Taro_c::_srch_DistTag2_main(void* i_actor, void* i_data) { - daTagPati_c* actor = (daTagPati_c*)i_actor; - - if (!fopAcM_IsActor(actor)) { + UNUSED(i_data); + + if (!fopAcM_IsActor(i_actor)) { return NULL; - } - - if (fopAcM_GetName(actor) != PROC_TAG_PATI) { + } + + if (fopAcM_GetName(i_actor) != PROC_TAG_PATI) { return NULL; - } - - if (!actor->isDistChkTag2()) { + } + + if (!((daTagPati_c*)i_actor)->isDistChkTag2()) { return NULL; } - return actor; + return i_actor; } fopAc_ac_c* daNpc_Pachi_Taro_c::srchEscapeTag1() { @@ -1157,21 +1164,21 @@ fopAc_ac_c* daNpc_Pachi_Taro_c::srchEscapeTag1() { } void* daNpc_Pachi_Taro_c::_srch_EscapeTag1_main(void* i_actor, void* i_data) { - daTagPati_c* actor = (daTagPati_c*)i_actor; - - if (!fopAcM_IsActor(actor)) { + UNUSED(i_data); + + if (!fopAcM_IsActor(i_actor)) { return NULL; - } - - if (fopAcM_GetName(actor) != PROC_TAG_PATI) { + } + + if (fopAcM_GetName(i_actor) != PROC_TAG_PATI) { return NULL; - } - - if (!actor->isEscapeChkTag1()) { + } + + if (!((daTagPati_c*)i_actor)->isEscapeChkTag1()) { return NULL; } - return actor; + return i_actor; } fopAc_ac_c* daNpc_Pachi_Taro_c::srchEscapeTag2() { @@ -1179,21 +1186,21 @@ fopAc_ac_c* daNpc_Pachi_Taro_c::srchEscapeTag2() { } void* daNpc_Pachi_Taro_c::_srch_EscapeTag2_main(void* i_actor, void* i_data) { - daTagPati_c* actor = (daTagPati_c*)i_actor; - - if (!fopAcM_IsActor(actor)) { + UNUSED(i_data); + + if (!fopAcM_IsActor(i_actor)) { return NULL; - } - - if (fopAcM_GetName(actor) != PROC_TAG_PATI) { + } + + if (fopAcM_GetName(i_actor) != PROC_TAG_PATI) { return NULL; - } - - if (!actor->isEscapeChkTag2()) { + } + + if (!((daTagPati_c*)i_actor)->isEscapeChkTag2()) { return NULL; } - return actor; + return i_actor; } BOOL daNpc_Pachi_Taro_c::evtTalk() { @@ -1355,7 +1362,7 @@ void daNpc_Pachi_Taro_c::drawOtherMdl() { g_env_light.setLightTevColorType_MAJI(mpModels[i], &tevStr); mDoMtx_stack_c::copy(model->getAnmMtx(jointNo[i])); Mtx mtx; - MTXCopy(mDoMtx_stack_c::get(), mtx); + cMtx_copy(mDoMtx_stack_c::get(), mtx); mpModels[i]->setBaseTRMtx(mtx); mDoExt_modelUpdateDL(mpModels[i]); dComIfGd_addRealShadow(mShadowKey, mpModels[i]); @@ -1409,7 +1416,7 @@ BOOL daNpc_Pachi_Taro_c::setAction(actionFunc action) { int daNpc_Pachi_Taro_c::wait(void* param_1) { int unused = 0; - + switch (mMode) { case MODE_ENTER: case MODE_INIT: @@ -1454,11 +1461,10 @@ int daNpc_Pachi_Taro_c::wait(void* param_1) { srchPlayerActor(); } } - - switch (mJntAnm.getMode()) { - case 0: - default: - break; + + // ??? + if (mJntAnm.getMode() == 0) { + (int)mType; } if (field_0x1004 == 0) { @@ -1509,7 +1515,8 @@ BOOL daNpc_Pachi_Taro_c::_turn_to_link(s16 i_step) { } BOOL daNpc_Pachi_Taro_c::_turn_pos(cXyz const& i_pos, s16 i_step) { - BOOL rv = cLib_chaseAngleS(&mCurAngle.y, cLib_targetAngleY(¤t.pos, &i_pos), i_step); + s16 targetAngleY = cLib_targetAngleY(¤t.pos, &i_pos); + BOOL rv = cLib_chaseAngleS(&mCurAngle.y, targetAngleY, i_step); current.angle.y = mCurAngle.y; shape_angle.y = mCurAngle.y; return rv; @@ -1975,8 +1982,9 @@ BOOL daNpc_Pachi_Taro_c::cutTalk(int i_staffId) { setMesPat(); } + int* piVar2 = NULL; int mesNo = 0; - int* piVar2 = dComIfGp_evmng_getMyIntegerP(i_staffId, mesNos[mMesPat]); + piVar2 = dComIfGp_evmng_getMyIntegerP(i_staffId, mesNos[mMesPat]); if (piVar2 != NULL) { mesNo = *piVar2; } @@ -2499,23 +2507,24 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialContinue_Main(int const& i_cutId) { BOOL rv = FALSE; switch (i_cutId) { - case 10: - if (_turn_pos(mTagPos, 0x1000)) { - field_0xfe2 = 1; - rv = TRUE; - } - break; - - case 20: - BOOL chaseAngleFlag = cLib_chaseAngleS(&mCurAngle.y, (s16)home.angle.y, 0x800); - current.angle.y = mCurAngle.y; - shape_angle.y = mCurAngle.y; + case 10: + if (_turn_pos(mTagPos, 0x1000)) { + field_0xfe2 = 1; + rv = TRUE; + } + break; - if (chaseAngleFlag) { - daNpc_Pachi_Maro_c* maro_p = (daNpc_Pachi_Maro_c*)mActorMngrs[0].getActorP(); - maro_p->setFMotion_LookNone(); - rv = TRUE; - } + case 20: + s16 homeAngleY = home.angle.y; + BOOL chaseAngleFlag = cLib_chaseAngleS(&mCurAngle.y, homeAngleY, 0x800); + current.angle.y = mCurAngle.y; + shape_angle.y = mCurAngle.y; + + if (chaseAngleFlag) { + daNpc_Pachi_Maro_c* maro_p = (daNpc_Pachi_Maro_c*)mActorMngrs[0].getActorP(); + maro_p->setFMotion_LookNone(); + rv = TRUE; + } } return rv; diff --git a/src/d/actor/d_a_npc_passer.cpp b/src/d/actor/d_a_npc_passer.cpp index 91b5baebacf..4f4462ef829 100644 --- a/src/d/actor/d_a_npc_passer.cpp +++ b/src/d/actor/d_a_npc_passer.cpp @@ -8,6 +8,14 @@ #include "d/actor/d_a_npc_passer.h" #include "d/d_s_play.h" +daNpcPasser_c::actionFunc daNpcPasser_c::ActionTable[5][2] = { + {&daNpcPasser_c::initPath, &daNpcPasser_c::executePath}, + {&daNpcPasser_c::initEscape, &daNpcPasser_c::executeEscape}, + {&daNpcPasser_c::initFear, &daNpcPasser_c::executeFear}, + {&daNpcPasser_c::initFight, &daNpcPasser_c::executeFight}, + {&daNpcPasser_c::initRelief, &daNpcPasser_c::executeRelief}, +}; + daNpcPasser_c::~daNpcPasser_c() { removeResrc(m_type, m_objNum); @@ -473,14 +481,6 @@ void daNpcPasser_c::create_init() { setBaseMtx(); } -daNpcPasser_c::actionFunc daNpcPasser_c::ActionTable[5][2] = { - {&daNpcPasser_c::initPath, &daNpcPasser_c::executePath}, - {&daNpcPasser_c::initEscape, &daNpcPasser_c::executeEscape}, - {&daNpcPasser_c::initFear, &daNpcPasser_c::executeFear}, - {&daNpcPasser_c::initFight, &daNpcPasser_c::executeFight}, - {&daNpcPasser_c::initRelief, &daNpcPasser_c::executeRelief}, -}; - daNpcPasser_c::seqFunc* daNpcPasser_c::m_funcTbl[28] = { daNpcPasser_c::m_seq00_funcTbl, daNpcPasser_c::m_seq01_funcTbl, daNpcPasser_c::m_seq02_funcTbl, daNpcPasser_c::m_seq03_funcTbl, @@ -703,29 +703,29 @@ void daNpcPasser_c::setSpeed(f32 param_1, f32 param_2, f32* i_speed, int param_4 } void daNpcPasser_c::pathMoveF() { - f32 fVar1 = 0.0f; - f32 speed = 0.0f; - f32 fVar2 = 0.0f; + f32 maxSpeed = 0.0f; + f32 anmPlaySpeed = 0.0f; + f32 actualSpeed = 0.0f; cXyz* ccMoveP = mStts.GetCCMoveP(); if (field_0xb1c == 2) { - fVar1 = Cd2_HIO_walkMaxSpeed(m_type); - fVar2 = Cd2_HIO_walkAnmPlaySpeed(m_type); + maxSpeed = Cd2_HIO_walkMaxSpeed(m_type); + anmPlaySpeed = Cd2_HIO_walkAnmPlaySpeed(m_type); cLib_chaseF(&field_0xb10, 0.8f, 0.05f); - setSpeed(MREG_F(0) + 0.7f, fVar1, &field_0xb14, 0); - setSpeed(MREG_F(0) + 0.7f, fVar1, &speedF, 1); + setSpeed(MREG_F(0) + 0.7f, maxSpeed, &field_0xb14, 0); + setSpeed(MREG_F(0) + 0.7f, maxSpeed, &speedF, 1); } else if (field_0xb1c == 1) { - fVar1 = Cd2_HIO_maxSpeed(m_type); - fVar2 = Cd2_HIO_anmPlaySpeed(m_type); + maxSpeed = Cd2_HIO_maxSpeed(m_type); + anmPlaySpeed = Cd2_HIO_anmPlaySpeed(m_type); if (mActionIdx == 1) { - fVar1 *= 1.5f; - fVar2 *= 1.5f; + maxSpeed *= 1.5f; + anmPlaySpeed *= 1.5f; } cLib_chaseF(&field_0xb10, 1.0f, 0.05f); - setSpeed(MREG_F(0) + 0.7f, fVar1, &field_0xb14, 0); - setSpeed(MREG_F(0) + 0.7f, fVar1, &speedF, 1); + setSpeed(MREG_F(0) + 0.7f, maxSpeed, &field_0xb14, 0); + setSpeed(MREG_F(0) + 0.7f, maxSpeed, &speedF, 1); } else if (field_0xb1c == 0) { cLib_chaseF(&field_0xb10, 0.0f, 0.05f); cLib_chaseF(&field_0xb14, 0.0f, 1.5f); @@ -745,17 +745,17 @@ void daNpcPasser_c::pathMoveF() { fopAcM_posMoveF(this, ccMoveP); if (field_0xb1c != 0) { - fVar1 = field_0xb14 / fVar1; - if (fVar1 > 1.0f) { - fVar1 = 1.0f; + actualSpeed = field_0xb14 / maxSpeed; + if (actualSpeed > 1.0f) { + actualSpeed = 1.0f; } - speed = fVar2 * fVar1; - if (speed < 0.6f) { - speed = 0.6f; + actualSpeed = anmPlaySpeed * actualSpeed; + if (actualSpeed < 0.6f) { + actualSpeed = 0.6f; } - mpMorf->setPlaySpeed(speed); + mpMorf->setPlaySpeed(actualSpeed); } } diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp index cd04616d266..b7bfe440423 100644 --- a/src/d/actor/d_a_npc_post.cpp +++ b/src/d/actor/d_a_npc_post.cpp @@ -159,6 +159,52 @@ enum Type { /* 0x3 */ TYPE_DEFAULT, }; +daNpc_Post_HIOParam const daNpc_Post_Param_c::m = { + 190.0f, + -3.0f, + 1.0f, + 700.0f, + 255.0f, + 180.0f, + 35.0f, + 30.0f, + 0.0f, + 0.0f, + 10.0f, + -10.0f, + 30.0f, + -10.0f, + 45.0f, + -45.0f, + 0.6f, + 12.0f, + 3, + 6, + 5, + 6, + 110.0f, + 0.0f, + 0.0f, + 0.0f, + 60, + 8, + 0, + 0, + 0, + false, + false, + 4.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 16.0f, + 60, +}; + #if DEBUG daNpc_Post_HIO_c::daNpc_Post_HIO_c() { m = daNpc_Post_Param_c::m; @@ -173,7 +219,7 @@ void daNpc_Post_HIO_c::listenPropertyEvent(const JORPropertyEvent* evt) { switch ((u32)evt->id) { case 0x40000002: - if (jorFile.open(6, "", NULL, NULL, NULL)) { + if (jorFile.open(6, "すべてのファイル(*.*)\0*.*\0", NULL, NULL, NULL)) { memset(&buffer, 0, sizeof(buffer)); len = 0; daNpcT_cmnListenPropertyEvent(buffer, &len, &m.common); @@ -321,7 +367,7 @@ daNpc_Post_c::cutFunc daNpc_Post_c::mCutList[2] = { static NPC_POST_HIO_CLASS l_HIO; daNpc_Post_c::~daNpc_Post_c() { - OS_REPORT("|%06d:%x|daNpc_Post_c -> コンストラクト\n", g_Counter.mCounter0, this); + OS_REPORT("|%06d:%x|daNpc_Post_c -> デストラクト\n", g_Counter.mCounter0, this); if (mpMorf[0] != NULL) { mpMorf[0]->stopZelAnime(); @@ -340,52 +386,6 @@ daNpc_Post_c::~daNpc_Post_c() { deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList); } -daNpc_Post_HIOParam const daNpc_Post_Param_c::m = { - 190.0f, - -3.0f, - 1.0f, - 700.0f, - 255.0f, - 180.0f, - 35.0f, - 30.0f, - 0.0f, - 0.0f, - 10.0f, - -10.0f, - 30.0f, - -10.0f, - 45.0f, - -45.0f, - 0.6f, - 12.0f, - 3, - 6, - 5, - 6, - 110.0f, - 0.0f, - 0.0f, - 0.0f, - 60, - 8, - 0, - 0, - 0, - false, - false, - 4.0f, - 0.0f, - 0.0f, - 0.0f, - 0.0f, - 0.0f, - 0.0f, - 0.0f, - 16.0f, - 60, -}; - cPhs_Step daNpc_Post_c::create() { daNpcT_ct(this, daNpc_Post_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList); @@ -414,7 +414,7 @@ cPhs_Step daNpc_Post_c::create() { return cPhs_ERROR_e; } - J3DModel* model = mpMorf[0]->getModel(); + J3DModelData* modelData = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f); @@ -454,21 +454,24 @@ cPhs_Step daNpc_Post_c::create() { } int daNpc_Post_c::CreateHeap() { + J3DModelData* modelData = NULL; + J3DModel* model = NULL; int bmdIdx = 0; int resIdx = l_bmdData[bmdIdx][1]; int idx = l_bmdData[bmdIdx][0]; - J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_resNameList[resIdx], idx)); + modelData = static_cast(dComIfG_getObjectRes(l_resNameList[resIdx], idx)); if (modelData == NULL) { return 0; } - u32 uVar1 = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); + u32 sp28 = 0x11020284; + mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + sp28); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } - J3DModel* model = mpMorf[0]->getModel(); + model = mpMorf[0]->getModel(); for (u16 i = 0; i < modelData->getJointNum(); i++) { modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } @@ -488,8 +491,9 @@ int daNpc_Post_c::CreateHeap() { } if (mType != TYPE_BAR) { - u32 uVar2 = 0x11000084; - mpFlagModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, J3DMdlFlag_DifferedDLBuffer, uVar2); + sp28 = 0x11000084; + mpFlagModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, + J3DMdlFlag_DifferedDLBuffer, sp28); if (mpFlagModelMorf == NULL || mpFlagModelMorf->getModel() == NULL) { return 0; } @@ -501,13 +505,16 @@ int daNpc_Post_c::CreateHeap() { for (int i = 0; i < 2; i++) { if (l_bmdData[bmdTypeList[i]][0] >= 0) { - modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[bmdTypeList[i]][1]], l_bmdData[bmdTypeList[i]][0]); + modelData = + (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[bmdTypeList[i]][1]], + l_bmdData[bmdTypeList[i]][0]); } else { modelData = NULL; } if (modelData != NULL) { - mpLetterModels[i] = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, 0x11000084); + mpLetterModels[i] = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, + 0x11000084); } else { mpLetterModels[i] = NULL; } @@ -521,7 +528,7 @@ int daNpc_Post_c::CreateHeap() { } int daNpc_Post_c::Delete() { - OS_REPORT("|%06d:%x|daNpc_Post_c -> コンストラクト\n", g_Counter.mCounter0, this); + OS_REPORT("|%06d:%x|daNpc_Post_c -> Delete\n", g_Counter.mCounter0, this); fopAcM_RegisterDeleteID(this, "NPC_POST"); this->~daNpc_Post_c(); return 1; @@ -688,6 +695,8 @@ BOOL daNpc_Post_c::checkChangeEvt() { return TRUE; } + + (int)mType; } return FALSE; @@ -854,7 +863,7 @@ void daNpc_Post_c::setAttnPos() { mpFlagModelMorf->play(0, 0); mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(JNT_BACKBONE2)); Mtx mtx; - MTXCopy(mDoMtx_stack_c::get(), mtx); + cMtx_copy(mDoMtx_stack_c::get(), mtx); mpFlagModelMorf->getModel()->setBaseTRMtx(mtx); mpFlagModelMorf->modelCalc(); } @@ -970,7 +979,7 @@ void daNpc_Post_c::drawOtherMdl() { mDoMtx_stack_c::copy(model->getAnmMtx(jointNo[i])); Mtx mtx; - MTXCopy(mDoMtx_stack_c::get(), mtx); + cMtx_copy(mDoMtx_stack_c::get(), mtx); mpLetterModels[i]->setBaseTRMtx(mtx); mDoExt_modelUpdateDL(mpLetterModels[i]); dComIfGd_addRealShadow(mShadowKey, mpLetterModels[i]); @@ -996,9 +1005,10 @@ bool daNpc_Post_c::setFlagAnm(int i_idx, int i_attr, f32 i_morf) { }; J3DAnmTransform* anm = NULL; + int idx = i_idx; if (mpFlagModelMorf != NULL) { - if (flagAnmData[i_idx].fileIdx > 0) { - anm = getTrnsfrmKeyAnmP(l_resNameList[flagAnmData[i_idx].arcIdx], flagAnmData[i_idx].fileIdx); + if (flagAnmData[idx].fileIdx > 0) { + anm = getTrnsfrmKeyAnmP(l_resNameList[flagAnmData[idx].arcIdx], flagAnmData[idx].fileIdx); } if (anm != NULL) { @@ -1093,10 +1103,6 @@ void daNpc_Post_c::pullOutLetter() { } } -static int const dummy[2] = { - -1, -1, -}; - int daNpc_Post_c::cutDeliver(int i_staffId) { cXyz work; csXyz angle; @@ -1255,6 +1261,8 @@ int daNpc_Post_c::cutDeliver(int i_staffId) { } } + int arr[2] = {-1, -1}; + switch (prm) { case 0: mJntAnm.lookPlayer(0); @@ -1360,6 +1368,7 @@ int daNpc_Post_c::cutDeliver(int i_staffId) { } int daNpc_Post_c::wait(void* param_1) { + daTag_EvtArea_c* actor_p = NULL; daPy_py_c* player = daPy_getPlayerActorClass(); f32 fVar1 = mHIO->m.nod_interval; @@ -1388,7 +1397,7 @@ int daNpc_Post_c::wait(void* param_1) { ) ) { for (int i = 0; i < 4; i++) { - daTag_EvtArea_c* actor_p = (daTag_EvtArea_c*)mActorMngrs[i].getActorP(); + actor_p = (daTag_EvtArea_c*)mActorMngrs[i].getActorP(); if (actor_p != NULL) { if (actor_p->chkPointInArea(player->current.pos)) { if (daPy_getPlayerActorClass()->checkBoarRide()) { @@ -1397,7 +1406,8 @@ int daNpc_Post_c::wait(void* param_1) { mActorPos = actor_p->current.pos; f32 fVar2 = player->current.pos.absXZ(actor_p->current.pos); - if (actor_p->scale.x - 700.0f <= fVar2) { + f32 adjustedScale = actor_p->scale.x - 700.0f; + if (adjustedScale <= fVar2) { if (daPy_getPlayerActorClass()->checkHorseRide()) { mEvtNo = EVT_DELIVERTO_PLAYER_ON_HORSE; } else if (daPy_py_c::checkNowWolf()) { diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index 71d6ec6e749..1b897adfaa6 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -378,8 +378,8 @@ int daNpcRafrel_c::Draw() { } int daNpcRafrel_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { - int jnt_no = i_joint->getJntNo(); - u16 jointNo = jnt_no; + J3DJoint* joint = i_joint; + int jnt_no = joint->getJntNo(); int spC[] = {1, 3, 4}; if (jnt_no == 0) { diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 4503e9435c1..3db66c6352d 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -191,6 +191,7 @@ void daObjBm_HIO_c::genMessage(JORMContext* ctx) { ctx->genSlider("ビームＹスケール", &beam_scale.y, 0.1f, 10.0f); ctx->genCheckBox("チェック描画", &check_draw, 0x1); } + #define BEAM_SCALE_X l_HIO.beam_scale.x #define BEAM_SCALE_Y l_HIO.beam_scale.y #define BEAM_SCALE_Z l_HIO.beam_scale.z @@ -230,9 +231,11 @@ void daObjBm_HIO_c::genMessage(JORMContext* ctx) { #define CHECK_DRAW 0 #endif -fopAc_ac_c* daObjBm_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_actorP, s16 param_2, dBgW_Base::PushPullLabel pp_field) { +fopAc_ac_c* daObjBm_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_actorP, s16 param_2, + dBgW_Base::PushPullLabel i_ppLabel) { + UNUSED(i_actorP); + dBgW::PushPullLabel pp_label = cLib_checkBit(i_ppLabel, dBgW::PPLABEL_3); daObjBm_c* actor_p = (daObjBm_c*)i_bgActor; - dBgW::PushPullLabel pp_label = cLib_checkBit(pp_field, dBgW::PPLABEL_3); u8 l_swNo3 = actor_p->getSwNo3(); u8 l_moveType = actor_p->getMoveType(); @@ -241,23 +244,26 @@ fopAc_ac_c* daObjBm_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_actorP, s (s16)param_2 - 0x8000 : (s16)param_2; s16 angle = spE - actor_p->home.angle.y; + // not sure if this is correct + const dBgW::PushPullLabel pp_field = dBgW::PPLABEL_3; JUT_ASSERT(513, pp_label != pp_field); - actor_p->mPPLabel = pp_field; + actor_p->mPPLabel = i_ppLabel; + dBgW::PushPullLabel pp_label_2; if (angle >= -0x2000 && angle < 0x2000) { - pp_label = dBgW::PPLABEL_NONE; + pp_label_2 = dBgW::PPLABEL_NONE; } else if (angle >= 0x2000 && angle < 0x6000) { - pp_label = dBgW::PPLABEL_PUSH; + pp_label_2 = dBgW::PPLABEL_PUSH; } else if (angle >= 0x6000 || angle < -0x6000) { - pp_label = dBgW::PPLABEL_PULL; + pp_label_2 = dBgW::PPLABEL_PULL; } else { - pp_label = dBgW::PPLABEL_3; + pp_label_2 = dBgW::PPLABEL_3; } - if (l_moveType != 0 || (l_moveType == 0 && pp_label == dBgW::PPLABEL_NONE)) { + if (l_moveType != 0 || (l_moveType == 0 && pp_label_2 == dBgW::PPLABEL_NONE)) { for (int i = 0; i < 4; i++) { - if (i == pp_label) { + if (i == pp_label_2) { actor_p->mMomentCnt[i]++; } else { actor_p->mMomentCnt[i] = 0; @@ -273,12 +279,13 @@ fopAc_ac_c* daObjBm_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_actorP, s static int nodeCallBack(J3DJoint* i_joint, int param_2) { if (param_2 == 0) { - int jnt_no = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jnt_no = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); daObjBm_c* i_this = (daObjBm_c*)model->getUserArea(); cMtx_copy(model->getAnmMtx(jnt_no), mDoMtx_stack_c::get()); - s16 sVar1 = i_this->field_0x1000 * cM_scos(i_this->field_0xff0 * 0x2CEC + KREG_S(6)); + s16 sVar1 = i_this->field_0x1000 * cM_scos(i_this->field_0xff0 * (11500 + KREG_S(6))); if (jnt_no == i_this->getHeadJoint()) { mDoMtx_stack_c::XrotM(i_this->field_0xf96 + sVar1); @@ -342,10 +349,10 @@ int daObjBm_c::Create() { fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x, l_cull_box.max.y, l_cull_box.max.z); - JUTNameTab* joint_name = mpModel->getModelData()->getJointTree().getJointName(); + JUTNameTab* name = mpModel->getModelData()->getJointTree().getJointName(); for (int i = 0; i < 5; i++) { for (u16 j = 0; j < mpModel->getModelData()->getJointNum(); j++) { - if (strcmp(joint_name->getName(j), l_joint_table[i]) == 0) { + if (strcmp(name->getName(j), l_joint_table[i]) == 0) { mJoints[i] = j; mpModel->getModelData()->getJointNodePointer(j)->setCallBack(nodeCallBack); } @@ -353,9 +360,9 @@ int daObjBm_c::Create() { } mpModel->setUserArea((uintptr_t)this); - JUTNameTab* material_name = mpModel->getModelData()->getMaterialTable().getMaterialName(); + name = mpModel->getModelData()->getMaterialTable().getMaterialName(); for (u16 i = 0; i < mpModel->getModelData()->getMaterialNum(); i++) { - if (strcmp(material_name->getName(i), l_eye_matName) == 0) { + if (strcmp(name->getName(i), l_eye_matName) == 0) { mpMaterial = mpModel->getModelData()->getMaterialNodePointer(i); } } @@ -399,84 +406,101 @@ int daObjBm_c::Create() { return 1; } -// FAKEMATCH int daObjBm_c::CreateHeap() { - J3DModelData* modelData; - - modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BMD_BM_e); - JUT_ASSERT(767, modelData != NULL); - mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, 0x11000084); - if (mpModel == NULL) { - return 0; - } + J3DModelData* modelData = + (J3DModelData*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BMD_BM_e); - J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BRK_SERCH_e); - JUT_ASSERT(780, pbrk != NULL); - mSerchBrk = new mDoExt_brkAnm(); - if (mSerchBrk == NULL || mSerchBrk->init(modelData, pbrk, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1) == 0) { - return 0; + { + JUT_ASSERT(767, modelData != NULL); + mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, 0x11000084); + if (mpModel == NULL) { + return 0; + } } + { + J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BRK_SERCH_e); + JUT_ASSERT(780, pbrk != NULL); + mSerchBrk = new mDoExt_brkAnm(); + if (mSerchBrk == NULL || mSerchBrk->init(modelData, pbrk, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1) == 0) { + return 0; + } + #if DEBUG - pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BRK_TURN_e); - JUT_ASSERT(791, pbrk != NULL); + pbrk = + (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BRK_TURN_e); + JUT_ASSERT(791, pbrk != NULL); #endif - - J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BCK_BM_UP_e); - JUT_ASSERT(798, pbck != NULL); - mBeamosBck = new mDoExt_bckAnm(); - if (mBeamosBck == NULL || mBeamosBck->init(pbck, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) { - return 0; } - modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BMD_EF_BIMOBEAM_e); - JUT_ASSERT(813, modelData != NULL); - mBeamModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, 0x11000284); - if (mBeamModel == NULL) { - return 0; + { + J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BCK_BM_UP_e); + JUT_ASSERT(798, pbck != NULL); + mBeamosBck = new mDoExt_bckAnm(); + if (mBeamosBck == NULL || mBeamosBck->init(pbck, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) { + return 0; + } } - J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BTK_EF_BIMOBEAMB_OFF_e); - JUT_ASSERT(827, pbtk != NULL); - mBeamBtk = new mDoExt_btkAnm(); - if (mBeamBtk == NULL || mBeamBtk->init(modelData, pbtk, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1) == 0) { - return 0; + { + modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BMD_EF_BIMOBEAM_e); + JUT_ASSERT(813, modelData != NULL); + mBeamModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, 0x11000284); + if (mBeamModel == NULL) { + return 0; + } } - mBeamBtk->setFrame(mBeamBtk->getEndFrame()); + + { + J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BTK_EF_BIMOBEAMB_OFF_e); + JUT_ASSERT(827, pbtk != NULL); + mBeamBtk = new mDoExt_btkAnm(); + if (mBeamBtk == NULL || mBeamBtk->init(modelData, pbtk, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1) == 0) { + return 0; + } + mBeamBtk->setFrame(mBeamBtk->getEndFrame()); #if DEBUG - J3DAnmTextureSRTKey* pbtk2 = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BTK_EF_BIMOBEAM_ON_e); - JUT_ASSERT(840, pbtk != NULL); + pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BTK_EF_BIMOBEAM_ON_e); + JUT_ASSERT(840, pbtk != NULL); #endif - pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BTK_EF_BIMOBEAM_e); - JUT_ASSERT(846, pbtk != NULL); - mBeamEffBtk = new mDoExt_btkAnm(); - if (mBeamEffBtk == NULL || mBeamEffBtk->init(modelData, pbtk, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1) == 0) { - return 0; + pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes( + l_arcName, dRes_INDEX_OBJ_BM_BTK_EF_BIMOBEAM_e); + JUT_ASSERT(846, pbtk != NULL); + mBeamEffBtk = new mDoExt_btkAnm(); + if (mBeamEffBtk == NULL || mBeamEffBtk->init(modelData, pbtk, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1) == 0) { + return 0; + } } - J3DAnmTransform* pbck2 = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BCK_EF_BIMOBEAM_e); - JUT_ASSERT(858, pbck != NULL); - mBeamEffBck = new mDoExt_bckAnm(); - if (mBeamEffBck == NULL || mBeamEffBck->init(pbck2, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false) == 0) { - return 0; + { + J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BCK_EF_BIMOBEAM_e); + JUT_ASSERT(858, pbck != NULL); + mBeamEffBck = new mDoExt_bckAnm(); + if (mBeamEffBck == NULL || mBeamEffBck->init(pbck, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false) == 0) { + return 0; + } } - modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BMD_P_BMF_e); - JUT_ASSERT(873, modelData != NULL); - mBmfModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, 0x11000084); - if (mBmfModel == NULL) { - return 0; + { + modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BMD_P_BMF_e); + JUT_ASSERT(873, modelData != NULL); + mBmfModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, 0x11000084); + if (mBmfModel == NULL) { + return 0; + } } - J3DAnmTransform* pbck3 = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BCK_BMF_OFF_e); - JUT_ASSERT(885, pbck != NULL); - mBmfOffBck = new mDoExt_bckAnm(); - if (mBmfOffBck == NULL || mBmfOffBck->init(pbck3, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) { - return 0; + { + J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BCK_BMF_OFF_e); + JUT_ASSERT(885, pbck != NULL); + mBmfOffBck = new mDoExt_bckAnm(); + if (mBmfOffBck == NULL || mBmfOffBck->init(pbck, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) { + return 0; + } + mBmfOffBck->setPlaySpeed(0.0f); } - mBmfOffBck->setPlaySpeed(0.0f); return 1; } @@ -513,9 +537,10 @@ int daObjBm_c::Execute(Mtx** i_mtx) { #if DEBUG scale.setall(BODY_SCALE); mpModel->setBaseScale(scale); - daPy_py_c* player = daPy_getPlayerActorClass(); #endif + daPy_py_c* player = daPy_getPlayerActorClass(); + field_0xff0++; if (field_0xf96 != field_0xf98 && field_0xfaa == 0) { @@ -714,11 +739,19 @@ void daObjBm_c::calcBeamLenAndAt() { work.normalizeZP(); end += work * 1200.0f; int frame = mBeamBtk->getFrame() + 0.5f; - f32 fVar1 = 360.0f; + f32 var_f31 = (f32)frame * 360.0f; + if (var_f31 > 1200.0f) { + var_f31 = 1200.0f; + } + f32 absVal = 1200.0f; if (fopAcM_lc_c::lineCheck(&field_0xfb8, &end, this) && fopAcM_lc_c::checkGroundHit()) { - f32 absVal = field_0xfb8.abs(fopAcM_lc_c::getCross()); + absVal = field_0xfb8.abs(fopAcM_lc_c::getCross()); mBeamScale.z = absVal / 1200.0f; + + if (1200.0f * mBeamScale.z < var_f31) { + var_f31 = 1200.0f * mBeamScale.z; + } } else { mBeamScale.z = 1.0f; } @@ -923,6 +956,8 @@ void daObjBm_c::effectSet1() {} void daObjBm_c::effectEnd() {} int daObjBm_c::check_to_walk() { + const int src_num = 5; + int ret = -1; bool flag = true; @@ -1046,8 +1081,9 @@ void daObjBm_c::mode_walk() { eyePos = current.pos; if (flag) { - const daObjBm_c::BgcSrc_c* bgcSrc = mBgc.M_lin5; - mBgc.chk_wall_pre(this, bgcSrc, 5, M_dir_base[field_0x10bc]); + const int src_num = 5; + const daObjBm_c::BgcSrc_c* bgcSrc = Bgc_c::M_lin5; + mBgc.chk_wall_pre(this, bgcSrc, src_num, M_dir_base[field_0x10bc]); } current.pos.x = local_58.x; @@ -1171,6 +1207,8 @@ void daObjBm_c::Bgc_c::wall_pos(fopAc_ac_c const* i_actor, daObjBm_c::BgcSrc_c c if (absVal < field_0x17c) { field_0x17c = absVal; field_0x178 = i; + } else { + continue; } } else { field_0x64[i] = cXyz::Zero; @@ -1347,11 +1385,7 @@ void daObjBm_c::initActionAttack() { dPa_RM(ID_ZF_S_BM_NESSENSRC01), }; - #if DEBUG mPlayerDist = fopAcM_searchPlayerDistanceXZ(this) - TARGET_OFFSET_DIST; - #else - mPlayerDist = fopAcM_searchPlayerDistanceXZ(this); - #endif daPy_py_c* player = daPy_getPlayerActorClass(); mBeamBtk->init(mBeamModel->getModelData(), @@ -1593,11 +1627,15 @@ void daObjBm_c::initActionDead() { field_0xfac = field_0xfaa = 0; - mBeamosBck->init((J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_ID_OBJ_BM_BCK_OC_DOWN_e), 1, - J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, true); - if (mBeamBtk->getBtkAnm() == (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_ID_OBJ_BM_BTK_EF_BIMOBEAM_ON_e)) { + mBeamosBck->init((J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, + dRes_ID_OBJ_BM_BCK_OC_DOWN_e), 1, + J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, true); + J3DAnmTextureSRTKey* anmTexSRTKey = + (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_ID_OBJ_BM_BTK_EF_BIMOBEAM_ON_e); + if (mBeamBtk->getBtkAnm() == anmTexSRTKey) { mBeamBtk->init(mBeamModel->getModelData(), - (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BTK_EF_BIMOBEAMB_OFF_e), + (J3DAnmTextureSRTKey*)dComIfG_getObjectRes( + l_arcName, dRes_INDEX_OBJ_BM_BTK_EF_BIMOBEAMB_OFF_e), 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1); } diff --git a/src/d/actor/d_a_obj_dust.cpp b/src/d/actor/d_a_obj_dust.cpp index 7cab7b9fa53..58429b97748 100644 --- a/src/d/actor/d_a_obj_dust.cpp +++ b/src/d/actor/d_a_obj_dust.cpp @@ -104,6 +104,8 @@ void daObjDust_c::setBaseMtx() { } static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) { + UNUSED(i_bgw); + UNUSED(i_bgActor); fopAc_ac_c* ride_actor = (fopAc_ac_c*)i_rideActor; daObjDust_c* a_this = (daObjDust_c*)i_bgActor; @@ -130,6 +132,18 @@ static int daObjDust_Delete(daObjDust_c* i_this) { return 1; } +int daObjDust_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_FloatingDust01.bmd"); + JUT_ASSERT(86, modelData != NULL); + + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + + return 1; +} + int daObjDust_c::create() { fopAcM_ct(this, daObjDust_c); @@ -168,18 +182,6 @@ static int daObjDust_Create(fopAc_ac_c* i_this) { return a_this->create(); } -int daObjDust_c::CreateHeap() { - J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_FloatingDust01.bmd"); - JUT_ASSERT(86, modelData != NULL); - - mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); - if (mpModel == NULL) { - return 0; - } - - return 1; -} - int daObjDust_c::Create() { initBaseMtx(); mpBgW->SetRideCallback(rideCallBack); diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index 6900391d267..f386a649cca 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -125,7 +125,7 @@ int daObjFallObj_c::create1st() { if (phase == cPhs_ERROR_e) { return phase; } - + #if DEBUG // Falling obj l_HIO.entryHIO("落下ＯＢＪ"); @@ -134,7 +134,6 @@ int daObjFallObj_c::create1st() { return phase; } -// TODO: Debug Nonmatching / Fakematch (bVar1) int daObjFallObj_c::Execute(Mtx** i_mtx) { cXyz cStack_d8(0.0f, 150.0f, 160.0f + KREG_F(0)); @@ -147,38 +146,32 @@ int daObjFallObj_c::Execute(Mtx** i_mtx) { daPy_py_c* player = daPy_getPlayerActorClass(); - f32 dVar12 = std::fabs(player->current.pos.y - cStack_d8.y); - f32 dVar13 = cStack_d8.absXZ(player->current.pos); - f32 dVar14 = player->current.pos.abs(cStack_d8); + f32 var_f31 = std::fabs(player->current.pos.y - cStack_d8.y); + f32 var_f30 = cStack_d8.absXZ(player->current.pos); + f32 var_f29 = player->current.pos.abs(cStack_d8); dBgS_LinChk linChk; linChk.Set(&player->eyePos, &attention_info.position, this); - bool bVar1 = false; - + //TODO: fakematch #if DEBUG - int check3 = 0; - int check2 = 0; - int check1 = 0; - if (!dComIfG_Bgsp().LineCross(&linChk) && !checkHang2()) { - check1 = 1; - } - if (check1 && dVar12 - KREG_F(4) < dVar13) { - check2 = 1; - } - if (check2 && dVar14 < 2150.0f - KREG_F(5)) { - check3 = 1; - } - if (check3 && mAction == ACTION_WAIT) { - bVar1 = true; - } + bool temp = !dComIfG_Bgsp().LineCross(&linChk) && + !checkHang2() && + var_f31 - KREG_F(4) < var_f30 && + var_f29 < 2150.0f - KREG_F(5) && + mAction == ACTION_WAIT; #else - if (!dComIfG_Bgsp().LineCross(&linChk) && !checkHang2() && dVar12 - KREG_F(4) < dVar13 && dVar14 < 2150.0f - KREG_F(5) && mAction == ACTION_WAIT) { - bVar1 = true; + bool temp = false; + if (!dComIfG_Bgsp().LineCross(&linChk) && + !checkHang2() && + var_f31 - KREG_F(4) < var_f30 && + var_f29 < 2150.0f - KREG_F(5) && + mAction == ACTION_WAIT) { + temp = true; } #endif - if (((bool) bVar1) != 0) { + if (temp) { attention_info.distances[fopAc_attn_BATTLE_e] = 0x22; attention_info.flags |= fopAc_AttnFlag_BATTLE_e; } else { @@ -217,7 +210,7 @@ void daObjFallObj_c::action() { action_follow_fall(); break; } - + if (mVibrationOn && !field_0x5e4) { dComIfGp_getVibration().StopQuake(0x1f); mVibrationOn = false; @@ -344,7 +337,7 @@ void daObjFallObj_c::action_follow_fall() { bool daObjFallObj_c::checkHang() { bool rv = false; daPy_py_c* player = daPy_getPlayerActorClass(); - + u32 status = dComIfGp_checkPlayerStatus1(0, 0x2000000); if (status && fopAcM_searchPlayerDistanceXZ(this) < 250.0f && player->current.pos.y > current.pos.y - 100.0f && @@ -395,7 +388,7 @@ bool daObjFallObj_c::checkHang2() { return false; } } - + return false; } diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp index d577fda4f37..35f846698ea 100644 --- a/src/d/actor/d_a_obj_itamato.cpp +++ b/src/d/actor/d_a_obj_itamato.cpp @@ -11,38 +11,6 @@ #include "JSystem/JHostIO/JORFile.h" #include -struct daObj_ItaMato_HIOParam { - /* 0x00 */ f32 attn_offset; - /* 0x04 */ f32 gravity; - /* 0x08 */ f32 scale; - /* 0x0C */ f32 real_shadow_size; - /* 0x10 */ f32 shake_pow; -}; - -class daObj_ItaMato_Param_c { -public: - virtual ~daObj_ItaMato_Param_c() {} - - static daObj_ItaMato_HIOParam const m; -}; - -#if DEBUG -#define PARAM mHIO->mAttr -#define PARAM_CLASS daObj_ItaMato_HIO_c - -class daObj_ItaMato_HIO_c : public mDoHIO_entry_c { -public: - daObj_ItaMato_HIO_c(); - void genMessage(JORMContext* ctx); - void listenPropertyEvent(const JORPropertyEvent*); - - /* 0x8 */ daObj_ItaMato_HIOParam mAttr; -}; -#else -#define PARAM daObj_ItaMato_Param_c::m -#define PARAM_CLASS daObj_ItaMato_Param_c -#endif - daObj_ItaMato_HIOParam const daObj_ItaMato_Param_c::m = { 110.0f, -3.0f, @@ -53,7 +21,7 @@ daObj_ItaMato_HIOParam const daObj_ItaMato_Param_c::m = { #if DEBUG daObj_ItaMato_HIO_c::daObj_ItaMato_HIO_c() { - mAttr = daObj_ItaMato_Param_c::m; + m = daObj_ItaMato_Param_c::m; } void daObj_ItaMato_HIO_c::listenPropertyEvent(const JORPropertyEvent* i_event) { @@ -64,18 +32,18 @@ void daObj_ItaMato_HIO_c::listenPropertyEvent(const JORPropertyEvent* i_event) { switch ((u32)i_event->id) { case 0x40000002: - if (jorFile.open(6, "すべてのファイル(*.*)", NULL, NULL, NULL)) { + if (jorFile.open(6, "すべてのファイル(*.*)\0*.*", NULL, NULL, NULL)) { memset(buffer, 0, sizeof(buffer)); len = 0; - sprintf(buffer + len, "%.3ff,\t// 注目オフセット\n", mAttr.attn_offset); + sprintf(buffer + len, "%.3ff,\t// 注目オフセット\n", m.attn_offset); len = strlen(buffer); - sprintf(buffer + len, "%.3ff,\t// 重力\n", mAttr.gravity); + sprintf(buffer + len, "%.3ff,\t// 重力\n", m.gravity); len = strlen(buffer); - sprintf(buffer + len, "%.3ff,\t// スケ−ル\n", mAttr.scale); + sprintf(buffer + len, "%.3ff,\t// スケ−ル\n", m.scale); len = strlen(buffer); - sprintf(buffer + len, "%.3ff,\t// リアル影サイズ\n", mAttr.real_shadow_size); + sprintf(buffer + len, "%.3ff,\t// リアル影サイズ\n", m.real_shadow_size); len = strlen(buffer); - sprintf(buffer + len, "%.3ff,\t// 揺れパワ−\n", mAttr.shake_pow); + sprintf(buffer + len, "%.3ff,\t// 揺れパワ−\n", m.shake_pow); len = strlen(buffer); jorFile.writeData(buffer, len); jorFile.close(); @@ -88,11 +56,11 @@ void daObj_ItaMato_HIO_c::listenPropertyEvent(const JORPropertyEvent* i_event) { } void daObj_ItaMato_HIO_c::genMessage(JORMContext* ctx) { - ctx->genSlider("注目オフセット　", &mAttr.attn_offset, 0.0f, 1000.0f); - ctx->genSlider("重力　　　　　　", &mAttr.gravity, -100.0f, 100.0f); - ctx->genSlider("スケ−ル　　　　", &mAttr.scale, 0.0f, 100.0f); - ctx->genSlider("リアル影サイズ　", &mAttr.real_shadow_size, 0.0f, 10000.0f); - ctx->genSlider("揺れパワ−　　　", &mAttr.shake_pow, 0.0f, 90.0f); + ctx->genSlider("注目オフセット　", &m.attn_offset, 0.0f, 1000.0f); + ctx->genSlider("重力　　　　　　", &m.gravity, -100.0f, 100.0f); + ctx->genSlider("スケ−ル　　　　", &m.scale, 0.0f, 100.0f); + ctx->genSlider("リアル影サイズ　", &m.real_shadow_size, 0.0f, 10000.0f); + ctx->genSlider("揺れパワ−　　　", &m.shake_pow, 0.0f, 90.0f); ctx->genButton("ファイル書き出し", 0x40000002); } #endif @@ -111,7 +79,7 @@ static dCcD_SrcSph l_ccDSph = { } // mSphAttr }; -static PARAM_CLASS l_HIO; +static OBJ_ITAMATO_HIO_CLASS l_HIO; static char* l_resName = "H_ItaMato"; @@ -255,7 +223,9 @@ int daObj_ItaMato_c::Execute() { } } - dComIfGs_setTmpReg(0xF4FF, dComIfGs_getTmpReg(0xF4FF) + 1); + u8 curRegVal = dComIfGs_getTmpReg(0xF4FF); + curRegVal++; + dComIfGs_setTmpReg(0xF4FF, curRegVal); if (dComIfGp_getAttention()->GetLockonList(0) != NULL) { if (dComIfGp_getAttention()->LockonTruth()) { if (this == dComIfGp_getAttention()->GetLockonList(0)->getActor()) { @@ -311,7 +281,7 @@ int daObj_ItaMato_c::Execute() { cLib_addCalc2(&field_0x9f0[2], 0.0f, 0.125f, 125.0f); setMtx(); attention_info.position = current.pos; - attention_info.position.y += PARAM.attn_offset; + attention_info.position.y += mHIO->m.attn_offset; eyePos = attention_info.position; if (field_0xa16 == 0) { @@ -399,7 +369,7 @@ const char* daObj_ItaMato_c::getResName() { void daObj_ItaMato_c::setSwayParam(fopAc_ac_c* i_actor) { f32 fVar1 = 1.0f; - f32 fVar2[3] = {0.0f, 0.0f, PARAM.shake_pow}; + f32 fVar2[3] = {0.0f, 0.0f, mHIO->m.shake_pow}; field_0xa02 = fopAcM_searchActorAngleY(this, i_actor) - shape_angle.y + 0x8000; field_0x9e8 = 8; diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index 9f1e3a555f0..6cb86dc3e48 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -15,6 +15,18 @@ #include "m_Do/m_Do_lib.h" #include +class daObj_KatHIO_c : public JORReflexible { +public: + daObj_KatHIO_c(); + virtual ~daObj_KatHIO_c() {} + + void genMessage(JORMContext* ctx); + + s8 field_0x4; + f32 mScaleFemale; + f32 mScaleMale; +}; + static u8 hio_set; static daObj_KatHIO_c l_HIO; @@ -25,6 +37,17 @@ daObj_KatHIO_c::daObj_KatHIO_c() { mScaleFemale = 1.0f; } +#if DEBUG +void daObj_KatHIO_c::genMessage(JORMContext* ctx) { + // Golden Snail + ctx->genLabel("黄金蟲(カタツムリ)", 0x80000001); + // Model scale (male) + ctx->genSlider("モデルスケール(オス)", &mScaleMale, 0.1f, 4.0f); + // Model scale (female) + ctx->genSlider("モデルスケール(メス)", &mScaleFemale, 0.1f, 4.0f); +} +#endif + static u8 const l_kat_itemno[2] = { fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL, @@ -84,7 +107,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return kat->CreateHeap(); } -int daObjKAT_c::CreateHeap() { +inline int daObjKAT_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kat", 9); JUT_ASSERT(0x136, modelData != NULL); mpMorfSO = @@ -140,12 +163,12 @@ int daObjKAT_c::CreateHeap() { static int daObjKAT_Create(fopAc_ac_c* i_this) { daObjKAT_c* kat = (daObjKAT_c*)i_this; - fpc_ProcID unused = fopAcM_GetID(i_this); + fopAcM_RegisterCreateID(i_this, "Obj_KAT"); return kat->create(); } static int daObjKAT_Delete(daObjKAT_c* i_this) { - fpc_ProcID unused = fopAcM_GetID(i_this); + fopAcM_RegisterDeleteID(i_this, "Obj_KAT"); i_this->Delete(); return 1; } @@ -623,7 +646,7 @@ void daObjKAT_c::Z_BufferChk() { field_0x800 = ((near + far * near / projected.z) / (far - near) + 1.0f) * 16777215.0f; } -int daObjKAT_c::Delete() { +inline int daObjKAT_c::Delete() { dComIfG_resDelete(&mPhase, "Kat"); if (field_0xa70 != 0) { hio_set = 0; @@ -694,12 +717,12 @@ bool daObjKAT_c::CreateChk() { return true; } -int daObjKAT_c::create() { +inline int daObjKAT_c::create() { fopAcM_ct(this, daObjKAT_c); s32 loadResult = dComIfG_resLoad(&mPhase, "Kat"); if (loadResult == cPhs_COMPLEATE_e) { - OS_REPORT("KAT PARAM: %x", fopAcM_GetParam(this)); + OS_REPORT("KAT PARAM %x\n", fopAcM_GetParam(this)); field_0x808 = fopAcM_GetParam(this) & 0xf; if (field_0x808 == 2) { field_0x56c = 0; diff --git a/src/d/actor/d_a_obj_kwheel01.cpp b/src/d/actor/d_a_obj_kwheel01.cpp index b861f43bab6..f75d7398c4b 100644 --- a/src/d/actor/d_a_obj_kwheel01.cpp +++ b/src/d/actor/d_a_obj_kwheel01.cpp @@ -22,7 +22,6 @@ static const u32 l_dzbidx[3] = {9, 8, 10}; static const int l_bmdidx[2] = {4, 5}; - static const char* l_arcName = "K_Wheel01"; // Likely to have been a macro; matches for loop at beginning of create1st for both debug and retail, despite retail only calling getArg4567() @@ -57,17 +56,17 @@ cPhs_Step daObjKWheel01_c::create1st() { bool atLeastOneKLiftExists = false; s8 debugStackVar; - for(int i = 0; i < 4; i++) { - if(CHECK_KLIFT_EXISTS(i)) { + for (int i = 0; i < 4; i++) { + if (CHECK_KLIFT_EXISTS(i)) { atLeastOneKLiftExists = true; } } - if(!mCreatedKLifts) { + if (!mCreatedKLifts) { setMtx(); u32 createLiftParameters = (getArg2() & 0x3F) | daObjKLift00_c::LOCK_e | daObjKLift00_c::NO_BASE_DISP; - for(int i = 0; i < 4; i++) { - if(CHECK_KLIFT_EXISTS(i)) { + for (int i = 0; i < 4; i++) { + if (CHECK_KLIFT_EXISTS(i)) { cXyz kLiftPos; MTXMultVec(mNewBgMtx, &l_pos[i], &kLiftPos); m_klift_pid[i] = fopAcM_create(PROC_Obj_KLift00, createLiftParameters, &kLiftPos, fopAcM_GetHomeRoomNo(this), 0, 0, -1); @@ -79,25 +78,32 @@ cPhs_Step daObjKWheel01_c::create1st() { } cPhs_Step phase = static_cast(dComIfG_resLoad(this, l_arcName)); - if(phase == cPhs_COMPLEATE_e) { + if (phase == cPhs_COMPLEATE_e) { mYAngularVelocity = 0; setMtx(); - - phase = static_cast(MoveBGCreate(l_arcName, (getOut() ? l_dzbidx[2] : l_dzbidx[0]), dBgS_MoveBGProc_TypicalRotY, 0x5D98, &mNewBgMtx)); - if(phase == cPhs_ERROR_e) + u32 dzbId; + if (getOut()) { + dzbId = l_dzbidx[2]; + } else { + dzbId = l_dzbidx[0]; + } + phase = static_cast(MoveBGCreate(l_arcName, dzbId, dBgS_MoveBGProc_TypicalRotY, 0x5D98, &mNewBgMtx)); + if (phase == cPhs_ERROR_e) { return phase; + } - for(int i = 0; i < 4; i++) { - if(CHECK_KLIFT_EXISTS(i) && dComIfG_Bgsp().Regist(mKLiftCollisions[i], this)) + for (int i = 0; i < 4; i++) { + if (CHECK_KLIFT_EXISTS(i) && dComIfG_Bgsp().Regist(mKLiftCollisions[i], this)) { return cPhs_ERROR_e; + } } - } - #if DEBUG - // "Pulley(Lv3)" - l_HIO.entryHIO("滑車(Lv3)"); - #endif + #if DEBUG + // "Pulley(Lv3)" + l_HIO.entryHIO("滑車(Lv3)"); + #endif + } return phase; } @@ -114,14 +120,14 @@ void daObjKWheel01_c::setMtx() { MTXCopy(mDoMtx_stack_c::get(), mTransformMtx); MTXCopy(mDoMtx_stack_c::get(), mNewBgMtx); - if(mYAngularVelocity) { + if (mYAngularVelocity) { mDoMtx_stack_c::copy(mTransformMtx); mDoMtx_stack_c::transM(cM_rndFX(1.0f), cM_rndFX(1.0f), cM_rndFX(1.0f)); MTXCopy(mDoMtx_stack_c::get(), mTransformMtx); } - for(int i = 0; i < 4; i++) { - if(CHECK_KLIFT_EXISTS(i)) { + for (int i = 0; i < 4; i++) { + if (CHECK_KLIFT_EXISTS(i)) { Vec kLiftPos; MTXMultVec(mNewBgMtx, &l_pos[i], &kLiftPos); mDoMtx_stack_c::transS(kLiftPos.x, kLiftPos.y, kLiftPos.z); @@ -135,20 +141,21 @@ int daObjKWheel01_c::CreateHeap() { JUT_ASSERT(229, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, (1 << 19), 0x11000084); - if(!mpModel) + if (!mpModel) { return 0; + } - for(int i = 0; i < 4; i++) { - if(!CHECK_KLIFT_EXISTS(i)) { + for (int i = 0; i < 4; i++) { + if (!CHECK_KLIFT_EXISTS(i)) { mKLiftCollisions[i] = NULL; - } - else { + } else { mKLiftCollisions[i] = new (dBgW); - if(!mKLiftCollisions[i]) + if (!mKLiftCollisions[i]) { return 0; + } - if(mKLiftCollisions[i]->Set(static_cast(dComIfG_getObjectRes(l_arcName, l_dzbidx[1])), 1, &mKLiftBaseMatrices[i])) { + if (mKLiftCollisions[i]->Set(static_cast(dComIfG_getObjectRes(l_arcName, l_dzbidx[1])), 1, &mKLiftBaseMatrices[i])) { mKLiftCollisions[i] = NULL; return 0; } @@ -162,19 +169,20 @@ int daObjKWheel01_c::Create() { mpModel->setBaseTRMtx(mTransformMtx); fopAcM_SetMtx(this, mTransformMtx); - if(getSwNo() != 0xFF && fopAcM_isSwitch(this, getSwNo())) { + if (getSwNo() != 0xFF && fopAcM_isSwitch(this, getSwNo())) { #if DEBUG - if(getArg0()) { + if (getArg0()) { mYAngularVelocity = l_HIO.mTargetYAngularSpeed; - } - else + } else { mYAngularVelocity = -l_HIO.mTargetYAngularSpeed; - #else - if(getArg0()) + } +#else + if (getArg0()) { mYAngularVelocity = 64; - else + } else { mYAngularVelocity = -64; - #endif + } +#endif } fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x, l_cull_box.max.y, l_cull_box.max.z); @@ -184,9 +192,9 @@ int daObjKWheel01_c::Create() { static void* searchKWheel00(void* param_0, void* i_this) { UNUSED(i_this); - if(param_0 && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == PROC_Obj_KWheel00) { + if (param_0 && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == PROC_Obj_KWheel00) { daObjKWheel00_c* const kWheel00 = static_cast(param_0); - if(kWheel00->getType() == daObjKWheel00_c::TYPE_LARGE_GOLD) { + if (kWheel00->getType() == daObjKWheel00_c::TYPE_LARGE_GOLD) { return param_0; } } @@ -197,17 +205,18 @@ static void* searchKWheel00(void* param_0, void* i_this) { int daObjKWheel01_c::Execute(Mtx** i_mtx) { eventUpdate(); - if(getSwNo() == 0xFF) { + if (getSwNo() == 0xFF) { daObjKWheel00_c* const foundKWheel00 = static_cast(fopAcM_Search(searchKWheel00, this)); - if(foundKWheel00) { - if(getArg0()) - current.angle.y += foundKWheel00->current.angle.z - foundKWheel00->old.angle.z; - else - current.angle.y -= foundKWheel00->current.angle.z - foundKWheel00->old.angle.z; + if (foundKWheel00) { + if (getArg0()) { + ANGLE_ADD_2(current.angle.y, foundKWheel00->current.angle.z - foundKWheel00->old.angle.z); + } else { + ANGLE_SUB_2(current.angle.y, foundKWheel00->current.angle.z - foundKWheel00->old.angle.z); + } shape_angle.y = current.angle.y; - if(current.angle.y != old.angle.y) { + if (current.angle.y != old.angle.y) { #if DEBUG mYAngularVelocity = l_HIO.mTargetYAngularSpeed; #else @@ -215,35 +224,32 @@ int daObjKWheel01_c::Execute(Mtx** i_mtx) { #endif } } - } - else { - if(mYAngularVelocity == 0) { - if(fopAcM_isSwitch(this, getSwNo())) { - if(getEvent() != 0xFF) { - const s32 eventIndex = dComIfGp_getEventManager().getEventIdx(this, getEvent()); - setEvent(eventIndex, getEvent(), 1); - } - else { + } else { + if (mYAngularVelocity == 0) { + if (fopAcM_isSwitch(this, getSwNo())) { + if (getEvent() != 0xFF) { + s16 eventIndex = (s16)dComIfGp_getEventManager().getEventIdx(this, getEvent()); + setEvent(eventIndex, (u8)getEvent(), 1); + } else { eventStart(); } } } - if(mYAngularVelocity != 0) { + if (mYAngularVelocity != 0) { #if DEBUG - if(mYAngularVelocity > 0) { - if(mYAngularVelocity < l_HIO.mTargetYAngularSpeed) + if (mYAngularVelocity > 0) { + if (mYAngularVelocity < l_HIO.mTargetYAngularSpeed) { mYAngularVelocity += l_HIO.mYAngularAcceleration; - } - else if(mYAngularVelocity > -l_HIO.mTargetYAngularSpeed) { + } + } else if (mYAngularVelocity > -l_HIO.mTargetYAngularSpeed) { mYAngularVelocity -= l_HIO.mYAngularAcceleration; } #else - if(mYAngularVelocity > 0) { - if(mYAngularVelocity < 64) + if (mYAngularVelocity > 0) { + if (mYAngularVelocity < 64) mYAngularVelocity += 2; - } - else if(mYAngularVelocity > -64) { + } else if (mYAngularVelocity > -64) { mYAngularVelocity -= 2; } #endif @@ -257,11 +263,11 @@ int daObjKWheel01_c::Execute(Mtx** i_mtx) { mpModel->setBaseTRMtx(mTransformMtx); *i_mtx = &mNewBgMtx; - for(int i = 0; i < 4; i++) { - if(CHECK_KLIFT_EXISTS(i)) { + for (int i = 0; i < 4; i++) { + if (CHECK_KLIFT_EXISTS(i)) { daObjKLift00_c* const foundKLift = static_cast(fopAcM_SearchByID(m_klift_pid[i])); - if(foundKLift) { + if (foundKLift) { cXyz kLiftOffset; MTXMultVec(mNewBgMtx, &l_pos[i], &kLiftOffset); @@ -273,14 +279,17 @@ int daObjKWheel01_c::Execute(Mtx** i_mtx) { } - for(int i = 0; i < 4; i++) { - if(CHECK_KLIFT_EXISTS(i)) + for (int i = 0; i < 4; i++) { + if (CHECK_KLIFT_EXISTS(i)) { mKLiftCollisions[i]->Move(); + } } // Stack ordering issues arise if mDoAud_seStartLevel is used - if(mYAngularVelocity) - Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_GEAR_LV, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); + if (mYAngularVelocity) { + Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_GEAR_LV, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, + -1.0f, 0); + } return 1; } @@ -303,9 +312,10 @@ int daObjKWheel01_c::Delete() { l_HIO.removeHIO(); #endif - for(int i = 0; i < 4; i++) { - if(CHECK_KLIFT_EXISTS(i) && mKLiftCollisions[i] && mKLiftCollisions[i]->ChkUsed()) + for (int i = 0; i < 4; i++) { + if (CHECK_KLIFT_EXISTS(i) && mKLiftCollisions[i] && mKLiftCollisions[i]->ChkUsed()) { dComIfG_Bgsp().Release(mKLiftCollisions[i]); + } } return 1; @@ -313,15 +323,17 @@ int daObjKWheel01_c::Delete() { bool daObjKWheel01_c::eventStart() { #if DEBUG - if(getArg0()) + if (getArg0()) { mYAngularVelocity = l_HIO.mYAngularAcceleration; - else + } else { mYAngularVelocity = -l_HIO.mYAngularAcceleration; + } #else - if(getArg0()) + if (getArg0()) { mYAngularVelocity = 2; - else + } else { mYAngularVelocity = -2; + } #endif return true; diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index e0e966a8dfe..c90472918bc 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -259,7 +259,7 @@ void daLv6SwGate_c::modeBreak() { dComIfGp_particle_set(0x8B7D, &p, &shape_angle, 0); p.set(-150.0f - mMovementAmount, 0.0f, 0.0f); csXyz shapeAngle(shape_angle); - shapeAngle.y += 0x8000; + ANGLE_ADD_2(shapeAngle.y, 0x8000); mDoMtx_stack_c::ZXYrotS(shapeAngle.x, shapeAngle.y, shapeAngle.z); mDoMtx_stack_c::multVec(&p, &p); p += current.pos; @@ -304,14 +304,14 @@ static int daLv6SwGate_Execute(daLv6SwGate_c* i_this) { } static int daLv6SwGate_Delete(daLv6SwGate_c* i_this) { - fpc_ProcID id = fopAcM_GetID(i_this); + fopAcM_RegisterDeleteID(i_this, "daLv6SwGate"); return i_this->MoveBGDelete(); } static int daLv6SwGate_Create(fopAc_ac_c* i_this) { - daLv6SwGate_c* this_gate = (daLv6SwGate_c*)i_this; - fpc_ProcID id = fopAcM_GetID(i_this); - return this_gate->create(); + daLv6SwGate_c* gate = (daLv6SwGate_c*)i_this; + fopAcM_RegisterCreateID(i_this, "daLv6SwGate"); + return gate->create(); } static actor_method_class l_daLv6SwGate_Method = { diff --git a/src/d/actor/d_a_obj_lv6Tenbin.cpp b/src/d/actor/d_a_obj_lv6Tenbin.cpp index 578feaecf68..0e04c362bfa 100644 --- a/src/d/actor/d_a_obj_lv6Tenbin.cpp +++ b/src/d/actor/d_a_obj_lv6Tenbin.cpp @@ -159,13 +159,13 @@ void daTenbin_c::rideCallBackRight(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* daPy_py_c* player = dComIfGp_getLinkPlayer(); if (fopAcM_GetName(i_act2) == PROC_SPINNER) { if (player->checkSpinnerRide()) { - i_tenbin->field_0x5B2 += 2; + i_tenbin->field_0x5B2 += (u16)2; } } if (fopAcM_GetName(i_act2) == PROC_ALINK && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) { - i_tenbin->field_0x5B2 += 2; + i_tenbin->field_0x5B2 += (u16)2; if (player->checkBootsOrArmorHeavy()) { - i_tenbin->field_0x5B2 += 60000; + i_tenbin->field_0x5B2 += (u16)60000; } if (player->getGrabActorID() != -1) { fopAc_ac_c* found = fopAcM_SearchByID(player->getGrabActorID()); @@ -178,7 +178,7 @@ void daTenbin_c::rideCallBackRight(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* if (fopAcM_GetName(i_act2) == PROC_CSTATUE) { daCstatue_c* i_statue = (daCstatue_c*)i_act2; if (i_statue->checkNormalType()) { - i_tenbin->field_0x5B2 += 4; + i_tenbin->field_0x5B2 += (u16)4; } else if (fopAcM_GetID(i_statue) != i_tenbin->field_0x650) { i_tenbin->field_0x5B2++; } @@ -191,13 +191,13 @@ void daTenbin_c::rideCallBackLeft(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* daPy_py_c* player = dComIfGp_getLinkPlayer(); if (fopAcM_GetName(i_act2) == PROC_SPINNER) { if (player->checkSpinnerRide()) { - i_tenbin->field_0x5B4 += 2; + i_tenbin->field_0x5B4 += (u16)2; } } if (fopAcM_GetName(i_act2) == PROC_ALINK && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) { - i_tenbin->field_0x5B4 += 2; + i_tenbin->field_0x5B4 += (u16)2; if (player->checkEquipHeavyBoots()) { - i_tenbin->field_0x5B4 += 60000; + i_tenbin->field_0x5B4 += (u16)60000; } if (player->getGrabActorID() != -1) { fopAc_ac_c* found = fopAcM_SearchByID(player->getGrabActorID()); @@ -210,7 +210,7 @@ void daTenbin_c::rideCallBackLeft(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* if (fopAcM_GetName(i_act2) == PROC_CSTATUE) { daCstatue_c* i_statue = (daCstatue_c*)i_act2; if (i_statue->checkNormalType()) { - i_tenbin->field_0x5B4 += 4; + i_tenbin->field_0x5B4 += (u16)4; } else if (fopAcM_GetID(i_statue) != i_tenbin->field_0x650) { i_tenbin->field_0x5B4++; } @@ -336,13 +336,13 @@ static int daTenbin_Execute(daTenbin_c* i_this) { } static int daTenbin_Delete(daTenbin_c* i_this) { - fpc_ProcID id = fopAcM_GetID(i_this); + fopAcM_RegisterDeleteID(i_this, "daTenbin"); return i_this->MoveBGDelete(); } static int daTenbin_Create(fopAc_ac_c* i_this) { daTenbin_c* this_tenbin = (daTenbin_c*)i_this; - fpc_ProcID id = fopAcM_GetID(i_this); + fopAcM_RegisterCreateID(i_this, "daTenbin"); return this_tenbin->create(); } diff --git a/src/d/actor/d_a_obj_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp index 0b9e4b3d93d..c123578767b 100644 --- a/src/d/actor/d_a_obj_lv6egate.cpp +++ b/src/d/actor/d_a_obj_lv6egate.cpp @@ -9,7 +9,7 @@ static char* l_arcName = "LV6EGATE"; -static const int l_dzbidx = 3; +const int l_dzbidx = 3; int daObjLv6EGate_c::create1st() { int phase_state = dComIfG_resLoad(this, l_arcName); @@ -40,6 +40,22 @@ static const cull_box l_cull_box = { {500.0f, 300.0f, 50.0f}, }; +static dCcD_SrcCyl l_cc_cyl_src = { + { + {0x0, {{0x0, 0x2, 0x0}, {0x400, 0x11}, 0x79}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 300.0f // mHeight + } // mCyl + } +}; + static dCcD_SrcCyl l_at_cyl_src = { { {0x0, {{0x100, 0x2, 0xd}, {0x400, 0x0}, 0x11}}, // mObj @@ -56,6 +72,12 @@ static dCcD_SrcCyl l_at_cyl_src = { } }; +static u8 l_local_cyl[] = { + 0xC3, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x43, 0x91, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; + int daObjLv6EGate_c::Create() { fopAcM_SetMtx(this, field_0x5d8); fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x, l_cull_box.max.y, l_cull_box.max.z); @@ -151,7 +173,7 @@ int daObjLv6EGate_c::Execute(Mtx** param_0) { cXyz cyl_pos; f32 var_f31 = -280.0f; - f32 temp_f30 = (330.0f - var_f31) * 0.125f; + f32 temp_f30 = (330.0f - var_f31) / 8.0f; for (int i = 0; i < 8; i++) { cXyz local_pos; local_pos.x = var_f31; diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index f037e8aff44..c3fec295ae5 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -10,6 +10,8 @@ #include "d/actor/d_a_obj_lv6swturn.h" #include "d/actor/d_a_player.h" +static char* l_arcName = "Obj_l6tsw"; + #if DEBUG daObjLv6SwTurn_HIO_c::daObjLv6SwTurn_HIO_c() { mWaitTime = 0x2f; @@ -30,6 +32,7 @@ void daObjLv6SwTurn_HIO_c::genMessage(JORMContext* context) { static fopAc_ac_c* PPCallBack(fopAc_ac_c* actor1, fopAc_ac_c* actor2, s16 param_2, dBgW_Base::PushPullLabel pushPull) { + static const int pp_field = 3; UNUSED(param_2); dBgW_Base::PushPullLabel pushPull_3 = cLib_checkBit(pushPull, dBgW_Base::PPLABEL_3); daObjLv6SwTurn_c* swTurnActor1 = (daObjLv6SwTurn_c*)actor1; @@ -57,8 +60,6 @@ static fopAc_ac_c* PPCallBack(fopAc_ac_c* actor1, fopAc_ac_c* actor2, s16 param_ return actor1; } -static char* l_arcName = "Obj_l6tsw"; - void daObjLv6SwTurn_c::initBaseMtx() { unk5A8->setBaseScale(scale); setBaseMtx(); @@ -135,20 +136,11 @@ enum daObjLv6SwTurn_c_mode{ void daObjLv6SwTurn_c::mode_proc_call() { typedef void (daObjLv6SwTurn_c::*func_type)(); - // naming difference between debug and release -#if DEBUG - static func_type mode_proc_call[] = { - &daObjLv6SwTurn_c::modeWait, - &daObjLv6SwTurn_c::modeRotate - }; - (this->*mode_proc_call[mMode])(); -#else static func_type l_func[] = { &daObjLv6SwTurn_c::modeWait, &daObjLv6SwTurn_c::modeRotate }; (this->*l_func[mMode])(); -#endif } void daObjLv6SwTurn_c::init_modeWait() { @@ -312,7 +304,7 @@ int daObjLv6SwTurn_c::Draw() { dComIfGd_setList(); #if DEBUG if (l_HIO.mDrawFlag) { - mpBgW->GetAttackThrough(0); + mpBgW->DebugDraw(); } #endif return TRUE; diff --git a/src/d/actor/d_a_obj_pdwall.cpp b/src/d/actor/d_a_obj_pdwall.cpp index 6132e10d7c2..444b1e0f1d1 100644 --- a/src/d/actor/d_a_obj_pdwall.cpp +++ b/src/d/actor/d_a_obj_pdwall.cpp @@ -7,7 +7,14 @@ #include "d/actor/d_a_obj_pdwall.h" +// these are arrays to force them to not be inlined, not sure if this is fake static const int l_dzbidx = 7; +static const int l_bmdidx = 4; + +static const cull_box l_cull_box = { + {-100.0f, -800.0f, -300.0f}, + {750.0f, 500.0f, 300.0f}, +}; static char* l_arcName = "P_Dwall"; @@ -15,7 +22,7 @@ int daObjPDwall_c::create1st() { int phase_state = dComIfG_resLoad(this, l_arcName); if (phase_state == cPhs_COMPLEATE_e) { setMtx(); - + phase_state = MoveBGCreate(l_arcName, l_dzbidx, dBgS_MoveBGProc_TypicalRotY, 0xB1C0, &field_0x5a8); if (phase_state == cPhs_ERROR_e) { return phase_state; @@ -31,11 +38,6 @@ int daObjPDwall_c::create1st() { return phase_state; } -static const cull_box l_cull_box = { - {-100.0f, -800.0f, -300.0f}, - {750.0f, 500.0f, 300.0f}, -}; - void daObjPDwall_c::setMtx() { for (int i = 0; i < 10; i++) { mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x808[i], current.pos.z); @@ -54,7 +56,7 @@ void daObjPDwall_c::setMtx() { } int daObjPDwall_c::CreateHeap() { - J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx); JUT_ASSERT(175, model_data != NULL); for (int i = 0; i < 10; i++) { diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index 69e508971d0..12d8f54e3cf 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -295,7 +295,7 @@ int daObjPicture_c::execute() { cXyz sp8(current.pos); fopAcM_gc_c::gndCheck(&sp8); - shape_angle.x += 0x400; + ANGLE_ADD_2(shape_angle.x, 0x400); if (shape_angle.x > 0x4000) { shape_angle.x = 0x4000; } @@ -309,7 +309,6 @@ int daObjPicture_c::execute() { cLib_chaseF(¤t.pos.x, field_0xca0.x, 1.0f); cLib_chaseF(¤t.pos.z, field_0xca0.z, 1.0f); setPicAtCol(); - break; } case 3: break; diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp index 16af5cb3aeb..c4ad41b2fd0 100644 --- a/src/d/actor/d_a_obj_poFire.cpp +++ b/src/d/actor/d_a_obj_poFire.cpp @@ -221,8 +221,8 @@ void daPoFire_c::modeWait() { if (eventInfo.checkCommandCatch()) { init_modeWaitSetEffect(); } else { - dComIfGp_att_CatchRequest(this, itemNo[mActorID], l_HIO.mPickupRange, 70.0f, -70.0f, 0x5000, - 1); + int result = dComIfGp_att_CatchRequest(this, itemNo[mActorID], l_HIO.mPickupRange, 70.0f, + -70.0f, 0x5000, 1); eventInfo.onCondition(dEvtCnd_40_e); } current.pos.y = unk5D4 + l_HIO.mWaitVertRange * cM_ssin(cM_deg2s(unk5D8 * l_HIO.mWaitPeriod)); diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index 233e442b066..fe265afb004 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -18,8 +18,9 @@ static char* l_staffName = "SCanTen"; static char* l_eventName = "SKY_CANNON_TEN_FIRE"; static int eventCallBack(void* i_proc, int param_1) { - if (i_proc != NULL) { - ((daObjSCannonTen_c*)i_proc)->changeScene(); + daObjSCannonTen_c* proc = (daObjSCannonTen_c*)i_proc; + if (proc != NULL) { + proc->changeScene(); } return 1; @@ -147,6 +148,22 @@ int daObjSCannonTen_c::execute() { return 1; } +const daObjSCannonTen_c::ExeProc daObjSCannonTen_c::s_exeProc[] = { + &daObjSCannonTen_c::exeModeWait, + &daObjSCannonTen_c::exeModeOrderEvt, + &daObjSCannonTen_c::exeModeActionEvt, + &daObjSCannonTen_c::exeModeEnd, +}; + +const daObjSCannonTen_c::ExeProc daObjSCannonTen_c::s_demoExeProc[][2] = { + {&daObjSCannonTen_c::demoInitLinkIn, &daObjSCannonTen_c::demoExeLinkIn}, + {&daObjSCannonTen_c::demoInitSet, &daObjSCannonTen_c::demoExeSet}, + {&daObjSCannonTen_c::demoInitMove, &daObjSCannonTen_c::demoExeMove}, + {&daObjSCannonTen_c::demoInitFire, &daObjSCannonTen_c::demoExeFire}, + {&daObjSCannonTen_c::demoInitFireEnd, &daObjSCannonTen_c::demoExeFireEnd}, + {&daObjSCannonTen_c::demoInitFinish, &daObjSCannonTen_c::demoExeFinish}, +}; + void daObjSCannonTen_c::middleExe() { if (s_exeProc[mMode] != NULL) { (this->*s_exeProc[mMode])(); @@ -158,10 +175,10 @@ void daObjSCannonTen_c::middleExe() { } void daObjSCannonTen_c::exeModeWait() { - if (!(DEBUG && aREG_F(0) != 0.0f) && fopAcM_checkHookCarryNow(this) && + if (!(DEBUG && aREG_F(0)) && fopAcM_checkHookCarryNow(this) && dComIfGp_checkPlayerStatus1(0, 0x10)) { eventInfo.setArchiveName(l_arcName); - mEvtIdx = dComIfGp_getEventManager().getEventIdx(this, l_eventName, 0xFF); + mEvtIdx = (s16)dComIfGp_getEventManager().getEventIdx(this, l_eventName, 0xFF); #if DEBUG if (mEvtIdx == -1) { // "××××××××××××× Sky Cannon (City in the Sky) d_a_obj_scannon_ten.cpp: Failed to get event\n" @@ -187,22 +204,6 @@ void daObjSCannonTen_c::exeModeOrderEvt() { } } -void (daObjSCannonTen_c::*daObjSCannonTen_c::s_exeProc[])() = { - &daObjSCannonTen_c::exeModeWait, - &daObjSCannonTen_c::exeModeOrderEvt, - &daObjSCannonTen_c::exeModeActionEvt, - &daObjSCannonTen_c::exeModeEnd, -}; - -void (daObjSCannonTen_c::*daObjSCannonTen_c::s_demoExeProc[][2])() = { - {&daObjSCannonTen_c::demoInitLinkIn, &daObjSCannonTen_c::demoExeLinkIn}, - {&daObjSCannonTen_c::demoInitSet, &daObjSCannonTen_c::demoExeSet}, - {&daObjSCannonTen_c::demoInitMove, &daObjSCannonTen_c::demoExeMove}, - {&daObjSCannonTen_c::demoInitFire, &daObjSCannonTen_c::demoExeFire}, - {&daObjSCannonTen_c::demoInitFireEnd, &daObjSCannonTen_c::demoExeFireEnd}, - {&daObjSCannonTen_c::demoInitFinish, &daObjSCannonTen_c::demoExeFinish}, -}; - void daObjSCannonTen_c::exeModeActionEvt() { if (dComIfGp_evmng_endCheck(mEvtIdx) != 0) { dComIfGp_event_reset(); @@ -323,7 +324,7 @@ void daObjSCannonTen_c::demoInitFinish() { if (joint_p == NULL) { // "××××××Sky Cannon—The head joint is missing!!!! ××××××" OS_REPORT("______________________××××××天空砲台　頭部分のジョイントがありません！！！！ ××××××____________\n"); - JUT_ASSERT(1351, FALSE); + JUT_ASSERT(867, FALSE); } #endif @@ -368,7 +369,8 @@ void daObjSCannonTen_c::changeScene() { fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x80); - dStage_changeScene(1, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); + const int a_exit_id = 1; + dStage_changeScene(a_exit_id, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); } void daObjSCannonTen_c::initEmtSmoke() { diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp index 0feb173312a..5802b0b8d6b 100644 --- a/src/d/actor/d_a_obj_spinLift.cpp +++ b/src/d/actor/d_a_obj_spinLift.cpp @@ -61,8 +61,8 @@ void daSpinLift_c::setBaseMtx() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } +static u32 const l_bmdIdx[] = {4, 4, 4, 4, 4, 4, 4, 4, 4}; int daSpinLift_c::CreateHeap() { - static u32 const l_bmdIdx[] = {4, 4, 4, 4, 4, 4, 4, 4, 4}; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mModelType], l_bmdIdx[mModelType]); JUT_ASSERT(222, modelData != NULL); @@ -73,8 +73,8 @@ int daSpinLift_c::CreateHeap() { return 1; } +static const int l_dzbIdx[] = {7, 7, 7, 7, 7, 7, 7, 7, 7}; int daSpinLift_c::create() { - static const int l_dzbIdx[] = {7, 7, 7, 7, 7, 7, 7, 7, 7}; fopAcM_ct(this, daSpinLift_c); mModelType = getModelType(); int phase = dComIfG_resLoad(&mPhase, l_resNameIdx[mModelType]); @@ -123,7 +123,7 @@ int daSpinLift_c::Execute(Mtx** param_0) { } void daSpinLift_c::moveLift() { - static daSpinLift_c::modeFunc mode_proc[] = { + static const daSpinLift_c::modeFunc mode_proc[] = { &daSpinLift_c::modeWait, &daSpinLift_c::modeUpMove, &daSpinLift_c::modeDownMove, diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp index 601e09e3cab..bc9deedc788 100644 --- a/src/d/actor/d_a_obj_ss_drink.cpp +++ b/src/d/actor/d_a_obj_ss_drink.cpp @@ -305,18 +305,10 @@ void daObj_SSDrink_c::setParam() { gravity = -5.0f; -#if DEBUG - bool bVar1 = false; - bool bVar2 = false; -#endif - - if (daPy_getPlayerActorClass()->getGrabActorID() != fpcM_ERROR_PROCESS_ID_e) { - if (!checkProcess(&daObj_SSDrink_c::drink)) { - if (field_0xb0c != 0x60) { - fopAcM_offSwitch(this, getSwitchFromParam()); - return; - } - } + if (daPy_getPlayerActorClass()->getGrabActorID() != fpcM_ERROR_PROCESS_ID_e && + !checkProcess(&daObj_SSDrink_c::drink) && field_0xb0c != 0x60) { + fopAcM_offSwitch(this, getSwitchFromParam()); + return; } fopAcM_onSwitch(this, getSwitchFromParam()); @@ -367,13 +359,12 @@ int daObj_SSDrink_c::chkEvent() { int ret = 1; if (checkProcess(&daObj_SSDrink_c::drink)) { - return 1; + return ret; } if (dComIfGp_getEvent()->isOrderOK() == 0) { if (getParentPtr() != NULL) { - fopAc_ac_c* parent = (fopAc_ac_c*)getParentPtr(); - attention_info.position.set(parent->attention_info.position); + attention_info.position.set(((fopAc_ac_c*)getParentPtr())->attention_info.position); } ret = 0; diff --git a/src/d/actor/d_a_obj_syRock.cpp b/src/d/actor/d_a_obj_syRock.cpp index 4dbcc13b9fe..296ebc42d14 100644 --- a/src/d/actor/d_a_obj_syRock.cpp +++ b/src/d/actor/d_a_obj_syRock.cpp @@ -129,19 +129,21 @@ int daSyRock_c::CreateHeap() { JUT_ASSERT(271, modelData != NULL); mpModels[0] = mDoExt_J3DModel__create(modelData, 1 << 19, 0x11000084); - if(!mpModels[0]) + if (!mpModels[0]) { return 0; + } modelData = static_cast(dComIfG_getObjectRes("syourock", 5)); JUT_ASSERT(282, modelData != NULL); mpModels[1] = mDoExt_J3DModel__create(modelData, 1 << 19, 0x11000084); - if(!mpModels[1]) + if (!mpModels[1]) { return 0; + } mpBrokenCollision = new dBgW; - if(!mpBrokenCollision || mpBrokenCollision->Set(static_cast(dComIfG_getObjectRes("syourock", 9)), 1, &mBgMtx)) { + if (!mpBrokenCollision || mpBrokenCollision->Set(static_cast(dComIfG_getObjectRes("syourock", 9)), 1, &mBgMtx)) { mpBrokenCollision = NULL; return 0; } @@ -160,18 +162,21 @@ cPhs_Step daSyRock_c::create() { fopAcM_ct(this, daSyRock_c); // Check if an associated water pillar should be searched for - if(getArg0() == TRUE) { + if (getArg0() == TRUE) { mpWaterPillar = static_cast(fopAcM_Search(searchWaterPillar, this)); - if(!mpWaterPillar) + if (!mpWaterPillar) { return cPhs_INIT_e; + } } + cPhs_Step bgCreatePhaseProcess; + const cPhs_Step requestedPhaseProcess = static_cast(dComIfG_resLoad(&mPhase, "syourock")); - if(requestedPhaseProcess == cPhs_COMPLEATE_e) { - const cPhs_Step bgCreatePhaseProcess = static_cast(MoveBGCreate("syourock", 0x8, dBgS_MoveBGProc_TypicalRotY, 0x2100, NULL)); - if(bgCreatePhaseProcess == cPhs_ERROR_e) + if (requestedPhaseProcess == cPhs_COMPLEATE_e) { + if (MoveBGCreate("syourock", 0x8, dBgS_MoveBGProc_TypicalRotY, 0x2100, NULL) == cPhs_ERROR_e) { return cPhs_ERROR_e; + } mAcchCir.SetWall(150.0f, 150.0f); mAcch.Set(fopAcM_GetPosition_p(this), @@ -204,24 +209,23 @@ cPhs_Step daSyRock_c::create() { mUnbrokenCollider.SetStts(&mStts); mUnbrokenCollider.OffAtSetBit(); - if(fopAcM_isSwitch(this, getSwBit1())) { + if (fopAcM_isSwitch(this, getSwBit1())) { mIsUnbroken = false; mUnbrokenCollider.OffCoSetBit(); - if(mpBrokenCollision && mpBrokenCollision->ChkUsed()) { + if (mpBrokenCollision && mpBrokenCollision->ChkUsed()) { dComIfG_Bgsp().Release(mpBrokenCollision); mpBrokenCollision->Move(); } // Snap already broken stalactite to its appropriate location and set its mode accordingly setFallStat(); - } - else { + } else { mIsUnbroken = true; - if(mpBgW) + if (mpBgW) dComIfG_Bgsp().Release(mpBgW); - if(mpBrokenCollision) { + if (mpBrokenCollision) { dComIfG_Bgsp().Regist(mpBrokenCollision, this); mpBrokenCollision->Move(); } @@ -246,25 +250,23 @@ cPhs_Step daSyRock_c::create() { void daSyRock_c::setFallStat() { mpWaterPillar = static_cast(fopAcM_Search(searchWaterPillar, this)); - if(mpWaterPillar) { + if (mpWaterPillar) { OS_REPORT("== 下に水柱あり ==\n"); // "== Water pillar below ==" mpWaterPillar->onRockFlag(); mMode = MODE_MOVE; - } - else { + } else { OS_REPORT("== 下に水柱無し ==\n"); // "== No water pillar below ==" mAcch.CrrPos(dComIfG_Bgsp()); - if(mAcch.ChkWaterHit()) { - if(mAcch.m_wtr.GetHeight() - mAcch.GetGroundH() >= 200.0f) { + if (mAcch.ChkWaterHit()) { + if (mAcch.m_wtr.GetHeight() - mAcch.GetGroundH() >= 200.0f) { mUnderwaterOffset.x = 150.0f; shape_angle.z = 0x4000; } current.pos.y = mAcch.GetGroundH(); - } - else { + } else { current.pos.y = mAcch.GetGroundH(); } @@ -317,9 +319,9 @@ void daSyRock_c::init_modeWait() { } void daSyRock_c::modeWait() { - if(mAutoDropSwNo != 0xFF && fopAcM_isSwitch(this, mAutoDropSwNo)) { + if (mAutoDropSwNo != 0xFF && fopAcM_isSwitch(this, mAutoDropSwNo)) { field_0x779 = 0; - if(getEvetID() != 0xFF) { + if (getEvetID() != 0xFF) { orderEvent(getEvetID(), 0xFF, 1); } else { eventStart(); @@ -327,13 +329,13 @@ void daSyRock_c::modeWait() { return; } - if(mUnbrokenCollider.ChkTgHit()) { + if (mUnbrokenCollider.ChkTgHit()) { dCcD_GObjInf* tgHitGObj = mUnbrokenCollider.GetTgHitGObj(); - if(tgHitGObj->GetAtType() == AT_TYPE_BOMB) { + if (tgHitGObj->GetAtType() == AT_TYPE_BOMB) { field_0x779 = 0; - if(getEvetID() != 0xFF) + if (getEvetID() != 0xFF) { orderEvent(getEvetID(), 0xFF, 1); - else { + } else { eventStart(); } } @@ -343,8 +345,9 @@ void daSyRock_c::modeWait() { bool daSyRock_c::eventStart() { // field_0x779 is always 0 when eventStart() is called (see modeWait()) - if(!field_0x779) + if (!field_0x779) { init_modeDropInit(); + } return true; } @@ -364,24 +367,26 @@ void daSyRock_c::init_modeDropInit() { } void daSyRock_c::modeDropInit() { - if(mWaitFrames) + if (mWaitFrames) { mWaitFrames--; - else + } else { init_modeDrop(); + } } void* daSyRock_c::searchWaterPillar(void* i_proc, void* i_this) { daSyRock_c* const syRock = static_cast(i_this); daWtPillar_c* const wtPillar = static_cast(i_proc); - if(wtPillar && fopAcM_IsActor(wtPillar) && fopAcM_GetProfName(wtPillar) == PROC_Obj_WaterPillar) { + if (wtPillar && fopAcM_IsActor(wtPillar) && fopAcM_GetProfName(wtPillar) == PROC_Obj_WaterPillar) { const cXyz vectorFromWaterPillar = syRock->current.pos - wtPillar->current.pos; const f32 horizontalDistanceToWaterPillar = vectorFromWaterPillar.absXZ(); - if(horizontalDistanceToWaterPillar <= l_HIO.mRange) + if (horizontalDistanceToWaterPillar <= l_HIO.mRange) { return wtPillar; - else + } else { return NULL; + } } return NULL; } @@ -391,7 +396,7 @@ void daSyRock_c::init_modeDrop() { fopAcM_SetMaxFallSpeed(this, -l_HIO.mMaxFallSpeed); fopAcM_SetSpeedF(this, 0.0f); - if(mpBrokenCollision) { + if (mpBrokenCollision) { dComIfG_Bgsp().Release(mpBrokenCollision); mpBrokenCollision->Move(); } @@ -416,15 +421,17 @@ void daSyRock_c::init_modeSink() { fopAcM_SetGravity(this, -l_HIO.mFallAcceleration + l_HIO.mFallWaterBouyancy); speed.y = cLib_minMaxLimit(speed.y, -15.0f - oREG_F(7), 13.0f + oREG_F(8)); - if(!mpWaterPillar) + if (!mpWaterPillar) { mUnderwaterOffset.x = 150.0f; + } mMode = MODE_SINK; } void daSyRock_c::modeSink() { - if(!mpWaterPillar) + if (!mpWaterPillar) { cLib_addCalcAngleS(&shape_angle.z, 0x4000, 1, 0x444, 1); + } speed.y = cLib_minMaxLimit(speed.y, -15.0f - oREG_F(7), 13.0f + oREG_F(8)); @@ -438,8 +445,9 @@ void daSyRock_c::init_modeMove() { mDoAud_seStart(Z2SE_OBJ_STALAC_LAND_WATER, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); - if(mpBgW) + if (mpBgW) { dComIfG_Bgsp().Regist(mpBgW, this); + } mpWaterPillar->onRockFlag(); @@ -463,7 +471,7 @@ void daSyRock_c::modeMove() { current.pos = mpWaterPillar->getPos(); current.pos.y -= 50.0f; - if(mpWaterPillar->isRockYure()) { + if (mpWaterPillar->isRockYure()) { mShakeAmplitude = l_HIO.mShakeAmplitude; mShakeZOscAngQuantum = l_HIO.mShakeZOscAngQuantum; mShakeXOscAngQuantum = l_HIO.mShakeXOscAngQuantum; @@ -486,57 +494,63 @@ void daSyRock_c::bgCheck() { const bool inWater = mAcch.ChkWaterIn(); bool inWaterPillar = false; - if(mMode == MODE_DROP) { - if(mpWaterPillar) { + if (mMode == MODE_DROP) { + if (mpWaterPillar) { const f32 pillarTop = mpWaterPillar->getPillarHeight() + mpWaterPillar->current.pos.y - 50.0f; - if(pillarTop >= current.pos.y) + if (pillarTop >= current.pos.y) { inWaterPillar = true; + } } const f32 waterHeight = mAcch.m_wtr.GetHeight(); - if(hitWater) { + if (hitWater) { const f32 verticalSpeed = speed.y; - if(chkWaterLineIn()) + if (chkWaterLineIn()) { init_modeSink(); + } - if(inWater && !mInWaterPrevFrame) { + if (inWater && !mInWaterPrevFrame) { cXyz currentRockPos(current.pos); currentRockPos.y = waterHeight; fopKyM_createWpillar(¤tRockPos, l_HIO.mEffScale, 3); - if(verticalSpeed < -15.0f) + if (verticalSpeed < -15.0f) { fopAcM_seStart(this, Z2SE_OBJ_FALL_WATER_M, 0); - else + } else { mDoAud_seStart(Z2SE_OBJ_STALAC_LAND_WATER, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + } } } - if(inWaterPillar) + if (inWaterPillar) { init_modeMove(); + } } - if(hitGround) { - if(!hitWater && !mpWaterPillar) { + if (hitGround) { + if (!hitWater && !mpWaterPillar) { mDoAud_seStart(Z2SE_OBJ_STALAC_LAND, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); daObjEff::Act_c::make_land_smoke(¤t.pos, l_HIO.mEffScale); } - if(mpWaterPillar) + if (mpWaterPillar) { init_modeMove(); - else + } else { init_modeDropEnd(); + } } } void daSyRock_c::init_modeDropEnd() { - if(!mAcch.ChkWaterIn()) { + if (!mAcch.ChkWaterIn()) { dComIfGp_getVibration().StartShock(l_HIO.mVibModePower, 0xF, cXyz(0.0f, 1.0f, 0.0f)); } - if(mpBgW) + if (mpBgW) { dComIfG_Bgsp().Regist(mpBgW, this); + } mUnbrokenCollider.OffAtSetBit(); @@ -563,10 +577,11 @@ int daSyRock_c::Draw() { int daSyRock_c::Delete() { dComIfG_resDelete(&mPhase, "syourock"); - if(mpBrokenCollision && mpBrokenCollision->ChkUsed()) + if (mpBrokenCollision && mpBrokenCollision->ChkUsed()) { dComIfG_Bgsp().Release(mpBrokenCollision); + } - #if DEBUG +#if DEBUG l_HIO.removeHIO(); #endif @@ -575,7 +590,6 @@ int daSyRock_c::Delete() { static int daSyRock_Draw(daSyRock_c* i_this) { return i_this->MoveBGDraw(); - return 1; } static int daSyRock_Execute(daSyRock_c* i_this) { diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index 82053130a67..11eeecaccc8 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -8,6 +8,27 @@ #include "d/actor/d_a_obj_twGate.h" #include "d/d_com_inf_game.h" +class daTwGate_HIO_c : public fOpAcm_HIO_entry_c { +public: + daTwGate_HIO_c(); + ~daTwGate_HIO_c() {} + + void genMessage(JORMContext* ctx); + + /* 0x4 */ f32 mRange; +}; + +daTwGate_HIO_c::daTwGate_HIO_c() { + mRange = 1900.0f; +} + +#if DEBUG +void daTwGate_HIO_c::genMessage(JORMContext* ctx) { + // Range + ctx->genSlider("範囲", &mRange, 0.0f, 500000.0f); +} +#endif + static char* l_resNameIdx[13] = { "twGtFiro", "twGtK0102", @@ -24,17 +45,6 @@ static char* l_resNameIdx[13] = { "", }; -daTwGate_HIO_c::daTwGate_HIO_c() { - mRange = 1900.0f; -} - -#if DEBUG -void daTwGate_HIO_c::genMessage(JORMContext* ctx) { - // Range - ctx->genSlider("範囲", &mRange, 0.0f, 500000.0f); -} -#endif - void daTwGate_c::setBaseMtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z); diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index 9880530c816..bcbf449891e 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -12,43 +12,19 @@ #include "d/d_item_data.h" #include "d/d_s_play.h" -#if DEBUG - -class daObjWStatue_HIO_c : public fOpAcm_HIO_entry_c { -public: - daObjWStatue_HIO_c() { - mRespawnTimer = 30; - } - - void genMessage(JORMContext* context) { - // Wooden Statue - context->genLabel("木彫りの像", 0); - - // Respawn timer - context->genSlider("全滅後の出現タイマー", &mRespawnTimer, 0, 200); - } - - u8 mRespawnTimer; -}; - -daObjWStatue_HIO_c l_HIO; - -#endif - - const static dCcD_SrcCyl l_cyl_src = { { - {0x0, {{0x0, 0x0, 0x0}, {0xffffffff, 0x11}, 0x59}}, // mObj + {0x0, {{0x0, 0x0, 0x0}, {-1, 0x11}, 0x59}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x4}, // mGObjTg {0x0}, // mGObjCo }, // mObjInf { - { - {0.0f, 0.0f, 0.0f}, // mCenter - 20.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 20.0f, // mRadius + 40.0f // mHeight + } // mCyl } }; @@ -56,6 +32,31 @@ static char* l_arcName = "O_wood"; static char* l_eventName = "GET_WOOD_STATUE"; +class daObjWStatue_HIO_c : public fOpAcm_HIO_entry_c { +public: + daObjWStatue_HIO_c(); + + void genMessage(JORMContext* context); + + u8 mRespawnTimer; +}; + +#if DEBUG +daObjWStatue_HIO_c l_HIO; + +daObjWStatue_HIO_c::daObjWStatue_HIO_c() { + mRespawnTimer = 30; +} + +void daObjWStatue_HIO_c::genMessage(JORMContext* context) { + // Wooden Statue + context->genLabel("木彫りの像", 0); + + // Respawn timer + context->genSlider("全滅後の出現タイマー", &mRespawnTimer, 0, 200); +} +#endif + static f32 Reflect(cXyz* param_1, cBgS_PolyInfo const& param_2, f32 param_3) { cM3dGPla acStack_3c; bool isTriPla = dComIfG_Bgsp().GetTriPla(param_2, &acStack_3c); @@ -72,24 +73,36 @@ static f32 Reflect(cXyz* param_1, cBgS_PolyInfo const& param_2, f32 param_3) { static void lifeGetTgCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_2, fopAc_ac_c* param_3, dCcD_GObjInf* param_4) { - if (i_this != NULL && + UNUSED(param_2); + UNUSED(param_3); + + daObjWStatue_c* statue = static_cast(i_this); + + if (statue != NULL && (param_4->ChkAtType(AT_TYPE_40) || param_4->ChkAtType(AT_TYPE_BOOMERANG)) && !dComIfGp_event_runCheck() && - !((daObjWStatue_c*)i_this)->chkStatus(daObjWStatue_c::STATUS_BOOMERANG_CARRY)) + !statue->chkStatus(daObjWStatue_c::STATUS_BOOMERANG_CARRY)) { - ((daObjWStatue_c*)i_this)->actionInitBoomerangCarry(); + statue->actionInitBoomerangCarry(); } return; } static void lifeGetCoCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_2, fopAc_ac_c* param_3, dCcD_GObjInf* param_4) { - if (i_this != NULL && param_3 != NULL && param_3 == dComIfGp_getLinkPlayer()) { - ((daObjWStatue_c*)i_this)->initActionOrderGetDemo(); + UNUSED(param_2); + UNUSED(param_4); + + daObjWStatue_c* statue = static_cast(i_this); + + if (statue != NULL && param_3 != NULL && param_3 == dComIfGp_getLinkPlayer()) { + statue->initActionOrderGetDemo(); } } static void* s_sh_sub(void* param_1, void* param_2) { + UNUSED(param_2); + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_E_SH) { return param_1; } @@ -409,7 +422,7 @@ void daObjWStatue_c::effectStop() { } int daObjWStatue_c::execute() { - static daObjWStatue_c::demoFunc l_demoFunc[5] = { + static const daObjWStatue_c::demoFunc l_demoFunc[5] = { &daObjWStatue_c::actionWait, &daObjWStatue_c::actionOrderGetDemo, &daObjWStatue_c::actionGetDemo, &daObjWStatue_c::actionSwOnWait, &daObjWStatue_c::actionBoomerangCarry, diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp index 5e54f21ea4d..207a20d68fd 100644 --- a/src/f_pc/f_pc_create_req.cpp +++ b/src/f_pc/f_pc_create_req.cpp @@ -5,6 +5,7 @@ #include "f_pc/f_pc_create_req.h" #include "SSystem/SComponent/c_malloc.h" +#include "SSystem/SComponent/c_phase.h" #include "f_pc/f_pc_base.h" #include "f_pc/f_pc_create_iter.h" #include "f_pc/f_pc_deletor.h" diff --git a/src/f_pc/f_pc_fstcreate_req.cpp b/src/f_pc/f_pc_fstcreate_req.cpp index 08ff536ec70..8722b96f063 100644 --- a/src/f_pc/f_pc_fstcreate_req.cpp +++ b/src/f_pc/f_pc_fstcreate_req.cpp @@ -7,6 +7,7 @@ #include "f_pc/f_pc_base.h" #include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_load.h" +#include "SSystem/SComponent/c_phase.h" int fpcFCtRq_Do(fast_create_request* i_createReq) { if (i_createReq->create_func != NULL && diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index 9f56391dd23..4d4c7784aee 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -8,8 +8,21 @@ #include "f_pc/f_pc_node.h" #include "f_pc/f_pc_manager.h" #include "f_pc/f_pc_debug_sv.h" +#include "SSystem/SComponent/c_phase.h" #include +typedef struct standard_create_request_class { + /* 0x00 */ create_request base; + /* 0x48 */ request_of_phase_process_class phase_request; + /* 0x50 */ s16 process_name; + /* 0x54 */ void* process_append; + /* 0x58 */ stdCreateFunc create_post_method; + /* 0x5C */ void* unk_0x5C; +#if DEBUG + /* 0x60 */ int unk_0x60; +#endif +} standard_create_request_class; + int fpcSCtRq_phase_Load(standard_create_request_class* i_request) { int ret = fpcLd_Load(i_request->process_name); From 06ebc176c25f71ce2268755d6c0890a36e78d041 Mon Sep 17 00:00:00 2001 From: Luzagar <40547781+Luzagar@users.noreply.github.com> Date: Sat, 28 Feb 2026 21:25:31 +0100 Subject: [PATCH 09/35] E rd documentation (#3106) * some e_rd doc * fix build * more doc * more doc * fix debug * fix debug for real * change some name * some rename * rename --- include/d/actor/d_a_e_rd.h | 120 +- src/d/actor/d_a_e_rd.cpp | 5515 ++++++++++++++++++----------------- src/d/actor/d_a_e_rdb.cpp | 4 +- src/d/actor/d_a_e_wb.cpp | 64 +- src/d/actor/d_a_obj_key.cpp | 4 +- 5 files changed, 2854 insertions(+), 2853 deletions(-) diff --git a/include/d/actor/d_a_e_rd.h b/include/d/actor/d_a_e_rd.h index 90a3fec56a3..e4d38a4b0bf 100644 --- a/include/d/actor/d_a_e_rd.h +++ b/include/d/actor/d_a_e_rd.h @@ -21,75 +21,75 @@ class e_rd_class { public: e_rd_class(); - /* 0x0000 */ fopEn_enemy_c actor; - /* 0x05AC */ request_of_phase_process_class mPhase; - /* 0x05B4 */ s16 mMode; - /* 0x05B6 */ u8 field_0x5b6; - /* 0x05B7 */ u8 field_0x5b7; - /* 0x05B8 */ u8 field_0x5b8; + /* 0x0000 */ fopEn_enemy_c enemy; + /* 0x05AC */ request_of_phase_process_class phase; + /* 0x05B4 */ s16 mode; + /* 0x05B6 */ u8 arg0; + /* 0x05B7 */ u8 arg1; + /* 0x05B8 */ u8 arg2; /* 0x05B9 */ u8 field_0x5b9; /* 0x05BA */ u8 field_0x5ba; /* 0x05BB */ u8 field_0x5bb; - /* 0x05BC */ u8 field_0x5bc; + /* 0x05BC */ u8 weapon_type; /* 0x05BD */ s8 field_0x5bd; /* 0x05C0 */ cXyz field_0x5c0; - /* 0x05CC */ s16 field_0x5cc; - /* 0x05D0 */ mDoExt_McaMorfSO* mpModelMorf; - /* 0x05D4 */ Z2CreatureEnemy mSound; - /* 0x0678 */ char* mResName; - /* 0x067C */ int mAnmID; + /* 0x05CC */ s16 target_ya; + /* 0x05D0 */ mDoExt_McaMorfSO* anm_p; + /* 0x05D4 */ Z2CreatureEnemy sound; + /* 0x0678 */ char* resName; + /* 0x067C */ int anm; /* 0x0680 */ int field_0x680; /* 0x0684 */ dJntCol_c mJntCol; - /* 0x0694 */ J3DModel* field_0x694; - /* 0x0698 */ mDoExt_McaMorfSO* mpMorfBowAnm; + /* 0x0694 */ J3DModel* arrow; + /* 0x0698 */ mDoExt_McaMorfSO* bow_anm; /* 0x069C */ mDoExt_McaMorf* mpMorfHornAnm; /* 0x06A0 */ s8 field_0x6a0; /* 0x06A4 */ cXyz field_0x6a4; /* 0x06B0 */ cXyz field_0x6b0; /* 0x06BC */ csXyz field_0x6bc; - /* 0x06C2 */ s8 field_0x6c2; + /* 0x06C2 */ s8 run_flag; /* 0x06C3 */ u8 field_0x6c3; - /* 0x06C4 */ J3DModel* mpEyeModels[2]; + /* 0x06C4 */ J3DModel* eye_model[2]; /* 0x06CC */ f32 field_0x6cc; /* 0x06D0 */ f32 field_0x6d0; - /* 0x06D4 */ J3DModel* mpBossArmorParts[14]; + /* 0x06D4 */ J3DModel* armor_boss_part[14]; /* 0x070C */ s8 field_0x70c[14]; /* 0x071C */ cXyz field_0x71c[14]; /* 0x07C4 */ cXyz field_0x7c4[14]; /* 0x086C */ csXyz field_0x86c[14]; - /* 0x08C0 */ u32 field_0x8c0[14][3]; + /* 0x08C0 */ u32 armor_break_eff[14][3]; /* 0x0968 */ s8 field_0x968; /* 0x096C */ f32 field_0x96c; - /* 0x0970 */ s16 field_0x970; - /* 0x0972 */ s16 mAction; - /* 0x0974 */ s16 field_0x974; - /* 0x0978 */ f32 mPlayerDistance; - /* 0x097C */ s16 mPlayerAngleY; - /* 0x0980 */ f32 field_0x980; - /* 0x0984 */ f32 field_0x984; - /* 0x0988 */ u32 mShadowKey; - /* 0x098C */ fpc_ProcID mWbActorID; - /* 0x0990 */ s16 field_0x990[4]; - /* 0x0998 */ s16 field_0x998; + /* 0x0970 */ s16 counter; + /* 0x0972 */ s16 action; + /* 0x0974 */ s16 prev_action; + /* 0x0978 */ f32 dis; + /* 0x097C */ s16 angleY; + /* 0x0980 */ f32 attack_range; + /* 0x0984 */ f32 waterY; + /* 0x0988 */ u32 shadow_key; + /* 0x098C */ fpc_ProcID boar_id; + /* 0x0990 */ s16 timer[4]; + /* 0x0998 */ s16 damage_timer; /* 0x099A */ s16 field_0x99a; - /* 0x099C */ s16 field_0x99c; - /* 0x099E */ s16 field_0x99e; + /* 0x099C */ s16 yagura_timer; + /* 0x099E */ s16 attack_timer; /* 0x09A0 */ s8 field_0x9a0; - /* 0x09A1 */ s8 field_0x9a1; + /* 0x09A1 */ s8 look_timer; /* 0x09A2 */ s8 field_0x9a2; - /* 0x09A3 */ s8 field_0x9a3; + /* 0x09A3 */ s8 arrow_flag; /* 0x09A4 */ s8 field_0x9a4; /* 0x09A5 */ u8 field_0x9a5; - /* 0x09A6 */ s16 field_0x9a6; + /* 0x09A6 */ s16 bow_shake_timer; /* 0x09A8 */ s16 field_0x9a8; /* 0x09AA */ u8 field_0x9aa; /* 0x09AB */ s8 field_0x9ab; /* 0x09AC */ s8 field_0x9ac; /* 0x09AD */ s8 field_0x9ad; /* 0x09B0 */ cXyz field_0x9b0; - /* 0x09BC */ s8 field_0x9bc; + /* 0x09BC */ s8 ride_mode; /* 0x09BD */ s8 field_0x9bd; - /* 0x09BE */ s8 field_0x9be; + /* 0x09BE */ s8 boar_stand; /* 0x09BF */ u8 field_0x9bf; /* 0x09C0 */ f32 field_0x9c0; /* 0x09C4 */ f32 field_0x9c4; @@ -99,16 +99,16 @@ class e_rd_class { /* 0x09CC */ s16 field_0x9cc; /* 0x09CE */ s16 field_0x9ce; /* 0x09D0 */ s16 field_0x9d0; - /* 0x09D4 */ cXyz field_0x9d4; + /* 0x09D4 */ cXyz eye; /* 0x09E0 */ cXyz field_0x9e0; // unused, dbg offset 0xa18 - /* 0x09EC */ f32 field_0x9ec; + /* 0x09EC */ f32 jump_z; /* 0x09F0 */ f32 field_0x9f0; /* 0x09F4 */ s16 field_0x9f4; /* 0x09F6 */ s16 field_0x9f6; - /* 0x09F8 */ s8 field_0x9f8; + /* 0x09F8 */ s8 damage_flag; /* 0x09FC */ cXyz field_0x9fc; // unused, dbg offset 0xa34 /* 0x0A08 */ u8 field_0xa08[0x0A0C - 0x0A08]; - /* 0x0A0C */ csXyz field_0xa0c; + /* 0x0A0C */ csXyz jump_angle; /* 0x0A12 */ csXyz field_0xa12; /* 0x0A18 */ csXyz field_0xa18; /* 0x0A1E */ s8 field_0xa1e; @@ -139,37 +139,37 @@ class e_rd_class { /* 0x0AF8 */ s16 field_0xaf8; /* 0x0AFA */ s8 field_0xafa; /* 0x0AFB */ s8 field_0xafb; - /* 0x0AFC */ dPath* mPath; + /* 0x0AFC */ dPath* path; /* 0x0B00 */ s8 field_0xb00; - /* 0x0B01 */ s8 field_0xb01; - /* 0x0B04 */ dBgS_AcchCir mAcchCir; - /* 0x0B44 */ dBgS_ObjAcch mObjAcch; + /* 0x0B01 */ s8 path_dir; + /* 0x0B04 */ dBgS_AcchCir AcchCir; + /* 0x0B44 */ dBgS_ObjAcch ObjAcch; /* 0x0D1C */ dCcD_Stts mStts; - /* 0x0D58 */ dCcD_Sph field_0xd58[3]; - /* 0x1100 */ dCcD_Sph field_0x1100; - /* 0x1238 */ dCcU_AtInfo mAtInfo; - /* 0x125C */ u8 field_0x125c; + /* 0x0D58 */ dCcD_Sph cc_sph[3]; + /* 0x1100 */ dCcD_Sph at_sph; + /* 0x1238 */ dCcU_AtInfo AtInfo; + /* 0x125C */ u8 hio_set; /* 0x125D */ s8 field_0x125d; /* 0x1260 */ u32 field_0x1260; /* 0x1264 */ u32 field_0x1264; - /* 0x1268 */ u32 field_0x1268[3]; - /* 0x1274 */ u32 field_0x1274[2]; + /* 0x1268 */ u32 enemy_downWtrA[3]; + /* 0x1274 */ u32 fire_eff[2]; /* 0x127C */ cXyz field_0x127c; /* 0x1288 */ cXyz field_0x1288; /* 0x1294 */ s8 field_0x1294; - /* 0x1295 */ s8 field_0x1295; + /* 0x1295 */ s8 one_hit_kill; /* 0x1296 */ s8 field_0x1296; /* 0x1297 */ s8 field_0x1297; /* 0x1298 */ s8 field_0x1298; /* 0x1299 */ u8 field_0x1299; - /* 0x129A */ s8 mBossMode; // 1: Eldin Field, 2 Eldin Bridge, 3 Lake Hylia Bridge, 4 ??? + /* 0x129A */ s8 actor_set; // 1: Eldin Field, 2 Eldin Bridge, 3 Lake Hylia Bridge, 4 ??? /* 0x129B */ u8 field_0x129b; /* 0x129C */ s8 field_0x129c; - /* 0x12A0 */ int field_0x12a0; - /* 0x12A4 */ s16 mDemoMode; - /* 0x12A6 */ s16 field_0x12a6; - /* 0x12A8 */ cXyz mDemoCamEye; - /* 0x12B4 */ cXyz mDemoCamCenter; + /* 0x12A0 */ int sw; + /* 0x12A4 */ s16 demo_mode; + /* 0x12A6 */ s16 demo_timer; + /* 0x12A8 */ cXyz demo_cam_eye; + /* 0x12B4 */ cXyz demo_cam_center; /* 0x12C0 */ cXyz field_0x12c0; /* 0x12CC */ cXyz field_0x12cc; /* 0x12D8 */ cXyz field_0x12d8; @@ -177,11 +177,11 @@ class e_rd_class { /* 0x12F0 */ cXyz field_0x12f0; /* 0x12FC */ u8 field_0x12fc[0x1300 - 0x12fc]; /* 0x1300 */ f32 field_0x1300; - /* 0x1304 */ u8 mBlureRate; - /* 0x1308 */ f32 mDemoCamFovy; + /* 0x1304 */ u8 blurRate; + /* 0x1308 */ f32 demo_cam_zoom; /* 0x130C */ f32 field_0x130c; /* 0x1310 */ u8 field_0x1310[0x131c - 0x1310]; - /* 0x131C */ dMsgFlow_c mMsgFlow; + /* 0x131C */ dMsgFlow_c MsgFlow; }; STATIC_ASSERT(sizeof(e_rd_class) == 0x1368); diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index 585cdcb63f5..884ed1759dc 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -57,7 +57,7 @@ class daE_RD_HIO_c : public JORReflexible { /* 0x39 */ u8 invulnerable; // 不死身 (Invulnerability) /* 0x3A */ u8 eye_polygon; // 目ポリゴン (Eye polygon) /* 0x3B */ u8 one_hit_kill; // 一撃必殺 (One hit kill) - /* 0x3C */ f32 field_0x3c; // 一騎（ダ）サイズ (One-man army (Da) size) + /* 0x3C */ f32 ikki_boss_size; // 一騎（ダ）サイズ (One-man army (Da) size) /* 0x40 */ f32 jump_g; // 飛びＧ (Jump G) /* 0x44 */ f32 jump_z; // 飛びＺ (Jump Z) /* 0x48 */ f32 jump_z_suspended; // 飛びＺ（騎乗停止） (Jump Z (Stop riding)) @@ -222,7 +222,7 @@ daE_RD_HIO_c::daE_RD_HIO_c() { invulnerable = 0; eye_polygon = 1; one_hit_kill = 0; - field_0x3c = 75.0f; + ikki_boss_size = 75.0f; jump_z_suspended = 5.0f; jump_z = 10.0f; jump_y = 33.0f; @@ -277,47 +277,47 @@ void daE_RD_HIO_c::genMessage(JORMContext* ctext) { // one-hit kill ctext->genCheckBox("一撃必殺", &one_hit_kill, 0x1); // ikki (da) size - ctext->genSlider("一騎（ダ）サイズ", &field_0x3c, 0.0f, 150.0f); + ctext->genSlider("一騎（ダ）サイズ", &ikki_boss_size, 0.0f, 150.0f); } #endif -static fopAc_ac_c* get_pla(fopAc_ac_c* a_this) { - fopAc_ac_c* player = dComIfGp_getPlayer(0); +static fopAc_ac_c* get_pla(fopAc_ac_c* actor) { + fopAc_ac_c* pla = dComIfGp_getPlayer(0); // "coach" refers to the Ilia/Telma transport wagon: - fopAc_ac_c* actor = fopAcM_SearchByName(PROC_NPC_COACH); + fopAc_ac_c* coach = fopAcM_SearchByName(PROC_NPC_COACH); - if (actor == NULL) { + if (coach == NULL) { return dComIfGp_getPlayer(0); } - f32 link_rd_x_diff, coach_rd_x_diff, link_rd_z_diff, coach_rd_z_diff; - link_rd_x_diff = player->current.pos.x - a_this->current.pos.x; - link_rd_z_diff = player->current.pos.z - a_this->current.pos.z; - coach_rd_x_diff = actor->current.pos.x - a_this->current.pos.x; - coach_rd_z_diff = actor->current.pos.z - a_this->current.pos.z; + f32 pla_x, coach_x, pla_z, coach_z; + pla_x = pla->current.pos.x - actor->current.pos.x; + pla_z = pla->current.pos.z - actor->current.pos.z; + coach_x = coach->current.pos.x - actor->current.pos.x; + coach_z = coach->current.pos.z - actor->current.pos.z; // If the XZ-dist of Link is further than the coach, then focus the coach. - if (SQUARE(link_rd_x_diff) + SQUARE(link_rd_z_diff) > SQUARE(coach_rd_x_diff) + SQUARE(coach_rd_z_diff)) { - return actor; + if (SQUARE(pla_x) + SQUARE(pla_z) > SQUARE(coach_x) + SQUARE(coach_z)) { + return coach; } return dComIfGp_getPlayer(0); } -static void anm_init(e_rd_class* i_this, int i_anmID, f32 i_morf, u8 i_mode, f32 i_speed) { +static void anm_init(e_rd_class* i_this, int i_no, f32 i_morf, u8 i_mode, f32 i_speed) { if (i_this->field_0x680 == 0) { - if (i_this->mBossMode != 0) { - if (i_anmID < 73) { - i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_rdb", i_anmID), + if (i_this->actor_set != 0) { + if (i_no < 73) { + i_this->anm_p->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_rdb", i_no), i_mode, i_morf, i_speed, 0.0f, -1.0f); - i_this->mAnmID = i_anmID; + i_this->anm = i_no; } } else { - i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, i_anmID), + i_this->anm_p->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, i_no), i_mode, i_morf, i_speed, 0.0f, -1.0f); - i_this->mAnmID = i_anmID; + i_this->anm = i_no; - if (i_anmID == BCK_RD_KYORO2) { - i_this->mpModelMorf->setFrame(cM_rndF(30.0f)); + if (i_no == BCK_RD_KYORO2) { + i_this->anm_p->setFrame(cM_rndF(30.0f)); } } } @@ -332,11 +332,11 @@ static void horn_anm_init(e_rd_class* i_this, int i_anmID, f32 i_morf, u8 i_mode static int nodeCallBack(J3DJoint* i_joint, int param_2) { if (param_2 == 0) { - J3DJoint* my_joint = i_joint; - int jointNo = my_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jointNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); e_rd_class* i_this = (e_rd_class*)model->getUserArea(); - fopEn_enemy_c* a_this = &i_this->actor; + fopEn_enemy_c* enemy = &i_this->enemy; if (i_this != NULL) { MTXCopy(model->getAnmMtx(jointNo), *calc_mtx); if (jointNo == JNT_KOSI) { @@ -420,11 +420,11 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) { static int nodeCallBack_B(J3DJoint* i_joint, int param_2) { if (param_2 == 0) { - J3DJoint* my_joint = i_joint; - int jointNo = my_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jointNo = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); e_rd_class* i_this = (e_rd_class*)model->getUserArea(); - fopEn_enemy_c* a_this = &i_this->actor; + fopEn_enemy_c* enemy = &i_this->enemy; if (i_this != NULL) { MTXCopy(model->getAnmMtx(jointNo), *calc_mtx); @@ -448,7 +448,7 @@ static int nodeCallBack_bow(J3DJoint* i_joint, int param_2) { int jointNo = my_joint->getJntNo(); J3DModel* model = j3dSys.getModel(); e_rd_class* i_this = (e_rd_class*)model->getUserArea(); - fopEn_enemy_c* a_this = &i_this->actor; + fopEn_enemy_c* enemy = &i_this->enemy; if (i_this != NULL && i_this->field_0x9a8 != 0) { MTXCopy(model->getAnmMtx(jointNo), *calc_mtx); cMtx_ZrotM(*calc_mtx, i_this->field_0x9a8); @@ -461,7 +461,7 @@ static int nodeCallBack_bow(J3DJoint* i_joint, int param_2) { } static int daE_RD_Draw(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; J3DModel* model; J3DMaterial* matNode_p; J3DModelData* model_data; @@ -471,11 +471,11 @@ static int daE_RD_Draw(e_rd_class* i_this) { return 1; } - model = i_this->mpModelMorf->getModel(); - g_env_light.settingTevStruct(0, &a_this->current.pos, &a_this->tevStr); - g_env_light.setLightTevColorType_MAJI(model, &a_this->tevStr); + model = i_this->anm_p->getModel(); + g_env_light.settingTevStruct(0, &enemy->current.pos, &enemy->tevStr); + g_env_light.setLightTevColorType_MAJI(model, &enemy->tevStr); - if (i_this->mBossMode == 0 && i_this->field_0x968 != 0) { + if (i_this->actor_set == 0 && i_this->field_0x968 != 0) { model_data = model->getModelData(); for (u16 i = 0; i < model_data->getMaterialNum(); i++) { J3DMaterial* mat_node_p = model_data->getMaterialNodePointer(i); @@ -485,16 +485,16 @@ static int daE_RD_Draw(e_rd_class* i_this) { } } - if (i_this->mBossMode == 3) { + if (i_this->actor_set == 3) { J3DShape* shape = model->getModelData()->getMaterialNodePointer(3)->getShape(); if (shape != NULL) { shape->hide(); } } - i_this->mpModelMorf->entryDL(); + i_this->anm_p->entryDL(); - if (i_this->mBossMode == 0 && i_this->field_0x968 != 0) { + if (i_this->actor_set == 0 && i_this->field_0x968 != 0) { J3DModelData* modelData = model->getModelData(); for (u16 i = 0; i < modelData->getMaterialNum(); i++) { matNode_p = modelData->getMaterialNodePointer(i); @@ -504,37 +504,37 @@ static int daE_RD_Draw(e_rd_class* i_this) { } } - if (i_this->field_0x5bc == 1) { - g_env_light.setLightTevColorType_MAJI(i_this->field_0x694, &a_this->tevStr); - mDoExt_modelUpdateDL(i_this->field_0x694); - } else if (i_this->field_0x5bc >= 2) { - g_env_light.setLightTevColorType_MAJI(i_this->mpMorfBowAnm->getModel(), &a_this->tevStr); - i_this->mpMorfBowAnm->entryDL(); + if (i_this->weapon_type == 1) { + g_env_light.setLightTevColorType_MAJI(i_this->arrow, &enemy->tevStr); + mDoExt_modelUpdateDL(i_this->arrow); + } else if (i_this->weapon_type >= 2) { + g_env_light.setLightTevColorType_MAJI(i_this->bow_anm->getModel(), &enemy->tevStr); + i_this->bow_anm->entryDL(); if (i_this->field_0x9a2 != 0) { - g_env_light.setLightTevColorType_MAJI(i_this->field_0x694, &a_this->tevStr); - mDoExt_modelUpdateDL(i_this->field_0x694); + g_env_light.setLightTevColorType_MAJI(i_this->arrow, &enemy->tevStr); + mDoExt_modelUpdateDL(i_this->arrow); } } - if (i_this->mBossMode != 0) { + if (i_this->actor_set != 0) { for (int i = 0; i < 14; i++) { - if (i_this->mpBossArmorParts[i] != NULL) { - g_env_light.setLightTevColorType_MAJI(i_this->mpBossArmorParts[i], &a_this->tevStr); - mDoExt_modelUpdateDL(i_this->mpBossArmorParts[i]); + if (i_this->armor_boss_part[i] != NULL) { + g_env_light.setLightTevColorType_MAJI(i_this->armor_boss_part[i], &enemy->tevStr); + mDoExt_modelUpdateDL(i_this->armor_boss_part[i]); } } if (i_this->field_0x6a0 != 0) { - g_env_light.setLightTevColorType_MAJI(i_this->mpMorfHornAnm->getModel(), &a_this->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->mpMorfHornAnm->getModel(), &enemy->tevStr); i_this->mpMorfHornAnm->entryDL(); } } if (i_this->field_0x1297 != 0) { for (int i = 0; i < 2; i++) { - g_env_light.setLightTevColorType_MAJI(i_this->mpEyeModels[i], &a_this->tevStr); - model_data = i_this->mpEyeModels[i]->getModelData(); + g_env_light.setLightTevColorType_MAJI(i_this->eye_model[i], &enemy->tevStr); + model_data = i_this->eye_model[i]->getModelData(); for (u16 j = 0; j < model_data->getMaterialNum(); j++) { matNode_p = model_data->getMaterialNodePointer(j); matNode_p->getTevColor(1)->r = 0xFF; @@ -542,26 +542,26 @@ static int daE_RD_Draw(e_rd_class* i_this) { matNode_p->getTevColor(1)->b = 0x18; } - mDoExt_modelUpdateDL(i_this->mpEyeModels[i]); + mDoExt_modelUpdateDL(i_this->eye_model[i]); } } - if (i_this->field_0x9bc != 2) { - cXyz sp44; - sp44.set(a_this->current.pos.x, a_this->current.pos.y + 100.0f, a_this->current.pos.z); - i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &sp44, - 1200.0f + BREG_F(19), 0.0f, a_this->current.pos.y, - i_this->mObjAcch.GetGroundH(), i_this->mObjAcch.m_gnd, - &i_this->actor.tevStr, 0, 1.0f, + if (i_this->ride_mode != 2) { + cXyz pos; + pos.set(enemy->current.pos.x, enemy->current.pos.y + 100.0f, enemy->current.pos.z); + i_this->shadow_key = dComIfGd_setShadow(i_this->shadow_key, 1, model, &pos, + 1200.0f + BREG_F(19), 0.0f, enemy->current.pos.y, + i_this->ObjAcch.GetGroundH(), i_this->ObjAcch.m_gnd, + &i_this->enemy.tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); - if (i_this->field_0x5bc == 1) { - dComIfGd_addRealShadow(i_this->mShadowKey, i_this->field_0x694); + if (i_this->weapon_type == 1) { + dComIfGd_addRealShadow(i_this->shadow_key, i_this->arrow); } } - if (i_this->field_0x5b7 == 14) { - if (i_this->mBlureRate > 2) { - mDoGph_gInf_c::setBlureRate(i_this->mBlureRate); + if (i_this->arg1 == 14) { + if (i_this->blurRate > 2) { + mDoGph_gInf_c::setBlureRate(i_this->blurRate); mDoGph_gInf_c::onBlure(); } else { mDoGph_gInf_c::offBlure(); @@ -572,7 +572,7 @@ static int daE_RD_Draw(e_rd_class* i_this) { } static BOOL other_bg_check(e_rd_class* i_this, fopAc_ac_c* i_other) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; dBgS_LinChk lin_chk; cXyz unused_vec; cXyz start; @@ -580,10 +580,10 @@ static BOOL other_bg_check(e_rd_class* i_this, fopAc_ac_c* i_other) { end = i_other->current.pos; end.y += 130.0f; - start = a_this->current.pos; - start.y = a_this->eyePos.y; + start = enemy->current.pos; + start.y = enemy->eyePos.y; - lin_chk.Set(&start, &end, a_this); + lin_chk.Set(&start, &end, enemy); if (dComIfG_Bgsp().LineCross(&lin_chk)) { if (i_other != dComIfG_Bgsp().GetActorPointer(lin_chk)) { return TRUE; @@ -618,15 +618,15 @@ static BOOL otoCheck(fopAc_ac_c* i_actor, f32 param_2) { } static BOOL pl_pass_check(e_rd_class* i_this, f32 param_2) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - fopAc_ac_c* actor = get_pla(a_this); - cXyz sp18, sp24; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + fopAc_ac_c* actor = get_pla(enemy); + cXyz mae, ato; - sp18 = a_this->current.pos - actor->current.pos; + mae = enemy->current.pos - actor->current.pos; cMtx_YrotS(*calc_mtx, -(actor->shape_angle.y)); - MtxPosition(&sp18, &sp24); + MtxPosition(&mae, &ato); - if (sp24.z > param_2) { + if (ato.z > param_2) { return TRUE; } @@ -671,7 +671,7 @@ static dBomb_c* search_bomb(e_rd_class* i_this, int param_1) { return NULL; } - fopAc_ac_c* a_this = &i_this->actor; + fopAc_ac_c* actor = &i_this->enemy; dBomb_c* bomb; target_info_count = 0; @@ -689,35 +689,35 @@ static dBomb_c* search_bomb(e_rd_class* i_this, int param_1) { f32 threshold = 100.0f; f32 compare_val_f = 1500.0f; if (target_info_count != 0) { - cXyz vec1, vec2, vec3; + cXyz mae, vec, ato; for (int i = 0; i < target_info_count;) { bomb = (dBomb_c*)target_info[i]; - vec1.x = bomb->current.pos.x - a_this->eyePos.x; - vec1.y = 50.0f + bomb->current.pos.y - a_this->eyePos.y; - vec1.z = bomb->current.pos.z - a_this->eyePos.z; - vec2.x = bomb->current.pos.x - a_this->current.pos.x; - vec2.z = bomb->current.pos.z - a_this->current.pos.z; - f32 dist1 = JMAFastSqrt(SQUARE(vec1.x) + SQUARE(vec1.z)); - f32 dist2 = JMAFastSqrt(SQUARE(vec2.x) + SQUARE(vec2.z)); - if (dist1 < threshold && !(dist2 > i_this->mPlayerDistance + 30.0f) + mae.x = bomb->current.pos.x - actor->eyePos.x; + mae.y = 50.0f + bomb->current.pos.y - actor->eyePos.y; + mae.z = bomb->current.pos.z - actor->eyePos.z; + vec.x = bomb->current.pos.x - actor->current.pos.x; + vec.z = bomb->current.pos.z - actor->current.pos.z; + f32 dist1 = JMAFastSqrt(SQUARE(mae.x) + SQUARE(mae.z)); + f32 dist2 = JMAFastSqrt(SQUARE(vec.x) + SQUARE(vec.z)); + if (dist1 < threshold && !(dist2 > i_this->dis + 30.0f) && (!other_bg_check(i_this, bomb) || !param_1)) { if (param_1) { - f32 abs_res = fabsf(50.0f + bomb->current.pos.y - a_this->eyePos.y); - if (abs_res <= 300.0f) { - s16 ang_y = a_this->shape_angle.y - cM_atan2s(vec1.x, vec1.z); - if (ang_y < 0) { - ang_y = (-1 * ang_y); + f32 abs_r = fabsf(50.0f + bomb->current.pos.y - actor->eyePos.y); + if (abs_r <= 300.0f) { + s16 angleY = actor->shape_angle.y - cM_atan2s(mae.x, mae.z); + if (angleY < 0) { + angleY = (-1 * angleY); } - if ((u16)ang_y < 20000) { + if ((u16)angleY < 20000) { return bomb; } - cMtx_YrotS(*calc_mtx, -a_this->shape_angle.y); - MtxPosition(&vec1, &vec3); - if (fabsf(vec3.x) < 500.0f && fabsf(vec3.y) < 300.0f - && vec3.z > -125.0f && vec3.z < 500.0f) + cMtx_YrotS(*calc_mtx, -actor->shape_angle.y); + MtxPosition(&mae, &ato); + if (fabsf(ato.x) < 500.0f && fabsf(ato.y) < 300.0f + && ato.z > -125.0f && ato.z < 500.0f) { return bomb; } @@ -744,19 +744,19 @@ static dBomb_c* search_bomb(e_rd_class* i_this, int param_1) { } static BOOL way_bg_check(e_rd_class* i_this, f32 param_2) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; dBgS_LinChk lin_chk; - cXyz sp98, start, end; + cXyz mae, start, ato; - start = a_this->current.pos; + start = enemy->current.pos; start.y += 50.0f; - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - sp98.x = 0.0f; - sp98.y = 50.0f; - sp98.z = param_2; - MtxPosition(&sp98, &end); - end += a_this->current.pos; - lin_chk.Set(&start, &end, a_this); + cMtx_YrotS(*calc_mtx, enemy->shape_angle.y); + mae.x = 0.0f; + mae.y = 50.0f; + mae.z = param_2; + MtxPosition(&mae, &ato); + ato += enemy->current.pos; + lin_chk.Set(&start, &ato, enemy); if (dComIfG_Bgsp().LineCross(&lin_chk)) { return TRUE; @@ -766,58 +766,58 @@ static BOOL way_bg_check(e_rd_class* i_this, f32 param_2) { } static void ride_off(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + e_wb_class* boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); - if (bullbo != NULL) { - UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be, u16); - i_this->field_0x9be = 0; + if (boar != NULL) { + UNSET_FLAG(boar->mStatusFlags, i_this->boar_stand, u16); + i_this->boar_stand = 0; - if (bullbo->mActionID != 22 && bullbo->mActionID != 23 && bullbo->mActionID != 24) { - if (bullbo->mActionID == 1) { - if ((bullbo->mStatusFlags & 3) != 0) { - bullbo->mActionID = 6; + if (boar->mActionID != 22 && boar->mActionID != 23 && boar->mActionID != 24) { + if (boar->mActionID == 1) { + if ((boar->mStatusFlags & 3) != 0) { + boar->mActionID = 6; } else { - bullbo->mActionID = 0; + boar->mActionID = 0; } - bullbo->mActionMode = 0; - } else if (bullbo->mActionID == 21) { - bullbo->mActionMode = 0; - } else if ((bullbo->mStatusFlags & 1) == 0) { - if (bullbo->mActionID == 6 && (bullbo->mActionMode == 2 || bullbo->mActionMode == 3)) { - bullbo->mActionMode = 1; + boar->mActionMode = 0; + } else if (boar->mActionID == 21) { + boar->mActionMode = 0; + } else if ((boar->mStatusFlags & 1) == 0) { + if (boar->mActionID == 6 && (boar->mActionMode == 2 || boar->mActionMode == 3)) { + boar->mActionMode = 1; } else { - bullbo->mActionMode = 0; + boar->mActionMode = 0; } - bullbo->mActionID = 7; - bullbo->field_0x698[1] = cM_rndF(30.0f) + 80.0f; + boar->mActionID = 7; + boar->field_0x698[1] = cM_rndF(30.0f) + 80.0f; } } - a_this->current.angle.x = 0; - i_this->mWbActorID = -1; + enemy->current.angle.x = 0; + i_this->boar_id = -1; } - i_this->field_0x9bc = 0; - if (i_this->mpMorfBowAnm != NULL) { - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 10), 0, + i_this->ride_mode = 0; + if (i_this->bow_anm != NULL) { + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); - i_this->mpMorfBowAnm->setFrame(10.0f); + i_this->bow_anm->setFrame(10.0f); } - a_this->home.pos = a_this->current.pos; + enemy->home.pos = enemy->current.pos; } static void* s_wb_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { - e_wb_class* wild_boar_p = (e_wb_class*) i_actor; + e_wb_class* boar = (e_wb_class*) i_actor; e_rd_class* i_this = (e_rd_class*)i_data; - if (wild_boar_p->mActionID != ACTION_DROP && wild_boar_p->mActionID != ACTION_DAMAGE - && wild_boar_p->mActionID != ACTION_A_DAMAGE && wild_boar_p->mActionID != ACTION_STAND) { - if (i_this->mBossMode == wild_boar_p->field_0x79d && - (data_80519230 != 0 || (wild_boar_p->mStatusFlags & 3) != 3) && target_info_count < 10) { + if (boar->mActionID != ACTION_DROP && boar->mActionID != ACTION_DAMAGE + && boar->mActionID != ACTION_A_DAMAGE && boar->mActionID != ACTION_STAND) { + if (i_this->actor_set == boar->field_0x79d && + (data_80519230 != 0 || (boar->mStatusFlags & 3) != 3) && target_info_count < 10) { target_info[target_info_count] = (fopAc_ac_c*)i_actor; target_info_count++; } @@ -828,7 +828,7 @@ static void* s_wb_sub(void* i_actor, void* i_data) { } static fpc_ProcID search_wb(e_rd_class* i_this, s16 param_2) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; target_info_count = 0; for (int i = 0; i < 10; i++) { @@ -842,39 +842,39 @@ static fpc_ProcID search_wb(e_rd_class* i_this, s16 param_2) { } fpcM_Search(s_wb_sub, i_this); - f32 fVar1 = 100.0f; + f32 dist = 100.0f; f32 fVar2 = 1500.0f; // Hyrule Field - Bridge of Eldin - if (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0 && fopAcM_GetRoomNo(a_this) == 0) { + if (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0 && fopAcM_GetRoomNo(enemy) == 0) { fVar2 = hREG_F(0) + 5000.0f; } if (target_info_count != 0) { - cXyz sp54, sp60; - fopAc_ac_c* bullbo; + cXyz vec, sp60; + fopAc_ac_c* actor; int i = 0; while (i < target_info_count) { - bullbo = (fopAc_ac_c*)target_info[i]; - sp54.x = bullbo->current.pos.x - a_this->eyePos.x; - sp54.y = (bullbo->current.pos.y + 50.0f) - a_this->eyePos.y; - sp54.z = bullbo->current.pos.z - a_this->eyePos.z; - if (JMAFastSqrt(sp54.x * sp54.x + sp54.z * sp54.z) < fVar1) { + actor = (fopAc_ac_c*)target_info[i]; + vec.x = actor->current.pos.x - enemy->eyePos.x; + vec.y = (actor->current.pos.y + 50.0f) - enemy->eyePos.y; + vec.z = actor->current.pos.z - enemy->eyePos.z; + if (JMAFastSqrt(SQUARE(vec.x) + SQUARE(vec.z)) < dist) { if (param_2 == 1) { - return fopAcM_GetID(bullbo); + return fopAcM_GetID(actor); } - s16 sVar1 = a_this->shape_angle.y - cM_atan2s(sp54.x, sp54.z); - if (sVar1 < param_2 && sVar1 > (s16)-param_2 && !other_bg_check(i_this, bullbo)) { - return fopAcM_GetID(bullbo); + s16 range = enemy->shape_angle.y - cM_atan2s(vec.x, vec.z); + if (range < param_2 && range > (s16)-param_2 && !other_bg_check(i_this, actor)) { + return fopAcM_GetID(actor); } } i++; if (i == target_info_count) { i = 0; - fVar1 += 100.0f; - if (fVar1 > fVar2) { + dist += 100.0f; + if (dist > fVar2) { return -1; } } @@ -887,54 +887,54 @@ static fpc_ProcID search_wb(e_rd_class* i_this, s16 param_2) { } static void wb_check(e_rd_class* i_this, s16 param_2) { - e_wb_class* bullbo; - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + e_wb_class* boar; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - if (desert_substage != 118 || fopAcM_GetRoomNo(a_this) != 1) { + if (desert_substage != 118 || fopAcM_GetRoomNo(enemy) != 1) { // Arbiter's Grounds Exterior - a.k.a. Bulblin camp // OR most other areas in the game. Except for (non-exhaustive): // 1. Outside Link's home // 2. Ordon Spring - i_this->mWbActorID = search_wb(i_this, param_2); - bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID); - if (bullbo != NULL) { + i_this->boar_id = search_wb(i_this, param_2); + boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); + if (boar != NULL) { if (desert_substage != 0) { - if (i_this->field_0x5bc != 1) { - if ((bullbo->mStatusFlags & 1) == 0) { + if (i_this->weapon_type != 1) { + if ((boar->mStatusFlags & 1) == 0) { return; } - } else if ((bullbo->mStatusFlags & 1) != 0) { + } else if ((boar->mStatusFlags & 1) != 0) { return; } } - i_this->mAction = ACTION_WB_SEARCH; - i_this->mMode = 0; + i_this->action = ACTION_WB_SEARCH; + i_this->mode = 0; - if ((bullbo->mStatusFlags & 1) == 0) { - bullbo->mStatusFlags |= (u16) 1; - i_this->field_0x9be = 1; - } else if ((bullbo->mStatusFlags & 2) == 0) { - bullbo->mStatusFlags |= (u16) 2; - i_this->field_0x9be = 2; + if ((boar->mStatusFlags & 1) == 0) { + boar->mStatusFlags |= (u16) 1; + i_this->boar_stand = 1; + } else if ((boar->mStatusFlags & 2) == 0) { + boar->mStatusFlags |= (u16) 2; + i_this->boar_stand = 2; } } } } static BOOL wb_init_ride(e_rd_class* i_this) { - i_this->mWbActorID = search_wb(i_this, 1); - e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID); - - if (bullbo != NULL) { - i_this->mAction = ACTION_WB_RIDE; - i_this->mMode = 0; - i_this->field_0x9bc = 2; - i_this->field_0x9be = i_this->field_0x5b6; - bullbo->mStatusFlags |= (s8)i_this->field_0x5b6; - bullbo->mActionID = 1; - - if (i_this->field_0x5bc != 0 && i_this->field_0x9be == 1) { + i_this->boar_id = search_wb(i_this, 1); + e_wb_class* boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); + + if (boar != NULL) { + i_this->action = ACTION_WB_RIDE; + i_this->mode = 0; + i_this->ride_mode = 2; + i_this->boar_stand = i_this->arg0; + boar->mStatusFlags |= (s8)i_this->arg0; + boar->mActionID = 1; + + if (i_this->weapon_type != 0 && i_this->boar_stand == 1) { i_this->field_0x5bd = 1; } @@ -945,9 +945,9 @@ static BOOL wb_init_ride(e_rd_class* i_this) { return FALSE; } -static BOOL pl_check(e_rd_class* i_this, f32 param_2, s16 param_3) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - fopAc_ac_c* actor = get_pla(a_this); +static BOOL pl_check(e_rd_class* i_this, f32 range, s16 angle) { + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + fopAc_ac_c* actor = get_pla(enemy); if ((desert_substage == 0 && dComIfGp_event_runCheck())) { return FALSE; @@ -959,18 +959,18 @@ static BOOL pl_check(e_rd_class* i_this, f32 param_2, s16 param_3) { } if (S_find != 0) { - param_2 = 10000.0f; + range = 10000.0f; } - if (i_this->mPlayerDistance < param_2) { - s16 sVar1 = a_this->shape_angle.y - i_this->mPlayerAngleY; - if (sVar1 < param_3 && sVar1 > (s16)-param_3 && !other_bg_check(i_this, actor)) { + if (i_this->dis < range) { + s16 target = enemy->shape_angle.y - i_this->angleY; + if (target < angle && target > (s16)-angle && !other_bg_check(i_this, actor)) { return TRUE; } for (int i = 0; i <= 2; i++) { - if (i_this->field_0xd58[i].ChkCoHit()) { - cCcD_Obj* hit_obj = i_this->field_0xd58[i].GetCoHitObj(); + if (i_this->cc_sph[i].ChkCoHit()) { + cCcD_Obj* hit_obj = i_this->cc_sph[i].GetCoHitObj(); if (daPy_getPlayerActorClass() == dCc_GetAc(hit_obj->GetAc())) { return TRUE; } @@ -982,28 +982,28 @@ static BOOL pl_check(e_rd_class* i_this, f32 param_2, s16 param_3) { } static dBomb_c* bomb_view_check(e_rd_class* i_this) { - fopEn_enemy_c* unused_p = &i_this->actor; + fopEn_enemy_c* unused_p = &i_this->enemy; return search_bomb(i_this, 1); } static dBomb_c* bomb_check(e_rd_class* i_this) { - fopEn_enemy_c* unused_p = &i_this->actor; + fopEn_enemy_c* unused_p = &i_this->enemy; return search_bomb(i_this, 0); } -static BOOL move_gake_check(e_rd_class* i_this, f32 param_2) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; +static BOOL move_gake_check(e_rd_class* i_this, f32 gake) { + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; dBgS_GndChk gnd_chk; - cXyz sp74, sp80; - - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - sp74.x = 0.0f; - sp74.y = 100.0f; - sp74.z = param_2; - MtxPosition(&sp74, &sp80); - sp80 += a_this->current.pos; - gnd_chk.SetPos(&sp80); - if ((a_this->current.pos.y - dComIfG_Bgsp().GroundCross(&gnd_chk)) > 300.0f) { + cXyz mae, ato; + + cMtx_YrotS(*calc_mtx, enemy->shape_angle.y); + mae.x = 0.0f; + mae.y = 100.0f; + mae.z = gake; + MtxPosition(&mae, &ato); + ato += enemy->current.pos; + gnd_chk.SetPos(&ato); + if ((enemy->current.pos.y - dComIfG_Bgsp().GroundCross(&gnd_chk)) > 300.0f) { return TRUE; } @@ -1011,42 +1011,42 @@ static BOOL move_gake_check(e_rd_class* i_this, f32 param_2) { } static BOOL way_check(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - cXyz spac; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + cXyz mae; // Hidden Village - if (strcmp(dComIfGp_getStartStageName(), "F_SP128") == 0 && a_this->current.pos.z < -8400.0f) { - spac.x = a_this->home.pos.x - a_this->current.pos.x; - spac.z = a_this->home.pos.z - a_this->current.pos.z; - i_this->field_0x5cc = cM_atan2s(spac.x, spac.z); + if (strcmp(dComIfGp_getStartStageName(), "F_SP128") == 0 && enemy->current.pos.z < -8400.0f) { + mae.x = enemy->home.pos.x - enemy->current.pos.x; + mae.z = enemy->home.pos.z - enemy->current.pos.z; + i_this->target_ya = cM_atan2s(mae.x, mae.z); return TRUE; } - cXyz start, end; - s16 sVar1 = cM_rndF(65535.0f); - f32 fVar1 = 1000.0f; - start = a_this->current.pos; + cXyz start, ato; + s16 angle = cM_rndF(65535.0f); + f32 z = 1000.0f; + start = enemy->current.pos; start.y += 50.0f; for (int i = 0; i < 5; i++) { for (int j = 0; j < 16; j++) { - cMtx_YrotS(*calc_mtx, sVar1); - spac.x = 0.0f; - spac.y = 0.0f; - spac.z = fVar1; - MtxPosition(&spac, &end); - end += start; + cMtx_YrotS(*calc_mtx, angle); + mae.x = 0.0f; + mae.y = 0.0f; + mae.z = z; + MtxPosition(&mae, &ato); + ato += start; dBgS_LinChk lin_chk; - lin_chk.Set(&start, &end, a_this); + lin_chk.Set(&start, &ato, enemy); if (dComIfG_Bgsp().LineCross(&lin_chk)) { - ANGLE_ADD(sVar1, 0x1000); + ANGLE_ADD(angle, 0x1000); } else { - i_this->field_0x5cc = sVar1; + i_this->target_ya = angle; return TRUE; } } - fVar1 -= 150.0f; + z -= 150.0f; } return FALSE; @@ -1054,20 +1054,20 @@ static BOOL way_check(e_rd_class* i_this) { static BOOL path_check(e_rd_class* i_this) { static u8 check_index[255]; - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; dBgS_LinChk lin_chk; cXyz start, end; - start = a_this->current.pos; + start = enemy->current.pos; start.y += WREG_F(0) + 10.0f; - dPnt* points = i_this->mPath->m_points; - for (int i = 0; i < i_this->mPath->m_num; i++, points++) { + dPnt* points = i_this->path->m_points; + for (int i = 0; i < i_this->path->m_num; i++, points++) { if (i < 0xFF) { end.x = points->m_position.x; end.y = points->m_position.y + 10.0f + WREG_F(1); end.z = points->m_position.z; - lin_chk.Set(&start, &end, a_this); + lin_chk.Set(&start, &end, enemy); if (!dComIfG_Bgsp().LineCross(&lin_chk)) { check_index[i] = 1; } else { @@ -1076,114 +1076,114 @@ static BOOL path_check(e_rd_class* i_this) { } } - f32 fVar2, fVar3, fVar4; - f32 fVar1 = 100.0f; - bool bVar1 = false; + f32 x, y, z; + f32 dist = 100.0f; + bool found = false; f32 reg_f27; // unused for (int i = 0; i < 100;) { - points = i_this->mPath->m_points; - for (int j = 0; j < i_this->mPath->m_num; j++, points++) { + points = i_this->path->m_points; + for (int j = 0; j < i_this->path->m_num; j++, points++) { if (j < 0xFF && check_index[j] != 0) { - fVar2 = a_this->current.pos.x - points->m_position.x; - fVar3 = a_this->current.pos.y - points->m_position.y; - fVar4 = a_this->current.pos.z - points->m_position.z; - if (JMAFastSqrt(fVar2 * fVar2 + fVar3 * fVar3 + fVar4 * fVar4) < fVar1) { + x = enemy->current.pos.x - points->m_position.x; + y = enemy->current.pos.y - points->m_position.y; + z = enemy->current.pos.z - points->m_position.z; + if (JMAFastSqrt(x * x + y * y + z * z) < dist) { i_this->field_0xb00 = j; - bVar1 = true; + found = true; break; } } } - if (bVar1) { + if (found) { break; } ++i; - reg_f27 = fVar1 += 50.0f; + reg_f27 = dist += 50.0f; } - if (!bVar1) { + if (!found) { return FALSE; } if (cM_rndF(1.0f) < 0.5f) { - i_this->field_0xb01 = 1; + i_this->path_dir = 1; // forward } else { - i_this->field_0xb01 = 0xFF; + i_this->path_dir = 0xFF; // backward } return TRUE; } static void e_rd_normal(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - if (i_this->field_0x5b6 == 1 || i_this->field_0x5b6 == 2) { + if (i_this->arg0 == 1 || i_this->arg0 == 2) { if (wb_init_ride(i_this)) { - i_this->field_0x5b6 = 0; + i_this->arg0 = 0; } return; } cXyz unused_vec_0, unused_vec_1; - f32 fVar1 = 0.0f; - s16 sVar1 = 0x4000; + f32 speed = 0.0f; + s16 angle = 0x4000; if (desert_substage != 0) { - sVar1 = 0x6000; + angle = 0x6000; } - switch (i_this->mMode) { + switch (i_this->mode) { case 0: if (i_this->field_0x5bd != 0) { anm_init(i_this, BCK_RD_ARMAMENT, 2.0f, 0, 1.0f); - i_this->mMode = 1; + i_this->mode = 1; } else { - i_this->mMode = 2; + i_this->mode = 2; } break; case 1: - if ((int)i_this->mpModelMorf->getFrame() == 11) { + if ((int)i_this->anm_p->getFrame() == 11) { i_this->field_0x5bd = 0; } - if (i_this->mpModelMorf->isStop()) { - i_this->mMode = 2; + if (i_this->anm_p->isStop()) { + i_this->mode = 2; } break; case 2: - if (i_this->field_0x990[0] == 0) { - if (i_this->mPath != NULL && path_check(i_this)) { - i_this->mAction = ACTION_JYUNKAI; - i_this->mMode = 0; + if (i_this->timer[0] == 0) { + if (i_this->path != NULL && path_check(i_this)) { + i_this->action = ACTION_JYUNKAI; + i_this->mode = 0; return; } if (way_check(i_this)) { anm_init(i_this, BCK_RD_WALK, 10.0f, 2, 1.0f); - i_this->mMode = 3; - i_this->field_0x990[0] = cM_rndF(100.0f) + 100.0f; + i_this->mode = 3; + i_this->timer[0] = cM_rndF(100.0f) + 100.0f; } } else if (desert_substage != 0) { - sVar1 = 0x7000; + angle = 0x7000; } else { - sVar1 = 0x6000; + angle = 0x6000; } break; case 3: - fVar1 = l_HIO.movement_speed; - if (a_this->speedF >= 3.0f && move_gake_check(i_this, 100.0f)) { - i_this->mMode = 4; - i_this->field_0x990[0] = cM_rndF(100.0f) + 50.0f; + speed = l_HIO.movement_speed; + if (enemy->speedF >= 3.0f && move_gake_check(i_this, 100.0f)) { + i_this->mode = 4; + i_this->timer[0] = cM_rndF(100.0f) + 50.0f; anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); } else { - if (i_this->field_0x990[0] == 0 || (a_this->speedF >= 3.0f && way_bg_check(i_this, 200.0f))) { - i_this->mMode = 2; - i_this->field_0x990[0] = cM_rndF(100.0f) + 50.0f; + if (i_this->timer[0] == 0 || (enemy->speedF >= 3.0f && way_bg_check(i_this, 200.0f))) { + i_this->mode = 2; + i_this->timer[0] = cM_rndF(100.0f) + 50.0f; anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); } } @@ -1191,272 +1191,272 @@ static void e_rd_normal(e_rd_class* i_this) { case 4: i_this->field_0x9c8 = 0xFF; - if (i_this->field_0x990[0] == 0) { - i_this->field_0x5cc = a_this->current.angle.y + 0x8000 + (s16)cM_rndFX(4000.0f); + if (i_this->timer[0] == 0) { + i_this->target_ya = enemy->current.angle.y + 0x8000 + (s16)cM_rndFX(4000.0f); anm_init(i_this, BCK_RD_WALK, 10.0f, 2, 1.0f); - i_this->mMode = 3; - i_this->field_0x990[0] = cM_rndF(100.0f) + 100.0f; + i_this->mode = 3; + i_this->timer[0] = cM_rndF(100.0f) + 100.0f; } } - if (fVar1) { - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->field_0x5cc, 8, 0x400); - s16 sVar1 = a_this->current.angle.y - i_this->field_0x5cc; - if (sVar1 > 0x400 || sVar1 < -0x400) { - fVar1 = 0.0f; + if (speed) { + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->target_ya, 8, 0x400); + s16 range = enemy->current.angle.y - i_this->target_ya; + if (range > 0x400 || range < -0x400) { + speed = 0.0f; } } - cLib_addCalc2(&a_this->speedF, fVar1, 1.0f, 3.0f); - f32 fVar2 = i_this->field_0x980; - BOOL bVar1 = FALSE; - if (i_this->field_0x9a1 == 1 || S_find != 0) { - if (i_this->field_0x9a1 == 1) { - bVar1 = TRUE; + cLib_addCalc2(&enemy->speedF, speed, 1.0f, 3.0f); + f32 range = i_this->attack_range; + BOOL search_check = FALSE; + if (i_this->look_timer == 1 || S_find != 0) { + if (i_this->look_timer == 1) { + search_check = TRUE; } - fVar2 = 10000.0f; - sVar1 = 0x7FFF; + range = 10000.0f; + angle = 0x7FFF; } - if (((i_this->field_0x970 & 7) == 0 || bVar1) && i_this->mMode >= 2) { - if ((i_this->field_0x970 & 8) != 0 && !bVar1) { - wb_check(i_this, sVar1); + if (((i_this->counter & 7) == 0 || search_check) && i_this->mode >= 2) { + if ((i_this->counter & 8) != 0 && !search_check) { + wb_check(i_this, angle); } else { - if (pl_check(i_this, fVar2, sVar1)) { - if (i_this->field_0x5bc == 1) { - i_this->mAction = ACTION_FIGHT_RUN; - i_this->mMode = 0xFFF6; - i_this->field_0x990[0] = 60; - } else if (i_this->field_0x5bc >= 2) { - i_this->mAction = ACTION_BOW_RUN; - i_this->mMode = 0xFFF6; + if (pl_check(i_this, range, angle)) { + if (i_this->weapon_type == 1) { + i_this->action = ACTION_FIGHT_RUN; + i_this->mode = -10; + i_this->timer[0] = 60; + } else if (i_this->weapon_type >= 2) { + i_this->action = ACTION_BOW_RUN; + i_this->mode = -10; } } if (bomb_view_check(i_this) != NULL) { - i_this->mAction = ACTION_BOMB; - i_this->mMode = 0; + i_this->action = ACTION_BOMB; + i_this->mode = 0; } } } } static void e_rd_fight_run(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - fopAc_ac_c* player = dComIfGp_getPlayer(0); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); cXyz sp64, sp70; - f32 fVar3 = 0.0f; - s8 bVar1 = true; + f32 speed = 0.0f; + s8 attack_flag = true; - if (!pl_check(i_this, i_this->field_0x980 + 50.0f, 0x7FFF) && i_this->field_0x990[0] == 0) { - if (i_this->field_0x99e == 0) { - bVar1 = false; + if (!pl_check(i_this, i_this->attack_range + 50.0f, 0x7FFF) && i_this->timer[0] == 0) { + if (i_this->attack_timer == 0) { + attack_flag = false; } } else { - i_this->field_0x99e = 35; + i_this->attack_timer = 35; } - f32 fVar1; + f32 dash_speed; if (desert_substage != 0) { - fVar1 = 24.0f; + dash_speed = 24.0f; } else { - fVar1 = l_HIO.dash_speed; + dash_speed = l_HIO.dash_speed; } - if (i_this->field_0x5bc != 1) { - if (i_this->field_0x5bc >= 2) { - i_this->mAction = ACTION_BOW_RUN; + if (i_this->weapon_type != 1) { + if (i_this->weapon_type >= 2) { + i_this->action = ACTION_BOW_RUN; } else { - i_this->mAction = ACTION_NORMAL; - i_this->field_0x990[0] = cM_rndF(50.0f) + 50.0f; + i_this->action = ACTION_NORMAL; + i_this->timer[0] = cM_rndF(50.0f) + 50.0f; anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); } - i_this->mMode = 0; + i_this->mode = 0; } else { - i_this->mPlayerDistance -= fabsf(a_this->current.pos.y - player->current.pos.y) * 0.7f; + i_this->dis -= fabsf(enemy->current.pos.y - pla->current.pos.y) * 0.7f; - switch (i_this->mMode) { + switch (i_this->mode) { case -20: - if ((int)i_this->mpModelMorf->getFrame() == 11) { + if ((int)i_this->anm_p->getFrame() == 11) { i_this->field_0x5bd = 0; } - if (i_this->mpModelMorf->isStop()) { - i_this->mMode = 0; + if (i_this->anm_p->isStop()) { + i_this->mode = 0; } break; case -10: anm_init(i_this, BCK_RD_WAIT01, 7.0f, 2, 1.0f); - i_this->field_0x990[1] = cM_rndF(10.0f) + 15.0f; - i_this->mMode = 0xFFF7; + i_this->timer[1] = cM_rndF(10.0f) + 15.0f; + i_this->mode = 0xFFF7; break; case -9: - if (i_this->field_0x990[1] == 0) { - i_this->mMode = 0; + if (i_this->timer[1] == 0) { + i_this->mode = 0; } break; case 0: if (i_this->field_0x5bd != 0) { anm_init(i_this, BCK_RD_ARMAMENT, 2.0f, 0, 1.0f); - i_this->mMode = 0xFFEC; - } else if (i_this->field_0x990[1] == 0) { + i_this->mode = 0xFFEC; + } else if (i_this->timer[1] == 0) { anm_init(i_this, BCK_RD_RUN, 5.0f, 2, cM_rndFX(0.05f) + 1.0f); - i_this->mMode = 1; + i_this->mode = 1; } break; case 1: - fVar3 = fVar1; - if (i_this->mPlayerDistance < l_HIO.battle_init_range) { + speed = dash_speed; + if (i_this->dis < l_HIO.battle_init_range) { anm_init(i_this, BCK_RD_KAMAE, 5.0f, 2, 1.0f); - i_this->mMode = 2; + i_this->mode = 2; } break; case 2: - fVar3 = l_HIO.movement_speed; - if (i_this->mPlayerDistance > l_HIO.battle_init_range + 50.0f) { - i_this->mMode = 0; - } else if (i_this->mPlayerDistance < l_HIO.battle_init_range - 50.0f) { - i_this->mMode = 3; + speed = l_HIO.movement_speed; + if (i_this->dis > l_HIO.battle_init_range + 50.0f) { + i_this->mode = 0; + } else if (i_this->dis < l_HIO.battle_init_range - 50.0f) { + i_this->mode = 3; } break; case 3: - fVar3 = -l_HIO.movement_speed; - if (i_this->mPlayerDistance > l_HIO.battle_init_range) { - i_this->mMode = 2; + speed = -l_HIO.movement_speed; + if (i_this->dis > l_HIO.battle_init_range) { + i_this->mode = 2; } break; case 5: - if (i_this->field_0x990[3] != 0) { + if (i_this->timer[3] != 0) { i_this->field_0x9c8 = 0xFF; } - fVar3 = 0.0f; - a_this->speedF = 0.0f; + speed = 0.0f; + enemy->speedF = 0.0f; if (!move_gake_check(i_this, 100.0f)) { - i_this->mMode = 2; + i_this->mode = 2; } break; } - if (i_this->mMode < 5 && move_gake_check(i_this, 100.0f)) { - i_this->mMode = 5; - i_this->field_0x990[3] = cM_rndF(15.0f) + 30.0f; + if (i_this->mode < 5 && move_gake_check(i_this, 100.0f)) { + i_this->mode = 5; + i_this->timer[3] = cM_rndF(15.0f) + 30.0f; anm_init(i_this, BCK_RD_WAIT01, 5.0f, 2, 1.0f); } - if (i_this->mMode >= 0) { - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngleY, 4, 0x800); - s16 sVar1 = a_this->current.angle.y - i_this->mPlayerAngleY; - if (sVar1 > 0x400 || sVar1 < -0x400) { - fVar3 = 0.0f; + if (i_this->mode >= 0) { + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->angleY, 4, 0x800); + s16 range = enemy->current.angle.y - i_this->angleY; + if (range > 0x400 || range < -0x400) { + speed = 0.0f; } } - cLib_addCalc2(&a_this->speedF, fVar3, 1.0f, 5.0f); + cLib_addCalc2(&enemy->speedF, speed, 1.0f, 5.0f); - if (!bVar1) { - i_this->mAction = ACTION_NORMAL; - if (i_this->mMode == 5) { - i_this->field_0x5cc = a_this->current.angle.y + 0x8000 + (s16)cM_rndFX(4000.0f); + if (!attack_flag) { + i_this->action = ACTION_NORMAL; + if (i_this->mode == 5) { + i_this->target_ya = enemy->current.angle.y + 0x8000 + (s16)cM_rndFX(4000.0f); anm_init(i_this, BCK_RD_WALK, 10.0f, 2, 1.0f); - i_this->mMode = 3; - i_this->field_0x990[0] = cM_rndF(100.0f) + 100.0f; - i_this->field_0x990[1] = 40; + i_this->mode = 3; + i_this->timer[0] = cM_rndF(100.0f) + 100.0f; + i_this->timer[1] = 40; } else { - i_this->mMode = 0; - i_this->field_0x990[0] = cM_rndF(50.0f) + 50.0f; + i_this->mode = 0; + i_this->timer[0] = cM_rndF(50.0f) + 50.0f; anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); } } else { - if (i_this->mPlayerDistance < l_HIO.battle_init_range && (i_this->field_0xa20 & cc_pl_cut_bit_get()) != 0 && + if (i_this->dis < l_HIO.battle_init_range && (i_this->field_0xa20 & cc_pl_cut_bit_get()) != 0 && i_this->field_0x9f0 < 0.1f) { - i_this->mAction = ACTION_AVOID; - i_this->mMode = 0; - i_this->field_0x998 = 20; - } else if (i_this->field_0x5bd == 0 && i_this->mPlayerDistance < l_HIO.attack_init_range && i_this->field_0x990[2] == 0) { - i_this->field_0x990[2] = cM_rndF(20.0f) + 20.0f; - f32 compare_val_f = 0.5f; - if (cM_rndF(1.0f) < compare_val_f) { - i_this->mAction = ACTION_FIGHT; - i_this->mMode = 0; + i_this->action = ACTION_AVOID; + i_this->mode = 0; + i_this->damage_timer = 20; + } else if (i_this->field_0x5bd == 0 && i_this->dis < l_HIO.attack_init_range && i_this->timer[2] == 0) { + i_this->timer[2] = cM_rndF(20.0f) + 20.0f; + f32 rnd = 0.5f; + if (cM_rndF(1.0f) < rnd) { + i_this->action = ACTION_FIGHT; + i_this->mode = 0; } } } - if ((i_this->field_0x970 & 15) == 0) { + if ((i_this->counter & 15) == 0) { wb_check(i_this, 0x3000); if (bomb_view_check(i_this) != NULL) { - i_this->mAction = ACTION_BOMB; - i_this->mMode = 0; + i_this->action = ACTION_BOMB; + i_this->mode = 0; } } - if (i_this->mAction == ACTION_FIGHT_RUN && i_this->field_0x9c8 >= 0) { + if (i_this->action == ACTION_FIGHT_RUN && i_this->field_0x9c8 >= 0) { i_this->field_0x9c8 = 1; } } } static fopAc_ac_c* at_hit_check(e_rd_class* i_this) { - fopEn_enemy_c* unused_p = &i_this->actor; - fopAc_ac_c* actor_p; - if (i_this->mMode >= 10) { + fopEn_enemy_c* enemy = &i_this->enemy; + fopAc_ac_c* actor; + if (i_this->mode >= 10) { return NULL; } - if (i_this->field_0x1100.ChkAtHit()) { - cCcD_Obj* at_hit_obj_p = i_this->field_0x1100.GetAtHitObj(); - actor_p = dCc_GetAc(at_hit_obj_p->GetAc()); - return actor_p; + if (i_this->at_sph.ChkAtHit()) { + cCcD_Obj* at_hit_obj_p = i_this->at_sph.GetAtHitObj(); + actor = dCc_GetAc(at_hit_obj_p->GetAc()); + return actor; } return NULL; } static void e_rd_fight(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; cXyz sp3c, sp48; - int frame = i_this->mpModelMorf->getFrame(); + int frame = i_this->anm_p->getFrame(); - switch (i_this->mMode) { + switch (i_this->mode) { case 0: { anm_init(i_this, BCK_RD_ATTACK01, TREG_F(14) + 6.0f, 0, 1.0f); if (l_HIO.field_0x38 == 0) { - i_this->field_0x990[0] = 25; + i_this->timer[0] = 25; } else if (l_HIO.field_0x38 == 1) { // in practice, only goes in here - i_this->field_0x990[0] = 15; + i_this->timer[0] = 15; } else if (l_HIO.field_0x38 == 2) { - i_this->field_0x990[0] = 10; + i_this->timer[0] = 10; } - i_this->mMode = 1; - i_this->field_0x990[1] = 5; - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_WAND_ATTACK, -1); + i_this->mode = 1; + i_this->timer[1] = 5; + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_WAND_ATTACK, -1); break; } case 1: { - if (i_this->field_0x990[1] != 0) { - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngleY, 4, 0x800); + if (i_this->timer[1] != 0) { + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->angleY, 4, 0x800); } if (frame == 30) { - i_this->mpModelMorf->setFrame(0.0f); - } else if (i_this->field_0x990[0] == 0) { + i_this->anm_p->setFrame(0.0f); + } else if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_ATTACK01, 2.0f, 0, l_HIO.swing_speed); - i_this->mpModelMorf->setFrame(30.0f); - i_this->mMode = 2; + i_this->anm_p->setFrame(30.0f); + i_this->mode = 2; } break; } @@ -1466,12 +1466,12 @@ static void e_rd_fight(e_rd_class* i_this) { i_this->field_0x9ab = 1; } - if (i_this->mpModelMorf->checkFrame(44.0f)) { - i_this->mSound.startCreatureSound(Z2SE_EN_RD_SWING_CLUB, 0, -1); + if (i_this->anm_p->checkFrame(44.0f)) { + i_this->sound.startCreatureSound(Z2SE_EN_RD_SWING_CLUB, 0, -1); } - if (i_this->mpModelMorf->checkFrame(50.0f)) { - i_this->mpModelMorf->setPlaySpeed(1.0f); + if (i_this->anm_p->checkFrame(50.0f)) { + i_this->anm_p->setPlaySpeed(1.0f); } int iVar1; @@ -1485,14 +1485,14 @@ static void e_rd_fight(e_rd_class* i_this) { } if (frame >= iVar1) { - i_this->mMode = 3; + i_this->mode = 3; if (l_HIO.field_0x38 == 0) { - i_this->field_0x990[0] = 20; + i_this->timer[0] = 20; } else if (l_HIO.field_0x38 == 1) { // in practice, only goes in here - i_this->field_0x990[0] = 15; + i_this->timer[0] = 15; } else if (l_HIO.field_0x38 == 2) { - i_this->field_0x990[0] = 10; + i_this->timer[0] = 10; } anm_init(i_this, BCK_RD_KAMAE, 5.0f, 2, 1.0f); @@ -1504,76 +1504,76 @@ static void e_rd_fight(e_rd_class* i_this) { case 3: case 10: { - if (i_this->field_0x990[0] == 0) { - i_this->mAction = ACTION_FIGHT_RUN; - i_this->mMode = 0; + if (i_this->timer[0] == 0) { + i_this->action = ACTION_FIGHT_RUN; + i_this->mode = 0; } } } - cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f); + cLib_addCalc0(&enemy->speedF, 1.0f, 3.0f); if (i_this->field_0x9ab != 0) { fopAc_ac_c* actor = at_hit_check(i_this); if (actor != NULL && fopAcM_GetName(actor) == PROC_ALINK) { if (daPy_getPlayerActorClass()->checkPlayerGuard()) { - i_this->mpModelMorf->setPlaySpeed(-1.0f); + i_this->anm_p->setPlaySpeed(-1.0f); dComIfGp_getVibration().StartShock(4, 31, cXyz(0.0f, 1.0f, 0.0f)); - dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(i_this), 5); - i_this->mMode = 10; - i_this->field_0x990[0] = 10; + dKy_Sound_set(enemy->current.pos, 100, fopAcM_GetID(i_this), 5); + i_this->mode = 10; + i_this->timer[0] = 10; } } } } static void e_rd_bow_run(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; cXyz unused_vec_0, unused_vec_1; - f32 fVar1 = 0.0f; - f32 fVar2; + f32 speed = 0.0f; + f32 dash_speed; if (desert_substage != 0) { - fVar2 = 24.0f; + dash_speed = 24.0f; } else { - fVar2 = l_HIO.dash_speed; + dash_speed = l_HIO.dash_speed; } - s16 playerAngleY = fopAcM_searchPlayerAngleY(a_this); + s16 target_angle = fopAcM_searchPlayerAngleY(enemy); s8 bVar1 = 0; - switch (i_this->mMode) { + switch (i_this->mode) { case -20: - if ((int)i_this->mpModelMorf->getFrame() == 11) { + if ((int)i_this->anm_p->getFrame() == 11) { i_this->field_0x5bd = 0; } - if (i_this->mpModelMorf->isStop()) { - i_this->mMode = 0; + if (i_this->anm_p->isStop()) { + i_this->mode = 0; } break; case -10: anm_init(i_this, BCK_RD_WAIT01, 5.0f, 2, 1.0f); - i_this->field_0x990[0] = cM_rndF(10.0f) + 15.0f; - i_this->mMode = 0xFFF7; + i_this->timer[0] = cM_rndF(10.0f) + 15.0f; + i_this->mode = 0xFFF7; break; case -9: i_this->field_0x9c8 = 1; - if (i_this->field_0x990[0] == 0) { - i_this->mMode = 0; + if (i_this->timer[0] == 0) { + i_this->mode = 0; } break; case 0: if (i_this->field_0x5bd != 0) { anm_init(i_this, BCK_RD_ARMAMENT, 2.0f, 0, 1.0f); - i_this->mMode = 0xFFEC; + i_this->mode = 0xFFEC; } else { anm_init(i_this, BCK_RD_RUN, 5.0f, 2, 1.0f); - i_this->field_0x990[0] = cM_rndF(50.0f) + 20.0f; - if (i_this->mPlayerDistance < l_HIO.attack_range - 100.0f) { - i_this->mMode = 1; - } else if (i_this->mPlayerDistance > l_HIO.attack_range + 100.0f) { - i_this->mMode = 2; + i_this->timer[0] = cM_rndF(50.0f) + 20.0f; + if (i_this->dis < l_HIO.attack_range - 100.0f) { + i_this->mode = 1; + } else if (i_this->dis > l_HIO.attack_range + 100.0f) { + i_this->mode = 2; } else { bVar1 = 1; } @@ -1581,67 +1581,67 @@ static void e_rd_bow_run(e_rd_class* i_this) { break; case 1: - fVar1 = fVar2; - ANGLE_ADD_2(playerAngleY, 0x8000); - if (i_this->mPlayerDistance > l_HIO.attack_range || i_this->field_0x990[0] == 0 || i_this->mObjAcch.ChkWallHit() || move_gake_check(i_this, 100.0f)) { + speed = dash_speed; + ANGLE_ADD_2(target_angle, 0x8000); + if (i_this->dis > l_HIO.attack_range || i_this->timer[0] == 0 || i_this->ObjAcch.ChkWallHit() || move_gake_check(i_this, 100.0f)) { bVar1 = 1; } - i_this->field_0x990[2] = 20; + i_this->timer[2] = 20; break; case 2: - fVar1 = fVar2; - if (i_this->mPlayerDistance < l_HIO.attack_range) { + speed = dash_speed; + if (i_this->dis < l_HIO.attack_range) { bVar1 = 1; } break; } - cLib_addCalc2(&a_this->speedF, fVar1, 1.0f, 5.0f); - if (i_this->mMode >= 0) { - cLib_addCalcAngleS2(&a_this->current.angle.y, playerAngleY, 4, 0x1000); + cLib_addCalc2(&enemy->speedF, speed, 1.0f, 5.0f); + if (i_this->mode >= 0) { + cLib_addCalcAngleS2(&enemy->current.angle.y, target_angle, 4, 0x1000); } if (i_this->field_0x5bd == 0 && bVar1) { - if (i_this->field_0x5b8 == 3) { - i_this->mAction = ACTION_BOW2; + if (i_this->arg2 == 3) { + i_this->action = ACTION_BOW2; } else { - i_this->mAction = ACTION_BOW; + i_this->action = ACTION_BOW; } - i_this->mMode = 0; - i_this->field_0x990[1] = cM_rndF(150.0f); - } else if (i_this->field_0x990[2] == 0 && !pl_check(i_this, i_this->field_0x980 + 50.0f, 0x7FFF)) { - i_this->mAction = ACTION_NORMAL; - i_this->mMode = 0; - i_this->field_0x990[0] = cM_rndF(50.0f) + 50.0f; + i_this->mode = 0; + i_this->timer[1] = cM_rndF(150.0f); + } else if (i_this->timer[2] == 0 && !pl_check(i_this, i_this->attack_range + 50.0f, 0x7FFF)) { + i_this->action = ACTION_NORMAL; + i_this->mode = 0; + i_this->timer[0] = cM_rndF(50.0f) + 50.0f; anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); - } else if ((i_this->field_0x970 & 15) == 0) { + } else if ((i_this->counter & 15) == 0) { wb_check(i_this, 0x3000); if (bomb_view_check(i_this) != NULL) { - i_this->mAction = ACTION_BOMB; - i_this->mMode = 0; + i_this->action = ACTION_BOMB; + i_this->mode = 0; } } - if (i_this->mAction != ACTION_BOW_RUN) { + if (i_this->action != ACTION_BOW_RUN) { i_this->field_0x9c8 = 0; } } static void e_rd_bow(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; cXyz unused_vec_0, unused_vec_1; - int frame = i_this->mpModelMorf->getFrame(); + int frame = i_this->anm_p->getFrame(); - switch (i_this->mMode) { + switch (i_this->mode) { case 0: anm_init(i_this, BCK_RD_SHOOT_READY, 5.0f, 0, 1.0f); - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 7), + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 7), 0, 5.0f, 0.9f + TREG_F(3), 0.0f, -1.0f); - i_this->mMode = 1; - a_this->speedF = 0.0f; + i_this->mode = 1; + enemy->speedF = 0.0f; break; case 1: @@ -1651,26 +1651,26 @@ static void e_rd_bow(e_rd_class* i_this) { } if (frame == 20) { - i_this->mSound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1); + i_this->sound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1); } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_SHOOT_WAIT, 4.0f, 2, 1.0f); - i_this->field_0x990[0] = cM_rndF(10.0f) + 10.0f; - i_this->mMode = 2; + i_this->timer[0] = cM_rndF(10.0f) + 10.0f; + i_this->mode = 2; } break; case 2: i_this->field_0x9c8 = 4; - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { if (i_this->field_0x9a4 == 0 && !dMsgObject_isTalkNowCheck()) { anm_init(i_this, BCK_RD_SHOOT, 1.0f, 0, 1.0f); - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); - i_this->mMode = 3; + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); + i_this->mode = 3; } else { - i_this->mAction = ACTION_BOW_RUN; - i_this->mMode = 0; + i_this->action = ACTION_BOW_RUN; + i_this->mode = 0; } } @@ -1684,28 +1684,28 @@ static void e_rd_bow(e_rd_class* i_this) { } if (frame == 2 + XREG_S(7)) { - i_this->field_0x9a3 = 1; + i_this->arrow_flag = 1; } - if (i_this->mpModelMorf->isStop()) { - if (i_this->field_0x990[1] == 0 && (i_this->mPlayerDistance < l_HIO.attack_range - 200.0f || i_this->mPlayerDistance > l_HIO.attack_range)) { - if (!(i_this->mPlayerDistance < l_HIO.attack_range - 200.0f) || !way_bg_check(i_this, -100.0f)) { - i_this->mAction = ACTION_BOW_RUN; + if (i_this->anm_p->isStop()) { + if (i_this->timer[1] == 0 && (i_this->dis < l_HIO.attack_range - 200.0f || i_this->dis > l_HIO.attack_range)) { + if (!(i_this->dis < l_HIO.attack_range - 200.0f) || !way_bg_check(i_this, -100.0f)) { + i_this->action = ACTION_BOW_RUN; } - i_this->mMode = 0; + i_this->mode = 0; } else { - i_this->mMode = 0; + i_this->mode = 0; } } break; } - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngleY, 4, 0x1000); + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->angleY, 4, 0x1000); } static void* s_command3_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data && ((e_rd_class*)i_actor)->mAction == ACTION_COMMANDER) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data && ((e_rd_class*)i_actor)->action == ACTION_COMMANDER) { return i_actor; } @@ -1713,43 +1713,43 @@ static void* s_command3_sub(void* i_actor, void* i_data) { } static s8 e_rd_bow2(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - fopAc_ac_c* actor = get_pla(a_this); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + fopAc_ac_c* actor = get_pla(enemy); cXyz unused_vec_0, unused_vec_1; - int frame = i_this->mpModelMorf->getFrame(); - s8 rv = 0; + int frame = i_this->anm_p->getFrame(); + s8 rt = 0; - if (i_this->mMode <= 1) { - if (i_this->mPlayerDistance < i_this->field_0x980 && !other_bg_check(i_this, actor)) { - i_this->mMode = 2; + if (i_this->mode <= 1) { + if (i_this->dis < i_this->attack_range && !other_bg_check(i_this, actor)) { + i_this->mode = 2; } - rv = 1; + rt = 1; } - switch (i_this->mMode) { + switch (i_this->mode) { case 0: - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); - i_this->mMode = 1; - i_this->field_0x990[0] = cM_rndF(40.0f) + 60.0f; + i_this->mode = 1; + i_this->timer[0] = cM_rndF(40.0f) + 60.0f; } break; case 1: - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_WAIT01, 10.0f, 2, 1.0f); - i_this->field_0x990[0] = cM_rndF(100.0f) + 100.0f; - i_this->mMode = 0; + i_this->timer[0] = cM_rndF(100.0f) + 100.0f; + i_this->mode = 0; } break; case 2: anm_init(i_this, BCK_RD_SHOOT_READY, 5.0f, 0, 1.0f); - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 7), + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 7), 0, 5.0f, 0.9f + TREG_F(3), 0.0f, -1.0f); - i_this->mMode = 3; - a_this->speedF = 0.0f; + i_this->mode = 3; + enemy->speedF = 0.0f; break; case 3: @@ -1759,28 +1759,28 @@ static s8 e_rd_bow2(e_rd_class* i_this) { } if (frame == 20) { - i_this->mSound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1); + i_this->sound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1); } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_SHOOT_WAIT, 4.0f, 2, 1.0f); - i_this->field_0x990[0] = cM_rndF(10.0f); - i_this->mMode = 4; + i_this->timer[0] = cM_rndF(10.0f); + i_this->mode = 4; } break; case 4: i_this->field_0x9c8 = 4; - if (i_this->field_0x990[0] == 0) { - if (i_this->mPlayerDistance > i_this->field_0x980 || other_bg_check(i_this, actor)) { - i_this->mMode = 0; - return rv; + if (i_this->timer[0] == 0) { + if (i_this->dis > i_this->attack_range || other_bg_check(i_this, actor)) { + i_this->mode = 0; + return rt; } if (!dMsgObject_isTalkNowCheck() && i_this->field_0x9a4 == 0) { anm_init(i_this, BCK_RD_SHOOT, 1.0f, 0, 1.0f); - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); - i_this->mMode = 5; + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); + i_this->mode = 5; } } @@ -1794,40 +1794,40 @@ static s8 e_rd_bow2(e_rd_class* i_this) { } if (frame == 2 + XREG_S(7)) { - i_this->field_0x9a3 = 1; + i_this->arrow_flag = 1; } - if (i_this->mpModelMorf->isStop()) { - if (i_this->field_0x990[1] == 0 && fabsf(a_this->current.pos.y - actor->current.pos.y) < 300.0f && i_this->mPlayerDistance < l_HIO.attack_range - 200.0f) { + if (i_this->anm_p->isStop()) { + if (i_this->timer[1] == 0 && fabsf(enemy->current.pos.y - actor->current.pos.y) < 300.0f && i_this->dis < l_HIO.attack_range - 200.0f) { if (!way_bg_check(i_this, -100.0f)) { - i_this->mAction = ACTION_BOW_RUN; - i_this->field_0x1295 = 0; + i_this->action = ACTION_BOW_RUN; + i_this->one_hit_kill = 0; } - i_this->mMode = 0; + i_this->mode = 0; } else { - i_this->mMode = 0; + i_this->mode = 0; } } break; } - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngleY, 4, 0x1000); - return rv; + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->angleY, 4, 0x1000); + return rt; } static void e_rd_bow_ikki(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; cXyz vec_0x24, vec_0x18; - int frame = i_this->mpModelMorf->getFrame(); + int frame = i_this->anm_p->getFrame(); - switch (i_this->mMode) { + switch (i_this->mode) { case 0: anm_init(i_this, BCK_RD_SHOOT_READY, 5.0f, 0, 1.0f); - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 7), + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 7), 0, 5.0f, 0.9f + TREG_F(3), 0.0f, -1.0f); - i_this->mMode = 1; - a_this->speedF = 0.0f; + i_this->mode = 1; + enemy->speedF = 0.0f; break; case 1: @@ -1836,20 +1836,20 @@ static void e_rd_bow_ikki(e_rd_class* i_this) { } if (frame == 20) { - i_this->mSound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1); + i_this->sound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1); } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_SHOOT_WAIT, 4.0f, 2, 1.0f); - i_this->mMode = 2; + i_this->mode = 2; } break; case 2: - if (i_this->field_0x990[0] == 0 && i_this->field_0x9a4 == 0) { + if (i_this->timer[0] == 0 && i_this->field_0x9a4 == 0) { anm_init(i_this, BCK_RD_SHOOT, 1.0f, 0, 1.0f); - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); - i_this->mMode = 3; + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); + i_this->mode = 3; } i_this->field_0x9a2 = 1; @@ -1861,311 +1861,311 @@ static void e_rd_bow_ikki(e_rd_class* i_this) { } if (frame == 2 + XREG_S(7)) { - i_this->field_0x9a3 = 1; + i_this->arrow_flag = 1; } - if (i_this->mpModelMorf->isStop()) { - i_this->mMode = 0; - i_this->field_0x990[0] = 10000; + if (i_this->anm_p->isStop()) { + i_this->mode = 0; + i_this->timer[0] = 10000; } break; } i_this->field_0x9c8 = 14; - i_this->field_0x9d4.set(34800.0f, 100.0f, -14900.0f); - vec_0x24 = i_this->field_0x9d4 - a_this->current.pos; - a_this->current.angle.y = cM_atan2s(vec_0x24.x, vec_0x24.z); + i_this->eye.set(34800.0f, 100.0f, -14900.0f); + vec_0x24 = i_this->eye - enemy->current.pos; + enemy->current.angle.y = cM_atan2s(vec_0x24.x, vec_0x24.z); } static void e_rd_avoid(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - int frame = i_this->mpModelMorf->getFrame(); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + int frame = i_this->anm_p->getFrame(); - switch (i_this->mMode) { + switch (i_this->mode) { case 0: anm_init(i_this, BCK_RD_AVOID, 1.0f, 0, 1.0f); - i_this->mMode = 1; - a_this->speedF = -30.0f + XREG_F(1); - a_this->speed.y = 20.0f + XREG_F(2); - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_DODGE, -1); + i_this->mode = 1; + enemy->speedF = -30.0f + XREG_F(1); + enemy->speed.y = 20.0f + XREG_F(2); + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_DODGE, -1); break; case 1: if (frame == 6) { - i_this->mpModelMorf->setPlaySpeed(0.0f); - i_this->mMode = 2; + i_this->anm_p->setPlaySpeed(0.0f); + i_this->mode = 2; } break; case 2: - if (i_this->mObjAcch.ChkGroundHit()) { - i_this->mpModelMorf->setPlaySpeed(1.0f); - i_this->mMode = 3; + if (i_this->ObjAcch.ChkGroundHit()) { + i_this->anm_p->setPlaySpeed(1.0f); + i_this->mode = 3; } break; case 3: - cLib_addCalc0(&a_this->speedF, 1.0f, 10.0f); - if (i_this->mpModelMorf->isStop()) { - i_this->mAction = ACTION_FIGHT_RUN; - i_this->mMode = 0; - i_this->field_0x990[0] = 30; + cLib_addCalc0(&enemy->speedF, 1.0f, 10.0f); + if (i_this->anm_p->isStop()) { + i_this->action = ACTION_FIGHT_RUN; + i_this->mode = 0; + i_this->timer[0] = 30; } } } static void e_rd_wb_search(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - cXyz sp54, sp60; - f32 fVar1 = 0.0f; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + cXyz mae, ato; + f32 speed = 0.0f; s8 bVar1 = 0; - fopAc_ac_c* bullbo_actor = fopAcM_SearchByID(i_this->mWbActorID); - e_wb_class* bullbo = (e_wb_class*)bullbo_actor; - if (bullbo_actor == NULL) { + fopAc_ac_c* actor = fopAcM_SearchByID(i_this->boar_id); + e_wb_class* boar = (e_wb_class*)actor; + if (actor == NULL) { bVar1 = 1; } else { - if (bullbo->mActionID == 22 || bullbo->mActionID == 21 || bullbo->mActionID == 23 || bullbo->mActionID == 24) { + if (boar->mActionID == 22 || boar->mActionID == 21 || boar->mActionID == 23 || boar->mActionID == 24) { bVar1 = 1; - } else if (i_this->mMode <= 3) { + } else if (i_this->mode <= 3) { for (int i = 0; i <= 2; i++) { - if (i_this->field_0xd58[i].ChkCoHit()) { - cCcD_Obj* co_hit_obj_p = i_this->field_0xd58[i].GetCoHitObj(); - fopAc_ac_c* actor_p = dCc_GetAc(co_hit_obj_p->GetAc()); - if (actor_p != NULL && actor_p != bullbo_actor && fopAcM_GetName(actor_p) == PROC_E_WB) { + if (i_this->cc_sph[i].ChkCoHit()) { + cCcD_Obj* co_hit_obj_p = i_this->cc_sph[i].GetCoHitObj(); + fopAc_ac_c* hit_actor = dCc_GetAc(co_hit_obj_p->GetAc()); + if (hit_actor != NULL && hit_actor != actor && fopAcM_GetName(hit_actor) == PROC_E_WB) { bVar1 = 1; } } } - if (i_this->mObjAcch.ChkWallHit()) { + if (i_this->ObjAcch.ChkWallHit()) { bVar1 = 1; } } } if (bVar1) { - i_this->mAction = ACTION_NORMAL; - i_this->mMode = 0; + i_this->action = ACTION_NORMAL; + i_this->mode = 0; ride_off(i_this); } else { - if (i_this->mMode >= 2 && bullbo->mActionID != 1) { - bullbo->mActionID = 1; - bullbo->mActionMode = 0; + if (i_this->mode >= 2 && boar->mActionID != 1) { + boar->mActionID = 1; + boar->mActionMode = 0; } - switch (i_this->mMode) { + switch (i_this->mode) { case 0: anm_init(i_this, BCK_RD_WAIT01, 10.0f, 2, 1.0f); - i_this->mMode = 1; - i_this->field_0x990[0] = cM_rndF(15.0f) + 15.0f; + i_this->mode = 1; + i_this->timer[0] = cM_rndF(15.0f) + 15.0f; // fallthrough case 1: i_this->field_0x9c8 = 11; - if (i_this->field_0x990[0] == 0) { - i_this->mMode = 2; - if (bullbo_actor->speedF > 5.0f) { + if (i_this->timer[0] == 0) { + i_this->mode = 2; + if (actor->speedF > 5.0f) { anm_init(i_this, BCK_RD_SIGN, 3.0f, 2, 1.0f); - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_CALLING, -1); - i_this->field_0x990[0] = cM_rndF(20.0f) + 30.0f; + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_CALLING, -1); + i_this->timer[0] = cM_rndF(20.0f) + 30.0f; } else { - i_this->field_0x990[0] = 10; + i_this->timer[0] = 10; } } break; case 2: - sp54 = bullbo_actor->current.pos - a_this->current.pos; - cLib_addCalcAngleS2(&a_this->current.angle.y, cM_atan2s(sp54.x, sp54.z), 4, 0x800); + mae = actor->current.pos - enemy->current.pos; + cLib_addCalcAngleS2(&enemy->current.angle.y, cM_atan2s(mae.x, mae.z), 4, 0x800); i_this->field_0x9c8 = 11; - if (i_this->field_0x990[0] == 0 && bullbo_actor->speedF < 1.0f) { + if (i_this->timer[0] == 0 && actor->speedF < 1.0f) { cXyz sp6c, sp78; - cMtx_YrotS(*calc_mtx, bullbo_actor->shape_angle.y); - sp54.x = 100.0f; - sp54.y = 0.0f; - if (i_this->field_0x9be == 1) { - sp54.z = TREG_F(0) + 20.0f; + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); + mae.x = 100.0f; + mae.y = 0.0f; + if (i_this->boar_stand == 1) { + mae.z = TREG_F(0) + 20.0f; } else { - sp54.z = TREG_F(10) + -120.0f; + mae.z = TREG_F(10) + -120.0f; } - MtxPosition(&sp54, &sp60); + MtxPosition(&mae, &ato); - sp6c = (bullbo_actor->current.pos + sp60) - a_this->current.pos; - sp54.x = -100.0f; - MtxPosition(&sp54, &sp60); + sp6c = (actor->current.pos + ato) - enemy->current.pos; + mae.x = -100.0f; + MtxPosition(&mae, &ato); - sp78 = (bullbo_actor->current.pos + sp60) - a_this->current.pos; + sp78 = (actor->current.pos + ato) - enemy->current.pos; if (sp6c.abs() < sp78.abs()) { i_this->field_0x9bd = 0; - sp60 = sp6c + a_this->current.pos; + ato = sp6c + enemy->current.pos; } else { i_this->field_0x9bd = 1; - sp60 = sp78 + a_this->current.pos; + ato = sp78 + enemy->current.pos; } - sp54 = sp60 - a_this->current.pos; - i_this->field_0x5cc = (s16) cM_atan2s(sp54.x, sp54.z); - i_this->mMode = 3; + mae = ato - enemy->current.pos; + i_this->target_ya = (s16) cM_atan2s(mae.x, mae.z); + i_this->mode = 3; anm_init(i_this, BCK_RD_RUN, 5.0f, 2, 1.5f); } break; case 3: - fVar1 = l_HIO.dash_speed * 1.5f; - cMtx_YrotS(*calc_mtx, bullbo_actor->shape_angle.y); + speed = l_HIO.dash_speed * 1.5f; + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); if (i_this->field_0x9bd == 0) { - sp54.x = 100.0f; + mae.x = 100.0f; } else { - sp54.x = -100.0f; + mae.x = -100.0f; } - sp54.y = 0.0f; - if (i_this->field_0x9be == 1) { - sp54.z = TREG_F(0) + 20.0f; + mae.y = 0.0f; + if (i_this->boar_stand == 1) { + mae.z = TREG_F(0) + 20.0f; } else { - sp54.z = TREG_F(10) + -120.0f; + mae.z = TREG_F(10) + -120.0f; } - MtxPosition(&sp54, &sp60); + MtxPosition(&mae, &ato); - sp60 += bullbo_actor->current.pos; - sp54 = sp60 - a_this->current.pos; - i_this->field_0x5cc = (s16) cM_atan2s(sp54.x, sp54.z); - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->field_0x5cc, 2, 0x400); - sp54 = sp60 - a_this->current.pos; - sp54.y = 0.0f; + ato += actor->current.pos; + mae = ato - enemy->current.pos; + i_this->target_ya = (s16) cM_atan2s(mae.x, mae.z); + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->target_ya, 2, 0x400); + mae = ato - enemy->current.pos; + mae.y = 0.0f; - if (sp54.abs() < TREG_F(19) + 230.0f) { - i_this->mMode = 4; - if (i_this->field_0x9be == 1) { + if (mae.abs() < TREG_F(19) + 230.0f) { + i_this->mode = 4; + if (i_this->boar_stand == 1) { anm_init(i_this, BCK_RD_ARMAMENT, 2.0f, 0, 1.0f); } else { anm_init(i_this, BCK_RD_WAIT01, 5.0f, 2, 1.0f); - i_this->field_0x990[0] = 10; + i_this->timer[0] = 10; } } break; case 4: - cMtx_YrotS(*calc_mtx, bullbo_actor->shape_angle.y); - sp54.x = 0.0f; - sp54.y = 0.0f; - if (i_this->field_0x9be == 1) { - sp54.z = 20.0f; + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); + mae.x = 0.0f; + mae.y = 0.0f; + if (i_this->boar_stand == 1) { + mae.z = 20.0f; } else { - sp54.z = -20.0f; + mae.z = -20.0f; } - MtxPosition(&sp54, &i_this->field_0x5c0); + MtxPosition(&mae, &i_this->field_0x5c0); - i_this->field_0x5c0 += bullbo_actor->current.pos; - sp54 = i_this->field_0x5c0 - a_this->current.pos; - cLib_addCalcAngleS2(&a_this->current.angle.y, (s16)cM_atan2s(sp54.x, sp54.z), 2, 0x1000); + i_this->field_0x5c0 += actor->current.pos; + mae = i_this->field_0x5c0 - enemy->current.pos; + cLib_addCalcAngleS2(&enemy->current.angle.y, (s16)cM_atan2s(mae.x, mae.z), 2, 0x1000); - if (i_this->field_0x5bc != 0 && i_this->field_0x9be == 1) { - if ((int)i_this->mpModelMorf->getFrame() == 11) { + if (i_this->weapon_type != 0 && i_this->boar_stand == 1) { + if ((int)i_this->anm_p->getFrame() == 11) { i_this->field_0x5bd = 1; } - if (i_this->mpModelMorf->isStop()) { - i_this->mMode = 5; + if (i_this->anm_p->isStop()) { + i_this->mode = 5; anm_init(i_this, BCK_RD_JUMP_A, 2.0f, 0, 1.0f); - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_JUMP_RIDING, -1); + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_JUMP_RIDING, -1); } - } else if (i_this->field_0x990[0] == 0) { - i_this->mMode = 5; + } else if (i_this->timer[0] == 0) { + i_this->mode = 5; anm_init(i_this, BCK_RD_JUMP_A, 2.0f, 0, 1.0f); - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_JUMP_RIDING, -1); + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_JUMP_RIDING, -1); } break; case 5: - if (i_this->mpModelMorf->isStop()) { - i_this->mMode = 6; + if (i_this->anm_p->isStop()) { + i_this->mode = 6; anm_init(i_this, BCK_RD_JUMP_B, 10.0f, 0, 1.0f); - i_this->field_0x9bc = 1; + i_this->ride_mode = 1; i_this->field_0x9c4 = 30.0f; - i_this->field_0x990[3] = 20; + i_this->timer[3] = 20; } break; case 6: if (i_this->field_0x9c0 <= 0.0f) { - i_this->mAction = ACTION_WB_RIDE; - i_this->mMode = 0; - bullbo->mActionID = 4; - bullbo->mActionMode = 0; + i_this->action = ACTION_WB_RIDE; + i_this->mode = 0; + boar->mActionID = 4; + boar->mActionMode = 0; } } - cLib_addCalc2(&a_this->speedF, fVar1, 1.0f, 3.0f); - i_this->field_0x9d4 = bullbo_actor->eyePos; + cLib_addCalc2(&enemy->speedF, speed, 1.0f, 3.0f); + i_this->eye = actor->eyePos; } } static void e_rd_wb_ride(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; cXyz sp1c, sp28; - fopAc_ac_c* wb_actor_p = fopAcM_SearchByID(i_this->mWbActorID); + fopAc_ac_c* actor = fopAcM_SearchByID(i_this->boar_id); - if (wb_actor_p == NULL) { - i_this->mAction = ACTION_NORMAL; - i_this->mMode = 0; + if (actor == NULL) { + i_this->action = ACTION_NORMAL; + i_this->mode = 0; ride_off(i_this); return; } - e_wb_class* bullbo = (e_wb_class*) wb_actor_p; - if ((bullbo->mStatusFlags & 3) == 0) { + e_wb_class* boar = (e_wb_class*) actor; + if ((boar->mStatusFlags & 3) == 0) { OS_REPORT("......BOSS DL !!!!\n"); - if (bullbo->mActionID == 1) { - bullbo->mActionID = 0; + if (boar->mActionID == 1) { + boar->mActionID = 0; } - fopAcM_delete(a_this); + fopAcM_delete(enemy); return; } - switch (i_this->mMode) { + switch (i_this->mode) { case 0: { - i_this->mMode = 1; - if (i_this->mBossMode == 0) { + i_this->mode = 1; + if (i_this->actor_set == 0) { anm_init(i_this, BCK_RD_JUMP_C, 1.0f, 0, 1.0f); } } // fallthrough case 1: { - if (i_this->mpModelMorf->isStop() || i_this->mBossMode != 0) { - if (i_this->mBossMode != 0) { - bullbo->mActionMode = 0; - i_this->mMode = 0; + if (i_this->anm_p->isStop() || i_this->actor_set != 0) { + if (i_this->actor_set != 0) { + boar->mActionMode = 0; + i_this->mode = 0; - if (i_this->mBossMode == 3) { - bullbo->mActionID = 17; + if (i_this->actor_set == 3) { + boar->mActionID = 17; // Hyrule Field if (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0) { - bullbo->mActionMode = -100; - i_this->mAction = ACTION_IKKI2_START; + boar->mActionMode = -100; + i_this->action = ACTION_IKKI2_START; } else { - i_this->mAction = ACTION_WB_RUN; + i_this->action = ACTION_WB_RUN; } - } else if (i_this->mBossMode == 2) { - bullbo->mActionID = 15; - i_this->mAction = ACTION_WB_RUN; - } else if (i_this->mBossMode == 4) { - bullbo->mActionID = 19; - i_this->mAction = ACTION_LV9_END; + } else if (i_this->actor_set == 2) { + boar->mActionID = 15; + i_this->action = ACTION_WB_RUN; + } else if (i_this->actor_set == 4) { + boar->mActionID = 19; + i_this->action = ACTION_LV9_END; } else if (cDmr_SkipInfo == 0) { - i_this->mAction = ACTION_KIBA_START; - bullbo->mActionID = 30; + i_this->action = ACTION_KIBA_START; + boar->mActionID = 30; } else { - bullbo->mActionID = 8; - i_this->mAction = ACTION_WB_RUN; - bullbo->field_0x79c = 10; + boar->mActionID = 8; + i_this->action = ACTION_WB_RUN; + boar->field_0x79c = 10; Z2GetAudioMgr()->subBgmStart(Z2BGM_HORSE_BATTLE); } } else { - bullbo->mActionID = 6; - bullbo->mActionMode = 0; - i_this->mAction = ACTION_WB_RUN; - i_this->mMode = 0; + boar->mActionID = 6; + boar->mActionMode = 0; + i_this->action = ACTION_WB_RUN; + i_this->mode = 0; } } } @@ -2173,50 +2173,50 @@ static void e_rd_wb_ride(e_rd_class* i_this) { } static void e_rd_wb_run(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; cXyz sp3c, sp48; - fopAc_ac_c* base_bulb_p = (fopAc_ac_c*) fopAcM_SearchByID(i_this->mWbActorID); + fopAc_ac_c* actor = (fopAc_ac_c*) fopAcM_SearchByID(i_this->boar_id); - if (base_bulb_p == NULL) { - fopAcM_delete(a_this); + if (actor == NULL) { + fopAcM_delete(enemy); return; } - e_wb_class* bullbo = (e_wb_class*) base_bulb_p; - if (bullbo->field_0x17e1) { - fopAcM_setStageLayer(a_this); + e_wb_class* boar = (e_wb_class*) actor; + if (boar->field_0x17e1) { + fopAcM_setStageLayer(enemy); } - if ((bullbo->mStatusFlags & 3) == 0) { - fopAcM_delete(a_this); + if ((boar->mStatusFlags & 3) == 0) { + fopAcM_delete(enemy); return; } if (daPy_getPlayerActorClass()->checkHorseRide()) { dAttention_c* attention = dComIfGp_getAttention(); - if (attention->Lockon() && a_this == attention->LockonTarget(0)) { - bullbo->field_0x6c0 = 1; + if (attention->Lockon() && enemy == attention->LockonTarget(0)) { + boar->field_0x6c0 = 1; } } - if ((bullbo->mStatusFlags & 1) == 0 && bullbo->mActionID == ACTION_BOW2 && i_this->mMode != 40) { + if ((boar->mStatusFlags & 1) == 0 && boar->mActionID == ACTION_BOW2 && i_this->mode != 40) { anm_init(i_this, BCK_RD_RRUN02_BACK, 5.0f, 2, 1.0f); - i_this->mMode = 40; + i_this->mode = 40; - if (i_this->mpMorfBowAnm != NULL) { - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, BCK_RD_BOW_SHOOT), + if (i_this->bow_anm != NULL) { + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, BCK_RD_BOW_SHOOT), 0, 1.0f, 1.0f, 0.0f, -1.0f); } } - f32 playerDistance = fopAcM_searchPlayerDistanceXZ(a_this); - int frame = i_this->mpModelMorf->getFrame(); + f32 player_dist = fopAcM_searchPlayerDistanceXZ(enemy); + int frame = i_this->anm_p->getFrame(); - switch (i_this->mMode) { + switch (i_this->mode) { case 0: - if ((bullbo->mStatusFlags & 4) != 0) { - if (i_this->field_0x9be == 1) { - if (bullbo->field_0x6d0 < 0) { + if ((boar->mStatusFlags & 4) != 0) { + if (i_this->boar_stand == 1) { + if (boar->field_0x6d0 < 0) { anm_init(i_this, BCK_RD_RSTEP_L, 10.0f, 2, 1.0f); } else { anm_init(i_this, BCK_RD_RSTEP_R, 10.0f, 2, 1.0f); @@ -2225,24 +2225,24 @@ static void e_rd_wb_run(e_rd_class* i_this) { anm_init(i_this, BCK_RD_RSTEP_BACK, 10.0f, 2, 1.0f); } } else { - if ((bullbo->mStatusFlags & 8) != 0) { - if (i_this->field_0x9be == 1) { + if ((boar->mStatusFlags & 8) != 0) { + if (i_this->boar_stand == 1) { anm_init(i_this, BCK_RD_RDAMAGE, 3.0f, 0, 1.0f); } else { anm_init(i_this, BCK_RD_RDAMAGE_BACK, 3.0f, 0, 1.0f); } - i_this->field_0x990[1] = cM_rndF(50.0f) + 50.0f; + i_this->timer[1] = cM_rndF(50.0f) + 50.0f; } else { - if ((bullbo->mStatusFlags & 16) != 0) { - if (i_this->field_0x9be == 1) { + if ((boar->mStatusFlags & 16) != 0) { + if (i_this->boar_stand == 1) { anm_init(i_this, BCK_RD_RRUN, 5.0f, 2, 1.0f); } else { anm_init(i_this, BCK_RD_RRUN_BACK, 5.0f, 2, 1.0f); } } else { - if ((bullbo->mStatusFlags & 32) != 0) { - if (i_this->field_0x9be == 1) { + if ((boar->mStatusFlags & 32) != 0) { + if (i_this->boar_stand == 1) { anm_init(i_this, BCK_RD_RWAIT, 5.0f, 2, 1.0f); } else { anm_init(i_this, BCK_RD_RWAIT_BACK, 5.0f, 2, 1.0f); @@ -2252,31 +2252,31 @@ static void e_rd_wb_run(e_rd_class* i_this) { } } - i_this->mpModelMorf->setPlaySpeed(bullbo->mpModelMorf->getPlaySpeed()); + i_this->anm_p->setPlaySpeed(boar->mpModelMorf->getPlaySpeed()); - if (i_this->field_0x9be == 1) { + if (i_this->boar_stand == 1) { i_this->field_0x9c8 = 2; } else { i_this->field_0x9c8 = 1; - if (i_this->field_0x5bc == 1 && base_bulb_p->speedF > 10.0f) { - if (playerDistance < TREG_F(11) + 850.0f && playerDistance < TREG_F(11) + 750.0f - && i_this->field_0x990[2] == 0) { - s16 sVar1 = a_this->shape_angle.y - i_this->mPlayerAngleY; - if (sVar1 > 0x1000 && sVar1 < 0x4000) { - i_this->mMode = 10; - } else if (sVar1 < -0x1000 && sVar1 > -0x4000) { - i_this->mMode = 20; + if (i_this->weapon_type == 1 && actor->speedF > 10.0f) { + if (player_dist < TREG_F(11) + 850.0f && player_dist < TREG_F(11) + 750.0f + && i_this->timer[2] == 0) { + s16 range = enemy->shape_angle.y - i_this->angleY; + if (range > 0x1000 && range < 0x4000) { + i_this->mode = 10; + } else if (range < -0x1000 && range > -0x4000) { + i_this->mode = 20; } if (daPy_getPlayerActorClass()->checkHorseRide() && dComIfGp_getHorseActor()->speedF >= 20.0f) { - i_this->field_0x990[2] = cM_rndF(20.0f) + 20.0f; + i_this->timer[2] = cM_rndF(20.0f) + 20.0f; } } } else { - if (i_this->field_0x990[1] == 0 && i_this->field_0x5bc >= 2) { + if (i_this->timer[1] == 0 && i_this->weapon_type >= 2) { anm_init(i_this, BCK_RD_RSHOOT_READY, 5.0f, 0, 1.0f); - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, BCK_RD_BOW_RREADY), 0, 5.0f, 1.0f, 0.0f, -1.0f); - i_this->mMode = 30; + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, BCK_RD_BOW_RREADY), 0, 5.0f, 1.0f, 0.0f, -1.0f); + i_this->mode = 30; } } } @@ -2284,18 +2284,18 @@ static void e_rd_wb_run(e_rd_class* i_this) { case 10: anm_init(i_this, BCK_RD_RATTACK01_WAIT, 10.0f, 2, 1.0f); - i_this->mMode = 11; + i_this->mode = 11; // fallthrough case 11: - if (playerDistance > 800.0f + TREG_F(10)) { - i_this->mMode = 0; - if (i_this->field_0x9be == 1) { + if (player_dist > 800.0f + TREG_F(10)) { + i_this->mode = 0; + if (i_this->boar_stand == 1) { anm_init(i_this, BCK_RD_RRUN, 10.0f, 2, 1.0f); } else { anm_init(i_this, BCK_RD_RRUN_BACK, 10.0f, 2, 1.0f); } - } else if (playerDistance < 550.0f && i_this->field_0x990[2] == 0) { - i_this->mMode = 25; + } else if (player_dist < 550.0f && i_this->timer[2] == 0) { + i_this->mode = 25; if (daPy_getPlayerActorClass()->checkHorseRide()) { anm_init(i_this, BCK_RD_RATTACK03, 5.0f, 0, 1.0f); } else { @@ -2306,19 +2306,19 @@ static void e_rd_wb_run(e_rd_class* i_this) { case 20: anm_init(i_this, BCK_RD_RATTACK02_WAIT, 10.0f, 2, 1.0f); - i_this->mMode = 21; + i_this->mode = 21; // fallthrough case 21: i_this->field_0x9ab = 1; - if (playerDistance > 800.0f + TREG_F(10)) { - i_this->mMode = 0; - if (i_this->field_0x9be == 1) { + if (player_dist > 800.0f + TREG_F(10)) { + i_this->mode = 0; + if (i_this->boar_stand == 1) { anm_init(i_this, BCK_RD_RRUN, 10.0f, 2, 1.0f); } else { anm_init(i_this, BCK_RD_RRUN_BACK, 10.0f, 2, 1.0f); } - } else if (playerDistance < 550.0f && i_this->field_0x990[2] == 0) { - i_this->mMode = 25; + } else if (player_dist < 550.0f && i_this->timer[2] == 0) { + i_this->mode = 25; if (daPy_getPlayerActorClass()->checkHorseRide()) { anm_init(i_this, BCK_RD_RATTACK04, 5.0f, 0, 1.0f); } else { @@ -2332,30 +2332,30 @@ static void e_rd_wb_run(e_rd_class* i_this) { i_this->field_0x9ab = 1; } - if (i_this->mpModelMorf->checkFrame(15.0f)) { - i_this->mSound.startCreatureSound(Z2SE_EN_RD_SWING_CLUB, 0, -1); + if (i_this->anm_p->checkFrame(15.0f)) { + i_this->sound.startCreatureSound(Z2SE_EN_RD_SWING_CLUB, 0, -1); } - if (i_this->mpModelMorf->isStop()) { - if (i_this->field_0x9be == 1) { + if (i_this->anm_p->isStop()) { + if (i_this->boar_stand == 1) { anm_init(i_this, BCK_RD_RRUN, 10.0f, 2, 1.0f); } else { anm_init(i_this, BCK_RD_RRUN_BACK, 10.0f, 2, 1.0f); - i_this->field_0x990[2] = cM_rndF(20.0f) + 20.0f; + i_this->timer[2] = cM_rndF(20.0f) + 20.0f; } - i_this->mMode = 0; + i_this->mode = 0; } break; case 30: i_this->field_0x9c8 = 3; if (frame == 14) { - i_this->mSound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1); + i_this->sound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1); } - if (i_this->mpModelMorf->isStop()) { - i_this->mMode = 31; + if (i_this->anm_p->isStop()) { + i_this->mode = 31; anm_init(i_this, BCK_RD_RSHOOT_WAIT, 4.0f, 2, 1.0f); } @@ -2364,12 +2364,12 @@ static void e_rd_wb_run(e_rd_class* i_this) { case 31: i_this->field_0x9c8 = 3; - if (i_this->field_0x990[1] == 0 && i_this->mPlayerDistance < l_HIO.mounted_launch_distance + if (i_this->timer[1] == 0 && i_this->dis < l_HIO.mounted_launch_distance && i_this->field_0x9a4 == 0 && !dComIfGp_event_runCheck()) { anm_init(i_this, BCK_RD_RSHOOT, 1.0f, 0, 1.0f); - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 10), + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); - i_this->mMode = 32; + i_this->mode = 32; } i_this->field_0x9a2 = 1; @@ -2381,55 +2381,55 @@ static void e_rd_wb_run(e_rd_class* i_this) { } if (frame == 2 + XREG_S(7)) { - i_this->field_0x9a3 = 1; + i_this->arrow_flag = 1; } i_this->field_0x9c8 = 3; - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_RSHOOT_READY, 5.0f, 0, 1.0f); - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 8), + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 8), 0, 5.0f, 1.0f, 0.0f, -1.0f); - i_this->mMode = 30; + i_this->mode = 30; - if (i_this->field_0x9bc == 2 && i_this->field_0x5bb != 0) { - i_this->field_0x990[1] = cM_rndF(30.0f) + 20.0f; + if (i_this->ride_mode == 2 && i_this->field_0x5bb != 0) { + i_this->timer[1] = cM_rndF(30.0f) + 20.0f; } else { - i_this->field_0x990[1] = cM_rndF(50.0f) + 30.0f; + i_this->timer[1] = cM_rndF(50.0f) + 30.0f; } } break; case 40: - if (bullbo->mActionID != 7) { - i_this->mMode = 0; + if (boar->mActionID != 7) { + i_this->mode = 0; anm_init(i_this, BCK_RD_RWAIT_BACK, 5.0f, 2, 1.0f); } break; case 50: - if (i_this->field_0x990[3] == 0) { - i_this->mMode = 0; - if (i_this->field_0x9be == 1) { + if (i_this->timer[3] == 0) { + i_this->mode = 0; + if (i_this->boar_stand == 1) { anm_init(i_this, BCK_RD_RRUN, 10.0f, 2, 1.0f); } else { anm_init(i_this, BCK_RD_RRUN_BACK, 10.0f, 2, 1.0f); - i_this->field_0x990[2] = cM_rndF(50.0f) + 50.0f; + i_this->timer[2] = cM_rndF(50.0f) + 50.0f; } } } - if (i_this->field_0x9be == 2 && i_this->mAnmID == BCK_RD_RRUN_BACK) { - i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_RD_V_RIDING_YELL, -1); + if (i_this->boar_stand == 2 && i_this->anm == BCK_RD_RRUN_BACK) { + i_this->sound.startCreatureVoiceLevel(Z2SE_EN_RD_V_RIDING_YELL, -1); } } static void* s_wbrun_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { - e_wb_class* bullbo = (e_wb_class*)i_actor; - fopAc_ac_c* actor_p = (fopAc_ac_c*)i_data; - if (bullbo->field_0x79d == 0) { - cXyz sp24(bullbo->mEnemy.current.pos - actor_p->current.pos); + e_wb_class* boar = (e_wb_class*)i_actor; + fopAc_ac_c* actor = (fopAc_ac_c*)i_data; + if (boar->field_0x79d == 0) { + cXyz sp24(boar->mEnemy.current.pos - actor->current.pos); if (sp24.abs() > KREG_F(11) + 7000.0f) { return i_actor; } @@ -2440,276 +2440,276 @@ static void* s_wbrun_sub(void* i_actor, void* i_data) { } static void e_rd_wb_run_B(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; cXyz unused_vec_0, unused_vec_1; - fopAc_ac_c* base_bulb_p = fopAcM_SearchByID(i_this->mWbActorID); + fopAc_ac_c* actor = fopAcM_SearchByID(i_this->boar_id); dAttention_c* attention; - if (base_bulb_p != NULL) { - if (i_this->mBossMode == 2 || i_this->mBossMode == 3) { - fopAcM_OffStatus(a_this, 0); - a_this->attention_info.flags = 0; + if (actor != NULL) { + if (i_this->actor_set == 2 || i_this->actor_set == 3) { + fopAcM_OffStatus(enemy, 0); + enemy->attention_info.flags = 0; } - e_wb_class* bullbo = (e_wb_class*) base_bulb_p; + e_wb_class* boar = (e_wb_class*) actor; if (daPy_getPlayerActorClass()->checkHorseRide()) { attention = dComIfGp_getAttention(); - if (attention->Lockon() && a_this == attention->LockonTarget(0)) { - bullbo->field_0x6c0 = 1; + if (attention->Lockon() && enemy == attention->LockonTarget(0)) { + boar->field_0x6c0 = 1; } } - switch (i_this->mMode) { + switch (i_this->mode) { case 0: { - if ((bullbo->mStatusFlags & 0x400) != 0) { + if ((boar->mStatusFlags & 0x400) != 0) { anm_init(i_this, e_rdb_class::BCK_RB_RSTARTLOOP, 10.0f, 2, 1.0f); - } else if ((bullbo->mStatusFlags & 0x800) != 0) { + } else if ((boar->mStatusFlags & 0x800) != 0) { anm_init(i_this, e_rdb_class::BCK_RB_RSTART, 10.0f, 2, 1.0f); } - i_this->mpModelMorf->setPlaySpeed(bullbo->mpModelMorf->getPlaySpeed()); + i_this->anm_p->setPlaySpeed(boar->mpModelMorf->getPlaySpeed()); break; } } - if (i_this->mAnmID == e_rdb_class::BCK_RB_RGUARD_F || i_this->mAnmID == e_rdb_class::BCK_RB_RDAMAGEB - || i_this->mAnmID == e_rdb_class::BCK_RB_RGUARD_L || i_this->mAnmID == e_rdb_class::BCK_RB_RGUARD_R) { + if (i_this->anm == e_rdb_class::BCK_RB_RGUARD_F || i_this->anm == e_rdb_class::BCK_RB_RDAMAGEB + || i_this->anm == e_rdb_class::BCK_RB_RGUARD_L || i_this->anm == e_rdb_class::BCK_RB_RGUARD_R) { i_this->field_0x9c8 = 0; - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, e_rdb_class::BCK_RB_RRUN, 5.0f, 2, 1.0f); } - } else if (i_this->mAnmID == e_rdb_class::BCK_RB_RPLAY_RUNR || i_this->mAnmID == e_rdb_class::BCK_RB_RPLAY_RUNL - || i_this->mAnmID == e_rdb_class::BCK_RB_RPLAY_STOP) { - if ((int)i_this->mpModelMorf->getFrame() == 21) { - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_HORN, -1); + } else if (i_this->anm == e_rdb_class::BCK_RB_RPLAY_RUNR || i_this->anm == e_rdb_class::BCK_RB_RPLAY_RUNL + || i_this->anm == e_rdb_class::BCK_RB_RPLAY_STOP) { + if ((int)i_this->anm_p->getFrame() == 21) { + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_HORN, -1); } - } else if (i_this->mAnmID == e_rdb_class::BCK_RB_RRUN) { - if (i_this->field_0x990[1] == 0) { - i_this->field_0x990[1] = cM_rndF(100.0f) + 70.0f; - i_this->field_0x990[2] = cM_rndF(30.0f) + 30.0f; + } else if (i_this->anm == e_rdb_class::BCK_RB_RRUN) { + if (i_this->timer[1] == 0) { + i_this->timer[1] = cM_rndF(100.0f) + 70.0f; + i_this->timer[2] = cM_rndF(30.0f) + 30.0f; } - if (i_this->field_0x990[2] != 0) { + if (i_this->timer[2] != 0) { i_this->field_0x9c8 = 1; } - if (a_this->speedF < 5.0f) { + if (enemy->speedF < 5.0f) { anm_init(i_this, e_rdb_class::BCK_RB_RWAIT, 5.0f, 2, 1.0f); } } else { i_this->field_0x9c8 = 1; - if (i_this->field_0x990[3] < 200) { - i_this->field_0x990[3] = cM_rndF(100.0f) + 200.0f; + if (i_this->timer[3] < 200) { + i_this->timer[3] = cM_rndF(100.0f) + 200.0f; } - if (a_this->speedF > 10.0f) { + if (enemy->speedF > 10.0f) { anm_init(i_this, e_rdb_class::BCK_RB_RRUN, 5.0f, 2, 1.0f); } } - if (fpcM_Search(s_wbrun_sub, i_this) != NULL && i_this->field_0x990[3] == 0) { - i_this->field_0x6c2 = 1; - i_this->field_0x990[3] = cM_rndF(100.0f) + 200.0f; + if (fpcM_Search(s_wbrun_sub, i_this) != NULL && i_this->timer[3] == 0) { + i_this->run_flag = 1; + i_this->timer[3] = cM_rndF(100.0f) + 200.0f; } // check if we need to jump a fence - if ((bullbo->mStatusFlags & 0x100) != 0) { - i_this->mAction = ACTION_WB_BJUMP; - i_this->mMode = 0; + if ((boar->mStatusFlags & 0x100) != 0) { + i_this->action = ACTION_WB_BJUMP; + i_this->mode = 0; } } } static void e_rd_wb_bjump(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; cXyz unused_vec_0, unused_vec_1; - fopAc_ac_c* base_bulb_p = fopAcM_SearchByID(i_this->mWbActorID); + fopAc_ac_c* actor = fopAcM_SearchByID(i_this->boar_id); dAttention_c* attention; - if (base_bulb_p != NULL) { - e_wb_class* bullbo = (e_wb_class*) base_bulb_p; + if (actor != NULL) { + e_wb_class* boar = (e_wb_class*) actor; if (daPy_getPlayerActorClass()->checkHorseRide()) { attention = dComIfGp_getAttention(); - if (attention->Lockon() && a_this == attention->LockonTarget(0)) { - bullbo->field_0x6c0 = 1; + if (attention->Lockon() && enemy == attention->LockonTarget(0)) { + boar->field_0x6c0 = 1; } } - switch (i_this->mMode) { + switch (i_this->mode) { case 0: i_this->field_0x680 = 0; anm_init(i_this, BCK_RD_RSTEP_RBACK, 3.0f, 0, 1.0f); - i_this->mMode = 1; - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); + i_this->mode = 1; + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); break; case 1: - if (i_this->mpModelMorf->isStop()) { - i_this->mMode = 2; + if (i_this->anm_p->isStop()) { + i_this->mode = 2; anm_init(i_this, BCK_RD_RUN, 2.0f, 0, 1.0f); } break; case 2: - if ((bullbo->mStatusFlags & 0x200) != 0) { + if ((boar->mStatusFlags & 0x200) != 0) { anm_init(i_this, BCK_RD_RUN02, 2.0f, 0, 1.0f); - i_this->mMode = 3; + i_this->mode = 3; } break; case 3: - if (i_this->mpModelMorf->isStop()) { - i_this->mAction = ACTION_WB_RUN; - i_this->mMode = 0; + if (i_this->anm_p->isStop()) { + i_this->action = ACTION_WB_RUN; + i_this->mode = 0; } } } } static void e_rd_bomb_action(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - cXyz sp48, sp54; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + cXyz mae, ato; dBomb_c* bomb = bomb_check(i_this); if (bomb == NULL) { int _; // needed to force dbg stack into r31 - i_this->mAction = ACTION_FIGHT_RUN; - i_this->mMode = 0; + i_this->action = ACTION_FIGHT_RUN; + i_this->mode = 0; return; } - sp48.x = bomb->current.pos.x - a_this->current.pos.x; - sp48.z = bomb->current.pos.z - a_this->current.pos.z; - s16 sVar1 = cM_atan2s(sp48.x, sp48.z); - f32 fVar1 = 0.0f; - s16 sVar2; + mae.x = bomb->current.pos.x - enemy->current.pos.x; + mae.z = bomb->current.pos.z - enemy->current.pos.z; + s16 angle = cM_atan2s(mae.x, mae.z); + f32 speed = 0.0f; + s16 range; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: - i_this->mMode = 1; + i_this->mode = 1; anm_init(i_this, BCK_RD_WAIT01, 5.0f, 2, 1.0f); - i_this->field_0x990[1] = cM_rndF(10.0f) + 10.0f; + i_this->timer[1] = cM_rndF(10.0f) + 10.0f; // fallthrough case 1: - if (i_this->field_0x990[1] == 0 && bomb->speedF < 0.1f) { - i_this->mMode = 2; + if (i_this->timer[1] == 0 && bomb->speedF < 0.1f) { + i_this->mode = 2; anm_init(i_this, BCK_RD_RUN, 5.0f, 2, cM_rndFX(0.05f) + 1.0f); } break; case 2: if (bomb->speedF < 0.1f && !bomb->checkStateCarry()) { - if (JMAFastSqrt(sp48.x * sp48.x + sp48.z * sp48.z) < 250.0f) { - sVar2 = i_this->mPlayerAngleY - a_this->shape_angle.y; - if (sVar2 < 0x4000 && sVar2 > -0x4000) { - i_this->mMode = 5; + if (JMAFastSqrt(mae.x * mae.x + mae.z * mae.z) < 250.0f) { + range = i_this->angleY - enemy->shape_angle.y; + if (range < 0x4000 && range > -0x4000) { + i_this->mode = 5; break; } } } - ANGLE_ADD_2(sVar1, 0x8000); - fVar1 = l_HIO.dash_speed; - if (JMAFastSqrt(sp48.x * sp48.x + sp48.z * sp48.z) > 600.0f) { - i_this->mMode = 3; + ANGLE_ADD_2(angle, 0x8000); + speed = l_HIO.dash_speed; + if (JMAFastSqrt(mae.x * mae.x + mae.z * mae.z) > 600.0f) { + i_this->mode = 3; anm_init(i_this, BCK_RD_WAIT01, 5.0f, 2, 1.0f); } break; case 3: - sVar1 = i_this->mPlayerAngleY; - if (JMAFastSqrt(sp48.x * sp48.x + sp48.z * sp48.z) < 500.0f) { - i_this->mMode = 0; + angle = i_this->angleY; + if (JMAFastSqrt(mae.x * mae.x + mae.z * mae.z) < 500.0f) { + i_this->mode = 0; } break; case 5: - fVar1 = l_HIO.dash_speed; + speed = l_HIO.dash_speed; i_this->field_0x9ad = 0; if (bomb->speedF > 0.1f) { - i_this->mMode = 0; - } else if (JMAFastSqrt(sp48.x * sp48.x + sp48.z * sp48.z) < 100.0f) { - i_this->field_0x990[0] = 20; - i_this->mMode = 6; + i_this->mode = 0; + } else if (JMAFastSqrt(mae.x * mae.x + mae.z * mae.z) < 100.0f) { + i_this->timer[0] = 20; + i_this->mode = 6; anm_init(i_this, BCK_RD_KICK, 3.0f, 0, 1.0f); } break; case 6: i_this->field_0x9ad = 0; - sVar1 = i_this->mPlayerAngleY; - if ((int)i_this->mpModelMorf->getFrame() <= 10) { - cMtx_YrotS(*calc_mtx, sVar1); - sp48.x = TREG_F(15) + -30.0f; - sp48.y = 0.0f; - sp48.z = TREG_F(16) + 60.0f; - MtxPosition(&sp48, &sp54); - sp54 += a_this->current.pos; - cLib_addCalc2(&bomb->current.pos.x, sp54.x, 1.0f, 15.0f); - cLib_addCalc2(&bomb->current.pos.z, sp54.z, 1.0f, 15.0f); - if ((int)i_this->mpModelMorf->getFrame() == 10) { + angle = i_this->angleY; + if ((int)i_this->anm_p->getFrame() <= 10) { + cMtx_YrotS(*calc_mtx, angle); + mae.x = TREG_F(15) + -30.0f; + mae.y = 0.0f; + mae.z = TREG_F(16) + 60.0f; + MtxPosition(&mae, &ato); + ato += enemy->current.pos; + cLib_addCalc2(&bomb->current.pos.x, ato.x, 1.0f, 15.0f); + cLib_addCalc2(&bomb->current.pos.z, ato.z, 1.0f, 15.0f); + if ((int)i_this->anm_p->getFrame() == 10) { bomb->speedF = 30.0f; bomb->speed.y = 30.0f; - bomb->current.angle.y = a_this->shape_angle.y; + bomb->current.angle.y = enemy->shape_angle.y; } } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_WAIT01, 5.0f, 2, 1.0f); - i_this->mMode = 3; + i_this->mode = 3; } } - cLib_addCalc2(&a_this->speedF, fVar1, 1.0f, 5.0f); - cLib_addCalcAngleS2(&a_this->current.angle.y, sVar1, 4, 0x1000); + cLib_addCalc2(&enemy->speedF, speed, 1.0f, 5.0f); + cLib_addCalcAngleS2(&enemy->current.angle.y, angle, 4, 0x1000); i_this->field_0x9c8 = 11; - i_this->field_0x9d4 = bomb->current.pos; + i_this->eye = bomb->current.pos; } static void e_rd_s_damage(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: - i_this->mMode = 1; - i_this->field_0x990[0] = 10; + i_this->mode = 1; + i_this->timer[0] = 10; - if (i_this->field_0x9be != 0) { - e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID); - if (bullbo != NULL) { - UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be, u16); + if (i_this->boar_stand != 0) { + e_wb_class* boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); + if (boar != NULL) { + UNSET_FLAG(boar->mStatusFlags, i_this->boar_stand, u16); } - i_this->field_0x9be = 0; - i_this->mWbActorID = -1; + i_this->boar_stand = 0; + i_this->boar_id = -1; } break; case 1: - if (i_this->field_0x990[1] != 0) { - i_this->actor.onHeadLockFlg(); - } - - if (i_this->mpModelMorf->isStop()) { - fopAc_ac_c* pla_p; - if (i_this->field_0x974 == 7) { - i_this->mAction = ACTION_BOW2; - } else if (i_this->field_0x974 == 26) { - i_this->mAction = ACTION_BOW3; - } else if (!other_bg_check(i_this, pla_p = dComIfGp_getPlayer(0))) { - i_this->mAction = ACTION_FIGHT_RUN; - i_this->field_0x990[0] = 40; + if (i_this->timer[1] != 0) { + i_this->enemy.onHeadLockFlg(); + } + + if (i_this->anm_p->isStop()) { + fopAc_ac_c* actor; + if (i_this->prev_action == 7) { + i_this->action = ACTION_BOW2; + } else if (i_this->prev_action == 26) { + i_this->action = ACTION_BOW3; + } else if (!other_bg_check(i_this, actor = dComIfGp_getPlayer(0))) { + i_this->action = ACTION_FIGHT_RUN; + i_this->timer[0] = 40; } else { - i_this->mAction = ACTION_NORMAL; + i_this->action = ACTION_NORMAL; } - i_this->mMode = 0; + i_this->mode = 0; } break; } - cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f); + cLib_addCalc0(&enemy->speedF, 1.0f, 3.0f); } static int kado_check(e_rd_class* i_this) { @@ -2721,86 +2721,86 @@ static int kado_check(e_rd_class* i_this) { 80.0f, -80.0f, }; - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; dBgS_LinChk lin_chk; - cXyz sp9c, spa8, spb4; - BOOL rv = FALSE; + cXyz mae, start, ato; + BOOL rt = FALSE; - cMtx_YrotS(*calc_mtx, i_this->field_0xa0c.y); + cMtx_YrotS(*calc_mtx, i_this->jump_angle.y); for (int i = 0; i < 2; i++) { - spa8 = a_this->current.pos; - spa8.y += 100.0f + JREG_F(0); - sp9c.x = JREG_F(1); - sp9c.y = JREG_F(2); - sp9c.z = 70.0f + JREG_F(3); - MtxPosition(&sp9c, &spb4); - spa8 += spb4; - sp9c.y = 50.0f + JREG_F(4); - sp9c.z = -150.0f + JREG_F(5); - sp9c.x = (1.0f + JREG_F(6)) * kado_check_x[i]; - MtxPosition(&sp9c, &spb4); - spb4 += spa8; - lin_chk.Set(&spa8, &spb4, a_this); + start = enemy->current.pos; + start.y += 100.0f + JREG_F(0); + mae.x = JREG_F(1); + mae.y = JREG_F(2); + mae.z = 70.0f + JREG_F(3); + MtxPosition(&mae, &ato); + start += ato; + mae.y = 50.0f + JREG_F(4); + mae.z = -150.0f + JREG_F(5); + mae.x = (1.0f + JREG_F(6)) * kado_check_x[i]; + MtxPosition(&mae, &ato); + ato += start; + lin_chk.Set(&start, &ato, enemy); if (dComIfG_Bgsp().LineCross(&lin_chk)) { - rv |= kado_bit[i]; + rt |= kado_bit[i]; } } - if (rv == 3) { - rv = FALSE; + if (rt == 3) { + rt = FALSE; } - return rv; + return rt; } static void rd_disappear(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - cXyz sp1c, sp28; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + cXyz mae, ato; - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(11), *calc_mtx); - sp1c.set(0.0f, 0.0f, 0.0f); - MtxPosition(&sp1c, &sp28); + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(11), *calc_mtx); + mae.set(0.0f, 0.0f, 0.0f); + MtxPosition(&mae, &ato); - u8 reg_r27 = 0; + u8 type = 0; if (fopAcM_SearchByName(PROC_NPC_COACH) != NULL) { - fopAcM_createDisappear(a_this, &sp28, 10, reg_r27, 51); + fopAcM_createDisappear(enemy, &ato, 10, type, 51); } else { - fopAcM_createDisappear(a_this, &sp28, 10, reg_r27, 11); + fopAcM_createDisappear(enemy, &ato, 10, type, 11); } - fopAcM_delete(a_this); + fopAcM_delete(enemy); - int swBit = (fopAcM_GetParam(a_this) & 0xFF000000) >> 24; - if (swBit != 0xFF) { - dComIfGs_onSwitch(swBit, fopAcM_GetRoomNo(a_this)); + int bitsw = (fopAcM_GetParam(enemy) & 0xFF000000) >> 24; + if (bitsw != 0xFF) { + dComIfGs_onSwitch(bitsw, fopAcM_GetRoomNo(enemy)); } - if (i_this->field_0x9be != 0) { - e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID); - if (bullbo != NULL) { - UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be, u16); - if (bullbo->mActionID == 1) { - bullbo->mActionID = 0; + if (i_this->boar_stand != 0) { + e_wb_class* boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); + if (boar != NULL) { + UNSET_FLAG(boar->mStatusFlags, i_this->boar_stand, u16); + if (boar->mActionID == 1) { + boar->mActionID = 0; } } } } static BOOL body_gake(e_rd_class* i_this) { - J3DModel* model = i_this->mpModelMorf->getModel(); - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - cXyz sp7c, sp88; + J3DModel* model = i_this->anm_p->getModel(); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + cXyz mae, ato; MTXCopy(model->getAnmMtx(11), *calc_mtx); - sp7c.set(40.0f + BREG_F(10), BREG_F(11), BREG_F(12)); - MtxPosition(&sp7c, &sp88); + mae.set(40.0f + BREG_F(10), BREG_F(11), BREG_F(12)); + MtxPosition(&mae, &ato); dBgS_ObjGndChk gnd_chk; - sp88.y += 100.0f; - gnd_chk.SetPos(&sp88); - sp88.y = dComIfG_Bgsp().GroundCross(&gnd_chk); + ato.y += 100.0f; + gnd_chk.SetPos(&ato); + ato.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if ((a_this->current.pos.y - sp88.y) > 300.0f) { + if ((enemy->current.pos.y - ato.y) > 300.0f) { return TRUE; } @@ -2808,58 +2808,58 @@ static BOOL body_gake(e_rd_class* i_this) { } static void e_rd_damage(e_rd_class* i_this) { - fopAc_ac_c* a_this = &i_this->actor; - fopEn_enemy_c* rd_enemy_p = (fopEn_enemy_c*) a_this; - cXyz sp34, sp40; + fopAc_ac_c* actor = &i_this->enemy; + fopEn_enemy_c* enemy = (fopEn_enemy_c*) actor; + cXyz mae, ato; - if (a_this->health <= 0) { - fopAcM_OffStatus(a_this, 0); - a_this->attention_info.flags = 0; + if (actor->health <= 0) { + fopAcM_OffStatus(actor, 0); + actor->attention_info.flags = 0; } i_this->field_0x6d0 = 0.0f; if (daPy_py_c::checkNowWolf() != 0) { - if (i_this->field_0xafa == 0 && rd_enemy_p->checkWolfDownStartFlg()) { - if (i_this->field_0x990[0] > 40) { - i_this->field_0x990[0] = 90; + if (i_this->field_0xafa == 0 && enemy->checkWolfDownStartFlg()) { + if (i_this->timer[0] > 40) { + i_this->timer[0] = 90; OS_REPORT(" RD WOLFHIT LONG \n"); - } else if (i_this->field_0x990[0] > 20) { - i_this->field_0x990[0] = 70; + } else if (i_this->timer[0] > 20) { + i_this->timer[0] = 70; OS_REPORT(" RD WOLFHIT MID \n"); } else { - i_this->field_0x990[0] = 50; + i_this->timer[0] = 50; OS_REPORT(" RD WOLFHIT SHORT \n"); } - i_this->mMode = 30; - i_this->field_0x990[1] = 16; + i_this->mode = 30; + i_this->timer[1] = 16; i_this->field_0xafa = 1; } - } else if (rd_enemy_p->checkCutDownHitFlg()) { - rd_enemy_p->offCutDownHitFlg(); - i_this->mMode = 3; - i_this->field_0x990[0] = 100; - i_this->field_0x990[1] = 45; - a_this->health = 0; - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_DEATH, -1); + } else if (enemy->checkCutDownHitFlg()) { + enemy->offCutDownHitFlg(); + i_this->mode = 3; + i_this->timer[0] = 100; + i_this->timer[1] = 45; + actor->health = 0; + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_DEATH, -1); i_this->field_0x968 = 1; daPy_getPlayerActorClass()->onEnemyDead(); i_this->field_0xadc = 15 + TREG_S(7); - rd_enemy_p->offDownFlg(); + enemy->offDownFlg(); } - s16 sVar1; - switch (i_this->mMode) { + s16 angle; + switch (i_this->mode) { case 0: anm_init(i_this, BCK_RD_DIEB, 3.0f, 0, 1.0f); - i_this->mMode = 1; - a_this->speedF = 0.0f; + i_this->mode = 1; + actor->speedF = 0.0f; ride_off(i_this); i_this->field_0xab8 = 8000.0f + BREG_F(10); - if (a_this->health <= 0) { - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_DEATH, -1); + if (actor->health <= 0) { + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_DEATH, -1); i_this->field_0x968 = 1; daPy_getPlayerActorClass()->onEnemyDead(); @@ -2867,67 +2867,67 @@ static void e_rd_damage(e_rd_class* i_this) { i_this->field_0x5ba = 0; } } else { - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_DAMAGE, -1); + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_DAMAGE, -1); } - i_this->field_0x990[0] = 0; + i_this->timer[0] = 0; break; case 1: - if (i_this->mObjAcch.ChkWallHit() != 0 && i_this->field_0x990[0] == 0) { + if (i_this->ObjAcch.ChkWallHit() != 0 && i_this->timer[0] == 0) { int kado_kabe; if ((kado_kabe = kado_check(i_this)) != 0) { OS_REPORT(" ..KADO KABE ..%x\n", kado_kabe); if (kado_kabe == 2) { i_this->field_0x9f6 = 0x1000; - ANGLE_ADD(i_this->field_0xa0c.y, TREG_S(8) - 7000); + ANGLE_ADD(i_this->jump_angle.y, TREG_S(8) - 7000); } else { i_this->field_0x9f6 = -0x1000; - ANGLE_ADD(i_this->field_0xa0c.y, -(TREG_S(8) - 7000)); + ANGLE_ADD(i_this->jump_angle.y, -(TREG_S(8) - 7000)); } i_this->field_0xab8 = 8000.0f + BREG_F(10); i_this->field_0xa24 = 100.0f + BREG_F(4); i_this->field_0xa2c = 100.0f + BREG_F(5); - i_this->field_0x990[0] = 60; + i_this->timer[0] = 60; break; } - i_this->mMode = 10; - a_this->speed.y = 0.0f; - i_this->field_0x9ec *= 0.2f; - ANGLE_ADD_2(i_this->field_0xa0c.y, 0x8000); + i_this->mode = 10; + actor->speed.y = 0.0f; + i_this->jump_z *= 0.2f; + ANGLE_ADD_2(i_this->jump_angle.y, 0x8000); i_this->field_0xaf0 = 5 + BREG_S(7); i_this->field_0xa24 = 100.0f + BREG_F(4); i_this->field_0xa2c = 100.0f + BREG_F(5); i_this->field_0x9f6 = 0; } else { - cLib_addCalcAngleS2(&i_this->field_0xa0c.x, -0x4000, 1, 0x300 + BREG_S(4)); - a_this->current.angle.y += i_this->field_0x9f6; - a_this->shape_angle.y = a_this->current.angle.y; + cLib_addCalcAngleS2(&i_this->jump_angle.x, -0x4000, 1, 0x300 + BREG_S(4)); + actor->current.angle.y += i_this->field_0x9f6; + actor->shape_angle.y = actor->current.angle.y; - if (i_this->field_0xa0c.x <= -0x3000 && i_this->mObjAcch.ChkGroundHit()) { + if (i_this->jump_angle.x <= -0x3000 && i_this->ObjAcch.ChkGroundHit()) { i_this->field_0xa1e = 10; if (i_this->field_0x1294 != 0) { - i_this->mSound.startCreatureSound(Z2SE_CM_BODYFALL_ASASE_M, 0, -1); + i_this->sound.startCreatureSound(Z2SE_CM_BODYFALL_ASASE_M, 0, -1); } else { - i_this->mSound.startCreatureSound(Z2SE_CM_BODYFALL_M, 0, -1); + i_this->sound.startCreatureSound(Z2SE_CM_BODYFALL_M, 0, -1); } - i_this->mMode = 2; + i_this->mode = 2; if (i_this->field_0xa1f == 0) { anm_init(i_this, BCK_RD_DIEA, 3.0f, 0, 1.0f); - sVar1 = (s16) i_this->field_0xa0c.y; + angle = (s16) i_this->jump_angle.y; } else { - sVar1 = i_this->field_0xa0c.y + 0x8000; + angle = i_this->jump_angle.y + 0x8000; } - a_this->current.angle.y = sVar1; + actor->current.angle.y = angle; - if (i_this->field_0x9f8 != 0) { - i_this->field_0x9ec = 0.0f; + if (i_this->damage_flag != 0) { + i_this->jump_z = 0.0f; i_this->field_0xab8 = 2000.0f + BREG_F(12); } else { if (i_this->field_0xa1f == 0) { @@ -2940,8 +2940,8 @@ static void e_rd_damage(e_rd_class* i_this) { i_this->field_0xa28 = -0x5000; i_this->field_0xa30 = -0x4000; - i_this->field_0x9ec *= 0.5f; - a_this->speed.y = 20.0f + TREG_F(6); + i_this->jump_z *= 0.5f; + actor->speed.y = 20.0f + TREG_F(6); i_this->field_0x9f6 /= 2; i_this->field_0xab8 = 8000.0f + BREG_F(12); i_this->field_0x125d = 1; @@ -2951,16 +2951,16 @@ static void e_rd_damage(e_rd_class* i_this) { break; case 2: - a_this->current.angle.y += i_this->field_0x9f6; - a_this->shape_angle.y = a_this->current.angle.y; - cLib_addCalcAngleS2(&i_this->field_0xa0c.x, -0x4000, 1, 0x300 + BREG_S(4)); + actor->current.angle.y += i_this->field_0x9f6; + actor->shape_angle.y = actor->current.angle.y; + cLib_addCalcAngleS2(&i_this->jump_angle.x, -0x4000, 1, 0x300 + BREG_S(4)); - if (i_this->mObjAcch.ChkGroundHit()) { - if (a_this->health > 0 && daPy_py_c::checkNowWolf() == 0) { - rd_enemy_p->onDownFlg(); + if (i_this->ObjAcch.ChkGroundHit()) { + if (actor->health > 0 && daPy_py_c::checkNowWolf() == 0) { + enemy->onDownFlg(); } - dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(i_this), 5); + dKy_Sound_set(actor->current.pos, 100, fopAcM_GetID(i_this), 5); i_this->field_0xa1e = 10; if (i_this->field_0xa1f == 0) { @@ -2969,28 +2969,28 @@ static void e_rd_damage(e_rd_class* i_this) { anm_init(i_this, BCK_RD_DIEB, 3.0f, 0, 1.0f); } - i_this->field_0x9ec = 0.0f; - i_this->field_0xa0c.x = -0x4000; + i_this->jump_z = 0.0f; + i_this->jump_angle.x = -0x4000; if (i_this->field_0xa1f == 0) { - sVar1 = s16(i_this->field_0xa0c.y); + angle = s16(i_this->jump_angle.y); for (int i = 0; i < 4; i++) { i_this->field_0xad2[i] = cM_rndF(10.0f); } } else { - sVar1 = i_this->field_0xa0c.y + 0x8000; + angle = i_this->jump_angle.y + 0x8000; } - a_this->current.angle.y = sVar1; + actor->current.angle.y = angle; if (daPy_py_c::checkNowWolf() != 0) { - i_this->field_0x990[0] = 80; - i_this->field_0x990[1] = 55; + i_this->timer[0] = 80; + i_this->timer[1] = 55; } else { - i_this->field_0x990[0] = cM_rndF(10.0f) + 60.0f; - i_this->field_0x990[1] = 35; + i_this->timer[0] = cM_rndF(10.0f) + 60.0f; + i_this->timer[1] = 35; } - i_this->mMode = 3; + i_this->mode = 3; i_this->field_0xab8 = 1500.0f + BREG_F(13); i_this->field_0x125d = 1; } @@ -2998,21 +2998,21 @@ static void e_rd_damage(e_rd_class* i_this) { case 3: if (body_gake(i_this)) { - i_this->field_0x9ec = -20.0f + VREG_F(8); - i_this->field_0xa0c.x -= s16(0x300 + VREG_S(7)); + i_this->jump_z = -20.0f + VREG_F(8); + i_this->jump_angle.x -= s16(0x300 + VREG_S(7)); } else { - i_this->field_0x9ec = 0.0f; + i_this->jump_z = 0.0f; } - if (a_this->health <= 0 && i_this->field_0x990[1] == 0) { + if (actor->health <= 0 && i_this->timer[1] == 0) { rd_disappear(i_this); return; } - if (daPy_getPlayerActorClass()->getCutType() != daPy_py_c::CUT_TYPE_DOWN && i_this->field_0x990[0] == 0) { - i_this->field_0xa0c.x = -0x4000; - rd_enemy_p->offDownFlg(); - i_this->mMode = 20; + if (daPy_getPlayerActorClass()->getCutType() != daPy_py_c::CUT_TYPE_DOWN && i_this->timer[0] == 0) { + i_this->jump_angle.x = -0x4000; + enemy->offDownFlg(); + i_this->mode = 20; if (i_this->field_0xa1f == 0) { anm_init(i_this, BCK_RD_DIEA_UP, 3.0f, 0, 1.0f); @@ -3024,11 +3024,11 @@ static void e_rd_damage(e_rd_class* i_this) { case 10: if (i_this->field_0xaf0 != 0) { - cLib_addCalcAngleS2(&i_this->field_0xa0c.x, 0, 1, 0x300 + BREG_S(4)); + cLib_addCalcAngleS2(&i_this->jump_angle.x, 0, 1, 0x300 + BREG_S(4)); } else { - cLib_addCalcAngleS2(&i_this->field_0xa0c.x, -0x4000, 1, 0x800 + BREG_S(5)); - if (i_this->mObjAcch.ChkGroundHit()) { - i_this->mMode = 2; + cLib_addCalcAngleS2(&i_this->jump_angle.x, -0x4000, 1, 0x800 + BREG_S(5)); + if (i_this->ObjAcch.ChkGroundHit()) { + i_this->mode = 2; if (i_this->field_0xa1f == 0) { anm_init(i_this, BCK_RD_DIEA, 3.0f, 0, 1.0f); i_this->field_0xa24 = -100.0f - BREG_F(6); @@ -3040,96 +3040,96 @@ static void e_rd_damage(e_rd_class* i_this) { i_this->field_0xa28 = -0x5000; i_this->field_0xa30 = -0x4000; - i_this->field_0x9ec *= 0.5f; - a_this->speed.y = 20.0f + TREG_F(6); + i_this->jump_z *= 0.5f; + actor->speed.y = 20.0f + TREG_F(6); if (i_this->field_0xa1f == 0) { - sVar1 = s16(i_this->field_0xa0c.y); + angle = s16(i_this->jump_angle.y); } else { - sVar1 = i_this->field_0xa0c.y + 0x8000; + angle = i_this->jump_angle.y + 0x8000; } - a_this->current.angle.y = sVar1; + actor->current.angle.y = angle; i_this->field_0xab8 = 8000.0f + BREG_F(12); } } break; case 20: - if (i_this->mpModelMorf->getFrame() >= 35.0f) { + if (i_this->anm_p->getFrame() >= 35.0f) { i_this->field_0xa18.x = i_this->field_0xa18.z = 0; } - if (i_this->mpModelMorf->isStop()) { - i_this->field_0xa0c.x = i_this->field_0xa0c.y = 0; + if (i_this->anm_p->isStop()) { + i_this->jump_angle.x = i_this->jump_angle.y = 0; anm_init(i_this, BCK_RD_WAIT01, 0.0f, 2, 1.0f); - i_this->field_0x990[0] = 5; - i_this->mMode = 21; + i_this->timer[0] = 5; + i_this->mode = 21; - rd_enemy_p->offDownFlg(); + enemy->offDownFlg(); } break; case 21: - if (i_this->field_0x990[0] == 0) { - i_this->field_0x998 = 0; + if (i_this->timer[0] == 0) { + i_this->damage_timer = 0; if (pl_check(i_this, 10000.0f, 0x6000)) { - i_this->mAction = ACTION_NORMAL; - i_this->mMode = 0; + i_this->action = ACTION_NORMAL; + i_this->mode = 0; } else { - i_this->field_0x990[0] = cM_rndF(20.0f) + 20.0f; + i_this->timer[0] = cM_rndF(20.0f) + 20.0f; anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); - i_this->mMode = 22; + i_this->mode = 22; } } break; case 22: - if (i_this->field_0x990[0] == 0) { - i_this->mAction = ACTION_NORMAL; - i_this->mMode = 0; - i_this->field_0x990[0] = cM_rndF(50.0f) + 50.0f; + if (i_this->timer[0] == 0) { + i_this->action = ACTION_NORMAL; + i_this->mode = 0; + i_this->timer[0] = cM_rndF(50.0f) + 50.0f; anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); } break; case 30: - if (!rd_enemy_p->checkWolfDownPullFlg()) { - i_this->field_0x990[1] = 0; + if (!enemy->checkWolfDownPullFlg()) { + i_this->timer[1] = 0; } - if (i_this->field_0x990[0] == 0) { - i_this->mMode = 31; + if (i_this->timer[0] == 0) { + i_this->mode = 31; if (i_this->field_0xa1f == 0) { anm_init(i_this, BCK_RD_DIEA_UP, 3.0f, 0, 1.0f); } else { anm_init(i_this, BCK_RD_DIEB_UP, 3.0f, 0, 1.0f); } - i_this->field_0x990[0] = 10; - } else if (i_this->field_0x990[1] == 1) { - rd_enemy_p->onWolfDownPullEndFlg(); - rd_enemy_p->offCutDownHitFlg(); - a_this->health = 0; - i_this->field_0x990[0] = 1000; - i_this->field_0x990[1] = 35; - i_this->mMode = 3; + i_this->timer[0] = 10; + } else if (i_this->timer[1] == 1) { + enemy->onWolfDownPullEndFlg(); + enemy->offCutDownHitFlg(); + actor->health = 0; + i_this->timer[0] = 1000; + i_this->timer[1] = 35; + i_this->mode = 3; } break; case 31: - if (i_this->field_0x990[0] == 0) { - rd_enemy_p->offDownFlg(); - i_this->mMode = 20; + if (i_this->timer[0] == 0) { + enemy->offDownFlg(); + i_this->mode = 20; i_this->field_0xafa = 0; } } - if (rd_enemy_p->checkDownFlg()) { - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(11), *calc_mtx); - sp34.set(BREG_F(0), BREG_F(1), BREG_F(2)); - MtxPosition(&sp34, &sp40); - rd_enemy_p->setDownPos(&sp40); + if (enemy->checkDownFlg()) { + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(11), *calc_mtx); + mae.set(BREG_F(0), BREG_F(1), BREG_F(2)); + MtxPosition(&mae, &ato); + enemy->setDownPos(&ato); i_this->field_0x9ad = 0; } @@ -3140,44 +3140,44 @@ static void e_rd_damage(e_rd_class* i_this) { } static s16 gake_check(e_rd_class* i_this, f32 param_2) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; dBgS_GndChk gnd_chk; dBgS_LinChk lin_chk; - cXyz spf8, sp104, start, end; - s16 sVar1 = a_this->shape_angle.y; + cXyz spf8, sp104, mae, ato; + s16 angle = enemy->shape_angle.y; for (int i = 0; i < 16; i++) { - cMtx_YrotS(*calc_mtx, sVar1); - start.x = 0.0f; - start.y = 100.0f; - start.z = param_2; - MtxPosition(&start, &end); - end += a_this->current.pos; - gnd_chk.SetPos(&end); - - if (a_this->current.pos.y - dComIfG_Bgsp().GroundCross(&gnd_chk) > 300.0f) { - start = a_this->current.pos; - start.y += 100.0f; - lin_chk.Set(&start, &end, a_this); + cMtx_YrotS(*calc_mtx, angle); + mae.x = 0.0f; + mae.y = 100.0f; + mae.z = param_2; + MtxPosition(&mae, &ato); + ato += enemy->current.pos; + gnd_chk.SetPos(&ato); + + if (enemy->current.pos.y - dComIfG_Bgsp().GroundCross(&gnd_chk) > 300.0f) { + mae = enemy->current.pos; + mae.y += 100.0f; + lin_chk.Set(&mae, &ato, enemy); if (!dComIfG_Bgsp().LineCross(&lin_chk)) { - return sVar1; + return angle; } } - ANGLE_ADD(sVar1, 0x1000); + ANGLE_ADD(angle, 0x1000); } - return a_this->shape_angle.y; + return enemy->shape_angle.y; } static void* s_bikkuri_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data) { - if (((e_rd_class*)i_actor)->mAction == ACTION_BOW3 && ((e_rd_class*)i_actor)->mMode <= 2) { + if (((e_rd_class*)i_actor)->action == ACTION_BOW3 && ((e_rd_class*)i_actor)->mode <= 2) { cXyz sp28 = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos; if (sp28.abs() < KREG_F(11) + 350.0f) { anm_init((e_rd_class*)i_actor, 29, 5.0f, 2, 1.3f); - ((e_rd_class*)i_actor)->mMode = 3; - ((e_rd_class*)i_actor)->field_0x990[0] = cM_rndF(20.0f) + 40.0f; + ((e_rd_class*)i_actor)->mode = 3; + ((e_rd_class*)i_actor)->timer[0] = cM_rndF(20.0f) + 40.0f; } } } @@ -3197,216 +3197,216 @@ static void* s_saku_sub(void* i_actor, void* i_data) { } static void e_rd_drop(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - f32 fVar1 = 0.0f; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + f32 speed = 0.0f; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: - i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_DAMAGE, -1); + i_this->sound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_DAMAGE, -1); anm_init(i_this, BCK_RD_DAMAGE_S, 2.0f, 0, 1.0f); - i_this->mMode = 1; + i_this->mode = 1; if (desert_substage != 0) { - i_this->mDemoMode = 10; + i_this->demo_mode = 10; } break; case 1: - i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_DAMAGE, -1); + i_this->sound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_DAMAGE, -1); - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_FURA2, 0.0f, 2, 1.0f); - i_this->mMode = 2; + i_this->mode = 2; - if (i_this->mDemoMode != 0) { - i_this->field_0x5cc = i_this->mPlayerAngleY; + if (i_this->demo_mode != 0) { + i_this->target_ya = i_this->angleY; } else if (strcmp(dComIfGp_getStartStageName(), "F_SP128") == 0) { // Hidden Village - i_this->field_0x5cc = a_this->home.angle.y; + i_this->target_ya = enemy->home.angle.y; } else { - i_this->field_0x5cc = gake_check(i_this, 200.0f); + i_this->target_ya = gake_check(i_this, 200.0f); } fpcM_Search(s_bikkuri_sub, i_this); - i_this->field_0x990[0] = 60; + i_this->timer[0] = 60; } break; case 2: - i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_DAMAGE, -1); - fVar1 = 4.0f; - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->field_0x5cc, 8, 0x400); + i_this->sound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_DAMAGE, -1); + speed = 4.0f; + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->target_ya, 8, 0x400); - if (i_this->field_0x990[0] == 0) { - i_this->mAction = ACTION_A_DAMAGE; - i_this->mMode = 0; + if (i_this->timer[0] == 0) { + i_this->action = ACTION_A_DAMAGE; + i_this->mode = 0; return; } if (move_gake_check(i_this, KREG_F(6) + 30.0f)) { - i_this->mMode = 3; - i_this->field_0xa0c.y = a_this->shape_angle.y + 0x8000; - i_this->field_0xa0c.x = 0; - i_this->mpModelMorf->setPlaySpeed(0.3f); + i_this->mode = 3; + i_this->jump_angle.y = enemy->shape_angle.y + 0x8000; + i_this->jump_angle.x = 0; + i_this->anm_p->setPlaySpeed(0.3f); i_this->field_0xaf8 = 0; - i_this->field_0x990[0] = 20; + i_this->timer[0] = 20; } break; case 3: - if (i_this->field_0x990[0] == 19) { + if (i_this->timer[0] == 19) { daObjH_Saku_c* h_saku = (daObjH_Saku_c*)fpcM_Search(s_saku_sub, i_this); if (h_saku != NULL) { h_saku->BreakSet(); } } - fVar1 = 3.0f; + speed = 3.0f; - if (i_this->field_0xa0c.x > -0x4000) { - a_this->speed.y = 0.0f; - i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_DAMAGE, -1); + if (i_this->jump_angle.x > -0x4000) { + enemy->speed.y = 0.0f; + i_this->sound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_DAMAGE, -1); } else { - if (i_this->field_0xa0c.x > -0x6800) { - a_this->speed.y = -fabsf(cM_scos(i_this->field_0xa0c.x) * (TREG_F(8) + 70.0f)); - i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_FALLING, -1); + if (i_this->jump_angle.x > -0x6800) { + enemy->speed.y = -fabsf(cM_scos(i_this->jump_angle.x) * (TREG_F(8) + 70.0f)); + i_this->sound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_FALLING, -1); } else { - i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_FALLING, -1); + i_this->sound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_FALLING, -1); } } - cLib_addCalcAngleS2(&i_this->field_0xa0c.x, -0x7000, 2, i_this->field_0xaf8); + cLib_addCalcAngleS2(&i_this->jump_angle.x, -0x7000, 2, i_this->field_0xaf8); cLib_addCalcAngleS2(&i_this->field_0xaf8, 0x800, 1, 0x50); i_this->field_0x9ab = 2; - if (i_this->field_0x990[0] == 0 && a_this->current.pos.y <= i_this->mObjAcch.GetGroundH() + 100.0f + KREG_F(17)) { - if (i_this->field_0x5b7 == 13 || i_this->field_0x5b7 == 14) { - i_this->mAction = ACTION_REG; - i_this->mMode = 1; + if (i_this->timer[0] == 0 && enemy->current.pos.y <= i_this->ObjAcch.GetGroundH() + 100.0f + KREG_F(17)) { + if (i_this->arg1 == 13 || i_this->arg1 == 14) { + i_this->action = ACTION_REG; + i_this->mode = 1; i_this->field_0xafb = 1; i_this->field_0xaf2 = 0; } else { - a_this->current.pos.y = i_this->mObjAcch.GetGroundH() + 100.0f + KREG_F(17); - i_this->field_0xa0c.x = -0x4000; - i_this->mAction = ACTION_DAMAGE; - i_this->mMode = 0; - i_this->field_0x9ec = 0.0f; - a_this->health = 0; + enemy->current.pos.y = i_this->ObjAcch.GetGroundH() + 100.0f + KREG_F(17); + i_this->jump_angle.x = -0x4000; + i_this->action = ACTION_DAMAGE; + i_this->mode = 0; + i_this->jump_z = 0.0f; + enemy->health = 0; } } break; } - cLib_addCalc2(&a_this->speedF, fVar1, 1.0f, 3.0f); + cLib_addCalc2(&enemy->speedF, speed, 1.0f, 3.0f); } static void e_rd_a_damage(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - i_this->field_0x998 = 3; - fopAcM_OffStatus(a_this, 0); - a_this->attention_info.flags = 0; + i_this->damage_timer = 3; + fopAcM_OffStatus(enemy, 0); + enemy->attention_info.flags = 0; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: - i_this->mMode = 1; + i_this->mode = 1; anm_init(i_this, BCK_RD_DEAD_ARROW, 5.0f, 0, 1.0f); - i_this->field_0x990[0] = 80; + i_this->timer[0] = 80; if (desert_substage != 0) { i_this->field_0x5ba = 0; } - dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(i_this), 5); + dKy_Sound_set(enemy->current.pos, 100, fopAcM_GetID(i_this), 5); break; case 1: - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { rd_disappear(i_this); } break; } - cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f); + cLib_addCalc0(&enemy->speedF, 1.0f, 3.0f); } static void e_rd_stand(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); - i_this->mMode = 1; - i_this->field_0x990[0] = cM_rndF(40.0f) + 60.0f; + i_this->mode = 1; + i_this->timer[0] = cM_rndF(40.0f) + 60.0f; } break; case 1: - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_WAIT01, 10.0f, 2, 1.0f); - i_this->field_0x990[0] = cM_rndF(100.0f) + 100.0f; - i_this->mMode = 0; + i_this->timer[0] = cM_rndF(100.0f) + 100.0f; + i_this->mode = 0; } break; } - f32 fVar1 = i_this->field_0x980; - s16 sVar1 = 0x4000; - BOOL bVar1 = FALSE; + f32 range = i_this->attack_range; + s16 angle = 0x4000; + BOOL search_check = FALSE; - if (i_this->field_0x9a1 == 1 || S_find != 0) { - if (i_this->field_0x9a1 == 1) { - bVar1 = TRUE; + if (i_this->look_timer == 1 || S_find != 0) { + if (i_this->look_timer == 1) { + search_check = TRUE; } - fVar1 = 10000.0f; - sVar1 = 0x7FFF; + range = 10000.0f; + angle = 0x7FFF; } - if ((i_this->field_0x970 & 7) == 0 && fopAcM_GetRoomNo(a_this) == 0) { + if ((i_this->counter & 7) == 0 && fopAcM_GetRoomNo(enemy) == 0) { if (S_find != 0) { - wb_check(i_this, sVar1); - if (i_this->field_0x9be != 0) { + wb_check(i_this, angle); + if (i_this->boar_stand != 0) { return; } } if (pl_check(i_this, 500.0f, 0x4000)) { - i_this->mAction = ACTION_FIGHT_RUN; - i_this->mMode = -10; - i_this->field_0x990[0] = 60; + i_this->action = ACTION_FIGHT_RUN; + i_this->mode = -10; + i_this->timer[0] = 60; } return; } - if (((i_this->field_0x970 & 7) == 0 || bVar1) && pl_check(i_this, fVar1, sVar1) && i_this->field_0x5bc == 1) { + if (((i_this->counter & 7) == 0 || search_check) && pl_check(i_this, range, angle) && i_this->weapon_type == 1) { OS_REPORT(" <<<<<<<<<<<<<< RD RIDE 4\n"); - i_this->mAction = ACTION_FIGHT_RUN; - i_this->mMode = -10; - i_this->field_0x990[0] = 60; + i_this->action = ACTION_FIGHT_RUN; + i_this->mode = -10; + i_this->timer[0] = 60; } } static s8 e_rd_bow3(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - if (i_this->field_0x998 == 0 && i_this->mMode != 5 && fpcM_Search(s_command3_sub, i_this) == NULL) { - i_this->mMode = 5; - i_this->field_0x990[1] = cM_rndF(20.0f) + 40.0f; - i_this->field_0x990[0] = cM_rndF(20.0f) + 80.0f; + if (i_this->damage_timer == 0 && i_this->mode != 5 && fpcM_Search(s_command3_sub, i_this) == NULL) { + i_this->mode = 5; + i_this->timer[1] = cM_rndF(20.0f) + 40.0f; + i_this->timer[0] = cM_rndF(20.0f) + 80.0f; } cXyz unused_vec_0, unused_vec_1; - int frame = i_this->mpModelMorf->getFrame(); + int frame = i_this->anm_p->getFrame(); s8 bVar1 = 1; - s8 retval = 0; + s8 rt = 0; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: bVar1 = 0; anm_init(i_this, BCK_RD_WAIT01, 10.0f, 2, 1.0f); - i_this->mMode = 1; + i_this->mode = 1; break; case 1: @@ -3414,33 +3414,33 @@ static s8 e_rd_bow3(e_rd_class* i_this) { break; case 3: - if (i_this->field_0x990[0] == 0) { - i_this->mMode = 0; + if (i_this->timer[0] == 0) { + i_this->mode = 0; } break; case 5: - if (i_this->field_0x990[1] == 1) { + if (i_this->timer[1] == 1) { anm_init(i_this, BCK_RD_KYORO2, 5.0f, 2, 1.3f); } - if (i_this->field_0x990[0] == 10) { + if (i_this->timer[0] == 10) { anm_init(i_this, BCK_RD_WAIT01, 5.0f, 2, 1.0f); } - if (i_this->field_0x990[0] == 0) { - i_this->mAction = ACTION_BOW2; - i_this->mMode = 0; + if (i_this->timer[0] == 0) { + i_this->action = ACTION_BOW2; + i_this->mode = 0; } break; case 10: - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_SHOOT_READY, 5.0f, 0, 1.0f); - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 7), + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 7), 0, 5.0f, 0.9f + TREG_F(3), 0.0f, -1.0f); - i_this->mMode = 11; - a_this->speedF = 0.0f; + i_this->mode = 11; + enemy->speedF = 0.0f; } break; @@ -3451,23 +3451,23 @@ static s8 e_rd_bow3(e_rd_class* i_this) { } if (frame == 20) { - i_this->mSound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1); + i_this->sound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1); } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_SHOOT_WAIT, 4.0f, 2, 1.0f); - i_this->field_0x990[0] = cM_rndF(10.0f) + 10.0f; - i_this->mMode = 12; + i_this->timer[0] = cM_rndF(10.0f) + 10.0f; + i_this->mode = 12; } break; case 12: i_this->field_0x9c8 = 4; - if (i_this->field_0x990[0] == 0 && !dMsgObject_isTalkNowCheck() && i_this->field_0x9a4 == 0) { + if (i_this->timer[0] == 0 && !dMsgObject_isTalkNowCheck() && i_this->field_0x9a4 == 0) { anm_init(i_this, BCK_RD_SHOOT, 1.0f, 0, 1.0f); - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); - i_this->mMode = 13; + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); + i_this->mode = 13; } i_this->field_0x9a2 = 1; @@ -3480,40 +3480,40 @@ static s8 e_rd_bow3(e_rd_class* i_this) { } if (frame == 2 + XREG_S(7)) { - i_this->field_0x9a3 = 1; + i_this->arrow_flag = 1; } - if (i_this->mpModelMorf->isStop()) { - i_this->mMode = 0; + if (i_this->anm_p->isStop()) { + i_this->mode = 0; } } if (bVar1) { - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngleY, 4, 0x1000); + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->angleY, 4, 0x1000); } - if (i_this->mPlayerDistance < 500.0f) { - i_this->mAction = ACTION_BOW_RUN; - i_this->mMode = 0; - i_this->field_0x1295 = 0; + if (i_this->dis < 500.0f) { + i_this->action = ACTION_BOW_RUN; + i_this->mode = 0; + i_this->one_hit_kill = 0; } - return retval; + return rt; } static void* s_command2_sub(void* i_actor, void* i_data) { UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD - && ((e_rd_class*)i_actor)->mAction == ACTION_BOW3 && ((e_rd_class*)i_actor)->mMode < 10) { - ((e_rd_class*)i_actor)->field_0x990[0] = cM_rndF(10.0f) + 10.0f; - ((e_rd_class*)i_actor)->mMode = 10; + && ((e_rd_class*)i_actor)->action == ACTION_BOW3 && ((e_rd_class*)i_actor)->mode < 10) { + ((e_rd_class*)i_actor)->timer[0] = cM_rndF(10.0f) + 10.0f; + ((e_rd_class*)i_actor)->mode = 10; } return NULL; } static void* s_command4_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data && ((e_rd_class*)i_actor)->mAction == ACTION_BOW3) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data && ((e_rd_class*)i_actor)->action == ACTION_BOW3) { return i_actor; } @@ -3521,78 +3521,78 @@ static void* s_command4_sub(void* i_actor, void* i_data) { } static void e_rd_commander(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; s8 bVar1 = 0; s8 bVar2 = 0; boss = i_this; - if (i_this->field_0x990[2] == 0 && fpcM_Search(s_command4_sub, i_this) == NULL) { - i_this->mAction = ACTION_BOW2; - i_this->mMode = 0; + if (i_this->timer[2] == 0 && fpcM_Search(s_command4_sub, i_this) == NULL) { + i_this->action = ACTION_BOW2; + i_this->mode = 0; } else { - switch (i_this->mMode) { + switch (i_this->mode) { case 0: - i_this->mMode = 1; + i_this->mode = 1; break; case 1: bVar1 = 1; - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); - i_this->mMode = 2; - i_this->field_0x990[0] = cM_rndF(40.0f) + 60.0f; + i_this->mode = 2; + i_this->timer[0] = cM_rndF(40.0f) + 60.0f; } break; case 2: bVar1 = 1; - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_WAIT01, 10.0f, 2, 1.0f); - i_this->field_0x990[0] = cM_rndF(100.0f) + 100.0f; - i_this->mMode = 1; + i_this->timer[0] = cM_rndF(100.0f) + 100.0f; + i_this->mode = 1; } break; case 5: anm_init(i_this, BCK_RD_WAIT01, 5.0f, 2, 1.0f); - i_this->field_0x990[0] = 30; - i_this->mMode = 6; + i_this->timer[0] = 30; + i_this->mode = 6; break; case 6: bVar2 = 1; - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_GOSIGN, 3.0f, 0, 1.0f); - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_COMMANDER, -1); - i_this->mMode = 7; + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_COMMANDER, -1); + i_this->mode = 7; if (dComIfGp_event_runCheck()) { - i_this->field_0x990[0] = l_HIO.command_to_ready_stance + 2; + i_this->timer[0] = l_HIO.command_to_ready_stance + 2; } else { - i_this->field_0x990[0] = 10; + i_this->timer[0] = 10; } } break; case 7: bVar2 = 1; - if (i_this->field_0x990[0] == 1) { + if (i_this->timer[0] == 1) { fpcM_Search(s_command2_sub, i_this); } - if (i_this->field_0x990[0] == 0 && i_this->mpModelMorf->isStop()) { + if (i_this->timer[0] == 0 && i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_WAIT01, 5.0f, 2, 1.0f); - if (!dComIfGp_event_runCheck() && !pl_check(i_this, i_this->field_0x980, 0x4000)) { - i_this->mMode = 10; - i_this->field_0x990[1] = TREG_S(8) + 350; + if (!dComIfGp_event_runCheck() && !pl_check(i_this, i_this->attack_range, 0x4000)) { + i_this->mode = 10; + i_this->timer[1] = TREG_S(8) + 350; } else { if (dComIfGp_event_runCheck()) { - i_this->field_0x990[0] = 80; + i_this->timer[0] = 80; } else { - i_this->field_0x990[0] = TREG_S(3); + i_this->timer[0] = TREG_S(3); } - i_this->mMode = 6; + i_this->mode = 6; } } break; @@ -3601,137 +3601,137 @@ static void e_rd_commander(e_rd_class* i_this) { anm_init(i_this, BCK_RD_GOSIGN, 3.0f, 0, 1.0f); mDoAud_seStart(Z2SE_EN_RD_V_CALLING, 0, 0, 0); fpcM_Search(s_command2_sub, i_this); - i_this->mMode = 11; + i_this->mode = 11; break; case 11: - if (i_this->mpModelMorf->isStop()) { - if (i_this->field_0x990[1] == 0) { + if (i_this->anm_p->isStop()) { + if (i_this->timer[1] == 0) { anm_init(i_this, BCK_RD_WAIT01, 10.0f, 2, 1.0f); - i_this->field_0x990[0] = cM_rndF(30.0f) + 30.0f; - i_this->mMode = 1; + i_this->timer[0] = cM_rndF(30.0f) + 30.0f; + i_this->mode = 1; } else { - i_this->mMode = 10; + i_this->mode = 10; } } } - if (bVar1 && pl_check(i_this, i_this->field_0x980, 0x4000)) { - i_this->mMode = 5; - if (i_this->field_0x12a0 != 0) { - dComIfGs_onSwitch(i_this->field_0x12a0, fopAcM_GetRoomNo(a_this)); + if (bVar1 && pl_check(i_this, i_this->attack_range, 0x4000)) { + i_this->mode = 5; + if (i_this->sw != 0) { + dComIfGs_onSwitch(i_this->sw, fopAcM_GetRoomNo(enemy)); } } if (bVar2) { - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngleY, 2, 0x800); + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->angleY, 2, 0x800); } } } static void e_rd_excite(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; cXyz sp40; - f32 fVar1 = 0.0f; + f32 speed = 0.0f; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: anm_init(i_this, BCK_RD_WAIT01, 4.0f, 2, 1.0f); - i_this->mMode = 1; - i_this->field_0x990[0] = cM_rndF(20.0f) + 20.0f; - i_this->field_0x5cc = a_this->current.angle.y; + i_this->mode = 1; + i_this->timer[0] = cM_rndF(20.0f) + 20.0f; + i_this->target_ya = enemy->current.angle.y; i_this->field_0x5c0 = S_find_pos; break; case 1: i_this->field_0x9c8 = 11; - i_this->field_0x9d4 = S_find_pos; + i_this->eye = S_find_pos; - if (i_this->field_0x990[0] == 0) { - if (i_this->field_0x1295 != 0) { - i_this->mMode = 3; + if (i_this->timer[0] == 0) { + if (i_this->one_hit_kill != 0) { + i_this->mode = 3; anm_init(i_this, BCK_RD_KYORO2, 5.0f, 2, 1.3f); - i_this->field_0x990[0] = cM_rndF(20.0f) + 40.0f; + i_this->timer[0] = cM_rndF(20.0f) + 40.0f; } else { - i_this->mMode = 2; + i_this->mode = 2; anm_init(i_this, BCK_RD_RUN, 2.0f, 2, cM_rndFX(0.05f) + 1.0f); - i_this->field_0x990[0] = cM_rndF(15.0f) + 30.0f; + i_this->timer[0] = cM_rndF(15.0f) + 30.0f; } - sp40 = i_this->field_0x5c0 - a_this->current.pos; - i_this->field_0x5cc = (s16) cM_atan2s(sp40.x, sp40.z); + sp40 = i_this->field_0x5c0 - enemy->current.pos; + i_this->target_ya = (s16) cM_atan2s(sp40.x, sp40.z); } break; case 2: i_this->field_0x9c8 = 11; - i_this->field_0x9d4 = i_this->field_0x5c0; - fVar1 = l_HIO.dash_speed; - sp40 = i_this->field_0x5c0 - a_this->current.pos; - if (i_this->field_0x990[0] == 0 || move_gake_check(i_this, 100.0f) || sp40.abs() < 100.0f) { - i_this->mMode = 3; + i_this->eye = i_this->field_0x5c0; + speed = l_HIO.dash_speed; + sp40 = i_this->field_0x5c0 - enemy->current.pos; + if (i_this->timer[0] == 0 || move_gake_check(i_this, 100.0f) || sp40.abs() < 100.0f) { + i_this->mode = 3; anm_init(i_this, BCK_RD_KYORO2, 5.0f, 2, 1.3f); - i_this->field_0x990[0] = cM_rndF(20.0f) + 40.0f; + i_this->timer[0] = cM_rndF(20.0f) + 40.0f; } break; case 3: - if (i_this->field_0x990[0] == 0) { - i_this->mAction = i_this->field_0x974; - if (i_this->mAction == ACTION_STAND) { - i_this->mAction = ACTION_NORMAL; + if (i_this->timer[0] == 0) { + i_this->action = i_this->prev_action; + if (i_this->action == ACTION_STAND) { + i_this->action = ACTION_NORMAL; } - i_this->mMode = 0; + i_this->mode = 0; } break; } - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->field_0x5cc, 2, 0x800); - s16 sVar1 = a_this->current.angle.y - i_this->field_0x5cc; - if (sVar1 > 0x400 || sVar1 < -0x400) { - fVar1 = 0.0f; + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->target_ya, 2, 0x800); + s16 range = enemy->current.angle.y - i_this->target_ya; + if (range > 0x400 || range < -0x400) { + speed = 0.0f; } - cLib_addCalc2(&a_this->speedF, fVar1, 1.0f, 5.0f); + cLib_addCalc2(&enemy->speedF, speed, 1.0f, 5.0f); } static void e_rd_water(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - i_this->field_0x998 = 10; + i_this->damage_timer = 10; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: case 1: { - a_this->speed.y = 0.0f; + enemy->speed.y = 0.0f; if (i_this->field_0xa1f == 0) { anm_init(i_this, BCK_RD_DROWNEDA, 3.0f, 2, 1.0f); } else { anm_init(i_this, BCK_RD_DROWNEDB, 3.0f, 2, 1.0f); } - i_this->field_0x990[0] = 60; - i_this->field_0x9f0 = i_this->field_0x9ec = a_this->speedF = 0.0f; - cXyz sp28 = a_this->current.pos; - sp28.y = i_this->field_0x984; - if (i_this->mMode == 0) { - fopKyM_createWpillar(&sp28, 1.5f, 0); + i_this->timer[0] = 60; + i_this->field_0x9f0 = i_this->jump_z = enemy->speedF = 0.0f; + cXyz yogan = enemy->current.pos; + yogan.y = i_this->waterY; + if (i_this->mode == 0) { + fopKyM_createWpillar(&yogan, 1.5f, 0); } else { OS_REPORT(" RD YOGAN \n"); - fopKyM_createMpillar(&sp28, 1.0f); + fopKyM_createMpillar(&yogan, 1.0f); } - i_this->mMode = 10; + i_this->mode = 10; break; } case 10: - a_this->speed.y = 0.0f; - cLib_addCalc2(&a_this->current.pos.y, i_this->field_0x984, 0.5f, 5.0f); - cLib_addCalcAngleS2(&i_this->field_0xa0c.x, -0x4000, 4, 0x400 + BREG_S(4)); + enemy->speed.y = 0.0f; + cLib_addCalc2(&enemy->current.pos.y, i_this->waterY, 0.5f, 5.0f); + cLib_addCalcAngleS2(&i_this->jump_angle.x, -0x4000, 4, 0x400 + BREG_S(4)); - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { rd_disappear(i_this); } break; @@ -3739,28 +3739,28 @@ static void e_rd_water(e_rd_class* i_this) { } static void e_rd_kiba_start(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - fopAcM_OffStatus(a_this, 0); - a_this->attention_info.flags = 0; - i_this->field_0x998 = 10; + fopAcM_OffStatus(enemy, 0); + enemy->attention_info.flags = 0; + i_this->damage_timer = 10; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: anm_init(i_this, e_rdb_class::BCK_RB_RWAIT02, 1.0f, 2, 1.0f); - i_this->mMode++; + i_this->mode++; i_this->field_0x6a0 = 0; break; case 2: anm_init(i_this, e_rdb_class::BCK_RB_RCOMEON, 10.0f, 0, 1.0f); - i_this->mMode++; + i_this->mode++; break; case 3: - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, e_rdb_class::BCK_RB_RWAIT02, 5.0f, 2, 1.0f); - i_this->mMode++; + i_this->mode++; } break; @@ -3768,46 +3768,46 @@ static void e_rd_kiba_start(e_rd_class* i_this) { i_this->field_0x6a0 = 1; anm_init(i_this, e_rdb_class::BCK_RB_RPLAY_STOP2, 20.0f, 0, 1.0f); horn_anm_init(i_this, 6, 2.0f, 0, 1.0f); - i_this->mMode++; + i_this->mode++; break; case 6: - if ((int)i_this->mpModelMorf->getFrame() == 21) { - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_HORN, -1); + if ((int)i_this->anm_p->getFrame() == 21) { + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_HORN, -1); } - if (i_this->mpModelMorf->isStop()) { - i_this->mAction = ACTION_WB_RUN; - i_this->mMode = 0; - fopAcM_OnStatus(a_this, 0); // statement does nothing. - a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e; + if (i_this->anm_p->isStop()) { + i_this->action = ACTION_WB_RUN; + i_this->mode = 0; + fopAcM_OnStatus(enemy, 0); // statement does nothing. + enemy->attention_info.flags = fopAc_AttnFlag_BATTLE_e; } } } static void e_rd_ikki2_start(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - fopAcM_OffStatus(a_this, 0); - a_this->attention_info.flags = 0; - i_this->field_0x998 = 10; + fopAcM_OffStatus(enemy, 0); + enemy->attention_info.flags = 0; + i_this->damage_timer = 10; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: anm_init(i_this, e_rdb_class::BCK_RB_ROP_DEMO2_WAIT, 1.0f, 2, 1.0f); - i_this->mMode++; + i_this->mode++; break; case 2: anm_init(i_this, e_rdb_class::BCK_RB_ROP_DEMO2_EXCITE, 5.0f, 0, 1.0f); - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_V_DEMO_EXCITE, -1); - i_this->mMode++; + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_DEMO_EXCITE, -1); + i_this->mode++; break; case 3: - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, e_rdb_class::BCK_RB_ROP_DEMO2_WAIT, 10.0f, 2, 1.0f); - i_this->mMode = 4; + i_this->mode = 4; } break; @@ -3817,181 +3817,181 @@ static void e_rd_ikki2_start(e_rd_class* i_this) { } static void e_rd_kiba_end(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - fopAcM_OffStatus(a_this, 0); - a_this->attention_info.flags = 0; - i_this->field_0x998 = 10; - e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID); + fopAcM_OffStatus(enemy, 0); + enemy->attention_info.flags = 0; + i_this->damage_timer = 10; + e_wb_class* boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); - switch (i_this->mMode) { + switch (i_this->mode) { case 0: i_this->field_0x680 = 0; anm_init(i_this, BCK_RD_RSHOOT_WAIT, 1.0f, 0, 1.0f); - i_this->mMode++; - i_this->field_0x990[0] = 14; - bullbo->field_0x7a2 = 1; + i_this->mode++; + i_this->timer[0] = 14; + boar->field_0x7a2 = 1; break; case 1: - if (i_this->field_0x990[0] == 1) { - cXyz sp28, sp34; - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - sp28.x = BREG_F(8) + 40.0f; - sp28.y = BREG_F(9) + 20.0f; - sp28.z = BREG_F(10) + 57.0f; - MtxPosition(&sp28, &i_this->field_0x6b0); - i_this->field_0x6bc.y = a_this->shape_angle.y + BREG_S(0); - sp28.x = BREG_F(11) + 80.0f; - sp28.y = BREG_F(12); - sp28.z = BREG_F(13); - MtxPosition(&sp28, &sp34); - i_this->field_0x6a4 += sp34; + if (i_this->timer[0] == 1) { + cXyz mae, ato; + cMtx_YrotS(*calc_mtx, enemy->shape_angle.y); + mae.x = BREG_F(8) + 40.0f; + mae.y = BREG_F(9) + 20.0f; + mae.z = BREG_F(10) + 57.0f; + MtxPosition(&mae, &i_this->field_0x6b0); + i_this->field_0x6bc.y = enemy->shape_angle.y + BREG_S(0); + mae.x = BREG_F(11) + 80.0f; + mae.y = BREG_F(12); + mae.z = BREG_F(13); + MtxPosition(&mae, &ato); + i_this->field_0x6a4 += ato; i_this->field_0x6a0 = 2; } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_RSHOOT_WAIT02, 2.0f, 2, 1.0f); - i_this->mMode++; - i_this->field_0x990[0] = 110; + i_this->mode++; + i_this->timer[0] = 110; } break; case 2: - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_RSTEP_BACK, 2.0f, 0, 1.0f); - i_this->mMode++; - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_V_AWAKE, -1); - i_this->field_0x990[0] = 10; + i_this->mode++; + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_AWAKE, -1); + i_this->timer[0] = 10; } break; case 3: - if (i_this->field_0x990[0] == 0) { - bullbo->field_0x7a2 = 0; + if (i_this->timer[0] == 0) { + boar->field_0x7a2 = 0; } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_SHOUT, 5.0f, 2, 1.0f); - i_this->mMode++; - i_this->field_0x990[0] = 20; + i_this->mode++; + i_this->timer[0] = 20; } break; case 4: - if (i_this->field_0x990[0] != 0) { + if (i_this->timer[0] != 0) { i_this->field_0x9c8 = 1; } - if ((bullbo->mStatusFlags & 0x100) != 0) { - i_this->mAction = ACTION_WB_BJUMP; - i_this->mMode = 0; - i_this->field_0x990[1] = 2000; - i_this->field_0x990[2] = 1000; + if ((boar->mStatusFlags & 0x100) != 0) { + i_this->action = ACTION_WB_BJUMP; + i_this->mode = 0; + i_this->timer[1] = 2000; + i_this->timer[2] = 1000; } break; } } static void e_rd_ikki_end(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + e_wb_class* boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); - fopAcM_OffStatus(a_this, 0); - a_this->attention_info.flags = 0; - i_this->field_0x998 = 10; - bullbo->field_0x1434 = fopAcM_GetID(i_this); + fopAcM_OffStatus(enemy, 0); + enemy->attention_info.flags = 0; + i_this->damage_timer = 10; + boar->field_0x1434 = fopAcM_GetID(i_this); - switch (i_this->mMode) { + switch (i_this->mode) { case 0: anm_init(i_this, BCK_RD_RRUN02_BACK, 1.0f, 0, 1.0f); - i_this->mMode++; - i_this->field_0x9bc = 0; + i_this->mode++; + i_this->ride_mode = 0; - if (daPy_getPlayerActorClass()->checkHorseRide() && bullbo != NULL) { - UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be, u16); - i_this->field_0x9be = 0; - bullbo->mActionID = 16; - bullbo->mActionMode = 0; - bullbo->field_0x169e = 10; + if (daPy_getPlayerActorClass()->checkHorseRide() && boar != NULL) { + UNSET_FLAG(boar->mStatusFlags, i_this->boar_stand, u16); + i_this->boar_stand = 0; + boar->mActionID = 16; + boar->mActionMode = 0; + boar->field_0x169e = 10; } - a_this->speedF = 0.0f; - a_this->speed.y = 40.0f + KREG_F(7); - i_this->field_0x9ec = 70.0f + KREG_F(8); + enemy->speedF = 0.0f; + enemy->speed.y = 40.0f + KREG_F(7); + i_this->jump_z = 70.0f + KREG_F(8); - if (fopAcM_searchPlayerAngleY(a_this) < 0) { - i_this->field_0xa0c.y = 0x4000; + if (fopAcM_searchPlayerAngleY(enemy) < 0) { + i_this->jump_angle.y = 0x4000; } else { - i_this->field_0xa0c.y = -0x4000; + i_this->jump_angle.y = -0x4000; } - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_V_DEATH, -1); + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_DEATH, -1); break; case 1: - if (i_this->mAnmID == BCK_RD_RRUN02_BACK) { - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm == BCK_RD_RRUN02_BACK) { + if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_JUMP_A, 1.0f, 2, 1.0f); } } - if (a_this->speed.y < 0.0f) { - cLib_addCalc2(&i_this->field_0x9ec, KREG_F(9), 0.1f, 1.0f); - a_this->current.angle.y += i_this->field_0x9f6; + if (enemy->speed.y < 0.0f) { + cLib_addCalc2(&i_this->jump_z, KREG_F(9), 0.1f, 1.0f); + enemy->current.angle.y += i_this->field_0x9f6; } break; } } static void e_rd_ikki2_end(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + e_wb_class* boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); - fopAcM_OffStatus(a_this, 0); - a_this->attention_info.flags = 0; - i_this->field_0x998 = 10; - bullbo->field_0x1434 = fopAcM_GetID(i_this); + fopAcM_OffStatus(enemy, 0); + enemy->attention_info.flags = 0; + i_this->damage_timer = 10; + boar->field_0x1434 = fopAcM_GetID(i_this); - switch (i_this->mMode) { + switch (i_this->mode) { case 0: if (daPy_getPlayerActorClass()->checkHorseRide()) { anm_init(i_this, BCK_RD_RRUN_BACK, 0.0f, 0, 1.0f); - i_this->mMode = 1; - bullbo->mActionID = 18; - bullbo->mActionMode = 0; - bullbo->field_0x169e = 90; + i_this->mode = 1; + boar->mActionID = 18; + boar->mActionMode = 0; + boar->field_0x169e = 90; mDoAud_bgmStop(30); } break; case 1: - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_RSHOOT_READY, 3.0f, 2, 1.0f); } break; case 10: anm_init(i_this, BCK_RD_RSHOOT, 2.0f, 0, 1.0f); - i_this->mMode = 11; - i_this->field_0x9bc = 0; + i_this->mode = 11; + i_this->ride_mode = 0; - if (bullbo != NULL) { - UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be, u16); - i_this->field_0x9be = 0; + if (boar != NULL) { + UNSET_FLAG(boar->mStatusFlags, i_this->boar_stand, u16); + i_this->boar_stand = 0; } - a_this->speedF = 0.0f; - a_this->speed.y = 50.0f + KREG_F(7); - i_this->field_0x9ec = 60.0f + KREG_F(8); - i_this->field_0xa0c.y = 0x4000; + enemy->speedF = 0.0f; + enemy->speed.y = 50.0f + KREG_F(7); + i_this->jump_z = 60.0f + KREG_F(8); + i_this->jump_angle.y = 0x4000; - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_V_DEATH, -1); + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_DEATH, -1); break; case 11: - if (a_this->speed.y < 0.0f) { - cLib_addCalc2(&i_this->field_0x9ec, KREG_F(9), 0.1f, 1.0f); + if (enemy->speed.y < 0.0f) { + cLib_addCalc2(&i_this->jump_z, KREG_F(9), 0.1f, 1.0f); } break; } @@ -4007,51 +4007,51 @@ static void* s_rdb_sub(void* i_actor, void* i_data) { } static void e_rd_lv9_end(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + e_wb_class* boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); - i_this->field_0x998 = 10; + i_this->damage_timer = 10; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: anm_init(i_this, e_rdb_class::BCK_RB_RWALK, 0.0f, 2, 1.0f); - i_this->mMode = 1; + i_this->mode = 1; break; case 1: - if ((bullbo->mStatusFlags & 8) != 0) { + if ((boar->mStatusFlags & 8) != 0) { anm_init(i_this, e_rdb_class::BCK_RB_RWAIT, 10.0f, 2, 1.0f); - i_this->mMode = 2; + i_this->mode = 2; } break; case 2: - if ((bullbo->mStatusFlags & 8) != 0) { + if ((boar->mStatusFlags & 8) != 0) { anm_init(i_this, e_rdb_class::BCK_RB_LV9_END03, 5.0f, 0, 1.0f); - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_V_LV9_END03, -1); - i_this->mMode = 3; + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_LV9_END03, -1); + i_this->mode = 3; } break; case 3: - if (i_this->mAnmID == e_rdb_class::BCK_RB_LV9_END03) { - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm == e_rdb_class::BCK_RB_LV9_END03) { + if (i_this->anm_p->isStop()) { anm_init(i_this, e_rdb_class::BCK_RB_RWAIT, 10.0f, 2, 1.0f); } } else { - e_rdb_class* king_bulblin = (e_rdb_class*)fpcM_Search(s_rdb_sub, i_this); - if (king_bulblin != NULL && king_bulblin->mDemoMode == 14) { + e_rdb_class* rdb = (e_rdb_class*)fpcM_Search(s_rdb_sub, i_this); + if (rdb != NULL && rdb->mDemoMode == 14) { anm_init(i_this, e_rdb_class::BCK_RB_RNEIGH, 3.0f, 0, 1.0f); - bullbo->mActionMode++; - i_this->mMode = 4; + boar->mActionMode++; + i_this->mode = 4; } } break; case 4: - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, e_rdb_class::BCK_RB_RRUN, 3.0f, 2, 1.0f); - i_this->mMode = 5; + i_this->mode = 5; } break; @@ -4073,84 +4073,84 @@ static void* s_boom_sub(void* i_actor, void* i_data) { } static void wolfkick_damage(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - fopAc_ac_c* player = dComIfGp_getPlayer(0); - - i_this->mAction = ACTION_DAMAGE; - i_this->mMode = 0; - i_this->field_0xa0c.y = player->shape_angle.y + 0x8000; - a_this->speed.y = l_HIO.wolf_falling_power_y; - i_this->field_0x9ec = -l_HIO.wolf_falling_power_z; - i_this->mSound.startCollisionSE(Z2SE_HIT_WOOD_WEAPON, 31); - i_this->field_0x9f8 = 1; - i_this->field_0x998 = 1000; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); + + i_this->action = ACTION_DAMAGE; + i_this->mode = 0; + i_this->jump_angle.y = pla->shape_angle.y + 0x8000; + enemy->speed.y = l_HIO.wolf_falling_power_y; + i_this->jump_z = -l_HIO.wolf_falling_power_z; + i_this->sound.startCollisionSE(Z2SE_HIT_WOOD_WEAPON, 31); + i_this->damage_flag = 1; + i_this->damage_timer = 1000; } static void big_damage(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - i_this->mAction = ACTION_DAMAGE; - i_this->mMode = 0; - a_this->speed.y = l_HIO.jump_y + 2.0f; + i_this->action = ACTION_DAMAGE; + i_this->mode = 0; + enemy->speed.y = l_HIO.jump_y + 2.0f; - if (i_this->field_0x9bc == 2) { - fopAc_ac_c* bullbo = fopAcM_SearchByID(i_this->mWbActorID); - if (bullbo != NULL && bullbo->speedF >= 20.0f) { - i_this->field_0x9ec = bullbo->speedF; - if (i_this->field_0x9ec > 40.0f) { - i_this->field_0x9ec = 40.0f; + if (i_this->ride_mode == 2) { + fopAc_ac_c* actor = fopAcM_SearchByID(i_this->boar_id); + if (actor != NULL && actor->speedF >= 20.0f) { + i_this->jump_z = actor->speedF; + if (i_this->jump_z > 40.0f) { + i_this->jump_z = 40.0f; } } else { - i_this->field_0x9ec = -l_HIO.jump_z_suspended; + i_this->jump_z = -l_HIO.jump_z_suspended; } - i_this->field_0xa0c.y = a_this->shape_angle.y + (s16)cM_rndFX(3000.0f); + i_this->jump_angle.y = enemy->shape_angle.y + (s16)cM_rndFX(3000.0f); } else { - i_this->field_0xa0c.y = i_this->mAtInfo.mHitDirection.y; - i_this->field_0x9ec = -l_HIO.jump_z; + i_this->jump_angle.y = i_this->AtInfo.mHitDirection.y; + i_this->jump_z = -l_HIO.jump_z; } - if ((i_this->mAtInfo.mHitBit & 0x80) != 0) { + if ((i_this->AtInfo.mHitBit & 0x80) != 0) { OS_REPORT("SPIN CUT HIT !!\n"); i_this->field_0x9f6 = cM_rndFX(2000.0f) + 4000.0f; - } else if ((i_this->mAtInfo.mHitBit & 0x800) != 0) { + } else if ((i_this->AtInfo.mHitBit & 0x800) != 0) { OS_REPORT("SPIN CUT L HIT !!\n"); i_this->field_0x9f6 = -(cM_rndFX(2000.0f) + 4000.0f); } else { - if (i_this->field_0x9bc != 0) { + if (i_this->ride_mode != 0) { i_this->field_0x9f6 = cM_rndFX(3000.0f); } else { - if (fopAcM_GetName(i_this->mAtInfo.mpActor) == PROC_E_WB) { + if (fopAcM_GetName(i_this->AtInfo.mpActor) == PROC_E_WB) { i_this->field_0x9f6 = cM_rndFX(8000.0f); - a_this->speed.y = cM_rndF(15.0f) + (35.0f + TREG_F(17)); - i_this->field_0x9ec = -(i_this->mAtInfo.mpActor->speedF * 0.5f); + enemy->speed.y = cM_rndF(15.0f) + (35.0f + TREG_F(17)); + i_this->jump_z = -(i_this->AtInfo.mpActor->speedF * 0.5f); } else { i_this->field_0x9f6 = cM_rndFX(1000.0f); } } } - i_this->field_0x9f8 = 0; - i_this->field_0x998 = 1000; + i_this->damage_flag = 0; + i_this->damage_timer = 1000; } static void small_damage(e_rd_class* i_this, int param_2) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; - if (i_this->mAction != ACTION_S_DAMAGE) { - i_this->field_0x974 = i_this->mAction; + if (i_this->action != ACTION_S_DAMAGE) { + i_this->prev_action = i_this->action; } - i_this->mAction = ACTION_S_DAMAGE; - i_this->mMode = 0; - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_DAMAGE, -1); + i_this->action = ACTION_S_DAMAGE; + i_this->mode = 0; + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_DAMAGE, -1); if (param_2 == 0) { - s16 sVar1 = a_this->shape_angle.y - i_this->mPlayerAngleY; - if (sVar1 < -0x4000 || sVar1 > 0x4000) { + s16 range = enemy->shape_angle.y - i_this->angleY; + if (range < -0x4000 || range > 0x4000) { anm_init(i_this, BCK_RD_DAMAGE_W, 2.0f, 0, 1.0f); - } else if (sVar1 < 0) { + } else if (range < 0) { anm_init(i_this, BCK_RD_DAMAGE_L, 2.0f, 0, 1.0f); } else { anm_init(i_this, BCK_RD_DAMAGE_R, 2.0f, 0, 1.0f); @@ -4160,19 +4160,19 @@ static void small_damage(e_rd_class* i_this, int param_2) { } i_this->field_0x9f0 = 20.0f + TREG_F(10); - i_this->field_0x9f4 = i_this->mAtInfo.mHitDirection.y; + i_this->field_0x9f4 = i_this->AtInfo.mHitDirection.y; } static void part_break(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; cXyz unused_vec_0, unused_vec_1; for (int i = 0; i < 14; i++) { if (i_this->field_0x70c[i] == 0) { i_this->field_0x70c[i] = 1; - i_this->mSound.startCreatureSound(Z2SE_EN_RDB_BREAK_ARMOR, 0, -1); + i_this->sound.startCreatureSound(Z2SE_EN_RDB_BREAK_ARMOR, 0, -1); - cXyz sp54 = i_this->field_0x71c[i] - a_this->current.pos; + cXyz sp54 = i_this->field_0x71c[i] - enemy->current.pos; cMtx_YrotS(*calc_mtx, cM_atan2s(sp54.x, sp54.z)); sp54.x = cM_rndFX(10.0f); sp54.y = cM_rndF(5.0f) + 20.0f; @@ -4183,42 +4183,42 @@ static void part_break(e_rd_class* i_this) { i_this->field_0x86c[i].x = cM_rndF(65536.0f); u16 uVar1; - if (i_this->mAtInfo.mHitStatus != 0) { + if (i_this->AtInfo.mHitStatus != 0) { uVar1 = 3; } else { uVar1 = 1; } - dComIfGp_setHitMark(uVar1, a_this, &i_this->field_0x71c[i], &a_this->shape_angle, NULL, 0); + dComIfGp_setHitMark(uVar1, enemy, &i_this->field_0x71c[i], &enemy->shape_angle, NULL, 0); return; } } } static void damage_check(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - fopAc_ac_c* bullbo = fopAcM_SearchByID(i_this->mWbActorID); - e_wb_class* bullbo_p = (e_wb_class*)bullbo; - - if (i_this->field_0x9bc == 2 && bullbo_p != NULL && (bullbo_p->mStatusFlags & 0xC0) != 0) { - if (i_this->mAction == ACTION_IKKI2_END) { - i_this->mMode = 10; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + daPy_py_c* pla = (daPy_py_c*)dComIfGp_getPlayer(0); + fopAc_ac_c* actor = fopAcM_SearchByID(i_this->boar_id); + e_wb_class* boar = (e_wb_class*)actor; + + if (i_this->ride_mode == 2 && boar != NULL && (boar->mStatusFlags & 0xC0) != 0) { + if (i_this->action == ACTION_IKKI2_END) { + i_this->mode = 10; } else { - i_this->mAction = ACTION_DAMAGE; - i_this->mMode = 0; - i_this->field_0x998 = 1000; + i_this->action = ACTION_DAMAGE; + i_this->mode = 0; + i_this->damage_timer = 1000; - if ((bullbo_p->mStatusFlags & 0x80) != 0) { - i_this->field_0xa0c.y = a_this->shape_angle.y + 0x8000 + (s16)cM_rndFX(3000.0f); + if ((boar->mStatusFlags & 0x80) != 0) { + i_this->jump_angle.y = enemy->shape_angle.y + 0x8000 + (s16)cM_rndFX(3000.0f); i_this->field_0x9f6 = (s16)cM_rndFX(1000.0f); } else { - i_this->field_0xa0c.y = a_this->shape_angle.y + (s16)cM_rndFX(8000.0f); + i_this->jump_angle.y = enemy->shape_angle.y + (s16)cM_rndFX(8000.0f); i_this->field_0x9f6 = (s16)cM_rndFX(3000.0f); } - a_this->speed.y = cM_rndF(15.0f) + (25.0f + TREG_F(13)); - i_this->field_0x9ec = -20.0f + TREG_F(18); + enemy->speed.y = cM_rndF(15.0f) + (25.0f + TREG_F(13)); + i_this->jump_z = -20.0f + TREG_F(18); } return; @@ -4226,78 +4226,78 @@ static void damage_check(e_rd_class* i_this) { i_this->mStts.Move(); - if (i_this->field_0x998 == 0) { - if (i_this->mBossMode != 0 + if (i_this->damage_timer == 0) { + if (i_this->actor_set != 0 #if DEBUG || l_HIO.invulnerable #endif ) { - a_this->health = 100; + enemy->health = 100; } for (int i = 0; i <= 2; i++) { - if (i_this->field_0xd58[i].ChkTgHit() != 0) { - i_this->field_0x998 = 6; - i_this->mAtInfo.mpCollider = i_this->field_0xd58[i].GetTgHitObj(); - if (i_this->mBossMode == 3) { - s16 sVar1 = a_this->shape_angle.y - i_this->mPlayerAngleY; - at_power_check(&i_this->mAtInfo); - if (i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_ARROW) || i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_BOMB)) { + if (i_this->cc_sph[i].ChkTgHit() != 0) { + i_this->damage_timer = 6; + i_this->AtInfo.mpCollider = i_this->cc_sph[i].GetTgHitObj(); + if (i_this->actor_set == 3) { + s16 range = enemy->shape_angle.y - i_this->angleY; + at_power_check(&i_this->AtInfo); + if (i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_ARROW) || i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_BOMB)) { u16 uVar1; - if (dComIfGp_getHorseActor()->speedF > 20.0f || sVar1 > 0x7800 || sVar1 < -0x7800) { - cc_at_check(a_this, &i_this->mAtInfo); + if (dComIfGp_getHorseActor()->speedF > 20.0f || range > 0x7800 || range < -0x7800) { + cc_at_check(enemy, &i_this->AtInfo); dScnPly_c::setPauseTimer(0); - bullbo_p->mLapCount++; - if (bullbo_p->mLapCount >= 3) { + boar->mLapCount++; + if (boar->mLapCount >= 3) { mDoAud_bgmStop(30); - i_this->mAction = ACTION_IKKI2_END; - i_this->mMode = 0; - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_V_DAMAGE_L, -1); + i_this->action = ACTION_IKKI2_END; + i_this->mode = 0; + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_DAMAGE_L, -1); } else { - bullbo_p->field_0x169e = 25; + boar->field_0x169e = 25; anm_init(i_this, e_rdb_class::BCK_RB_RDAMAGEB, 2.0f, 0, 1.0f); - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_V_DAMAGE, -1); + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_DAMAGE, -1); } uVar1 = 3; - bullbo_p->field_0x698[3] = 100; + boar->field_0x698[3] = 100; dComIfGs_onSaveDunSwitch(7); } else { uVar1 = 2; anm_init(i_this, e_rdb_class::BCK_RB_RGUARD_F, 2.0f, 0, 1.0f); } - cXyz sp34, sp40; - cMtx_YrotS(*calc_mtx, bullbo->shape_angle.y); - sp34.set(0.0f, nREG_F(9) + 150.0f, nREG_F(10) + 200.0f); - MtxPosition(&sp34, &sp40); + cXyz mae, ato; + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); + mae.set(0.0f, nREG_F(9) + 150.0f, nREG_F(10) + 200.0f); + MtxPosition(&mae, &ato); - sp40 += a_this->current.pos; - cXyz sp4c(2.0f, 2.0f, 2.0f); - dComIfGp_setHitMark(uVar1, a_this, &sp40, NULL, &sp4c, 0); - } else if (i_this->mAtInfo.mHitType == 1) { + ato += enemy->current.pos; + cXyz sc(2.0f, 2.0f, 2.0f); + dComIfGp_setHitMark(uVar1, enemy, &ato, NULL, &sc, 0); + } else if (i_this->AtInfo.mHitType == 1) { anm_init(i_this, e_rdb_class::BCK_RB_RGUARD_F, 2.0f, 0, 1.0f); - bullbo_p->field_0x169e = 25; + boar->field_0x169e = 25; dScnPly_c::setPauseTimer(0); - cXyz sp58, sp64; - cMtx_YrotS(*calc_mtx, bullbo->shape_angle.y); + cXyz mae, ato; + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); - s16 angle_diff = a_this->shape_angle.y - i_this->mPlayerAngleY; + s16 angle_diff = enemy->shape_angle.y - i_this->angleY; if (angle_diff < 0) { - sp58.set(100.0f, nREG_F(9) + 150.0f, nREG_F(10) + 400.0f); + mae.set(100.0f, nREG_F(9) + 150.0f, nREG_F(10) + 400.0f); } else { - sp58.set(-100.0f, nREG_F(9) + 150.0f, nREG_F(10) + 400.0f); + mae.set(-100.0f, nREG_F(9) + 150.0f, nREG_F(10) + 400.0f); } - MtxPosition(&sp58, &sp64); + MtxPosition(&mae, &ato); - sp64 += a_this->current.pos; - cXyz sp70(2.0f, 2.0f, 2.0f); - dComIfGp_setHitMark(2, a_this, &sp64, NULL, &sp70, 0); + ato += enemy->current.pos; + cXyz sc(2.0f, 2.0f, 2.0f); + dComIfGp_setHitMark(2, enemy, &ato, NULL, &sc, 0); dComIfGp_getVibration().StartShock(8, 31, cXyz(0.0f, 1.0f, 0.0f)); - i_this->mSound.startCollisionSE(Z2SE_HIT_SWORD, 40); + i_this->sound.startCollisionSE(Z2SE_HIT_SWORD, 40); - i_this->field_0x998 = 30; + i_this->damage_timer = 30; } return; @@ -4305,19 +4305,19 @@ static void damage_check(e_rd_class* i_this) { i_this->field_0x129c = 3; - if (i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_10000000)) { + if (i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_10000000)) { wolfkick_damage(i_this); break; } - at_power_check(&i_this->mAtInfo); - if (i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_SHIELD_ATTACK)) { - i_this->field_0x990[1] = 30; + at_power_check(&i_this->AtInfo); + if (i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_SHIELD_ATTACK)) { + i_this->timer[1] = 30; } else { - i_this->field_0x990[1] = 1; + i_this->timer[1] = 1; } - if (i_this->field_0x9bc == 2 && i_this->mAtInfo.mAttackPower <= 10) { + if (i_this->ride_mode == 2 && i_this->AtInfo.mAttackPower <= 10) { if (fpcM_Search(s_boom_sub, i_this) != NULL) { return; } @@ -4325,75 +4325,75 @@ static void damage_check(e_rd_class* i_this) { i_this->field_0x99a = 5; } - s16 cur_health = a_this->health; // unused - OS_REPORT(" HIT AT %d\n", i_this->mAtInfo.mAttackPower); - if (i_this->field_0x1295 != 0 && (i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_SLINGSHOT) || - (i_this->mAtInfo.mHitType != 1 && i_this->mAtInfo.mHitType != 16 && i_this->mAtInfo.mHitType != 2))) { - i_this->field_0x998 = 1000; - i_this->mAction = ACTION_DROP; - i_this->mMode = 0; - a_this->health = 0; - cc_at_check(a_this, &i_this->mAtInfo); + s16 cur_health = enemy->health; // unused + OS_REPORT(" HIT AT %d\n", i_this->AtInfo.mAttackPower); + if (i_this->one_hit_kill != 0 && (i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_SLINGSHOT) || + (i_this->AtInfo.mHitType != 1 && i_this->AtInfo.mHitType != 16 && i_this->AtInfo.mHitType != 2))) { + i_this->damage_timer = 1000; + i_this->action = ACTION_DROP; + i_this->mode = 0; + enemy->health = 0; + cc_at_check(enemy, &i_this->AtInfo); return; } - if (i_this->mAtInfo.mHitType == 15) { - a_this->health = 0; - if (i_this->field_0x9bc == 0) { - i_this->mAction = ACTION_A_DAMAGE; - i_this->mMode = 0; - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_DAMAGE, -1); - a_this->health = 0; - cc_at_check(a_this, &i_this->mAtInfo); + if (i_this->AtInfo.mHitType == 15) { + enemy->health = 0; + if (i_this->ride_mode == 0) { + i_this->action = ACTION_A_DAMAGE; + i_this->mode = 0; + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_DAMAGE, -1); + enemy->health = 0; + cc_at_check(enemy, &i_this->AtInfo); return; } } - cc_at_check(a_this, &i_this->mAtInfo); + cc_at_check(enemy, &i_this->AtInfo); if (daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_HEAD_JUMP) { - a_this->health = 0; + enemy->health = 0; } - if (i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_UNK)) { - i_this->field_0x998 = 20; + if (i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_UNK)) { + i_this->damage_timer = 20; } else { - i_this->field_0x998 = 10; + i_this->damage_timer = 10; } - if (i_this->mAtInfo.mAttackPower <= 1) { - i_this->field_0x998 = 10 + KREG_S(8); + if (i_this->AtInfo.mAttackPower <= 1) { + i_this->damage_timer = 10 + KREG_S(8); } - i_this->field_0xa20 |= i_this->mAtInfo.mHitBit; + i_this->field_0xa20 |= i_this->AtInfo.mHitBit; - if (daPy_getPlayerActorClass()->checkHorseRide() != 0 && dComIfGp_getHorseActor()->speedF >= 20.0f && i_this->mAtInfo.mHitType == 1) { - i_this->mAtInfo.mAttackPower = 20; + if (daPy_getPlayerActorClass()->checkHorseRide() != 0 && dComIfGp_getHorseActor()->speedF >= 20.0f && i_this->AtInfo.mHitType == 1) { + i_this->AtInfo.mAttackPower = 20; } - if (a_this->health <= 0 || i_this->mAtInfo.mHitStatus != 0 || i_this->field_0x9bc != 0) { - if (player->getCutType() == daPy_py_c::CUT_TYPE_JUMP && player->checkCutJumpCancelTurn()) { + if (enemy->health <= 0 || i_this->AtInfo.mHitStatus != 0 || i_this->ride_mode != 0) { + if (pla->getCutType() == daPy_py_c::CUT_TYPE_JUMP && pla->checkCutJumpCancelTurn()) { small_damage(i_this, i); - i_this->field_0x998 = 3 + NREG_S(7); + i_this->damage_timer = 3 + NREG_S(7); } else { - if (i_this->mBossMode != 0 && bullbo_p != NULL) { - i_this->field_0x998 = 20; - if (i_this->mBossMode == 2) { - bullbo_p->mLapCount++; - if (bullbo_p->mLapCount == 1) { - a_this->health = 0; + if (i_this->actor_set != 0 && boar != NULL) { + i_this->damage_timer = 20; + if (i_this->actor_set == 2) { + boar->mLapCount++; + if (boar->mLapCount == 1) { + enemy->health = 0; /* dSv_event_flag_c::M_055 - Main Event - Did damage at least once during joust/one-on-one battle */ dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x58]); part_break(i_this); - bullbo_p->field_0x169e = 20; + boar->field_0x169e = 20; dScnPly_c::setPauseTimer(0); } - if (l_HIO.one_hit_kill != 0 || bullbo_p->mLapCount >= 2) { + if (l_HIO.one_hit_kill != 0 || boar->mLapCount >= 2) { mDoAud_bgmStop(30); - i_this->mAction = ACTION_IKKI_END; - i_this->mMode = 0; + i_this->action = ACTION_IKKI_END; + i_this->mode = 0; - if ((i_this->mAtInfo.mHitBit & 0x80) != 0) { + if ((i_this->AtInfo.mHitBit & 0x80) != 0) { i_this->field_0x9f6 = 0x300 + YREG_S(0); } else { i_this->field_0x9f6 = cM_rndFX(100.0f); @@ -4402,80 +4402,80 @@ static void damage_check(e_rd_class* i_this) { dScnPly_c::setPauseTimer(10); } else { if (i_this->field_0x680 == 0) { - int anm_idx = i_this->mAnmID; + int anm_idx = i_this->anm; anm_init(i_this, e_rdb_class::BCK_RB_RDOWNB, 2.0f, 0, 1.0f); i_this->field_0x680 = anm_idx; } - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_V_DAMAGE_L, -1); + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_DAMAGE_L, -1); } return; } - bullbo_p->mLapCount++; - bullbo_p->mPathAdjustCounter++; + boar->mLapCount++; + boar->mPathAdjustCounter++; part_break(i_this); - if (bullbo_p->mLapCount == 1 || bullbo_p->mLapCount == 2 || bullbo_p->mLapCount == 3 || - bullbo_p->mLapCount == 4 || bullbo_p->mLapCount == 6) { + if (boar->mLapCount == 1 || boar->mLapCount == 2 || boar->mLapCount == 3 || + boar->mLapCount == 4 || boar->mLapCount == 6) { part_break(i_this); } - s8 sVar2 = 8 - bullbo_p->mLapCount; - if (sVar2 > 8) { - sVar2 = 8; + s8 life = 8 - boar->mLapCount; + if (life > 8) { + life = 8; } - dComIfGs_BossLife_public_Set(sVar2); + dComIfGs_BossLife_public_Set(life); - if (bullbo_p->mLapCount == 5) { + if (boar->mLapCount == 5) { Z2GetAudioMgr()->changeSubBgmStatus(2); } - if (bullbo_p->mLapCount >= 8) { - i_this->mAction = ACTION_KIBA_END; - i_this->mMode = 0; + if (boar->mLapCount >= 8) { + i_this->action = ACTION_KIBA_END; + i_this->mode = 0; mDoAud_seStart(Z2SE_EN_RDB_V_FAINT, 0, 0, 0); - bullbo_p->mActionID = 31; - bullbo_p->mActionMode = 0; + boar->mActionID = 31; + boar->mActionMode = 0; mDoAud_bgmStop(30); return; } - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_V_DAMAGE, -1); + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_DAMAGE, -1); - if (i_this->mAnmID == e_rdb_class::BCK_RB_RPLAY_RUNL || i_this->mAnmID == e_rdb_class::BCK_RB_RPLAY_RUNR - || i_this->mAnmID == e_rdb_class::BCK_RB_RPLAY_STOP) { - i_this->mAnmID = i_this->field_0x680; + if (i_this->anm == e_rdb_class::BCK_RB_RPLAY_RUNL || i_this->anm == e_rdb_class::BCK_RB_RPLAY_RUNR + || i_this->anm == e_rdb_class::BCK_RB_RPLAY_STOP) { + i_this->anm = i_this->field_0x680; i_this->field_0x680 = 0; } if (i_this->field_0x680 == 0) { - i_this->field_0x990[3] = cM_rndF(100.0f) + 200.0f; - int anm_id = i_this->mAnmID; + i_this->timer[3] = cM_rndF(100.0f) + 200.0f; + int anm_no = i_this->anm; - s16 angle_diff = a_this->shape_angle.y - i_this->mPlayerAngleY; + s16 angle_diff = enemy->shape_angle.y - i_this->angleY; if (angle_diff < 0) { anm_init(i_this, e_rdb_class::BCK_RB_RDAMAGEL, 2.0f, 0, 1.0f); } else { anm_init(i_this, e_rdb_class::BCK_RB_RDAMAGER, 2.0f, 0, 1.0f); } - i_this->field_0x680 = anm_id; + i_this->field_0x680 = anm_no; } - if (i_this->mAction != ACTION_WB_RUN) { - i_this->mAction = ACTION_WB_RUN; - i_this->mMode = 0; + if (i_this->action != ACTION_WB_RUN) { + i_this->action = ACTION_WB_RUN; + i_this->mode = 0; } break; } - if (i_this->field_0x9bc != 0 && i_this->mAtInfo.mpCollider->ChkAtType(AT_TYPE_BOOMERANG)) { - i_this->field_0x998 = 20; - if (i_this->mAction == ACTION_WB_RUN) { + if (i_this->ride_mode != 0 && i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_BOOMERANG)) { + i_this->damage_timer = 20; + if (i_this->action == ACTION_WB_RUN) { anm_init(i_this, BCK_RD_RRUN02_BACK, 5.0f, 2, 1.0f); - i_this->mMode = 50; - i_this->field_0x990[3] = cM_rndF(20.0f) + 50.0f; + i_this->mode = 50; + i_this->timer[3] = cM_rndF(20.0f) + 50.0f; } } else { big_damage(i_this); @@ -4483,24 +4483,24 @@ static void damage_check(e_rd_class* i_this) { } } else { int iVar2 = i; - if (i_this->mAtInfo.mHitType == 16) { + if (i_this->AtInfo.mHitType == 16) { iVar2 = 0; } small_damage(i_this, iVar2); } - a_this->speedF = 0.0f; - if (i_this->mpMorfBowAnm != NULL) { - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); + enemy->speedF = 0.0f; + if (i_this->bow_anm != NULL) { + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); } break; } } for (int j = 0; j <= 2; j++) { - if (a_this->health <= 1) { - i_this->field_0xd58[j].SetTgHitMark(CcG_Tg_UNK_MARK_3); + if (enemy->health <= 1) { + i_this->cc_sph[j].SetTgHitMark(CcG_Tg_UNK_MARK_3); } } } @@ -4508,7 +4508,7 @@ static void damage_check(e_rd_class* i_this) { static void* s_other_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->field_0x5b7 != 6) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->arg1 != 6) { return i_actor; } @@ -4521,10 +4521,10 @@ static void* s_ep_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Lv1Cdl00) { if (!fopAcM_isSwitch((fopAc_ac_c*)i_actor, fopAcM_GetParam(i_actor) & 0xFF)) { - f32 fVar2, fVar1; - fVar2 = ((fopAc_ac_c*)i_actor)->current.pos.x - player->current.pos.x; - fVar1 = ((fopAc_ac_c*)i_actor)->current.pos.z - player->current.pos.z; - if (JMAFastSqrt(fVar2 * fVar2 + fVar1 * fVar1) < NREG_F(17) + 600.0f) { + f32 x, z; + x = ((fopAc_ac_c*)i_actor)->current.pos.x - player->current.pos.x; + z = ((fopAc_ac_c*)i_actor)->current.pos.z - player->current.pos.z; + if (JMAFastSqrt(x * x + z * z) < NREG_F(17) + 600.0f) { return i_actor; } } @@ -4534,60 +4534,60 @@ static void* s_ep_sub(void* i_actor, void* i_data) { } static s8 e_rd_yagura(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; cXyz unused_vec_0, unused_vec_1; - int frame = i_this->mpModelMorf->getFrame(); - s8 rv = 1; + int frame = i_this->anm_p->getFrame(); + s8 rt = 1; s8 bVar1 = 0; fpcM_Search(s_b_sub, i_this); - switch (i_this->mMode) { + switch (i_this->mode) { case 0: - if (i_this->field_0x99c != 0) { - a_this->home.pos.y = a_this->current.pos.y; + if (i_this->yagura_timer != 0) { + enemy->home.pos.y = enemy->current.pos.y; return 0; } - rv = 0; + rt = 0; bVar1 = 1; - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); - i_this->mMode = 1; - i_this->field_0x990[0] = cM_rndF(40.0f) + 60.0f; + i_this->mode = 1; + i_this->timer[0] = cM_rndF(40.0f) + 60.0f; } break; case 1: - rv = 0; + rt = 0; bVar1 = 1; - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_WAIT01, 10.0f, 2, 1.0f); - i_this->field_0x990[0] = cM_rndF(100.0f) + 100.0f; - i_this->mMode = 0; + i_this->timer[0] = cM_rndF(100.0f) + 100.0f; + i_this->mode = 0; } break; case 5: i_this->field_0x9c8 = 4; - if (i_this->field_0x990[0] == 0) { + if (i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_SHOUT, 5.0f, 0, 1.0f); - i_this->mMode = 10; - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_FIND_LINK_YELL, -1); - dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(i_this), 3); + i_this->mode = 10; + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_FIND_LINK_YELL, -1); + dKy_Sound_set(enemy->current.pos, 100, fopAcM_GetID(i_this), 3); } break; case 10: - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_SHOOT_READY, 5.0f, 0, 1.0f); - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 7), + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 7), 0, 5.0f, 0.9f + TREG_F(3), 0.0f, -1.0f); - i_this->mMode = 11; - a_this->speedF = 0.0f; + i_this->mode = 11; + enemy->speedF = 0.0f; } break; @@ -4599,23 +4599,23 @@ static s8 e_rd_yagura(e_rd_class* i_this) { } if (frame == 20) { - i_this->mSound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1); + i_this->sound.startCreatureSound(Z2SE_OBJ_ARROW_DRAW_NORMAL, 0, -1); } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { anm_init(i_this, BCK_RD_SHOOT_WAIT, 4.0f, 2, 1.0f); - i_this->field_0x990[0] = cM_rndF(10.0f) + 10.0f; - i_this->mMode = 12; + i_this->timer[0] = cM_rndF(10.0f) + 10.0f; + i_this->mode = 12; } break; case 12: i_this->field_0x9c8 = 4; - if (i_this->field_0x990[0] == 0 && i_this->field_0x9a4 == 0) { + if (i_this->timer[0] == 0 && i_this->field_0x9a4 == 0) { anm_init(i_this, BCK_RD_SHOOT, 1.0f, 0, 1.0f); - i_this->mpMorfBowAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); - i_this->mMode = 13; + i_this->bow_anm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, 10), 0, 1.0f, 1.0f, 0.0f, -1.0f); + i_this->mode = 13; } i_this->field_0x9a2 = 1; @@ -4628,16 +4628,16 @@ static s8 e_rd_yagura(e_rd_class* i_this) { } if (frame == 2 + XREG_S(7)) { - i_this->field_0x9a3 = 1; + i_this->arrow_flag = 1; } - if (i_this->mpModelMorf->isStop()) { + if (i_this->anm_p->isStop()) { if (pl_check(i_this, 10000.0f, 0x7FFF)) { - i_this->mMode = 10; + i_this->mode = 10; anm_init(i_this, BCK_RD_SHOUT, 5.0f, 0, 1.0f); - dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(i_this), 3); + dKy_Sound_set(enemy->current.pos, 100, fopAcM_GetID(i_this), 3); } else { - i_this->mMode = 0; + i_this->mode = 0; } } break; @@ -4646,48 +4646,48 @@ static s8 e_rd_yagura(e_rd_class* i_this) { break; } - if (fabsf(i_this->mObjAcch.GetGroundH() - a_this->home.pos.y) > 10.0f) { - i_this->mAction = ACTION_DAMAGE; - i_this->mMode = 0; - i_this->field_0xa0c.y = s16(a_this->shape_angle.y); - a_this->speed.y = 20.0f; - i_this->field_0x9ec = -20.0f; - i_this->field_0x998 = 1000; - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_DEATH, -1); - a_this->health = 0; + if (fabsf(i_this->ObjAcch.GetGroundH() - enemy->home.pos.y) > 10.0f) { + i_this->action = ACTION_DAMAGE; + i_this->mode = 0; + i_this->jump_angle.y = s16(enemy->shape_angle.y); + enemy->speed.y = 20.0f; + i_this->jump_z = -20.0f; + i_this->damage_timer = 1000; + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_DEATH, -1); + enemy->health = 0; return 0; } - if (bVar1 && pl_check(i_this, i_this->field_0x980, 0x4000) && (i_this->field_0x980 >= 8000.0f || fpcM_Search(s_ep_sub, i_this) != NULL)) { + if (bVar1 && pl_check(i_this, i_this->attack_range, 0x4000) && (i_this->attack_range >= 8000.0f || fpcM_Search(s_ep_sub, i_this) != NULL)) { anm_init(i_this, BCK_RD_WAIT01, 4.0f, 2, 1.0f); - i_this->field_0x990[0] = 30; - i_this->mMode = 5; + i_this->timer[0] = 30; + i_this->mode = 5; if (S_find == 0 && !lbl_70_bss_AE && !daPy_getPlayerActorClass()->checkBoarRide() - && !dComIfGp_event_runCheck() && i_this->mDemoMode == 0 + && !dComIfGp_event_runCheck() && i_this->demo_mode == 0 && fpcM_Search(s_other_sub, i_this) != NULL) { - i_this->mDemoMode = 1; + i_this->demo_mode = 1; } } - if (rv != 0) { - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngleY, 4, 0x1000); + if (rt != 0) { + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->angleY, 4, 0x1000); } - return rv; + return rt; } static void e_rd_jyunkai(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - int frame = i_this->mpModelMorf->getFrame(); // unused - f32 fVar1 = 0.0f; - s16 sVar1 = 0x4000; - cXyz sp58, sp64; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + int frame = i_this->anm_p->getFrame(); // unused + f32 speed = 0.0f; + s16 angle = 0x4000; + cXyz vec, sp64; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: { anm_init(i_this, BCK_RD_WALK, 10.0f, 2, 1.0f); - i_this->mMode = 1; - dPnt* pnt_p = i_this->mPath->m_points; + i_this->mode = 1; + dPnt* pnt_p = i_this->path->m_points; pnt_p += i_this->field_0xb00; i_this->field_0x5c0.x = pnt_p->m_position.x; i_this->field_0x5c0.y = pnt_p->m_position.y; @@ -4695,206 +4695,206 @@ static void e_rd_jyunkai(e_rd_class* i_this) { } // fallthrough case 1: - fVar1 = l_HIO.movement_speed; - sp58 = i_this->field_0x5c0 - a_this->current.pos; - i_this->field_0x5cc = cM_atan2s(sp58.x, sp58.z); - - if (sp58.abs() < 50.0f) { - i_this->field_0xb00 += i_this->field_0xb01; - if (i_this->field_0xb00 >= (i_this->mPath->m_num & 0xFF)) { - if (dPath_ChkClose(i_this->mPath)) { + speed = l_HIO.movement_speed; + vec = i_this->field_0x5c0 - enemy->current.pos; + i_this->target_ya = cM_atan2s(vec.x, vec.z); + + if (vec.abs() < 50.0f) { + i_this->field_0xb00 += i_this->path_dir; + if (i_this->field_0xb00 >= (i_this->path->m_num & 0xFF)) { + if (dPath_ChkClose(i_this->path)) { i_this->field_0xb00 = 0; } else { - i_this->field_0xb01 = 0xFF; - i_this->field_0xb00 = i_this->mPath->m_num - 2; + i_this->path_dir = 0xFF; + i_this->field_0xb00 = i_this->path->m_num - 2; } } else if (i_this->field_0xb00 < 0) { - i_this->field_0xb01 = 1; + i_this->path_dir = 1; i_this->field_0xb00 = 1; } - i_this->mMode = 2; - i_this->field_0x990[0] = cM_rndF(100.0f) + 100.0f; + i_this->mode = 2; + i_this->timer[0] = cM_rndF(100.0f) + 100.0f; anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); } break; case 2: - sVar1 = 0x6000; + angle = 0x6000; - if (i_this->field_0x990[0] == 0) { - i_this->mMode = 0; + if (i_this->timer[0] == 0) { + i_this->mode = 0; } break; case 10: anm_init(i_this, BCK_RD_SHOUT, 5.0f, 0, 1.0f); - i_this->mMode = 11; - dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(i_this), 3); + i_this->mode = 11; + dKy_Sound_set(enemy->current.pos, 100, fopAcM_GetID(i_this), 3); S_find = 20; break; case 11: - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngleY, 2, 0x800); - if (i_this->mpModelMorf->isStop()) { - i_this->mAction = ACTION_FIGHT_RUN; - i_this->mMode = -10; - i_this->field_0x990[0] = 60; + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->angleY, 2, 0x800); + if (i_this->anm_p->isStop()) { + i_this->action = ACTION_FIGHT_RUN; + i_this->mode = -10; + i_this->timer[0] = 60; return; } } - if (fVar1) { - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->field_0x5cc, 8, 0x400); - s16 sVar2 = a_this->current.angle.y - i_this->field_0x5cc; - if (sVar2 > 0x400 || sVar2 < -0x400) { - fVar1 = 0.0f; + if (speed) { + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->target_ya, 8, 0x400); + s16 range = enemy->current.angle.y - i_this->target_ya; + if (range > 0x400 || range < -0x400) { + speed = 0.0f; } } - cLib_addCalc2(&a_this->speedF, fVar1, 1.0f, 3.0f); + cLib_addCalc2(&enemy->speedF, speed, 1.0f, 3.0f); - f32 fVar2 = i_this->field_0x980; + f32 range = i_this->attack_range; BOOL bVar1 = FALSE; - if (i_this->field_0x9a1 == 1|| S_find != 0) { - if (i_this->field_0x9a1 == 1) { + if (i_this->look_timer == 1|| S_find != 0) { + if (i_this->look_timer == 1) { bVar1 = TRUE; } - fVar2 = 10000.0f; - sVar1 = 0x7FFF; + range = 10000.0f; + angle = 0x7FFF; } - if (i_this->mMode < 10) { + if (i_this->mode < 10) { if (bVar1) { - i_this->mMode = 2; - i_this->field_0x990[0] = cM_rndF(100.0f) + 100.0f; + i_this->mode = 2; + i_this->timer[0] = cM_rndF(100.0f) + 100.0f; anm_init(i_this, BCK_RD_KYORO2, 10.0f, 2, 1.0f); - } else if ((i_this->field_0x970 & 7) == 0 && pl_check(i_this, fVar2, sVar1)) { + } else if ((i_this->counter & 7) == 0 && pl_check(i_this, range, angle)) { if (S_find == 0) { - i_this->mMode = 10; + i_this->mode = 10; } else { - i_this->mAction = ACTION_FIGHT_RUN; - i_this->mMode = -10; - i_this->field_0x990[0] = 60; + i_this->action = ACTION_FIGHT_RUN; + i_this->mode = -10; + i_this->timer[0] = 60; } } } } static void e_rd_sleep(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - int frame = i_this->mpModelMorf->getFrame(); - f32 fVar1 = i_this->field_0x980; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + int frame = i_this->anm_p->getFrame(); + f32 range = i_this->attack_range; s16 sVar1 = 0x4000; - BOOL bVar1 = FALSE; + BOOL look_check = FALSE; - if (i_this->field_0x9a1 == 1 || S_find != 0) { - if (i_this->field_0x9a1 == 1) { - bVar1 = TRUE; - } else if ((i_this->field_0x970 & 15) == 0) { - bVar1 = TRUE; + if (i_this->look_timer == 1 || S_find != 0) { + if (i_this->look_timer == 1) { + look_check = TRUE; + } else if ((i_this->counter & 15) == 0) { + look_check = TRUE; } - fVar1 = 5000.0f; + range = 5000.0f; sVar1 = 0x7FFF; } - s8 cVar1 = 0; + s8 find = 0; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: - i_this->field_0x990[0] = cM_rndF(100.0f) + 200.0f; + i_this->timer[0] = cM_rndF(100.0f) + 200.0f; anm_init(i_this, BCK_RD_SLEEP_WAIT, 10.0f, 2, 1.0f); - i_this->mMode = 1; + i_this->mode = 1; break; case 1: - if (bVar1 || i_this->field_0x990[0] == 0) { + if (look_check || i_this->timer[0] == 0) { anm_init(i_this, BCK_RD_SLEEP_LOOKAROUND, 5.0f, 0, 1.0f); - i_this->mMode = 2; + i_this->mode = 2; } break; case 2: - if (i_this->mpModelMorf->isStop()) { - i_this->mMode = 0; + if (i_this->anm_p->isStop()) { + i_this->mode = 0; } - if (fopAcM_GetRoomNo(a_this) == 0) { - if (bVar1) { + if (fopAcM_GetRoomNo(enemy) == 0) { + if (look_check) { wb_check(i_this, sVar1); } - if (i_this->mPlayerDistance > 600.0f) { + if (i_this->dis > 600.0f) { return; } } - if (frame > 60 && frame < 200 && (((i_this->field_0x970 & 7) == 0) || bVar1) && pl_check(i_this, fVar1, sVar1)) { - cVar1 = 1; + if (frame > 60 && frame < 200 && (((i_this->counter & 7) == 0) || look_check) && pl_check(i_this, range, sVar1)) { + find = 1; } break; case 5: - if (i_this->field_0x990[0] == 0) { - cVar1 = 1; + if (i_this->timer[0] == 0) { + find = 1; } break; case 10: anm_init(i_this, BCK_RD_SHOUT, 5.0f, 0, 1.0f); - i_this->mMode = 11; - dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(i_this), 3); + i_this->mode = 11; + dKy_Sound_set(enemy->current.pos, 100, fopAcM_GetID(i_this), 3); S_find = 20; break; case 11: - cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngleY, 2, 0x800); + cLib_addCalcAngleS2(&enemy->current.angle.y, i_this->angleY, 2, 0x800); - if (i_this->mpModelMorf->isStop()) { - i_this->mAction = ACTION_FIGHT_RUN; - i_this->mMode = -10; - i_this->field_0x990[0] = 60; + if (i_this->anm_p->isStop()) { + i_this->action = ACTION_FIGHT_RUN; + i_this->mode = -10; + i_this->timer[0] = 60; return; } } - if (i_this->mMode < 5) { + if (i_this->mode < 5) { for (int i = 0; i <= 2; i++) { - if (i_this->field_0xd58[i].ChkCoHit()) { - cCcD_Obj* co_hit_obj_p = i_this->field_0xd58[i].GetCoHitObj(); + if (i_this->cc_sph[i].ChkCoHit()) { + cCcD_Obj* co_hit_obj_p = i_this->cc_sph[i].GetCoHitObj(); if (daPy_getPlayerActorClass() == dCc_GetAc(co_hit_obj_p->GetAc())) { - cVar1 = 2; + find = 2; break; } } } } - if (i_this->mMode < 10) { - if (cVar1 == 1) { + if (i_this->mode < 10) { + if (find == 1) { if (S_find == 0) { - i_this->mMode = 10; + i_this->mode = 10; } else { - i_this->mAction = ACTION_FIGHT_RUN; - i_this->mMode = -10; - i_this->field_0x990[0] = 60; + i_this->action = ACTION_FIGHT_RUN; + i_this->mode = -10; + i_this->timer[0] = 60; OS_REPORT("......RD FIND 1!!!\n"); } - } else if (cVar1 == 2) { - i_this->mMode = 5; + } else if (find == 2) { + i_this->mode = 5; anm_init(i_this, BCK_RD_KYORO2, 7.0f, 2, 1.5f); - i_this->field_0x990[0] = cM_rndF(10.0f) + 20.0f; + i_this->timer[0] = cM_rndF(10.0f) + 20.0f; OS_REPORT("......RD FIND 2!!!\n"); } } - if (i_this->field_0x980 >= 9900.0f) { - i_this->mAction = ACTION_STAND; - i_this->mMode = 0; - i_this->field_0x990[0] = 0; + if (i_this->attack_range >= 9900.0f) { + i_this->action = ACTION_STAND; + i_this->mode = 0; + i_this->timer[0] = 0; } } @@ -4910,111 +4910,111 @@ static void* s_tag_sub(void* i_actor, void* i_data) { } static void e_rd_tag(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - fopAc_ac_c* player = dComIfGp_getPlayer(0); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); i_this->field_0x9ad = 0; - i_this->field_0x998 = 10; + i_this->damage_timer = 10; - switch (i_this->mMode) { + switch (i_this->mode) { case 0: break; } - if (S_find != 0 && (i_this->field_0x970 & 31) == 0 && !dComIfGp_event_runCheck() && i_this->mPlayerDistance < 3000.0f && i_this->mPlayerDistance > 500.0f && - i_this->field_0x5bb != 0 && !fopAcM_otherBgCheck(a_this, player)) { + if (S_find != 0 && (i_this->counter & 31) == 0 && !dComIfGp_event_runCheck() && i_this->dis < 3000.0f && i_this->dis > 500.0f && + i_this->field_0x5bb != 0 && !fopAcM_otherBgCheck(enemy, pla)) { rd_count = 0; fpcM_Search(s_tag_sub, i_this); if (rd_count < 6) { - csXyz cStack_40(0, i_this->mPlayerAngleY, 0); - cXyz sp38; - sp38.x = cM_rndFX(200.0f) + a_this->home.pos.x; - sp38.y = a_this->home.pos.y; - sp38.z = cM_rndFX(200.0f) + a_this->home.pos.z; + csXyz angl(0, i_this->angleY, 0); + cXyz pos; + pos.x = cM_rndFX(200.0f) + enemy->home.pos.x; + pos.y = enemy->home.pos.y; + pos.z = cM_rndFX(200.0f) + enemy->home.pos.z; - fpc_ProcID i_parameters; + fpc_ProcID parameter; if ((rd_count & 3) == 3) { - i_parameters = 0xFF011323; + parameter = 0xFF011323; } else { - i_parameters = 0xFF011123; + parameter = 0xFF011123; } - fopAcM_createChild(PROC_E_RD, fopAcM_GetID(a_this), i_parameters, &sp38, fopAcM_GetRoomNo(a_this), &cStack_40, NULL, -1, NULL); + fopAcM_createChild(PROC_E_RD, fopAcM_GetID(enemy), parameter, &pos, fopAcM_GetRoomNo(enemy), &angl, NULL, -1, NULL); } } } static void e_rd_reg(e_rd_class* i_this) { - fopEn_enemy_c* a_this = &i_this->actor; - fopAc_ac_c* player = dComIfGp_getPlayer(0); + fopEn_enemy_c* enemy = &i_this->enemy; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); i_this->field_0x9ad = 0; - i_this->field_0x998 = 10; + i_this->damage_timer = 10; if (i_this->field_0xafb == 0) { - i_this->mAction = ACTION_BOW2; - i_this->mMode = 1; - i_this->field_0x980 = 0.0f; + i_this->action = ACTION_BOW2; + i_this->mode = 1; + i_this->attack_range = 0.0f; return; } - if (i_this->mMode != 0) { + if (i_this->mode != 0) { return; } - if (i_this->field_0x5b7 != 14) { + if (i_this->arg1 != 14) { return; } - if (i_this->mDemoMode == 0) { - f32 fVar1, fVar2; - fVar1 = player->current.pos.x - -5551.0f; - fVar2 = player->current.pos.z - 5525.0f; - if (JMAFastSqrt(fVar1 * fVar1 + fVar2 * fVar2) < 600.0f) { - i_this->mDemoMode = 20; + if (i_this->demo_mode == 0) { + f32 x, z; + x = pla->current.pos.x - -5551.0f; + z = pla->current.pos.z - 5525.0f; + if (JMAFastSqrt(SQUARE(x)+ SQUARE(z)) < 600.0f) { + i_this->demo_mode = 20; } } } static void action(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - fopAc_ac_c* actor = get_pla(a_this); - cXyz sp25c, sp268; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + fopAc_ac_c* actor = get_pla(enemy); + cXyz mae, ato; i_this->field_0x9c8 = 0; if (actor == dComIfGp_getPlayer(0)) { - i_this->mPlayerDistance = fopAcM_searchPlayerDistance(a_this); + i_this->dis = fopAcM_searchPlayerDistance(enemy); if (daPy_getPlayerActorClass()->checkHorseRide()) { - i_this->mPlayerDistance -= BREG_F(17) + 100.0f; + i_this->dis -= BREG_F(17) + 100.0f; } - i_this->mPlayerAngleY = fopAcM_searchPlayerAngleY(a_this); + i_this->angleY = fopAcM_searchPlayerAngleY(enemy); } else { - sp25c = actor->current.pos - a_this->current.pos; - i_this->mPlayerDistance = sp25c.abs(); - i_this->mPlayerAngleY = cM_atan2s(sp25c.x, sp25c.z); - i_this->field_0x980 = NREG_F(7) + 10000.0f; + mae = actor->current.pos - enemy->current.pos; + i_this->dis = mae.abs(); + i_this->angleY = cM_atan2s(mae.x, mae.z); + i_this->attack_range = NREG_F(7) + 10000.0f; } if (desert_substage != 0) { if (i_this->field_0x9a0 == 0) { - dScnKy_env_light_c* env_light_p = dKy_getEnvlight(); - int iVar1 = env_light_p->daytime / 15.0f; - if (iVar1 >= 6 && iVar1 <= 17) { - i_this->field_0x980 = 10000.0f; + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); + int timeH = kankyo->daytime / 15.0f; + if (timeH >= 6 && timeH <= 17) { + i_this->attack_range = 10000.0f; } } else { i_this->field_0x9a0--; } } - s16 sp_0x2c = i_this->mAction; + s16 curr_action = i_this->action; damage_check(i_this); - if (sp_0x2c == ACTION_WB_SEARCH && i_this->mAction != ACTION_WB_SEARCH) { - e_wb_class* bullbo_p = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID); - if (bullbo_p != NULL && bullbo_p->mActionID == 1) { - bullbo_p->mActionID = 0; + if (curr_action == ACTION_WB_SEARCH && i_this->action != ACTION_WB_SEARCH) { + e_wb_class* boar = (e_wb_class*)fopAcM_SearchByID(i_this->boar_id); + if (boar != NULL && boar->mActionID == 1) { + boar->mActionID = 0; } } @@ -5022,9 +5022,9 @@ static void action(e_rd_class* i_this) { s8 cVar2 = 0; s8 bVar1 = 1; s8 cVar3 = 0; - i_this->actor.offHeadLockFlg(); + i_this->enemy.offHeadLockFlg(); - switch (i_this->mAction) { + switch (i_this->action) { case ACTION_NORMAL: e_rd_normal(i_this); cVar3 = 1; @@ -5074,7 +5074,7 @@ static void action(e_rd_class* i_this) { break; case ACTION_WB_RUN: - if (i_this->mBossMode != 0) { + if (i_this->actor_set != 0) { e_rd_wb_run_B(i_this); } else { e_rd_wb_run(i_this); @@ -5177,14 +5177,14 @@ static void action(e_rd_class* i_this) { e_rd_reg(i_this); } - if (cVar3 != 0 && otoCheck(a_this, 1500.0f)) { + if (cVar3 != 0 && otoCheck(enemy, 1500.0f)) { SND_INFLUENCE* sound = dKy_Sound_get(); if (!pl_check(i_this, 500.0f, 0x7FFF)) { - sp25c = sound->position - a_this->current.pos; - if (sp25c.abs() < sound->field_0xc * 120) { - i_this->field_0x974 = i_this->mAction; - i_this->mAction = ACTION_EXCITE; - i_this->mMode = 0; + mae = sound->position - enemy->current.pos; + if (mae.abs() < sound->field_0xc * 120) { + i_this->prev_action = i_this->action; + i_this->action = ACTION_EXCITE; + i_this->mode = 0; S_find_pos = sound->position; } } @@ -5193,159 +5193,159 @@ static void action(e_rd_class* i_this) { if (bVar1) { dBgS_ObjGndChk obj_gnd_chk; dBgS_ObjGndChk_Spl spl_chk; - sp25c = a_this->current.pos; - sp25c.y += 150.0f; - spl_chk.SetPos(&sp25c); - obj_gnd_chk.SetPos(&sp25c); + mae = enemy->current.pos; + mae.y += 150.0f; + spl_chk.SetPos(&mae); + obj_gnd_chk.SetPos(&mae); - i_this->field_0x984 = dComIfG_Bgsp().GroundCross(&spl_chk); + i_this->waterY = dComIfG_Bgsp().GroundCross(&spl_chk); - f32 fVar3 = i_this->field_0x984 - dComIfG_Bgsp().GroundCross(&obj_gnd_chk); - if (a_this->current.pos.y < i_this->field_0x984 && fVar3 > 100.0f) { - i_this->mAction = ACTION_WATER; + f32 waterY = i_this->waterY - dComIfG_Bgsp().GroundCross(&obj_gnd_chk); + if (enemy->current.pos.y < i_this->waterY && waterY > 100.0f) { + i_this->action = ACTION_WATER; if (dComIfG_Bgsp().GetPolyAtt0(spl_chk) == 6) { - i_this->mMode = 1; + i_this->mode = 1; } else { - i_this->mMode = 0; + i_this->mode = 0; } - a_this->current.pos.y = i_this->field_0x984; + enemy->current.pos.y = i_this->waterY; } } if (cVar2 != 0) { - i_this->mSound.setLinkSearch(true); - if (desert_substage != 0 && (i_this->field_0x5b7 == 6 || i_this->field_0x5b7 == 7 || i_this->field_0x5b7 == 8)) { + i_this->sound.setLinkSearch(true); + if (desert_substage != 0 && (i_this->arg1 == 6 || i_this->arg1 == 7 || i_this->arg1 == 8)) { S_find = 20; } } else { - i_this->mSound.setLinkSearch(false); + i_this->sound.setLinkSearch(false); } if (cVar1) { if (desert_substage != 0) { - if (!dComIfGp_event_runCheck() && i_this->field_0x99c == 0 && i_this->mPlayerDistance > 700.0f && i_this->field_0x5bb != 0) { - fopAcM_delete(a_this); + if (!dComIfGp_event_runCheck() && i_this->yagura_timer == 0 && i_this->dis > 700.0f && i_this->field_0x5bb != 0) { + fopAcM_delete(enemy); } } else if (daPy_getPlayerActorClass()->checkHorseRide() && dComIfGp_getHorseActor()->speedF >= 30.0f && i_this->field_0x5bb != 0) { - fopAcM_delete(a_this); + fopAcM_delete(enemy); } } - cLib_addCalcAngleS2(&a_this->shape_angle.y, a_this->current.angle.y, 2, 0x1000); - cLib_addCalcAngleS2(&a_this->shape_angle.x, a_this->current.angle.x, 2, 0x1000); - cLib_addCalcAngleS2(&a_this->shape_angle.z, a_this->current.angle.z, 2, 0x1000); + cLib_addCalcAngleS2(&enemy->shape_angle.y, enemy->current.angle.y, 2, 0x1000); + cLib_addCalcAngleS2(&enemy->shape_angle.x, enemy->current.angle.x, 2, 0x1000); + cLib_addCalcAngleS2(&enemy->shape_angle.z, enemy->current.angle.z, 2, 0x1000); - if (i_this->field_0x9bc == 0) { - a_this->attention_info.distances[fopAc_attn_BATTLE_e] = 3; - if (i_this->field_0x9ec) { - cMtx_YrotS(*calc_mtx, i_this->field_0xa0c.y); + if (i_this->ride_mode == 0) { + enemy->attention_info.distances[fopAc_attn_BATTLE_e] = 3; + if (i_this->jump_z) { + cMtx_YrotS(*calc_mtx, i_this->jump_angle.y); if (i_this->field_0xaf0 == 0) { - sp25c.z = i_this->field_0x9ec; + mae.z = i_this->jump_z; } else { - sp25c.z = 0.0f; - a_this->speed.y = 0.0f; + mae.z = 0.0f; + enemy->speed.y = 0.0f; } - a_this->gravity = -(l_HIO.jump_g - 1.0f); + enemy->gravity = -(l_HIO.jump_g - 1.0f); } else { - cMtx_YrotS(*calc_mtx, a_this->current.angle.y); - sp25c.z = a_this->speedF; - a_this->gravity = -5.0f; + cMtx_YrotS(*calc_mtx, enemy->current.angle.y); + mae.z = enemy->speedF; + enemy->gravity = -5.0f; } - sp25c.x = 0.0f; - sp25c.y = 0.0f; - MtxPosition(&sp25c, &sp268); + mae.x = 0.0f; + mae.y = 0.0f; + MtxPosition(&mae, &ato); - a_this->speed.x = sp268.x; - a_this->speed.z = sp268.z; - a_this->current.pos += a_this->speed; - a_this->speed.y += a_this->gravity; - if (a_this->speed.y < -100.0f) { - a_this->speed.y = -100.0f; + enemy->speed.x = ato.x; + enemy->speed.z = ato.z; + enemy->current.pos += enemy->speed; + enemy->speed.y += enemy->gravity; + if (enemy->speed.y < -100.0f) { + enemy->speed.y = -100.0f; } if (i_this->field_0x9ad != 0) { cXyz* pcVar1 = i_this->mStts.GetCCMoveP(); if (pcVar1 != NULL) { - a_this->current.pos.x += pcVar1->x; - a_this->current.pos.z += pcVar1->z; + enemy->current.pos.x += pcVar1->x; + enemy->current.pos.z += pcVar1->z; } } cLib_addCalc0(&i_this->field_0x9c0, 1.0f, 3.0f); if (i_this->field_0x9f0 > 0.1f) { - sp25c.x = 0.0f; - sp25c.y = 0.0f; - sp25c.z = -i_this->field_0x9f0; + mae.x = 0.0f; + mae.y = 0.0f; + mae.z = -i_this->field_0x9f0; cMtx_YrotS(*calc_mtx, i_this->field_0x9f4); - MtxPosition(&sp25c, &sp268); - a_this->current.pos += sp268; + MtxPosition(&mae, &ato); + enemy->current.pos += ato; cLib_addCalc0(&i_this->field_0x9f0, 1.0f, 7.0f + TREG_F(12)); } } else { - a_this->attention_info.distances[fopAc_attn_BATTLE_e] = 34; - fopAc_ac_c* bullboActor = fopAcM_SearchByID(i_this->mWbActorID); - if (bullboActor == NULL) { - i_this->mAction = ACTION_NORMAL; - i_this->mMode = 0; + enemy->attention_info.distances[fopAc_attn_BATTLE_e] = 34; + fopAc_ac_c* actor = fopAcM_SearchByID(i_this->boar_id); + if (actor == NULL) { + i_this->action = ACTION_NORMAL; + i_this->mode = 0; return; } - a_this->speedF = bullboActor->speedF; + enemy->speedF = actor->speedF; if (daPy_getPlayerActorClass()->checkHorseRide() && dComIfGp_getHorseActor()->speedF >= 30.0f) { - a_this->speed = bullboActor->speed; - a_this->speed.y = 0.0f; + enemy->speed = actor->speed; + enemy->speed.y = 0.0f; } else { - a_this->speed.set(0.0f, 0.0f, 0.0f); + enemy->speed.set(0.0f, 0.0f, 0.0f); } - e_wb_class* bullbo = (e_wb_class*)bullboActor; - if (i_this->field_0x9be == 1) { - MTXCopy(bullbo->mpModelMorf->getModel()->getAnmMtx(bullbo->field_0x688 + 15), *calc_mtx); + e_wb_class* boar = (e_wb_class*)actor; + if (i_this->boar_stand == 1) { + MTXCopy(boar->mpModelMorf->getModel()->getAnmMtx(boar->field_0x688 + 15), *calc_mtx); } else { - MTXCopy(bullbo->mpModelMorf->getModel()->getAnmMtx(bullbo->field_0x688 + 16), *calc_mtx); + MTXCopy(boar->mpModelMorf->getModel()->getAnmMtx(boar->field_0x688 + 16), *calc_mtx); } - if (i_this->mBossMode != 0) { - sp25c.set(0.0f, BREG_F(4) + -65.0f, 0.0f); + if (i_this->actor_set != 0) { + mae.set(0.0f, BREG_F(4) + -65.0f, 0.0f); } else { - sp25c.set(0.0f, BREG_F(4) + -45.0f, 0.0f); + mae.set(0.0f, BREG_F(4) + -45.0f, 0.0f); } - MtxPosition(&sp25c, &i_this->field_0x9b0); + MtxPosition(&mae, &i_this->field_0x9b0); - if (i_this->field_0x9bc == 2) { - a_this->current.pos = i_this->field_0x9b0; - a_this->shape_angle = a_this->current.angle = bullboActor->shape_angle; + if (i_this->ride_mode == 2) { + enemy->current.pos = i_this->field_0x9b0; + enemy->shape_angle = enemy->current.angle = actor->shape_angle; - sp25c.x = 10.0f; - MtxPosition(&sp25c, &sp268); - sp25c = sp268 - i_this->field_0x9b0; - ANGLE_ADD(a_this->current.angle.x, - -cM_atan2s(sp25c.y, JMAFastSqrt(sp25c.x * sp25c.x + sp25c.z * sp25c.z))); - a_this->shape_angle.x = a_this->current.angle.x; + mae.x = 10.0f; + MtxPosition(&mae, &ato); + mae = ato - i_this->field_0x9b0; + ANGLE_ADD(enemy->current.angle.x, + -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z))); + enemy->shape_angle.x = enemy->current.angle.x; - if (i_this->field_0x9be == 1) { - bullbo->field_0x1434 = fopAcM_GetID(i_this); + if (i_this->boar_stand == 1) { + boar->field_0x1434 = fopAcM_GetID(i_this); } } else { - sp25c = i_this->field_0x9b0 - a_this->current.pos; - cMtx_YrotS(*calc_mtx, cM_atan2s(sp25c.x, sp25c.z)); - cMtx_XrotM(*calc_mtx, -cM_atan2s(sp25c.y, JMAFastSqrt(sp25c.x * sp25c.x + sp25c.z * sp25c.z))); - sp25c.x = 0.0f; - sp25c.y = 0.0f; - sp25c.z = TREG_F(3) + 20.0f; - MtxPosition(&sp25c, &sp268); + mae = i_this->field_0x9b0 - enemy->current.pos; + cMtx_YrotS(*calc_mtx, cM_atan2s(mae.x, mae.z)); + cMtx_XrotM(*calc_mtx, -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z))); + mae.x = 0.0f; + mae.y = 0.0f; + mae.z = TREG_F(3) + 20.0f; + MtxPosition(&mae, &ato); - a_this->current.pos += sp268; - sp25c = i_this->field_0x9b0 - a_this->current.pos; - if (sp25c.abs() < 30.0f || i_this->field_0x990[3] == 0) { - i_this->field_0x9bc = 2; + enemy->current.pos += ato; + mae = i_this->field_0x9b0 - enemy->current.pos; + if (mae.abs() < 30.0f || i_this->timer[3] == 0) { + i_this->ride_mode = 2; } - cLib_addCalcAngleS2(&a_this->current.angle.y, bullboActor->shape_angle.y, 4, 0x800); + cLib_addCalcAngleS2(&enemy->current.angle.y, actor->shape_angle.y, 4, 0x800); } i_this->field_0x9c0 += i_this->field_0x9c4; @@ -5361,35 +5361,35 @@ static void action(e_rd_class* i_this) { s16 sp_0x28 = 0; s16 sp_0x26 = 16000; i_this->field_0x9a4 = 0; - cXyz sp274; + cXyz ato2; s16 sp_0x24 = 0x1000; if (i_this->field_0x9c8 == -1) { - cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); - sp25c.x = 0.0f; - sp25c.y = KREG_F(8) + 70.0f; - sp25c.z = 50.0f; - MtxPosition(&sp25c, &sp274); + cMtx_YrotS(*calc_mtx, enemy->shape_angle.y); + mae.x = 0.0f; + mae.y = KREG_F(8) + 70.0f; + mae.z = 50.0f; + MtxPosition(&mae, &ato2); - sp274 += a_this->current.pos; + ato2 += enemy->current.pos; i_this->field_0x9c8 = 2; sp_0x24 = KREG_S(7) + 0x800; } else if (i_this->field_0x9c8 >= 11) { i_this->field_0x9c8 -= (s8) 10; - sp274 = i_this->field_0x9d4; + ato2 = i_this->eye; } else { - sp274 = actor->eyePos; + ato2 = actor->eyePos; } - if (i_this->field_0x9bc == 2) { + if (i_this->ride_mode == 2) { sp_0x24 = 0x1000; } if (i_this->field_0x9c8 != 0) { - sp25c = sp274 - a_this->current.pos; - sp25c.y += TREG_F(2) + -150.0f; - sp_0x2a = cM_atan2s(sp25c.x, sp25c.z) - a_this->shape_angle.y; - sp_0x28 = a_this->shape_angle.x + cM_atan2s(sp25c.y, JMAFastSqrt(sp25c.x * sp25c.x + sp25c.z * sp25c.z)); + mae = ato2 - enemy->current.pos; + mae.y += TREG_F(2) + -150.0f; + sp_0x2a = cM_atan2s(mae.x, mae.z) - enemy->shape_angle.y; + sp_0x28 = enemy->shape_angle.x + cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z)); if (i_this->field_0x9c8 <= 2) { if (sp_0x2a > sp_0x26) { sp_0x2a = sp_0x26; @@ -5405,7 +5405,7 @@ static void action(e_rd_class* i_this) { cLib_addCalcAngleS2(&i_this->field_0x9ca, sp_0x2a, 2, sp_0x24); } else if (i_this->field_0x9c8 == 5) { - if ((i_this->field_0x970 & 15) == 0 && cM_rndF2(1.0f) < 0.3f) { + if ((i_this->counter & 15) == 0 && cM_rndF2(1.0f) < 0.3f) { i_this->field_0x9d0 = cM_rndFX2(2000.0f); } } else { @@ -5420,7 +5420,7 @@ static void action(e_rd_class* i_this) { } cLib_addCalcAngleS2(&i_this->field_0x9ca, sp_0x2a / 2, 2, 0x1000); - sp_0x28 = -cM_atan2s(sp25c.y, JMAFastSqrt(sp25c.x * sp25c.x + sp25c.z * sp25c.z)); + sp_0x28 = -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z)); if (sp_0x28 > 0x2AF8) { sp_0x28 = 11000; i_this->field_0x9a4 = 1; @@ -5450,13 +5450,13 @@ static void action(e_rd_class* i_this) { i_this->field_0xa28 += s16(4000 + BREG_S(1)); } - if (a_this->speed.y < 0.0f && i_this->mObjAcch.ChkGroundHit()) { + if (enemy->speed.y < 0.0f && i_this->ObjAcch.ChkGroundHit()) { cLib_addCalc0(&i_this->field_0xa2c, 1.0f, 30.0f); cLib_addCalc0(&i_this->field_0xa24, 1.0f, 30.0f); } - if (i_this->field_0x9ec) { - sp_0x2a = i_this->field_0xa0c.y - a_this->shape_angle.y; + if (i_this->jump_z) { + sp_0x2a = i_this->jump_angle.y - enemy->shape_angle.y; i_this->field_0xa74[3].y = -sp_0x2a + 0x4000; if (i_this->field_0xa74[3].y > 0x1770) { i_this->field_0xa74[3].y = 6000; @@ -5486,12 +5486,12 @@ static void action(e_rd_class* i_this) { } cMtx_YrotS(*calc_mtx, sp_0x2a); - sp25c.x = 0.0f; - sp25c.y = 0.0f; - sp25c.z = 12000.0f; - MtxPosition(&sp25c, &sp268); - i_this->field_0xae4.y = -sp268.x; - i_this->field_0xae4.x = -sp268.z * 1.3f; + mae.x = 0.0f; + mae.y = 0.0f; + mae.z = 12000.0f; + MtxPosition(&mae, &ato); + i_this->field_0xae4.y = -ato.x; + i_this->field_0xae4.x = -ato.z * 1.3f; if (i_this->field_0xae4.x > 10000) { i_this->field_0xae4.x = 10000; @@ -5522,14 +5522,14 @@ static void action(e_rd_class* i_this) { cLib_addCalcAngleS2(&i_this->field_0xa74[i].y, 0, 1, sp_0x20); } else { - --i_this->field_0xad2[i - 3]; + i_this->field_0xad2[i - 3]--; } } else { i_this->field_0xa74[i].y = 0; } if (i >= 3) { - i_this->field_0xabc[i] = i_this->field_0xab8 * cM_scos(i_this->field_0x970 * (BREG_S(0) + 4000) + i * (BREG_S(1) + 20000)); + i_this->field_0xabc[i] = i_this->field_0xab8 * cM_scos(i_this->counter * (BREG_S(0) + 4000) + i * (BREG_S(1) + 20000)); } } @@ -5542,15 +5542,15 @@ static void action(e_rd_class* i_this) { if (i_this->field_0xa1e != 0) { i_this->field_0xa1e--; - if (i_this->field_0xa0c.x != 0) { + if (i_this->jump_angle.x != 0) { Vec sp280; cXyz sp28c, sp298; dBgS_GndChk gnd_chk; f32 fVar2 = 75.0f; - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(1), *calc_mtx); - sp25c.set(0.0f, 0.0f, 0.0f); - MtxPosition(&sp25c, &sp28c); + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(1), *calc_mtx); + mae.set(0.0f, 0.0f, 0.0f); + MtxPosition(&mae, &sp28c); sp28c.y += 100.0f; sp28c.y += 100.0f; gnd_chk.SetPos(&sp28c); @@ -5563,11 +5563,11 @@ static void action(e_rd_class* i_this) { gnd_chk.SetPos(&sp280); sp280.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - f32 x_diff, y_diff, z_diff; + f32 x, y, z; if (sp280.y != -G_CM3D_F_INF) { - y_diff = sp280.y - sp28c.y; - z_diff = sp280.z - sp28c.z; - sVar5 = -cM_atan2s(y_diff, z_diff); + y = sp280.y - sp28c.y; + z = sp280.z - sp28c.z; + sVar5 = -cM_atan2s(y, z); if (sVar5 > 0x3000 || sVar5 < -0x3000) { sVar5 = 0; } @@ -5580,9 +5580,9 @@ static void action(e_rd_class* i_this) { sp280.y = dComIfG_Bgsp().GroundCross(&gnd_chk); if (sp280.y != -G_CM3D_F_INF) { - y_diff = sp280.y - sp28c.y; - x_diff = sp280.x - sp28c.x; - sVar4 = (s16) cM_atan2s(y_diff, x_diff); + y = sp280.y - sp28c.y; + x = sp280.x - sp28c.x; + sVar4 = (s16) cM_atan2s(y, x); if (sVar4 > 0x3000 || sVar4 < -0x3000) { sVar4 = 0; } @@ -5592,23 +5592,23 @@ static void action(e_rd_class* i_this) { dBgS_LinChk lin_chk; cXyz sp2a4, start, end; - start = a_this->current.pos; + start = enemy->current.pos; start.y += JREG_F(5) + 30.0f; - J3DModel* model = i_this->mpModelMorf->getModel(); + J3DModel* model = i_this->anm_p->getModel(); sp2a4.set(0.0f, 0.0f, 0.0f); MTXCopy(model->getAnmMtx(BREG_S(8) + 13), *calc_mtx); MtxPosition(&sp2a4, &end); end.y += JREG_F(6) + 30.0f; - lin_chk.Set(&start, &end, a_this); + lin_chk.Set(&start, &end, enemy); if (dComIfG_Bgsp().LineCross(&lin_chk)) { sp2a4 = start - end; cMtx_YrotS(*calc_mtx, cM_atan2s(sp2a4.x, sp2a4.z)); sp2a4.x = 0.0f; sp2a4.y = 0.0f; sp2a4.z = TREG_F(11) + 50.0f; - MtxPosition(&sp2a4, &sp268); - a_this->current.pos += sp268; + MtxPosition(&sp2a4, &ato); + enemy->current.pos += ato; } i_this->field_0xa18.x = sVar5; @@ -5622,82 +5622,82 @@ static void action(e_rd_class* i_this) { if (i_this->field_0x129c != 0) { i_this->field_0x129c--; if (i_this->field_0x129c == 0) { - dComIfGp_particle_set(0x15E, &a_this->eyePos, &a_this->shape_angle, NULL); + dComIfGp_particle_set(ID_ZI_J_TUBA00, &enemy->eyePos, &enemy->shape_angle, NULL); } } if (i_this->field_0x125d != 0) { - J3DModel* model_p = i_this->mpModelMorf->getModel(); + J3DModel* model_p = i_this->anm_p->getModel(); MTXCopy(model_p->getAnmMtx(11), *calc_mtx); - sp25c.set(0.0f, 0.0f, 0.0f); - MtxPosition(&sp25c, &sp268); + mae.set(0.0f, 0.0f, 0.0f); + MtxPosition(&mae, &ato); dBgS_ObjGndChk_Spl spl_chk_2; - sp25c = sp268; - sp25c.y += 100.0f; - spl_chk_2.SetPos(&sp25c); - if (fabsf(dComIfG_Bgsp().GroundCross(&spl_chk_2) - sp268.y) < 50.0f) { + mae = ato; + mae.y += 100.0f; + spl_chk_2.SetPos(&mae); + if (fabsf(dComIfG_Bgsp().GroundCross(&spl_chk_2) - ato.y) < 50.0f) { static u16 w_eff_name[3] = { - 0x8258, - 0x8259, - 0x825A, + dPa_RM(ID_ZI_S_ENEMY_DOWNWTRA_A), + dPa_RM(ID_ZI_S_ENEMY_DOWNWTRA_B), + dPa_RM(ID_ZI_S_ENEMY_DOWNWTRA_C), }; - f32 reg_f30 = 1.0f; - cXyz prtcl_scale(reg_f30, reg_f30, reg_f30); - csXyz cStack_330(0, 0, 0); + f32 scale = 1.0f; + cXyz sc(scale, scale, scale); + csXyz rot(0, 0, 0); for (int i = 0; i < 3; i++) { - i_this->field_0x1268[i] = dComIfGp_particle_set(i_this->field_0x1268[i], w_eff_name[i], &sp268, &a_this->tevStr, - &cStack_330, &prtcl_scale, 0xFF, 0, -1, NULL, NULL, NULL); + i_this->enemy_downWtrA[i] = dComIfGp_particle_set(i_this->enemy_downWtrA[i], w_eff_name[i], &ato, &enemy->tevStr, + &rot, &sc, 0xFF, 0, -1, NULL, NULL, NULL); } } else { - fopAcM_effSmokeSet1(&i_this->field_0x1260, &i_this->field_0x1264, &sp268, NULL, 1.3f, &a_this->tevStr, 1); + fopAcM_effSmokeSet1(&i_this->field_0x1260, &i_this->field_0x1264, &ato, NULL, 1.3f, &enemy->tevStr, 1); } i_this->field_0x125d = 0; } - cXyz sp2d4(1.3f, 1.3f, 1.3f); - setMidnaBindEffect(a_this, &i_this->mSound, &a_this->eyePos, &sp2d4); + cXyz size(1.3f, 1.3f, 1.3f); + setMidnaBindEffect(enemy, &i_this->sound, &enemy->eyePos, &size); } static void fire_eff_set(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - cXyz sp48, sp54; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + cXyz mae, ato; int iVar1; u16 uVar1[2]; - f32 fVar1; + f32 scale; - if (i_this->field_0x5bc == 4) { + if (i_this->weapon_type == 4) { iVar1 = 2; uVar1[0] = 0x1DF; uVar1[1] = 0x1DE; - i_this->mSound.startCreatureSoundLevel(Z2SE_OBJ_BOMB_IGNITION, 0, -1); - fVar1 = NREG_F(18) + 2.0f; - sp48.x = NREG_F(0) + 62.0f; - sp48.y = NREG_F(1) + 22.0f; - sp48.z = NREG_F(2) + -50.0f; + i_this->sound.startCreatureSoundLevel(Z2SE_OBJ_BOMB_IGNITION, 0, -1); + scale = NREG_F(18) + 2.0f; + mae.x = NREG_F(0) + 62.0f; + mae.y = NREG_F(1) + 22.0f; + mae.z = NREG_F(2) + -50.0f; } else { iVar1 = 1; uVar1[0] = 0x8113; - i_this->mSound.startCreatureSoundLevel(Z2SE_OBJ_ARROW_FIRE_READY, 0, -1); - fVar1 = 1.0f; - sp48.x = NREG_F(0) + 90.0f; - sp48.y = NREG_F(1) + 10.0f; - sp48.z = NREG_F(2) + -60.0f; + i_this->sound.startCreatureSoundLevel(Z2SE_OBJ_ARROW_FIRE_READY, 0, -1); + scale = 1.0f; + mae.x = NREG_F(0) + 90.0f; + mae.y = NREG_F(1) + 10.0f; + mae.z = NREG_F(2) + -60.0f; } - MtxPosition(&sp48, &sp54); - i_this->field_0x1288 = sp54 - i_this->field_0x127c; + MtxPosition(&mae, &ato); + i_this->field_0x1288 = ato - i_this->field_0x127c; i_this->field_0x1288 *= 0.9f; - i_this->field_0x127c = sp54; + i_this->field_0x127c = ato; - cXyz sp60(fVar1, fVar1, fVar1); + cXyz sc(scale, scale, scale); for (int i = 0 ; i < iVar1; i++) { - i_this->field_0x1274[i] = dComIfGp_particle_set(i_this->field_0x1274[i], uVar1[i], &sp54, &a_this->shape_angle, &sp60); + i_this->fire_eff[i] = dComIfGp_particle_set(i_this->fire_eff[i], uVar1[i], &ato, &enemy->shape_angle, &sc); if (i == 0) { - JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->field_0x1274[i]); + JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->fire_eff[i]); if (emitter != NULL) { emitter->setParticleCallBackPtr(dPa_control_c::getParticleTracePCB()); emitter->setUserWork((uintptr_t)&i_this->field_0x1288); @@ -5708,8 +5708,8 @@ static void fire_eff_set(e_rd_class* i_this) { static void* s_wb_sub2(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { - e_wb_class* unused_wb_p = (e_wb_class*) i_actor; - fopAc_ac_c* unused_actor_p = (fopAc_ac_c*) i_data; + e_wb_class* boar = (e_wb_class*) i_actor; + fopAc_ac_c* actor = (fopAc_ac_c*) i_data; if (target_info_count < 2) { target_info[target_info_count] = (fopAc_ac_c*) i_actor; target_info_count++; @@ -5762,14 +5762,14 @@ static u8 data_80519338; static void* s_lv9rd_sub2(void* i_actor, void* i_data) { UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD - && ((e_rd_class*)i_actor)->field_0x5b7 == data_80519338 && ((e_rd_class*)i_actor)->mAction != ACTION_DROP) { - ((e_rd_class*)i_actor)->mAction = ACTION_DROP; - ((e_rd_class*)i_actor)->mMode = 2; + && ((e_rd_class*)i_actor)->arg1 == data_80519338 && ((e_rd_class*)i_actor)->action != ACTION_DROP) { + ((e_rd_class*)i_actor)->action = ACTION_DROP; + ((e_rd_class*)i_actor)->mode = 2; anm_init((e_rd_class*)i_actor, BCK_RD_FURA2, 2.0f, 2, 1.0f); - ((e_rd_class*)i_actor)->field_0x990[0] = 1000; - ((e_rd_class*)i_actor)->field_0x5cc = ((fopEn_enemy_c*)i_actor)->home.angle.y; + ((e_rd_class*)i_actor)->timer[0] = 1000; + ((e_rd_class*)i_actor)->target_ya = ((fopEn_enemy_c*)i_actor)->home.angle.y; dComIfGp_setHitMark(1, ((fopEn_enemy_c*)i_actor), &((fopEn_enemy_c*)i_actor)->eyePos, NULL, NULL, 0); - ((e_rd_class*)i_actor)->mSound.startCollisionSE(Z2SE_HIT_WOOD_WEAPON, 31); + ((e_rd_class*)i_actor)->sound.startCollisionSE(Z2SE_HIT_WOOD_WEAPON, 31); return i_actor; } @@ -5779,9 +5779,9 @@ static void* s_lv9rd_sub2(void* i_actor, void* i_data) { static void* s_lv9rd_sub3(void* i_actor, void* i_data) { UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD - && (((e_rd_class*)i_actor)->field_0x5b7 == 13 || ((e_rd_class*)i_actor)->field_0x5b7 == 14)) { + && (((e_rd_class*)i_actor)->arg1 == 13 || ((e_rd_class*)i_actor)->arg1 == 14)) { ((e_rd_class*)i_actor)->field_0x9a4 = 1; - ((e_rd_class*)i_actor)->field_0x980 = 50000.0f; + ((e_rd_class*)i_actor)->attack_range = 50000.0f; } return NULL; @@ -5808,65 +5808,65 @@ static void* s_lv9arrow_sub2(void* i_actor, void* i_data) { } static void cam_3d_morf(e_rd_class* i_this, f32 param_2) { - cLib_addCalc2(&i_this->mDemoCamCenter.x, i_this->field_0x12cc.x, param_2, i_this->field_0x12e4.x * i_this->field_0x130c); - cLib_addCalc2(&i_this->mDemoCamCenter.y, i_this->field_0x12cc.y, param_2, i_this->field_0x12e4.y * i_this->field_0x130c); - cLib_addCalc2(&i_this->mDemoCamCenter.z, i_this->field_0x12cc.z, param_2, i_this->field_0x12e4.z * i_this->field_0x130c); - cLib_addCalc2(&i_this->mDemoCamEye.x, i_this->field_0x12c0.x, param_2, i_this->field_0x12d8.x * i_this->field_0x130c); - cLib_addCalc2(&i_this->mDemoCamEye.y, i_this->field_0x12c0.y, param_2, i_this->field_0x12d8.y * i_this->field_0x130c); - cLib_addCalc2(&i_this->mDemoCamEye.z, i_this->field_0x12c0.z, param_2, i_this->field_0x12d8.z * i_this->field_0x130c); + cLib_addCalc2(&i_this->demo_cam_center.x, i_this->field_0x12cc.x, param_2, i_this->field_0x12e4.x * i_this->field_0x130c); + cLib_addCalc2(&i_this->demo_cam_center.y, i_this->field_0x12cc.y, param_2, i_this->field_0x12e4.y * i_this->field_0x130c); + cLib_addCalc2(&i_this->demo_cam_center.z, i_this->field_0x12cc.z, param_2, i_this->field_0x12e4.z * i_this->field_0x130c); + cLib_addCalc2(&i_this->demo_cam_eye.x, i_this->field_0x12c0.x, param_2, i_this->field_0x12d8.x * i_this->field_0x130c); + cLib_addCalc2(&i_this->demo_cam_eye.y, i_this->field_0x12c0.y, param_2, i_this->field_0x12d8.y * i_this->field_0x130c); + cLib_addCalc2(&i_this->demo_cam_eye.z, i_this->field_0x12c0.z, param_2, i_this->field_0x12d8.z * i_this->field_0x130c); } static void cam_spd_set(e_rd_class* i_this) { - i_this->field_0x12d8.x = fabsf(i_this->field_0x12c0.x - i_this->mDemoCamEye.x); - i_this->field_0x12d8.y = fabsf(i_this->field_0x12c0.y - i_this->mDemoCamEye.y); - i_this->field_0x12d8.z = fabsf(i_this->field_0x12c0.z - i_this->mDemoCamEye.z); - i_this->field_0x12e4.x = fabsf(i_this->field_0x12cc.x - i_this->mDemoCamCenter.x); - i_this->field_0x12e4.y = fabsf(i_this->field_0x12cc.y - i_this->mDemoCamCenter.y); - i_this->field_0x12e4.z = fabsf(i_this->field_0x12cc.z - i_this->mDemoCamCenter.z); + i_this->field_0x12d8.x = fabsf(i_this->field_0x12c0.x - i_this->demo_cam_eye.x); + i_this->field_0x12d8.y = fabsf(i_this->field_0x12c0.y - i_this->demo_cam_eye.y); + i_this->field_0x12d8.z = fabsf(i_this->field_0x12c0.z - i_this->demo_cam_eye.z); + i_this->field_0x12e4.x = fabsf(i_this->field_0x12cc.x - i_this->demo_cam_center.x); + i_this->field_0x12e4.y = fabsf(i_this->field_0x12cc.y - i_this->demo_cam_center.y); + i_this->field_0x12e4.z = fabsf(i_this->field_0x12cc.z - i_this->demo_cam_center.z); i_this->field_0x130c = 0.0f; } static void demo_camera(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + daPy_py_c* pla = (daPy_py_c*)dComIfGp_getPlayer(0); camera_class* camera = (camera_class*) dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera_2 = (camera_class*) dComIfGp_getCamera(0); - daNPC_TK_c* hawk_p = (daNPC_TK_c*) fopAcM_SearchByName(PROC_NPC_TK); - fopAc_ac_c* a_hwk = hawk_p; - cXyz sp38, sp44, sp50, sp5c; + camera_class* camera0 = (camera_class*) dComIfGp_getCamera(0); + daNPC_TK_c* taka = (daNPC_TK_c*) fopAcM_SearchByName(PROC_NPC_TK); + fopAc_ac_c* actor = taka; + cXyz mae, ato, sp50, target; bool sp_0x9 = true; // unused s8 bVar1 = false; s16 sVar1 = 0; - switch (i_this->mDemoMode + 1) { + switch (i_this->demo_mode + 1) { case 2: - if (!a_this->eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0); - a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); + if (!enemy->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(enemy, 2, 0xFFFF, 0); + enemy->eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } camera->mCamera.Stop(); - i_this->mDemoMode = 2; - i_this->field_0x12a6 = 0; - i_this->mDemoCamFovy = 55.0f; + i_this->demo_mode = 2; + i_this->demo_timer = 0; + i_this->demo_cam_zoom = 55.0f; camera->mCamera.SetTrimSize(3); - i_this->mDemoCamCenter = a_this->current.pos; - i_this->mDemoCamCenter.y = a_this->eyePos.y - 80.0f + 60.0f + TREG_F(5); + i_this->demo_cam_center = enemy->current.pos; + i_this->demo_cam_center.y = enemy->eyePos.y - 80.0f + 60.0f + TREG_F(5); i_this->field_0x1300 = 2000.0f; - a_this->current.angle.y = i_this->mPlayerAngleY; + enemy->current.angle.y = i_this->angleY; // fallthrough case 3: - if (i_this->field_0x12a6 < 85) { - mDoMtx_stack_c::YrotS(s16(a_this->current.angle.y)); + if (i_this->demo_timer < 85) { + mDoMtx_stack_c::YrotS(s16(enemy->current.angle.y)); mDoMtx_stack_c::XrotM(0x640); - sp38.x = 0.0f; - sp38.y = TREG_F(3); - sp38.z = i_this->field_0x1300; - mDoMtx_stack_c::multVec(&sp38, &i_this->mDemoCamEye); - i_this->mDemoCamEye += a_this->current.pos; - cLib_addCalc2(&i_this->mDemoCamCenter.y, a_this->eyePos.y - 80.0f + 60.0f + TREG_F(5), 0.1f, 20.0f); + mae.x = 0.0f; + mae.y = TREG_F(3); + mae.z = i_this->field_0x1300; + mDoMtx_stack_c::multVec(&mae, &i_this->demo_cam_eye); + i_this->demo_cam_eye += enemy->current.pos; + cLib_addCalc2(&i_this->demo_cam_center.y, enemy->eyePos.y - 80.0f + 60.0f + TREG_F(5), 0.1f, 20.0f); cLib_addCalc2(&i_this->field_0x1300, 400.0f, 0.5f, 150.0f); } else if (desert_substage == 124) { // main Gerudo Desert @@ -5879,117 +5879,117 @@ static void demo_camera(e_rd_class* i_this) { fpcM_Search(s_wb_sub2, i_this); if (target_info[0] != NULL && target_info[1] != NULL) { - i_this->mDemoCamCenter = target_info[0]->current.pos + ((target_info[1]->current.pos - target_info[0]->current.pos) * 0.5f); - i_this->mDemoCamCenter.y += 200.0f + BREG_F(7); + i_this->demo_cam_center = target_info[0]->current.pos + ((target_info[1]->current.pos - target_info[0]->current.pos) * 0.5f); + i_this->demo_cam_center.y += 200.0f + BREG_F(7); - if (i_this->field_0x12a6 == 85) { - i_this->mDemoCamEye = i_this->mDemoCamCenter; - i_this->mDemoCamEye.y += 100.0f + VREG_F(8); - i_this->mDemoCamEye.z += 900.0f + VREG_F(9); + if (i_this->demo_timer == 85) { + i_this->demo_cam_eye = i_this->demo_cam_center; + i_this->demo_cam_eye.y += 100.0f + VREG_F(8); + i_this->demo_cam_eye.z += 900.0f + VREG_F(9); } else { - cLib_addCalc2(&i_this->mDemoCamEye.x, i_this->mDemoCamCenter.x, 0.2f, 100.0f); - cLib_addCalc2(&i_this->mDemoCamEye.y, i_this->mDemoCamCenter.y + 100.0f + VREG_F(8), 0.2f, 100.0f); - cLib_addCalc2(&i_this->mDemoCamEye.z, i_this->mDemoCamCenter.z + 900.0f + VREG_F(9), 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_eye.x, i_this->demo_cam_center.x, 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_eye.y, i_this->demo_cam_center.y + 100.0f + VREG_F(8), 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_eye.z, i_this->demo_cam_center.z + 900.0f + VREG_F(9), 0.2f, 100.0f); } } - if (i_this->field_0x12a6 == 220) { + if (i_this->demo_timer == 220) { bVar1 = true; } - } else if (i_this->field_0x12a6 == 140) { + } else if (i_this->demo_timer == 140) { bVar1 = true; } break; case 11: - if (!a_this->eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0); - a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); + if (!enemy->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(enemy, 2, 0xFFFF, 0); + enemy->eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } camera->mCamera.Stop(); - i_this->mDemoMode = 11; - i_this->field_0x12a6 = 0; - i_this->mDemoCamFovy = 55.0f; + i_this->demo_mode = 11; + i_this->demo_timer = 0; + i_this->demo_cam_zoom = 55.0f; dComIfGp_offCameraAttentionStatus(0, 8); camera->mCamera.SetTrimSize(3); - i_this->mDemoCamCenter = a_this->current.pos; - i_this->mDemoCamCenter.y = (a_this->eyePos.y - 80.0f) + 60.0f + TREG_F(5); - i_this->mDemoCamEye = camera_2->lookat.eye; - a_this->current.angle.y = i_this->mPlayerAngleY; + i_this->demo_cam_center = enemy->current.pos; + i_this->demo_cam_center.y = (enemy->eyePos.y - 80.0f) + 60.0f + TREG_F(5); + i_this->demo_cam_eye = camera0->lookat.eye; + enemy->current.angle.y = i_this->angleY; i_this->field_0x1300 = 2000.0f; // fallthrough case 12: - mDoMtx_stack_c::YrotS(s16(a_this->current.angle.y)); + mDoMtx_stack_c::YrotS(s16(enemy->current.angle.y)); mDoMtx_stack_c::XrotM(0x640); - sp38.x = 0.0f; - sp38.y = TREG_F(3); - sp38.z = i_this->field_0x1300; - mDoMtx_stack_c::multVec(&sp38, &sp44); - sp44.x += a_this->current.pos.x; - sp44.z += a_this->current.pos.z; - sp44.y += a_this->home.pos.y; + mae.x = 0.0f; + mae.y = TREG_F(3); + mae.z = i_this->field_0x1300; + mDoMtx_stack_c::multVec(&mae, &ato); + ato.x += enemy->current.pos.x; + ato.z += enemy->current.pos.z; + ato.y += enemy->home.pos.y; cLib_addCalc2(&i_this->field_0x1300, 400.0f, 0.5f, 150.0f); - if (i_this->field_0x12a6 < 20) { - i_this->mDemoCamEye = sp44; + if (i_this->demo_timer < 20) { + i_this->demo_cam_eye = ato; } else { - cLib_addCalc2(&i_this->mDemoCamEye.x, sp44.x, 0.1f, 10.0f); - cLib_addCalc2(&i_this->mDemoCamEye.z, sp44.z, 0.1f, 10.0f); + cLib_addCalc2(&i_this->demo_cam_eye.x, ato.x, 0.1f, 10.0f); + cLib_addCalc2(&i_this->demo_cam_eye.z, ato.z, 0.1f, 10.0f); } - cLib_addCalc2(&i_this->mDemoCamCenter.x, a_this->eyePos.x, 0.1f, 10.0f); - cLib_addCalc2(&i_this->mDemoCamCenter.z, a_this->eyePos.z, 0.1f, 10.0f); - cLib_addCalc2(&i_this->mDemoCamCenter.y, a_this->eyePos.y - 80.0f + 60.0f + TREG_F(5), 0.1f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_center.x, enemy->eyePos.x, 0.1f, 10.0f); + cLib_addCalc2(&i_this->demo_cam_center.z, enemy->eyePos.z, 0.1f, 10.0f); + cLib_addCalc2(&i_this->demo_cam_center.y, enemy->eyePos.y - 80.0f + 60.0f + TREG_F(5), 0.1f, 100.0f); - if (i_this->field_0x12a6 == s16(100 + KREG_S(8))) { + if (i_this->demo_timer == s16(100 + KREG_S(8))) { bVar1 = true; } break; case 20: - if (player->getClothesChangeWaitTimer() == 0) { - i_this->mDemoMode = 21; - i_this->field_0x12a6 = 0; + if (pla->getClothesChangeWaitTimer() == 0) { + i_this->demo_mode = 21; + i_this->demo_timer = 0; } break; case 21: - if (!a_this->eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0); - a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); + if (!enemy->eventInfo.checkCommandDemoAccrpt()) { + fopAcM_orderPotentialEvent(enemy, 2, 0xFFFF, 0); + enemy->eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } camera->mCamera.Stop(); - i_this->mDemoMode = 21; - i_this->field_0x12a6 = 0; - i_this->mDemoCamFovy = 55.0f; + i_this->demo_mode = 21; + i_this->demo_timer = 0; + i_this->demo_cam_zoom = 55.0f; camera->mCamera.SetTrimSize(3); - i_this->mDemoCamCenter = camera_2->lookat.center; - i_this->mDemoCamEye = camera_2->lookat.eye; + i_this->demo_cam_center = camera0->lookat.center; + i_this->demo_cam_eye = camera0->lookat.eye; i_this->field_0x12cc.set(-7875.0f, 2125.0f, 7895.0f); i_this->field_0x12c0.set(-7527.0f, 2084.0f, 7552.0f); cam_spd_set(i_this); i_this->field_0x12e4 *= 2.0f; - i_this->field_0x12f0 = player->current.pos; + i_this->field_0x12f0 = pla->current.pos; i_this->field_0x12f0.y = 2000.0f; daPy_getPlayerActorClass()->changeOriginalDemo(); if (daPy_py_c::checkNowWolf()) { daPy_getPlayerActorClass()->changeDemoMode(71, 0, 0, 0); - i_this->mDemoMode = 19; + i_this->demo_mode = 19; } // fallthrough case 22: - daPy_getPlayerActorClass()->setPlayerPosAndAngle(&i_this->field_0x12f0, player->shape_angle.y, 0); + daPy_getPlayerActorClass()->setPlayerPosAndAngle(&i_this->field_0x12f0, pla->shape_angle.y, 0); - if (i_this->mDemoMode != 19) { - if (i_this->field_0x12a6 == 1) { + if (i_this->demo_mode != 19) { + if (i_this->demo_timer == 1) { Z2GetAudioMgr()->bgmStreamPrepare(0x2000055); Z2GetAudioMgr()->bgmStreamPlay(); } @@ -5997,32 +5997,32 @@ static void demo_camera(e_rd_class* i_this) { cam_3d_morf(i_this, BREG_F(17) + 0.2f); cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.1f, 1.0f, BREG_F(17) + 0.002f); - if (i_this->field_0x12a6 == 70) { - dComIfGs_onSwitch(75, fopAcM_GetRoomNo(a_this)); + if (i_this->demo_timer == 70) { + dComIfGs_onSwitch(75, fopAcM_GetRoomNo(enemy)); } - if (i_this->field_0x12a6 >= 70) { - sp44.set(-5182.0f, 2000.0f, 5237.0f); - daPy_getPlayerActorClass()->setPlayerPosAndAngle(&sp44, -8111, 0); + if (i_this->demo_timer >= 70) { + ato.set(-5182.0f, 2000.0f, 5237.0f); + daPy_getPlayerActorClass()->setPlayerPosAndAngle(&ato, -8111, 0); } - if (i_this->field_0x12a6 == 120 || i_this->field_0x12a6 == 130 - || i_this->field_0x12a6 == 140 || i_this->field_0x12a6 == 150) { + if (i_this->demo_timer == 120 || i_this->demo_timer == 130 + || i_this->demo_timer == 140 || i_this->demo_timer == 150) { fpcM_Search(s_lv9dn_sub, i_this); } - if (i_this->field_0x12a6 > 160) { - cLib_addCalc2(&i_this->mDemoCamFovy, 55.0f, 0.05f, 0.5f); + if (i_this->demo_timer > 160) { + cLib_addCalc2(&i_this->demo_cam_zoom, 55.0f, 0.05f, 0.5f); } else { - cLib_addCalc2(&i_this->mDemoCamFovy, 45.0f, 0.05f, 0.5f); + cLib_addCalc2(&i_this->demo_cam_zoom, 45.0f, 0.05f, 0.5f); } - if (i_this->field_0x12a6 == 180) { + if (i_this->demo_timer == 180) { i_this->field_0x12cc.set(-7241.0f, 4310.0f, 7269.0f); i_this->field_0x12c0.set(-6913.0f, 4139.0f, 6948.0f); cam_spd_set(i_this); - i_this->mDemoMode = 22; - i_this->field_0x12a6 = 0; + i_this->demo_mode = 22; + i_this->demo_timer = 0; fpcM_Search(s_lv9rd_sub, i_this); daPy_getPlayerActorClass()->changeDemoMode(23, 0, 0, 0); } @@ -6032,49 +6032,49 @@ static void demo_camera(e_rd_class* i_this) { case 23: cam_3d_morf(i_this, BREG_F(17) + 0.2f); cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.15f, 1.0f, BREG_F(17) + 0.005f); - cLib_addCalc2(&i_this->mDemoCamFovy, 55.0f, 0.1f, 0.5f); + cLib_addCalc2(&i_this->demo_cam_zoom, 55.0f, 0.1f, 0.5f); - if (i_this->field_0x12a6 == 13) { + if (i_this->demo_timer == 13) { fpcM_Search(s_lv9dn_sub2,i_this); } - if (i_this->field_0x12a6 == 17 || i_this->field_0x12a6 == 27 || i_this->field_0x12a6 == 37 || i_this->field_0x12a6 == 47) { + if (i_this->demo_timer == 17 || i_this->demo_timer == 27 || i_this->demo_timer == 37 || i_this->demo_timer == 47) { fpcM_Search(s_lv9dn_sub, i_this); } - if (i_this->field_0x12a6 == 55) { - i_this->mDemoCamCenter.set(-8330.0f, 4359.0f, 8449.0f); - i_this->mDemoCamEye.set(-8183.0f, 4264.0f, 7991.0f); - i_this->mDemoCamFovy = 55.0f; - i_this->mDemoMode = 23; - i_this->field_0x12a6 = 0; + if (i_this->demo_timer == 55) { + i_this->demo_cam_center.set(-8330.0f, 4359.0f, 8449.0f); + i_this->demo_cam_eye.set(-8183.0f, 4264.0f, 7991.0f); + i_this->demo_cam_zoom = 55.0f; + i_this->demo_mode = 23; + i_this->demo_timer = 0; } break; case 24: i_this->field_0x9a4 = 1; - if (i_this->field_0x12a6 == 20) { - i_this->field_0x980 = 50000.0f; + if (i_this->demo_timer == 20) { + i_this->attack_range = 50000.0f; } - if (i_this->field_0x12a6 < 40) { - i_this->mDemoCamEye.y += 2.0f; + if (i_this->demo_timer < 40) { + i_this->demo_cam_eye.y += 2.0f; } - if (i_this->field_0x12a6 == 40) { - i_this->mDemoCamCenter.set(-8033.0f, 4259.0f, 8143.0f); - i_this->mDemoCamEye.set(-8337.0f, 4488.0f, 8451.0f); + if (i_this->demo_timer == 40) { + i_this->demo_cam_center.set(-8033.0f, 4259.0f, 8143.0f); + i_this->demo_cam_eye.set(-8337.0f, 4488.0f, 8451.0f); } - if (i_this->field_0x12a6 >= 40) { - cLib_addCalc2(&i_this->mDemoCamFovy, 30.0f, 0.05f, 0.5f); + if (i_this->demo_timer >= 40) { + cLib_addCalc2(&i_this->demo_cam_zoom, 30.0f, 0.05f, 0.5f); } - if (i_this->field_0x12a6 == 110) { + if (i_this->demo_timer == 110) { i_this->field_0x9a4 = 0; - i_this->mDemoMode = 24; - i_this->field_0x12a6 = 0; + i_this->demo_mode = 24; + i_this->demo_timer = 0; i_this->field_0x12cc.set(-4910.0f, 2012.0f, 4976.0f); i_this->field_0x12c0.set(-5235.0f, 2179.0f, 5302.0f); cam_spd_set(i_this); @@ -6083,55 +6083,55 @@ static void demo_camera(e_rd_class* i_this) { case 25: i_this->field_0x9a4 = 1; - i_this->field_0x980 = 0.0f; + i_this->attack_range = 0.0f; - if (i_this->field_0x12a6 >= 4) { - i_this->mBlureRate = 200 + VREG_S(7); - sVar1 = cM_scos(i_this->field_0x12a6 * 0x500) * 2500.0f; + if (i_this->demo_timer >= 4) { + i_this->blurRate = 200 + VREG_S(7); + sVar1 = cM_scos(i_this->demo_timer * 0x500) * 2500.0f; i_this->field_0x130c = 0.03f + BREG_F(16); cam_3d_morf(i_this, 0.5f + BREG_F(17)); - if (i_this->field_0x12a6 == 4) { + if (i_this->demo_timer == 4) { fpcM_Search(s_lv9arrow_sub, i_this); } - if (i_this->field_0x12a6 == 10) { + if (i_this->demo_timer == 10) { fpcM_Search(s_lv9dn_sub2, i_this); } - if (i_this->field_0x12a6 == 20) { + if (i_this->demo_timer == 20) { daPy_getPlayerActorClass()->changeDemoMode(20, 1, 0, 0); - hawk_p->mSound.startCreatureVoice(Z2SE_HAWK_V_REGI_DEMO_1, -1); + taka->mSound.startCreatureVoice(Z2SE_HAWK_V_REGI_DEMO_1, -1); } - if (i_this->field_0x12a6 == 41) { + if (i_this->demo_timer == 41) { mDoGph_gInf_c::fadeOut(0.5f, g_blackColor); } - if (i_this->field_0x12a6 == 43) { - i_this->mDemoMode = 25; - i_this->field_0x12a6 = 0; + if (i_this->demo_timer == 43) { + i_this->demo_mode = 25; + i_this->demo_timer = 0; Z2GetAudioMgr()->seStart(Z2SE_AL_FISHING_HIT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - i_this->mBlureRate = 0; + i_this->blurRate = 0; } } break; case 26: - if (i_this->field_0x12a6 == 40) { + if (i_this->demo_timer == 40) { mDoGph_gInf_c::fadeIn(0.5f, g_blackColor); - i_this->mDemoCamFovy = 55.0f; - i_this->mDemoCamCenter.set(-5197.0f, 1712.0f, 5039.0f); - i_this->mDemoCamEye.set(-5215.0f, 2108.0f, 5327.0f); + i_this->demo_cam_zoom = 55.0f; + i_this->demo_cam_center.set(-5197.0f, 1712.0f, 5039.0f); + i_this->demo_cam_eye.set(-5215.0f, 2108.0f, 5327.0f); i_this->field_0x12cc.set(-5025.0f, 2270.0f, 4909.0f); i_this->field_0x12c0.set(-5215.0f, 2108.0f, 5327.0f); cam_spd_set(i_this); fpcM_Search(s_lv9arrow_sub2, i_this); } - if (i_this->field_0x12a6 == 80) { - i_this->mDemoMode = 26; - i_this->field_0x12a6 = 0; + if (i_this->demo_timer == 80) { + i_this->demo_mode = 26; + i_this->demo_timer = 0; daPy_getPlayerActorClass()->changeDemoMode(72, 3, 0, 0); } break; @@ -6140,123 +6140,123 @@ static void demo_camera(e_rd_class* i_this) { cam_3d_morf(i_this, BREG_F(17) + 0.2f); cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.5f, 1.0f, BREG_F(17) + 0.01f); - if (i_this->field_0x12a6 == 55) { - i_this->mDemoCamCenter.set(-5529.0f, 2457.0f, 5589.0f); - i_this->mDemoCamEye.set(-5232.0f, 2201.0f, 5295.0f); + if (i_this->demo_timer == 55) { + i_this->demo_cam_center.set(-5529.0f, 2457.0f, 5589.0f); + i_this->demo_cam_eye.set(-5232.0f, 2201.0f, 5295.0f); i_this->field_0x12cc.set(-5580.0f, 2188.0f, 5640.0f); i_this->field_0x12c0.set(-5232.0f, 2201.0f, 5295.0f); cam_spd_set(i_this); - i_this->mDemoMode = 27; - i_this->field_0x12a6 = 0; + i_this->demo_mode = 27; + i_this->demo_timer = 0; } break; case 28: fpcM_Search(s_lv9rd_sub3, i_this); - if (i_this->field_0x12a6 == 40) { + if (i_this->demo_timer == 40) { data_80519338 = 14; fpcM_Search(s_lv9rd_sub2, i_this); - } else if (i_this->field_0x12a6 == 60) { + } else if (i_this->demo_timer == 60) { data_80519338 = 13; fpcM_Search(s_lv9rd_sub2, i_this); } - if (i_this->field_0x12a6 == 10 || i_this->field_0x12a6 == 20 || i_this->field_0x12a6 == 30 || i_this->field_0x12a6 == 40) { + if (i_this->demo_timer == 10 || i_this->demo_timer == 20 || i_this->demo_timer == 30 || i_this->demo_timer == 40) { fpcM_Search(s_lv9dn_sub, i_this); } - if (i_this->field_0x12a6 < 100) { - cLib_addCalc2(&i_this->mDemoCamFovy, 25.0f, 0.2f, 1.0f); - } else if (i_this->field_0x12a6 >= 120) { - cLib_addCalc2(&i_this->mDemoCamFovy, 55.0f, 0.05f, 0.4f); + if (i_this->demo_timer < 100) { + cLib_addCalc2(&i_this->demo_cam_zoom, 25.0f, 0.2f, 1.0f); + } else if (i_this->demo_timer >= 120) { + cLib_addCalc2(&i_this->demo_cam_zoom, 55.0f, 0.05f, 0.4f); cam_3d_morf(i_this, BREG_F(17) + 0.2f); cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.1f, 1.0f, BREG_F(17) + 0.01f); - if (i_this->field_0x12a6 == 177) { - sp44.set(-5821.0f, 2000.0f, 5850.0f); - dBomb_c::createNormalBombExplode(&sp44); + if (i_this->demo_timer == 177) { + ato.set(-5821.0f, 2000.0f, 5850.0f); + dBomb_c::createNormalBombExplode(&ato); dComIfGs_onTmpBit((u16) dSv_event_tmp_flag_c::tempBitLabels[0x76]); } - if (i_this->field_0x12a6 == 180) { + if (i_this->demo_timer == 180) { dComIfGp_getVibration().StartShock(8, 79, cXyz(0.0f, 1.0f, 0.0f)); fpcM_Search(s_lv9dn_sub3, i_this); } } - if (i_this->field_0x12a6 != 230) { + if (i_this->demo_timer != 230) { break; } - i_this->mDemoMode = 28; - i_this->field_0x12a6 = 0; + i_this->demo_mode = 28; + i_this->demo_timer = 0; i_this->field_0x12cc.set(-5406.0f, 2168.0f, 5468.0f); i_this->field_0x12c0.set(-5058.0f, 2181.0f, 5124.0f); cam_spd_set(i_this); // fallthrough case 29: - if (i_this->field_0x12a6 == 1) { - player->changeDemoMode(20, 0, 0, 0); + if (i_this->demo_timer == 1) { + pla->changeDemoMode(20, 0, 0, 0); } - if (i_this->field_0x12a6 < 25) { + if (i_this->demo_timer < 25) { cam_3d_morf(i_this, BREG_F(17) + 0.2f); cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.2f, 1.0f, BREG_F(17) + 0.01f); - if (i_this->field_0x12a6 == 23) { - hawk_p->setResistanceDemo(); + if (i_this->demo_timer == 23) { + taka->setResistanceDemo(); } } else { - if (i_this->field_0x12a6 == 25) { + if (i_this->demo_timer == 25) { i_this->field_0x130c = 0.0f; } - sp5c = a_hwk->current.pos; - cLib_addCalc2(&i_this->mDemoCamCenter.x, sp5c.x, 0.2f, i_this->field_0x130c * 100.0f); - cLib_addCalc2(&i_this->mDemoCamCenter.y, sp5c.y + BREG_F(13), 0.2f, i_this->field_0x130c * 100.0f); - cLib_addCalc2(&i_this->mDemoCamCenter.z, sp5c.z, 0.2f, i_this->field_0x130c * 100.0f); + target = actor->current.pos; + cLib_addCalc2(&i_this->demo_cam_center.x, target.x, 0.2f, i_this->field_0x130c * 100.0f); + cLib_addCalc2(&i_this->demo_cam_center.y, target.y + BREG_F(13), 0.2f, i_this->field_0x130c * 100.0f); + cLib_addCalc2(&i_this->demo_cam_center.z, target.z, 0.2f, i_this->field_0x130c * 100.0f); cLib_addCalc2(&i_this->field_0x130c, 1.0f, 1.0f, 0.03f); - if (i_this->field_0x12a6 >= 55) { - if (i_this->field_0x12a6 == 110) { - hawk_p->mSound.startCreatureVoice(Z2SE_HAWK_V_REGI_DEMO_2, -1); + if (i_this->demo_timer >= 55) { + if (i_this->demo_timer == 110) { + taka->mSound.startCreatureVoice(Z2SE_HAWK_V_REGI_DEMO_2, -1); } - if (i_this->field_0x12a6 < 135) { - cLib_addCalc2(&i_this->mDemoCamFovy, 20.0f, 0.2f, 1.0f); + if (i_this->demo_timer < 135) { + cLib_addCalc2(&i_this->demo_cam_zoom, 20.0f, 0.2f, 1.0f); } else { - cLib_addCalc2(&i_this->mDemoCamFovy, 55.0f, 0.1f, 0.5f); + cLib_addCalc2(&i_this->demo_cam_zoom, 55.0f, 0.1f, 0.5f); } } - if (i_this->field_0x12a6 == 205) { - i_this->mDemoMode = 29; - i_this->field_0x12a6 = 0; + if (i_this->demo_timer == 205) { + i_this->demo_mode = 29; + i_this->demo_timer = 0; daPy_getPlayerActorClass()->changeDemoMode(1, 0, 0, 0); } } break; case 30: - i_this->mDemoCamFovy = 55.0f; - i_this->mDemoCamEye.set(-3963.0f, 147.0f, 8094.0f); - sp5c = a_hwk->current.pos; + i_this->demo_cam_zoom = 55.0f; + i_this->demo_cam_eye.set(-3963.0f, 147.0f, 8094.0f); + target = actor->current.pos; - if (i_this->field_0x12a6 == 0) { - i_this->mDemoCamCenter = sp5c; + if (i_this->demo_timer == 0) { + i_this->demo_cam_center = target; } else { - cLib_addCalc2(&i_this->mDemoCamCenter.x, sp5c.x, 0.2f, 100.0f); - cLib_addCalc2(&i_this->mDemoCamCenter.y, sp5c.y, 0.2f, 100.0f); - cLib_addCalc2(&i_this->mDemoCamCenter.z, sp5c.z, 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_center.x, target.x, 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_center.y, target.y, 0.2f, 100.0f); + cLib_addCalc2(&i_this->demo_cam_center.z, target.z, 0.2f, 100.0f); - if (i_this->field_0x12a6 == 140) { + if (i_this->demo_timer == 140) { i_this->field_0x12cc.set(-4080.0f, 134.0f, 8190.0f); - i_this->field_0x12c0 = i_this->mDemoCamEye; + i_this->field_0x12c0 = i_this->demo_cam_eye; cam_spd_set(i_this); - i_this->mDemoMode = 30; - i_this->field_0x12a6 = 0; + i_this->demo_mode = 30; + i_this->demo_timer = 0; } } break; @@ -6265,16 +6265,16 @@ static void demo_camera(e_rd_class* i_this) { cam_3d_morf(i_this, BREG_F(17) + 0.1f); cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.1f, 1.0f, BREG_F(17) + 0.002f); - if (i_this->field_0x12a6 == 70) { - i_this->mDemoCamCenter.set(-4527.0f, 143.0f, 8305.0f); - i_this->mDemoCamEye.set(-4676.0f, 161.0f, 8282.0f); + if (i_this->demo_timer == 70) { + i_this->demo_cam_center.set(-4527.0f, 143.0f, 8305.0f); + i_this->demo_cam_eye.set(-4676.0f, 161.0f, 8282.0f); i_this->field_0x12cc.set(-4552.0f, 143.0f, 8461.0f); i_this->field_0x12c0.set(-4701.0f, 161.0f, 8438.0f); cam_spd_set(i_this); - i_this->mDemoMode = 31; - i_this->field_0x12a6 = 0; - sp44.set(-5397.0f, 2000.0f, 5921.0f); - daPy_getPlayerActorClass()->setPlayerPosAndAngle(&sp44, 0x213F, 0); + i_this->demo_mode = 31; + i_this->demo_timer = 0; + ato.set(-5397.0f, 2000.0f, 5921.0f); + daPy_getPlayerActorClass()->setPlayerPosAndAngle(&ato, 0x213F, 0); } break; @@ -6282,57 +6282,58 @@ static void demo_camera(e_rd_class* i_this) { cam_3d_morf(i_this, BREG_F(17) + 0.05f); cLib_addCalc2(&i_this->field_0x130c, BREG_F(16) + 0.05f, 1.0f, BREG_F(17) + 0.001f); - if (i_this->field_0x12a6 == 70) { - i_this->mDemoMode = 32; - i_this->field_0x12a6 = 0; - i_this->mDemoCamCenter.set(-5275.0f, 2327.0f, 5812.0f); - i_this->mDemoCamEye.set(-5367.0f, 2689.0f, 5495.0f); - i_this->mDemoCamFovy = 30.0f; + if (i_this->demo_timer == 70) { + i_this->demo_mode = 32; + i_this->demo_timer = 0; + i_this->demo_cam_center.set(-5275.0f, 2327.0f, 5812.0f); + i_this->demo_cam_eye.set(-5367.0f, 2689.0f, 5495.0f); + i_this->demo_cam_zoom = 30.0f; } break; case 33: - if (i_this->field_0x12a6 == 60) { - i_this->mDemoCamCenter.set(-3906.0f, 42.0f, 8198.0f); - i_this->mDemoCamEye.set(-4274.0f, 272.0f, 7969.0f); - i_this->mDemoMode = 33; - i_this->field_0x12a6 = 0; + if (i_this->demo_timer == 60) { + i_this->demo_cam_center.set(-3906.0f, 42.0f, 8198.0f); + i_this->demo_cam_eye.set(-4274.0f, 272.0f, 7969.0f); + i_this->demo_mode = 33; + i_this->demo_timer = 0; dComIfGs_onTmpBit((u16) dSv_event_tmp_flag_c::tempBitLabels[0x75]); } break; case 34: - if (i_this->field_0x12a6 == 65) { + if (i_this->demo_timer == 65) { daPy_getPlayerActorClass()->changeDemoMode(60, 1, 0, 0); } - if (i_this->field_0x12a6 == 70) { - i_this->mDemoCamCenter.set(-5712.0f, 2308.0f, 5828.0f); - i_this->mDemoCamEye.set(-5286.0f, 2104.0f, 5957.0f); - i_this->mDemoCamFovy = 45.0f; - i_this->mDemoMode = 34; - i_this->field_0x12a6 = 0; + if (i_this->demo_timer == 70) { + i_this->demo_cam_center.set(-5712.0f, 2308.0f, 5828.0f); + i_this->demo_cam_eye.set(-5286.0f, 2104.0f, 5957.0f); + i_this->demo_cam_zoom = 45.0f; + i_this->demo_mode = 34; + i_this->demo_timer = 0; } break; case 35: - cLib_addCalc2(&i_this->mDemoCamFovy, 40.0f, 0.05f, 0.02f); - if (i_this->field_0x12a6 == 80) { - i_this->mDemoCamCenter.set(-4712.0f, 870.0f, 7432.0f); - i_this->mDemoCamEye.set(-4852.0f, 1171.0f, 7072.0f); - i_this->mDemoCamFovy = 55.0f; - i_this->mDemoMode = 35; - i_this->field_0x12a6 = 0; + cLib_addCalc2(&i_this->demo_cam_zoom, 40.0f, 0.05f, 0.02f); + if (i_this->demo_timer == 80) { + i_this->demo_cam_center.set(-4712.0f, 870.0f, 7432.0f); + i_this->demo_cam_eye.set(-4852.0f, 1171.0f, 7072.0f); + i_this->demo_cam_zoom = 55.0f; + i_this->demo_mode = 35; + i_this->demo_timer = 0; + /* Hyrule Castle - Resistance leaves Flag*/ dComIfGs_onTmpBit((u16) dSv_event_tmp_flag_c::tempBitLabels[0x74]); } break; case 36: - if (i_this->field_0x12a6 == 120) { + if (i_this->demo_timer == 120) { bVar1 = true; - int swBit = (fopAcM_GetParam(a_this) & 0xFF000000) >> 24; - if (swBit != 0xFF) { - dComIfGs_onSwitch(swBit, fopAcM_GetRoomNo(a_this)); + int bitsw = (fopAcM_GetParam(enemy) & 0xFF000000) >> 24; + if (bitsw != 0xFF) { + dComIfGs_onSwitch(bitsw, fopAcM_GetRoomNo(enemy)); } } break; @@ -6343,15 +6344,15 @@ static void demo_camera(e_rd_class* i_this) { camera->mCamera.SetTrimSize(0); dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); - i_this->mDemoMode = -1; + i_this->demo_mode = -1; } - if (i_this->mDemoMode > 0) { - cXyz sp68, sp74; - sp68 = i_this->mDemoCamCenter; - sp74 = i_this->mDemoCamEye; - camera->mCamera.Set(sp68, sp74, sVar1, i_this->mDemoCamFovy); - i_this->field_0x12a6++; + if (i_this->demo_mode > 0) { + cXyz center, eye; + center = i_this->demo_cam_center; + eye = i_this->demo_cam_eye; + camera->mCamera.Set(center, eye, sVar1, i_this->demo_cam_zoom); + i_this->demo_timer++; } } @@ -6368,11 +6369,11 @@ static int daE_RD_Execute(e_rd_class* i_this) { } } - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - cXyz sp98, spa4, spb0; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + cXyz mae, ato, ato2; - if (i_this->field_0x5b8 == 11) { - fopAcM_delete(a_this); + if (i_this->arg2 == 11) { + fopAcM_delete(enemy); return 1; } @@ -6380,15 +6381,15 @@ static int daE_RD_Execute(e_rd_class* i_this) { S_find--; } - i_this->field_0x970++; + i_this->counter++; - if (i_this->mBossMode == 0) { + if (i_this->actor_set == 0) { i_this->field_0x1297 = i_this->field_0x1298; } else { - fopAc_ac_c* player = dComIfGp_getPlayer(0); + fopAc_ac_c* pla = dComIfGp_getPlayer(0); // Bridge of Eldin Battle - if (strcmp(dComIfGp_getStartStageName(), "F_SP102") == 0 && player->current.pos.y < -2000.0f) { + if (strcmp(dComIfGp_getStartStageName(), "F_SP102") == 0 && pla->current.pos.y < -2000.0f) { cDmr_SkipInfo = 50; } @@ -6398,13 +6399,13 @@ static int daE_RD_Execute(e_rd_class* i_this) { } for (int i = 0; i < 4; i++) { - if (i_this->field_0x990[i] != 0) { - i_this->field_0x990[i]--; + if (i_this->timer[i] != 0) { + i_this->timer[i]--; } } - if (i_this->field_0x998 != 0) { - i_this->field_0x998--; + if (i_this->damage_timer != 0) { + i_this->damage_timer--; } if (i_this->field_0xaf0 != 0) { @@ -6415,69 +6416,69 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->field_0x99a--; } - if (i_this->field_0x99e != 0) { - i_this->field_0x99e--; + if (i_this->attack_timer != 0) { + i_this->attack_timer--; } - if (i_this->field_0x99c != 0) { - i_this->field_0x99c--; + if (i_this->yagura_timer != 0) { + i_this->yagura_timer--; } - if (otoCheck(a_this, 1000.0f) || daPy_getPlayerActorClass()->checkWolfBark()) { - i_this->field_0x9a1 = cM_rndF(10.0f) + 10.0f; + if (otoCheck(enemy, 1000.0f) || daPy_getPlayerActorClass()->checkWolfBark()) { + i_this->look_timer = cM_rndF(10.0f) + 10.0f; } - if (i_this->field_0x9a1 != 0) { - i_this->field_0x9a1--; + if (i_this->look_timer != 0) { + i_this->look_timer--; } i_this->field_0x9a2 = 0; i_this->field_0x9ad = 1; action(i_this); - if (i_this->field_0x9bc != 0) { + if (i_this->ride_mode != 0) { i_this->field_0x9ad = 0; } - if (i_this->field_0x9bc != 2 && i_this->field_0xaf0 == 0 && i_this->mAction != ACTION_IKKI_END) { - spa4.set(0.0f, 0.0f, 0.0f); - if (i_this->field_0x9ec) { - cMtx_YrotS(*calc_mtx, i_this->field_0xa0c.y); - sp98.x = 0.0f; - sp98.y = TREG_F(8); - sp98.z = i_this->field_0xaec; - MtxPosition(&sp98, &spa4); - cLib_addCalc2(&i_this->field_0xaec, i_this->field_0x9ec * (TREG_F(9) + 2.0f), 1.0f, TREG_F(17) + 5.0f); + if (i_this->ride_mode != 2 && i_this->field_0xaf0 == 0 && i_this->action != ACTION_IKKI_END) { + ato.set(0.0f, 0.0f, 0.0f); + if (i_this->jump_z) { + cMtx_YrotS(*calc_mtx, i_this->jump_angle.y); + mae.x = 0.0f; + mae.y = TREG_F(8); + mae.z = i_this->field_0xaec; + MtxPosition(&mae, &ato); + cLib_addCalc2(&i_this->field_0xaec, i_this->jump_z * (TREG_F(9) + 2.0f), 1.0f, TREG_F(17) + 5.0f); } else { cLib_addCalc0(&i_this->field_0xaec, 1.0f, TREG_F(17) + 5.0f); } - if (i_this->mAnmID == BCK_RD_DIEB && i_this->field_0xa0c.x != 0 && i_this->field_0xa1f == 0) { - spa4.y += KREG_F(0) + -20.0f; + if (i_this->anm == BCK_RD_DIEB && i_this->jump_angle.x != 0 && i_this->field_0xa1f == 0) { + ato.y += KREG_F(0) + -20.0f; } - a_this->current.pos += spa4; - a_this->old.pos += spa4; - i_this->mObjAcch.CrrPos(dComIfG_Bgsp()); - a_this->current.pos -= spa4; - a_this->old.pos -= spa4; + enemy->current.pos += ato; + enemy->old.pos += ato; + i_this->ObjAcch.CrrPos(dComIfG_Bgsp()); + enemy->current.pos -= ato; + enemy->old.pos -= ato; - if (!i_this->mObjAcch.ChkGroundHit()) { - if (a_this->speed.y < -10.0f) { + if (!i_this->ObjAcch.ChkGroundHit()) { + if (enemy->speed.y < -10.0f) { i_this->field_0xaf2++; - if (i_this->field_0xaf2 == 20 && i_this->mBossMode == 0) { - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_DEATH, -1); + if (i_this->field_0xaf2 == 20 && i_this->actor_set == 0) { + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_DEATH, -1); } } } else { - if (i_this->field_0xaf2 >= ZREG_S(8) + 20 && i_this->field_0x5b7 != 13 && i_this->field_0x5b7 != 14) { - i_this->mAction = ACTION_DAMAGE; - i_this->mMode = 0; - a_this->speed.y = 0.0f; - i_this->field_0x9ec = -1.0f; - i_this->field_0xa0c.x = -0x3000; - i_this->field_0x998 = 1000; - a_this->health = 0; + if (i_this->field_0xaf2 >= ZREG_S(8) + 20 && i_this->arg1 != 13 && i_this->arg1 != 14) { + i_this->action = ACTION_DAMAGE; + i_this->mode = 0; + enemy->speed.y = 0.0f; + i_this->jump_z = -1.0f; + i_this->jump_angle.x = -0x3000; + i_this->damage_timer = 1000; + enemy->health = 0; } i_this->field_0xaf2 = 0; @@ -6485,83 +6486,83 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->field_0x1294 = 0; - if (i_this->mObjAcch.GetGroundH() != -G_CM3D_F_INF && i_this->mObjAcch.ChkWaterHit() && i_this->mObjAcch.m_wtr.GetHeight() > a_this->current.pos.y) { + if (i_this->ObjAcch.GetGroundH() != -G_CM3D_F_INF && i_this->ObjAcch.ChkWaterHit() && i_this->ObjAcch.m_wtr.GetHeight() > enemy->current.pos.y) { i_this->field_0x1294 = 1; } } if (i_this->field_0xafb == 0) { - mDoMtx_stack_c::transS(a_this->current.pos.x, a_this->current.pos.y + i_this->field_0x9c0, a_this->current.pos.z); + mDoMtx_stack_c::transS(enemy->current.pos.x, enemy->current.pos.y + i_this->field_0x9c0, enemy->current.pos.z); mDoMtx_stack_c::XrotM((s16) i_this->field_0xa12.x); mDoMtx_stack_c::ZrotM((s16) i_this->field_0xa12.z); - mDoMtx_stack_c::YrotM((s16) i_this->field_0xa0c.y); - mDoMtx_stack_c::XrotM((s16) i_this->field_0xa0c.x); - mDoMtx_stack_c::YrotM(-i_this->field_0xa0c.y); - mDoMtx_stack_c::YrotM((s16) a_this->shape_angle.y); - mDoMtx_stack_c::XrotM((s16) a_this->shape_angle.x); - mDoMtx_stack_c::ZrotM(a_this->shape_angle.z); + mDoMtx_stack_c::YrotM((s16) i_this->jump_angle.y); + mDoMtx_stack_c::XrotM((s16) i_this->jump_angle.x); + mDoMtx_stack_c::YrotM(-i_this->jump_angle.y); + mDoMtx_stack_c::YrotM((s16) enemy->shape_angle.y); + mDoMtx_stack_c::XrotM((s16) enemy->shape_angle.x); + mDoMtx_stack_c::ZrotM(enemy->shape_angle.z); - f32 fVar1 = l_HIO.model_size * a_this->scale.x; - if (i_this->mBossMode != 0) { - fVar1 *= l_HIO.leader_size_ratio; + f32 scale = l_HIO.model_size * enemy->scale.x; + if (i_this->actor_set != 0) { + scale *= l_HIO.leader_size_ratio; } - mDoMtx_stack_c::scaleM(fVar1, fVar1, fVar1); + mDoMtx_stack_c::scaleM(scale, scale, scale); - J3DModel* my_model_p = i_this->mpModelMorf->getModel(); + J3DModel* my_model_p = i_this->anm_p->getModel(); my_model_p->setBaseTRMtx(mDoMtx_stack_c::get()); - i_this->mpModelMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this))); - int frame = i_this->mpModelMorf->getFrame(); + i_this->anm_p->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(enemy))); + int frame = i_this->anm_p->getFrame(); - if (i_this->mAnmID == BCK_RD_RUN && (frame == 1 || frame == 10)) { - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_RUNNING_BREATH, -1); + if (i_this->anm == BCK_RD_RUN && (frame == 1 || frame == 10)) { + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_RUNNING_BREATH, -1); } - if (i_this->mAnmID == BCK_RD_KYORO2 && (frame == 5 || frame == 26)) { - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_RUNNING_BREATH, -1); + if (i_this->anm == BCK_RD_KYORO2 && (frame == 5 || frame == 26)) { + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_RUNNING_BREATH, -1); } - if ((i_this->mAnmID == BCK_RD_SHOOT_READY && frame == 10) || (i_this->mAnmID == BCK_RD_RSHOOT_READY && frame == 5) || (i_this->mAnmID == BCK_RD_ARMAMENT && frame == 10)) { - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_READY_WEAPON, -1); + if ((i_this->anm == BCK_RD_SHOOT_READY && frame == 10) || (i_this->anm == BCK_RD_RSHOOT_READY && frame == 5) || (i_this->anm == BCK_RD_ARMAMENT && frame == 10)) { + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_READY_WEAPON, -1); } - if ((i_this->mAnmID == BCK_RD_WALK && (i_this->mpModelMorf->checkFrame(1.0f) || i_this->mpModelMorf->checkFrame(15.0f))) || - ((i_this->mAnmID == BCK_RD_RUN || i_this->mAnmID == BCK_RD_RUN02) && (i_this->mpModelMorf->checkFrame(1.0f) || i_this->mpModelMorf->checkFrame(7.0f)))) { + if ((i_this->anm == BCK_RD_WALK && (i_this->anm_p->checkFrame(1.0f) || i_this->anm_p->checkFrame(15.0f))) || + ((i_this->anm == BCK_RD_RUN || i_this->anm == BCK_RD_RUN02) && (i_this->anm_p->checkFrame(1.0f) || i_this->anm_p->checkFrame(7.0f)))) { if (i_this->field_0x1294 != 0) { - i_this->mSound.startCreatureSound(Z2SE_RIDER_FOOTNOTE_WATER, 0, -1); + i_this->sound.startCreatureSound(Z2SE_RIDER_FOOTNOTE_WATER, 0, -1); } else { - i_this->mSound.startCreatureSound(Z2SE_RIDER_FOOTNOTE, 0, -1); + i_this->sound.startCreatureSound(Z2SE_RIDER_FOOTNOTE, 0, -1); } } - if (i_this->mBossMode != 0) { - if (i_this->mAnmID == e_rdb_class::BCK_RB_RCOMEON) { - if (i_this->mpModelMorf->checkFrame(30.0f)) { - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_V_LAUGH, -1); + if (i_this->actor_set != 0) { + if (i_this->anm == e_rdb_class::BCK_RB_RCOMEON) { + if (i_this->anm_p->checkFrame(30.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_LAUGH, -1); } - } else if (i_this->mAnmID == e_rdb_class::BCK_RB_RJUMP_C && i_this->mpModelMorf->checkFrame(21.0f)) { - i_this->mSound.startCreatureVoice(Z2SE_EN_RDB_V_HOICK2, -1); + } else if (i_this->anm == e_rdb_class::BCK_RB_RJUMP_C && i_this->anm_p->checkFrame(21.0f)) { + i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_HOICK2, -1); } } - if (i_this->field_0x680 != 0 && i_this->mpModelMorf->isStop()) { - int i_anmID; - if (a_this->speedF >= 10.0f) { - i_anmID = BCK_RD_SHOUT; + if (i_this->field_0x680 != 0 && i_this->anm_p->isStop()) { + int anm; + if (enemy->speedF >= 10.0f) { + anm = BCK_RD_SHOUT; } else { - i_anmID = BCK_RD_WALK; + anm = BCK_RD_WALK; } i_this->field_0x680 = 0; - anm_init(i_this, i_anmID, 10.0f, 2, 1.0f); + anm_init(i_this, anm, 10.0f, 2, 1.0f); } - i_this->mpModelMorf->modelCalc(); + i_this->anm_p->modelCalc(); - if (i_this->mAnmID == BCK_RD_SLEEP_WAIT || dComIfGp_checkPlayerStatus0(0, 0x200000)) { + if (i_this->anm == BCK_RD_SLEEP_WAIT || dComIfGp_checkPlayerStatus0(0, 0x200000)) { i_this->field_0x1297 = 0; } if (i_this->field_0x1297 != 0) { - J3DModel* model = i_this->mpModelMorf->getModel(); + J3DModel* model = i_this->anm_p->getModel(); cLib_addCalc2(&i_this->field_0x6cc, i_this->field_0x6d0, 1.0f, 0.02f); i_this->field_0x6d0 = 1.0f; MTXCopy(model->getAnmMtx(13), *calc_mtx); @@ -6579,212 +6580,212 @@ static int daE_RD_Execute(e_rd_class* i_this) { for (int i = 0; i < 2; i++) { MtxPush(); - s16 sVar2, sVar1; + s16 x, y; if (i == 0) { - sp98.set(38.0f, 0.0f, 0.0f); - MtxPosition(&sp98, &spa4); - sp98 = camera->lookat.eye - spa4; - - sVar1 = cM_atan2s(sp98.x, sp98.z); - sVar2 = -cM_atan2s(sp98.y, JMAFastSqrt(sp98.x * sp98.x + sp98.z * sp98.z)); - fVar1 = sp98.abs() * (0.001f + JREG_F(8)); - if (fVar1 > 2.0f + JREG_F(17)) { - fVar1 = 2.0f + JREG_F(17); + mae.set(38.0f, 0.0f, 0.0f); + MtxPosition(&mae, &ato); + mae = camera->lookat.eye - ato; + + y = cM_atan2s(mae.x, mae.z); + x = -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z)); + scale = mae.abs() * (0.001f + JREG_F(8)); + if (scale > 2.0f + JREG_F(17)) { + scale = 2.0f + JREG_F(17); } - dScnKy_env_light_c* env_light = dKy_getEnvlight(); - int my_scale = env_light->daytime / 15.0f; - fVar1 *= i_this->field_0x6cc * time_scale[my_scale]; - sp98.set(38.0f, 0.0f, 6.0f); + dScnKy_env_light_c* kankyo = dKy_getEnvlight(); + int timeH = kankyo->daytime / 15.0f; + scale *= i_this->field_0x6cc * time_scale[timeH]; + mae.set(38.0f, 0.0f, 6.0f); } else { - sp98.set(38.0f, 0.0f, -6.0f); + mae.set(38.0f, 0.0f, -6.0f); } - MtxPosition(&sp98, &spa4); - MtxTrans(spa4.x, spa4.y, spa4.z, 0); - cMtx_YrotM(*calc_mtx, sVar1); - cMtx_XrotM(*calc_mtx, sVar2); - MtxScale(fVar1, fVar1, fVar1, 1); + MtxPosition(&mae, &ato); + MtxTrans(ato.x, ato.y, ato.z, 0); + cMtx_YrotM(*calc_mtx, y); + cMtx_XrotM(*calc_mtx, x); + MtxScale(scale, scale, scale, 1); - i_this->mpEyeModels[i]->setBaseTRMtx(*calc_mtx); + i_this->eye_model[i]->setBaseTRMtx(*calc_mtx); MtxPull(); } } } if (i_this->field_0xafb == 0) { - J3DModel* model = i_this->mpModelMorf->getModel(); + J3DModel* model = i_this->anm_p->getModel(); MTXCopy(model->getAnmMtx(11), *calc_mtx); - sp98.set(0.0f, 0.0f, 0.0f); - MtxPosition(&sp98, &spa4); - sp98.set(YREG_F(1), YREG_F(2) + 100.0f, YREG_F(3)); - MtxPosition(&sp98, &spb0); + mae.set(0.0f, 0.0f, 0.0f); + MtxPosition(&mae, &ato); + mae.set(YREG_F(1), YREG_F(2) + 100.0f, YREG_F(3)); + MtxPosition(&mae, &ato2); - if (spa4.y < spb0.y) { + if (ato.y < ato2.y) { i_this->field_0xa1f = 0; } else { i_this->field_0xa1f = 1; } - cXyz spbc(0.0f, 0.0f, 0.0f); + cXyz cr(0.0f, 0.0f, 0.0f); - if (i_this->field_0x998 != 0) { - spbc.set(-20000.0f, 200000.0f, 30000.0f); + if (i_this->damage_timer != 0) { + cr.set(-20000.0f, 200000.0f, 30000.0f); } - if (i_this->mBossMode != 0) { + if (i_this->actor_set != 0) { MTXCopy(model->getAnmMtx(AREG_S(9) + 6), *calc_mtx); } else { MTXCopy(model->getAnmMtx(13), *calc_mtx); } - sp98.set(20.0f, 0.0f, 0.0f); - MtxPosition(&sp98, &a_this->eyePos); + mae.set(20.0f, 0.0f, 0.0f); + MtxPosition(&mae, &enemy->eyePos); if (daPy_py_c::checkNowWolf()) { - spbc.y += 30.0f; - i_this->field_0xd58[0].SetC(a_this->eyePos + spbc); - i_this->field_0xd58[0].SetR(50.0f); + cr.y += 30.0f; + i_this->cc_sph[0].SetC(enemy->eyePos + cr); + i_this->cc_sph[0].SetR(50.0f); } else { - i_this->field_0xd58[0].SetC(a_this->eyePos + spbc); - i_this->field_0xd58[0].SetR(35.0f); + i_this->cc_sph[0].SetC(enemy->eyePos + cr); + i_this->cc_sph[0].SetR(35.0f); } - if (i_this->field_0x9bc == 2) { - a_this->attention_info.position = a_this->current.pos; - a_this->attention_info.position.y += 190.0f + JREG_F(8); + if (i_this->ride_mode == 2) { + enemy->attention_info.position = enemy->current.pos; + enemy->attention_info.position.y += 190.0f + JREG_F(8); - if (i_this->mBossMode != 0) { - a_this->attention_info.position.y += 120.0f + JREG_F(9); + if (i_this->actor_set != 0) { + enemy->attention_info.position.y += 120.0f + JREG_F(9); } } else { - a_this->attention_info.position = a_this->eyePos; - a_this->attention_info.position.y += 30.0f; + enemy->attention_info.position = enemy->eyePos; + enemy->attention_info.position.y += 30.0f; } - if (i_this->mBossMode != 0) { - f32 fVar2 = 60.0f; - f32 fVar1 = 0.0f; - if (i_this->mBossMode == 2) { - fVar2 = 90.0f; - fVar1 = l_HIO.field_0x3c; + if (i_this->actor_set != 0) { + f32 rad = 60.0f; + f32 size = 0.0f; + if (i_this->actor_set == 2) { + rad = 90.0f; + size = l_HIO.ikki_boss_size; } - sp98.set(ZREG_F(0), ZREG_F(1), ZREG_F(2)); + mae.set(ZREG_F(0), ZREG_F(1), ZREG_F(2)); MTXCopy(model->getAnmMtx(2), *calc_mtx); - MtxPosition(&sp98, &spa4); - i_this->field_0xd58[2].SetC(spa4 + spbc); - i_this->field_0xd58[2].SetR((fVar2 + ZREG_F(3)) + fVar1); + MtxPosition(&mae, &ato); + i_this->cc_sph[2].SetC(ato + cr); + i_this->cc_sph[2].SetR((rad + ZREG_F(3)) + size); - sp98.set(ZREG_F(4), ZREG_F(5), ZREG_F(6)); + mae.set(ZREG_F(4), ZREG_F(5), ZREG_F(6)); MTXCopy(model->getAnmMtx(22), *calc_mtx); - MtxPosition(&sp98, &spa4); - i_this->field_0xd58[1].SetC(spa4 + spbc); - i_this->field_0xd58[1].SetR(fVar2 + ZREG_F(7)); + MtxPosition(&mae, &ato); + i_this->cc_sph[1].SetC(ato + cr); + i_this->cc_sph[1].SetR(rad + ZREG_F(7)); } else { - sp98.set(BREG_F(14), BREG_F(15), BREG_F(16)); + mae.set(BREG_F(14), BREG_F(15), BREG_F(16)); MTXCopy(model->getAnmMtx(12), *calc_mtx); - MtxPosition(&sp98, &spa4); - i_this->field_0xd58[2].SetC(spa4 + spbc); - i_this->field_0xd58[2].SetR(35.0f); + MtxPosition(&mae, &ato); + i_this->cc_sph[2].SetC(ato + cr); + i_this->cc_sph[2].SetR(35.0f); - sp98.set(BREG_F(11) + -10.0f, BREG_F(12), BREG_F(13)); + mae.set(BREG_F(11) + -10.0f, BREG_F(12), BREG_F(13)); MTXCopy(model->getAnmMtx(10), *calc_mtx); - MtxPosition(&sp98, &spa4); - i_this->field_0xd58[1].SetC(spa4 + spbc); - i_this->field_0xd58[1].SetR(35.0f); + MtxPosition(&mae, &ato); + i_this->cc_sph[1].SetC(ato + cr); + i_this->cc_sph[1].SetR(35.0f); } for (int i = 0; i <= 2; i++) { if (i_this->field_0x9ad != 0) { - i_this->field_0xd58[i].OnCoSetBit(); + i_this->cc_sph[i].OnCoSetBit(); } else { - i_this->field_0xd58[i].OffCoSetBit(); + i_this->cc_sph[i].OffCoSetBit(); } - dComIfG_Ccsp()->Set(&i_this->field_0xd58[i]); + dComIfG_Ccsp()->Set(&i_this->cc_sph[i]); - if (i_this->mBossMode == 1 && i_this->field_0x9bc == 2) { - i_this->field_0xd58[i].OnTgNoHitMark(); + if (i_this->actor_set == 1 && i_this->ride_mode == 2) { + i_this->cc_sph[i].OnTgNoHitMark(); } else { - i_this->field_0xd58[i].OffTgNoHitMark(); + i_this->cc_sph[i].OffTgNoHitMark(); } - if (i_this->mBossMode == 3) { + if (i_this->actor_set == 3) { for (int j = 0; j <= 2; j++) { - i_this->field_0xd58[j].SetTgType(0x2022); - i_this->field_0xd58[j].OnTgNoHitMark(); + i_this->cc_sph[j].SetTgType(0x2022); + i_this->cc_sph[j].OnTgNoHitMark(); } } } } if (i_this->field_0x9ab == 2) { - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(11), *calc_mtx); - sp98.set(0.0f, 0.0f, 0.0f); - MtxPosition(&sp98, &spa4); - i_this->field_0x1100.SetR(l_HIO.model_size * 50.0f); - i_this->field_0x1100.SetC(spa4); - dComIfG_Ccsp()->Set(&i_this->field_0x1100); + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(11), *calc_mtx); + mae.set(0.0f, 0.0f, 0.0f); + MtxPosition(&mae, &ato); + i_this->at_sph.SetR(l_HIO.model_size * 50.0f); + i_this->at_sph.SetC(ato); + dComIfG_Ccsp()->Set(&i_this->at_sph); i_this->field_0x9ab = 0; } - if (i_this->field_0x5bc == 1) { + if (i_this->weapon_type == 1) { if (i_this->field_0x5bd == 0) { - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(24), *calc_mtx); + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(24), *calc_mtx); } else { - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(11), *calc_mtx); + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(11), *calc_mtx); cMtx_YrotM(*calc_mtx, 6000); cMtx_XrotM(*calc_mtx, 10000); cMtx_ZrotM(*calc_mtx, 18000); MtxTrans(-30.0f, -50.0f, 20.0f, 1); } - i_this->field_0x694->setBaseTRMtx(*calc_mtx); + i_this->arrow->setBaseTRMtx(*calc_mtx); if (i_this->field_0x9ab != 0) { if (daPy_getPlayerActorClass()->checkHorseRide() || daPy_getPlayerActorClass()->checkBoarRide()) { - sp98.set(0.0f, nREG_F(15) + 50.0f, 0.0f); - i_this->field_0x1100.SetR((nREG_F(16) + 60.0f) * l_HIO.model_size); + mae.set(0.0f, nREG_F(15) + 50.0f, 0.0f); + i_this->at_sph.SetR((nREG_F(16) + 60.0f) * l_HIO.model_size); } else { - sp98.set(0.0f, 30.0f, 0.0f); - i_this->field_0x1100.SetR(l_HIO.model_size * 50.0f); + mae.set(0.0f, 30.0f, 0.0f); + i_this->at_sph.SetR(l_HIO.model_size * 50.0f); } - MtxPosition(&sp98, &spa4); + MtxPosition(&mae, &ato); if (i_this->field_0x9ac == 0) { i_this->field_0x9ac = 1; - i_this->field_0x1100.StartCAt(spa4); + i_this->at_sph.StartCAt(ato); } else { - i_this->field_0x1100.MoveCAt(spa4); + i_this->at_sph.MoveCAt(ato); } i_this->field_0x9ab = 0; } else { - cXyz spc8(-200000.0f, -200000.0f, -200000.0f); - i_this->field_0x1100.SetC(spc8); - i_this->field_0x1100.SetR(-200.0f); + cXyz cr(-200000.0f, -200000.0f, -200000.0f); + i_this->at_sph.SetC(cr); + i_this->at_sph.SetR(-200.0f); i_this->field_0x9ac = 0; } - dComIfG_Ccsp()->Set(&i_this->field_0x1100); + dComIfG_Ccsp()->Set(&i_this->at_sph); } - if (i_this->field_0x5bc >= 2) { - J3DModel* model = i_this->mpModelMorf->getModel(); + if (i_this->weapon_type >= 2) { + J3DModel* model = i_this->anm_p->getModel(); - if (i_this->field_0x9a6 != 0) { - i_this->field_0x9a6--; + if (i_this->bow_shake_timer != 0) { + i_this->bow_shake_timer--; } - i_this->field_0x9a8 = i_this->field_0x9a6 * cM_ssin(i_this->field_0x9a6 * (TREG_S(9) + 0x7800)) * (TREG_F(5) + 100.0f); + i_this->field_0x9a8 = i_this->bow_shake_timer * cM_ssin(i_this->bow_shake_timer * (TREG_S(9) + 0x7800)) * (TREG_F(5) + 100.0f); - model = i_this->mpMorfBowAnm->getModel(); + model = i_this->bow_anm->getModel(); if (i_this->field_0x5bd == 0) { - model->setBaseTRMtx(i_this->mpModelMorf->getModel()->getAnmMtx(19)); + model->setBaseTRMtx(i_this->anm_p->getModel()->getAnmMtx(19)); } else { - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(11), *calc_mtx); + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(11), *calc_mtx); cMtx_YrotM(*calc_mtx, 6000); cMtx_XrotM(*calc_mtx, 10000); cMtx_ZrotM(*calc_mtx, 18000); @@ -6792,15 +6793,15 @@ static int daE_RD_Execute(e_rd_class* i_this) { model->setBaseTRMtx(*calc_mtx); } - i_this->mpMorfBowAnm->play(0, 0); - i_this->mpMorfBowAnm->modelCalc(); + i_this->bow_anm->play(0, 0); + i_this->bow_anm->modelCalc(); if (i_this->field_0x9a2 != 0) { - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(24), *calc_mtx); - i_this->field_0x694->setBaseTRMtx(*calc_mtx); + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(24), *calc_mtx); + i_this->arrow->setBaseTRMtx(*calc_mtx); - if (i_this->field_0x5bc >= 3) { - if (i_this->field_0x9bc != 2 || i_this->field_0x990[1] <= 18) { + if (i_this->weapon_type >= 3) { + if (i_this->ride_mode != 2 || i_this->timer[1] <= 18) { fire_eff_set(i_this); } } else { @@ -6808,76 +6809,76 @@ static int daE_RD_Execute(e_rd_class* i_this) { } } - if (i_this->field_0x9a3 != 0) { - if (i_this->field_0x5bc == 3) { - i_this->mSound.startCreatureSound(Z2SE_OBJ_ARROW_SHOT_FIRE, 0, -1); + if (i_this->arrow_flag) { + if (i_this->weapon_type == 3) { + i_this->sound.startCreatureSound(Z2SE_OBJ_ARROW_SHOT_FIRE, 0, -1); } else { - i_this->mSound.startCreatureSound(Z2SE_OBJ_ARROW_SHOT_NORMAL, 0, -1); + i_this->sound.startCreatureSound(Z2SE_OBJ_ARROW_SHOT_NORMAL, 0, -1); } - i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_SHOT_ARROW, -1); + i_this->sound.startCreatureVoice(Z2SE_EN_RD_V_SHOT_ARROW, -1); - sp98.set(0.0f, 0.0f, 0.0f); - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(24), *calc_mtx); - MtxPosition(&sp98, &spa4); + mae.set(0.0f, 0.0f, 0.0f); + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(24), *calc_mtx); + MtxPosition(&mae, &ato); - csXyz local_148; - int iVar1 = 0; + csXyz angl; + int parameter = 0; - if (i_this->mAction == ACTION_BOW_IKKI) { - sp98 = i_this->field_0x9d4 - spa4; - local_148.y = cM_atan2s(sp98.x, sp98.z); - local_148.x = -cM_atan2s(sp98.y, JMAFastSqrt(sp98.x * sp98.x + sp98.z * sp98.z)); + if (i_this->action == ACTION_BOW_IKKI) { + mae = i_this->eye - ato; + angl.y = cM_atan2s(mae.x, mae.z); + angl.x = -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z)); } else { - fopAc_ac_c* actor = get_pla(a_this); + fopAc_ac_c* actor = get_pla(enemy); if (actor != dComIfGp_getPlayer(0)) { - iVar1 |= 32; + parameter |= 32; } - sp98 = actor->eyePos; + mae = actor->eyePos; if (i_this->field_0x1296 != 0) { f32 mult_fact = TREG_F(7) + 15.0f; - sp98.x += actor->speed.x * mult_fact; - sp98.z += actor->speed.z * mult_fact; + mae.x += actor->speed.x * mult_fact; + mae.z += actor->speed.z * mult_fact; } - sp98 -= spa4; - sp98.y -= 30.0f; - local_148.y = cM_atan2s(sp98.x, sp98.z); + mae -= ato; + mae.y -= 30.0f; + angl.y = cM_atan2s(mae.x, mae.z); - if (i_this->field_0x9bc == 2 && !pl_pass_check(i_this, YREG_F(18))) { + if (i_this->ride_mode == 2 && !pl_pass_check(i_this, YREG_F(18))) { s16 sVar3 = cM_rndF(1000.0f) + 2000.0f; if (cM_rndF(1.0f) < 0.5f) { sVar3 *= -1; } - local_148.y += sVar3; + angl.y += sVar3; } - local_148.x = -cM_atan2s(sp98.y, JMAFastSqrt(sp98.x * sp98.x + sp98.z * sp98.z)); + angl.x = -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z)); // NOT Hyrule Field if (strcmp(dComIfGp_getStartStageName(), "F_SP121") != 0 && i_this->field_0x1296 == 0) { - ANGLE_ADD(local_148.x, cM_rndFX(200.0f) + -500.0f); - ANGLE_ADD(local_148.y, cM_rndFX(100.0f)); + ANGLE_ADD(angl.x, cM_rndFX(200.0f) + -500.0f); + ANGLE_ADD(angl.y, cM_rndFX(100.0f)); } } - local_148.z = 0; - if (i_this->field_0x5bc == 3) { - iVar1 |= 1; - } else if (i_this->field_0x5bc == 4) { - iVar1 |= 2; + angl.z = 0; + if (i_this->weapon_type == 3) { + parameter |= 1; + } else if (i_this->weapon_type == 4) { + parameter |= 2; } - if (i_this->field_0x5b8 == 11) { - iVar1 |= 16; + if (i_this->arg2 == 11) { + parameter |= 16; } - fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(a_this), iVar1, &spa4, fopAcM_GetRoomNo(a_this), &local_148, NULL, -1, NULL); - i_this->field_0x9a3 = 0; - i_this->field_0x9a6 = TREG_S(8) + 15; + fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(enemy), parameter, &ato, fopAcM_GetRoomNo(enemy), &angl, NULL, -1, NULL); + i_this->arrow_flag = 0; + i_this->bow_shake_timer = TREG_S(8) + 15; } } @@ -6893,24 +6894,24 @@ static int daE_RD_Execute(e_rd_class* i_this) { 14, 19, }; static u16 eno[3] = { - 0x828C, - 0x828D, - 0x828E, + dPa_RM(ID_ZM_S_RB_BREAKARMOR00), + dPa_RM(ID_ZM_S_RB_BREAKARMOR01), + dPa_RM(ID_ZM_S_RB_BREAKARMOR02), }; - if (i_this->mBossMode != 0) { + if (i_this->actor_set != 0) { for (int i = 0; i < 14; i++) { - if (i_this->mpBossArmorParts[i] != NULL) { + if (i_this->armor_boss_part[i] != NULL) { if (i_this->field_0x70c[i] == 0) { - if (i_this->mBossMode == 3) { - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(ikki2_boss_part_idx[i]), *calc_mtx); + if (i_this->actor_set == 3) { + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(ikki2_boss_part_idx[i]), *calc_mtx); } else { - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(boss_part_idx[i]), *calc_mtx); + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(boss_part_idx[i]), *calc_mtx); } - i_this->mpBossArmorParts[i]->setBaseTRMtx(*calc_mtx); - sp98.set(0.0f, 0.0f, 0.0f); - MtxPosition(&sp98, &i_this->field_0x71c[i]); + i_this->armor_boss_part[i]->setBaseTRMtx(*calc_mtx); + mae.set(0.0f, 0.0f, 0.0f); + MtxPosition(&mae, &i_this->field_0x71c[i]); } else { i_this->field_0x71c[i] += i_this->field_0x7c4[i]; i_this->field_0x7c4[i].y -= 3.0f; @@ -6920,18 +6921,18 @@ static int daE_RD_Execute(e_rd_class* i_this) { mDoMtx_stack_c::transS(i_this->field_0x71c[i].x, i_this->field_0x71c[i].y, i_this->field_0x71c[i].z); mDoMtx_stack_c::YrotM(i_this->field_0x86c[i].y); mDoMtx_stack_c::XrotM(i_this->field_0x86c[i].x); - f32 my_scale = l_HIO.leader_size_ratio * (l_HIO.model_size * a_this->scale.x); + f32 my_scale = l_HIO.leader_size_ratio * (l_HIO.model_size * enemy->scale.x); mDoMtx_stack_c::scaleM(my_scale, my_scale, my_scale); - i_this->mpBossArmorParts[i]->setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->armor_boss_part[i]->setBaseTRMtx(mDoMtx_stack_c::get()); for (int j = 0; j < 3; j++) { - i_this->field_0x8c0[i][j] = dComIfGp_particle_set(i_this->field_0x8c0[i][j], eno[j], + i_this->armor_break_eff[i][j] = dComIfGp_particle_set(i_this->armor_break_eff[i][j], eno[j], &i_this->field_0x71c[i], NULL, NULL); } - if (i_this->field_0x71c[i].y < a_this->current.pos.y - 200.0f) { - i_this->mpBossArmorParts[i] = NULL; + if (i_this->field_0x71c[i].y < enemy->current.pos.y - 200.0f) { + i_this->armor_boss_part[i] = NULL; } } } @@ -6939,15 +6940,15 @@ static int daE_RD_Execute(e_rd_class* i_this) { if (i_this->field_0x6a0 != 0) { if (i_this->field_0x6a0 == 1) { - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(YREG_S(3) + 15), *calc_mtx); - sp98.set(0.0f, 0.0f, 0.0f); - MtxPosition(&sp98, &i_this->field_0x6a4); + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(YREG_S(3) + 15), *calc_mtx); + mae.set(0.0f, 0.0f, 0.0f); + MtxPosition(&mae, &i_this->field_0x6a4); } else { i_this->field_0x6a4 += i_this->field_0x6b0; i_this->field_0x6b0.y -= 5.0f; MtxTrans(i_this->field_0x6a4.x, i_this->field_0x6a4.y, i_this->field_0x6a4.z, 0); - f32 fVar4 = l_HIO.leader_size_ratio * ( l_HIO.model_size * a_this->scale.x); - MtxScale(fVar4, fVar4, fVar4, 1); + f32 scale = l_HIO.leader_size_ratio * ( l_HIO.model_size * enemy->scale.x); + MtxScale(scale, scale, scale, 1); MtxTrans(BREG_F(5) + 80.0f, BREG_F(6) + 50.0f, BREG_F(7), 1); cMtx_YrotM(*calc_mtx, i_this->field_0x6bc.y); cMtx_XrotM(*calc_mtx, 0x7FFF); @@ -6960,13 +6961,13 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->mpMorfHornAnm->getModel()->setBaseTRMtx(*calc_mtx); } - if (i_this->field_0x6c2 != 0) { - i_this->field_0x6c2 = 0; + if (i_this->run_flag) { + i_this->run_flag = 0; if (i_this->field_0x680 == 0) { - int iVar2 = i_this->mAnmID; - if (iVar2 == e_rdb_class::BCK_RB_RRUN) { - s16 angle_diff = a_this->shape_angle.y - i_this->mPlayerAngleY; - if (angle_diff < 0) { + int anm_no = i_this->anm; + if (anm_no == e_rdb_class::BCK_RB_RRUN) { + s16 run_range = enemy->shape_angle.y - i_this->angleY; + if (run_range < 0) { anm_init(i_this, e_rdb_class::BCK_RB_RPLAY_RUNR, 2.0f, 0, 1.0f); } else { anm_init(i_this, e_rdb_class::BCK_RB_RPLAY_RUNL, 2.0f, 0, 1.0f); @@ -6978,7 +6979,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { horn_anm_init(i_this, e_rdb_class::BCK_HORN_RPLAY_STOP, 2.0f, 0, 1.0f); } - i_this->field_0x680 = iVar2; + i_this->field_0x680 = anm_no; } } @@ -6988,27 +6989,27 @@ static int daE_RD_Execute(e_rd_class* i_this) { } } - if (i_this->mBossMode == 0 && i_this->field_0x9bc == 0) { + if (i_this->actor_set == 0 && i_this->ride_mode == 0) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(11), mDoMtx_stack_c::get()); - mDoMtx_stack_c::multVecZero(&spa4); - sp98 = player->current.pos - spa4; - s16 atan_val = cM_atan2s(sp98.x, sp98.z); + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(11), mDoMtx_stack_c::get()); + mDoMtx_stack_c::multVecZero(&ato); + mae = player->current.pos - ato; + s16 atan_val = cM_atan2s(mae.x, mae.z); cMtx_YrotS(*calc_mtx, atan_val); - sp98.x = 0.0f; - sp98.y = 0.0f; - sp98.z = (BREG_F(12) + 40.0f) - 30.0f; - MtxPosition(&sp98, &spb0); - spb0 += spa4; - i_this->actor.setDownPos(&spb0); + mae.x = 0.0f; + mae.y = 0.0f; + mae.z = (BREG_F(12) + 40.0f) - 30.0f; + MtxPosition(&mae, &ato2); + ato2 += ato; + i_this->enemy.setDownPos(&ato2); } - cXyz spd4(a_this->eyePos); + cXyz spd4(enemy->eyePos); spd4.y += NREG_F(7) + 130.0f; - i_this->actor.setHeadLockPos(&spd4); + i_this->enemy.setHeadLockPos(&spd4); demo_camera(i_this); i_this->field_0x5bb = 1; - a_this->attention_info.flags |= fopAc_AttnFlag_UNK_0x200000; + enemy->attention_info.flags |= fopAc_AttnFlag_UNK_0x200000; return 1; } @@ -7022,29 +7023,29 @@ static int daE_RD_IsDelete(e_rd_class*) { } static int daE_RD_Delete(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; fopAcM_RegisterDeleteID(i_this, "E_RD"); - dComIfG_resDelete(&i_this->mPhase, i_this->mResName); - if (i_this->field_0x125c != 0) { + dComIfG_resDelete(&i_this->phase, i_this->resName); + if (i_this->hio_set != 0) { hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.field_0x4); } - if (a_this->heap != NULL) { - i_this->mpModelMorf->stopZelAnime(); + if (enemy->heap != NULL) { + i_this->anm_p->stopZelAnime(); } return 1; } static void ride_game_actor_set(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - fopAc_ac_c* player = dComIfGp_getPlayer(0); - cXyz sp70, i_pos; - csXyz i_angle; + fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); + cXyz mae, ato; + csXyz angl; - OS_REPORT("E3 2005 ACTOR SET %d\n", i_this->mBossMode); + OS_REPORT("E3 2005 ACTOR SET %d\n", i_this->actor_set); static cXyz set_pos[6] = { cXyz(0.0f, 1500.0f, 2500.0f), cXyz(800.0f, 1500.0f, -4800.0f), @@ -7055,60 +7056,60 @@ static void ride_game_actor_set(e_rd_class* i_this) { }; dBgS_GndChk gnd_chk; - u32 i_parameters; - int iVar1 = 6; - if (i_this->mBossMode >= 2) { - iVar1 = 1; + u32 parameter; + int num = 6; + if (i_this->actor_set >= 2) { + num = 1; } - for (int i = 0; i < iVar1; i++) { - if (i_this->mBossMode == 1) { - cMtx_YrotS(*calc_mtx, player->shape_angle.y); - sp70 = set_pos[i]; + for (int i = 0; i < num; i++) { + if (i_this->actor_set == 1) { + cMtx_YrotS(*calc_mtx, pla->shape_angle.y); + mae = set_pos[i]; if (i > 0 && cDmr_SkipInfo == 0) { - sp70.z -= 4000.0f; - } - - MtxPosition(&sp70, &i_pos); - i_pos += player->current.pos; - gnd_chk.SetPos(&i_pos); - i_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - i_angle = player->shape_angle; - ANGLE_ADD(i_angle.y, 0x4000); - i_parameters = 0x80000005; - } else if (i_this->mBossMode == 2) { - i_pos.set(34789.0f, -290.0f, -36177.0f); - i_angle.set(0, 0, 0); - i_parameters = 0x80000007; - } else if (i_this->mBossMode == 3) { - i_pos.set(-93620.0f, -5750.0f, 49650.0f); - i_angle.set(0, -0x8000, 0); - i_parameters = 0x80000008; - } else if (i_this->mBossMode == 4) { - i_pos = a_this->home.pos; - i_angle = a_this->home.angle; - i_parameters = 0x80000009; + mae.z -= 4000.0f; + } + + MtxPosition(&mae, &ato); + ato += pla->current.pos; + gnd_chk.SetPos(&ato); + ato.y = dComIfG_Bgsp().GroundCross(&gnd_chk); + angl = pla->shape_angle; + ANGLE_ADD(angl.y, 0x4000); + parameter = 0x80000005; + } else if (i_this->actor_set == 2) { + ato.set(34789.0f, -290.0f, -36177.0f); + angl.set(0, 0, 0); + parameter = 0x80000007; + } else if (i_this->actor_set == 3) { + ato.set(-93620.0f, -5750.0f, 49650.0f); + angl.set(0, -0x8000, 0); + parameter = 0x80000008; + } else if (i_this->actor_set == 4) { + ato = a_this->home.pos; + angl = a_this->home.angle; + parameter = 0x80000009; } if (i == 0) { - a_this->home.pos = i_pos; + a_this->home.pos = ato; a_this->current.pos = a_this->home.pos; a_this->old.pos = a_this->home.pos; } else { - i_angle = player->shape_angle; - i_parameters = (i << 8 | 0x80000006); + angl = pla->shape_angle; + parameter = (i << 8 | 0x80000006); } - fopAcM_create(PROC_E_WB, i_parameters, &i_pos, fopAcM_GetRoomNo(a_this), &i_angle, NULL, -1); + fopAcM_create(PROC_E_WB, parameter, &ato, fopAcM_GetRoomNo(a_this), &angl, NULL, -1); } } static void coach_game_actor_set(e_rd_class* i_this) { - fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - fopAc_ac_c* player = dComIfGp_getPlayer(0); + fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; + fopAc_ac_c* pla = dComIfGp_getPlayer(0); cXyz ununsed_vec_0, ununsed_vec_1; - csXyz i_angle; + csXyz angl; OS_REPORT("COATH GAME ACTOR SET \n"); @@ -7119,11 +7120,11 @@ static void coach_game_actor_set(e_rd_class* i_this) { }; dBgS_GndChk gnd_chk; - i_angle.set(0, 0, 0); - i_angle.y = player->shape_angle.y; + angl.set(0, 0, 0); + angl.y = pla->shape_angle.y; for (int i = 0; i < NREG_S(7) + 3; i++) { - fopAcM_create(PROC_E_WB, (i + 1) * 0x100 | 0x8000000a, &set_pos[i], fopAcM_GetRoomNo(a_this), &i_angle, NULL, -1); + fopAcM_create(PROC_E_WB, (i + 1) * 0x100 | 0x8000000a, &set_pos[i], fopAcM_GetRoomNo(enemy), &angl, NULL, -1); } } @@ -7134,22 +7135,22 @@ static int useHeapInit(fopAc_ac_c* a_this) { J3DModelData* modelData; J3DModel* model; - if (i_this->mBossMode != 0) { - i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BMDR_RB), NULL, NULL, + if (i_this->actor_set != 0) { + i_this->anm_p = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BMDR_RB), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BCK_RB_RWAIT), 2, 1.0f, - 0, -1, &i_this->mSound, 0x80000, 0x11000084); - if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) { + 0, -1, &i_this->sound, 0x80000, 0x11000084); + if (i_this->anm_p == NULL || i_this->anm_p->getModel() == NULL) { return 0; } - model = i_this->mpModelMorf->getModel(); + model = i_this->anm_p->getModel(); model->setUserArea((uintptr_t)i_this); for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) { model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_B); } - if (i_this->mBossMode == 1) { + if (i_this->actor_set == 1) { i_this->mpMorfHornAnm = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BMDR_RB_HORN), NULL, NULL, NULL, 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); if (i_this->mpMorfHornAnm == NULL || i_this->mpMorfHornAnm->getModel() == NULL) { @@ -7173,22 +7174,22 @@ static int useHeapInit(fopAc_ac_c* a_this) { }; for (int i = 0; i < 14; i++) { - if (i_this->mBossMode == 3) { + if (i_this->actor_set == 3) { if (i < 2) { modelData = (J3DModelData*)dComIfG_getObjectRes("E_rdb", ikki2_boss_part_bmd[i]); JUT_ASSERT(10672, modelData != NULL); - i_this->mpBossArmorParts[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); - if (i_this->mpBossArmorParts[i] == NULL) { + i_this->armor_boss_part[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (i_this->armor_boss_part[i] == NULL) { return 0; } } else { i_this->field_0x70c[i] = 1; } - } else if (i_this->mBossMode == 1 || i == 13) { + } else if (i_this->actor_set == 1 || i == 13) { modelData = (J3DModelData*)dComIfG_getObjectRes("E_rdb", boss_part_bmd[i]); JUT_ASSERT(10687, modelData != NULL); - i_this->mpBossArmorParts[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); - if (i_this->mpBossArmorParts[i] == NULL) { + i_this->armor_boss_part[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (i_this->armor_boss_part[i] == NULL) { return 0; } } else { @@ -7196,116 +7197,116 @@ static int useHeapInit(fopAc_ac_c* a_this) { } } } else { - i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD), NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, BCK_RD_WAIT01), 0, 1.0f, - 0, -1, &i_this->mSound, 0x80000, 0x11000084); - if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) { + i_this->anm_p = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->resName, BMDR_RD), NULL, NULL, + (J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, BCK_RD_WAIT01), 0, 1.0f, + 0, -1, &i_this->sound, 0x80000, 0x11000084); + if (i_this->anm_p == NULL || i_this->anm_p->getModel() == NULL) { return 0; } - J3DModel* model_2 = i_this->mpModelMorf->getModel(); - model_2->setUserArea((uintptr_t)i_this); + J3DModel* model2 = i_this->anm_p->getModel(); + model2->setUserArea((uintptr_t)i_this); mDoMtx_stack_c::scaleS(0.0f, 0.0f, 0.0f); - model_2->setBaseTRMtx(mDoMtx_stack_c::get()); + model2->setBaseTRMtx(mDoMtx_stack_c::get()); - for (u16 i = 0; i < model_2->getModelData()->getJointNum(); i++) { - model_2->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); + for (u16 i = 0; i < model2->getModelData()->getJointNum(); i++) { + model2->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); } - if (i_this->field_0x5bc == 1) { + if (i_this->weapon_type == 1) { if (boss != NULL) { - modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD_CLUBB); + modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->resName, BMDR_RD_CLUBB); } else { - modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD_CLUB); + modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->resName, BMDR_RD_CLUB); } JUT_ASSERT(10762, modelData != NULL); - i_this->field_0x694 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); - if (i_this->field_0x694 == NULL) { + i_this->arrow = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (i_this->arrow == NULL) { return 0; } - i_this->field_0x694->setBaseTRMtx(mDoMtx_stack_c::get()); - } else if (i_this->field_0x5bc >= 2) { - i_this->mpMorfBowAnm = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD_BOW), NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, BCK_RD_BOW_SHOOT), 0, 1.0f, + i_this->arrow->setBaseTRMtx(mDoMtx_stack_c::get()); + } else if (i_this->weapon_type >= 2) { + i_this->bow_anm = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->resName, BMDR_RD_BOW), NULL, NULL, + (J3DAnmTransform*)dComIfG_getObjectRes(i_this->resName, BCK_RD_BOW_SHOOT), 0, 1.0f, 0, -1, NULL, 0x80000, 0x11000084); - if (i_this->mpMorfBowAnm == NULL || i_this->mpMorfBowAnm->getModel() == NULL) { + if (i_this->bow_anm == NULL || i_this->bow_anm->getModel() == NULL) { return 0; } - model_2 = i_this->mpMorfBowAnm->getModel(); - model_2->setUserArea((uintptr_t)i_this); - model_2->setBaseTRMtx(mDoMtx_stack_c::get()); + model2 = i_this->bow_anm->getModel(); + model2->setUserArea((uintptr_t)i_this); + model2->setBaseTRMtx(mDoMtx_stack_c::get()); - for (u16 i = 0; i < model_2->getModelData()->getJointNum(); i++) { + for (u16 i = 0; i < model2->getModelData()->getJointNum(); i++) { if (i == 2 || i == 3) { - model_2->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_bow); + model2->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_bow); } } - if (i_this->field_0x5bc == 4) { - modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD_BARROW); + if (i_this->weapon_type == 4) { + modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->resName, BMDR_RD_BARROW); } else { - modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD_ARROW); + modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->resName, BMDR_RD_ARROW); } JUT_ASSERT(10810, modelData != NULL); - i_this->field_0x694 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); - if (i_this->field_0x694 == NULL) { + i_this->arrow = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (i_this->arrow == NULL) { return 0; } - i_this->field_0x694->setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->arrow->setBaseTRMtx(mDoMtx_stack_c::get()); } - modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD_EYE); + modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->resName, BMDR_RD_EYE); JUT_ASSERT(10823, modelData != NULL); for (u16 i = 0; i < 2; i++) { - i_this->mpEyeModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); - if (i_this->mpEyeModels[i] == NULL) { + i_this->eye_model[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (i_this->eye_model[i] == NULL) { return 0; } - i_this->mpEyeModels[i]->setBaseTRMtx(mDoMtx_stack_c::get()); + i_this->eye_model[i]->setBaseTRMtx(mDoMtx_stack_c::get()); } } return 1; } -static cPhs_Step daE_RD_Create(fopAc_ac_c* a_this) { - e_rd_class* i_this = (e_rd_class*)a_this; +static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { + e_rd_class* i_this = (e_rd_class*)actor; - fopAcM_ct(&i_this->actor, e_rd_class); + fopAcM_ct(&i_this->enemy, e_rd_class); - i_this->field_0x5b6 = fopAcM_GetParam(a_this); - i_this->field_0x5b7 = i_this->field_0x5b6; - i_this->field_0x5b8 = (fopAcM_GetParam(a_this) & 0xF000) >> 12; - if (i_this->field_0x5b8 == 15) { - i_this->field_0x5b8 = 0; + i_this->arg0 = fopAcM_GetParam(actor); + i_this->arg1 = i_this->arg0; + i_this->arg2 = (fopAcM_GetParam(actor) & 0xF000) >> 12; + if (i_this->arg2 == 15) { + i_this->arg2 = 0; } - if (((i_this->field_0x5b6 == 4 || i_this->field_0x5b6 == 5) || i_this->field_0x5b6 == 11) || i_this->field_0x5b6 == 12) { - if (i_this->field_0x5b6 == 4) { - i_this->mBossMode = 1; - } else if (i_this->field_0x5b6 == 5) { - i_this->mBossMode = 2; - } else if (i_this->field_0x5b6 == 11) { - i_this->mBossMode = 3; - } else if (i_this->field_0x5b6 == 12) { - i_this->mBossMode = 4; + if (((i_this->arg0 == 4 || i_this->arg0 == 5) || i_this->arg0 == 11) || i_this->arg0 == 12) { + if (i_this->arg0 == 4) { + i_this->actor_set = 1; + } else if (i_this->arg0 == 5) { + i_this->actor_set = 2; + } else if (i_this->arg0 == 11) { + i_this->actor_set = 3; + } else if (i_this->arg0 == 12) { + i_this->actor_set = 4; } - i_this->mResName = "E_rdb"; + i_this->resName = "E_rdb"; } else { - i_this->mResName = "E_RD"; + i_this->resName = "E_RD"; } - cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, i_this->mResName); - if (phase == cPhs_COMPLEATE_e) { + cPhs_Step phase_state = dComIfG_resLoad(&i_this->phase, i_this->resName); + if (phase_state == cPhs_COMPLEATE_e) { if (strcmp(dComIfGp_getStartStageName(), "F_SP124") == 0) { // Gerudo Desert desert_substage = 124; @@ -7318,184 +7319,184 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* a_this) { } } - int swBit = (fopAcM_GetParam(a_this) & 0xFF000000) >> 24; + int swBit = (fopAcM_GetParam(actor) & 0xFF000000) >> 24; if (swBit != 0xFF) { - if (dComIfGs_isSwitch(swBit, fopAcM_GetRoomNo(a_this))) { + if (dComIfGs_isSwitch(swBit, fopAcM_GetRoomNo(actor))) { return cPhs_ERROR_e; } } - if (i_this->field_0x5b6 == 10) { + if (i_this->arg0 == 10) { coach_game_actor_set(i_this); return cPhs_ERROR_e; } - if (i_this->mBossMode != 0) { + if (i_this->actor_set != 0) { boss = i_this; - i_this->field_0x5b6 = 1; + i_this->arg0 = 1; } - i_this->field_0x5bc = (fopAcM_GetParam(a_this) & 0xF00) >> 8; - if (i_this->field_0x5bc == 15) { - i_this->field_0x5bc = 0; + i_this->weapon_type = (fopAcM_GetParam(actor) & 0xF00) >> 8; + if (i_this->weapon_type == 15) { + i_this->weapon_type = 0; } - if (i_this->field_0x5bc >= 4) { + if (i_this->weapon_type >= 4) { return cPhs_ERROR_e; } - i_this->field_0x5ba = (fopAcM_GetParam(a_this) & 0xFF0000) >> 16; + i_this->field_0x5ba = (fopAcM_GetParam(actor) & 0xFF0000) >> 16; if (i_this->field_0x5ba == 0xFF) { i_this->field_0x5ba = 0; } if (i_this->field_0x5ba == 2) { - fopAcM_setStageLayer(a_this); + fopAcM_setStageLayer(actor); } - i_this->field_0x5b9 = (fopAcM_GetParam(a_this) & 0xFF000000) >> 24; - if (i_this->field_0x5b8 == 3 || i_this->field_0x5b8 == 4 || i_this->field_0x5b8 == 5 || i_this->field_0x5b8 == 6 || i_this->field_0x5b8 == 7) { - if (i_this->field_0x5b8 != 5) { - i_this->field_0x1295 = 1; + i_this->field_0x5b9 = (fopAcM_GetParam(actor) & 0xFF000000) >> 24; + if (i_this->arg2 == 3 || i_this->arg2 == 4 || i_this->arg2 == 5 || i_this->arg2 == 6 || i_this->arg2 == 7) { + if (i_this->arg2 != 5) { + i_this->one_hit_kill = 1; } - if (i_this->field_0x5b8 == 4) { + if (i_this->arg2 == 4) { i_this->field_0x1296 = 1; } - if (i_this->field_0x5b8 == 6) { + if (i_this->arg2 == 6) { i_this->field_0x1299 = 1; - i_this->mAction = ACTION_COMMANDER; - i_this->mMode = 0; - i_this->field_0x990[2] = 20; + i_this->action = ACTION_COMMANDER; + i_this->mode = 0; + i_this->timer[2] = 20; i_this->field_0x1296 = 1; - } else if (i_this->field_0x5b8 == 7) { - i_this->mAction = ACTION_BOW3; + } else if (i_this->arg2 == 7) { + i_this->action = ACTION_BOW3; i_this->field_0x1296 = 1; - i_this->field_0x998 = 20; + i_this->damage_timer = 20; } else { - i_this->mAction = ACTION_BOW2; + i_this->action = ACTION_BOW2; } - fopAcM_setCullSizeFar(a_this, 30000.0f); - i_this->field_0x5b8 = 3; - } else if (i_this->field_0x5b8 == 10) { - i_this->mAction = ACTION_BOW_IKKI; - i_this->field_0x990[0] = 142 + XREG_S(2); - } else if (i_this->field_0x5b8 == 11) { - fopAcM_create(PROC_E_RDY, fopAcM_GetParam(a_this), &a_this->home.pos, - fopAcM_GetRoomNo(a_this), &a_this->home.angle, NULL, -1); + fopAcM_setCullSizeFar(actor, 30000.0f); + i_this->arg2 = 3; + } else if (i_this->arg2 == 10) { + i_this->action = ACTION_BOW_IKKI; + i_this->timer[0] = 142 + XREG_S(2); + } else if (i_this->arg2 == 11) { + fopAcM_create(PROC_E_RDY, fopAcM_GetParam(actor), &actor->home.pos, + fopAcM_GetRoomNo(actor), &actor->home.angle, NULL, -1); } - if ((a_this->home.angle.z & 0xFF) == 0 || (a_this->home.angle.z & 0xFF) == 0xFF) { - i_this->field_0x980 = 100000.0f; + if ((actor->home.angle.z & 0xFF) == 0 || (actor->home.angle.z & 0xFF) == 0xFF) { + i_this->attack_range = 100000.0f; } else { - i_this->field_0x980 = (a_this->home.angle.z & 0xFF) * 100.0f; + i_this->attack_range = (actor->home.angle.z & 0xFF) * 100.0f; } - i_this->field_0x12a0 = a_this->home.angle.z >> 8 & 0xFF; + i_this->sw = actor->home.angle.z >> 8 & 0xFF; - if (i_this->field_0x12a0 == 0xFF) { - i_this->field_0x12a0 = 0; + if (i_this->sw == 0xFF) { + i_this->sw = 0; } - fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_0x100); - a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e; + fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x100); + actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e; - if (i_this->field_0x5b6 == 6) { - i_this->mAction = ACTION_YAGURA; - i_this->field_0x99c = 30; + if (i_this->arg0 == 6) { + i_this->action = ACTION_YAGURA; + i_this->yagura_timer = 30; S_find = 0; lbl_70_bss_AE = false; - if (fopAcM_GetRoomNo(a_this) == 0) { - fopAcM_setCullSizeFar(a_this, 30000.0f); + if (fopAcM_GetRoomNo(actor) == 0) { + fopAcM_setCullSizeFar(actor, 30000.0f); } - } else if (i_this->field_0x5b6 == 7) { - i_this->mAction = ACTION_NORMAL; - u8 path_idx = a_this->home.angle.x & 0xFF; - if ((u32)(path_idx) != 0xFF) { - i_this->mPath = dPath_GetRoomPath(path_idx, fopAcM_GetRoomNo(a_this)); - OS_REPORT("//////////////E_RD PPD %x!!\n", i_this->mPath); - if (i_this->mPath == NULL) { + } else if (i_this->arg0 == 7) { + i_this->action = ACTION_NORMAL; + u8 path_no = actor->home.angle.x & 0xFF; + if ((u32)(path_no) != 0xFF) { + i_this->path = dPath_GetRoomPath(path_no, fopAcM_GetRoomNo(actor)); + OS_REPORT("//////////////E_RD PPD %x!!\n", i_this->path); + if (i_this->path == NULL) { OS_REPORT("......RD NONONONONONO PATH !!!!\n"); return cPhs_ERROR_e; } - dPnt* pnt_p = i_this->mPath->m_points; + dPnt* pnt_p = i_this->path->m_points; OS_REPORT("//////////////E_RD P0.y %f\n", pnt_p->m_position.y); } - } else if (i_this->field_0x5b6 == 8) { - i_this->mAction = ACTION_SLEEP; - if (fopAcM_GetRoomNo(a_this) == 0) { - fopAcM_setCullSizeFar(a_this, 30000.0f); + } else if (i_this->arg0 == 8) { + i_this->action = ACTION_SLEEP; + if (fopAcM_GetRoomNo(actor) == 0) { + fopAcM_setCullSizeFar(actor, 30000.0f); } - } else if (i_this->field_0x5b6 == 9) { - i_this->mAction = ACTION_TAG; - fopAcM_OffStatus(a_this, 0); - a_this->attention_info.flags = 0; - } else if (i_this->field_0x5b6 == 35) { - i_this->mAction = ACTION_FIGHT_RUN; - i_this->mMode = 0; - i_this->field_0x99c = 200; + } else if (i_this->arg0 == 9) { + i_this->action = ACTION_TAG; + fopAcM_OffStatus(actor, 0); + actor->attention_info.flags = 0; + } else if (i_this->arg0 == 35) { + i_this->action = ACTION_FIGHT_RUN; + i_this->mode = 0; + i_this->yagura_timer = 200; } - if (i_this->field_0x5bc == 1 && i_this->field_0x5b6 == 0) { - i_this->mAction = ACTION_STAND; - i_this->mMode = 0; + if (i_this->weapon_type == 1 && i_this->arg0 == 0) { + i_this->action = ACTION_STAND; + i_this->mode = 0; } - if (i_this->field_0x5b6 == 13 || i_this->field_0x5b6 == 14) { - i_this->mAction = ACTION_REG; - i_this->mMode = 0; + if (i_this->arg0 == 13 || i_this->arg0 == 14) { + i_this->action = ACTION_REG; + i_this->mode = 0; i_this->field_0xafb = 1; - fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x100); } - if (i_this->field_0x5b6 > 2) { - i_this->field_0x5b6 = 0; + if (i_this->arg0 > 2) { + i_this->arg0 = 0; } - a_this->home.angle.z = a_this->current.angle.z = a_this->shape_angle.z - = a_this->home.angle.x = a_this->current.angle.x = a_this->shape_angle.x = 0; + actor->home.angle.z = actor->current.angle.z = actor->shape_angle.z + = actor->home.angle.x = actor->current.angle.x = actor->shape_angle.x = 0; - u32 i_size; - if (i_this->mBossMode == 1) { - i_size = 0xAD60; - } else if (i_this->mBossMode == 2) { - i_size = 0x3C00; - } else if (i_this->mBossMode == 3) { - i_size = 0x4400; + u32 size; + if (i_this->actor_set == 1) { + size = 0xAD60; + } else if (i_this->actor_set == 2) { + size = 0x3C00; + } else if (i_this->actor_set == 3) { + size = 0x4400; } else { - i_size = 0x4FF0; + size = 0x4FF0; } - if (!fopAcM_entrySolidHeap(a_this, useHeapInit, i_size)) { + if (!fopAcM_entrySolidHeap(actor, useHeapInit, size)) { OS_REPORT("//////////////E_RD SET NON !!\n"); return cPhs_ERROR_e; } - if (i_this->mBossMode != 0) { + if (i_this->actor_set != 0) { ride_game_actor_set(i_this); } if (hio_set == 0) { - i_this->field_0x125c = 1; + i_this->hio_set = 1; hio_set = 1; // "rider" l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("ライダー", &l_HIO); } - fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx()); - fopAcM_SetMin(a_this, -200.0f, -200.0f, -200.0f); - fopAcM_SetMax(a_this, 200.0f, 200.0f, 200.0f); - i_this->mObjAcch.Set(fopAcM_GetPosition_p(a_this), fopAcM_GetOldPosition_p(a_this), a_this, 1, - &i_this->mAcchCir, fopAcM_GetSpeed_p(a_this), NULL, NULL); - i_this->mAcchCir.SetWall(50.0f, 50.0f); + fopAcM_SetMtx(actor, i_this->anm_p->getModel()->getBaseTRMtx()); + fopAcM_SetMin(actor, -200.0f, -200.0f, -200.0f); + fopAcM_SetMax(actor, 200.0f, 200.0f, 200.0f); + i_this->ObjAcch.Set(fopAcM_GetPosition_p(actor), fopAcM_GetOldPosition_p(actor), actor, 1, + &i_this->AcchCir, fopAcM_GetSpeed_p(actor), NULL, NULL); + i_this->AcchCir.SetWall(50.0f, 50.0f); - a_this->field_0x560 = a_this->health = 40; + actor->field_0x560 = actor->health = 40; - i_this->mStts.Init(150, 0, a_this); + i_this->mStts.Init(150, 0, actor); static dCcD_SrcSph cc_sph_src = { { @@ -7509,11 +7510,11 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* a_this) { } // mSphAttr }; for (int i = 0; i <= 2; i++) { - i_this->field_0xd58[i].Set(cc_sph_src); - i_this->field_0xd58[i].SetStts(&i_this->mStts); + i_this->cc_sph[i].Set(cc_sph_src); + i_this->cc_sph[i].SetStts(&i_this->mStts); - if (i_this->mBossMode != 0) { - i_this->field_0xd58[i].SetTgType(0xD8FAFD3F); + if (i_this->actor_set != 0) { + i_this->cc_sph[i].SetTgType(0xD8FAFD3F); } } @@ -7528,25 +7529,25 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* a_this) { {{0.0f, 0.0f, 0.0f}, 35.0f} // mSph } // mSphAttr }; - i_this->field_0x1100.Set(at_sph_src); - i_this->field_0x1100.SetStts(&i_this->mStts); + i_this->at_sph.Set(at_sph_src); + i_this->at_sph.SetStts(&i_this->mStts); - i_this->field_0x970 = instanceCount | (u16(cM_rndF(65535.0f)) & 0xFF00); + i_this->counter = instanceCount | (u16(cM_rndF(65535.0f)) & 0xFF00); instanceCount++; - i_this->mSound.init(&a_this->current.pos, &a_this->eyePos, 3, 1); + i_this->sound.init(&actor->current.pos, &actor->eyePos, 3, 1); - if (i_this->mBossMode != 0) { - i_this->mSound.setEnemyName("E_rdb"); + if (i_this->actor_set != 0) { + i_this->sound.setEnemyName("E_rdb"); } else { - i_this->mSound.setEnemyName("E_rd"); + i_this->sound.setEnemyName("E_rd"); } - i_this->mAtInfo.mPowerType = 2; - i_this->mAtInfo.mpSound = &i_this->mSound; + i_this->AtInfo.mPowerType = 2; + i_this->AtInfo.mpSound = &i_this->sound; if (boss != NULL) { - fopAcM_setCullSizeFar(a_this, 30000.0f); + fopAcM_setCullSizeFar(actor, 30000.0f); } i_this->field_0x9a0 = 5; @@ -7556,15 +7557,15 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* a_this) { i_this->field_0x1298 = l_HIO.eye_polygon; if (desert_substage != 0 || strcmp(dComIfGp_getStartStageName(), "F_SP115") == 0 || - (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0 && fopAcM_GetRoomNo(a_this) == 0)) { + (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0 && fopAcM_GetRoomNo(actor) == 0)) { // Lake Hylia or Hyrule Field - fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x4000); } - } else if (i_this->mBossMode != 4) { - fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x4000); + } else if (i_this->actor_set != 4) { + fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x4000); } - if (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0 && fopAcM_GetRoomNo(a_this) == 0) { + if (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0 && fopAcM_GetRoomNo(actor) == 0) { // Hyrule Field - Bridge of Eldin data_80519201 = 1; } else { @@ -7575,13 +7576,13 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* a_this) { daE_RD_Execute(i_this); c_start = 0; - if (i_this->mAction == ACTION_TAG) { + if (i_this->action == ACTION_TAG) { i_this->field_0xafb = 1; - i_this->mSound.setEnemyName(NULL); + i_this->sound.setEnemyName(NULL); } } - return phase; + return phase_state; } e_rd_class::e_rd_class() {} diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index f1d8fb180b3..6f603444799 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -1297,8 +1297,8 @@ static void demo_camera(e_rdb_class* i_this) { if (i_this->field_0x10aa >= 40) { e_rd_class* bulblin_p = (e_rd_class*)fopAcM_SearchByName(PROC_E_RD); if (bulblin_p != NULL) { - a_this->current.pos = bulblin_p->actor.current.pos; - a_this->eyePos = bulblin_p->actor.eyePos; + a_this->current.pos = bulblin_p->enemy.current.pos; + a_this->eyePos = bulblin_p->enemy.eyePos; } } diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index e1a404ed1d5..587f091acf6 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -398,9 +398,9 @@ static int daE_WB_Draw(e_wb_class* i_this) { e_rd_class* pfVar4 = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); if ((i_this->mStatusFlags & 1) != 0) { - if (pfVar4 && pfVar4->field_0x9bc == 2) { + if (pfVar4 && pfVar4->ride_mode == 2) { if (i_this->field_0x7a2 == 0) { - model = pfVar4->mpModelMorf->getModel(); + model = pfVar4->anm_p->getModel(); cVar7 = 1; } } else { @@ -439,7 +439,7 @@ static int daE_WB_Draw(e_wb_class* i_this) { i_this->field_0x1438[0] = local_48; i_this->field_0x1438[1] = local_60; } else { - if (pfVar4->mBossMode != 0) { + if (pfVar4->actor_set != 0) { sp8 = 0xf; spc = 0x14; } else { @@ -1178,7 +1178,7 @@ static void e_wb_f_run(e_wb_class* i_this) { local_a4 = 0x200; } - if (local_90 != NULL && local_90->mAnmID == 0x27) { + if (local_90 != NULL && local_90->anm == 0x27) { i_this->field_0x6d6 = (5000.0f + BREG_F(16)) * cM_ssin(i_this->field_0x68e * (1000 + BREG_S(7))); local_a4 = 0x400; @@ -2075,7 +2075,7 @@ static void e_wb_b_ikki2(e_wb_class* i_this) { if (local_a4 != -1 ) { int* p = dComIfGp_evmng_getMyIntegerP(local_a4, "action"); if (p) { - rider->mMode = 2; + rider->mode = 2; i_this->mActionMode = -98; } } @@ -2808,7 +2808,7 @@ static void damage_check(e_wb_class* i_this) { i_this->mZ2Ride.startCreatureSound(Z2SE_EN_BB_RUNDOWN, 0, -1); e_rd_class* rider = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); - rider->field_0x998 = 20; + rider->damage_timer = 20; } else { if (i_this->field_0x79d == 0 || i_this->mSpeedCapTimer == 0) { fopAc_ac_c* hit_actor = @@ -3103,7 +3103,7 @@ static void* s_rddel_sub(void* param_0, void* param_1) { UNUSED(param_1); if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_E_RD) { e_rd_class* rd = (e_rd_class*)param_0; - if (rd->mBossMode == 0) { + if (rd->actor_set == 0) { fopAcM_delete((fopAc_ac_c*)param_0); } } @@ -3115,8 +3115,8 @@ static int rd_count; static void* s_rdcount_sub(void* i_actor, void* i_data) { UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { - if (((e_rd_class*)i_actor)->mBossMode == 0 && - (((e_rd_class*)i_actor)->field_0x5b7 == 1 || ((e_rd_class*)i_actor)->field_0x5b7 == 2)) + if (((e_rd_class*)i_actor)->actor_set == 0 && + (((e_rd_class*)i_actor)->arg1 == 1 || ((e_rd_class*)i_actor)->arg1 == 2)) { rd_count++; } @@ -3128,7 +3128,7 @@ static void* s_rddel2_sub(void* i_actor, void* i_data) { UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { e_rd_class* rd = ((e_rd_class*)i_actor); - fopAc_ac_c* r28 = fopAcM_SearchByID(rd->mWbActorID); + fopAc_ac_c* r28 = fopAcM_SearchByID(rd->boar_id); if (r28 == i_data) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -3341,7 +3341,7 @@ static s8 e_wb_c_run(e_wb_class* i_this) { turn_speed = 0x200; i_this->mTargetFacingAngle = cM_atan2s(sp94.x, sp94.z); - if (rider && rider->mAnmID == 0x27) { + if (rider && rider->anm == 0x27) { ANGLE_ADD(i_this->mTargetFacingAngle, (BREG_F(16) + 5000.0f) * cM_ssin(i_this->field_0x68e * (BREG_S(7) + 1000))); turn_speed = 0x400; @@ -3681,8 +3681,8 @@ static void* s_rdArrowWait_sub(void* i_actor, void* i_data) { UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { e_rd_class* a_this = static_cast(i_actor); - if (a_this->field_0x5bc == 2 || a_this->field_0x5bc == 3) { - a_this->field_0x990[1] = cM_rndF(20.0) + 3.0f; + if (a_this->weapon_type == 2 || a_this->weapon_type == 3) { + a_this->timer[1] = cM_rndF(20.0) + 3.0f; } } @@ -3869,16 +3869,16 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16a0 = 0; i_this->field_0x1714 = 55.0f + KREG_F(7); i_this->field_0x16a0 = 0; - s16 sp16 = local_194->actor.shape_angle.y + - (local_194->field_0xa0c.y - local_194->actor.shape_angle.y) / 2; + s16 sp16 = local_194->enemy.shape_angle.y + + (local_194->jump_angle.y - local_194->enemy.shape_angle.y) / 2; mDoMtx_stack_c::YrotS(sp16); local_3c.x = NREG_F(0); local_3c.y = NREG_F(1) + 500.0f; local_3c.z = NREG_F(2) - 500.0f; mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); - i_this->field_0x16a4 += local_194->actor.current.pos; + i_this->field_0x16a4 += local_194->enemy.current.pos; i_this->field_0x1710 = 10.0f; - i_this->field_0x16bc = local_194->actor.current.pos; + i_this->field_0x16bc = local_194->enemy.current.pos; i_this->field_0x16bc.y += 200.0f + KREG_F(11); daPy_getPlayerActorClass()->changeOriginalDemo(); horse->changeOriginalDemo(); @@ -3886,13 +3886,13 @@ static void demo_camera(e_wb_class* i_this) { // fallthrough case 0xb: { cLib_addCalc2(&i_this->field_0x1710, 1000.0f, 1.0f, 100.0f + KREG_F(10)); - cLib_addCalc2(&i_this->field_0x16bc.x, local_194->actor.current.pos.x, 0.5f + KREG_F(8), + cLib_addCalc2(&i_this->field_0x16bc.x, local_194->enemy.current.pos.x, 0.5f + KREG_F(8), i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16bc.y, local_194->actor.current.pos.y + 200.0f + KREG_F(11), + cLib_addCalc2(&i_this->field_0x16bc.y, local_194->enemy.current.pos.y + 200.0f + KREG_F(11), 0.5f + KREG_F(8), i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16bc.z, local_194->actor.current.pos.z, 0.5f + KREG_F(8), + cLib_addCalc2(&i_this->field_0x16bc.z, local_194->enemy.current.pos.z, 0.5f + KREG_F(8), i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16a4.x, local_194->actor.current.pos.x, 0.05f, + cLib_addCalc2(&i_this->field_0x16a4.x, local_194->enemy.current.pos.x, 0.05f, 12.0f + NREG_F(3)); if (i_this->field_0x16a0 == 0x28) { if (a_this->shape_angle.y < 0x4000 && -0x4000 < a_this->shape_angle.y) { @@ -4169,7 +4169,7 @@ static void demo_camera(e_wb_class* i_this) { MtxPosition(&i_this->field_0x16c8, &i_this->field_0x16bc); i_this->field_0x16bc += a_this->current.pos; if (i_this->field_0x16a0 == 130) { - local_194->mMode++; + local_194->mode++; player->changeDemoParam2(0); } if (i_this->field_0x16a0 == 220) { @@ -4200,7 +4200,7 @@ static void demo_camera(e_wb_class* i_this) { MtxPosition(&i_this->field_0x16c8, &i_this->field_0x16bc); i_this->field_0x16bc += a_this->current.pos; if (i_this->field_0x16a0 == 20) { - local_194->mMode++; + local_194->mode++; } if (i_this->field_0x16a0 != (s16)(92 + KREG_S(8))) { break; @@ -4257,7 +4257,7 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16bc.set(-8416.0f, 345.0f, 6.0f); i_this->field_0x16a4.set(-8994.0f, 326.0f, 400.0f); i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); - local_194->field_0x990[3] = 700; + local_194->timer[3] = 700; } } break; case 0x26: { @@ -4809,25 +4809,25 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16a4.x += 100.0f + VREG_F(8); i_this->field_0x16a4.y += 600.0f + VREG_F(9); i_this->field_0x16a4.z += -500.0f + VREG_F(10); - i_this->field_0x16bc = local_194->actor.current.pos; - i_this->field_0x16bc.y = local_194->actor.current.pos.y + 100.0f + KREG_F(11); + i_this->field_0x16bc = local_194->enemy.current.pos; + i_this->field_0x16bc.y = local_194->enemy.current.pos.y + 100.0f + KREG_F(11); } // fallthrough case 0x5d: { if (local_194 != NULL) { cLib_addCalc2(&i_this->field_0x1710, 1000.0f, 1.0f, 100.0f + KREG_F(10)); - cLib_addCalc2(&i_this->field_0x16bc.x, local_194->actor.current.pos.x, 0.5f + KREG_F(8), + cLib_addCalc2(&i_this->field_0x16bc.x, local_194->enemy.current.pos.x, 0.5f + KREG_F(8), i_this->field_0x1710); cLib_addCalc2(&i_this->field_0x16bc.y, - local_194->actor.current.pos.y + 100.0f + KREG_F(11), 0.5f + KREG_F(8), + local_194->enemy.current.pos.y + 100.0f + KREG_F(11), 0.5f + KREG_F(8), i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16bc.z, local_194->actor.current.pos.z, 0.5f + KREG_F(8), + cLib_addCalc2(&i_this->field_0x16bc.z, local_194->enemy.current.pos.z, 0.5f + KREG_F(8), i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16a4.x, local_194->actor.current.pos.x - 10.0f, 0.05f, + cLib_addCalc2(&i_this->field_0x16a4.x, local_194->enemy.current.pos.x - 10.0f, 0.05f, 12.0f + NREG_F(3)); if (i_this->field_0x16a0 >= 40) { if (i_this->field_0x16a0 == 40) { - i_this->field_0x5c4 = local_194->actor.current.pos; + i_this->field_0x5c4 = local_194->enemy.current.pos; } for (int i = 0; i < 2; i++) { @@ -4857,7 +4857,7 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x5c4 = i_this->field_0x16bc; i_this->field_0x1430 = 1; a_this->current.angle.y = player->shape_angle.y; - fopAcM_delete(&local_194->actor); + fopAcM_delete(&local_194->enemy); } } } break; diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp index 904dd8a9e55..c0bcfdaeda4 100644 --- a/src/d/actor/d_a_obj_key.cpp +++ b/src/d/actor/d_a_obj_key.cpp @@ -287,12 +287,12 @@ static void chain_control_01(obj_key_class* i_this) { MtxPosition(&spC4, &spB8); } else if (fopAcM_GetName(pparent) == PROC_E_RD) { e_rd_class* rd = (e_rd_class*)pparent; - parent_model = rd->mpModelMorf->getModel(); + parent_model = rd->anm_p->getModel(); MTXCopy(parent_model->getAnmMtx(VREG_S(0) + 12), *calc_mtx); spC4.set(12.0f + VREG_F(0), -5.0f + VREG_F(1), VREG_F(2)); MtxPosition(&spC4, &spB8); - rd->actor.field_0x567 = 1; + rd->enemy.field_0x567 = 1; } else if (fopAcM_GetName(pparent) == PROC_E_RDB) { e_rdb_class* rdb = (e_rdb_class*)pparent; parent_model = rdb->mpModelMorf->getModel(); From b5d3b8c059c10711370437f7db7539cd90f1cb29 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sat, 28 Feb 2026 14:35:07 -0700 Subject: [PATCH 10/35] Another round of GCC fixes (#3115) * Fix remaining -> for GCC compilation (#3114 follow-up) MWerks' header transitively includes C string functions (memcpy, strlen, strcmp, etc.), but GCC/Clang's is the C++ std::string header. These files all use C string functions and should include instead. * Use std::isnan instead of isnan for GCC compilation GCC's places isnan in the std namespace. Using the unqualified isnan fails to compile with GCC/Clang. * Fix cCcD_Src types: s32 -> u32 for bitmask fields cCcD_SrcObjCommonBase::mSPrm, cCcD_SrcObjTg::mType, and cCcD_SrcObjAt::mType are used as bitmasks (SetType/SetSPrm take u32, MskType/MskSPrm use u32, values like 0xFFFFFFFF are common in aggregate inits). Change from s32 to u32 to match usage. Also fix AT_TYPE_WOLF_ATTACK/AT_TYPE_UNK to use unsigned literals, and remove now-unnecessary (s32) casts on hex literals in collision source data. * Mark dummy() functions as static to avoid multiple definition errors These decomp artifact functions have the same name and signature across TUs, causing linker errors when building as a single binary. --- include/JSystem/JAudio2/JASGadget.h | 2 +- include/JSystem/JUtility/JUTFont.h | 2 +- include/SSystem/SComponent/c_cc_d.h | 10 +++++----- include/d/d_save.h | 2 +- include/f_ap/f_ap_game.h | 2 +- include/global.h | 5 +++++ src/JSystem/J2DGraph/J2DManage.cpp | 2 +- src/JSystem/J2DGraph/J2DMaterialFactory.cpp | 2 +- src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp | 2 +- src/JSystem/J3DGraphBase/J3DMatBlock.cpp | 2 +- src/JSystem/J3DGraphBase/J3DPacket.cpp | 2 +- src/JSystem/J3DGraphBase/J3DShapeDraw.cpp | 2 +- src/JSystem/J3DGraphBase/J3DVertex.cpp | 2 +- src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp | 2 +- src/JSystem/JAudio2/JASWaveArcLoader.cpp | 2 +- src/JSystem/JHostIO/JHIMccBuf.cpp | 2 +- src/JSystem/JHostIO/JORServer.cpp | 2 +- src/JSystem/JKernel/JKRAram.cpp | 2 +- src/JSystem/JKernel/JKRAramArchive.cpp | 2 +- src/JSystem/JKernel/JKRArchivePri.cpp | 2 +- src/JSystem/JKernel/JKRCompArchive.cpp | 2 +- src/JSystem/JKernel/JKRDvdAramRipper.cpp | 2 +- src/JSystem/JKernel/JKRDvdArchive.cpp | 2 +- src/JSystem/JKernel/JKRDvdRipper.cpp | 2 +- src/JSystem/JKernel/JKRFileCache.cpp | 2 +- src/JSystem/JKernel/JKRFileLoader.cpp | 2 +- src/JSystem/JKernel/JKRHeap.cpp | 2 +- src/JSystem/JKernel/JKRMemArchive.cpp | 2 +- src/JSystem/JMessage/resource.cpp | 2 +- src/JSystem/JParticle/JPAResourceManager.cpp | 2 +- src/JSystem/JStudio/JStudio/ctb.cpp | 2 +- src/JSystem/JStudio/JStudio/fvb.cpp | 2 +- src/JSystem/JStudio/JStudio/jstudio-control.cpp | 2 +- src/JSystem/JStudio/JStudio/stb.cpp | 2 +- src/JSystem/JSupport/JSUMemoryStream.cpp | 2 +- src/JSystem/JSupport/JSUOutputStream.cpp | 2 +- src/JSystem/JUtility/JUTNameTab.cpp | 2 +- src/JSystem/JUtility/JUTResource.cpp | 2 +- .../MSL/MSL_C/MSL_Common/Include/cstring | 16 ++++++++++++++++ src/SSystem/SComponent/c_lib.cpp | 2 +- src/d/actor/d_a_alink.cpp | 6 +++--- src/d/actor/d_a_e_bg.cpp | 2 +- src/d/actor/d_a_e_dk.cpp | 2 +- src/d/actor/d_a_e_hm.cpp | 2 +- src/d/actor/d_a_e_hp.cpp | 4 ++-- src/d/actor/d_a_e_hz.cpp | 2 +- src/d/actor/d_a_e_kr.cpp | 4 ++-- src/d/actor/d_a_e_sh.cpp | 2 +- src/d/actor/d_a_e_yd.cpp | 4 ++-- src/d/actor/d_a_e_yr.cpp | 4 ++-- src/d/actor/d_a_grass.cpp | 2 +- src/d/actor/d_a_obj_hakai_brl.cpp | 2 +- src/d/actor/d_a_obj_kbacket.cpp | 2 +- src/d/actor/d_a_obj_klift00.cpp | 2 +- src/d/actor/d_a_obj_wood_statue.cpp | 2 +- src/d/actor/d_a_tag_kmsg.cpp | 2 +- src/d/d_envse.cpp | 2 +- src/d/d_error_msg.cpp | 2 +- src/d/d_event_manager.cpp | 2 +- src/d/d_kankyo_wether.cpp | 2 +- src/d/d_menu_option.cpp | 2 +- src/d/d_menu_ring.cpp | 2 +- src/d/d_meter2_draw.cpp | 2 +- src/d/d_msg_scrn_3select.cpp | 2 +- src/d/d_msg_scrn_base.cpp | 2 +- src/f_op/f_op_actor_mng.cpp | 2 +- src/m_Do/m_Do_main.cpp | 2 +- 67 files changed, 96 insertions(+), 75 deletions(-) diff --git a/include/JSystem/JAudio2/JASGadget.h b/include/JSystem/JAudio2/JASGadget.h index 53eaefb6a48..bab663e8e63 100644 --- a/include/JSystem/JAudio2/JASGadget.h +++ b/include/JSystem/JAudio2/JASGadget.h @@ -2,7 +2,7 @@ #define JASGADGET_H #include "JSystem/JUtility/JUTAssert.h" -#include +#include #ifdef __MWERKS__ #define JAS_GLOBAL_INSTANCE_INIT diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index d4a1d9a8413..dbd27f23177 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -2,7 +2,7 @@ #define JUTFONT_H #include "JSystem/JUtility/TColor.h" -#include +#include /** * @ingroup jsystem-jutility diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 2393e9c13d2..f80c33b823d 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -62,8 +62,8 @@ enum cCcD_ObjAtType { /* 0x10000000 */ AT_TYPE_10000000 = (1 << 28), /* 0x10000000 */ AT_TYPE_20000000 = (1 << 29), /* 0x40000000 */ AT_TYPE_WOLF_CUT_TURN = (1 << 30), - /* 0x80000000 */ AT_TYPE_WOLF_ATTACK = (1 << 31), - /* 0xD8000000 */ AT_TYPE_UNK = 0xD8000000 + /* 0x80000000 */ AT_TYPE_WOLF_ATTACK = (1u << 31), + /* 0xD8000000 */ AT_TYPE_UNK = 0xD8000000u }; struct cCcD_SrcTriAttr { @@ -120,16 +120,16 @@ class cCcD_DivideArea : public cM3dGAab { STATIC_ASSERT(0x40 == sizeof(cCcD_DivideArea)); struct cCcD_SrcObjCommonBase { - /* 0x0 */ s32 mSPrm; + /* 0x0 */ u32 mSPrm; }; struct cCcD_SrcObjTg { - /* 0x0 */ s32 mType; + /* 0x0 */ u32 mType; /* 0x4 */ cCcD_SrcObjCommonBase mBase; }; // Size: 0x8 struct cCcD_SrcObjAt { - /* 0x0 */ s32 mType; + /* 0x0 */ u32 mType; /* 0x4 */ u8 mAtp; /* 0x8 */ cCcD_SrcObjCommonBase mBase; }; // Size: 0xC diff --git a/include/d/d_save.h b/include/d/d_save.h index a0e29d9dd73..abb77dd69c6 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -1,7 +1,7 @@ #ifndef D_SAVE_D_SAVE_H #define D_SAVE_D_SAVE_H -#include +#include #include "SSystem/SComponent/c_xyz.h" #include #include "global.h" diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h index 79bbb1b24f8..83f5909a295 100644 --- a/include/f_ap/f_ap_game.h +++ b/include/f_ap/f_ap_game.h @@ -6,7 +6,7 @@ #include "JSystem/JFramework/JFWDisplay.h" #include "JSystem/JUtility/JUTAssert.h" #include "CaptureScreen.h" -#include +#include void fapGm_After(); void fapGm_Create(); diff --git a/include/global.h b/include/global.h index 7161d3e2b95..7b1897f654e 100644 --- a/include/global.h +++ b/include/global.h @@ -152,4 +152,9 @@ static const float INF = 2000000000.0f; #define FABSF std::fabsf #endif +#ifndef __MWERKS__ +#include +using std::isnan; +#endif + #endif diff --git a/src/JSystem/J2DGraph/J2DManage.cpp b/src/JSystem/J2DGraph/J2DManage.cpp index 19a04db031e..a7ac40503f0 100644 --- a/src/JSystem/J2DGraph/J2DManage.cpp +++ b/src/JSystem/J2DGraph/J2DManage.cpp @@ -2,7 +2,7 @@ #include "JSystem/J2DGraph/J2DManage.h" #include "JSystem/JSupport/JSUInputStream.h" -#include +#include void* J2DDataManage::get(char const* name) { J2DataManageLink* link; diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp index 8c45bff19ea..52349f83047 100644 --- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -5,7 +5,7 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTResource.h" -#include +#include #include J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) { diff --git a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp index d705c1c59ae..f27b56cd1a4 100644 --- a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include J3DSkinNList::J3DSkinNList() { field_0x0 = NULL; diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp index 21a8bf57895..004189a89b1 100644 --- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -5,7 +5,7 @@ #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/J3DGraphBase/J3DTransform.h" #include "global.h" -#include +#include inline void loadMatColors(const J3DGXColor* color) { J3DGDWriteXFCmdHdr(0x100C, 2); diff --git a/src/JSystem/J3DGraphBase/J3DPacket.cpp b/src/JSystem/J3DGraphBase/J3DPacket.cpp index 173061882cc..5eb6e773926 100644 --- a/src/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/src/JSystem/J3DGraphBase/J3DPacket.cpp @@ -7,7 +7,7 @@ #include "JSystem/J3DGraphBase/J3DShapeMtx.h" #include "JSystem/JKernel/JKRHeap.h" #include -#include +#include #include "global.h" J3DError J3DDisplayListObj::newDisplayList(u32 maxSize) { diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp index e001a8a8b9f..94d4534a82c 100644 --- a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp @@ -2,7 +2,7 @@ #include "JSystem/J3DGraphBase/J3DShapeDraw.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include #include #include diff --git a/src/JSystem/J3DGraphBase/J3DVertex.cpp b/src/JSystem/J3DGraphBase/J3DVertex.cpp index d455f27c8c8..478ff42b0ef 100644 --- a/src/JSystem/J3DGraphBase/J3DVertex.cpp +++ b/src/JSystem/J3DGraphBase/J3DVertex.cpp @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphAnimator/J3DJointTree.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include J3DVertexData::J3DVertexData() { mVtxNum = 0; diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp index 7d868d8730e..a4097a8884e 100644 --- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp @@ -9,7 +9,7 @@ #include "JSystem/JSupport/JSupport.h" #include "JSystem/JKernel/JKRHeap.h" #include -#include +#include void* J3DClusterLoaderDataBase::load(const void* i_data) { J3D_ASSERT_NULLPTR(41, i_data); diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp index c2b7400444d..277933fdb6a 100644 --- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp @@ -5,7 +5,7 @@ #include "JSystem/JAudio2/JASTaskThread.h" #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRDvdAramRipper.h" -#include +#include #include #include diff --git a/src/JSystem/JHostIO/JHIMccBuf.cpp b/src/JSystem/JHostIO/JHIMccBuf.cpp index f71f9fc0fa0..f013947e260 100644 --- a/src/JSystem/JHostIO/JHIMccBuf.cpp +++ b/src/JSystem/JHostIO/JHIMccBuf.cpp @@ -4,7 +4,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JHostIO/JHIRMcc.h" #include -#include +#include void JHIReport(const char* fmt, ...) {} diff --git a/src/JSystem/JHostIO/JORServer.cpp b/src/JSystem/JHostIO/JORServer.cpp index 5a55a342c99..18086d36d80 100644 --- a/src/JSystem/JHostIO/JORServer.cpp +++ b/src/JSystem/JHostIO/JORServer.cpp @@ -5,7 +5,7 @@ #include "JSystem/JHostIO/JORFile.h" #include "JSystem/JHostIO/JORHostInfo.h" #include "JSystem/JSupport/JSUMemoryStream.h" -#include +#include void JOREventCallbackListNode::JORAppend() { JORServer* pServer = JORServer::getInstance(); diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp index ffea3d9af77..d6bcec7f6b1 100644 --- a/src/JSystem/JKernel/JKRAram.cpp +++ b/src/JSystem/JKernel/JKRAram.cpp @@ -8,7 +8,7 @@ #include "JSystem/JUtility/JUTException.h" #include #include -#include +#include #if PLATFORM_GCN const u32 stack_size = 0xc00; diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index 811978caa04..235fb07515f 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -8,7 +8,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" #include -#include +#include JKRAramArchive::JKRAramArchive() {} diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/src/JSystem/JKernel/JKRArchivePri.cpp index 375e297c371..6a84bbb6053 100644 --- a/src/JSystem/JKernel/JKRArchivePri.cpp +++ b/src/JSystem/JKernel/JKRArchivePri.cpp @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRHeap.h" #include -#include +#include u32 JKRArchive::sCurrentDirID; diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp index 8a1577f5922..ace09dad8b3 100644 --- a/src/JSystem/JKernel/JKRCompArchive.cpp +++ b/src/JSystem/JKernel/JKRCompArchive.cpp @@ -11,7 +11,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" #include -#include +#include #include JKRCompArchive::JKRCompArchive(s32 entryNum, JKRArchive::EMountDirection eMountDirection) diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/src/JSystem/JKernel/JKRDvdAramRipper.cpp index 3ca276e0506..930b4df3548 100644 --- a/src/JSystem/JKernel/JKRDvdAramRipper.cpp +++ b/src/JSystem/JKernel/JKRDvdAramRipper.cpp @@ -11,7 +11,7 @@ #include #include #include "global.h" -#include +#include static int JKRDecompressFromDVDToAram(JKRDvdFile*, u32, u32, u32, u32, u32, u32*); static int decompSZS_subroutine(u8*, u32); diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index ed88d791e73..c2cdf00f5ea 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -7,7 +7,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" #include -#include +#include #include "global.h" #include diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp index cf84ef9eec3..fb5806c0a95 100644 --- a/src/JSystem/JKernel/JKRDvdRipper.cpp +++ b/src/JSystem/JKernel/JKRDvdRipper.cpp @@ -8,7 +8,7 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JUtility/JUTException.h" -#include +#include #include #include #include diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/src/JSystem/JKernel/JKRFileCache.cpp index 1dc3a719ef8..d0162d95e56 100644 --- a/src/JSystem/JKernel/JKRFileCache.cpp +++ b/src/JSystem/JKernel/JKRFileCache.cpp @@ -7,7 +7,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include -#include +#include #include "global.h" JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* param_3) { diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp index 26790f87b66..6bb460e93ab 100644 --- a/src/JSystem/JKernel/JKRFileLoader.cpp +++ b/src/JSystem/JKernel/JKRFileLoader.cpp @@ -4,7 +4,7 @@ #define MSL_USE_INLINES 1 // needed to inline tolower call. not inlined elsewhere in the repo -#include +#include #include #include "global.h" diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp index 720166455a0..8655a80ae34 100644 --- a/src/JSystem/JKernel/JKRHeap.cpp +++ b/src/JSystem/JKernel/JKRHeap.cpp @@ -9,7 +9,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" #include -#include +#include #if DEBUG u8 JKRValue_DEBUGFILL_NOTUSE = 0xFD; diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp index 0c0ef4887ca..86d6ef63cf8 100644 --- a/src/JSystem/JKernel/JKRMemArchive.cpp +++ b/src/JSystem/JKernel/JKRMemArchive.cpp @@ -5,7 +5,7 @@ #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include +#include #include "global.h" #include diff --git a/src/JSystem/JMessage/resource.cpp b/src/JSystem/JMessage/resource.cpp index 04387050c29..5bda0614978 100644 --- a/src/JSystem/JMessage/resource.cpp +++ b/src/JSystem/JMessage/resource.cpp @@ -4,7 +4,7 @@ #include "JSystem/JGadget/search.h" #include "JSystem/JGadget/define.h" #include -#include +#include u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, bool* pbValid) const { if (!oParse_TBlock_messageID_.getRaw()) { diff --git a/src/JSystem/JParticle/JPAResourceManager.cpp b/src/JSystem/JParticle/JPAResourceManager.cpp index e382a391100..9ea2dff1284 100644 --- a/src/JSystem/JParticle/JPAResourceManager.cpp +++ b/src/JSystem/JParticle/JPAResourceManager.cpp @@ -3,7 +3,7 @@ #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JParticle/JPADynamicsBlock.h" #include "JSystem/JParticle/JPAResource.h" -#include +#include struct JPAResourceLoader { JPAResourceLoader(u8 const*, JPAResourceManager*); diff --git a/src/JSystem/JStudio/JStudio/ctb.cpp b/src/JSystem/JStudio/JStudio/ctb.cpp index a28752af7ad..5a2c0c11cbc 100644 --- a/src/JSystem/JStudio/JStudio/ctb.cpp +++ b/src/JSystem/JStudio/JStudio/ctb.cpp @@ -2,7 +2,7 @@ #include "JSystem/JStudio/JStudio/ctb.h" #include -#include +#include #include JStudio::ctb::TObject::~TObject() {} diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/src/JSystem/JStudio/JStudio/fvb.cpp index 94721909c4c..1f8b68b4a2a 100644 --- a/src/JSystem/JStudio/JStudio/fvb.cpp +++ b/src/JSystem/JStudio/JStudio/fvb.cpp @@ -2,7 +2,7 @@ #include "JSystem/JStudio/JStudio/fvb.h" #include "JSystem/JUtility/JUTException.h" -#include +#include namespace JStudio { namespace fvb { diff --git a/src/JSystem/JStudio/JStudio/jstudio-control.cpp b/src/JSystem/JStudio/JStudio/jstudio-control.cpp index 38fe394ea04..dd11fe431be 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-control.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-control.cpp @@ -7,7 +7,7 @@ #include "JSystem/JStudio/JStudio/jstudio-control.h" #include "JSystem/JStudio/JStudio/jstudio-math.h" #include "JSystem/JStudio/JStudio/jstudio-data.h" -#include +#include JStudio::TControl::TControl() { mTransformOnSet = false; diff --git a/src/JSystem/JStudio/JStudio/stb.cpp b/src/JSystem/JStudio/JStudio/stb.cpp index b2dbddbd6db..424bc4e3fb2 100644 --- a/src/JSystem/JStudio/JStudio/stb.cpp +++ b/src/JSystem/JStudio/JStudio/stb.cpp @@ -4,7 +4,7 @@ #include "JSystem/JStudio/JStudio/jstudio-object.h" #include "JSystem/JUtility/JUTException.h" #include -#include +#include namespace JStudio { namespace stb { diff --git a/src/JSystem/JSupport/JSUMemoryStream.cpp b/src/JSystem/JSupport/JSUMemoryStream.cpp index 9364bc7d0d7..6fb5cd03fca 100644 --- a/src/JSystem/JSupport/JSUMemoryStream.cpp +++ b/src/JSystem/JSupport/JSUMemoryStream.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JSupport/JSUMemoryStream.h" -#include +#include void JSUMemoryInputStream::setBuffer(void const* pBuffer, s32 length) { mBuffer = pBuffer; diff --git a/src/JSystem/JSupport/JSUOutputStream.cpp b/src/JSystem/JSupport/JSUOutputStream.cpp index 132b143c5d7..dec0976ad3d 100644 --- a/src/JSystem/JSupport/JSUOutputStream.cpp +++ b/src/JSystem/JSupport/JSUOutputStream.cpp @@ -3,7 +3,7 @@ #include "JSystem/JSupport/JSUOutputStream.h" #include "JSystem/JSupport/JSURandomOutputStream.h" #include -#include +#include JSUOutputStream::~JSUOutputStream() { if (!isGood()) { diff --git a/src/JSystem/JUtility/JUTNameTab.cpp b/src/JSystem/JUtility/JUTNameTab.cpp index 3b6ed448e04..8b1cdbdf71d 100644 --- a/src/JSystem/JUtility/JUTNameTab.cpp +++ b/src/JSystem/JUtility/JUTNameTab.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTNameTab.h" -#include +#include JUTNameTab::JUTNameTab() { setResource(NULL); diff --git a/src/JSystem/JUtility/JUTResource.cpp b/src/JSystem/JUtility/JUTResource.cpp index 3c80c471d69..cc0258face7 100644 --- a/src/JSystem/JUtility/JUTResource.cpp +++ b/src/JSystem/JUtility/JUTResource.cpp @@ -3,7 +3,7 @@ #include "JSystem/JUtility/JUTResource.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JSupport/JSUInputStream.h" -#include +#include void* JUTResReference::getResource(JSUInputStream* stream, u32 resType, JKRArchive* archive) { stream->read(mType); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring index c55307fb713..b7c2e53a2a8 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring @@ -26,6 +26,22 @@ size_t strlen(const char* str); #ifdef __cplusplus }; + +namespace std { +using ::memcpy; +using ::memset; +using ::memcmp; +using ::memchr; +using ::memmove; +using ::strrchr; +using ::strchr; +using ::strlen; +using ::strncmp; +using ::strcmp; +using ::strcat; +using ::strncpy; +using ::strcpy; +} // namespace std #endif #endif /* _MSL_COMMON_STRING_H */ diff --git a/src/SSystem/SComponent/c_lib.cpp b/src/SSystem/SComponent/c_lib.cpp index 4440acbc077..6441d6ceb8d 100644 --- a/src/SSystem/SComponent/c_lib.cpp +++ b/src/SSystem/SComponent/c_lib.cpp @@ -4,7 +4,7 @@ */ #include "SSystem/SComponent/c_lib.h" -#include +#include #include "SSystem/SComponent/c_math.h" /** diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 8977c2c0769..a2b5a11f6d1 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -1467,7 +1467,7 @@ static f32 l_ladderAnmBaseTransY = 102.00054168701172f; static dCcD_SrcCyl l_cylSrc = { { - {0, {{AT_TYPE_WOLF_ATTACK, 3, 0x1A}, {(s32)0xD8FFFDFF, 5}, 0x73}}, + {0, {{AT_TYPE_WOLF_ATTACK, 3, 0x1A}, {0xD8FFFDFF, 5}, 0x73}}, {dCcD_SE_WOLF_BITE, 3, 1, 0, {1}}, {dCcD_SE_NONE, 6, 0, 0, {0}}, {0}, @@ -1483,7 +1483,7 @@ static dCcD_SrcCyl l_cylSrc = { static dCcD_SrcSph l_sphSrc = { { - {0, {{AT_TYPE_NORMAL_SWORD, 3, 0x1A}, {(s32)0xD8FBFDFF, 5}, 0x73}}, + {0, {{AT_TYPE_NORMAL_SWORD, 3, 0x1A}, {0xD8FBFDFF, 5}, 0x73}}, {dCcD_SE_SWORD, 3, 1, 0, {1}}, {dCcD_SE_NONE, 6, 0, 0, {0}}, {0}, @@ -4640,7 +4640,7 @@ void daAlink_c::playerInit() { } } -void dummy(fopAc_ac_c* i_this) { +static void dummy(fopAc_ac_c* i_this) { fopAcM_RegisterCreateID(i_this, "ALINK"); } diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index 1f1514bed6d..be19dfcae20 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -44,7 +44,7 @@ void daE_BG_HIO_c::genMessage(JORMContext* ctx) { namespace { dCcD_SrcSph cc_bg_src = { { - {0x0, {{0x0, 0x0, 0x0}, {(s32)0xD8FBFDFF, 0x03}, 0x75}}, // mObj + {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x03}, 0x75}}, // mObj {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg {0x0}, // mGObjCo diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index a21506dcba1..6efac3410ba 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -46,7 +46,7 @@ enum E_DK_RES_FILE_ID { namespace { static dCcD_SrcSph cc_dk_src = { { // mObjInf - { 0x0, { { 0, 0, { 0 } }, { (s32)0xd8fbbddf, { 3 } }, { { 0x75 } } } }, // mObj + { 0x0, { { 0, 0, { 0 } }, { 0xd8fbbddf, { 3 } }, { { 0x75 } } } }, // mObj { 0x09, 0, 0, 0, { 0 } }, // mGObjAt { 0x00, 0x00, 0x00, 0x00, { 5 } }, // mGObjTg { { 0 } }, // mGObjCo diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp index 7dcd7c5317a..11eacb6b34d 100644 --- a/src/d/actor/d_a_e_hm.cpp +++ b/src/d/actor/d_a_e_hm.cpp @@ -94,7 +94,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { void daE_HM_c::initCcCylinder() { static const dCcD_SrcSph ccShpSrc = { { - {0x0, {{0x2, 0x1, 0xd}, {(s32)0xD8FBFDFF, 0x43}, 0x75}}, // mObj + {0x0, {{0x2, 0x1, 0xd}, {0xD8FBFDFF, 0x43}, 0x75}}, // mObj {dCcD_SE_STONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg {0x0}, // mGObjCo diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index 49d563fec3f..a1f202489a8 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -31,7 +31,7 @@ class daE_HP_HIO_c : public JORReflexible { namespace { static dCcD_SrcCyl cc_hp_src = { { - {0, {{0x0, 0x0, 0x0}, {(s32)0xd8000000, 0x3}, 0x0}}, + {0, {{0x0, 0x0, 0x0}, {0xd8000000, 0x3}, 0x0}}, {dCcD_SE_13, 0, 0, 0, {0}}, {dCcD_SE_NONE, 0, 0, 0, {6}}, {0}, @@ -47,7 +47,7 @@ static dCcD_SrcCyl cc_hp_src = { static dCcD_SrcSph cc_lamp_src = { { - {0x0, {{0x0, 0x0, 0x0}, {(s32)0xD8FBFDFF, 0x43}, 0x75}}, // mObj + {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x43}, 0x75}}, // mObj {dCcD_SE_13, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x6}, // mGObjTg {0x0}, // mGObjCo diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index 5d926a4d571..8b680502352 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -2016,7 +2016,7 @@ int daE_HZ_c::create() { static dCcD_SrcSph cc_sph_src2 = { { - {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0}, {(s32)0xd8fafdff, 0x3}, 0x75}}, // mObj + {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0}, {0xd8fafdff, 0x3}, 0x75}}, // mObj {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg {0x0}, // mGObjCo diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp index 4001092815b..c32921568b0 100644 --- a/src/d/actor/d_a_e_kr.cpp +++ b/src/d/actor/d_a_e_kr.cpp @@ -2258,7 +2258,7 @@ static int daE_Kr_Create(fopAc_ac_c* i_this) { }; static dCcD_SrcSph head_tg_sph_src = { { - {0x0, {{0x0, 0x1, 0x0}, {(s32)0xd8fbfdff, 0x3}, 0x0}}, // mObj + {0x0, {{0x0, 0x1, 0x0}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg {0x0}, // mGObjCo @@ -2270,7 +2270,7 @@ static int daE_Kr_Create(fopAc_ac_c* i_this) { static dCcD_SrcSph body_tg_sph_src = { { - {0x0, {{0x0, 0x1, 0x0}, {(s32)0xd8fbfdff, 0x3}, 0x0}}, // mObj + {0x0, {{0x0, 0x1, 0x0}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg {0x0}, // mGObjCo diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index a2d7722926c..b05c57eef82 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -1160,7 +1160,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { static int daE_SH_Create(fopAc_ac_c* i_this) { static dCcD_SrcSph cc_sph_src = { { - {0x0, {{0x0, 0x0, 0x0}, {(s32)0xd8fbfdff, 0x3}, 0x75}}, // mObj + {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg {0x0}, // mGObjCo diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp index bd54664088d..3146abf0189 100644 --- a/src/d/actor/d_a_e_yd.cpp +++ b/src/d/actor/d_a_e_yd.cpp @@ -1361,7 +1361,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { static int daE_YD_Create(fopAc_ac_c* i_this) { static dCcD_SrcSph cc_sph_src = { { - {0x0, {{0x0, 0x0, 0xd}, {(s32)0xd8fbfdff, 0x3}, 0x25}}, // mObj + {0x0, {{0x0, 0x0, 0xd}, {0xd8fbfdff, 0x3}, 0x25}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_STONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg {0x0}, // mGObjCo @@ -1383,7 +1383,7 @@ static int daE_YD_Create(fopAc_ac_c* i_this) { }; static dCcD_SrcSph kuki_sph_src = { { - {0x0, {{0x0, 0x0, 0xd}, {(s32)0xd8fbfdff, 0x3}, 0x0}}, // mObj + {0x0, {{0x0, 0x0, 0xd}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg {0x0}, // mGObjCo diff --git a/src/d/actor/d_a_e_yr.cpp b/src/d/actor/d_a_e_yr.cpp index f329c48a9a7..61132a0de8f 100644 --- a/src/d/actor/d_a_e_yr.cpp +++ b/src/d/actor/d_a_e_yr.cpp @@ -2416,7 +2416,7 @@ static int daE_Yr_Create(fopAc_ac_c* i_this) { static dCcD_SrcSph head_tg_sph_src = { { - {0x0, {{0x0, 0x1, 0x0}, {(s32)0xd8fbfdff, 0x3}, 0x0}}, // mObj + {0x0, {{0x0, 0x1, 0x0}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg {0x0}, // mGObjCo @@ -2428,7 +2428,7 @@ static int daE_Yr_Create(fopAc_ac_c* i_this) { static dCcD_SrcSph body_tg_sph_src = { { - {0x0, {{0x0, 0x1, 0x0}, {(s32)0xd8fbfdff, 0x3}, 0x0}}, // mObj + {0x0, {{0x0, 0x1, 0x0}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg {0x0}, // mGObjCo diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 33a079524ce..04992b39b50 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -10,7 +10,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include #include "d/actor/d_grass.inc" // IWYU pragma: keep #include "d/actor/d_flower.inc" diff --git a/src/d/actor/d_a_obj_hakai_brl.cpp b/src/d/actor/d_a_obj_hakai_brl.cpp index 756ee528ab6..1b71ca265c1 100644 --- a/src/d/actor/d_a_obj_hakai_brl.cpp +++ b/src/d/actor/d_a_obj_hakai_brl.cpp @@ -84,7 +84,7 @@ int daObjHBarrel_c::execute() { dCcD_SrcCyl const daObjHBarrel_c::s_CcDCyl = { { - {0x0, {{0x0, 0x0, 0xd}, {(s32)0xd8fafdff, 0x11}, 0x79}}, // mObj + {0x0, {{0x0, 0x0, 0xd}, {0xd8fafdff, 0x11}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x5}, // mGObjTg {0x0}, // mGObjCo diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index d200074e31c..5333f8f912e 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -22,7 +22,7 @@ const daObj_KBacket_HIOParam daObj_KBacket_Param_c::m = { }; static const dCcD_SrcGObjInf l_ccDObjData = { - {0x0, {{0x0, 0x0, 0x0}, {(s32)0xd8fbfdff, 0x0}, 0x79}}, // mObj + {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x0}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_STONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg {0x0}, // mGObjCo diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index 739c7fe7f8e..cc5ee259d79 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -78,7 +78,7 @@ static const char* l_arcName = "K_lift00"; static dCcD_SrcSph l_cc_sph_src = { { - {0x0, {{0x0, 0x0, 0x0}, {(s32)0xd8fbfdff, 0x11}, 0x79}}, // mObj + {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x11}, 0x79}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x2}, // mGObjTg {0x0}, // mGObjCo diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index bcbf449891e..23bcad36f76 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -14,7 +14,7 @@ const static dCcD_SrcCyl l_cyl_src = { { - {0x0, {{0x0, 0x0, 0x0}, {-1, 0x11}, 0x59}}, // mObj + {0x0, {{0x0, 0x0, 0x0}, {0xFFFFFFFF, 0x11}, 0x59}}, // mObj {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x4}, // mGObjTg {0x0}, // mGObjCo diff --git a/src/d/actor/d_a_tag_kmsg.cpp b/src/d/actor/d_a_tag_kmsg.cpp index 1588e5a9c21..8c2d036149f 100644 --- a/src/d/actor/d_a_tag_kmsg.cpp +++ b/src/d/actor/d_a_tag_kmsg.cpp @@ -4,7 +4,7 @@ #include "d/actor/d_a_npc.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_counter.h" -#include +#include struct EventListItem { char* mEventName; diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index df9a133bec6..734ed221e75 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_path.h" #include "f_op/f_op_camera_mng.h" -#include +#include static int dEnvSe_Draw(dEnvSe_c* i_this) { return 1; diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index 2436f983ea0..460c794dbd4 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -5,7 +5,7 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPicture.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index 41b31b58371..8b2291b1249 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -13,7 +13,7 @@ #include "d/d_demo.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_counter.h" -#include +#include #if DEBUG static dEvM_HIO_c l_HIO; diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index 8acb561fde7..0e0617639dc 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -12,7 +12,7 @@ #include "d/d_kankyo.h" #include "d/d_kankyo_rain.h" #include "f_op/f_op_camera_mng.h" -#include +#include #include "m_Do/m_Do_audio.h" static void dKyw_pntlight_set(WIND_INFLUENCE* pntwind); diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index 269bef1849c..898b210b45e 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -22,7 +22,7 @@ #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include +#include typedef void (dMenu_Option_c::*initFunc)(); static initFunc init[] = { diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index 49c3e4000b2..92e81fa350a 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -25,7 +25,7 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include +#include #include diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index 5be39371cde..f8f0ca10e62 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -20,7 +20,7 @@ #include "d/d_msg_class.h" #include "d/d_msg_object.h" #include "d/d_pane_class.h" -#include +#include dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { OS_REPORT("enter dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap *mp_heap)\n"); diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index f8c9167be18..a41895aac42 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -10,7 +10,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DTextBox.h" -#include +#include #include "d/d_com_inf_game.h" #include "d/d_select_cursor.h" #include "d/d_msg_object.h" diff --git a/src/d/d_msg_scrn_base.cpp b/src/d/d_msg_scrn_base.cpp index 43651004d36..84899c28241 100644 --- a/src/d/d_msg_scrn_base.cpp +++ b/src/d/d_msg_scrn_base.cpp @@ -6,7 +6,7 @@ #include "d/d_msg_object.h" #include "d/d_msg_out_font.h" #include "d/d_pane_class.h" -#include +#include dMsgScrnBase_c::dMsgScrnBase_c() { init(); diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 28b5b6abfa5..2bc28c20142 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -776,7 +776,7 @@ bool fopAcM_addAngleY(fopAc_ac_c* i_actor, s16 i_target, s16 i_step) { return cLib_chaseAngleS(&angle->y, i_target, i_step); } -void dummy(fopAc_ac_c* i_actor) { +static void dummy(fopAc_ac_c* i_actor) { fopAcM_SetSpeedF(i_actor, 10.0f); } diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 901b8c980b0..23753b59ed6 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -33,7 +33,7 @@ #include "m_Do/m_Do_printf.h" #include "m_Do/m_Do_ext2.h" #include "SSystem/SComponent/c_counter.h" -#include +#include #if PLATFORM_WII || PLATFORM_SHIELD #include From 6a48380461bc9baabe1706ba57ca0cedfa2d0c51 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sat, 28 Feb 2026 21:19:17 -0700 Subject: [PATCH 11/35] More GCC compatibility/warning fixes (#3118) * Wrap >4-char literals in a MULTI_CHAR macro Modern compilers do not support CW's non-standard behavior with >4 char literals. We can, however, use a constexpr function to compute the u64 values directly. This leaves <=4 char literals unchanged. * Replace non-pointer usages of NULL with 0 * Define NULL to nullptr on C++11 and above * Fix more -Wpointer-arith and -Woverflow warnings * Replace u32/s32 with uintptr_t/intptr_t where appropriate * JSUOutputStream: Overload all standard int types --- include/JSystem/J2DGraph/J2DAnimation.h | 2 +- include/JSystem/JAudio2/JAISeMgr.h | 4 +- include/JSystem/JAudio2/JAISound.h | 7 +- include/JSystem/JAudio2/JASDSPInterface.h | 2 +- include/JSystem/JAudio2/JASResArcLoader.h | 6 +- include/JSystem/JKernel/JKRHeap.h | 3 +- include/JSystem/JStudio/JStudio/fvb-data.h | 2 +- include/JSystem/JStudio/JStudio/stb.h | 3 +- include/JSystem/JSupport/JSUOutputStream.h | 38 +-- include/JSystem/JSupport/JSupport.h | 2 +- include/JSystem/JUtility/JUTXfb.h | 2 +- include/d/d_stage.h | 50 +-- include/dolphin/types.h | 6 +- include/f_op/f_op_actor.h | 2 +- include/f_op/f_op_actor_mng.h | 9 +- include/f_op/f_op_scene_mng.h | 5 +- include/global.h | 19 ++ include/revolution/types.h | 6 +- src/DynamicLink.cpp | 2 +- src/JSystem/J2DGraph/J2DMaterialFactory.cpp | 4 +- src/JSystem/J2DGraph/J2DPictureEx.cpp | 2 +- src/JSystem/J3DGraphBase/J3DShape.cpp | 2 +- src/JSystem/JAudio2/JASAramStream.cpp | 2 +- src/JSystem/JAudio2/JASDSPInterface.cpp | 2 +- src/JSystem/JAudio2/JASHeapCtrl.cpp | 4 +- src/JSystem/JAudio2/JASResArcLoader.cpp | 2 +- src/JSystem/JAudio2/JASSimpleWaveBank.cpp | 2 +- src/JSystem/JAudio2/JAUSectionHeap.cpp | 2 +- src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp | 6 +- src/JSystem/JKernel/JKRAram.cpp | 2 +- src/JSystem/JKernel/JKRAramArchive.cpp | 4 +- src/JSystem/JKernel/JKRDvdFile.cpp | 2 +- src/JSystem/JKernel/JKRFileCache.cpp | 2 +- src/JSystem/JKernel/JKRHeap.cpp | 2 +- src/JSystem/JKernel/JKRThread.cpp | 2 +- src/JSystem/JParticle/JPAEmitter.cpp | 2 +- src/JSystem/JUtility/JUTGraphFifo.cpp | 2 +- src/JSystem/JUtility/JUTVideo.cpp | 2 +- .../MSL/MSL_C++/MSL_Common/Include/cstdint | 14 + .../MSL/MSL_C++/MSL_Common/Include/stdint.h | 16 - src/Z2AudioLib/Z2Audience.cpp | 2 +- src/Z2AudioLib/Z2Creature.cpp | 20 +- src/Z2AudioLib/Z2SoundObject.cpp | 16 +- src/c/c_dylink.cpp | 2 +- src/d/actor/d_a_alink.cpp | 4 +- src/d/actor/d_a_alink_horse.inc | 2 +- src/d/actor/d_a_alink_swim.inc | 2 +- src/d/actor/d_a_b_dr.cpp | 2 +- src/d/actor/d_a_balloon_2D.cpp | 46 +-- src/d/actor/d_a_boomerang.cpp | 30 +- src/d/actor/d_a_coach_2D.cpp | 18 +- src/d/actor/d_a_coach_fire.cpp | 4 +- src/d/actor/d_a_door_shutter.cpp | 6 +- src/d/actor/d_a_e_arrow.cpp | 2 +- src/d/actor/d_a_e_bg.cpp | 2 +- src/d/actor/d_a_e_df.cpp | 2 +- src/d/actor/d_a_e_gi.cpp | 2 +- src/d/actor/d_a_e_hp.cpp | 4 +- src/d/actor/d_a_e_yh.cpp | 2 +- src/d/actor/d_a_e_ym.cpp | 2 +- src/d/actor/d_a_formation_mng.cpp | 2 +- src/d/actor/d_a_kago.cpp | 32 +- src/d/actor/d_a_movie_player.cpp | 2 +- src/d/actor/d_a_nbomb.cpp | 2 +- src/d/actor/d_a_npc_blue_ns.cpp | 4 +- src/d/actor/d_a_npc_chin.cpp | 4 +- src/d/actor/d_a_npc_fairy.cpp | 6 +- src/d/actor/d_a_npc_grm.cpp | 4 +- src/d/actor/d_a_npc_hanjo.cpp | 2 +- src/d/actor/d_a_npc_henna.cpp | 4 +- src/d/actor/d_a_npc_kasi_hana.cpp | 6 +- src/d/actor/d_a_npc_kasi_kyu.cpp | 6 +- src/d/actor/d_a_npc_kasi_mich.cpp | 6 +- src/d/actor/d_a_npc_kn.cpp | 2 +- src/d/actor/d_a_npc_maro.cpp | 2 +- src/d/actor/d_a_npc_rafrel.cpp | 2 +- src/d/actor/d_a_npc_shad.cpp | 2 +- src/d/actor/d_a_npc_tk.cpp | 8 +- src/d/actor/d_a_npc_tkj2.cpp | 2 +- src/d/actor/d_a_npc_uri.cpp | 8 +- src/d/actor/d_a_npc_ykw.cpp | 4 +- src/d/actor/d_a_obj_avalanche.cpp | 2 +- src/d/actor/d_a_obj_batta.cpp | 2 +- src/d/actor/d_a_obj_bed.cpp | 2 +- src/d/actor/d_a_obj_bky_rock.cpp | 2 +- src/d/actor/d_a_obj_bmWindow.cpp | 2 +- src/d/actor/d_a_obj_digholl.cpp | 4 +- src/d/actor/d_a_obj_flag.cpp | 2 +- src/d/actor/d_a_obj_kbox.cpp | 4 +- src/d/actor/d_a_obj_laundry_rope.cpp | 2 +- src/d/actor/d_a_obj_lp.cpp | 10 +- src/d/actor/d_a_obj_lv3Water.cpp | 2 +- src/d/actor/d_a_obj_lv6ChangeGate.cpp | 4 +- src/d/actor/d_a_obj_lv6TogeRoll.cpp | 4 +- src/d/actor/d_a_obj_lv6bemos2.cpp | 2 +- src/d/actor/d_a_obj_magne_arm.cpp | 8 +- src/d/actor/d_a_obj_maki.cpp | 2 +- src/d/actor/d_a_obj_prop.cpp | 2 +- src/d/actor/d_a_obj_rfHole.cpp | 2 +- src/d/actor/d_a_obj_rope_bridge.cpp | 2 +- src/d/actor/d_a_obj_sekizoa.cpp | 4 +- src/d/actor/d_a_obj_so.cpp | 2 +- src/d/actor/d_a_obj_stone.cpp | 4 +- src/d/actor/d_a_obj_tks.cpp | 2 +- src/d/actor/d_a_obj_vground.cpp | 4 +- src/d/actor/d_a_passer_mng.cpp | 2 +- src/d/actor/d_a_shop_item.cpp | 2 +- src/d/actor/d_a_tag_allmato.cpp | 2 +- src/d/actor/d_a_title.cpp | 16 +- src/d/d_bg_s.cpp | 2 +- src/d/d_bg_w_kcol.cpp | 6 +- src/d/d_bright_check.cpp | 30 +- src/d/d_camera.cpp | 2 +- src/d/d_cc_d.cpp | 2 +- src/d/d_com_inf_game.cpp | 6 +- src/d/d_error_msg.cpp | 6 +- src/d/d_ev_camera.cpp | 2 +- src/d/d_event_manager.cpp | 2 +- src/d/d_file_sel_info.cpp | 52 +-- src/d/d_file_sel_warning.cpp | 14 +- src/d/d_file_select.cpp | 182 +++++----- src/d/d_gameover.cpp | 8 +- src/d/d_kankyo_rain.cpp | 4 +- src/d/d_kantera_icon_meter.cpp | 4 +- src/d/d_menu_collect.cpp | 312 +++++++++--------- src/d/d_menu_dmap.cpp | 192 +++++------ src/d/d_menu_fishing.cpp | 50 +-- src/d/d_menu_fmap.cpp | 2 +- src/d/d_menu_fmap2D.cpp | 136 ++++---- src/d/d_menu_insect.cpp | 54 +-- src/d/d_menu_item_explain.cpp | 44 +-- src/d/d_menu_letter.cpp | 190 +++++------ src/d/d_menu_option.cpp | 216 ++++++------ src/d/d_menu_ring.cpp | 108 +++--- src/d/d_menu_save.cpp | 84 ++--- src/d/d_menu_skill.cpp | 66 ++-- src/d/d_meter2_draw.cpp | 290 ++++++++-------- src/d/d_meter_button.cpp | 204 ++++++------ src/d/d_meter_haihai.cpp | 16 +- src/d/d_meter_hakusha.cpp | 12 +- src/d/d_meter_string.cpp | 18 +- src/d/d_msg_scrn_3select.cpp | 62 ++-- src/d/d_msg_scrn_arrow.cpp | 14 +- src/d/d_msg_scrn_boss.cpp | 8 +- src/d/d_msg_scrn_explain.cpp | 54 +-- src/d/d_msg_scrn_howl.cpp | 58 ++-- src/d/d_msg_scrn_item.cpp | 74 ++--- src/d/d_msg_scrn_jimaku.cpp | 32 +- src/d/d_msg_scrn_kanban.cpp | 32 +- src/d/d_msg_scrn_light.cpp | 2 +- src/d/d_msg_scrn_place.cpp | 8 +- src/d/d_msg_scrn_staff.cpp | 8 +- src/d/d_msg_scrn_talk.cpp | 88 ++--- src/d/d_msg_scrn_tree.cpp | 34 +- src/d/d_name.cpp | 72 ++-- src/d/d_particle.cpp | 2 +- src/d/d_resorce.cpp | 2 +- src/d/d_s_logo.cpp | 2 +- src/d/d_s_name.cpp | 4 +- src/d/d_s_play.cpp | 2 +- src/d/d_s_room.cpp | 2 +- src/d/d_select_cursor.cpp | 44 +-- src/d/d_stage.cpp | 12 +- src/d/d_timer.cpp | 106 +++--- src/f_op/f_op_scene_mng.cpp | 4 +- src/f_pc/f_pc_pause.cpp | 5 +- src/m_Do/m_Do_Reset.cpp | 2 +- src/m_Do/m_Do_ext.cpp | 2 +- src/m_Do/m_Do_machine.cpp | 2 +- 169 files changed, 1855 insertions(+), 1824 deletions(-) diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h index 035be59253c..97183b8aae6 100644 --- a/include/JSystem/J2DGraph/J2DAnimation.h +++ b/include/JSystem/J2DGraph/J2DAnimation.h @@ -59,7 +59,7 @@ class J2DAnmVtxColor : public J2DAnmBase { J2DAnmVtxColor() { mKind = KIND_VTX_COLOR; for (int i = 0; i < ARRAY_SIZE(mAnmTableNum); i++) { - mAnmTableNum[i] = NULL; + mAnmTableNum[i] = 0; } for (int i = 0; i < ARRAY_SIZE(mVtxColorIndexData); i++) { mVtxColorIndexData[i] = NULL; diff --git a/include/JSystem/JAudio2/JAISeMgr.h b/include/JSystem/JAudio2/JAISeMgr.h index 50f81fb1b4c..928d85525ba 100644 --- a/include/JSystem/JAudio2/JAISeMgr.h +++ b/include/JSystem/JAudio2/JAISeMgr.h @@ -15,7 +15,7 @@ struct JASNonCopyable { JASNonCopyable() {} ~JASNonCopyable() {} - /* 0x0 */ int field_0x0; + /* 0x0 */ void* field_0x0; }; // Size: 0x4 /** @@ -56,7 +56,7 @@ class JAISeCategoryMgr : public JAISeqDataUser, public JASNonCopyable { mParams.init(); mMaxActiveSe = 0; mMaxInactiveSe = 0; - field_0x0 = 0; + field_0x0 = NULL; } virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion); diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h index 5e414ade24c..5e1cd40b4b8 100644 --- a/include/JSystem/JAudio2/JAISound.h +++ b/include/JSystem/JAudio2/JAISound.h @@ -5,6 +5,7 @@ #include "JSystem/JAudio2/JAIAudible.h" #include "JSystem/JUtility/JUTAssert.h" #include "global.h" +#include class JAISound; @@ -134,7 +135,7 @@ struct JAISoundStatus_ { u8 flag8 : 1; } flags; } state; - /* 0x4 */ u32 userdata_; + /* 0x4 */ uintptr_t userdata_; }; // Size: 0x8 /** @@ -294,8 +295,8 @@ class JAISound { void setAnimationState(u32 state) { status_.state.flags.animationState = state; } - u32 getUserData() const { return status_.userdata_; } - void setUserData(u32 userData) { status_.userdata_ = userData; } + uintptr_t getUserData() const { return status_.userdata_; } + void setUserData(uintptr_t userData) { status_.userdata_ = userData; } JAIAudible* getAudible() { return audible_; } bool isHandleAttached() const { return handle_ != NULL; } bool hasLifeTime() const { return status_.field_0x1.flags.flag2; } diff --git a/include/JSystem/JAudio2/JASDSPInterface.h b/include/JSystem/JAudio2/JASDSPInterface.h index d68727c9ea7..0642fdc018a 100644 --- a/include/JSystem/JAudio2/JASDSPInterface.h +++ b/include/JSystem/JAudio2/JASDSPInterface.h @@ -112,7 +112,7 @@ namespace JASDsp { void invalChannelAll(); void initBuffer(); int setFXLine(u8, s16*, JASDsp::FxlineConfig_*); - BOOL changeFXLineParam(u8, u8, u32); + BOOL changeFXLineParam(u8, u8, uintptr_t); extern u8 const DSPADPCM_FILTER[64]; extern u32 const DSPRES_FILTER[320]; diff --git a/include/JSystem/JAudio2/JASResArcLoader.h b/include/JSystem/JAudio2/JASResArcLoader.h index 1b375e798e3..bcaf1fb06ff 100644 --- a/include/JSystem/JAudio2/JASResArcLoader.h +++ b/include/JSystem/JAudio2/JASResArcLoader.h @@ -8,10 +8,10 @@ namespace JASResArcLoader { size_t getResSize(JKRArchive const*, u16); size_t getResMaxSize(JKRArchive const*); static void loadResourceCallback(void*); - int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32); + int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, uintptr_t), uintptr_t); // from pikmin2 - typedef void (*LoadCallback)(u32, u32); + typedef void (*LoadCallback)(u32, uintptr_t); struct TLoadResInfo { inline TLoadResInfo(JKRArchive* archive, u16 id, void* buf, u32 size) @@ -30,7 +30,7 @@ namespace JASResArcLoader { void* mBuffer; // _08 u32 mBufferSize; // _0C LoadCallback mCallback; // _10 - u32 mCallbackArg; // _14, arg to pass to mCallback along with readResource result + uintptr_t mCallbackArg; // _14, arg to pass to mCallback along with readResource result OSMessageQueue* mQueue; // _18 }; }; diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index b6675f41b7a..e3ce79f00be 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -5,6 +5,7 @@ #include #include "global.h" #include +#include class JKRHeap; typedef void (*JKRErrorHandler)(void*, u32, int); @@ -66,7 +67,7 @@ class JKRHeap : public JKRDisposer { JKRHeap* find(void* ptr) const; JKRHeap* findAllHeap(void* ptr) const; - void dispose_subroutine(u32 start, u32 end); + void dispose_subroutine(uintptr_t start, uintptr_t end); bool dispose(void* ptr, u32 size); void dispose(void* begin, void* end); void dispose(); diff --git a/include/JSystem/JStudio/JStudio/fvb-data.h b/include/JSystem/JStudio/JStudio/fvb-data.h index b88f637dbbf..3932d0edc1c 100644 --- a/include/JSystem/JStudio/JStudio/fvb-data.h +++ b/include/JSystem/JStudio/JStudio/fvb-data.h @@ -14,7 +14,7 @@ extern const char ga4cSignature[4]; const int PARAGRAPH_DATA = 1; -typedef enum TEComposite { +enum TEComposite { /* 0x0 */ COMPOSITE_NONE, /* 0x1 */ COMPOSITE_RAW, /* 0x2 */ COMPOSITE_IDX, diff --git a/include/JSystem/JStudio/JStudio/stb.h b/include/JSystem/JStudio/JStudio/stb.h index 20813969ff1..b17bb57a8c2 100644 --- a/include/JSystem/JStudio/JStudio/stb.h +++ b/include/JSystem/JStudio/JStudio/stb.h @@ -5,6 +5,7 @@ #include "JSystem/JStudio/JStudio/object-id.h" #include "JSystem/JStudio/JStudio/stb-data-parse.h" #include +#include namespace JStudio { class TObject; @@ -86,7 +87,7 @@ class TObject : public object::TObject_ID { const void* getSequence() const { return pSequence; } void setSequence_(const void* arg1) { pSequence = arg1; } const void* getSequence_offset(s32 i_no) const { - int s32Val = (s32)getSequence(); + intptr_t s32Val = (intptr_t)getSequence(); return (const void*)(s32Val + i_no); } const void* getSequence_next() const { return pSequence_next; } diff --git a/include/JSystem/JSupport/JSUOutputStream.h b/include/JSystem/JSupport/JSUOutputStream.h index b44ec084b05..b7ab069fbb2 100644 --- a/include/JSystem/JSupport/JSUOutputStream.h +++ b/include/JSystem/JSupport/JSUOutputStream.h @@ -18,30 +18,24 @@ class JSUOutputStream : public JSUIosBase { s32 write(const void*, s32); void write(const char*); - JSUOutputStream& operator<<(u32 param_0) { - write(¶m_0, sizeof(u32)); - return *this; - } - - JSUOutputStream& operator<<(s32 param_0) { - write(¶m_0, sizeof(s32)); - return *this; - } - - JSUOutputStream& operator<<(s16 param_0) { - write(¶m_0, sizeof(s16)); - return *this; - } - - JSUOutputStream& operator<<(u16 param_0) { - write(¶m_0, sizeof(u16)); - return *this; +#define JSU_OUTPUTSTREAM_OPERATOR(T) \ + JSUOutputStream& operator<<(T val) { \ + write(&val, sizeof(T)); \ + return *this; \ } - JSUOutputStream& operator<<(u8 param_0) { - write(¶m_0, sizeof(u8)); - return *this; - } + JSU_OUTPUTSTREAM_OPERATOR(signed char) + JSU_OUTPUTSTREAM_OPERATOR(unsigned char) + JSU_OUTPUTSTREAM_OPERATOR(signed short) + JSU_OUTPUTSTREAM_OPERATOR(unsigned short) + JSU_OUTPUTSTREAM_OPERATOR(int) + JSU_OUTPUTSTREAM_OPERATOR(unsigned int) + JSU_OUTPUTSTREAM_OPERATOR(signed long) + JSU_OUTPUTSTREAM_OPERATOR(unsigned long) + JSU_OUTPUTSTREAM_OPERATOR(signed long long) + JSU_OUTPUTSTREAM_OPERATOR(unsigned long long) + +#undef JSU_OUTPUTSTREAM_OPERATOR JSUOutputStream& operator<<(const char* param_0) { write(param_0); diff --git a/include/JSystem/JSupport/JSupport.h b/include/JSystem/JSupport/JSupport.h index 717fd9b7b0f..c982af61038 100644 --- a/include/JSystem/JSupport/JSupport.h +++ b/include/JSystem/JSupport/JSupport.h @@ -20,7 +20,7 @@ T* JSUConvertOffsetToPtr(const void* ptr, uintptr_t offset) { template T* JSUConvertOffsetToPtr(const void* ptr, const void* offset) { T* ret; - if (offset == NULL) { + if (offset == 0) { ret = NULL; } else { ret = (T*)((intptr_t)ptr + (intptr_t)offset); diff --git a/include/JSystem/JUtility/JUTXfb.h b/include/JSystem/JUtility/JUTXfb.h index 28059c70739..c4bf605b9c8 100644 --- a/include/JSystem/JUtility/JUTXfb.h +++ b/include/JSystem/JUtility/JUTXfb.h @@ -75,7 +75,7 @@ class JUTXfb { static JUTXfb* sManager; private: - /* 0x00 */ void* mBuffer[3]; + /* 0x00 */ u8* mBuffer[3]; /* 0x0C */ bool mXfbAllocated[3]; /* 0x10 */ s32 mBufferNum; /* 0x14 */ s16 mDrawingXfbIndex; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 335d432c75b..6f558f87c09 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -573,7 +573,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual roomRead_class* getRoom(void) const { OSReport("Room non room data !!\n"); JUT_ASSERT(2100, FALSE); - return NULL; + return 0; } virtual void setMapInfo(stage_map_info_class* i_MapInfo) { mMapInfo = i_MapInfo; } virtual stage_map_info_class* getMapInfo(void) const { return mMapInfo; } @@ -589,7 +589,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual stage_palette_info_class* getPaletteInfo(void) const { OSReport("Room non palet data !!\n"); JUT_ASSERT(2130, FALSE); - return NULL; + return 0; } virtual void setPselectInfo(stage_pselect_info_class* i_PselectInfo) { UNUSED(i_PselectInfo); @@ -600,7 +600,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual stage_pselect_info_class* getPselectInfo(void) const { OSReport("Room non pselect data !!\n"); JUT_ASSERT(2141, FALSE); - return NULL; + return 0; } virtual void setEnvrInfo(stage_envr_info_class* i_EnvrInfo) { UNUSED(i_EnvrInfo); @@ -611,7 +611,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual stage_envr_info_class* getEnvrInfo(void) const { OSReport("Room non envr data !!\n"); JUT_ASSERT(2152, FALSE); - return NULL; + return 0; } virtual void setVrboxInfo(stage_vrbox_info_class* i_VrboxInfo) { mVrboxInfo = i_VrboxInfo; } virtual stage_vrbox_info_class* getVrboxInfo(void) const { return mVrboxInfo; } @@ -626,7 +626,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual stage_plight_info_class* getPlightInfo(void) const { OSReport("Room non plight data !!\n"); JUT_ASSERT(2178, FALSE); - return NULL; + return 0; } virtual void setPaletteNumInfo(int i_PaletteNumInfo) { UNUSED(i_PaletteNumInfo); @@ -637,7 +637,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual int getPaletteNumInfo(void) const { OSReport("Room non palette num data !!\n"); JUT_ASSERT(2190, FALSE); - return NULL; + return 0; } virtual void setPselectNumInfo(int i_PselectNumInfo) { UNUSED(i_PselectNumInfo); @@ -648,7 +648,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual int getPselectNumInfo(void) const { OSReport("Room non pselect num data !!\n"); JUT_ASSERT(2201, FALSE); - return NULL; + return 0; } virtual void setEnvrNumInfo(int i_EnvrNumInfo) { UNUSED(i_EnvrNumInfo); @@ -659,7 +659,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual int getEnvrNumInfo(void) const { OSReport("Room non envr num data !!\n"); JUT_ASSERT(2212, FALSE); - return NULL; + return 0; } virtual void setVrboxNumInfo(int i_VrboxNumInfo) { mVrboxNumInfo = i_VrboxNumInfo; } virtual int getVrboxNumInfo(void) const { return mVrboxNumInfo; } @@ -674,7 +674,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual int getPlightNumInfo(void) const { OSReport("Room non plight num data !!\n"); JUT_ASSERT(2227, FALSE); - return NULL; + return 0; } virtual void setLightVecInfo(stage_pure_lightvec_info_class* i_LightVecInfo) { mLightVecInfo = i_LightVecInfo; } virtual stage_pure_lightvec_info_class* getLightVecInfo(void) const { return mLightVecInfo; } @@ -689,7 +689,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual stage_stag_info_class* getStagInfo(void) const { OSReport("Room non stag data !!\n"); JUT_ASSERT(2260, FALSE); - return NULL; + return 0; } virtual void setSclsInfo(stage_scls_info_dummy_class* i_SclsInfo) { mSclsInfo = i_SclsInfo; } virtual stage_scls_info_dummy_class* getSclsInfo(void) const { return mSclsInfo; } @@ -702,7 +702,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual dStage_dPnt_c* getPntInf(void) const { OSReport("Room non Pnts data !\n"); JUT_ASSERT(2285, FALSE); - return NULL; + return 0; } virtual void setPathInfo(dStage_dPath_c* i_PathInfo) { UNUSED(i_PathInfo); @@ -713,7 +713,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual dStage_dPath_c* getPathInf(void) const { OSReport("Room non Path data !\n"); JUT_ASSERT(2296, FALSE); - return NULL; + return 0; } virtual void setPnt2Info(dStage_dPnt_c* i_Pnt2Info) { mPnt2Info = i_Pnt2Info; } virtual dStage_dPnt_c* getPnt2Inf(void) const { return mPnt2Info; } @@ -739,7 +739,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual dStage_MemoryConfig_c* getMemoryConfig(void) const { OSReport("Room non memory config data!\n"); JUT_ASSERT(2423, FALSE); - return NULL; + return 0; } virtual void setMemoryMap(dStage_MemoryMap_c* i_MemoryMap) { UNUSED(i_MemoryMap); @@ -749,7 +749,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual dStage_MemoryMap_c* getMemoryMap(void) const { OSReport("Room non memory map data!\n"); JUT_ASSERT(2442, FALSE); - return NULL; + return 0; } virtual void setMulti(dStage_Multi_c* i_Multi) { UNUSED(i_Multi); @@ -759,7 +759,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual dStage_Multi_c* getMulti(void) const { OSReport("Room non multi data!\n"); JUT_ASSERT(2457, FALSE); - return NULL; + return 0; } virtual void setOldMulti(void) { OSReport("Room non old multi data!\n"); @@ -772,7 +772,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual dStage_Multi_c* getOldMulti(void) const { OSReport("Room non old multi data!\n"); JUT_ASSERT(2472, FALSE); - return NULL; + return 0; } virtual void setLbnk(dStage_Lbnk_c* i_Lbnk) { mLbnk = i_Lbnk; } virtual dStage_Lbnk_c* getLbnk(void) const { return mLbnk; } @@ -786,7 +786,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual dStage_DMap_c* getDMap(void) const { OS_REPORT("Room non DMap data\n"); JUT_ASSERT(2513, FALSE); - return NULL; + return 0; } virtual void setDrTg(stage_tgsc_class* i_DrTg) { mDrTg = i_DrTg; } virtual stage_tgsc_class* getDrTg(void) const { return mDrTg; } @@ -804,7 +804,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual void* getMapPath(void) { OSReport("stage non 2d map path data !!\n"); JUT_ASSERT(2561, FALSE); - return NULL; + return 0; } virtual void setElst(dStage_Elst_c* i_Elst) { UNUSED(i_Elst); @@ -815,7 +815,7 @@ class dStage_roomDt_c : public dStage_dt_c { virtual dStage_Elst_c* getElst(void) { dStage_SetErrorRoom(); OSReport("Room no Elst Data!!\n"); - return NULL; + return 0; } public: @@ -901,7 +901,7 @@ class dStage_stageDt_c : public dStage_dt_c { /* vt[43] */ virtual stage_pure_lightvec_info_class* getLightVecInfo(void) const { OSReport("stage non LightVec data !!\n"); JUT_ASSERT(3007, FALSE); - return NULL; + return 0; } /* vt[44] */ virtual void setLightVecInfoNum(int i_LightVecInfoNum) { UNUSED(i_LightVecInfoNum); @@ -912,7 +912,7 @@ class dStage_stageDt_c : public dStage_dt_c { /* vt[45] */ virtual int getLightVecInfoNum(void) const { OSReport("stage non LightVecNum data !!\n"); JUT_ASSERT(3018, FALSE); - return NULL; + return 0; } /* vt[40] */ virtual void setPlightNumInfo(int i_PlightNumInfo) { mPlightNumInfo = i_PlightNumInfo; } /* vt[41] */ virtual int getPlightNumInfo(void) const { return mPlightNumInfo; } @@ -943,7 +943,7 @@ class dStage_stageDt_c : public dStage_dt_c { /* vt[65] */ virtual dStage_FileList2_dt_c* getFileList2Info(void) const { OSReport("stage non filelist2 data!\n"); JUT_ASSERT(3127, FALSE); - return NULL; + return 0; } /* vt[66] */ virtual void setFileListInfo(dStage_FileList_dt_c* list) { UNUSED(list); @@ -954,7 +954,7 @@ class dStage_stageDt_c : public dStage_dt_c { /* vt[67] */ virtual dStage_FileList_dt_c* getFileListInfo(void) const { OSReport("stage non filelist data!\n"); JUT_ASSERT(3142, FALSE); - return NULL; + return 0; } /* vt[68] */ virtual void setFloorInfo(dStage_FloorInfo_c* i_FloorInfo) { mFloorInfo = i_FloorInfo; } /* vt[69] */ virtual dStage_FloorInfo_c* getFloorInfo(void) const { return mFloorInfo; } @@ -976,7 +976,7 @@ class dStage_stageDt_c : public dStage_dt_c { /* vt[80] */ virtual dStage_Lbnk_c* getLbnk(void) const { OSReport("stage non Lbnk data!\n"); JUT_ASSERT(3238, FALSE); - return NULL; + return 0; } /* vt[81] */ virtual void setTresure(stage_tresure_class* i_Tresure) { mTresure = i_Tresure; } /* vt[82] */ virtual stage_tresure_class* getTresure(void) const { return mTresure; } @@ -995,7 +995,7 @@ class dStage_stageDt_c : public dStage_dt_c { virtual void* getUnit() { OSReport("stage non unit list data !!\n"); JUT_ASSERT(3325, 0); - return NULL; + return 0; } #endif /* vt[89] */ virtual void setMapPath(void* i_MapPath) { return; } diff --git a/include/dolphin/types.h b/include/dolphin/types.h index 8411e109991..4eb63aa1da3 100644 --- a/include/dolphin/types.h +++ b/include/dolphin/types.h @@ -69,8 +69,12 @@ typedef unsigned int uint; #endif #ifndef NULL -#ifdef __cplusplus +#ifdef __cplusplus +#if __cplusplus >= 201103L +#define NULL nullptr +#else #define NULL 0 +#endif #else #define NULL ((void*)0) #endif diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index d743c143f2e..6aa5713e1b9 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -199,7 +199,7 @@ class dEvt_info_c { BOOL chkCondition(u16 condition) { return (mCondition & condition) == condition; } void suspendProc(void* actor) { - if (field_0x10 != NULL) { + if (field_0x10 != 0) { field_0x14(actor); } } diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 83f009a41e4..b3a8873bcc3 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -423,7 +423,14 @@ inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) { i_culltype == fopAc_CULLBOX_CUSTOM_e; } -inline const cXyz& fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) { +inline +#ifdef __MWERKS__ +// In the original code, this constructs a temporary and returns a reference to it +const cXyz& +#else +const Vec& +#endif +fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) { return i_actor->cull.sphere.center; } diff --git a/include/f_op/f_op_scene_mng.h b/include/f_op/f_op_scene_mng.h index 996a3b6d6ef..20b847259a6 100644 --- a/include/f_op/f_op_scene_mng.h +++ b/include/f_op/f_op_scene_mng.h @@ -4,14 +4,15 @@ #include "f_op/f_op_scene_pause.h" #include "f_pc/f_pc_manager.h" #include "f_op/f_op_scene.h" +#include typedef struct base_process_class base_process_class; scene_class* fopScnM_SearchByID(fpc_ProcID id); int fopScnM_ChangeReq(scene_class* i_scene, s16 i_procName, s16 param_3, u16 param_4); fpc_ProcID fopScnM_DeleteReq(scene_class* i_scene); -int fopScnM_CreateReq(s16 i_procName, s16 param_2, u16 param_3, u32 i_data); -u32 fopScnM_ReRequest(s16 i_procName, u32 i_data); +int fopScnM_CreateReq(s16 i_procName, s16 param_2, u16 param_3, uintptr_t i_data); +u32 fopScnM_ReRequest(s16 i_procName, uintptr_t i_data); void fopScnM_Management(); void fopScnM_Init(); diff --git a/include/global.h b/include/global.h index 7b1897f654e..fc8abb5431e 100644 --- a/include/global.h +++ b/include/global.h @@ -145,6 +145,25 @@ static const float INF = 2000000000.0f; #define UNSET_FLAG(var, flag, type) (var) &= ~(flag) #endif +// Macro for multi-character literals that exceed 4 bytes (e.g. 'ari_os'). +// CW encodes all characters in big-endian order into the full integer, but GCC/Clang +// truncate multi-char constants to int (4 bytes). This macro produces matching u64 +// values on all compilers. For <=4-char literals, raw constants like 'ABCD' are fine. +#ifdef __MWERKS__ + #define MULTI_CHAR(x) (x) +#else + template + inline constexpr unsigned long long MultiCharLiteral(const char (&buf)[N]) { + static_assert(N - 1 >= 3 && N - 1 <= 10, "MULTI_CHAR literal must be 1-8 characters"); + unsigned long long out = 0; + for (int i = 1; i < N - 2; i++) { + out = (out << 8) | static_cast(buf[i]); + } + return out; + } + #define MULTI_CHAR(x) MultiCharLiteral(#x) +#endif + // potential fakematch? #if DEBUG #define FABSF fabsf diff --git a/include/revolution/types.h b/include/revolution/types.h index 2434b540850..3ee03a86532 100644 --- a/include/revolution/types.h +++ b/include/revolution/types.h @@ -66,8 +66,12 @@ typedef unsigned int uint; #endif #ifndef NULL -#ifdef __cplusplus +#ifdef __cplusplus +#if __cplusplus >= 201103L +#define NULL nullptr +#else #define NULL 0 +#endif #else #define NULL ((void*)0) #endif diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 52cf2579705..6724feb2a98 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -224,7 +224,7 @@ bool DynamicModuleControl::do_load() { mModule = (OSModuleHeader*)JKRDvdToMainRam( buffer, NULL, EXPAND_SWITCH_UNKNOWN1, NULL, heap, JKRDvdRipper::ALLOC_DIRECTION_FORWARD, 0, NULL, NULL); - if (mModule != NULL) { + if (mModule != 0) { mSize = 0; mResourceType = 7; } diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp index 52349f83047..156a0926158 100644 --- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -244,7 +244,7 @@ u16 J2DMaterialFactory::newTexNo(int param_0, int param_1) const { if (iVar2->field_0x38[param_1] != 0xffff) { return field_0x28[iVar2->field_0x38[param_1]]; } - return 0x1FFFF; + return 0xFFFF; } u16 J2DMaterialFactory::newFontNo(int param_0) const { @@ -252,7 +252,7 @@ u16 J2DMaterialFactory::newFontNo(int param_0) const { if (iVar2->field_0x48 != 0xffff) { return field_0x2c[iVar2->field_0x48]; } - return 0x1FFFF; + return 0xFFFF; } J2DTevOrder J2DMaterialFactory::newTevOrder(int param_0, int param_1) const { diff --git a/src/JSystem/J2DGraph/J2DPictureEx.cpp b/src/JSystem/J2DGraph/J2DPictureEx.cpp index 27cc68cc94f..bf2ea7168a1 100644 --- a/src/JSystem/J2DGraph/J2DPictureEx.cpp +++ b/src/JSystem/J2DGraph/J2DPictureEx.cpp @@ -917,7 +917,7 @@ JUTTexture* J2DPictureEx::getTexture(u8 param_0) const { u8 J2DPictureEx::getTextureCount() const { if (mMaterial == NULL) { - return NULL; + return 0; } return mMaterial->getTexGenBlock()->getTexGenNum(); diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp index 91dd5b8ea0e..1cf379df4e0 100644 --- a/src/JSystem/J3DGraphBase/J3DShape.cpp +++ b/src/JSystem/J3DGraphBase/J3DShape.cpp @@ -226,7 +226,7 @@ void J3DShape::makeVtxArrayCmd() { if (array[i] != 0) GDSetArray((GXAttr)(i + GX_VA_POS), array[i], stride[i]); else - GDSetArrayRaw((GXAttr)(i + GX_VA_POS), NULL, stride[i]); + GDSetArrayRaw((GXAttr)(i + GX_VA_POS), 0, stride[i]); } } diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/src/JSystem/JAudio2/JASAramStream.cpp index 34a2c811c7b..ea0fb5776fe 100644 --- a/src/JSystem/JAudio2/JASAramStream.cpp +++ b/src/JSystem/JAudio2/JASAramStream.cpp @@ -143,7 +143,7 @@ bool JASAramStream::start() { } bool JASAramStream::stop(u16 param_0) { - if (!OSSendMessage(&field_0x000, (OSMessage)(param_0 << 0x10 | 1), OS_MESSAGE_NOBLOCK)) { + if (!OSSendMessage(&field_0x000, (OSMessage)(uintptr_t)(param_0 << 0x10 | 1), OS_MESSAGE_NOBLOCK)) { JUT_WARN(290, "%s", "OSSendMessage Failed"); return false; } diff --git a/src/JSystem/JAudio2/JASDSPInterface.cpp b/src/JSystem/JAudio2/JASDSPInterface.cpp index 79cf9bb249e..f4e85d1bd59 100644 --- a/src/JSystem/JAudio2/JASDSPInterface.cpp +++ b/src/JSystem/JAudio2/JASDSPInterface.cpp @@ -471,7 +471,7 @@ int JASDsp::setFXLine(u8 param_0, s16* buffer, JASDsp::FxlineConfig_* param_2) { return 1; } -BOOL JASDsp::changeFXLineParam(u8 param_0, u8 param_1, u32 param_2) { +BOOL JASDsp::changeFXLineParam(u8 param_0, u8 param_1, uintptr_t param_2) { JUT_ASSERT(450, dspMutex); FxBuf* buf = &FX_BUF[param_0]; switch (param_1) { diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/src/JSystem/JAudio2/JASHeapCtrl.cpp index ee280261f49..44abd98ba47 100644 --- a/src/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/src/JSystem/JAudio2/JASHeapCtrl.cpp @@ -284,7 +284,7 @@ void JASGenericMemPool::free(void* ptr, u32 param_1) { freeMemCount++; } -u32 JASKernel::sAramBase; +uintptr_t JASKernel::sAramBase; JKRHeap* JASKernel::sSystemHeap; @@ -309,7 +309,7 @@ JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* JASKernel::getCom JASHeap JASKernel::audioAramHeap; -void JASKernel::setupAramHeap(u32 param_0, u32 param_1) { +void JASKernel::setupAramHeap(uintptr_t param_0, u32 param_1) { #if !PLATFORM_GCN OSReport("setupAramHeap %x, %x, %x\n", param_0, ARGetBaseAddress(), param_1); param_0 = ARGetBaseAddress(); diff --git a/src/JSystem/JAudio2/JASResArcLoader.cpp b/src/JSystem/JAudio2/JASResArcLoader.cpp index 7fb2aff7366..a55c73469c8 100644 --- a/src/JSystem/JAudio2/JASResArcLoader.cpp +++ b/src/JSystem/JAudio2/JASResArcLoader.cpp @@ -55,7 +55,7 @@ static void JASResArcLoader::loadResourceCallback(void* args) { } -int JASResArcLoader::loadResourceAsync(JKRArchive* archive, u16 id, u8* buffer, u32 size, LoadCallback callback, u32 cbArg) +int JASResArcLoader::loadResourceAsync(JKRArchive* archive, u16 id, u8* buffer, u32 size, LoadCallback callback, uintptr_t cbArg) { TLoadResInfo args(archive, id, buffer, size); args.mCallback = callback; diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp index 9bc0bbf31d9..c599a0e8576 100644 --- a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp +++ b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp @@ -42,7 +42,7 @@ JASWaveArc* JASSimpleWaveBank::getWaveArc(u32 no) { int JASSimpleWaveBank::TWaveHandle::getWavePtr() const { void* base = mHeap->getBase(); if (base == NULL) { - return NULL; + return 0; } return (intptr_t)base + mWaveInfo.field_0x08; } diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/src/JSystem/JAudio2/JAUSectionHeap.cpp index 8a9bbf8277a..eb1f2110708 100644 --- a/src/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/src/JSystem/JAudio2/JAUSectionHeap.cpp @@ -40,7 +40,7 @@ namespace { field_0x4 = stack_14.getNumFiles(); field_0x8 = new s32[field_0x4]; if (!field_0x8) { - field_0x4 = NULL; + field_0x4 = 0; return; } for (u32 i = 0; i < field_0x4; i++) { diff --git a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp b/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp index f973cb4779f..596dfb27425 100644 --- a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp +++ b/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp @@ -111,10 +111,10 @@ bool JAUDynamicSeqDataBlocks::appendDynamicSeqDataBlock(JAUSeqDataBlock* seqData return 1; } -static void JAUDynamicSeqDataBlocks_receiveLoaded_(u32 param_0, u32 param_1) { +static void JAUDynamicSeqDataBlocks_receiveLoaded_(u32 param_0, uintptr_t param_1) { JSULink* link = (JSULink*)param_1; JAUSeqDataBlock* seqDataBlock = link->getObject(); - if (param_0 != NULL) { + if (param_0 != 0) { seqDataBlock->field_0x1c = 2; } else { seqDataBlock->field_0x1c = 0; @@ -153,7 +153,7 @@ bool JAUDynamicSeqDataBlocks::loadDynamicSeq(JAISoundID param_0, bool param_1, JASResArcLoader::loadResourceAsync( seqDataArchive_, resourceId, link->getObject()->region.addr, link->getObject()->region.size, - JAUDynamicSeqDataBlocks_receiveLoaded_, (u32)link); + JAUDynamicSeqDataBlocks_receiveLoaded_, (uintptr_t)link); } return true; } diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp index d6bcec7f6b1..64f14da1a7e 100644 --- a/src/JSystem/JKernel/JKRAram.cpp +++ b/src/JSystem/JKernel/JKRAram.cpp @@ -69,7 +69,7 @@ JKRAram::JKRAram(u32 audio_buffer_size, u32 audio_graph_size, s32 priority) if (mAramMemorySize) { mAramMemoryPtr = ARAlloc(mAramMemorySize); } else { - mAramMemoryPtr = NULL; + mAramMemoryPtr = 0; } OS_REPORT("ARAM audio area %08x: %08x\n", mAudioMemoryPtr, mAudioMemorySize); diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index 235fb07515f..41a88bac904 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -205,7 +205,7 @@ void* JKRAramArchive::fetchResource(SDIFileEntry* pEntry, u32* pOutSize) { &outBuf); *pOutSize = size; - if (size == NULL) { + if (size == 0) { return NULL; } @@ -240,7 +240,7 @@ void* JKRAramArchive::fetchResource(void* buffer, u32 bufferSize, SDIFileEntry* } else { if (compression == COMPRESSION_YAZ0) { u32 expandSize = this->getExpandSize(pEntry); - if (expandSize != NULL) { + if (expandSize != 0) { size = expandSize; } } diff --git a/src/JSystem/JKernel/JKRDvdFile.cpp b/src/JSystem/JKernel/JKRDvdFile.cpp index 07bd9505a5c..c56141f9003 100644 --- a/src/JSystem/JKernel/JKRDvdFile.cpp +++ b/src/JSystem/JKernel/JKRDvdFile.cpp @@ -125,7 +125,7 @@ s32 JKRDvdFile::sync(void) { void JKRDvdFile::doneProcess(s32 id, DVDFileInfo* fileInfo) { // fileInfo->field_0x3c looks like some kind of user pointer? JKRDvdFile* dvdFile = *(JKRDvdFile**)((u8*)fileInfo + 0x3c); - OSSendMessage(&dvdFile->mMessageQueue2, (OSMessage)id, OS_MESSAGE_NOBLOCK); + OSSendMessage(&dvdFile->mMessageQueue2, (OSMessage)(intptr_t)id, OS_MESSAGE_NOBLOCK); } s32 JKRDvdFile::getFileSize(void) const { diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/src/JSystem/JKernel/JKRFileCache.cpp index d0162d95e56..4579a9ee88f 100644 --- a/src/JSystem/JKernel/JKRFileCache.cpp +++ b/src/JSystem/JKernel/JKRFileCache.cpp @@ -192,7 +192,7 @@ u32 JKRFileCache::readResource(void* dst, u32 dstLength, u32, const char* path) if (findFile(finalPath, path)) { return readResource(dst, dstLength, filePath); } - return NULL; + return 0; } void JKRFileCache::removeResourceAll(void) { diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp index 8655a80ae34..eb4d7083c6e 100644 --- a/src/JSystem/JKernel/JKRHeap.cpp +++ b/src/JSystem/JKernel/JKRHeap.cpp @@ -349,7 +349,7 @@ JKRHeap* JKRHeap::findAllHeap(void* ptr) const { return NULL; } -void JKRHeap::dispose_subroutine(u32 begin, u32 end) { +void JKRHeap::dispose_subroutine(uintptr_t begin, uintptr_t end) { JSUListIterator next_iterator((JSULink*)NULL); JSUListIterator it = mDisposerList.getFirst(); while (it != mDisposerList.getEnd()) { diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index 918f1012fc3..cb5055012a8 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -73,7 +73,7 @@ void JKRThread::setCommon_mesgQueue(JKRHeap* heap, int message_count) { sThreadList.append(&mThreadListLink); mCurrentHeap = NULL; - mCurrentHeapError = NULL; + mCurrentHeapError = 0; } void JKRThread::setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param_3) { diff --git a/src/JSystem/JParticle/JPAEmitter.cpp b/src/JSystem/JParticle/JPAEmitter.cpp index fb03d52640e..5e7ccbc6dd7 100644 --- a/src/JSystem/JParticle/JPAEmitter.cpp +++ b/src/JSystem/JParticle/JPAEmitter.cpp @@ -39,7 +39,7 @@ void JPABaseEmitter::init(JPAEmitterManager* param_0, JPAResource* param_1) { mGlobalPrmClr.r = mGlobalPrmClr.g = mGlobalPrmClr.b = mGlobalPrmClr.a = mGlobalEnvClr.r = mGlobalEnvClr.g = mGlobalEnvClr.b = mGlobalEnvClr.a = 0xff; param_1->getBsp()->getPrmClr(&mPrmClr); param_1->getBsp()->getEnvClr(&mEnvClr); - mpUserWork = NULL; + mpUserWork = 0; mScaleOut = 1.0f; mEmitCount = 0.0f; initStatus(0x30); diff --git a/src/JSystem/JUtility/JUTGraphFifo.cpp b/src/JSystem/JUtility/JUTGraphFifo.cpp index 6792e10f8c5..7950757e7c4 100644 --- a/src/JSystem/JUtility/JUTGraphFifo.cpp +++ b/src/JSystem/JUtility/JUTGraphFifo.cpp @@ -18,7 +18,7 @@ JUTGraphFifo::JUTGraphFifo(u32 size) { GXInitFifoPtrs(mFifo, mBase, mBase); } else { mBase = JKRAllocFromSysHeap(mSize + 0xA0, 32); - mBase = (void*)ROUND((intptr_t)mBase, 0x20); + mBase = (void*)ALIGN_NEXT((uintptr_t)mBase, 0x20); mFifo = GXInit(mBase, mSize); data_804514B8 = true; sCurrentFifo = this; diff --git a/src/JSystem/JUtility/JUTVideo.cpp b/src/JSystem/JUtility/JUTVideo.cpp index 823402eff42..77d9be31b1e 100644 --- a/src/JSystem/JUtility/JUTVideo.cpp +++ b/src/JSystem/JUtility/JUTVideo.cpp @@ -178,7 +178,7 @@ void JUTVideo::postRetraceProc(u32 retrace_count) { sManager->mPostCallback(retrace_count); } - OSSendMessage(&sManager->mMessageQueue, (OSMessage)VIGetRetraceCount(), OS_MESSAGE_NOBLOCK); + OSSendMessage(&sManager->mMessageQueue, (OSMessage)(uintptr_t)VIGetRetraceCount(), OS_MESSAGE_NOBLOCK); } void JUTVideo::setRenderMode(GXRenderModeObj const* pObj) { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint index 314a5486716..35428a686ee 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint @@ -40,6 +40,20 @@ typedef long long intmax_t; #ifdef __cplusplus }; } + +using std::uint8_t; +using std::uint16_t; +using std::uint32_t; + +using std::int8_t; +using std::int16_t; +using std::int32_t; + +using std::uint64_t; +using std::int64_t; + +using std::uintptr_t; +using std::intptr_t; #endif #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h index caf108094b8..89ff7339eca 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h @@ -3,20 +3,4 @@ #include -#ifdef __cplusplus - using std::uint8_t; - using std::uint16_t; - using std::uint32_t; - - using std::int8_t; - using std::int16_t; - using std::int32_t; - - using std::uint64_t; - using std::int64_t; - - using std::uintptr_t; - using std::intptr_t; -#endif - #endif diff --git a/src/Z2AudioLib/Z2Audience.cpp b/src/Z2AudioLib/Z2Audience.cpp index 46b7107473e..5e8522701b9 100644 --- a/src/Z2AudioLib/Z2Audience.cpp +++ b/src/Z2AudioLib/Z2Audience.cpp @@ -454,7 +454,7 @@ f32 Z2SpotMic::calcMicVolume(f32 param_0, int camID, f32 param_2) { JUT_ASSERT(687, camID >= 0); JUT_ASSERT(688, camID < 1); - if (mMicOn == NULL) { + if (mMicOn == false) { return param_2; } diff --git a/src/Z2AudioLib/Z2Creature.cpp b/src/Z2AudioLib/Z2Creature.cpp index e02d1abcd56..14b0d310231 100644 --- a/src/Z2AudioLib/Z2Creature.cpp +++ b/src/Z2AudioLib/Z2Creature.cpp @@ -718,11 +718,11 @@ void Z2SoundObjBeeGroup::playBeeGroupSound(JAISoundID soundID, u8 param_1) { Z2SoundHandlePool* handle1 = startLevelSound((u32)soundID, 0, -1); Z2SoundHandlePool* handle2 = startLevelSound(sound_id2, 0, -1); - if (handle1 != NULL && *handle1 != NULL) { + if (handle1 != NULL && *handle1 != false) { f32 volume = Z2Calc::linearTransform(param_1, 1.0f, 5.0f, 0.5f, 1.0f, false); (*handle1)->getAuxiliary().moveVolume(volume, 0); } - if (handle2 != NULL && *handle2 != NULL) { + if (handle2 != NULL && *handle2 != false) { f32 volume = Z2Calc::linearTransform(param_1, 1.0f, 20.0f, 0.1f, 1.0f, false); (*handle2)->getAuxiliary().moveVolume(volume, 0); } @@ -924,28 +924,28 @@ Z2SoundHandlePool* Z2CreatureOI::startCreatureSoundLevel(JAISoundID soundID, u32 f32 pitch = Z2Calc::getParamByExp(mapinfo, 0.0f, 42.0f, 0.4f, 0.9f, 1.1f, Z2Calc::CURVE_POSITIVE); - if (handle1 != NULL && *handle1 != NULL) { + if (handle1 != NULL && *handle1 != false) { (*handle1)->getAuxiliary().moveVolume(volume, 0); (*handle1)->getAuxiliary().movePitch(pitch, 0); } else { return NULL; } - if (handle2 != NULL && *handle2 != NULL) { + if (handle2 != NULL && *handle2 != false) { (*handle2)->getAuxiliary().moveVolume(volume, 0); (*handle2)->getAuxiliary().movePitch(pitch, 0); } else { return NULL; } - if (handle3 != NULL && *handle3 != NULL) { + if (handle3 != NULL && *handle3 != false) { (*handle3)->getAuxiliary().moveVolume(volume, 0); (*handle3)->getAuxiliary().movePitch(pitch, 0); } else { return NULL; } - if (handle4 != NULL && *handle4 != NULL) { + if (handle4 != NULL && *handle4 != false) { (*handle4)->getAuxiliary().moveVolume(volume, 0); (*handle4)->getAuxiliary().movePitch(pitch, 0); return handle4; @@ -979,7 +979,7 @@ Z2SoundHandlePool* Z2CreatureOI::startTentacleSoundLevel(JAISoundID soundID, u8 } static void Z2_E_sw_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) { - if (handle != NULL && *handle != NULL) { + if (handle != NULL && *handle != false) { f32 pitch = 1.0f; switch (mapinfo) { case 1: @@ -994,7 +994,7 @@ static void Z2_E_sw_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) { } static void Z2_E_ms_modVol(Z2SoundHandlePool* handle, u32 mapinfo) { - if (handle != NULL && *handle != NULL) { + if (handle != NULL && *handle != false) { f32 var_f31 = 0.2f; if (mapinfo == 1) { (*handle)->getAuxiliary().moveVolume(var_f31, 0); @@ -1003,7 +1003,7 @@ static void Z2_E_ms_modVol(Z2SoundHandlePool* handle, u32 mapinfo) { } static void Z2_E_mm_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) { - if (handle != NULL && *handle != NULL) { + if (handle != NULL && *handle != false) { f32 var_f31 = 0.7f; if (mapinfo == 3) { (*handle)->getAuxiliary().movePitch(var_f31, 0); @@ -1012,7 +1012,7 @@ static void Z2_E_mm_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) { } static void Z2_B_zan_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) { - if (handle != NULL && *handle != NULL) { + if (handle != NULL && *handle != false) { f32 pitch = 1.0f; f32 volume = 1.0f; if (mapinfo > 400) { diff --git a/src/Z2AudioLib/Z2SoundObject.cpp b/src/Z2AudioLib/Z2SoundObject.cpp index ec0a70eac44..39048846998 100644 --- a/src/Z2AudioLib/Z2SoundObject.cpp +++ b/src/Z2AudioLib/Z2SoundObject.cpp @@ -164,7 +164,7 @@ Z2SoundHandlePool* Z2SoundObjBase::startLevelSound(JAISoundID soundID, u32 mapin if (handle != NULL) { soundStarter_->startSound(soundID, handle, pos_, mapinfo, fxMix, 1.0f, 1.0f, -1.0f, -1.0f, 0); - if (handle != NULL && (*handle) != NULL) { + if (handle != NULL && (*handle) != false) { (*handle)->setLifeTime(1, false); #if PLATFORM_WII || PLATFORM_SHIELD @@ -210,7 +210,7 @@ Z2SoundHandlePool* Z2SoundObjBase::startCollisionSE(u32 hitID, u32 mapinfo, Z2So } Z2SoundHandlePool* handle = Z2SoundObjBase::startSound(JAISoundID(hitID), mapinfo, -1); - if (handle != NULL && (*handle) != NULL) { + if (handle != NULL && (*handle) != false) { (*handle)->setUserData(mapinfo); if (30 <= mapinfo && mapinfo <= 52) { Z2Audible* audible = (Z2Audible*)(*handle)->getAudible(); @@ -251,7 +251,7 @@ Z2SoundHandlePool* Z2DopplerSoundObjBase::startSound(JAISoundID soundID, u32 map pos_ = NULL; Z2SoundHandlePool* handle = Z2SoundObjBase::startSound(soundID, mapinfo, reverb); - if (pos != NULL && handle != NULL && (*handle) != NULL) { + if (pos != NULL && handle != NULL && (*handle) != false) { if ((*handle)->acceptsNewAudible()) { (*handle)->newAudible(*pos, &field_0x20, 0, NULL); } @@ -266,7 +266,7 @@ Z2SoundHandlePool* Z2DopplerSoundObjBase::startLevelSound(JAISoundID soundID, u3 pos_ = NULL; Z2SoundHandlePool* handle = Z2SoundObjBase::startLevelSound(soundID, mapinfo, reverb); - if (pos != NULL && handle != NULL && (*handle) != NULL) { + if (pos != NULL && handle != NULL && (*handle) != false) { if ((*handle)->acceptsNewAudible()) { (*handle)->newAudible(*pos, &field_0x20, 0, NULL); } @@ -285,7 +285,7 @@ void Z2SoundObjSimple::init(Vec* posPtr, u8 handleNum) { Z2SoundHandlePool* Z2SoundObjSimple::startSound(JAISoundID soundID, u32 mapinfo, s8 reverb) { Z2SoundHandlePool* handle = Z2SoundObjBase::startSound(soundID, mapinfo, reverb); - if (soundID == Z2SE_AL_UKI_POKOPOKO && handle != NULL && (*handle) != NULL) { + if (soundID == Z2SE_AL_UKI_POKOPOKO && handle != NULL && (*handle) != false) { f32 volume = Z2Calc::getParamByExp((f32)mapinfo, 0.0f, 127.0f, 0.2f, 0.4f, 1.0f, Z2Calc::CURVE_POSITIVE); f32 pitch = Z2Calc::getParamByExp((f32)mapinfo, 0.0f, 127.0f, 0.2f, 0.6f, 1.2f, Z2Calc::CURVE_POSITIVE); (*handle)->getAuxiliary().movePitch(pitch, 0); @@ -298,7 +298,7 @@ Z2SoundHandlePool* Z2SoundObjSimple::startSound(JAISoundID soundID, u32 mapinfo, Z2SoundHandlePool* Z2SoundObjSimple::startLevelSound(JAISoundID soundID, u32 mapinfo, s8 reverb) { Z2SoundHandlePool* handle = Z2SoundObjBase::startLevelSound(soundID, mapinfo, reverb); - if (handle != NULL && (*handle) != NULL) { + if (handle != NULL && (*handle) != false) { f32 pitch = 1.0f; f32 volume = 1.0f; switch (soundID) { @@ -502,7 +502,7 @@ void Z2SoundObjAnime::startSoundInner(const JGeometry::TVec3& pos, f32 para u32 id = getSoundID(animationSound, pos, param_1); if (!Z2GetSeMgr()->isSoundCulling(id)) { JAISoundHandle* handle = getHandleUserData(user_data); - if (handle != NULL && (*handle) != NULL && (*handle)->getAnimationState() != 1) { + if (handle != NULL && (*handle) != false && (*handle)->getAnimationState() != 1) { handle = NULL; } @@ -514,7 +514,7 @@ void Z2SoundObjAnime::startSoundInner(const JGeometry::TVec3& pos, f32 para bool result = soundStarter->startSound(id, handle, &pos, mapinfo, (f32)reverb / 127.0f, animationSound->field_0x0c, (f32)animationSound->field_0x14 / 127.0f, -1.0f, -1.0f, 0); - if ((*handle) != NULL) { + if ((*handle) != false) { (*handle)->setAnimationState(1); (*handle)->setUserData(user_data); if (animationSound->setsLifeTime()) { diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index f175c04b54a..4b2ecd0bf82 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -857,7 +857,7 @@ BOOL cCc_Check() { BOOL rt = TRUE; for (int i = 0; i < ARRAY_SIZEU(DynamicNameTable); i++) { uintptr_t ptr = (uintptr_t)DMC[i]; - if (ptr != NULL) { + if (ptr != 0) { u32 ptr_hi_byte = ptr >> 0x18; if (ptr_hi_byte < 0x80 || ptr_hi_byte > 0x83) { // "cCc_Check invalid pointer detected" diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index a2b5a11f6d1..5f6bd7ca17d 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -3082,7 +3082,7 @@ cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) { } } else if (field_0x35c4.abs2XZ() > 1.0f && checkModeFlg(1)) { f32 var_f31; - if (checkWolf() != NULL) { + if (checkWolf() != 0) { var_f31 = 80.0f; } else { var_f31 = 150.0f; @@ -12223,7 +12223,7 @@ BOOL daAlink_c::checkGroundSpecialMode() { return procScreamWaitInit(); } - return NULL; + return 0; } int daAlink_c::commonCheckNextAction(int param_0) { diff --git a/src/d/actor/d_a_alink_horse.inc b/src/d/actor/d_a_alink_horse.inc index a637ef42cb3..e9ce673c989 100644 --- a/src/d/actor/d_a_alink_horse.inc +++ b/src/d/actor/d_a_alink_horse.inc @@ -339,7 +339,7 @@ void daAlink_c::setHorseStirrup() { if (field_0x2fab & 1) { mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(field_0x30bc)); mDoMtx_stack_c::transM(-2.0f, -11.0f, 1.5f); - mDoMtx_stack_c::ZXYrotM(NULL, -0x8000, 0x4000); + mDoMtx_stack_c::ZXYrotM(0, -0x8000, 0x4000); mDoMtx_copy(mDoMtx_stack_c::get(), horse->getLeftStirrupMtx()); } diff --git a/src/d/actor/d_a_alink_swim.inc b/src/d/actor/d_a_alink_swim.inc index 857a3693f6a..aa7cd983505 100644 --- a/src/d/actor/d_a_alink_swim.inc +++ b/src/d/actor/d_a_alink_swim.inc @@ -346,7 +346,7 @@ int daAlink_c::checkNextActionSwim() { int daAlink_c::checkSwimAction(int param_0) { f32 var_f31; if (checkWolf()) { - if (getMoveBGActorName(mLinkAcch.m_gnd, NULL) == PROC_Obj_ITA) { + if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == PROC_Obj_ITA) { var_f31 = 200.0f; } else { var_f31 = mpHIO->mWolf.mWlSwim.m.mStartHeight; diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index 609ba1e94dc..0a9d6c7a9a5 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -4083,7 +4083,7 @@ int daB_DR_c::create() { gravity = -3.0f; mSound.init(¤t.pos, &eyePos, 3, 1); - mColliderStts.Init(0x19, NULL, this); + mColliderStts.Init(0x19, 0, this); fopAcM_OnStatus(this, 0x4000); diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp index d7df1327edf..76b9ce8b3f2 100644 --- a/src/d/actor/d_a_balloon_2D.cpp +++ b/src/d/actor/d_a_balloon_2D.cpp @@ -165,18 +165,18 @@ int daBalloon2D_c::createHeap() { JKRArchive* arc = resInfo->getArchive(); mScreen->setPriority("zelda_balloon_game.blo", 0x20000, arc); dPaneClass_showNullPane(mScreen); - field_0x578 = new CPaneMgr(mScreen, 'n_all', 2, NULL); - field_0x57c = new CPaneMgr(mScreen, 'score_tn', 0, NULL); - field_0x580 = new CPaneMgr(mScreen, 'suji_n', 2, NULL); - field_0x584 = new CPaneMgr(mScreen, 's_set_n', 0, NULL); - field_0x588 = new CPaneMgr(mScreen, 'tas_n', 0, NULL); - field_0x58c = new CPaneMgr(mScreen, 'combo_tn', 0, NULL); - field_0x590 = new CPaneMgr(mScreen, 'num_n', 0, NULL); - field_0x594 = new CPaneMgr(mScreen, 'co_set_n', 2, NULL); - field_0x598 = new CPaneMgr(mScreen, 'bal_3_n', 2, NULL); - field_0x59c = new CPaneMgr(mScreen, 'bal_2_n', 2, NULL); - field_0x5a0 = new CPaneMgr(mScreen, 'bal_1_n', 2, NULL); - field_0x5a4 = new CPaneMgr(mScreen, 'ba_com_n', 2, NULL); + field_0x578 = new CPaneMgr(mScreen, MULTI_CHAR('n_all'), 2, NULL); + field_0x57c = new CPaneMgr(mScreen, MULTI_CHAR('score_tn'), 0, NULL); + field_0x580 = new CPaneMgr(mScreen, MULTI_CHAR('suji_n'), 2, NULL); + field_0x584 = new CPaneMgr(mScreen, MULTI_CHAR('s_set_n'), 0, NULL); + field_0x588 = new CPaneMgr(mScreen, MULTI_CHAR('tas_n'), 0, NULL); + field_0x58c = new CPaneMgr(mScreen, MULTI_CHAR('combo_tn'), 0, NULL); + field_0x590 = new CPaneMgr(mScreen, MULTI_CHAR('num_n'), 0, NULL); + field_0x594 = new CPaneMgr(mScreen, MULTI_CHAR('co_set_n'), 2, NULL); + field_0x598 = new CPaneMgr(mScreen, MULTI_CHAR('bal_3_n'), 2, NULL); + field_0x59c = new CPaneMgr(mScreen, MULTI_CHAR('bal_2_n'), 2, NULL); + field_0x5a0 = new CPaneMgr(mScreen, MULTI_CHAR('bal_1_n'), 2, NULL); + field_0x5a4 = new CPaneMgr(mScreen, MULTI_CHAR('ba_com_n'), 2, NULL); field_0x578->setAlphaRate(0.0f); field_0x5a4->setAlphaRate(0.0f); for (s32 i = 0; i < 10; i++) { @@ -197,17 +197,17 @@ int daBalloon2D_c::createHeap() { } J2DTextBox* combos[2]; J2DTextBox* scores[2]; - combos[0] = (J2DTextBox*)mScreen->search('combo_ts'); - combos[1] = (J2DTextBox*)mScreen->search('combo_t'); - scores[0] = (J2DTextBox*)mScreen->search('score_ts'); - scores[1] = (J2DTextBox*)mScreen->search('score_t'); - field_0x5a8[0] = (J2DPicture*)mScreen->search('suji_4'); - field_0x5a8[1] = (J2DPicture*)mScreen->search('suji_3'); - field_0x5a8[2] = (J2DPicture*)mScreen->search('suji_2'); - field_0x5a8[3] = (J2DPicture*)mScreen->search('suji_1'); - field_0x5a8[4] = (J2DPicture*)mScreen->search('suji_0'); - field_0x5a8[5] = (J2DPicture*)mScreen->search('num_1'); - field_0x5a8[6] = (J2DPicture*)mScreen->search('num_0'); + combos[0] = (J2DTextBox*)mScreen->search(MULTI_CHAR('combo_ts')); + combos[1] = (J2DTextBox*)mScreen->search(MULTI_CHAR('combo_t')); + scores[0] = (J2DTextBox*)mScreen->search(MULTI_CHAR('score_ts')); + scores[1] = (J2DTextBox*)mScreen->search(MULTI_CHAR('score_t')); + field_0x5a8[0] = (J2DPicture*)mScreen->search(MULTI_CHAR('suji_4')); + field_0x5a8[1] = (J2DPicture*)mScreen->search(MULTI_CHAR('suji_3')); + field_0x5a8[2] = (J2DPicture*)mScreen->search(MULTI_CHAR('suji_2')); + field_0x5a8[3] = (J2DPicture*)mScreen->search(MULTI_CHAR('suji_1')); + field_0x5a8[4] = (J2DPicture*)mScreen->search(MULTI_CHAR('suji_0')); + field_0x5a8[5] = (J2DPicture*)mScreen->search(MULTI_CHAR('num_1')); + field_0x5a8[6] = (J2DPicture*)mScreen->search(MULTI_CHAR('num_0')); for (int i = 0; i < 2; i++) { combos[i]->setString(32, ""); scores[i]->setString(32, ""); diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index c51a648a59e..85e416298a1 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -158,10 +158,10 @@ static const u32 l_lockSeFlg[BOOMERANG_LOCK_MAX] = { }; void daBoomerang_sight_c::initialize() { - m_cursorYellowAllPane = m_cursorYellowScrn->search('n_all'); - m_cursorYellow0Pane = m_cursorYellowScrn->search('cursor0'); - m_cursorYellow1Pane = m_cursorYellowScrn->search('cursor1'); - m_cursorYellow2Pane = m_cursorYellowScrn->search('cursor2'); + m_cursorYellowAllPane = m_cursorYellowScrn->search(MULTI_CHAR('n_all')); + m_cursorYellow0Pane = m_cursorYellowScrn->search(MULTI_CHAR('cursor0')); + m_cursorYellow1Pane = m_cursorYellowScrn->search(MULTI_CHAR('cursor1')); + m_cursorYellow2Pane = m_cursorYellowScrn->search(MULTI_CHAR('cursor2')); m_cursorYellowBck->searchUpdateMaterialID(m_cursorYellowScrn); m_cursorYellowAllPane->setAnimation(m_cursorYellowBck); @@ -174,7 +174,7 @@ void daBoomerang_sight_c::initialize() { m_cursorYellow0Pane->setAnimation(m_cursorYellowBpk); m_cursorYellow1Pane->setAnimation(m_cursorYellowBpk); m_cursorYellow2Pane->setAnimation(m_cursorYellowBpk); - m_cursorYellowScrn->search('flash')->setAnimation(m_cursorYellowBpk); + m_cursorYellowScrn->search(MULTI_CHAR('flash'))->setAnimation(m_cursorYellowBpk); m_cursorYellowBpk->setFrame(0.0f); m_cursorYellow2Brk->searchUpdateMaterialID(m_cursorYellowScrn); @@ -192,10 +192,10 @@ void daBoomerang_sight_c::initialize() { m_cursorYellowScrn->setUserInfo('n_43'); m_cursorYellowAllPane->setUserInfo(' '); - m_cursorRedAllPane = m_cursorRedScrn->search('n_all'); - m_cursorRed0Pane = m_cursorRedScrn->search('cursor0'); - m_cursorRed1Pane = m_cursorRedScrn->search('cursor1'); - m_cursorRed2Pane = m_cursorRedScrn->search('cursor2'); + m_cursorRedAllPane = m_cursorRedScrn->search(MULTI_CHAR('n_all')); + m_cursorRed0Pane = m_cursorRedScrn->search(MULTI_CHAR('cursor0')); + m_cursorRed1Pane = m_cursorRedScrn->search(MULTI_CHAR('cursor1')); + m_cursorRed2Pane = m_cursorRedScrn->search(MULTI_CHAR('cursor2')); m_cursorRedAllPane->setAnimation(m_cursorYellowBck); m_cursorRed0Pane->setAnimation(m_cursorYellowBck); @@ -204,7 +204,7 @@ void daBoomerang_sight_c::initialize() { m_cursorRed0Pane->setAnimation(m_cursorYellowBpk); m_cursorRed1Pane->setAnimation(m_cursorYellowBpk); m_cursorRed2Pane->setAnimation(m_cursorYellowBpk); - m_cursorRedScrn->search('flash')->setAnimation(m_cursorYellowBpk); + m_cursorRedScrn->search(MULTI_CHAR('flash'))->setAnimation(m_cursorYellowBpk); m_cursorRed2Brk->searchUpdateMaterialID(m_cursorRedScrn); m_cursorRedBrk->searchUpdateMaterialID(m_cursorRedScrn); @@ -221,10 +221,10 @@ void daBoomerang_sight_c::initialize() { m_cursorRedScrn->setUserInfo('n_43'); m_cursorRedAllPane->setUserInfo(' '); - m_cursorOrangeAllPane = m_cursorOrangeScrn->search('n_all'); - m_cursorOrange0Pane = m_cursorOrangeScrn->search('cursor0'); - m_cursorOrange1Pane = m_cursorOrangeScrn->search('cursor1'); - m_cursorOrange2Pane = m_cursorOrangeScrn->search('cursor2'); + m_cursorOrangeAllPane = m_cursorOrangeScrn->search(MULTI_CHAR('n_all')); + m_cursorOrange0Pane = m_cursorOrangeScrn->search(MULTI_CHAR('cursor0')); + m_cursorOrange1Pane = m_cursorOrangeScrn->search(MULTI_CHAR('cursor1')); + m_cursorOrange2Pane = m_cursorOrangeScrn->search(MULTI_CHAR('cursor2')); m_cursorOrangeAllPane->setAnimation(m_cursorYellowBck); m_cursorOrange0Pane->setAnimation(m_cursorYellowBck); @@ -233,7 +233,7 @@ void daBoomerang_sight_c::initialize() { m_cursorOrange0Pane->setAnimation(m_cursorYellowBpk); m_cursorOrange1Pane->setAnimation(m_cursorYellowBpk); m_cursorOrange2Pane->setAnimation(m_cursorYellowBpk); - m_cursorOrangeScrn->search('flash')->setAnimation(m_cursorYellowBpk); + m_cursorOrangeScrn->search(MULTI_CHAR('flash'))->setAnimation(m_cursorYellowBpk); m_cursorOrange2Brk->searchUpdateMaterialID(m_cursorOrangeScrn); m_cursorOrangeBrk->searchUpdateMaterialID(m_cursorOrangeScrn); diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index 660d279218d..2a457132c94 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -125,13 +125,13 @@ int daCoach2D_c::createHeap() { mpFireIconBrk->searchUpdateMaterialID(mpScrn); setBrkAnime(true); - mpPaneAll = new CPaneMgr(mpScrn, 'n_all', 2, NULL); - mpPaneBasha = new CPaneMgr(mpScrn, 'basha_n', 2, NULL); - mpPaneFire = new CPaneMgr(mpScrn, 'fire_n', 2, NULL); + mpPaneAll = new CPaneMgr(mpScrn, MULTI_CHAR('n_all'), 2, NULL); + mpPaneBasha = new CPaneMgr(mpScrn, MULTI_CHAR('basha_n'), 2, NULL); + mpPaneFire = new CPaneMgr(mpScrn, MULTI_CHAR('fire_n'), 2, NULL); - mpScrn->search('fire_b_n')->move(mpPaneFire->getPosX(), mpPaneFire->getPosY()); + mpScrn->search(MULTI_CHAR('fire_b_n'))->move(mpPaneFire->getPosX(), mpPaneFire->getPosY()); - mpPaneFireB = new CPaneMgr(mpScrn, 'fire_b_n', 2, NULL); + mpPaneFireB = new CPaneMgr(mpScrn, MULTI_CHAR('fire_b_n'), 2, NULL); mMsgLight = new dMsgScrnLight_c(6, 0xFF); @@ -288,7 +288,7 @@ void daCoach2D_c::update() { icon_pos_x -= var_f29; } - f32 var_f30 = 4.0f * ((J2DPicture*)mpScrn->search('basha_p0'))->getWhite().r; + f32 var_f30 = 4.0f * ((J2DPicture*)mpScrn->search(MULTI_CHAR('basha_p0')))->getWhite().r; if (var_f30 > 255.0f) { var_f30 = 255.0f; } @@ -320,14 +320,14 @@ void daCoach2D_c::setBrkAnime(bool param_0) { if (mBrkFrame >= mpFireIconBrk->getFrameMax()) { mBrkFrame -= mpFireIconBrk->getFrameMax(); } - mpScrn->search('basha_f0')->show(); + mpScrn->search(MULTI_CHAR('basha_f0'))->show(); } else { - mpScrn->search('basha_f0')->hide(); + mpScrn->search(MULTI_CHAR('basha_f0'))->hide(); mBrkFrame = 0.0f; } mpFireIconBrk->setFrame(mBrkFrame); - mpScrn->search('basha_p0')->setAnimation(mpFireIconBrk); + mpScrn->search(MULTI_CHAR('basha_p0'))->setAnimation(mpFireIconBrk); } static int daCoach2D_create(daCoach2D_c* i_this) { diff --git a/src/d/actor/d_a_coach_fire.cpp b/src/d/actor/d_a_coach_fire.cpp index 80433c573e6..f2f46b9eab7 100644 --- a/src/d/actor/d_a_coach_fire.cpp +++ b/src/d/actor/d_a_coach_fire.cpp @@ -113,11 +113,11 @@ int daCoachFire_c::execute() { dAttention_c* attn = dComIfGp_getAttention(); if (attn->LockonTruth()) { if (attn->LockonTarget(0) != this) { - if (coach->deleteFireArrowFromList(fopAcM_GetID(this)) != NULL) { + if (coach->deleteFireArrowFromList(fopAcM_GetID(this)) != false) { fopAcM_delete(this); } } - } else if (coach->deleteFireArrowFromList(fopAcM_GetID(this)) != NULL) { + } else if (coach->deleteFireArrowFromList(fopAcM_GetID(this)) != false) { fopAcM_delete(this); } } diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 60bde824e62..59ef62eea2d 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -306,7 +306,7 @@ int daDoor20_c::checkOpenMsgDoor(int* param_1) { *param_1 = 0; return 1; } - field_0x624.init(NULL, msgNo, NULL, NULL); + field_0x624.init(0, msgNo, NULL, NULL); int rv = field_0x624.checkOpenDoor(this, param_1); dMsgObject_endFlowGroup(); return rv; @@ -1380,7 +1380,7 @@ int daDoor20_c::createKey() { } field_0x5ec = fopAcM_createChildFromOffset(PROC_Obj_Lv5Key, fopAcM_GetID(this), 0xffffffff, - &cStack_28, roomNo, &cStack_30, &scale, 0xffffffff, 0); + &cStack_28, roomNo, &cStack_30, &scale, -1, 0); break; default: OSReport_Error("シャッタードア：鍵タイプが不明です\n"); // Shutter door: key type unknown @@ -1399,7 +1399,7 @@ int daDoor20_c::createKey() { } field_0x5ec = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffffff, - &cStack_28, roomNo, &cStack_30, &scale, 0xffffffff, 0); + &cStack_28, roomNo, &cStack_30, &scale, -1, 0); } current.pos = prevPos; diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp index dc5a0c4d314..a972d172324 100644 --- a/src/d/actor/d_a_e_arrow.cpp +++ b/src/d/actor/d_a_e_arrow.cpp @@ -330,7 +330,7 @@ static void e_arrow_spin(e_arrow_class* i_this) { } static void* s_limit_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) != NULL && i_actor != i_data && + if (fopAcM_IsActor(i_actor) != FALSE && i_actor != i_data && fopAcM_GetName(i_actor) == PROC_E_ARROW && static_cast(i_actor)->mAction == ACTION_ARROW_FIRE && fabsf(static_cast(i_actor)->field_0xa00.z - diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index be19dfcae20..9c8320c1888 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -93,7 +93,7 @@ int daE_BG_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { } int daE_BG_c::JointCallBack(J3DJoint* i_joint, int param_1) { - if (param_1 == NULL) { + if (param_1 == 0) { J3DModel* model = j3dSys.getModel(); daE_BG_c* bg = (daE_BG_c*)model->getUserArea(); if (bg != NULL) { diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index cd1fd1b1877..9ae161b9682 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -659,7 +659,7 @@ int daE_DF_c::Create() { return cPhs_ERROR_e; } - if (fopAcM_entrySolidHeap(this, useHeapInit, 0x1a40) == NULL) { + if (fopAcM_entrySolidHeap(this, useHeapInit, 0x1a40) == false) { return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index 4dac5344b4c..cfdcd944422 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -93,7 +93,7 @@ int daE_GI_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { } int daE_GI_c::JointCallBack(J3DJoint* i_joint, int param_1) { - if (param_1 == NULL) { + if (param_1 == 0) { J3DModel* model = j3dSys.getModel(); daE_GI_c* a_this = (daE_GI_c*)model->getUserArea(); diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index a1f202489a8..114ca27387e 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -119,7 +119,7 @@ int daE_HP_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { } int daE_HP_c::JointCallBack(J3DJoint* i_joint, int param_1) { - if (param_1 == NULL) { + if (param_1 == 0) { J3DModel* model = j3dSys.getModel(); daE_HP_c* poe = (daE_HP_c*)model->getUserArea(); if (poe != NULL) { @@ -155,7 +155,7 @@ int daE_HP_c::LampCtrlJoint(J3DJoint* i_joint, J3DModel* i_model) { } int daE_HP_c::LampJointCallBack(J3DJoint* i_joint, int param_1) { - if (param_1 == NULL) { + if (param_1 == 0) { J3DModel* model = j3dSys.getModel(); daE_HP_c* poe = (daE_HP_c*)model->getUserArea(); if (poe != NULL) { diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index 871708c0f9e..369b19b2161 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -2008,7 +2008,7 @@ static int daE_YH_Execute(e_yh_class* i_this) { J3DModel* model = i_this->mpMorf->getModel(); model->setBaseTRMtx(mDoMtx_stack_c::get()); - i_this->mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this))); + i_this->mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this))); i_this->mBrk->play(); i_this->mpMorf->modelCalc(); diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index 1bcc56551d5..38e63b4fa49 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -3147,7 +3147,7 @@ void daE_YM_c::action() { cXyz unused_vec(field_0x68c, field_0x68c, field_0x68c); cXyz my_pos = current.pos; setMidnaBindEffect(this, &mSound, &my_pos, &scale); - mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); mpBrk->play(); } diff --git a/src/d/actor/d_a_formation_mng.cpp b/src/d/actor/d_a_formation_mng.cpp index 531172731bc..70535c25ff0 100644 --- a/src/d/actor/d_a_formation_mng.cpp +++ b/src/d/actor/d_a_formation_mng.cpp @@ -382,7 +382,7 @@ void daFmtMng_c::create_init() { for (int i = 0; i < mFormationLine * mFormationRow; i++, member++) { member->mNpcId = fopAcM_createChild(0x294, fopAcM_GetID(this), (inTime << 0x10) | 0x200, &member->field_0x04, fopAcM_GetRoomNo(this), - &home.angle, NULL, 0xffffffff, NULL); + &home.angle, NULL, -1, NULL); } } diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 6eb85ad6f75..9f4dd6e463f 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -188,7 +188,7 @@ bool daKago_c::checkBck(int param_0) { } int daKago_c::draw() { - if (field_0x6de == NULL) { + if (field_0x6de == 0) { return 1; } @@ -511,7 +511,7 @@ void daKago_c::demo_skip(int param_0) { switch (param_0) { case 0: field_0x748 = 2; - field_0x74c = NULL; + field_0x74c = 0; break; case 1: field_0x728 = 0; @@ -525,7 +525,7 @@ void daKago_c::demo_skip(int param_0) { /* dSv_event_flag_c::M_051 - Main Event - Shadow Kargorok (?) (Large) event complete (Horse grass appears in various places) */ dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[84]); field_0x748 = 7; - field_0x74c = NULL; + field_0x74c = 0; break; case 4: setSceneChange(0); @@ -692,7 +692,7 @@ int daKago_c::setSceneChange(int param_0) { void daKago_c::createBalloonScore() { if (field_0x6e7 != 0 && mBalloon2DId == fpcM_ERROR_PROCESS_ID_e) { - mBalloon2DId = fopAcM_create(PROC_BALLOON2D, 0, 0, 0xffffffff, 0, 0, 0xffffffff); + mBalloon2DId = fopAcM_create(PROC_BALLOON2D, 0, 0, 0xffffffff, 0, 0, -1); field_0x6e9 = 1; } } @@ -1199,7 +1199,7 @@ void daKago_c::executeFly() { } if (field_0x744 == 3) { cLib_chaseUC(&field_0x6de, 0, 4); - cLib_addCalcAngleS(¤t.angle.x, 0xffffe000, 8, 0x100, 0x10); + cLib_addCalcAngleS(¤t.angle.x, -8192, 8, 0x100, 0x10); } else { cLib_addCalcAngleS(¤t.angle.x, unkInt2, 8, 0x100, 0x10); } @@ -2230,7 +2230,7 @@ bool daKago_c::PerchDemoAwayForward() { if (field_0x728 < 30) { cLib_addCalcAngleS(¤t.angle.x, 0, 8, 0x100, 0x40); } else { - cLib_addCalcAngleS(¤t.angle.x, 0xffffe000, 8, 0x100, 0x40); + cLib_addCalcAngleS(¤t.angle.x, -8192, 8, 0x100, 0x40); } shape_angle.x = current.angle.x; @@ -2277,7 +2277,7 @@ bool daKago_c::PerchDemoAwayForward() { cLib_chaseF(&field_0x6f8, 30.0f, 1.0f); - cLib_addCalcAngleS(¤t.angle.x, 0xffffe000, 8, 0x100, 0x40); + cLib_addCalcAngleS(¤t.angle.x, -8192, 8, 0x100, 0x40); shape_angle.x = current.angle.x; shape_angle.y = current.angle.y; @@ -2547,7 +2547,7 @@ bool daKago_c::executeFirstDemo() { if (field_0x728 > 30) { cLib_chaseF(&field_0x6cc, 350.0f, 4.0f); - cLib_addCalcAngleS(&field_0x718, 0xfffff800, 8, 0x100, 0x10); + cLib_addCalcAngleS(&field_0x718, -2048, 8, 0x100, 0x10); } else { cLib_chaseF(&field_0x6cc, 350.0f, 6.0f); cLib_addCalcAngleS(&field_0x718, 0x400, 8, 0x200, 0x10); @@ -2699,7 +2699,7 @@ bool daKago_c::executeFirstDemo() { case 6: dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); - cLib_addCalcAngleS(¤t.angle.x, 0xffffe000, 8, 0x100, 0x40); + cLib_addCalcAngleS(¤t.angle.x, -8192, 8, 0x100, 0x40); shape_angle.x = current.angle.x; shape_angle.y = current.angle.y; @@ -2944,7 +2944,7 @@ void daKago_c::executeLandingLakeHairia() { speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); speed.y = -field_0x6f8 * cM_ssin(current.angle.x); - cLib_chaseAngleS(&shape_angle.x, 0xffffe000, 0x100); + cLib_chaseAngleS(&shape_angle.x, -8192, 0x100); current.angle.x = shape_angle.x; if (field_0x728 == 90) { @@ -3078,7 +3078,7 @@ void daKago_c::executeLandingBoartHouse() { speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); speed.y = -field_0x6f8 * cM_ssin(current.angle.x); - cLib_chaseAngleS(&shape_angle.x, 0xffffe000, 0x100); + cLib_chaseAngleS(&shape_angle.x, -8192, 0x100); current.angle.x = shape_angle.x; if (field_0x728 == 0x50) { @@ -3391,7 +3391,7 @@ void daKago_c::setDashBlurEffect(int param_0) { field_0x6be.y = shape_angle.y; field_0x6be.z = 0; } - field_0xb40 = dComIfGp_particle_set(field_0xb40, 0x860f, &cameraEyeOffset, &tevStr, &field_0x6be, 0, 0xff, 0, 0xffffffff, 0, 0, 0); + field_0xb40 = dComIfGp_particle_set(field_0xb40, 0x860f, &cameraEyeOffset, &tevStr, &field_0x6be, 0, 0xff, 0, -1, 0, 0, 0); } void daKago_c::setWallHitEffect(cXyz param_0, int param_1) { @@ -3422,7 +3422,7 @@ void daKago_c::setSibukiEffect() { for (int i = 0; i < 3; i++) { field_0xb44[i] = dComIfGp_particle_set(field_0xb44[i], kago_wave_id[i], &acStack_28, &tevStr, &cStack_30, - 0, 0xff, 0, 0xffffffff, 0, 0, 0); + 0, 0xff, 0, -1, 0, 0, 0); } if (field_0x6e7 == 0) { @@ -3436,7 +3436,7 @@ void daKago_c::setDashSibukiEffect() { cXyz acStack_20(current.pos.x, field_0x70c + l_HIO.mYOffsetFromWaterSurface, current.pos.z); csXyz cStack_28(0, shape_angle.y, 0); field_0xb50 = dComIfGp_particle_set(field_0xb50, 0x86fe, &acStack_20, &tevStr, &cStack_28, 0, - 0xff, 0, 0xffffffff, 0, 0, 0); + 0xff, 0, -1, 0, 0, 0); } void daKago_c::setWaterFallEffect() { @@ -3450,7 +3450,7 @@ void daKago_c::setWaterFallEffect() { for (int i = 0; i < 2; i++) { field_0xb44[i] = dComIfGp_particle_set(field_0xb44[i], kago_wave_id[i], &acStack_28, &tevStr, &cStack_30, - 0, 0xff, 0, 0xffffffff, 0, 0, 0); + 0, 0xff, 0, -1, 0, 0, 0); } if (field_0x6e7 == 0) { mSound.startCreatureSoundLevel(Z2SE_EN_YC_SPLASH, 0, -1); @@ -3734,7 +3734,7 @@ int daKago_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) { } int daKago_c::JointCallBack(J3DJoint* param_0, int param_1) { - if (param_1 == NULL) { + if (param_1 == 0) { J3DModel* model = j3dSys.getModel(); daKago_c* kago = (daKago_c*)model->getUserArea(); if (kago != NULL) { diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 94cdc99ce53..8b90726ad19 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -3719,7 +3719,7 @@ BOOL daMP_WaitUntilPrepare() { } void daMP_PrepareReady(BOOL msg) { - OSSendMessage(&daMP_PrepareReadyQueue, (OSMessage)msg, 1); + OSSendMessage(&daMP_PrepareReadyQueue, (OSMessage)(uintptr_t)msg, 1); } static BOOL daMP_THPPlayerPrepare(s32 frame, s32 flag, s32 audioTrack) { diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 5090950574f..48d785a7cec 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -97,7 +97,7 @@ int daNbomb_c::searchEnemy(fopAc_ac_c* i_enemy) { static void* daNbomb_searchEnemy(fopAc_ac_c* i_actor, void* i_data) { if (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e && - ((daNbomb_c*)i_data)->searchEnemy(i_actor) != NULL) + ((daNbomb_c*)i_data)->searchEnemy(i_actor) != 0) { return i_actor; } diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index 7492657fd48..220c64af3fc 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -736,14 +736,14 @@ void daNpcBlueNS_c::playMotion() { int daNpcBlueNS_c::setAction(int (daNpcBlueNS_c::*i_action)(int)) { field_0xdc0 = 3; if (mAction != NULL) { - (this->*mAction)(NULL); + (this->*mAction)(0); } field_0xdc0 = 0; mAction = i_action; if (mAction != NULL) { - (this->*mAction)(NULL); + (this->*mAction)(0); } return 1; diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index 500ff60eaaf..6fc9002f1ab 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -362,7 +362,7 @@ int daNpcChin_c::CreateHeap() { setMotionAnm(motionAnmParam, 0.0f); - if (field_0xe24 != 0 && mSpotLight.loadModel() == NULL) { + if (field_0xe24 != 0 && mSpotLight.loadModel() == 0) { return 0; } @@ -439,7 +439,7 @@ int daNpcChin_c::createHeapCallBack(fopAc_ac_c* i_this) { } int daNpcChin_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { - if (param_1 == NULL) { + if (param_1 == 0) { J3DModel* model = j3dSys.getModel(); daNpcChin_c* chin = (daNpcChin_c*)model->getUserArea(); if (chin != NULL) { diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index 850c5baa7bc..f579985d22b 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -883,7 +883,7 @@ void daNpc_Fairy_c::srchActors() { BOOL daNpc_Fairy_c::evtTalk() { if (chkAction(&daNpc_Fairy_c::talk)) { - (this->*mAction)(NULL); + (this->*mAction)(0); } else { mPreItemNo = 0; @@ -952,7 +952,7 @@ void daNpc_Fairy_c::action() { } if (mAction) { - (this->*mAction)(NULL); + (this->*mAction)(0); } } @@ -1124,7 +1124,7 @@ BOOL daNpc_Fairy_c::setAction(actionFunc action, int param_2) { mMode = 0xFFFF; if (mAction) { - (this->*mAction)(NULL); + (this->*mAction)(0); } mMode = 0; diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index 819b40db8c8..c530f869f99 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -448,8 +448,8 @@ BOOL daNpc_grM_c::evtProc() { int face_motion, motion; if (ctrlMsgAnm(&face_motion, &motion, this, field_0xe2d)) { if (field_0xe26) { - mFaceMotionSeqMngr.setNo(face_motion, -1.0f, TRUE, NULL); - mMotionSeqMngr.setNo(motion, -1.0f, TRUE, NULL); + mFaceMotionSeqMngr.setNo(face_motion, -1.0f, TRUE, 0); + mMotionSeqMngr.setNo(motion, -1.0f, TRUE, 0); } } else if (tmp != 0 && field_0xe26) { setAfterTalkMotion(); diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index 06dc3c57a79..e80428e355b 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -1791,7 +1791,7 @@ int daNpc_Hanjo_c::takayose(void* param_0) { } } } - if (daPy_py_c::checkNowWolf() && mCyl2.ChkCoHit() != NULL) { + if (daPy_py_c::checkNowWolf() && mCyl2.ChkCoHit() != 0) { if (!daPy_getPlayerActorClass()->checkPlayerFly() || daPy_getPlayerActorClass()->checkAutoJump() || daPy_getPlayerActorClass()->checkWolfTriggerJump()) diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 53eb4bb2d83..0b41cad2b4b 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -277,7 +277,7 @@ static void message_shop(npc_henna_class* i_this) { i_this->field_0x750 = 1; } if (i_this->field_0x750 != 0) { - fopAcM_OffStatus(actor, NULL); + fopAcM_OffStatus(actor, 0); cLib_offBit(actor->attention_info.flags, fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e); } else { fopAcM_OnStatus(actor, 0); @@ -2498,7 +2498,7 @@ static int daNpc_Henna_Execute(npc_henna_class* i_this) { mDoMtx_stack_c::transS(-460.0f + AREG_F(0), 51.0f + AREG_F(1), -240.0f + AREG_F(2)); mDoMtx_stack_c::YrotM(-17729 + AREG_S(0)); - mDoMtx_stack_c::XrotM(AREG_S(1) - 0x8107); + mDoMtx_stack_c::XrotM((s16)(AREG_S(1) - 0x8107)); mDoMtx_stack_c::ZrotM(AREG_S(2) + 2000 + sp_0xe); } else { mDoMtx_stack_c::transS(-790.0f + AREG_F(0), 153.0f + AREG_F(1), diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index 2d592ec85e7..e9544a9a529 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -853,7 +853,7 @@ BOOL daNpcKasiHana_c::main() { } if (mAction) { - (this->*mAction)(NULL); + (this->*mAction)(0); } mKasiMng.sendInfo(); @@ -1072,14 +1072,14 @@ BOOL daNpcKasiHana_c::setAction(actionFunc action) { mMode = -1; if (mAction) { - (this->*mAction)(NULL); + (this->*mAction)(0); } mMode = 0; mAction = action; if (mAction) { - (this->*mAction)(NULL); + (this->*mAction)(0); } return TRUE; diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index 27c4a0b6baf..8f3f9464cf6 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -400,7 +400,7 @@ BOOL daNpcKasiKyu_c::main() { } if (mAction) { - (this->*mAction)(NULL); + (this->*mAction)(0); } playMotion(); @@ -621,14 +621,14 @@ BOOL daNpcKasiKyu_c::setAction(actionFunc action) { mMode = -1; if (mAction) { - (this->*mAction)(NULL); + (this->*mAction)(0); } mMode = 0; mAction = action; if (mAction) { - (this->*mAction)(NULL); + (this->*mAction)(0); } return TRUE; diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index e76b9b98239..791cecafb03 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -400,7 +400,7 @@ BOOL daNpcKasiMich_c::main() { } if (mAction) { - (this->*mAction)(NULL); + (this->*mAction)(0); } playMotion(); @@ -621,14 +621,14 @@ BOOL daNpcKasiMich_c::setAction(actionFunc action) { mMode = -1; if (mAction) { - (this->*mAction)(NULL); + (this->*mAction)(0); } mMode = 0; mAction = action; if (mAction) { - (this->*mAction)(NULL); + (this->*mAction)(0); } return TRUE; diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index 6a6568f9d51..1197e744cee 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -4965,7 +4965,7 @@ int daNpc_Kn_c::setPrtcl() { mParticleMngr[i].mpModel == true ? &mParticleMngr[i].mAngle : NULL, 0, fopAcM_GetRoomNo(this), 0.0f, speedF); - if (mParticleMngr[i].mpModel != NULL) { + if (mParticleMngr[i].mpModel != false) { emitter = mParticleMngr[i].mManager.getCenterEmitter(0, 0); if (emitter != NULL) { switch (i) { diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index 2301e4fc8a2..fbb6ebcad98 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -386,7 +386,7 @@ int daNpc_Maro_c::Execute() { setSellItemMax(getMaxNumItem()); field_0xf60 = -1; setMasterType(2); - mShopCamAction.setCamDataIdx(NULL); + mShopCamAction.setCamDataIdx(0); mShopCamAction.setCamAction(NULL); field_0x1131 = 1; } diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index 1b897adfaa6..cc9b2382d91 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -421,7 +421,7 @@ int daNpcRafrel_c::createHeapCallBack(fopAc_ac_c* i_this) { } int daNpcRafrel_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { - if (param_1 == NULL) { + if (param_1 == 0) { J3DModel* mdl_p = j3dSys.getModel(); daNpcRafrel_c* i_this = (daNpcRafrel_c*)mdl_p->getUserArea(); diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index 395d5a0f87a..15f99d924c8 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -1485,7 +1485,7 @@ bool daNpcShad_c::talk(void* param_1) { if (strcmp(dComIfGp_getStartStageName(), "R_SP116") == 0 || mCurAngle.y == fopAcM_searchPlayerAngleY(this)) { if (talkProc(NULL, TRUE, NULL)) { mActorMngr[0].entry(daPy_getPlayerActorClass()); - itemNo = NULL; + itemNo = 0; eventID = mFlow.getEventId(&itemNo); OS_REPORT("会話終了時 イベントID=%d アイテムNo=%d\n", eventID, itemNo); // At the end of the conversation, Event ID=%d Item No=%d diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index 09e5a645142..8b83afb997d 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -1340,7 +1340,7 @@ void daNPC_TK_c::executeBack() { if (current.pos.y > unkXyz1.y) { cLib_chaseAngleS(&shape_angle.x, 0x2000, 0x400); } else { - cLib_chaseAngleS(&shape_angle.x, 0xffffe000, 0x400); + cLib_chaseAngleS(&shape_angle.x, -8192, 0x400); } } else { cLib_chaseAngleS(&field_0x69c, 0x200, 0x10); @@ -1379,7 +1379,7 @@ void daNPC_TK_c::executeBack() { if (current.pos.y > unkXyz1.y) { cLib_chaseAngleS(&shape_angle.x, 0x2000, 0x400); } else { - cLib_chaseAngleS(&shape_angle.x, 0xffffe000, 0x400); + cLib_chaseAngleS(&shape_angle.x, -8192, 0x400); } } else { cLib_chaseAngleS(&field_0x69c, 0x200, 0x10); @@ -2456,7 +2456,7 @@ void daNPC_TK_c::executeWolfPerch() { void daNPC_TK_c::executeResistanceDemo() { daNpcMoiR_c* npcMoiR; - if (fopAcM_SearchByName(PROC_NPC_MOIR, (fopAc_ac_c**)&npcMoiR) == NULL || npcMoiR == NULL) { + if (fopAcM_SearchByName(PROC_NPC_MOIR, (fopAc_ac_c**)&npcMoiR) == 0 || npcMoiR == NULL) { return; } @@ -2623,7 +2623,7 @@ void daNPC_TK_c::executeResistanceDemo() { // fallthrough case 8: { - cLib_addCalcAngleS2(&field_0x6a2, 0xffffdc00, 8, 0x200); + cLib_addCalcAngleS2(&field_0x6a2, -9216, 8, 0x200); cLib_addCalcAngleS2(&field_0x6a0, 0x1000, 8, 0x200); cLib_addCalcAngleS2(&field_0x6aa, 0x2000, 8, 0x200); diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index 103a9d57f25..d364c06cc19 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -176,7 +176,7 @@ static void Wind_effect(npc_tkj2_class* i_this) { if ((s16)(sVar1 - i_this->field_0x5c4) < 0) { cLib_addCalcAngleS(&a_this->shape_angle.z, 0x2000, 0x10, 0x1000, 0); } else { - cLib_addCalcAngleS(&a_this->shape_angle.z, 0xFFFFE000, 2, 0x1000, 0); + cLib_addCalcAngleS(&a_this->shape_angle.z, -8192, 2, 0x1000, 0); } } diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index 2d0db6e9b8e..093423cc663 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -904,12 +904,12 @@ int daNpc_Uri_c::selectAction() { switch (mType) { case TYPE_1: - if (field_0x100d != NULL) { + if (field_0x100d != 0) { field_0xfc0[0] = &daNpc_Uri_c::sitWait; } else { - if (field_0x100e != NULL) { + if (field_0x100e != 0) { /* T_0007 - Ordon Village - During Uli's pick-up tutorial */ - if (daNpcT_chkTmpBit(7) && field_0x100f == NULL) { + if (daNpcT_chkTmpBit(7) && field_0x100f == 0) { field_0xfc0[0] = &daNpc_Uri_c::walk; } else { field_0xfc0[0] = &daNpc_Uri_c::wait; @@ -981,7 +981,7 @@ int daNpc_Uri_c::getTutorialCond(cXyz param_1) { field_0x1000 = mpHIO->m.field_0xa8 - 100.0f; return 5; } - if (field_0x1009 != NULL) { + if (field_0x1009 != 0) { return 8; } } diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index 7aac0c13405..25b3df0e8fe 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -462,7 +462,7 @@ int daNpc_ykW_c::createHeapCallBack(fopAc_ac_c* i_this) { } int daNpc_ykW_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { - if (param_1 == NULL) { + if (param_1 == 0) { J3DModel* model = j3dSys.getModel(); daNpc_ykW_c* ykw = (daNpc_ykW_c*)model->getUserArea(); if (ykw != 0) { @@ -1822,7 +1822,7 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) { itemPos.y += 50.0f; unkActor1 = fopAcM_fastCreateItem(&itemPos, 0, fopAcM_GetRoomNo(this), &unkSxyz, - &unkXyz1, &unkFloat2, &unkFloat3, -1, NULL, NULL); + &unkXyz1, &unkFloat2, &unkFloat3, -1, 0, NULL); if (unkActor1 != NULL) { mDoAud_seStart(Z2SE_OBJ_YO_HEART_S, &itemPos, 0, 0); fopAcM_OnStatus(unkActor1, fopAcM_STATUS_UNK_0x4000); diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp index 23b4daf8fa6..795b9ff45f4 100644 --- a/src/d/actor/d_a_obj_avalanche.cpp +++ b/src/d/actor/d_a_obj_avalanche.cpp @@ -253,7 +253,7 @@ int daObjAvalanche_c::demoProc() { void daObjAvalanche_c::setEffect() { cXyz acStack_18(0.0f, 0.0f, 0.0f); csXyz cStack_20(0, 0, 0); - dComIfGp_particle_set(0x8c51, &acStack_18, &cStack_20, NULL, 0xff, NULL, 0xffffffff, NULL, NULL, + dComIfGp_particle_set(0x8c51, &acStack_18, &cStack_20, NULL, 0xff, NULL, -1, NULL, NULL, NULL); } diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 23ce104482d..eb187f1ac01 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -509,7 +509,7 @@ int daObjBATTA_c::execute() { action(); mBrk->play(); mBtk->play(); - mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); mtx_set(); if (field_0x9f0 == 0) { mSph.SetC(current.pos); diff --git a/src/d/actor/d_a_obj_bed.cpp b/src/d/actor/d_a_obj_bed.cpp index 37de863ca69..06c2eb71dae 100644 --- a/src/d/actor/d_a_obj_bed.cpp +++ b/src/d/actor/d_a_obj_bed.cpp @@ -30,7 +30,7 @@ void daObj_Bed_HIO_c::genMessage(JORMContext* ctx) { } #endif -daObj_Bed_HIOParam const daObj_Bed_Param_c::m = {NULL, -3.0f, 1.0f, 600.0f}; +daObj_Bed_HIOParam const daObj_Bed_Param_c::m = {0, -3.0f, 1.0f, 600.0f}; daObj_Bed_c::~daObj_Bed_c() { if (mpCollider != NULL) { diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index d2918eeaeb1..08fc622c8c6 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -68,7 +68,7 @@ int daBkyRock_c::draw() { mModels[mMode], &tevStr); if (field_0x57a) { - dMdl_c* dMdl = dMdl_mng_c::entry(mModels[2]->getModelData(), NULL, current.roomNo); + dMdl_c* dMdl = dMdl_mng_c::entry(mModels[2]->getModelData(), 0, current.roomNo); if (dMdl != NULL) { _pieceData* piece = mPieces; for (int i = 0; i < 20; i++, piece++) { diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index eadbca6baac..e16f6a753a6 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -288,7 +288,7 @@ void daBmWindow_c::setBreakEffect(int param_1) { } int temp = param_1 * 3; for (int i = temp; i < temp + 3; i++) { - dComIfGp_particle_set(particle_id[i], &cStack_2c, &cStack_40, &scale, 0xff, 0, 0xffffffff, + dComIfGp_particle_set(particle_id[i], &cStack_2c, &cStack_40, &scale, 0xff, 0, -1, NULL, NULL, NULL); } } diff --git a/src/d/actor/d_a_obj_digholl.cpp b/src/d/actor/d_a_obj_digholl.cpp index 0e9aca1f7c0..d9fa7f35283 100644 --- a/src/d/actor/d_a_obj_digholl.cpp +++ b/src/d/actor/d_a_obj_digholl.cpp @@ -74,9 +74,9 @@ int daObjDigholl_c::execute() { } if (player->current.pos.abs(current.pos) < 1000.0f) { - dComIfGp_particle_setSimple(0x70f, ¤t.pos, 0xff, g_whiteColor, g_whiteColor, NULL, + dComIfGp_particle_setSimple(0x70f, ¤t.pos, 0xff, g_whiteColor, g_whiteColor, 0, 0.0f); - dComIfGp_particle_setSimple(0x73d, ¤t.pos, 0xff, g_whiteColor, g_whiteColor, NULL, + dComIfGp_particle_setSimple(0x73d, ¤t.pos, 0xff, g_whiteColor, g_whiteColor, 0, 0.0f); } diff --git a/src/d/actor/d_a_obj_flag.cpp b/src/d/actor/d_a_obj_flag.cpp index 7443e8fa3f0..9e2e11bdafc 100644 --- a/src/d/actor/d_a_obj_flag.cpp +++ b/src/d/actor/d_a_obj_flag.cpp @@ -80,7 +80,7 @@ void daObjFlag_c::calcJointAngle() { joint->mJoint3 = joint->mJoint1 - joint->mJoint2; } - if(attr().field_0x25 != NULL) { + if(attr().field_0x25 != 0) { if(i == 1) { calcAngleSwingX(joint, power); } diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index 655f6257202..8f85615ea90 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -62,7 +62,7 @@ static void break_eff(obj_kbox_class* i_this) { fopAcM_GetRoomNo(&i_this->mActor), NULL, NULL, &particleScale); dPa_modelEcallBack::setModel(pEmitter, kibako_bmd, i_this->mActor.tevStr, 3, NULL, 0, 0); for (int i = 0; i < 3; i++) { - dComIfGp_particle_set(particle_id[i], &emitterPos, 0, &particleScale, 0xff, 0, 0xffffffff, + dComIfGp_particle_set(particle_id[i], &emitterPos, 0, &particleScale, 0xff, 0, -1, 0, 0, 0); } } @@ -213,7 +213,7 @@ static void kbox_float(obj_kbox_class* i_this) { i_this->field_0x5a4 + i_this->field_0x590 + i_this->field_0x58c + i_this->field_0x5ac; i_this->field_0x9e8 = dComIfGp_particle_set(i_this->field_0x9e8, 0x86c3, &cStack_88, &a_this->tevStr, &a_this->shape_angle, - &cStack_7c, 0xff, 0, 0xffffffff, 0, 0, 0); + &cStack_7c, 0xff, 0, -1, 0, 0, 0); if (i_this->field_0x5ac <= -50.0f) { fopAcM_delete(a_this); dComIfGp_particle_set(0x86c4, &cStack_88, &a_this->tevStr, &a_this->shape_angle, diff --git a/src/d/actor/d_a_obj_laundry_rope.cpp b/src/d/actor/d_a_obj_laundry_rope.cpp index f23271db218..080f45915b8 100644 --- a/src/d/actor/d_a_obj_laundry_rope.cpp +++ b/src/d/actor/d_a_obj_laundry_rope.cpp @@ -113,7 +113,7 @@ cXyz* daObjLndRope_c::getRopeStartPos() { } f32 daObjLndRope_c::getStartRate(cXyz* i_ropeSegmentPos) { - if (mFlag != NULL) { + if (mFlag != 0) { return mScale * (i_ropeSegmentPos->x - getRopeStartPos()->x); } else { return mScale * (i_ropeSegmentPos->z - getRopeStartPos()->z); diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index 4d75aacb08b..77011548d5c 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -53,14 +53,14 @@ static int tandem; static int demo_f; -static int target_info[10]; +static void* target_info[10]; static int target_info_count; static void* s_ks_sub(void* param_1, void* param_2) { if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == 0x60) { if (target_info_count < 10) { - target_info[target_info_count] = (intptr_t)param_1; + target_info[target_info_count] = param_1; target_info_count++; } return param_1; @@ -77,7 +77,7 @@ static int hit_check(obj_lp_class* i_this, wd_ss* WdSs) { fVar1 = 50.0f; for (int i = 0; i < target_info_count; i++) { - sp6c = WdSs->field_0x10 - *(cXyz *)(target_info[i] + 0x4d0); + sp6c = WdSs->field_0x10 - *(cXyz *)((u8 *)target_info[i] + 0x4d0); if (sp6c.y >= -3.0f) { f32 dist = JMAFastSqrt(sp6c.x * sp6c.x + sp6c.z * sp6c.z); if (dist <= fVar1 * WdSs->field_0x3c) { @@ -126,7 +126,7 @@ static int hit_check(obj_lp_class* i_this, wd_ss* WdSs) { cLib_addCalc2(&WdSs->field_0x10.y, WdSs->field_0x4.y + fVar8 * -0.5f, 0.5f, 3.0f); cLib_addCalc2(&WdSs->field_0x28.x, fVar8, 0.1f, fVar8 * 0.5f); cLib_addCalcAngleS2(&WdSs->field_0x34, cM_atan2s(sp6c.x, sp6c.z), 0x20, 0x400); - cLib_addCalcAngleS2(&WdSs->field_0x36, 0xfffff060, 0x20, 0x400); + cLib_addCalcAngleS2(&WdSs->field_0x36, -4000, 0x20, 0x400); rv = 1; } } @@ -221,7 +221,7 @@ static int daObj_Lp_Execute(obj_lp_class* i_this) { target_info[i] = 0; } - target_info[0] = (intptr_t)dComIfGp_getPlayer(0); + target_info[0] = dComIfGp_getPlayer(0); target_info_count = 1; if (strcmp(dComIfGp_getStartStageName(), "D_MN05") == 0) { diff --git a/src/d/actor/d_a_obj_lv3Water.cpp b/src/d/actor/d_a_obj_lv3Water.cpp index 704f35dcf56..e9b17c3ad6b 100644 --- a/src/d/actor/d_a_obj_lv3Water.cpp +++ b/src/d/actor/d_a_obj_lv3Water.cpp @@ -31,7 +31,7 @@ class daLv3Water_HIO_c : public mDoHIO_entry_c { }; daLv3Water_HIO_c::daLv3Water_HIO_c() { - mLevelControlWaitFrames = NULL; + mLevelControlWaitFrames = 0; } #if DEBUG diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp index a28b3dca489..da9f2efe235 100644 --- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp +++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp @@ -127,7 +127,7 @@ int daLv6ChangeGate_c::Execute(Mtx** param_0) { for (int i = 0; i < 12; i++) { cXyz spC(cyl_x_offset + mMoveTransX, 0.0f, 0.0f); - mDoMtx_stack_c::ZXYrotS(NULL, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::ZXYrotS(0, shape_angle.y, shape_angle.z); mDoMtx_stack_c::multVec(&spC, &spC); spC += current.pos; @@ -251,7 +251,7 @@ void daLv6ChangeGate_c::init_modeBreak() { void daLv6ChangeGate_c::modeBreak() { cXyz effpos(mMoveTransX, 0.0f, 0.0f); - mDoMtx_stack_c::ZXYrotS(NULL, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::ZXYrotS(0, shape_angle.y, shape_angle.z); mDoMtx_stack_c::multVec(&effpos, &effpos); effpos += current.pos; diff --git a/src/d/actor/d_a_obj_lv6TogeRoll.cpp b/src/d/actor/d_a_obj_lv6TogeRoll.cpp index 9fe14383992..2ee3dbd3340 100644 --- a/src/d/actor/d_a_obj_lv6TogeRoll.cpp +++ b/src/d/actor/d_a_obj_lv6TogeRoll.cpp @@ -206,7 +206,7 @@ void daTogeRoll_c::moveTogeRoll() { &daTogeRoll_c::modeBound, &daTogeRoll_c::modeBound2, &daTogeRoll_c::modeBoundWait, }; - if (field_0x5dc == NULL) { + if (field_0x5dc == 0) { for (int i = 0; i < 8; i++) { if (mSph[i].ChkCoHit()) { fopAc_ac_c* hit_actor = dCc_GetAc(mSph[i].GetCoHitObj()->GetAc()); @@ -264,7 +264,7 @@ void daTogeRoll_c::init_modeBoundWait() { } void daTogeRoll_c::modeBoundWait() { - if (field_0x5db != NULL) { + if (field_0x5db != 0) { field_0x5db -= 1; } else { field_0x5dc = 0; diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index c7e58cc22a0..134c3fa0424 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -494,7 +494,7 @@ void daObjLv6Bm_c::calcBeam() { if (field_0xa19 > 0) { cXyz sp84(field_0x9f8); - if (fopAcM_lc_c::lineCheck(&field_0x9e4, &field_0x9f8, this) != NULL && fopAcM_lc_c::checkGroundHit()) { + if (fopAcM_lc_c::lineCheck(&field_0x9e4, &field_0x9f8, this) != false && fopAcM_lc_c::checkGroundHit()) { sp84 = fopAcM_lc_c::getCross(); } diff --git a/src/d/actor/d_a_obj_magne_arm.cpp b/src/d/actor/d_a_obj_magne_arm.cpp index e2531f8d34f..049323dace9 100644 --- a/src/d/actor/d_a_obj_magne_arm.cpp +++ b/src/d/actor/d_a_obj_magne_arm.cpp @@ -186,8 +186,8 @@ int daObjMarm_c::Create() { mIsYRotForward = 0; } - if (dComIfG_Bgsp().Regist((dBgW_Base*)mpBgW1, this) != NULL || - dComIfG_Bgsp().Regist((dBgW_Base*)mpBgW2, this) != NULL) + if (dComIfG_Bgsp().Regist((dBgW_Base*)mpBgW1, this) != false || + dComIfG_Bgsp().Regist((dBgW_Base*)mpBgW2, this) != false) { return FALSE; } @@ -1060,11 +1060,11 @@ void daObjMarm_c::debugDraw() { } int daObjMarm_c::Delete() { - if (mpBgW1 != NULL && mpBgW1->ChkUsed() != NULL) { + if (mpBgW1 != NULL && mpBgW1->ChkUsed() != false) { dComIfG_Bgsp().Release(mpBgW1); } - if (mpBgW2 != NULL && mpBgW2->ChkUsed() != NULL) { + if (mpBgW2 != NULL && mpBgW2->ChkUsed() != false) { dComIfG_Bgsp().Release(mpBgW2); } endMagneHoleEffect(); diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index 9d79d4847c2..131ccf39e16 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -114,7 +114,7 @@ int daObj_Maki_Execute(obj_maki_class* i_this) { cxyz.y += 20000.0f; i_this->field_0x6f8[0] = dComIfGp_particle_set( i_this->field_0x6f8[0], 0x820b, &i_this->current.pos, &i_this->tevStr, - &i_this->shape_angle, 0, 0xff, 0, 0xffffffff, 0, 0, 0); + &i_this->shape_angle, 0, 0xff, 0, -1, 0, 0, 0); fopAcM_seStartLevel(i_this, 0x800a6, 0); } } diff --git a/src/d/actor/d_a_obj_prop.cpp b/src/d/actor/d_a_obj_prop.cpp index fc2b773538c..273e03b5f1c 100644 --- a/src/d/actor/d_a_obj_prop.cpp +++ b/src/d/actor/d_a_obj_prop.cpp @@ -53,7 +53,7 @@ int daObjProp_c::Delete() { } int daObjProp_c::draw() { - g_env_light.settingTevStruct(NULL, ¤t.pos, &tevStr); + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdate(mpModel); return 1; diff --git a/src/d/actor/d_a_obj_rfHole.cpp b/src/d/actor/d_a_obj_rfHole.cpp index 02d1883cd1a..6433549b881 100644 --- a/src/d/actor/d_a_obj_rfHole.cpp +++ b/src/d/actor/d_a_obj_rfHole.cpp @@ -157,7 +157,7 @@ void daRfHole_c::setBreakEffect() { mDoMtx_stack_c::multVec(&acStack_24, &acStack_24); cXyz cStack_30 = current.pos + acStack_24; for (int i = 0; i < 5; i++) { - dComIfGp_particle_set(particle_id[i], &cStack_30, NULL, &scale, 0xff, 0, 0xffffffff, NULL, + dComIfGp_particle_set(particle_id[i], &cStack_30, NULL, &scale, 0xff, 0, -1, NULL, NULL, NULL); } } diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp index 9c0874ccab1..402ca74b463 100644 --- a/src/d/actor/d_a_obj_rope_bridge.cpp +++ b/src/d/actor/d_a_obj_rope_bridge.cpp @@ -16,7 +16,7 @@ static char* l_ropeArcName = "L_Ropest"; void daObjRBridge_c::initBaseMtx() { mDoMtx_stack_c::transS(current.pos); - mDoMtx_stack_c::ZXYrotM(NULL, current.angle.y, 0); + mDoMtx_stack_c::ZXYrotM(0, current.angle.y, 0); MTXCopy(mDoMtx_stack_c::get(), mMtx); mpBrgModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index 1e2ff2ccbd8..fcf5bf8107a 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -255,7 +255,7 @@ int daObj_Sekizoa_c::CreateHeap() { } if (mType == TYPE_6) { int success_create = mInvModel.create(mpMorf[0]->getModel(), 1); - if (success_create == NULL) { + if (success_create == 0) { return 0; } @@ -736,7 +736,7 @@ void daObj_Sekizoa_c::setAttnPos() { mpMorf[1]->modelCalc(); } if (mpMcaMorf != NULL) { - ((mDoExt_McaMorfSO*)mpMcaMorf)->play(NULL, 0); + ((mDoExt_McaMorfSO*)mpMcaMorf)->play(0, 0); if (mType == TYPE_1 || mType == TYPE_3 || mType == TYPE_5) { mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(7)); } else { diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 0431d31851f..47ffa2a36c0 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -831,7 +831,7 @@ static void demo_camera(obj_so_class* i_this) { // fallthrough case 2: sp3c.set(12459.0f, 3152.0f, 4628.0f); - daPy_getPlayerActorClass()->setPlayerPosAndAngle(&sp3c, 0xfffffaee, 0); + daPy_getPlayerActorClass()->setPlayerPosAndAngle(&sp3c, -1298, 0); i_this->mDemoCamCenter.x = a_this->current.pos.x; i_this->mDemoCamCenter.z = a_this->current.pos.z; sp3c.y = (a_this->current.pos.y + 150.0f) - 50.0f; diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index c5ddc061b9e..1d7c35e86d1 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -807,7 +807,7 @@ void daObjStone_c::init_modeBreak() { JPABaseEmitter* emitter = dComIfGp_particle_set( 0x15c, ¤t.pos, 0, &acStack_40, 0xff, &dPa_modelEcallBack::getEcallback(), fopAcM_GetRoomNo(this), 0, 0, 0); dPa_modelEcallBack::setModel(emitter, stone_bmd, tevStr, - 3, 0, NULL, 0); + 3, 0, 0, 0); for (int i = 0; i < 3; i = i + 1) { dComIfGp_particle_set( l_eff_id[i], @@ -947,7 +947,7 @@ void daObjStone_c::set_carry_eff() { if (field_0x0950 == 3) { for (int i = 0; i < 3; i++) { field_0x0964[i] = - dComIfGp_particle_set(l_carry_eff_id[i], ¤t.pos, 0, &pos, 0xFF, 0, 0xFFFFFFFF, + dComIfGp_particle_set(l_carry_eff_id[i], ¤t.pos, 0, &pos, 0xFF, 0, -1, 0, 0, 0); // float literal inline if (field_0x0964[i] != 0) { field_0x0964[i]->becomeImmortalEmitter(); diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp index f01ec869f71..f7693409763 100644 --- a/src/d/actor/d_a_obj_tks.cpp +++ b/src/d/actor/d_a_obj_tks.cpp @@ -279,7 +279,7 @@ int daObjTks_c::createHeapCallBack(fopAc_ac_c* i_this) { } int daObjTks_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { - if (param_1 == NULL) { + if (param_1 == 0) { J3DModel* mdl_p = j3dSys.getModel(); daObjTks_c* a_this = (daObjTks_c*)mdl_p->getUserArea(); diff --git a/src/d/actor/d_a_obj_vground.cpp b/src/d/actor/d_a_obj_vground.cpp index 47dae42331e..3af6e0c5e71 100644 --- a/src/d/actor/d_a_obj_vground.cpp +++ b/src/d/actor/d_a_obj_vground.cpp @@ -47,7 +47,7 @@ int daObjVGnd_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 0xb); JUT_ASSERT(198, pbtk != NULL); mpBtk = new mDoExt_btkAnm(); - if ((!mpBtk) || (!mpBtk->init(modelData, pbtk, 1, NULL, 1.0f, NULL, -1))) { + if ((!mpBtk) || (!mpBtk->init(modelData, pbtk, 1, 0, 1.0f, 0, -1))) { return 0; } } @@ -56,7 +56,7 @@ int daObjVGnd_c::CreateHeap() { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 0x8); JUT_ASSERT(212, pbrk != NULL); mpBrk = new mDoExt_brkAnm(); - if ((!mpBrk) || (!mpBrk->init(modelData, pbrk, 1, NULL, 1.0f, NULL, -1))) { + if ((!mpBrk) || (!mpBrk->init(modelData, pbrk, 1, 0, 1.0f, 0, -1))) { return 0; } } diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index c48a9e76ad5..ea584d91581 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -23,7 +23,7 @@ int daPasserMng_c::execute() { csXyz cStack_20(field_0x596 != 0 ? 0xff : endTime, current.angle.y, 0); childProcIds[currentChildIndex] = fopAcM_createChild(npcId, fopAcM_GetID(this), getPasserParam(), ¤t.pos, - fopAcM_GetRoomNo(this), &cStack_20, 0, 0xffffffff, 0); + fopAcM_GetRoomNo(this), &cStack_20, 0, -1, 0); currentChildIndex = (currentChildIndex + 1) % getMaxNum(); } mTime = time + intervalTime; diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 136d429b9ac..09ef16cb701 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -128,7 +128,7 @@ void daShopItem_c::CreateInit() { home.pos = current.pos; set_mtx(); - mpModel->setUserArea(NULL); + mpModel->setUserArea(0); } void daShopItem_c::set_mtx() { diff --git a/src/d/actor/d_a_tag_allmato.cpp b/src/d/actor/d_a_tag_allmato.cpp index b1a4549e2c5..2a2c94acfb4 100644 --- a/src/d/actor/d_a_tag_allmato.cpp +++ b/src/d/actor/d_a_tag_allmato.cpp @@ -517,7 +517,7 @@ int daTag_AllMato_c::checkCrsMato2() { } fopAc_ac_c* sp18 = NULL; - int sp14 = NULL; + int sp14 = 0; for (int i = 0; i < 499; i++) { for (int j = 0; j < mBouMatoActorNum; j++) { diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 3072d3c24c7..55229336b89 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -182,12 +182,12 @@ void daTitle_c::loadWait_proc() { mTitle.Scr->setPriority("zelda_press_start.blo", 0x100000, mpMount->getArchive()); J2DTextBox* text[7]; - text[0] = (J2DTextBox*)mTitle.Scr->search('t_s_00'); - text[1] = (J2DTextBox*)mTitle.Scr->search('t_s_01'); - text[2] = (J2DTextBox*)mTitle.Scr->search('t_s_02'); - text[3] = (J2DTextBox*)mTitle.Scr->search('t_s_03'); - text[4] = (J2DTextBox*)mTitle.Scr->search('t_s_04'); - text[5] = (J2DTextBox*)mTitle.Scr->search('t_s_05'); + text[0] = (J2DTextBox*)mTitle.Scr->search(MULTI_CHAR('t_s_00')); + text[1] = (J2DTextBox*)mTitle.Scr->search(MULTI_CHAR('t_s_01')); + text[2] = (J2DTextBox*)mTitle.Scr->search(MULTI_CHAR('t_s_02')); + text[3] = (J2DTextBox*)mTitle.Scr->search(MULTI_CHAR('t_s_03')); + text[4] = (J2DTextBox*)mTitle.Scr->search(MULTI_CHAR('t_s_04')); + text[5] = (J2DTextBox*)mTitle.Scr->search(MULTI_CHAR('t_s_05')); text[6] = (J2DTextBox*)mTitle.Scr->search('t_o'); for (int i = 0; i < 7; i++) { @@ -196,9 +196,9 @@ void daTitle_c::loadWait_proc() { fopMsgM_messageGet(text[i]->getStringPtr(), 100); } - field_0x600 = new CPaneMgrAlpha(mTitle.Scr, 'n_all', 2, NULL); + field_0x600 = new CPaneMgrAlpha(mTitle.Scr, MULTI_CHAR('n_all'), 2, NULL); field_0x600->setAlpha(0); - J2DPane* pane = mTitle.Scr->search('n_all'); + J2DPane* pane = mTitle.Scr->search(MULTI_CHAR('n_all')); pane->translate(g_daTitHIO.mPSPosX, g_daTitHIO.mPSPosY); pane->scale(g_daTitHIO.mPSScaleX, g_daTitHIO.mPSScaleY); mpHeap->becomeCurrentHeap(); diff --git a/src/d/d_bg_s.cpp b/src/d/d_bg_s.cpp index 190e2badc9c..7295126a6b0 100644 --- a/src/d/d_bg_s.cpp +++ b/src/d/d_bg_s.cpp @@ -712,7 +712,7 @@ void dBgS::MoveBgMatrixCrrPos(cBgS_PolyInfo const& i_poly, bool param_1, cXyz* i void dBgS_MoveBGProc_Typical(dBgW* i_bgw, void* i_actor_ptr, cBgS_PolyInfo const& i_poly, bool param_3, cXyz* i_pos, csXyz* i_angle, csXyz* i_shapeAngle) { Mtx m; - if (i_bgw->GetOldInvMtx(m) != NULL) { + if (i_bgw->GetOldInvMtx(m) != 0) { cXyz move_old; MTXMultVec(m, i_pos, &move_old); diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp index 76d7c815111..07950e67634 100644 --- a/src/d/d_bg_w_kcol.cpp +++ b/src/d/d_bg_w_kcol.cpp @@ -689,9 +689,9 @@ void dBgWKCol::ShdwDraw(cBgS_ShdwDraw* param_0) { do { stepY_sp78 = 1000000; - best1_sp70 = NULL; - best2_sp6C = NULL; - best3_sp68 = NULL; + best1_sp70 = 0; + best2_sp6C = 0; + best3_sp68 = 0; int x_sp44 = minX_spA0; do { diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index 75537717e19..e7695b74517 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -28,32 +28,32 @@ dBrightCheck_c::~dBrightCheck_c() { void dBrightCheck_c::screenSet() { static u64 const tv_btnA[] = { - 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at', + MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4'), MULTI_CHAR('cont_at'), }; static u64 const ftv_btnA[] = { - 'font_a1', 'font_at2', 'font_at3', 'font_at4', 'font_at', + MULTI_CHAR('font_a1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4'), MULTI_CHAR('font_at'), }; #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) static u64 const txTV[] = { - 'menu_t6s', 'menu_t6', 'menu_t9s', 'menu_t9', 'menut10s', - 'menu_t10', 'menu_t7s', 'menu_t7', 'menu_t8s', 'menu_t8', + MULTI_CHAR('menu_t6s'), MULTI_CHAR('menu_t6'), MULTI_CHAR('menu_t9s'), MULTI_CHAR('menu_t9'), MULTI_CHAR('menut10s'), + MULTI_CHAR('menu_t10'), MULTI_CHAR('menu_t7s'), MULTI_CHAR('menu_t7'), MULTI_CHAR('menu_t8s'), MULTI_CHAR('menu_t8'), }; #else static u64 const txTV[] = { - 'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101', - 'menu_t01', 'menu_t71', 'menu_t3', 'menu_t81', 'menu_t4', + MULTI_CHAR('menu_t61'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t91'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menut101'), + MULTI_CHAR('menu_t01'), MULTI_CHAR('menu_t71'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t81'), MULTI_CHAR('menu_t4'), }; #endif #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) static u64 const txTVhide[] = { - 'fmenu_6n', 'fmenu_9n', 'fmenu_10', 'fmenu_7n', 'fmenu_8n', + MULTI_CHAR('fmenu_6n'), MULTI_CHAR('fmenu_9n'), MULTI_CHAR('fmenu_10'), MULTI_CHAR('fmenu_7n'), MULTI_CHAR('fmenu_8n'), }; #else static u64 const txTVhide[] = { - 'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n', + MULTI_CHAR('menu_6n'), MULTI_CHAR('menu_9n'), MULTI_CHAR('menu_10n'), MULTI_CHAR('menu_7n'), MULTI_CHAR('menu_8n'), }; #endif @@ -61,16 +61,16 @@ void dBrightCheck_c::screenSet() { JUT_ASSERT(0, mBrightCheck.Scr != NULL); mBrightCheck.Scr->setPriority("zelda_option_check.blo", 0x1100000, mArchive); - mBrightCheck.Scr->search('g_abtn_n')->hide(); + mBrightCheck.Scr->search(MULTI_CHAR('g_abtn_n'))->hide(); #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) - J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search('t_t00'); - mBrightCheck.Scr->search('t_t00')->show(); - mBrightCheck.Scr->search('f_t00')->hide(); + J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search(MULTI_CHAR('t_t00')); + mBrightCheck.Scr->search(MULTI_CHAR('t_t00'))->show(); + mBrightCheck.Scr->search(MULTI_CHAR('f_t00'))->hide(); #else - J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search('f_t00'); - mBrightCheck.Scr->search('f_t00')->show(); - mBrightCheck.Scr->search('t_t00')->hide(); + J2DTextBox* settings_text = (J2DTextBox*)mBrightCheck.Scr->search(MULTI_CHAR('f_t00')); + mBrightCheck.Scr->search(MULTI_CHAR('f_t00'))->show(); + mBrightCheck.Scr->search(MULTI_CHAR('t_t00'))->hide(); #endif settings_text->setFont(mDoExt_getRubyFont()); diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 4d3c2811630..a54cc0ec552 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -10131,7 +10131,7 @@ bool dCamera_c::eventCamera(s32 param_0) { } int* sp90_i; - if (getEvStringData(sp90, "Trim", "DEFAULT") != NULL) { + if (getEvStringData(sp90, "Trim", "DEFAULT") != false) { sp90_i = (int*)sp90; if (*sp90_i == 'STAN') { mEventData.field_0x1c = 0; diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp index cf09711b3e2..3c1acd7d5a2 100644 --- a/src/d/d_cc_d.cpp +++ b/src/d/d_cc_d.cpp @@ -255,7 +255,7 @@ dCcD_GObjInf* dCcD_GObjInf::GetTgHitGObj() { u8 dCcD_GObjInf::GetTgHitObjSe() { dCcD_GObjInf* objInf = GetTgHitGObj(); if (objInf == NULL) { - return NULL; + return 0; } else { return objInf->GetAtSe(); } diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index c2ec47a9862..253ef224cb8 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -1114,7 +1114,7 @@ void dComIfG_inf_c::baseCsr_c::draw(f32 param_1, f32 param_2) { r28 = 0xFF; } - J2DPicture* picture = field_0x8.getPicture('cursor00'); + J2DPicture* picture = field_0x8.getPicture(MULTI_CHAR('cursor00')); JUT_ASSERT(1450, picture != NULL); picture->scale(1.3f, 1.3f); JUtility::TColor color = picture->getWhite(); @@ -1148,7 +1148,7 @@ void dComIfG_inf_c::baseCsr_c::create() { int rt = field_0x8.create(resInfo->getArchive(), "zelda_pointing_cursor_navi.blo"); JUT_ASSERT(1498, rt); - J2DPicture* picture = field_0x8.getPicture('cursor00'); + J2DPicture* picture = field_0x8.getPicture(MULTI_CHAR('cursor00')); JUT_ASSERT(1500, picture != NULL); JUtility::TColor color = picture->getWhite(); color.a = 0; @@ -1172,7 +1172,7 @@ void dComIfG_inf_c::baseCsr_c::particleExecute() { } void dComIfG_inf_c::anmCsr_c::draw(f32 param_1, f32 param_2) { - field_0x8.setPos('lock_n', param_1, param_2); + field_0x8.setPos(MULTI_CHAR('lock_n'), param_1, param_2); dComIfGd_set2DXlu(&field_0x8); } #endif diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index 460c794dbd4..4259e7f08cb 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -72,9 +72,9 @@ static void messageSet(u32 status, bool i_drawBg) { JUT_ASSERT(102, strlen(msg_p)-1 < 512); - J2DTextBox tpane('TEXT1', JGeometry::TBox2(0.0f, 0.0f, FB_WIDTH, 200.0f), (ResFONT*)font_data, msg_p, 512, HBIND_CENTER, VBIND_CENTER); - J2DTextBox spane('TEXT2', JGeometry::TBox2(0.0f, 0.0f, FB_WIDTH, 200.0f), (ResFONT*)font_data, msg_p, 512, HBIND_CENTER, VBIND_CENTER); - J2DPicture ppane('PICT1', JGeometry::TBox2(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT), (ResTIMG*)black_tex, NULL); + J2DTextBox tpane(MULTI_CHAR('TEXT1'), JGeometry::TBox2(0.0f, 0.0f, FB_WIDTH, 200.0f), (ResFONT*)font_data, msg_p, 512, HBIND_CENTER, VBIND_CENTER); + J2DTextBox spane(MULTI_CHAR('TEXT2'), JGeometry::TBox2(0.0f, 0.0f, FB_WIDTH, 200.0f), (ResFONT*)font_data, msg_p, 512, HBIND_CENTER, VBIND_CENTER); + J2DPicture ppane(MULTI_CHAR('PICT1'), JGeometry::TBox2(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT), (ResTIMG*)black_tex, NULL); JUTResFont font((ResFONT*)font_data, NULL); JUTFont* pfont = (JUTFont*)&font; diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index 287aa9f3d8a..f737d35ddaf 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -3127,7 +3127,7 @@ bool dCamera_c::useItem1EvCamera() { if (item_p->field_0x20 < item_p->field_0x4) break; - if (data_list[item_p->mType][1].field_0x08 != NULL && item_p->field_0x1c == 0) { + if (data_list[item_p->mType][1].field_0x08 != 0 && item_p->field_0x1c == 0) { item_p->field_0x1c = 1; item_p->field_0x0 = 1; break; diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index 8b2291b1249..84af0a5d516 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -1245,7 +1245,7 @@ void* dEvent_manager_c::getMySubstanceP(int staffId, const char* dataname, int d int dEvent_manager_c::getMySubstanceNum(int staffId, const char* dataname) { dEvDtData_c* data = getMyDataP(staffId, dataname, FALSE); if (data == NULL) { - return NULL; + return 0; } else { return data->getNumber(); } diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index 8c64684010b..ca2387a0713 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -36,24 +36,24 @@ void dFile_info_c::screenSet() { mFileInfo.Scr->setPriority("zelda_file_select_info_text.blo", 0x1100000, mArchive); mFileInfo.mFont = mDoExt_getMesgFont(); - mFileInfo.Scr->search('w_cp_ef1')->hide(); - mFileInfo.field_0x10 = mFileInfo.Scr->search('w_dat_i1'); - mDatBase = new CPaneMgrAlpha(mFileInfo.Scr, 'w_dat_i1', 2, NULL); - mNoDatBase = new CPaneMgrAlpha(mFileInfo.Scr, 'w_nda_i1', 2, NULL); + mFileInfo.Scr->search(MULTI_CHAR('w_cp_ef1'))->hide(); + mFileInfo.field_0x10 = mFileInfo.Scr->search(MULTI_CHAR('w_dat_i1')); + mDatBase = new CPaneMgrAlpha(mFileInfo.Scr, MULTI_CHAR('w_dat_i1'), 2, NULL); + mNoDatBase = new CPaneMgrAlpha(mFileInfo.Scr, MULTI_CHAR('w_nda_i1'), 2, NULL); J2DTextBox* info_text[4]; #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) - info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('w_s_t_01'); - info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('w_p_t_01'); - mFileInfo.Scr->search('f_s_t_02')->hide(); - mFileInfo.Scr->search('f_p_t_02')->hide(); + info_text[0] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('w_s_t_01')); + info_text[1] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('w_p_t_01')); + mFileInfo.Scr->search(MULTI_CHAR('f_s_t_02'))->hide(); + mFileInfo.Scr->search(MULTI_CHAR('f_p_t_02'))->hide(); #else - info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('f_s_t_02'); - info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('f_p_t_02'); - mFileInfo.Scr->search('w_s_t_01')->hide(); - mFileInfo.Scr->search('w_p_t_01')->hide(); + info_text[0] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('f_s_t_02')); + info_text[1] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('f_p_t_02')); + mFileInfo.Scr->search(MULTI_CHAR('w_s_t_01'))->hide(); + mFileInfo.Scr->search(MULTI_CHAR('w_p_t_01'))->hide(); #endif for (int i = 0; i < 2; i++) { @@ -64,19 +64,19 @@ void dFile_info_c::screenSet() { dMeter2Info_getString(0x3D1, info_text[1]->getStringPtr(), NULL); // Total play time #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) - info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('w_name01'); - info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('w_new_1'); - mFileInfo.Scr->search('f_name01')->hide(); - mFileInfo.Scr->search('f_new_1')->hide(); + info_text[0] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('w_name01')); + info_text[1] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('w_new_1')); + mFileInfo.Scr->search(MULTI_CHAR('f_name01'))->hide(); + mFileInfo.Scr->search(MULTI_CHAR('f_new_1'))->hide(); #else - info_text[0] = (J2DTextBox*)mFileInfo.Scr->search('f_name01'); - info_text[1] = (J2DTextBox*)mFileInfo.Scr->search('f_new_1'); - mFileInfo.Scr->search('w_name01')->hide(); - mFileInfo.Scr->search('w_new_1')->hide(); + info_text[0] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('f_name01')); + info_text[1] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('f_new_1')); + mFileInfo.Scr->search(MULTI_CHAR('w_name01'))->hide(); + mFileInfo.Scr->search(MULTI_CHAR('w_new_1'))->hide(); #endif - info_text[2] = (J2DTextBox*)mFileInfo.Scr->search('w_time01'); - info_text[3] = (J2DTextBox*)mFileInfo.Scr->search('w_ptim01'); + info_text[2] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('w_time01')); + info_text[3] = (J2DTextBox*)mFileInfo.Scr->search(MULTI_CHAR('w_ptim01')); for (int i = 0; i < 4; i++) { info_text[i]->setFont(mFileInfo.mFont); @@ -122,9 +122,9 @@ int dFile_info_c::setSaveData(dSv_save_c* i_savedata, BOOL i_validChksum, u8 i_d void dFile_info_c::setHeartCnt(dSv_save_c* i_savedata) { static u64 l_htag[] = { - 'hear_20', 'hear_21', 'hear_22', 'hear_23', 'hear_24', 'hear_25', 'hear_26', - 'hear_27', 'hear_28', 'hear_29', 'hear_30', 'hear_31', 'hear_32', 'hear_33', - 'hear_34', 'hear_35', 'hear_36', 'hear_37', 'hear_38', 'hear_39', + MULTI_CHAR('hear_20'), MULTI_CHAR('hear_21'), MULTI_CHAR('hear_22'), MULTI_CHAR('hear_23'), MULTI_CHAR('hear_24'), MULTI_CHAR('hear_25'), MULTI_CHAR('hear_26'), + MULTI_CHAR('hear_27'), MULTI_CHAR('hear_28'), MULTI_CHAR('hear_29'), MULTI_CHAR('hear_30'), MULTI_CHAR('hear_31'), MULTI_CHAR('hear_32'), MULTI_CHAR('hear_33'), + MULTI_CHAR('hear_34'), MULTI_CHAR('hear_35'), MULTI_CHAR('hear_36'), MULTI_CHAR('hear_37'), MULTI_CHAR('hear_38'), MULTI_CHAR('hear_39'), }; static const char* amariheartTex[] = { @@ -218,7 +218,7 @@ void dDlst_FileInfo_c::draw() { MTXScale(m, mBasePane->getWidth() / field_0x10->getWidth(), mBasePane->getHeight() / field_0x10->getHeight(), 1.0f); MTXConcat(glb_mtx, m, glb_mtx); - Scr->search('Nm_02')->setMtx(glb_mtx); + Scr->search(MULTI_CHAR('Nm_02'))->setMtx(glb_mtx); } Scr->draw(0.0f, 0.0f, graf_ctx); diff --git a/src/d/d_file_sel_warning.cpp b/src/d/d_file_sel_warning.cpp index 3063012ea03..4fbce3920be 100644 --- a/src/d/d_file_sel_warning.cpp +++ b/src/d/d_file_sel_warning.cpp @@ -59,20 +59,20 @@ void dFile_warning_c::screenSet() { mFileWarn.Scr->animation(); mFileWarn.mFont = mDoExt_getMesgFont(); - mpRootPane = new CPaneMgr(mFileWarn.Scr, 'Nm_02', 0, NULL); + mpRootPane = new CPaneMgr(mFileWarn.Scr, MULTI_CHAR('Nm_02'), 0, NULL); JUT_ASSERT(0, mpRootPane != NULL); field_0x34 = mpRootPane->getTranslateY(); #if REGION_JPN - mFileWarn.Scr->search('ms_for_2')->hide(); - mFileWarn.Scr->search('ms_for_3')->hide(); + mFileWarn.Scr->search(MULTI_CHAR('ms_for_2'))->hide(); + mFileWarn.Scr->search(MULTI_CHAR('ms_for_3'))->hide(); - field_0x20 = static_cast(mFileWarn.Scr->search('w_msg_jp')); + field_0x20 = static_cast(mFileWarn.Scr->search(MULTI_CHAR('w_msg_jp'))); #else - mFileWarn.Scr->search('w_msg_jp')->hide(); - mFileWarn.Scr->search('ms_for_2')->hide(); + mFileWarn.Scr->search(MULTI_CHAR('w_msg_jp'))->hide(); + mFileWarn.Scr->search(MULTI_CHAR('ms_for_2'))->hide(); - field_0x20 = static_cast(mFileWarn.Scr->search('ms_for_3')); + field_0x20 = static_cast(mFileWarn.Scr->search(MULTI_CHAR('ms_for_3'))); #endif field_0x20->show(); field_0x20->setFont(mFileWarn.mFont); diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index b2104bc00a6..55456ad8267 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -59,7 +59,7 @@ static s32 MenuSelEndFrameTbl[3] = { 898, }; -static u64 l_tagName13[3] = {'w_dat_i0', 'w_dat_i1', 'w_dat_i2'}; +static u64 l_tagName13[3] = {MULTI_CHAR('w_dat_i0'), MULTI_CHAR('w_dat_i1'), MULTI_CHAR('w_dat_i2')}; dFs_HIO_c::dFs_HIO_c() { base_effect_appear_frames = 5; @@ -807,15 +807,15 @@ void dFile_select_c::dataSelectStart() { yesnoMenuMoveAnmInitSet(0x473, 0x47d); selectWakuAlpahAnmInit(mSelectNum, 0xff, 0, g_fsHIO.select_box_appear_frames); - mSelDt.ScrDt->search('ken_00')->hide(); - mSelDt.ScrDt->search('ken_01')->hide(); - mSelDt.ScrDt->search('ken_02')->hide(); - mSelDt.ScrDt->search('tate_00')->hide(); - mSelDt.ScrDt->search('tate_01')->hide(); - mSelDt.ScrDt->search('tate_02')->hide(); - mSelDt.ScrDt->search('fuku_00')->hide(); - mSelDt.ScrDt->search('fuku_01')->hide(); - mSelDt.ScrDt->search('fuku_02')->hide(); + mSelDt.ScrDt->search(MULTI_CHAR('ken_00'))->hide(); + mSelDt.ScrDt->search(MULTI_CHAR('ken_01'))->hide(); + mSelDt.ScrDt->search(MULTI_CHAR('ken_02'))->hide(); + mSelDt.ScrDt->search(MULTI_CHAR('tate_00'))->hide(); + mSelDt.ScrDt->search(MULTI_CHAR('tate_01'))->hide(); + mSelDt.ScrDt->search(MULTI_CHAR('tate_02'))->hide(); + mSelDt.ScrDt->search(MULTI_CHAR('fuku_00'))->hide(); + mSelDt.ScrDt->search(MULTI_CHAR('fuku_01'))->hide(); + mSelDt.ScrDt->search(MULTI_CHAR('fuku_02'))->hide(); mpFileSelect3d->drawOff(); mDataSelProc = DATASELPROC_SELECT_DATA_OPENERASE_MOVE; @@ -1002,8 +1002,8 @@ void dFile_select_c::dataSelectMoveAnime() { void dFile_select_c::makeRecInfo(u8 i_dataNo) { dSv_save_c* pSave = (dSv_save_c*)&mSaveData[i_dataNo]; - J2DPane* ken0 = mSelDt.ScrDt->search('ken_00'); - J2DPane* ken1 = mSelDt.ScrDt->search('ken_01'); + J2DPane* ken0 = mSelDt.ScrDt->search(MULTI_CHAR('ken_00')); + J2DPane* ken1 = mSelDt.ScrDt->search(MULTI_CHAR('ken_01')); ken0->hide(); ken1->hide(); @@ -1017,7 +1017,7 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) { ken1->hide(); } - J2DPane* ken2 = mSelDt.ScrDt->search('ken_02'); + J2DPane* ken2 = mSelDt.ScrDt->search(MULTI_CHAR('ken_02')); if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_MASTER_SWORD) || pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_LIGHT_SWORD)) { @@ -1026,8 +1026,8 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) { ken2->hide(); } - J2DPane* tate0 = mSelDt.ScrDt->search('tate_00'); - J2DPane* tate1 = mSelDt.ScrDt->search('tate_01'); + J2DPane* tate0 = mSelDt.ScrDt->search(MULTI_CHAR('tate_00')); + J2DPane* tate1 = mSelDt.ScrDt->search(MULTI_CHAR('tate_01')); tate0->hide(); tate1->hide(); @@ -1039,28 +1039,28 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) { tate1->show(); } - J2DPane* tate2 = mSelDt.ScrDt->search('tate_02'); + J2DPane* tate2 = mSelDt.ScrDt->search(MULTI_CHAR('tate_02')); if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_HYLIA_SHIELD)) { tate2->show(); } else { tate2->hide(); } - J2DPane* fuku0 = mSelDt.ScrDt->search('fuku_00'); + J2DPane* fuku0 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_00')); if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WEAR_KOKIRI)) { fuku0->show(); } else { fuku0->hide(); } - J2DPane* fuku1 = mSelDt.ScrDt->search('fuku_01'); + J2DPane* fuku1 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_01')); if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WEAR_ZORA)) { fuku1->show(); } else { fuku1->hide(); } - J2DPane* fuku2 = mSelDt.ScrDt->search('fuku_02'); + J2DPane* fuku2 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_02')); if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_ARMOR)) { fuku2->show(); } else { @@ -1659,7 +1659,7 @@ void dFile_select_c::copySelMoveAnmInitSet(int param_0, int param_1) { } void dFile_select_c::setSaveDataForCopySel() { - static u64 l_tagName101[2] = {'w_nun01', 'w_nun02'}; + static u64 l_tagName101[2] = {MULTI_CHAR('w_nun01'), MULTI_CHAR('w_nun02')}; static char* l_numTex[3] = {"tt_1_metal_40x40.bti", "tt_2_metal_40x40.bti", "tt_3_metal_40x40.bti"}; SaveDataBuf* pSave = mSaveData; @@ -2901,31 +2901,31 @@ void dFile_select_c::cardToNandDataCopyErrDisp3() { #endif void dFile_select_c::screenSet() { - static u64 l_tagName0[3] = {'w_sel_00', 'w_sel_01', 'w_sel_02'}; - static u64 l_tagName3[3] = {'w_moyo00', 'w_moyo01', 'w_moyo02'}; - static u64 l_tagName4[3] = {'w_gold00', 'w_gold01', 'w_gold02'}; - static u64 l_tagName5[3] = {'w_go2_00', 'w_go2_01', 'w_go2_02'}; - static u64 l_tagName12[3] = {'w_bk_l00', 'w_bk_l01', 'w_bk_l02'}; - static u64 l_nouseTag[15] = {'w_mcheck', 'w_tabi1', 'w_tabi2', 'w_tabi3', 'w_doko_c', - 'w_uwa_c', 'w_cp_chu', 'w_cpsita', 'w_cp_x', 'w_de', - 'w_de_chu', 'w_desita', 'w_de_x', 'w_name', 'w_h_name'}; + static u64 l_tagName0[3] = {MULTI_CHAR('w_sel_00'), MULTI_CHAR('w_sel_01'), MULTI_CHAR('w_sel_02')}; + static u64 l_tagName3[3] = {MULTI_CHAR('w_moyo00'), MULTI_CHAR('w_moyo01'), MULTI_CHAR('w_moyo02')}; + static u64 l_tagName4[3] = {MULTI_CHAR('w_gold00'), MULTI_CHAR('w_gold01'), MULTI_CHAR('w_gold02')}; + static u64 l_tagName5[3] = {MULTI_CHAR('w_go2_00'), MULTI_CHAR('w_go2_01'), MULTI_CHAR('w_go2_02')}; + static u64 l_tagName12[3] = {MULTI_CHAR('w_bk_l00'), MULTI_CHAR('w_bk_l01'), MULTI_CHAR('w_bk_l02')}; + static u64 l_nouseTag[15] = {MULTI_CHAR('w_mcheck'), MULTI_CHAR('w_tabi1'), MULTI_CHAR('w_tabi2'), MULTI_CHAR('w_tabi3'), MULTI_CHAR('w_doko_c'), + MULTI_CHAR('w_uwa_c'), MULTI_CHAR('w_cp_chu'), MULTI_CHAR('w_cpsita'), MULTI_CHAR('w_cp_x'), 'w_de', + MULTI_CHAR('w_de_chu'), MULTI_CHAR('w_desita'), MULTI_CHAR('w_de_x'), MULTI_CHAR('w_name'), MULTI_CHAR('w_h_name')}; #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) - static u64 l_tagName21[2] = {'w_tabi_s', 'w_tabi_x'}; + static u64 l_tagName21[2] = {MULTI_CHAR('w_tabi_s'), MULTI_CHAR('w_tabi_x')}; #else - static u64 l_tagName21[2] = {'t_for', 't_for1'}; + static u64 l_tagName21[2] = {MULTI_CHAR('t_for'), MULTI_CHAR('t_for1')}; #endif - static u64 l_tagName18[3] = {'w_de_ef0', 'w_de_ef1', 'w_de_ef2'}; - static u64 l_tagName19[3] = {'w_cp_ef0', 'w_cp_ef1', 'w_cp_ef2'}; + static u64 l_tagName18[3] = {MULTI_CHAR('w_de_ef0'), MULTI_CHAR('w_de_ef1'), MULTI_CHAR('w_de_ef2')}; + static u64 l_tagName19[3] = {MULTI_CHAR('w_cp_ef0'), MULTI_CHAR('w_cp_ef1'), MULTI_CHAR('w_cp_ef2')}; #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) - static u64 l_tagName20[2] = {'w_er_msg', 'w_er_msR'}; + static u64 l_tagName20[2] = {MULTI_CHAR('w_er_msg'), MULTI_CHAR('w_er_msR')}; #else - static u64 l_tagName20[2] = {'er_for0', 'er_for1'}; + static u64 l_tagName20[2] = {MULTI_CHAR('er_for0'), MULTI_CHAR('er_for1')}; #endif - static u64 l_tagName131[3] = {'N_sel_00', 'N_sel_01', 'N_sel_02'}; + static u64 l_tagName131[3] = {MULTI_CHAR('N_sel_00'), MULTI_CHAR('N_sel_01'), MULTI_CHAR('N_sel_02')}; fileSel.Scr = new J2DScreen(); JUT_ASSERT(4917, fileSel.Scr != NULL); @@ -2944,27 +2944,27 @@ void dFile_select_c::screenSet() { field_0x0090->searchUpdateMaterialID(fileSel.Scr); field_0x009c->searchUpdateMaterialID(fileSel.Scr); - mBaseMovePane = new CPaneMgr(fileSel.Scr, 'w_move_n', 0, NULL); - mBaseSubPane = fileSel.Scr->search('w_sub_n'); + mBaseMovePane = new CPaneMgr(fileSel.Scr, MULTI_CHAR('w_move_n'), 0, NULL); + mBaseSubPane = fileSel.Scr->search(MULTI_CHAR('w_sub_n')); for (int i = 0; i < 3; i++) { mSelFilePanes[i] = new CPaneMgr(fileSel.Scr, l_tagName0[i], 1, NULL); } - fileSel.Scr->search('Wi_btn_n')->hide(); - mBbtnPane = new CPaneMgrAlpha(fileSel.Scr, 'w_n_bbtn', 2, NULL); - mAbtnPane = new CPaneMgrAlpha(fileSel.Scr, 'w_n_abtn', 2, NULL); + fileSel.Scr->search(MULTI_CHAR('Wi_btn_n'))->hide(); + mBbtnPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_n_bbtn'), 2, NULL); + mAbtnPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_n_abtn'), 2, NULL); #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) - mModoruTxtPane = new CPaneMgrAlpha(fileSel.Scr, 'w_modo', 2, NULL); - mKetteiTxtPane = new CPaneMgrAlpha(fileSel.Scr, 'w_kete', 2, NULL); - fileSel.Scr->search('f_modo')->hide(); - fileSel.Scr->search('f_kete')->hide(); + mModoruTxtPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_modo'), 2, NULL); + mKetteiTxtPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_kete'), 2, NULL); + fileSel.Scr->search(MULTI_CHAR('f_modo'))->hide(); + fileSel.Scr->search(MULTI_CHAR('f_kete'))->hide(); #else - mModoruTxtPane = new CPaneMgrAlpha(fileSel.Scr, 'f_modo', 2, NULL); - mKetteiTxtPane = new CPaneMgrAlpha(fileSel.Scr, 'f_kete', 2, NULL); - fileSel.Scr->search('w_modo')->hide(); - fileSel.Scr->search('w_kete')->hide(); + mModoruTxtPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('f_modo'), 2, NULL); + mKetteiTxtPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('f_kete'), 2, NULL); + fileSel.Scr->search(MULTI_CHAR('w_modo'))->hide(); + fileSel.Scr->search(MULTI_CHAR('w_kete'))->hide(); #endif ((J2DTextBox*)mModoruTxtPane->getPanePtr())->setFont(fileSel.font[0]); @@ -3032,13 +3032,13 @@ void dFile_select_c::screenSet() { } #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) - fileSel.Scr->search('t_for')->hide(); - fileSel.Scr->search('t_for1')->hide(); + fileSel.Scr->search(MULTI_CHAR('t_for'))->hide(); + fileSel.Scr->search(MULTI_CHAR('t_for1'))->hide(); #else - fileSel.Scr->search('w_tabi_s')->hide(); - fileSel.Scr->search('w_tabi_x')->hide(); - fileSel.Scr->search('w_mgn1')->hide(); - fileSel.Scr->search('w_mgn2')->hide(); + fileSel.Scr->search(MULTI_CHAR('w_tabi_s'))->hide(); + fileSel.Scr->search(MULTI_CHAR('w_tabi_x'))->hide(); + fileSel.Scr->search(MULTI_CHAR('w_mgn1'))->hide(); + fileSel.Scr->search(MULTI_CHAR('w_mgn2'))->hide(); #endif for (int i = 0; i < 2; i++) { @@ -3085,17 +3085,17 @@ void dFile_select_c::screenSet() { field_0x0208 = 0; field_0x0209 = 0; - mErrorMsgPane = fileSel.Scr->search('w_er_n'); + mErrorMsgPane = fileSel.Scr->search(MULTI_CHAR('w_er_n')); #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) - fileSel.Scr->search('er_for0')->hide(); - fileSel.Scr->search('er_for1')->hide(); + fileSel.Scr->search(MULTI_CHAR('er_for0'))->hide(); + fileSel.Scr->search(MULTI_CHAR('er_for1'))->hide(); #else - fileSel.Scr->search('w_er_msg')->hide(); - fileSel.Scr->search('w_er_msR')->hide(); + fileSel.Scr->search(MULTI_CHAR('w_er_msg'))->hide(); + fileSel.Scr->search(MULTI_CHAR('w_er_msR'))->hide(); #endif - fileSel.Scr->search('w_er_msE')->hide(); + fileSel.Scr->search(MULTI_CHAR('w_er_msE'))->hide(); for (int i = 0; i < 2; i++) { mErrorMsgTxtPane[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName20[i], 0, NULL); @@ -3132,7 +3132,7 @@ void dFile_select_c::screenSet() { mSelIcon->setPos(vtxCenter.x, vtxCenter.y, mSelFilePanes[mSelectNum]->getPanePtr(), true); mSelIcon->setAlphaRate(0.0f); - J2DPane* basePane = fileSel.Scr->search('Nm_02'); + J2DPane* basePane = fileSel.Scr->search(MULTI_CHAR('Nm_02')); basePane->setAnimation(mBaseMoveAnm); setWakuAnm(); @@ -3161,11 +3161,11 @@ void dFile_select_c::screenSet() { mFileInfoNoDatBasePane[i] = mFileInfo[i]->getNoDatBase(); } - mNameBasePane = fileSel.Scr->search('name_n'); + mNameBasePane = fileSel.Scr->search(MULTI_CHAR('name_n')); mpName = new dName_c(mNameBasePane); field_0x0128 = false; mpFileWarning = new dFile_warning_c(mpArchive, 0); - mSelDt.mpPane = fileSel.Scr->search('w_moyo03'); + mSelDt.mpPane = fileSel.Scr->search(MULTI_CHAR('w_moyo03')); #if PLATFORM_GCN JUtility::TColor black = mDoGph_gInf_c::getFadeColor(); @@ -3174,7 +3174,7 @@ void dFile_select_c::screenSet() { white.a = 0xff; ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpFadePict = new J2DPicture('PICT01', JGeometry::TBox2(0.0f, FB_WIDTH, 0.0f, FB_HEIGHT), + mpFadePict = new J2DPicture(MULTI_CHAR('PICT01'), JGeometry::TBox2(0.0f, FB_WIDTH, 0.0f, FB_HEIGHT), timg, NULL); mpFadePict->setBlackWhite(black, white); mpFadePict->setAlpha(0); @@ -3182,20 +3182,20 @@ void dFile_select_c::screenSet() { } void dFile_select_c::screenSetCopySel() { - static u64 l_tagName000[2] = {'w_sel_01', 'w_sel_02'}; - static u64 l_tagName001[2] = {'w_moyo01', 'w_moyo02'}; - static u64 l_tagName002[2] = {'w_gold01', 'w_gold02'}; - static u64 l_tagName003[2] = {'w_go2_01', 'w_go2_02'}; - static u64 l_tagName004[2] = {'w_bk_l01', 'w_bk_l02'}; - static u64 l_tagName005[2] = {'w_cp_ef1', 'w_cp_ef2'}; + static u64 l_tagName000[2] = {MULTI_CHAR('w_sel_01'), MULTI_CHAR('w_sel_02')}; + static u64 l_tagName001[2] = {MULTI_CHAR('w_moyo01'), MULTI_CHAR('w_moyo02')}; + static u64 l_tagName002[2] = {MULTI_CHAR('w_gold01'), MULTI_CHAR('w_gold02')}; + static u64 l_tagName003[2] = {MULTI_CHAR('w_go2_01'), MULTI_CHAR('w_go2_02')}; + static u64 l_tagName004[2] = {MULTI_CHAR('w_bk_l01'), MULTI_CHAR('w_bk_l02')}; + static u64 l_tagName005[2] = {MULTI_CHAR('w_cp_ef1'), MULTI_CHAR('w_cp_ef2')}; mCpSel.Scr = new J2DScreen(); JUT_ASSERT(5286, mCpSel.Scr != NULL); mCpSel.Scr->setPriority("zelda_file_select_copy_select.blo", 0x1100000, mpArchive); dPaneClass_showNullPane(mCpSel.Scr); - mCpSel.mpPane2 = mCpSel.Scr->search('name_n'); - mCpSel.mpPane1 = fileSel.Scr->search('name_n'); + mCpSel.mpPane2 = mCpSel.Scr->search(MULTI_CHAR('name_n')); + mCpSel.mpPane1 = fileSel.Scr->search(MULTI_CHAR('name_n')); void* bck = JKRGetNameResource("zelda_file_select_copy_select.bck", mpArchive); mCpSelBck = (J2DAnmTransform*)J2DAnmLoaderDataBase::load(bck); @@ -3249,7 +3249,7 @@ void dFile_select_c::screenSetCopySel() { mCpSel.Scr->search(l_tagName005[i])->hide(); } - J2DPane* namePane = mCpSel.Scr->search('name_n'); + J2DPane* namePane = mCpSel.Scr->search(MULTI_CHAR('name_n')); namePane->setAnimation(mCpSelBck); mCpSelBck->setFrame(0.0f); namePane->animationTransform(); @@ -3271,15 +3271,15 @@ void dFile_select_c::screenSetCopySel() { } void dFile_select_c::screenSetYesNo() { - static u64 l_tagName012[2] = {'w_no_n', 'w_yes_n'}; - static u64 l_tagName013[2] = {'w_no_t', 'w_yes_t'}; - static u64 l_tagName013U[2] = {'f_no_t', 'f_yes_t'}; - static u64 l_tagName9[2] = {'w_no_m', 'w_yes_m'}; + static u64 l_tagName012[2] = {MULTI_CHAR('w_no_n'), MULTI_CHAR('w_yes_n')}; + static u64 l_tagName013[2] = {MULTI_CHAR('w_no_t'), MULTI_CHAR('w_yes_t')}; + static u64 l_tagName013U[2] = {MULTI_CHAR('f_no_t'), MULTI_CHAR('f_yes_t')}; + static u64 l_tagName9[2] = {MULTI_CHAR('w_no_m'), MULTI_CHAR('w_yes_m')}; static u64 l_tagName10[2] = { - 'w_no_g', - 'w_yes_g', + MULTI_CHAR('w_no_g'), + MULTI_CHAR('w_yes_g'), }; - static u64 l_tagName11[2] = {'w_no_gr', 'w_yes_gr'}; + static u64 l_tagName11[2] = {MULTI_CHAR('w_no_gr'), MULTI_CHAR('w_yes_gr')}; static u8 l_msgNum2[2] = {0x08, 0x07}; mYnSel.ScrYn = new J2DScreen(); @@ -3337,12 +3337,12 @@ void dFile_select_c::screenSetYesNo() { } void dFile_select_c::screenSet3Menu() { - static u64 l_tagName6[3] = {'w_sat_mo', 'w_del_mo', 'w_cop_mo'}; - static u64 l_tagName7[3] = {'w_sat_g', 'w_del_g', 'w_cop_g'}; - static u64 l_tagName8[3] = {'w_sat_gr', 'w_del_gr', 'w_cop_gr'}; - static u64 l_tagName1[3] = {'w_sta_n', 'w_del_n', 'w_cop_n'}; - static u64 l_tagName011[3] = {'w_sta', 'w_del', 'w_cop_t'}; - static u64 l_tagName011U[3] = {'f_sta', 'f_del', 'f_cop_t'}; + static u64 l_tagName6[3] = {MULTI_CHAR('w_sat_mo'), MULTI_CHAR('w_del_mo'), MULTI_CHAR('w_cop_mo')}; + static u64 l_tagName7[3] = {MULTI_CHAR('w_sat_g'), MULTI_CHAR('w_del_g'), MULTI_CHAR('w_cop_g')}; + static u64 l_tagName8[3] = {MULTI_CHAR('w_sat_gr'), MULTI_CHAR('w_del_gr'), MULTI_CHAR('w_cop_gr')}; + static u64 l_tagName1[3] = {MULTI_CHAR('w_sta_n'), MULTI_CHAR('w_del_n'), MULTI_CHAR('w_cop_n')}; + static u64 l_tagName011[3] = {MULTI_CHAR('w_sta'), MULTI_CHAR('w_del'), MULTI_CHAR('w_cop_t')}; + static u64 l_tagName011U[3] = {MULTI_CHAR('f_sta'), MULTI_CHAR('f_del'), MULTI_CHAR('f_cop_t')}; static u8 l_msgNum[3] = {0x57, 0x58, 0x56}; m3mSel.Scr3m = new J2DScreen(); @@ -3368,7 +3368,7 @@ void dFile_select_c::screenSet3Menu() { m3mBtk->searchUpdateMaterialID(m3mSel.Scr3m); m3mBtkFrame = 0; - m3mMenuPane = m3mSel.Scr3m->search('wmenu_n'); + m3mMenuPane = m3mSel.Scr3m->search(MULTI_CHAR('wmenu_n')); m3mMenuPane->setAnimation(m3mBck); m3mBck->setFrame(799.0f); m3mMenuPane->animationTransform(); @@ -3412,13 +3412,13 @@ void dFile_select_c::screenSetDetail() { mSelDt.ScrDt->setAnimation(mSelDtBtk); mSelDtBtkFrame = 0; - mSelDt.mpPane2 = mSelDt.ScrDt->search('n_all'); - mSelDtPane_mset = new CPaneMgr(mSelDt.ScrDt, 'mset_p_n', 0, NULL); + mSelDt.mpPane2 = mSelDt.ScrDt->search(MULTI_CHAR('n_all')); + mSelDtPane_mset = new CPaneMgr(mSelDt.ScrDt, MULTI_CHAR('mset_p_n'), 0, NULL); mpFileSelect3d->setBasePane(mSelDtPane_mset); - mpFileSelect3d->setBase2Pane(fileSel.Scr->search('w_sub_n')); + mpFileSelect3d->setBase2Pane(fileSel.Scr->search(MULTI_CHAR('w_sub_n'))); - mSelDt.ScrDt->search('d_win_n')->setUserInfo('n_43'); + mSelDt.ScrDt->search(MULTI_CHAR('d_win_n'))->setUserInfo('n_43'); } void dFile_select_c::setWakuAnm() { diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 6b4838c3b71..4275dbe3f5d 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -369,14 +369,14 @@ dDlst_GameOverScrnDraw_c::dDlst_GameOverScrnDraw_c(JKRArchive* i_archive) { mFadeColor.set(0, 0, 0, 0); if (dMeter2Info_getGameOverType() != 0) { - mpScreen->search('n_base')->hide(); + mpScreen->search(MULTI_CHAR('n_base'))->hide(); if (mDoGph_gInf_c::getFadeRate() == 1.0f) { mFadeColor = mDoGph_gInf_c::getFadeColor(); } } - mpScreen->search('base_b')->hide(); + mpScreen->search(MULTI_CHAR('base_b'))->hide(); JUtility::TColor img_white(mFadeColor); JUtility::TColor img_black(mFadeColor); @@ -385,10 +385,10 @@ dDlst_GameOverScrnDraw_c::dDlst_GameOverScrnDraw_c(JKRArchive* i_archive) { ResTIMG* img = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); mpBackImg = - new J2DPicture('PICT01', JGeometry::TBox2(0.0f, 486.0f, 0.0f, 660.0f), img, NULL); + new J2DPicture(MULTI_CHAR('PICT01'), JGeometry::TBox2(0.0f, 486.0f, 0.0f, 660.0f), img, NULL); mpBackImg->setBlackWhite(img_white, img_black); - J2DTextBox* gold_tbox = (J2DTextBox*)mpScreen->search('gold_00'); + J2DTextBox* gold_tbox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('gold_00')); gold_tbox->setFont(mDoExt_getSubFont()); char string[64]; diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 73e9af07ccb..fce7f79a713 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -2540,9 +2540,9 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) { color_reg0.b = 0; f32 size = 8000.0f; - if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == NULL) { + if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0) { size = 11000.0f; - } else if (strcmp(dComIfGp_getStartStageName(), "F_SP200") == NULL) { + } else if (strcmp(dComIfGp_getStartStageName(), "F_SP200") == 0) { size = 10000.0f; } diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp index 431c4c0d303..fa31a962ea2 100644 --- a/src/d/d_kantera_icon_meter.cpp +++ b/src/d/d_kantera_icon_meter.cpp @@ -31,9 +31,9 @@ void dKantera_icon_c::initiate() { dPaneClass_showNullPane(scrn); mpKanteraIcon->setScreen(scrn); - mpParent = new CPaneMgr(scrn, 'kan_m_n', 2, NULL); + mpParent = new CPaneMgr(scrn, MULTI_CHAR('kan_m_n'), 2, NULL); - mpGauge = new CPaneMgr(scrn, 'yellow_m', 0, NULL); + mpGauge = new CPaneMgr(scrn, MULTI_CHAR('yellow_m'), 0, NULL); } void dKantera_icon_c::setAlphaRate(f32 alphaRate) { diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index ba9728c1a5a..0cdfcde90b9 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -255,25 +255,25 @@ static u8 const lit_3778[12] = { }; void dMenu_Collect2D_c::screenSet() { - static const u64 text_sv[3] = {'sav_0', 'sav_1', 'sav_2'}; - static const u64 text_op[3] = {'opt_0', 'opt_1', 'opt_2',}; - static const u64 ftext_sv[3] = {'f_sav_0', 'f_sav_1', 'f_sav_2'}; - static const u64 ftext_op[3] = {'f_opt_0', 'f_opt_1', 'f_opt_2'}; - static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'}; - static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'}; + static const u64 text_sv[3] = {MULTI_CHAR('sav_0'), MULTI_CHAR('sav_1'), MULTI_CHAR('sav_2')}; + static const u64 text_op[3] = {MULTI_CHAR('opt_0'), MULTI_CHAR('opt_1'), MULTI_CHAR('opt_2'),}; + static const u64 ftext_sv[3] = {MULTI_CHAR('f_sav_0'), MULTI_CHAR('f_sav_1'), MULTI_CHAR('f_sav_2')}; + static const u64 ftext_op[3] = {MULTI_CHAR('f_opt_0'), MULTI_CHAR('f_opt_1'), MULTI_CHAR('f_opt_2')}; + static const u64 text_a_tag[5] = {MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5')}; + static const u64 text_b_tag[5] = {MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5')}; #if REGION_JPN - static_cast(mpScreen->search('t_t00'))->setFont(mDoExt_getRubyFont()); - static_cast(mpScreen->search('t_t00'))->setString(0x20, ""); + static_cast(mpScreen->search(MULTI_CHAR('t_t00')))->setFont(mDoExt_getRubyFont()); + static_cast(mpScreen->search(MULTI_CHAR('t_t00')))->setString(0x20, ""); dMeter2Info_getStringKanji( - 0x3E1, static_cast(mpScreen->search('t_t00'))->getStringPtr(), NULL); - mpScreen->search('f_t00')->hide(); + 0x3E1, static_cast(mpScreen->search(MULTI_CHAR('t_t00')))->getStringPtr(), NULL); + mpScreen->search(MULTI_CHAR('f_t00'))->hide(); #else - static_cast(mpScreen->search('f_t00'))->setFont(mDoExt_getRubyFont()); - static_cast(mpScreen->search('f_t00'))->setString(0x20, ""); + static_cast(mpScreen->search(MULTI_CHAR('f_t00')))->setFont(mDoExt_getRubyFont()); + static_cast(mpScreen->search(MULTI_CHAR('f_t00')))->setString(0x20, ""); dMeter2Info_getStringKanji( - 0x3E1, static_cast(mpScreen->search('f_t00'))->getStringPtr(), NULL); - mpScreen->search('t_t00')->hide(); + 0x3E1, static_cast(mpScreen->search(MULTI_CHAR('f_t00')))->getStringPtr(), NULL); + mpScreen->search(MULTI_CHAR('t_t00'))->hide(); #endif for (int i = 0; i < 3; i++) { @@ -312,45 +312,45 @@ void dMenu_Collect2D_c::screenSet() { } #if REGION_JPN - static_cast(mpScreen->search('item_n00'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('item_n01'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('item_n02'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('item_n03'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('item_n00'))->setString(0x20, ""); - static_cast(mpScreen->search('item_n01'))->setString(0x20, ""); - static_cast(mpScreen->search('item_n02'))->setString(0x20, ""); - static_cast(mpScreen->search('item_n03'))->setString(0x20, ""); - static_cast(mpScreen->search('i_text1'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('i_text0'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('i_text1'))->setString(0x100, ""); - static_cast(mpScreen->search('i_text0'))->setString(0x100, ""); - - mpScreen->search('item_n04')->hide(); - mpScreen->search('item_n05')->hide(); - mpScreen->search('item_n06')->hide(); - mpScreen->search('item_n07')->hide(); - mpScreen->search('f_text1')->hide(); - mpScreen->search('f_text0')->hide(); + static_cast(mpScreen->search(MULTI_CHAR('item_n00')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('item_n01')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('item_n02')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('item_n03')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('item_n00')))->setString(0x20, ""); + static_cast(mpScreen->search(MULTI_CHAR('item_n01')))->setString(0x20, ""); + static_cast(mpScreen->search(MULTI_CHAR('item_n02')))->setString(0x20, ""); + static_cast(mpScreen->search(MULTI_CHAR('item_n03')))->setString(0x20, ""); + static_cast(mpScreen->search(MULTI_CHAR('i_text1')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('i_text0')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('i_text1')))->setString(0x100, ""); + static_cast(mpScreen->search(MULTI_CHAR('i_text0')))->setString(0x100, ""); + + mpScreen->search(MULTI_CHAR('item_n04'))->hide(); + mpScreen->search(MULTI_CHAR('item_n05'))->hide(); + mpScreen->search(MULTI_CHAR('item_n06'))->hide(); + mpScreen->search(MULTI_CHAR('item_n07'))->hide(); + mpScreen->search(MULTI_CHAR('f_text1'))->hide(); + mpScreen->search(MULTI_CHAR('f_text0'))->hide(); #else - static_cast(mpScreen->search('item_n04'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('item_n05'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('item_n06'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('item_n07'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('item_n04'))->setString(0x20, ""); - static_cast(mpScreen->search('item_n05'))->setString(0x20, ""); - static_cast(mpScreen->search('item_n06'))->setString(0x20, ""); - static_cast(mpScreen->search('item_n07'))->setString(0x20, ""); - static_cast(mpScreen->search('f_text1'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('f_text0'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('f_text1'))->setString(0x100, ""); - static_cast(mpScreen->search('f_text0'))->setString(0x100, ""); - - mpScreen->search('item_n00')->hide(); - mpScreen->search('item_n01')->hide(); - mpScreen->search('item_n02')->hide(); - mpScreen->search('item_n03')->hide(); - mpScreen->search('i_text1')->hide(); - mpScreen->search('i_text0')->hide(); + static_cast(mpScreen->search(MULTI_CHAR('item_n04')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('item_n05')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('item_n06')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('item_n07')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('item_n04')))->setString(0x20, ""); + static_cast(mpScreen->search(MULTI_CHAR('item_n05')))->setString(0x20, ""); + static_cast(mpScreen->search(MULTI_CHAR('item_n06')))->setString(0x20, ""); + static_cast(mpScreen->search(MULTI_CHAR('item_n07')))->setString(0x20, ""); + static_cast(mpScreen->search(MULTI_CHAR('f_text1')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('f_text0')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('f_text1')))->setString(0x100, ""); + static_cast(mpScreen->search(MULTI_CHAR('f_text0')))->setString(0x100, ""); + + mpScreen->search(MULTI_CHAR('item_n00'))->hide(); + mpScreen->search(MULTI_CHAR('item_n01'))->hide(); + mpScreen->search(MULTI_CHAR('item_n02'))->hide(); + mpScreen->search(MULTI_CHAR('item_n03'))->hide(); + mpScreen->search(MULTI_CHAR('i_text1'))->hide(); + mpScreen->search(MULTI_CHAR('i_text0'))->hide(); #endif field_0x22d[0][0] = 0; @@ -365,13 +365,13 @@ void dMenu_Collect2D_c::screenSet() { if (field_0x22d[3][0] != 0) { if (dComIfGs_isItemFirstBit(0x28)) { - mpScreen->search('ken_00')->hide(); - mpScreen->search('ken_01')->show(); + mpScreen->search(MULTI_CHAR('ken_00'))->hide(); + mpScreen->search(MULTI_CHAR('ken_01'))->show(); } else if (dComIfGs_isItemFirstBit(0x3F) /* dSv_event_flag_c::F_0026 - Ordon Village - gave wooden sword to talo on 3rd day */ && !dComIfGs_isEventBit(0x302)) { - mpScreen->search('ken_00')->show(); - mpScreen->search('ken_01')->hide(); + mpScreen->search(MULTI_CHAR('ken_00'))->show(); + mpScreen->search(MULTI_CHAR('ken_01'))->hide(); } } @@ -391,11 +391,11 @@ void dMenu_Collect2D_c::screenSet() { dComIfGs_isItemFirstBit(0x2B) || dComIfGs_isItemFirstBit(0x2A) ? true : false; if (field_0x22d[3][1] != 0) { if (dComIfGs_isItemFirstBit(0x2B)) { - mpScreen->search('tate_00')->show(); - mpScreen->search('tate_01')->hide(); + mpScreen->search(MULTI_CHAR('tate_00'))->show(); + mpScreen->search(MULTI_CHAR('tate_01'))->hide(); } else if (dComIfGs_isItemFirstBit(0x2A)) { - mpScreen->search('tate_00')->hide(); - mpScreen->search('tate_01')->show(); + mpScreen->search(MULTI_CHAR('tate_00'))->hide(); + mpScreen->search(MULTI_CHAR('tate_01'))->show(); } } field_0x22d[4][1] = dComIfGs_isItemFirstBit(0x2C); @@ -662,14 +662,14 @@ void dMenu_Collect2D_c::screenSet() { mCursorX = i_copy; mCursorY = j_copy; } - mpLinkPm = new CPaneMgr(mpScreen, 'linki_n', 0, NULL); + mpLinkPm = new CPaneMgr(mpScreen, MULTI_CHAR('linki_n'), 0, NULL); mLinkGlobalCenterPos.x = mpLinkPm->getInitGlobalCenterPosX(); mLinkGlobalCenterPos.y = mpLinkPm->getInitGlobalCenterPosY(); mLinkGlobalCenterPos.z = -1000.0f; - mpMaskPm = new CPaneMgr(mpScreen, 'kamen_n', 0, NULL); - mpModelBg = new CPaneMgr(mpScreen, 'modelbgn', 2, NULL); - mpHeartParent = new CPaneMgr(mpScreen, 'heart_n', 0, NULL); - mpHeartPiece = new CPaneMgr(mpScreen, 'heart_kn', 0, NULL); + mpMaskPm = new CPaneMgr(mpScreen, MULTI_CHAR('kamen_n'), 0, NULL); + mpModelBg = new CPaneMgr(mpScreen, MULTI_CHAR('modelbgn'), 2, NULL); + mpHeartParent = new CPaneMgr(mpScreen, MULTI_CHAR('heart_n'), 0, NULL); + mpHeartPiece = new CPaneMgr(mpScreen, MULTI_CHAR('heart_kn'), 0, NULL); setAButtonString(mCurrentAString); setBButtonString(mCurrentBString); setItemNameString(mCursorX, mCursorY); @@ -702,12 +702,12 @@ void dMenu_Collect2D_c::btkAnimeLoop0(J2DAnmTextureSRTKey* i_SRTKey) { } else { mFrame = 0.0f; } - static_cast(mpScreen->search('modelbg0'))->setAnimation(i_SRTKey); - static_cast(mpScreen->search('modelbg1'))->setAnimation(i_SRTKey); - static_cast(mpScreen->search('modelbg2'))->setAnimation(i_SRTKey); - static_cast(mpScreen->search('modelbg3'))->setAnimation(i_SRTKey); - static_cast(mpScreen->search('modelbg4'))->setAnimation(i_SRTKey); - static_cast(mpScreen->search('modelbg5'))->setAnimation(i_SRTKey); + static_cast(mpScreen->search(MULTI_CHAR('modelbg0')))->setAnimation(i_SRTKey); + static_cast(mpScreen->search(MULTI_CHAR('modelbg1')))->setAnimation(i_SRTKey); + static_cast(mpScreen->search(MULTI_CHAR('modelbg2')))->setAnimation(i_SRTKey); + static_cast(mpScreen->search(MULTI_CHAR('modelbg3')))->setAnimation(i_SRTKey); + static_cast(mpScreen->search(MULTI_CHAR('modelbg4')))->setAnimation(i_SRTKey); + static_cast(mpScreen->search(MULTI_CHAR('modelbg5')))->setAnimation(i_SRTKey); } void dMenu_Collect2D_c::setBackAlpha() { @@ -1126,24 +1126,24 @@ void dMenu_Collect2D_c::changeClothe() { void dMenu_Collect2D_c::setArrowMaxNum(u8 param_0) { switch (param_0) { case 0: - mpScreen->search('item_0_0')->hide(); - mpScreen->search('item_0_1')->hide(); - mpScreen->search('item_0_2')->hide(); + mpScreen->search(MULTI_CHAR('item_0_0'))->hide(); + mpScreen->search(MULTI_CHAR('item_0_1'))->hide(); + mpScreen->search(MULTI_CHAR('item_0_2'))->hide(); break; case 30: - mpScreen->search('item_0_0')->show(); - mpScreen->search('item_0_1')->hide(); - mpScreen->search('item_0_2')->hide(); + mpScreen->search(MULTI_CHAR('item_0_0'))->show(); + mpScreen->search(MULTI_CHAR('item_0_1'))->hide(); + mpScreen->search(MULTI_CHAR('item_0_2'))->hide(); break; case 60: - mpScreen->search('item_0_0')->hide(); - mpScreen->search('item_0_1')->show(); - mpScreen->search('item_0_2')->hide(); + mpScreen->search(MULTI_CHAR('item_0_0'))->hide(); + mpScreen->search(MULTI_CHAR('item_0_1'))->show(); + mpScreen->search(MULTI_CHAR('item_0_2'))->hide(); break; case 100: - mpScreen->search('item_0_0')->hide(); - mpScreen->search('item_0_1')->hide(); - mpScreen->search('item_0_2')->show(); + mpScreen->search(MULTI_CHAR('item_0_0'))->hide(); + mpScreen->search(MULTI_CHAR('item_0_1'))->hide(); + mpScreen->search(MULTI_CHAR('item_0_2'))->show(); break; } } @@ -1151,26 +1151,26 @@ void dMenu_Collect2D_c::setArrowMaxNum(u8 param_0) { void dMenu_Collect2D_c::setWalletMaxNum(u16 i_walletSize) { switch (i_walletSize) { case 300: - mpScreen->search('item_1_0')->show(); - mpScreen->search('item_1_1')->hide(); - mpScreen->search('item_1_2')->hide(); + mpScreen->search(MULTI_CHAR('item_1_0'))->show(); + mpScreen->search(MULTI_CHAR('item_1_1'))->hide(); + mpScreen->search(MULTI_CHAR('item_1_2'))->hide(); break; case 600: - mpScreen->search('item_1_0')->hide(); - mpScreen->search('item_1_1')->show(); - mpScreen->search('item_1_2')->hide(); + mpScreen->search(MULTI_CHAR('item_1_0'))->hide(); + mpScreen->search(MULTI_CHAR('item_1_1'))->show(); + mpScreen->search(MULTI_CHAR('item_1_2'))->hide(); break; case 1000: - mpScreen->search('item_1_0')->hide(); - mpScreen->search('item_1_1')->hide(); - mpScreen->search('item_1_2')->show(); + mpScreen->search(MULTI_CHAR('item_1_0'))->hide(); + mpScreen->search(MULTI_CHAR('item_1_1'))->hide(); + mpScreen->search(MULTI_CHAR('item_1_2'))->show(); break; } } void dMenu_Collect2D_c::setSmellType() { static const u64 smell_tag[5] = { - 'wolf_med', 'wolf_chi', 'wolf_fis', 'wolf_iri', 'wolf_pou', + MULTI_CHAR('wolf_med'), MULTI_CHAR('wolf_chi'), MULTI_CHAR('wolf_fis'), MULTI_CHAR('wolf_iri'), MULTI_CHAR('wolf_pou'), }; s32 smellType = -1; switch (dComIfGs_getCollectSmell()) { @@ -1201,10 +1201,10 @@ void dMenu_Collect2D_c::setSmellType() { void dMenu_Collect2D_c::setHeartPiece() { static const u64 heart_tag[4] = { - 'heart_1n', - 'heart_2n', - 'heart_3n', - 'heart_4n', + MULTI_CHAR('heart_1n'), + MULTI_CHAR('heart_2n'), + MULTI_CHAR('heart_3n'), + MULTI_CHAR('heart_4n'), }; s32 life = dComIfGs_getMaxLife() % 5; for (int i = 0; i < MAX_VISIBLE_HEARTPIECES; i++) { @@ -1228,10 +1228,10 @@ void dMenu_Collect2D_c::setPohMaxNum(u8 i_pohNum) { JKRArchive* archive = dComIfGp_getMain2DArchive(); const char* textureName = dMeter2Info_getNumberTextureName(div); ResTIMG* timg = (ResTIMG*)archive->getResource('TIMG', textureName); - static_cast(mpScreen->search('item2_3'))->changeTexture(timg, 0); + static_cast(mpScreen->search(MULTI_CHAR('item2_3')))->changeTexture(timg, 0); check = 1; } else { - mpScreen->search('item2_3')->hide(); + mpScreen->search(MULTI_CHAR('item2_3'))->hide(); } div = index / 10; index = index % 10; @@ -1239,25 +1239,25 @@ void dMenu_Collect2D_c::setPohMaxNum(u8 i_pohNum) { JKRArchive* archive = dComIfGp_getMain2DArchive(); const char* textureName2 = dMeter2Info_getNumberTextureName(div); ResTIMG* timg2 = (ResTIMG*)archive->getResource('TIMG', textureName2); - static_cast(mpScreen->search('item2_2'))->changeTexture(timg2, 0); + static_cast(mpScreen->search(MULTI_CHAR('item2_2')))->changeTexture(timg2, 0); } else { - mpScreen->search('item2_2')->hide(); + mpScreen->search(MULTI_CHAR('item2_2'))->hide(); } JKRArchive* archive = dComIfGp_getMain2DArchive(); const char* textureName3 = dMeter2Info_getNumberTextureName(index); ResTIMG* timg3 = (ResTIMG*)archive->getResource('TIMG', textureName3); - static_cast(mpScreen->search('item2_1'))->changeTexture(timg3, 0); + static_cast(mpScreen->search(MULTI_CHAR('item2_1')))->changeTexture(timg3, 0); } else { - mpScreen->search('item2_3')->hide(); - mpScreen->search('item2_2')->hide(); - mpScreen->search('item2_1')->hide(); + mpScreen->search(MULTI_CHAR('item2_3'))->hide(); + mpScreen->search(MULTI_CHAR('item2_2'))->hide(); + mpScreen->search(MULTI_CHAR('item2_1'))->hide(); } } void dMenu_Collect2D_c::setEquipItemFrameColorSword(int i_frame) { static const u64 tag[2] = { - 'ken_g_0', - 'ken_g_1', + MULTI_CHAR('ken_g_0'), + MULTI_CHAR('ken_g_1'), }; if (i_frame == -1) { @@ -1313,8 +1313,8 @@ void dMenu_Collect2D_c::setEquipItemFrameColorSword(int i_frame) { void dMenu_Collect2D_c::setEquipItemFrameColorShield(int i_frame) { static const u64 tag[2] = { - 'tate_g_0', - 'tate_g_1', + MULTI_CHAR('tate_g_0'), + MULTI_CHAR('tate_g_1'), }; if (i_frame == -1) { @@ -1361,9 +1361,9 @@ void dMenu_Collect2D_c::setEquipItemFrameColorShield(int i_frame) { void dMenu_Collect2D_c::setEquipItemFrameColorClothes(int i_frame) { static const u64 tag[3] = { - 'fuku_g_0', - 'fuku_g_1', - 'fuku_g_2', + MULTI_CHAR('fuku_g_0'), + MULTI_CHAR('fuku_g_1'), + MULTI_CHAR('fuku_g_2'), }; if (i_frame == -1) { @@ -1413,7 +1413,7 @@ void dMenu_Collect2D_c::setEquipItemFrameColorClothes(int i_frame) { void dMenu_Collect2D_c::setHIO(bool i_useHIO) { static const u64 kaz_n[9] = { - 'uzu_00', 'uzu_01', 'uzu_02', 'uzu_03', 'uzu_04', 'uzu_05', 'uzu_06', 'uzu_07', 'hishi', + MULTI_CHAR('uzu_00'), MULTI_CHAR('uzu_01'), MULTI_CHAR('uzu_02'), MULTI_CHAR('uzu_03'), MULTI_CHAR('uzu_04'), MULTI_CHAR('uzu_05'), MULTI_CHAR('uzu_06'), MULTI_CHAR('uzu_07'), MULTI_CHAR('hishi'), }; if (mBlueSmokePosX != g_drawHIO.mCollectScreen.mBlueSmokePosX || @@ -1461,7 +1461,7 @@ void dMenu_Collect2D_c::setHIO(bool i_useHIO) { } if (g_drawHIO.mCollectScreen.mColorDebugON) { - J2DPicture* basePicture = (J2DPicture*)mpScreen->search('nht_base'); + J2DPicture* basePicture = (J2DPicture*)mpScreen->search(MULTI_CHAR('nht_base')); basePicture->setBlackWhite(g_drawHIO.mCollectScreen.mVesselBack[0], g_drawHIO.mCollectScreen.mVesselFront[0]); @@ -1502,29 +1502,29 @@ void dMenu_Collect2D_c::setHIO(bool i_useHIO) { u64 dMenu_Collect2D_c::getItemTag(int i_tag1, int i_tag2, bool param_3) { static const u64 itemTag[6][7] = { - {0, 0, 0, 'ken_n0', 'ken_n1', 'heart_kn', 'kamen_n'}, - {0, 0, 0, 'tate_n0', 'tate_n1'}, + {0, 0, 0, MULTI_CHAR('ken_n0'), MULTI_CHAR('ken_n1'), MULTI_CHAR('heart_kn'), MULTI_CHAR('kamen_n')}, + {0, 0, 0, MULTI_CHAR('tate_n0'), MULTI_CHAR('tate_n1')}, { 0, 0, 0, - 'fuku_n0', - 'fuku_n1', - 'fuku_n2', + MULTI_CHAR('fuku_n0'), + MULTI_CHAR('fuku_n1'), + MULTI_CHAR('fuku_n2'), }, { - 'item_1_n', - 'item_0_n', - 'kabu_6n', - 'maki_5_n', + MULTI_CHAR('item_1_n'), + MULTI_CHAR('item_0_n'), + MULTI_CHAR('kabu_6n'), + MULTI_CHAR('maki_5_n'), }, { - 'wolf_n', - 'item_2_n', - 'fish_3_n', - 'lett_4_n', + MULTI_CHAR('wolf_n'), + MULTI_CHAR('item_2_n'), + MULTI_CHAR('fish_3_n'), + MULTI_CHAR('lett_4_n'), }, - {'save_n', 'option_n'}, + {MULTI_CHAR('save_n'), MULTI_CHAR('option_n')}, }; if (i_tag2 == 5 && !param_3) { @@ -2034,37 +2034,37 @@ void dMenu_Collect2D_c::_draw() { if (mItemNameString == 0) { #if REGION_JPN - char* stringPtr1 = static_cast(mpScreen->search('i_text1'))->getStringPtr(); + char* stringPtr1 = static_cast(mpScreen->search(MULTI_CHAR('i_text1')))->getStringPtr(); #else - char* stringPtr1 = static_cast(mpScreen->search('f_text1'))->getStringPtr(); + char* stringPtr1 = static_cast(mpScreen->search(MULTI_CHAR('f_text1')))->getStringPtr(); #endif strcpy(stringPtr1, ""); #if REGION_JPN - char* stringPtr0 = static_cast(mpScreen->search('i_text0'))->getStringPtr(); + char* stringPtr0 = static_cast(mpScreen->search(MULTI_CHAR('i_text0')))->getStringPtr(); #else - char* stringPtr0 = static_cast(mpScreen->search('f_text0'))->getStringPtr(); + char* stringPtr0 = static_cast(mpScreen->search(MULTI_CHAR('f_text0')))->getStringPtr(); #endif strcpy(stringPtr0, ""); } else { #if REGION_JPN - J2DTextBox* textBox1 = static_cast(mpScreen->search('i_text1')); + J2DTextBox* textBox1 = static_cast(mpScreen->search(MULTI_CHAR('i_text1'))); #else - J2DTextBox* textBox1 = static_cast(mpScreen->search('f_text1')); + J2DTextBox* textBox1 = static_cast(mpScreen->search(MULTI_CHAR('f_text1'))); #endif mpString->getString(mItemNameString, textBox1, NULL, NULL, NULL, 0); #if REGION_JPN - J2DTextBox* textBox0 = static_cast(mpScreen->search('i_text0')); + J2DTextBox* textBox0 = static_cast(mpScreen->search(MULTI_CHAR('i_text0'))); #else - J2DTextBox* textBox0 = static_cast(mpScreen->search('f_text0')); + J2DTextBox* textBox0 = static_cast(mpScreen->search(MULTI_CHAR('f_text0'))); #endif mpString->getString(mItemNameString, textBox0, NULL, NULL, NULL, 0); #if REGION_JPN - textBox0 = static_cast(mpScreen->search('i_text0')); + textBox0 = static_cast(mpScreen->search(MULTI_CHAR('i_text0'))); #else - textBox0 = static_cast(mpScreen->search('f_text0')); + textBox0 = static_cast(mpScreen->search(MULTI_CHAR('f_text0'))); #endif mpString->drawOutFontLocal(textBox0, -1.0f); } @@ -2088,7 +2088,7 @@ bool dMenu_Collect2D_c::isOutCheck() { void dMenu_Collect2D_c::setAButtonString(u16 i_stringID) { static const u64 text_a_tag[5] = { - 'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5', + MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5'), }; if (i_stringID != mCurrentAString) { @@ -2112,7 +2112,7 @@ void dMenu_Collect2D_c::setAButtonString(u16 i_stringID) { void dMenu_Collect2D_c::setBButtonString(u16 i_stringID) { static const u64 text_b_tag[5] = { - 'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5', + MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5'), }; if (i_stringID != mCurrentBString) { @@ -2146,23 +2146,23 @@ void dMenu_Collect2D_c::setItemNameString(u8 param_0, u8 param_1) { } else { #if REGION_JPN char* stringPtr = - static_cast(mpScreen->search('item_n00'))->getStringPtr(); + static_cast(mpScreen->search(MULTI_CHAR('item_n00')))->getStringPtr(); dMeter2Info_getStringKanji(uVar6, stringPtr, NULL); - stringPtr = static_cast(mpScreen->search('item_n01'))->getStringPtr(); + stringPtr = static_cast(mpScreen->search(MULTI_CHAR('item_n01')))->getStringPtr(); dMeter2Info_getStringKanji(uVar6, stringPtr, NULL); - stringPtr = static_cast(mpScreen->search('item_n02'))->getStringPtr(); + stringPtr = static_cast(mpScreen->search(MULTI_CHAR('item_n02')))->getStringPtr(); dMeter2Info_getStringKanji(uVar6, stringPtr, NULL); - stringPtr = static_cast(mpScreen->search('item_n03'))->getStringPtr(); + stringPtr = static_cast(mpScreen->search(MULTI_CHAR('item_n03')))->getStringPtr(); dMeter2Info_getStringKanji(uVar6, stringPtr, NULL); #else char* stringPtr = - static_cast(mpScreen->search('item_n04'))->getStringPtr(); + static_cast(mpScreen->search(MULTI_CHAR('item_n04')))->getStringPtr(); dMeter2Info_getStringKanji(uVar6, stringPtr, NULL); - stringPtr = static_cast(mpScreen->search('item_n05'))->getStringPtr(); + stringPtr = static_cast(mpScreen->search(MULTI_CHAR('item_n05')))->getStringPtr(); dMeter2Info_getStringKanji(uVar6, stringPtr, NULL); - stringPtr = static_cast(mpScreen->search('item_n06'))->getStringPtr(); + stringPtr = static_cast(mpScreen->search(MULTI_CHAR('item_n06')))->getStringPtr(); dMeter2Info_getStringKanji(uVar6, stringPtr, NULL); - stringPtr = static_cast(mpScreen->search('item_n07'))->getStringPtr(); + stringPtr = static_cast(mpScreen->search(MULTI_CHAR('item_n07')))->getStringPtr(); dMeter2Info_getStringKanji(uVar6, stringPtr, NULL); #endif } @@ -2172,21 +2172,21 @@ void dMenu_Collect2D_c::setItemNameString(u8 param_0, u8 param_1) { void dMenu_Collect2D_c::setItemNameStringNull() { mItemNameString = 0; #if REGION_JPN - J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('item_n00'); + J2DTextBox* textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n00')); strcpy(textBox->getStringPtr(), ""); - textBox = (J2DTextBox*)mpScreen->search('item_n01'); + textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n01')); strcpy(textBox->getStringPtr(), ""); - textBox = (J2DTextBox*)mpScreen->search('item_n02'); + textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n02')); strcpy(textBox->getStringPtr(), ""); - textBox = (J2DTextBox*)mpScreen->search('item_n03'); + textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n03')); #else - J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('item_n04'); + J2DTextBox* textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n04')); strcpy(textBox->getStringPtr(), ""); - textBox = (J2DTextBox*)mpScreen->search('item_n05'); + textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n05')); strcpy(textBox->getStringPtr(), ""); - textBox = (J2DTextBox*)mpScreen->search('item_n06'); + textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n06')); strcpy(textBox->getStringPtr(), ""); - textBox = (J2DTextBox*)mpScreen->search('item_n07'); + textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('item_n07')); #endif strcpy(textBox->getStringPtr(), ""); } diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index 70367af4e3a..187fa4b1726 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -147,32 +147,32 @@ void dMenu_DmapBg_c::mapScreenInit() { } #if (PLATFORM_WII || PLATFORM_SHIELD) - mpBlack = new CPaneMgrAlpha(mMapScreen[0], 'm_black', 2, NULL); + mpBlack = new CPaneMgrAlpha(mMapScreen[0], MULTI_CHAR('m_black'), 2, NULL); JUT_ASSERT(699, mpBlack != NULL); mpBlack->setAlphaRate(0.0f); #else mpBlack = NULL; #endif - mMapScreen[0]->search('map_icon')->hide(); - mMapScreen[0]->search('map_aria')->hide(); - mMapScreen[0]->search('n_all')->hide(); - mMapScreen[1]->search('n_all')->hide(); - mMapScreen[0]->search('m_black')->hide(); - mMapScreen[1]->search('bs_00_0')->hide(); - mMapScreen[1]->search('bs_00_1')->hide(); - mMapScreen[1]->search('gold00_0')->hide(); - mMapScreen[1]->search('gold00_1')->hide(); - mMapScreen[1]->search('m_black')->hide(); - mMapScreen[1]->search('center_n')->hide(); - mMapScreen[1]->search('map_ai_n')->setBasePosition(J2DBasePosition_0); - mMapScreen[0]->search('center_n')->setBasePosition(J2DBasePosition_4); + mMapScreen[0]->search(MULTI_CHAR('map_icon'))->hide(); + mMapScreen[0]->search(MULTI_CHAR('map_aria'))->hide(); + mMapScreen[0]->search(MULTI_CHAR('n_all'))->hide(); + mMapScreen[1]->search(MULTI_CHAR('n_all'))->hide(); + mMapScreen[0]->search(MULTI_CHAR('m_black'))->hide(); + mMapScreen[1]->search(MULTI_CHAR('bs_00_0'))->hide(); + mMapScreen[1]->search(MULTI_CHAR('bs_00_1'))->hide(); + mMapScreen[1]->search(MULTI_CHAR('gold00_0'))->hide(); + mMapScreen[1]->search(MULTI_CHAR('gold00_1'))->hide(); + mMapScreen[1]->search(MULTI_CHAR('m_black'))->hide(); + mMapScreen[1]->search(MULTI_CHAR('center_n'))->hide(); + mMapScreen[1]->search(MULTI_CHAR('map_ai_n'))->setBasePosition(J2DBasePosition_0); + mMapScreen[0]->search(MULTI_CHAR('center_n'))->setBasePosition(J2DBasePosition_4); OSInitFastCast(); { Mtx m; CPaneMgr pane; - Vec vtx = pane.getGlobalVtx(mMapScreen[1]->search('map_icon'), &m, 0, false, 0); + Vec vtx = pane.getGlobalVtx(mMapScreen[1]->search(MULTI_CHAR('map_icon')), &m, 0, false, 0); field_0xdc0 = vtx.x; field_0xdc4 = vtx.y; } @@ -193,7 +193,7 @@ void dMenu_DmapBg_c::mapScreenInit() { mMapScreen[0]->animation(); setGoldAnimation(true); - mMapPane = (J2DPicture*)mMapScreen[1]->search('map_aria'); + mMapPane = (J2DPicture*)mMapScreen[1]->search(MULTI_CHAR('map_aria')); mMapPane->setCornerColor(JUtility::TColor(0xFF, 0xFF, 0xFF, 0xFF)); mMapPane->setWhite(JUtility::TColor(0xFF, 0xFF, 0xFF, 0xFF)); @@ -204,7 +204,7 @@ void dMenu_DmapBg_c::mapScreenInit() { mMapWidth = vtx3.x - vtx0.x; mMapHeight = vtx3.y - vtx0.y; - J2DPicture* map_icon_pic = (J2DPicture*)mMapScreen[1]->search('map_icon'); + J2DPicture* map_icon_pic = (J2DPicture*)mMapScreen[1]->search(MULTI_CHAR('map_icon')); map_icon_pic->setBasePosition(J2DBasePosition_4); map_icon_pic->setCornerColor(JUtility::TColor(0xFF, 0xFF, 0xFF, 0xFF)); map_icon_pic->setAlpha(0); @@ -212,7 +212,7 @@ void dMenu_DmapBg_c::mapScreenInit() { initiate(dComIfGp_getDmapResArchive()); for (int i = 0; i < 2; i++) { - mpMapSpace[i] = new CPaneMgr(mMapScreen[i], 'mapspace', 0, NULL); + mpMapSpace[i] = new CPaneMgr(mMapScreen[i], MULTI_CHAR('mapspace'), 0, NULL); JUT_ASSERT(817, mpMapSpace[i] != NULL); mpMapSpace[i]->paneTrans(0.0f, -15.0f); @@ -282,15 +282,15 @@ bool dMenu_DmapBg_c::iconScaleAnm() { } void dMenu_DmapBg_c::buttonIconScreenInit() { - static u64 const cont_at[5] = {'cont_at', 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4'}; - static u64 const cont_bt[5] = {'cont_bt', 'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4'}; - static u64 const font_at[5] = {'font_at', 'font_at1', 'font_at2', 'font_at3', 'font_at4'}; - static u64 const font_bt[5] = {'font_bt', 'font_bt1', 'font_bt2', 'font_bt3', 'font_bt4'}; + static u64 const cont_at[5] = {MULTI_CHAR('cont_at'), MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4')}; + static u64 const cont_bt[5] = {MULTI_CHAR('cont_bt'), MULTI_CHAR('cont_bt1'), MULTI_CHAR('cont_bt2'), MULTI_CHAR('cont_bt3'), MULTI_CHAR('cont_bt4')}; + static u64 const font_at[5] = {MULTI_CHAR('font_at'), MULTI_CHAR('font_at1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4')}; + static u64 const font_bt[5] = {MULTI_CHAR('font_bt'), MULTI_CHAR('font_bt1'), MULTI_CHAR('font_bt2'), MULTI_CHAR('font_bt3'), MULTI_CHAR('font_bt4')}; static u64 const c_tag[2] = { #if VERSION == VERSION_GCN_JPN - 'c_text_s', 'c_text' + MULTI_CHAR('c_text_s'), MULTI_CHAR('c_text') #else - 'f_text_s', 'f_text' + MULTI_CHAR('f_text_s'), MULTI_CHAR('f_text') #endif }; @@ -314,9 +314,9 @@ void dMenu_DmapBg_c::buttonIconScreenInit() { #else mDecorateScreen = NULL; mpDecorateRoot = NULL; - mButtonScreen->search('w_spot')->hide(); - mButtonScreen->search('spot00')->hide(); - mButtonScreen->search('spot01')->hide(); + mButtonScreen->search(MULTI_CHAR('w_spot'))->hide(); + mButtonScreen->search(MULTI_CHAR('spot00'))->hide(); + mButtonScreen->search(MULTI_CHAR('spot01'))->hide(); #endif mpButtonRoot = new CPaneMgrAlphaMorf(mButtonScreen, 'ROOT', 2, NULL); @@ -327,7 +327,7 @@ void dMenu_DmapBg_c::buttonIconScreenInit() { mpButtonText[i] = NULL; } - mpCButton = new CPaneMgrAlpha(mButtonScreen, 'c_btn', 2, NULL); + mpCButton = new CPaneMgrAlpha(mButtonScreen, MULTI_CHAR('c_btn'), 2, NULL); JUT_ASSERT(978, mpCButton != NULL); mpJButton = NULL; @@ -373,9 +373,9 @@ void dMenu_DmapBg_c::buttonIconScreenInit() { void dMenu_DmapBg_c::setAButtonString(u32 i_msgNo) { static u64 const cont_at[5] = { #if VERSION == VERSION_GCN_JPN - 'cont_at', 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4' + MULTI_CHAR('cont_at'), MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4') #else - 'font_at', 'font_at1', 'font_at2', 'font_at3', 'font_at4' + MULTI_CHAR('font_at'), MULTI_CHAR('font_at1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4') #endif }; for (int i = 0; i < 5; i++) { @@ -390,9 +390,9 @@ void dMenu_DmapBg_c::setAButtonString(u32 i_msgNo) { void dMenu_DmapBg_c::setBButtonString(u32 i_msgNo) { static u64 const cont_bt[5] = { #if VERSION == VERSION_GCN_JPN - 'cont_bt', 'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4' + MULTI_CHAR('cont_bt'), MULTI_CHAR('cont_bt1'), MULTI_CHAR('cont_bt2'), MULTI_CHAR('cont_bt3'), MULTI_CHAR('cont_bt4') #else - 'font_bt', 'font_bt1', 'font_bt2', 'font_bt3', 'font_bt4' + MULTI_CHAR('font_bt'), MULTI_CHAR('font_bt1'), MULTI_CHAR('font_bt2'), MULTI_CHAR('font_bt3'), MULTI_CHAR('font_bt4') #endif }; for (int i = 0; i < 5; i++) { @@ -413,9 +413,9 @@ dMenu_Dmap_c* dMenu_Dmap_c::myclass; void dMenu_DmapBg_c::setCButtonString(u32 i_msgNo) { static u64 const c_tag[2] = { #if VERSION == VERSION_GCN_JPN - 'c_text_s', 'c_text' + MULTI_CHAR('c_text_s'), MULTI_CHAR('c_text') #else - 'f_text_s', 'f_text' + MULTI_CHAR('f_text_s'), MULTI_CHAR('f_text') #endif }; int i; @@ -479,7 +479,7 @@ void dMenu_DmapBg_c::baseScreenInit() { JUT_ASSERT(1362, fg != false); dPaneClass_showNullPane(mFloorScreen); - mBaseScreen->search('w_btn_n')->hide(); + mBaseScreen->search(MULTI_CHAR('w_btn_n'))->hide(); mpBaseRoot = new CPaneMgrAlphaMorf(mBaseScreen, 'ROOT', 2, NULL); JUT_ASSERT(1396, mpBaseRoot != NULL); @@ -494,11 +494,11 @@ void dMenu_DmapBg_c::baseScreenInit() { mpDrawCursor->setParam(0.95f, 0.9f, 0.1f, 0.6f, 0.5f); #if VERSION == VERSION_GCN_JPN - J2DTextBox* uVar9 = (J2DTextBox*)mBaseScreen->search('t_t00'); - mBaseScreen->search('f_t_00')->hide(); + J2DTextBox* uVar9 = (J2DTextBox*)mBaseScreen->search(MULTI_CHAR('t_t00')); + mBaseScreen->search(MULTI_CHAR('f_t_00'))->hide(); #else - J2DTextBox* uVar9 = (J2DTextBox*)mBaseScreen->search('f_t_00'); - mBaseScreen->search('t_t00')->hide(); + J2DTextBox* uVar9 = (J2DTextBox*)mBaseScreen->search(MULTI_CHAR('f_t_00')); + mBaseScreen->search(MULTI_CHAR('t_t00'))->hide(); #endif uVar9->setFont(mDoExt_getSubFont()); uVar9->setString(32, ""); @@ -524,11 +524,11 @@ void dMenu_DmapBg_c::setFloorMessage() { }; #if VERSION == VERSION_GCN_JPN - #define FLOOR_TAG(A, B) ('ffoor0_0' | (A<<16) | (B)) - #define FFOOR_TAG(A, B) ('floor0_0' | (A<<16) | (B)) + #define FLOOR_TAG(A, B) (MULTI_CHAR('ffoor0_0') | (A<<16) | (B)) + #define FFOOR_TAG(A, B) (MULTI_CHAR('floor0_0') | (A<<16) | (B)) #else - #define FLOOR_TAG(A, B) ('floor0_0' | (A<<16) | (B)) - #define FFOOR_TAG(A, B) ('ffoor0_0' | (A<<16) | (B)) + #define FLOOR_TAG(A, B) (MULTI_CHAR('floor0_0') | (A<<16) | (B)) + #define FFOOR_TAG(A, B) (MULTI_CHAR('ffoor0_0') | (A<<16) | (B)) #endif floor_textbox_1[0] = (J2DTextBox*)mFloorScreen->search(FFOOR_TAG(7, 1)); @@ -795,8 +795,8 @@ void dMenu_DmapBg_c::setAllAlphaRate(f32 i_rate, bool param_2) { } void dMenu_DmapBg_c::setGoldAnimation(bool param_1) { - J2DPane* gold0 = mMapScreen[0]->search('gold00_0'); - J2DPane* gold1 = mMapScreen[0]->search('gold00_1'); + J2DPane* gold0 = mMapScreen[0]->search(MULTI_CHAR('gold00_0')); + J2DPane* gold1 = mMapScreen[0]->search(MULTI_CHAR('gold00_1')); if (param_1) { gold0->setAnimation(field_0xd28[0]); @@ -809,13 +809,13 @@ void dMenu_DmapBg_c::setGoldAnimation(bool param_1) { void dMenu_DmapBg_c::setGoldFrameAlphaRate(f32 i_rate) { if (0.0f == i_rate) { - mMapScreen[0]->search('gold00_0')->hide(); - mMapScreen[0]->search('gold00_1')->hide(); + mMapScreen[0]->search(MULTI_CHAR('gold00_0'))->hide(); + mMapScreen[0]->search(MULTI_CHAR('gold00_1'))->hide(); } else { - mMapScreen[0]->search('gold00_0')->show(); - mMapScreen[0]->search('gold00_1')->show(); - mMapScreen[0]->search('gold00_0')->setAlpha(i_rate * 255.0f); - mMapScreen[0]->search('gold00_1')->setAlpha(i_rate * 255.0f); + mMapScreen[0]->search(MULTI_CHAR('gold00_0'))->show(); + mMapScreen[0]->search(MULTI_CHAR('gold00_1'))->show(); + mMapScreen[0]->search(MULTI_CHAR('gold00_0'))->setAlpha(i_rate * 255.0f); + mMapScreen[0]->search(MULTI_CHAR('gold00_1'))->setAlpha(i_rate * 255.0f); } } @@ -875,7 +875,7 @@ void dMenu_DmapBg_c::draw() { mMapScreen[0]->draw(field_0xd94, field_0xd98, grafContext); if (mpBackTexture != NULL) { - J2DPane* center_pane = mMapScreen[0]->search('center_n'); + J2DPane* center_pane = mMapScreen[0]->search(MULTI_CHAR('center_n')); CPaneMgr pane; Mtx mtx; Vec local_200 = pane.getGlobalVtx(center_pane, &mtx, 0, false, 0); @@ -904,7 +904,7 @@ void dMenu_DmapBg_c::draw() { mMapScreen[1]->draw(field_0xd94, field_0xd98, grafContext); - J2DPane* center_pane = mMapScreen[1]->search('center_n'); + J2DPane* center_pane = mMapScreen[1]->search(MULTI_CHAR('center_n')); CPaneMgr pane; Mtx local_110; Vec local_218 = pane.getGlobalVtx(center_pane, &local_110, 0, false, 0); @@ -1061,18 +1061,18 @@ dMenu_Dmap_c::dMenu_Dmap_c(JKRExpHeap* param_1, STControl* param_2, CSTControl* } void dMenu_Dmap_c::screenInit() { - static u64 const floor_tag[8] = {'floor7_n', 'floor0_n', 'floor1_n', 'floor2_n', - 'floor3_n', 'floor4_n', 'floor5_n', 'floor6_n'}; - static u64 const icon_tag[8] = {'ico_set7', 'ico_set0', 'ico_set1', 'ico_set2', - 'ico_set3', 'ico_set4', 'ico_set5', 'ico_set6'}; - static u64 const boss_tag[8] = {'ic_st_b7', 'ic_st_b0', 'ic_st_b1', 'ic_st_b2', - 'ic_st_b3', 'ic_st_b4', 'ic_st_b5', 'ic_st_b6'}; - static u64 const stay_tag[2] = {'rink_nul', 'boss_nul'}; - static u64 const waku_tag[3] = {'gray_map', 'gray_con', 'gray_key'}; - static u64 const key_tag[3] = {'key_00', 'key_01', 'key_02'}; - static u64 const item_tag[3] = {'map000', 'con000', 'i_key_n'}; - - field_0x10 = new CPaneMgr(mpDrawBg->mBaseScreen, 'floo_s_n', 0, NULL); + static u64 const floor_tag[8] = {MULTI_CHAR('floor7_n'), MULTI_CHAR('floor0_n'), MULTI_CHAR('floor1_n'), MULTI_CHAR('floor2_n'), + MULTI_CHAR('floor3_n'), MULTI_CHAR('floor4_n'), MULTI_CHAR('floor5_n'), MULTI_CHAR('floor6_n')}; + static u64 const icon_tag[8] = {MULTI_CHAR('ico_set7'), MULTI_CHAR('ico_set0'), MULTI_CHAR('ico_set1'), MULTI_CHAR('ico_set2'), + MULTI_CHAR('ico_set3'), MULTI_CHAR('ico_set4'), MULTI_CHAR('ico_set5'), MULTI_CHAR('ico_set6')}; + static u64 const boss_tag[8] = {MULTI_CHAR('ic_st_b7'), MULTI_CHAR('ic_st_b0'), MULTI_CHAR('ic_st_b1'), MULTI_CHAR('ic_st_b2'), + MULTI_CHAR('ic_st_b3'), MULTI_CHAR('ic_st_b4'), MULTI_CHAR('ic_st_b5'), MULTI_CHAR('ic_st_b6')}; + static u64 const stay_tag[2] = {MULTI_CHAR('rink_nul'), MULTI_CHAR('boss_nul')}; + static u64 const waku_tag[3] = {MULTI_CHAR('gray_map'), MULTI_CHAR('gray_con'), MULTI_CHAR('gray_key')}; + static u64 const key_tag[3] = {MULTI_CHAR('key_00'), MULTI_CHAR('key_01'), MULTI_CHAR('key_02')}; + static u64 const item_tag[3] = {MULTI_CHAR('map000'), MULTI_CHAR('con000'), MULTI_CHAR('i_key_n')}; + + field_0x10 = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('floo_s_n'), 0, NULL); for (int i = 0; i < 8; i++) { field_0x114[i] = 0.0f; @@ -1119,7 +1119,7 @@ void dMenu_Dmap_c::screenInit() { f32 var_f29; f32 var_f28 = 7.0f; - var_f29 = mpDrawBg->mFloorScreen->search('s_n_all')->getHeight(); + var_f29 = mpDrawBg->mFloorScreen->search(MULTI_CHAR('s_n_all'))->getHeight(); f32 var_f30 = mSelFloor[0]->getPanePtr()->getHeight(); f32 var_f27 = mFloorAll - mBottomFloor + 1; @@ -1138,19 +1138,19 @@ void dMenu_Dmap_c::screenInit() { iconMoveCalc(); Vec local_b0 = mSelFloor[getDefaultCurFloorPos()]->getGlobalVtxCenter(false, 0); mpDrawBg->mpDrawCursor->setPos(local_b0.x + field_0x104, local_b0.y, mSelFloor[getDefaultCurFloorPos()]->getPanePtr(), true); - field_0x94 = new CPaneMgr(mpDrawBg->mBaseScreen, 'item_s_n', 0, NULL); - field_0x7c[0] = new CPaneMgr(mpDrawBg->mBaseScreen, 'map_n', 3, NULL); - field_0x7c[1] = new CPaneMgr(mpDrawBg->mBaseScreen, 'con_n', 3, NULL); - field_0x7c[2] = new CPaneMgr(mpDrawBg->mBaseScreen, 'key_n', 3, NULL); - field_0x88[0] = new CPaneMgr(mpDrawBg->mBaseScreen, 'map000', 3, NULL); - field_0x88[1] = new CPaneMgr(mpDrawBg->mBaseScreen, 'con000', 3, NULL); + field_0x94 = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('item_s_n'), 0, NULL); + field_0x7c[0] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('map_n'), 3, NULL); + field_0x7c[1] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('con_n'), 3, NULL); + field_0x7c[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('key_n'), 3, NULL); + field_0x88[0] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('map000'), 3, NULL); + field_0x88[1] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('con000'), 3, NULL); if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV2) { - field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, 'i_key_n', 3, NULL); + field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('i_key_n'), 3, NULL); } else if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV5) { - field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, 'lv5_k_n', 3, NULL); + field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('lv5_k_n'), 3, NULL); } else { - field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, 'nor_k_n', 3, NULL); + field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('nor_k_n'), 3, NULL); } for (int i = 0; i < 3; i++) { @@ -1158,8 +1158,8 @@ void dMenu_Dmap_c::screenInit() { } if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV2) { - mpDrawBg->mBaseScreen->search('lv5_k_n')->hide(); - mpDrawBg->mBaseScreen->search('nor_k_n')->hide(); + mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_k_n'))->hide(); + mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide(); u8 key_num = 0; if (checkItemGet(fpcNm_ITEM_L2_KEY_PIECES1, 1)) { @@ -1187,19 +1187,19 @@ void dMenu_Dmap_c::screenInit() { } if (key_num == 0 || dMeter2Info_isTempBit(0)) { - mpDrawBg->mBaseScreen->search('key_n_n')->hide(); + mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide(); } else { ResTIMG* tex = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(key_num)); - ((J2DPicture*)mpDrawBg->mBaseScreen->search('c_n_2_s'))->changeTexture(tex, 0); - ((J2DPicture*)mpDrawBg->mBaseScreen->search('c_n_2'))->changeTexture(tex, 0); + ((J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('c_n_2_s')))->changeTexture(tex, 0); + ((J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('c_n_2')))->changeTexture(tex, 0); tex = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(3)); - ((J2DPicture*)mpDrawBg->mBaseScreen->search('c_n_1_s'))->changeTexture(tex, 0); - ((J2DPicture*)mpDrawBg->mBaseScreen->search('c_n_1'))->changeTexture(tex, 0); + ((J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('c_n_1_s')))->changeTexture(tex, 0); + ((J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('c_n_1')))->changeTexture(tex, 0); } } else if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV5) { - mpDrawBg->mBaseScreen->search('i_key_n')->hide(); - mpDrawBg->mBaseScreen->search('nor_k_n')->hide(); - mpDrawBg->mBaseScreen->search('key_n_n')->hide(); + mpDrawBg->mBaseScreen->search(MULTI_CHAR('i_key_n'))->hide(); + mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide(); + mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide(); u8 itemNo = fpcNm_ITEM_NONE; field_0x174[2] = 0; @@ -1230,14 +1230,14 @@ void dMenu_Dmap_c::screenInit() { case fpcNm_ITEM_TOMATO_PUREE: case fpcNm_ITEM_TASTE: dMeter2Info_readItemTexture(itemNo, mItemTexBuf, - (J2DPicture*)mpDrawBg->mBaseScreen->search('lv5_boss'), NULL, NULL, NULL, NULL, + (J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_boss')), NULL, NULL, NULL, NULL, NULL, NULL, -1); break; } } else { - mpDrawBg->mBaseScreen->search('i_key_n')->hide(); - mpDrawBg->mBaseScreen->search('lv5_k_n')->hide(); - mpDrawBg->mBaseScreen->search('key_n_n')->hide(); + mpDrawBg->mBaseScreen->search(MULTI_CHAR('i_key_n'))->hide(); + mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_k_n'))->hide(); + mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide(); field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? fpcNm_ITEM_BOSS_KEY : 0; } @@ -1258,9 +1258,9 @@ void dMenu_Dmap_c::screenInit() { mpDrawBg->mBaseScreen->search(waku_tag[i])->hide(); if (i == 2) { - mpDrawBg->mBaseScreen->search('lv5_k_n')->hide(); - mpDrawBg->mBaseScreen->search('nor_k_n')->hide(); - mpDrawBg->mBaseScreen->search('key_n_n')->hide(); + mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_k_n'))->hide(); + mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide(); + mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide(); } } } @@ -1270,7 +1270,7 @@ void dMenu_Dmap_c::screenInit() { } field_0x94->hide(); - field_0x98 = new CPaneMgr(mpDrawBg->mBaseScreen, 'so_s_n', 0, NULL); + field_0x98 = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('so_s_n'), 0, NULL); field_0x98->hide(); } @@ -1728,7 +1728,7 @@ void dMenu_Dmap_c::_create() { screenInit(); - mpDrawBg->getMapPane()->changeTexture(mMapCtrl->getResTIMGPointer(0), NULL); + mpDrawBg->getMapPane()->changeTexture(mMapCtrl->getResTIMGPointer(0), 0); if (mpDrawBg->getMapPane()->append(mMapCtrl->getResTIMGPointer(1), 1.0f)) { mpDrawBg->getMapPane()->setBlendRatio(1.0f, 0.0f); @@ -2025,8 +2025,8 @@ void dMenu_Dmap_c::_draw() { sp14[1] = -(field_0x138 + 100.0f * (sp20 * mMapCtrl->getPixelPerCm())); Vec spC; - spC.x = mpDrawBg->mMapScreen[0]->search('center_n')->getGlbBounds().i.x + (mpDrawBg->mMapScreen[0]->search('center_n')->getWidth() / 2); - spC.y = mpDrawBg->mMapScreen[0]->search('center_n')->getGlbBounds().i.y + (mpDrawBg->mMapScreen[0]->search('center_n')->getHeight() / 2); + spC.x = mpDrawBg->mMapScreen[0]->search(MULTI_CHAR('center_n'))->getGlbBounds().i.x + (mpDrawBg->mMapScreen[0]->search(MULTI_CHAR('center_n'))->getWidth() / 2); + spC.y = mpDrawBg->mMapScreen[0]->search(MULTI_CHAR('center_n'))->getGlbBounds().i.y + (mpDrawBg->mMapScreen[0]->search(MULTI_CHAR('center_n'))->getHeight() / 2); CPaneMgr sp70; //!@bug It's unclear what this is supposed to be, but a stack pointer being converted to a bool is probably not intended. diff --git a/src/d/d_menu_fishing.cpp b/src/d/d_menu_fishing.cpp index 315d820e59f..a37c4f510ea 100644 --- a/src/d/d_menu_fishing.cpp +++ b/src/d/d_menu_fishing.cpp @@ -220,54 +220,54 @@ void dMenu_Fishing_c::wait_move() { void dMenu_Fishing_c::screenSetBase() { static const u64 fish_n[6] = { - 'fish_n_6', 'fish_n_5', 'fish_n_3', 'fish_n_1', 'fish_n_2', 'fish_n_4', + MULTI_CHAR('fish_n_6'), MULTI_CHAR('fish_n_5'), MULTI_CHAR('fish_n_3'), MULTI_CHAR('fish_n_1'), MULTI_CHAR('fish_n_2'), MULTI_CHAR('fish_n_4'), }; static const u64 fish_p0[6] = { - 'fi_pa_6n', 'fi_pa_5n', 'fi_pa_3n', 'fi_pa_1n', 'fi_pa_2n', 'fi_pa_4n', + MULTI_CHAR('fi_pa_6n'), MULTI_CHAR('fi_pa_5n'), MULTI_CHAR('fi_pa_3n'), MULTI_CHAR('fi_pa_1n'), MULTI_CHAR('fi_pa_2n'), MULTI_CHAR('fi_pa_4n'), }; static const u64 fish_p1[6] = { - 'fi_na_6n', 'fi_na_5n', 'fi_na_3n', 'fi_na_1n', 'fi_na_2n', 'fi_na_4n', + MULTI_CHAR('fi_na_6n'), MULTI_CHAR('fi_na_5n'), MULTI_CHAR('fi_na_3n'), MULTI_CHAR('fi_na_1n'), MULTI_CHAR('fi_na_2n'), MULTI_CHAR('fi_na_4n'), }; - static const u64 fish_p2[6] = {'fi_li_6n', 'fi_li_5n', 'fi_li_3n', - 'fi_li_1n', 'fi_li_2n', 'fi_li_4n'}; + static const u64 fish_p2[6] = {MULTI_CHAR('fi_li_6n'), MULTI_CHAR('fi_li_5n'), MULTI_CHAR('fi_li_3n'), + MULTI_CHAR('fi_li_1n'), MULTI_CHAR('fi_li_2n'), MULTI_CHAR('fi_li_4n')}; static const u64 fish_p3[6] = { - 'b_box_6n', 'b_box_5n', 'b_box_3n', 'b_box_1n', 'b_box_2n', 'b_box_4n', + MULTI_CHAR('b_box_6n'), MULTI_CHAR('b_box_5n'), MULTI_CHAR('b_box_3n'), MULTI_CHAR('b_box_1n'), MULTI_CHAR('b_box_2n'), MULTI_CHAR('b_box_4n'), }; static const u64 fish_p4[6] = { - 'r_box_6n', 'r_box_5n', 'r_box_3n', 'r_box_1n', 'r_box_2n', 'r_box_4n', + MULTI_CHAR('r_box_6n'), MULTI_CHAR('r_box_5n'), MULTI_CHAR('r_box_3n'), MULTI_CHAR('r_box_1n'), MULTI_CHAR('r_box_2n'), MULTI_CHAR('r_box_4n'), }; static const u64 fish_p5[6] = { - 'info_6_n', 'info_5_n', 'info_3_n', 'info_1_n', 'info_2_n', 'info_4_n', + MULTI_CHAR('info_6_n'), MULTI_CHAR('info_5_n'), MULTI_CHAR('info_3_n'), MULTI_CHAR('info_1_n'), MULTI_CHAR('info_2_n'), MULTI_CHAR('info_4_n'), }; static const u64 size_1[6] = { - 'size_t_6', 'size_t_5', 'size_t_3', 'size_t_1', 'size_t_2', 'size_t_4', + MULTI_CHAR('size_t_6'), MULTI_CHAR('size_t_5'), MULTI_CHAR('size_t_3'), MULTI_CHAR('size_t_1'), MULTI_CHAR('size_t_2'), MULTI_CHAR('size_t_4'), }; static const u64 size_unit_1[6] = { - 'cm_t_6', 'cm_t_5', 'cm_t_3', 'cm_t_1', 'cm_t_2', 'cm_t_4', + MULTI_CHAR('cm_t_6'), MULTI_CHAR('cm_t_5'), MULTI_CHAR('cm_t_3'), MULTI_CHAR('cm_t_1'), MULTI_CHAR('cm_t_2'), MULTI_CHAR('cm_t_4'), }; static const u64 count_1[6] = { - 'count_t6', 'count_t5', 'count_t3', 'count_t1', 'count_t2', 'count_t4', + MULTI_CHAR('count_t6'), MULTI_CHAR('count_t5'), MULTI_CHAR('count_t3'), MULTI_CHAR('count_t1'), MULTI_CHAR('count_t2'), MULTI_CHAR('count_t4'), }; static const u64 count_unit_1[6] = { - 'cou_t_6', 'cou_t_5', 'cou_t_3', 'cou_t_1', 'cou_t_2', 'cou_t_4', + MULTI_CHAR('cou_t_6'), MULTI_CHAR('cou_t_5'), MULTI_CHAR('cou_t_3'), MULTI_CHAR('cou_t_1'), MULTI_CHAR('cou_t_2'), MULTI_CHAR('cou_t_4'), }; static const u64 name_0[6] = { - 'name_6', 'name_5', 'name_3', 'name_1', 'name_2', 'name_4', + MULTI_CHAR('name_6'), MULTI_CHAR('name_5'), MULTI_CHAR('name_3'), MULTI_CHAR('name_1'), MULTI_CHAR('name_2'), MULTI_CHAR('name_4'), }; static const u64 fname_0[6] = { - 'f_name_6', 'f_name_5', 'f_name_3', 'f_name_1', 'f_name_2', 'f_name_4', + MULTI_CHAR('f_name_6'), MULTI_CHAR('f_name_5'), MULTI_CHAR('f_name_3'), MULTI_CHAR('f_name_1'), MULTI_CHAR('f_name_2'), MULTI_CHAR('f_name_4'), }; static const u32 name_id[6] = { @@ -281,7 +281,7 @@ void dMenu_Fishing_c::screenSetBase() { mpScreen = new J2DScreen(); mpScreen->setPriority("zelda_fish_window.blo", 0x20000, mpArchive); dPaneClass_showNullPane(mpScreen); - mpParent = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); mpParent->setAlphaRate(0.0f); for (int i = 0; i < MAX_FINDABLE_FISHES; i++) { mpFishParent[i] = new CPaneMgr(mpScreen, fish_n[i], 0, NULL); @@ -292,15 +292,15 @@ void dMenu_Fishing_c::screenSetBase() { mpFishParts[4][i] = new CPaneMgr(mpScreen, fish_p4[i], 0, NULL); mpFishParts[5][i] = new CPaneMgr(mpScreen, fish_p5[i], 0, NULL); } - mpFishInfoParent[0] = new CPaneMgr(mpScreen, 'info_blu', 0, NULL); - mpFishInfoParent[1] = new CPaneMgr(mpScreen, 'info_red', 0, NULL); + mpFishInfoParent[0] = new CPaneMgr(mpScreen, MULTI_CHAR('info_blu'), 0, NULL); + mpFishInfoParent[1] = new CPaneMgr(mpScreen, MULTI_CHAR('info_red'), 0, NULL); #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) - J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('t_t00'); - mpScreen->search('f_t00')->hide(); + J2DTextBox* textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('t_t00')); + mpScreen->search(MULTI_CHAR('f_t00'))->hide(); #else - J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('f_t00'); - mpScreen->search('t_t00')->hide(); + J2DTextBox* textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('f_t00')); + mpScreen->search(MULTI_CHAR('t_t00'))->hide(); #endif textBox->setFont(mDoExt_getSubFont()); @@ -329,8 +329,8 @@ void dMenu_Fishing_c::screenSetBase() { mpFishNameString[i]->setString(0x20, ""); dMeter2Info_getStringKanji(name_id[i], mpFishNameString[i]->getStringPtr(), NULL); } - mpInfoLargestString = (J2DTextBox*)mpScreen->search('inf_size'); - mpInfoNumCaughtString = (J2DTextBox*)mpScreen->search('inf_cou'); + mpInfoLargestString = (J2DTextBox*)mpScreen->search(MULTI_CHAR('inf_size')); + mpInfoNumCaughtString = (J2DTextBox*)mpScreen->search(MULTI_CHAR('inf_cou')); mpInfoLargestString->setFont(mDoExt_getMesgFont()); mpInfoNumCaughtString->setFont(mDoExt_getMesgFont()); mpInfoLargestString->setString(0x20, ""); @@ -340,8 +340,8 @@ void dMenu_Fishing_c::screenSetBase() { } void dMenu_Fishing_c::screenSetDoIcon() { - static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'}; - static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'}; + static const u64 text_a_tag[5] = {MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5')}; + static const u64 text_b_tag[5] = {MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5')}; mpIconScreen = new J2DScreen(); mpIconScreen->setPriority("zelda_collect_soubi_do_icon_parts.blo", 0x20000, mpArchive); diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index a9e88c8696d..2cb59876134 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -2270,7 +2270,7 @@ bool dMenu_Fmap_c::readFieldMapData(void** o_data, char const* i_path, bool para } void dMenu_Fmap_c::decodeFieldMapData() { - int field_data = (intptr_t)mpFieldDat; + intptr_t field_data = (intptr_t)mpFieldDat; dMenu_Fmap_field_region_data_c* region_data = (dMenu_Fmap_field_region_data_c*)(field_data + mpFieldDat->mRegionDataOffset); dMenuMapCommon_c::Stage_c* stage_data diff --git a/src/d/d_menu_fmap2D.cpp b/src/d/d_menu_fmap2D.cpp index 20d798b9472..9f6cf74c07f 100644 --- a/src/d/d_menu_fmap2D.cpp +++ b/src/d/d_menu_fmap2D.cpp @@ -178,10 +178,10 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { mpBaseRoot = new CPaneMgrAlphaMorf(mpBaseScreen, 'ROOT', 2, NULL); JUT_ASSERT(264, mpBaseRoot != NULL); - mpMapArea = new CPaneMgr(mpBaseScreen, 'center_n', 0, NULL); + mpMapArea = new CPaneMgr(mpBaseScreen, MULTI_CHAR('center_n'), 0, NULL); JUT_ASSERT(269, mpMapArea != NULL); - mpMapBlack = new CPaneMgr(mpBaseScreen, 'map_blak', 0, NULL); + mpMapBlack = new CPaneMgr(mpBaseScreen, MULTI_CHAR('map_blak'), 0, NULL); JUT_ASSERT(273, mpMapBlack != NULL); mpMeterHaihai = new dMeterHaihai_c(1); @@ -204,12 +204,12 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { dPaneClass_showNullPane(mpPointScreen); - mpPointParent = new CPaneMgr(mpPointScreen, 'f_po_n', 2, NULL); + mpPointParent = new CPaneMgr(mpPointScreen, MULTI_CHAR('f_po_n'), 2, NULL); JUT_ASSERT(301, mpPointParent != NULL); mpPointParent->scale(g_fmapHIO.mCursorScale, g_fmapHIO.mCursorScale); - static const u64 cur_tag[4] = {'f_po_ru', 'f_po_rd', 'f_po_ld', 'f_po_lu'}; + static const u64 cur_tag[4] = {MULTI_CHAR('f_po_ru'), MULTI_CHAR('f_po_rd'), MULTI_CHAR('f_po_ld'), MULTI_CHAR('f_po_lu')}; for (int i = 0; i < 4; i++) { J2DPicture* picture = static_cast(mpPointScreen->search(cur_tag[i])); @@ -390,7 +390,7 @@ void dMenu_Fmap2DBack_c::draw() { if (g_fmapHIO.mCursorDebugON) { mpPointParent->scale(g_fmapHIO.mCursorScale, g_fmapHIO.mCursorScale); - static const u64 cur_tag[4] = {'f_po_ru', 'f_po_rd', 'f_po_ld', 'f_po_lu'}; + static const u64 cur_tag[4] = {MULTI_CHAR('f_po_ru'), MULTI_CHAR('f_po_rd'), MULTI_CHAR('f_po_ld'), MULTI_CHAR('f_po_lu')}; for (int i = 0; i < 4; i++) { J2DPicture* picture = static_cast(mpPointScreen->search(cur_tag[i])); @@ -1814,8 +1814,8 @@ void dMenu_Fmap2DBack_c::btkAnimeLoop(f32 i_step) { mAnmFrame = 0.0f; } - mpBaseScreen->search('gold00_0')->setAnimation(mpBaseAnm); - mpBaseScreen->search('gold00_1')->setAnimation(mpBaseAnm); + mpBaseScreen->search(MULTI_CHAR('gold00_0'))->setAnimation(mpBaseAnm); + mpBaseScreen->search(MULTI_CHAR('gold00_1'))->setAnimation(mpBaseAnm); mpBaseScreen->animation(); } @@ -2187,46 +2187,46 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { mpAnalogStickAlpha = NULL; mpAnalogStick = NULL; mpDpad = NULL; - mpTitleScreen->search('tri_Null')->hide(); + mpTitleScreen->search(MULTI_CHAR('tri_Null'))->hide(); #endif #if PLATFORM_GCN - mpArrowLAlpha[0] = new CPaneMgrAlpha(mpTitleScreen, 'yaji_04', 0, NULL); - mpArrowLAlpha[1] = new CPaneMgrAlpha(mpTitleScreen, 'yaji_05', 0, NULL); - mpArrowRAlpha[0] = new CPaneMgrAlpha(mpTitleScreen, 'yaji_06', 0, NULL); - mpArrowRAlpha[1] = new CPaneMgrAlpha(mpTitleScreen, 'yaji_07', 0, NULL); + mpArrowLAlpha[0] = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_04'), 0, NULL); + mpArrowLAlpha[1] = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_05'), 0, NULL); + mpArrowRAlpha[0] = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_06'), 0, NULL); + mpArrowRAlpha[1] = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_07'), 0, NULL); - mpDpadAlpha = new CPaneMgrAlpha(mpTitleScreen, 'juji_c_n', 2, NULL); + mpDpadAlpha = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('juji_c_n'), 2, NULL); mpDpadAlpha->setAlphaRate(0.0f); mpAnalogStickAlpha = new CPaneMgrAlpha(mpTitleScreen, 'as_n', 2, NULL); mpAnalogStickAlpha->setAlphaRate(0.0f); mpAnalogStick = new CPaneMgr(mpTitleScreen, 'as_n', 0, NULL); - mpDpad = new CPaneMgr(mpTitleScreen, 'juji_c_n', 0, NULL); + mpDpad = new CPaneMgr(mpTitleScreen, MULTI_CHAR('juji_c_n'), 0, NULL); #endif #if PLATFORM_SHIELD - mpButtonA = new CPaneMgr(mpTitleScreen, 'abtn_n', 2, NULL); + mpButtonA = new CPaneMgr(mpTitleScreen, MULTI_CHAR('abtn_n'), 2, NULL); JUT_ASSERT(3935, mpButtonA != NULL); - mpButtonB = new CPaneMgr(mpTitleScreen, 'bbtn_n', 2, NULL); + mpButtonB = new CPaneMgr(mpTitleScreen, MULTI_CHAR('bbtn_n'), 2, NULL); JUT_ASSERT(3938, mpButtonB != NULL); - mpButtonZ = new CPaneMgr(mpTitleScreen, 'j_scal_n', 2, NULL); + mpButtonZ = new CPaneMgr(mpTitleScreen, MULTI_CHAR('j_scal_n'), 2, NULL); JUT_ASSERT(3941, mpButtonZ != NULL); - mpButtonTextA = new CPaneMgr(mpTitleScreen, 'a_text_n', 2, NULL); + mpButtonTextA = new CPaneMgr(mpTitleScreen, MULTI_CHAR('a_text_n'), 2, NULL); JUT_ASSERT(3953, mpButtonTextA != NULL); - mpButtonTextB = new CPaneMgr(mpTitleScreen, 'b_text_n', 2, NULL); + mpButtonTextB = new CPaneMgr(mpTitleScreen, MULTI_CHAR('b_text_n'), 2, NULL); JUT_ASSERT(3956, mpButtonTextB != NULL); - mpButtonTextZ = new CPaneMgr(mpTitleScreen, 'z_text_n', 2, NULL); + mpButtonTextZ = new CPaneMgr(mpTitleScreen, MULTI_CHAR('z_text_n'), 2, NULL); JUT_ASSERT(3959, mpButtonTextZ != NULL); #else - mpButtonA = new CPaneMgr(mpTitleScreen, 'abtn_n1', 2, NULL); + mpButtonA = new CPaneMgr(mpTitleScreen, MULTI_CHAR('abtn_n1'), 2, NULL); JUT_ASSERT(3935, mpButtonA != NULL); - mpButtonB = new CPaneMgr(mpTitleScreen, 'bbtn_n1', 2, NULL); + mpButtonB = new CPaneMgr(mpTitleScreen, MULTI_CHAR('bbtn_n1'), 2, NULL); JUT_ASSERT(3938, mpButtonB != NULL); - mpButtonZ = new CPaneMgr(mpTitleScreen, 'zbtn_n1', 2, NULL); + mpButtonZ = new CPaneMgr(mpTitleScreen, MULTI_CHAR('zbtn_n1'), 2, NULL); JUT_ASSERT(3941, mpButtonZ != NULL); - mpButtonTextA = new CPaneMgr(mpTitleScreen, 'a_text_n', 2, NULL); + mpButtonTextA = new CPaneMgr(mpTitleScreen, MULTI_CHAR('a_text_n'), 2, NULL); JUT_ASSERT(3953, mpButtonTextA != NULL); - mpButtonTextB = new CPaneMgr(mpTitleScreen, 'b_text_n', 2, NULL); + mpButtonTextB = new CPaneMgr(mpTitleScreen, MULTI_CHAR('b_text_n'), 2, NULL); JUT_ASSERT(3956, mpButtonTextB != NULL); - mpButtonTextZ = new CPaneMgr(mpTitleScreen, 'z_text_n', 2, NULL); + mpButtonTextZ = new CPaneMgr(mpTitleScreen, MULTI_CHAR('z_text_n'), 2, NULL); JUT_ASSERT(3959, mpButtonTextZ != NULL); #endif mpButtonA->setAlphaRate(0.0f); @@ -2236,16 +2236,16 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { mpButtonTextB->setAlphaRate(0.0f); mpButtonTextZ->setAlphaRate(0.0f); - mpNamePane = new CPaneMgr(mpTitleScreen, 'name_n', 0, NULL); + mpNamePane = new CPaneMgr(mpTitleScreen, MULTI_CHAR('name_n'), 0, NULL); JUT_ASSERT(3970, mpNamePane != NULL); - mpSubPane = new CPaneMgr(mpTitleScreen, 'sub_n_n', 0, NULL); + mpSubPane = new CPaneMgr(mpTitleScreen, MULTI_CHAR('sub_n_n'), 0, NULL); JUT_ASSERT(3974, mpSubPane != NULL); if (dMeter2Info_getMapStatus() == 9) { mpNamePane->hide(); mpSubPane->hide(); } - mpContPane = new CPaneMgr(mpTitleScreen, 'cont_n', 0, NULL); + mpContPane = new CPaneMgr(mpTitleScreen, MULTI_CHAR('cont_n'), 0, NULL); JUT_ASSERT(3984, mpContPane != NULL); mTitlePosX = mTitlePosY = 0.0f; @@ -2271,8 +2271,8 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { mAnmFrame = 0.0f; - static const u64 area_name[3] = {'i_name_s', 'i_name' ,'i_name1'}; - static const u64 farea_name[3] = {'f_name_1', 'f_name3', 'f_name2'}; + static const u64 area_name[3] = {MULTI_CHAR('i_name_s'), MULTI_CHAR('i_name') ,MULTI_CHAR('i_name1')}; + static const u64 farea_name[3] = {MULTI_CHAR('f_name_1'), MULTI_CHAR('f_name3'), MULTI_CHAR('f_name2')}; for (int i = 0; i < 3; i++) { #if VERSION == VERSION_GCN_JPN static_cast(mpTitleScreen->search(area_name[i])) @@ -2288,17 +2288,17 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { } #if PLATFORM_GCN static const u64 sfont_name[7] = { - 'sfont00', 'sfontl0', 'sfontl1', 'sfontl2', 'sfontb0', 'sfontb1', 'sfontb2' + MULTI_CHAR('sfont00'), MULTI_CHAR('sfontl0'), MULTI_CHAR('sfontl1'), MULTI_CHAR('sfontl2'), MULTI_CHAR('sfontb0'), MULTI_CHAR('sfontb1'), MULTI_CHAR('sfontb2') }; static const u64 ffont_name[7] = { - 'ffont00', 'ffontl0', 'ffontl1', 'ffontl2', 'ffontb0', 'ffontb3', 'ffontb4' + MULTI_CHAR('ffont00'), MULTI_CHAR('ffontl0'), MULTI_CHAR('ffontl1'), MULTI_CHAR('ffontl2'), MULTI_CHAR('ffontb0'), MULTI_CHAR('ffontb3'), MULTI_CHAR('ffontb4') }; #else static const u64 sfont_name[7] = { - 'sfont00', 'sfontl0', 'sfontl1', 'sfontl2', 'sfontb0', 'sfontb1', 'sfontb2' + MULTI_CHAR('sfont00'), MULTI_CHAR('sfontl0'), MULTI_CHAR('sfontl1'), MULTI_CHAR('sfontl2'), MULTI_CHAR('sfontb0'), MULTI_CHAR('sfontb1'), MULTI_CHAR('sfontb2') }; static const u64 ffont_name[7] = { - 'ffont01', 'ffontl3', 'ffontl4', 'ffontl5', 'ffontb3', 'ffontb4', 'ffontb5' + MULTI_CHAR('ffont01'), MULTI_CHAR('ffontl3'), MULTI_CHAR('ffontl4'), MULTI_CHAR('ffontl5'), MULTI_CHAR('ffontb3'), MULTI_CHAR('ffontb4'), MULTI_CHAR('ffontb5') }; #endif for (int i = 0; i < 7; i++) { @@ -2316,8 +2316,8 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { } setTitleNameString(0x3e0); - static const u64 cont_zt[5] = {'cont_zt', 'cont_zt1', 'cont_zt2', 'cont_zt3', 'cont_zt4'}; - static const u64 font_zt[5] = {'font_zt1', 'font_zt2', 'font_zt3', 'font_zt4', 'font_zt5'}; + static const u64 cont_zt[5] = {MULTI_CHAR('cont_zt'), MULTI_CHAR('cont_zt1'), MULTI_CHAR('cont_zt2'), MULTI_CHAR('cont_zt3'), MULTI_CHAR('cont_zt4')}; + static const u64 font_zt[5] = {MULTI_CHAR('font_zt1'), MULTI_CHAR('font_zt2'), MULTI_CHAR('font_zt3'), MULTI_CHAR('font_zt4'), MULTI_CHAR('font_zt5')}; for (int i = 0; i < 5; i++) { #if VERSION == VERSION_GCN_JPN static_cast(mpTitleScreen->search(cont_zt[i])) @@ -2333,11 +2333,11 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { } setZButtonString(0x529, 0xff); #if PLATFORM_GCN - static const u64 cont_bt[5] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt'}; - static const u64 font_bt[5] = {'font_bt1', 'font_bt2', 'font_bt3', 'font_bt4', 'font_bt5'}; + static const u64 cont_bt[5] = {MULTI_CHAR('cont_bt1'), MULTI_CHAR('cont_bt2'), MULTI_CHAR('cont_bt3'), MULTI_CHAR('cont_bt4'), MULTI_CHAR('cont_bt')}; + static const u64 font_bt[5] = {MULTI_CHAR('font_bt1'), MULTI_CHAR('font_bt2'), MULTI_CHAR('font_bt3'), MULTI_CHAR('font_bt4'), MULTI_CHAR('font_bt5')}; #else - static const u64 cont_bt[5] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt8'}; - static const u64 font_bt[5] = {'font_bt1', 'font_bt2', 'font_bt3', 'font_bt4', 'font_bt5'}; + static const u64 cont_bt[5] = {MULTI_CHAR('cont_bt1'), MULTI_CHAR('cont_bt2'), MULTI_CHAR('cont_bt3'), MULTI_CHAR('cont_bt4'), MULTI_CHAR('cont_bt8')}; + static const u64 font_bt[5] = {MULTI_CHAR('font_bt1'), MULTI_CHAR('font_bt2'), MULTI_CHAR('font_bt3'), MULTI_CHAR('font_bt4'), MULTI_CHAR('font_bt5')}; #endif for (int i = 0; i < 5; i++) { #if VERSION == VERSION_GCN_JPN @@ -2354,8 +2354,8 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { } setBButtonString(0x522, 0xff); - static const u64 cont_at[5] = {'cont_at', 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4'}; - static const u64 font_at[5] = {'font_at1', 'font_at2', 'font_at3', 'font_at4', 'font_at5'}; + static const u64 cont_at[5] = {MULTI_CHAR('cont_at'), MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4')}; + static const u64 font_at[5] = {MULTI_CHAR('font_at1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4'), MULTI_CHAR('font_at5')}; for (int i = 0; i < 5; i++) { #if VERSION == VERSION_GCN_JPN static_cast(mpTitleScreen->search(cont_at[i])) @@ -2372,8 +2372,8 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { setAButtonString(0x527, 0xff); #if PLATFORM_GCN - static const u64 juji_c[5] = {'juji_c00', 'juji_c01', 'juji_c02', 'juji_c03', 'juji_c04'}; - static const u64 fuji_c[5] = {'fuji_c00', 'fuji_c01', 'fuji_c02', 'fuji_c03', 'fuji_c04'}; + static const u64 juji_c[5] = {MULTI_CHAR('juji_c00'), MULTI_CHAR('juji_c01'), MULTI_CHAR('juji_c02'), MULTI_CHAR('juji_c03'), MULTI_CHAR('juji_c04')}; + static const u64 fuji_c[5] = {MULTI_CHAR('fuji_c00'), MULTI_CHAR('fuji_c01'), MULTI_CHAR('fuji_c02'), MULTI_CHAR('fuji_c03'), MULTI_CHAR('fuji_c04')}; for (int i = 0; i < 5; i++) { #if VERSION == VERSION_GCN_JPN static_cast(mpTitleScreen->search(juji_c[i])) @@ -2389,8 +2389,8 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { } setCrossLRString(0x3f9); - static const u64 ast_c[5] = {'ast_00', 'ast_01', 'ast_02', 'ast_03', 'ast_04'}; - static const u64 fst_c[5] = {'fst_00', 'fst_01', 'fst_02', 'fst_03', 'fst_04'}; + static const u64 ast_c[5] = {MULTI_CHAR('ast_00'), MULTI_CHAR('ast_01'), MULTI_CHAR('ast_02'), MULTI_CHAR('ast_03'), MULTI_CHAR('ast_04')}; + static const u64 fst_c[5] = {MULTI_CHAR('fst_00'), MULTI_CHAR('fst_01'), MULTI_CHAR('fst_02'), MULTI_CHAR('fst_03'), MULTI_CHAR('fst_04')}; for (int i = 0; i < 5; i++) { #if VERSION == VERSION_GCN_JPN static_cast(mpTitleScreen->search(ast_c[i])) @@ -2575,28 +2575,28 @@ void dMenu_Fmap2DTop_c::btkAnimeLoop(J2DAnmTextureSRTKey* i_anm, f32 i_delta) { mAnmFrame = 0.0f; } - mpTitleScreen->search('spot_0')->setAnimation(i_anm); + mpTitleScreen->search(MULTI_CHAR('spot_0'))->setAnimation(i_anm); mpTitleScreen->animation(); } void dMenu_Fmap2DTop_c::setMoyaAlpha(u8 i_alpha) { - mpTitleScreen->search('spot_0')->setAlpha(i_alpha); + mpTitleScreen->search(MULTI_CHAR('spot_0'))->setAlpha(i_alpha); } void dMenu_Fmap2DTop_c::setTitleNameString(u32 param_0) { #if VERSION == VERSION_GCN_JPN static const u64 sfont_name[7] = { - 'sfont00', 'sfontl0', 'sfontl1', 'sfontl2', 'sfontb0', 'sfontb1', 'sfontb2' + MULTI_CHAR('sfont00'), MULTI_CHAR('sfontl0'), MULTI_CHAR('sfontl1'), MULTI_CHAR('sfontl2'), MULTI_CHAR('sfontb0'), MULTI_CHAR('sfontb1'), MULTI_CHAR('sfontb2') }; #define setTitleNameString_font_name sfont_name #elif PLATFORM_GCN static const u64 ffont_name[7] = { - 'ffont00', 'ffontl0', 'ffontl1', 'ffontl2', 'ffontb0', 'ffontb3', 'ffontb4' + MULTI_CHAR('ffont00'), MULTI_CHAR('ffontl0'), MULTI_CHAR('ffontl1'), MULTI_CHAR('ffontl2'), MULTI_CHAR('ffontb0'), MULTI_CHAR('ffontb3'), MULTI_CHAR('ffontb4') }; #define setTitleNameString_font_name ffont_name #else static const u64 ffont_name[7] = { - 'ffont01', 'ffontl3', 'ffontl4', 'ffontl5', 'ffontb3', 'ffontb4', 'ffontb5' + MULTI_CHAR('ffont01'), MULTI_CHAR('ffontl3'), MULTI_CHAR('ffontl4'), MULTI_CHAR('ffontl5'), MULTI_CHAR('ffontb3'), MULTI_CHAR('ffontb4'), MULTI_CHAR('ffontb5') }; #define setTitleNameString_font_name ffont_name #endif @@ -2617,10 +2617,10 @@ void dMenu_Fmap2DTop_c::setTitleNameString(u32 param_0) { void dMenu_Fmap2DTop_c::setAreaNameString(u32 param_0) { #if VERSION == VERSION_GCN_JPN - static const u64 iarea_name[3] = {'i_name_s', 'i_name', 'i_name1'}; + static const u64 iarea_name[3] = {MULTI_CHAR('i_name_s'), MULTI_CHAR('i_name'), MULTI_CHAR('i_name1')}; #define setAreaNameString_area_name iarea_name #else - static const u64 farea_name[3] = {'f_name_1', 'f_name3', 'f_name2'}; + static const u64 farea_name[3] = {MULTI_CHAR('f_name_1'), MULTI_CHAR('f_name3'), MULTI_CHAR('f_name2')}; #define setAreaNameString_area_name farea_name #endif for (int i = 0; i < 3; i++) { @@ -2644,10 +2644,10 @@ void dMenu_Fmap2DTop_c::setZButtonString(u32 param_0, u8 i_alpha) { } #if VERSION == VERSION_GCN_JPN - static const u64 cont_zt[5] = {'cont_zt', 'cont_zt1', 'cont_zt2', 'cont_zt3', 'cont_zt4'}; + static const u64 cont_zt[5] = {MULTI_CHAR('cont_zt'), MULTI_CHAR('cont_zt1'), MULTI_CHAR('cont_zt2'), MULTI_CHAR('cont_zt3'), MULTI_CHAR('cont_zt4')}; #define setZButtonString_font_zt cont_zt #else - static const u64 font_zt[5] = {'font_zt1', 'font_zt2', 'font_zt3', 'font_zt4', 'font_zt5'}; + static const u64 font_zt[5] = {MULTI_CHAR('font_zt1'), MULTI_CHAR('font_zt2'), MULTI_CHAR('font_zt3'), MULTI_CHAR('font_zt4'), MULTI_CHAR('font_zt5')}; #define setZButtonString_font_zt font_zt #endif if (param_0 == 0 || !isWarpAccept()) { @@ -2678,10 +2678,10 @@ void dMenu_Fmap2DTop_c::setZButtonString(u32 param_0, u8 i_alpha) { void dMenu_Fmap2DTop_c::setBButtonString(u32 param_0, u8 i_alpha) { #if VERSION == VERSION_GCN_JPN - static const u64 cont_bt[5] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt'}; + static const u64 cont_bt[5] = {MULTI_CHAR('cont_bt1'), MULTI_CHAR('cont_bt2'), MULTI_CHAR('cont_bt3'), MULTI_CHAR('cont_bt4'), MULTI_CHAR('cont_bt')}; #define setBButtonString_font_bt cont_bt #else - static const u64 font_bt[5] = {'font_bt1', 'font_bt2', 'font_bt3', 'font_bt4', 'font_bt5'}; + static const u64 font_bt[5] = {MULTI_CHAR('font_bt1'), MULTI_CHAR('font_bt2'), MULTI_CHAR('font_bt3'), MULTI_CHAR('font_bt4'), MULTI_CHAR('font_bt5')}; #define setBButtonString_font_bt font_bt #endif if (param_0 == 0) { @@ -2704,10 +2704,10 @@ void dMenu_Fmap2DTop_c::setBButtonString(u32 param_0, u8 i_alpha) { void dMenu_Fmap2DTop_c::setAButtonString(u32 param_0, u8 i_alpha) { #if VERSION == VERSION_GCN_JPN - static const u64 cont_at[5] = {'cont_at', 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4'}; + static const u64 cont_at[5] = {MULTI_CHAR('cont_at'), MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4')}; #define setAButtonString_font_at cont_at #else - static const u64 font_at[5] = {'font_at1', 'font_at2', 'font_at3', 'font_at4', 'font_at5'}; + static const u64 font_at[5] = {MULTI_CHAR('font_at1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4'), MULTI_CHAR('font_at5')}; #define setAButtonString_font_at font_at #endif if (param_0 == 0) { @@ -2731,23 +2731,23 @@ void dMenu_Fmap2DTop_c::setAButtonString(u32 param_0, u8 i_alpha) { void dMenu_Fmap2DTop_c::setCrossLRString(u32 param_0) { #if PLATFORM_GCN || (VERSION == VERSION_SHIELD) #if VERSION == VERSION_GCN_JPN - static const u64 juji_c[5] = {'juji_c00', 'juji_c01', 'juji_c02', 'juji_c03', 'juji_c04'}; + static const u64 juji_c[5] = {MULTI_CHAR('juji_c00'), MULTI_CHAR('juji_c01'), MULTI_CHAR('juji_c02'), MULTI_CHAR('juji_c03'), MULTI_CHAR('juji_c04')}; #else - static const u64 juji_c[5] = {'fuji_c00', 'fuji_c01', 'fuji_c02', 'fuji_c03', 'fuji_c04'}; + static const u64 juji_c[5] = {MULTI_CHAR('fuji_c00'), MULTI_CHAR('fuji_c01'), MULTI_CHAR('fuji_c02'), MULTI_CHAR('fuji_c03'), MULTI_CHAR('fuji_c04')}; #endif if (param_0 == 0) { for (int i = 0; i < 5; i++) { J2DTextBox* text_box = static_cast(mpTitleScreen->search(juji_c[i])); strcpy(text_box->getStringPtr(), ""); } - mpTitleScreen->search('juy_sha0')->show(); + mpTitleScreen->search(MULTI_CHAR('juy_sha0'))->show(); mAlphaDpad = 1; } else { for (int i = 0; i < 5; i++) { J2DTextBox* text_box = static_cast(mpTitleScreen->search(juji_c[i])); dMeter2Info_getStringKanji(param_0, text_box->getStringPtr(), NULL); } - mpTitleScreen->search('juy_sha0')->show(); + mpTitleScreen->search(MULTI_CHAR('juy_sha0'))->show(); mAlphaDpad = 2; } #endif @@ -2756,23 +2756,23 @@ void dMenu_Fmap2DTop_c::setCrossLRString(u32 param_0) { void dMenu_Fmap2DTop_c::set3DStickString(u32 param_0) { #if PLATFORM_GCN || (VERSION == VERSION_SHIELD) #if VERSION == VERSION_GCN_JPN - static const u64 ast_c[5] = {'ast_00', 'ast_01', 'ast_02', 'ast_03', 'ast_04'}; + static const u64 ast_c[5] = {MULTI_CHAR('ast_00'), MULTI_CHAR('ast_01'), MULTI_CHAR('ast_02'), MULTI_CHAR('ast_03'), MULTI_CHAR('ast_04')}; #else - static const u64 ast_c[5] = {'fst_00', 'fst_01', 'fst_02', 'fst_03', 'fst_04'}; + static const u64 ast_c[5] = {MULTI_CHAR('fst_00'), MULTI_CHAR('fst_01'), MULTI_CHAR('fst_02'), MULTI_CHAR('fst_03'), MULTI_CHAR('fst_04')}; #endif if (param_0 == 0) { for (int i = 0; i < 5; i++) { J2DTextBox* text_box = static_cast(mpTitleScreen->search(ast_c[i])); strcpy(text_box->getStringPtr(), ""); } - mpTitleScreen->search('as_sha0')->show(); + mpTitleScreen->search(MULTI_CHAR('as_sha0'))->show(); mAlphaAnalogStick = 1; } else { for (int i = 0; i < 5; i++) { J2DTextBox* text_box = static_cast(mpTitleScreen->search(ast_c[i])); dMeter2Info_getStringKanji(param_0, text_box->getStringPtr(), NULL); } - mpTitleScreen->search('as_sha0')->show(); + mpTitleScreen->search(MULTI_CHAR('as_sha0'))->show(); mAlphaAnalogStick = 2; } #endif diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index 239195a51b4..1cc94b391b4 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -441,20 +441,20 @@ void dMenu_Insect_c::explain_close_move() { void dMenu_Insect_c::screenSetBase() { static const u64 insect_tag[MAX_INSECT_NUM] = { - 'ari_os', 'ari_ms', 'kag_os', 'kag_ms', 'kab_os', 'kab_ms', 'kam_os', 'kam_mes', - 'kuwa_os', 'kuwa_mes', 'dan_os', 'dan_mes', 'cho_os', 'cho_ms', 'tent_os', 'tent_mes', - 'kata_os', 'kata_mes', 'nana_os', 'nana_mes', 'bat_os', 'bat_mes', 'tonb_os', 'tonb_mes', + MULTI_CHAR('ari_os'), MULTI_CHAR('ari_ms'), MULTI_CHAR('kag_os'), MULTI_CHAR('kag_ms'), MULTI_CHAR('kab_os'), MULTI_CHAR('kab_ms'), MULTI_CHAR('kam_os'), MULTI_CHAR('kam_mes'), + MULTI_CHAR('kuwa_os'), MULTI_CHAR('kuwa_mes'), MULTI_CHAR('dan_os'), MULTI_CHAR('dan_mes'), MULTI_CHAR('cho_os'), MULTI_CHAR('cho_ms'), MULTI_CHAR('tent_os'), MULTI_CHAR('tent_mes'), + MULTI_CHAR('kata_os'), MULTI_CHAR('kata_mes'), MULTI_CHAR('nana_os'), MULTI_CHAR('nana_mes'), MULTI_CHAR('bat_os'), MULTI_CHAR('bat_mes'), MULTI_CHAR('tonb_os'), MULTI_CHAR('tonb_mes'), }; static const u64 ageha_tag[MAX_INSECT_NUM] = { - 'ageha00', 'ageha01', 'ageha02', 'ageha03', 'ageha04', 'ageha05', 'ageha06', 'ageha07', - 'ageha08', 'ageha09', 'ageha10', 'ageha11', 'ageha12', 'ageha13', 'ageha14', 'ageha15', - 'ageha16', 'ageha17', 'ageha18', 'ageha19', 'ageha20', 'ageha21', 'ageha22', 'ageha23', + MULTI_CHAR('ageha00'), MULTI_CHAR('ageha01'), MULTI_CHAR('ageha02'), MULTI_CHAR('ageha03'), MULTI_CHAR('ageha04'), MULTI_CHAR('ageha05'), MULTI_CHAR('ageha06'), MULTI_CHAR('ageha07'), + MULTI_CHAR('ageha08'), MULTI_CHAR('ageha09'), MULTI_CHAR('ageha10'), MULTI_CHAR('ageha11'), MULTI_CHAR('ageha12'), MULTI_CHAR('ageha13'), MULTI_CHAR('ageha14'), MULTI_CHAR('ageha15'), + MULTI_CHAR('ageha16'), MULTI_CHAR('ageha17'), MULTI_CHAR('ageha18'), MULTI_CHAR('ageha19'), MULTI_CHAR('ageha20'), MULTI_CHAR('ageha21'), MULTI_CHAR('ageha22'), MULTI_CHAR('ageha23'), }; mpScreen = new J2DScreen(); mpScreen->setPriority("zelda_gold_insects.blo", 0x20000, mpArchive); dPaneClass_showNullPane(mpScreen); - mpParent = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); mpParent->setAlphaRate(0.0f); for (int i = 0; i < MAX_INSECT_NUM; i++) { mpINSParent[i] = new CPaneMgr(mpScreen, insect_tag[i], 0, NULL); @@ -475,11 +475,11 @@ void dMenu_Insect_c::screenSetBase() { } } #if VERSION == VERSION_GCN_JPN - J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('t_t00'); - mpScreen->search('f_t00')->hide(); + J2DTextBox* textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('t_t00')); + mpScreen->search(MULTI_CHAR('f_t00'))->hide(); #else - J2DTextBox* textBox = (J2DTextBox*)mpScreen->search('f_t00'); - mpScreen->search('t_t00')->hide(); + J2DTextBox* textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('f_t00')); + mpScreen->search(MULTI_CHAR('t_t00'))->hide(); #endif textBox->setFont(mDoExt_getSubFont()); textBox->setString(0x200, ""); @@ -490,27 +490,27 @@ void dMenu_Insect_c::screenSetExplain() { mpExpScreen = new J2DScreen(); mpExpScreen->setPriority("zelda_gold_insects_info.blo", 0x20000, mpArchive); dPaneClass_showNullPane(mpExpScreen); - mpExpParent = new CPaneMgr(mpExpScreen, 'n_all', 2, NULL); + mpExpParent = new CPaneMgr(mpExpScreen, MULTI_CHAR('n_all'), 2, NULL); mpExpParent->setAlphaRate(0.0f); - mpExpSubWin[0] = new CPaneMgr(mpExpScreen, 'in_win_n', 0, NULL); - mpExpSubWin[1] = new CPaneMgr(mpExpScreen, 'w_d_mo_n', 0, NULL); + mpExpSubWin[0] = new CPaneMgr(mpExpScreen, MULTI_CHAR('in_win_n'), 0, NULL); + mpExpSubWin[1] = new CPaneMgr(mpExpScreen, MULTI_CHAR('w_d_mo_n'), 0, NULL); if (field_0xf6 == 0) { mpExpSubWin[1]->hide(); } #if VERSION == VERSION_GCN_JPN - mpInfoText = new CPaneMgr(mpExpScreen, 'mg_3line', 0, NULL); - mpExpScreen->search('n_e4line')->hide(); - field_0x5c = (J2DTextBox*)mpExpScreen->search('w_msg_jp'); - mpExpScreen->search('ms_for_2')->hide(); + mpInfoText = new CPaneMgr(mpExpScreen, MULTI_CHAR('mg_3line'), 0, NULL); + mpExpScreen->search(MULTI_CHAR('n_e4line'))->hide(); + field_0x5c = (J2DTextBox*)mpExpScreen->search(MULTI_CHAR('w_msg_jp')); + mpExpScreen->search(MULTI_CHAR('ms_for_2'))->hide(); #else - mpInfoText = new CPaneMgr(mpExpScreen, 'mg_e4lin', 0, NULL); - mpExpScreen->search('n_3line')->hide(); - field_0x5c = (J2DTextBox*)mpExpScreen->search('ms_for_2'); - mpExpScreen->search('w_msg_jp')->hide(); + mpInfoText = new CPaneMgr(mpExpScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); + mpExpScreen->search(MULTI_CHAR('n_3line'))->hide(); + field_0x5c = (J2DTextBox*)mpExpScreen->search(MULTI_CHAR('ms_for_2')); + mpExpScreen->search(MULTI_CHAR('w_msg_jp'))->hide(); #endif - mpExpScreen->search('ms_for_3')->hide(); - field_0x54[0] = (J2DPicture*)mpExpScreen->search('insects'); - field_0x54[1] = (J2DPicture*)mpExpScreen->search('insectss'); + mpExpScreen->search(MULTI_CHAR('ms_for_3'))->hide(); + field_0x54[0] = (J2DPicture*)mpExpScreen->search(MULTI_CHAR('insects')); + field_0x54[1] = (J2DPicture*)mpExpScreen->search(MULTI_CHAR('insectss')); J2DTextBox* textBox = (J2DTextBox*)mpInfoText->getPanePtr(); textBox->setFont(mDoExt_getMesgFont()); J2DTextBox* textBox2 = (J2DTextBox*)mpInfoText->getPanePtr(); @@ -521,10 +521,10 @@ void dMenu_Insect_c::screenSetExplain() { void dMenu_Insect_c::screenSetDoIcon() { static const u64 text_a_tag[5] = { - 'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5', + MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5'), }; static const u64 text_b_tag[5] = { - 'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5', + MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5'), }; mpIconScreen = new J2DScreen(); diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index 0e4fd1ffe98..7119ef3e030 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -42,17 +42,17 @@ static moveFunc move_process[] = { dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archive, STControl* i_stick, bool param_3) { static const u64 name_tag[4] = { - 'item_n04', - 'item_n05', - 'item_n06', - 'item_n07', + MULTI_CHAR('item_n04'), + MULTI_CHAR('item_n05'), + MULTI_CHAR('item_n06'), + MULTI_CHAR('item_n07'), }; static const u64 fame_tag[4] = { - 'f_item_1', - 'f_item_2', - 'f_item_3', - 'f_item_4', + MULTI_CHAR('f_item_1'), + MULTI_CHAR('f_item_2'), + MULTI_CHAR('f_item_3'), + MULTI_CHAR('f_item_4'), }; mpHeap = i_heap; @@ -97,18 +97,18 @@ dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archi mpKanteraMeter = new dKantera_icon_c(); mpInfoScreen = new J2DScreen(); mpInfoScreen->setPriority("zelda_item_screen_info.blo", 0x20000, mpArchive); - mpParent[0] = new CPaneMgr(mpInfoScreen, 'n_all', 2, NULL); + mpParent[0] = new CPaneMgr(mpInfoScreen, MULTI_CHAR('n_all'), 2, NULL); mpParent[1] = NULL; - mpLabel = new CPaneMgr(mpInfoScreen, 'label_n', 0, NULL); + mpLabel = new CPaneMgr(mpInfoScreen, MULTI_CHAR('label_n'), 0, NULL); mDescAlpha = 0.0f; field_0x78 = 0; mAlphaRatio = 201.0f; #if VERSION == VERSION_GCN_JPN - mpInfoText = new CPaneMgr(mpInfoScreen, 'i_text4', 0, NULL); - mpInfoScreen->search('i_text1')->hide(); + mpInfoText = new CPaneMgr(mpInfoScreen, MULTI_CHAR('i_text4'), 0, NULL); + mpInfoScreen->search(MULTI_CHAR('i_text1'))->hide(); #else - mpInfoText = new CPaneMgr(mpInfoScreen, 'i_text1', 0, NULL); - mpInfoScreen->search('i_text4')->hide(); + mpInfoText = new CPaneMgr(mpInfoScreen, MULTI_CHAR('i_text1'), 0, NULL); + mpInfoScreen->search(MULTI_CHAR('i_text4'))->hide(); #endif ((J2DTextBox*)(mpInfoText->getPanePtr()))->setFont(mDoExt_getMesgFont()); ((J2DTextBox*)(mpInfoText->getPanePtr()))->setString(0x200, ""); @@ -124,25 +124,25 @@ dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archi ((J2DTextBox*)(mpNameText[i]->getPanePtr()))->setFont(mDoExt_getMesgFont()); ((J2DTextBox*)(mpNameText[i]->getPanePtr()))->setString(0x20, ""); } - mpInfoIcon = new CPaneMgr(mpInfoScreen, 'i_icon_p', 0, NULL); + mpInfoIcon = new CPaneMgr(mpInfoScreen, MULTI_CHAR('i_icon_p'), 0, NULL); for (int i = 0; i < 4; i++) { mpExpItemTex[i] = (ResTIMG*)mpHeap->alloc(0xC00, 0x20); } mpExpItemPane[0] = new J2DPicture( - 'i_icon_1', + MULTI_CHAR('i_icon_1'), JGeometry::TBox2(0.0f, 0.0f, mpInfoIcon->getInitSizeX(), mpInfoIcon->getInitSizeY()), ((J2DPicture*)(mpInfoIcon->getPanePtr()))->getTexture(0)->getTexInfo(), NULL); mpExpItemPane[0]->setBasePosition(J2DBasePosition_4); mpInfoIcon->getPanePtr()->appendChild(mpExpItemPane[0]); mpExpItemPane[1] = new J2DPicture( - 'i_icon_2', + MULTI_CHAR('i_icon_2'), JGeometry::TBox2(0.0f, 0.0f, mpInfoIcon->getInitSizeX(), mpInfoIcon->getInitSizeY()), ((J2DPicture*)(mpInfoIcon->getPanePtr()))->getTexture(0)->getTexInfo(), NULL); mpExpItemPane[1]->setBasePosition(J2DBasePosition_4); mpInfoIcon->getPanePtr()->appendChild(mpExpItemPane[1]); mpExpItemPane[2] = new J2DPicture( - 'i_icon_3', + MULTI_CHAR('i_icon_3'), JGeometry::TBox2(0.0f, 0.0f, mpInfoIcon->getInitSizeX(), mpInfoIcon->getInitSizeY()), ((J2DPicture*)(mpInfoIcon->getPanePtr()))->getTexture(0)->getTexInfo(), NULL); mpExpItemPane[2]->setBasePosition(J2DBasePosition_4); @@ -152,7 +152,7 @@ dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archi 'TIMG', dMeter2Info_getNumberTextureName(0)); for (int i = 0; i < 3; i++) { mpItemNumTex[i] = new J2DPicture(texResource); - mpInfoScreen->search('info_n1')->appendChild(mpItemNumTex[i]); + mpInfoScreen->search(MULTI_CHAR('info_n1'))->appendChild(mpItemNumTex[i]); mpItemNumTex[i]->move(i * 16.0f + (mpInfoIcon->getPosX() + mpInfoIcon->getSizeX() * 0.5f), mpInfoIcon->getPosY() + mpInfoIcon->getSizeY() - 3.0f); mpItemNumTex[i]->resize(16.0f, 16.0f); @@ -290,7 +290,7 @@ void dMenu_ItemExplain_c::move() { if (status != mStatus) { (this->*init_process[mStatus])(); } - if (mStatus != NULL) { + if (mStatus != 0) { mpInfoScreen->animation(); } if (g_ringHIO.mItemDescAlpha != mDescAlpha) { @@ -396,7 +396,7 @@ void dMenu_ItemExplain_c::open_init() { } } setNumber(); - mpInfoScreen->search('i_i_back')->show(); + mpInfoScreen->search(MULTI_CHAR('i_i_back'))->show(); field_0xe6 = 0; } else { mpInfoIcon->hide(); @@ -404,7 +404,7 @@ void dMenu_ItemExplain_c::open_init() { mpExpItemPane[i]->hide(); } setNumber(); - mpInfoScreen->search('i_i_back')->hide(); + mpInfoScreen->search(MULTI_CHAR('i_i_back'))->hide(); field_0xe6 = 1; } if (mpArrow != NULL) { diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index ee1be7dc6aa..2cb342c37d1 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -429,11 +429,11 @@ void dMenu_Letter_c::wait_move() { if (mProcess == 1 || mProcess == 2) { #if VERSION == VERSION_GCN_JPN - J2DTextBox* textBox = (J2DTextBox*)mpBaseScreen->search('t_t00'); - mpBaseScreen->search('f_t_00')->hide(); + J2DTextBox* textBox = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('t_t00')); + mpBaseScreen->search(MULTI_CHAR('f_t_00'))->hide(); #else - J2DTextBox* textBox = (J2DTextBox*)mpBaseScreen->search('f_t_00'); - mpBaseScreen->search('t_t00')->hide(); + J2DTextBox* textBox = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('f_t_00')); + mpBaseScreen->search(MULTI_CHAR('t_t00'))->hide(); #endif dComIfGp_setMessageCountNumber(field_0x374 + (field_0x36f + 1) * 100); mpString->getString(0x4d6, textBox, NULL, NULL, NULL, 0); @@ -492,7 +492,7 @@ void dMenu_Letter_c::read_open_init() { } J2DTextBox* text2 = (J2DTextBox*)field_0x2ec[i]->getPanePtr(); mpString->getStringPage(dMenu_Letter::getLetterText(idx), field_0x3e3 - 1, LINE_MAX, text2, text1, - NULL, NULL, NULL); + 0, NULL, NULL); } field_0x3e2 = mpString->getPageMax(LINE_MAX); if (field_0x3e2 > 1) { @@ -551,7 +551,7 @@ void dMenu_Letter_c::read_move_init() { setBButtonString(0x3f9); } CPaneMgr paneMgr; - J2DPane* pane = mpLetterScreen[0]->search('set_ya_n'); + J2DPane* pane = mpLetterScreen[0]->search(MULTI_CHAR('set_ya_n')); Vec pos = paneMgr.getGlobalVtxCenter(pane, false, 0); mpArrow->setPos(pos.x, pos.y); } else { @@ -592,7 +592,7 @@ void dMenu_Letter_c::read_move_move() { mpArrow->arwAnimeMove(); } CPaneMgr paneMgr; - J2DPane* pane = mpLetterScreen[0]->search('set_ya_n'); + J2DPane* pane = mpLetterScreen[0]->search(MULTI_CHAR('set_ya_n')); Vec pos = paneMgr.getGlobalVtxCenter(pane, false, 0); mpArrow->setPos(pos.x, pos.y); } @@ -642,7 +642,7 @@ void dMenu_Letter_c::read_next_fadein_init() { text1 = (J2DTextBox*)field_0x2f4[i]->getPanePtr(); } J2DTextBox* text2 = (J2DTextBox*)field_0x2ec[i]->getPanePtr(); - mpString->getStringPage(dMenu_Letter::getLetterText(idx), field_0x3e3 - 1, LINE_MAX, text2, text1, NULL, NULL, NULL); + mpString->getStringPage(dMenu_Letter::getLetterText(idx), field_0x3e3 - 1, LINE_MAX, text2, text1, 0, NULL, NULL); } char acStack_30[10]; sprintf(acStack_30, "%d/%d", field_0x3e3, field_0x3e2); @@ -705,51 +705,51 @@ void dMenu_Letter_c::read_close_move() { void dMenu_Letter_c::screenSetMenu() { static const u64 tag_sub0[6] = { - 'menu_t0s', 'menu_t1s', 'menu_t2s', 'menu_t3s', 'menu_t4s', 'menu_t5s', + MULTI_CHAR('menu_t0s'), MULTI_CHAR('menu_t1s'), MULTI_CHAR('menu_t2s'), MULTI_CHAR('menu_t3s'), MULTI_CHAR('menu_t4s'), MULTI_CHAR('menu_t5s'), }; static const u64 tag_sub1[6] = { - 'menu_t0', 'menu_t1', 'menu_t2', 'menu_t3', 'menu_t4', 'menu_t5', + MULTI_CHAR('menu_t0'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t4'), MULTI_CHAR('menu_t5'), }; static const u64 tag_name0[6] = { - 'menu_t6s', 'menu_f7s', 'menu_f8s', 'menu_t9s', 'menu_10s', 'menu_11s', + MULTI_CHAR('menu_t6s'), MULTI_CHAR('menu_f7s'), MULTI_CHAR('menu_f8s'), MULTI_CHAR('menu_t9s'), MULTI_CHAR('menu_10s'), MULTI_CHAR('menu_11s'), }; static const u64 tag_name1[6] = { - 'menu_f6', 'menu_f7', 'menu_t8', 'menu_t9', 'menu_t10', 'menu_t11', + MULTI_CHAR('menu_f6'), MULTI_CHAR('menu_f7'), MULTI_CHAR('menu_t8'), MULTI_CHAR('menu_t9'), MULTI_CHAR('menu_t10'), MULTI_CHAR('menu_t11'), }; static const u64 ftag_sub0[6] = { - 'fenu_t0s', 'fenu_t1s', 'fenu_t2s', 'fenu_t3s', 'fenu_t4s', 'fenu_t5s', + MULTI_CHAR('fenu_t0s'), MULTI_CHAR('fenu_t1s'), MULTI_CHAR('fenu_t2s'), MULTI_CHAR('fenu_t3s'), MULTI_CHAR('fenu_t4s'), MULTI_CHAR('fenu_t5s'), }; static const u64 ftag_sub1[6] = { - 'fenu_t0', 'fenu_t1', 'fenu_t2', 'fenu_t3', 'fenu_t4', 'fenu_t5', + MULTI_CHAR('fenu_t0'), MULTI_CHAR('fenu_t1'), MULTI_CHAR('fenu_t2'), MULTI_CHAR('fenu_t3'), MULTI_CHAR('fenu_t4'), MULTI_CHAR('fenu_t5'), }; static const u64 ftag_name0[6] = { - 'fenu_t6s', 'fenu_t7s', 'fenu_f8s', 'fenu_t9s', 'fenu_10s', 'fenu_11s', + MULTI_CHAR('fenu_t6s'), MULTI_CHAR('fenu_t7s'), MULTI_CHAR('fenu_f8s'), MULTI_CHAR('fenu_t9s'), MULTI_CHAR('fenu_10s'), MULTI_CHAR('fenu_11s'), }; static const u64 ftag_name1[6] = { - 'fenu_t6', 'fenu_t7', 'fenu_t8', 'fenu_t9', 'fenu_t10', 'fenu_t11', + MULTI_CHAR('fenu_t6'), MULTI_CHAR('fenu_t7'), MULTI_CHAR('fenu_t8'), MULTI_CHAR('fenu_t9'), MULTI_CHAR('fenu_t10'), MULTI_CHAR('fenu_t11'), }; static const u64 tag_letter[6] = { - 'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n', 'let_05_n', + MULTI_CHAR('let_00_n'), MULTI_CHAR('let_01_n'), MULTI_CHAR('let_02_n'), MULTI_CHAR('let_03_n'), MULTI_CHAR('let_04_n'), MULTI_CHAR('let_05_n'), }; static const u64 tag_frame[6] = { - 'flame_00', 'flame_01', 'flame_02', 'flame_03', 'flame_04', 'flame_05', + MULTI_CHAR('flame_00'), MULTI_CHAR('flame_01'), MULTI_CHAR('flame_02'), MULTI_CHAR('flame_03'), MULTI_CHAR('flame_04'), MULTI_CHAR('flame_05'), }; static const u64 tag_menu0[6] = { #if VERSION == VERSION_GCN_JPN - 'menu_t0', 'menu_t1', 'menu_t2', 'menu_t3', 'menu_t4', 'menu_t5', + MULTI_CHAR('menu_t0'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t4'), MULTI_CHAR('menu_t5'), #else - 'fenu_t0', 'fenu_t1', 'fenu_t2', 'fenu_t3', 'fenu_t4', 'fenu_t5', + MULTI_CHAR('fenu_t0'), MULTI_CHAR('fenu_t1'), MULTI_CHAR('fenu_t2'), MULTI_CHAR('fenu_t3'), MULTI_CHAR('fenu_t4'), MULTI_CHAR('fenu_t5'), #endif }; static const u64 tag_menu1[6] = { #if VERSION == VERSION_GCN_JPN - 'menu_f6', 'menu_f7', 'menu_t8', 'menu_t9', 'menu_t10', 'menu_t11', + MULTI_CHAR('menu_f6'), MULTI_CHAR('menu_f7'), MULTI_CHAR('menu_t8'), MULTI_CHAR('menu_t9'), MULTI_CHAR('menu_t10'), MULTI_CHAR('menu_t11'), #else - 'fenu_t6', 'fenu_t7', 'fenu_t8', 'fenu_t9', 'fenu_t10', 'fenu_t11', + MULTI_CHAR('fenu_t6'), MULTI_CHAR('fenu_t7'), MULTI_CHAR('fenu_t8'), MULTI_CHAR('fenu_t9'), MULTI_CHAR('fenu_t10'), MULTI_CHAR('fenu_t11'), #endif }; static const u64 tag_midoku[6] = { - 'midoku_0', 'midoku_1', 'midoku_2', 'midoku_3', 'midoku_4', 'midoku_5', + MULTI_CHAR('midoku_0'), MULTI_CHAR('midoku_1'), MULTI_CHAR('midoku_2'), MULTI_CHAR('midoku_3'), MULTI_CHAR('midoku_4'), MULTI_CHAR('midoku_5'), }; mpMenuScreen = new J2DScreen(); @@ -757,7 +757,7 @@ void dMenu_Letter_c::screenSetMenu() { bool fg = mpMenuScreen->setPriority("zelda_letter_select_6menu.blo", 0x20000, mpArchive); JUT_ASSERT(1156, fg != false); dPaneClass_showNullPane(mpMenuScreen); - mpParent[0] = new CPaneMgr(mpMenuScreen, 'n_all', 2, NULL); + mpParent[0] = new CPaneMgr(mpMenuScreen, MULTI_CHAR('n_all'), 2, NULL); JUT_ASSERT(1161, mpParent[0] != NULL); mpParent[0]->setAlphaRate(0.0f); for (int i = 0; i < 6; i++) { @@ -829,7 +829,7 @@ void dMenu_Letter_c::screenSetMenu() { fg = mpMenuDMYScreen->setPriority("zelda_letter_select_6menu.blo", 0x20000, mpArchive); JUT_ASSERT(1280, fg != false); dPaneClass_showNullPane(mpMenuDMYScreen); - mpDMYParent = new CPaneMgr(mpMenuDMYScreen, 'n_all', 2, NULL); + mpDMYParent = new CPaneMgr(mpMenuDMYScreen, MULTI_CHAR('n_all'), 2, NULL); JUT_ASSERT(1285, mpDMYParent != NULL); for (int i = 0; i < 6; i++) { #if VERSION == VERSION_GCN_JPN @@ -867,15 +867,15 @@ void dMenu_Letter_c::screenSetMenu() { void dMenu_Letter_c::screenSetBase() { static const u64 tag_pip[9] = { - 'pi_00_n', 'pi_01_n', 'pi_02_n', 'pi_03_n', 'pi_04_n', - 'pi_05_n', 'pi_06_n', 'pi_07_n', 'pi_08_n', + MULTI_CHAR('pi_00_n'), MULTI_CHAR('pi_01_n'), MULTI_CHAR('pi_02_n'), MULTI_CHAR('pi_03_n'), MULTI_CHAR('pi_04_n'), + MULTI_CHAR('pi_05_n'), MULTI_CHAR('pi_06_n'), MULTI_CHAR('pi_07_n'), MULTI_CHAR('pi_08_n'), }; static const u64 tag_pil[9] = { - 'pi_l_00', 'pi_l_01', 'pi_l_02', 'pi_l_03', 'pi_l_04', - 'pi_l_05', 'pi_l_06', 'pi_l_07', 'pi_l_08', + MULTI_CHAR('pi_l_00'), MULTI_CHAR('pi_l_01'), MULTI_CHAR('pi_l_02'), MULTI_CHAR('pi_l_03'), MULTI_CHAR('pi_l_04'), + MULTI_CHAR('pi_l_05'), MULTI_CHAR('pi_l_06'), MULTI_CHAR('pi_l_07'), MULTI_CHAR('pi_l_08'), }; static const u64 tag_pii[9] = { - 'pi_00', 'pi_01', 'pi_02', 'pi_03', 'pi_04', 'pi_05', 'pi_06', 'pi_07', 'pi_08', + MULTI_CHAR('pi_00'), MULTI_CHAR('pi_01'), MULTI_CHAR('pi_02'), MULTI_CHAR('pi_03'), MULTI_CHAR('pi_04'), MULTI_CHAR('pi_05'), MULTI_CHAR('pi_06'), MULTI_CHAR('pi_07'), MULTI_CHAR('pi_08'), }; mpBaseScreen = new J2DScreen(); @@ -883,39 +883,39 @@ void dMenu_Letter_c::screenSetBase() { bool fg = mpBaseScreen->setPriority("zelda_letter_select_base.blo", 0x20000, mpArchive); JUT_ASSERT(1361, fg != false); dPaneClass_showNullPane(mpBaseScreen); - mpBaseScreen->search('wi_btn_n')->hide(); - mpParent[1] = new CPaneMgr(mpBaseScreen, 'n_all', 2, NULL); + mpBaseScreen->search(MULTI_CHAR('wi_btn_n'))->hide(); + mpParent[1] = new CPaneMgr(mpBaseScreen, MULTI_CHAR('n_all'), 2, NULL); JUT_ASSERT(1372, mpParent[1] != NULL); mpParent[1]->setAlphaRate(0.0f); #if VERSION == VERSION_GCN_JPN - J2DTextBox* piVar9 = (J2DTextBox*)mpBaseScreen->search('t_t00'); - mpBaseScreen->search('f_t_00')->hide(); + J2DTextBox* piVar9 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('t_t00')); + mpBaseScreen->search(MULTI_CHAR('f_t_00'))->hide(); #else - J2DTextBox* piVar9 = (J2DTextBox*)mpBaseScreen->search('f_t_00'); - mpBaseScreen->search('t_t00')->hide(); + J2DTextBox* piVar9 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('f_t_00')); + mpBaseScreen->search(MULTI_CHAR('t_t00'))->hide(); #endif piVar9->setString(0x40, ""); piVar9->setFont(mDoExt_getSubFont()); dComIfGp_setMessageCountNumber(field_0x374 + (field_0x36f + 1) * 100); mpString->getString(0x4d6, piVar9, NULL, NULL, NULL, 0); #if VERSION == VERSION_GCN_JPN - J2DTextBox* text1 = (J2DTextBox*)mpBaseScreen->search('wps_text'); - J2DTextBox* text2 = (J2DTextBox*)mpBaseScreen->search('w_p_text'); - J2DTextBox* text3 = (J2DTextBox*)mpBaseScreen->search('g_ps_txt'); - J2DTextBox* text4 = (J2DTextBox*)mpBaseScreen->search('g_p_text'); - mpBaseScreen->search('fwpstex1')->hide(); - mpBaseScreen->search('fwp_tex1')->hide(); - mpBaseScreen->search('fgps_tx1')->hide(); - mpBaseScreen->search('fgp_tex1')->hide(); + J2DTextBox* text1 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('wps_text')); + J2DTextBox* text2 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('w_p_text')); + J2DTextBox* text3 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('g_ps_txt')); + J2DTextBox* text4 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('g_p_text')); + mpBaseScreen->search(MULTI_CHAR('fwpstex1'))->hide(); + mpBaseScreen->search(MULTI_CHAR('fwp_tex1'))->hide(); + mpBaseScreen->search(MULTI_CHAR('fgps_tx1'))->hide(); + mpBaseScreen->search(MULTI_CHAR('fgp_tex1'))->hide(); #else - J2DTextBox* text1 = (J2DTextBox*)mpBaseScreen->search('fwpstex1'); - J2DTextBox* text2 = (J2DTextBox*)mpBaseScreen->search('fwp_tex1'); - J2DTextBox* text3 = (J2DTextBox*)mpBaseScreen->search('fgps_tx1'); - J2DTextBox* text4 = (J2DTextBox*)mpBaseScreen->search('fgp_tex1'); - mpBaseScreen->search('wps_text')->hide(); - mpBaseScreen->search('w_p_text')->hide(); - mpBaseScreen->search('g_ps_txt')->hide(); - mpBaseScreen->search('g_p_text')->hide(); + J2DTextBox* text1 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('fwpstex1')); + J2DTextBox* text2 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('fwp_tex1')); + J2DTextBox* text3 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('fgps_tx1')); + J2DTextBox* text4 = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('fgp_tex1')); + mpBaseScreen->search(MULTI_CHAR('wps_text'))->hide(); + mpBaseScreen->search(MULTI_CHAR('w_p_text'))->hide(); + mpBaseScreen->search(MULTI_CHAR('g_ps_txt'))->hide(); + mpBaseScreen->search(MULTI_CHAR('g_p_text'))->hide(); #endif text1->setString(0x40, ""); text2->setString(0x40, ""); @@ -929,16 +929,16 @@ void dMenu_Letter_c::screenSetBase() { dMeter2Info_getStringKanji(0x4d7, text2->getStringPtr(), 0); dMeter2Info_getStringKanji(0x4d7, text3->getStringPtr(), 0); dMeter2Info_getStringKanji(0x4d7, text4->getStringPtr(), 0); - ((J2DTextBox*)mpBaseScreen->search('pi_no_00'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpBaseScreen->search('pi_no_01'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpBaseScreen->search('pi_no_02'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpBaseScreen->search('pi_no_03'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpBaseScreen->search('pi_no_04'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpBaseScreen->search('pi_no_05'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpBaseScreen->search('pi_no_06'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpBaseScreen->search('pi_no_07'))->setFont(mDoExt_getMesgFont()); - ((J2DTextBox*)mpBaseScreen->search('pi_no_08'))->setFont(mDoExt_getMesgFont()); - field_0x1ec = (J2DTextBox*)mpBaseScreen->search('let_area'); + ((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_00')))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_01')))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_02')))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_03')))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_04')))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_05')))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_06')))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_07')))->setFont(mDoExt_getMesgFont()); + ((J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('pi_no_08')))->setFont(mDoExt_getMesgFont()); + field_0x1ec = (J2DTextBox*)mpBaseScreen->search(MULTI_CHAR('let_area')); for (int i = 0; i < 9; i++) { field_0x1f0[i] = (J2DTextBox*)mpBaseScreen->search(tag_pip[i]); if (field_0x374 > 1 && i < field_0x374) { @@ -970,7 +970,7 @@ void dMenu_Letter_c::screenSetShadow() { mpSdwScreen = new J2DScreen(); mpSdwScreen->setPriority("zelda_letter_select_shadow.blo", 0x20000, mpArchive); dPaneClass_showNullPane(mpSdwScreen); - mpParent[2] = new CPaneMgr(mpSdwScreen, 'n_all', 2, NULL); + mpParent[2] = new CPaneMgr(mpSdwScreen, MULTI_CHAR('n_all'), 2, NULL); mpParent[2]->setAlphaRate(0.0f); } @@ -983,20 +983,20 @@ void dMenu_Letter_c::screenSetLetter() { #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptRuby() == 0) { - field_0x2ec[0] = new CPaneMgr(mpLetterScreen[0], 't3f_s', 0, NULL); - field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], 'mg_3flin', 0, NULL); - field_0x2f4[0] = new CPaneMgr(mpLetterScreen[0], 'mg_3f_s', 0, NULL); - field_0x2f4[1] = new CPaneMgr(mpLetterScreen[0], 'mg_3f', 0, NULL); + field_0x2ec[0] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('t3f_s'), 0, NULL); + field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3flin'), 0, NULL); + field_0x2f4[0] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3f_s'), 0, NULL); + field_0x2f4[1] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3f'), 0, NULL); mpLetterScreen[0]->search('t4_s')->hide(); - mpLetterScreen[0]->search('mg_e4lin')->hide(); + mpLetterScreen[0]->search(MULTI_CHAR('mg_e4lin'))->hide(); mpLetterScreen[0]->search('t3_s')->hide(); - mpLetterScreen[0]->search('mg_3line')->hide(); - mpLineParent = new CPaneMgr(mpLetterScreen[0], 'jp_fri_n', 0, NULL); + mpLetterScreen[0]->search(MULTI_CHAR('mg_3line'))->hide(); + mpLineParent = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('jp_fri_n'), 0, NULL); JUT_ASSERT(1530, mpLineParent != NULL); for (int i = 0; i < 12; i++) { static u64 const line_tag[12] = { - 'line00', 'line01', 'line02', 'line03', 'line04', 'line05', - 'line06', 'line07', 'line08', + MULTI_CHAR('line00'), MULTI_CHAR('line01'), MULTI_CHAR('line02'), MULTI_CHAR('line03'), MULTI_CHAR('line04'), MULTI_CHAR('line05'), + MULTI_CHAR('line06'), MULTI_CHAR('line07'), MULTI_CHAR('line08'), }; if (line_tag[i] != 0) { @@ -1012,22 +1012,22 @@ void dMenu_Letter_c::screenSetLetter() { ((J2DTextBox*)field_0x2f4[1]->getPanePtr())->setLineSpace(((J2DTextBox*)field_0x2ec[1]->getPanePtr())->getLineSpace()); } else { field_0x2ec[0] = new CPaneMgr(mpLetterScreen[0], 't3_s', 0, NULL); - field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], 'mg_3line', 0, NULL); + field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3line'), 0, NULL); for (int i = 0; i < 2; i++) { field_0x2f4[i] = NULL; } mpLetterScreen[0]->search('t4_s')->hide(); - mpLetterScreen[0]->search('mg_e4lin')->hide(); - mpLetterScreen[0]->search('t3f_s')->hide(); - mpLetterScreen[0]->search('mg_3flin')->hide(); - mpLetterScreen[0]->search('mg_3f_s')->hide(); - mpLetterScreen[0]->search('mg_3f')->hide(); + mpLetterScreen[0]->search(MULTI_CHAR('mg_e4lin'))->hide(); + mpLetterScreen[0]->search(MULTI_CHAR('t3f_s'))->hide(); + mpLetterScreen[0]->search(MULTI_CHAR('mg_3flin'))->hide(); + mpLetterScreen[0]->search(MULTI_CHAR('mg_3f_s'))->hide(); + mpLetterScreen[0]->search(MULTI_CHAR('mg_3f'))->hide(); mpLineParent = new CPaneMgr(mpLetterScreen[0], 'jp_n', 0, NULL); JUT_ASSERT(1530, mpLineParent != NULL); for (int i = 0; i < 12; i++) { static u64 const line_tag[12] = { - 'line21', 'line22', 'line23', 'line24', 'line25', 'line26', - 'line27', 'line28', 'line29', + MULTI_CHAR('line21'), MULTI_CHAR('line22'), MULTI_CHAR('line23'), MULTI_CHAR('line24'), MULTI_CHAR('line25'), MULTI_CHAR('line26'), + MULTI_CHAR('line27'), MULTI_CHAR('line28'), MULTI_CHAR('line29'), }; if (line_tag[i] != 0) { @@ -1037,26 +1037,26 @@ void dMenu_Letter_c::screenSetLetter() { } } - mpLetterScreen[0]->search('jp_fri_n')->hide(); + mpLetterScreen[0]->search(MULTI_CHAR('jp_fri_n'))->hide(); mpLetterScreen[0]->search('us_n')->hide(); } #else static u64 const line_tag[12] = { - 'line09', 'line10', 'line11', 'line12', 'line13', 'line14', - 'line15', 'line16', 'line17', 'line18', 'line19', 'line20', + MULTI_CHAR('line09'), MULTI_CHAR('line10'), MULTI_CHAR('line11'), MULTI_CHAR('line12'), MULTI_CHAR('line13'), MULTI_CHAR('line14'), + MULTI_CHAR('line15'), MULTI_CHAR('line16'), MULTI_CHAR('line17'), MULTI_CHAR('line18'), MULTI_CHAR('line19'), MULTI_CHAR('line20'), }; field_0x2ec[0] = new CPaneMgr(mpLetterScreen[0], 't4_s', 0, NULL); - field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], 'mg_e4lin', 0, NULL); + field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_e4lin'), 0, NULL); for (int i = 0; i < 2; i++) { field_0x2f4[i] = NULL; } - mpLetterScreen[0]->search('t3f_s')->hide(); - mpLetterScreen[0]->search('mg_3flin')->hide(); - mpLetterScreen[0]->search('mg_3f_s')->hide(); - mpLetterScreen[0]->search('mg_3f')->hide(); + mpLetterScreen[0]->search(MULTI_CHAR('t3f_s'))->hide(); + mpLetterScreen[0]->search(MULTI_CHAR('mg_3flin'))->hide(); + mpLetterScreen[0]->search(MULTI_CHAR('mg_3f_s'))->hide(); + mpLetterScreen[0]->search(MULTI_CHAR('mg_3f'))->hide(); mpLetterScreen[0]->search('t3_s')->hide(); - mpLetterScreen[0]->search('mg_3line')->hide(); + mpLetterScreen[0]->search(MULTI_CHAR('mg_3line'))->hide(); mpLineParent = new CPaneMgr(mpLetterScreen[0], 'us_n', 0, NULL); JUT_ASSERT(1530, mpLineParent != NULL); for (int i = 0; i < 12; i++) { @@ -1066,7 +1066,7 @@ void dMenu_Letter_c::screenSetLetter() { field_0x25c[i] = NULL; } } - mpLetterScreen[0]->search('jp_fri_n')->hide(); + mpLetterScreen[0]->search(MULTI_CHAR('jp_fri_n'))->hide(); mpLetterScreen[0]->search('jp_n')->hide(); #endif @@ -1086,8 +1086,8 @@ void dMenu_Letter_c::screenSetLetter() { #endif } } - field_0x1e4[0] = (J2DTextBox*)mpLetterScreen[0]->search('p_texts'); - field_0x1e4[1] = (J2DTextBox*)mpLetterScreen[0]->search('p_text'); + field_0x1e4[0] = (J2DTextBox*)mpLetterScreen[0]->search(MULTI_CHAR('p_texts')); + field_0x1e4[1] = (J2DTextBox*)mpLetterScreen[0]->search(MULTI_CHAR('p_text')); for (int i = 0; i < 2; i++) { field_0x1e4[i]->setFont(mDoExt_getSubFont()); field_0x1e4[i]->setString(0x10, ""); @@ -1098,7 +1098,7 @@ void dMenu_Letter_c::screenSetLetter() { JUT_ASSERT(1631, fg != false); dPaneClass_showNullPane(mpLetterScreen[1]); for (int i = 0; i < 2; i++) { - mpTextParent[i] = new CPaneMgr(mpLetterScreen[i], 'n_all', 2, NULL); + mpTextParent[i] = new CPaneMgr(mpLetterScreen[i], MULTI_CHAR('n_all'), 2, NULL); JUT_ASSERT(1636, mpTextParent[i] != NULL); mpTextParent[i]->scale(0.0f, 0.0f); mpTextParent[i]->setAlphaRate(0.0f); @@ -1112,10 +1112,10 @@ void dMenu_Letter_c::screenSetLetter() { void dMenu_Letter_c::screenSetDoIcon() { static const u64 text_a_tag[5] = { - 'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5', + MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5'), }; static const u64 text_b_tag[5] = { - 'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5', + MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5'), }; mpIconScreen = new J2DScreen(); diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index 898b210b45e..cc34f26938f 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -92,13 +92,13 @@ dMenu_Option_c::~dMenu_Option_c() {} static const u32 dMo_soundMode[3] = {0, 1, 2}; void dMenu_Option_c::_create() { - static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'}; - static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'}; - static const u64 l_tagName012[2] = {'w_no_n', 'w_yes_n'}; - static const u64 l_tagName013[2] = {'w_no_t', 'w_yes_t'}; - static const u64 l_tagName9[2] = {'w_no_m', 'w_yes_m'}; - static const u64 l_tagName10[2] = {'w_no_g', 'w_yes_g'}; - static const u64 l_tagName11[2] = {'w_no_gr', 'w_yes_gr'}; + static const u64 text_a_tag[5] = {MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5')}; + static const u64 text_b_tag[5] = {MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5')}; + static const u64 l_tagName012[2] = {MULTI_CHAR('w_no_n'), MULTI_CHAR('w_yes_n')}; + static const u64 l_tagName013[2] = {MULTI_CHAR('w_no_t'), MULTI_CHAR('w_yes_t')}; + static const u64 l_tagName9[2] = {MULTI_CHAR('w_no_m'), MULTI_CHAR('w_yes_m')}; + static const u64 l_tagName10[2] = {MULTI_CHAR('w_no_g'), MULTI_CHAR('w_yes_g')}; + static const u64 l_tagName11[2] = {MULTI_CHAR('w_no_gr'), MULTI_CHAR('w_yes_gr')}; static const u8 l_msgNum2[2] = {8, 7}; mpFont = mDoExt_getMesgFont(); @@ -116,14 +116,14 @@ void dMenu_Option_c::_create() { bool fg = mpScreen->setPriority("zelda_option_select_menu.blo", 0x20000, mpArchive); JUT_ASSERT(210, fg != false); - mpScreen->search('base_a_n')->hide(); - mpScreen->search('y_set_p4')->hide(); - mpScreen->search('y_set_p3')->hide(); - mpScreen->search('y_set_p2')->hide(); - mpScreen->search('y_set_p1')->hide(); - mpScreen->search('y_set_p0')->hide(); - field_0x254[0] = (J2DTextBox*)mpScreen->search('cont_ts'); - field_0x254[1] = (J2DTextBox*)mpScreen->search('cont_t'); + mpScreen->search(MULTI_CHAR('base_a_n'))->hide(); + mpScreen->search(MULTI_CHAR('y_set_p4'))->hide(); + mpScreen->search(MULTI_CHAR('y_set_p3'))->hide(); + mpScreen->search(MULTI_CHAR('y_set_p2'))->hide(); + mpScreen->search(MULTI_CHAR('y_set_p1'))->hide(); + mpScreen->search(MULTI_CHAR('y_set_p0'))->hide(); + field_0x254[0] = (J2DTextBox*)mpScreen->search(MULTI_CHAR('cont_ts')); + field_0x254[1] = (J2DTextBox*)mpScreen->search(MULTI_CHAR('cont_t')); for (int i = 0; i < 2; i++) { field_0x254[i]->setFont(mDoExt_getMesgFont()); field_0x254[i]->setString(0x20, ""); @@ -132,8 +132,8 @@ void dMenu_Option_c::_create() { JUT_ASSERT(246, mpBackScreen != NULL); fg = mpBackScreen->setPriority("zelda_option_base.blo", 0x20000, mpArchive); JUT_ASSERT(251, fg != false); - mpBackScreen->search('wi_btn_n')->hide(); - field_0x27c = mpBackScreen->search('let_area'); + mpBackScreen->search(MULTI_CHAR('wi_btn_n'))->hide(); + field_0x27c = mpBackScreen->search(MULTI_CHAR('let_area')); mpClipScreen = new J2DScreen(); JUT_ASSERT(265, mpClipScreen != NULL); @@ -147,7 +147,7 @@ void dMenu_Option_c::_create() { fg = mpShadowScreen->setPriority("zelda_option_menu_shadow.blo", 0x20000, mpArchive); JUT_ASSERT(278, fg != false); dPaneClass_showNullPane(mpShadowScreen); - mpShadowScreen->search('mw_n_5')->hide(); + mpShadowScreen->search(MULTI_CHAR('mw_n_5'))->hide(); mpTVScreen = new J2DScreen(); JUT_ASSERT(287, mpTVScreen != NULL); @@ -155,12 +155,12 @@ void dMenu_Option_c::_create() { JUT_ASSERT(291, fg != false); dPaneClass_showNullPane(mpTVScreen); - mpTVButtonAB = new CPaneMgr(mpTVScreen, 'g_abtn_n', 0, NULL); + mpTVButtonAB = new CPaneMgr(mpTVScreen, MULTI_CHAR('g_abtn_n'), 0, NULL); JUT_ASSERT(295, mpTVButtonAB != NULL); - mpTVButtonText = new CPaneMgr(mpTVScreen, 'a_text_n', 0, NULL); + mpTVButtonText = new CPaneMgr(mpTVScreen, MULTI_CHAR('a_text_n'), 0, NULL); JUT_ASSERT(298, mpTVButtonText != NULL); - mpTVScreen->search('g_abtn_n')->hide(); + mpTVScreen->search(MULTI_CHAR('g_abtn_n'))->hide(); mpScreenIcon = new J2DScreen(); JUT_ASSERT(325, mpScreenIcon != NULL); @@ -1289,141 +1289,141 @@ void dMenu_Option_c::menuHide(int index) { void dMenu_Option_c::screenSet() { static const u64 tag_frame[6] = { - 'flame_00', 'flame_01', 'flame_02', 'flame_03', 'flame_04', 'flame_05', + MULTI_CHAR('flame_00'), MULTI_CHAR('flame_01'), MULTI_CHAR('flame_02'), MULTI_CHAR('flame_03'), MULTI_CHAR('flame_04'), MULTI_CHAR('flame_05'), }; #if VERSION == VERSION_GCN_JPN static const u64 tag_menu0[6] = { - 'menu_t0', 'menu_t1', 'menu_t2', 'menu_t3', 'menu_t4', 'menu_t5', + MULTI_CHAR('menu_t0'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t4'), MULTI_CHAR('menu_t5'), }; #else static const u64 tag_menu0[6] = { - 'fenu_t0', 'fenu_t1', 'fenu_t2', 'fenu_t3', 'fenu_t4', 'fenu_t5', + MULTI_CHAR('fenu_t0'), MULTI_CHAR('fenu_t1'), MULTI_CHAR('fenu_t2'), MULTI_CHAR('fenu_t3'), MULTI_CHAR('fenu_t4'), MULTI_CHAR('fenu_t5'), }; #endif static const u64 let_n[6] = { - 'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n', 'let_05_n', + MULTI_CHAR('let_00_n'), MULTI_CHAR('let_01_n'), MULTI_CHAR('let_02_n'), MULTI_CHAR('let_03_n'), MULTI_CHAR('let_04_n'), MULTI_CHAR('let_05_n'), }; static const u64 let2_n[6] = { - 'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n', + MULTI_CHAR('let_00_n'), MULTI_CHAR('let_01_n'), MULTI_CHAR('let_02_n'), MULTI_CHAR('let_03_n'), MULTI_CHAR('let_04_n'), }; static const u64 menu_n[6] = { - 'menu_n0', 'menu_n1', 'menu_n2', 'menu_n3', 'menu_n4', 'menu_n5', + MULTI_CHAR('menu_n0'), MULTI_CHAR('menu_n1'), MULTI_CHAR('menu_n2'), MULTI_CHAR('menu_n3'), MULTI_CHAR('menu_n4'), MULTI_CHAR('menu_n5'), }; static const u64 menu2_n[6] = { - 'mw_n_0', 'mw_n_1', 'mw_n_2', 'mw_n_3', 'mw_n_4', + MULTI_CHAR('mw_n_0'), MULTI_CHAR('mw_n_1'), MULTI_CHAR('mw_n_2'), MULTI_CHAR('mw_n_3'), MULTI_CHAR('mw_n_4'), }; static const u64 al0_n[6] = { - 's_grr_00', 's_grr_01', 's_grr_02', 's_grr_03', 's_grr_04', 's_grr_05', + MULTI_CHAR('s_grr_00'), MULTI_CHAR('s_grr_01'), MULTI_CHAR('s_grr_02'), MULTI_CHAR('s_grr_03'), MULTI_CHAR('s_grr_04'), MULTI_CHAR('s_grr_05'), }; static const u64 al1_n[6] = { - 'c_grr_00', 'c_grr_01', 'c_grr_02', 'c_grr_03', 'c_grr_04', 'c_grr_05', + MULTI_CHAR('c_grr_00'), MULTI_CHAR('c_grr_01'), MULTI_CHAR('c_grr_02'), MULTI_CHAR('c_grr_03'), MULTI_CHAR('c_grr_04'), MULTI_CHAR('c_grr_05'), }; static const u64 al2_n[6] = { - 's_grl_00', 's_grl_01', 's_grl_02', 's_grl_03', 's_grl_04', 's_grl_05', + MULTI_CHAR('s_grl_00'), MULTI_CHAR('s_grl_01'), MULTI_CHAR('s_grl_02'), MULTI_CHAR('s_grl_03'), MULTI_CHAR('s_grl_04'), MULTI_CHAR('s_grl_05'), }; static const u64 al3_n[6] = { - 'c_grl_00', 'c_grl_01', 'c_grl_02', 'c_grl_03', 'c_grl_04', 'c_grl_05', + MULTI_CHAR('c_grl_00'), MULTI_CHAR('c_grl_01'), MULTI_CHAR('c_grl_02'), MULTI_CHAR('c_grl_03'), MULTI_CHAR('c_grl_04'), MULTI_CHAR('c_grl_05'), }; static const u64 haihail_n[5] = { - 'y_set_l0', 'y_set_l1', 'y_set_l2', 'y_set_l3', 'y_set_l4', + MULTI_CHAR('y_set_l0'), MULTI_CHAR('y_set_l1'), MULTI_CHAR('y_set_l2'), MULTI_CHAR('y_set_l3'), MULTI_CHAR('y_set_l4'), }; static const u64 haihair_n[5] = { - 'y_set_r0', 'y_set_r1', 'y_set_r2', 'y_set_r3', 'y_set_r4', + MULTI_CHAR('y_set_r0'), MULTI_CHAR('y_set_r1'), MULTI_CHAR('y_set_r2'), MULTI_CHAR('y_set_r3'), MULTI_CHAR('y_set_r4'), }; static const u64 menu3_n[6] = { - 'menuapn0', 'menuapn1', 'menuapn2', 'menuapn3', 'menuapn4', + MULTI_CHAR('menuapn0'), MULTI_CHAR('menuapn1'), MULTI_CHAR('menuapn2'), MULTI_CHAR('menuapn3'), MULTI_CHAR('menuapn4'), }; static const u64 tv_btnA[5] = { - 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at', + MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4'), MULTI_CHAR('cont_at'), }; static const u64 ftv_btnA[5] = { - 'font_a1', 'font_at2', 'font_at3', 'font_at4', 'font_at', + MULTI_CHAR('font_a1'), MULTI_CHAR('font_at2'), MULTI_CHAR('font_at3'), MULTI_CHAR('font_at4'), MULTI_CHAR('font_at'), }; #if VERSION == VERSION_GCN_JPN - static const u64 fenu_t0[2] = {'fenu_t0s', 'fenu_t0'}; - static const u64 menu_t0[2] = {'menu_t0s', 'menu_t0'}; - static const u64 fenu_t1[2] = {'fenu_t1s', 'fenu_t1'}; - static const u64 menu_t1[2] = {'menu_t1s', 'menu_t1'}; - static const u64 fenu_t2[2] = {'fenu_t2s', 'fenu_t2'}; - static const u64 menu_t2[2] = {'menu_t2s', 'menu_t2'}; - static const u64 fenu_t3[2] = {'fenu_t3s', 'fenu_t3'}; - static const u64 menu_t3[2] = {'menu_t3s', 'menu_t3'}; - static const u64 fenu_t4[2] = {'fenu_t4s', 'fenu_t4'}; - static const u64 menu_t4[2] = {'menu_t4s', 'menu_t4'}; - static const u64 fenu_t5[2] = {'fenu_t5s', 'fenu_t5'}; - static const u64 menu_t5[2] = {'menu_t5s', 'menu_t5'}; + static const u64 fenu_t0[2] = {MULTI_CHAR('fenu_t0s'), MULTI_CHAR('fenu_t0')}; + static const u64 menu_t0[2] = {MULTI_CHAR('menu_t0s'), MULTI_CHAR('menu_t0')}; + static const u64 fenu_t1[2] = {MULTI_CHAR('fenu_t1s'), MULTI_CHAR('fenu_t1')}; + static const u64 menu_t1[2] = {MULTI_CHAR('menu_t1s'), MULTI_CHAR('menu_t1')}; + static const u64 fenu_t2[2] = {MULTI_CHAR('fenu_t2s'), MULTI_CHAR('fenu_t2')}; + static const u64 menu_t2[2] = {MULTI_CHAR('menu_t2s'), MULTI_CHAR('menu_t2')}; + static const u64 fenu_t3[2] = {MULTI_CHAR('fenu_t3s'), MULTI_CHAR('fenu_t3')}; + static const u64 menu_t3[2] = {MULTI_CHAR('menu_t3s'), MULTI_CHAR('menu_t3')}; + static const u64 fenu_t4[2] = {MULTI_CHAR('fenu_t4s'), MULTI_CHAR('fenu_t4')}; + static const u64 menu_t4[2] = {MULTI_CHAR('menu_t4s'), MULTI_CHAR('menu_t4')}; + static const u64 fenu_t5[2] = {MULTI_CHAR('fenu_t5s'), MULTI_CHAR('fenu_t5')}; + static const u64 menu_t5[2] = {MULTI_CHAR('menu_t5s'), MULTI_CHAR('menu_t5')}; #else - static const u64 fenu_t0[2] = {'fenu_t0s', 'fenu_t0'}; - static const u64 menu_t0[2] = {'menu_t0s', 'menu_t0'}; - static const u64 fenu_t2[2] = {'fenu_t1s', 'fenu_t1'}; - static const u64 menu_t2[2] = {'menu_t1s', 'menu_t1'}; - static const u64 fenu_t3[2] = {'fenu_t2s', 'fenu_t2'}; - static const u64 menu_t3[2] = {'menu_t2s', 'menu_t2'}; - static const u64 fenu_t4[2] = {'fenu_t3s', 'fenu_t3'}; - static const u64 menu_t4[2] = {'menu_t3s', 'menu_t3'}; - static const u64 fenu_t1[2] = {'fenu_t4s', 'fenu_t4'}; - static const u64 menu_t1[2] = {'menu_t4s', 'menu_t4'}; - static const u64 fenu_t5[2] = {'fenu_t5s', 'fenu_t5'}; - static const u64 menu_t5[2] = {'menu_t5s', 'menu_t5'}; + static const u64 fenu_t0[2] = {MULTI_CHAR('fenu_t0s'), MULTI_CHAR('fenu_t0')}; + static const u64 menu_t0[2] = {MULTI_CHAR('menu_t0s'), MULTI_CHAR('menu_t0')}; + static const u64 fenu_t2[2] = {MULTI_CHAR('fenu_t1s'), MULTI_CHAR('fenu_t1')}; + static const u64 menu_t2[2] = {MULTI_CHAR('menu_t1s'), MULTI_CHAR('menu_t1')}; + static const u64 fenu_t3[2] = {MULTI_CHAR('fenu_t2s'), MULTI_CHAR('fenu_t2')}; + static const u64 menu_t3[2] = {MULTI_CHAR('menu_t2s'), MULTI_CHAR('menu_t2')}; + static const u64 fenu_t4[2] = {MULTI_CHAR('fenu_t3s'), MULTI_CHAR('fenu_t3')}; + static const u64 menu_t4[2] = {MULTI_CHAR('menu_t3s'), MULTI_CHAR('menu_t3')}; + static const u64 fenu_t1[2] = {MULTI_CHAR('fenu_t4s'), MULTI_CHAR('fenu_t4')}; + static const u64 menu_t1[2] = {MULTI_CHAR('menu_t4s'), MULTI_CHAR('menu_t4')}; + static const u64 fenu_t5[2] = {MULTI_CHAR('fenu_t5s'), MULTI_CHAR('fenu_t5')}; + static const u64 menu_t5[2] = {MULTI_CHAR('menu_t5s'), MULTI_CHAR('menu_t5')}; #endif static const u64 menut_0[6] = { - 'menut0as', 'menut0a', 'menut0a2', 'menut0a1', 'menut0a4', 'menut0a3', + MULTI_CHAR('menut0as'), MULTI_CHAR('menut0a'), MULTI_CHAR('menut0a2'), MULTI_CHAR('menut0a1'), MULTI_CHAR('menut0a4'), MULTI_CHAR('menut0a3'), }; static const u64 fenut_0[6] = { - 'menut010', 'menut0a9', 'menut0a8', 'menut0a7', 'menut0a6', 'menut0a5', + MULTI_CHAR('menut010'), MULTI_CHAR('menut0a9'), MULTI_CHAR('menut0a8'), MULTI_CHAR('menut0a7'), MULTI_CHAR('menut0a6'), MULTI_CHAR('menut0a5'), }; static const u64 menut_1[6] = { - 'menut1as', 'menut1a', 'menut1a2', 'menut1a1', 'menut1a4', 'menut1a3', + MULTI_CHAR('menut1as'), MULTI_CHAR('menut1a'), MULTI_CHAR('menut1a2'), MULTI_CHAR('menut1a1'), MULTI_CHAR('menut1a4'), MULTI_CHAR('menut1a3'), }; static const u64 fenut_1[6] = { - 'menut110', 'menut1a9', 'menut1a8', 'menut1a7', 'menut1a6', 'menut1a5', + MULTI_CHAR('menut110'), MULTI_CHAR('menut1a9'), MULTI_CHAR('menut1a8'), MULTI_CHAR('menut1a7'), MULTI_CHAR('menut1a6'), MULTI_CHAR('menut1a5'), }; static const u64 menut_2[6] = { - 'menut2as', 'menut2a', 'menut2a2', 'menut2a1', 'menut2a4', 'menut2a3', + MULTI_CHAR('menut2as'), MULTI_CHAR('menut2a'), MULTI_CHAR('menut2a2'), MULTI_CHAR('menut2a1'), MULTI_CHAR('menut2a4'), MULTI_CHAR('menut2a3'), }; static const u64 fenut_2[6] = { - 'menut210', 'menut2a9', 'menut2a8', 'menut2a7', 'menut2a6', 'menut2a5', + MULTI_CHAR('menut210'), MULTI_CHAR('menut2a9'), MULTI_CHAR('menut2a8'), MULTI_CHAR('menut2a7'), MULTI_CHAR('menut2a6'), MULTI_CHAR('menut2a5'), }; static const u64 menut_3[6] = { - 'menut3a5', 'menut3a6', 'menut3a7', 'menut3a8', 'menut3a9', 'menut310', + MULTI_CHAR('menut3a5'), MULTI_CHAR('menut3a6'), MULTI_CHAR('menut3a7'), MULTI_CHAR('menut3a8'), MULTI_CHAR('menut3a9'), MULTI_CHAR('menut310'), }; static const u64 fenut_3[6] = { - 'menut315', 'menut314', 'menut313', 'menut312', 'menut311', 'menut001', + MULTI_CHAR('menut315'), MULTI_CHAR('menut314'), MULTI_CHAR('menut313'), MULTI_CHAR('menut312'), MULTI_CHAR('menut311'), MULTI_CHAR('menut001'), }; static const u64 menut_4[6] = { - 'menut3as', 'menut3a', 'menut3a2', 'menut3a1', 'menut3a4', 'menut3a3', + MULTI_CHAR('menut3as'), MULTI_CHAR('menut3a'), MULTI_CHAR('menut3a2'), MULTI_CHAR('menut3a1'), MULTI_CHAR('menut3a4'), MULTI_CHAR('menut3a3'), }; static const u64 fenut_4[6] = { - 'menut321', 'menut320', 'menut319', 'menut318', 'menut317', 'menut316', + MULTI_CHAR('menut321'), MULTI_CHAR('menut320'), MULTI_CHAR('menut319'), MULTI_CHAR('menut318'), MULTI_CHAR('menut317'), MULTI_CHAR('menut316'), }; #if VERSION == VERSION_GCN_JPN static const u64 tx[6] = { - 'wps_text', 'w_p_text', 'g_ps_tx3', 'g_p_tex3', 'wps_tex1', 'w_p_tex1', + MULTI_CHAR('wps_text'), MULTI_CHAR('w_p_text'), MULTI_CHAR('g_ps_tx3'), MULTI_CHAR('g_p_tex3'), MULTI_CHAR('wps_tex1'), MULTI_CHAR('w_p_tex1'), }; #else static const u64 tx[6] = { - 'w_p_tex5', 'w_p_tex6', 'w_p_tex3', 'w_p_tex4', 'fps_tex1', 'f_p_tex1', + MULTI_CHAR('w_p_tex5'), MULTI_CHAR('w_p_tex6'), MULTI_CHAR('w_p_tex3'), MULTI_CHAR('w_p_tex4'), MULTI_CHAR('fps_tex1'), MULTI_CHAR('f_p_tex1'), }; #endif static const u64 op_tx[4] = { - 'w_text_n', 'w_btn_n', 'w_k_t_n', 'w_abtn_n', + MULTI_CHAR('w_text_n'), MULTI_CHAR('w_btn_n'), MULTI_CHAR('w_k_t_n'), MULTI_CHAR('w_abtn_n'), }; static const u64 z_tx[3] = { - 'z_gc_n', 0, 0, + MULTI_CHAR('z_gc_n'), 0, 0, }; #if VERSION == VERSION_GCN_JPN static const u64 txTV[10] = { - 'menu_t6s', 'menu_t6', 'menu_t9s', 'menu_t9', 'menut10s', - 'menu_t10', 'menu_t7s', 'menu_t7', 'menu_t8s', 'menu_t8', + MULTI_CHAR('menu_t6s'), MULTI_CHAR('menu_t6'), MULTI_CHAR('menu_t9s'), MULTI_CHAR('menu_t9'), MULTI_CHAR('menut10s'), + MULTI_CHAR('menu_t10'), MULTI_CHAR('menu_t7s'), MULTI_CHAR('menu_t7'), MULTI_CHAR('menu_t8s'), MULTI_CHAR('menu_t8'), }; #else static const u64 txTV[10] = { - 'menu_t61', 'menu_t2', 'menu_t91', 'menu_t1', 'menut101', - 'menu_t01', 'menu_t71', 'menu_t3', 'menu_t81', 'menu_t4', + MULTI_CHAR('menu_t61'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t91'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menut101'), + MULTI_CHAR('menu_t01'), MULTI_CHAR('menu_t71'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t81'), MULTI_CHAR('menu_t4'), }; #endif - mpTitle = new CPaneMgr(mpBackScreen, 'title_n', 0, NULL); + mpTitle = new CPaneMgr(mpBackScreen, MULTI_CHAR('title_n'), 0, NULL); Vec pos = mpTitle->getGlobalVtxCenter(mpTitle->mPane, false, 0); mpWarning->mPosY = pos.y + g_drawHIO.mOptionScreen.mBackgroundPosY; for (int i = 0; i < 6; i++) { @@ -1445,11 +1445,11 @@ void dMenu_Option_c::screenSet() { mpDrawCursor->setScale(0.0f); mpDrawCursor->setParam(1.01f, 0.85f, 0.02f, 0.5f, 0.5f); mpDrawCursor->offPlayAnime(0); - mpParent[0] = new CPaneMgr(mpScreen, 'n_all', 2, NULL); - mpParent[1] = new CPaneMgr(mpClipScreen, 'n_all', 2, NULL); + mpParent[0] = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent[1] = new CPaneMgr(mpClipScreen, MULTI_CHAR('n_all'), 2, NULL); mpParent[2] = new CPaneMgr(mpShadowScreen, 'nall', 2, NULL); - mpParent[3] = new CPaneMgr(mpTVScreen, 'n_all', 2, NULL); - mpParent[4] = new CPaneMgr(mpBackScreen, 'n_all', 2, NULL); + mpParent[3] = new CPaneMgr(mpTVScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent[4] = new CPaneMgr(mpBackScreen, MULTI_CHAR('n_all'), 2, NULL); for (int i = 0; i < 6; i++) { mpMenuNull[i] = new CPaneMgr(mpScreen, let_n[i], 0, NULL); mpMenuPane[i] = new CPaneMgr(mpScreen, menu_n[i], 0, NULL); @@ -1484,31 +1484,31 @@ void dMenu_Option_c::screenSet() { } } for (int i = 0; i < 6; i++) { - if (let2_n[i] != NULL) { + if (let2_n[i] != 0) { mpMenuPane3[i] = new CPaneMgr(mpClipScreen, let2_n[i], 0, NULL); } else { mpMenuPane3[i] = NULL; } - if (menu3_n[i] != NULL) { + if (menu3_n[i] != 0) { mpMenuPane32[i] = new CPaneMgr(mpClipScreen, menu3_n[i], 0, NULL); } else { mpMenuPane32[i] = NULL; } } #if VERSION == VERSION_GCN_JPN - field_0x270[0] = (J2DTextBox*)mpBackScreen->search('t_t00'); - field_0x270[1] = (J2DTextBox*)mpBackScreen->search('t_t01'); - mpBackScreen->search('f_t00')->hide(); - mpBackScreen->search('t_t01')->hide(); - field_0x270[2] = (J2DTextBox*)mpTVScreen->search('t_t00'); - mpTVScreen->search('f_t00')->hide(); + field_0x270[0] = (J2DTextBox*)mpBackScreen->search(MULTI_CHAR('t_t00')); + field_0x270[1] = (J2DTextBox*)mpBackScreen->search(MULTI_CHAR('t_t01')); + mpBackScreen->search(MULTI_CHAR('f_t00'))->hide(); + mpBackScreen->search(MULTI_CHAR('t_t01'))->hide(); + field_0x270[2] = (J2DTextBox*)mpTVScreen->search(MULTI_CHAR('t_t00')); + mpTVScreen->search(MULTI_CHAR('f_t00'))->hide(); #else - field_0x270[0] = (J2DTextBox*)mpBackScreen->search('f_t00'); - field_0x270[1] = (J2DTextBox*)mpBackScreen->search('t_t01'); - mpBackScreen->search('t_t00')->hide(); - mpBackScreen->search('t_t01')->hide(); - field_0x270[2] = (J2DTextBox*)mpTVScreen->search('f_t00'); - mpTVScreen->search('t_t00')->hide(); + field_0x270[0] = (J2DTextBox*)mpBackScreen->search(MULTI_CHAR('f_t00')); + field_0x270[1] = (J2DTextBox*)mpBackScreen->search(MULTI_CHAR('t_t01')); + mpBackScreen->search(MULTI_CHAR('t_t00'))->hide(); + mpBackScreen->search(MULTI_CHAR('t_t01'))->hide(); + field_0x270[2] = (J2DTextBox*)mpTVScreen->search(MULTI_CHAR('f_t00')); + mpTVScreen->search(MULTI_CHAR('t_t00'))->hide(); #endif for (int i = 0; i < 3; i++) { field_0x270[i]->setFont(mDoExt_getRubyFont()); @@ -1697,11 +1697,11 @@ void dMenu_Option_c::screenSet() { field_0x3b4 = 0.0f; menuVisible(); #if VERSION == VERSION_GCN_JPN - mpBackScreen->search('jpn_n')->show(); - mpBackScreen->search('foregn_n')->hide(); + mpBackScreen->search(MULTI_CHAR('jpn_n'))->show(); + mpBackScreen->search(MULTI_CHAR('foregn_n'))->hide(); #else - mpBackScreen->search('jpn_n')->hide(); - mpBackScreen->search('foregn_n')->show(); + mpBackScreen->search(MULTI_CHAR('jpn_n'))->hide(); + mpBackScreen->search(MULTI_CHAR('foregn_n'))->show(); #endif for (int i = 0; i < 6; i++) { J2DTextBox* backScreen = (J2DTextBox*)mpBackScreen->search(tx[i]); @@ -1715,12 +1715,12 @@ void dMenu_Option_c::screenSet() { mpString->getString(0x556, backScreen, NULL, NULL, NULL, 0); } } - mpBackScreen->search('wi_btn_n')->hide(); + mpBackScreen->search(MULTI_CHAR('wi_btn_n'))->hide(); for (int i = 0; i < 4; i++) { field_0x1c0[i] = 0; } for (int i = 0; i < 3; i++) { - if (z_tx[i] != NULL) { + if (z_tx[i] != 0) { mpZButtonText[i] = new CPaneMgr(mpBackScreen, z_tx[i], 2, NULL); } else { mpZButtonText[i] = NULL; @@ -2075,14 +2075,14 @@ void dMenu_Option_c::changeTVCheck() { static void dummy() { #if VERSION == VERSION_GCN_JPN - static const u64 txTVhide[5] = {'fmenu_6n', 'fmenu_9n', 'fmenu_10', 'fmenu_7n', 'fmenu_8n'}; + static const u64 txTVhide[5] = {MULTI_CHAR('fmenu_6n'), MULTI_CHAR('fmenu_9n'), MULTI_CHAR('fmenu_10'), MULTI_CHAR('fmenu_7n'), MULTI_CHAR('fmenu_8n')}; #else - static const u64 txTVhide[5] = {'menu_6n', 'menu_9n', 'menu_10n', 'menu_7n', 'menu_8n'}; + static const u64 txTVhide[5] = {MULTI_CHAR('menu_6n'), MULTI_CHAR('menu_9n'), MULTI_CHAR('menu_10n'), MULTI_CHAR('menu_7n'), MULTI_CHAR('menu_8n')}; #endif } void dMenu_Option_c::setAButtonString(u16 i_stringID) { - static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'}; + static const u64 text_a_tag[5] = {MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5')}; u32 stringId = i_stringID; if (stringId != field_0x3dc) { field_0x3dc = i_stringID; @@ -2101,7 +2101,7 @@ void dMenu_Option_c::setAButtonString(u16 i_stringID) { } void dMenu_Option_c::setBButtonString(u16 i_stringID) { - static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'}; + static const u64 text_b_tag[5] = {MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5')}; u32 stringId = i_stringID; if (stringId != field_0x3de) { field_0x3de = i_stringID; diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index 92e81fa350a..efb8e0c4fd5 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -48,34 +48,34 @@ static procFunc stick_proc[] = { dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i_cStick, u8 i_ringOrigin) { static const u64 xy_text[5] = { - 'yx_text', 'yx_te_s1', 'yx_te_s2', 'yx_te_s3', 'yx_te_s4', + MULTI_CHAR('yx_text'), MULTI_CHAR('yx_te_s1'), MULTI_CHAR('yx_te_s2'), MULTI_CHAR('yx_te_s3'), MULTI_CHAR('yx_te_s4'), }; static const u64 fxy_text[5] = { - 'fyx_tex', 'fyx_te_1', 'fyx_te_2', 'fyx_te_3', 'fyx_te_4', + MULTI_CHAR('fyx_tex'), MULTI_CHAR('fyx_te_1'), MULTI_CHAR('fyx_te_2'), MULTI_CHAR('fyx_te_3'), MULTI_CHAR('fyx_te_4'), }; static const u64 c_text[5] = { - 'c_text', 'c_te_s1', 'c_te_s2', 'c_te_s3', 'c_te_s4', + MULTI_CHAR('c_text'), MULTI_CHAR('c_te_s1'), MULTI_CHAR('c_te_s2'), MULTI_CHAR('c_te_s3'), MULTI_CHAR('c_te_s4'), }; static const u64 fc_text[5] = { - 'fc_text', 'fc_te_s1', 'fc_te_s2', 'fc_te_s3', 'fc_te_s4', + MULTI_CHAR('fc_text'), MULTI_CHAR('fc_te_s1'), MULTI_CHAR('fc_te_s2'), MULTI_CHAR('fc_te_s3'), MULTI_CHAR('fc_te_s4'), }; static const u64 c_text1[5] = { - 'c_text1', 'c_texs1', 'c_texs2', 'c_texs3', 'c_texs4', + MULTI_CHAR('c_text1'), MULTI_CHAR('c_texs1'), MULTI_CHAR('c_texs2'), MULTI_CHAR('c_texs3'), MULTI_CHAR('c_texs4'), }; static const u64 fc_text1[5] = { - 'fc_text1', 'fc_texs1', 'fc_texs2', 'fc_texs3', 'fc_texs4', + MULTI_CHAR('fc_text1'), MULTI_CHAR('fc_texs1'), MULTI_CHAR('fc_texs2'), MULTI_CHAR('fc_texs3'), MULTI_CHAR('fc_texs4'), }; static const u64 t_on[5] = { - 'gr_t_on', 'g_tof_s5', 'g_tof_s6', 'g_tof_s7', 'g_tof_s8', + MULTI_CHAR('gr_t_on'), MULTI_CHAR('g_tof_s5'), MULTI_CHAR('g_tof_s6'), MULTI_CHAR('g_tof_s7'), MULTI_CHAR('g_tof_s8'), }; static const u64 ft_on[5] = { - 'fr_t_on', 'f_tof_s5', 'f_tof_s6', 'f_tof_s7', 'f_tof_s8', + MULTI_CHAR('fr_t_on'), MULTI_CHAR('f_tof_s5'), MULTI_CHAR('f_tof_s6'), MULTI_CHAR('f_tof_s7'), MULTI_CHAR('f_tof_s8'), }; static const u64 t_off[5] = { - 'gr_t_of', 'g_tof_s1', 'g_tof_s2', 'g_tof_s3', 'g_tof_s4', + MULTI_CHAR('gr_t_of'), MULTI_CHAR('g_tof_s1'), MULTI_CHAR('g_tof_s2'), MULTI_CHAR('g_tof_s3'), MULTI_CHAR('g_tof_s4'), }; static const u64 ft_off[5] = { - 'fr_t_of', 'f_tof_s1', 'f_tof_s2', 'f_tof_s3', 'f_tof_s4', + MULTI_CHAR('fr_t_of'), MULTI_CHAR('f_tof_s1'), MULTI_CHAR('f_tof_s2'), MULTI_CHAR('f_tof_s3'), MULTI_CHAR('f_tof_s4'), }; mpHeap = i_heap; @@ -264,12 +264,12 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i "SCRN/zelda_item_select_icon_message_ver2.blo", 0x20000, dComIfGp_getRingResArchive()); dPaneClass_showNullPane(mpScreen); - mpMessageParent = new CPaneMgrAlpha(mpScreen, 'n_all', 2, NULL); + mpMessageParent = new CPaneMgrAlpha(mpScreen, MULTI_CHAR('n_all'), 2, NULL); mpTextParent[0] = new CPaneMgr(mpScreen, 'r_n', 0, NULL); mpTextParent[1] = new CPaneMgr(mpScreen, 'c_n', 2, NULL); mpTextParent[1]->setAlphaRate(1.0f); mpTextParent[2] = NULL; - mpTextParent[3] = new CPaneMgr(mpScreen, 'c_sen_n', 2, NULL); + mpTextParent[3] = new CPaneMgr(mpScreen, MULTI_CHAR('c_sen_n'), 2, NULL); mpTextParent[4] = new CPaneMgr(mpScreen, 'gr_n', 2, NULL); mpTextParent[4]->hide(); for (int i = 5; i < 10; i++) { @@ -301,20 +301,20 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i mItemSlotParam2[i] = (mpItemBuf[i][0]->height / 48.0f * (texScale / 100.0f)); } } - mpScreen->search('r_btn_n')->hide(); + mpScreen->search(MULTI_CHAR('r_btn_n'))->hide(); if (mPlayerIsWolf) { - mpScreen->search('yx_te_s1')->hide(); - mpScreen->search('yx_te_s2')->hide(); - mpScreen->search('yx_te_s3')->hide(); - mpScreen->search('yx_te_s4')->hide(); - mpScreen->search('yx_text')->hide(); - mpScreen->search('fyx_te_1')->hide(); - mpScreen->search('fyx_te_2')->hide(); - mpScreen->search('fyx_te_3')->hide(); - mpScreen->search('fyx_te_4')->hide(); - mpScreen->search('fyx_tex')->hide(); - mpScreen->search('x_btn_n')->hide(); - mpScreen->search('y_btn_n')->hide(); + mpScreen->search(MULTI_CHAR('yx_te_s1'))->hide(); + mpScreen->search(MULTI_CHAR('yx_te_s2'))->hide(); + mpScreen->search(MULTI_CHAR('yx_te_s3'))->hide(); + mpScreen->search(MULTI_CHAR('yx_te_s4'))->hide(); + mpScreen->search(MULTI_CHAR('yx_text'))->hide(); + mpScreen->search(MULTI_CHAR('fyx_te_1'))->hide(); + mpScreen->search(MULTI_CHAR('fyx_te_2'))->hide(); + mpScreen->search(MULTI_CHAR('fyx_te_3'))->hide(); + mpScreen->search(MULTI_CHAR('fyx_te_4'))->hide(); + mpScreen->search(MULTI_CHAR('fyx_tex'))->hide(); + mpScreen->search(MULTI_CHAR('x_btn_n'))->hide(); + mpScreen->search(MULTI_CHAR('y_btn_n'))->hide(); } mpString = new dMsgString_c(); for (i = 0; i < 5; i++) { @@ -387,38 +387,38 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i "SCRN/zelda_item_select_icon3_spot.blo", 0x20000, dComIfGp_getRingResArchive()); dPaneClass_showNullPane(mpSpotScreen); - mpSpotParent = new CPaneMgrAlpha(mpSpotScreen, 'n_all', 2, NULL); + mpSpotParent = new CPaneMgrAlpha(mpSpotScreen, MULTI_CHAR('n_all'), 2, NULL); mpCenterScreen = new J2DScreen(); dPaneClass_setPriority(&mpResData[2], mpHeap, mpCenterScreen, "SCRN/zelda_item_select_icon3_center_parts.blo", 0x20000, dComIfGp_getRingResArchive()); dPaneClass_showNullPane(mpCenterScreen); - mpCenterParent = new CPaneMgrAlpha(mpCenterScreen, 'center_n', 2, NULL); - mpNameParent = new CPaneMgr(mpCenterScreen, 'label_n', 1, NULL); - mpCircle = new CPaneMgr(mpCenterScreen, 'circle_n', 2, NULL); + mpCenterParent = new CPaneMgrAlpha(mpCenterScreen, MULTI_CHAR('center_n'), 2, NULL); + mpNameParent = new CPaneMgr(mpCenterScreen, MULTI_CHAR('label_n'), 1, NULL); + mpCircle = new CPaneMgr(mpCenterScreen, MULTI_CHAR('circle_n'), 2, NULL); J2DTextBox* textBox[4]; #if VERSION == VERSION_GCN_JPN - textBox[0] = (J2DTextBox*)mpCenterScreen->search('item_n04'); - textBox[1] = (J2DTextBox*)mpCenterScreen->search('item_n05'); - textBox[2] = (J2DTextBox*)mpCenterScreen->search('item_n06'); - textBox[3] = (J2DTextBox*)mpCenterScreen->search('item_n07'); - J2DPane* pane = mpCenterScreen->search('fitem_n1'); + textBox[0] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n04')); + textBox[1] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n05')); + textBox[2] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n06')); + textBox[3] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n07')); + J2DPane* pane = mpCenterScreen->search(MULTI_CHAR('fitem_n1')); pane->mVisible = false; - pane = mpCenterScreen->search('fitem_n2'); + pane = mpCenterScreen->search(MULTI_CHAR('fitem_n2')); pane->mVisible = false; - pane = mpCenterScreen->search('fitem_n3'); + pane = mpCenterScreen->search(MULTI_CHAR('fitem_n3')); pane->mVisible = false; - pane = mpCenterScreen->search('fitem_n4'); + pane = mpCenterScreen->search(MULTI_CHAR('fitem_n4')); pane->mVisible = false; #else - textBox[0] = (J2DTextBox*)mpCenterScreen->search('fitem_n1'); - textBox[1] = (J2DTextBox*)mpCenterScreen->search('fitem_n2'); - textBox[2] = (J2DTextBox*)mpCenterScreen->search('fitem_n3'); - textBox[3] = (J2DTextBox*)mpCenterScreen->search('fitem_n4'); - mpCenterScreen->search('item_n04'); - mpCenterScreen->search('item_n05'); - mpCenterScreen->search('item_n06'); - mpCenterScreen->search('item_n07'); + textBox[0] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n1')); + textBox[1] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n2')); + textBox[2] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n3')); + textBox[3] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n4')); + mpCenterScreen->search(MULTI_CHAR('item_n04')); + mpCenterScreen->search(MULTI_CHAR('item_n05')); + mpCenterScreen->search(MULTI_CHAR('item_n06')); + mpCenterScreen->search(MULTI_CHAR('item_n07')); #endif for (int i = 0; i < 4; i++) { textBox[i]->setFont(mDoExt_getMesgFont()); @@ -614,7 +614,7 @@ void dMenu_Ring_c::_draw() { if (mStatus != STATUS_EXPLAIN && mPikariFlashingSpeed > 0.0f) { Vec pos; CPaneMgr paneMgr; - pos = paneMgr.getGlobalVtxCenter(mpScreen->search('gr_btn'), true, 0); + pos = paneMgr.getGlobalVtxCenter(mpScreen->search(MULTI_CHAR('gr_btn')), true, 0); dMeter2Info_getMeterClass()->getMeterDrawPtr()->drawPikari( pos.x, pos.y, &mPikariFlashingSpeed, g_ringHIO.mPikariScale, g_ringHIO.mPikariFrontOuter, g_ringHIO.mPikariFrontInner, g_ringHIO.mPikariBackOuter, g_ringHIO.mPikariBackInner, @@ -1102,15 +1102,15 @@ void dMenu_Ring_c::setScale() { void dMenu_Ring_c::setNameString(u32 i_stringID) { J2DTextBox* textBox[4]; #if VERSION == VERSION_GCN_JPN - textBox[0] = (J2DTextBox*)mpCenterScreen->search('item_n04'); - textBox[1] = (J2DTextBox*)mpCenterScreen->search('item_n05'); - textBox[2] = (J2DTextBox*)mpCenterScreen->search('item_n06'); - textBox[3] = (J2DTextBox*)mpCenterScreen->search('item_n07'); + textBox[0] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n04')); + textBox[1] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n05')); + textBox[2] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n06')); + textBox[3] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n07')); #else - textBox[0] = (J2DTextBox*)mpCenterScreen->search('fitem_n1'); - textBox[1] = (J2DTextBox*)mpCenterScreen->search('fitem_n2'); - textBox[2] = (J2DTextBox*)mpCenterScreen->search('fitem_n3'); - textBox[3] = (J2DTextBox*)mpCenterScreen->search('fitem_n4'); + textBox[0] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n1')); + textBox[1] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n2')); + textBox[2] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n3')); + textBox[3] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('fitem_n4')); #endif if (mNameStringID != i_stringID) { for (int i = 0; i < 4; i++) { diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index 78ff06dc244..957910a036a 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -150,28 +150,28 @@ void dMenu_save_c::_create() { } void dMenu_save_c::screenSet() { - static u64 l_tagName0[3] = {'w_sel_00', 'w_sel_01', 'w_sel_02'}; - static u64 l_tagName000[2] = {'w_no_t', 'w_yes_t'}; - static u64 l_tagName000U[2] = {'f_no_t', 'f_yes_t'}; - static u64 l_tagName00[2] = {'w_modo', 'w_kete'}; - static u64 l_tagName00U[2] = {'f_modo', 'f_kete'}; - static u64 l_tagName3[3] = {'w_moyo00', 'w_moyo01', 'w_moyo02'}; - static u64 l_tagName4[3] = {'w_gold00', 'w_gold01', 'w_gold02'}; - static u64 l_tagName5[3] = {'w_go2_00', 'w_go2_01', 'w_go2_02'}; - static u64 l_tagName9[2] = {'w_no_m', 'w_yes_m'}; - static u64 l_tagName10[2] = {'w_no_g', 'w_yes_g'}; - static u64 l_tagName11[2] = {'w_no_gr', 'w_yes_gr'}; - static u64 l_tagName12[3] = {'w_bk_l00', 'w_bk_l01', 'w_bk_l02'}; + static u64 l_tagName0[3] = {MULTI_CHAR('w_sel_00'), MULTI_CHAR('w_sel_01'), MULTI_CHAR('w_sel_02')}; + static u64 l_tagName000[2] = {MULTI_CHAR('w_no_t'), MULTI_CHAR('w_yes_t')}; + static u64 l_tagName000U[2] = {MULTI_CHAR('f_no_t'), MULTI_CHAR('f_yes_t')}; + static u64 l_tagName00[2] = {MULTI_CHAR('w_modo'), MULTI_CHAR('w_kete')}; + static u64 l_tagName00U[2] = {MULTI_CHAR('f_modo'), MULTI_CHAR('f_kete')}; + static u64 l_tagName3[3] = {MULTI_CHAR('w_moyo00'), MULTI_CHAR('w_moyo01'), MULTI_CHAR('w_moyo02')}; + static u64 l_tagName4[3] = {MULTI_CHAR('w_gold00'), MULTI_CHAR('w_gold01'), MULTI_CHAR('w_gold02')}; + static u64 l_tagName5[3] = {MULTI_CHAR('w_go2_00'), MULTI_CHAR('w_go2_01'), MULTI_CHAR('w_go2_02')}; + static u64 l_tagName9[2] = {MULTI_CHAR('w_no_m'), MULTI_CHAR('w_yes_m')}; + static u64 l_tagName10[2] = {MULTI_CHAR('w_no_g'), MULTI_CHAR('w_yes_g')}; + static u64 l_tagName11[2] = {MULTI_CHAR('w_no_gr'), MULTI_CHAR('w_yes_gr')}; + static u64 l_tagName12[3] = {MULTI_CHAR('w_bk_l00'), MULTI_CHAR('w_bk_l01'), MULTI_CHAR('w_bk_l02')}; #if VERSION == VERSION_GCN_JPN - static u64 l_tagName21[2] = {'w_tabi_s', 'w_tabi_x'}; - static u64 l_tagName20[2] = {'w_er_msg', 'w_er_msR'}; + static u64 l_tagName21[2] = {MULTI_CHAR('w_tabi_s'), MULTI_CHAR('w_tabi_x')}; + static u64 l_tagName20[2] = {MULTI_CHAR('w_er_msg'), MULTI_CHAR('w_er_msR')}; #else - static u64 l_tagName21[2] = {'t_for', 't_for1'}; - static u64 l_tagName211[10] = {'tmoyou00', 'tmoyou01', 'tmoyou02', 'tmoyou03', 'tmoyou04', - 'tmoyou05', 'tmoyou06', 'tmoyou07', 'tmoyou08', 'tmoyou09'}; - static u64 l_tagName20[2] = {'er_for0', 'er_for1'}; + static u64 l_tagName21[2] = {MULTI_CHAR('t_for'), MULTI_CHAR('t_for1')}; + static u64 l_tagName211[10] = {MULTI_CHAR('tmoyou00'), MULTI_CHAR('tmoyou01'), MULTI_CHAR('tmoyou02'), MULTI_CHAR('tmoyou03'), MULTI_CHAR('tmoyou04'), + MULTI_CHAR('tmoyou05'), MULTI_CHAR('tmoyou06'), MULTI_CHAR('tmoyou07'), MULTI_CHAR('tmoyou08'), MULTI_CHAR('tmoyou09')}; + static u64 l_tagName20[2] = {MULTI_CHAR('er_for0'), MULTI_CHAR('er_for1')}; #endif - static u64 l_tagName13[3] = {'w_dat_i0', 'w_dat_i1', 'w_dat_i2'}; + static u64 l_tagName13[3] = {MULTI_CHAR('w_dat_i0'), MULTI_CHAR('w_dat_i1'), MULTI_CHAR('w_dat_i2')}; static u8 l_msgNum0[2] = {0x08, 0x07}; static u8 l_msgNum[2] = {0x54, 0x55}; @@ -193,15 +193,15 @@ void dMenu_save_c::screenSet() { field_0x48->searchUpdateMaterialID(mSaveSel.Scr); field_0x4c->searchUpdateMaterialID(mSaveSel.Scr); - mpSelectMoveBase = new CPaneMgr(mSaveSel.Scr, 'w_move_n', 0, NULL); - field_0xa0 = mSaveSel.Scr->search('wmenu_n'); + mpSelectMoveBase = new CPaneMgr(mSaveSel.Scr, MULTI_CHAR('w_move_n'), 0, NULL); + field_0xa0 = mSaveSel.Scr->search(MULTI_CHAR('wmenu_n')); for (int i = 0; i < 3; i++) { mpSelData[i] = new CPaneMgr(mSaveSel.Scr, l_tagName0[i], 0, NULL); } - mpNoYes[0] = new CPaneMgr(mSaveSel.Scr, 'w_no_n', 0, NULL); - mpNoYes[1] = new CPaneMgr(mSaveSel.Scr, 'w_yes_n', 0, NULL); + mpNoYes[0] = new CPaneMgr(mSaveSel.Scr, MULTI_CHAR('w_no_n'), 0, NULL); + mpNoYes[1] = new CPaneMgr(mSaveSel.Scr, MULTI_CHAR('w_yes_n'), 0, NULL); for (int i = 0; i < 2; i++) { #if VERSION == VERSION_GCN_JPN @@ -218,17 +218,17 @@ void dMenu_save_c::screenSet() { ((J2DTextBox*)mpNoYesTxt[i]->getPanePtr())->setString(message); } - mSaveSel.Scr->search('Wi_btn_n')->hide(); - mSaveSel.Scr->search('GC_btn_n')->show(); + mSaveSel.Scr->search(MULTI_CHAR('Wi_btn_n'))->hide(); + mSaveSel.Scr->search(MULTI_CHAR('GC_btn_n'))->show(); - mpBBtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, 'w_nbbtn', 2, NULL); - mpABtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, 'w_nabtn', 2, NULL); + mpBBtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_nbbtn'), 2, NULL); + mpABtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_nabtn'), 2, NULL); #if VERSION == VERSION_GCN_JPN - mpBackTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'w_modo', 2, NULL); - mpConfirmTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'w_kete', 2, NULL); + mpBackTxt = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_modo'), 2, NULL); + mpConfirmTxt = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_kete'), 2, NULL); #else - mpBackTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'f_modo', 2, NULL); - mpConfirmTxt = new CPaneMgrAlpha(mSaveSel.Scr, 'f_kete', 2, NULL); + mpBackTxt = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('f_modo'), 2, NULL); + mpConfirmTxt = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('f_kete'), 2, NULL); #endif mpBackTxt->setAlpha(0); @@ -314,11 +314,11 @@ void dMenu_save_c::screenSet() { } #if VERSION == VERSION_GCN_JPN - mSaveSel.Scr->search('t_for')->hide(); - mSaveSel.Scr->search('t_for1')->hide(); + mSaveSel.Scr->search(MULTI_CHAR('t_for'))->hide(); + mSaveSel.Scr->search(MULTI_CHAR('t_for1'))->hide(); #else - mSaveSel.Scr->search('w_tabi_s')->hide(); - mSaveSel.Scr->search('w_tabi_x')->hide(); + mSaveSel.Scr->search(MULTI_CHAR('w_tabi_s'))->hide(); + mSaveSel.Scr->search(MULTI_CHAR('w_tabi_x'))->hide(); for (int i = 0; i < 10; i++) { mSaveSel.Scr->search(l_tagName211[i])->hide(); @@ -346,13 +346,13 @@ void dMenu_save_c::screenSet() { mpHeaderTxtPane[1]->setAlpha(0); mHeaderTxtType = 0; - field_0xb4 = mSaveSel.Scr->search('w_er_n'); + field_0xb4 = mSaveSel.Scr->search(MULTI_CHAR('w_er_n')); #if VERSION == VERSION_GCN_JPN - mSaveSel.Scr->search('er_for0')->hide(); - mSaveSel.Scr->search('er_for1')->hide(); + mSaveSel.Scr->search(MULTI_CHAR('er_for0'))->hide(); + mSaveSel.Scr->search(MULTI_CHAR('er_for1'))->hide(); #else - mSaveSel.Scr->search('w_er_msg')->hide(); - mSaveSel.Scr->search('w_er_msR')->hide(); + mSaveSel.Scr->search(MULTI_CHAR('w_er_msg'))->hide(); + mSaveSel.Scr->search(MULTI_CHAR('w_er_msR'))->hide(); #endif for (int i = 0; i < 2; i++) { @@ -391,7 +391,7 @@ void dMenu_save_c::screenSet() { mSelIcon->setPos(pos.x, pos.y, mpSelData[mSelectedFile]->getPanePtr(), true); mSelIcon->setAlphaRate(0.0f); - J2DPane* pane = mSaveSel.Scr->search('Nm_02'); + J2DPane* pane = mSaveSel.Scr->search(MULTI_CHAR('Nm_02')); pane->setAnimation(field_0x40); field_0x64 = 0; field_0x50 = 1; @@ -794,7 +794,7 @@ void dMenu_save_c::saveQuestion() { if (mYesNoCursor == CURSOR_YES) { field_0x1c0 = 1; - J2DPane* pane = mSaveSel.Scr->search('Nm_02'); + J2DPane* pane = mSaveSel.Scr->search(MULTI_CHAR('Nm_02')); pane->setAnimation(field_0x40); field_0xd2 = 0; diff --git a/src/d/d_menu_skill.cpp b/src/d/d_menu_skill.cpp index 59a46103091..b9129efb2fb 100644 --- a/src/d/d_menu_skill.cpp +++ b/src/d/d_menu_skill.cpp @@ -361,57 +361,57 @@ void dMenu_Skill_c::read_close_move() { void dMenu_Skill_c::screenSetMenu() { static const u64 tag_sub0[7] = { - 'menu_t0s', 'menu_t1s', 'menu_t2s', 'menu_t3s', 'menu_t4s', 'menu_t5s', 'menu_t51', + MULTI_CHAR('menu_t0s'), MULTI_CHAR('menu_t1s'), MULTI_CHAR('menu_t2s'), MULTI_CHAR('menu_t3s'), MULTI_CHAR('menu_t4s'), MULTI_CHAR('menu_t5s'), MULTI_CHAR('menu_t51'), }; static const u64 tag_sub1[7] = { - 'menu_t0', 'menu_t1', 'menu_t2', 'menu_t3', 'menu_t4', 'menu_t5', 'menu_t6', + MULTI_CHAR('menu_t0'), MULTI_CHAR('menu_t1'), MULTI_CHAR('menu_t2'), MULTI_CHAR('menu_t3'), MULTI_CHAR('menu_t4'), MULTI_CHAR('menu_t5'), MULTI_CHAR('menu_t6'), }; static const u64 tag_name0[7] = { - 'menu_t6s', 'menu_f7s', 'menu_f8s', 'menu_t9s', 'menu_10s', 'menu_11s', 'menu_112', + MULTI_CHAR('menu_t6s'), MULTI_CHAR('menu_f7s'), MULTI_CHAR('menu_f8s'), MULTI_CHAR('menu_t9s'), MULTI_CHAR('menu_10s'), MULTI_CHAR('menu_11s'), MULTI_CHAR('menu_112'), }; static const u64 tag_name1[7] = { - 'menu_f6', 'menu_f7', 'menu_t8', 'menu_t9', 'menu_t10', 'menu_t11', 'menu_t01', + MULTI_CHAR('menu_f6'), MULTI_CHAR('menu_f7'), MULTI_CHAR('menu_t8'), MULTI_CHAR('menu_t9'), MULTI_CHAR('menu_t10'), MULTI_CHAR('menu_t11'), MULTI_CHAR('menu_t01'), }; static const u64 ftag_sub0[7] = { - 'fenu_t0s', 'fenu_t1s', 'fenu_t2s', 'fenu_t3s', 'fenu_t4s', 'fenu_t5s', 'fenu_t6s', + MULTI_CHAR('fenu_t0s'), MULTI_CHAR('fenu_t1s'), MULTI_CHAR('fenu_t2s'), MULTI_CHAR('fenu_t3s'), MULTI_CHAR('fenu_t4s'), MULTI_CHAR('fenu_t5s'), MULTI_CHAR('fenu_t6s'), }; static const u64 ftag_sub1[7] = { - 'fenu_t0', 'fenu_t1', 'fenu_t2', 'fenu_t3', 'fenu_t4', 'fenu_t5', 'fenu_t6', + MULTI_CHAR('fenu_t0'), MULTI_CHAR('fenu_t1'), MULTI_CHAR('fenu_t2'), MULTI_CHAR('fenu_t3'), MULTI_CHAR('fenu_t4'), MULTI_CHAR('fenu_t5'), MULTI_CHAR('fenu_t6'), }; static const u64 ftag_name0[7] = { - 'fenu_t7s', 'fenu_t8s', 'fenu_t9s', 'fenu_10s', 'fenu_11s', 'fenu_12s', 'fenu_13s', + MULTI_CHAR('fenu_t7s'), MULTI_CHAR('fenu_t8s'), MULTI_CHAR('fenu_t9s'), MULTI_CHAR('fenu_10s'), MULTI_CHAR('fenu_11s'), MULTI_CHAR('fenu_12s'), MULTI_CHAR('fenu_13s'), }; static const u64 ftag_name1[7] = { - 'fenu_t7', 'fenu_t8', 'fenu_t9', 'fenu_10', 'fenu_11', 'fenu_12', 'fenu_13', + MULTI_CHAR('fenu_t7'), MULTI_CHAR('fenu_t8'), MULTI_CHAR('fenu_t9'), MULTI_CHAR('fenu_10'), MULTI_CHAR('fenu_11'), MULTI_CHAR('fenu_12'), MULTI_CHAR('fenu_13'), }; static const u64 tag_letter[7] = { - 'let_00_n', 'let_01_n', 'let_02_n', 'let_03_n', 'let_04_n', 'let_05_n', 'let_06_n', + MULTI_CHAR('let_00_n'), MULTI_CHAR('let_01_n'), MULTI_CHAR('let_02_n'), MULTI_CHAR('let_03_n'), MULTI_CHAR('let_04_n'), MULTI_CHAR('let_05_n'), MULTI_CHAR('let_06_n'), }; static const u64 tag_frame[7] = { - 'flame_00', 'flame_01', 'flame_02', 'flame_03', 'flame_04', 'flame_05', 'flame_06', + MULTI_CHAR('flame_00'), MULTI_CHAR('flame_01'), MULTI_CHAR('flame_02'), MULTI_CHAR('flame_03'), MULTI_CHAR('flame_04'), MULTI_CHAR('flame_05'), MULTI_CHAR('flame_06'), }; static const u64 tag_maki[7] = { - 'maki_0n', 'maki_1n', 'maki_2n', 'maki_3n', 'maki_4n', 'maki_5n', 'maki_6n', + MULTI_CHAR('maki_0n'), MULTI_CHAR('maki_1n'), MULTI_CHAR('maki_2n'), MULTI_CHAR('maki_3n'), MULTI_CHAR('maki_4n'), MULTI_CHAR('maki_5n'), MULTI_CHAR('maki_6n'), }; static const u64 tag_makic[7] = { - 'maki_0', 'maki_1', 'maki_2', 'maki_3', 'maki_4', 'maki_5', 'maki_6', + MULTI_CHAR('maki_0'), MULTI_CHAR('maki_1'), MULTI_CHAR('maki_2'), MULTI_CHAR('maki_3'), MULTI_CHAR('maki_4'), MULTI_CHAR('maki_5'), MULTI_CHAR('maki_6'), }; mpMenuScreen = new J2DScreen(); mpMenuScreen->setPriority("zelda_ougi_window.blo", 0x20000, mpArchive); dPaneClass_showNullPane(mpMenuScreen); - mpParent = new CPaneMgr(mpMenuScreen, 'n_all', 2, NULL); + mpParent = new CPaneMgr(mpMenuScreen, MULTI_CHAR('n_all'), 2, NULL); mpParent->setAlphaRate(0.0f); for (int i = 0; i < 7; i++) { #if VERSION == VERSION_GCN_JPN @@ -470,11 +470,11 @@ void dMenu_Skill_c::screenSetMenu() { } } #if VERSION == VERSION_GCN_JPN - J2DTextBox* textBox = (J2DTextBox*)mpMenuScreen->search('t_t00'); - mpMenuScreen->search('f_t00')->hide(); + J2DTextBox* textBox = (J2DTextBox*)mpMenuScreen->search(MULTI_CHAR('t_t00')); + mpMenuScreen->search(MULTI_CHAR('f_t00'))->hide(); #else - J2DTextBox* textBox = (J2DTextBox*)mpMenuScreen->search('f_t00'); - mpMenuScreen->search('t_t00')->hide(); + J2DTextBox* textBox = (J2DTextBox*)mpMenuScreen->search(MULTI_CHAR('f_t00')); + mpMenuScreen->search(MULTI_CHAR('t_t00'))->hide(); #endif textBox->setFont(mDoExt_getSubFont()); textBox->setString(0x200, ""); @@ -483,29 +483,29 @@ void dMenu_Skill_c::screenSetMenu() { void dMenu_Skill_c::screenSetLetter() { static const u64 name_tag[4] = { - 'item_n04', - 'item_n05', - 'item_n06', - 'item_n07', + MULTI_CHAR('item_n04'), + MULTI_CHAR('item_n05'), + MULTI_CHAR('item_n06'), + MULTI_CHAR('item_n07'), }; static const u64 fame_tag[4] = { - 'f_item_1', - 'f_item_2', - 'f_item_3', - 'f_item_4', + MULTI_CHAR('f_item_1'), + MULTI_CHAR('f_item_2'), + MULTI_CHAR('f_item_3'), + MULTI_CHAR('f_item_4'), }; mpLetterScreen = new J2DScreen(); mpLetterScreen->setPriority("zelda_ougi_info.blo", 0x20000, mpArchive); dPaneClass_showNullPane(mpLetterScreen); #if VERSION == VERSION_GCN_JPN - mpTextPane = new CPaneMgr(mpLetterScreen, 'mg_3line', 0, NULL); - mpLetterScreen->search('n_e4line')->hide(); + mpTextPane = new CPaneMgr(mpLetterScreen, MULTI_CHAR('mg_3line'), 0, NULL); + mpLetterScreen->search(MULTI_CHAR('n_e4line'))->hide(); #else - mpTextPane = new CPaneMgr(mpLetterScreen, 'mg_e4lin', 0, NULL); - mpLetterScreen->search('n_3line')->hide(); + mpTextPane = new CPaneMgr(mpLetterScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); + mpLetterScreen->search(MULTI_CHAR('n_3line'))->hide(); #endif - mpExpName = new CPaneMgr(mpLetterScreen, 'label_n', 0, NULL); + mpExpName = new CPaneMgr(mpLetterScreen, MULTI_CHAR('label_n'), 0, NULL); J2DTextBox* paneFont = (J2DTextBox*)mpTextPane->getPanePtr(); paneFont->setFont(mDoExt_getMesgFont()); J2DTextBox* paneString = (J2DTextBox*)mpTextPane->getPanePtr(); @@ -521,7 +521,7 @@ void dMenu_Skill_c::screenSetLetter() { mpNameString[i]->setFont(mDoExt_getMesgFont()); mpNameString[i]->setString(0x40, ""); } - mpTextParent = new CPaneMgr(mpLetterScreen, 'n_all', 2, NULL); + mpTextParent = new CPaneMgr(mpLetterScreen, MULTI_CHAR('n_all'), 2, NULL); mpTextParent->setAlphaRate(0.0f); ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); mpBlackTex = new J2DPicture(timg); @@ -531,10 +531,10 @@ void dMenu_Skill_c::screenSetLetter() { void dMenu_Skill_c::screenSetDoIcon() { static const u64 text_a_tag[5] = { - 'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5', + MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5'), }; static const u64 text_b_tag[5] = { - 'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5', + MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5'), }; mpIconScreen = new J2DScreen(); mpIconScreen->setPriority("zelda_collect_soubi_do_icon_parts.blo", 0x20000, mpArchive); diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index f8f0ca10e62..302ef5e06a0 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -50,7 +50,7 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); - mpScreen->search('ju_ring5')->hide(); + mpScreen->search(MULTI_CHAR('ju_ring5'))->hide(); field_0x73c = 0.0f; for (int i = 0; i < 2; i++) { @@ -71,10 +71,10 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpPikariScreen); - mpPikariParent = new CPaneMgr(mpPikariScreen, 'pika_n', 0, NULL); + mpPikariParent = new CPaneMgr(mpPikariScreen, MULTI_CHAR('pika_n'), 0, NULL); JUT_ASSERT(0, mpPikariParent != NULL); - mPikariBlack = static_cast(mpPikariScreen->search('pika00'))->getBlack(); - mPikariWhite = static_cast(mpPikariScreen->search('pika00'))->getWhite(); + mPikariBlack = static_cast(mpPikariScreen->search(MULTI_CHAR('pika00')))->getBlack(); + mPikariWhite = static_cast(mpPikariScreen->search(MULTI_CHAR('pika00')))->getWhite(); OSInitFastCast(); void* pikari_bck = JKRGetNameResource("zelda_icon_pikari.bck", dComIfGp_getMain2DArchive()); @@ -86,14 +86,14 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { mPikariBpk->searchUpdateMaterialID(mpPikariScreen); playPikariBpkAnimation(1.0f); - mpParent = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); JUT_ASSERT(0, mpParent != NULL); - static u64 const a_tag[] = {'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at'}; - static u64 const b_tag[] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt'}; - static u64 const z_tag[] = {'cont_zt1', 'cont_zt2', 'cont_zt3', 'cont_zt4', 'cont_rt'}; - static u64 const x_tag[] = {'cont_xt1', 'cont_xt2', 'cont_xt3', 'cont_xt4', 'cont_xt5'}; - static u64 const y_tag[] = {'cont_yt1', 'cont_yt2', 'cont_yt3', 'cont_yt4', 'cont_yt5'}; + static u64 const a_tag[] = {MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4'), MULTI_CHAR('cont_at')}; + static u64 const b_tag[] = {MULTI_CHAR('cont_bt1'), MULTI_CHAR('cont_bt2'), MULTI_CHAR('cont_bt3'), MULTI_CHAR('cont_bt4'), MULTI_CHAR('cont_bt')}; + static u64 const z_tag[] = {MULTI_CHAR('cont_zt1'), MULTI_CHAR('cont_zt2'), MULTI_CHAR('cont_zt3'), MULTI_CHAR('cont_zt4'), MULTI_CHAR('cont_rt')}; + static u64 const x_tag[] = {MULTI_CHAR('cont_xt1'), MULTI_CHAR('cont_xt2'), MULTI_CHAR('cont_xt3'), MULTI_CHAR('cont_xt4'), MULTI_CHAR('cont_xt5')}; + static u64 const y_tag[] = {MULTI_CHAR('cont_yt1'), MULTI_CHAR('cont_yt2'), MULTI_CHAR('cont_yt3'), MULTI_CHAR('cont_yt4'), MULTI_CHAR('cont_yt5')}; for (int i = 0; i < 5; i++) { mpAText[i] = new CPaneMgr(mpScreen, a_tag[i], 0, NULL); @@ -721,36 +721,36 @@ void dMeter2Draw_c::initLife() { } static u64 const life_tag[] = { - 'hpb_00', 'hpb_01', 'hpb_02', 'hpb_03', 'hpb_04', 'hpb_05', 'hpb_06', - 'hpb_07', 'hpb_08', 'hpb_09', 'hpb_10', 'hpb_11', 'hpb_12', 'hpb_13', - 'hpb_14', 'hpb_15', 'hpb_16', 'hpb_17', 'hpb_18', 'hpb_19', + MULTI_CHAR('hpb_00'), MULTI_CHAR('hpb_01'), MULTI_CHAR('hpb_02'), MULTI_CHAR('hpb_03'), MULTI_CHAR('hpb_04'), MULTI_CHAR('hpb_05'), MULTI_CHAR('hpb_06'), + MULTI_CHAR('hpb_07'), MULTI_CHAR('hpb_08'), MULTI_CHAR('hpb_09'), MULTI_CHAR('hpb_10'), MULTI_CHAR('hpb_11'), MULTI_CHAR('hpb_12'), MULTI_CHAR('hpb_13'), + MULTI_CHAR('hpb_14'), MULTI_CHAR('hpb_15'), MULTI_CHAR('hpb_16'), MULTI_CHAR('hpb_17'), MULTI_CHAR('hpb_18'), MULTI_CHAR('hpb_19'), }; static u64 const mark_tag[] = { - 'heartn00', 'heartn01', 'heartn02', 'heartn03', 'heartn04', 'heartn05', 'heartn06', - 'heartn07', 'heartn08', 'heartn09', 'heartn10', 'heartn11', 'heartn12', 'heartn13', - 'heartn14', 'heartn15', 'heartn16', 'heartn17', 'heartn18', 'heartn19', + MULTI_CHAR('heartn00'), MULTI_CHAR('heartn01'), MULTI_CHAR('heartn02'), MULTI_CHAR('heartn03'), MULTI_CHAR('heartn04'), MULTI_CHAR('heartn05'), MULTI_CHAR('heartn06'), + MULTI_CHAR('heartn07'), MULTI_CHAR('heartn08'), MULTI_CHAR('heartn09'), MULTI_CHAR('heartn10'), MULTI_CHAR('heartn11'), MULTI_CHAR('heartn12'), MULTI_CHAR('heartn13'), + MULTI_CHAR('heartn14'), MULTI_CHAR('heartn15'), MULTI_CHAR('heartn16'), MULTI_CHAR('heartn17'), MULTI_CHAR('heartn18'), MULTI_CHAR('heartn19'), }; static u64 const base_tag[] = { - 'h_ba_n00', 'h_ba_n01', 'h_ba_n02', 'h_ba_n03', 'h_ba_n04', 'h_ba_n05', 'h_ba_n06', - 'h_ba_n07', 'h_ba_n08', 'h_ba_n09', 'h_ba_n10', 'h_ba_n11', 'h_ba_n12', 'h_ba_n13', - 'h_ba_n14', 'h_ba_n15', 'h_ba_n16', 'h_ba_n17', 'h_ba_n18', 'h_ba_n19', + MULTI_CHAR('h_ba_n00'), MULTI_CHAR('h_ba_n01'), MULTI_CHAR('h_ba_n02'), MULTI_CHAR('h_ba_n03'), MULTI_CHAR('h_ba_n04'), MULTI_CHAR('h_ba_n05'), MULTI_CHAR('h_ba_n06'), + MULTI_CHAR('h_ba_n07'), MULTI_CHAR('h_ba_n08'), MULTI_CHAR('h_ba_n09'), MULTI_CHAR('h_ba_n10'), MULTI_CHAR('h_ba_n11'), MULTI_CHAR('h_ba_n12'), MULTI_CHAR('h_ba_n13'), + MULTI_CHAR('h_ba_n14'), MULTI_CHAR('h_ba_n15'), MULTI_CHAR('h_ba_n16'), MULTI_CHAR('h_ba_n17'), MULTI_CHAR('h_ba_n18'), MULTI_CHAR('h_ba_n19'), }; static u64 const lifet1_tag[] = { - 'hear_00s', 'hear_01s', 'hear_02s', 'hear_03s', 'hear_04s', 'hear_05s', 'hear_06s', - 'hear_07s', 'hear_08s', 'hear_09s', 'hear_10s', 'hear_11s', 'hear_12s', 'hear_13s', - 'hear_14s', 'hear_15s', 'hear_16s', 'hear_17s', 'hear_18s', 'hear_19s', + MULTI_CHAR('hear_00s'), MULTI_CHAR('hear_01s'), MULTI_CHAR('hear_02s'), MULTI_CHAR('hear_03s'), MULTI_CHAR('hear_04s'), MULTI_CHAR('hear_05s'), MULTI_CHAR('hear_06s'), + MULTI_CHAR('hear_07s'), MULTI_CHAR('hear_08s'), MULTI_CHAR('hear_09s'), MULTI_CHAR('hear_10s'), MULTI_CHAR('hear_11s'), MULTI_CHAR('hear_12s'), MULTI_CHAR('hear_13s'), + MULTI_CHAR('hear_14s'), MULTI_CHAR('hear_15s'), MULTI_CHAR('hear_16s'), MULTI_CHAR('hear_17s'), MULTI_CHAR('hear_18s'), MULTI_CHAR('hear_19s'), }; static u64 const lifet2_tag[] = { - 'hear_00', 'hear_01', 'hear_02', 'hear_03', 'hear_04', 'hear_05', 'hear_06', - 'hear_07', 'hear_08', 'hear_09', 'hear_10', 'hear_11', 'hear_12', 'hear_13', - 'hear_14', 'hear_15', 'hear_16', 'hear_17', 'hear_18', 'hear_19', + MULTI_CHAR('hear_00'), MULTI_CHAR('hear_01'), MULTI_CHAR('hear_02'), MULTI_CHAR('hear_03'), MULTI_CHAR('hear_04'), MULTI_CHAR('hear_05'), MULTI_CHAR('hear_06'), + MULTI_CHAR('hear_07'), MULTI_CHAR('hear_08'), MULTI_CHAR('hear_09'), MULTI_CHAR('hear_10'), MULTI_CHAR('hear_11'), MULTI_CHAR('hear_12'), MULTI_CHAR('hear_13'), + MULTI_CHAR('hear_14'), MULTI_CHAR('hear_15'), MULTI_CHAR('hear_16'), MULTI_CHAR('hear_17'), MULTI_CHAR('hear_18'), MULTI_CHAR('hear_19'), }; - mpLifeParent = new CPaneMgr(mpScreen, 'heart_n', 2, NULL); + mpLifeParent = new CPaneMgr(mpScreen, MULTI_CHAR('heart_n'), 2, NULL); JUT_ASSERT(0, mpLifeParent != NULL); for (int i = 0; i < 20; i++) { @@ -770,7 +770,7 @@ void dMeter2Draw_c::initLife() { JUT_ASSERT(0, mpLifeTexture[i][1] != NULL); } - mpBigHeart = new CPaneMgr(mpScreen, 'bigh_n', 2, NULL); + mpBigHeart = new CPaneMgr(mpScreen, MULTI_CHAR('bigh_n'), 2, NULL); JUT_ASSERT(0, mpBigHeart != NULL); mpLifeParent->setAlphaRate(0.0f); @@ -791,20 +791,20 @@ void dMeter2Draw_c::initMagic() { field_0x550 = 0.0f; field_0x554 = 0.0f; - mpMagicParent = new CPaneMgr(mpKanteraScreen, 'magic_n', 2, NULL); + mpMagicParent = new CPaneMgr(mpKanteraScreen, MULTI_CHAR('magic_n'), 2, NULL); JUT_ASSERT(0, mpMagicParent != NULL); - mpMagicBase = new CPaneMgr(mpKanteraScreen, 'mm_base', 0, NULL); + mpMagicBase = new CPaneMgr(mpKanteraScreen, MULTI_CHAR('mm_base'), 0, NULL); JUT_ASSERT(0, mpMagicBase != NULL); - mpMagicFrameL = new CPaneMgr(mpKanteraScreen, 'm_w_l_n', 2, NULL); + mpMagicFrameL = new CPaneMgr(mpKanteraScreen, MULTI_CHAR('m_w_l_n'), 2, NULL); JUT_ASSERT(0, mpMagicFrameL != NULL); mpMagicFrameR = - new CPaneMgr(mpKanteraScreen, 'm_w_r_n', 2, NULL); + new CPaneMgr(mpKanteraScreen, MULTI_CHAR('m_w_r_n'), 2, NULL); JUT_ASSERT(0, mpMagicFrameR != NULL); - mpMagicMeter = new CPaneMgr(mpKanteraScreen, 'mm_00', 0, NULL); + mpMagicMeter = new CPaneMgr(mpKanteraScreen, MULTI_CHAR('mm_00'), 0, NULL); JUT_ASSERT(0, mpMagicMeter != NULL); OSInitFastCast(); @@ -851,7 +851,7 @@ void dMeter2Draw_c::initMagic() { } void dMeter2Draw_c::initLightDrop() { - mpLightDropParent = new CPaneMgr(mpScreen, 's_tuta_n', 2, NULL); + mpLightDropParent = new CPaneMgr(mpScreen, MULTI_CHAR('s_tuta_n'), 2, NULL); JUT_ASSERT(0, mpLightDropParent != NULL); static u64 const tuta_0[] = { @@ -860,13 +860,13 @@ void dMeter2Draw_c::initLightDrop() { }; static u64 const tuta_1[] = { - 'sl_00', 'sl_01', 'sl_02', 'sl_03', 'sl_04', 'sl_05', 'sl_06', 'sl_07', - 'sl_08', 'sl_09', 'sl_10', 'sl_11', 'sl_12', 'sl_13', 'sl_14', 'sl_15', + MULTI_CHAR('sl_00'), MULTI_CHAR('sl_01'), MULTI_CHAR('sl_02'), MULTI_CHAR('sl_03'), MULTI_CHAR('sl_04'), MULTI_CHAR('sl_05'), MULTI_CHAR('sl_06'), MULTI_CHAR('sl_07'), + MULTI_CHAR('sl_08'), MULTI_CHAR('sl_09'), MULTI_CHAR('sl_10'), MULTI_CHAR('sl_11'), MULTI_CHAR('sl_12'), MULTI_CHAR('sl_13'), MULTI_CHAR('sl_14'), MULTI_CHAR('sl_15'), }; static u64 const tuta_2[] = { - 'scp_00', 'scp_01', 'scp_02', 'scp_03', 'scp_04', 'scp_05', 'scp_06', 'scp_07', - 'scp_08', 'scp_09', 'scp_10', 'scp_11', 'scp_12', 'scp_13', 'scp_14', 'scp_15', + MULTI_CHAR('scp_00'), MULTI_CHAR('scp_01'), MULTI_CHAR('scp_02'), MULTI_CHAR('scp_03'), MULTI_CHAR('scp_04'), MULTI_CHAR('scp_05'), MULTI_CHAR('scp_06'), MULTI_CHAR('scp_07'), + MULTI_CHAR('scp_08'), MULTI_CHAR('scp_09'), MULTI_CHAR('scp_10'), MULTI_CHAR('scp_11'), MULTI_CHAR('scp_12'), MULTI_CHAR('scp_13'), MULTI_CHAR('scp_14'), MULTI_CHAR('scp_15'), }; for (int i = 0; i < 16; i++) { @@ -880,10 +880,10 @@ void dMeter2Draw_c::initLightDrop() { JUT_ASSERT(0, mpSIParts[i][2] != NULL); } - mpSIParent[0] = new CPaneMgr(mpScreen, 'tuta_n', 2, NULL); + mpSIParent[0] = new CPaneMgr(mpScreen, MULTI_CHAR('tuta_n'), 2, NULL); JUT_ASSERT(0, mpSIParent[0] != NULL); - mpSIParent[1] = new CPaneMgr(mpScreen, 's_null', 2, NULL); + mpSIParent[1] = new CPaneMgr(mpScreen, MULTI_CHAR('s_null'), 2, NULL); JUT_ASSERT(0, mpSIParent[1] != NULL); mpLightDropParent->setAlphaRate(0.0f); @@ -907,12 +907,12 @@ void dMeter2Draw_c::initLightDrop() { } void dMeter2Draw_c::initRupeeKey() { - mpRupeeKeyParent = new CPaneMgr(mpScreen, 'r_k_n', 2, NULL); + mpRupeeKeyParent = new CPaneMgr(mpScreen, MULTI_CHAR('r_k_n'), 2, NULL); JUT_ASSERT(0, mpRupeeKeyParent != NULL); field_0x718 = 1.0f; - static u64 const rupeet1_tag[] = {'r_n_1_s', 'r_n_2_s', 'r_n_3_s', 'r_n_4_s'}; - static u64 const rupeet2_tag[] = {'r_n_1', 'r_n_2', 'r_n_3', 'r_n_4'}; + static u64 const rupeet1_tag[] = {MULTI_CHAR('r_n_1_s'), MULTI_CHAR('r_n_2_s'), MULTI_CHAR('r_n_3_s'), MULTI_CHAR('r_n_4_s')}; + static u64 const rupeet2_tag[] = {MULTI_CHAR('r_n_1'), MULTI_CHAR('r_n_2'), MULTI_CHAR('r_n_3'), MULTI_CHAR('r_n_4')}; for (int i = 0; i < 4; i++) { mpRupeeTexture[i][0] = new CPaneMgr(mpScreen, rupeet1_tag[i], 0, NULL); @@ -924,20 +924,20 @@ void dMeter2Draw_c::initRupeeKey() { mpRupeeTexture[i][1]->getPanePtr()->setBasePosition(J2DBasePosition_4); } - mpRupeeParent[0] = new CPaneMgr(mpScreen, 'rupi_n', 2, NULL); + mpRupeeParent[0] = new CPaneMgr(mpScreen, MULTI_CHAR('rupi_n'), 2, NULL); JUT_ASSERT(0, mpRupeeParent[0] != NULL); - mpRupeeParent[1] = new CPaneMgr(mpScreen, 'moyou_rn', 2, NULL); + mpRupeeParent[1] = new CPaneMgr(mpScreen, MULTI_CHAR('moyou_rn'), 2, NULL); JUT_ASSERT(0, mpRupeeParent[1] != NULL); - mpRupeeParent[2] = new CPaneMgr(mpScreen, 'moyou_ln', 2, NULL); + mpRupeeParent[2] = new CPaneMgr(mpScreen, MULTI_CHAR('moyou_ln'), 2, NULL); JUT_ASSERT(0, mpRupeeParent[2] != NULL); mpRupeeParent[0]->setAlphaRate(0.0f); mpRupeeParent[1]->setAlphaRate(0.0f); mpRupeeParent[2]->setAlphaRate(0.0f); - static u64 const key_tag[] = {'key_nul', 'k_n_1_n', 'k_n_2_n', 'k_n_3_n', 'k_n_4_n'}; + static u64 const key_tag[] = {MULTI_CHAR('key_nul'), MULTI_CHAR('k_n_1_n'), MULTI_CHAR('k_n_2_n'), MULTI_CHAR('k_n_3_n'), MULTI_CHAR('k_n_4_n')}; for (int i = 0; i < 5; i++) { mpKeyTexture[i] = new CPaneMgr(mpScreen, key_tag[i], 0, NULL); @@ -946,7 +946,7 @@ void dMeter2Draw_c::initRupeeKey() { mpKeyTexture[i]->hide(); } - mpKeyParent = new CPaneMgr(mpScreen, 'key_n', 2, NULL); + mpKeyParent = new CPaneMgr(mpScreen, MULTI_CHAR('key_n'), 2, NULL); JUT_ASSERT(0, mpKeyParent != NULL); mpKeyParent->setAlphaRate(0.0f); @@ -988,7 +988,7 @@ void dMeter2Draw_c::initButton() { } } - mpItemB = new CPaneMgr(mpScreen, 'b_itm_p', 0, NULL); + mpItemB = new CPaneMgr(mpScreen, MULTI_CHAR('b_itm_p'), 0, NULL); JUT_ASSERT(0, mpItemB != NULL); mpItemB->getPanePtr()->setBasePosition(J2DBasePosition_4); mpItemB->show(); @@ -1003,19 +1003,19 @@ void dMeter2Draw_c::initButton() { field_0x771 = dComIfGs_getBButtonItemKey(); mpItemBPane = new J2DPicture( - 'b_itm_pp', + MULTI_CHAR('b_itm_pp'), JGeometry::TBox2(0.0f, 0.0f, mpItemB->getInitSizeX(), mpItemB->getInitSizeY()), static_cast(mpItemB->getPanePtr())->getTexture(0)->getTexInfo(), NULL); JUT_ASSERT(0, mpItemBPane != NULL); mpItemBPane->setBasePosition(J2DBasePosition_4); mpItemB->getPanePtr()->appendChild(mpItemBPane); - mpItemXY[0] = new CPaneMgr(mpScreen, 'x_itm_p', 0, NULL); + mpItemXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('x_itm_p'), 0, NULL); JUT_ASSERT(0, mpItemXY[0] != NULL); mpItemXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4); dMeter2Info_setMeterItemPanePtr(0, mpItemXY[0]); - mpItemXY[1] = new CPaneMgr(mpScreen, 'y_itm_p', 0, NULL); + mpItemXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('y_itm_p'), 0, NULL); JUT_ASSERT(0, mpItemXY[1] != NULL); mpItemXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4); dMeter2Info_setMeterItemPanePtr(1, mpItemXY[1]); @@ -1024,7 +1024,7 @@ void dMeter2Draw_c::initButton() { mpBTextA = NULL; mpItemXYPane[0] = new J2DPicture( - 'x_itm_pp', + MULTI_CHAR('x_itm_pp'), JGeometry::TBox2(0.0f, 0.0f, mpItemXY[0]->getInitSizeX(), mpItemXY[0]->getInitSizeY()), static_cast(mpItemXY[0]->getPanePtr())->getTexture(0)->getTexInfo(), NULL); JUT_ASSERT(0, mpItemXYPane[0] != NULL); @@ -1032,84 +1032,84 @@ void dMeter2Draw_c::initButton() { mpItemXY[0]->getPanePtr()->appendChild(mpItemXYPane[0]); mpItemXYPane[1] = new J2DPicture( - 'y_itm_pp', + MULTI_CHAR('y_itm_pp'), JGeometry::TBox2(0.0f, 0.0f, mpItemXY[1]->getInitSizeX(), mpItemXY[1]->getInitSizeY()), static_cast(mpItemXY[1]->getPanePtr())->getTexture(0)->getTexInfo(), NULL); JUT_ASSERT(0, mpItemXYPane[1] != NULL); mpItemXYPane[1]->setBasePosition(J2DBasePosition_4); mpItemXY[1]->getPanePtr()->appendChild(mpItemXYPane[1]); - mpItemR = new CPaneMgr(mpScreen, 'r_itm_p', 0, NULL); + mpItemR = new CPaneMgr(mpScreen, MULTI_CHAR('r_itm_p'), 0, NULL); JUT_ASSERT(0, mpItemR != NULL); mpItemR->getPanePtr()->setBasePosition(J2DBasePosition_4); dMeter2Info_setMeterItemPanePtr(2, mpItemR); mpItemXYPane[2] = new J2DPicture( - 'r_itm_pp', + MULTI_CHAR('r_itm_pp'), JGeometry::TBox2(0.0f, 0.0f, mpItemR->getInitSizeX(), mpItemR->getInitSizeY()), static_cast(mpItemR->getPanePtr())->getTexture(0)->getTexInfo(), NULL); JUT_ASSERT(0, mpItemXYPane[2] != NULL); mpItemXYPane[2]->setBasePosition(J2DBasePosition_4); mpItemR->getPanePtr()->appendChild(mpItemXYPane[2]); - mpLightB = new CPaneMgr(mpScreen, 'b_light', 0, NULL); + mpLightB = new CPaneMgr(mpScreen, MULTI_CHAR('b_light'), 0, NULL); JUT_ASSERT(0, mpLightB != NULL); mpLightB->getPanePtr()->setBasePosition(J2DBasePosition_4); field_0x72c = 1.0f; mpLightB->hide(); - mpLightXY[0] = new CPaneMgr(mpScreen, 'x_light', 0, NULL); + mpLightXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('x_light'), 0, NULL); JUT_ASSERT(0, mpLightXY[0] != NULL); mpLightXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpLightXY[0]->hide(); - mpLightXY[1] = new CPaneMgr(mpScreen, 'y_light', 0, NULL); + mpLightXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('y_light'), 0, NULL); JUT_ASSERT(0, mpLightXY[1] != NULL); mpLightXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpLightXY[1]->hide(); - mpLightXY[2] = new CPaneMgr(mpScreen, 'r_light', 0, NULL); + mpLightXY[2] = new CPaneMgr(mpScreen, MULTI_CHAR('r_light'), 0, NULL); JUT_ASSERT(0, mpLightXY[2] != NULL); mpLightXY[2]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpLightXY[2]->hide(); - mpBTextA = new CPaneMgr(mpScreen, 'b_text_a', 0, NULL); + mpBTextA = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_a'), 0, NULL); JUT_ASSERT(0, mpBTextA != NULL); - mpBTextB = new CPaneMgr(mpScreen, 'b_text_b', 0, NULL); + mpBTextB = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_b'), 0, NULL); JUT_ASSERT(0, mpBTextB != NULL); - mpBTextXY[0] = new CPaneMgr(mpScreen, 'b_text_x', 0, NULL); + mpBTextXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_x'), 0, NULL); JUT_ASSERT(0, mpBTextXY[0] != NULL); - mpBTextXY[1] = new CPaneMgr(mpScreen, 'b_text_y', 0, NULL); + mpBTextXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_y'), 0, NULL); JUT_ASSERT(0, mpBTextXY[1] != NULL); mpBTextXY[2] = NULL; - mpTextA = new CPaneMgr(mpScreen, 'a_text_n', 0, NULL); + mpTextA = new CPaneMgr(mpScreen, MULTI_CHAR('a_text_n'), 0, NULL); JUT_ASSERT(0, mpTextA != NULL); - mpTextB = new CPaneMgr(mpScreen, 'b_text_n', 0, NULL); + mpTextB = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_n'), 0, NULL); JUT_ASSERT(0, mpTextB != NULL); - mpTextXY[2] = new CPaneMgr(mpScreen, 'z_text_n', 0, NULL); + mpTextXY[2] = new CPaneMgr(mpScreen, MULTI_CHAR('z_text_n'), 0, NULL); JUT_ASSERT(0, mpTextXY[2] != NULL); - mpTextXY[0] = new CPaneMgr(mpScreen, 'x_text_n', 0, NULL); + mpTextXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('x_text_n'), 0, NULL); JUT_ASSERT(0, mpTextXY[0] != NULL); - mpTextXY[1] = new CPaneMgr(mpScreen, 'y_text_n', 0, NULL); + mpTextXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('y_text_n'), 0, NULL); JUT_ASSERT(0, mpTextXY[1] != NULL); - mpTextI = new CPaneMgr(mpScreen, 'i_text_n', 2, NULL); + mpTextI = new CPaneMgr(mpScreen, MULTI_CHAR('i_text_n'), 2, NULL); JUT_ASSERT(0, mpTextI != NULL); - mpTextM = new CPaneMgr(mpScreen, 'm_text_n', 2, NULL); + mpTextM = new CPaneMgr(mpScreen, MULTI_CHAR('m_text_n'), 2, NULL); JUT_ASSERT(0, mpTextM != NULL); - static u64 const juji_i_tag[] = {'ju_ring4', 'yaji_00', 'yaji_01', 'ju_ring2', 'ju_ring4'}; - static u64 const juji_m_tag[] = {'ju_ring3', 'yaji_02', 'yaji_03', 'ju_ring3', 0}; + static u64 const juji_i_tag[] = {MULTI_CHAR('ju_ring4'), MULTI_CHAR('yaji_00'), MULTI_CHAR('yaji_01'), MULTI_CHAR('ju_ring2'), MULTI_CHAR('ju_ring4')}; + static u64 const juji_m_tag[] = {MULTI_CHAR('ju_ring3'), MULTI_CHAR('yaji_02'), MULTI_CHAR('yaji_03'), MULTI_CHAR('ju_ring3'), 0}; for (int i = 0; i < 5; i++) { if (juji_i_tag[i] != 0) { @@ -1130,33 +1130,33 @@ void dMeter2Draw_c::initButton() { mpTextXY[0]->hide(); mpTextXY[1]->hide(); - mpButtonParent = new CPaneMgr(mpScreen, 'cont_n', 2, NULL); + mpButtonParent = new CPaneMgr(mpScreen, MULTI_CHAR('cont_n'), 2, NULL); JUT_ASSERT(0, mpButtonParent != NULL); - mpButtonA = new CPaneMgr(mpScreen, 'abtn_n', 2, NULL); + mpButtonA = new CPaneMgr(mpScreen, MULTI_CHAR('abtn_n'), 2, NULL); JUT_ASSERT(0, mpButtonA != NULL); - mpButtonB = new CPaneMgr(mpScreen, 'bbtn_n', 2, NULL); + mpButtonB = new CPaneMgr(mpScreen, MULTI_CHAR('bbtn_n'), 2, NULL); JUT_ASSERT(0, mpButtonB != NULL); field_0x730 = 1.0f; - mpButtonMidona = new CPaneMgr(mpScreen, 'midona_n', 2, NULL); + mpButtonMidona = new CPaneMgr(mpScreen, MULTI_CHAR('midona_n'), 2, NULL); JUT_ASSERT(0, mpButtonMidona != NULL); mButtonZAlpha = 0.0f; field_0x724 = 0.0f; field_0x738 = 0.0f; field_0x740 = 0; - mpButtonXY[0] = new CPaneMgr(mpScreen, 'xbtn_n', 2, NULL); + mpButtonXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('xbtn_n'), 2, NULL); JUT_ASSERT(0, mpButtonXY[0] != NULL); - mpButtonXY[1] = new CPaneMgr(mpScreen, 'ybtn_n', 2, NULL); + mpButtonXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('ybtn_n'), 2, NULL); JUT_ASSERT(0, mpButtonXY[1] != NULL); - mpButtonXY[2] = new CPaneMgr(mpScreen, 'zbtn_n', 2, NULL); + mpButtonXY[2] = new CPaneMgr(mpScreen, MULTI_CHAR('zbtn_n'), 2, NULL); JUT_ASSERT(0, mpButtonXY[2] != NULL); - mpUzu = new CPaneMgrAlpha(mpScreen, 'uzu_n', 2, NULL); + mpUzu = new CPaneMgrAlpha(mpScreen, MULTI_CHAR('uzu_n'), 2, NULL); JUT_ASSERT(0, mpUzu != NULL); ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( @@ -1173,7 +1173,7 @@ void dMeter2Draw_c::initButton() { for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { - field_0x524[i][j] = NULL; + field_0x524[i][j] = 0; } } @@ -1208,54 +1208,54 @@ void dMeter2Draw_c::initButton() { } void dMeter2Draw_c::initButtonCross() { - mpButtonCrossParent = new CPaneMgr(mpScreen, 'juji_n', 2, NULL); + mpButtonCrossParent = new CPaneMgr(mpScreen, MULTI_CHAR('juji_n'), 2, NULL); JUT_ASSERT(0, mpButtonCrossParent != NULL); - static_cast(mpScreen->search('cont_ju0'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('cont_ju1'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('cont_ju2'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('cont_ju3'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('cont_ju4'))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju0')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju1')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju2')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju3')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju4')))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('cont_ju0'))->setString(0x40, ""); - static_cast(mpScreen->search('cont_ju1'))->setString(0x40, ""); - static_cast(mpScreen->search('cont_ju2'))->setString(0x40, ""); - static_cast(mpScreen->search('cont_ju3'))->setString(0x40, ""); - static_cast(mpScreen->search('cont_ju4'))->setString(0x40, ""); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju0')))->setString(0x40, ""); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju1')))->setString(0x40, ""); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju2')))->setString(0x40, ""); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju3')))->setString(0x40, ""); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju4')))->setString(0x40, ""); dMeter2Info_getString( - 0x61, static_cast(mpScreen->search('cont_ju0'))->getStringPtr(), NULL); + 0x61, static_cast(mpScreen->search(MULTI_CHAR('cont_ju0')))->getStringPtr(), NULL); dMeter2Info_getString( - 0x61, static_cast(mpScreen->search('cont_ju1'))->getStringPtr(), NULL); + 0x61, static_cast(mpScreen->search(MULTI_CHAR('cont_ju1')))->getStringPtr(), NULL); dMeter2Info_getString( - 0x61, static_cast(mpScreen->search('cont_ju2'))->getStringPtr(), NULL); + 0x61, static_cast(mpScreen->search(MULTI_CHAR('cont_ju2')))->getStringPtr(), NULL); dMeter2Info_getString( - 0x61, static_cast(mpScreen->search('cont_ju3'))->getStringPtr(), NULL); + 0x61, static_cast(mpScreen->search(MULTI_CHAR('cont_ju3')))->getStringPtr(), NULL); dMeter2Info_getString( - 0x61, static_cast(mpScreen->search('cont_ju4'))->getStringPtr(), NULL); + 0x61, static_cast(mpScreen->search(MULTI_CHAR('cont_ju4')))->getStringPtr(), NULL); - static_cast(mpScreen->search('cont_ju5'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('cont_ju6'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('cont_ju7'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('cont_ju8'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('cont_ju9'))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju5')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju6')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju7')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju8')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju9')))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('cont_ju5'))->setString(0x40, ""); - static_cast(mpScreen->search('cont_ju6'))->setString(0x40, ""); - static_cast(mpScreen->search('cont_ju7'))->setString(0x40, ""); - static_cast(mpScreen->search('cont_ju8'))->setString(0x40, ""); - static_cast(mpScreen->search('cont_ju9'))->setString(0x40, ""); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju5')))->setString(0x40, ""); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju6')))->setString(0x40, ""); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju7')))->setString(0x40, ""); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju8')))->setString(0x40, ""); + static_cast(mpScreen->search(MULTI_CHAR('cont_ju9')))->setString(0x40, ""); dMeter2Info_getString( - 0x62, static_cast(mpScreen->search('cont_ju5'))->getStringPtr(), NULL); + 0x62, static_cast(mpScreen->search(MULTI_CHAR('cont_ju5')))->getStringPtr(), NULL); dMeter2Info_getString( - 0x62, static_cast(mpScreen->search('cont_ju6'))->getStringPtr(), NULL); + 0x62, static_cast(mpScreen->search(MULTI_CHAR('cont_ju6')))->getStringPtr(), NULL); dMeter2Info_getString( - 0x62, static_cast(mpScreen->search('cont_ju7'))->getStringPtr(), NULL); + 0x62, static_cast(mpScreen->search(MULTI_CHAR('cont_ju7')))->getStringPtr(), NULL); dMeter2Info_getString( - 0x62, static_cast(mpScreen->search('cont_ju8'))->getStringPtr(), NULL); + 0x62, static_cast(mpScreen->search(MULTI_CHAR('cont_ju8')))->getStringPtr(), NULL); dMeter2Info_getString( - 0x62, static_cast(mpScreen->search('cont_ju9'))->getStringPtr(), NULL); + 0x62, static_cast(mpScreen->search(MULTI_CHAR('cont_ju9')))->getStringPtr(), NULL); mpButtonCrossParent->setAlphaRate(0.0f); drawButtonCross(g_drawHIO.mButtonCrossOFFPosX, g_drawHIO.mButtonCrossOFFPosY); @@ -1269,9 +1269,9 @@ void dMeter2Draw_c::playPikariBckAnimation(f32 i_frame) { } void dMeter2Draw_c::setPikariBpkAnimation(J2DAnmColor* i_bpk) { - mpPikariScreen->search('pika00')->setAnimation(i_bpk); - mpPikariScreen->search('moya00')->setAnimation(i_bpk); - mpPikariScreen->search('moyabs')->setAnimation(i_bpk); + mpPikariScreen->search(MULTI_CHAR('pika00'))->setAnimation(i_bpk); + mpPikariScreen->search(MULTI_CHAR('moya00'))->setAnimation(i_bpk); + mpPikariScreen->search(MULTI_CHAR('moyabs'))->setAnimation(i_bpk); } void dMeter2Draw_c::playPikariBpkAnimation(f32 i_frame) { @@ -1283,18 +1283,18 @@ void dMeter2Draw_c::playPikariBpkAnimation(f32 i_frame) { void dMeter2Draw_c::playOxygenBpkAnimation(J2DAnmColor* i_bpk) { if (i_bpk == NULL || mpMagicMeter->getAlpha() == 0) { - mpKanteraScreen->search('mm_00')->setAnimation((J2DAnmColor*)NULL); + mpKanteraScreen->search(MULTI_CHAR('mm_00'))->setAnimation((J2DAnmColor*)NULL); } else { field_0x558++; if (field_0x558 >= i_bpk->getFrameMax()) { field_0x558 -= i_bpk->getFrameMax(); } - mpKanteraScreen->search('mm_00')->setAnimation(i_bpk); + mpKanteraScreen->search(MULTI_CHAR('mm_00'))->setAnimation(i_bpk); i_bpk->setFrame(field_0x558); mpKanteraScreen->animation(); - mpKanteraScreen->search('mm_00')->setAnimation((J2DAnmColor*)NULL); + mpKanteraScreen->search(MULTI_CHAR('mm_00'))->setAnimation((J2DAnmColor*)NULL); } } @@ -1315,20 +1315,20 @@ void dMeter2Draw_c::drawPikari(f32 i_posX, f32 i_posY, f32* i_framep, f32 i_scal if (param_9 == 4) { var_f31 = 24.0f; - if (mpPikariScreen->search('moya00')->isVisible()) { - mpPikariScreen->search('moya00')->hide(); + if (mpPikariScreen->search(MULTI_CHAR('moya00'))->isVisible()) { + mpPikariScreen->search(MULTI_CHAR('moya00'))->hide(); } - if (mpPikariScreen->search('moyabs')->isVisible()) { - mpPikariScreen->search('moyabs')->hide(); + if (mpPikariScreen->search(MULTI_CHAR('moyabs'))->isVisible()) { + mpPikariScreen->search(MULTI_CHAR('moyabs'))->hide(); } } else { - if (!mpPikariScreen->search('moya00')->isVisible()) { - mpPikariScreen->search('moya00')->show(); + if (!mpPikariScreen->search(MULTI_CHAR('moya00'))->isVisible()) { + mpPikariScreen->search(MULTI_CHAR('moya00'))->show(); } - if (!mpPikariScreen->search('moyabs')->isVisible()) { - mpPikariScreen->search('moyabs')->show(); + if (!mpPikariScreen->search(MULTI_CHAR('moyabs'))->isVisible()) { + mpPikariScreen->search(MULTI_CHAR('moyabs'))->show(); } } @@ -1357,21 +1357,21 @@ void dMeter2Draw_c::drawPikari(f32 i_posX, f32 i_posY, f32* i_framep, f32 i_scal mpPikariParent->scale(i_scale * mpPikariParent->getScaleX(), i_scale * mpPikariParent->getScaleY()); - if (mpPikariScreen->search('moya00')->isVisible()) { - static_cast(mpPikariScreen->search('moya00')) + if (mpPikariScreen->search(MULTI_CHAR('moya00'))->isVisible()) { + static_cast(mpPikariScreen->search(MULTI_CHAR('moya00'))) ->setBlackWhite(i_moyaBlack, i_moyaWhite); } - if (mpPikariScreen->search('moyabs')->isVisible()) { - static_cast(mpPikariScreen->search('moyabs')) + if (mpPikariScreen->search(MULTI_CHAR('moyabs'))->isVisible()) { + static_cast(mpPikariScreen->search(MULTI_CHAR('moyabs'))) ->setBlackWhite(i_moyabsBlack, i_moyabsWhite); } if (param_9 != 4) { - static_cast(mpPikariScreen->search('pika00')) + static_cast(mpPikariScreen->search(MULTI_CHAR('pika00'))) ->setBlackWhite(mPikariBlack, mPikariBlack); } else { - static_cast(mpPikariScreen->search('pika00')) + static_cast(mpPikariScreen->search(MULTI_CHAR('pika00'))) ->setBlackWhite(g_MsgObject_HIO_c.mPikariPikaR1, g_MsgObject_HIO_c.mPikariPikaR0); } @@ -1390,9 +1390,9 @@ void dMeter2Draw_c::drawPikariHakusha(f32 i_posX, f32 i_posY, f32 i_frame, f32 i mpPikariParent->scale(i_scale * mpPikariParent->getScaleX(), i_scale * mpPikariParent->getScaleY()); - static_cast(mpPikariScreen->search('moya00')) + static_cast(mpPikariScreen->search(MULTI_CHAR('moya00'))) ->setBlackWhite(i_moyaBlack, i_moyaWhite); - static_cast(mpPikariScreen->search('moyabs')) + static_cast(mpPikariScreen->search(MULTI_CHAR('moyabs'))) ->setBlackWhite(i_moyabsBlack, i_moyabsWhite); mpPikariScreen->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort()); @@ -1407,7 +1407,7 @@ void dMeter2Draw_c::changeTextureLife(int i_no, bool param_1, u8 i_quarterNum) { mpLifeTexture[i_no][0]->hide(); mpLifeTexture[i_no][1]->hide(); - static u64 const tag_bigh[] = {'bigh_00', 'bigh_01', 'bigh_02', 'bigh_03'}; + static u64 const tag_bigh[] = {MULTI_CHAR('bigh_00'), MULTI_CHAR('bigh_01'), MULTI_CHAR('bigh_02'), MULTI_CHAR('bigh_03')}; for (int i = 0; i < 4; i++) { if (i == i_quarterNum) { @@ -1417,7 +1417,7 @@ void dMeter2Draw_c::changeTextureLife(int i_no, bool param_1, u8 i_quarterNum) { } } - static u64 const tag_du[] = {'heart_ln', 'heart_un'}; + static u64 const tag_du[] = {MULTI_CHAR('heart_ln'), MULTI_CHAR('heart_un')}; mpBigHeart->translate(mpLifeParts[i_no]->getTranslateX() + (mpScreen->search(tag_du[i_no / 10])->getTranslateX() - @@ -2295,7 +2295,7 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos } if (i_action == 0x26 || i_action == 0x2E) { - mpScreen->search('item_b_n')->show(); + mpScreen->search(MULTI_CHAR('item_b_n'))->show(); var_r31 = 1; if (mButtonBItem != dComIfGs_getSelectEquipSword()) { @@ -2309,17 +2309,17 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos changeTextureItemB(mButtonBItem); break; default: - mpScreen->search('item_b_n')->hide(); + mpScreen->search(MULTI_CHAR('item_b_n'))->hide(); var_r31 = 0; } } } else if (param_1 == true && i_action == 0x4F) { - mpScreen->search('item_b_n')->show(); + mpScreen->search(MULTI_CHAR('item_b_n'))->show(); mButtonBItem = fpcNm_ITEM_LURE_ROD; changeTextureItemB(fpcNm_ITEM_LURE_ROD); var_r31 = 2; } else { - mpScreen->search('item_b_n')->hide(); + mpScreen->search(MULTI_CHAR('item_b_n'))->hide(); } mpItemB->getPanePtr()->rotate(mpItemB->getSizeX() * 0.5f, mpItemB->getSizeY() * 0.5f, ROTATE_Z, @@ -2344,7 +2344,7 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos } void dMeter2Draw_c::drawButtonR(u8 unused0, u8 i_action, bool unused1, bool unused2) { - mpScreen->search('item_r_n')->hide(); + mpScreen->search(MULTI_CHAR('item_r_n'))->hide(); mpTextXY[2]->show(); getActionString(i_action, 1, &field_0x768[2]); @@ -2431,7 +2431,7 @@ void dMeter2Draw_c::drawButtonBin(u8 i_action) { void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_3, bool param_4) { JUT_ASSERT(0, i_no < SELECT_MAX_e); - static u64 const tag[] = {'item_x_n', 'item_y_n'}; + static u64 const tag[] = {MULTI_CHAR('item_x_n'), MULTI_CHAR('item_y_n')}; if (!param_3) { mpScreen->search(tag[i_no])->hide(); @@ -3926,7 +3926,7 @@ s16 dMeter2Draw_c::getButtonTimer() { // unused static u64 const tag_7759[] = { - 'item_x_n', - 'item_y_n', - 'item_j_n', + MULTI_CHAR('item_x_n'), + MULTI_CHAR('item_y_n'), + MULTI_CHAR('item_j_n'), }; diff --git a/src/d/d_meter_button.cpp b/src/d/d_meter_button.cpp index 82be060e441..21f027c11d9 100644 --- a/src/d/d_meter_button.cpp +++ b/src/d/d_meter_button.cpp @@ -142,42 +142,42 @@ int dMeterButton_c::_execute(u32 i_flags, bool i_drawA, bool i_drawB, bool i_dra u8 dir_3D = dComIfGp_get3DDirection(); if (dir_3D & DIR_LEFT_e) { - if (!mpButtonScreen->search('yaji_l_n')->isVisible()) { - mpButtonScreen->search('yaji_l_n')->show(); + if (!mpButtonScreen->search(MULTI_CHAR('yaji_l_n'))->isVisible()) { + mpButtonScreen->search(MULTI_CHAR('yaji_l_n'))->show(); } } else { - if (mpButtonScreen->search('yaji_l_n')->isVisible() == true) { - mpButtonScreen->search('yaji_l_n')->hide(); + if (mpButtonScreen->search(MULTI_CHAR('yaji_l_n'))->isVisible() == true) { + mpButtonScreen->search(MULTI_CHAR('yaji_l_n'))->hide(); } } if (dir_3D & DIR_UP_e) { - if (!mpButtonScreen->search('yaji_u_n')->isVisible()) { - mpButtonScreen->search('yaji_u_n')->show(); + if (!mpButtonScreen->search(MULTI_CHAR('yaji_u_n'))->isVisible()) { + mpButtonScreen->search(MULTI_CHAR('yaji_u_n'))->show(); } } else { - if (mpButtonScreen->search('yaji_u_n')->isVisible() == true) { - mpButtonScreen->search('yaji_u_n')->hide(); + if (mpButtonScreen->search(MULTI_CHAR('yaji_u_n'))->isVisible() == true) { + mpButtonScreen->search(MULTI_CHAR('yaji_u_n'))->hide(); } } if (dir_3D & DIR_DOWN_e) { - if (!mpButtonScreen->search('yaji_d_n')->isVisible()) { - mpButtonScreen->search('yaji_d_n')->show(); + if (!mpButtonScreen->search(MULTI_CHAR('yaji_d_n'))->isVisible()) { + mpButtonScreen->search(MULTI_CHAR('yaji_d_n'))->show(); } } else { - if (mpButtonScreen->search('yaji_d_n')->isVisible() == true) { - mpButtonScreen->search('yaji_d_n')->hide(); + if (mpButtonScreen->search(MULTI_CHAR('yaji_d_n'))->isVisible() == true) { + mpButtonScreen->search(MULTI_CHAR('yaji_d_n'))->hide(); } } if (dir_3D & DIR_RIGHT_e) { - if (!mpButtonScreen->search('yaji_r_n')->isVisible()) { - mpButtonScreen->search('yaji_r_n')->show(); + if (!mpButtonScreen->search(MULTI_CHAR('yaji_r_n'))->isVisible()) { + mpButtonScreen->search(MULTI_CHAR('yaji_r_n'))->show(); } } else { - if (mpButtonScreen->search('yaji_r_n')->isVisible() == true) { - mpButtonScreen->search('yaji_r_n')->hide(); + if (mpButtonScreen->search(MULTI_CHAR('yaji_r_n'))->isVisible() == true) { + mpButtonScreen->search(MULTI_CHAR('yaji_r_n'))->hide(); } } } @@ -186,39 +186,39 @@ int dMeterButton_c::_execute(u32 i_flags, bool i_drawA, bool i_drawB, bool i_dra u8 dir_c = dComIfGp_getCStickDirection(); if (dir_c & DIR_LEFT_e) { - if (!mpButtonScreen->search('yaji_ln')->isVisible()) { - mpButtonScreen->search('yaji_ln')->show(); + if (!mpButtonScreen->search(MULTI_CHAR('yaji_ln'))->isVisible()) { + mpButtonScreen->search(MULTI_CHAR('yaji_ln'))->show(); } } else { - if (mpButtonScreen->search('yaji_ln')->isVisible() == true) { - mpButtonScreen->search('yaji_ln')->hide(); + if (mpButtonScreen->search(MULTI_CHAR('yaji_ln'))->isVisible() == true) { + mpButtonScreen->search(MULTI_CHAR('yaji_ln'))->hide(); } } if (dir_c & DIR_UP_e) { - if (!mpButtonScreen->search('yaji_un')->isVisible()) { - mpButtonScreen->search('yaji_un')->show(); + if (!mpButtonScreen->search(MULTI_CHAR('yaji_un'))->isVisible()) { + mpButtonScreen->search(MULTI_CHAR('yaji_un'))->show(); } } else { - if (mpButtonScreen->search('yaji_un')->isVisible() == true) { - mpButtonScreen->search('yaji_un')->hide(); + if (mpButtonScreen->search(MULTI_CHAR('yaji_un'))->isVisible() == true) { + mpButtonScreen->search(MULTI_CHAR('yaji_un'))->hide(); } } if (dir_c & DIR_DOWN_e) { - if (!mpButtonScreen->search('yaji_dn')->isVisible()) { - mpButtonScreen->search('yaji_dn')->show(); + if (!mpButtonScreen->search(MULTI_CHAR('yaji_dn'))->isVisible()) { + mpButtonScreen->search(MULTI_CHAR('yaji_dn'))->show(); } - } else if (mpButtonScreen->search('yaji_dn')->isVisible() == true) { - mpButtonScreen->search('yaji_dn')->hide(); + } else if (mpButtonScreen->search(MULTI_CHAR('yaji_dn'))->isVisible() == true) { + mpButtonScreen->search(MULTI_CHAR('yaji_dn'))->hide(); } if (dir_c & DIR_RIGHT_e) { - if (!mpButtonScreen->search('yaji_rn')->isVisible()) { - mpButtonScreen->search('yaji_rn')->show(); + if (!mpButtonScreen->search(MULTI_CHAR('yaji_rn'))->isVisible()) { + mpButtonScreen->search(MULTI_CHAR('yaji_rn'))->show(); } - } else if (mpButtonScreen->search('yaji_rn')->isVisible() == true) { - mpButtonScreen->search('yaji_rn')->hide(); + } else if (mpButtonScreen->search(MULTI_CHAR('yaji_rn'))->isVisible() == true) { + mpButtonScreen->search(MULTI_CHAR('yaji_rn'))->hide(); } } @@ -987,13 +987,13 @@ bool dMeterButton_c::alphaAnimeButtonBin(u32 i_flags, bool i_drawButton) { void dMeterButton_c::screenInitButton() { static u64 const text_tag[] = { - 'info_ar0', 'info_ar1', 'info_ar2', 'info_ar3', 'info_ar4', - 'info_ar5', 'info_ar6', 'info_ar7', 'info_ar8', 'info_ar9', + MULTI_CHAR('info_ar0'), MULTI_CHAR('info_ar1'), MULTI_CHAR('info_ar2'), MULTI_CHAR('info_ar3'), MULTI_CHAR('info_ar4'), + MULTI_CHAR('info_ar5'), MULTI_CHAR('info_ar6'), MULTI_CHAR('info_ar7'), MULTI_CHAR('info_ar8'), MULTI_CHAR('info_ar9'), }; static u64 const ftext_tag[] = { - 'fnfo_ar0', 'fnfo_ar1', 'fnfo_ar2', 'fnfo_ar3', 'fnfo_ar4', - 'fnfo_ar5', 'fnfo_ar6', 'fnfo_ar7', 'fnfo_ar8', 'fnfo_ar9', + MULTI_CHAR('fnfo_ar0'), MULTI_CHAR('fnfo_ar1'), MULTI_CHAR('fnfo_ar2'), MULTI_CHAR('fnfo_ar3'), MULTI_CHAR('fnfo_ar4'), + MULTI_CHAR('fnfo_ar5'), MULTI_CHAR('fnfo_ar6'), MULTI_CHAR('fnfo_ar7'), MULTI_CHAR('fnfo_ar8'), MULTI_CHAR('fnfo_ar9'), }; OS_REPORT("enter dMeterButton_c::screenInitButton\n"); @@ -1013,7 +1013,7 @@ void dMeterButton_c::screenInitButton() { dPaneClass_showNullPane(mpButtonScreen); field_0x00c = NULL; - mpParent = new CPaneMgr(mpButtonScreen, 'info_n', 0, NULL); + mpParent = new CPaneMgr(mpButtonScreen, MULTI_CHAR('info_n'), 0, NULL); if (mpParent == NULL) OS_REPORT("[%s] %d\n", __FILE__, 1867); JUT_ASSERT(1868, mpParent != NULL); @@ -1038,7 +1038,7 @@ void dMeterButton_c::screenInitButton() { mParentCenterX = (608.0f / 2) - mpParent->getInitCenterPosX(); paneTrans(mpParent, mParentCenterX, 0.0f, 0xFF); - mpButtonA = new CPaneMgr(mpButtonScreen, 'abtn_n', 2, NULL); + mpButtonA = new CPaneMgr(mpButtonScreen, MULTI_CHAR('abtn_n'), 2, NULL); if (mpButtonA == NULL) { OS_REPORT("[%s] %d\n", __FILE__, 1902); } @@ -1046,7 +1046,7 @@ void dMeterButton_c::screenInitButton() { mpButtonA->setAlphaRate(0.0f); mpButtonA->show(); - mpButtonB = new CPaneMgr(mpButtonScreen, 'bbtn_n', 2, NULL); + mpButtonB = new CPaneMgr(mpButtonScreen, MULTI_CHAR('bbtn_n'), 2, NULL); if (mpButtonB == NULL) { OS_REPORT("[%s] %d\n", __FILE__, 1914); } @@ -1054,7 +1054,7 @@ void dMeterButton_c::screenInitButton() { mpButtonB->setAlphaRate(0.0f); mpButtonB->show(); - mpButtonR = new CPaneMgr(mpButtonScreen, 'rbtn_n', 2, NULL); + mpButtonR = new CPaneMgr(mpButtonScreen, MULTI_CHAR('rbtn_n'), 2, NULL); if (mpButtonR == NULL) { OS_REPORT("[%s] %d\n", __FILE__, 1932); } @@ -1062,7 +1062,7 @@ void dMeterButton_c::screenInitButton() { mpButtonR->setAlphaRate(0.0f); mpButtonR->show(); - mpMidona = new CPaneMgr(mpButtonScreen, 'midona', 0, NULL); + mpMidona = new CPaneMgr(mpButtonScreen, MULTI_CHAR('midona'), 0, NULL); JUT_ASSERT(1939, mpMidona != NULL); if (mpMidona == NULL) { OS_REPORT("[%s] %d\n", __FILE__, 1941); @@ -1074,12 +1074,12 @@ void dMeterButton_c::screenInitButton() { #if DEBUG if (mpButtonScreen->search('zbtn') == 0) OS_REPORT("[%s] %d\n", __FILE__, 1947); - if (mpButtonScreen->search('z_btnl') == 0) OS_REPORT("[%s] %d\n", __FILE__, 1948); + if (mpButtonScreen->search(MULTI_CHAR('z_btnl')) == 0) OS_REPORT("[%s] %d\n", __FILE__, 1948); #endif mpButtonScreen->search('zbtn')->show(); - mpButtonScreen->search('z_btnl')->show(); + mpButtonScreen->search(MULTI_CHAR('z_btnl'))->show(); - mpButtonZ = new CPaneMgr(mpButtonScreen, 'zbtn_n', 2, NULL); + mpButtonZ = new CPaneMgr(mpButtonScreen, MULTI_CHAR('zbtn_n'), 2, NULL); if (mpButtonZ == NULL) { OS_REPORT("[%s] %d\n", __FILE__, 1954); } @@ -1087,35 +1087,35 @@ void dMeterButton_c::screenInitButton() { mpButtonZ->setAlphaRate(0.0f); mpButtonZ->show(); - mpButton3D = new CPaneMgr(mpButtonScreen, 'asbtn_n', 2, NULL); + mpButton3D = new CPaneMgr(mpButtonScreen, MULTI_CHAR('asbtn_n'), 2, NULL); JUT_ASSERT(1964, mpButton3D != NULL); mpButton3D->setAlphaRate(0.0f); mpButton3D->show(); - mpButtonScreen->search('yaji_l_n')->hide(); - mpButtonScreen->search('yaji_u_n')->hide(); - mpButtonScreen->search('yaji_d_n')->hide(); - mpButtonScreen->search('yaji_r_n')->hide(); + mpButtonScreen->search(MULTI_CHAR('yaji_l_n'))->hide(); + mpButtonScreen->search(MULTI_CHAR('yaji_u_n'))->hide(); + mpButtonScreen->search(MULTI_CHAR('yaji_d_n'))->hide(); + mpButtonScreen->search(MULTI_CHAR('yaji_r_n'))->hide(); - mpButtonC = new CPaneMgr(mpButtonScreen, 'cbtn_n', 2, NULL); + mpButtonC = new CPaneMgr(mpButtonScreen, MULTI_CHAR('cbtn_n'), 2, NULL); JUT_ASSERT(1992, mpButtonC != NULL); mpButtonC->setAlphaRate(0.0f); mpButtonC->show(); - mpButtonScreen->search('yaji_ln')->hide(); - mpButtonScreen->search('yaji_un')->hide(); - mpButtonScreen->search('yaji_dn')->hide(); - mpButtonScreen->search('yaji_rn')->hide(); + mpButtonScreen->search(MULTI_CHAR('yaji_ln'))->hide(); + mpButtonScreen->search(MULTI_CHAR('yaji_un'))->hide(); + mpButtonScreen->search(MULTI_CHAR('yaji_dn'))->hide(); + mpButtonScreen->search(MULTI_CHAR('yaji_rn'))->hide(); - mpButtonS = new CPaneMgr(mpButtonScreen, 'sbtn_n', 2, NULL); + mpButtonS = new CPaneMgr(mpButtonScreen, MULTI_CHAR('sbtn_n'), 2, NULL); JUT_ASSERT(2002, mpButtonS != NULL); mpButtonS->setAlphaRate(0.0f); - mpButtonX = new CPaneMgr(mpButtonScreen, 'xbtn_n', 2, NULL); + mpButtonX = new CPaneMgr(mpButtonScreen, MULTI_CHAR('xbtn_n'), 2, NULL); JUT_ASSERT(2048, mpButtonX != NULL); mpButtonX->setAlphaRate(0.0f); - mpButtonY = new CPaneMgr(mpButtonScreen, 'ybtn_n', 2, NULL); + mpButtonY = new CPaneMgr(mpButtonScreen, MULTI_CHAR('ybtn_n'), 2, NULL); JUT_ASSERT(2052, mpButtonY != NULL); mpButtonY->setAlphaRate(0.0f); @@ -1124,7 +1124,7 @@ void dMeterButton_c::screenInitButton() { mpButtonRemo2 = NULL; mpButtonAR = NULL; - mpButton3DB = new CPaneMgr(mpButtonScreen, 'as_b_n', 2, NULL); + mpButton3DB = new CPaneMgr(mpButtonScreen, MULTI_CHAR('as_b_n'), 2, NULL); JUT_ASSERT(2060, mpButton3DB != NULL); mpButton3DB->setAlphaRate(0.0f); @@ -1136,19 +1136,19 @@ void dMeterButton_c::screenInitButton() { mpButtonNunZ = NULL; mpButtonNunC = NULL; - mpButtonBin = new CPaneMgr(mpButtonScreen, 'bottl_n', 2, NULL); + mpButtonBin = new CPaneMgr(mpButtonScreen, MULTI_CHAR('bottl_n'), 2, NULL); JUT_ASSERT(2071, mpButtonBin != NULL); mpButtonBin->setAlphaRate(0.0f); - mpText[0] = new CPaneMgr(mpButtonScreen, 'text_n', 2, NULL); + mpText[0] = new CPaneMgr(mpButtonScreen, MULTI_CHAR('text_n'), 2, NULL); JUT_ASSERT(2075, mpText[0] != NULL); mpText[0]->setAlphaRate(0.0f); - mpText[1] = new CPaneMgr(mpButtonScreen, 'text2_n', 2, NULL); + mpText[1] = new CPaneMgr(mpButtonScreen, MULTI_CHAR('text2_n'), 2, NULL); JUT_ASSERT(2079, mpText[1] != NULL); mpText[1]->setAlphaRate(0.0f); - mpItem_c = new CPaneMgr(mpButtonScreen, 'fishing', 0, NULL); + mpItem_c = new CPaneMgr(mpButtonScreen, MULTI_CHAR('fishing'), 0, NULL); JUT_ASSERT(2083, mpItem_c != NULL); mpItem_c->setAlphaRate(0.0f); @@ -1215,8 +1215,8 @@ void dMeterButton_c::screenInitButton() { Mtx m, m2; Vec sp108 = pane.getGlobalVtx(mpButtonScreen->search('zbtn'), &m, 0, false, 0); Vec spFC = pane.getGlobalVtx(mpButtonScreen->search('zbtn'), &m, 3, false, 0); - Vec spF0 = pane.getGlobalVtx(mpButtonScreen->search('midona'), &m2, 0, false, 0); - Vec spE4 = pane.getGlobalVtx(mpButtonScreen->search('midona'), &m2, 3, false, 0); + Vec spF0 = pane.getGlobalVtx(mpButtonScreen->search(MULTI_CHAR('midona')), &m2, 0, false, 0); + Vec spE4 = pane.getGlobalVtx(mpButtonScreen->search(MULTI_CHAR('midona')), &m2, 3, false, 0); f32 var_f2; if (sp108.x > spF0.x) { @@ -1412,18 +1412,18 @@ void dMeterButton_c::screenInitText() { JUT_ASSERT(2457, fg != false); dPaneClass_showNullPane(mpScreen); - mpFkAll_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + mpFkAll_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); OS_REPORT("[%s] %d\n", __FILE__, 2461); JUT_ASSERT(2462, mpFkAll_c != NULL); mpFkAll_c->setAlphaRate(0.0f); OS_REPORT("[%s] %d\n", __FILE__, 2465); - mpScreen->search('mg_null')->move( - g_MsgObject_HIO_c.mTextPosX + mpScreen->search('mg_null')->getBounds().i.x, - g_MsgObject_HIO_c.mTextPosY + mpScreen->search('mg_null')->getBounds().i.y); + mpScreen->search(MULTI_CHAR('mg_null'))->move( + g_MsgObject_HIO_c.mTextPosX + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.x, + g_MsgObject_HIO_c.mTextPosY + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.y); OS_REPORT("[%s] %d\n", __FILE__, 2469); - mpFkRoot_c = new CPaneMgr(mpScreen, 'mg_null', 0, NULL); + mpFkRoot_c = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(2472, mpFkRoot_c != NULL); OS_REPORT("[%s] %d\n", __FILE__, 2474); @@ -1441,24 +1441,24 @@ void dMeterButton_c::screenInitText() { dPaneClass_showNullPane(mpTextScreen); OS_REPORT("[%s] %d\n", __FILE__, 2496); - mpTmRoot_c = new CPaneMgr(mpTextScreen, 'mg_null', 0, NULL); + mpTmRoot_c = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(2499, mpTmRoot_c != NULL); #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptRuby() == 0) { - mpTm_c[0] = new CPaneMgr(mpTextScreen, 'mg_3flin', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3flin'), 0, NULL); - mpTm_c[1] = new CPaneMgr(mpTextScreen, 't3f_s', 0, NULL); + mpTm_c[1] = new CPaneMgr(mpTextScreen, MULTI_CHAR('t3f_s'), 0, NULL); - field_0x0ec[0] = new CPaneMgr(mpTextScreen, 'mg_3f', 0, NULL); + field_0x0ec[0] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3f'), 0, NULL); - field_0x0ec[1] = new CPaneMgr(mpTextScreen, 'mg_3f_s', 0, NULL); + field_0x0ec[1] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); - mpTextScreen->search('n_3line')->hide(); - mpTextScreen->search('n_3fline')->show(); - mpTextScreen->search('n_e4line')->hide(); + mpTextScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpTextScreen->search(MULTI_CHAR('n_3fline'))->show(); + mpTextScreen->search(MULTI_CHAR('n_e4line'))->hide(); } else { - mpTm_c[0] = new CPaneMgr(mpTextScreen, 'mg_3line', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3line'), 0, NULL); mpTm_c[1] = new CPaneMgr(mpTextScreen, 't3_s', 0, NULL); @@ -1466,12 +1466,12 @@ void dMeterButton_c::screenInitText() { field_0x0ec[1] = NULL; OS_REPORT("[%s] %d\n", __FILE__, __LINE__); - mpTextScreen->search('n_3line')->show(); - mpTextScreen->search('n_3fline')->hide(); - mpTextScreen->search('n_e4line')->hide(); + mpTextScreen->search(MULTI_CHAR('n_3line'))->show(); + mpTextScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpTextScreen->search(MULTI_CHAR('n_e4line'))->hide(); } #else - mpTm_c[0] = new CPaneMgr(mpTextScreen, 'mg_e4lin', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); JUT_ASSERT(2504, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpTextScreen, 't4_s', 0, NULL); @@ -1482,9 +1482,9 @@ void dMeterButton_c::screenInitText() { OS_REPORT("[%s] %d\n", __FILE__, 2512); - mpTextScreen->search('n_3line')->hide(); - mpTextScreen->search('n_3fline')->hide(); - mpTextScreen->search('n_e4line')->show(); + mpTextScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpTextScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpTextScreen->search(MULTI_CHAR('n_e4line'))->show(); #endif OS_REPORT("[%s] %d\n", __FILE__, 2554); @@ -3046,7 +3046,7 @@ f32 dMeterButton_c::getCenterPosCalc(u8 i_button, char* i_string, int param_2) { (mTextScale[param_2] * dMeter2Info_getStringLength(mpTextBox[0], i_string)) * temp_f0; if (field_0x4d9 == param_2 && field_0x4be[param_2] == 1) { - field_0x1e4[param_2] = mButtonBScale * mpButtonScreen->search('fishing')->getWidth(); + field_0x1e4[param_2] = mButtonBScale * mpButtonScreen->search(MULTI_CHAR('fishing'))->getWidth(); } field_0x29c[param_2] = field_0x1e4[param_2]; @@ -3059,15 +3059,15 @@ f32 dMeterButton_c::getCenterPosCalc(u8 i_button, char* i_string, int param_2) { switch (i_button) { case BUTTON_A_e: - mButtonWidth[i_button] = mButtonAScale * mpButtonScreen->search('a_btn1')->getWidth(); + mButtonWidth[i_button] = mButtonAScale * mpButtonScreen->search(MULTI_CHAR('a_btn1'))->getWidth(); field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button]; break; case BUTTON_B_e: - mButtonWidth[i_button] = mButtonBScale * mpButtonScreen->search('b_btn')->getWidth(); + mButtonWidth[i_button] = mButtonBScale * mpButtonScreen->search(MULTI_CHAR('b_btn'))->getWidth(); field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button]; break; case BUTTON_R_e: - mButtonWidth[i_button] = mButtonRScale * mpButtonScreen->search('r_btn_b')->getWidth(); + mButtonWidth[i_button] = mButtonRScale * mpButtonScreen->search(MULTI_CHAR('r_btn_b'))->getWidth(); field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button]; break; case BUTTON_Z_e: @@ -3077,8 +3077,8 @@ f32 dMeterButton_c::getCenterPosCalc(u8 i_button, char* i_string, int param_2) { Mtx m, m2; Vec sp124 = pane.getGlobalVtx(mpButtonScreen->search('zbtn'), &m, 0, false, 0); Vec sp130 = pane.getGlobalVtx(mpButtonScreen->search('zbtn'), &m, 3, false, 0); - Vec sp13C = pane.getGlobalVtx(mpButtonScreen->search('midona'), &m2, 0, false, 0); - Vec sp148 = pane.getGlobalVtx(mpButtonScreen->search('midona'), &m2, 3, false, 0); + Vec sp13C = pane.getGlobalVtx(mpButtonScreen->search(MULTI_CHAR('midona')), &m2, 0, false, 0); + Vec sp148 = pane.getGlobalVtx(mpButtonScreen->search(MULTI_CHAR('midona')), &m2, 3, false, 0); f32 var_f2; if (sp124.x > sp13C.x) { @@ -3100,47 +3100,47 @@ f32 dMeterButton_c::getCenterPosCalc(u8 i_button, char* i_string, int param_2) { field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button]; break; case BUTTON_3D_e: - mButtonWidth[i_button] = mButton3DScale * mpButtonScreen->search('as_btn1')->getWidth(); + mButtonWidth[i_button] = mButton3DScale * mpButtonScreen->search(MULTI_CHAR('as_btn1'))->getWidth(); if (dComIfGp_get3DDirection() & DIR_LEFT_e) { - mButtonWidth[i_button] += mButton3DScale * mpButtonScreen->search('yaji04')->getWidth(); + mButtonWidth[i_button] += mButton3DScale * mpButtonScreen->search(MULTI_CHAR('yaji04'))->getWidth(); } if (dComIfGp_get3DDirection() & DIR_RIGHT_e) { - mButtonWidth[i_button] += mButton3DScale * mpButtonScreen->search('yaji02')->getWidth(); + mButtonWidth[i_button] += mButton3DScale * mpButtonScreen->search(MULTI_CHAR('yaji02'))->getWidth(); } field_0x304[i_button] = 0.0f; break; case BUTTON_C_e: if (dComIfGp_checkCameraAttentionStatus(0, 8)) { - mButtonWidth[i_button] = mButtonCScale * mpButtonScreen->search('c_btn')->getWidth(); + mButtonWidth[i_button] = mButtonCScale * mpButtonScreen->search(MULTI_CHAR('c_btn'))->getWidth(); field_0x304[i_button] = 0.0f; } else { mButtonWidth[i_button] = - mButtonCScale * (mpButtonScreen->search('yaji_rn')->getWidth() + - mpButtonScreen->search('c_btn')->getWidth()); + mButtonCScale * (mpButtonScreen->search(MULTI_CHAR('yaji_rn'))->getWidth() + + mpButtonScreen->search(MULTI_CHAR('c_btn'))->getWidth()); field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button]; } break; case BUTTON_S_e: - mButtonWidth[i_button] = mButtonSScale * mpButtonScreen->search('a_btn2')->getWidth(); + mButtonWidth[i_button] = mButtonSScale * mpButtonScreen->search(MULTI_CHAR('a_btn2'))->getWidth(); field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button]; break; case BUTTON_X_e: - mButtonWidth[i_button] = mButtonXScale * mpButtonScreen->search('x_btn')->getWidth(); + mButtonWidth[i_button] = mButtonXScale * mpButtonScreen->search(MULTI_CHAR('x_btn'))->getWidth(); field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button]; break; case BUTTON_Y_e: - mButtonWidth[i_button] = mButtonYScale * mpButtonScreen->search('y_btn')->getWidth(); + mButtonWidth[i_button] = mButtonYScale * mpButtonScreen->search(MULTI_CHAR('y_btn'))->getWidth(); field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button]; break; case BUTTON_3DB_e: - mButtonWidth[i_button] = mButton3DBScale * mpButtonScreen->search('as_b_n')->getWidth(); + mButtonWidth[i_button] = mButton3DBScale * mpButtonScreen->search(MULTI_CHAR('as_b_n'))->getWidth(); field_0x304[i_button] = field_0x1e4[param_2] + mButtonWidth[i_button]; break; case BUTTON_BIN_e: - mButtonWidth[i_button] = field_0x5f0 * mpButtonScreen->search('bottl_n')->getWidth(); + mButtonWidth[i_button] = field_0x5f0 * mpButtonScreen->search(MULTI_CHAR('bottl_n'))->getWidth(); field_0x304[i_button] = 0.0f; break; } diff --git a/src/d/d_meter_haihai.cpp b/src/d/d_meter_haihai.cpp index f1b647502a0..5e6c9fd3e74 100644 --- a/src/d/d_meter_haihai.cpp +++ b/src/d/d_meter_haihai.cpp @@ -30,7 +30,7 @@ int dMeterHaihai_c::_create() { JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpHaihaiScreen); - mpParent = new CPaneMgr(mpHaihaiScreen, 'n_all', 2, NULL); + mpParent = new CPaneMgr(mpHaihaiScreen, MULTI_CHAR('n_all'), 2, NULL); JUT_ASSERT(0, mpParent != NULL); OSInitFastCast(); @@ -300,9 +300,9 @@ void dMeterHaihai_c::playBckAnime(J2DAnmTransformKey* i_bck) { } i_bck->setFrame(mBckFrame); - mpHaihaiScreen->search('n_anim')->setAnimation(i_bck); - mpHaihaiScreen->search('n_anim')->animationTransform(); - mpHaihaiScreen->search('n_anim')->setAnimation((J2DAnmTransform*)NULL); + mpHaihaiScreen->search(MULTI_CHAR('n_anim'))->setAnimation(i_bck); + mpHaihaiScreen->search(MULTI_CHAR('n_anim'))->animationTransform(); + mpHaihaiScreen->search(MULTI_CHAR('n_anim'))->setAnimation((J2DAnmTransform*)NULL); } } @@ -323,8 +323,8 @@ void dMeterHaihai_c::playBtkAnime(J2DAnmTextureSRTKey* i_btk) { } i_btk->setFrame(mBtkFrame); - mpHaihaiScreen->search('yaji00')->setAnimation(i_btk); - mpHaihaiScreen->search('yaji01')->setAnimation(i_btk); + mpHaihaiScreen->search(MULTI_CHAR('yaji00'))->setAnimation(i_btk); + mpHaihaiScreen->search(MULTI_CHAR('yaji01'))->setAnimation(i_btk); } } @@ -345,7 +345,7 @@ void dMeterHaihai_c::playBpkAnime(J2DAnmColor* i_bpk) { } i_bpk->setFrame(mBpkFrame); - mpHaihaiScreen->search('npc_l1')->setAnimation(i_bpk); - mpHaihaiScreen->search('yaji_l')->setAnimation(i_bpk); + mpHaihaiScreen->search(MULTI_CHAR('npc_l1'))->setAnimation(i_bpk); + mpHaihaiScreen->search(MULTI_CHAR('yaji_l'))->setAnimation(i_bpk); } } diff --git a/src/d/d_meter_hakusha.cpp b/src/d/d_meter_hakusha.cpp index 8e11b767572..8c4c25d6241 100644 --- a/src/d/d_meter_hakusha.cpp +++ b/src/d/d_meter_hakusha.cpp @@ -26,7 +26,7 @@ dMeterHakusha_c::~dMeterHakusha_c() { int dMeterHakusha_c::_create() { static u64 haku_tag[] = { - 'haku_n00', 'haku_n01', 'haku_n02', 'haku_n03', 'haku_n04', 'haku_n05', + MULTI_CHAR('haku_n00'), MULTI_CHAR('haku_n01'), MULTI_CHAR('haku_n02'), MULTI_CHAR('haku_n03'), MULTI_CHAR('haku_n04'), MULTI_CHAR('haku_n05'), }; for (int i = 0; i < 6; i++) { @@ -34,7 +34,7 @@ int dMeterHakusha_c::_create() { JUT_ASSERT(0, mpHakushaPos[i] != NULL); } - mpHakushaParent = new CPaneMgr(field_0x004, 'hakunall', 0, NULL); + mpHakushaParent = new CPaneMgr(field_0x004, MULTI_CHAR('hakunall'), 0, NULL); JUT_ASSERT(0, mpHakushaParent != NULL); mpHakushaScreen = new J2DScreen(); @@ -45,10 +45,10 @@ int dMeterHakusha_c::_create() { JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpHakushaScreen); - mpHakushaOn = new CPaneMgr(mpHakushaScreen, 'haku_n', 2, NULL); + mpHakushaOn = new CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_n'), 2, NULL); JUT_ASSERT(0, mpHakushaOn != NULL); - mpHakushaOff = new CPaneMgr(mpHakushaScreen, 'haku_b_n', 2, NULL); + mpHakushaOff = new CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_b_n'), 2, NULL); JUT_ASSERT(0, mpHakushaOff != NULL); mpHakushaOn->setAlphaRate(0.0f); @@ -74,12 +74,12 @@ int dMeterHakusha_c::_create() { JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpButtonScreen); - mpButtonA = new CPaneMgr(mpButtonScreen, 'abtn_n', 2, NULL); + mpButtonA = new CPaneMgr(mpButtonScreen, MULTI_CHAR('abtn_n'), 2, NULL); JUT_ASSERT(0, mpButtonA != NULL); mpButtonA->show(); mpButtonA->setAlphaRate(0.0f); - mpButtonScreen->search('info_n')->translate(0.0f, 0.0f); + mpButtonScreen->search(MULTI_CHAR('info_n'))->translate(0.0f, 0.0f); field_0x100 = g_drawHIO.mButtonAHorsePosX; field_0x104 = g_drawHIO.mButtonAHorsePosY; diff --git a/src/d/d_meter_string.cpp b/src/d/d_meter_string.cpp index cd0b4025050..1f8ee5f1e1c 100644 --- a/src/d/d_meter_string.cpp +++ b/src/d/d_meter_string.cpp @@ -58,19 +58,19 @@ int dMeterString_c::_create() { mpGetInBck = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load( JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpMapArchive)); - mpParentPane = new CPaneMgr(mpScreen, 'get_in_n', 2, NULL); + mpParentPane = new CPaneMgr(mpScreen, MULTI_CHAR('get_in_n'), 2, NULL); JUT_ASSERT(0, mpParentPane != NULL); - mpRootPane = new CPaneMgr(mpScreen, 'n_all', 0, NULL); + mpRootPane = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 0, NULL); JUT_ASSERT(0, mpRootPane != NULL); - mpTextPane = new CPaneMgr(mpScreen, 'get_in', 0, NULL); + mpTextPane = new CPaneMgr(mpScreen, MULTI_CHAR('get_in'), 0, NULL); JUT_ASSERT(0, mpTextPane != NULL); - static_cast(mpScreen->search('get_in_s'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('get_in'))->setFont(mDoExt_getMesgFont()); - static_cast(mpScreen->search('get_in_s'))->setString(0x100, ""); - static_cast(mpScreen->search('get_in'))->setString(0x100, ""); + static_cast(mpScreen->search(MULTI_CHAR('get_in_s')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('get_in')))->setFont(mDoExt_getMesgFont()); + static_cast(mpScreen->search(MULTI_CHAR('get_in_s')))->setString(0x100, ""); + static_cast(mpScreen->search(MULTI_CHAR('get_in')))->setString(0x100, ""); mAnimFrame = 0.0f; mPikariAnimFrame = 0.0f; @@ -166,8 +166,8 @@ int dMeterString_c::_delete() { int dMeterString_c::createString(int i_stringID) { char str_buf[32]; dMeter2Info_getString(i_stringID, str_buf, NULL); - strcpy(static_cast(mpScreen->search('get_in_s'))->getStringPtr(), str_buf); - strcpy(static_cast(mpScreen->search('get_in'))->getStringPtr(), str_buf); + strcpy(static_cast(mpScreen->search(MULTI_CHAR('get_in_s')))->getStringPtr(), str_buf); + strcpy(static_cast(mpScreen->search(MULTI_CHAR('get_in')))->getStringPtr(), str_buf); mAnimFrame = 40.0f; mPikariAnimFrame = -1.0f; diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index a41895aac42..8f7862d2f5a 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -25,16 +25,16 @@ processFn process[] = { dMsgScrn3Select_c::dMsgScrn3Select_c() { static u64 const tag_name[3][12] = { // A - 'a_n', 'a_g', 'a_gr', 'a_m', 'w_yes_00', 'w_yes_01', 'w_yes_02', 'w_yes_03', 'w_yes_04', - 'sel_po00', 'a_kahen', 'a_cursor', + 'a_n', 'a_g', 'a_gr', 'a_m', MULTI_CHAR('w_yes_00'), MULTI_CHAR('w_yes_01'), MULTI_CHAR('w_yes_02'), MULTI_CHAR('w_yes_03'), MULTI_CHAR('w_yes_04'), + MULTI_CHAR('sel_po00'), MULTI_CHAR('a_kahen'), MULTI_CHAR('a_cursor'), // B - 'b_n', 'b_g', 'b_gr', 'b_m', 'w_yes_07', 'w_yes_06', 'w_yes_05', 'w_yes_08', 'w_yes_09', - 'sel_po01', 'b_kahen', 'b_cursor', + 'b_n', 'b_g', 'b_gr', 'b_m', MULTI_CHAR('w_yes_07'), MULTI_CHAR('w_yes_06'), MULTI_CHAR('w_yes_05'), MULTI_CHAR('w_yes_08'), MULTI_CHAR('w_yes_09'), + MULTI_CHAR('sel_po01'), MULTI_CHAR('b_kahen'), MULTI_CHAR('b_cursor'), // C - 'c_n', 'c_g', 'c_gr', 'c_m', 'w_yes_12', 'w_yes_11', 'w_yes_10', 'w_yes_13', 'w_yes_14', - 'sel_po02', 'c_kahen', 'c_cursor' + 'c_n', 'c_g', 'c_gr', 'c_m', MULTI_CHAR('w_yes_12'), MULTI_CHAR('w_yes_11'), MULTI_CHAR('w_yes_10'), MULTI_CHAR('w_yes_13'), MULTI_CHAR('w_yes_14'), + MULTI_CHAR('sel_po02'), MULTI_CHAR('c_kahen'), MULTI_CHAR('c_cursor') }; mpScreen = new J2DScreen(); @@ -66,7 +66,7 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { JUT_ASSERT(0, mpSelectCursor != NULL); mpSelectCursor->setAlphaRate(0.0f); - mpParent = new CPaneMgr(mpScreen, 'abc_n', 0, NULL); + mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('abc_n'), 0, NULL); JUT_ASSERT(0, mpParent != NULL); for (int i = 0; i < 3; i++) { @@ -115,11 +115,11 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mpTmSel_c[2] = new CPaneMgr(mpScreen, 'c_tf', 0, NULL); - mpTmrSel_c[0] = new CPaneMgr(mpScreen, 'a_tf_f', 0, NULL); + mpTmrSel_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('a_tf_f'), 0, NULL); - mpTmrSel_c[1] = new CPaneMgr(mpScreen, 'b_tf_f', 0, NULL); + mpTmrSel_c[1] = new CPaneMgr(mpScreen, MULTI_CHAR('b_tf_f'), 0, NULL); - mpTmrSel_c[2] = new CPaneMgr(mpScreen, 'c_tf_f', 0, NULL); + mpTmrSel_c[2] = new CPaneMgr(mpScreen, MULTI_CHAR('c_tf_f'), 0, NULL); for (int i = 0; i < 3; i++) { ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setString(64, ""); @@ -129,15 +129,15 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { ((J2DTextBox*)(mpTmrSel_c[i]->getPanePtr()))->setFont(mDoExt_getMesgFont()); } - mpScreen->search('a_t_e')->hide(); - mpScreen->search('b_t_e')->hide(); - mpScreen->search('c_t_e')->hide(); + mpScreen->search(MULTI_CHAR('a_t_e'))->hide(); + mpScreen->search(MULTI_CHAR('b_t_e'))->hide(); + mpScreen->search(MULTI_CHAR('c_t_e'))->hide(); mpScreen->search('a_tf')->show(); mpScreen->search('b_tf')->show(); mpScreen->search('c_tf')->show(); - mpScreen->search('a_tf_f')->show(); - mpScreen->search('b_tf_f')->show(); - mpScreen->search('c_tf_f')->show(); + mpScreen->search(MULTI_CHAR('a_tf_f'))->show(); + mpScreen->search(MULTI_CHAR('b_tf_f'))->show(); + mpScreen->search(MULTI_CHAR('c_tf_f'))->show(); mpScreen->search('a_t')->hide(); mpScreen->search('b_t')->hide(); mpScreen->search('c_t')->hide(); @@ -154,27 +154,27 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mpTmrSel_c[i] = NULL; } - mpScreen->search('a_t_e')->hide(); - mpScreen->search('b_t_e')->hide(); - mpScreen->search('c_t_e')->hide(); + mpScreen->search(MULTI_CHAR('a_t_e'))->hide(); + mpScreen->search(MULTI_CHAR('b_t_e'))->hide(); + mpScreen->search(MULTI_CHAR('c_t_e'))->hide(); mpScreen->search('a_tf')->hide(); mpScreen->search('b_tf')->hide(); mpScreen->search('c_tf')->hide(); - mpScreen->search('a_tf_f')->hide(); - mpScreen->search('b_tf_f')->hide(); - mpScreen->search('c_tf_f')->hide(); + mpScreen->search(MULTI_CHAR('a_tf_f'))->hide(); + mpScreen->search(MULTI_CHAR('b_tf_f'))->hide(); + mpScreen->search(MULTI_CHAR('c_tf_f'))->hide(); mpScreen->search('a_t')->show(); mpScreen->search('b_t')->show(); mpScreen->search('c_t')->show(); } #else - mpTmSel_c[0] = new CPaneMgr(mpScreen, 'a_t_e', 0, NULL); + mpTmSel_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('a_t_e'), 0, NULL); JUT_ASSERT(0, mpTmSel_c[0] != NULL); - mpTmSel_c[1] = new CPaneMgr(mpScreen, 'b_t_e', 0, NULL); + mpTmSel_c[1] = new CPaneMgr(mpScreen, MULTI_CHAR('b_t_e'), 0, NULL); JUT_ASSERT(0, mpTmSel_c[1] != NULL); - mpTmSel_c[2] = new CPaneMgr(mpScreen, 'c_t_e', 0, NULL); + mpTmSel_c[2] = new CPaneMgr(mpScreen, MULTI_CHAR('c_t_e'), 0, NULL); JUT_ASSERT(0, mpTmSel_c[2] != NULL); for (int i = 0; i < 3; i++) { @@ -183,15 +183,15 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mpTmrSel_c[i] = NULL; } - mpScreen->search('a_t_e')->show(); - mpScreen->search('b_t_e')->show(); - mpScreen->search('c_t_e')->show(); + mpScreen->search(MULTI_CHAR('a_t_e'))->show(); + mpScreen->search(MULTI_CHAR('b_t_e'))->show(); + mpScreen->search(MULTI_CHAR('c_t_e'))->show(); mpScreen->search('a_tf')->hide(); mpScreen->search('b_tf')->hide(); mpScreen->search('c_tf')->hide(); - mpScreen->search('a_tf_f')->hide(); - mpScreen->search('b_tf_f')->hide(); - mpScreen->search('c_tf_f')->hide(); + mpScreen->search(MULTI_CHAR('a_tf_f'))->hide(); + mpScreen->search(MULTI_CHAR('b_tf_f'))->hide(); + mpScreen->search(MULTI_CHAR('c_tf_f'))->hide(); mpScreen->search('a_t')->hide(); mpScreen->search('b_t')->hide(); mpScreen->search('c_t')->hide(); diff --git a/src/d/d_msg_scrn_arrow.cpp b/src/d/d_msg_scrn_arrow.cpp index 1ad714f8391..ba85ceea2fa 100644 --- a/src/d/d_msg_scrn_arrow.cpp +++ b/src/d/d_msg_scrn_arrow.cpp @@ -25,23 +25,23 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() { mpBpk->searchUpdateMaterialID(mpScreen); mBpkFrame = 0.0f; - mpParent_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL); + mpParent_c = new CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); JUT_ASSERT(0, mpParent_c != NULL); - mpArw_c = new CPaneMgr(mpScreen, 'ya_next', 0, NULL); + mpArw_c = new CPaneMgr(mpScreen, MULTI_CHAR('ya_next'), 0, NULL); JUT_ASSERT(0, mpArw_c != NULL); mpArw_c->hide(); mpArw_c->mPane->setAnimation(mpBck); - mpScreen->search('yajnext')->setAnimation(mpBpk); - mpScreen->search('yajinexl')->setAnimation(mpBpk); + mpScreen->search(MULTI_CHAR('yajnext'))->setAnimation(mpBpk); + mpScreen->search(MULTI_CHAR('yajinexl'))->setAnimation(mpBpk); - mpDot_c = new CPaneMgr(mpScreen, 'ya_end', 0, NULL); + mpDot_c = new CPaneMgr(mpScreen, MULTI_CHAR('ya_end'), 0, NULL); JUT_ASSERT(0, mpDot_c != NULL); mpDot_c->hide(); - mpScreen->search('yaj_end')->setAnimation(mpBpk); - mpScreen->search('yajiendl')->setAnimation(mpBpk); + mpScreen->search(MULTI_CHAR('yaj_end'))->setAnimation(mpBpk); + mpScreen->search(MULTI_CHAR('yajiendl'))->setAnimation(mpBpk); } dMsgScrnArrow_c::~dMsgScrnArrow_c() { diff --git a/src/d/d_msg_scrn_boss.cpp b/src/d/d_msg_scrn_boss.cpp index 242fa4af227..d2110e7cec6 100644 --- a/src/d/d_msg_scrn_boss.cpp +++ b/src/d/d_msg_scrn_boss.cpp @@ -8,7 +8,7 @@ dMsgScrnBoss_c::dMsgScrnBoss_c() { static u64 t_tag[7] = { - 'sfontb0', 'sfontb1', 'sfontb2', 'sfontl0', 'sfontl1', 'sfontl2', 'sfont00', + MULTI_CHAR('sfontb0'), MULTI_CHAR('sfontb1'), MULTI_CHAR('sfontb2'), MULTI_CHAR('sfontl0'), MULTI_CHAR('sfontl1'), MULTI_CHAR('sfontl2'), MULTI_CHAR('sfont00'), }; init(); @@ -17,15 +17,15 @@ dMsgScrnBoss_c::dMsgScrnBoss_c() { mpScreen->setPriority("zelda_boss_name.blo", 0x20000, dComIfGp_getMsgArchive(4)); dPaneClass_showNullPane(mpScreen); - mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mBossNameScaleX, g_MsgObject_HIO_c.mBossNameScaleY); - mpFontParent = new CPaneMgr(mpScreen, 's_font_n', 0, NULL); + mpFontParent = new CPaneMgr(mpScreen, MULTI_CHAR('s_font_n'), 0, NULL); mpFontParent->scale(g_MsgObject_HIO_c.mBossNameCharSizeX, g_MsgObject_HIO_c.mBossNameCharSizeY); mpFontParent->paneTrans(g_MsgObject_HIO_c.mBossNameCharPosX, g_MsgObject_HIO_c.mBossNameCharPosY); - mpBaseParent = new CPaneMgr(mpScreen, 'base_n', 2, NULL); + mpBaseParent = new CPaneMgr(mpScreen, MULTI_CHAR('base_n'), 2, NULL); mpBaseParent->scale(g_MsgObject_HIO_c.mBossNameBaseSizeX, g_MsgObject_HIO_c.mBossNameBaseSizeY); mpBaseParent->paneTrans(g_MsgObject_HIO_c.mBossNameBasePosX, g_MsgObject_HIO_c.mBossNameBasePosY); diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index a68029cc233..7387b36a6c0 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -82,7 +82,7 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs JUT_ASSERT(119, fg != false); dPaneClass_showNullPane(mpTxScreen); - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3line', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); JUT_ASSERT(124, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3_s', 0, NULL); @@ -91,9 +91,9 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs mpTmr_c[0] = NULL; mpTmr_c[1] = NULL; - mpTxScreen->search('n_3line')->show(); - mpTxScreen->search('n_3fline')->hide(); - mpTxScreen->search('n_e4line')->hide(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->show(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); #if VERSION == VERSION_GCN_JPN field_0x50 = 0.0f; @@ -107,36 +107,36 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs JUT_ASSERT(153, fg != false); dPaneClass_showNullPane(mpTxScreen); - mpScreen->search('n_all')->scale(g_MsgObject_HIO_c.mBoxTalkScaleX, + mpScreen->search(MULTI_CHAR('n_all'))->scale(g_MsgObject_HIO_c.mBoxTalkScaleX, g_MsgObject_HIO_c.mBoxTalkScaleY); #if VERSION == VERSION_GCN_JPN field_0x50 = 0.0f; if (dComIfGs_getOptRuby() == 0) { - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3flin', 0, NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3f_s', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3flin'), 0, NULL); + mpTm_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s'), 0, NULL); - mpTmr_c[0] = new CPaneMgr(mpTxScreen, 'mg_3f', 0, NULL); - mpTmr_c[1] = new CPaneMgr(mpTxScreen, 'mg_3f_s', 0, NULL); + mpTmr_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f'), 0, NULL); + mpTmr_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); - mpTxScreen->search('n_3line')->hide(); - mpTxScreen->search('n_3fline')->show(); - mpTxScreen->search('n_e4line')->hide(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->show(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); } else { - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3line', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3_s', 0, NULL); mpTmr_c[0] = NULL; mpTmr_c[1] = NULL; - mpTxScreen->search('n_3line')->show(); - mpTxScreen->search('n_3fline')->hide(); - mpTxScreen->search('n_e4line')->hide(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->show(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); } #else field_0x50 = -10.0f; - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_e4lin', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); JUT_ASSERT(162, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't4_s', 0, NULL); @@ -145,9 +145,9 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs mpTmr_c[0] = NULL; mpTmr_c[1] = NULL; - mpTxScreen->search('n_3line')->hide(); - mpTxScreen->search('n_3fline')->hide(); - mpTxScreen->search('n_e4line')->show(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->show(); #endif if (param_1 == 2 || param_1 == 4) { @@ -178,17 +178,17 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs } } - mpScreen->search('mg_null')->move( - g_MsgObject_HIO_c.mTextPosX + mpScreen->search('mg_null')->getBounds().i.x, - g_MsgObject_HIO_c.mTextPosY + mpScreen->search('mg_null')->getBounds().i.y); + mpScreen->search(MULTI_CHAR('mg_null'))->move( + g_MsgObject_HIO_c.mTextPosX + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.x, + g_MsgObject_HIO_c.mTextPosY + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.y); - mpArw_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL); + mpArw_c = new CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); JUT_ASSERT(241, mpArw_c != NULL); - mpMg_c[0] = new CPaneMgr(mpScreen, 'mg_null', 0, NULL); + mpMg_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(244, mpMg_c[0] != NULL); - mpMg_c[1] = new CPaneMgr(mpTxScreen, 'mg_null', 0, NULL); + mpMg_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(247, mpMg_c[1] != NULL); mpRoot_c[0] = new CPaneMgr(mpScreen, 'ROOT', 2, NULL); @@ -296,7 +296,7 @@ void dMsgScrnExplain_c::move() { (this->*init_process[mStatus])(); } - mpScreen->search('n_all')->scale(g_MsgObject_HIO_c.mBoxTalkScaleX, + mpScreen->search(MULTI_CHAR('n_all'))->scale(g_MsgObject_HIO_c.mBoxTalkScaleX, g_MsgObject_HIO_c.mBoxTalkScaleY); } diff --git a/src/d/d_msg_scrn_howl.cpp b/src/d/d_msg_scrn_howl.cpp index 17905019303..473de9c3502 100644 --- a/src/d/d_msg_scrn_howl.cpp +++ b/src/d/d_msg_scrn_howl.cpp @@ -39,18 +39,18 @@ static dMsgScrnHowl_cFunc process[5] = { dMsgScrnHowl_c::dMsgScrnHowl_c() { static u64 ylinen_tag[3] = { - 'ylinen00', - 'ylinen02', - 'ylinen04', + MULTI_CHAR('ylinen00'), + MULTI_CHAR('ylinen02'), + MULTI_CHAR('ylinen04'), }; static u64 tlinen_tag[7] = { - 'tlinen00', 'tlinen01', 'tlinen02', 'tlinen03', 'tlinen04', 'tlinen05', 'tlinen06', + MULTI_CHAR('tlinen00'), MULTI_CHAR('tlinen01'), MULTI_CHAR('tlinen02'), MULTI_CHAR('tlinen03'), MULTI_CHAR('tlinen04'), MULTI_CHAR('tlinen05'), MULTI_CHAR('tlinen06'), }; static u64 tline_tag[7] = { - 'tline00', 'tline01', 'tline02', 'tline03', 'tlinen04', 'tline05', 'tline06', + MULTI_CHAR('tline00'), MULTI_CHAR('tline01'), MULTI_CHAR('tline02'), MULTI_CHAR('tline03'), MULTI_CHAR('tlinen04'), MULTI_CHAR('tline05'), MULTI_CHAR('tline06'), }; static u64 tlines_tag[7] = { - 'tlines00', 'tlines01', 'tlines02', 'tlines03', 'tlines04', 'tlines05', 'tlines06', + MULTI_CHAR('tlines00'), MULTI_CHAR('tlines01'), MULTI_CHAR('tlines02'), MULTI_CHAR('tlines03'), MULTI_CHAR('tlines04'), MULTI_CHAR('tlines05'), MULTI_CHAR('tlines06'), }; init(); @@ -59,31 +59,31 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { bool fg = mpScreen->setPriority("zelda_wolf_howl.blo", 0x20000, dComIfGp_getMsgArchive(5)); JUT_ASSERT(73, fg != false); dPaneClass_showNullPane(mpScreen); - mpScreen->search('line00')->hide(); - mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 3, NULL); + mpScreen->search(MULTI_CHAR('line00'))->hide(); + mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 3, NULL); JUT_ASSERT(79, mpPmP_c != NULL); mpScreen->search('ag_n')->hide(); field_0x1994 = 0.0f; field_0x1998 = 0.0f; - mpScreen->search('wi_btn_n')->hide(); - mpButtonIcon[0] = new CPaneMgr(mpScreen, 'cbtn_n', 2, NULL); + mpScreen->search(MULTI_CHAR('wi_btn_n'))->hide(); + mpButtonIcon[0] = new CPaneMgr(mpScreen, MULTI_CHAR('cbtn_n'), 2, NULL); JUT_ASSERT(91, mpButtonIcon[0] != NULL); - mpButtonText[0] = new CPaneMgr(mpScreen, 'g_ltxt_n', 2, NULL); + mpButtonText[0] = new CPaneMgr(mpScreen, MULTI_CHAR('g_ltxt_n'), 2, NULL); JUT_ASSERT(93, mpButtonText[0] != NULL); - mpButtonIcon[1] = new CPaneMgr(mpScreen, 'abt_n', 2, NULL); + mpButtonIcon[1] = new CPaneMgr(mpScreen, MULTI_CHAR('abt_n'), 2, NULL); JUT_ASSERT(96, mpButtonIcon[1] != NULL); - mpButtonText[1] = new CPaneMgr(mpScreen, 'gr_txt_n', 2, NULL); + mpButtonText[1] = new CPaneMgr(mpScreen, MULTI_CHAR('gr_txt_n'), 2, NULL); JUT_ASSERT(98, mpButtonText[1] != NULL); #if VERSION == VERSION_GCN_JPN - J2DTextBox* piStack_19c = (J2DTextBox*)mpScreen->search('g_l_info'); - J2DTextBox* piStack_1a0 = (J2DTextBox*)mpScreen->search('g_r_info'); - mpScreen->search('fgr_info')->hide(); - mpScreen->search('fgl_info')->hide(); + J2DTextBox* piStack_19c = (J2DTextBox*)mpScreen->search(MULTI_CHAR('g_l_info')); + J2DTextBox* piStack_1a0 = (J2DTextBox*)mpScreen->search(MULTI_CHAR('g_r_info')); + mpScreen->search(MULTI_CHAR('fgr_info'))->hide(); + mpScreen->search(MULTI_CHAR('fgl_info'))->hide(); #else - J2DTextBox* piStack_19c = (J2DTextBox*)mpScreen->search('fgl_info'); - J2DTextBox* piStack_1a0 = (J2DTextBox*)mpScreen->search('fgr_info'); - mpScreen->search('g_l_info')->hide(); - mpScreen->search('g_r_info')->hide(); + J2DTextBox* piStack_19c = (J2DTextBox*)mpScreen->search(MULTI_CHAR('fgl_info')); + J2DTextBox* piStack_1a0 = (J2DTextBox*)mpScreen->search(MULTI_CHAR('fgr_info')); + mpScreen->search(MULTI_CHAR('g_l_info'))->hide(); + mpScreen->search(MULTI_CHAR('g_r_info'))->hide(); #endif piStack_19c->setString(0x40, ""); piStack_19c->setFont(mDoExt_getMesgFont()); @@ -138,9 +138,9 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { field_0x2136 = (350.0f / field_0x1980); field_0x2138 = 0; field_0x1984 = 255.0f / field_0x2136; - mpABase = new CPaneMgr(mpScreen, 'a_base', 0, NULL); + mpABase = new CPaneMgr(mpScreen, MULTI_CHAR('a_base'), 0, NULL); JUT_ASSERT(218, mpABase != NULL); - mpLineAll = new CPaneMgr(mpScreen, 'line_all', 0, NULL); + mpLineAll = new CPaneMgr(mpScreen, MULTI_CHAR('line_all'), 0, NULL); JUT_ASSERT(221, mpLineAll != NULL); f32 in_f31; for (int i = 0; i < 7; i++) { @@ -184,7 +184,7 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { res = (ResTIMG const*)dComIfGp_getMsgArchive(5)->getResource('TIMG', "tt_black_32.bti"); mpGuideDot = new J2DPicture(res); JUT_ASSERT(280, mpGuideDot != NULL); - mpGuideDot->setBlackWhite(((J2DPicture*)mpScreen->search('line00'))->getBlack(), ((J2DPicture*)mpScreen->search('line00'))->getWhite()); + mpGuideDot->setBlackWhite(((J2DPicture*)mpScreen->search(MULTI_CHAR('line00')))->getBlack(), ((J2DPicture*)mpScreen->search(MULTI_CHAR('line00')))->getWhite()); res = (ResTIMG const*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_iastarRR.bti"); mpTopBall = new J2DPicture(res); JUT_ASSERT(287, mpTopBall != NULL); @@ -197,8 +197,8 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { mpTopBallTail[i]->setBlackWhite(g_MsgObject_HIO_c.mHowlHIO.mDotBlack, g_MsgObject_HIO_c.mHowlHIO.mDotWhite); } field_0x2134 = 0; - field_0x1988 = mpScreen->search('line00')->getWidth(); - field_0x198c = mpScreen->search('line00')->getHeight(); + field_0x1988 = mpScreen->search(MULTI_CHAR('line00'))->getWidth(); + field_0x198c = mpScreen->search(MULTI_CHAR('line00'))->getHeight(); field_0x2194 = daAlink_getAlinkActorClass()->getCorrectCurveID(); mCorrectLineMax = 0; field_0x2197 = 0; @@ -674,7 +674,7 @@ void dMsgScrnHowl_c::drawGuide() { } if (dVar16 > 0.0f) { mpGuideDot->setAlpha( - dVar16 * (mpScreen->search('line00')->getAlpha() * mpPmP_c->getAlphaRate())); + dVar16 * (mpScreen->search(MULTI_CHAR('line00'))->getAlpha() * mpPmP_c->getAlphaRate())); mpGuideDot->draw((2.0f + (local_f0 - local_f8 / 2)), (local_f4 - local_fc / 2), local_f8, local_fc, false, false, false); } @@ -771,7 +771,7 @@ void dMsgScrnHowl_c::drawGuide2() { } if (guideAlpha > 0.0f && local_94 > 0.0f) { mpGuideDot->setAlpha(local_94 * - (guideAlpha * (mpScreen->search('line00')->getAlpha() * + (guideAlpha * (mpScreen->search(MULTI_CHAR('line00'))->getAlpha() * mpPmP_c->getAlphaRate()))); mpGuideDot->draw(2.0f + (local_a0 - local_a8 / 2), local_a4 - local_ac / 2, local_a8, local_ac, false, false, false); @@ -810,7 +810,7 @@ void dMsgScrnHowl_c::drawEffect() { 12.0f + ((vec2.x - vec1.x) / (mDoGph_gInf_c::getWidthF() / FB_WIDTH)), field_0x2120); grafContext->setScissor(); u8 timer = daAlink_getAlinkActorClass()->getWolfHowlMgrP()->getReleaseTimer(); - u8 screenAlpha = mpScreen->search('line00')->getAlpha(); + u8 screenAlpha = mpScreen->search(MULTI_CHAR('line00'))->getAlpha(); mpWaveTex->setAlpha((screenAlpha * mpPmP_c->getAlphaRate()) * ((30 - timer) / 30.0f)); f32 fVar2 = field_0x2128 * field_0x1980; f32 fVar3 = mpLineH[0]->getGlobalPosX() - field_0x27a8; diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp index e85eaa69072..904b418ab98 100644 --- a/src/d/d_msg_scrn_item.cpp +++ b/src/d/d_msg_scrn_item.cpp @@ -147,10 +147,10 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { } else { dVar18 = 1.0f; } - field_0x178 = field_0x0e0[0]->width * mpScreen->search('set_it_n')->getWidth() / 48.0f; - field_0x17c = field_0x0e0[0]->height * mpScreen->search('set_it_n')->getHeight() / 48.0f; - field_0x170 = mpScreen->search('set_it_n')->getWidth(); - field_0x174 = mpScreen->search('set_it_n')->getHeight(); + field_0x178 = field_0x0e0[0]->width * mpScreen->search(MULTI_CHAR('set_it_n'))->getWidth() / 48.0f; + field_0x17c = field_0x0e0[0]->height * mpScreen->search(MULTI_CHAR('set_it_n'))->getHeight() / 48.0f; + field_0x170 = mpScreen->search(MULTI_CHAR('set_it_n'))->getWidth(); + field_0x174 = mpScreen->search(MULTI_CHAR('set_it_n'))->getHeight(); for (int i = 0; i < 3; i++) { if (mpItemPane[i] != NULL) { mpItemPane[i]->resize(field_0x178 * dVar18, field_0x17c * dVar18); @@ -167,19 +167,19 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { JUT_ASSERT(291, mpBuf != NULL); memset(mpBuf, 0, 0x106a); mCharInfoPtr = (CharInfo_c*)mpBuf; - field_0x160 = mpScreen->search('n_all')->getBounds().i.x; - field_0x164 = mpScreen->search('n_all')->getBounds().i.y; + field_0x160 = mpScreen->search(MULTI_CHAR('n_all'))->getBounds().i.x; + field_0x164 = mpScreen->search(MULTI_CHAR('n_all'))->getBounds().i.y; field_0x180 = 0.0f; field_0x184 = 0.0f; for (int i = 0; i < 3; i++) { field_0x188[i] = g_MsgObject_HIO_c.mBoxPos[i][3]; } field_0x194 = 0.0f; - mpArw_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL); + mpArw_c = new CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); JUT_ASSERT(306, mpArw_c != NULL); - mpMg_c[0] = new CPaneMgr(mpScreen, 'mg_null', 0, NULL); + mpMg_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(309, mpMg_c[0] != NULL); - mpMg_c[1] = new CPaneMgr(mpTxScreen, 'mg_null', 0, NULL); + mpMg_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(312, mpMg_c[1] != NULL); OSInitFastCast(); fukiPosCalc(param_1); @@ -193,55 +193,55 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { field_0x12c[1]->searchUpdateMaterialID(mpScreen); field_0x154[1] = 0.0f; field_0x19d = false; - mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 3, NULL); + mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 3, NULL); JUT_ASSERT(389, mpPmP_c != NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mBoxItemScaleX, g_MsgObject_HIO_c.mBoxItemScaleY); #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptRuby() == 0) { - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3flin', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3flin'), 0, NULL); JUT_ASSERT(407, mpTm_c[0] != NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3f_s', 0, NULL); + mpTm_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s'), 0, NULL); JUT_ASSERT(410, mpTm_c[1] != NULL); - mpTm_c[2] = new CPaneMgr(mpTxScreen, 't3f_w', 0, NULL); + mpTm_c[2] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_w'), 0, NULL); JUT_ASSERT(413, mpTm_c[2] != NULL); - mpTmr_c[0] = new CPaneMgr(mpTxScreen, 'mg_3f', 0, NULL); + mpTmr_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f'), 0, NULL); JUT_ASSERT(416, mpTmr_c[0] != NULL); - mpTmr_c[1] = new CPaneMgr(mpTxScreen, 'mg_3f_s', 0, NULL); + mpTmr_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); JUT_ASSERT(419, mpTmr_c[1] != NULL); - mpTmr_c[2] = new CPaneMgr(mpTxScreen, 'mg_3f_w', 0, NULL); + mpTmr_c[2] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_w'), 0, NULL); JUT_ASSERT(422, mpTmr_c[2] != NULL); - mpTxScreen->search('n_3line')->hide(); - mpTxScreen->search('n_3fline')->show(); - mpTxScreen->search('n_e4line')->hide(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->show(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); } else { - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3line', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); JUT_ASSERT(407, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3_s', 0, NULL); JUT_ASSERT(410, mpTm_c[1] != NULL); mpTm_c[2] = new CPaneMgr(mpTxScreen, 't3_w', 0, NULL); JUT_ASSERT(413, mpTm_c[2] != NULL); - mpTxScreen->search('n_3line')->show(); - mpTxScreen->search('n_3fline')->hide(); - mpTxScreen->search('n_e4line')->hide(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->show(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); } #else - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_e4lin', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); JUT_ASSERT(407, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't4_s', 0, NULL); JUT_ASSERT(410, mpTm_c[1] != NULL); mpTm_c[2] = new CPaneMgr(mpTxScreen, 't4_w', 0, NULL); JUT_ASSERT(413, mpTm_c[2] != NULL); - mpTxScreen->search('n_3line')->hide(); - mpTxScreen->search('n_3fline')->hide(); - mpTxScreen->search('n_e4line')->show(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->show(); #endif for (int i = 0; i < 3; i++) { @@ -476,10 +476,10 @@ void dMsgScrnItem_c::drawSelf() { texScale = 1.0f; }; - mpItemPane[i]->draw(mpScreen->search('set_it_n')->getGlbBounds().i.x + + mpItemPane[i]->draw(mpScreen->search(MULTI_CHAR('set_it_n'))->getGlbBounds().i.x + 0.5f * (field_0x170 - (field_0x178 * texScale)) + g_MsgObject_HIO_c.mBoxItemPosX, - mpScreen->search('set_it_n')->getGlbBounds().i.y + + mpScreen->search(MULTI_CHAR('set_it_n'))->getGlbBounds().i.y + 0.5f * (field_0x174 - (field_0x17c * texScale)) + g_MsgObject_HIO_c.mBoxItemPosY, field_0x178 * texScale, field_0x17c * texScale, field_0x19e, false, @@ -601,14 +601,14 @@ void dMsgScrnItem_c::fukiPosCalc(u8 param_1) { switch(field_0x19c) { case 1: yOffset = g_MsgObject_HIO_c.mBoxPos[2][3]; - field_0x180 = 105.0f - (mpScreen->search('n_all')->getBounds().i.y + - mpScreen->search('n_all')->getBounds().f.y) / 2; + field_0x180 = 105.0f - (mpScreen->search(MULTI_CHAR('n_all'))->getBounds().i.y + + mpScreen->search(MULTI_CHAR('n_all'))->getBounds().f.y) / 2; mpSelect_c->translate(486.0f, 230.0f); break; case 2: yOffset = g_MsgObject_HIO_c.mBoxPos[1][3]; - field_0x180 = 235.0f - (mpScreen->search('n_all')->getBounds().i.y + - mpScreen->search('n_all')->getBounds().f.y) / 2; + field_0x180 = 235.0f - (mpScreen->search(MULTI_CHAR('n_all'))->getBounds().i.y + + mpScreen->search(MULTI_CHAR('n_all'))->getBounds().f.y) / 2; mpSelect_c->translate(486.0f, 355.0f); break; default: @@ -618,7 +618,7 @@ void dMsgScrnItem_c::fukiPosCalc(u8 param_1) { } field_0x184 = yOffset; setTextBoxPosOffsetY(field_0x180 + yOffset); - mpScreen->search('n_all')->move(field_0x160, yOffset + (field_0x164 + field_0x180)); + mpScreen->search(MULTI_CHAR('n_all'))->move(field_0x160, yOffset + (field_0x164 + field_0x180)); if (mpPmP_c != NULL) { mpPmP_c->reinit(); mpArrow_c->setPos(mpArw_c->getGlobalPosX() + (0.5f * mpArw_c->getSizeX()), @@ -640,8 +640,8 @@ void dMsgScrnItem_c::fukiPosCalc(u8 param_1) { } void dMsgScrnItem_c::setBtk0Animation(J2DAnmTextureSRTKey* param_1) { - mpScreen->search('gold00')->setAnimation(param_1); - mpScreen->search('gold01')->setAnimation(param_1); + mpScreen->search(MULTI_CHAR('gold00'))->setAnimation(param_1); + mpScreen->search(MULTI_CHAR('gold01'))->setAnimation(param_1); } void dMsgScrnItem_c::setBpk0Animation(J2DAnmColor* param_0) { @@ -649,7 +649,7 @@ void dMsgScrnItem_c::setBpk0Animation(J2DAnmColor* param_0) { } void dMsgScrnItem_c::setBpk1Animation(J2DAnmColor* param_0) { - mpScreen->search('moyou_1')->setAnimation(param_0); + mpScreen->search(MULTI_CHAR('moyou_1'))->setAnimation(param_0); } bool dMsgScrnItem_c::isOugiID() { diff --git a/src/d/d_msg_scrn_jimaku.cpp b/src/d/d_msg_scrn_jimaku.cpp index d921c160d3b..b92c1afd0e2 100644 --- a/src/d/d_msg_scrn_jimaku.cpp +++ b/src/d/d_msg_scrn_jimaku.cpp @@ -40,7 +40,7 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { memset(mpBuf, 0, 0x106A); mCharInfoPtr = (CharInfo_c*)mpBuf; - mpPmP_c = new CPaneMgr(mpScreen, 'mg_null', 3, NULL); + mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 3, NULL); JUT_ASSERT(0, mpPmP_c != NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mSubtitleScaleX, g_MsgObject_HIO_c.mSubtitleScaleY); field_0xcc = g_MsgObject_HIO_c.mBoxPos[0][5]; @@ -48,33 +48,33 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptRuby() == 0) { - mpTm_c[0] = new CPaneMgr(mpScreen, 'mg_3flin', 0, NULL); - mpTm_c[1] = new CPaneMgr(mpScreen, 't3f_s', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_3flin'), 0, NULL); + mpTm_c[1] = new CPaneMgr(mpScreen, MULTI_CHAR('t3f_s'), 0, NULL); - mpTmr_c[0] = new CPaneMgr(mpScreen, 'mg_3f', 0, NULL); - mpTmr_c[1] = new CPaneMgr(mpScreen, 'mg_3f_s', 0, NULL); + mpTmr_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_3f'), 0, NULL); + mpTmr_c[1] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); - mpScreen->search('n_3line')->hide(); - mpScreen->search('n_3fline')->show(); - mpScreen->search('n_e4line')->hide(); + mpScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpScreen->search(MULTI_CHAR('n_3fline'))->show(); + mpScreen->search(MULTI_CHAR('n_e4line'))->hide(); } else { - mpTm_c[0] = new CPaneMgr(mpScreen, 'mg_3line', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_3line'), 0, NULL); mpTm_c[1] = new CPaneMgr(mpScreen, 't3_s', 0, NULL); - mpScreen->search('n_3line')->show(); - mpScreen->search('n_3fline')->hide(); - mpScreen->search('n_e4line')->hide(); + mpScreen->search(MULTI_CHAR('n_3line'))->show(); + mpScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpScreen->search(MULTI_CHAR('n_e4line'))->hide(); } #else - mpTm_c[0] = new CPaneMgr(mpScreen, 'mg_e4lin', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); JUT_ASSERT(0, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpScreen, 't4_s', 0, NULL); JUT_ASSERT(0, mpTm_c[1] != NULL); - mpScreen->search('n_3line')->hide(); - mpScreen->search('n_3fline')->hide(); - mpScreen->search('n_e4line')->show(); + mpScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpScreen->search(MULTI_CHAR('n_e4line'))->show(); #endif for (int i = 0; i < 2; i++) { diff --git a/src/d/d_msg_scrn_kanban.cpp b/src/d/d_msg_scrn_kanban.cpp index 864d533bff5..681986c25a1 100644 --- a/src/d/d_msg_scrn_kanban.cpp +++ b/src/d/d_msg_scrn_kanban.cpp @@ -39,7 +39,7 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { field_0xd0->searchUpdateMaterialID(mpScreen); field_0xd8 = 0.0f; - mpPmP_c = new CPaneMgr(mpScreen, 'n_size', 2, NULL); + mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_size'), 2, NULL); JUT_ASSERT(60, mpPmP_c != NULL); mpPmP_c->getPanePtr()->setAnimation(field_0xcc); @@ -48,10 +48,10 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { mpPmP_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY); - mpBack_c = new CPaneMgr(mpScreen, 'back_b', 0, NULL); + mpBack_c = new CPaneMgr(mpScreen, MULTI_CHAR('back_b'), 0, NULL); JUT_ASSERT(68, mpBack_c != NULL); - mpSpot_c = new CPaneMgr(mpScreen, 'spot00', 0, NULL); + mpSpot_c = new CPaneMgr(mpScreen, MULTI_CHAR('spot00'), 0, NULL); JUT_ASSERT(72, mpSpot_c != NULL); mpSpot_c->getPanePtr()->setAnimation(field_0xd0); @@ -59,18 +59,18 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptRuby() != 0) { - static u64 const t_tag[3] = {'mg_3line', 't3_w', 't3_s'}; + static u64 const t_tag[3] = {MULTI_CHAR('mg_3line'), 't3_w', 't3_s'}; for (int i = 0; i < 3; i++) { mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); } - mpScreen->search('n_3line')->show(); - mpScreen->search('n_3fline')->hide(); - mpScreen->search('n_e4line')->hide(); + mpScreen->search(MULTI_CHAR('n_3line'))->show(); + mpScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpScreen->search(MULTI_CHAR('n_e4line'))->hide(); } else { - static u64 const t_tag_2[3] = {'t3fline', 't3f_w', 't3f_s'}; - static u64 const tr_tag[3] = {'mg_3f', 'mg_3f_w', 'mg_3f_s'}; + static u64 const t_tag_2[3] = {MULTI_CHAR('t3fline'), MULTI_CHAR('t3f_w'), MULTI_CHAR('t3f_s')}; + static u64 const tr_tag[3] = {MULTI_CHAR('mg_3f'), MULTI_CHAR('mg_3f_w'), MULTI_CHAR('mg_3f_s')}; for (int i = 0; i < 3; i++) { mpTm_c[i] = new CPaneMgr(mpScreen, t_tag_2[i], 0, NULL); @@ -80,12 +80,12 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { ((J2DTextBox*)mpTmr_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); } - mpScreen->search('n_3line')->hide(); - mpScreen->search('n_3fline')->show(); - mpScreen->search('n_e4line')->hide(); + mpScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpScreen->search(MULTI_CHAR('n_3fline'))->show(); + mpScreen->search(MULTI_CHAR('n_e4line'))->hide(); } #else - static u64 const t_tag[3] = {'mg_e4lin', 'f4_w', 't4_s'}; + static u64 const t_tag[3] = {MULTI_CHAR('mg_e4lin'), 'f4_w', 't4_s'}; for (int i = 0; i < 3; i++) { mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); @@ -93,9 +93,9 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); } - mpScreen->search('n_3line')->hide(); - mpScreen->search('n_3fline')->hide(); - mpScreen->search('n_e4line')->show(); + mpScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpScreen->search(MULTI_CHAR('n_e4line'))->show(); #endif ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getFontSize(mFontSize); diff --git a/src/d/d_msg_scrn_light.cpp b/src/d/d_msg_scrn_light.cpp index baa99036b58..55872b72fb0 100644 --- a/src/d/d_msg_scrn_light.cpp +++ b/src/d/d_msg_scrn_light.cpp @@ -143,7 +143,7 @@ dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) { mpBpk->searchUpdateMaterialID(mpScreen); mBpkFrame = 0.0f; - mpParent_c = new CPaneMgr(mpScreen, 'moya00', 0, NULL); + mpParent_c = new CPaneMgr(mpScreen, MULTI_CHAR('moya00'), 0, NULL); JUT_ASSERT(0, mpParent_c != NULL); mpParent_c->getPanePtr()->setAnimation(mpBck); diff --git a/src/d/d_msg_scrn_place.cpp b/src/d/d_msg_scrn_place.cpp index dc2a337f8aa..c9c76484c63 100644 --- a/src/d/d_msg_scrn_place.cpp +++ b/src/d/d_msg_scrn_place.cpp @@ -14,7 +14,7 @@ dMsgScrnPlace_c::dMsgScrnPlace_c() { static u64 t_tag[7] = { - 'sfontb0', 'sfontb1', 'sfontb2', 'sfontl0', 'sfontl1', 'sfontl2', 'sfont00', + MULTI_CHAR('sfontb0'), MULTI_CHAR('sfontb1'), MULTI_CHAR('sfontb2'), MULTI_CHAR('sfontl0'), MULTI_CHAR('sfontl1'), MULTI_CHAR('sfontl2'), MULTI_CHAR('sfont00'), }; init(); @@ -35,16 +35,16 @@ dMsgScrnPlace_c::dMsgScrnPlace_c() { #endif dPaneClass_showNullPane(mpScreen); - mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY); - mpFontParent = new CPaneMgr(mpScreen, 's_font_n', 0, NULL); + mpFontParent = new CPaneMgr(mpScreen, MULTI_CHAR('s_font_n'), 0, NULL); mpFontParent->scale(g_MsgObject_HIO_c.mStageTitleCharSizeX, g_MsgObject_HIO_c.mStageTitleCharSizeY); mpFontParent->paneTrans(g_MsgObject_HIO_c.mStageTitleCharPosX, g_MsgObject_HIO_c.mStageTitleCharPosY - mScaleX); - mpBaseParent = new CPaneMgr(mpScreen, 'base_n', 2, NULL); + mpBaseParent = new CPaneMgr(mpScreen, MULTI_CHAR('base_n'), 2, NULL); mpBaseParent->scale(g_MsgObject_HIO_c.mStageTitleBaseSizeX, g_MsgObject_HIO_c.mStageTitleBaseSizeY); mpBaseParent->paneTrans(g_MsgObject_HIO_c.mStageTitleBasePosX, diff --git a/src/d/d_msg_scrn_staff.cpp b/src/d/d_msg_scrn_staff.cpp index cbba48b1649..1f921241463 100644 --- a/src/d/d_msg_scrn_staff.cpp +++ b/src/d/d_msg_scrn_staff.cpp @@ -13,7 +13,7 @@ dMsgScrnStaff_c::dMsgScrnStaff_c(u8 unused) { static u64 t_tag[6] = { - 'right_s', 'right', 'center_s', 'center', 'left_s', 'left', + MULTI_CHAR('right_s'), MULTI_CHAR('right'), MULTI_CHAR('center_s'), MULTI_CHAR('center'), MULTI_CHAR('left_s'), 'left', }; init(); @@ -26,11 +26,11 @@ dMsgScrnStaff_c::dMsgScrnStaff_c(u8 unused) { dPaneClass_showNullPane(mpScreen); mpPmP_c = new CPaneMgr(mpScreen, 'ROOT', 2, NULL); - mpScreen->search('left_n')->hide(); - mpScreen->search('right_n')->hide(); + mpScreen->search(MULTI_CHAR('left_n'))->hide(); + mpScreen->search(MULTI_CHAR('right_n'))->hide(); for (int i = 0; i < 6; i++) { - mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], NULL, NULL); + mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x200, ""); } diff --git a/src/d/d_msg_scrn_talk.cpp b/src/d/d_msg_scrn_talk.cpp index 6bc36825161..941e984fbd7 100644 --- a/src/d/d_msg_scrn_talk.cpp +++ b/src/d/d_msg_scrn_talk.cpp @@ -78,21 +78,21 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { field_0xf8[i] = 18.0f - g_MsgObject_HIO_c.mPikariScale; field_0x35c[i] = g_MsgObject_HIO_c.mPikariHaloDelay_spirit; } - field_0xe8 = mpScreen->search('n_all')->getBounds().i.x; - field_0xec = mpScreen->search('n_all')->getBounds().i.y; + field_0xe8 = mpScreen->search(MULTI_CHAR('n_all'))->getBounds().i.x; + field_0xec = mpScreen->search(MULTI_CHAR('n_all'))->getBounds().i.y; field_0xf0 = 0.0f; for (int i = 0; i < 3; i++) { field_0x350[i] = g_MsgObject_HIO_c.mBoxPos[i][0]; } - mpScreen->search('mg_null')->move( - mpScreen->search('mg_null')->getBounds().i.x + g_MsgObject_HIO_c.mTextPosX, - mpScreen->search('mg_null')->getBounds().i.y + g_MsgObject_HIO_c.mTextPosY); - mpArw_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL); + mpScreen->search(MULTI_CHAR('mg_null'))->move( + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.x + g_MsgObject_HIO_c.mTextPosX, + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.y + g_MsgObject_HIO_c.mTextPosY); + mpArw_c = new CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); JUT_ASSERT(147, mpArw_c != NULL); - mpMg_c[0] = new CPaneMgr(mpScreen, 'mg_null', 0, NULL); + mpMg_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(150, mpMg_c[0] != NULL); - mpMg_c[1] = new CPaneMgr(mpTxScreen, 'mg_null', 0, NULL); + mpMg_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(153, mpMg_c[1] != NULL); OSInitFastCast(); @@ -102,69 +102,69 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { field_0xf4 = -10.0f; #endif fukiPosCalc(param_1); - mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 3, NULL); + mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 3, NULL); JUT_ASSERT(176, mpPmP_c != NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mBoxTalkScaleX, g_MsgObject_HIO_c.mBoxTalkScaleY); #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptRuby() == 0) { - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3flin', 0, NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3f_s', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3flin'), 0, NULL); + mpTm_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s'), 0, NULL); - mpTmr_c[0] = new CPaneMgr(mpTxScreen, 'mg_3f', 0, NULL); + mpTmr_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f'), 0, NULL); if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) { - mpTm_c[2] = new CPaneMgr(mpTxScreen, 't3f_s1', 0, NULL); - mpTm_c[3] = new CPaneMgr(mpTxScreen, 't3f_s2', 0, NULL); - mpTm_c[4] = new CPaneMgr(mpTxScreen, 't3f_s3', 0, NULL); - mpTm_c[5] = new CPaneMgr(mpTxScreen, 't3f_s4', 0, NULL); - mpTmr_c[1] = new CPaneMgr(mpTxScreen, 'mg_3f_s1', 0, NULL); - mpTmr_c[2] = new CPaneMgr(mpTxScreen, 'mg_3f_s2', 0, NULL); + mpTm_c[2] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s1'), 0, NULL); + mpTm_c[3] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s2'), 0, NULL); + mpTm_c[4] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s3'), 0, NULL); + mpTm_c[5] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s4'), 0, NULL); + mpTmr_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s1'), 0, NULL); + mpTmr_c[2] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s2'), 0, NULL); } else { - mpTmr_c[1] = new CPaneMgr(mpTxScreen, 'mg_3f_s', 0, NULL); + mpTmr_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); } - mpTxScreen->search('n_3line')->hide(); - mpTxScreen->search('n_3fline')->show(); - mpTxScreen->search('n_e4line')->hide(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->show(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); } else { - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3line', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3_s', 0, NULL); if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) { - mpTm_c[2] = new CPaneMgr(mpTxScreen, 't3_s1', 0, NULL); + mpTm_c[2] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3_s1'), 0, NULL); JUT_ASSERT(189, mpTm_c[2] != NULL); - mpTm_c[3] = new CPaneMgr(mpTxScreen, 't3_s2', 0, NULL); + mpTm_c[3] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3_s2'), 0, NULL); JUT_ASSERT(191, mpTm_c[3] != NULL); - mpTm_c[4] = new CPaneMgr(mpTxScreen, 't3_s3', 0, NULL); + mpTm_c[4] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3_s3'), 0, NULL); JUT_ASSERT(193, mpTm_c[4] != NULL); - mpTm_c[5] = new CPaneMgr(mpTxScreen, 't3_s4', 0, NULL); + mpTm_c[5] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3_s4'), 0, NULL); JUT_ASSERT(193, mpTm_c[5] != NULL); } - mpTxScreen->search('n_3line')->show(); - mpTxScreen->search('n_3fline')->hide(); - mpTxScreen->search('n_e4line')->hide(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->show(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); } #else - mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_e4lin', 0, NULL); + mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); JUT_ASSERT(182, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't4_s', 0, NULL); JUT_ASSERT(185, mpTm_c[1] != NULL); if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) { - mpTm_c[2] = new CPaneMgr(mpTxScreen, 't4_s1', 0, NULL); + mpTm_c[2] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t4_s1'), 0, NULL); JUT_ASSERT(189, mpTm_c[2] != NULL); - mpTm_c[3] = new CPaneMgr(mpTxScreen, 't4_s2', 0, NULL); + mpTm_c[3] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t4_s2'), 0, NULL); JUT_ASSERT(191, mpTm_c[3] != NULL); - mpTm_c[4] = new CPaneMgr(mpTxScreen, 't4_s3', 0, NULL); + mpTm_c[4] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t4_s3'), 0, NULL); JUT_ASSERT(193, mpTm_c[4] != NULL); - mpTm_c[5] = new CPaneMgr(mpTxScreen, 't4_s4', 0, NULL); + mpTm_c[5] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t4_s4'), 0, NULL); JUT_ASSERT(193, mpTm_c[5] != NULL); } - mpTxScreen->search('n_3line')->hide(); - mpTxScreen->search('n_3fline')->hide(); - mpTxScreen->search('n_e4line')->show(); + mpTxScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpTxScreen->search(MULTI_CHAR('n_e4line'))->show(); #endif for (int i = 0; i < 6; i++) { if (mpTm_c[i] != NULL) { @@ -485,16 +485,16 @@ void dMsgScrnTalk_c::fukiPosCalc(u8 param_1) { switch (field_0x488) { case 1: dVar15 = g_MsgObject_HIO_c.mBoxPos[2][0]; - field_0xf0 = 105.0f - (mpScreen->search('n_all')->getBounds().i.y + - mpScreen->search('n_all')->getBounds().f.y) / 2; + field_0xf0 = 105.0f - (mpScreen->search(MULTI_CHAR('n_all'))->getBounds().i.y + + mpScreen->search(MULTI_CHAR('n_all'))->getBounds().f.y) / 2; if (mpSelect_c != NULL) { mpSelect_c->translate(486.0f, 230.0f); } break; case 2: dVar15 = g_MsgObject_HIO_c.mBoxPos[1][0]; - field_0xf0 = 235.0f - (mpScreen->search('n_all')->getBounds().i.y + - mpScreen->search('n_all')->getBounds().f.y) / 2; + field_0xf0 = 235.0f - (mpScreen->search(MULTI_CHAR('n_all'))->getBounds().i.y + + mpScreen->search(MULTI_CHAR('n_all'))->getBounds().f.y) / 2; if (mpSelect_c != NULL) { mpSelect_c->translate(486.0f, 355.0f); } @@ -509,10 +509,10 @@ void dMsgScrnTalk_c::fukiPosCalc(u8 param_1) { } if (dComIfGp_isHeapLockFlag() == 2 || dComIfGp_isHeapLockFlag() == 3) { setTextBoxPosOffsetY(-190.0f); - mpScreen->search('n_all')->move(field_0xe8, field_0xec - 190.0f); + mpScreen->search(MULTI_CHAR('n_all'))->move(field_0xe8, field_0xec - 190.0f); } else { setTextBoxPosOffsetY(field_0xf0 + dVar15); - mpScreen->search('n_all')->move(field_0xe8, field_0xec + field_0xf0 + dVar15); + mpScreen->search(MULTI_CHAR('n_all'))->move(field_0xe8, field_0xec + field_0xf0 + dVar15); } if (mpPmP_c != NULL) { mpPmP_c->reinit(); diff --git a/src/d/d_msg_scrn_tree.cpp b/src/d/d_msg_scrn_tree.cpp index 6165a62b8f3..eb29b1e2664 100644 --- a/src/d/d_msg_scrn_tree.cpp +++ b/src/d/d_msg_scrn_tree.cpp @@ -44,36 +44,36 @@ dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) { field_0xd4->searchUpdateMaterialID(mpScreen); field_0xe0 = 0.0f; - mpPmP_c = new CPaneMgr(mpScreen, 'n_size', 2, NULL); + mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_size'), 2, NULL); mpPmP_c->getPanePtr()->setAnimation(field_0xcc); field_0xcc->setFrame(1.0f); mpPmP_c->getPanePtr()->animationTransform(); mpPmP_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mBoxWoodScaleX, g_MsgObject_HIO_c.mBoxWoodScaleY); - field_0xc4 = new CPaneMgr(mpScreen, 'back_b', 0, NULL); - field_0xc8 = new CPaneMgr(mpScreen, 'spot00', 0, NULL); + field_0xc4 = new CPaneMgr(mpScreen, MULTI_CHAR('back_b'), 0, NULL); + field_0xc8 = new CPaneMgr(mpScreen, MULTI_CHAR('spot00'), 0, NULL); field_0xc8->getPanePtr()->setAnimation(field_0xd0); - mpScreen->search('white_m')->setAnimation(field_0xd4); + mpScreen->search(MULTI_CHAR('white_m'))->setAnimation(field_0xd4); #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptRuby() != 0) { for (int i = 0; i < 3; i++) { - static u64 const t_tag[3] = {'mg_3line', 't3_w', 't3_s'}; + static u64 const t_tag[3] = {MULTI_CHAR('mg_3line'), 't3_w', 't3_s'}; mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(field_0x54); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x210, ""); } - mpScreen->search('n_3line')->show(); - mpScreen->search('n_3fline')->hide(); - mpScreen->search('n_e4line')->hide(); + mpScreen->search(MULTI_CHAR('n_3line'))->show(); + mpScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpScreen->search(MULTI_CHAR('n_e4line'))->hide(); } else { for (int i = 0; i < 3; i++) { - static u64 const t_tag[3] = {'t3fline', 't3f_w', 't3f_s'}; - static u64 const tr_tag[3] = {'mg_3f', 'mg_3f_w', 'mg_3f_s'}; + static u64 const t_tag[3] = {MULTI_CHAR('t3fline'), MULTI_CHAR('t3f_w'), MULTI_CHAR('t3f_s')}; + static u64 const tr_tag[3] = {MULTI_CHAR('mg_3f'), MULTI_CHAR('mg_3f_w'), MULTI_CHAR('mg_3f_s')}; mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(field_0x54); @@ -84,22 +84,22 @@ dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) { ((J2DTextBox*)mpTmr_c[i]->getPanePtr())->setString(0x210, ""); } - mpScreen->search('n_3line')->hide(); - mpScreen->search('n_3fline')->show(); - mpScreen->search('n_e4line')->hide(); + mpScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpScreen->search(MULTI_CHAR('n_3fline'))->show(); + mpScreen->search(MULTI_CHAR('n_e4line'))->hide(); } #else for (int i = 0; i < 3; i++) { - static u64 const t_tag[3] = {'mg_e4lin', 'f4_w', 't4_s'}; + static u64 const t_tag[3] = {MULTI_CHAR('mg_e4lin'), 'f4_w', 't4_s'}; mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(field_0x54); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x200, ""); } - mpScreen->search('n_3line')->hide(); - mpScreen->search('n_3fline')->hide(); - mpScreen->search('n_e4line')->show(); + mpScreen->search(MULTI_CHAR('n_3line'))->hide(); + mpScreen->search(MULTI_CHAR('n_3fline'))->hide(); + mpScreen->search(MULTI_CHAR('n_e4line'))->show(); #endif ((J2DTextBox*)mpTm_c[0]->getPanePtr())->getFontSize(mFontSize); diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index f83eda6abb3..e5d4f845061 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -1291,18 +1291,18 @@ void dName_c::screenSet() { 's_00', 's_01', 's_02', 's_03', 's_04', 's_05', 's_06', 's_07', }; static u64 l_cur1TagName[8] = { - 's_0r', 's_01r', 's_02r', 's_03r', 's_04r', 's_05r', 's_06r', 's_07r', + 's_0r', MULTI_CHAR('s_01r'), MULTI_CHAR('s_02r'), MULTI_CHAR('s_03r'), MULTI_CHAR('s_04r'), MULTI_CHAR('s_05r'), MULTI_CHAR('s_06r'), MULTI_CHAR('s_07r'), }; #if REGION_JPN static u64 l_menu_icon_tag[4] = { - 'j_hira_n', - 'j_kata_n', - 'j_eigo_n', - 'j_end_n', + MULTI_CHAR('j_hira_n'), + MULTI_CHAR('j_kata_n'), + MULTI_CHAR('j_eigo_n'), + MULTI_CHAR('j_end_n'), }; static u64 l_menu_tag[5][3] = { - 'm_hira_0', 'm_hira_1', 'm_hira_s', 'm_kata_0', 'm_kata_1', 'm_kata_s', - 'm_eigo_0', 'm_eigo_1', 'm_eigo_s', 'j_end_0', 'j_end_1', 'j_end_s', + MULTI_CHAR('m_hira_0'), MULTI_CHAR('m_hira_1'), MULTI_CHAR('m_hira_s'), MULTI_CHAR('m_kata_0'), MULTI_CHAR('m_kata_1'), MULTI_CHAR('m_kata_s'), + MULTI_CHAR('m_eigo_0'), MULTI_CHAR('m_eigo_1'), MULTI_CHAR('m_eigo_s'), MULTI_CHAR('j_end_0'), MULTI_CHAR('j_end_1'), MULTI_CHAR('j_end_s'), }; static u32 l_menu_msg[4] = { 0x386, @@ -1312,14 +1312,14 @@ void dName_c::screenSet() { }; #else static u64 l_menu_icon_tag[4] = { - 'p_ABC_n', - 'p_abc_n', - 'j_eigo_n', - 'p_end_n', + MULTI_CHAR('p_ABC_n'), + MULTI_CHAR('p_abc_n'), + MULTI_CHAR('j_eigo_n'), + MULTI_CHAR('p_end_n'), }; static u64 l_menu_tag[5][3] = { - 'p_ABC_0', 'p_ABC_1', 'p_ABC_2', 'p_abc_0', 'p_abc_1', 'p_abc_2', - 'm_eigo_0', 'm_eigo_1', 'm_eigo_2', 'p_end_0', 'p_end_1', 'p_end_2', + MULTI_CHAR('p_ABC_0'), MULTI_CHAR('p_ABC_1'), MULTI_CHAR('p_ABC_2'), MULTI_CHAR('p_abc_0'), MULTI_CHAR('p_abc_1'), MULTI_CHAR('p_abc_2'), + MULTI_CHAR('m_eigo_0'), MULTI_CHAR('m_eigo_1'), MULTI_CHAR('m_eigo_2'), MULTI_CHAR('p_end_0'), MULTI_CHAR('p_end_1'), MULTI_CHAR('p_end_2'), }; static u32 l_menu_msg[4] = { 0x38B, @@ -1329,20 +1329,20 @@ void dName_c::screenSet() { }; #endif static u64 l_tagName[65] = { - 'm_00_0', 'm_00_1', 'm_00_2', 'm_00_3', 'm_00_4', 'm_01_0', 'm_01_1', 'm_01_2', 'm_01_3', - 'm_01_4', 'm_02_0', 'm_02_1', 'm_02_2', 'm_02_3', 'm_02_4', 'm03_0', 'm03_1', 'm03_2', - 'm03_3', 'm03_4', 'm_04_0', 'm_04_1', 'm_04_2', 'm_04_3', 'm_04_4', 'm_05_0', 'm_05_1', - 'm_05_2', 'm_05_3', 'm_05_4', 'm_06_0', 'm_06_1', 'm_06_2', 'm_06_3', 'm_06_4', 'm_07_0', - 'm_07_1', 'm_07_2', 'm_07_3', 'm_07_4', 'm_08_0', 'm_08_1', 'm_08_2', 'm_08_3', 'm_08_4', - 'm_09_0', 'm_09_1', 'm_09_2', 'm_09_3', 'm_09_4', 'm_10_0', 'm_10_1', 'm_10_2', 'm_10_3', - 'm_10_4', 'm_11_0', 'm_11_1', 'm_11_2', 'm_11_3', 'm_11_4', 'm12_0', 'm12_1', 'm12_2', - 'm12_3', 'm12_4', + MULTI_CHAR('m_00_0'), MULTI_CHAR('m_00_1'), MULTI_CHAR('m_00_2'), MULTI_CHAR('m_00_3'), MULTI_CHAR('m_00_4'), MULTI_CHAR('m_01_0'), MULTI_CHAR('m_01_1'), MULTI_CHAR('m_01_2'), MULTI_CHAR('m_01_3'), + MULTI_CHAR('m_01_4'), MULTI_CHAR('m_02_0'), MULTI_CHAR('m_02_1'), MULTI_CHAR('m_02_2'), MULTI_CHAR('m_02_3'), MULTI_CHAR('m_02_4'), MULTI_CHAR('m03_0'), MULTI_CHAR('m03_1'), MULTI_CHAR('m03_2'), + MULTI_CHAR('m03_3'), MULTI_CHAR('m03_4'), MULTI_CHAR('m_04_0'), MULTI_CHAR('m_04_1'), MULTI_CHAR('m_04_2'), MULTI_CHAR('m_04_3'), MULTI_CHAR('m_04_4'), MULTI_CHAR('m_05_0'), MULTI_CHAR('m_05_1'), + MULTI_CHAR('m_05_2'), MULTI_CHAR('m_05_3'), MULTI_CHAR('m_05_4'), MULTI_CHAR('m_06_0'), MULTI_CHAR('m_06_1'), MULTI_CHAR('m_06_2'), MULTI_CHAR('m_06_3'), MULTI_CHAR('m_06_4'), MULTI_CHAR('m_07_0'), + MULTI_CHAR('m_07_1'), MULTI_CHAR('m_07_2'), MULTI_CHAR('m_07_3'), MULTI_CHAR('m_07_4'), MULTI_CHAR('m_08_0'), MULTI_CHAR('m_08_1'), MULTI_CHAR('m_08_2'), MULTI_CHAR('m_08_3'), MULTI_CHAR('m_08_4'), + MULTI_CHAR('m_09_0'), MULTI_CHAR('m_09_1'), MULTI_CHAR('m_09_2'), MULTI_CHAR('m_09_3'), MULTI_CHAR('m_09_4'), MULTI_CHAR('m_10_0'), MULTI_CHAR('m_10_1'), MULTI_CHAR('m_10_2'), MULTI_CHAR('m_10_3'), + MULTI_CHAR('m_10_4'), MULTI_CHAR('m_11_0'), MULTI_CHAR('m_11_1'), MULTI_CHAR('m_11_2'), MULTI_CHAR('m_11_3'), MULTI_CHAR('m_11_4'), MULTI_CHAR('m12_0'), MULTI_CHAR('m12_1'), MULTI_CHAR('m12_2'), + MULTI_CHAR('m12_3'), MULTI_CHAR('m12_4'), }; static u64 l_nameTagName[8] = { - 'name_00', 'name_01', 'name_02', 'name_03', 'name_04', 'name_05', 'name_06', 'name_07', + MULTI_CHAR('name_00'), MULTI_CHAR('name_01'), MULTI_CHAR('name_02'), MULTI_CHAR('name_03'), MULTI_CHAR('name_04'), MULTI_CHAR('name_05'), MULTI_CHAR('name_06'), MULTI_CHAR('name_07'), }; static u64 l_nameCurTagName[8] = { - 's__n_00', 's__n_01', 's__n_02', 's__n_03', 's__n_04', 's__n_05', 's__n_06', 's__n_07', + MULTI_CHAR('s__n_00'), MULTI_CHAR('s__n_01'), MULTI_CHAR('s__n_02'), MULTI_CHAR('s__n_03'), MULTI_CHAR('s__n_04'), MULTI_CHAR('s__n_05'), MULTI_CHAR('s__n_06'), MULTI_CHAR('s__n_07'), }; nameIn.NameInScr = new J2DScreen(); @@ -1351,7 +1351,7 @@ void dName_c::screenSet() { archive = dComIfGp_getNameResArchive(); nameIn.NameInScr->setPriority("zelda_player_name.blo", 0x100000, archive); dPaneClass_showNullPane(nameIn.NameInScr); - nameIn.field_0x10 = nameIn.NameInScr->search('name_n'); + nameIn.field_0x10 = nameIn.NameInScr->search(MULTI_CHAR('name_n')); void* bpk = JKRGetNameResource("zelda_player_name.bpk", archive); JUT_ASSERT(0, bpk != NULL); @@ -1376,22 +1376,22 @@ void dName_c::screenSet() { } #if REGION_JPN - nameIn.NameInScr->search('pal_n')->hide(); - mMenuPane = nameIn.NameInScr->search('jpn_n'); + nameIn.NameInScr->search(MULTI_CHAR('pal_n'))->hide(); + mMenuPane = nameIn.NameInScr->search(MULTI_CHAR('jpn_n')); mMenuPane->show(); - nameIn.NameInScr->search('p_ABC_n')->scale(0.0f, 0.0f); - nameIn.NameInScr->search('p_abc_n')->scale(0.0f, 0.0f); - nameIn.NameInScr->search('p_end_n')->scale(0.0f, 0.0f); + nameIn.NameInScr->search(MULTI_CHAR('p_ABC_n'))->scale(0.0f, 0.0f); + nameIn.NameInScr->search(MULTI_CHAR('p_abc_n'))->scale(0.0f, 0.0f); + nameIn.NameInScr->search(MULTI_CHAR('p_end_n'))->scale(0.0f, 0.0f); #else - nameIn.NameInScr->search('jpn_n')->hide(); - mMenuPane = nameIn.NameInScr->search('pal_n'); + nameIn.NameInScr->search(MULTI_CHAR('jpn_n'))->hide(); + mMenuPane = nameIn.NameInScr->search(MULTI_CHAR('pal_n')); mMenuPane->show(); - nameIn.NameInScr->search('j_hira_n')->scale(0.0f, 0.0f); - nameIn.NameInScr->search('j_kata_n')->scale(0.0f, 0.0f); - nameIn.NameInScr->search('j_eigo_n')->scale(0.0f, 0.0f); - nameIn.NameInScr->search('j_end_n')->scale(0.0f, 0.0f); + nameIn.NameInScr->search(MULTI_CHAR('j_hira_n'))->scale(0.0f, 0.0f); + nameIn.NameInScr->search(MULTI_CHAR('j_kata_n'))->scale(0.0f, 0.0f); + nameIn.NameInScr->search(MULTI_CHAR('j_eigo_n'))->scale(0.0f, 0.0f); + nameIn.NameInScr->search(MULTI_CHAR('j_end_n'))->scale(0.0f, 0.0f); #endif J2DTextBox* menuPane[3]; @@ -1426,7 +1426,7 @@ void dName_c::screenSet() { mMenuIcon[0]->hide(); mMenuIcon[1]->hide(); #endif - mMojiPane = nameIn.NameInScr->search('moji_n'); + mMojiPane = nameIn.NameInScr->search(MULTI_CHAR('moji_n')); for (u32 i = 0; i < 65; i++) { mMojiIcon[i] = new CPaneMgr(nameIn.NameInScr, l_tagName[i], 2, NULL); diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index 9a1b395dec5..8b171047aa5 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -1596,7 +1596,7 @@ s32 dPa_control_c::getPolyColor(cBgS_PolyInfo& param_0, int param_1, _GXColor* p return 0; } - if (param_1 == NULL) { + if (param_1 == 0) { dKy_pol_eff_prim_get(¶m_0, param_2); dKy_pol_eff_env_get(¶m_0, param_3); *param_4 = dKy_pol_eff_alpha_get(¶m_0); diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 88b32030490..d63a7438baa 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -49,7 +49,7 @@ int dRes_info_c::set(char const* i_arcName, char const* i_path, u8 i_mountDirect JUT_ASSERT(120, strlen(i_arcName) <= NAME_MAX); #endif - if (*i_path != NULL) { + if (*i_path != '\0') { char path[40]; snprintf(path, sizeof(path), "%s%s.arc", i_path, i_arcName); mDMCommand = mDoDvdThd_mountArchive_c::create(path, i_mountDirection, i_heap); diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index 5ccdcd95a2a..7a2e5303f77 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -955,5 +955,5 @@ scene_process_profile_definition g_profile_LOGO_SCENE = { 0, &g_fopScn_Method.base, &l_dScnLogo_Method, - NULL, + 0, }; diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 6ba2f9247b5..a4fe5558fbc 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -339,7 +339,7 @@ scene_process_profile_definition g_profile_NAME_SCENE = { 0, &g_fopScn_Method.base, &l_dScnName_Method, - NULL, + 0, }; scene_process_profile_definition g_profile_NAMEEX_SCENE = { @@ -353,5 +353,5 @@ scene_process_profile_definition g_profile_NAMEEX_SCENE = { 0, &g_fopScn_Method.base, &l_dScnName_Method, - NULL, + 0, }; diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 69512ffea20..1e4636c4577 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -554,7 +554,7 @@ static int phase_3(dScnPly_c* i_this) { return cPhs_INIT_e; } - if (!i_this->field_0x1d0 == NULL && !i_this->field_0x1d0->sync()) { + if (i_this->field_0x1d0 != NULL && !i_this->field_0x1d0->sync()) { return cPhs_INIT_e; } diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 4e87bcef371..18dd48bedea 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -326,7 +326,7 @@ static int phase_1(room_of_scene_class* i_this) { } else { stage_stag_info_class* stagInfo = dComIfGp_getStage()->getStagInfo(); - if (dStage_staginfo_GetArchiveHeap(stagInfo) != NULL) { + if (dStage_staginfo_GetArchiveHeap(stagInfo) != FALSE) { heap = mDoExt_getArchiveHeap(); } } diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp index 6bbd3faa911..6c9281067d8 100644 --- a/src/d/d_select_cursor.cpp +++ b/src/d/d_select_cursor.cpp @@ -102,11 +102,11 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2) switch(mNameIdx) { case 0: - mpPaneMgr = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + mpPaneMgr = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); mpPaneMgr->hide(); mpPaneMgr->setAlpha(0); - static u64 const corner_tag[4] = {'l_u_null', 'l_d_null', 'r_u_null', 'r_d_null'}; + static u64 const corner_tag[4] = {MULTI_CHAR('l_u_null'), MULTI_CHAR('l_d_null'), MULTI_CHAR('r_u_null'), MULTI_CHAR('r_d_null')}; for (int i = 0; i< 4; i++) { field_0x1C[i] = new CPaneMgr(mpScreen, corner_tag[i], 0, NULL); field_0x94[i] = mpScreen->search(corner_tag[i])->getTranslateX(); @@ -120,13 +120,13 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2) field_0x18 = NULL; break; case 1: - mpPaneMgr = new CPaneMgr(mpScreen, 'n_all', 2, NULL); + mpPaneMgr = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); mpPaneMgr->hide(); mpPaneMgr->setAlpha(0); mpPaneMgr->scale(param_1, param_1); - field_0x14 = new CPaneMgr(mpScreen, 'sel_po00', 0, NULL); + field_0x14 = new CPaneMgr(mpScreen, MULTI_CHAR('sel_po00'), 0, NULL); field_0x14->hide(); - field_0x18 = new CPaneMgr(mpScreen, 'n_all2', 2, NULL); + field_0x18 = new CPaneMgr(mpScreen, MULTI_CHAR('n_all2'), 2, NULL); break; case 2: mpPaneMgr = new CPaneMgr(mpScreen, 'Null', 2, NULL); @@ -137,7 +137,7 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2) field_0x18 = NULL; break; case 3: - mpPaneMgr = new CPaneMgr(mpScreen, 'batsu', 2, NULL); + mpPaneMgr = new CPaneMgr(mpScreen, MULTI_CHAR('batsu'), 2, NULL); mpPaneMgr->hide(); mpPaneMgr->setAlpha(0); mpPaneMgr->scale(param_1, param_1); @@ -181,8 +181,8 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2) field_0x40 = 0.0f; switch(mNameIdx) { case 1: - field_0x50 = mpScreen->search('ssel_ico')->getTranslateX(); - field_0x54 = mpScreen->search('ssel_ico')->getTranslateY(); + field_0x50 = mpScreen->search(MULTI_CHAR('ssel_ico'))->getTranslateX(); + field_0x54 = mpScreen->search(MULTI_CHAR('ssel_ico'))->getTranslateY(); break; case 0: case 2: @@ -395,8 +395,8 @@ void dSelect_cursor_c::setScale(f32 i_scale) { switch (mNameIdx) { case 1: - field_0x50 = mpScreen->search('ssel_ico')->getTranslateX(); - field_0x54 = mpScreen->search('ssel_ico')->getTranslateY(); + field_0x50 = mpScreen->search(MULTI_CHAR('ssel_ico'))->getTranslateX(); + field_0x54 = mpScreen->search(MULTI_CHAR('ssel_ico'))->getTranslateY(); break; case 0: case 2: @@ -467,14 +467,14 @@ void dSelect_cursor_c::setBpkAnimation(J2DAnmColor* param_0) { break; } case 2: - mpScreen->search('light')->setAnimation(param_0); - mpScreen->search('back_l')->setAnimation(param_0); + mpScreen->search(MULTI_CHAR('light'))->setAnimation(param_0); + mpScreen->search(MULTI_CHAR('back_l'))->setAnimation(param_0); break; case 3: - mpScreen->search('batsu')->setAnimation(param_0); + mpScreen->search(MULTI_CHAR('batsu'))->setAnimation(param_0); break; default: - mpScreen->search('light00')->setAnimation(param_0); + mpScreen->search(MULTI_CHAR('light00'))->setAnimation(param_0); break; } } @@ -483,7 +483,7 @@ void dSelect_cursor_c::setBtk0Animation(J2DAnmTextureSRTKey* param_0) { switch (mNameIdx) { case 0: { static u64 const tag_4197[8] = { - 'i_c_ld1', 'i_c_ld2', 'i_c_lu1', 'i_c_lu2', 'i_c_rd1', 'i_c_rd2', 'i_c_ru1', 'i_c_ru2', + MULTI_CHAR('i_c_ld1'), MULTI_CHAR('i_c_ld2'), MULTI_CHAR('i_c_lu1'), MULTI_CHAR('i_c_lu2'), MULTI_CHAR('i_c_rd1'), MULTI_CHAR('i_c_rd2'), MULTI_CHAR('i_c_ru1'), MULTI_CHAR('i_c_ru2'), }; for (int i = 0; i < 8; i++) { mpScreen->search(tag_4197[i])->setAnimation(param_0); @@ -491,14 +491,14 @@ void dSelect_cursor_c::setBtk0Animation(J2DAnmTextureSRTKey* param_0) { break; } case 1: { - static u64 const tag_4204[2] = {'gold01', 'gold02'}; + static u64 const tag_4204[2] = {MULTI_CHAR('gold01'), MULTI_CHAR('gold02')}; for (int i = 0; i < 2; i++) { mpScreen->search(tag_4204[i])->setAnimation(param_0); } break; } default: - mpScreen->search('gold01')->setAnimation(param_0); + mpScreen->search(MULTI_CHAR('gold01'))->setAnimation(param_0); break; } } @@ -527,15 +527,15 @@ void dSelect_cursor_c::setCursorAnimation() { field_0x84[i] = mParam2 * (field_0xa4[i] * ((1.0f - param3) + fVar2 * param3)); } - moveCenter(mpScreen->search('l_u_null'), field_0x74[0], field_0x84[0]); - moveCenter(mpScreen->search('l_d_null'), field_0x74[1], field_0x84[1]); - moveCenter(mpScreen->search('r_u_null'), field_0x74[2], field_0x84[2]); - moveCenter(mpScreen->search('r_d_null'), field_0x74[3], field_0x84[3]); + moveCenter(mpScreen->search(MULTI_CHAR('l_u_null')), field_0x74[0], field_0x84[0]); + moveCenter(mpScreen->search(MULTI_CHAR('l_d_null')), field_0x74[1], field_0x84[1]); + moveCenter(mpScreen->search(MULTI_CHAR('r_u_null')), field_0x74[2], field_0x84[2]); + moveCenter(mpScreen->search(MULTI_CHAR('r_d_null')), field_0x74[3], field_0x84[3]); } void dSelect_cursor_c::setBckAnimation(J2DAnmTransformKey* param_0) { - mpScreen->search('ssel_ico')->setAnimation((J2DAnmTransform*)param_0); + mpScreen->search(MULTI_CHAR('ssel_ico'))->setAnimation((J2DAnmTransform*)param_0); } void dSelect_cursor_c::moveCenter(J2DPane* i_pane, f32 i_x, f32 i_y) { diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 22e7b00c64b..cd0fcd0958b 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -2456,10 +2456,10 @@ static int dStage_elstInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, } static void dKankyo_create() { - fopKyM_fastCreate(PROC_KANKYO, NULL, NULL, NULL, NULL); - fopKyM_fastCreate(PROC_KYEFF, NULL, NULL, NULL, NULL); - fopKyM_fastCreate(PROC_KYEFF2, NULL, NULL, NULL, NULL); - fopKyM_fastCreate(PROC_ENVSE, NULL, NULL, NULL, NULL); + fopKyM_fastCreate(PROC_KANKYO, 0, NULL, NULL, NULL); + fopKyM_fastCreate(PROC_KYEFF, 0, NULL, NULL, NULL); + fopKyM_fastCreate(PROC_KYEFF2, 0, NULL, NULL, NULL); + fopKyM_fastCreate(PROC_ENVSE, 0, NULL, NULL, NULL); } static void layerMemoryInfoLoader(void* i_data, dStage_dt_c* i_stage, int param_2) { @@ -2710,7 +2710,7 @@ void dStage_Create() { JUT_ASSERT(4517, status); } - *dStage_roomControl_c::getDemoArcName() = NULL; + *dStage_roomControl_c::getDemoArcName() = 0; dKankyo_create(); if (dComIfG_getStageRes("vrbox_sora.bmd")) { @@ -2725,7 +2725,7 @@ void dStage_Delete() { OS_REPORT("dStage_Delete\n"); char* demoArcName = dStage_roomControl_c::getDemoArcName(); - if (*demoArcName != NULL) { + if (*demoArcName != '\0') { dComIfG_deleteObjectResMain(demoArcName); } diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 4ae3a54280e..5dc02014833 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -603,17 +603,17 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { mpGetInBck = (J2DAnmTransform*)J2DAnmLoaderDataBase::load( JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpArchive)); - mpGetInParent = new CPaneMgr(mpGetInScreen, 'get_in_n', 2, NULL); + mpGetInParent = new CPaneMgr(mpGetInScreen, MULTI_CHAR('get_in_n'), 2, NULL); JUT_ASSERT(0, mpGetInParent != NULL); - mpGetInRoot = new CPaneMgr(mpGetInScreen, 'n_all', 0, NULL); + mpGetInRoot = new CPaneMgr(mpGetInScreen, MULTI_CHAR('n_all'), 0, NULL); JUT_ASSERT(0, mpGetInRoot != NULL); - mpGetInText = new CPaneMgr(mpGetInScreen, 'get_in', 0, NULL); + mpGetInText = new CPaneMgr(mpGetInScreen, MULTI_CHAR('get_in'), 0, NULL); JUT_ASSERT(0, mpGetInText != NULL); - static_cast(mpGetInScreen->search('get_in_s'))->setFont(mDoExt_getMesgFont()); - static_cast(mpGetInScreen->search('get_in'))->setFont(mDoExt_getMesgFont()); + static_cast(mpGetInScreen->search(MULTI_CHAR('get_in_s')))->setFont(mDoExt_getMesgFont()); + static_cast(mpGetInScreen->search(MULTI_CHAR('get_in')))->setFont(mDoExt_getMesgFont()); for (int i = 0; i < 51; i++) { m_getin_info[i].bck_frame = 0.0f; @@ -640,40 +640,40 @@ void dDlst_TimerScrnDraw_c::setScreenBase() { mpParent = NULL; - mpCowParent = new CPaneMgr(mpScreen, 'cow_n', 2, NULL); + mpCowParent = new CPaneMgr(mpScreen, MULTI_CHAR('cow_n'), 2, NULL); JUT_ASSERT(0, mpCowParent != NULL); mpCowParent->setAlphaRate(0.0f); - mpTimeParent = new CPaneMgr(mpScreen, 'time_n', 2, NULL); + mpTimeParent = new CPaneMgr(mpScreen, MULTI_CHAR('time_n'), 2, NULL); JUT_ASSERT(0, mpTimeParent != NULL); mpTimeParent->setAlphaRate(0.0f); - mpImageParent = new CPaneMgr(mpScreen, 'cow_i_n', 2, NULL); + mpImageParent = new CPaneMgr(mpScreen, MULTI_CHAR('cow_i_n'), 2, NULL); JUT_ASSERT(0, mpImageParent != NULL); mpImageParent->setAlphaRate(0.0f); - field_0x5c[0][0] = mpScreen->search('c_n_2'); - field_0x5c[0][1] = mpScreen->search('c_n_2_s'); - field_0x5c[1][0] = mpScreen->search('c_n_1'); - field_0x5c[1][1] = mpScreen->search('c_n_1_s'); - - field_0x6c[0] = static_cast(mpScreen->search('c_n_4')); - field_0x6c[1] = static_cast(mpScreen->search('c_n_4_s')); - field_0x74[0] = static_cast(mpScreen->search('c_n_3')); - field_0x74[1] = static_cast(mpScreen->search('c_n_3_s')); - - mTimerText[0][0] = mpScreen->search('t_n_6'); - mTimerText[0][1] = mpScreen->search('t_n_6_s'); - mTimerText[1][0] = mpScreen->search('t_n_5'); - mTimerText[1][1] = mpScreen->search('t_n_5_s'); - mTimerText[2][0] = mpScreen->search('t_n_4'); - mTimerText[2][1] = mpScreen->search('t_n_4_s'); - mTimerText[3][0] = mpScreen->search('t_n_3'); - mTimerText[3][1] = mpScreen->search('t_n_3_s'); - mTimerText[4][0] = mpScreen->search('t_n_2'); - mTimerText[4][1] = mpScreen->search('t_n_2_s'); - mTimerText[5][0] = mpScreen->search('t_n_1'); - mTimerText[5][1] = mpScreen->search('t_n_1_s'); + field_0x5c[0][0] = mpScreen->search(MULTI_CHAR('c_n_2')); + field_0x5c[0][1] = mpScreen->search(MULTI_CHAR('c_n_2_s')); + field_0x5c[1][0] = mpScreen->search(MULTI_CHAR('c_n_1')); + field_0x5c[1][1] = mpScreen->search(MULTI_CHAR('c_n_1_s')); + + field_0x6c[0] = static_cast(mpScreen->search(MULTI_CHAR('c_n_4'))); + field_0x6c[1] = static_cast(mpScreen->search(MULTI_CHAR('c_n_4_s'))); + field_0x74[0] = static_cast(mpScreen->search(MULTI_CHAR('c_n_3'))); + field_0x74[1] = static_cast(mpScreen->search(MULTI_CHAR('c_n_3_s'))); + + mTimerText[0][0] = mpScreen->search(MULTI_CHAR('t_n_6')); + mTimerText[0][1] = mpScreen->search(MULTI_CHAR('t_n_6_s')); + mTimerText[1][0] = mpScreen->search(MULTI_CHAR('t_n_5')); + mTimerText[1][1] = mpScreen->search(MULTI_CHAR('t_n_5_s')); + mTimerText[2][0] = mpScreen->search(MULTI_CHAR('t_n_4')); + mTimerText[2][1] = mpScreen->search(MULTI_CHAR('t_n_4_s')); + mTimerText[3][0] = mpScreen->search(MULTI_CHAR('t_n_3')); + mTimerText[3][1] = mpScreen->search(MULTI_CHAR('t_n_3_s')); + mTimerText[4][0] = mpScreen->search(MULTI_CHAR('t_n_2')); + mTimerText[4][1] = mpScreen->search(MULTI_CHAR('t_n_2_s')); + mTimerText[5][0] = mpScreen->search(MULTI_CHAR('t_n_1')); + mTimerText[5][1] = mpScreen->search(MULTI_CHAR('t_n_1_s')); } void dDlst_TimerScrnDraw_c::setScreenBoatRace() { @@ -684,21 +684,21 @@ void dDlst_TimerScrnDraw_c::setScreenBoatRace() { JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); - mpParent = new CPaneMgr(mpScreen, 'ta_co_n', 2, NULL); + mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('ta_co_n'), 2, NULL); JUT_ASSERT(0, mpParent != NULL); - mpCowParent = new CPaneMgr(mpScreen, 'num_n', 2, NULL); + mpCowParent = new CPaneMgr(mpScreen, MULTI_CHAR('num_n'), 2, NULL); JUT_ASSERT(0, mpCowParent != NULL); mpCowParent->setAlphaRate(0.0f); mpTimeParent = NULL; - mpImageParent = new CPaneMgr(mpScreen, 'target_n', 2, NULL); + mpImageParent = new CPaneMgr(mpScreen, MULTI_CHAR('target_n'), 2, NULL); JUT_ASSERT(0, mpImageParent != NULL); mpImageParent->setAlphaRate(0.0f); - mpScreen->search('w_target')->hide(); - mpScreen->search('target')->show(); + mpScreen->search(MULTI_CHAR('w_target'))->hide(); + mpScreen->search(MULTI_CHAR('target'))->show(); for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { @@ -706,9 +706,9 @@ void dDlst_TimerScrnDraw_c::setScreenBoatRace() { } } - field_0x6c[0] = static_cast(mpScreen->search('num_1')); + field_0x6c[0] = static_cast(mpScreen->search(MULTI_CHAR('num_1'))); field_0x6c[1] = NULL; - field_0x74[0] = static_cast(mpScreen->search('num_0')); + field_0x74[0] = static_cast(mpScreen->search(MULTI_CHAR('num_0'))); field_0x74[1] = NULL; for (int i = 0; i < 6; i++) { @@ -728,25 +728,25 @@ void dDlst_TimerScrnDraw_c::setScreenRider() { mpParent = NULL; - mpCowParent = new CPaneMgr(mpScreen, 'num_n', 2, NULL); + mpCowParent = new CPaneMgr(mpScreen, MULTI_CHAR('num_n'), 2, NULL); JUT_ASSERT(0, mpCowParent != NULL); mpCowParent->setAlphaRate(0.0f); mpTimeParent = NULL; - mpImageParent = new CPaneMgr(mpScreen, 'rid_i_n', 2, NULL); + mpImageParent = new CPaneMgr(mpScreen, MULTI_CHAR('rid_i_n'), 2, NULL); JUT_ASSERT(0, mpImageParent != NULL); mpImageParent->setAlphaRate(0.0f); - field_0x5c[0][0] = mpScreen->search('n_n_2'); - field_0x5c[0][1] = mpScreen->search('n_n_2_s'); - field_0x5c[1][0] = mpScreen->search('n_n_1'); - field_0x5c[1][1] = mpScreen->search('n_n_1_s'); + field_0x5c[0][0] = mpScreen->search(MULTI_CHAR('n_n_2')); + field_0x5c[0][1] = mpScreen->search(MULTI_CHAR('n_n_2_s')); + field_0x5c[1][0] = mpScreen->search(MULTI_CHAR('n_n_1')); + field_0x5c[1][1] = mpScreen->search(MULTI_CHAR('n_n_1_s')); - field_0x6c[0] = static_cast(mpScreen->search('n_n_4')); - field_0x6c[1] = static_cast(mpScreen->search('n_n_4_s')); - field_0x74[0] = static_cast(mpScreen->search('n_n_3')); - field_0x74[1] = static_cast(mpScreen->search('n_n_3_s')); + field_0x6c[0] = static_cast(mpScreen->search(MULTI_CHAR('n_n_4'))); + field_0x6c[1] = static_cast(mpScreen->search(MULTI_CHAR('n_n_4_s'))); + field_0x74[0] = static_cast(mpScreen->search(MULTI_CHAR('n_n_3'))); + field_0x74[1] = static_cast(mpScreen->search(MULTI_CHAR('n_n_3_s'))); for (int i = 0; i < 6; i++) { for (int j = 0; j < 2; j++) { @@ -765,10 +765,10 @@ void dDlst_TimerScrnDraw_c::hideDenominator() { } if (field_0x3C8 == 8) { - mpScreen->search('n_sl_s')->hide(); + mpScreen->search(MULTI_CHAR('n_sl_s'))->hide(); mpScreen->search('n_sl')->hide(); } else { - J2DPane* sl_s = mpScreen->search('c_sl_s'); + J2DPane* sl_s = mpScreen->search(MULTI_CHAR('c_sl_s')); J2DPane* sl = mpScreen->search('c_sl'); if (sl_s != NULL) { @@ -1221,8 +1221,8 @@ BOOL dDlst_TimerScrnDraw_c::closeAnime() { int dDlst_TimerScrnDraw_c::createGetIn(cXyz i_pos) { char string[104]; dMeter2Info_getString(0x3E4, string, NULL); // "GOAT IN!" - strcpy(static_cast(mpGetInScreen->search('get_in_s'))->getStringPtr(), string); - strcpy(static_cast(mpGetInScreen->search('get_in'))->getStringPtr(), string); + strcpy(static_cast(mpGetInScreen->search(MULTI_CHAR('get_in_s')))->getStringPtr(), string); + strcpy(static_cast(mpGetInScreen->search(MULTI_CHAR('get_in')))->getStringPtr(), string); if (mCowID < 50) { m_getin_info[mCowID].bck_frame = 40.0f; @@ -1310,8 +1310,8 @@ int dDlst_TimerScrnDraw_c::createGetIn(cXyz i_pos) { s32 dDlst_TimerScrnDraw_c::createStart(u16 i_messageID) { char string[112]; dMeter2Info_getString(i_messageID, string, NULL); - strcpy(static_cast(mpGetInScreen->search('get_in_s'))->getStringPtr(), string); - strcpy(static_cast(mpGetInScreen->search('get_in'))->getStringPtr(), string); + strcpy(static_cast(mpGetInScreen->search(MULTI_CHAR('get_in_s')))->getStringPtr(), string); + strcpy(static_cast(mpGetInScreen->search(MULTI_CHAR('get_in')))->getStringPtr(), string); if (mCowID == 0) { m_getin_info[mCowID].bck_frame = 40.0f; diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp index ba1f3221396..5a67aa5b9d4 100644 --- a/src/f_op/f_op_scene_mng.cpp +++ b/src/f_op/f_op_scene_mng.cpp @@ -28,11 +28,11 @@ fpc_ProcID fopScnM_DeleteReq(scene_class* i_scene) { return fopScnRq_Request(1, i_scene, 0x7FFF, NULL, 0x7FFF, 0) != fpcM_ERROR_PROCESS_ID_e; } -int fopScnM_CreateReq(s16 i_procName, s16 param_2, u16 param_3, u32 i_data) { +int fopScnM_CreateReq(s16 i_procName, s16 param_2, u16 param_3, uintptr_t i_data) { return fopScnRq_Request(0, 0, i_procName, (void*)i_data, param_2, param_3) != fpcM_ERROR_PROCESS_ID_e; } -u32 fopScnM_ReRequest(s16 i_procName, u32 i_data) { +u32 fopScnM_ReRequest(s16 i_procName, uintptr_t i_data) { if (l_scnRqID == fpcM_ERROR_PROCESS_ID_e) { return 0; } diff --git a/src/f_pc/f_pc_pause.cpp b/src/f_pc/f_pc_pause.cpp index a3484d1c7ca..60515726b0b 100644 --- a/src/f_pc/f_pc_pause.cpp +++ b/src/f_pc/f_pc_pause.cpp @@ -6,6 +6,7 @@ #include "f_pc/f_pc_pause.h" #include "f_pc/f_pc_node.h" #include "f_pc/f_pc_layer_iter.h" +#include int fpcPause_IsEnable(void* i_proc, u8 i_flag) { if ((((base_process_class*)i_proc)->pause_flag & i_flag) == i_flag) { @@ -20,7 +21,7 @@ int fpcPause_Enable(void* i_proc, u8 i_flag) { if (fpcBs_Is_JustOfType(g_fpcNd_type, ((base_process_class*)i_proc)->subtype)) { fpcLyIt_OnlyHere(&((process_node_class*)i_proc)->layer, (fpcLyIt_OnlyHereFunc)fpcPause_Enable, - (void*)i_flag); + (void*)(uintptr_t)i_flag); } return 1; } @@ -30,7 +31,7 @@ int fpcPause_Disable(void* i_proc, u8 i_flag) { ((base_process_class*)i_proc)->pause_flag &= var_r31; if (fpcBs_Is_JustOfType(g_fpcNd_type, ((base_process_class*)i_proc)->subtype)) { - fpcLyIt_OnlyHere(&((process_node_class*)i_proc)->layer, (fpcLyIt_OnlyHereFunc)fpcPause_Disable, (void*)i_flag); + fpcLyIt_OnlyHere(&((process_node_class*)i_proc)->layer, (fpcLyIt_OnlyHereFunc)fpcPause_Disable, (void*)(uintptr_t)i_flag); } return 1; diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp index fd478e51a19..e2a062d2049 100644 --- a/src/m_Do/m_Do_Reset.cpp +++ b/src/m_Do/m_Do_Reset.cpp @@ -99,7 +99,7 @@ void mDoRst_reset(int reset, u32 resetCode, int forceMenu) { } void checkDiskCallback(s32 result, DVDCommandBlock* block) { - block->userData = (void*)result; + block->userData = (void*)(intptr_t)result; } void mDoRst_resetCallBack(int port, void*) { diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 310fe4f5b1c..26f86522117 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -3713,7 +3713,7 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u3 bool hasSharedDlistObj = i_modelData->getMaterialNodePointer(0)->getSharedDisplayListObj() != NULL; // Update the modelFlag if the model data passed in has a shared dlist object - if (hasSharedDlistObj != NULL) { + if (hasSharedDlistObj != false) { if (i_modelData->isLocked()) { i_modelFlag = J3DMdlFlag_UseSharedDL; } else if (i_modelFlag == J3DMdlFlag_UseSharedDL) { diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index 08ede9161a4..1223da03a1c 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -580,7 +580,7 @@ static void fault_callback_scroll(u16, OSContext* p_context, u32, u32) { JUTException* manager = JUTException::getManager(); JUTConsole* exConsole = manager->getConsole(); - u32 srr0 = p_context->srr0 & -4; + uintptr_t srr0 = p_context->srr0 & -4; if (srr0 >= 0x8000000C && srr0 < 0x82FFFFFF) { exConsole->print_f("(SRR0-3):%08X %08X %08X %08X\n", *(u32*)(srr0 - 0xC), *(u32*)(srr0 - 0x8), *(u32*)(srr0 - 0x4), *(u32*)srr0); From 80e603b7c3370287230e86c2fc870c3d434654ea Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sun, 1 Mar 2026 09:38:55 -0700 Subject: [PATCH 12/35] gdb checkpoint --- .gdbinit | 5 + .vscode/launch.json | 32 + configure.py | 15 + include/gz/gz_menu_settings.h | 2 + include/umbra/umbra_gdb.h | 17 + include/umbra/umbra_net.h | 2 + include/umbra/umbra_nintendont.h | 2 + mod_config.py | 1 + .../MetroTRK/Processor/ppc/Generic/targimpl.c | 3 + src/gz/gz.cpp | 5 + src/gz/gz_menu_settings.cpp | 13 + src/umbra/umbra_gdb.cpp | 632 ++++++++++++++++++ src/umbra/umbra_net.cpp | 24 + tools/gen_gdb_rel_loader.py | 168 +++++ 14 files changed, 921 insertions(+) create mode 100644 .gdbinit create mode 100644 .vscode/launch.json create mode 100644 include/umbra/umbra_gdb.h create mode 100644 src/umbra/umbra_gdb.cpp create mode 100644 tools/gen_gdb_rel_loader.py diff --git a/.gdbinit b/.gdbinit new file mode 100644 index 00000000000..14b6f187fc1 --- /dev/null +++ b/.gdbinit @@ -0,0 +1,5 @@ +set confirm off +file build/GZ2E01/framework.elf +source build/GZ2E01/load_rel_symbols.gdb +target remote 192.168.86.208:2159 +load-all-symbols diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000000..12294c81e01 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,32 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Attach to Nintendont GDB", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/build/GZ2E01/framework.elf", + "cwd": "${workspaceFolder}", + "MIMode": "gdb", + "miDebuggerPath": "/opt/devkitpro/devkitPPC/bin/powerpc-eabi-gdb", + "miDebuggerServerAddress": "192.168.86.208:2159", + "stopAtConnect": true, + "setupCommands": [ + { + "text": "set confirm off", + "ignoreFailures": false + }, + { + "text": "source ${workspaceFolder}/build/GZ2E01/load_rel_symbols.gdb", + "ignoreFailures": false + } + ], + "postRemoteConnectCommands": [ + { + "text": "load-all-symbols", + "ignoreFailures": false + } + ] + } + ] +} diff --git a/configure.py b/configure.py index a6c0b26fa60..a9452d43647 100755 --- a/configure.py +++ b/configure.py @@ -3074,6 +3074,21 @@ def link_order_callback(module_id: int, objects: List[str]) -> List[str]: "implicit": [ldscript_path, "build/binutils", "tools/patch_forceactive.py"], }) +# Generate GDB REL symbol loader script after all PLFs are linked +if config.non_matching: + gdb_loader_out = f"build/{version}/load_rel_symbols.gdb" + config.custom_build_rules.append({ + "name": "gen_gdb_rel_loader", + "command": f"$python tools/gen_gdb_rel_loader.py build/{version}", + "description": "GDB REL LOADER $out", + }) + config.custom_build_steps.setdefault("post-build", []).append({ + "outputs": gdb_loader_out, + "rule": "gen_gdb_rel_loader", + "inputs": [f"build/{version}/config.json"], + "implicit": ["tools/gen_gdb_rel_loader.py"], + }) + # Optional extra categories for progress tracking config.progress_categories = [ ProgressCategory("game", "TP Game Code"), diff --git a/include/gz/gz_menu_settings.h b/include/gz/gz_menu_settings.h index 48a244fd2ad..ac3dac1e4fc 100644 --- a/include/gz/gz_menu_settings.h +++ b/include/gz/gz_menu_settings.h @@ -21,6 +21,7 @@ class gzSettingsMenu_c : public gzMenu_c { // Actions SETTING_COMMAND_COMBOS, SETTING_MENU_POSITIONS, + SETTING_GDB_SERVER, SETTING_SAVE, SETTING_LOAD, SETTING_DELETE, @@ -87,6 +88,7 @@ class gzSettingsMenu_c : public gzMenu_c { // Actions gzLine* mpCommandCombos; gzLine* mpMenuPositions; + gzLine* mpGdbServer; gzLine* mpSave; gzLine* mpLoad; gzLine* mpDelete; diff --git a/include/umbra/umbra_gdb.h b/include/umbra/umbra_gdb.h new file mode 100644 index 00000000000..afa59d5759f --- /dev/null +++ b/include/umbra/umbra_gdb.h @@ -0,0 +1,17 @@ +#ifndef UMBRA_GDB_H +#define UMBRA_GDB_H + +#ifdef __cplusplus +extern "C" { +#endif + +void umbra_gdb_trk_hook(void); +void umbra_gdb_install_crash_handlers(void); +void umbra_gdb_auto_start(void); +void umbra_gdb_poll(void); + +#ifdef __cplusplus +} +#endif + +#endif /* UMBRA_GDB_H */ diff --git a/include/umbra/umbra_net.h b/include/umbra/umbra_net.h index 71dc35ab2bd..50f7e852ee5 100644 --- a/include/umbra/umbra_net.h +++ b/include/umbra/umbra_net.h @@ -13,6 +13,8 @@ class umbraNet { int stateWrite(const void* data, u32 len); int stateRead(void* buf, u32 maxLen); + int gdbStart(u16 port); + static u32 makeIP(u8 a, u8 b, u8 c, u8 d) { return ((u32)a << 24) | ((u32)b << 16) | ((u32)c << 8) | (u32)d; } diff --git a/include/umbra/umbra_nintendont.h b/include/umbra/umbra_nintendont.h index 9276a645ab5..784c8386684 100644 --- a/include/umbra/umbra_nintendont.h +++ b/include/umbra/umbra_nintendont.h @@ -17,6 +17,8 @@ #define UMBRA_CMD_NET_STATE_WRITE 0x07 #define UMBRA_CMD_NET_STATE_READ 0x08 #define UMBRA_CMD_NET_DISCONNECT 0x09 +#define UMBRA_CMD_GDB_START 0x0A +#define UMBRA_CMD_GDB_ARM_CRASH 0x0B #define UMBRA_CMD_WORD(cmd) (((u32)UMBRA_MAGIC << 16) | ((u32)(cmd) << 8)) diff --git a/mod_config.py b/mod_config.py index d506b13ab57..ca9aeb312f7 100644 --- a/mod_config.py +++ b/mod_config.py @@ -66,4 +66,5 @@ "umbra/umbra_nintendont.cpp", "umbra/umbra_storage.cpp", "umbra/umbra_net.cpp", + "umbra/umbra_gdb.cpp", ] diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c index b570022d2b2..b9872a0ab47 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c @@ -1,5 +1,6 @@ #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" +#include "umbra/umbra_gdb.h" #include #include @@ -392,6 +393,8 @@ void TRKPostInterruptEvent(void) { size_t registerSize; TRKEvent event; + umbra_gdb_trk_hook(); + if (gTRKState.inputActivated) { gTRKState.inputActivated = FALSE; } else { diff --git a/src/gz/gz.cpp b/src/gz/gz.cpp index ffb6f4fe5c6..dfc64e48ae1 100644 --- a/src/gz/gz.cpp +++ b/src/gz/gz.cpp @@ -17,6 +17,8 @@ #include "dolphin/gx/GXGet.h" #include +#include "umbra/umbra_gdb.h" + gzInfo_c g_gzInfo; void gzInfo_c::startIconPreload() { @@ -521,6 +523,8 @@ int gzInfo_c::execute() { #ifndef __REVOLUTION_SDK__ umbraDetectPlatform(); #endif + umbra_gdb_install_crash_handlers(); + int settingsResult = loadSettings(); mGZInitialized = true; @@ -539,6 +543,7 @@ int gzInfo_c::execute() { return 0; } + umbra_gdb_poll(); pollIconPreload(); if (mpSetupWizard != NULL) { diff --git a/src/gz/gz_menu_settings.cpp b/src/gz/gz_menu_settings.cpp index 0595e647f30..148c5b7a34b 100644 --- a/src/gz/gz_menu_settings.cpp +++ b/src/gz/gz_menu_settings.cpp @@ -105,6 +105,7 @@ gzSettingsMenu_c::gzSettingsMenu_c() { // Actions mpCommandCombos = new (gzHeap(GZ_GROUP_MENU), 4) gzLine("command combos", "change default command combos"); mpMenuPositions = new (gzHeap(GZ_GROUP_MENU), 4) gzLine("menu positions", "set positions of overlay menus"); + mpGdbServer = new (gzHeap(GZ_GROUP_MENU), 4) gzLine("start gdb server", "start listening for gdb on port 2159"); mpSave = new (gzHeap(GZ_GROUP_MENU), 4) gzLine("save settings", "saves tpgz settings"); mpLoad = new (gzHeap(GZ_GROUP_MENU), 4) gzLine("load settings", "loads tpgz settings"); mpDelete = new (gzHeap(GZ_GROUP_MENU), 4) gzLine("delete settings", "deletes tpgz settings"); @@ -122,6 +123,7 @@ gzSettingsMenu_c::gzSettingsMenu_c() { mpLines[SETTING_THEME] = mpTheme; mpLines[SETTING_COMMAND_COMBOS] = mpCommandCombos; mpLines[SETTING_MENU_POSITIONS] = mpMenuPositions; + mpLines[SETTING_GDB_SERVER] = mpGdbServer; mpLines[SETTING_SAVE] = mpSave; mpLines[SETTING_LOAD] = mpLoad; mpLines[SETTING_DELETE] = mpDelete; @@ -180,6 +182,9 @@ void gzSettingsMenu_c::_delete() { delete mpMenuPositions; mpMenuPositions = NULL; + delete mpGdbServer; + mpGdbServer = NULL; + delete mpSave; mpSave = NULL; @@ -246,6 +251,14 @@ void gzSettingsMenu_c::execute() { gzInfo_sendNotification("test!", 2); gzInfo_sendNotification("test2!"); break; + case SETTING_GDB_SERVER: + if (g_gzInfo.mNet.gdbStart(2159) == 0) { + gzInfo_sendNotification("gdb server started on port 2159"); + } else { + gzInfo_sendNotification("failed to start gdb server"); + } + gzInfo_seStart(Z2SE_SY_CURSOR_OK); + break; case SETTING_RETURN_TO_LOADER: mpConfirm = new (gzHeap(GZ_GROUP_UI), 4) gzConfirm_c(returnToLoaderConfirmCb, returnToLoaderReturnCb, this, "return to loader?"); gzInfo_seStart(Z2SE_SY_CURSOR_OK); diff --git a/src/umbra/umbra_gdb.cpp b/src/umbra/umbra_gdb.cpp new file mode 100644 index 00000000000..75e051e1b25 --- /dev/null +++ b/src/umbra/umbra_gdb.cpp @@ -0,0 +1,632 @@ +/* Do NOT include d/dolzel.h — conflicts with targimpl.h struct definitions */ + +#include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" +#include +#include +#include +#include + +#include "umbra/umbra_gdb.h" +#include "umbra/umbra_nintendont.h" +#include "umbra/umbra_platform.h" + +extern "C" { + void* VIGetCurrentFrameBuffer(void); + void OSReport(const char* msg, ...); + void AIStopDMA(void); + void AIStartDMA(void); + BOOL OSDisableInterrupts(void); +} + +/* Must match kernel/gdb.h */ + +#define GDB_SHM_BASE ((volatile u32*)0x93003600) +#define GDB_SHM_SIZE 512 + +#define GDB_SHM_MAGIC 0x47444253 /* "GDBS" */ + +#define GDB_STATE_IDLE 0 +#define GDB_STATE_STOPPED 1 +#define GDB_STATE_RESUME 2 +#define GDB_STATE_STEP 3 +#define GDB_STATE_DETACH 4 + +#define SHM_MAGIC 0 +#define SHM_STATE 1 +#define SHM_STOP_REASON 2 +#define SHM_SIGNAL 3 +#define SHM_GPR_BASE 4 +#define SHM_PC 36 +#define SHM_LR 37 +#define SHM_CR 38 +#define SHM_CTR 39 +#define SHM_XER 40 +#define SHM_MSR 41 +#define SHM_FPR_BYTE_OFF 0x0A8 +#define SHM_FPSCR_BYTE_OFF 0x1A8 +#define SHM_HALT_REQ 108 + +#define MSR_SE (1 << 10) + +#define SI_C0INBUFH (*(volatile u32*)0xCC006404) +#define PAD_TRIGGER_Z 0x0010 + +/* 8x8 bitmap font, ASCII 0x20-0x7E */ +static const u8 font8x8[95][8] = { + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, /* */ + {0x18,0x3C,0x3C,0x18,0x18,0x00,0x18,0x00}, /* ! */ + {0x36,0x36,0x00,0x00,0x00,0x00,0x00,0x00}, /* " */ + {0x36,0x7F,0x36,0x36,0x36,0x7F,0x36,0x00}, /* # */ + {0x0C,0x3E,0x03,0x1E,0x30,0x1F,0x0C,0x00}, /* $ */ + {0x00,0x63,0x33,0x18,0x0C,0x66,0x63,0x00}, /* % */ + {0x1C,0x36,0x1C,0x6E,0x3B,0x33,0x6E,0x00}, /* & */ + {0x06,0x06,0x03,0x00,0x00,0x00,0x00,0x00}, /* ' */ + {0x18,0x0C,0x06,0x06,0x06,0x0C,0x18,0x00}, /* ( */ + {0x06,0x0C,0x18,0x18,0x18,0x0C,0x06,0x00}, /* ) */ + {0x00,0x66,0x3C,0xFF,0x3C,0x66,0x00,0x00}, /* * */ + {0x00,0x0C,0x0C,0x3F,0x0C,0x0C,0x00,0x00}, /* + */ + {0x00,0x00,0x00,0x00,0x00,0x0C,0x0C,0x06}, /* , */ + {0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x00}, /* - */ + {0x00,0x00,0x00,0x00,0x00,0x0C,0x0C,0x00}, /* . */ + {0x60,0x30,0x18,0x0C,0x06,0x03,0x01,0x00}, /* / */ + {0x3E,0x63,0x73,0x7B,0x6F,0x67,0x3E,0x00}, /* 0 */ + {0x0C,0x0E,0x0C,0x0C,0x0C,0x0C,0x3F,0x00}, /* 1 */ + {0x1E,0x33,0x30,0x1C,0x06,0x33,0x3F,0x00}, /* 2 */ + {0x1E,0x33,0x30,0x1C,0x30,0x33,0x1E,0x00}, /* 3 */ + {0x38,0x3C,0x36,0x33,0x7F,0x30,0x78,0x00}, /* 4 */ + {0x3F,0x03,0x1F,0x30,0x30,0x33,0x1E,0x00}, /* 5 */ + {0x1C,0x06,0x03,0x1F,0x33,0x33,0x1E,0x00}, /* 6 */ + {0x3F,0x33,0x30,0x18,0x0C,0x0C,0x0C,0x00}, /* 7 */ + {0x1E,0x33,0x33,0x1E,0x33,0x33,0x1E,0x00}, /* 8 */ + {0x1E,0x33,0x33,0x3E,0x30,0x18,0x0E,0x00}, /* 9 */ + {0x00,0x0C,0x0C,0x00,0x00,0x0C,0x0C,0x00}, /* : */ + {0x00,0x0C,0x0C,0x00,0x00,0x0C,0x0C,0x06}, /* ; */ + {0x18,0x0C,0x06,0x03,0x06,0x0C,0x18,0x00}, /* < */ + {0x00,0x00,0x3F,0x00,0x00,0x3F,0x00,0x00}, /* = */ + {0x06,0x0C,0x18,0x30,0x18,0x0C,0x06,0x00}, /* > */ + {0x1E,0x33,0x30,0x18,0x0C,0x00,0x0C,0x00}, /* ? */ + {0x3E,0x63,0x7B,0x7B,0x7B,0x03,0x1E,0x00}, /* @ */ + {0x0C,0x1E,0x33,0x33,0x3F,0x33,0x33,0x00}, /* A */ + {0x3F,0x66,0x66,0x3E,0x66,0x66,0x3F,0x00}, /* B */ + {0x3C,0x66,0x03,0x03,0x03,0x66,0x3C,0x00}, /* C */ + {0x1F,0x36,0x66,0x66,0x66,0x36,0x1F,0x00}, /* D */ + {0x7F,0x46,0x16,0x1E,0x16,0x46,0x7F,0x00}, /* E */ + {0x7F,0x46,0x16,0x1E,0x16,0x06,0x0F,0x00}, /* F */ + {0x3C,0x66,0x03,0x03,0x73,0x66,0x7C,0x00}, /* G */ + {0x33,0x33,0x33,0x3F,0x33,0x33,0x33,0x00}, /* H */ + {0x1E,0x0C,0x0C,0x0C,0x0C,0x0C,0x1E,0x00}, /* I */ + {0x78,0x30,0x30,0x30,0x33,0x33,0x1E,0x00}, /* J */ + {0x67,0x66,0x36,0x1E,0x36,0x66,0x67,0x00}, /* K */ + {0x0F,0x06,0x06,0x06,0x46,0x66,0x7F,0x00}, /* L */ + {0x63,0x77,0x7F,0x7F,0x6B,0x63,0x63,0x00}, /* M */ + {0x63,0x67,0x6F,0x7B,0x73,0x63,0x63,0x00}, /* N */ + {0x1C,0x36,0x63,0x63,0x63,0x36,0x1C,0x00}, /* O */ + {0x3F,0x66,0x66,0x3E,0x06,0x06,0x0F,0x00}, /* P */ + {0x1E,0x33,0x33,0x33,0x3B,0x1E,0x38,0x00}, /* Q */ + {0x3F,0x66,0x66,0x3E,0x36,0x66,0x67,0x00}, /* R */ + {0x1E,0x33,0x07,0x0E,0x38,0x33,0x1E,0x00}, /* S */ + {0x3F,0x2D,0x0C,0x0C,0x0C,0x0C,0x1E,0x00}, /* T */ + {0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x00}, /* U */ + {0x33,0x33,0x33,0x33,0x33,0x1E,0x0C,0x00}, /* V */ + {0x63,0x63,0x63,0x6B,0x7F,0x77,0x63,0x00}, /* W */ + {0x63,0x63,0x36,0x1C,0x1C,0x36,0x63,0x00}, /* X */ + {0x33,0x33,0x33,0x1E,0x0C,0x0C,0x1E,0x00}, /* Y */ + {0x7F,0x63,0x31,0x18,0x4C,0x66,0x7F,0x00}, /* Z */ + {0x1E,0x06,0x06,0x06,0x06,0x06,0x1E,0x00}, /* [ */ + {0x03,0x06,0x0C,0x18,0x30,0x60,0x40,0x00}, /* \ */ + {0x1E,0x18,0x18,0x18,0x18,0x18,0x1E,0x00}, /* ] */ + {0x08,0x1C,0x36,0x63,0x00,0x00,0x00,0x00}, /* ^ */ + {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF}, /* _ */ + {0x0C,0x0C,0x18,0x00,0x00,0x00,0x00,0x00}, /* ` */ + {0x00,0x00,0x1E,0x30,0x3E,0x33,0x6E,0x00}, /* a */ + {0x07,0x06,0x06,0x3E,0x66,0x66,0x3B,0x00}, /* b */ + {0x00,0x00,0x1E,0x33,0x03,0x33,0x1E,0x00}, /* c */ + {0x38,0x30,0x30,0x3E,0x33,0x33,0x6E,0x00}, /* d */ + {0x00,0x00,0x1E,0x33,0x3F,0x03,0x1E,0x00}, /* e */ + {0x1C,0x36,0x06,0x0F,0x06,0x06,0x0F,0x00}, /* f */ + {0x00,0x00,0x6E,0x33,0x33,0x3E,0x30,0x1F}, /* g */ + {0x07,0x06,0x36,0x6E,0x66,0x66,0x67,0x00}, /* h */ + {0x0C,0x00,0x0E,0x0C,0x0C,0x0C,0x1E,0x00}, /* i */ + {0x30,0x00,0x30,0x30,0x30,0x33,0x33,0x1E}, /* j */ + {0x07,0x06,0x66,0x36,0x1E,0x36,0x67,0x00}, /* k */ + {0x0E,0x0C,0x0C,0x0C,0x0C,0x0C,0x1E,0x00}, /* l */ + {0x00,0x00,0x33,0x7F,0x7F,0x6B,0x63,0x00}, /* m */ + {0x00,0x00,0x1F,0x33,0x33,0x33,0x33,0x00}, /* n */ + {0x00,0x00,0x1E,0x33,0x33,0x33,0x1E,0x00}, /* o */ + {0x00,0x00,0x3B,0x66,0x66,0x3E,0x06,0x0F}, /* p */ + {0x00,0x00,0x6E,0x33,0x33,0x3E,0x30,0x78}, /* q */ + {0x00,0x00,0x3B,0x6E,0x66,0x06,0x0F,0x00}, /* r */ + {0x00,0x00,0x3E,0x03,0x1E,0x30,0x1F,0x00}, /* s */ + {0x08,0x0C,0x3E,0x0C,0x0C,0x2C,0x18,0x00}, /* t */ + {0x00,0x00,0x33,0x33,0x33,0x33,0x6E,0x00}, /* u */ + {0x00,0x00,0x33,0x33,0x33,0x1E,0x0C,0x00}, /* v */ + {0x00,0x00,0x63,0x6B,0x7F,0x7F,0x36,0x00}, /* w */ + {0x00,0x00,0x63,0x36,0x1C,0x36,0x63,0x00}, /* x */ + {0x00,0x00,0x33,0x33,0x33,0x3E,0x30,0x1F}, /* y */ + {0x00,0x00,0x3F,0x19,0x0C,0x26,0x3F,0x00}, /* z */ + {0x38,0x0C,0x0C,0x07,0x0C,0x0C,0x38,0x00}, /* { */ + {0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x00}, /* | */ + {0x07,0x0C,0x0C,0x38,0x0C,0x0C,0x07,0x00}, /* } */ + {0x6E,0x3B,0x00,0x00,0x00,0x00,0x00,0x00}, /* ~ */ +}; + +/* XFB YUYV: [Y0][Cb][Y1][Cr] per 2 pixels */ +static void draw_glyph(u8* xfb, int xfb_stride, int px, int py, char c) { + if (c < 0x20 || c > 0x7E) + return; + const u8* glyph = font8x8[c - 0x20]; + for (int row = 0; row < 8; row++) { + u8 bits = glyph[row]; + u8* line = xfb + (py + row) * xfb_stride; + for (int col = 0; col < 8; col++) { + if (bits & (0x80 >> col)) { + int x = px + col; + line[x * 2] = 235; + if (x & 1) { + line[x * 2 - 1] = 128; + line[x * 2 + 1] = 128; + } else { + line[x * 2 + 1] = 128; + if (x * 2 + 3 < xfb_stride) + line[x * 2 + 3] = 128; + } + } + } + } +} + +static int draw_string(u8* xfb, int xfb_stride, int px, int py, const char* str) { + int x = px; + while (*str) { + if (*str == '\n') { + py += 10; + x = px; + str++; + continue; + } + draw_glyph(xfb, xfb_stride, x, py, *str); + x += 8; + str++; + } + return x; +} + +static void draw_hex32(u8* xfb, int xfb_stride, int px, int py, u32 val) { + const char* hex = "0123456789ABCDEF"; + char buf[9]; + for (int i = 7; i >= 0; i--) { + buf[i] = hex[val & 0xF]; + val >>= 4; + } + buf[8] = '\0'; + draw_string(xfb, xfb_stride, px, py, buf); +} + +static u32 exception_to_signal(u32 exception_id) { + switch (exception_id & 0xFFFF) { + case 0x0200: return 11; /* SIGSEGV */ + case 0x0300: return 11; /* SIGSEGV */ + case 0x0400: return 11; /* SIGSEGV */ + case 0x0500: return 2; /* SIGINT */ + case 0x0600: return 11; /* SIGSEGV */ + case 0x0700: return 5; /* SIGTRAP */ + case 0x0800: return 8; /* SIGFPE */ + case 0x0900: return 14; /* SIGALRM */ + case 0x0D00: return 5; /* SIGTRAP */ + default: return 5; /* SIGTRAP */ + } +} + +static const char* exception_name(u32 exception_id) { + switch (exception_id & 0xFFFF) { + case 0x0200: return "Machine Check"; + case 0x0300: return "DSI"; + case 0x0400: return "ISI"; + case 0x0500: return "External Interrupt"; + case 0x0600: return "Alignment"; + case 0x0700: return "Program"; + case 0x0800: return "FP Unavailable"; + case 0x0900: return "Decrementer"; + case 0x0D00: return "Trace"; + default: return "Unknown"; + } +} + +/* Reads SI hardware directly — works in exception context */ +static bool read_z_button(void) { + u32 data0 = SI_C0INBUFH; + u16 buttons = (u16)(data0 >> 16); + return (buttons & PAD_TRIGGER_Z) != 0; +} + +static int start_gdb_server(u16 port) { + if (!umbraHasUmbraSupport()) { + return -1; + } + + u8 buf[32] ATTRIBUTE_ALIGN(32); + u8 statusBuf[32] ATTRIBUTE_ALIGN(32); + + /* No memset — dolzel.h PCH not available */ + for (int i = 0; i < 32; i++) { + buf[i] = 0; + statusBuf[i] = 0; + } + + *(u32*)(buf + 0) = UMBRA_CMD_WORD(UMBRA_CMD_GDB_START); + buf[4] = (port >> 8) & 0xFF; + buf[5] = port & 0xFF; + + if (!umbraTransfer(buf, sizeof(buf), 1) || + !umbraTransfer(statusBuf, sizeof(statusBuf), 0)) { + return -1; + } + + u32 status = *(u32*)(statusBuf + 0); + return (status == 0) ? 0 : -1; +} + +static void draw_crash_screen(u32 exc_id, u32 pc, u32 lr) { + u8* xfb = (u8*)VIGetCurrentFrameBuffer(); + if (!xfb) + return; + + int stride = 640 * 2; + int y = 40; + + draw_string(xfb, stride, 48, y, "tpgz crashed! listening for gdbserver..."); + y += 14; + + int x = draw_string(xfb, stride, 48, y, "Exception: "); + draw_string(xfb, stride, x, y, exception_name(exc_id)); + y += 10; + + x = draw_string(xfb, stride, 48, y, " PC: 0x"); + draw_hex32(xfb, stride, x, y, pc); + y += 10; + + x = draw_string(xfb, stride, 48, y, " LR: 0x"); + draw_hex32(xfb, stride, x, y, lr); + y += 14; + + draw_string(xfb, stride, 48, y, "Press Z to continue with crash"); + + DCFlushRange(xfb, (u32)(stride * 480)); +} + +static __OSExceptionHandler old_handlers[__OS_EXCEPTION_MAX]; + +static void save_ctx_to_shm(OSContext* ctx, u32 exc_vector) { + for (int i = 0; i < 32; i++) + GDB_SHM_BASE[SHM_GPR_BASE + i] = ctx->gpr[i]; + + GDB_SHM_BASE[SHM_PC] = ctx->srr0; + GDB_SHM_BASE[SHM_LR] = ctx->lr; + GDB_SHM_BASE[SHM_CR] = ctx->cr; + GDB_SHM_BASE[SHM_CTR] = ctx->ctr; + GDB_SHM_BASE[SHM_XER] = ctx->xer; + GDB_SHM_BASE[SHM_MSR] = ctx->srr1; + + volatile u64* fpr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPR_BYTE_OFF); + for (int i = 0; i < 32; i++) + fpr_shm[i] = *(volatile u64*)&ctx->fpr[i]; + + volatile u64* fpscr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPSCR_BYTE_OFF); + *fpscr_shm = (u64)ctx->fpscr; + + GDB_SHM_BASE[SHM_STOP_REASON] = exc_vector; + GDB_SHM_BASE[SHM_SIGNAL] = exception_to_signal(exc_vector); +} + +static void restore_shm_to_ctx(OSContext* ctx, u32 state) { + for (int i = 0; i < 32; i++) + ctx->gpr[i] = GDB_SHM_BASE[SHM_GPR_BASE + i]; + + ctx->srr0 = GDB_SHM_BASE[SHM_PC]; + ctx->lr = GDB_SHM_BASE[SHM_LR]; + ctx->cr = GDB_SHM_BASE[SHM_CR]; + ctx->ctr = GDB_SHM_BASE[SHM_CTR]; + ctx->xer = GDB_SHM_BASE[SHM_XER]; + + u32 msr = GDB_SHM_BASE[SHM_MSR]; + if (state == GDB_STATE_STEP) + msr |= MSR_SE; + else + msr &= ~MSR_SE; + ctx->srr1 = msr; + + volatile u64* fpr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPR_BYTE_OFF); + for (int i = 0; i < 32; i++) + *(volatile u64*)&ctx->fpr[i] = fpr_shm[i]; + + volatile u64* fpscr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPSCR_BYTE_OFF); + ctx->fpscr = (u32)*fpscr_shm; +} + +static void umbra_gdb_crash_handler(__OSException exception, OSContext* ctx) { + u32 exc_vector = ((u32)exception + 1) * 0x100; + + OSReport("tpgz: exception 0x%04X (%s) at PC=0x%08X LR=0x%08X\n", + exc_vector, exception_name(exc_vector), ctx->srr0, ctx->lr); + + if (!umbraIsNintendont()) { + /* Dolphin handles GDB at emulator level; just start server and chain */ + start_gdb_server(2159); + OSReport("tpgz: gdbserver listening on port 2159\n"); + if (old_handlers[exception]) + old_handlers[exception](exception, ctx); + return; + } + + int server_err = start_gdb_server(2159); + OSReport("tpgz: gdbserver start result=%d\n", server_err); + + draw_crash_screen(exc_vector, ctx->srr0, ctx->lr); + + if (server_err != 0) { + OSReport("tpgz: gdb server failed to start\n"); + while (!read_z_button()) {} + if (old_handlers[exception]) + old_handlers[exception](exception, ctx); + return; + } + + for (int wait = 0; wait < 500000000; wait++) { + DCInvalidateRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + if (GDB_SHM_BASE[SHM_MAGIC] == GDB_SHM_MAGIC) { + save_ctx_to_shm(ctx, exc_vector); + GDB_SHM_BASE[SHM_STATE] = GDB_STATE_STOPPED; + DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + OSReport("tpgz: gdb shm ready, waiting for debugger\n"); + + while (1) { + DCInvalidateRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + u32 state = GDB_SHM_BASE[SHM_STATE]; + + if (state == GDB_STATE_RESUME || state == GDB_STATE_STEP) { + restore_shm_to_ctx(ctx, state); + OSLoadContext(ctx); + } else if (state == GDB_STATE_DETACH) { + GDB_SHM_BASE[SHM_MAGIC] = 0; + DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + OSLoadContext(ctx); + } + + if (read_z_button()) { + GDB_SHM_BASE[SHM_MAGIC] = 0; + DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + break; + } + } + break; + } + } + + OSReport("tpgz: gdb exiting crash handler\n"); + if (old_handlers[exception]) + old_handlers[exception](exception, ctx); +} + +static void arm_crash_gdb(u16 port) { + if (!umbraHasUmbraSupport()) + return; + + u8 buf[32] ATTRIBUTE_ALIGN(32); + u8 statusBuf[32] ATTRIBUTE_ALIGN(32); + + for (int i = 0; i < 32; i++) { + buf[i] = 0; + statusBuf[i] = 0; + } + + *(u32*)(buf + 0) = UMBRA_CMD_WORD(UMBRA_CMD_GDB_ARM_CRASH); + buf[4] = (port >> 8) & 0xFF; + buf[5] = port & 0xFF; + + umbraTransfer(buf, sizeof(buf), 1); + umbraTransfer(statusBuf, sizeof(statusBuf), 0); +} + +extern "C" void umbra_gdb_auto_start(void) { + start_gdb_server(2159); +} + +extern "C" void umbra_gdb_install_crash_handlers(void) { + static const __OSException exceptions[] = { + __OS_EXCEPTION_MACHINE_CHECK, + __OS_EXCEPTION_DSI, + __OS_EXCEPTION_ISI, + __OS_EXCEPTION_ALIGNMENT, + /* NOT FLOATING_POINT — OS uses it for lazy FPU context switching */ + }; + + for (u32 i = 0; i < sizeof(exceptions) / sizeof(exceptions[0]); i++) { + old_handlers[exceptions[i]] = + __OSSetExceptionHandler(exceptions[i], umbra_gdb_crash_handler); + } + + if (!umbraIsNintendont()) { + arm_crash_gdb(2159); + } +} + +static void save_regs_to_shm(void) { + for (int i = 0; i < 32; i++) + GDB_SHM_BASE[SHM_GPR_BASE + i] = gTRKCPUState.Default.GPR[i]; + + GDB_SHM_BASE[SHM_PC] = gTRKCPUState.Default.PC; + GDB_SHM_BASE[SHM_LR] = gTRKCPUState.Default.LR; + GDB_SHM_BASE[SHM_CR] = gTRKCPUState.Default.CR; + GDB_SHM_BASE[SHM_CTR] = gTRKCPUState.Default.CTR; + GDB_SHM_BASE[SHM_XER] = gTRKCPUState.Default.XER; + GDB_SHM_BASE[SHM_MSR] = gTRKCPUState.Extended1.MSR; + + volatile u64* fpr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPR_BYTE_OFF); + for (int i = 0; i < 32; i++) + fpr_shm[i] = gTRKCPUState.Float.FPR[i]; + + volatile u64* fpscr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPSCR_BYTE_OFF); + *fpscr_shm = gTRKCPUState.Float.FPSCR; + + u32 exc_id = gTRKCPUState.Extended1.exceptionID; + GDB_SHM_BASE[SHM_STOP_REASON] = exc_id; + GDB_SHM_BASE[SHM_SIGNAL] = exception_to_signal(exc_id); +} + +static void restore_regs_from_shm(u32 state) { + for (int i = 0; i < 32; i++) + gTRKCPUState.Default.GPR[i] = GDB_SHM_BASE[SHM_GPR_BASE + i]; + + gTRKCPUState.Default.PC = GDB_SHM_BASE[SHM_PC]; + gTRKCPUState.Default.LR = GDB_SHM_BASE[SHM_LR]; + gTRKCPUState.Default.CR = GDB_SHM_BASE[SHM_CR]; + gTRKCPUState.Default.CTR = GDB_SHM_BASE[SHM_CTR]; + gTRKCPUState.Default.XER = GDB_SHM_BASE[SHM_XER]; + + u32 msr = GDB_SHM_BASE[SHM_MSR]; + if (state == GDB_STATE_STEP) { + msr |= MSR_SE; + } else { + msr &= ~MSR_SE; + } + gTRKCPUState.Extended1.MSR = msr; + + volatile u64* fpr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPR_BYTE_OFF); + for (int i = 0; i < 32; i++) + gTRKCPUState.Float.FPR[i] = fpr_shm[i]; + volatile u64* fpscr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPSCR_BYTE_OFF); + gTRKCPUState.Float.FPSCR = *fpscr_shm; +} + +static void gdb_spin_wait(void) { + while (1) { + DCInvalidateRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + u32 state = GDB_SHM_BASE[SHM_STATE]; + + if (state == GDB_STATE_RESUME || state == GDB_STATE_STEP) { + restore_regs_from_shm(state); + ICFlashInvalidate(); /* ARM may have patched PPC code */ + TRKSwapAndGo(); + } + else if (state == GDB_STATE_DETACH) { + GDB_SHM_BASE[SHM_MAGIC] = 0; + DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + ICFlashInvalidate(); + TRKSwapAndGo(); + } + } +} + +#define SHM_PPC_HEARTBEAT 109 +#define SHM_PPC_HALT_SEEN 110 +#define SHM_EXIT_REQ 111 + +/* Uncached MEM2 mirror, shared with Nintendont kernel at 0x13003420 */ +#define PPC_RESET_STATUS ((volatile u32*)0xD3003420) + +/* Must match loader/source/ppc/PADReadGC/source/PADReadGC.c DoGameExit() */ +static void do_game_exit(void) { + OSDisableInterrupts(); + AIStopDMA(); + /* Signal kernel to exit */ + *PPC_RESET_STATUS = 0x1DEA; + while (*PPC_RESET_STATUS == 0x1DEA) + ; + /* Disable memory protection */ + *(volatile u32*)0xCC00403C = 0xF; + *(volatile u32*)0xCC004040 = 0; + *(volatile u32*)0xCC004020 = 0xFF; + /* Copy return stub from MEM2 */ + volatile u32* dest = (volatile u32*)0x80004000; + volatile u32* src = (volatile u32*)0x93011810; + u32 size = 0x1800; + do { *dest++ = *src++; } while ((size -= 4) > 0); + DCFlushRange((void*)0x80004000, 0x1800); + ICInvalidateRange((void*)0x80004000, 0x1800); + *(volatile u32*)0xCD800004 = 0x36; + ((void(*)(void))0x80004000)(); +} + +extern "C" void umbra_gdb_poll(void) { + static u32 heartbeat = 0; + static bool auto_started = false; + + if (!auto_started) { + auto_started = true; + start_gdb_server(2159); + } + + DCInvalidateRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + + if (GDB_SHM_BASE[SHM_EXIT_REQ] == 1) { + GDB_SHM_BASE[SHM_EXIT_REQ] = 0; + DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + do_game_exit(); /* does not return */ + } + + GDB_SHM_BASE[SHM_PPC_HEARTBEAT] = ++heartbeat; + GDB_SHM_BASE[SHM_PPC_HALT_SEEN] = GDB_SHM_BASE[SHM_HALT_REQ]; + DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + + if (GDB_SHM_BASE[SHM_HALT_REQ] != 1) + return; + + OSContext ctx; + OSSaveContext(&ctx); + + /* OSSaveContext saves its own return address as LR, not our caller's. + * Walk the back chain to get the real caller LR. */ + u32 sp = ctx.gpr[1]; + u32 back_chain = *(volatile u32*)sp; + if (back_chain >= 0x80000000 && back_chain < 0x81800000) { + ctx.lr = *(volatile u32*)(back_chain + 4); + } + + save_ctx_to_shm(&ctx, 0x0500); + GDB_SHM_BASE[SHM_SIGNAL] = 2; /* SIGINT */ + GDB_SHM_BASE[SHM_STATE] = GDB_STATE_STOPPED; + GDB_SHM_BASE[SHM_HALT_REQ] = 0; + DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + + /* Flush stack so ARM can read PPC memory via physical addresses */ + DCFlushRange((void*)(sp & ~0x1F), 32 * 1024); + + AIStopDMA(); + + while (1) { + DCInvalidateRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + u32 state = GDB_SHM_BASE[SHM_STATE]; + + if (state == GDB_STATE_RESUME || state == GDB_STATE_STEP) { + ICFlashInvalidate(); /* ARM may have patched PPC code */ + AIStartDMA(); + return; + } else if (state == GDB_STATE_DETACH) { + GDB_SHM_BASE[SHM_MAGIC] = 0; + DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + ICFlashInvalidate(); + AIStartDMA(); + return; + } + + if (read_z_button()) { + GDB_SHM_BASE[SHM_HALT_REQ] = 0; + GDB_SHM_BASE[SHM_STATE] = GDB_STATE_RESUME; + DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + ICFlashInvalidate(); + AIStartDMA(); + return; + } + } +} + +extern "C" void umbra_gdb_trk_hook(void) { + DCInvalidateRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + + if (GDB_SHM_BASE[SHM_MAGIC] == GDB_SHM_MAGIC) { + save_regs_to_shm(); + GDB_SHM_BASE[SHM_STATE] = GDB_STATE_STOPPED; + DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + gdb_spin_wait(); /* does not return */ + } +} diff --git a/src/umbra/umbra_net.cpp b/src/umbra/umbra_net.cpp index 4b096de8016..9e264c6de9f 100644 --- a/src/umbra/umbra_net.cpp +++ b/src/umbra/umbra_net.cpp @@ -159,6 +159,30 @@ int umbraNet::stateRead(void* buf, u32 maxLen) { return (int)dataLen; } +int umbraNet::gdbStart(u16 port) { + if (!umbraHasUmbraSupport()) { + return -1; + } + + u8 buf[32] ATTRIBUTE_ALIGN(32); + memset(buf, 0, sizeof(buf)); + + *(u32*)(buf + 0) = UMBRA_CMD_WORD(UMBRA_CMD_GDB_START); + buf[4] = (port >> 8) & 0xFF; + buf[5] = port & 0xFF; + + u8 statusBuf[32] ATTRIBUTE_ALIGN(32); + memset(statusBuf, 0, sizeof(statusBuf)); + + if (!umbraTransfer(buf, sizeof(buf), 1) || + !umbraTransfer(statusBuf, sizeof(statusBuf), 0)) { + return -1; + } + + u32 status = *(u32*)(statusBuf + 0); + return (status == 0) ? 0 : -1; +} + int umbraNet::recvUDP(void* buf, u32 maxLen) { if (!umbraHasUmbraSupport()) { return -1; diff --git a/tools/gen_gdb_rel_loader.py b/tools/gen_gdb_rel_loader.py new file mode 100644 index 00000000000..bed40f5a6fc --- /dev/null +++ b/tools/gen_gdb_rel_loader.py @@ -0,0 +1,168 @@ +#!/usr/bin/env python3 +"""Generate load_rel_symbols.gdb from config.json and PLF ELF headers.""" + +import json +import os +import struct +import sys + + +# REL section index -> ELF section name +REL_SECTIONS = { + 1: ".text", + 4: ".rodata", + 5: ".data", + 6: ".bss", +} + + +def get_elf_sections(plf_path): + """Parse ELF section headers and return set of section names.""" + sections = set() + try: + with open(plf_path, "rb") as f: + magic = f.read(4) + if magic != b"\x7fELF": + return sections + f.seek(0) + ehdr = f.read(52) # ELF32 header + e_shoff = struct.unpack(">I", ehdr[32:36])[0] + e_shentsize = struct.unpack(">H", ehdr[46:48])[0] + e_shnum = struct.unpack(">H", ehdr[48:50])[0] + e_shstrndx = struct.unpack(">H", ehdr[50:52])[0] + + # Read section header string table + f.seek(e_shoff + e_shstrndx * e_shentsize) + shstrtab_hdr = f.read(e_shentsize) + strtab_off = struct.unpack(">I", shstrtab_hdr[16:20])[0] + strtab_size = struct.unpack(">I", shstrtab_hdr[20:24])[0] + f.seek(strtab_off) + strtab = f.read(strtab_size) + + # Read each section header + for i in range(e_shnum): + f.seek(e_shoff + i * e_shentsize) + shdr = f.read(e_shentsize) + sh_name_idx = struct.unpack(">I", shdr[0:4])[0] + # Extract null-terminated string + end = strtab.index(b"\x00", sh_name_idx) + name = strtab[sh_name_idx:end].decode("ascii", errors="replace") + if name: + sections.add(name) + except Exception: + pass + return sections + + +def main(): + script_dir = os.path.dirname(os.path.abspath(__file__)) + repo_root = os.path.dirname(script_dir) + + if len(sys.argv) > 1: + build_dir = os.path.abspath(sys.argv[1]) + else: + build_dir = os.path.join(repo_root, "build", "GZ2E01") + + config_path = os.path.join(build_dir, "config.json") + if not os.path.exists(config_path): + print("Error: config.json not found at %s" % config_path) + sys.exit(1) + + with open(config_path) as f: + cfg = json.load(f) + + # Build module_id -> (plf_path, set of section names) + modules = {} + for m in cfg.get("modules", []): + mid = m.get("module_id") + name = m.get("name") + if mid is not None and name: + plf = os.path.join(build_dir, name, "%s.plf" % name) + if os.path.exists(plf): + elf_sections = get_elf_sections(plf) + modules[mid] = (plf, elf_sections) + + out_path = os.path.join(build_dir, "load_rel_symbols.gdb") + + with open(out_path, "w") as f: + f.write("# Auto-generated by gen_gdb_rel_loader.py — do not edit\n") + f.write("# Source this file, then run: load-all-symbols\n\n") + + # load-dol-symbols + elf_path = os.path.join(build_dir, "framework.elf") + f.write("define load-dol-symbols\n") + f.write(" symbol-file %s\n" % elf_path) + f.write(" printf \"Loaded DOL symbols\\n\"\n") + f.write("end\n\n") + + # Per-module loader commands + for mid in sorted(modules.keys()): + plf, elf_sections = modules[mid] + + # Determine which extra sections this PLF actually has + extra_secs = [] + for sec_idx, sec_name in sorted(REL_SECTIONS.items()): + if sec_idx == 1: + continue # .text is the primary argument + if sec_name in elf_sections: + extra_secs.append((sec_idx, sec_name)) + + f.write("define __rel_%d\n" % mid) + # Read .text (section index 1) + f.write(" set $__t = *(unsigned int*)($__si + 8) & ~1\n") + f.write(" set $__ts = *(unsigned int*)($__si + 12)\n") + + # Read only sections that exist in this PLF + for sec_idx, sec_name in extra_secs: + var = sec_name.replace(".", "_") + f.write(" set $%s = 0\n" % var) + f.write(" if $__ns > %d\n" % sec_idx) + f.write(" set $%s = *(unsigned int*)($__si + %d) & ~1\n" % (var, sec_idx * 8)) + f.write(" end\n") + + f.write(" if $__t != 0 && $__ts != 0\n") + + # Build add-symbol-file with only existing sections + cmd = "add-symbol-file %s $__t" % plf + for sec_idx, sec_name in extra_secs: + var = sec_name.replace(".", "_") + cmd += " -s %s $%s" % (sec_name, var) + f.write(" %s\n" % cmd) + f.write(" set $__loaded = $__loaded + 1\n") + + f.write(" end\n") + f.write("end\n\n") + + # load-rel-symbols: walk the OS module linked list + f.write("define load-rel-symbols\n") + f.write(" set confirm off\n") + f.write(" set $__mod = *(unsigned int*)0x800030C8\n") + f.write(" set $__loaded = 0\n") + f.write(" while $__mod != 0\n") + f.write(" set $__id = *(unsigned int*)($__mod)\n") + f.write(" set $__next = *(unsigned int*)($__mod + 4)\n") + f.write(" set $__ns = *(unsigned int*)($__mod + 0x0C)\n") + f.write(" set $__si = *(unsigned int*)($__mod + 0x10)\n") + + for mid in sorted(modules.keys()): + f.write(" if $__id == %d\n" % mid) + f.write(" __rel_%d\n" % mid) + f.write(" end\n") + + f.write(" set $__mod = $__next\n") + f.write(" end\n") + f.write(" set confirm on\n") + f.write(' printf "Loaded %d REL modules\\n", $__loaded\n') + f.write("end\n\n") + + # load-all-symbols + f.write("define load-all-symbols\n") + f.write(" load-dol-symbols\n") + f.write(" load-rel-symbols\n") + f.write("end\n") + + print("Generated %s (%d module mappings)" % (out_path, len(modules))) + + +if __name__ == "__main__": + main() From dde0737e4a3c7106d899f2cbb50e235eb1ce44d2 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sun, 1 Mar 2026 09:47:18 -0700 Subject: [PATCH 13/35] rm tmp crash screen impl --- src/umbra/umbra_gdb.cpp | 183 ---------------------------------------- 1 file changed, 183 deletions(-) diff --git a/src/umbra/umbra_gdb.cpp b/src/umbra/umbra_gdb.cpp index 75e051e1b25..b4a18f7c6f4 100644 --- a/src/umbra/umbra_gdb.cpp +++ b/src/umbra/umbra_gdb.cpp @@ -11,7 +11,6 @@ #include "umbra/umbra_platform.h" extern "C" { - void* VIGetCurrentFrameBuffer(void); void OSReport(const char* msg, ...); void AIStopDMA(void); void AIStartDMA(void); @@ -51,157 +50,6 @@ extern "C" { #define SI_C0INBUFH (*(volatile u32*)0xCC006404) #define PAD_TRIGGER_Z 0x0010 -/* 8x8 bitmap font, ASCII 0x20-0x7E */ -static const u8 font8x8[95][8] = { - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, /* */ - {0x18,0x3C,0x3C,0x18,0x18,0x00,0x18,0x00}, /* ! */ - {0x36,0x36,0x00,0x00,0x00,0x00,0x00,0x00}, /* " */ - {0x36,0x7F,0x36,0x36,0x36,0x7F,0x36,0x00}, /* # */ - {0x0C,0x3E,0x03,0x1E,0x30,0x1F,0x0C,0x00}, /* $ */ - {0x00,0x63,0x33,0x18,0x0C,0x66,0x63,0x00}, /* % */ - {0x1C,0x36,0x1C,0x6E,0x3B,0x33,0x6E,0x00}, /* & */ - {0x06,0x06,0x03,0x00,0x00,0x00,0x00,0x00}, /* ' */ - {0x18,0x0C,0x06,0x06,0x06,0x0C,0x18,0x00}, /* ( */ - {0x06,0x0C,0x18,0x18,0x18,0x0C,0x06,0x00}, /* ) */ - {0x00,0x66,0x3C,0xFF,0x3C,0x66,0x00,0x00}, /* * */ - {0x00,0x0C,0x0C,0x3F,0x0C,0x0C,0x00,0x00}, /* + */ - {0x00,0x00,0x00,0x00,0x00,0x0C,0x0C,0x06}, /* , */ - {0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x00}, /* - */ - {0x00,0x00,0x00,0x00,0x00,0x0C,0x0C,0x00}, /* . */ - {0x60,0x30,0x18,0x0C,0x06,0x03,0x01,0x00}, /* / */ - {0x3E,0x63,0x73,0x7B,0x6F,0x67,0x3E,0x00}, /* 0 */ - {0x0C,0x0E,0x0C,0x0C,0x0C,0x0C,0x3F,0x00}, /* 1 */ - {0x1E,0x33,0x30,0x1C,0x06,0x33,0x3F,0x00}, /* 2 */ - {0x1E,0x33,0x30,0x1C,0x30,0x33,0x1E,0x00}, /* 3 */ - {0x38,0x3C,0x36,0x33,0x7F,0x30,0x78,0x00}, /* 4 */ - {0x3F,0x03,0x1F,0x30,0x30,0x33,0x1E,0x00}, /* 5 */ - {0x1C,0x06,0x03,0x1F,0x33,0x33,0x1E,0x00}, /* 6 */ - {0x3F,0x33,0x30,0x18,0x0C,0x0C,0x0C,0x00}, /* 7 */ - {0x1E,0x33,0x33,0x1E,0x33,0x33,0x1E,0x00}, /* 8 */ - {0x1E,0x33,0x33,0x3E,0x30,0x18,0x0E,0x00}, /* 9 */ - {0x00,0x0C,0x0C,0x00,0x00,0x0C,0x0C,0x00}, /* : */ - {0x00,0x0C,0x0C,0x00,0x00,0x0C,0x0C,0x06}, /* ; */ - {0x18,0x0C,0x06,0x03,0x06,0x0C,0x18,0x00}, /* < */ - {0x00,0x00,0x3F,0x00,0x00,0x3F,0x00,0x00}, /* = */ - {0x06,0x0C,0x18,0x30,0x18,0x0C,0x06,0x00}, /* > */ - {0x1E,0x33,0x30,0x18,0x0C,0x00,0x0C,0x00}, /* ? */ - {0x3E,0x63,0x7B,0x7B,0x7B,0x03,0x1E,0x00}, /* @ */ - {0x0C,0x1E,0x33,0x33,0x3F,0x33,0x33,0x00}, /* A */ - {0x3F,0x66,0x66,0x3E,0x66,0x66,0x3F,0x00}, /* B */ - {0x3C,0x66,0x03,0x03,0x03,0x66,0x3C,0x00}, /* C */ - {0x1F,0x36,0x66,0x66,0x66,0x36,0x1F,0x00}, /* D */ - {0x7F,0x46,0x16,0x1E,0x16,0x46,0x7F,0x00}, /* E */ - {0x7F,0x46,0x16,0x1E,0x16,0x06,0x0F,0x00}, /* F */ - {0x3C,0x66,0x03,0x03,0x73,0x66,0x7C,0x00}, /* G */ - {0x33,0x33,0x33,0x3F,0x33,0x33,0x33,0x00}, /* H */ - {0x1E,0x0C,0x0C,0x0C,0x0C,0x0C,0x1E,0x00}, /* I */ - {0x78,0x30,0x30,0x30,0x33,0x33,0x1E,0x00}, /* J */ - {0x67,0x66,0x36,0x1E,0x36,0x66,0x67,0x00}, /* K */ - {0x0F,0x06,0x06,0x06,0x46,0x66,0x7F,0x00}, /* L */ - {0x63,0x77,0x7F,0x7F,0x6B,0x63,0x63,0x00}, /* M */ - {0x63,0x67,0x6F,0x7B,0x73,0x63,0x63,0x00}, /* N */ - {0x1C,0x36,0x63,0x63,0x63,0x36,0x1C,0x00}, /* O */ - {0x3F,0x66,0x66,0x3E,0x06,0x06,0x0F,0x00}, /* P */ - {0x1E,0x33,0x33,0x33,0x3B,0x1E,0x38,0x00}, /* Q */ - {0x3F,0x66,0x66,0x3E,0x36,0x66,0x67,0x00}, /* R */ - {0x1E,0x33,0x07,0x0E,0x38,0x33,0x1E,0x00}, /* S */ - {0x3F,0x2D,0x0C,0x0C,0x0C,0x0C,0x1E,0x00}, /* T */ - {0x33,0x33,0x33,0x33,0x33,0x33,0x3F,0x00}, /* U */ - {0x33,0x33,0x33,0x33,0x33,0x1E,0x0C,0x00}, /* V */ - {0x63,0x63,0x63,0x6B,0x7F,0x77,0x63,0x00}, /* W */ - {0x63,0x63,0x36,0x1C,0x1C,0x36,0x63,0x00}, /* X */ - {0x33,0x33,0x33,0x1E,0x0C,0x0C,0x1E,0x00}, /* Y */ - {0x7F,0x63,0x31,0x18,0x4C,0x66,0x7F,0x00}, /* Z */ - {0x1E,0x06,0x06,0x06,0x06,0x06,0x1E,0x00}, /* [ */ - {0x03,0x06,0x0C,0x18,0x30,0x60,0x40,0x00}, /* \ */ - {0x1E,0x18,0x18,0x18,0x18,0x18,0x1E,0x00}, /* ] */ - {0x08,0x1C,0x36,0x63,0x00,0x00,0x00,0x00}, /* ^ */ - {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF}, /* _ */ - {0x0C,0x0C,0x18,0x00,0x00,0x00,0x00,0x00}, /* ` */ - {0x00,0x00,0x1E,0x30,0x3E,0x33,0x6E,0x00}, /* a */ - {0x07,0x06,0x06,0x3E,0x66,0x66,0x3B,0x00}, /* b */ - {0x00,0x00,0x1E,0x33,0x03,0x33,0x1E,0x00}, /* c */ - {0x38,0x30,0x30,0x3E,0x33,0x33,0x6E,0x00}, /* d */ - {0x00,0x00,0x1E,0x33,0x3F,0x03,0x1E,0x00}, /* e */ - {0x1C,0x36,0x06,0x0F,0x06,0x06,0x0F,0x00}, /* f */ - {0x00,0x00,0x6E,0x33,0x33,0x3E,0x30,0x1F}, /* g */ - {0x07,0x06,0x36,0x6E,0x66,0x66,0x67,0x00}, /* h */ - {0x0C,0x00,0x0E,0x0C,0x0C,0x0C,0x1E,0x00}, /* i */ - {0x30,0x00,0x30,0x30,0x30,0x33,0x33,0x1E}, /* j */ - {0x07,0x06,0x66,0x36,0x1E,0x36,0x67,0x00}, /* k */ - {0x0E,0x0C,0x0C,0x0C,0x0C,0x0C,0x1E,0x00}, /* l */ - {0x00,0x00,0x33,0x7F,0x7F,0x6B,0x63,0x00}, /* m */ - {0x00,0x00,0x1F,0x33,0x33,0x33,0x33,0x00}, /* n */ - {0x00,0x00,0x1E,0x33,0x33,0x33,0x1E,0x00}, /* o */ - {0x00,0x00,0x3B,0x66,0x66,0x3E,0x06,0x0F}, /* p */ - {0x00,0x00,0x6E,0x33,0x33,0x3E,0x30,0x78}, /* q */ - {0x00,0x00,0x3B,0x6E,0x66,0x06,0x0F,0x00}, /* r */ - {0x00,0x00,0x3E,0x03,0x1E,0x30,0x1F,0x00}, /* s */ - {0x08,0x0C,0x3E,0x0C,0x0C,0x2C,0x18,0x00}, /* t */ - {0x00,0x00,0x33,0x33,0x33,0x33,0x6E,0x00}, /* u */ - {0x00,0x00,0x33,0x33,0x33,0x1E,0x0C,0x00}, /* v */ - {0x00,0x00,0x63,0x6B,0x7F,0x7F,0x36,0x00}, /* w */ - {0x00,0x00,0x63,0x36,0x1C,0x36,0x63,0x00}, /* x */ - {0x00,0x00,0x33,0x33,0x33,0x3E,0x30,0x1F}, /* y */ - {0x00,0x00,0x3F,0x19,0x0C,0x26,0x3F,0x00}, /* z */ - {0x38,0x0C,0x0C,0x07,0x0C,0x0C,0x38,0x00}, /* { */ - {0x18,0x18,0x18,0x00,0x18,0x18,0x18,0x00}, /* | */ - {0x07,0x0C,0x0C,0x38,0x0C,0x0C,0x07,0x00}, /* } */ - {0x6E,0x3B,0x00,0x00,0x00,0x00,0x00,0x00}, /* ~ */ -}; - -/* XFB YUYV: [Y0][Cb][Y1][Cr] per 2 pixels */ -static void draw_glyph(u8* xfb, int xfb_stride, int px, int py, char c) { - if (c < 0x20 || c > 0x7E) - return; - const u8* glyph = font8x8[c - 0x20]; - for (int row = 0; row < 8; row++) { - u8 bits = glyph[row]; - u8* line = xfb + (py + row) * xfb_stride; - for (int col = 0; col < 8; col++) { - if (bits & (0x80 >> col)) { - int x = px + col; - line[x * 2] = 235; - if (x & 1) { - line[x * 2 - 1] = 128; - line[x * 2 + 1] = 128; - } else { - line[x * 2 + 1] = 128; - if (x * 2 + 3 < xfb_stride) - line[x * 2 + 3] = 128; - } - } - } - } -} - -static int draw_string(u8* xfb, int xfb_stride, int px, int py, const char* str) { - int x = px; - while (*str) { - if (*str == '\n') { - py += 10; - x = px; - str++; - continue; - } - draw_glyph(xfb, xfb_stride, x, py, *str); - x += 8; - str++; - } - return x; -} - -static void draw_hex32(u8* xfb, int xfb_stride, int px, int py, u32 val) { - const char* hex = "0123456789ABCDEF"; - char buf[9]; - for (int i = 7; i >= 0; i--) { - buf[i] = hex[val & 0xF]; - val >>= 4; - } - buf[8] = '\0'; - draw_string(xfb, xfb_stride, px, py, buf); -} - static u32 exception_to_signal(u32 exception_id) { switch (exception_id & 0xFFFF) { case 0x0200: return 11; /* SIGSEGV */ @@ -266,34 +114,6 @@ static int start_gdb_server(u16 port) { return (status == 0) ? 0 : -1; } -static void draw_crash_screen(u32 exc_id, u32 pc, u32 lr) { - u8* xfb = (u8*)VIGetCurrentFrameBuffer(); - if (!xfb) - return; - - int stride = 640 * 2; - int y = 40; - - draw_string(xfb, stride, 48, y, "tpgz crashed! listening for gdbserver..."); - y += 14; - - int x = draw_string(xfb, stride, 48, y, "Exception: "); - draw_string(xfb, stride, x, y, exception_name(exc_id)); - y += 10; - - x = draw_string(xfb, stride, 48, y, " PC: 0x"); - draw_hex32(xfb, stride, x, y, pc); - y += 10; - - x = draw_string(xfb, stride, 48, y, " LR: 0x"); - draw_hex32(xfb, stride, x, y, lr); - y += 14; - - draw_string(xfb, stride, 48, y, "Press Z to continue with crash"); - - DCFlushRange(xfb, (u32)(stride * 480)); -} - static __OSExceptionHandler old_handlers[__OS_EXCEPTION_MAX]; static void save_ctx_to_shm(OSContext* ctx, u32 exc_vector) { @@ -361,11 +181,8 @@ static void umbra_gdb_crash_handler(__OSException exception, OSContext* ctx) { int server_err = start_gdb_server(2159); OSReport("tpgz: gdbserver start result=%d\n", server_err); - draw_crash_screen(exc_vector, ctx->srr0, ctx->lr); - if (server_err != 0) { OSReport("tpgz: gdb server failed to start\n"); - while (!read_z_button()) {} if (old_handlers[exception]) old_handlers[exception](exception, ctx); return; From 6e149819e13b1f70ecbf8a4c66b030c17ffed2bb Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sun, 1 Mar 2026 13:19:48 -0800 Subject: [PATCH 14/35] d_s_logo / d_s_play debug work, d_a_kago cleanup, misc cleanup (#3116) * d_a_kago cleanup * d_s_logo wii/shield work * d_s_logo / d_s_play debug work * fix missing profile class sizeof's * fix phase->id values * build fixes * fix dCamera_c and camera profile --- include/JSystem/JFramework/JFWSystem.h | 1 + include/JSystem/JHostIO/JORServer.h | 1 + include/JSystem/JParticle/JPAEmitterManager.h | 1 + .../SSystem/SComponent/c_API_controller_pad.h | 38 + include/d/actor/d_a_grass.h | 2 + include/d/actor/d_a_kago.h | 110 +- include/d/d_bg_s.h | 2 + include/d/d_camera.h | 3 +- include/d/d_com_inf_game.h | 45 +- include/d/d_demo.h | 1 + include/d/d_eye_hl.h | 4 + include/d/d_jpreviewer.h | 4 +- include/d/d_particle.h | 5 + include/d/d_path.h | 7 + include/d/d_resorce.h | 9 + include/d/d_s_logo.h | 114 +- include/d/d_s_menu.h | 2 + include/d/d_s_play.h | 25 +- include/d/d_s_play_env.h | 5 + include/d/d_save_HIO.h | 3 +- include/d/d_stage.h | 14 +- include/f_op/f_op_actor.h | 3 + include/f_op/f_op_actor_mng.h | 3 + include/f_op/f_op_kankyo.h | 2 +- include/f_op/f_op_kankyo_mng.h | 1 + include/m_Do/m_Do_Reset.h | 4 + include/m_Do/m_Do_audio.h | 4 +- include/m_Do/m_Do_ext.h | 6 + include/m_Re/m_Re_controller_pad.h | 2 + include/revolution/os/OSResetSW.h | 1 + include/revolution/sc.h | 1 + .../MSL/MSL_C/MSL_Common/Include/cmath | 5 + src/SSystem/SComponent/c_phase.cpp | 4 +- src/c/c_dylink.cpp | 8 +- src/d/actor/d_a_grass.cpp | 2 +- src/d/actor/d_a_kago.cpp | 2038 ++++++++--------- src/d/actor/d_a_mg_fshop.cpp | 2 +- src/d/actor/d_a_npc_wrestler.cpp | 2 +- src/d/actor/d_a_obj_volcball.cpp | 2 +- src/d/d_camera.cpp | 4 +- src/d/d_com_inf_game.cpp | 8 +- src/d/d_path.cpp | 19 + src/d/d_s_logo.cpp | 894 +++++++- src/d/d_s_play.cpp | 1032 ++++++++- src/d/d_stage.cpp | 4 +- src/f_op/f_op_actor_mng.cpp | 4 +- src/f_op/f_op_kankyo.cpp | 4 +- src/f_op/f_op_kankyo_mng.cpp | 4 +- src/m_Do/m_Do_audio.cpp | 2 +- 49 files changed, 3110 insertions(+), 1351 deletions(-) diff --git a/include/JSystem/JFramework/JFWSystem.h b/include/JSystem/JFramework/JFWSystem.h index cf6ac86b69c..0078e9aa1ac 100644 --- a/include/JSystem/JFramework/JFWSystem.h +++ b/include/JSystem/JFramework/JFWSystem.h @@ -37,6 +37,7 @@ struct JFWSystem { static JUTConsole* getSystemConsole() { return systemConsole; } static JKRExpHeap* getSystemHeap() { return systemHeap; } + static JKRExpHeap* getRootHeap() { return rootHeap; } static JUTResFont* getSystemFont() { return systemFont; } static void setMaxStdHeap(int max) { diff --git a/include/JSystem/JHostIO/JORServer.h b/include/JSystem/JHostIO/JORServer.h index d92e588117f..2c2ebf72d27 100644 --- a/include/JSystem/JHostIO/JORServer.h +++ b/include/JSystem/JHostIO/JORServer.h @@ -9,6 +9,7 @@ #include "JSystem/JUtility/JUTAssert.h" u32 JORMessageBox(const char* message, const char* title, u32 style); +int JORShellExecute(const char* param_0, const char* param_1, const char* param_2, const char* param_3, int param_4); struct JOREventCallbackListNode { JOREventCallbackListNode(u32, u32, bool); diff --git a/include/JSystem/JParticle/JPAEmitterManager.h b/include/JSystem/JParticle/JPAEmitterManager.h index 4508ef9cec4..a36d8041c02 100644 --- a/include/JSystem/JParticle/JPAEmitterManager.h +++ b/include/JSystem/JParticle/JPAEmitterManager.h @@ -39,6 +39,7 @@ class JPAEmitterManager { return pResMgrAry[res_mgr_id]; } int getEmitterNumber() const { return emtrNum - mFreeEmtrList.getNumLinks(); } + int getParticleNumber() const { return ptclNum - mPtclPool.getNum(); } public: /* 0x00 */ JSUList* pEmtrUseList; diff --git a/include/SSystem/SComponent/c_API_controller_pad.h b/include/SSystem/SComponent/c_API_controller_pad.h index 36d8fa5a1fd..501e7aee723 100644 --- a/include/SSystem/SComponent/c_API_controller_pad.h +++ b/include/SSystem/SComponent/c_API_controller_pad.h @@ -35,4 +35,42 @@ struct interface_of_controller_pad { void cAPICPad_recalibrate(void); u32 cAPICPad_ANY_BUTTON(u32 param_0); +#if PLATFORM_WII +u32 cAPICPad_BUTTON(u32 i_padNo); +u32 cAPICPad_Z_BUTTON(u32 i_padNo); +u32 cAPICPad_R_BUTTON(u32 i_padNo); +u32 cAPICPad_L_BUTTON(u32 i_padNo); +u32 cAPICPad_A_BUTTON(u32 i_padNo); +u32 cAPICPad_B_BUTTON(u32 i_padNo); +u32 cAPICPad_X_BUTTON(u32 i_padNo); +u32 cAPICPad_Y_BUTTON(u32 i_padNo); + +u32 cAPICPad_TRIGGER(u32 i_padNo); +u32 cAPICPad_Z_TRIGGER(u32 i_padNo); +u32 cAPICPad_R_TRIGGER(u32 i_padNo); +u32 cAPICPad_UP_TRIGGER(u32 i_padNo); +u32 cAPICPad_DOWN_TRIGGER(u32 i_padNo); +u32 cAPICPad_LEFT_TRIGGER(u32 i_padNo); +u32 cAPICPad_RIGHT_TRIGGER(u32 i_padNo); +u32 cAPICPad_L_TRIGGER(u32 i_padNo); +u32 cAPICPad_A_TRIGGER(u32 i_padNo); +u32 cAPICPad_B_TRIGGER(u32 i_padNo); +u32 cAPICPad_X_TRIGGER(u32 i_padNo); +u32 cAPICPad_Y_TRIGGER(u32 i_padNo); +u32 cAPICPad_START_TRIGGER(u32 i_padNo); + +f32 cAPICPad_X_STICK(u32 i_padNo); +f32 cAPICPad_X_STICK_3D(u32 i_padNo); +f32 cAPICPad_Y_STICK(u32 i_padNo); +f32 cAPICPad_VALUE_STICK(u32 i_padNo); +s16 cAPICPad_ANGLE_STICK(u32 i_padNo); +s16 cAPICPad_ANGLE_STICK_3D(u32 i_padNo); +f32 cAPICPad_X_SUBSTICK(u32 i_padNo); +f32 cAPICPad_Y_SUBSTICK(u32 i_padNo); +f32 cAPICPad_VALUE_SUBSTICK(u32 i_padNo); +s16 cAPICPad_ANGLE_SUBSTICK(u32 i_padNo); +f32 cAPICPad_L_ANALOG(u32 i_padNo); +f32 cAPICPad_R_ANALOG(u32 i_padNo); +#endif + #endif diff --git a/include/d/actor/d_a_grass.h b/include/d/actor/d_a_grass.h index 549a067eba5..4b07bea1d5e 100644 --- a/include/d/actor/d_a_grass.h +++ b/include/d/actor/d_a_grass.h @@ -44,6 +44,8 @@ class daGrass_c : public fopAc_ac_c { static daGrass_c* m_myObj; static dGrass_packet_c* m_grass; static dFlower_packet_c* m_flower; + + /* 0x568 */ u8 unk_0x568[0x570 - 0x568]; }; namespace daGrass_prm { diff --git a/include/d/actor/d_a_kago.h b/include/d/actor/d_a_kago.h index a84d049ad27..90de3b74bf9 100644 --- a/include/d/actor/d_a_kago.h +++ b/include/d/actor/d_a_kago.h @@ -18,6 +18,20 @@ */ class daKago_c : public fopAc_ac_c { public: + enum daKago_Action_e { + ACTION_FLY_e, + ACTION_STAGGER_e, + ACTION_EVENT_e, + ACTION_PERCH_e, + ACTION_WAIT_e, + ACTION_ATTACK_e, + ACTION_EVENT2_e, + ACTION_PERCH2_e, + ACTION_LANDING_e, + ACTION_DEMO_FLY_e, + ACTION_DEMO_FLY2_e, + }; + int getBckName(int); void setBck(int, u8, f32, f32); bool checkBck(int); @@ -93,14 +107,14 @@ class daKago_c : public fopAc_ac_c { void setEvent() { mIsFlying = false; - mCurrentAction = 2; - field_0x744 = 0; + mAction = ACTION_EVENT_e; + mMode = 0; } void setEvent2() { mIsFlying = false; - mCurrentAction = 6; - field_0x744 = 0; + mAction = ACTION_EVENT2_e; + mMode = 0; } void setKagoPath(u8 i_pathNo) { @@ -110,36 +124,36 @@ class daKago_c : public fopAc_ac_c { } void onWaterFall() { - field_0x6ea = 1; + mIsWaterfall = TRUE; } bool isAttack() { - return field_0x6dd != 0; + return mIsAttack != 0; } MtxP getLegR3Mtx() { return mLegR3Mtx; } - MtxP getMidnaLocaterMtx() { return mpMorf->getModel()->getAnmMtx(4); } + MtxP getMidnaLocaterMtx() { return mAnm_p->getModel()->getAnmMtx(4); } s8 getPathDir() { return mPathDir; } u8 isFlying() { return mIsFlying; } fopAc_ac_c* getLockActor() { return mpLockActor; } void setLockActor(fopAc_ac_c* actor) { mpLockActor = actor; } void setEatYm() { field_0x6d8 |= (u8) 4; } - MtxP getMouthMtx() { return mpMorf->getModel()->getAnmMtx(7); } + MtxP getMouthMtx() { return mAnm_p->getModel()->getAnmMtx(7); } private: /* 0x568 */ request_of_phase_process_class mPhase; - /* 0x570 */ mDoExt_McaMorfSO* mpMorf; + /* 0x570 */ mDoExt_McaMorfSO* mAnm_p; /* 0x574 */ Z2CreatureEnemy mSound; /* 0x618 */ fopAc_ac_c* mpLockActor; /* 0x61C */ fpc_ProcID mBalloon2DId; /* 0x620 */ Mtx mLegR3Mtx; - /* 0x650 */ cXyz field_0x650[3]; + /* 0x650 */ cXyz mWallHitEffPos[3]; /* 0x674 */ cXyz field_0x674; /* 0x680 */ cXyz field_0x680; - /* 0x68C */ cXyz field_0x68c; - /* 0x698 */ cXyz field_0x698; + /* 0x68C */ cXyz mDemoCamCenter; + /* 0x698 */ cXyz mDemoCamEye; /* 0x6A4 */ cXyz field_0x6a4; - /* 0x6B0 */ cXyz field_0x6b0; + /* 0x6B0 */ cXyz mPrevCamEye; /* 0x6BC */ s16 field_0x6bc; /* 0x6BE */ csXyz field_0x6be; /* 0x6C4 */ f32 field_0x6c4; @@ -147,12 +161,12 @@ class daKago_c : public fopAc_ac_c { /* 0x6CA */ s16 field_0x6ca; /* 0x6CC */ f32 field_0x6cc; /* 0x6D0 */ f32 field_0x6d0; - /* 0x6D4 */ f32 field_0x6d4; + /* 0x6D4 */ f32 mDemoCamFovy; /* 0x6D8 */ u8 field_0x6d8; /* 0x6D9 */ u8 field_0x6d9; /* 0x6DA */ s16 field_0x6da; /* 0x6DC */ u8 field_0x6dc; - /* 0x6DD */ u8 field_0x6dd; + /* 0x6DD */ u8 mIsAttack; /* 0x6DE */ u8 field_0x6de; /* 0x6DF */ u8 field_0x6df; /* 0x6E0 */ u8 field_0x6e0; @@ -162,18 +176,18 @@ class daKago_c : public fopAc_ac_c { /* 0x6E4 */ u8 field_0x6e4; /* 0x6E5 */ u8 field_0x6e5; /* 0x6E6 */ u8 field_0x6e6; - /* 0x6E7 */ u8 field_0x6e7; + /* 0x6E7 */ u8 mType; /* 0x6E8 */ u8 field_0x6e8; /* 0x6E8 */ u8 field_0x6e9; - /* 0x6EA */ u8 field_0x6ea; - /* 0x6EB */ u8 field_0x6eb; + /* 0x6EA */ u8 mIsWaterfall; + /* 0x6EB */ u8 mBalloonMenuMode; /* 0x6EC */ u8 field_0x6ec[0x6ed - 0x6ec]; - /* 0x6ED */ u8 field_0x6ed; - /* 0x6F0 */ f32 field_0x6f0; - /* 0x6F4 */ f32 field_0x6f4; - /* 0x6F8 */ f32 field_0x6f8; + /* 0x6ED */ u8 unk_0x6ed; + /* 0x6F0 */ f32 mStickX; + /* 0x6F4 */ f32 mStickY; + /* 0x6F8 */ f32 mFlySpeed; /* 0x6FC */ f32 field_0x6fc; - /* 0x700 */ f32 field_0x700; + /* 0x700 */ f32 mGroundFlyHeight; /* 0x704 */ f32 mGroundHeight; /* 0x708 */ f32 mRoofHeight; /* 0x70C */ f32 field_0x70c; @@ -181,32 +195,32 @@ class daKago_c : public fopAc_ac_c { /* 0x712 */ s16 field_0x712; /* 0x714 */ s16 field_0x714; /* 0x716 */ s16 field_0x716; - /* 0x718 */ s16 field_0x718; - /* 0x71A */ s16 field_0x71a; - /* 0x71C */ s32 field_0x71c; - /* 0x720 */ s32 field_0x720; + /* 0x718 */ s16 mHeadRotZ; + /* 0x71A */ s16 mHeadRotY; + /* 0x71C */ int mWaterSplashTimer; + /* 0x720 */ int mWallHitInvulnTimer; /* 0x724 */ u8 field_0x724[0x728 - 0x724]; - /* 0x728 */ s32 field_0x728; - /* 0x72C */ s32 field_0x72c; - /* 0x730 */ s32 mDashCooldownTime; - /* 0x734 */ s32 mDashTime; - /* 0x738 */ s32 field_0x738; - /* 0x73C */ s32 field_0x73c; - /* 0x740 */ s32 mCurrentAction; - /* 0x744 */ s32 field_0x744; - /* 0x748 */ s32 field_0x748; - /* 0x74C */ s32 field_0x74c; - /* 0x750 */ s32 field_0x750; - /* 0x754 */ s32 field_0x754; - /* 0x758 */ s32 field_0x758; - /* 0x75C */ char* field_0x75c; - /* 0x760 */ char* field_0x760; - /* 0x764 */ s32 field_0x764; + /* 0x728 */ int field_0x728; + /* 0x72C */ int field_0x72c; + /* 0x730 */ int mDashCooldownTime; + /* 0x734 */ int mDashTime; + /* 0x738 */ int mGndSpecialCode; + /* 0x73C */ int mSceneType; + /* 0x740 */ int mAction; + /* 0x744 */ int mMode; + /* 0x748 */ int mDemoMode; + /* 0x74C */ int field_0x74c; + /* 0x750 */ int field_0x750; + /* 0x754 */ int field_0x754; + /* 0x758 */ int field_0x758; + /* 0x75C */ char* mArcName; + /* 0x760 */ char* mDemoName; + /* 0x764 */ u32 mShadowId; /* 0x768 */ dPath* mpPath1; /* 0x76C */ dPath* mpPath2; - /* 0x770 */ s8 mPathIdx; + /* 0x770 */ s8 mPathCurrentPointNo; /* 0x771 */ s8 field_0x771; - /* 0x772 */ s8 mPathIdxOffset; + /* 0x772 */ s8 mPathStep; /* 0x773 */ s8 mPathDir; /* 0x774 */ u8 field_0x774[0x778 - 0x774]; /* 0x778 */ dBgS_AcchCir mAcchCir; @@ -220,9 +234,9 @@ class daKago_c : public fopAc_ac_c { /* 0xB38 */ u32 field_0xb38; /* 0xB3C */ u32 field_0xb3c; /* 0xB40 */ u32 field_0xb40; - /* 0xB44 */ u32 field_0xb44[3]; - /* 0xB50 */ u32 field_0xb50; - /* 0xB54 */ u8 field_0xb54; + /* 0xB44 */ u32 mSibukiEmitterIDs[3]; + /* 0xB50 */ u32 mDashSibukiEmitterID; + /* 0xB54 */ u8 mIsHioSet; /* 0xB58 */ dMsgFlow_c mMsgFlow; }; diff --git a/include/d/d_bg_s.h b/include/d/d_bg_s.h index c0804bd07ce..537748470ce 100644 --- a/include/d/d_bg_s.h +++ b/include/d/d_bg_s.h @@ -195,6 +195,8 @@ class dBgS : public cBgS { void ChkDeleteActorRegist(fopAc_ac_c*); + void Draw(); + #if DEBUG /* 0x1404 */ u8 field_0x1404[0x1408 - 0x1404]; /* 0x1408 */ dBgS_HIO m_hio; diff --git a/include/d/d_camera.h b/include/d/d_camera.h index c49cce155e9..f7a7132538f 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -1367,8 +1367,7 @@ class dCamera_c { /* 0x970 */ dCamSetup_c mCamSetup; /* 0xAEC */ dCamParam_c mCamParam; /* 0xB0C */ u8 field_0xb0c; - /* 0xB0D */ u8 field_0xb0d[0xd58 - 0xb0d]; -}; // Size: 0xD58 +}; // Size: 0xB10 dCamera_c* dCam_getBody(); camera_class* dCam_getCamera(); diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 20101bc074e..d8556e2fde1 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -952,7 +952,7 @@ class dComIfG_inf_c { dComIfG_inf_c() { this->ct(); } ~dComIfG_inf_c() {} void ct(); - void createBaseCsr(); + static void createBaseCsr(); #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG class baseCsr_c : public mDoGph_gInf_c::csr_c { @@ -1022,7 +1022,9 @@ class dComIfG_inf_c { /* 0x1DE09 */ u8 field_0x1de09; /* 0x1DE0A */ u8 field_0x1de0a; /* 0x1DE0B */ u8 mIsDebugMode; - /* 0x1DE0C */ u8 field_0x1de0c; + #if DEBUG + /* 0x1DE0C */ OSStopwatch mStopwatch; + #endif static __d_timer_info_c dComIfG_mTimerInfo; #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG @@ -1174,6 +1176,7 @@ int dComIfG_TimerEnd(int i_mode, int param_1); int dComIfG_TimerDeleteCheck(int); int dComIfG_TimerDeleteRequest(int i_mode); int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*, void*); +BOOL dComIfG_isSceneResetButton(); int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cBgS_PolyInfo& param_3, s16 i_angle, f32 param_5, _GXTexObj* i_tex); @@ -3262,6 +3265,22 @@ inline JPABaseEmitter* dComIfGp_particle_setColor(u16 param_0, const cXyz* i_pos NULL, NULL, NULL, -1, NULL); } +inline u32 dComIfGp_particle_getHeapSize() { + return g_dComIfG_gameInfo.play.getParticle()->getHeapSize(); +} + +inline u32 dComIfGp_particle_getSceneHeapSize() { + return g_dComIfG_gameInfo.play.getParticle()->getSceneHeapSize(); +} + +inline int dComIfGp_particle_getEmitterNum() { + return g_dComIfG_gameInfo.play.getParticle()->getEmitterNum(); +} + +inline int dComIfGp_particle_getParticleNum() { + return g_dComIfG_gameInfo.play.getParticle()->getParticleNum(); +} + inline dSmplMdl_draw_c* dComIfGp_getSimpleModel() { return g_dComIfG_gameInfo.play.getSimpleModel(); } @@ -4369,6 +4388,28 @@ inline u32 dComIfG_getTrigB(u32 i_padNo) { return mDoCPd_c::getTrig(i_padNo) & PAD_BUTTON_B; } +inline u32 dComIfG_getObjectAllSize() { + return g_dComIfG_gameInfo.mResControl.getObjectAllSize(); +} + +inline u32 dComIfG_getStageAllSize() { + return g_dComIfG_gameInfo.mResControl.getStageAllSize(); +} + +inline u32 dComIfG_getObjectSize(const char* i_arcName) { + return g_dComIfG_gameInfo.mResControl.getObjectSize(i_arcName); +} + +inline u32 dComIfG_getStageSize(const char* i_arcName) { + return g_dComIfG_gameInfo.mResControl.getStageSize(i_arcName); +} + +#if DEBUG +inline void dComIfG_initStopwatch() { + OSInitStopwatch(&g_dComIfG_gameInfo.mStopwatch, "dComIfG"); +} +#endif + inline int dComIfGd_setRealShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4, f32 param_5, dKy_tevstr_c* param_6) { return g_dComIfG_gameInfo.drawlist.setRealShadow(param_0, param_1, param_2, param_3, param_4, diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 73c6f24e422..45e99a85d9a 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -387,6 +387,7 @@ class dDemo_c { static s16 getBranchId() { return m_branchId; } static u16 getBranchNum() { return m_branchNum; } static jmessage_tControl* getMesgControl() { return m_mesgControl; } + static dDemo_system_c* getSystem() { return m_system; } static void setBranchNum(u16 num) { m_branchNum = num; diff --git a/include/d/d_eye_hl.h b/include/d/d_eye_hl.h index d1743878060..382938c5a56 100644 --- a/include/d/d_eye_hl.h +++ b/include/d/d_eye_hl.h @@ -13,6 +13,10 @@ class dEyeHL_mng_c { static void entry(dEyeHL_c*); static void remove(dEyeHL_c*); + static void create() { + JUT_ASSERT(51, m_obj == NULL); + } + static dEyeHL_c* m_obj; }; diff --git a/include/d/d_jpreviewer.h b/include/d/d_jpreviewer.h index 9971fa66741..b3b9776de9e 100644 --- a/include/d/d_jpreviewer.h +++ b/include/d/d_jpreviewer.h @@ -26,8 +26,8 @@ class dJprev_c { void show3D(Mtx); void show2D(); - void create(JStudio::TControl* pControl, const JUTGamePad& pad); - void remove(); + static void create(JStudio::TControl* pControl, const JUTGamePad& pad); + static void remove(); void update(); static dJprev_c* get() { return m_myObj; } diff --git a/include/d/d_particle.h b/include/d/d_particle.h index ab8a3be5742..5b5d8db634c 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -7,6 +7,7 @@ #include "JSystem/JParticle/JPAParticle.h" #include "d/d_particle_name.h" #include "d/d_kankyo_tev_str.h" +#include "JSystem/JKernel/JKRSolidHeap.h" void dPa_cleanupGX(); @@ -427,6 +428,9 @@ class dPa_control_c { JKRSolidHeap* getSceneHeap() { return mSceneHeap; } void* getSceneRes() { return m_sceneRes; } + u32 getHeapSize() { return mHeap->getTotalFreeSize(); } + u32 getSceneHeapSize() { return mSceneHeap->getTotalFreeSize(); } + void levelAllForceOnEventMove() { field_0x210.allForceOnEventMove(); } void levelExecute(u32 param_0) { @@ -453,6 +457,7 @@ class dPa_control_c { static JPAEmitterManager* getEmitterManager() { return mEmitterMng; } int getEmitterNum() { return mEmitterMng->getEmitterNumber(); }; + int getParticleNum() { return mEmitterMng->getParticleNumber(); } static dPa_light8PcallBack* getLight8PcallBack() { return &mLight8PcallBack; diff --git a/include/d/d_path.h b/include/d/d_path.h index 7a4e6576acb..5ef65cfaef6 100644 --- a/include/d/d_path.h +++ b/include/d/d_path.h @@ -25,6 +25,13 @@ struct dPath { /* 0x8 */ dPnt* m_points; }; +#if VERSION == VERSION_SHIELD_DEBUG +void dPath_Move(); +void dPath_Draw(); +void dPath_Dt(); +void dPath_Ct(); +#endif + inline BOOL dPath_ChkClose(const dPath* i_path) { return i_path->m_closed & 1; } dPath* dPath_GetRoomPath(int path_index, int room_no); diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 000146822bd..31d028a082a 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -39,6 +39,7 @@ class dRes_info_c { char* getArchiveName() { return mArchiveName; } mDoDvdThd_mountArchive_c* getDMCommand() { return mDMCommand; } JKRArchive* getArchive() { return mArchive; } + JKRSolidHeap* getDataHeap() { return mDataHeap; } u32 incCount() { return ++mCount; } u32 decCount() { return --mCount; } @@ -138,6 +139,14 @@ class dRes_control_c { return getResInfo(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo)); } + u32 getObjectSize(const char* i_arcName) { + return getSize(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo)); + } + + u32 getStageSize(const char* i_arcName) { + return getSize(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo)); + } + /* 0x0000 */ dRes_info_c mObjectInfo[128]; /* 0x1200 */ dRes_info_c mStageInfo[64]; }; // Size: 0x1B00 diff --git a/include/d/d_s_logo.h b/include/d/d_s_logo.h index 0a611b83c3b..56d10eef822 100644 --- a/include/d/d_s_logo.h +++ b/include/d/d_s_logo.h @@ -2,6 +2,7 @@ #define D_S_D_S_LOGO_H #include "f_op/f_op_scene.h" +#include "m_Do/m_Do_dvd_thread.h" class JKRExpHeap; class JKRHeap; @@ -11,33 +12,41 @@ class mDoDvdThd_mountXArchive_c; class mDoDvdThd_mountArchive_c; class mDoDvdThd_toMainRam_c; -class dLog_HIO_c { -public: - dLog_HIO_c(); - virtual ~dLog_HIO_c(); - - u8 field_0x4[0x8 - 0x4]; -}; // Size: 0x8 - class dScnLogo_c : public scene_class { public: enum { - /* 0x0 */ EXEC_WARNING_IN, - /* 0x1 */ EXEC_WARNING_DISP, - /* 0x2 */ EXEC_WARNING_OUT, - /* 0x3 */ EXEC_NINTENDO_IN, - /* 0x4 */ EXEC_NINTENDO_OUT, - /* 0x5 */ EXEC_DOLBY_IN, - /* 0x6 */ EXEC_DOLBY_OUT, - /* 0x7 */ EXEC_DOLBY_OUT2, - /* 0x8 */ EXEC_PROG_IN, - /* 0x9 */ EXEC_PROG_SEL, - /* 0xA */ EXEC_PROG_OUT, - /* 0xB */ EXEC_PROG_SET, - /* 0xC */ EXEC_PROG_SET2, - /* 0xD */ EXEC_PROG_CHANGE, - /* 0xE */ EXEC_DVD_WAIT, - /* 0xF */ EXEC_SCENE_CHANGE, + /* 0 */ EXEC_WARNING_IN, + /* 1 */ EXEC_WARNING_DISP, + /* 2 */ EXEC_WARNING_OUT, + /* 3 */ EXEC_NINTENDO_IN, + /* 4 */ EXEC_NINTENDO_OUT, + /* 5 */ EXEC_DOLBY_IN, + /* 6 */ EXEC_DOLBY_OUT, + /* 7 */ EXEC_DOLBY_OUT2, + /* 8 */ EXEC_PROG_IN, + /* 9 */ EXEC_PROG_SEL, + /* 10 */ EXEC_PROG_OUT, + /* 11 */ EXEC_PROG_SET, + /* 12 */ EXEC_PROG_SET2, + /* 13 */ EXEC_PROG_CHANGE, + /* 14 */ EXEC_DVD_WAIT, + /* 15 */ EXEC_SCENE_CHANGE, + + #if PLATFORM_WII || PLATFORM_SHIELD + /* 16 */ EXEC_STRAP_IN, + /* 17 */ EXEC_STRAP_DISP, + /* 18 */ EXEC_STRAP_OUT, + /* 19 */ EXEC_STRAP_OUT2, + #endif + + #if VERSION == VERSION_SHIELD + /* 20 */ EXEC_MOC_IN, + /* 21 */ EXEC_MOC_DISP, + /* 22 */ EXEC_MOC_OUT, + /* 23 */ EXEC_NVLOGO_IN, + /* 24 */ EXEC_NVLOGO_DISP, + /* 25 */ EXEC_NVLOGO_OUT, + #endif }; dScnLogo_c() {} @@ -64,30 +73,66 @@ class dScnLogo_c : public scene_class { void nextSceneChange(); ~dScnLogo_c(); int create(); - void logoInitGC(); void dvdDataLoad(); void setProgressiveMode(u8); u8 getProgressiveMode(); bool isProgressiveMode(); void setRenderMode(); - #if VERSION == VERSION_GCN_PAL + #if VERSION == VERSION_GCN_PAL || PLATFORM_WII || PLATFORM_SHIELD u8 getPalLanguage(); #endif - #if DEBUG + #if PLATFORM_WII || PLATFORM_SHIELD + void logoInitWii(); + void strapInDraw(); + void strapDispDraw(); + void strapOutDraw(); + void strapOut2Draw(); + #else + void logoInitGC(); + #endif + + #if VERSION == VERSION_SHIELD + void mocInDraw(); + void mocDispDraw(); + void mocOutDraw(); + void nvLogoInDraw(); + void nvLogoDispDraw(); + void nvLogoOutDraw(); + #endif + + mDoDvdThd_mountXArchive_c* aramMount(const char* i_arcPath, JKRHeap* i_heap) { + return mDoDvdThd_mountXArchive_c::create(i_arcPath, 0, JKRArchive::MOUNT_ARAM, i_heap); + } + + mDoDvdThd_mountXArchive_c* onMemMount(const char* i_arcPath) { + return mDoDvdThd_mountXArchive_c::create(i_arcPath, 0, JKRArchive::MOUNT_MEM, NULL); + } + static void onOpeningCut() { + #if DEBUG mOpeningCut = true; + #endif + } + + static u8 isOpeningCut() { + #if DEBUG + return mOpeningCut; + #else + return 0; + #endif } + #if DEBUG static u8 mOpeningCut; #endif public: /* 0x1C4 */ request_of_phase_process_class field_0x1c4; /* 0x1CC */ mDoDvdThd_toMainRam_c* sceneCommand; - /* 0x1D0 */ JKRExpHeap* field_0x1d0; - /* 0x1D4 */ JKRExpHeap* field_0x1d4; + /* 0x1D0 */ JKRExpHeap* mLogoHeap; + /* 0x1D4 */ JKRExpHeap* mLogo01Heap; /* 0x1D8 */ JKRHeap* mpHeap; /* 0x1DC */ dDlst_2D_c* mWarning; /* 0x1E0 */ dDlst_2D_c* mWarningStart; @@ -97,6 +142,13 @@ class dScnLogo_c : public scene_class { /* 0x1F0 */ dDlst_2D_c* mProgressiveYes; /* 0x1F4 */ dDlst_2D_c* mProgressiveNo; /* 0x1F8 */ dDlst_2D_c* mProgressiveSel; +#if PLATFORM_WII || PLATFORM_SHIELD + /* 0x1FC */ dDlst_2D_c* mStrapImg; +#endif +#if VERSION == VERSION_SHIELD + /* 0x200 */ dDlst_2D_c* mNvLogo; + /* 0x204 */ dDlst_2D_c* mMocImg; +#endif #if VERSION == VERSION_GCN_PAL /* 0x1FC */ mDoDvdThd_mountArchive_c* mpPalLogoResCommand; #endif @@ -114,6 +166,10 @@ class dScnLogo_c : public scene_class { /* 0x214 */ u16 field_0x214; /* 0x218 */ u32 field_0x218; /* 0x21C */ void* dummyGameAlloc; +#if PLATFORM_WII || VERSION == VERSION_SHIELD + /* 0x224 */ mDoDvdThd_toMainRam_c* mpHomeBtnCommand; + /* 0x228 */ int mHomeBtnRegion; +#endif /* 0x220 */ mDoDvdThd_mountXArchive_c* mpField0Command; /* 0x224 */ mDoDvdThd_mountXArchive_c* mpAlAnmCommand; /* 0x228 */ u8 field_0x228[4]; diff --git a/include/d/d_s_menu.h b/include/d/d_s_menu.h index a544c655762..d2e0e9bde0b 100644 --- a/include/d/d_s_menu.h +++ b/include/d/d_s_menu.h @@ -83,6 +83,8 @@ class dScnMenu_c : public scene_class { extern int g_playerKind; extern int g_debugHpMode; extern int g_horsePosInit; + +u8 dSm_read_stageset(u8* i_data); #else class dScnMenu_c {}; #endif diff --git a/include/d/d_s_play.h b/include/d/d_s_play.h index 7181cf0b60c..45b60220b08 100644 --- a/include/d/d_s_play.h +++ b/include/d/d_s_play.h @@ -9,9 +9,15 @@ class mDoDvdThd_mountXArchive_c; class mDoDvdThd_toMainRam_c; -class dScnPly_reg_childHIO_c { +class dScnPly_reg_childHIO_c : public JORReflexible { public: - /* 0x00 */ void* vtable; +#if ENABLE_REGHIO + dScnPly_reg_childHIO_c(); + virtual ~dScnPly_reg_childHIO_c() {} + + void genMessage(JORMContext*); +#endif + /* 0x04 */ f32 mFloatReg[30]; /* 0x7C */ s16 mShortReg[10]; }; @@ -37,9 +43,10 @@ class dScnPly_preLoad_HIO_c : public mDoHIO_entry_c { void genMessage(JORMContext*); }; -class dScnPly_env_HIO_c { +class dScnPly_env_HIO_c : public JORReflexible { public: virtual ~dScnPly_env_HIO_c() {} + void genMessage(JORMContext*); /* 0x04 */ s8 field_0x4; /* 0x08 */ dScnPly_env_otherHIO_c mOther; @@ -79,6 +86,18 @@ class dScnPly_c : public scene_class { static s8 pauseTimer; static s8 nextPauseTimer; + #if DEBUG + void onDebugPause() { + debugPause = TRUE; + } + + void offDebugPause() { + debugPause = FALSE; + } + + static u8 debugPause; + #endif + /* 0x1C4 */ request_of_phase_process_class field_0x1c4; /* 0x1CC */ mDoDvdThd_toMainRam_c* sceneCommand; /* 0x1D0 */ mDoDvdThd_mountXArchive_c* field_0x1d0; diff --git a/include/d/d_s_play_env.h b/include/d/d_s_play_env.h index 79eed8a63d4..d2b23d9f8c2 100644 --- a/include/d/d_s_play_env.h +++ b/include/d/d_s_play_env.h @@ -6,7 +6,9 @@ class dScnPly_env_otherHIO_c : public JORReflexible { dScnPly_env_otherHIO_c(); virtual ~dScnPly_env_otherHIO_c() {} + void listenPropertyEvent(const JORPropertyEvent*); void genMessage(JORMContext*); + void addSetEmitterID(u16 param_0) { #if DEBUG field_0x1c[field_0x4f++] = param_0; @@ -14,6 +16,8 @@ class dScnPly_env_otherHIO_c : public JORReflexible { #endif } + void printParticle(); + #if DEBUG /* 0x04 */ s8 field_0x04; #endif @@ -53,6 +57,7 @@ class dScnPly_env_debugHIO_c : public JORReflexible { dScnPly_env_debugHIO_c(); virtual ~dScnPly_env_debugHIO_c() {} + void listenPropertyEvent(const JORPropertyEvent*); void genMessage(JORMContext*); /* 0x04 */ u8 field_0x4; diff --git a/include/d/d_save_HIO.h b/include/d/d_save_HIO.h index cc2f8af7065..e149f7fcb98 100644 --- a/include/d/d_save_HIO.h +++ b/include/d/d_save_HIO.h @@ -209,11 +209,12 @@ class dSvBit_childItemHIO_c { /* 0x1A0 */ dSvBit_childItOneZoneHIO_c mOneZoneSave; }; -class dSvBit_HIO_c { +class dSvBit_HIO_c : public JORReflexible { public: void init(); virtual ~dSvBit_HIO_c() {} + void genMessage(JORMContext*); /* 0x004 */ s8 field_0x4; /* 0x008 */ dSvBit_childSwitchHIO_c mSwitch; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 6f558f87c09..a4b72182bb8 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1062,7 +1062,7 @@ class dStage_roomStatus_c { /* 0x3F7 */ s8 mZoneNo; /* 0x3F8 */ s8 mMemBlockID; /* 0x3F9 */ u8 mRegionNo; - /* 0x3FC */ int mProcID; + /* 0x3FC */ fpc_ProcID mProcID; /* 0x400 */ dBgW_Base* mpBgW; int getZoneNo() const { return mZoneNo; } @@ -1118,8 +1118,8 @@ class dStage_roomControl_c { static s8 getRoomReadId() { return mRoomReadId; } static void setRoomReadId(s8 id) { mRoomReadId = id; } - static u32 getProcID() { return mProcID; } - static void setProcID(u32 id) { mProcID = id; } + static fpc_ProcID getProcID() { return mProcID; } + static void setProcID(fpc_ProcID id) { mProcID = id; } static int getStayNo() { return mStayNo; } static int getNextStayNo() { return mNextStayNo; } static BOOL GetTimePass() { return m_time_pass; } @@ -1193,7 +1193,7 @@ class dStage_roomControl_c { JUT_ASSERT(2770, 0 <= i_roomNo && i_roomNo < 64); mStatus[i_roomNo].mProcID = i_id; } - static int getStatusProcID(int i_roomNo) { + static fpc_ProcID getStatusProcID(int i_roomNo) { JUT_ASSERT(2774, 0 <= i_roomNo && i_roomNo < 64); return mStatus[i_roomNo].mProcID; } @@ -1223,7 +1223,7 @@ class dStage_roomControl_c { static char mArcBank[32][10]; static dStage_roomStatus_c mStatus[0x40]; static char mDemoArcName[10]; - static u32 mProcID; + static fpc_ProcID mProcID; static nameData* mArcBankName; static bankData* mArcBankData; static roomDzs_c m_roomDzs; @@ -1398,6 +1398,10 @@ dStage_KeepDoorInfo* dStage_GetKeepDoorInfo(); dStage_KeepDoorInfo* dStage_GetRoomKeepDoorInfo(); void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage); +#if DEBUG +void dStage_DebugDisp(); +#endif + #define dStage_NAME_LENGTH 8 const char* dStage_getName(s16 procName, s8 argument); diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 6aa5713e1b9..221fdf2ffb7 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -71,6 +71,8 @@ enum fopAc_Cull_e { fopAc_CULLBOX_14_e, #endif fopAc_CULLBOX_CUSTOM_e, + fopAc_CULLBOX_MAX_e = fopAc_CULLBOX_CUSTOM_e, + fopAc_CULLSPHERE_0_e, fopAc_CULLSPHERE_1_e, fopAc_CULLSPHERE_2_e, @@ -83,6 +85,7 @@ enum fopAc_Cull_e { fopAc_CULLSPHERE_8_e, #endif fopAc_CULLSPHERE_CUSTOM_e, + fopAc_CULLSPHERE_MAX_e = fopAc_CULLSPHERE_CUSTOM_e - fopAc_CULLSPHERE_0_e, }; enum fopAc_attention_type { diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index b3a8873bcc3..8cb4d1a255e 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -847,6 +847,9 @@ BOOL fopAcM_getNameString(const fopAc_ac_c*, char*); inline void fopAcM_SetStatusMap(fopAc_ac_c*, u32) {} +extern cull_box l_cullSizeBox[fopAc_CULLBOX_MAX_e]; +extern cull_sphere l_cullSizeSphere[fopAc_CULLSPHERE_MAX_e]; + class fopAcM_lc_c { public: fopAcM_lc_c() { mLineCheck.ClrSttsRoofOff(); } diff --git a/include/f_op/f_op_kankyo.h b/include/f_op/f_op_kankyo.h index 9d2b3b87eb7..7741d6c09df 100644 --- a/include/f_op/f_op_kankyo.h +++ b/include/f_op/f_op_kankyo.h @@ -19,7 +19,7 @@ struct kankyo_process_profile_definition { /* 0x24 */ leafdraw_method_class* sub_method; }; // Size: 0x28 -void fopKy_IsKankyo(void* i_this); +BOOL fopKy_IsKankyo(void* i_this); extern leafdraw_method_class g_fopKy_Method; diff --git a/include/f_op/f_op_kankyo_mng.h b/include/f_op/f_op_kankyo_mng.h index 975c1d2028f..dcd36635aec 100644 --- a/include/f_op/f_op_kankyo_mng.h +++ b/include/f_op/f_op_kankyo_mng.h @@ -21,6 +21,7 @@ base_process_class* fopKyM_fastCreate(s16 i_procName, int i_param, cXyz* i_pos, fopKyM_CreateFunc i_createFunc); fpc_ProcID fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param); fpc_ProcID fopKyM_createMpillar(cXyz const* i_pos, f32 i_size); +BOOL fopKyM_IsKy(void* i_process); inline fopKyM_prm_class* fopKyM_GetAppend(void* i_process) { return (fopKyM_prm_class*)fpcM_GetAppend(i_process); diff --git a/include/m_Do/m_Do_Reset.h b/include/m_Do/m_Do_Reset.h index 5396a1510df..8a19c8fbe37 100644 --- a/include/m_Do/m_Do_Reset.h +++ b/include/m_Do/m_Do_Reset.h @@ -6,6 +6,10 @@ void mDoRst_reset(int, u32, int); void mDoRst_resetCallBack(int, void*); +#if !PLATFORM_GCN +void mDoRst_shutdownCallBack(); +#endif + struct mDoRstData { /* 0x00 */ int mReset; /* 0x04 */ int mResetPrepare; diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 7c456b0cfef..57553f36fc8 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -27,13 +27,13 @@ class mDoAud_zelAudio_c : public Z2AudioMgr { static u8 isResetFlag() { return mResetFlag; } static void onResetFlag() { mResetFlag = true; } static void offResetFlag() { mResetFlag = false; } - static bool isBgmSet() { return mBgmSet; } + static u8 isBgmSet() { return mBgmSet; } static void onBgmSet() { mBgmSet = true; } static void offBgmSet() { mBgmSet = false; } static u8 mInitFlag; static u8 mResetFlag; - static bool mBgmSet; + static u8 mBgmSet; }; extern JKRSolidHeap* g_mDoAud_audioHeap; diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 44780980646..5cb6f84a101 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -774,6 +774,12 @@ void mDoExt_restoreCurrentHeap(); JKRExpHeap* mDoExt_getGameHeap(); void mDoExt_setSafeGameHeapSize(); size_t mDoExt_getSafeGameHeapSize(); +intptr_t mDoExt_getSafeArchiveHeapSize(); +intptr_t mDoExt_getSafeJ2dHeapSize(); +intptr_t mDoExt_getSafeCommandHeapSize(); +void mDoExt_setSafeCommandHeapSize(); +void mDoExt_setSafeArchiveHeapSize(); +void mDoExt_setSafeJ2dHeapSize(); void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap); JKRHeap* mDoExt_setCurrentHeap(JKRHeap* i_heap); JKRExpHeap* mDoExt_getArchiveHeap(); diff --git a/include/m_Re/m_Re_controller_pad.h b/include/m_Re/m_Re_controller_pad.h index ac77462a918..1b58bfd4afc 100644 --- a/include/m_Re/m_Re_controller_pad.h +++ b/include/m_Re/m_Re_controller_pad.h @@ -187,6 +187,8 @@ class mReCPd { static u32 getTrigUp(u32 i_pad) { return getTrig(i_pad) & WPAD_BUTTON_UP; } static u32 getTrigStart(u32 i_pad) { return getTrig(i_pad) & WPAD_BUTTON_PLUS; } + static f32 getStickX(u32 i_pad) { return getPad(i_pad).field_0x4[0].ex_status.fs.stick.x; } + static WPADInfo m_pad_info[WPAD_MAX_CONTROLLERS]; static Pad m_pad[WPAD_MAX_CONTROLLERS]; static motorWave_t m_motorWave[WPAD_MAX_CONTROLLERS]; diff --git a/include/revolution/os/OSResetSW.h b/include/revolution/os/OSResetSW.h index c6fc2d027f9..752efaea896 100644 --- a/include/revolution/os/OSResetSW.h +++ b/include/revolution/os/OSResetSW.h @@ -11,6 +11,7 @@ typedef void (*OSResetCallback)(void); typedef void (*OSPowerCallback)(void); OSResetCallback OSSetResetCallback(OSResetCallback callback); +OSPowerCallback OSSetPowerCallback(OSPowerCallback callback); BOOL OSGetResetSwitchState(void); BOOL OSGetResetButtonState(void); diff --git a/include/revolution/sc.h b/include/revolution/sc.h index 88ecad96601..262b1656074 100644 --- a/include/revolution/sc.h +++ b/include/revolution/sc.h @@ -184,6 +184,7 @@ u8 SCGetEuRgb60Mode(void); BOOL SCGetIdleMode(SCIdleModeInfo* data); u8 SCGetLanguage(void); u8 SCGetProgressiveMode(void); +void SCSetProgressiveMode(u8 mode); u8 SCGetScreenSaverMode(void); u8 SCGetSoundMode(void); u32 SCGetCounterBias(void); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath index 3040fbfe627..fa856b9b80b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath @@ -2,6 +2,7 @@ #define MSL_CMATH_H_ #include +#include #define NAN (*(float*) __float_nan) #define HUGE_VALF (*(float*) __float_huge) @@ -174,6 +175,10 @@ inline float abs(float x) { return ::fabsf(x); } +inline long abs(long x) { + return ::labs(x); +} + inline float fmod(float x, float y) { return ::fmod(x, y); } diff --git a/src/SSystem/SComponent/c_phase.cpp b/src/SSystem/SComponent/c_phase.cpp index c31fd9b2d0f..4784e24878a 100644 --- a/src/SSystem/SComponent/c_phase.cpp +++ b/src/SSystem/SComponent/c_phase.cpp @@ -6,12 +6,12 @@ #include "SSystem/SComponent/c_phase.h" void cPhs_Reset(request_of_phase_process_class* phase) { - phase->id = cPhs_INIT_e; + phase->id = 0; } void cPhs_Set(request_of_phase_process_class* phase, cPhs__Handler* handlerTbl) { phase->mpHandlerTable = handlerTbl; - phase->id = cPhs_INIT_e; + phase->id = 0; } void cPhs_UnCompleate(request_of_phase_process_class* phase) { diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index 4b2ecd0bf82..ed8b6dece94 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -1022,7 +1022,7 @@ int cDylPhs::Link(request_of_phase_process_class* i_phase, s16 i_ProfName) { (request_of_phase_process_fn)cDylPhs::phase_03 }; - if (i_phase->id == cPhs_NEXT_e) { + if (i_phase->id == 2) { return cPhs_COMPLEATE_e; } @@ -1030,11 +1030,11 @@ int cDylPhs::Link(request_of_phase_process_class* i_phase, s16 i_ProfName) { } int cDylPhs::Unlink(request_of_phase_process_class* i_phase, s16 i_ProfName) { - JUT_ASSERT(460, i_phase->id != cPhs_LOADING_e); + JUT_ASSERT(460, i_phase->id != 1); - if (i_phase->id == cPhs_NEXT_e) { + if (i_phase->id == 2) { int ret = cDyl_Unlink(i_ProfName); - i_phase->id = cPhs_INIT_e; + i_phase->id = 0; return ret; } diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 04992b39b50..c0cedf9e78c 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -406,7 +406,7 @@ actor_process_profile_definition g_profile_GRASS = { fpcPi_CURRENT_e, // mListPrio PROC_GRASS, // mProcName &g_fpcLf_Method.base, // sub_method - 0x00000570, // mSize + sizeof(daGrass_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // sub_method diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 9f4dd6e463f..de8cd355c40 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -23,6 +23,16 @@ #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_overlap_mng.h" +#include "res/Object/E_yc.h" +#include "res/Object/E_kc.h" + +#define TYPE_TWILIGHT 0 +#define TYPE_NORMAL 1 + +#define SCENE_TYPE_LAKE_HYLIA 0 +#define SCENE_TYPE_RIVER 1 +#define SCENE_TYPE_BOARD_HOUSE 2 +#define SCENE_TYPE_DEFAULT 3 namespace { static dCcD_SrcSph cc_sph_src = { { @@ -143,44 +153,34 @@ void daKago_HIO_c::genMessage(JORMContext* ctx) { } #endif -int daKago_c::getBckName(int param_0) { - if (field_0x6e7 == 0) { - return param_0; +int daKago_c::getBckName(int i_resIdx) { + if (mType == TYPE_TWILIGHT) { + return i_resIdx; } - switch (param_0) { - case 7: - return 4; - case 8: - return 5; - case 9: - return 6; - case 10: - return 7; - case 11: - return 8; - case 12: - return 9; - case 13: - return 10; - case 14: - return 11; - case 15: - return 12; - case 21: - return 13; - default: - return 6; - } -} - -void daKago_c::setBck(int param_0, u8 param_1, f32 param_2, f32 param_3) { - mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(field_0x75c, getBckName(param_0)), - param_1, param_2, param_3, 0.0f, -1.0f); -} - -bool daKago_c::checkBck(int param_0) { - if (mpMorf->getAnm() == dComIfG_getObjectRes(field_0x75c, getBckName(param_0))) { + // convert shadow kargorok res idx to normal kargorok res idx + switch (i_resIdx) { + case dRes_ID_E_YC_BCK_YC_CRASH_e: return dRes_ID_E_KC_BCK_KC_CRASH_e; + case dRes_ID_E_YC_BCK_YC_CRASH2_e: return dRes_ID_E_KC_BCK_KC_CRASH2_e; + case dRes_ID_E_YC_BCK_YC_FLY_e: return dRes_ID_E_KC_BCK_KC_FLY_e; + case dRes_ID_E_YC_BCK_YC_FLY_BRAKE_e: return dRes_ID_E_KC_BCK_KC_FLY_BRAKE_e; + case dRes_ID_E_YC_BCK_YC_FLY_DASH_WL_e: return dRes_ID_E_KC_BCK_KC_FLY_DASH_WL_e; + case dRes_ID_E_YC_BCK_YC_FLY_GLIDE_e: return dRes_ID_E_KC_BCK_KC_FLY_GLIDE_e; + case dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e: return dRes_ID_E_KC_BCK_KC_FLY_GLIDE_WL_e; + case dRes_ID_E_YC_BCK_YC_FLY_LIMIT_WL_e: return dRes_ID_E_KC_BCK_KC_FLY_LIMIT_WL_e; + case dRes_ID_E_YC_BCK_YC_FLY_WL_e: return dRes_ID_E_KC_BCK_KC_FLY_WL_e; + case dRes_ID_E_YC_BCK_YC_HOVERING_e: return dRes_ID_E_KC_BCK_KC_HOVERING_e; + default: return dRes_ID_E_KC_BCK_KC_FLY_e; + } +} + +void daKago_c::setBck(int i_anm, u8 i_mode, f32 i_morf, f32 i_speed) { + mAnm_p->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(mArcName, getBckName(i_anm)), + i_mode, i_morf, i_speed, 0.0f, -1.0f); +} + +bool daKago_c::checkBck(int i_anm) { + if (mAnm_p->getAnm() == dComIfG_getObjectRes(mArcName, getBckName(i_anm))) { return true; } else { return false; @@ -193,16 +193,19 @@ int daKago_c::draw() { } g_env_light.settingTevStruct(2, ¤t.pos, &tevStr); - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); g_env_light.setLightTevColorType_MAJI(model, &tevStr); + fopAcM_setEffectMtx(this, model->getModelData()); + dComIfGd_setListDark(); - mpMorf->entryDL(); + mAnm_p->entryDL(); dComIfGd_setList(); + cXyz unkXyz1; unkXyz1.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); - field_0x764 = - dComIfGd_setShadow(field_0x764, 0, model, &unkXyz1, 3500.0f, 0.0f, current.pos.y, + mShadowId = + dComIfGd_setShadow(mShadowId, 0, model, &unkXyz1, 3500.0f, 0.0f, current.pos.y, mObjAcch.GetGroundH(), mObjAcch.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); @@ -216,22 +219,26 @@ static int daKago_Draw(daKago_c* i_this) { int daKago_c::executeBalloonMenu() { dCamera_c* camera = dCam_getBody(); - switch (field_0x6eb) { + switch (mBalloonMenuMode) { case 0: - if (field_0x6e7 == 1 && (mCurrentAction == 0 || mCurrentAction == 5) && - !dComIfGp_event_runCheck() && mDoCPd_c::getTrigB(0)) + if (mType == TYPE_NORMAL && (mAction == ACTION_FLY_e || mAction == ACTION_ATTACK_e) && + !dComIfGp_event_runCheck() && mDoCPd_c::getTrigB(PAD_1)) { - field_0x6eb = 1; + mBalloonMenuMode = 1; return 1; } return 0; case 1: - if (eventInfo.checkCommandDemoAccrpt() == 0) { + if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 1, 0xffff, 0); - eventInfo.onCondition(2); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); + #if VERSION == VERSION_SHIELD_DEBUG + return 0; + #else break; + #endif } mMsgFlow.init(this, 0x457, 0, NULL); @@ -239,32 +246,29 @@ int daKago_c::executeBalloonMenu() { camera->Stop(); camera->SetTrimSize(3); - field_0x6eb = 0x2; - + mBalloonMenuMode = 2; break; case 2: if (mMsgFlow.doFlow(this, NULL, 0)) { if (dMsgObject_getSelectCursorPos() == 0) { - field_0x6eb = 0; + mBalloonMenuMode = 0; camera->Start(); camera->SetTrimSize(0); dComIfGp_event_reset(); - return 1; } if (dMsgObject_getSelectCursorPos() == 1) { - field_0x6eb = 3; + mBalloonMenuMode = 3; dComIfGp_setNextStage("F_SP112", 0, dComIfGp_roomControl_getStayNo(), dComIfG_play_c::getLayerNo(0), 0.0f, 10, 1, 0, 0, 1, 0); } else { - field_0x6eb = 3; + mBalloonMenuMode = 3; dStage_changeScene(3, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); } } - break; } @@ -275,37 +279,35 @@ static u8 hio_set; static daKago_HIO_c l_HIO; f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { - f32 retVal; - - retVal = mGroundHeight; + f32 gnd_height = mGroundHeight; if (mpPath1 != NULL) { - cXyz pointPos1; - cXyz pointPos2; + cXyz nextPntPos; + cXyz prevPntPos; cXyz cStack_140; - pointPos1 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; + nextPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; - int pointIdx2 = (int)mPathIdx - (int)mPathIdxOffset; - if (pointIdx2 >= mpPath1->m_num || pointIdx2 < 0) { - pointIdx2 = mPathIdx; + int prevPntNo = (int)mPathCurrentPointNo - (int)mPathStep; + if (prevPntNo >= mpPath1->m_num || prevPntNo < 0) { + prevPntNo = mPathCurrentPointNo; } - pointPos2 = dPath_GetPnt(mpPath1, pointIdx2)->m_position; + prevPntPos = dPath_GetPnt(mpPath1, prevPntNo)->m_position; - s16 targetAngleY = cLib_targetAngleY(&pointPos2, &pointPos1); + s16 pntAngle = cLib_targetAngleY(&prevPntPos, &nextPntPos); - mDoMtx_stack_c::YrotS(-targetAngleY); + mDoMtx_stack_c::YrotS(-pntAngle); mDoMtx_stack_c::transM(-i_pos.x, -i_pos.y, -i_pos.z); - mDoMtx_stack_c::multVec(&pointPos2, &cStack_140); + mDoMtx_stack_c::multVec(&prevPntPos, &cStack_140); f32 var_f29 = -cStack_140.z; if (var_f29 < 0.0f) { var_f29 = 0.0f; } - mDoMtx_stack_c::YrotS(-targetAngleY); + mDoMtx_stack_c::YrotS(-pntAngle); mDoMtx_stack_c::transM(-i_pos.x, -i_pos.y, -i_pos.z); - mDoMtx_stack_c::multVec(&pointPos1, &cStack_140); + mDoMtx_stack_c::multVec(&nextPntPos, &cStack_140); f32 var_f28 = cStack_140.z; if (var_f28 < 0.0f) { @@ -313,12 +315,12 @@ f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { } f32 var_f27 = var_f29 / (var_f29 + var_f28); - retVal = pointPos1.y * var_f27 + pointPos2.y * (1.0f - var_f27); + gnd_height = nextPntPos.y * var_f27 + prevPntPos.y * (1.0f - var_f27); if (o_step != NULL) { - f32 pointLatDist = pointPos1.absXZ(pointPos2); - f32 pointVertDist = std::abs(pointPos1.y - pointPos2.y); - *o_step = pointVertDist * l_HIO.mFlightSpeed / pointLatDist + 5.0f; + f32 pntDistXZ = nextPntPos.absXZ(prevPntPos); + f32 pntDistY = std::abs(nextPntPos.y - prevPntPos.y); + *o_step = pntDistY * l_HIO.mFlightSpeed / pntDistXZ + 5.0f; } } @@ -327,19 +329,20 @@ f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { dBgS_GndChk gndChk; cXyz gndChkPos(i_pos.x, i_pos.y + 500.0f, i_pos.z); gndChk.SetPos(&gndChkPos); - field_0x700 = dComIfG_Bgsp().GroundCross(&gndChk); + mGroundFlyHeight = dComIfG_Bgsp().GroundCross(&gndChk); + + mGndSpecialCode = 0; - field_0x738 = 0; + if (mGroundFlyHeight != -G_CM3D_F_INF) { + mGndSpecialCode = dComIfG_Bgsp().GetSpecialCode(gndChk); - if (field_0x700 != -G_CM3D_F_INF) { - field_0x738 = dComIfG_Bgsp().GetSpecialCode(gndChk); - field_0x700 += l_HIO.mFlightGroundAltitude; - if (retVal < field_0x700) { - retVal = field_0x700; - if (current.pos.y < retVal) { + mGroundFlyHeight += l_HIO.mFlightGroundAltitude; + if (gnd_height < mGroundFlyHeight) { + gnd_height = mGroundFlyHeight; + if (current.pos.y < gnd_height) { mGroundHeight = current.pos.y; } else { - mGroundHeight = field_0x700; + mGroundHeight = mGroundFlyHeight; } if (o_step != NULL) { @@ -360,15 +363,15 @@ f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { unkFlag1 = TRUE; } - if (retVal < gndCrossMag) { - field_0x700 = gndCrossMag; - retVal = gndCrossMag; + if (gnd_height < gndCrossMag) { + mGroundFlyHeight = gndCrossMag; + gnd_height = gndCrossMag; field_0x6e0 = 1; if (current.pos.y < gndCrossMag) { mGroundHeight = current.pos.y; } else { - mGroundHeight = field_0x700; + mGroundHeight = mGroundFlyHeight; } if (o_step != NULL) { @@ -382,37 +385,37 @@ f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { field_0x6e6 = 1; } } else { - field_0x71c = 0; + mWaterSplashTimer = 0; field_0x6e6 = 0; } - return retVal; + return gnd_height; } -f32 daKago_c::checkRoofHeight(cXyz param_0) { - f32 roofChkYVal = mRoofHeight; +f32 daKago_c::checkRoofHeight(cXyz i_pos) { + f32 roof_height = mRoofHeight; BOOL unkFlag1 = FALSE; field_0x6e5 = 0; dBgS_RoofChk roofChk; - cXyz unkXyz1(param_0.x, param_0.y - 500.0f, param_0.z); - roofChk.SetPos(unkXyz1); + cXyz chkpos(i_pos.x, i_pos.y - 500.0f, i_pos.z); + roofChk.SetPos(chkpos); - roofChkYVal = dComIfG_Bgsp().RoofChk(&roofChk); - if (roofChkYVal != G_CM3D_F_INF) { - roofChkYVal -= l_HIO.mFlightCeilingAltitude; - if (current.pos.y > roofChkYVal) { + roof_height = dComIfG_Bgsp().RoofChk(&roofChk); + if (roof_height != G_CM3D_F_INF) { + roof_height -= l_HIO.mFlightCeilingAltitude; + if (current.pos.y > roof_height) { mRoofHeight = current.pos.y; } else { - mRoofHeight = roofChkYVal; + mRoofHeight = roof_height; } if (dComIfG_Bgsp().GetSpecialCode(roofChk) == 1) { unkFlag1 = TRUE; } - if (std::abs(current.pos.y - roofChkYVal) < 310.0f) { + if (std::abs(current.pos.y - roof_height) < 310.0f) { fopAc_ac_c* actor = dComIfG_Bgsp().GetActorPointer(roofChk); if (actor != NULL && fopAcM_GetName(actor) == PROC_Obj_RIVERROCK) { if (((daObjRIVERROCK_c*)actor)->mBreakSubAction == daObjRIVERROCK_c::BREAK_MOVE) { @@ -432,7 +435,7 @@ f32 daKago_c::checkRoofHeight(cXyz param_0) { field_0x6e3 = 0; } - return roofChkYVal; + return roof_height; } void daKago_c::checkMoveHeight() { @@ -444,58 +447,61 @@ void daKago_c::checkMoveHeight() { void daKago_c::checkSizeBg() { dBgS_LinChk linChk; - cXyz unkXyz1; - cXyz unkXyz2; + cXyz line_start; + cXyz line_end; cM3dGPla plane; - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); field_0x6d9 = 0; - if (mCurrentAction == 4) { + if (mAction == ACTION_WAIT_e) { return; } - mDoMtx_stack_c::copy(model->getAnmMtx(10)); - mDoMtx_stack_c::multVecZero(&unkXyz1); - mDoMtx_stack_c::copy(model->getAnmMtx(14)); - mDoMtx_stack_c::multVecZero(&unkXyz2); - unkXyz2 = unkXyz1 + (unkXyz2 - unkXyz1) * 0.9f; - linChk.Set(&unkXyz1, &unkXyz2, NULL); + mDoMtx_stack_c::copy(model->getAnmMtx(YC_JNT_SHOULDERL_1_e)); + mDoMtx_stack_c::multVecZero(&line_start); + mDoMtx_stack_c::copy(model->getAnmMtx(YC_JNT_HANDL_3_e)); + mDoMtx_stack_c::multVecZero(&line_end); + line_end = line_start + (line_end - line_start) * 0.9f; + linChk.Set(&line_start, &line_end, NULL); + if (dComIfG_Bgsp().LineCross(&linChk)) { dComIfG_Bgsp().GetTriPla(linChk, &plane); if (dComIfG_Bgsp().GetSpecialCode(linChk) == 1) { field_0x6d9 |= (u8)1; - field_0x650[0] = linChk.GetCross(); + mWallHitEffPos[0] = linChk.GetCross(); } } - mDoMtx_stack_c::copy(model->getAnmMtx(15)); - mDoMtx_stack_c::multVecZero(&unkXyz1); - mDoMtx_stack_c::copy(model->getAnmMtx(19)); - mDoMtx_stack_c::multVecZero(&unkXyz2); - unkXyz2 = (unkXyz1 + (unkXyz2 - unkXyz1) * 0.9f); - linChk.Set(&unkXyz1, &unkXyz2, NULL); + mDoMtx_stack_c::copy(model->getAnmMtx(YC_JNT_SHOULDERR_1_e)); + mDoMtx_stack_c::multVecZero(&line_start); + mDoMtx_stack_c::copy(model->getAnmMtx(YC_JNT_HANDR_3_e)); + mDoMtx_stack_c::multVecZero(&line_end); + line_end = (line_start + (line_end - line_start) * 0.9f); + linChk.Set(&line_start, &line_end, NULL); + if (dComIfG_Bgsp().LineCross(&linChk)) { dComIfG_Bgsp().GetTriPla(linChk, &plane); if (dComIfG_Bgsp().GetSpecialCode(linChk) == 1) { field_0x6d9 |= (u8)0x2; - field_0x650[1] = linChk.GetCross(); + mWallHitEffPos[1] = linChk.GetCross(); } } - unkXyz1 = current.pos; - mDoMtx_stack_c::copy(model->getAnmMtx(1)); - mDoMtx_stack_c::multVecZero(&unkXyz1); + line_start = current.pos; + mDoMtx_stack_c::copy(model->getAnmMtx(YC_JNT_BACKBONE1_e)); + mDoMtx_stack_c::multVecZero(&line_start); mDoMtx_stack_c::transM(300.0f, 0.0f, 0.0f); - mDoMtx_stack_c::multVecZero(&unkXyz2); - linChk.Set(&unkXyz1, &unkXyz2, NULL); + mDoMtx_stack_c::multVecZero(&line_end); + linChk.Set(&line_start, &line_end, NULL); + if (dComIfG_Bgsp().LineCross(&linChk)) { dComIfG_Bgsp().GetTriPla(linChk, &plane); if (dComIfG_Bgsp().GetSpecialCode(linChk) == 1) { if (!checkYaguraPos(linChk.GetCross())) { field_0x6d9 |= (u8)4; - this->field_0x650[2] = linChk.GetCross(); + mWallHitEffPos[2] = linChk.GetCross(); } } } @@ -505,12 +511,12 @@ s16 daKago_c::getBeforeGroundHeight(u8 param_0) { return 0; } -void daKago_c::demo_skip(int param_0) { +void daKago_c::demo_skip(int i_parameter) { dCamera_c* camera = dCam_getBody(); - switch (param_0) { + switch (i_parameter) { case 0: - field_0x748 = 2; + mDemoMode = 2; field_0x74c = 0; break; case 1: @@ -521,10 +527,10 @@ void daKago_c::demo_skip(int param_0) { case 2: setMidnaRideOn(); setPlayerRideOn(); - field_0x718 = field_0x71a = 0; + mHeadRotZ = mHeadRotY = 0; /* dSv_event_flag_c::M_051 - Main Event - Shadow Kargorok (?) (Large) event complete (Horse grass appears in various places) */ dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[84]); - field_0x748 = 7; + mDemoMode = 7; field_0x74c = 0; break; case 4: @@ -534,10 +540,10 @@ void daKago_c::demo_skip(int param_0) { case 5: case 6: if (setSceneChange(3)) { - if (param_0 == 5) { - field_0x748 = 6; + if (i_parameter == 5) { + mDemoMode = 6; } else { - field_0x748 = 5; + mDemoMode = 5; field_0x6cc = 1.0f; } } @@ -545,14 +551,14 @@ void daKago_c::demo_skip(int param_0) { case 7: setRideOff(); case 8: { - field_0x68c.set(-77875.0f, -18287.0f, 42000.0f); - field_0x698.set(-77275.0f, -18500.0f, 41090.0f); + mDemoCamCenter.set(-77875.0f, -18287.0f, 42000.0f); + mDemoCamEye.set(-77275.0f, -18500.0f, 41090.0f); field_0x6a4.set(-77615.0f, -18640.0f, 41400.0f); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&field_0x6a4, 0, 0); field_0x6de = 0; speed.y = speedF = 0.0f; - setActionMode(4, 0); - camera->Set(field_0x68c, field_0x698, 70.0f, 0); + setActionMode(ACTION_WAIT_e, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, 70.0f, 0); camera->Reset(); camera->Start(); camera->SetTrimSize(0); @@ -563,14 +569,14 @@ void daKago_c::demo_skip(int param_0) { case 9: setRideOff(); case 10: - field_0x68c.set(3703.0f, 337.0f, 863.0f); - field_0x698.set(3726.0f, 272.0f, 1196.0f); + mDemoCamCenter.set(3703.0f, 337.0f, 863.0f); + mDemoCamEye.set(3726.0f, 272.0f, 1196.0f); field_0x6a4.set(3782.0f, 222.0f, 690.0f); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&field_0x6a4, 0, 0); field_0x6de = 0; speed.y = speedF = 0.0f; - setActionMode(4, 0); - camera->Set(field_0x68c, field_0x698, 70.0f, 0); + setActionMode(ACTION_WAIT_e, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, 70.0f, 0); camera->Reset(); camera->Start(); camera->SetTrimSize(0); @@ -579,27 +585,28 @@ void daKago_c::demo_skip(int param_0) { } } -int daKago_c::DemoSkipCallBack(void* param_0, int param_1) { - if (param_0 != NULL) { - ((daKago_c*)param_0)->demo_skip(param_1); - return 1; +int daKago_c::DemoSkipCallBack(void* i_this, int i_parameter) { + if (i_this != NULL) { + ((daKago_c*)i_this)->demo_skip(i_parameter); + return TRUE; } - return 0; + + return FALSE; } -void daKago_c::setActionMode(int param_0, int param_1) { +void daKago_c::setActionMode(int i_action, int i_mode) { mIsFlying = false; - mCurrentAction = param_0; - field_0x744 = param_1; + mAction = i_action; + mMode = i_mode; } void daKago_c::setMidnaTagPos() { - cXyz unkXyz1; + cXyz tagPos; daMidna_c* midna = daPy_getPlayerActorClass()->getMidnaActor(); if (midna != NULL) { mDoMtx_stack_c::copy(getMidnaLocaterMtx()); - mDoMtx_stack_c::multVecZero(&unkXyz1); - midna->onTagWaitPos(&unkXyz1); + mDoMtx_stack_c::multVecZero(&tagPos); + midna->onTagWaitPos(&tagPos); } } @@ -621,6 +628,7 @@ void daKago_c::setRideOff() { midna->offTagWaitPos(); midna->offCargoActor(); } + daPy_getPlayerActorClass()->offCargoCarry(); } @@ -628,78 +636,75 @@ s8 daKago_c::searchNearPassPoint() { cXyz pointPos; cXyz playerPos(daPy_getPlayerActorClass()->current.pos); - f32 unkFloat1; - f32 unkFloat2 = unkFloat1 = 100000.0f; - int pointIdx1; + f32 prev_nearest_distXZ, nearest_distXZ; + nearest_distXZ = prev_nearest_distXZ = 100000.0f; + int nearest_point_no; + for (int i = 0; i < mpPath1->m_num; i++) { - pointPos = dPath_GetPnt(mpPath1,i)->m_position; + pointPos = dPath_GetPnt(mpPath1, i)->m_position; - f32 playerLatDist = playerPos.absXZ(pointPos); - if (playerLatDist < unkFloat2) { - unkFloat1 = unkFloat2; - unkFloat2 = playerLatDist; - pointIdx1 = i; - } else if (playerLatDist < unkFloat1) { - unkFloat1 = playerLatDist; + f32 player_pnt_distXZ = playerPos.absXZ(pointPos); + if (player_pnt_distXZ < nearest_distXZ) { + prev_nearest_distXZ = nearest_distXZ; + nearest_distXZ = player_pnt_distXZ; + nearest_point_no = i; + } else if (player_pnt_distXZ < prev_nearest_distXZ) { + prev_nearest_distXZ = player_pnt_distXZ; } } - int pointIdx2 = pointIdx1 + mPathIdxOffset; - if (pointIdx2 < 0) { - pointIdx2 = 1; - } else if (pointIdx2 >= mpPath1->m_num) { - pointIdx2 = mpPath1->m_num - 1; + int next_point_no = nearest_point_no + mPathStep; + if (next_point_no < 0) { + next_point_no = 1; + } else if (next_point_no >= mpPath1->m_num) { + next_point_no = mpPath1->m_num - 1; } - return pointIdx2; + return next_point_no; } -int daKago_c::setSceneChange(int param_0) { - int unkInt1 = 0; - switch (param_0) { +int daKago_c::setSceneChange(int i_mode) { + int exitID = 0; + + switch (i_mode) { case 0: - if (field_0x6e7 == 0) { - unkInt1 = 1; + if (mType == TYPE_TWILIGHT) { + exitID = 1; } else { - unkInt1 = 6; + exitID = 6; } - break; case 1: - unkInt1 = 0; - + exitID = 0; endBalloonScore(); - break; case 2: - if (field_0x6e7 == 0) { - unkInt1 = 3; + if (mType == TYPE_TWILIGHT) { + exitID = 3; } else { - unkInt1 = 0; + exitID = 0; } endBalloonScore(); - break; case 3: - unkInt1 = 3; - + exitID = 3; break; } - return dStage_changeScene(unkInt1, 0.0f, 10, fopAcM_GetRoomNo(this), 0, -1); + return dStage_changeScene(exitID, 0.0f, 10, fopAcM_GetRoomNo(this), 0, -1); } void daKago_c::createBalloonScore() { - if (field_0x6e7 != 0 && mBalloon2DId == fpcM_ERROR_PROCESS_ID_e) { - mBalloon2DId = fopAcM_create(PROC_BALLOON2D, 0, 0, 0xffffffff, 0, 0, -1); + if (mType != TYPE_TWILIGHT && mBalloon2DId == fpcM_ERROR_PROCESS_ID_e) { + mBalloon2DId = fopAcM_create(PROC_BALLOON2D, 0, NULL, -1, NULL, NULL, -1); field_0x6e9 = 1; } } void daKago_c::startBalloonScore() { fopAc_ac_c* balloon_actor; - if (field_0x6e7 != 0 && field_0x6e9 == 1) { + if (mType != TYPE_TWILIGHT && field_0x6e9 == 1) { fopAcM_SearchByID(mBalloon2DId, &balloon_actor); if (balloon_actor != NULL) { ((daBalloon2D_c*)balloon_actor)->show(); @@ -711,9 +716,9 @@ void daKago_c::startBalloonScore() { void daKago_c::endBalloonScore() { fopAc_ac_c* balloon2D; - fopAc_ac_c *balloonObj; + fopAc_ac_c* balloonObj; - if (field_0x6e7 != 0) { + if (mType != TYPE_TWILIGHT) { fopAcM_SearchByID(mBalloon2DId, &balloon2D); if (balloon2D != NULL) { ((daBalloon2D_c*)balloon2D)->hide(); @@ -726,11 +731,11 @@ void daKago_c::endBalloonScore() { } } -f32 daKago_c::checkNextPath(cXyz param_0) { +f32 daKago_c::checkNextPath(cXyz i_pntPos) { cXyz cStack_14; mDoMtx_stack_c::YrotS(-field_0x714); mDoMtx_stack_c::transM(-current.pos.x, -current.pos.y, -current.pos.z); - mDoMtx_stack_c::multVec(¶m_0, &cStack_14); + mDoMtx_stack_c::multVec(&i_pntPos, &cStack_14); return cStack_14.z; } @@ -745,10 +750,11 @@ void daKago_c::checkHeight() { bool daKago_c::checkYaguraPos(cXyz param_0) { cXyz local_18(-22984.0f, 0.0f, 7455.0f); cXyz cStack_24; - s16 temp = -0x770; - mDoMtx_stack_c::YrotS(-temp); + s16 rot_y = -0x770; + mDoMtx_stack_c::YrotS(-rot_y); mDoMtx_stack_c::transM(-local_18.x, -local_18.y, -local_18.z); mDoMtx_stack_c::multVec(¶m_0, &cStack_24); + if (std::abs(cStack_24.z) < 700.0f) { return true; } else { @@ -758,12 +764,12 @@ bool daKago_c::checkYaguraPos(cXyz param_0) { bool daKago_c::checkWallHitFall(int param_0) { if (field_0x6e5 != 0) { - cXyz unkXyz1; - setActionMode(1, 3); - dComIfGp_getVibration().StartShock(8, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - unkXyz1 = current.pos; - unkXyz1.y += 200.0f; - setWallHitEffect(unkXyz1, 0); + cXyz effpos; + setActionMode(ACTION_STAGGER_e, 3); + dComIfGp_getVibration().StartShock(VIBMODE_S_POWER8, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); + effpos = current.pos; + effpos.y += 200.0f; + setWallHitEffect(effpos, 0); return true; } @@ -773,37 +779,37 @@ bool daKago_c::checkWallHitFall(int param_0) { if (!checkYaguraPos(current.pos)) { if (abs(unkInt1) > 0x7000) { field_0x6d9 |= (u8)0x4; - field_0x650[2].set(current.pos.x + cM_ssin(shape_angle.y) * 200.0f, current.pos.y, current.pos.z + cM_scos(shape_angle.y) * 200.0f); + mWallHitEffPos[2].set(current.pos.x + cM_ssin(shape_angle.y) * 200.0f, current.pos.y, current.pos.z + cM_scos(shape_angle.y) * 200.0f); } } if (unkInt1 > 0) { field_0x6d9 |= (u8)0x1; - field_0x650[0].set(current.pos.x + cM_ssin(shape_angle.y + 0x4000) * 200.0f, current.pos.y, - current.pos.z + cM_scos(shape_angle.y + 0x4000) * 200.0f); + mWallHitEffPos[0].set(current.pos.x + cM_ssin(shape_angle.y + 0x4000) * 200.0f, current.pos.y, + current.pos.z + cM_scos(shape_angle.y + 0x4000) * 200.0f); } else { field_0x6d9 |= (u8)0x2; - field_0x650[1].set(current.pos.x + cM_ssin(shape_angle.y + -0x4000) * 200.0f, - current.pos.y, - current.pos.z + cM_scos(shape_angle.y + -0x4000) * 200.0f); + mWallHitEffPos[1].set(current.pos.x + cM_ssin(shape_angle.y + -0x4000) * 200.0f, + current.pos.y, + current.pos.z + cM_scos(shape_angle.y + -0x4000) * 200.0f); } } if ((field_0x6d9 & 0x4) != 0) { - setActionMode(1, 0); - dComIfGp_getVibration().StartShock(8, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - setWallHitEffect(field_0x650[2], 0); + setActionMode(ACTION_STAGGER_e, 0); + dComIfGp_getVibration().StartShock(VIBMODE_S_POWER8, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); + setWallHitEffect(mWallHitEffPos[2], 0); return true; } - if (param_0 != 0 && field_0x720 == 0 && (field_0x6d9 & 0x3) != 0) { - dComIfGp_getVibration().StartShock(2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); + if (param_0 != 0 && mWallHitInvulnTimer == 0 && (field_0x6d9 & 0x3) != 0) { + dComIfGp_getVibration().StartShock(VIBMODE_S_POWER2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); if ((field_0x6d9 & 0x1) != 0) { - setActionMode(1, 1); - setWallHitEffect(field_0x650[0], 1); + setActionMode(ACTION_STAGGER_e, 1); + setWallHitEffect(mWallHitEffPos[0], 1); } else { - setActionMode(1, 2); - setWallHitEffect(field_0x650[1], 1); + setActionMode(ACTION_STAGGER_e, 2); + setWallHitEffect(mWallHitEffPos[1], 1); } return true; } @@ -816,8 +822,8 @@ bool daKago_c::checkAttackStart() { return false; } - if (mDoCPd_c::getTrigA(0)) { - setActionMode(5, 0); + if (mDoCPd_c::getTrigA(PAD_1)) { + setActionMode(ACTION_ATTACK_e, 0); mIsFlying = true; return true; } else { @@ -825,11 +831,9 @@ bool daKago_c::checkAttackStart() { } } -#define MIN(a, b) ((a) < (b) ? (a) : (b)) -#define MAX(a, b) ((a) > (b) ? (a) : (b)) - s16 daKago_c::getValueY(f32 param_0) { - s16 valueY = field_0x6f4 * param_0; + s16 valueY = mStickY * param_0; + f32 var_f31; if (valueY < 0) { if (current.pos.y > mRoofHeight - 200.0f) { @@ -853,11 +857,11 @@ s16 daKago_c::getValueY(f32 param_0) { } s16 daKago_c::getValueX(f32 param_0) { - return -field_0x6f0 * param_0; + return -mStickX * param_0; } s16 daKago_c::getValueAbsX(f32 param_0) { - return std::abs(-field_0x6f0 * param_0); + return std::abs(-mStickX * param_0); } void daKago_c::flySpeedCalcLockOn() { @@ -873,31 +877,31 @@ void daKago_c::flySpeedCalcLockOn() { cLib_addCalcAngleS(¤t.angle.x, angleX, 8, 0x100, 0x10); shape_angle.x = current.angle.x; - s16 angleX2 = current.angle.y; + + s16 prevAngleY = current.angle.y; cLib_addCalcAngleS(¤t.angle.y, angleY, 8, 0x100, 0x10); shape_angle.y = current.angle.y; - cLib_addCalcAngleS(&shape_angle.z, ((angleX2 - current.angle.y) * 0x20), 8, 0x400, 0x10); + cLib_addCalcAngleS(&shape_angle.z, ((prevAngleY - current.angle.y) * 0x20), 8, 0x400, 0x10); if (shape_angle.z > 0x3000) { shape_angle.z = 0x3000; } - if (shape_angle.z < -0x3000) { shape_angle.z = -0x3000; } } -void daKago_c::flySpeedCalc(s16 param_0, int param_1) { +void daKago_c::flySpeedCalc(s16 param_0, int i_calcType) { s16 var_r29; s16 var_r28; s16 var_r27; s16 sp_8; - if (param_1 == 0) { + if (i_calcType == 0) { sp_8 = 0x2000; - } else if (param_1 == 1) { + } else if (i_calcType == 1) { sp_8 = 0x1000; - } else if (param_1 == 2) { + } else if (i_calcType == 2) { sp_8 = 0x2aaa; } @@ -910,7 +914,7 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { field_0x710 += getValueY(40.0f); var_r29 = 0x200; - if (param_1 == 2) { + if (i_calcType == 2) { var_r29 = 0x400; } if (field_0x710 > var_r29) { @@ -920,7 +924,7 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { field_0x710 = -var_r29; } - if (field_0x6f4 > 0.0f) { + if (mStickY > 0.0f) { if (current.angle.x < var_r28) { current.angle.x += field_0x710; } else { @@ -952,6 +956,7 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { } current.angle.x += field_0x710; } + if (current.angle.x > 0x2aaa) { current.angle.x = 0x2aaa; } @@ -961,28 +966,28 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { shape_angle.x = current.angle.x; var_r27 = 0x2000; - if (param_1 == 1) { + if (i_calcType == 1) { var_r27 = 0x1000; - } else if (param_1 == 2) { + } else if (i_calcType == 2) { var_r27 = 0x2aaa; } f32 unkFloat1 = 20.0f; var_r29 = 0x100; - if (param_1 == 2) { + if (i_calcType == 2) { unkFloat1 = 30.0f; var_r29 = 0x200; } var_r28 = param_0 + getValueX(var_r27); if (mpLockActor != NULL) { - var_r28 = cLib_targetAngleY((Vec*)¤t, (Vec*)&mpLockActor->current); + var_r28 = cLib_targetAngleY(¤t.pos, &mpLockActor->current.pos); } int always_zero = 0; if (!always_zero) { if (abs((s16)(current.angle.y - param_0)) < var_r27) { - if (field_0x6f0) { + if (mStickX) { field_0x712 += getValueX(unkFloat1); if (field_0x712 > getValueAbsX(var_r29)) { field_0x712 = getValueAbsX(var_r29); @@ -993,18 +998,20 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { } else { cLib_addCalcAngleS(&field_0x712, 0, 8, 0x20, 0x10); } + current.angle.y += field_0x712; } else { int sp_14 = 0; - if (field_0x6f0 < 0.0f) { + if (mStickX < 0.0f) { if ((s16)(current.angle.y - param_0) < var_r27) { sp_14 = 1; } } else { - if (field_0x6f0 > 0.0f && (s16)(current.angle.y - param_0) > var_r27) { + if (mStickX > 0.0f && (s16)(current.angle.y - param_0) > var_r27) { sp_14 = 1; } } + if (sp_14 != 0) { field_0x712 += getValueX(unkFloat1); if (field_0x712 > getValueAbsX(var_r29)) { @@ -1020,7 +1027,9 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { } } } + shape_angle.y = current.angle.y; + cLib_addCalcAngleS(&shape_angle.z, -field_0x712 * 0x20, 8, 0x400, 0x10); if (shape_angle.z > 0x3000) { shape_angle.z = 0x3000; @@ -1031,7 +1040,7 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { if (field_0x6e3 == 1) { field_0x6e3 = 2; - if (field_0x6e7 == 1) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -1040,58 +1049,60 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) { if (field_0x6e6 == 1) { field_0x6e6 = 2; - if (mCurrentAction == 5) { - field_0x71c = l_HIO.mSplashGenTimeDuringDash; + if (mAction == ACTION_ATTACK_e) { + mWaterSplashTimer = l_HIO.mSplashGenTimeDuringDash; } else { - field_0x71c = l_HIO.mWaterSplashTime; + mWaterSplashTimer = l_HIO.mWaterSplashTime; } } } bool daKago_c::checkFlySceneChange() { - if ((mPathIdxOffset > 0 && mPathIdx >= mpPath1->m_num - 1 || - mPathIdxOffset < 0 && mPathIdx < 1) && - field_0x73c == 1 && fopOvlpM_IsPeek() == 0) + if (((mPathStep > 0 && mPathCurrentPointNo >= mpPath1->m_num - 1) || (mPathStep < 0 && mPathCurrentPointNo < 1)) + && mSceneType == SCENE_TYPE_RIVER + && !fopOvlpM_IsPeek()) { - setActionMode(0, 4); + setActionMode(ACTION_FLY_e, 4); field_0x728 = 300; - if (checkBck(9) == 0) { - setBck(9, 2, 10.0f, 1.0f); + if (!checkBck(dRes_ID_E_YC_BCK_YC_FLY_e)) { + setBck(dRes_ID_E_YC_BCK_YC_FLY_e, 2, 10.0f, 1.0f); } - if (mPathIdxOffset > 0) { + if (mPathStep > 0) { setSceneChange(1); } else { setSceneChange(2); } return true; - } else { - return false; } + + return false; } void daKago_c::setFlyAway() { current.angle.y = shape_angle.y; - setActionMode(0, 3); + setActionMode(ACTION_FLY_e, 3); field_0x728 = 90; - if (!checkBck(9)) { - setBck(9, 2, 10.0f, 1.0f); + + if (!checkBck(dRes_ID_E_YC_BCK_YC_FLY_e)) { + setBck(dRes_ID_E_YC_BCK_YC_FLY_e, 2, 10.0f, 1.0f); } + dComIfGp_getVibration().StopQuake(0x1f); } void daKago_c::setFlyAnime() { if (cM_rnd() < 0.5) { - if (checkBck(15) == 0) { - setBck(15, 2, 10.0f, 1.0f); + if (!checkBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e)) { + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); } else { - setBck(13, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e, 2, 10.0f, 1.0f); } } else { - if (!checkBck(13)) { - setBck(13, 2, 10.0f, 1.0f); + if (!checkBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e)) { + setBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e, 2, 10.0f, 1.0f); } } @@ -1099,23 +1110,24 @@ void daKago_c::setFlyAnime() { } void daKago_c::executeFly() { - s16 unkInt1; - s16 unkInt2; - f32 unkFloat1; - cXyz unkXyz1; - cXyz unkXyz2; + s16 pntAngleY; + s16 pntAngleX; + f32 targetFlySpeed; + cXyz nextPntPos; + cXyz prevPntPos; cXyz unkXyz3; startBalloonScore(); - if (field_0x744 < 3) { + if (mMode < 3) { if (mDashCooldownTime == 0) { - dComIfGp_setDoStatusForce(0x4b, 0); + dComIfGp_setDoStatusForce(BUTTON_STATUS_UNK_75, 0); } - if (field_0x6e7 == 1) { - dComIfGp_setAStatusForce(0x2a, 0); + + if (mType == TYPE_NORMAL) { + dComIfGp_setAStatusForce(BUTTON_STATUS_QUIT, 0); } else { - dComIfGp_setAStatusForce(0x27, 0); + dComIfGp_setAStatusForce(BUTTON_STATUS_UNK_39, 0); } } @@ -1126,7 +1138,7 @@ void daKago_c::executeFly() { checkHeight(); mIsFlying = true; - switch (field_0x744) { + switch (mMode) { case 0: shape_angle.y = current.angle.y; mGroundHeight = checkGroundHeight(current.pos, NULL); @@ -1135,27 +1147,29 @@ void daKago_c::executeFly() { case 1: setFlyAnime(); field_0x710 = field_0x712 = 0; - field_0x744 = 2; + mMode = 2; break; case 2: - unkXyz1 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; - unkXyz2 = dPath_GetPnt(mpPath1, mPathIdx - mPathIdxOffset)->m_position; - unkInt1 = cLib_targetAngleY(&unkXyz2, &unkXyz1); - field_0x714 = unkInt1; - flySpeedCalc(unkInt1, 0); - if (checkBck(11)) { - if (mpMorf->isStop()) { + nextPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; + prevPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo - mPathStep)->m_position; + pntAngleY = cLib_targetAngleY(&prevPntPos, &nextPntPos); + field_0x714 = pntAngleY; + + flySpeedCalc(pntAngleY, 0); + + if (checkBck(dRes_ID_E_YC_BCK_YC_FLY_DASH_WL_e)) { + if (mAnm_p->isStop()) { setFlyAnime(); } } else { if (field_0x710 < 0) { - if (!checkBck(15)) { - setBck(15, 2, 10.0f, 1.0f); + if (!checkBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e)) { + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); } field_0x728 = 10; } else if (field_0x710 > 0) { - if (!checkBck(13)) { - setBck(13, 2, 10.0f, 1.0f); + if (!checkBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e)) { + setBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e, 2, 10.0f, 1.0f); } field_0x728 = 90; } else { @@ -1164,22 +1178,26 @@ void daKago_c::executeFly() { } } } + if (cM_ssin(current.angle.x) > 0.0f) { - unkFloat1 = l_HIO.mFlightSpeed + l_HIO.mDescentRateIncrement * cM_ssin(current.angle.x); + targetFlySpeed = l_HIO.mFlightSpeed + l_HIO.mDescentRateIncrement * cM_ssin(current.angle.x); } else { - unkFloat1 = l_HIO.mFlightSpeed + l_HIO.mAscentRateDecel * cM_ssin(current.angle.x); + targetFlySpeed = l_HIO.mFlightSpeed + l_HIO.mAscentRateDecel * cM_ssin(current.angle.x); } - if (std::abs(field_0x6f8 - unkFloat1) > 10.0f) { - cLib_chaseF(&field_0x6f8, unkFloat1, 2.0f); + + if (std::abs(mFlySpeed - targetFlySpeed) > 10.0f) { + cLib_chaseF(&mFlySpeed, targetFlySpeed, 2.0f); } else { - cLib_chaseF(&field_0x6f8, unkFloat1, 1.0f); + cLib_chaseF(&mFlySpeed, targetFlySpeed, 1.0f); } - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); - unkXyz3.z = checkNextPath(unkXyz1); + + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); + + unkXyz3.z = checkNextPath(nextPntPos); if (unkXyz3.z < 0.0f) { - if (abs((s16)(unkInt1 - cLib_targetAngleY(&unkXyz2, ¤t.pos))) < 0x4000) { - mPathIdx += mPathIdxOffset; + if (abs((s16)(pntAngleY - cLib_targetAngleY(&prevPntPos, ¤t.pos))) < 0x4000) { + mPathCurrentPointNo += mPathStep; if (checkFlySceneChange()) { return; } @@ -1188,35 +1206,40 @@ void daKago_c::executeFly() { break; case 3: case 4: - if (mPathIdx >= mpPath1->m_num) { - unkInt1 = current.angle.y; - unkInt2 = 0; + if (mPathCurrentPointNo >= mpPath1->m_num) { + pntAngleY = current.angle.y; + pntAngleX = 0; } else { - unkXyz1 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; - unkXyz2 = dPath_GetPnt(mpPath1, mPathIdx - mPathIdxOffset)->m_position; - unkInt1 = cLib_targetAngleY(&unkXyz2, &unkXyz1); - unkInt2 = -cLib_targetAngleX(&unkXyz2, &unkXyz1); + nextPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; + prevPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo - mPathStep)->m_position; + pntAngleY = cLib_targetAngleY(&prevPntPos, &nextPntPos); + pntAngleX = -cLib_targetAngleX(&prevPntPos, &nextPntPos); } - if (field_0x744 == 3) { + + if (mMode == 3) { cLib_chaseUC(&field_0x6de, 0, 4); - cLib_addCalcAngleS(¤t.angle.x, -8192, 8, 0x100, 0x10); + cLib_addCalcAngleS(¤t.angle.x, -0x2000, 8, 0x100, 0x10); } else { - cLib_addCalcAngleS(¤t.angle.x, unkInt2, 8, 0x100, 0x10); + cLib_addCalcAngleS(¤t.angle.x, pntAngleX, 8, 0x100, 0x10); } + shape_angle.x = current.angle.x; - cLib_addCalcAngleS(¤t.angle.y, unkInt1, 8, 0x400, 0x10); + cLib_addCalcAngleS(¤t.angle.y, pntAngleY, 8, 0x400, 0x10); shape_angle.y = current.angle.y; cLib_addCalcAngleS(&shape_angle.z, 0, 8, 0x400, 0x10); - unkFloat1 = l_HIO.mFlightSpeed + 20.0f; - if (std::abs(field_0x6f8 - unkFloat1) > 10.0f) { - cLib_chaseF(&field_0x6f8, unkFloat1, 2.0f); + targetFlySpeed = l_HIO.mFlightSpeed + 20.0f; + + if (std::abs(mFlySpeed - targetFlySpeed) > 10.0f) { + cLib_chaseF(&mFlySpeed, targetFlySpeed, 2.0f); } else { - cLib_chaseF(&field_0x6f8, unkFloat1, 1.0f); + cLib_chaseF(&mFlySpeed, targetFlySpeed, 1.0f); } - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); + if (field_0x728 == 0) { - setActionMode(4, 0); + setActionMode(ACTION_WAIT_e, 0); } return; } @@ -1229,31 +1252,31 @@ void daKago_c::executeFly() { void daKago_c::executeStagger() { dCamera_c* camera = dCam_getBody(); - cXyz cStack_94 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; - cXyz cStack_a0 = dPath_GetPnt(mpPath1, mPathIdx - mPathIdxOffset)->m_position; + cXyz nextPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; + cXyz prevPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo - mPathStep)->m_position; - field_0x714 = cLib_targetAngleY(&cStack_a0, &cStack_94); + field_0x714 = cLib_targetAngleY(&prevPntPos, &nextPntPos); - if (field_0x6e7 == 1) { - dComIfGp_setAStatusForce(0x2a, 0); + if (mType == TYPE_NORMAL) { + dComIfGp_setAStatusForce(BUTTON_STATUS_QUIT, 0); } else { - dComIfGp_setAStatusForce(0x27, 0); + dComIfGp_setAStatusForce(BUTTON_STATUS_UNK_39, 0); } checkHeight(); mIsFlying = true; - switch (field_0x744) { + switch (mMode) { case 0: mSph.OffAtSetBit(); - daPy_getPlayerActorClass()->setPlayerDamage(0, 1); + daPy_getPlayerActorClass()->setPlayerDamage(0, TRUE); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(6)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(YC_JNT_HEAD_e)); mDoMtx_stack_c::multVecZero(&field_0x674); - if (field_0x6e7 == 0) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSound(Z2SE_EN_YC_CRASH, 0, -1); mSound.startCreatureVoice(Z2SE_EN_YC_V_HANGED, -1); } else { @@ -1261,12 +1284,12 @@ void daKago_c::executeStagger() { mSound.startCreatureVoice(Z2SE_EN_KC_V_CRASH, -1); } - setBck(7, 0, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_CRASH_e, 0, 10.0f, 1.0f); field_0x728 = 60; speedF = 30.0f; - if (current.pos.y < cStack_94.y) { + if (current.pos.y < nextPntPos.y) { speed.y = 30.0f; } else { speed.y = -30.0f; @@ -1274,22 +1297,21 @@ void daKago_c::executeStagger() { current.angle.y = field_0x6da - (s16)(current.angle.y - field_0x6da) + 0x8000; - field_0x744 = 4; - + mMode = 4; break; case 1: case 2: mSph.OffAtSetBit(); - daPy_getPlayerActorClass()->setPlayerDamage(0, 1); + daPy_getPlayerActorClass()->setPlayerDamage(0, TRUE); - setBck(15, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); field_0x728 = 10; - field_0x720 = (int)l_HIO.mWallHitInvulnTime; + mWallHitInvulnTimer = (int)l_HIO.mWallHitInvulnTime; speedF = 40.0f; - if (field_0x744 == 1) { + if (mMode == 1) { shape_angle.z = 0x3000; ANGLE_ADD(current.angle.y, -0x2000); if (abs((s16)(current.angle.y - field_0x714)) > 0x2000) { @@ -1306,18 +1328,17 @@ void daKago_c::executeStagger() { mSound.startCreatureSound(Z2SE_EN_YC_HIT_SIDE, 0, -1); dComIfGp_getVibration().StartQuake(1, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - field_0x744 = 5; - + mMode = 5; break; case 3: - daPy_getPlayerActorClass()->setPlayerDamage(2, 1); + daPy_getPlayerActorClass()->setPlayerDamage(2, TRUE); mSph.OffAtSetBit(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(6)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(YC_JNT_HEAD_e)); mDoMtx_stack_c::multVecZero(&field_0x674); - if (field_0x6e7 == 0) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSound(Z2SE_EN_YC_CRASH, 0, -1); mSound.startCreatureVoice(Z2SE_EN_YC_V_HANGED, -1); } else { @@ -1325,14 +1346,13 @@ void daKago_c::executeStagger() { mSound.startCreatureVoice(Z2SE_EN_KC_V_CRASH, -1); } - setBck(7, 0, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_CRASH_e, 0, 10.0f, 1.0f); - field_0x728 = 0x3c; + field_0x728 = 60; speedF = 30.0f; speed.y = -50.0f; - field_0x744 = 6; - + mMode = 6; break; case 5: cLib_addCalcAngleS(&shape_angle.y, current.angle.y, 8, 0x400, 0x40); @@ -1351,28 +1371,27 @@ void daKago_c::executeStagger() { } shape_angle.y = current.angle.y; - field_0x6f8 = 40.0f; + mFlySpeed = 40.0f; - setActionMode(0, 1); + setActionMode(ACTION_FLY_e, 1); dComIfGp_getVibration().StopQuake(0x1f); - break; case 4: case 6: - if (checkBck(7)) { - cXyz cStack_ac; + if (checkBck(dRes_ID_E_YC_BCK_YC_CRASH_e)) { + cXyz line_end; mDoMtx_stack_c::copy(mLegR3Mtx); - mDoMtx_stack_c::multVecZero(&cStack_ac); - cStack_ac.y -= 20.0f; + mDoMtx_stack_c::multVecZero(&line_end); + line_end.y -= 20.0f; - cXyz cStack_b8 = current.pos; - cStack_b8.y += 50.0f; + cXyz line_start = current.pos; + line_start.y += 50.0f; - dBgS_LinChk dStack_88; - dStack_88.Set(&cStack_b8, &cStack_ac, NULL); + dBgS_LinChk linechk; + linechk.Set(&line_start, &line_end, NULL); - if (dComIfG_Bgsp().LineCross(&dStack_88)) { + if (dComIfG_Bgsp().LineCross(&linechk)) { current.pos.y += 5.0f; } @@ -1380,13 +1399,13 @@ void daKago_c::executeStagger() { field_0x728 = 60; - if (mpMorf->checkFrame(22.0f)) { + if (mAnm_p->checkFrame(22.0f)) { setRideOff(); - setBck(8, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_CRASH2_e, 2, 10.0f, 1.0f); } } - if (field_0x744 == 4) { + if (mMode == 4) { cLib_addCalcAngleS(&shape_angle.y, current.angle.y + 0x8000, 8, 0x100, 0x10); } else { cLib_addCalcAngleS(&shape_angle.y, current.angle.y, 8, 0x100, 0x10); @@ -1401,40 +1420,38 @@ void daKago_c::executeStagger() { if (field_0x728 == 0) { setFlyAway(); - field_0x6f8 = -10.0f; + mFlySpeed = -10.0f; } - break; } } void daKago_c::executeWait() { - daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass()->getMidnaActor(); + daMidna_c* midna = daPy_getPlayerActorClass()->getMidnaActor(); if (field_0x728 == 0) { cLib_chaseUC(&field_0x6de, 0, 4); } if (field_0x6df == 0) { - if (player->checkWolfCargoCarrySceneChange()) { - if (field_0x73c == 1) { + if (daPy_py_c::checkWolfCargoCarrySceneChange()) { + if (mSceneType == SCENE_TYPE_RIVER) { createBalloonScore(); if (dComIfGp_getStartStagePoint() == 0) { - mPathIdxOffset = 1; - mPathIdx = 0; + mPathStep = 1; + mPathCurrentPointNo = 0; mPathDir = 1; } else { - mPathIdxOffset = -1; - mPathIdx = mpPath1->m_num + -1; + mPathStep = -1; + mPathCurrentPointNo = mpPath1->m_num + -1; mPathDir = -1; } - old.pos = dPath_GetPnt(mpPath1, mPathIdx)->m_position; - current.pos = old.pos; - mPathIdx += mPathIdxOffset; - field_0x6a4 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; + current.pos = old.pos = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; + mPathCurrentPointNo += mPathStep; + field_0x6a4 = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; - current.angle.y = shape_angle.y = cLib_targetAngleY((Vec*)¤t, &field_0x6a4); - if (player != NULL) { + current.angle.y = shape_angle.y = cLib_targetAngleY(¤t.pos, &field_0x6a4); + if (midna != NULL) { setMidnaRideOn(); setPlayerRideOn(); @@ -1442,16 +1459,16 @@ void daKago_c::executeWait() { field_0x6de = 0xff; field_0x6df = 1; - if (mPathDir == 1 && field_0x6e7 == 0 && dComIfGs_isSaveSwitch(9) == 0) { - setActionMode(9, 0); + if (mPathDir == 1 && mType == TYPE_TWILIGHT && !dComIfGs_isSaveSwitch(9)) { + setActionMode(ACTION_DEMO_FLY_e, 0); } else { - setActionMode(10, 0); + setActionMode(ACTION_DEMO_FLY2_e, 0); } setFlyAnime(); moveDemoFly(); } - } else if (field_0x73c == 0 || field_0x73c == 2) { + } else if (mSceneType == SCENE_TYPE_LAKE_HYLIA || mSceneType == SCENE_TYPE_BOARD_HOUSE) { setMidnaRideOn(); setPlayerRideOn(); @@ -1459,30 +1476,29 @@ void daKago_c::executeWait() { field_0x6de = 0xff; field_0x6df = 1; - setActionMode(8, 0); + setActionMode(ACTION_LANDING_e, 0); executeLanding(); } - } - return; } #if DEBUG mPathDir = 1; - if (mDoCPd_c::getHoldL(0) && mDoCPd_c::getHoldR(0) && - mDoCPd_c::getTrigB(0)) + if (mDoCPd_c::getHoldL(PAD_1) && mDoCPd_c::getHoldR(PAD_1) && + mDoCPd_c::getTrigB(PAD_1)) { - setActionMode(2, 0); + setActionMode(ACTION_EVENT_e, 0); - if (field_0x73c == 2) { + if (mSceneType == SCENE_TYPE_BOARD_HOUSE) { setKagoPath(1); } else { setKagoPath(5); - if (field_0x73c == 1) { + if (mSceneType == SCENE_TYPE_RIVER) { createBalloonScore(); + return; } } } @@ -1490,48 +1506,49 @@ void daKago_c::executeWait() { } bool daKago_c::calcAttackMove(int param_0) { - cXyz acStack_20; - cXyz cStack_2c; + cXyz nextPntPos; + cXyz prevPntPos; cXyz cStack_38; - acStack_20 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; - cStack_2c = dPath_GetPnt(mpPath1, mPathIdx - mPathIdxOffset)->m_position; + nextPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; + prevPntPos = dPath_GetPnt(mpPath1, mPathCurrentPointNo - mPathStep)->m_position; - s16 targetAngleY = cLib_targetAngleY(&cStack_2c, &acStack_20); - field_0x714 = targetAngleY; + s16 pntAngleY = cLib_targetAngleY(&prevPntPos, &nextPntPos); + field_0x714 = pntAngleY; if (mpLockActor != NULL) { flySpeedCalcLockOn(); } else { if (param_0 == 0) { - flySpeedCalc(targetAngleY, 1); + flySpeedCalc(pntAngleY, 1); } else { - flySpeedCalc(targetAngleY, 2); + flySpeedCalc(pntAngleY, 2); } } - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); - cStack_38.z = checkNextPath(acStack_20); + cStack_38.z = checkNextPath(nextPntPos); if (cStack_38.z < 0.0f) { - if (abs((s16)(targetAngleY - cLib_targetAngleY(&cStack_2c, ¤t.pos))) < 0x4000) { - mPathIdx += mPathIdxOffset; + if (abs((s16)(pntAngleY - cLib_targetAngleY(&prevPntPos, ¤t.pos))) < 0x4000) { + mPathCurrentPointNo += mPathStep; if (checkFlySceneChange()) { return true; } } } + return false; } void daKago_c::executeAttack() { - field_0x6dd = 1; + mIsAttack = TRUE; - if (field_0x6e7 == 1) { - dComIfGp_setAStatusForce(0x2a, 0); + if (mType == TYPE_NORMAL) { + dComIfGp_setAStatusForce(BUTTON_STATUS_QUIT, 0); } else { - dComIfGp_setAStatusForce(0x27, 0); + dComIfGp_setAStatusForce(BUTTON_STATUS_UNK_39, 0); } checkHeight(); @@ -1543,15 +1560,15 @@ void daKago_c::executeAttack() { setDashSibukiEffect(); } - switch (field_0x744) { + switch (mMode) { case 0: mDashCooldownTime = l_HIO.mDashCooldownTime; mDashTime = l_HIO.mDashTime; - field_0x744 = 1; + mMode = 1; setDashBlurEffect(0); - setBck(11, 0, 5.0f, l_HIO.mDashTimeMultiplier); + setBck(dRes_ID_E_YC_BCK_YC_FLY_DASH_WL_e, 0, 5.0f, l_HIO.mDashTimeMultiplier); dComIfGp_getVibration().StartShock(1, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); @@ -1568,18 +1585,20 @@ void daKago_c::executeAttack() { break; case 1: setDashEffect(); + if (calcAttackMove(0) == 0) { - cLib_chaseF(&field_0x6f8, 30.0f, l_HIO.mDashTimeMultiplier * 3.0f); - if (mpMorf->checkFrame(9.0f)) { - if (field_0x6e7 == 0) { + cLib_chaseF(&mFlySpeed, 30.0f, l_HIO.mDashTimeMultiplier * 3.0f); + if (mAnm_p->checkFrame(9.0f)) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSound(Z2SE_EN_YC_DASH, 0, -1); } else { mSound.startCreatureSound(Z2SE_EN_KC_DASH, 0, -1); } } - if (mpMorf->checkFrame(12.0f)) { - field_0x744 = 2; - field_0x728 = 0x14; + + if (mAnm_p->checkFrame(12.0f)) { + mMode = 2; + field_0x728 = 20; dComIfGp_getVibration().StartShock(2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); dComIfGp_getVibration().StartQuake(1, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); @@ -1593,15 +1612,15 @@ void daKago_c::executeAttack() { case 2: setDashEffect(); - if (mpMorf->checkFrame(23.0f)) { + if (mAnm_p->checkFrame(23.0f)) { mSph.OnAtSetBit(); } if (calcAttackMove(1) == 0) { - cLib_chaseF(&field_0x6f8, 100.0f, 5.0f); + cLib_chaseF(&mFlySpeed, 100.0f, 5.0f); if (field_0x728 == 0) { - field_0x744 = 3; + mMode = 3; } if (field_0x728 < 10 && checkWallHitFall(0)) { @@ -1617,8 +1636,9 @@ void daKago_c::executeAttack() { break; case 3: setDashEffect(); + if (calcAttackMove(1) == 0) { - cLib_chaseF(&field_0x6f8, 100.0f, 3.0f); + cLib_chaseF(&mFlySpeed, 100.0f, 3.0f); if (checkWallHitFall(0)) { dComIfGp_getVibration().StopQuake(0x1f); @@ -1626,8 +1646,7 @@ void daKago_c::executeAttack() { } else { mDashTime--; if (mDashTime == 0) { - field_0x744 = 4; - + mMode = 4; dComIfGp_getVibration().StopQuake(0x1f); } } @@ -1637,13 +1656,13 @@ void daKago_c::executeAttack() { setDashEffect(); case 5: if (calcAttackMove(0) == 0) { - cLib_chaseF(&field_0x6f8, l_HIO.mFlightSpeed, 5.0f); - if (field_0x6f8 <= l_HIO.mFlightSpeed) { + cLib_chaseF(&mFlySpeed, l_HIO.mFlightSpeed, 5.0f); + if (mFlySpeed <= l_HIO.mFlightSpeed) { mpLockActor = NULL; mSph.OffAtSetBit(); - setActionMode(0, 2); + setActionMode(ACTION_FLY_e, 2); field_0x6c8 = 0; field_0x6c4 = 8000.0f; @@ -1655,56 +1674,57 @@ void daKago_c::executeAttack() { } void daKago_c::calcCircleCamera(int param_0) { - cXyz cStack_20; + cXyz targetPos; mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::XrotM(shape_angle.x); mDoMtx_stack_c::transM(0.0f, 0.0f, 1500.0f); - mDoMtx_stack_c::multVecZero(&cStack_20); + mDoMtx_stack_c::multVecZero(&targetPos); if (param_0 == 0) { - field_0x68c = cStack_20; + mDemoCamCenter = targetPos; } else if (param_0 == 1) { - cLib_addCalcPos(&field_0x68c, cStack_20, 0.1f, field_0x6f8 + 100.0f, + cLib_addCalcPos(&mDemoCamCenter, targetPos, 0.1f, mFlySpeed + 100.0f, 10.0f); } else { - cLib_addCalcPos(&field_0x68c, cStack_20, 0.5f, field_0x6f8 + 30.0f, + cLib_addCalcPos(&mDemoCamCenter, targetPos, 0.5f, mFlySpeed + 30.0f, 10.0f); } + mDoMtx_stack_c::transM(0.0f, 0.0f, -1000.0f); - mDoMtx_stack_c::multVecZero(&cStack_20); + mDoMtx_stack_c::multVecZero(&targetPos); if (param_0 == 0) { - field_0x698 = cStack_20; + mDemoCamEye = targetPos; } else if (param_0 == 1) { - cLib_addCalcPos(&field_0x698, cStack_20, 0.1f, field_0x6f8 + 100.0f, + cLib_addCalcPos(&mDemoCamEye, targetPos, 0.1f, mFlySpeed + 100.0f, 10.0f); } else { - cLib_addCalcPos(&field_0x698, cStack_20, 0.5f, field_0x6f8 + 30.0f, 10.0f); + cLib_addCalcPos(&mDemoCamEye, targetPos, 0.5f, mFlySpeed + 30.0f, 10.0f); } - field_0x6d4 = 60.0f; - dCam_getBody()->Set(field_0x68c, field_0x698, field_0x6d4, 0); + mDemoCamFovy = 60.0f; + dCam_getBody()->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); } void daKago_c::executeEvent() { dCamera_c* camera = dCam_getBody(); - daPy_py_c* unusedPlayer = daPy_getPlayerActorClass(); + daPy_py_c* player = daPy_getPlayerActorClass(); - if ((field_0x73c == 0) && dComIfG_play_c::getLayerNo(0) == 13 && dComIfGs_isSaveSwitch(0x10)) { - dComIfGs_onSaveSwitch(0x1a); - setActionMode(4, 0); + if (mSceneType == SCENE_TYPE_LAKE_HYLIA && dComIfG_play_c::getLayerNo(0) == 13 && dComIfGs_isSaveSwitch(16)) { + dComIfGs_onSaveSwitch(26); + setActionMode(ACTION_WAIT_e, 0); } else { if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xffff, 3); - eventInfo.onCondition(2); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } else { camera->Stop(); camera->SetTrimSize(3); - field_0x748 = 0; + mDemoMode = 0; field_0x74c = 0; - setActionMode(3, 0); + setActionMode(ACTION_PERCH_e, 0); field_0x6dc = 1; field_0x6de = 0xff; dComIfGs_onSaveSwitch(8); @@ -1718,13 +1738,13 @@ void daKago_c::initPerchDemo() { cXyz midnaPos; fopAc_ac_c* midna = daPy_getPlayerActorClass()->getMidnaActor(); - if (midna != 0) { + if (midna != NULL) { midnaPos = midna->current.pos; } - switch (field_0x748) { + switch (mDemoMode) { case 0: { - Z2GetAudioMgr()->setDemoName(field_0x760); + Z2GetAudioMgr()->setDemoName(mDemoName); field_0x771 = 0; current.pos = dPath_GetPnt(mpPath2, field_0x771)->m_position; @@ -1753,46 +1773,44 @@ void daKago_c::initPerchDemo() { speed.y = 0.0f; speedF = 20.0f; - field_0x72c = 0xb4; + field_0x72c = 180; field_0x728 = field_0x72c + 90; field_0x6e8 = 0; - if ((field_0x73c == 0) && dComIfG_play_c::getLayerNo(0) == 13 && (playerPos.x > -90000.0f)) - { + if (mSceneType == SCENE_TYPE_LAKE_HYLIA && dComIfG_play_c::getLayerNo(0) == 13 && playerPos.x > -90000.0f) { field_0x6e8 = 1; } calcCircleCamera(0); field_0x6e4 = 0; - break; } case 1: { field_0x728 = 90; - field_0x6f8 = 20.0f; + mFlySpeed = 20.0f; break; } case 2: { - if (field_0x73c != 0) { - mPathIdx = searchNearPassPoint(); + if (mSceneType != SCENE_TYPE_LAKE_HYLIA) { + mPathCurrentPointNo = searchNearPassPoint(); } field_0x758 = 1; - if (mPathIdxOffset < 0) { + if (mPathStep < 0) { angleY = angleY + 0x8000; daPy_getPlayerActorClass()->setPlayerPosAndAngle(&playerPos, angleY, 0); - field_0x758 = 0xffffffff; + field_0x758 = -1; } mDoMtx_stack_c::transS(midnaPos); mDoMtx_stack_c::YrotM(angleY); mDoMtx_stack_c::transM(0.0f, 1000.0f, -1000.0f); - mDoMtx_stack_c::multVecZero((Vec*)¤t); + mDoMtx_stack_c::multVecZero(¤t.pos); - setBck(0xc, 2, 0.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_e, 2, 0.0f, 1.0f); mDoMtx_stack_c::transS(midnaPos); mDoMtx_stack_c::YrotM(angleY); @@ -1801,10 +1819,10 @@ void daKago_c::initPerchDemo() { current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x6a4); current.angle.x = -cLib_targetAngleX(¤t.pos, &field_0x6a4); - field_0x6f8 = 20.0f; + mFlySpeed = 20.0f; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); shape_angle.x = current.angle.x; shape_angle.y = current.angle.y; @@ -1813,37 +1831,35 @@ void daKago_c::initPerchDemo() { mDoMtx_stack_c::transS(playerPos); mDoMtx_stack_c::YrotM(angleY); mDoMtx_stack_c::transM(-100.0f, 100.0f, -300.0f); - mDoMtx_stack_c::multVecZero(&field_0x68c); + mDoMtx_stack_c::multVecZero(&mDemoCamCenter); mDoMtx_stack_c::transM(100.0f, -100.0f, 300.0f); mDoMtx_stack_c::transM(100.0f, 30.0f, 300.0f); - mDoMtx_stack_c::multVecZero(&field_0x698); + mDoMtx_stack_c::multVecZero(&mDemoCamEye); - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - dCam_getBody()->Set(field_0x68c, field_0x698, field_0x6d4, 0); + dCam_getBody()->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); field_0x728 = 10; - break; } case 3: { - setBck(9, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_e, 2, 10.0f, 1.0f); setMidnaTagPos(); speedF = speed.y = 0.0f; field_0x728 = 30; - break; } case 4: { - setBck(0xf, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); - if (field_0x73c == 0) { + if (mSceneType == SCENE_TYPE_LAKE_HYLIA) { field_0x6a4.set(-90000.0f, -16000.0f, 40000.0f); } else { - field_0x6a4 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; + field_0x6a4 = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; } setMidnaRideOn(); @@ -1851,15 +1867,14 @@ void daKago_c::initPerchDemo() { dComIfGp_getVibration().StartShock(2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - field_0x744 = 1; + mMode = 1; field_0x728 = 30; - break; } } field_0x74c = 1; - field_0x744 = 0; + mMode = 0; } bool daKago_c::executePerchDemo() { @@ -1870,17 +1885,17 @@ bool daKago_c::executePerchDemo() { daMidna_c* midna = daPy_getPlayerActorClass()->getMidnaActor(); s16 midnaYaw; - if (midna != 0) { + if (midna != NULL) { midnaPos = midna->current.pos; midnaYaw = midna->shape_angle.y; } field_0x750++; - switch (field_0x748) { + switch (mDemoMode) { case 0: { calcCircleCamera(1); - if ((field_0x750 & 0x20) != 0) { + if (field_0x750 & 0x20) { cLib_chaseF(&field_0x6fc, 3.0f, 0.3f); } else { cLib_chaseF(&field_0x6fc, -3.0f, 0.3f); @@ -1900,7 +1915,7 @@ bool daKago_c::executePerchDemo() { cLib_addCalcAngleS(&shape_angle.y, current.angle.y, 0x20, 0x100, 0x40); } else { if (field_0x754 == 0) { - if (field_0x6e7 == 1) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -1914,57 +1929,55 @@ bool daKago_c::executePerchDemo() { } if (field_0x728 == 0) { - field_0x748 = 1; + mDemoMode = 1; return true; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); - break; } case 1: { calcCircleCamera(2); cLib_addCalcAngleS(&shape_angle.x, -cLib_targetAngleX(¤t.pos, &playerPos), 4, 0x400, 0x40); - cLib_addCalcAngleS(&shape_angle.y, cLib_targetAngleY((Vec*)¤t, &playerPos), 4, 0x200, 0x40); + cLib_addCalcAngleS(&shape_angle.y, cLib_targetAngleY(¤t.pos, &playerPos), 4, 0x200, 0x40); current.angle.y = shape_angle.y; current.angle.x = shape_angle.x; - cLib_chaseF(&field_0x6f8, 60.0f, 1.0f); + cLib_chaseF(&mFlySpeed, 60.0f, 1.0f); - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (current.pos.abs(playerPos) < 2000.0f) { - field_0x748 = 2; + mDemoMode = 2; return true; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); - break; } case 2: { if (field_0x6e4 == 0) { - if (field_0x73c == 0) { + if (mSceneType == SCENE_TYPE_LAKE_HYLIA) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 4); - } else if (field_0x73c == 2) { + } else if (mSceneType == SCENE_TYPE_BOARD_HOUSE) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 5); } } - if (field_0x744 == 0) { + if (mMode == 0) { current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x6a4); current.angle.x = -cLib_targetAngleX(¤t.pos, &field_0x6a4); - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 != 0) { shape_angle.x = current.angle.x; if (field_0x728 == 1) { - if (field_0x6e7 == 1) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -1976,9 +1989,9 @@ bool daKago_c::executePerchDemo() { shape_angle.y = current.angle.y; if (field_0x6a4.abs(current.pos) < 300.0f) { - field_0x744 = 1; + mMode = 1; - setBck(0x15, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_HOVERING_e, 2, 10.0f, 1.0f); field_0x728 = 60; @@ -1988,16 +2001,16 @@ bool daKago_c::executePerchDemo() { mDoMtx_stack_c::multVecZero(&field_0x6a4); } } else { - cLib_chaseF(&field_0x6f8, 0.0f, 1.0f); + cLib_chaseF(&mFlySpeed, 0.0f, 1.0f); cLib_addCalcAngleS(¤t.angle.y, cLib_targetAngleY(¤t.pos, &field_0x6a4), 4, 0x400, 0x100); cLib_addCalcAngleS(¤t.angle.x, 0, 4, 0x100, 0x80); cLib_addCalcAngleS(&shape_angle.x, 0, 4, 0x100, 0x80); shape_angle.y = current.angle.y; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); - if (!field_0x6f8 && field_0x728 == 0) { - field_0x748 = 3; + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); + if (!mFlySpeed && field_0x728 == 0) { + mDemoMode = 3; return true; } } @@ -2006,23 +2019,22 @@ bool daKago_c::executePerchDemo() { mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(0.0f, 400.0f, -300.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 5.0f, 5.0f); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 5.0f, 5.0f); mDoMtx_stack_c::transS(playerPos); mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(100.0f, 30.0f, 300.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 20.0f, 10.0f); - - dCam_getBody()->Set(field_0x68c, field_0x698, field_0x6d4, 0); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 20.0f, 10.0f); + dCam_getBody()->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); break; } case 3: { if (field_0x6e4 == 0) { - if (field_0x73c == 0) { + if (mSceneType == SCENE_TYPE_LAKE_HYLIA) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 4); - } else if (field_0x73c == 2) { + } else if (mSceneType == SCENE_TYPE_BOARD_HOUSE) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 5); } } @@ -2031,34 +2043,33 @@ bool daKago_c::executePerchDemo() { mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(0.0f, 100.0f, 0.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 20.0f, 10.0f); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 20.0f, 10.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(300.0f, 50.0f, 500.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 20.0f, 10.0f); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 20.0f, 10.0f); - cLib_chaseF(&field_0x6d4, 70.0f, 1.0f); + cLib_chaseF(&mDemoCamFovy, 70.0f, 1.0f); - dCam_getBody()->Set(field_0x68c, field_0x698, field_0x6d4, 0); + dCam_getBody()->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); cLib_addCalcAngleS(¤t.angle.x, 0, 4, 0x400, 0x100); shape_angle.x = current.angle.x; if (field_0x728 == 0) { - field_0x748 = 4; + mDemoMode = 4; return true; } - break; } case 4: { if (field_0x6e4 == 0) { - if (field_0x73c == 0) { + if (mSceneType == SCENE_TYPE_LAKE_HYLIA) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 4); - } else if (field_0x73c == 2) { + } else if (mSceneType == SCENE_TYPE_BOARD_HOUSE) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 6); } } @@ -2066,22 +2077,20 @@ bool daKago_c::executePerchDemo() { if (PerchDemoAwayForward()) { return true; } - break; } case 5: { f32 maxStep = field_0x6cc * 50.0f; f32 minStep = field_0x6cc * 10.0f; cLib_chaseF(&field_0x6cc, 0.0f, 0.05f); - cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, maxStep, minStep); + cLib_addCalcPos(&mDemoCamCenter, midnaPos, 0.5f, maxStep, minStep); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(0.0f, 50.0f, -800.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, maxStep, minStep); - cLib_chaseF(&field_0x6d4, 70.0f, 1.0f); - dCam_getBody()->Set(field_0x68c, field_0x698, field_0x6d4, 0); - + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, maxStep, minStep); + cLib_chaseF(&mDemoCamFovy, 70.0f, 1.0f); + dCam_getBody()->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); break; } case 6: @@ -2092,7 +2101,6 @@ bool daKago_c::executePerchDemo() { } bool daKago_c::PerchDemoAwayForward() { - cXyz playerPos = daPy_getPlayerActorClass()->current.pos; s16 playerYaw = daPy_getPlayerActorClass()->shape_angle.y; @@ -2108,58 +2116,58 @@ bool daKago_c::PerchDemoAwayForward() { midnaYaw = midna->shape_angle.y; } - switch (field_0x744) { + switch (mMode) { case 0: case 1: { f32 unusedFloat1 = 20.0f; f32 unusedFloat2 = 10.0f; - field_0x68c += speed; - field_0x698 += speed; + mDemoCamCenter += speed; + mDemoCamEye += speed; mDoMtx_stack_c::transS(midnaPos); mDoMtx_stack_c::YrotM(playerYaw); - if (field_0x744 == 0) { + if (mMode == 0) { mDoMtx_stack_c::transM(0.0f, 100.0f, 0.0f); } else { mDoMtx_stack_c::transM(0.0f, -200.0f, 0.0f); } mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 10.0f, 5.0f); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 10.0f, 5.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(playerYaw); - if (field_0x744 == 0) { + if (mMode == 0) { mDoMtx_stack_c::transM(300.0f, 50.0f, 500.0f); } else { mDoMtx_stack_c::transM(500.0f, 50.0f, 0.0f); } mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 10.0f, 5.0f); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 10.0f, 5.0f); - cLib_chaseF(&field_0x6d4, 70.0f, 1.0f); + cLib_chaseF(&mDemoCamFovy, 70.0f, 1.0f); - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); mGroundHeight = checkGroundHeight(current.pos, NULL); mRoofHeight = checkRoofHeight(current.pos); - cLib_chaseF(&field_0x6f8, 30.0f, 1.0f); + cLib_chaseF(&mFlySpeed, 30.0f, 1.0f); cLib_addCalcAngleS(¤t.angle.x, 0, 8, 0x200, 0x80); shape_angle.x = current.angle.x; shape_angle.y = current.angle.y; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); - if (field_0x744 == 0) { + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); + if (mMode == 0) { cLib_addCalcAngleS(&shape_angle.x, 0x2000, 8, 0x200, 0x40); } else { cLib_addCalcAngleS(&shape_angle.x, 0, 8, 0x200, 0x40); } - if (field_0x728 == 0x14 && field_0x744 == 0) { - if (field_0x6e7 == 1) { + if (field_0x728 == 20 && mMode == 0) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -2167,90 +2175,89 @@ bool daKago_c::PerchDemoAwayForward() { } if (field_0x728 == 0) { - if (field_0x744 == 0) { - field_0x744 = 1; - field_0x728 = 0x1e; + if (mMode == 0) { + mMode = 1; + field_0x728 = 30; setPlayerRideOn(); dComIfGp_getVibration().StartShock(2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - } else if (field_0x73c != 0) { + } else if (mSceneType != SCENE_TYPE_LAKE_HYLIA) { field_0x728 = 60; - field_0x744 = 2; + mMode = 2; } else { field_0x728 = 90; - field_0x744 = 3; + mMode = 3; field_0x6cc = 1.0f; } } - break; } case 2: { if (field_0x728 > 10) { - field_0x68c += speed; - field_0x698 += speed; + mDemoCamCenter += speed; + mDemoCamEye += speed; - s16 targetYaw = cLib_targetAngleY(&field_0x698, &field_0x68c); + s16 targetYaw = cLib_targetAngleY(&mDemoCamEye, &mDemoCamCenter); if (abs((s16)(midnaYaw - targetYaw)) < 0x2000) { - cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, 5.0f, 10.0f); + cLib_addCalcPos(&mDemoCamCenter, midnaPos, 0.5f, 5.0f, 10.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(0.0f, 50.0f, -800.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 20.0f, 10.0f); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 20.0f, 10.0f); } else { - cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, 5.0f, 10.0f); + cLib_addCalcPos(&mDemoCamCenter, midnaPos, 0.5f, 5.0f, 10.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(300.0f, 50.0f, -500.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 20.0f, 10.0f); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 20.0f, 10.0f); } } else { - cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, 50.0f, 10.0f); + cLib_addCalcPos(&mDemoCamCenter, midnaPos, 0.5f, 50.0f, 10.0f); mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(playerYaw); mDoMtx_stack_c::transM(0.0f, 50.0f, -800.0f); mDoMtx_stack_c::multVecZero(&unkXyz1); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 50.0f, 10.0f); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 50.0f, 10.0f); } - cLib_chaseF(&field_0x6d4, 70.0f, 1.0f); - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + cLib_chaseF(&mDemoCamFovy, 70.0f, 1.0f); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); mGroundHeight = checkGroundHeight(current.pos, NULL); mRoofHeight = checkRoofHeight(current.pos); - cLib_chaseF(&field_0x6f8, l_HIO.mFlightSpeed, 2.0f); + cLib_chaseF(&mFlySpeed, l_HIO.mFlightSpeed, 2.0f); if (field_0x728 < 30) { cLib_addCalcAngleS(¤t.angle.x, 0, 8, 0x100, 0x40); } else { - cLib_addCalcAngleS(¤t.angle.x, -8192, 8, 0x100, 0x40); + cLib_addCalcAngleS(¤t.angle.x, -0x2000, 8, 0x100, 0x40); } shape_angle.x = current.angle.x; shape_angle.y = current.angle.y; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 == 0) { - if (field_0x73c == 2) { + if (mSceneType == SCENE_TYPE_BOARD_HOUSE) { if (setSceneChange(3)) { - field_0x748 = 5; + mDemoMode = 5; field_0x6cc = 1.0f; } } else { field_0x6dc = 0; - setActionMode(0, 0); + setActionMode(ACTION_FLY_e, 0); - camera->Reset(field_0x68c, field_0x698); + camera->Reset(mDemoCamCenter, mDemoCamEye); camera->Start(); camera->SetTrimSize(0); @@ -2259,37 +2266,35 @@ bool daKago_c::PerchDemoAwayForward() { Z2GetAudioMgr()->setDemoName(NULL); } } - break; } case 3: { cLib_chaseF(&field_0x6cc, 0.0f, 0.1f); - field_0x68c += speed; - field_0x698 += speed * field_0x6cc; + mDemoCamCenter += speed; + mDemoCamEye += speed * field_0x6cc; unkXyz1.set(playerPos.x, playerPos.y + 100.0f, playerPos.z); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 10.0f, 3.0f); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 10.0f, 3.0f); - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); - cLib_chaseF(&field_0x6f8, 30.0f, 1.0f); + cLib_chaseF(&mFlySpeed, 30.0f, 1.0f); - cLib_addCalcAngleS(¤t.angle.x, -8192, 8, 0x100, 0x40); + cLib_addCalcAngleS(¤t.angle.x, -0x2000, 8, 0x100, 0x40); shape_angle.x = current.angle.x; shape_angle.y = current.angle.y; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 == 0) { - setActionMode(7, 0); - field_0x748 = 8; + setActionMode(ACTION_PERCH2_e, 0); + mDemoMode = 8; return true; } - break; } } @@ -2310,14 +2315,14 @@ void daKago_c::executePerch() { void daKago_c::executeEvent2() { dCamera_c* camera = dCam_getBody(); if (!eventInfo.checkCommandDemoAccrpt()) { - fopAcM_orderPotentialEvent(this,2,0xffff,3); + fopAcM_orderPotentialEvent(this, 2, 0xffff, 3); eventInfo.onCondition(2); } else { camera->Stop(); camera->SetTrimSize(3); - field_0x748 = 0; + mDemoMode = 0; field_0x74c = 0; - setActionMode(7,0); + setActionMode(ACTION_PERCH2_e, 0); field_0x6dc = 1; field_0x6de = 0xff; } @@ -2327,47 +2332,51 @@ void daKago_c::initFirstDemo() { dCamera_c* camera = dCam_getBody(); cXyz acStack_28; cXyz cStack_34; + daPy_py_c* player = daPy_getPlayerActorClass(); s16 playerYaw = player->shape_angle.y; cXyz playerPos = player->current.pos; + daMidna_c* midna = daPy_py_c::getMidnaActor(); cXyz midnaPos; - if (midna != 0) { + if (midna != NULL) { midnaPos = midna->current.pos; } s16 targetYaw; - switch (field_0x748) { + switch (mDemoMode) { case 0: { - Z2GetAudioMgr()->setDemoName(field_0x760); - field_0x718 = -0x800; + Z2GetAudioMgr()->setDemoName(mDemoName); + mHeadRotZ = -0x800; player->changeOriginalDemo(); - player->changeDemoMode(0x17, 0, 0, 0); + player->changeDemoMode(daPy_demo_c::DEMO_UNK_23_e, 0, 0, 0); + playerPos.set(-103292.0f, -23437.0f, 39925.0f); field_0x6a4.set(-60000.0f, -11000.0f, 28000.0f); shape_angle.y = current.angle.y = cLib_targetAngleY(&playerPos, &field_0x6a4); cStack_34.set(-300.0f, 400.0f, -1000.0f); cLib_offsetPos(¤t.pos, &playerPos, shape_angle.y, &cStack_34); targetYaw = cLib_targetAngleY(&playerPos, ¤t.pos); + player->setPlayerPosAndAngle(&playerPos, targetYaw, 0); if (midna != NULL) { midna->current.pos = playerPos; midnaPos = midna->current.pos; } + field_0x680.set(0.0f, 0.0f, 0.0f); - field_0x68c = current.pos; + mDemoCamCenter = current.pos; field_0x6bc = 0x3000; field_0x6cc = 500.0f; field_0x6d0 = 400.0f; cStack_34.set(0.0f, field_0x6d0, field_0x6cc); - cLib_offsetPos(&field_0x698, ¤t.pos, shape_angle.y + field_0x6bc, - &cStack_34); - field_0x6d4 = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); - field_0x728 = 0xa0; - setBck(15, 2, 10.0f, 1.0f); - field_0x6e4 = 0; + cLib_offsetPos(&mDemoCamEye, ¤t.pos, shape_angle.y + field_0x6bc, &cStack_34); + mDemoCamFovy = 70.0f; + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); + field_0x728 = 160; + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); + field_0x6e4 = 0; break; } case 1: { @@ -2375,37 +2384,33 @@ void daKago_c::initFirstDemo() { midna->current.pos = playerPos; midnaPos = midna->current.pos; } - field_0x68c = current.pos; + + mDemoCamCenter = current.pos; field_0x6bc = 0x800; field_0x6cc = 700.0f; cStack_34.set(0.0f, 0.0f, field_0x6cc); - cLib_offsetPos(&field_0x698, ¤t.pos, shape_angle.y + field_0x6bc, - &cStack_34); - field_0x6d4 = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); - field_0x728 = 0x50; - + cLib_offsetPos(&mDemoCamEye, ¤t.pos, shape_angle.y + field_0x6bc, &cStack_34); + mDemoCamFovy = 70.0f; + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); + field_0x728 = 80; break; } case 2: { field_0x728 = 60; mMsgFlow.init(this, 0x7d3, 0, NULL); - break; } case 3: { - field_0x718 = cLib_targetAngleX(¤t.pos, &playerPos) / 4; + mHeadRotZ = cLib_targetAngleX(¤t.pos, &playerPos) / 4; targetYaw = cLib_targetAngleY(¤t.pos, &playerPos) - shape_angle.y; - field_0x71a = targetYaw / 4; + mHeadRotY = targetYaw / 4; cStack_34.set(50.0f, 150.0f, -200.0f); - cLib_offsetPos(&field_0x698, &midnaPos, shape_angle.y, &cStack_34); + cLib_offsetPos(&mDemoCamEye, &midnaPos, shape_angle.y, &cStack_34); cStack_34.set(50.0f, 0.0f, 50.0f); - cLib_offsetPos(&field_0x68c, &midnaPos, shape_angle.y, &cStack_34); - field_0x6d4 = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); - targetYaw = cLib_targetAngleY(&playerPos, (Vec*)¤t); - player->setPlayerPosAndAngle(&playerPos, targetYaw, 0); - + cLib_offsetPos(&mDemoCamCenter, &midnaPos, shape_angle.y, &cStack_34); + mDemoCamFovy = 70.0f; + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); + player->setPlayerPosAndAngle(&playerPos, cLib_targetAngleY(&playerPos, ¤t.pos), 0); break; } case 4: { @@ -2416,8 +2421,7 @@ void daKago_c::initFirstDemo() { mDoMtx_stack_c::YrotM(field_0x6bc); mDoMtx_stack_c::transM(0.0f, 300.0f, field_0x6cc); mDoMtx_stack_c::multVecZero(&field_0x6a4); - field_0x6f8 = 0.0f; - + mFlySpeed = 0.0f; break; } case 5: { @@ -2426,68 +2430,66 @@ void daKago_c::initFirstDemo() { mDoMtx_stack_c::YrotM(field_0x6bc); mDoMtx_stack_c::transM(0.0f, 300.0f, 200.0f); mDoMtx_stack_c::multVecZero(&field_0x6a4); - break; } case 6: { player->cancelOriginalDemo(); setPlayerRideOn(); dComIfGp_getVibration().StartShock(2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - field_0x728 = 0x96; + field_0x728 = 150; field_0x6cc = 1.0f; - break; } case 7: { field_0x6e8 = 0; } case 8: { - setBck(15, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); + if (field_0x6e8 != 0) { - mpMorf->setFrame(0.0f); + mAnm_p->setFrame(0.0f); field_0x6a4.set(-67000.0f, -13000.0f, 28000.0f); current.pos.set(-76600.0f, -15500.0f, 37340.0f); shape_angle.y = current.angle.y = -0x8000; shape_angle.x = current.angle.x = -0x1000; - field_0x6f8 = 50.0f; - field_0x698.set(-75232.0f, -14685.0f, 34417.0f); - field_0x68c.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); - field_0x6d4 = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + mFlySpeed = 50.0f; + mDemoCamEye.set(-75232.0f, -14685.0f, 34417.0f); + mDemoCamCenter.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); + mDemoCamFovy = 70.0f; + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); field_0x728 = 200; } else { field_0x6a4.set(-60000.0f, -11000.0f, 28000.0f); current.pos.set(-90000.0f, -16000.0f, 40000.0f); shape_angle.y = current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x6a4); shape_angle.x = current.angle.x = -0x2000; - field_0x6f8 = 50.0f; + mFlySpeed = 50.0f; cStack_34.set(-500.0f, 1000.0f, 5000.0f); - cLib_offsetPos(&field_0x698, ¤t.pos, shape_angle.y, &cStack_34); - field_0x68c.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); - field_0x6d4 = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + cLib_offsetPos(&mDemoCamEye, ¤t.pos, shape_angle.y, &cStack_34); + mDemoCamCenter.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); + mDemoCamFovy = 70.0f; + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); field_0x728 = 200; } - break; } } field_0x74c = 1; - field_0x744 = 0; + mMode = 0; } bool daKago_c::executeFirstDemo() { dCamera_c* camera = dCam_getBody(); cXyz unkXyz1; - cXyz unkXyz2; + cXyz offset; cXyz midnaPos; daPy_py_c* player = daPy_getPlayerActorClass(); daMidna_c* midna = daPy_py_c::getMidnaActor(); - if (midna != 0) { + if (midna != NULL) { midnaPos = midna->current.pos; } @@ -2495,8 +2497,8 @@ bool daKago_c::executeFirstDemo() { cXyz playerPos = player->current.pos; int unkFlag1; - int switchVal = field_0x748; - switch (switchVal) { + int mode = mDemoMode; // fakematch + switch (mode) { case 0: dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); @@ -2504,21 +2506,21 @@ bool daKago_c::executeFirstDemo() { cLib_chaseF(&field_0x6cc, 1250.0f, 6.7f); cLib_chaseF(&field_0x6d0, -400.0f, 7.1f); - unkXyz2.set(0.0f, field_0x6d0, field_0x6cc); - cLib_offsetPos(&field_0x698, ¤t.pos, shape_angle.y + field_0x6bc, &unkXyz2); + offset.set(0.0f, field_0x6d0, field_0x6cc); + cLib_offsetPos(&mDemoCamEye, ¤t.pos, shape_angle.y + field_0x6bc, &offset); unkXyz1.set(0.0f, -200.0f, 400.0f); cLib_chasePos(&field_0x680, unkXyz1, 4.0f); - cLib_offsetPos(&field_0x68c, ¤t.pos, shape_angle.y, &field_0x680); + cLib_offsetPos(&mDemoCamCenter, ¤t.pos, shape_angle.y, &field_0x680); - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); if (field_0x728 < 10) { setMidnaTagPos(); if (field_0x728 == 0) { - field_0x748 = 1; + mDemoMode = 1; return 1; } } @@ -2529,35 +2531,35 @@ bool daKago_c::executeFirstDemo() { cLib_chaseAngleS(&field_0x6bc, 0x1000, 0x20); - unkXyz2.set(0.0f, 0.0f, field_0x6cc); - cLib_offsetPos(&field_0x698, ¤t.pos, shape_angle.y + field_0x6bc, &unkXyz2); + offset.set(0.0f, 0.0f, field_0x6cc); + cLib_offsetPos(&mDemoCamEye, ¤t.pos, shape_angle.y + field_0x6bc, &offset); - if (field_0x728 < 0x46) { - cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, 10.0f, 10.0f); + if (field_0x728 < 70) { + cLib_addCalcPos(&mDemoCamCenter, midnaPos, 0.5f, 10.0f, 10.0f); } else { - field_0x68c = current.pos; + mDemoCamCenter = current.pos; } - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); setMidnaTagPos(); if (field_0x728 == 30) { - setBck(0x14, 0x02, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_HANGED_WAIT_e, 2, 10.0f, 1.0f); } if (field_0x728 > 30) { cLib_chaseF(&field_0x6cc, 350.0f, 4.0f); - cLib_addCalcAngleS(&field_0x718, -2048, 8, 0x100, 0x10); + cLib_addCalcAngleS(&mHeadRotZ, -0x800, 8, 0x100, 0x10); } else { cLib_chaseF(&field_0x6cc, 350.0f, 6.0f); - cLib_addCalcAngleS(&field_0x718, 0x400, 8, 0x200, 0x10); + cLib_addCalcAngleS(&mHeadRotZ, 0x400, 8, 0x200, 0x10); if (field_0x728 == 30) { setMidnaRideOn(); } - if (field_0x728 == 0x14) { - if (field_0x6e7 == 1) { + if (field_0x728 == 20) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -2565,7 +2567,7 @@ bool daKago_c::executeFirstDemo() { } if (field_0x728 == 0) { - field_0x748 = 2; + mDemoMode = 2; return true; } @@ -2575,25 +2577,24 @@ bool daKago_c::executeFirstDemo() { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 3); setMidnaTagPos(); - cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, 10.0f, 10.0f); - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + cLib_addCalcPos(&mDemoCamCenter, midnaPos, 0.5f, 10.0f, 10.0f); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); mMsgFlow.doFlow(this, NULL, 0); if (field_0x728 != 0) { if (field_0x728 == 1) { - setBck(0xf, 0x02, 20.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 20.0f, 1.0f); } if (mMsgFlow.getNowMsgNo() == 0x1774) { - setBck(0xf, 0x02, 20.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 20.0f, 1.0f); field_0x728 = 0; } } if (mMsgFlow.getNowMsgNo() == 0x1775) { - field_0x748 = 3; - + mDemoMode = 3; return true; } @@ -2603,18 +2604,17 @@ bool daKago_c::executeFirstDemo() { setMidnaTagPos(); cLib_addCalcAngleS( - &field_0x718, cLib_targetAngleX(¤t.pos, &playerPos) / 4, + &mHeadRotZ, cLib_targetAngleX(¤t.pos, &playerPos) / 4, 8, 0x100, 0x10); // adding braces to the switch case for this decl regresses debug match s16 targetYaw = cLib_targetAngleY(¤t.pos, &playerPos) - shape_angle.y; cLib_addCalcAngleS( - &field_0x71a, targetYaw / 4, + &mHeadRotY, targetYaw / 4, 8, 0x100, 0x10); if (mMsgFlow.doFlow(this, NULL, 0)) { - field_0x748 = 4; - + mDemoMode = 4; return true; } @@ -2623,8 +2623,8 @@ bool daKago_c::executeFirstDemo() { case 4: dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); - cLib_addCalcAngleS(&field_0x718, 0, 8, 0x100, 0x10); - cLib_addCalcAngleS(&field_0x71a, 0, 8, 0x100, 0x10); + cLib_addCalcAngleS(&mHeadRotZ, 0, 8, 0x100, 0x10); + cLib_addCalcAngleS(&mHeadRotY, 0, 8, 0x100, 0x10); cLib_chaseF(&field_0x6cc, -300.0f, 10.0f); @@ -2638,27 +2638,27 @@ bool daKago_c::executeFirstDemo() { shape_angle.y = current.angle.y; shape_angle.x = current.angle.x; - cLib_chaseF(&field_0x6f8, 20.0f, 1.0f); + cLib_chaseF(&mFlySpeed, 20.0f, 1.0f); - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); - field_0x68c += speed; - field_0x698 += speed; + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); + mDemoCamCenter += speed; + mDemoCamEye += speed; - unkXyz2.set(0.0f, 200.0f, -500.0f); - cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 10.0f, 3.0f); - unkXyz2.set(0.0f, 0.0f, 0.0f); + offset.set(0.0f, 200.0f, -500.0f); + cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 10.0f, 3.0f); + offset.set(0.0f, 0.0f, 0.0f); - cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 10.0f, 3.0f); + cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 10.0f, 3.0f); - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); if (field_0x6a4.abs(current.pos) < 100.0f) { - field_0x748 = 5; + mDemoMode = 5; return true; } @@ -2671,87 +2671,84 @@ bool daKago_c::executeFirstDemo() { shape_angle.y = current.angle.y; shape_angle.x = current.angle.x; - cLib_chaseF(&field_0x6f8, 20.0f, 1.0f); - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); + cLib_chaseF(&mFlySpeed, 20.0f, 1.0f); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); - field_0x68c += speed; - field_0x698 += speed; + speed.y = -mFlySpeed * cM_ssin(current.angle.x); + mDemoCamCenter += speed; + mDemoCamEye += speed; - unkXyz2.set(400.0f, 50.0f, -300.0f); - cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 10.0f, 3.0f); + offset.set(400.0f, 50.0f, -300.0f); + cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 10.0f, 3.0f); - unkXyz2.set(0.0f, 50.0f, 0.0f); - cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 10.0f, 3.0f); + offset.set(0.0f, 50.0f, 0.0f); + cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 10.0f, 3.0f); - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); if (field_0x6a4.abs(current.pos) < 100.0f) { - field_0x748 = 6; - + mDemoMode = 6; return true; } break; case 6: dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); - cLib_addCalcAngleS(¤t.angle.x, -8192, 8, 0x100, 0x40); + cLib_addCalcAngleS(¤t.angle.x, -0x2000, 8, 0x100, 0x40); shape_angle.x = current.angle.x; shape_angle.y = current.angle.y; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 > 120) { - field_0x68c += speed; - field_0x698 += speed; + mDemoCamCenter += speed; + mDemoCamEye += speed; - unkXyz2.set(400.0f, 100.0f, -300.0f); - cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x698, unkXyz1, 0.5f, 10.0f, 3.0f); + offset.set(400.0f, 100.0f, -300.0f); + cLib_offsetPos(&unkXyz1, &midnaPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamEye, unkXyz1, 0.5f, 10.0f, 3.0f); - unkXyz2.set(0.0f, 100.0f, 0.0f); - cLib_offsetPos(&unkXyz1, &playerPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 10.0f, 3.0f); + offset.set(0.0f, 100.0f, 0.0f); + cLib_offsetPos(&unkXyz1, &playerPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 10.0f, 3.0f); } else { cLib_chaseF(&field_0x6cc, 0.0f, 0.1f); - field_0x68c += speed; - field_0x698 += speed * field_0x6cc; + mDemoCamCenter += speed; + mDemoCamEye += speed * field_0x6cc; - unkXyz2.set(0.0f, 100.0f, 0.0f); - cLib_offsetPos(&unkXyz1, &playerPos, shape_angle.y, &unkXyz2); - cLib_addCalcPos(&field_0x68c, unkXyz1, 0.5f, 10.0f, 3.0f); + offset.set(0.0f, 100.0f, 0.0f); + cLib_offsetPos(&unkXyz1, &playerPos, shape_angle.y, &offset); + cLib_addCalcPos(&mDemoCamCenter, unkXyz1, 0.5f, 10.0f, 3.0f); } - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); if (field_0x728 == 0) { - field_0x748 = 7; - + mDemoMode = 7; return true; } - break; case 7: case 8: unkFlag1 = 0; - if (switchVal == 7 || field_0x6e8 == 0) { + if (mode == 7 || field_0x6e8 == 0) { if (field_0x728 == 110) { unkFlag1 = 1; } - } else if (switchVal == 8 && field_0x728 == 140) { + } else if (mode == 8 && field_0x728 == 140) { unkFlag1 = 1; } if (unkFlag1 != 0) { - if (field_0x6e7 == 1) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -2761,8 +2758,8 @@ bool daKago_c::executeFirstDemo() { if (field_0x728 != 0) { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1); } else { - if (field_0x73c == 0 && setSceneChange(0)) { - field_0x748 = 9; + if (mSceneType == SCENE_TYPE_LAKE_HYLIA && setSceneChange(0)) { + mDemoMode = 9; } } case 9: @@ -2771,16 +2768,15 @@ bool daKago_c::executeFirstDemo() { shape_angle.y = current.angle.y; shape_angle.x = current.angle.x; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); - - unkXyz2.set(0.0f, 100.0f, 0.0f); - cLib_offsetPos(&field_0x68c, ¤t.pos, shape_angle.y, &unkXyz2); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); - field_0x6d4 = 70.0f; + offset.set(0.0f, 100.0f, 0.0f); + cLib_offsetPos(&mDemoCamCenter, ¤t.pos, shape_angle.y, &offset); - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + mDemoCamFovy = 70.0f; + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); break; } @@ -2802,13 +2798,13 @@ void daKago_c::executeLandingLakeHairia() { cXyz unkXyz1; cXyz unkXyz2(-700.0f, 0.0f, -300.0f); - switch (field_0x744) { + switch (mMode) { case 0: current.pos.set(-74500.0f, -12775.0f, 31400.0f); if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xffff, 3); - eventInfo.onCondition(2); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } @@ -2816,38 +2812,37 @@ void daKago_c::executeLandingLakeHairia() { camera->SetTrimSize(3); current.pos.set(-74500.0f, -12775.0f, 31400.0f); - field_0x698.set(-79460.0f, -13000.0f, 34200.0f); - field_0x68c = current.pos; + mDemoCamEye.set(-79460.0f, -13000.0f, 34200.0f); + mDemoCamCenter = current.pos; - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; - current.angle.x = 0; - shape_angle.x = 0; - shape_angle.y = current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x698); + shape_angle.x = current.angle.x = 0; + shape_angle.y = current.angle.y = cLib_targetAngleY(¤t.pos, &mDemoCamEye); field_0x716 = shape_angle.y + 0x2000; field_0x6a4.set(-77615.0f, -18500.0f, 41400.0f); field_0x6a4 += unkXyz2; - field_0x744 = 1; + mMode = 1; field_0x712 = 0; field_0x728 = 150; - field_0x6f8 = 50.0f; + mFlySpeed = 50.0f; break; case 1: - Z2GetAudioMgr()->setDemoName(field_0x760); - field_0x744 = 2; + Z2GetAudioMgr()->setDemoName(mDemoName); + mMode = 2; case 2: - if (field_0x728 == 0x8c) { - if (field_0x6e7 == 0x01) { + if (field_0x728 == 140) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); } } - field_0x68c = current.pos; + mDemoCamCenter = current.pos; cLib_chaseAngleS(&field_0x712, 0x80, 4); @@ -2856,17 +2851,16 @@ void daKago_c::executeLandingLakeHairia() { cLib_chaseAngleS(&shape_angle.x, 0x1000, 0x20); current.angle.x = shape_angle.x; - field_0x6f8 = 50.0f; + mFlySpeed = 50.0f; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 == 0) { - field_0x744 = 3; + mMode = 3; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 7); - break; case 3: current.pos.set(-76600.0f, -15500.0f, 37340.0f); @@ -2875,37 +2869,36 @@ void daKago_c::executeLandingLakeHairia() { field_0x6a4.set(-77615.0f, -18500.0f, 41400.0f); field_0x6a4 += unkXyz2; - field_0x698.set(-76900.0f, -18550.0f, 41660.0f); - field_0x698 += unkXyz2; + mDemoCamEye.set(-76900.0f, -18550.0f, 41660.0f); + mDemoCamEye += unkXyz2; - field_0x68c = current.pos; + mDemoCamCenter = current.pos; - field_0x6d4 = 70.0f; + mDemoCamFovy = 70.0f; shape_angle.x = current.angle.x = -cLib_targetAngleX(¤t.pos, &field_0x6a4); shape_angle.y = current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x6a4); - field_0x744 = 4; + mMode = 4; field_0x728 = 60; - setBck(13, 2, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e, 2, 10.0f, 1.0f); case 4: - field_0x68c = current.pos; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + mDemoCamCenter = current.pos; + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 == 0) { - field_0x744 = 5; - field_0x728 = 0x28; + mMode = 5; + field_0x728 = 40; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 7); - break; case 5: - field_0x68c = current.pos; + mDemoCamCenter = current.pos; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); cLib_chaseAngleS(&shape_angle.x, 0, 0x80); current.angle.x = shape_angle.x; @@ -2913,10 +2906,10 @@ void daKago_c::executeLandingLakeHairia() { if (field_0x728 == 0) { setRideOff(); - field_0x744 = 6; + mMode = 6; field_0x728 = 100; - setBck(0xf, 0x02, 10.0f, 1.0f); + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 2, 10.0f, 1.0f); } else { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 7); } @@ -2927,28 +2920,29 @@ void daKago_c::executeLandingLakeHairia() { case 6: unkXyz1.set(-77875.0f, -18287.0f, 42000.0f); unkXyz1 += unkXyz2; - cLib_chasePos(&field_0x68c, unkXyz1, field_0x6cc); - if (field_0x68c.abs(unkXyz1) < 500.0f) { + cLib_chasePos(&mDemoCamCenter, unkXyz1, field_0x6cc); + if (mDemoCamCenter.abs(unkXyz1) < 500.0f) { cLib_chaseF(&field_0x6cc, 0.0f, 3.0f); } unkXyz1.set(-77275.0f, -18500.0f, 41090.0f); unkXyz1 += unkXyz2; - cLib_chasePos(&field_0x698, unkXyz1, field_0x6d0); - if (field_0x698.abs(unkXyz1) < 200.0f) { + cLib_chasePos(&mDemoCamEye, unkXyz1, field_0x6d0); + + if (mDemoCamEye.abs(unkXyz1) < 200.0f) { cLib_chaseF(&field_0x6d0, 0.0f, 1.0f); } else { cLib_chaseF(&field_0x6d0, 20.0f, 1.0f); } - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); - cLib_chaseAngleS(&shape_angle.x, -8192, 0x100); + cLib_chaseAngleS(&shape_angle.x, -0x2000, 0x100); current.angle.x = shape_angle.x; if (field_0x728 == 90) { - if (field_0x6e7 == 0x01) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -2956,7 +2950,7 @@ void daKago_c::executeLandingLakeHairia() { } if (field_0x728 == 0) { - setActionMode(4, 0); + setActionMode(ACTION_WAIT_e, 0); camera->Reset(); camera->Start(); @@ -2965,91 +2959,87 @@ void daKago_c::executeLandingLakeHairia() { dComIfGp_event_reset(); Z2GetAudioMgr()->setDemoName(NULL); - return; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 8); } - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); } void daKago_c::executeLandingBoartHouse() { dCamera_c* camera = dCam_getBody(); cXyz unkXyz1; - switch (field_0x744) { + switch (mMode) { case 0: { current.pos.set(5750.0f, 1600.0f, 6100.0f); if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xffff, 3); eventInfo.onCondition(2); - return; } camera->Stop(); camera->SetTrimSize(3); - field_0x744 = 10; - + mMode = 10; break; } case 10: { - Z2GetAudioMgr()->setDemoName(field_0x760); + Z2GetAudioMgr()->setDemoName(mDemoName); current.pos.set(5750.0f, 1600.0f, 6100.0f); - setBck(0xf, 0x02, 10.0f, 1.0f); - field_0x698.set(2900.0f, 300.0f, 500.0f); - field_0x68c = current.pos; - field_0x6d4 = 70.0f; + setBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e, 0x02, 10.0f, 1.0f); + mDemoCamEye.set(2900.0f, 300.0f, 500.0f); + mDemoCamCenter = current.pos; + mDemoCamFovy = 70.0f; field_0x6a4.set(3630.0f, 300.0f, 600.0f); shape_angle.x = current.angle.x = -cLib_targetAngleX(¤t.pos, &field_0x6a4); shape_angle.y = current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x6a4); - field_0x744 = 1; + mMode = 1; field_0x712 = 0; - field_0x728 = 0x50; - field_0x6f8 = 50.0f; + field_0x728 = 80; + mFlySpeed = 50.0f; } case 1: { - if (field_0x728 == 0x46) { - if (field_0x6e7 == 0x01) { + if (field_0x728 == 70) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); } } - field_0x68c = current.pos; + mDemoCamCenter = current.pos; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); if (field_0x728 == 0) { - field_0x744 = 2; - field_0x728 = 0x28; + mMode = 2; + field_0x728 = 40; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 9); - break; } case 2: { - field_0x68c = current.pos; + mDemoCamCenter = current.pos; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); cLib_chaseAngleS(&shape_angle.x, 0, 0x80); current.angle.x = shape_angle.x; if (field_0x728 == 0) { setRideOff(); - field_0x744 = 3; + mMode = 3; field_0x728 = 90; } else { dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 9); @@ -3057,32 +3047,31 @@ void daKago_c::executeLandingBoartHouse() { field_0x6cc = 40.0f; field_0x6d0 = 15.0f; - break; } case 3: { unkXyz1.set(3440.0f, 500.0f, 400.0f); - cLib_chasePos(&field_0x68c, unkXyz1, field_0x6cc); - if (field_0x68c.abs(unkXyz1) < 500.0f) { + cLib_chasePos(&mDemoCamCenter, unkXyz1, field_0x6cc); + if (mDemoCamCenter.abs(unkXyz1) < 500.0f) { cLib_chaseF(&field_0x6cc, 0.0f, 3.0f); } unkXyz1.set(3584.0f, 270.0f, 1007.0f); - cLib_chasePos(&field_0x698, unkXyz1, field_0x6d0); - if (field_0x698.abs(unkXyz1) < 200.0f) { + cLib_chasePos(&mDemoCamEye, unkXyz1, field_0x6d0); + if (mDemoCamEye.abs(unkXyz1) < 200.0f) { cLib_chaseF(&field_0x6d0, 0.0f, 1.0f); } else { cLib_chaseF(&field_0x6d0, 15.0f, 1.0f); } - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); - cLib_chaseAngleS(&shape_angle.x, -8192, 0x100); + cLib_chaseAngleS(&shape_angle.x, -0x2000, 0x100); current.angle.x = shape_angle.x; - if (field_0x728 == 0x50) { - if (field_0x6e7 == 0x01) { + if (field_0x728 == 80) { + if (mType == TYPE_NORMAL) { mSound.startCreatureVoice(Z2SE_EN_KC_V_NAKU, -1); } else { mSound.startCreatureVoice(Z2SE_EN_YC_V_NAKU, -1); @@ -3090,10 +3079,10 @@ void daKago_c::executeLandingBoartHouse() { } if (field_0x728 == 0) { - setActionMode(4, 0); + setActionMode(ACTION_WAIT_e, 0); - if (field_0x6e7 == 0x01) { - field_0x728 = 0x78; + if (mType == TYPE_NORMAL) { + field_0x728 = 120; } camera->Reset(); @@ -3103,44 +3092,42 @@ void daKago_c::executeLandingBoartHouse() { dComIfGp_event_reset(); Z2GetAudioMgr()->setDemoName(NULL); - return; } dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 10); - break; } } - camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); + camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); } void daKago_c::executeLanding() { - if (this->field_0x73c == 0) { + if (mSceneType == SCENE_TYPE_LAKE_HYLIA) { executeLandingLakeHairia(); - } else if (this->field_0x73c == 2) { + } else if (mSceneType == SCENE_TYPE_BOARD_HOUSE) { executeLandingBoartHouse(); } else { setRideOff(); - setActionMode(4, 0); + setActionMode(ACTION_WAIT_e, 0); } } void daKago_c::moveDemoFly() { - if (field_0x744 == 0) { - cLib_chaseF(&field_0x6f8, l_HIO.mFlightSpeed, 2.0f); + if (mMode == 0) { + cLib_chaseF(&mFlySpeed, l_HIO.mFlightSpeed, 2.0f); if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xffff, 3); - eventInfo.onCondition(2); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } else { setPlayerRideOn(); mDashCooldownTime = (int)l_HIO.mDashCooldownTime; mDashTime = (int)l_HIO.mDashTime; - field_0x744 = 1; + mMode = 1; setDashBlurEffect(0); - setBck(11, 0, 5.0f, l_HIO.mDashTimeMultiplier); + setBck(dRes_ID_E_YC_BCK_YC_FLY_DASH_WL_e, 0, 5.0f, l_HIO.mDashTimeMultiplier); dComIfGp_getVibration().StartShock(1, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); mpLockActor = NULL; @@ -3148,9 +3135,8 @@ void daKago_c::moveDemoFly() { mGroundHeight = checkGroundHeight(current.pos, NULL); mRoofHeight = checkRoofHeight(current.pos); - if (mCurrentAction == 9) { + if (mAction == ACTION_DEMO_FLY_e) { dComIfGs_onSaveSwitch(9); - mMsgFlow.init(this, 0xbbf, 0, NULL); } } @@ -3159,75 +3145,72 @@ void daKago_c::moveDemoFly() { mIsFlying = true; - if (mCurrentAction == 9) { + if (mAction == ACTION_DEMO_FLY_e) { mMsgFlow.doFlow(this, NULL, 0); } - if (field_0x744 < 6) { - setDashEffect(); - field_0x6dd = 0x01; - - dComIfGp_setAStatusForce(0x27, 0); + if (mMode < 6) { + setDashEffect(); + mIsAttack = TRUE; + dComIfGp_setAStatusForce(BUTTON_STATUS_UNK_39, 0); } - switch (field_0x744) { + switch (mMode) { case 1: { - Z2GetAudioMgr()->setDemoName(field_0x760); - - field_0x744 = 2; + Z2GetAudioMgr()->setDemoName(mDemoName); + mMode = 2; } case 2: { - cLib_chaseF(&field_0x6f8, 30.0f, l_HIO.mDashTimeMultiplier * 3.0f); - if (mpMorf->checkFrame(9.0f)) { - if (field_0x6e7 == 0) { + cLib_chaseF(&mFlySpeed, 30.0f, l_HIO.mDashTimeMultiplier * 3.0f); + if (mAnm_p->checkFrame(9.0f)) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSound(Z2SE_EN_YC_DASH, 0, -1); } else { mSound.startCreatureSound(Z2SE_EN_KC_DASH, 0, -1); } } - if (mpMorf->checkFrame(12.0f)) { - field_0x744 = 3; - field_0x728 = 0x14; + + if (mAnm_p->checkFrame(12.0f)) { + mMode = 3; + field_0x728 = 20; dComIfGp_getVibration().StartShock(2, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); dComIfGp_getVibration().StartQuake(1, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); field_0x6e6 = 0; } - break; } case 3: case 4: { - cLib_chaseF(&field_0x6f8, 100.0f, 5.0f); + cLib_chaseF(&mFlySpeed, 100.0f, 5.0f); if (field_0x728 == 0) { - if (field_0x744 == 3) { - field_0x744 = 4; - field_0x728 = 0xf; + if (mMode == 3) { + mMode = 4; + field_0x728 = 15; } else { - field_0x744 = 5; + mMode = 5; dComIfGp_getVibration().StopQuake(0x1f); } } - break; } case 5: { - cLib_chaseF(&field_0x6f8, l_HIO.mFlightSpeed, 5.0f); - if (field_0x6f8 <= l_HIO.mFlightSpeed) { + cLib_chaseF(&mFlySpeed, l_HIO.mFlightSpeed, 5.0f); + if (mFlySpeed <= l_HIO.mFlightSpeed) { field_0x6c8 = 0; field_0x6c4 = 8000.0f; field_0x710 = field_0x712 = 0; -#if VERSION == VERSION_WII_USA_R0 + #if VERSION == VERSION_WII_USA_R0 field_0x72c = 30; -#else + #else if (dComIfGp_getStartStagePoint() == 0) { field_0x72c = 30; } else { field_0x72c = 60 + nREG_S(1); } -#endif + #endif shape_angle.y = current.angle.y; @@ -3237,9 +3220,8 @@ void daKago_c::moveDemoFly() { setFlyAnime(); field_0x710 = field_0x712 = 0; - field_0x744 = 6; + mMode = 6; } - break; } case 6: { @@ -3249,32 +3231,30 @@ void daKago_c::moveDemoFly() { f32 fVar11 = 0.0f; if (cM_ssin(current.angle.x) > 0.0f) { - fVar11 = - l_HIO.mFlightSpeed + l_HIO.mDescentRateIncrement * cM_ssin(current.angle.x); + fVar11 = l_HIO.mFlightSpeed + l_HIO.mDescentRateIncrement * cM_ssin(current.angle.x); } else { fVar11 = l_HIO.mFlightSpeed + l_HIO.mAscentRateDecel * cM_ssin(current.angle.x); } - if (std::abs(field_0x6f8 - fVar11) > 10.0f) { - cLib_chaseF(&field_0x6f8, fVar11, 2.0f); + if (std::abs(mFlySpeed - fVar11) > 10.0f) { + cLib_chaseF(&mFlySpeed, fVar11, 2.0f); } else { - cLib_chaseF(&field_0x6f8, fVar11, 1.0f); + cLib_chaseF(&mFlySpeed, fVar11, 1.0f); } if (field_0x72c == 0) { - setActionMode(0, 0); + setActionMode(ACTION_FLY_e, 0); dComIfGp_event_reset(); Z2GetAudioMgr()->setDemoName(NULL); return; } - break; } } } - cXyz unkXyz1 = dPath_GetPnt(mpPath1, mPathIdx)->m_position; - cXyz unkXyz2 = dPath_GetPnt(mpPath1, mPathIdx - mPathIdxOffset)->m_position; + cXyz unkXyz1 = dPath_GetPnt(mpPath1, mPathCurrentPointNo)->m_position; + cXyz unkXyz2 = dPath_GetPnt(mpPath1, mPathCurrentPointNo - mPathStep)->m_position; s16 targetYaw = field_0x714 = cLib_targetAngleY(&unkXyz2, &unkXyz1); if (dComIfGp_getStartStagePoint() == 0) { @@ -3288,13 +3268,13 @@ void daKago_c::moveDemoFly() { cLib_addCalcAngleS(¤t.angle.y, cLib_targetAngleY(&unkXyz2, &unkXyz1), 8, 0x40, 0x10); shape_angle.y = current.angle.y; - speedF = field_0x6f8 * std::abs(cM_scos(current.angle.x)); - speed.y = -field_0x6f8 * cM_ssin(current.angle.x); + speedF = mFlySpeed * std::abs(cM_scos(current.angle.x)); + speed.y = -mFlySpeed * cM_ssin(current.angle.x); f32 nextPath = checkNextPath(unkXyz1); if (nextPath < 0.0f) { if (abs((s16)(targetYaw - cLib_targetAngleY(&unkXyz2, ¤t.pos))) < 0x4000) { - mPathIdx += this->mPathIdxOffset; + mPathCurrentPointNo += mPathStep; if (checkFlySceneChange()) { return; } @@ -3303,41 +3283,41 @@ void daKago_c::moveDemoFly() { } void daKago_c::setFlyEffect() { - if (field_0x6e7 == 1) { + if (mType == TYPE_NORMAL) { return; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); JPABaseEmitter* emitter; - field_0xb30 = dComIfGp_particle_set(field_0xb30, 0x8607, ¤t.pos, &tevStr); + field_0xb30 = dComIfGp_particle_set(field_0xb30, dPa_RM(ID_ZF_S_YCFLY_HANDLR2), ¤t.pos, &tevStr); emitter = dComIfGp_particle_getEmitter(field_0xb30); if (emitter != NULL) { - emitter->setGlobalSRTMatrix(model->getAnmMtx(13)); + emitter->setGlobalSRTMatrix(model->getAnmMtx(YC_JNT_HANDL_2_e)); } - field_0xb34 = dComIfGp_particle_set(field_0xb34, 0x8607, ¤t.pos, &tevStr); + field_0xb34 = dComIfGp_particle_set(field_0xb34, dPa_RM(ID_ZF_S_YCFLY_HANDLR2), ¤t.pos, &tevStr); emitter = dComIfGp_particle_getEmitter(field_0xb34); if (emitter != NULL) { - emitter->setGlobalSRTMatrix(model->getAnmMtx(18)); + emitter->setGlobalSRTMatrix(model->getAnmMtx(YC_JNT_HANDR_2_e)); } } void daKago_c::setDashEffect() { - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); JPABaseEmitter* emitter; - if (field_0x6e7 == 0) { - field_0xb38 = dComIfGp_particle_set(field_0xb38, 0x8609, ¤t.pos, &tevStr); - emitter = dComIfGp_particle_getEmitter(this->field_0xb38); + if (mType == TYPE_TWILIGHT) { + field_0xb38 = dComIfGp_particle_set(field_0xb38, dPa_RM(ID_ZF_S_YCDASH_HANDL2), ¤t.pos, &tevStr); + emitter = dComIfGp_particle_getEmitter(field_0xb38); if (emitter != NULL) { - emitter->setGlobalSRTMatrix(model->getAnmMtx(13)); + emitter->setGlobalSRTMatrix(model->getAnmMtx(YC_JNT_HANDL_2_e)); } - field_0xb3c = dComIfGp_particle_set(field_0xb3c, 0x860a, ¤t.pos, &tevStr); + field_0xb3c = dComIfGp_particle_set(field_0xb3c, dPa_RM(ID_ZF_S_YCDASH_HANDR2), ¤t.pos, &tevStr); emitter = dComIfGp_particle_getEmitter(field_0xb3c); if (emitter != NULL) { - emitter->setGlobalSRTMatrix(model->getAnmMtx(18)); + emitter->setGlobalSRTMatrix(model->getAnmMtx(YC_JNT_HANDR_2_e)); } } @@ -3345,25 +3325,27 @@ void daKago_c::setDashEffect() { } void daKago_c::setDamageEffect() { - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); JPABaseEmitter* emitter; - if (field_0x6e7 != 1) { - field_0xb38 = dComIfGp_particle_set(field_0xb38, 0x8603, ¤t.pos, &tevStr); - emitter = dComIfGp_particle_getEmitter(this->field_0xb38); + if (mType != TYPE_NORMAL) { + field_0xb38 = dComIfGp_particle_set(field_0xb38, dPa_RM(ID_ZF_S_YCDAMAGE00_HANDLR2), ¤t.pos, &tevStr); + emitter = dComIfGp_particle_getEmitter(field_0xb38); if (emitter != NULL) { - emitter->setGlobalSRTMatrix(model->getAnmMtx(13)); + emitter->setGlobalSRTMatrix(model->getAnmMtx(YC_JNT_HANDL_2_e)); } - field_0xb3c = dComIfGp_particle_set(field_0xb3c, 0x8603, ¤t.pos, &tevStr); + field_0xb3c = dComIfGp_particle_set(field_0xb3c, dPa_RM(ID_ZF_S_YCDAMAGE00_HANDLR2), ¤t.pos, &tevStr); emitter = dComIfGp_particle_getEmitter(field_0xb3c); if (emitter != NULL) { - emitter->setGlobalSRTMatrix(model->getAnmMtx(18)); + emitter->setGlobalSRTMatrix(model->getAnmMtx(YC_JNT_HANDR_2_e)); } } } void daKago_c::setDashBlurEffect(int param_0) { + UNUSED(param_0); + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz cameraEye = dCam_getBody()->Eye(); cXyz cameraEyeOffset; @@ -3381,51 +3363,53 @@ void daKago_c::setDashBlurEffect(int param_0) { cameraEyeOffset = cameraEye + local_78; - local_94.set((s16)cLib_targetAngleX(&field_0x6b0, &cameraEye), (s16)cLib_targetAngleY(&field_0x6b0, &cameraEye), 0); + local_94.set((s16)cLib_targetAngleX(&mPrevCamEye, &cameraEye), (s16)cLib_targetAngleY(&mPrevCamEye, &cameraEye), 0); if (l_HIO.mAngleTrackingMode == 0) { field_0x6be.x = -local_94.x; field_0x6be.y = local_94.y; field_0x6be.z = 0; } else { - field_0x6be.x = shape_angle.x * (0.5f + XREG_F(0x13)); + field_0x6be.x = shape_angle.x * (0.5f + XREG_F(19)); field_0x6be.y = shape_angle.y; field_0x6be.z = 0; } - field_0xb40 = dComIfGp_particle_set(field_0xb40, 0x860f, &cameraEyeOffset, &tevStr, &field_0x6be, 0, 0xff, 0, -1, 0, 0, 0); + + field_0xb40 = dComIfGp_particle_set(field_0xb40, dPa_RM(ID_ZF_S_YCSPEED), &cameraEyeOffset, &tevStr, &field_0x6be, NULL, 0xff, NULL, -1, NULL, NULL, NULL); } -void daKago_c::setWallHitEffect(cXyz param_0, int param_1) { +void daKago_c::setWallHitEffect(cXyz i_pos, int i_effType) { // might be a 2D array? static u16 kago_wall_hit_id[6] = { - 0x8658, - 0x86F9, - 0x86FA, - 0x8659, - 0x86FB, - 0x86FC, + dPa_RM(ID_ZF_S_YCHITA), + dPa_RM(ID_ZF_S_YCHITA_1), + dPa_RM(ID_ZF_S_YCHITA_2), + + dPa_RM(ID_ZF_S_YCHITB), + dPa_RM(ID_ZF_S_YCHITB_1), + dPa_RM(ID_ZF_S_YCHITB_2), }; for (int i = 0; i < 3; i++) { - dComIfGp_particle_set(kago_wall_hit_id[i + param_1 * 3], ¶m_0, &tevStr, 0, 0); + dComIfGp_particle_set(kago_wall_hit_id[i + i_effType * 3], &i_pos, &tevStr, NULL, NULL); } } void daKago_c::setSibukiEffect() { static u16 kago_wave_id[3] = { - 0x865A, - 0x865B, - 0x865C, + dPa_RM(ID_ZF_S_YCWAVE00_WAVE), + dPa_RM(ID_ZF_S_YCWAVE01_SPLASH), + dPa_RM(ID_ZF_S_YCWAVE02_DROP), }; - cXyz acStack_28(current.pos.x, field_0x70c + l_HIO.mYOffsetFromWaterSurface, current.pos.z); - csXyz cStack_30(0, shape_angle.y, 0); + cXyz effpos(current.pos.x, field_0x70c + l_HIO.mYOffsetFromWaterSurface, current.pos.z); + csXyz effrot(0, shape_angle.y, 0); for (int i = 0; i < 3; i++) { - field_0xb44[i] = - dComIfGp_particle_set(field_0xb44[i], kago_wave_id[i], &acStack_28, &tevStr, &cStack_30, - 0, 0xff, 0, -1, 0, 0, 0); + mSibukiEmitterIDs[i] = + dComIfGp_particle_set(mSibukiEmitterIDs[i], kago_wave_id[i], &effpos, &tevStr, &effrot, + NULL, 0xff, NULL, -1, NULL, NULL, NULL); } - if (field_0x6e7 == 0) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSoundLevel(Z2SE_EN_YC_SPLASH, 0, -1); } else { mSound.startCreatureSoundLevel(Z2SE_EN_KC_SPLASH, 0, -1); @@ -3433,40 +3417,40 @@ void daKago_c::setSibukiEffect() { } void daKago_c::setDashSibukiEffect() { - cXyz acStack_20(current.pos.x, field_0x70c + l_HIO.mYOffsetFromWaterSurface, current.pos.z); - csXyz cStack_28(0, shape_angle.y, 0); - field_0xb50 = dComIfGp_particle_set(field_0xb50, 0x86fe, &acStack_20, &tevStr, &cStack_28, 0, - 0xff, 0, -1, 0, 0, 0); + cXyz effpos(current.pos.x, field_0x70c + l_HIO.mYOffsetFromWaterSurface, current.pos.z); + csXyz effrot(0, shape_angle.y, 0); + mDashSibukiEmitterID = dComIfGp_particle_set(mDashSibukiEmitterID, dPa_RM(ID_ZF_S_YCWAVE03_SPLASH), &effpos, &tevStr, &effrot, NULL, + 0xff, NULL, -1, NULL, NULL, NULL); } void daKago_c::setWaterFallEffect() { static u16 kago_wave_id[2] = { - 0x865B, - 0x865C, + dPa_RM(ID_ZF_S_YCWAVE01_SPLASH), + dPa_RM(ID_ZF_S_YCWAVE02_DROP), }; - cXyz acStack_28(current.pos.x, current.pos.y, current.pos.z); - csXyz cStack_30(0, shape_angle.y, 0); + cXyz effpos(current.pos.x, current.pos.y, current.pos.z); + csXyz effrot(0, shape_angle.y, 0); for (int i = 0; i < 2; i++) { - field_0xb44[i] = - dComIfGp_particle_set(field_0xb44[i], kago_wave_id[i], &acStack_28, &tevStr, &cStack_30, - 0, 0xff, 0, -1, 0, 0, 0); + mSibukiEmitterIDs[i] = + dComIfGp_particle_set(mSibukiEmitterIDs[i], kago_wave_id[i], &effpos, &tevStr, &effrot, + NULL, 0xFF, NULL, -1, NULL, NULL, NULL); } - if (field_0x6e7 == 0) { + + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSoundLevel(Z2SE_EN_YC_SPLASH, 0, -1); } else { mSound.startCreatureSoundLevel(Z2SE_EN_KC_SPLASH, 0, -1); } } -static void* s_waterfall(void* param_0, void* param_1) { - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_Tag_WaterFall) { - if (!fpcM_IsCreating(fopAcM_GetID(param_0))) { - if (((daTagWaterFall_c*)param_0) - ->checkHitWaterFall(((fopAc_ac_c*)param_1)->current.pos)) +static void* s_waterfall(void* i_actor, void* i_data) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Tag_WaterFall) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor))) { + if (((daTagWaterFall_c*)i_actor)->checkHitWaterFall(((fopAc_ac_c*)i_data)->current.pos)) { - ((daKago_c*)param_1)->onWaterFall(); - return param_0; + ((daKago_c*)i_data)->onWaterFall(); + return i_actor; } } } @@ -3475,44 +3459,46 @@ static void* s_waterfall(void* param_0, void* param_1) { } void daKago_c::setFlySound() { + BOOL isPlayWingSound; + if (field_0x6de != 0) { - BOOL unkFlag1 = FALSE; - if (checkBck(9) || checkBck(15)) { - if (field_0x6e7 == 0) { - if (mpMorf->checkFrame(27.0f)) { - unkFlag1 = TRUE; + isPlayWingSound = FALSE; + if (checkBck(dRes_ID_E_YC_BCK_YC_FLY_e) || checkBck(dRes_ID_E_YC_BCK_YC_FLY_WL_e)) { + if (mType == TYPE_TWILIGHT) { + if (mAnm_p->checkFrame(27.0f)) { + isPlayWingSound = TRUE; } } else { - if (mpMorf->checkFrame(29.0f)) { - unkFlag1 = TRUE; + if (mAnm_p->checkFrame(29.0f)) { + isPlayWingSound = TRUE; } } - } else if (checkBck(21)) { - if (mpMorf->checkFrame(10.0f)) { - unkFlag1 = TRUE; + } else if (checkBck(dRes_ID_E_YC_BCK_YC_HOVERING_e)) { + if (mAnm_p->checkFrame(10.0f)) { + isPlayWingSound = TRUE; } - } else if (checkBck(6)) { - if (mpMorf->checkFrame(26.0f)) { - unkFlag1 = TRUE; + } else if (checkBck(dRes_ID_E_YC_BCK_YC_CATCH_START_e)) { + if (mAnm_p->checkFrame(26.0f)) { + isPlayWingSound = TRUE; } - } else if (checkBck(5)) { - if (mpMorf->checkFrame(10.0f)) { - unkFlag1 = TRUE; + } else if (checkBck(dRes_ID_E_YC_BCK_YC_CATCH_MIDDLE_e)) { + if (mAnm_p->checkFrame(10.0f)) { + isPlayWingSound = TRUE; } - } else if (checkBck(4)) { - if (mpMorf->checkFrame(10.0f) || mpMorf->checkFrame(35.0f)) { - unkFlag1 = TRUE; + } else if (checkBck(dRes_ID_E_YC_BCK_YC_CATCH_END_e)) { + if (mAnm_p->checkFrame(10.0f) || mAnm_p->checkFrame(35.0f)) { + isPlayWingSound = TRUE; } - } else if (checkBck(12) || checkBck(13)) { - if (field_0x6e7 == 0) { + } else if (checkBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_e) || checkBck(dRes_ID_E_YC_BCK_YC_FLY_GLIDE_WL_e)) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSoundLevel(Z2SE_EN_YC_GLIDE, 0, -1); } else { mSound.startCreatureSoundLevel(Z2SE_EN_KC_GLIDE, 0, -1); } } - if (unkFlag1) { - if (field_0x6e7 == 0) { + if (isPlayWingSound) { + if (mType == TYPE_TWILIGHT) { mSound.startCreatureSound(Z2SE_EN_YC_WING, 0, -1); } else { mSound.startCreatureSound(Z2SE_EN_KC_WING, 0, -1); @@ -3526,78 +3512,78 @@ void daKago_c::action() { checkSizeBg(); setFlyEffect(); - field_0x6f0 = mDoCPd_c::getStickX3D(0); - field_0x6f4 = mDoCPd_c::getStickY(0); + mStickX = mDoCPd_c::getStickX3D(PAD_1); + mStickY = mDoCPd_c::getStickY(PAD_1); - u32 unkInt1 = field_0x6ea; - field_0x6ea = 0; + u8 prevIsWaterfall = mIsWaterfall; + mIsWaterfall = FALSE; fpcM_Search(s_waterfall, this); - if (field_0x6ea != 0) { - if (unkInt1 == 0) { + if (mIsWaterfall) { + if (!prevIsWaterfall) { current.angle.x = 0x1000; dComIfGp_getVibration().StartQuake(3, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } - field_0x6f0 = field_0x6f0 * 0.5f; + mStickX = mStickX * 0.5f; - if (field_0x6f4 < 0.0f) { - field_0x6f4 = field_0x6f4 * 0.5f; + if (mStickY < 0.0f) { + mStickY = mStickY * 0.5f; } else { - field_0x6f4 = field_0x6f4 * 1.5f; + mStickY = mStickY * 1.5f; } setWaterFallEffect(); - } else if (unkInt1 != 0) { + } else if (prevIsWaterfall) { dComIfGp_getVibration().StopQuake(0x1f); } - field_0x6dd = 0; + mIsAttack = FALSE; - switch (mCurrentAction) { - case 0: + switch (mAction) { + case ACTION_FLY_e: executeFly(); break; - case 1: + case ACTION_STAGGER_e: executeStagger(); break; - case 2: + case ACTION_EVENT_e: executeEvent(); break; - case 3: + case ACTION_PERCH_e: executePerch(); break; - case 4: + case ACTION_WAIT_e: executeWait(); break; - case 5: + case ACTION_ATTACK_e: executeAttack(); break; - case 6: + case ACTION_EVENT2_e: executeEvent2(); break; - case 7: + case ACTION_PERCH2_e: executePerch2(); break; - case 8: + case ACTION_LANDING_e: executeLanding(); break; - case 9: + case ACTION_DEMO_FLY_e: moveDemoFly(); break; - case 10: + case ACTION_DEMO_FLY2_e: moveDemoFly(); break; } - if (field_0x6e7 == 1 && (mCurrentAction == 0 || mCurrentAction == 5)) { + if (mType == TYPE_NORMAL && (mAction == ACTION_FLY_e || mAction == ACTION_ATTACK_e)) { mSph.OnAtSetBit(); } setFlySound(); if (daPy_getPlayerActorClass()->checkCargoCarry()) { - if (mCurrentAction == 9 || mCurrentAction == 10) { + if (mAction == ACTION_DEMO_FLY_e || mAction == ACTION_DEMO_FLY2_e) { dCam_getBody()->SetTrimTypeForce(2); } else if (isAttack()) { dCam_getBody()->SetTrimTypeForce(0); @@ -3605,19 +3591,20 @@ void daKago_c::action() { } } - fopAcM_posMoveF(this, 0); + fopAcM_posMoveF(this, NULL); + if (field_0x6dc == 0) { mObjAcch.CrrPos(dComIfG_Bgsp()); } - if (mpMorf != NULL) { - mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + if (mAnm_p != NULL) { + mAnm_p->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); } field_0x674 = current.pos; if (cLib_chaseF(&field_0x6c4, 0.0f, 60.0f) == 0) { - field_0x6c8 = field_0x6c8 + 0x800; + ANGLE_ADD(field_0x6c8, 0x800); } field_0x6ca = field_0x6c4 * cM_ssin(field_0x6c8); @@ -3628,11 +3615,11 @@ void daKago_c::mtx_set() { mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::scaleM(l_HIO.mBasicSize,l_HIO.mBasicSize,l_HIO.mBasicSize); - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); model->setBaseTRMtx(mDoMtx_stack_c::get()); - mpMorf->modelCalc(); + mAnm_p->modelCalc(); - mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(0x1c)); + mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(YC_JNT_LEGR_3_e)); mDoMtx_stack_c::ZrotM(field_0x6ca); cMtx_copy(mDoMtx_stack_c::get(), mLegR3Mtx); } @@ -3654,7 +3641,7 @@ void daKago_c::cc_set() { int daKago_c::execute() { if (executeBalloonMenu()) { #if VERSION != VERSION_SHIELD_DEBUG - dComIfGp_setAStatusForce(0x27, 0); + dComIfGp_setAStatusForce(BUTTON_STATUS_UNK_39, 0); #endif return 1; } @@ -3667,24 +3654,27 @@ int daKago_c::execute() { field_0x72c--; } - if (field_0x720 != 0) { - field_0x720--; + if (mWallHitInvulnTimer != 0) { + mWallHitInvulnTimer--; } + if (mDashCooldownTime != 0) { mDashCooldownTime--; } - if (field_0x71c != 0) { - field_0x71c--; + + if (mWaterSplashTimer != 0) { + mWaterSplashTimer--; } - if (field_0x6ed != 0) { - field_0x6ed--; + + if (unk_0x6ed != 0) { + unk_0x6ed--; } action(); mtx_set(); cc_set(); - field_0x6b0 = dCam_getBody()->Eye(); + mPrevCamEye = dCam_getBody()->Eye(); return 1; } @@ -3698,9 +3688,9 @@ static int daKago_IsDelete(daKago_c* i_this) { } int daKago_c::_delete() { - dComIfG_resDelete(&mPhase, field_0x75c); + dComIfG_resDelete(&mPhase, mArcName); - if (field_0xb54 != 0) { + if (mIsHioSet != 0) { hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mChild); } @@ -3717,65 +3707,64 @@ static int daKago_Delete(daKago_c* i_this) { return i_this->_delete(); } -int daKago_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) { - J3DJoint* joint = param_0; +int daKago_c::ctrlJoint(J3DJoint* i_joint, J3DModel* param_1) { + J3DJoint* joint = i_joint; int jointNo = joint->getJntNo(); mDoMtx_stack_c::copy(param_1->getAnmMtx(jointNo)); - if (jointNo == 3 || jointNo == 5 || jointNo == 6) { - mDoMtx_stack_c::YrotM(field_0x71a); - mDoMtx_stack_c::ZrotM(field_0x718); + if (jointNo == YC_JNT_NECK1_e || jointNo == YC_JNT_NECK2_e || jointNo == YC_JNT_HEAD_e) { + mDoMtx_stack_c::YrotM(mHeadRotY); + mDoMtx_stack_c::ZrotM(mHeadRotZ); } param_1->setAnmMtx(jointNo,mDoMtx_stack_c::get()); cMtx_copy(mDoMtx_stack_c::get(),J3DSys::mCurrentMtx); - return 1; } -int daKago_c::JointCallBack(J3DJoint* param_0, int param_1) { +int daKago_c::JointCallBack(J3DJoint* i_joint, int param_1) { if (param_1 == 0) { J3DModel* model = j3dSys.getModel(); daKago_c* kago = (daKago_c*)model->getUserArea(); if (kago != NULL) { - kago->ctrlJoint(param_0, model); + kago->ctrlJoint(i_joint, model); } } + return 1; } int daKago_c::CreateHeap() { J3DModelData* modelData; - if (field_0x6e7 == 0) { - modelData = (J3DModelData*)dComIfG_getObjectRes(field_0x75c, 0x18); + if (mType == TYPE_TWILIGHT) { + modelData = (J3DModelData*)dComIfG_getObjectRes(mArcName, dRes_ID_E_YC_BMD_YC_e); } else { - modelData = (J3DModelData*)dComIfG_getObjectRes(field_0x75c, 0x10); + modelData = (J3DModelData*)dComIfG_getObjectRes(mArcName, dRes_ID_E_KC_BMD_KC_e); } - JUT_ASSERT(0x139f, modelData != NULL); - - mpMorf = new mDoExt_McaMorfSO( - modelData, NULL, NULL, - (J3DAnmTransform*)dComIfG_getObjectRes(field_0x75c, getBckName(9)), 2, 1.0f, 0, -1, &this->mSound, 0x80000, 0x11000084); + JUT_ASSERT(5023, modelData != NULL); - if (mpMorf == NULL || mpMorf->getModel() == NULL) { + mAnm_p = new mDoExt_McaMorfSO(modelData, NULL, NULL, + (J3DAnmTransform*)dComIfG_getObjectRes(mArcName, getBckName(dRes_ID_E_YC_BCK_YC_FLY_e)), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + if (mAnm_p == NULL || mAnm_p->getModel() == NULL) { return 0; } - J3DModel* model = mpMorf->getModel(); + J3DModel* model = mAnm_p->getModel(); model->setUserArea((uintptr_t)this); for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) { - if (i == 3 || i == 5 || i == 6) { + if (i == YC_JNT_NECK1_e || i == YC_JNT_NECK2_e || i == YC_JNT_HEAD_e) { model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack); } } + return 1; } -static int useHeapInit(fopAc_ac_c* param_0) { - daKago_c* kago = (daKago_c*)param_0; - return kago->CreateHeap(); +static int useHeapInit(fopAc_ac_c* actor) { + daKago_c* i_this = (daKago_c*)actor; + return i_this->CreateHeap(); } int daKago_c::create() { @@ -3786,39 +3775,40 @@ int daKago_c::create() { mpPath1 = dPath_GetRoomPath(param & 0xff, fopAcM_GetRoomNo(this)); if (mpPath1 == NULL) { OS_REPORT("KAGO ......NONONONONONO PATH !!!!\n"); - return 5; + return cPhs_ERROR_e; } } - field_0x6e7 = (fopAcM_GetParam(this) >> 16) & 0xff; - if (field_0x6e7 == 0xff) { - field_0x6e7 = 0; + mType = (fopAcM_GetParam(this) >> 16) & 0xff; + if (mType == 0xFF) { + mType = TYPE_TWILIGHT; } - if (field_0x6e7 == 0) { - field_0x75c = "E_YC"; - field_0x760 = "KAGO_YAMI"; + + if (mType == TYPE_TWILIGHT) { + mArcName = "E_YC"; + mDemoName = "KAGO_YAMI"; } else { - field_0x75c = "E_KC"; - field_0x760 = "KAGO_HIKARI"; + mArcName = "E_KC"; + mDemoName = "KAGO_HIKARI"; } - int phase_state = dComIfG_resLoad(&mPhase, field_0x75c); + int phase_state = dComIfG_resLoad(&mPhase, mArcName); if (phase_state == cPhs_COMPLEATE_e) { OS_REPORT("Kago PARAM %x \n", fopAcM_GetParam(this)); - if (fopAcM_entrySolidHeap(this, useHeapInit, 0x23a0) == 0) { + if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x23a0)) { return cPhs_ERROR_e; } - if (hio_set == 0) { - field_0xb54 = 1; - hio_set = 1; - l_HIO.mChild = mDoHIO_CREATE_CHILD("", &l_HIO); + if (!hio_set) { + mIsHioSet = TRUE; + hio_set = TRUE; + l_HIO.mChild = mDoHIO_CREATE_CHILD("カーゴロック（いい奴）", &l_HIO); } attention_info.flags = 0; - fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMtx(this, mAnm_p->getModel()->getBaseTRMtx()); fopAcM_SetMin(this, -200.0f, -200.0f, -200.0f); fopAcM_SetMax(this, 200.0f, 200.0f, 200.0f); @@ -3841,16 +3831,16 @@ int daKago_c::create() { maxFallSpeed = -100.0f; gravity = 0.0f; - mPathIdxOffset = 0x01; + mPathStep = 1; - setActionMode(4, 0); + setActionMode(ACTION_WAIT_e, 0); #if DEBUG - if (mDoCPd_c::getHoldL(0) && mDoCPd_c::getHoldR(0)) { - dComIfGs_offSwitch(0x2d, fopAcM_GetRoomNo(this)); - dComIfGs_offSwitch(0x32, fopAcM_GetRoomNo(this)); + if (mDoCPd_c::getHoldL(PAD_1) && mDoCPd_c::getHoldR(PAD_1)) { + dComIfGs_offSwitch(45, fopAcM_GetRoomNo(this)); + dComIfGs_offSwitch(50, fopAcM_GetRoomNo(this)); - setActionMode(8, 0); + setActionMode(ACTION_LANDING_e, 0); setMidnaRideOn(); setPlayerRideOn(); @@ -3860,19 +3850,19 @@ int daKago_c::create() { } #endif - field_0x73c = 3; + mSceneType = SCENE_TYPE_DEFAULT; if (strcmp("F_SP115", dComIfGp_getStartStageName()) == 0) { if (dComIfGp_getStartStageRoomNo() == 0) { - field_0x73c = 0; + mSceneType = SCENE_TYPE_LAKE_HYLIA; } } else if (strcmp("F_SP112", dComIfGp_getStartStageName()) == 0) { if (dComIfGp_getStartStageRoomNo() == 1) { - field_0x73c = 1; + mSceneType = SCENE_TYPE_RIVER; } } else if (strcmp("F_SP126", dComIfGp_getStartStageName()) == 0 && dComIfGp_getStartStageRoomNo() == 0) { - field_0x73c = 2; + mSceneType = SCENE_TYPE_BOARD_HOUSE; } mBalloon2DId = fpcM_ERROR_PROCESS_ID_e; @@ -3885,8 +3875,8 @@ int daKago_c::create() { return phase_state; } -static int daKago_Create(daKago_c* param_0) { - return param_0->create(); +static int daKago_Create(daKago_c* i_this) { + return i_this->create(); } static actor_method_class l_daKago_Method = { diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index f24db03e89c..cd3ff1ef191 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -1778,7 +1778,7 @@ actor_process_profile_definition g_profile_FSHOP = { fpcPi_CURRENT_e, // mListPrio PROC_FSHOP, // mProcName &g_fpcLf_Method.base, // sub_method - 0x00006B80, // mSize + sizeof(fshop_class), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // sub_method diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index e385f97b430..8143b8c1afd 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -5226,7 +5226,7 @@ actor_process_profile_definition g_profile_NPC_WRESTLER = { fpcPi_CURRENT_e, // mListPrio PROC_NPC_WRESTLER, // mProcName &g_fpcLf_Method.base, // sub_method - 0xEA0, // mSize (fix this) + sizeof(daNpcWrestler_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // sub_method diff --git a/src/d/actor/d_a_obj_volcball.cpp b/src/d/actor/d_a_obj_volcball.cpp index faad909e129..6c02a2311ba 100644 --- a/src/d/actor/d_a_obj_volcball.cpp +++ b/src/d/actor/d_a_obj_volcball.cpp @@ -618,7 +618,7 @@ actor_process_profile_definition g_profile_Obj_VolcanicBall = { fpcPi_CURRENT_e, // mListPrio PROC_Obj_VolcanicBall, // mProcName &g_fpcLf_Method.base, // sub_method - 0x00002928, // mSize + sizeof(daObjVolcBall_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // sub_method diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index a54cc0ec552..1baf13362a2 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -11212,7 +11212,7 @@ camera_process_profile_definition g_profile_CAMERA = { fpcPi_CURRENT_e, PROC_CAMERA, &g_fpcLf_Method.base, - sizeof(dCamera_c), + sizeof(camera_class), 0, 0, &g_fopVw_Method, @@ -11233,7 +11233,7 @@ camera_process_profile_definition g_profile_CAMERA2 = { fpcPi_CURRENT_e, PROC_CAMERA2, &g_fpcLf_Method.base, - sizeof(dCamera_c), + sizeof(camera_class), 0, 0, &g_fopVw_Method, diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 253ef224cb8..1f37fc6fe45 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -1287,7 +1287,7 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_arcNa static int (*l_method[3])(void*) = {(int (*)(void*))phase_1, (int (*)(void*))phase_2, (int (*)(void*))phase_3}; - if (i_phase->id == cPhs_NEXT_e) { + if (i_phase->id == 2) { return cPhs_COMPLEATE_e; } @@ -1335,7 +1335,7 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_resNa static int (*l_method[3])(void*) = {(int (*)(void*))phase_01, (int (*)(void*))phase_02, (int (*)(void*))phase_03}; - if (i_phase->id == cPhs_NEXT_e) { + if (i_phase->id == 2) { return cPhs_COMPLEATE_e; } @@ -1352,12 +1352,12 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_resNa */ int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* i_resName) { JUT_ASSERT(1889, i_phase->id != 1); - if (i_phase->id != cPhs_NEXT_e) { + if (i_phase->id != 2) { return 0; } int r30 = dComIfG_deleteObjectResMain(i_resName); - i_phase->id = cPhs_INIT_e; + i_phase->id = 0; return 1; } diff --git a/src/d/d_path.cpp b/src/d/d_path.cpp index fb15758e069..a01cfdc8a6b 100644 --- a/src/d/d_path.cpp +++ b/src/d/d_path.cpp @@ -111,3 +111,22 @@ u8 dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* par return 1; } + +#if VERSION == VERSION_SHIELD_DEBUG +void dPath_Ct() { + #if DEBUG + #endif +} + +void dPath_Dt() { + #if DEBUG + #endif +} + +void dPath_Move() {} + +void dPath_Draw() { + #if DEBUG + #endif +} +#endif diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index 7a2e5303f77..663d98e4259 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -18,12 +18,32 @@ #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" #include +#include "m_Do/m_Do_main.h" +#include "JSystem/JUtility/JUTConsole.h" -#if PLATFORM_WII +#if !PLATFORM_GCN +#include +#include +#include "m_Do/m_Do_Reset.h" + +#include "res/Object/LogoUsWii.h" +#endif + +#if PLATFORM_WII || VERSION == VERSION_SHIELD +#include "m_Re/m_Re_controller_pad.h" #include "d/d_cursor_mng.h" +#include "d/d_home_button.h" + +struct homeBtnData { + /* 0x0 */ int region; + /* 0x4 */ const char* path; +}; #endif -#if VERSION == VERSION_GCN_JPN +#if VERSION == VERSION_SHIELD +#define LOGO_ARC "LogoUs" +#define MSG_PATH "/res/Msgcn/bmgres.arc" +#elif VERSION == VERSION_GCN_JPN #define LOGO_ARC "Logo" #define MSG_PATH "/res/Msgjp/bmgres.arc" #elif VERSION == VERSION_GCN_PAL @@ -42,22 +62,70 @@ #define PROGRESSIVE_MODE_ON OS_PROGRESSIVE_MODE_ON #endif -static dLog_HIO_c g_LogHIO; +#if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG +#define FMAP_RES_PATH "/res/LayoutRevo/fmapresR.arc" +#define DMAP_RES_PATH "/res/LayoutRevo/dmapresR.arc" +#define COLLECT_RES_PATH "/res/LayoutRevo/clctresR.arc" -typedef void (dScnLogo_c::*execFunc)(); -static execFunc l_execFunc[16] = { - &dScnLogo_c::warningInDraw, &dScnLogo_c::warningDispDraw, &dScnLogo_c::warningOutDraw, - &dScnLogo_c::nintendoInDraw, &dScnLogo_c::nintendoOutDraw, &dScnLogo_c::dolbyInDraw, - &dScnLogo_c::dolbyOutDraw, &dScnLogo_c::dolbyOutDraw2, &dScnLogo_c::progInDraw, - &dScnLogo_c::progSelDraw, &dScnLogo_c::progOutDraw, &dScnLogo_c::progSetDraw, - &dScnLogo_c::progSet2Draw, &dScnLogo_c::progChangeDraw, &dScnLogo_c::dvdWaitDraw, - &dScnLogo_c::nextSceneChange, -}; +#define MSG_COM_PATH "/res/LayoutRevo/msgcomR.arc" +#define MSG_RES0_PATH "/res/LayoutRevo/msgres00R.arc" +#define MSG_RES1_PATH "/res/LayoutRevo/msgres01R.arc" +#define MSG_RES2_PATH "/res/LayoutRevo/msgres02R.arc" +#define MSG_RES3_PATH "/res/LayoutRevo/msgres03R.arc" +#else +#define FMAP_RES_PATH "/res/Layout/fmapres.arc" +#define DMAP_RES_PATH "/res/Layout/dmapres.arc" +#define COLLECT_RES_PATH "/res/Layout/clctres.arc" + +#define MSG_COM_PATH "/res/Layout/msgcom.arc" +#define MSG_RES0_PATH "/res/Layout/msgres00.arc" +#define MSG_RES1_PATH "/res/Layout/msgres01.arc" +#define MSG_RES2_PATH "/res/Layout/msgres02.arc" +#define MSG_RES3_PATH "/res/Layout/msgres03.arc" +#endif + +#if PLATFORM_WII || PLATFORM_SHIELD +#define ICON_RES_PATH "/res/WiiBannerIcon/bannerIcon.arc" +#define PARTICLE_COM_PATH "/res/Particle/common-r.jpc" +#else +#define ICON_RES_PATH "/res/CardIcon/cardicon.arc" +#define PARTICLE_COM_PATH "/res/Particle/common.jpc" +#endif + +#if PLATFORM_WII +#define RING_RES_PATH "/res/LayoutRevo/ringresR.arc" +#define ITEM_INF_RES_PATH "/res/LayoutRevo/itmInfResR.arc" +#define BUTTON_RES_PATH "/res/LayoutRevo/buttonR.arc" +#define MAIN2D_PATH "/res/LayoutRevo/main2DR.arc" +#else +#define RING_RES_PATH "/res/Layout/ringres.arc" +#define ITEM_INF_RES_PATH "/res/Layout/itmInfRes.arc" +#define BUTTON_RES_PATH "/res/Layout/button.arc" +#define MAIN2D_PATH "/res/Layout/main2D.arc" +#endif + +class dLog_HIO_c : public JORReflexible { +public: + dLog_HIO_c(); + virtual ~dLog_HIO_c() {} + + void genMessage(JORMContext*); + + u8 field_0x4[0x8 - 0x4]; +}; // Size: 0x8 + +static dLog_HIO_c g_LogHIO; dLog_HIO_c::dLog_HIO_c() {} +#if DEBUG +void dLog_HIO_c::genMessage(JORMContext*) {} +#endif + void dScnLogo_c::preLoad_dyl_create() { m_preLoad_dylPhase = new request_of_phase_process_class[14]; + JUT_ASSERT(194, m_preLoad_dylPhase != NULL); + memset(m_preLoad_dylPhase, 0, sizeof(request_of_phase_process_class) * 14); } @@ -65,15 +133,54 @@ void dScnLogo_c::preLoad_dyl_remove() { delete[] m_preLoad_dylPhase; } +typedef void (dScnLogo_c::*execFunc)(); +static execFunc l_execFunc[] = { + &dScnLogo_c::warningInDraw, &dScnLogo_c::warningDispDraw, &dScnLogo_c::warningOutDraw, + &dScnLogo_c::nintendoInDraw, &dScnLogo_c::nintendoOutDraw, &dScnLogo_c::dolbyInDraw, + &dScnLogo_c::dolbyOutDraw, &dScnLogo_c::dolbyOutDraw2, &dScnLogo_c::progInDraw, + &dScnLogo_c::progSelDraw, &dScnLogo_c::progOutDraw, &dScnLogo_c::progSetDraw, + &dScnLogo_c::progSet2Draw, &dScnLogo_c::progChangeDraw, &dScnLogo_c::dvdWaitDraw, + &dScnLogo_c::nextSceneChange, + + #if PLATFORM_WII || PLATFORM_SHIELD + &dScnLogo_c::strapInDraw, + &dScnLogo_c::strapDispDraw, + &dScnLogo_c::strapOutDraw, + &dScnLogo_c::strapOut2Draw, + #endif + + #if VERSION == VERSION_SHIELD + &dScnLogo_c::mocInDraw, + &dScnLogo_c::mocDispDraw, + &dScnLogo_c::mocOutDraw, + &dScnLogo_c::nvLogoInDraw, + &dScnLogo_c::nvLogoDispDraw, + &dScnLogo_c::nvLogoOutDraw, + #endif +}; + static s16 const l_preLoad_dylKeyTbl[14] = { - 0x02DC, 0x02CE, 0x0221, 0x00F2, 0x021B, 0x02F4, 0x0139, - 0x015A, 0x02E4, 0x00FE, 0x0308, 0x030F, 0x00FF, 0x013F, + PROC_BG, + PROC_DEMO00, + PROC_NBOMB, + PROC_SPINNER, + PROC_Obj_LifeContainer, + PROC_CROD, + PROC_DISAPPEAR, + PROC_Tag_Attp, + PROC_MG_ROD, + PROC_BOOMERANG, + PROC_ARROW, + PROC_SUSPEND, + PROC_MIDNA, + PROC_Obj_Yousei, }; bool dScnLogo_c::preLoad_dyl() { bool ret = true; + int var_r28 = 14; - for (int i = 0; i < 14; i++) { + for (int i = 0; i < var_r28; i++) { int phase_state = cDylPhs::Link(&m_preLoad_dylPhase[i], l_preLoad_dylKeyTbl[i]); if (phase_state != cPhs_COMPLEATE_e) { @@ -84,6 +191,10 @@ bool dScnLogo_c::preLoad_dyl() { return ret; } +#if DEBUG +u8 dScnLogo_c::mOpeningCut; +#endif + void dScnLogo_c::checkProgSelect() { #if VERSION == VERSION_GCN_PAL if (mDoRst::getProgSeqFlag() == 0) { @@ -133,16 +244,34 @@ void dScnLogo_c::progSelDraw() { if (field_0x20b == 0) { if (field_0x209 == 0) { - if (mDoCPd_c::getHoldRight(PAD_1) || mDoCPd_c::getStickX(PAD_1) > 0.5f) { + #if PLATFORM_WII + if (mReCPd::getTrigRight(PAD_1) || mReCPd::getStickX(PAD_1) > 0.5f) + #else + if (mDoCPd_c::getHoldRight(PAD_1) || mDoCPd_c::getStickX(PAD_1) > 0.5f) + #endif + { + #if PLATFORM_WII || PLATFORM_SHIELD + mDoAud_seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0); + #else mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0); + #endif field_0x209 = 1; field_0x20e = 30; field_0x210 = field_0x20e; field_0x212 = 0; } } else { - if (mDoCPd_c::getHoldLeft(PAD_1) || mDoCPd_c::getStickX(PAD_1) < -0.5f) { + #if PLATFORM_WII + if (mReCPd::getTrigLeft(PAD_1) || mReCPd::getStickX(PAD_1) < -0.5f) + #else + if (mDoCPd_c::getHoldLeft(PAD_1) || mDoCPd_c::getStickX(PAD_1) < -0.5f) + #endif + { + #if PLATFORM_WII || PLATFORM_SHIELD + mDoAud_seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0); + #else mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0); + #endif field_0x209 = 0; field_0x20e = 30; field_0x210 = field_0x20e; @@ -150,16 +279,40 @@ void dScnLogo_c::progSelDraw() { } } - if (mDoCPd_c::getTrigA(PAD_1) || mTimer == 0) { + #if PLATFORM_WII + if (cAPICPad_A_TRIGGER(PAD_1) || mTimer == 0) + #else + if (mDoCPd_c::getTrigA(PAD_1) || mTimer == 0) + #endif + { if (field_0x209 == 0) { - mProgressiveSel->getPicture()->changeTexture(mProgressivePro, 0); + J2DPicture* pic = mProgressiveSel->getPicture(); + pic->changeTexture(mProgressivePro, 0); + + #if VERSION != VERSION_SHIELD setProgressiveMode(PROGRESSIVE_MODE_ON); + #endif + mDoRst::setProgChgFlag(1); + + #if PLATFORM_WII || PLATFORM_SHIELD + mDoAud_seStart(Z2SE_SY_TALK_WIN_CLOSE, NULL, 0, 0); + #else mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); + #endif } else { - mProgressiveSel->getPicture()->changeTexture(mProgressiveInter, 0); + J2DPicture* pic = mProgressiveSel->getPicture(); + pic->changeTexture(mProgressiveInter, 0); + + #if VERSION != VERSION_SHIELD setProgressiveMode(PROGRESSIVE_MODE_OFF); + #endif + + #if PLATFORM_WII || PLATFORM_SHIELD + mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0); + #else mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); + #endif } if (mTimer > 540) { @@ -173,7 +326,12 @@ void dScnLogo_c::progSelDraw() { field_0x210 = field_0x20e; field_0x212 = 0; } + + #if PLATFORM_WII || PLATFORM_SHIELD + mDoRst::setProgSeqFlag(0); + #else mDoRst::setProgSeqFlag(1); + #endif } } else { if (field_0x214 == 0) { @@ -224,13 +382,18 @@ void dScnLogo_c::progOutDraw() { if (mTimer == 0) { #if VERSION == VERSION_GCN_PAL - if (field_0x218 == 1 && field_0x209 == 0) { + if (field_0x218 == 1 && field_0x209 == 0) #else - if (field_0x218 != 0 && field_0x209 == 0) { + if (field_0x218 != 0 && field_0x209 == 0) #endif + { mExecCommand = EXEC_PROG_CHANGE; mTimer = 150; } else if (field_0x218 == 0 && field_0x209 != 0) { + #if PLATFORM_WII || PLATFORM_SHIELD + mTimer = 90; + mExecCommand = EXEC_NINTENDO_IN; + #else if (mDoRst::getWarningDispFlag() != 0) { mTimer = 90; mExecCommand = EXEC_NINTENDO_IN; @@ -238,6 +401,7 @@ void dScnLogo_c::progOutDraw() { mTimer = 120; mExecCommand = EXEC_WARNING_IN; } + #endif mDoGph_gInf_c::startFadeIn(30); } else { @@ -273,11 +437,22 @@ void dScnLogo_c::progSet2Draw() { } void dScnLogo_c::progChangeDraw() { + #if PLATFORM_SHIELD + OSReport("progChangeDraw"); + #endif + if (getProgressiveMode() != 0 && mTimer == 90 && field_0x209 == 0) { setRenderMode(); } if (mTimer == 0) { + #if VERSION == VERSION_SHIELD_DEBUG + mExecCommand = EXEC_STRAP_IN; + mTimer = 0; + #elif PLATFORM_WII || PLATFORM_SHIELD + mExecCommand = EXEC_STRAP_IN; + mTimer = 90; + #else if (mDoRst::getWarningDispFlag() != 0) { mTimer = 90; mExecCommand = EXEC_NINTENDO_IN; @@ -285,6 +460,7 @@ void dScnLogo_c::progChangeDraw() { mTimer = 120; mExecCommand = EXEC_WARNING_IN; } + #endif mDoGph_gInf_c::startFadeIn(30); } @@ -306,12 +482,14 @@ void dScnLogo_c::warningDispDraw() { dComIfGd_set2DOpa(mWarning); dComIfGd_set2DOpa(mWarningStart); - f32 alpha = (f32)field_0x210 / (f32)field_0x20e; + f32 alphaf = (f32)field_0x210 / (f32)field_0x20e; if (field_0x212 != 0) { - alpha = 1.0f - alpha; + alphaf = 1.0f - alphaf; } - mWarningStart->setAlpha(255.0f * alpha); + u8 alpha = 255.0f * alphaf; + mWarningStart->setAlpha(alpha); + if (field_0x210 == 0) { field_0x210 = field_0x20e; field_0x212 ^= 1; @@ -319,10 +497,14 @@ void dScnLogo_c::warningDispDraw() { field_0x210--; } + #if PLATFORM_WII + if (mTimer == 0 || cAPICPad_A_TRIGGER(PAD_1) || cAPICPad_B_TRIGGER(PAD_1) || cAPICPad_START_TRIGGER(PAD_1)) + #else if (mTimer == 0 || mDoCPd_c::getTrig(PAD_1) & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_BUTTON_START | PAD_TRIGGER_Z | PAD_TRIGGER_L | PAD_TRIGGER_R | PAD_BUTTON_LEFT | PAD_BUTTON_RIGHT | PAD_BUTTON_DOWN | PAD_BUTTON_UP)) + #endif { mExecCommand = EXEC_WARNING_OUT; mTimer = 30; @@ -387,40 +569,208 @@ void dScnLogo_c::dolbyOutDraw2() { } } +#if PLATFORM_WII || PLATFORM_SHIELD +void dScnLogo_c::strapInDraw() { + dComIfGd_set2DOpa(mStrapImg); + if (mTimer == 0) { + mExecCommand = EXEC_STRAP_DISP; + + #if VERSION == VERSION_SHIELD_DEBUG + mTimer = 0; + #elif VERSION == VERSION_SHIELD + mTimer = 60; + #else + mTimer = 840; + #endif + } +} + +void dScnLogo_c::strapDispDraw() { + dComIfGd_set2DOpa(mStrapImg); + + #if VERSION == VERSION_SHIELD_DEBUG + if (mTimer == 0) + #elif VERSION == VERSION_SHIELD + if (mTimer == 0 || cAPICPad_ANY_BUTTON(PAD_1)) + #else + if (mTimer == 0 || mReCPd::getTrig(PAD_1) & ~WPAD_BUTTON_HOME) + #endif + { + mExecCommand = EXEC_DVD_WAIT; + } +} + +void dScnLogo_c::strapOutDraw() { + dComIfGd_set2DOpa(mStrapImg); + if (mTimer == 0) { + #if VERSION == VERSION_SHIELD + mExecCommand = EXEC_NVLOGO_IN; + #else + mExecCommand = EXEC_STRAP_OUT2; + #endif + + mTimer = 30; + mDoGph_gInf_c::startFadeIn(30); + } +} + +void dScnLogo_c::strapOut2Draw() { + if (mTimer == 0) { + mExecCommand = EXEC_SCENE_CHANGE; + } +} +#endif + +#if VERSION == VERSION_SHIELD +void dScnLogo_c::mocInDraw() { + dComIfGd_set2DOpa(mMocImg); + + if (mTimer == 0) { + mExecCommand = EXEC_MOC_DISP; + mTimer = 120; + } +} + +void dScnLogo_c::mocDispDraw() { + dComIfGd_set2DOpa(mMocImg); + + if (mTimer == 0 || cAPICPad_ANY_BUTTON(PAD_1)) { + mExecCommand = EXEC_MOC_OUT; + mTimer = 30; + mDoGph_gInf_c::startFadeOut(30); + } +} + +void dScnLogo_c::mocOutDraw() { + dComIfGd_set2DOpa(mMocImg); + + if (mTimer == 0) { + mExecCommand = EXEC_STRAP_IN; + mTimer = 90; + mDoGph_gInf_c::startFadeIn(30); + } +} + +void dScnLogo_c::nvLogoInDraw() { + dComIfGd_set2DOpa(mNvLogo); + + if (mTimer == 0) { + mExecCommand = EXEC_NVLOGO_DISP; + mTimer = 120; + } +} + +void dScnLogo_c::nvLogoDispDraw() { + dComIfGd_set2DOpa(mNvLogo); + + if (mTimer == 0 || cAPICPad_ANY_BUTTON(PAD_1)) { + mExecCommand = EXEC_NVLOGO_OUT; + mTimer = 30; + mDoGph_gInf_c::startFadeOut(30); + } +} + +void dScnLogo_c::nvLogoOutDraw() { + dComIfGd_set2DOpa(mNvLogo); + + if (mTimer == 0) { + mExecCommand = EXEC_STRAP_OUT2; + mTimer = 30; + mDoGph_gInf_c::startFadeIn(30); + } +} +#endif + void dScnLogo_c::dvdWaitDraw() { + #if PLATFORM_WII || PLATFORM_SHIELD + dComIfGd_set2DOpa(mStrapImg); + #endif + if (!dComIfG_syncAllObjectRes()) { - if (mpField0Command->sync() && mpAlAnmCommand->sync() && mpFmapResCommand->sync() && - mpDmapResCommand->sync() && mpCollectResCommand->sync() && mpItemIconCommand->sync() && - mpRingResCommand->sync() && mpPlayerNameCommand->sync() && - mpItemInfResCommand->sync() && mpButtonCommand->sync() && mpCardIconCommand->sync() && - mpBmgResCommand->sync() && mpMsgComCommand->sync() && mpMsgResCommand[0]->sync() && - mpMsgResCommand[1]->sync() && mpMsgResCommand[2]->sync() && - mpMsgResCommand[3]->sync() && mpMsgResCommand[4]->sync() && - mpMsgResCommand[5]->sync() && mpMsgResCommand[6]->sync() && mpFontResCommand->sync() && - mpMain2DCommand->sync() && mpRubyResCommand->sync() && mParticleCommand->sync() && - mItemTableCommand->sync() && mEnemyItemCommand->sync() && preLoad_dyl()) + if ( + #if PLATFORM_WII || VERSION == VERSION_SHIELD + mpHomeBtnCommand->sync() && + #endif + mpField0Command->sync() + && mpAlAnmCommand->sync() + && mpFmapResCommand->sync() + && mpDmapResCommand->sync() + && mpCollectResCommand->sync() + && mpItemIconCommand->sync() + && mpRingResCommand->sync() + && mpPlayerNameCommand->sync() + && mpItemInfResCommand->sync() + && mpButtonCommand->sync() + && mpCardIconCommand->sync() + && mpBmgResCommand->sync() + && mpMsgComCommand->sync() + && mpMsgResCommand[0]->sync() + && mpMsgResCommand[1]->sync() + && mpMsgResCommand[2]->sync() + && mpMsgResCommand[3]->sync() + && mpMsgResCommand[4]->sync() + && mpMsgResCommand[5]->sync() + && mpMsgResCommand[6]->sync() + && mpFontResCommand->sync() + && mpMain2DCommand->sync() + && mpRubyResCommand->sync() + && mParticleCommand->sync() + && mItemTableCommand->sync() + && mEnemyItemCommand->sync() + && preLoad_dyl()) { mDoRst::setLogoScnFlag(0); + + #if PLATFORM_WII || PLATFORM_SHIELD + mDoRst::setProgSeqFlag(0); + #endif + mDoRst::setProgChgFlag(0); + + #if PLATFORM_WII || PLATFORM_SHIELD + mExecCommand = EXEC_STRAP_OUT; + mTimer = 30; + mDoGph_gInf_c::startFadeOut(30); + #else mExecCommand = EXEC_SCENE_CHANGE; + #endif } } } void dScnLogo_c::nextSceneChange() { if (!mDoRst::isReset()) { - dComIfG_changeOpeningScene(this, PROC_OPENING_SCENE); + if (!isOpeningCut()) + { + dComIfG_changeOpeningScene(this, PROC_OPENING_SCENE); + } else { + #if DEBUG + fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 30); + dComIfGs_init(); + dComIfG_playerStatusD(); + return; + #endif + } } } dScnLogo_c::~dScnLogo_c() { if (mDoRst::isReset()) { - if (mDoAud_zelAudio_c::isInitFlag()) { + #if !(PLATFORM_WII || PLATFORM_SHIELD) + if (mDoAud_zelAudio_c::isInitFlag()) + #endif + { Z2AudioMgr::getInterface()->resetProcess(5, true); } + mDoRst_reset(0, 0x80000000, 0); } + #if PLATFORM_WII || PLATFORM_SHIELD + delete mStrapImg; + #endif + + #if !(PLATFORM_WII || PLATFORM_SHIELD) delete mNintendoLogo; delete mWarning; delete mWarningStart; @@ -435,14 +785,41 @@ dScnLogo_c::~dScnLogo_c() { mpPalLogoResCommand->getArchive()->unmount(); mpPalLogoResCommand->destroy(); #endif + #endif + + #if VERSION == VERSION_SHIELD + delete mNvLogo; + delete mMocImg; + #endif preLoad_dyl_remove(); + + #if PLATFORM_WII || PLATFORM_SHIELD + switch (getPalLanguage()) { + case 2: + dComIfG_deleteObjectResMain("LogoFrWii"); + break; + case 3: + dComIfG_deleteObjectResMain("LogoSpWii"); + break; + case 0: + default: + dComIfG_deleteObjectResMain("LogoUsWii"); + break; + } + #else dComIfG_deleteObjectResMain(LOGO_ARC); + #endif - field_0x1d4->destroy(); - field_0x1d0->destroy(); + mLogo01Heap->destroy(); + mLogoHeap->destroy(); JKRFree(dummyGameAlloc); + #if PLATFORM_WII || VERSION == VERSION_SHIELD + dHomeButton_c::create(mHomeBtnRegion, mpHomeBtnCommand->getMemAddress()); + mpHomeBtnCommand->destroy(); + #endif + dComIfGp_particle_createCommon(mParticleCommand->getMemAddress()); dComIfGp_setFieldMapArchive2(mpField0Command->getArchive()); dComIfGp_setAnmArchive(mpAlAnmCommand->getArchive()); @@ -454,7 +831,17 @@ dScnLogo_c::~dScnLogo_c() { dComIfGp_setRingResArchive(mpRingResCommand->getArchive()); dComIfGp_setNameResArchive(mpPlayerNameCommand->getArchive()); dComIfGp_setDemoMsgArchive(mpItemInfResCommand->getArchive()); + dComIfGp_setMeterButtonArchive(mpButtonCommand->getArchive()); + #if DEBUG + JKRArchive* button = mpButtonCommand->getArchive(); + if (button != NULL) { + OS_REPORT("button not nullptr\n"); + } else { + OS_REPORT("button nullptr\n"); + } + #endif + dComIfGp_setErrorResArchive(NULL); dComIfGp_setCardIconResArchive(mpCardIconCommand->getArchive()); dComIfGp_setMsgDtArchive(0, mpBmgResCommand->getArchive()); @@ -485,7 +872,12 @@ dScnLogo_c::~dScnLogo_c() { mpFontResCommand->destroy(); mpMain2DCommand->destroy(); mpRubyResCommand->destroy(); + + #if !PLATFORM_SHIELD mParticleCommand->destroy(); + #else + delete mParticleCommand; + #endif JKRAramHeap* aram_heap = JKRAram::getAramHeap(); u32 free_size = aram_heap->getTotalFreeSize(); @@ -502,15 +894,30 @@ dScnLogo_c::~dScnLogo_c() { #endif dComIfGp_setItemTable(mItemTableCommand->getMemAddress()); + #if !PLATFORM_SHIELD mItemTableCommand->destroy(); + #else + delete mItemTableCommand; + #endif dEnemyItem_c::setItemData((u8*)mEnemyItemCommand->getMemAddress()); + #if !PLATFORM_SHIELD mEnemyItemCommand->destroy(); + #else + delete mEnemyItemCommand; + #endif dDlst_shadowControl_c::setSimpleTex((ResTIMG*)dComIfG_getObjectRes("Always", 0x4A)); + + #if PLATFORM_WII || PLATFORM_SHIELD + dComIfG_inf_c::createBaseCsr(); + #endif + dTres_c::createWork(); dMpath_c::createWork(); + OS_REPORT("\x1b[31m%d gameHeap->getFreeSize %08x(%d)\n\x1b[m", 1479, mDoExt_getGameHeap()->getFreeSize(), mDoExt_getGameHeap()->getFreeSize()); + #if PLATFORM_WII data_8053a730 = 0; #endif @@ -520,10 +927,18 @@ static int phase_0(dScnLogo_c* i_this) { mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); dComIfGp_particle_create(); - i_this->dummyGameAlloc = mDoExt_getGameHeap()->alloc(0x340000, -0x10); + OS_REPORT("\x1b[31m%d gameHeap->getFreeSize %08x(%d)\n\x1b[m", 1497, mDoExt_getGameHeap()->getFreeSize(), mDoExt_getGameHeap()->getFreeSize()); + u32 var_r29 = 0x340000; + u32 var_r28 = 0x130000; + + i_this->dummyGameAlloc = mDoExt_getGameHeap()->alloc(var_r29, -0x10); JUT_ASSERT(1523, i_this->dummyGameAlloc != NULL); - i_this->field_0x1d0 = JKRExpHeap::create(i_this->dummyGameAlloc, 0x340000, NULL, false); - i_this->field_0x1d4 = JKRExpHeap::create(0x130000, i_this->field_0x1d0, false); + + i_this->mLogoHeap = JKRExpHeap::create(i_this->dummyGameAlloc, var_r29, NULL, false); + JUT_ASSERT(1525, i_this->mLogoHeap != NULL); + + i_this->mLogo01Heap = JKRCreateExpHeap(var_r28, i_this->mLogoHeap, false); + JUT_ASSERT(1528, i_this->mLogo01Heap != NULL); #if VERSION == VERSION_GCN_PAL switch (i_this->getPalLanguage()) { @@ -546,6 +961,10 @@ static int phase_0(dScnLogo_c* i_this) { } #endif + #if PLATFORM_WII || PLATFORM_SHIELD + OSSetPowerCallback(mDoRst_shutdownCallBack); + #endif + return cPhs_NEXT_e; } @@ -554,9 +973,11 @@ static int phase_1(dScnLogo_c* i_this) { return cPhs_INIT_e; } + #if !(PLATFORM_WII || PLATFORM_SHIELD) if (!mDoAud_zelAudio_c::isInitFlag() || Z2AudioMgr::getInterface()->checkFirstWaves()) { return cPhs_INIT_e; } + #endif #if VERSION == VERSION_GCN_PAL if (!mDoDvdThd::SyncWidthSound) { @@ -568,8 +989,29 @@ static int phase_1(dScnLogo_c* i_this) { } #endif - dComIfG_setObjectRes(LOGO_ARC, (u8)0, i_this->field_0x1d0); + int rt; + #if PLATFORM_WII || PLATFORM_SHIELD + switch (i_this->getPalLanguage()) { + case 0: + default: + rt = dComIfG_setObjectRes("LogoUsWii", (u8)0, i_this->mLogoHeap); + break; + case 2: + rt = dComIfG_setObjectRes("LogoFrWii", (u8)0, i_this->mLogoHeap); + break; + case 3: + rt = dComIfG_setObjectRes("LogoSpWii", (u8)0, i_this->mLogoHeap); + break; + } + #else + rt = dComIfG_setObjectRes(LOGO_ARC, (u8)0, i_this->mLogoHeap); + #endif + + JUT_ASSERT(1652, rt == 1); + mDoRst::setLogoScnFlag(1); + + OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 1667, archiveHeap->getTotalFreeSize()); archiveHeap->dump_sort(); return cPhs_NEXT_e; } @@ -599,17 +1041,45 @@ int dScnLogo_c::create() { data_8053a730 = 1; #endif - mpHeap = mDoExt_setCurrentHeap(field_0x1d4); + mpHeap = mDoExt_setCurrentHeap(mLogo01Heap); + + #if PLATFORM_WII || PLATFORM_SHIELD + logoInitWii(); + #else logoInitGC(); - mpHeap->becomeCurrentHeap(); + #endif + + JKRSetCurrentHeap(mpHeap); + + OS_REPORT("\x1b[31m%d gameHeap->getFreeSize %08x(%d)\n\x1b[m", 1732, mDoExt_getGameHeap()->getFreeSize(), mDoExt_getGameHeap()->getFreeSize()); dvdDataLoad(); + + OS_REPORT("\x1b[31m%d gameHeap->getFreeSize %08x(%d)\n\x1b[m", 1738, mDoExt_getGameHeap()->getFreeSize(), mDoExt_getGameHeap()->getFreeSize()); + + #if !(PLATFORM_WII || PLATFORM_SHIELD) Z2AudioMgr::getInterface()->loadStaticWaves(); - mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 60); + #endif + + mDoGph_gInf_c::setTickRate(OS_TIMER_CLOCK / 60); mDoGph_gInf_c::waitBlanking(0); + field_0x20a = 0; + + #if VERSION == VERSION_SHIELD_DEBUG + mExecCommand = EXEC_STRAP_IN; + mTimer = 0; + #elif VERSION == VERSION_SHIELD + mExecCommand = EXEC_MOC_IN; + mTimer = 30; + #elif PLATFORM_WII + mExecCommand = EXEC_STRAP_IN; + mTimer = 90; + #endif + mDoGph_gInf_c::startFadeIn(30); + #if !(PLATFORM_WII || PLATFORM_SHIELD) checkProgSelect(); if (field_0x20a != 0) { mExecCommand = EXEC_PROG_IN; @@ -628,12 +1098,92 @@ int dScnLogo_c::create() { JUTGamePad::clearResetOccurred(); JUTGamePad::setResetCallback(mDoRst_resetCallBack, NULL); + #endif + mDoRst::offReset(); mDoRst::offResetPrepare(); + #if PLATFORM_WII || VERSION == VERSION_SHIELD + dHomeButton_c::lbl_8053A724 = 0; + #endif + return phase_state; } +#if PLATFORM_WII || PLATFORM_SHIELD +void dScnLogo_c::logoInitWii() { + u8 language = getPalLanguage(); + if (language > 5) { + language = 0; + } + + ResTIMG* timg; + s16 width; + s16 height; + if (mDoGph_gInf_c::isWide()) { + switch (language) { + case 0: + default: + timg = (ResTIMG*)dComIfG_getObjectRes("LogoUsWii", dRes_ID_LOGOUSWII_BTI_STRAP_16_9_832X456_US_e); + break; + case 2: + timg = (ResTIMG*)dComIfG_getObjectRes("LogoFrWii", 3); + break; + case 3: + timg = (ResTIMG*)dComIfG_getObjectRes("LogoSpWii", 3); + break; + } + + width = 832; + height = 456; + } else { + switch (language) { + case 0: + default: + timg = (ResTIMG*)dComIfG_getObjectRes("LogoUsWii", dRes_ID_LOGOUSWII_BTI_STRAP_608X456_US_e); + break; + case 2: + timg = (ResTIMG*)dComIfG_getObjectRes("LogoFrWii", 4); + break; + case 3: + timg = (ResTIMG*)dComIfG_getObjectRes("LogoSpWii", 4); + break; + } + + width = 608; + height = 456; + } + + JUT_ASSERT(2309, timg != NULL); + mStrapImg = new dDlst_2D_c(timg, 304 - (width / 2), 224 - (height / 2), width, height, 255); + + #if VERSION == VERSION_SHIELD + timg = (ResTIMG*)dComIfG_getObjectRes("LogoUsWii", 5); + mNvLogo = new dDlst_2D_c(timg, 304 - (width / 2), 224 - (height / 2), width, height, 255); + + timg = (ResTIMG*)dComIfG_getObjectRes("LogoUsWii", 4); + mMocImg = new dDlst_2D_c(timg, 304 - (width / 2), 224 - (height / 2), width, height, 255); + #endif + + OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 2316, archiveHeap->getTotalFreeSize()); + + JUT_ASSERT(2319, mStrapImg != NULL); + + mNintendoLogo = NULL; + mDolbyLogo = NULL; + mWarning = NULL; + mWarningStart = NULL; + mProgressiveChoice = NULL; + mProgressiveYes = NULL; + mProgressiveNo = NULL; + mProgressivePro = NULL; + mProgressiveInter = NULL; + mProgressiveSel = NULL; + + OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 2341, archiveHeap->getTotalFreeSize()); + OS_REPORT("%d mLogo01Heap->getTotalFreeSize %08x\n\x1b[m", 2344, mLogo01Heap->getTotalFreeSize()); +} +#else void dScnLogo_c::logoInitGC() { ResTIMG* nintendoImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 4); mNintendoLogo = new dDlst_2D_c(nintendoImg, 117, 154, 376, 104, 255); @@ -751,103 +1301,133 @@ void dScnLogo_c::logoInitGC() { mProgressiveSel = new dDlst_2D_c(mProgressivePro, 153, 309, 336, 88, 255); #endif } +#endif void dScnLogo_c::dvdDataLoad() { - dComIfG_setObjectRes("Always", (u8)0, NULL); + int rt; + + #if PLATFORM_WII || VERSION == VERSION_SHIELD + rt = dComIfG_setObjectRes("HomeBtn", (u8)0, NULL); + JUT_ASSERT(__LINE__, rt == 1); + + static const homeBtnData l_homeBtnData[] = { + {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, + {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, + {SC_LANG_FRENCH, "/res/HomeBtn/homeBtn_FRA.arc"}, + {SC_LANG_SPANISH, "/res/HomeBtn/homeBtn_SPA.arc"}, + {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, + {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, + {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, + }; + + u8 language = getPalLanguage(); + const homeBtnData* data = &l_homeBtnData[language]; + mpHomeBtnCommand = mDoDvdThd_toMainRam_c::create(data->path, 0, NULL); + mHomeBtnRegion = data->region; + #endif + + rt = dComIfG_setObjectRes("Always", (u8)0, NULL); + JUT_ASSERT(2420, rt == 1); + + OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 2421, archiveHeap->getTotalFreeSize()); archiveHeap->dump_sort(); - dComIfG_setObjectRes("Alink", (u8)0, NULL); - - mpField0Command = mDoDvdThd_mountXArchive_c::create( - "/res/FieldMap/Field0.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpAlAnmCommand = - mDoDvdThd_mountXArchive_c::create("/res/Object/AlAnm.arc", 0, JKRArchive::MOUNT_ARAM, NULL); - mpFmapResCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/fmapres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpDmapResCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/dmapres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpCollectResCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/clctres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpItemIconCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/itemicon.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpRingResCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/ringres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpPlayerNameCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/playerName.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpItemInfResCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/itmInfRes.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpButtonCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/button.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpCardIconCommand = mDoDvdThd_mountXArchive_c::create( - "/res/CardIcon/cardicon.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + rt = dComIfG_setObjectRes("Alink", (u8)0, NULL); + JUT_ASSERT(2429, rt == 1); + + #if PLATFORM_WII || PLATFORM_SHIELD + rt = dComIfG_setObjectRes("NNGC", (u8)0, NULL); + JUT_ASSERT(2433, rt == 1); + #endif + + OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 2436, archiveHeap->getTotalFreeSize()); + + mpField0Command = aramMount("/res/FieldMap/Field0.arc", mDoExt_getJ2dHeap()); + mpAlAnmCommand = aramMount("/res/Object/AlAnm.arc", NULL); + mpFmapResCommand = aramMount(FMAP_RES_PATH, mDoExt_getJ2dHeap()); + mpDmapResCommand = aramMount(DMAP_RES_PATH, mDoExt_getJ2dHeap()); + mpCollectResCommand = aramMount(COLLECT_RES_PATH, mDoExt_getJ2dHeap()); + mpItemIconCommand = aramMount("/res/Layout/itemicon.arc", mDoExt_getJ2dHeap()); + mpRingResCommand = aramMount(RING_RES_PATH, mDoExt_getJ2dHeap()); + mpPlayerNameCommand = aramMount("/res/Layout/playerName.arc", mDoExt_getJ2dHeap()); + mpItemInfResCommand = aramMount(ITEM_INF_RES_PATH, mDoExt_getJ2dHeap()); + mpButtonCommand = aramMount(BUTTON_RES_PATH, mDoExt_getJ2dHeap()); + mpCardIconCommand = aramMount(ICON_RES_PATH, mDoExt_getJ2dHeap()); #if VERSION == VERSION_GCN_PAL switch (getPalLanguage()) { case 1: - mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msgde/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpBmgResCommand = onMemMount("/res/Msgde/bmgres.arc"); break; case 2: - mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msgfr/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpBmgResCommand = onMemMount("/res/Msgfr/bmgres.arc"); break; case 3: - mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msgsp/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpBmgResCommand = onMemMount("/res/Msgsp/bmgres.arc"); break; case 4: - mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msgit/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpBmgResCommand = onMemMount("/res/Msgit/bmgres.arc"); break; case 0: default: - mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msguk/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpBmgResCommand = onMemMount("/res/Msguk/bmgres.arc"); + break; + } + #elif VERSION == VERSION_SHIELD_DEBUG + switch (getPalLanguage()) { + case 2: + mpBmgResCommand = onMemMount("/res/Msgfr/bmgres.arc"); + break; + case 3: + mpBmgResCommand = onMemMount("/res/Msgsp/bmgres.arc"); + break; + default: + mpBmgResCommand = onMemMount("/res/Msgus/bmgres.arc"); break; } #else - mpBmgResCommand = mDoDvdThd_mountXArchive_c::create(MSG_PATH, 0, JKRArchive::MOUNT_MEM, NULL); - #endif - - mpMsgComCommand = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgcom.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpMsgResCommand[0] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres00.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpMsgResCommand[1] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres01.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpMsgResCommand[2] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres02.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpMsgResCommand[3] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres03.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpBmgResCommand = onMemMount(MSG_PATH); + #endif + + mpMsgComCommand = aramMount(MSG_COM_PATH, mDoExt_getJ2dHeap()); + mpMsgResCommand[0] = aramMount(MSG_RES0_PATH, mDoExt_getJ2dHeap()); + mpMsgResCommand[1] = aramMount(MSG_RES1_PATH, mDoExt_getJ2dHeap()); + mpMsgResCommand[2] = aramMount(MSG_RES2_PATH, mDoExt_getJ2dHeap()); + mpMsgResCommand[3] = aramMount(MSG_RES3_PATH, mDoExt_getJ2dHeap()); #if VERSION == VERSION_GCN_JPN - mpMsgResCommand[4] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres04.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[4] = aramMount("/res/Layout/msgres04.arc", mDoExt_getJ2dHeap()); #else - mpMsgResCommand[4] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres04F.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[4] = aramMount("/res/Layout/msgres04F.arc", mDoExt_getJ2dHeap()); #endif - mpMsgResCommand[5] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres05.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpMsgResCommand[6] = mDoDvdThd_mountXArchive_c::create( - "/res/Layout/msgres06.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); - mpMain2DCommand = - mDoDvdThd_mountXArchive_c::create("/res/Layout/main2D.arc", 0, JKRArchive::MOUNT_MEM, NULL); + mpMsgResCommand[5] = aramMount("/res/Layout/msgres05.arc", mDoExt_getJ2dHeap()); + mpMsgResCommand[6] = aramMount("/res/Layout/msgres06.arc", mDoExt_getJ2dHeap()); + + mpMain2DCommand = onMemMount(MAIN2D_PATH); #if VERSION == VERSION_GCN_JPN - mpFontResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontjp/fontres.arc", 1, - JKRArchive::MOUNT_MEM, NULL); - mpRubyResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontjp/rubyres.arc", 0, - JKRArchive::MOUNT_MEM, NULL); + mpFontResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontjp/fontres.arc", 1, JKRArchive::MOUNT_MEM, NULL); + mpRubyResCommand = onMemMount("/res/Fontjp/rubyres.arc"); #elif VERSION == VERSION_GCN_PAL - mpFontResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fonteu/fontres.arc", 0, - JKRArchive::MOUNT_MEM, NULL); - mpRubyResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fonteu/rubyres.arc", 0, - JKRArchive::MOUNT_MEM, NULL); + mpFontResCommand = onMemMount("/res/Fonteu/fontres.arc"); + mpRubyResCommand = onMemMount("/res/Fonteu/rubyres.arc"); +#elif VERSION == VERSION_SHIELD_DEBUG + mpFontResCommand = onMemMount("/res/Fonteu/fontres.arc"); + mpRubyResCommand = onMemMount("/res/Fontus/rubyres.arc"); +#elif VERSION == VERSION_SHIELD + mpFontResCommand = onMemMount("/res/Fontcn/fontres.arc"); + mpRubyResCommand = onMemMount("/res/Fontcn/rubyres.arc"); #else - mpFontResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontus/fontres.arc", 0, - JKRArchive::MOUNT_MEM, NULL); - mpRubyResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontus/rubyres.arc", 0, - JKRArchive::MOUNT_MEM, NULL); + mpFontResCommand = onMemMount("/res/Fontus/fontres.arc"); + mpRubyResCommand = onMemMount("/res/Fontus/rubyres.arc"); #endif - mParticleCommand = mDoDvdThd_toMainRam_c::create("/res/Particle/common.jpc", 0, - dComIfGp_particle_getResHeap()); + + mParticleCommand = mDoDvdThd_toMainRam_c::create(PARTICLE_COM_PATH, 0, dComIfGp_particle_getResHeap()); + mItemTableCommand = mDoDvdThd_toMainRam_c::create("/res/ItemTable/item_table.bin", 0, NULL); + JUT_ASSERT(2620, mItemTableCommand != NULL); + mEnemyItemCommand = mDoDvdThd_toMainRam_c::create("/res/ItemTable/enemy_table.bin", 0, NULL); + JUT_ASSERT(2624, mEnemyItemCommand != NULL); preLoad_dyl_create(); preLoad_dyl(); @@ -858,13 +1438,58 @@ static int dScnLogo_Create(scene_class* i_this) { } static int dScnLogo_Execute(dScnLogo_c* i_this) { + fpc_ProcID id = fpcM_GetID(i_this); + if (mDoRst::isReset()) { fopScnM_ChangeReq(i_this, PROC_LOGO_SCENE, 0, 5); } + return 1; } +#if DEBUG +static u8 lbl_8074CA49; +#endif + static int dScnLogo_Draw(dScnLogo_c* i_this) { + #if DEBUG + int x = 36; + int y = 40; + + y += 12; + JUTReport(x, y, "COPYDATE %s", mDoMain::COPYDATE_STRING); + + y += 12; + JUTReport(x, y, "Build by %s", "Authorized User"); + + y += 12; + JUTReport(x, y, "_DEBUG/Debug version"); + + if (!lbl_8074CA49) { + lbl_8074CA49 = 1; + JUTReportConsole_f("COPYDATE %s\n", mDoMain::COPYDATE_STRING); + JUTReportConsole_f("Build by %s\n", "Authorized User"); + JUTReportConsole_f("_DEBUG/Debug version\n"); + JUTReportConsole_f("SDKVersion %s\n", "11Dec2009Patch02"); + + #if PLATFORM_WII || PLATFORM_SHIELD + JUTReportConsole_f("ConsoleSimMem %08x\n", OSGetConsoleSimulatedMem1Size()); + JUTReportConsole_f("PhysicalMemory %08x\n", OSGetPhysicalMem1Size()); + JUTReportConsole_f("ConsoleType %08x\n", OSGetConsoleType()); + JUTReportConsole_f("Language(PAL) %1x\n", SCGetLanguage()); + JUTReportConsole_f("Progressive %1x\n", SCGetProgressiveMode()); + JUTReportConsole_f("SoundMode %1x\n", SCGetSoundMode()); + #else + JUTReportConsole_f("ConsoleSimMem %08x\n", OSGetConsoleSimulatedMemSize()); + JUTReportConsole_f("PhysicalMemory %08x\n", OSGetPhysicalMemSize()); + JUTReportConsole_f("ConsoleType %08x\n", OSGetConsoleType()); + JUTReportConsole_f("Language(PAL) %1x\n", OSGetLanguage()); + JUTReportConsole_f("Progressive %1x\n", OSGetProgressiveMode()); + JUTReportConsole_f("SoundMode %1x\n", OSGetSoundMode()); + #endif + } + #endif + i_this->draw(); return 1; } @@ -878,9 +1503,35 @@ static int dScnLogo_IsDelete(dScnLogo_c* i_this) { return 1; } -#if VERSION == VERSION_GCN_PAL +#if VERSION == VERSION_GCN_PAL || PLATFORM_WII || PLATFORM_SHIELD u8 dScnLogo_c::getPalLanguage() { u8 language; + + #if PLATFORM_WII || PLATFORM_SHIELD + switch (SCGetLanguage()) { + case SC_LANG_JAPANESE: + language = 6; + break; + case SC_LANG_ENGLISH: + language = 0; + break; + case SC_LANG_GERMAN: + language = 1; + break; + case SC_LANG_FRENCH: + language = 2; + break; + case SC_LANG_SPANISH: + language = 3; + break; + case SC_LANG_ITALIAN: + language = 4; + break; + case SC_LANG_DUTCH: + language = 5; + break; + } + #else switch (OSGetLanguage()) { case OS_LANGUAGE_ENGLISH: language = 0; @@ -901,13 +1552,20 @@ u8 dScnLogo_c::getPalLanguage() { language = 5; break; } + #endif return language; } #endif void dScnLogo_c::setProgressiveMode(u8 mode) { - #if VERSION == VERSION_GCN_PAL + #if VERSION == VERSION_SHIELD_DEBUG + return; + #endif + + #if PLATFORM_WII + SCSetProgressiveMode(mode); + #elif VERSION == VERSION_GCN_PAL OSSetEuRgb60Mode(mode); #else OSSetProgressiveMode(mode); @@ -915,6 +1573,10 @@ void dScnLogo_c::setProgressiveMode(u8 mode) { } u8 dScnLogo_c::getProgressiveMode() { + #if PLATFORM_WII || PLATFORM_SHIELD + return SCGetProgressiveMode(); + #endif + #if VERSION == VERSION_GCN_PAL return OSGetEuRgb60Mode(); #else @@ -934,8 +1596,6 @@ void dScnLogo_c::setRenderMode() { mDoMch_render_c::setProgressiveMode(); } -dLog_HIO_c::~dLog_HIO_c() {} - static scene_method_class l_dScnLogo_Method = { (process_method_func)dScnLogo_Create, (process_method_func)dScnLogo_Delete, diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 1e4636c4577..4f3c6807f0b 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -26,13 +26,33 @@ #include "m_Do/m_Do_graphic.h" #include "d/actor/d_a_suspend.h" #include "d/actor/d_a_ykgr.h" +#include "JSystem/JHostIO/JORFile.h" +#include "JSystem/JHostIO/JORServer.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JFramework/JFWSystem.h" +#include "f_ap/f_ap_game.h" +#include "d/d_bg_parts.h" +#include "f_op/f_op_kankyo_mng.h" +#include "d/actor/d_a_alink.h" +#include "d/actor/d_a_midna.h" +#include "JSystem/JKernel/JKRAram.h" +#include "JSystem/JKernel/JKRAramArchive.h" + +#if DEBUG +#include "d/d_s_menu.h" +#include "d/d_debug_pad.h" +#include "d/d_jpreviewer.h" +#include "d/d_jcam_editor.h" +#include "d/d_a_obj.h" +#include "d/d_debug_viewer.h" +#endif #include #if PLATFORM_WII #include "d/d_cursor_mng.h" #endif -static void dScnPly_Create(scene_class*); +static int dScnPly_Create(scene_class*); static int dScnPly_Delete(dScnPly_c*); static int dScnPly_IsDelete(dScnPly_c); static int dScnPly_Execute(dScnPly_c*); @@ -54,6 +74,10 @@ static request_of_phase_process_class resPhase[1]; static request_of_phase_process_class dylPhase[1]; +#if DEBUG +static OSTime dylPreLoadTime0; +#endif + static OSTime dylPreLoadTime1; static OSTime resPreLoadTime0; @@ -66,6 +90,47 @@ s8 dScnPly_c::pauseTimer; s8 dScnPly_c::nextPauseTimer; +#if DEBUG +u8 dScnPly_c::debugPause; +#endif + +static const s16 T_JOINT_dylKeyTbl[1] = { + PROC_COW, +}; + +static const char* T_JOINT_resName[1] = {"Always"}; + +struct PreLoadInfo { + const char* stageName; + const s16* profNameTbl; + const char** resNameTbl; + u8 dylKeyTblNum; + u8 resNameNum; +}; + +static PreLoadInfo const PreLoadInfoT[1] = { + { + "T_JOINT", + T_JOINT_dylKeyTbl, + T_JOINT_resName, + ARRAY_SIZE(T_JOINT_dylKeyTbl), + ARRAY_SIZE(T_JOINT_resName), + }, +}; + +static s8 preLoadNo = -1; + +static u8 doPreLoad = 1; + +#if DEBUG +void dScnPly_preLoad_HIO_c::genMessage(JORMContext* mctx) { + mctx->startComboBox("プリロード", &doPreLoad); + mctx->genComboBoxItem("しない", 0); + mctx->genComboBoxItem("する", 1); + mctx->endComboBox(); +} +#endif + s8 dScnPly_c::calcPauseTimer() { if (nextPauseTimer != 0) { pauseTimer = nextPauseTimer; @@ -76,18 +141,281 @@ s8 dScnPly_c::calcPauseTimer() { } } -static const s16 T_JOINT_dylKeyTbl[1] = { - 0x0106, -}; +#if DEBUG +dScnPly_reg_childHIO_c::dScnPly_reg_childHIO_c() { + for (int i = 0; i < 30; i++) { + mFloatReg[i] = 0.0f; + } + + for (int i = 0; i < 10; i++) { + mShortReg[i] = 0; + } +} + +void dScnPly_reg_childHIO_c::genMessage(JORMContext* mctx) { + char textbuf[8]; + + for (int i = 0; i < 20; i++) { + sprintf(textbuf, " F(%02d)", i); + mctx->genSlider(textbuf, &mFloatReg[i], -100000.0f, 100000.0f); + } + + for (int i = 20; i < 25; i++) { + sprintf(textbuf, " F(%02d)", i); + mctx->genSlider(textbuf, &mFloatReg[i], 0.0f, 1.0f); + } + + for (int i = 25; i < 30; i++) { + sprintf(textbuf, " F(%02d)", i); + mctx->genSlider(textbuf, &mFloatReg[i], -1.0f, 1.0f); + } + + for (int i = 0; i < 10; i++) { + sprintf(textbuf, " S(%02d)", i); + mctx->genSlider(textbuf, &mShortReg[i], -0x8000, 0x7FFF); + } +} + +void dScnPly_reg_HIO_c::genMessage(JORMContext* mctx) { + static const char l_nodeName[][20] = { + "森田(T)", + "まつたに(D)", + "イワワキ(I)", + "ささ(S)", + "うめみや(U)", + "おがわ(O)", + "坂口(Y)", + "さかい(K)", + "ハラ(B)", + "すみよし(M)", + "(空)-たけした(A)", + "吉田茂樹(P)", + "(空)-のま(N)", + "(空)-にしわき(W)", + "(空)-榊原政郎(J)", + "はやかわ(H)", + "(空)-定本(V)", + "(空)-西川(X)", + "(空)-鈴木（ゆ）(Z)", + "なかにし(n)", + "くわじま(k)", + "おかじま(o)", + "山崎(y)", + "芦田(a)", + "岡田(h)", + "高橋(t)", + }; + + // "Example usage" + mctx->genLabel("使い方例", 0); + mctx->genLabel("R_HS(00-09) ... はやかわレジスタ -32768 - +32767(short)", 0); + mctx->genLabel("R_HF(00-19) ... はやかわレジスタ -100000.0 - +100000.0", 0); + mctx->genLabel("R_HF(20-24) ... はやかわレジスタ 0.0f - 1.0f", 0); + mctx->genLabel("R_HF(25-29) ... はやかわレジスタ -1.0f - 1.0f", 0); + + for (int i = 0; i < 26; i++) { + mctx->genNode(l_nodeName[i], &mChildReg[i], 0, 0); + } +} + +dScnPly_preset_HIO_c::dScnPly_preset_HIO_c() { + field_0x5 = 0; + memset(mPresetData, 0, sizeof(mPresetData)); + memset(filename_buf, 0, sizeof(filename_buf)); + field_0x2716 = 0; + field_0x2717 = 0; +} + +void dScnPly_preset_HIO_c::exePreset() { + JORFile file; + + if (g_presetHIO.filename_buf[0] != 0) { + if (file.open((char*)filename_buf, 1, "", NULL, NULL, NULL)) { + memset(mPresetData, 0, sizeof(mPresetData)); + field_0x2716 = 0; + field_0x2717 = 1; + + file.readData(mPresetData, 0); + file.close(); + + if (dSm_read_stageset(mPresetData)) { + field_0x2717 = 2; + } + } else { + // "\nLoading error loop" + OS_REPORT("\n読み込みしっぱいのまきまき"); + } + + g_presetHIO.filename_buf[0] = 0; + } +} + +void dScnPly_preset_HIO_c::genMessage(JORMContext* mctx) { + // "Load situation file" + mctx->genLabel("【状況ファイルを読みこみ】", 0x80000001); + // "Items and Status can be set in a file" + mctx->genLabel("　アイテムやステータスの状態をファイルで指定することが出来ます。", 0x80000001); + mctx->genLabel("", 0x80000001); + + // "Click here to select a file to load!" + mctx->genButton("ここを押して読込ファイルを指定して下さい！", 0x40000001); + mctx->genLabel("", 0x80000001); + + // "- Loading during gameplay will automatically return you to the debug menu." + mctx->genLabel("・ゲーム中に読み込むと自動的にデバッグメニューへ戻ります。", 0x80000001); + // "- When loading a file from the debug menu," + mctx->genLabel("・デバッグメニューでファイルを読み込んだ際", 0x80000001); + // " if a stage command exists the game will temporarily load then return to the menu." + mctx->genLabel("　stage命令がある場合は一旦ゲームに入りメニューへと戻ります。", 0x80000001); + // " (To position the cursor)" + mctx->genLabel("　（カーソルを合わせる為）", 0x80000001); + mctx->genLabel("", 0x80000001); + + // "Reset state to before loading situation file" + mctx->genButton("状況ファイルを読み込んでいない状態に戻す", 0x40000003); + mctx->genLabel("", 0x80000001); + mctx->genLabel("", 0x80000001); + + // "Click here for the situation file location!" + mctx->genButton("状況ファイルの格納場所はコチラを押下！", 0x40000005); + mctx->genLabel("\\\\10.121.2.9\\zelda$\\JMAP_FOLDER\\situation", 0x80000001); + // "For details about the situation file contents, please refer to Nakamura-san's website" + mctx->genLabel("ファイルの内容については中村さんのＨＰをご参照ください", 0x80000001); + // "Click here to launch browser and view webpage." + mctx->genButton("ここを押すとブラウザが起動し表示されます。", 0x40000004); + mctx->genLabel("http://www-ead/~nakamuh/gc-zelda_2/misc/spec-situation_file.html", 0x80000001); +} + +void dScnPly_preset_HIO_c::listenPropertyEvent(const JORPropertyEvent* event) { + JORReflexible::listenPropertyEvent(event); + JORFile file; + + switch ((int)event->id) { + case 0x40000001: + if (file.open(1, "すべてのファイル(*.*)\0*.*", NULL, NULL, NULL)) { + memset(mPresetData, 0, sizeof(mPresetData)); + field_0x2716 = 0; + field_0x2717 = 1; + + file.readData(mPresetData, 0); + file.close(); + + if (dSm_read_stageset(mPresetData)) { + field_0x2717 = 2; + } + } + break; + case 0x40000003: + memset(mPresetData, 0, sizeof(mPresetData)); + break; + case 0x40000004: + JORShellExecute(NULL, "http://www-ead/~nakamuh/gc-zelda_2/misc/spec-situation_file.html", NULL, NULL, 1); + break; + case 0x40000005: + JORShellExecute(NULL, "\\\\10.121.2.9\\zelda$\\ZELDA2_JMAP_FOLDER\\situation", NULL, NULL, 1); + break; + } +} +#endif dScnPly_env_otherHIO_c::dScnPly_env_otherHIO_c() { mShadowDensity = 255.0f; - mAdjustLODBias = 1; - mDisplayTransparentCyl = false; + mAdjustLODBias = TRUE; + mDisplayTransparentCyl = FALSE; + + #if DEBUG + mAdjustCullFar = FALSE; + mCullFarValue = 4000.0f; + mDisplayShadows = TRUE; + mDisplayShadowImage = FALSE; + mDisplayShadowPoly = FALSE; + mDisplayCullBox = FALSE; + mLoadAllRooms = FALSE; + mDepthOfField = TRUE; + + mRailSize = 5.0f; + mRailColorR = 0x50; + mRailColorG = 0x50; + mRailColorB = 0x50; + + field_0x1a = 0xFF; + mDisplayParticleInfo = 0; + field_0x4e = 0; + field_0x4f = 0; + + for (int i = 0; i < 20; i++) { + field_0x1c[i] = -1; + } + #endif } -void dScnPly_env_otherHIO_c::genMessage(JORMContext* ctx) { +void dScnPly_env_otherHIO_c::genMessage(JORMContext* mctx) { + #if DEBUG + mctx->genCheckBox("影表示", &mDisplayShadows, 1); + mctx->genSlider("影濃さ", &mShadowDensity, 0.0f, 255.0f); + mctx->genCheckBox("被写界深度", &mDepthOfField, 1); + mctx->genCheckBox("ＬＯＤバイアス変更", &mAdjustLODBias, 1); + mctx->genCheckBox("カリングＦａｒ変更", &mAdjustCullFar, 1); + mctx->genSlider("カリングＦａｒ値", &mCullFarValue, 0.0f, 50000.0f); + mctx->genCheckBox("影イメージ表示", &mDisplayShadowImage, 1); + mctx->genCheckBox("影ポリゴン表示", &mDisplayShadowPoly, 1); + mctx->genCheckBox("透明円柱表示", &mDisplayTransparentCyl, 1); + mctx->genCheckBox("カリングボックス表示", &mDisplayCullBox, 1); + mctx->genCheckBox("パーティクル情報表示", &mDisplayParticleInfo, 1); + mctx->genButton("パーティクル履歴", 0x4000003); + mctx->genCheckBox("全部屋読み込み", &mLoadAllRooms, 1); + mctx->genButton("部屋メモリ", 0x4000001); + mctx->genButton("草、花、低木本数", 0x4000002); + mctx->genSlider("レールサイズ", &mRailSize, 0.0f, 100.0f); + mctx->genSlider("レールカラー(R)", &mRailColorR, 0, 0xff); + mctx->genSlider("レールカラー(G)", &mRailColorG, 0, 0xff); + mctx->genSlider("レールカラー(B)", &mRailColorB, 0, 0xff); + #endif +} + +#if DEBUG +void dScnPly_env_otherHIO_c::listenPropertyEvent(const JORPropertyEvent* event) { + JORReflexible::listenPropertyEvent(event); + JORFile file; + + switch ((int)event->id) { + case 0x4000001: + OS_REPORT("#############################################\n"); + break; + case 0x4000002: + break; + case 0x4000003: + g_envHIO.mOther.field_0x4e = 1; + break; + } +} + +void dScnPly_env_otherHIO_c::printParticle() { + dDbVw_Report(20, 100, "Emitter Num <%d> X=<%d>", dComIfGp_particle_getEmitterNum(), dComIfGp_particle_getHeapSize()); + dDbVw_Report(20, 120, "Particle Num <%d> Y=<%d>", dComIfGp_particle_getParticleNum(), dComIfGp_particle_getSceneHeapSize() - 0x180000); + + int var_r26 = 0xA0; + int var_r28 = field_0x4f; + if (field_0x4e != 0) { + OS_REPORT("Particle Error !!\n"); + + for (int i = 0; i < 20; i++) { + var_r28--; + if (var_r28 < 0) { + var_r28= 19; + } + + if (field_0x1c[var_r28] != 0xFFFF) { + OS_REPORT(" \n", field_0x1c[var_r28], dPa_name::getName(field_0x1c[var_r28])); + } + + var_r26 += 20; + } + + field_0x4e = 0; + } } +#endif dScnPly_env_debugHIO_c::dScnPly_env_debugHIO_c() { mBoxCullMinSize.set(-100.0f, -100.0f, -100.0f); @@ -96,31 +424,152 @@ dScnPly_env_debugHIO_c::dScnPly_env_debugHIO_c() { mSphereCullRadius = 100.0f; } -void dScnPly_env_debugHIO_c::genMessage(JORMContext* ctx) { +void dScnPly_env_debugHIO_c::genMessage(JORMContext* mctx) { + #if DEBUG + mctx->genLabel("【ボックスカリング(CULLSIZE_DEBUG)サイズ】", 0x80000001); + mctx->genSlider("最小Ｘ", &mBoxCullMinSize.x, -10000.0f, 10000.0f); + mctx->genSlider("最小Ｙ", &mBoxCullMinSize.y, -10000.0f, 10000.0f); + mctx->genSlider("最小Ｚ", &mBoxCullMinSize.z, -10000.0f, 10000.0f); + mctx->genSlider("最大Ｘ", &mBoxCullMaxSize.x, -10000.0f, 10000.0f); + mctx->genSlider("最大Ｙ", &mBoxCullMaxSize.y, -10000.0f, 10000.0f); + mctx->genSlider("最大Ｚ", &mBoxCullMaxSize.z, -10000.0f, 10000.0f); + + mctx->genLabel("【球カリング(CULLSIZE_Q_DEBUG)サイズ】", 0x80000001); + mctx->genSlider("中心Ｘ", &mSphereCullCenter.x, -10000.0f, 10000.0f); + mctx->genSlider("中心Ｙ", &mSphereCullCenter.y, -10000.0f, 10000.0f); + mctx->genSlider("中心Ｚ", &mSphereCullCenter.z, -10000.0f, 10000.0f); + mctx->genSlider("半径", &mSphereCullRadius, -10000.0f, 10000.0f); + #endif +} + +#if DEBUG +void dScnPly_env_debugHIO_c::listenPropertyEvent(const JORPropertyEvent* event) { + JORReflexible::listenPropertyEvent(event); + + l_cullSizeBox[fopAc_CULLBOX_14_e].min = mBoxCullMinSize; + l_cullSizeBox[fopAc_CULLBOX_14_e].max = mBoxCullMaxSize; + l_cullSizeSphere[fopAc_CULLSPHERE_8_e - fopAc_CULLSPHERE_0_e].center = mSphereCullCenter; + l_cullSizeSphere[fopAc_CULLSPHERE_8_e - fopAc_CULLSPHERE_0_e].radius = mSphereCullRadius; } +void dScnPly_env_HIO_c::genMessage(JORMContext* mctx) { + mctx->genNode("デバッグ用", &mDebug, 0, 0); + mctx->genNode("その他", &mOther, 0, 0); +} + +static u32 l_usedMemoryBlockSize = 0xFFFFFFFF; + +static int checkObjectSize(void* i_process, void* i_data) { + s16 profname = fpcM_GetProfName(i_process); + if (profname == PROC_BG) { + fopAc_ac_c* actor = (fopAc_ac_c*)i_process; + *((u32*)i_data) += ((l_usedMemoryBlockSize != 0 && actor->heap == NULL) ? 0 : actor->heap->getHeapSize()) + actor->base.base.profile->process_size; + } else if (profname == PROC_PLAY_SCENE || profname == PROC_ROOM_SCENE) { + *((u32*)i_data) += ((base_process_class*)i_process)->profile->process_size; + } else if (fopKyM_IsKy(i_process)) { + *((u32*)i_data + 1) += ((base_process_class*)i_process)->profile->process_size; + } else if (fopAcM_IsActor(i_process)) { + fopAc_ac_c* actor = (fopAc_ac_c*)i_process; + *((u32*)i_data + 1) += (actor->heap == NULL ? 0 : actor->heap->getHeapSize()) + actor->base.base.profile->process_size; + + if (profname == PROC_ALINK) { + daAlink_c* alink = (daAlink_c*)actor; + *((u32*)i_data + 1) += alink->getOtherHeapSize(); + } else if (profname == PROC_MIDNA) { + daMidna_c* midna = (daMidna_c*)actor; + *((u32*)i_data + 1) += midna->getOtherHeapSize(); + } + } + + return 1; +} + +static void initUsedHeapSize() { + l_usedMemoryBlockSize = 0; + for (int i = 0; i < 19; i++) { + JKRHeap* heap = dStage_roomControl_c::getMemoryBlockHeap(i); + if (heap != NULL) { + l_usedMemoryBlockSize += heap->getHeapSize(); + } + } +} + +static bool lbl_8074CADB; + +static void drawUsedHeapSize() { + if (mDoCPd_c::getHoldL(PAD_3) && mDoCPd_c::getHoldR(PAD_3) && mDoCPd_c::getTrigZ(PAD_3)) { + lbl_8074CADB = !lbl_8074CADB; + } + + if (lbl_8074CADB) { + int gameSize = mDoExt_getSafeGameHeapSize() - mDoExt_getGameHeap()->getTotalFreeSize(); + int zeldaSize = mDoExt_getSafeZeldaHeapSize() - mDoExt_getZeldaHeap()->getTotalFreeSize(); + int archiveSize = mDoExt_getSafeArchiveHeapSize() - mDoExt_getArchiveHeap()->getTotalFreeSize(); + int j2dSize = mDoExt_getSafeJ2dHeapSize() - mDoExt_getJ2dHeap()->getTotalFreeSize(); + + u32 sizes[2]; + sizes[0] = dComIfG_getStageAllSize(); + sizes[1] = dComIfG_getObjectAllSize() - (dComIfG_getObjectSize("CamParam") + + dComIfG_getObjectSize("Event") + + dComIfG_getObjectSize("Always") + + dComIfG_getObjectSize("Alink") + + dComIfG_getObjectSize("Midna")); + + fpcLyIt_All(checkObjectSize, sizes); + if (l_usedMemoryBlockSize != 0) { + sizes[0] = l_usedMemoryBlockSize + dComIfG_getStageSize("Stg_00") + dComIfG_getStageSize("Xtg_00"); + } + + int var_r25 = JKRGetAramFreeSize() / 1024; + JUTReport(380, 300, "Stage : %d(K)", (sizes[0] + 0x3FF) / 1024); + JUTReport(380, 316, "Obj : %d(K)", (sizes[1] + 0x3FF) / 1024); + JUTReport(380, 332, "C-ARAM : %d(K)", var_r25); + JUTReport(380, 348, ">Game : %d(K)", (gameSize + 0x3FF) / 1024); + JUTReport(380, 364, ">Zelda : %d(K)", (zeldaSize + 0x3FF) / 1024); + JUTReport(380, 380, ">Archive : %d(K)", (archiveSize + 0x3FF) / 1024); + JUTReport(380, 380, ">J2d : %d(K)", (j2dSize + 0x3FF) / 1024); + } +} +#endif + static int dScnPly_Draw(dScnPly_c* i_this) { static s16 l_wipeType[] = { - 0x0000, 0x0000, 0x0011, 0x0002, 0x0002, 0x0001, 0x0003, 0x0001, 0x0004, 0x0004, 0x0005, 0x0005, - 0x0006, 0x0007, 0x0000, 0x0000, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0008, 0x0008, + 0, 0, 17, 2, 2, 1, 3, 1, 4, 4, 5, 5, 6, 7, 0, 0, 2, 2, 2, 2, 2, 8, 8, }; + #if DEBUG + fapGm_HIO_c::startCpuTimer(); + fpc_ProcID id = fpcM_GetID(i_this); + drawUsedHeapSize(); + dStage_DebugDisp(); + #endif + dComIfG_Ccsp()->Move(); dComIfG_Bgsp().ClrMoveFlag(); - u8 useWhiteColor; if (!fopOvlpM_IsPeek() && !dComIfG_resetToOpening(i_this)) { - if (dComIfGp_isEnableNextStage()) { + if (dComIfGp_isEnableNextStage() + #if DEBUG + && !dScnMenu_c::isAutoSelect() + #endif + ) { + JUT_ASSERT(1019, dComIfGp_getNextStageWipe() < ARRAY_SIZEU(l_wipeType)); + u8 wipe = dComIfGp_getNextStageWipe(); - fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, l_wipeType[wipe], 5); + #if DEBUG + if (g_kankyoHIO.navy.wipe_test_ON != 0xFF) { + wipe = g_kankyoHIO.navy.wipe_test_ON; + } + #endif + + int rt = fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, l_wipeType[wipe], 5); int hour = dKy_getdaytime_hour(); - useWhiteColor = hour >= 6 && hour < 18 ? true : false; - BOOL tmp = useWhiteColor == 0 ? 1 : 0; + BOOL isDaytime = (hour >= 6 && hour < 18) ? FALSE : TRUE; if (wipe == 1 || wipe == 2 || wipe == 7 || wipe == 17 || wipe == 21 || - ((wipe == 8 || wipe == 10 || wipe == 18) && tmp) || - ((wipe == 9 || wipe == 11 || wipe == 19) && !tmp)) + ((wipe == 8 || wipe == 10 || wipe == 18) && isDaytime) || + ((wipe == 9 || wipe == 11 || wipe == 19) && !isDaytime)) { mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_saftyWhiteColor); } else if (wipe == 14 || wipe == 20) { @@ -136,42 +585,142 @@ static int dScnPly_Draw(dScnPly_c* i_this) { } } } + dMdl_mng_c::reset(); - if (!dComIfGp_isPauseFlag() && dScnPly_c::pauseTimer == 0) { + if (!dComIfGp_isPauseFlag() && !dScnPly_c::isPause() + #if DEBUG + && !fapGm_HIO_c::isCaptureScreen() + #endif + ) { if (fpcM_GetName(i_this) == PROC_PLAY_SCENE) { dComIfGp_getVibration().Run(); } daSus_c::execute(); dComIfG_Bgsp().Move(); + #if VERSION == VERSION_SHIELD_DEBUG + dPath_Move(); + #endif dComIfGp_particle_calc3D(); dComIfGp_particle_calc2D(); cCt_execCounter(); } else { dPa_control_c::onStatus(1); - if (dScnPly_c::pauseTimer == 0) { + + if (!dScnPly_c::isPause()) { dPa_control_c::onStatus(2); } + if (dScnPly_c::pauseTimer == 0) { dComIfGp_getVibration().Pause(); } } + #if DEBUG + if (fopOvlpM_IsDoingReq() != TRUE) { + if (dScnMenu_c::isAutoSelect() || dComIfG_isSceneResetButton() || g_presetHIO.field_0x2717 != 0) { + if (g_presetHIO.field_0x2717 != 0) { + dSm_read_stageset(g_presetHIO.mPresetData); + g_presetHIO.field_0x2717 = 0; + } + + s16 spA = 0; + if (dDemo_c::getMode() == 1) { + dDemo_c::end(); + spA = 7; + } + + fopScnM_ChangeReq(i_this, PROC_MENU_SCENE, spA, 5); + mDoAud_bgmStop(30); + + if (fpcM_GetName(i_this) != PROC_PLAY_SCENE) { + dComIfG_playerStatusD(); + } + } + } + + dDebugPad.Update(); + + fapGm_HIO_c::printCpuTimer(""); + fapGm_HIO_c::stopCpuTimer("ゲーム管理（計算処理２）"); + fapGm_HIO_c::printCpuTimer(""); + #endif + for (create_tag_class* i = fopDwIt_Begin(); i != NULL; i = fopDwIt_Next(i)) { - fpcM_Draw(i->mpTagData); + void* process = i->mpTagData; + fpcM_Draw(process); } + #if DEBUG + fapGm_HIO_c::startCpuTimer(); + #endif + if (!dComIfGp_isPauseFlag()) { dEyeHL_mng_c::update(); + + #if VERSION == VERSION_SHIELD_DEBUG + dBgp_c::drawShare(); + #endif + #if DEBUG + daSus_c::draw(); + #endif + dComIfG_Ccsp()->Draw(); - dComIfGp_getAttention()->Draw(); + #if DEBUG + dComIfG_Bgsp().Draw(); + dPath_Draw(); + #endif + + dAttention_c* attention = dComIfGp_getAttention(); + attention->Draw(); } + #if DEBUG + if (g_envHIO.mOther.mDisplayParticleInfo) { + g_envHIO.mOther.printParticle(); + } + + fapGm_HIO_c::printCpuTimer(""); + fapGm_HIO_c::stopCpuTimer("ゲーム管理（描画処理）"); + #endif + return 1; } +#if DEBUG +static BOOL l_pause; +static f32 l_pauseFrame; +static u8 lbl_8074CAE4; +static u32 l_sceneChangeStartTick; +#endif + static int dScnPly_Execute(dScnPly_c* i_this) { + #if DEBUG + fapGm_HIO_c::startCpuTimer(); + #endif + i_this->offReset(); + + #if DEBUG + if (lbl_8074CAE4) { + u32 var_r27 = OSGetTick() - l_sceneChangeStartTick; + OS_REPORT("\x1b[33m"); + // "Scene transition time: %f seconds\n" + OS_REPORT("シーン切り替え時間　%f秒\n\x1B[m", (f32)OSTicksToMicroseconds(var_r27) / 1000000.0f); + lbl_8074CAE4 = 0; + + initUsedHeapSize(); + OS_REPORT("Game Heap <%d,%d,%d>\n", mDoExt_getGameHeap()->getTotalUsedSize(), mDoExt_getGameHeap()->getTotalFreeSize(), mDoExt_getGameHeap()->getFreeSize()); + OS_REPORT("Zelda Heap <%d,%d,%d>\n", mDoExt_getZeldaHeap()->getTotalUsedSize(), mDoExt_getZeldaHeap()->getTotalFreeSize(), mDoExt_getZeldaHeap()->getFreeSize()); + OS_REPORT("Archive Heap <%d,%d,%d>\n", mDoExt_getArchiveHeap()->getTotalUsedSize(), mDoExt_getArchiveHeap()->getTotalFreeSize(), mDoExt_getArchiveHeap()->getFreeSize()); + OS_REPORT("最終残り　%d(%fM)\n", JFWSystem::getRootHeap()->getTotalFreeSize(), (f32)JFWSystem::getRootHeap()->getTotalFreeSize() / (f32)0x100000); + OS_REPORT("拡張最終残り　%d(%fM)\n", JKRGetRootHeap2()->getTotalFreeSize(), (f32)JKRGetRootHeap2()->getTotalFreeSize() / (f32)0x100000); + OS_REPORT("\x1b[m"); + } + #endif + + BOOL comboTrig = FALSE; + dStage_roomControl_c::offNoChangeRoom(); dStage_roomControl_c::setRoomReadId(0xFF); @@ -188,11 +737,63 @@ static int dScnPly_Execute(dScnPly_c* i_this) { } dKy_itudemo_se(); + + #if DEBUG + if (mDoCPd_c::isConnect(PAD_3)) { + if (mDoCPd_c::getTrigStart(PAD_1) && !fapGmHIO_get2Ddraw()) { + comboTrig = TRUE; + } else if (mDoCPd_c::getHoldR(PAD_2) && mDoCPd_c::getTrigStart(PAD_2)) { + comboTrig = TRUE; + } + + if (comboTrig == TRUE) { + if (l_pause) { + l_pause = FALSE; + } else { + l_pause = TRUE; + l_pauseFrame = 0.0f; + } + } + + if (l_pause) { + l_pauseFrame += mDoCPd_c::getAnalogR(PAD_2); + if (!mDoCPd_c::getTrigZ(PAD_2) && l_pauseFrame < 1.0f) { + i_this->onDebugPause(); + return 1; + } + + l_pauseFrame -= 1.0f; + } + + i_this->offDebugPause(); + } + #endif + if (!dComIfGp_isPauseFlag()) { + #if DEBUG + dJprev_c::get()->update(); + #endif + dDemo_c::update(); + + #if DEBUG + dJcame_c::get()->update(); + #endif + + #if VERSION == VERSION_SHIELD_DEBUG + dBgp_c::executeShare(); + #endif + dComIfGp_getEvent()->Step(); dComIfGp_getAttention()->Run(); } + + #if DEBUG + fapGm_HIO_c::printCpuTimer(""); + fapGm_HIO_c::stopCpuTimer("ゲーム管理（計算処理１）"); + fapGm_HIO_c::printCpuTimer(""); + #endif + return 1; } @@ -201,40 +802,34 @@ static int dScnPly_IsDelete(dScnPly_c i_this) { return 1; } -struct PreLoadInfo { - const char* stageName; - const s16* profNameTbl; - const char** resNameTbl; - u8 dylKeyTblNum; - u8 resNameNum; -}; - -static const char* T_JOINT_resName[1] = {"Always"}; - -static PreLoadInfo const PreLoadInfoT[1] = { - { - "T_JOINT", - T_JOINT_dylKeyTbl, - T_JOINT_resName, - 1, - 1, - }, -}; - -static s8 preLoadNo = -1; - -static u8 doPreLoad = 1; - static int dScnPly_Delete(dScnPly_c* i_this) { + UNUSED(i_this); + + #if VERSION == VERSION_SHIELD_DEBUG + for (int i = 0; i < 32; i++) { + char* bank = dStage_roomControl_c::getArcBank(i); + if (strcmp(bank, "") != 0) { + int rt = dComIfG_syncObjectRes(bank); + if (rt > 0) { + return 0; + } + } + } + #endif + daSus_c::reset(); dMpath_c::remove(); dTres_c::remove(); - dComIfGp_getAttention()->~dAttention_c(); + dAttention_c* attention = dComIfGp_getAttention(); + attention->~dAttention_c(); dComIfGp_getVibration().Remove(); dComIfG_Bgsp().Dt(); dComIfG_Ccsp()->Dt(); + #if VERSION == VERSION_SHIELD_DEBUG + dPath_Dt(); + #endif dStage_Delete(); dComIfGp_event_remove(); @@ -244,6 +839,11 @@ static int dScnPly_Delete(dScnPly_c* i_this) { dComIfGp_getMsgDtArchive(1)->removeResourceAll(); JKRUnmountArchive(dComIfGp_getMsgDtArchive(1)); + #if DEBUG + dJcame_c::remove(); + dJprev_c::remove(); + #endif + dDemo_c::remove(); fopMsgM_destroyExpHeap(dComIfGp_getExpHeap2D()); @@ -256,11 +856,25 @@ static int dScnPly_Delete(dScnPly_c* i_this) { mDoGph_gInf_c::getBloom()->remove(); + #if VERSION == VERSION_SHIELD_DEBUG + dBgp_c::removeShare(); + #endif + dComIfGs_offPlayerFieldLastStayFieldDataExistFlag(); + + #if DEBUG + daObj::HioObj_c::clean(); + mDoHIO_deleteChild(g_envHIO.field_0x4); + mDoHIO_deleteChild(g_save_bit_HIO.field_0x4); + g_preLoadHIO.removeHIO(); + #endif + dComIfGp_setWindowNum(0); dComIfGd_setView(NULL); if (preLoadNo >= 0) { + OS_REPORT("\x1b[32mプリロード解放\n\x1b[m"); + const char** resname_table = PreLoadInfoT[preLoadNo].resNameTbl; int res_num = PreLoadInfoT[preLoadNo].resNameNum; if (resname_table != NULL && (*resname_table != NULL)) { @@ -288,6 +902,113 @@ static int dScnPly_Delete(dScnPly_c* i_this) { return 1; } +#if DEBUG +static u32 getArchiveHeapSize(JKRHeap* i_heap, dRes_info_c* i_resInfo) { + if (i_resInfo == NULL) { + return 0; + } + + u32 size = 0; + int var_r29; + JKRArchive* archive = i_resInfo->getArchive(); + if (archive != NULL) { + var_r29 = i_heap->getSize(archive); + if (var_r29 > 0) { + size += var_r29 + 0x10; + } + + var_r29 = i_heap->getSize(((JKRAramArchive*)archive)->mBlock); + if (var_r29 > 0) { + size += var_r29 + 0x10; + } + } + + JKRSolidHeap* dataHeap = i_resInfo->getDataHeap(); + if (dataHeap != NULL) { + int var_r26 = i_heap->getSize(dataHeap); + if (var_r26 > 0) { + size += var_r26 + 0x10; + } + } + + return size; +} + +static u32 getArchiveBankHeapSize(JKRHeap* i_heap) { + u32 size = 0; + for (int i = 0; i < 32; i++) { + char* bank = dStage_roomControl_c::getArcBank(i); + if (strcmp(bank, "") != 0) { + size += getArchiveHeapSize(i_heap, dComIfG_getObjectResInfo(bank)); + } + } + + return size; +} + +static u32 getStageHeapSize(JKRHeap* i_heap) { + u32 size = 0; + for (int i = 0; i < 19; i++) { + JKRHeap* heap = dStage_roomControl_c::getMemoryBlockHeap(i); + if (heap != NULL) { + int var_r26 = i_heap->getSize(heap); + if (var_r26 > 0) { + size += var_r26 + 0x10; + } + } + } + + if (size == 0) { + for (int i = 0; i < 64; i++) { + size += getArchiveHeapSize(i_heap, dComIfG_getStageResInfo(dComIfG_getRoomArcName(i))); + } + } + + size += getArchiveHeapSize(i_heap, dComIfG_getStageResInfo("Stg_00")) + getArchiveHeapSize(i_heap, dComIfG_getStageResInfo("Xtg_00")); + return size; +} + +static BOOL heapSizeCheck(const char* i_label, JKRExpHeap* i_heap, s32 i_base, BOOL param_3) { + s32 free = i_heap->getFreeSize(); + s32 total = i_heap->getTotalUsedSize(); + + if (param_3) { + total -= getArchiveBankHeapSize(i_heap); + total -= getStageHeapSize(i_heap); + } + + s32 archiveHeapSize = mDoExt_getSafeArchiveHeapSize(); + f32 totalRatio = (f32)total / (f32)archiveHeapSize; + f32 freeRatio = (f32)free / (f32)total; + OS_REPORT("%s Free<%d> Total<%d> Base<%d> TotalRatio<%f> FreeRatio<%f>\n", + i_label, + free, + total, + i_base, + totalRatio, + freeRatio + ); + + int var_r30 = std::abs(total - i_base); + if (var_r30 > 64) { + // "%d (0x%x) byte difference!\n" + OS_REPORT("%d (0x%x) バイトの差があります！\n", var_r30, var_r30); + i_heap->dump(); + return FALSE; + } + + return TRUE; +} + +static BOOL heapSizeCheck() { + return heapSizeCheck("ArchiveHeap", mDoExt_getArchiveHeap(), mDoExt_getSafeArchiveHeapSize(), TRUE) + && heapSizeCheck("J2dHeap", mDoExt_getJ2dHeap(), mDoExt_getSafeJ2dHeapSize(), FALSE) + && heapSizeCheck("GameHeap", mDoExt_getGameHeap(), mDoExt_getSafeGameHeapSize(), TRUE) + && heapSizeCheck("ZeldaHeap", mDoExt_getZeldaHeap(), mDoExt_getSafeZeldaHeapSize(), FALSE) + && heapSizeCheck("CommandHeap", mDoExt_getCommandHeap(), mDoExt_getSafeCommandHeapSize(), FALSE); +} +#endif + bool dScnPly_c::resetGame() { if (fpcM_GetName(this) == PROC_OPENING_SCENE) { if (!dStage_roomControl_c::resetArchiveBank(0)) { @@ -302,6 +1023,7 @@ bool dScnPly_c::resetGame() { field_0x1d4 = 1; } } else { + #if VERSION != VERSION_SHIELD_DEBUG if (dComIfGp_getNextStagePoint() == -4 || (dComIfGs_getLastSceneMode() & 0xF) == 0xC || !strcmp(dComIfGp_getNextStageName(), "F_SP109") || (!strcmp(dComIfGp_getNextStageName(), "F_SP116") && @@ -311,6 +1033,7 @@ bool dScnPly_c::resetGame() { return false; } } + #endif } dComIfG_setBrightness(255); @@ -323,8 +1046,10 @@ void dScnPly_c::offReset() { if (field_0x1d4 != 0 && !fopOvlpM_IsPeek()) { mDoRst::offReset(); mDoRst::offResetPrepare(); + #if VERSION != VERSION_SHIELD_DEBUG JUTGamePad::C3ButtonReset::sResetOccurred = false; JUTGamePad::setResetCallback(mDoRst_resetCallBack, NULL); + #endif field_0x1d4 = 0; } } @@ -332,14 +1057,35 @@ void dScnPly_c::offReset() { static int phase_00(dScnPly_c* i_this) { if (!i_this->resetGame()) { return cPhs_INIT_e; - } else { - #if PLATFORM_WII - data_8053a730 = 1; - #endif + } - mDoGph_gInf_c::offBlure(); - return cPhs_NEXT_e; + #if PLATFORM_WII + data_8053a730 = 1; + #endif + + #if DEBUG + l_sceneChangeStartTick = OSGetTick(); + lbl_8074CAE4 = 1; + + mDoExt_setSafeGameHeapSize(); + mDoExt_setSafeZeldaHeapSize(); + mDoExt_setSafeCommandHeapSize(); + mDoExt_setSafeArchiveHeapSize(); + mDoExt_setSafeJ2dHeapSize(); + #endif + + mDoGph_gInf_c::offBlure(); + + #if DEBUG + if (!heapSizeCheck()) { + BOOL isDispWarning = mDoCPd_c::isConnect(PAD_3); + if (isDispWarning) { + JUT_WARN(2046, "%s", "Memory Danger !!"); + } } + #endif + + return cPhs_NEXT_e; } static int phase_01(dScnPly_c* i_this) { @@ -353,6 +1099,7 @@ static int phase_01(dScnPly_c* i_this) { mDoAud_setInDarkness(false); } + mDoAud_setSceneName(dComIfGp_getStartStageName(), dComIfGp_getStartStageRoomNo(), dComIfG_play_c::getLayerNo_common(dComIfGp_getStartStageName(), dComIfGp_getStartStageRoomNo(), @@ -370,19 +1117,17 @@ static int phase_0(dScnPly_c* i_this) { } static int phase_1(dScnPly_c* i_this) { - u32 id = fopScnM_GetID(i_this); - dStage_roomControl_c::setProcID(id); + dStage_roomControl_c::setProcID(fopScnM_GetID(i_this)); dComIfGp_setStartStage(dComIfGp_getNextStartStage()); if (dComIfGp_getStartStageLayer() < 0 && daPy_py_c::checkRoomRestartStart()) { - const char* stage = dComIfGp_getStartStageName(); - s8 room = dComIfGp_getStartStageRoomNo(); - s8 layer = dComIfGp_getStartStageLayer(); - if (dComIfG_play_c::getLayerNo_common_common(stage, room, layer) < 0) { + int layer = dComIfG_play_c::getLayerNo_common_common(dComIfGp_getStartStageName(), dComIfGp_getStartStageRoomNo(), dComIfGp_getStartStageLayer()); + if (layer < 0) { dComIfGp_setStartStageLayer(dComIfGp_getLayerOld()); } } + dComIfGp_offEnableNextStage(); // Stage: Faron Woods, Room: Faron Spring @@ -431,14 +1176,32 @@ static int phase_1(dScnPly_c* i_this) { dComIfGp_world_dark_set(0); } + #if DEBUG + if (dKy_darkworld_check()) { + if (dComIfGp_getStartStageLayer() != -1 && dComIfGp_getStartStageLayer() < 10 && dComIfG_play_c::getLayerNo(0) < 10) { + if (strcmp(dComIfGp_getStartStageName(), "D_MN08") != 0) { + // "Twilight layer spec error! sasaki" + OSReport_Error("\nトワイライトのレイヤー指定異常です！ sasaki"); + // "(If loaded from the debug menu, you can directly specify layers, so I can't tell if it's invalid.)" + OSReport_Error("\n(デバグメニューからの場合はレイヤー直指定できるので危険なのかは予測つきません。）"); + + OSReport_Error("\nstage[%s]", dComIfGp_getStartStageName()); + OSReport_Error("\nroom[%d]", dComIfGp_getStartStageRoomNo()); + OSReport_Error("\nlayer[%d]", dComIfG_play_c::getLayerNo(0)); + OSReport_Error("\nTW1[%d]", dComIfGs_isDarkClearLV(0)); + OSReport_Error("\nTW2[%d]", dComIfGs_isDarkClearLV(1)); + OSReport_Error("\nTW3[%d]", dComIfGs_isDarkClearLV(2)); + OSReport_Error("\nTW4[%d]", dComIfGs_isDarkClearLV(3)); + } + } + } + #endif + // Stage: Lake Hylia, Room: Fountain if (!strcmp(dComIfGp_getStartStageName(), "F_SP115") && dComIfGp_getStartStageRoomNo() == 1 && dComIfGp_getStartStageLayer() < 0) { - const char* stage = dComIfGp_getStartStageName(); - s8 room = dComIfGp_getStartStageRoomNo(); - s8 layer = dComIfGp_getStartStageLayer(); - if (dComIfG_play_c::getLayerNo_common(stage, room, layer) == 9) { + if (dComIfG_play_c::getLayerNo_common(dComIfGp_getStartStageName(), dComIfGp_getStartStageRoomNo(), dComIfGp_getStartStageLayer()) == 9) { dComIfGp_setStartStageLayer(9); } } @@ -467,6 +1230,14 @@ static int phase_1(dScnPly_c* i_this) { dComIfGs_onSaveDunSwitch(30); } + #if DEBUG + if (!strcmp(dComIfGp_getStartStageName(), "NPC_GND") && dComIfGp_getStartStageRoomNo() == 0 && + dComIfGp_getStartStageLayer() >= 12) + { + dComIfGp_world_dark_set(1); + } + #endif + dKy_darkworld_Area_set(dComIfGp_getStartStageName(), dComIfGp_getStartStageRoomNo()); // Stage: Hyrule Castle Sewers, Room: Prison Cell @@ -507,21 +1278,36 @@ static int phase_1(dScnPly_c* i_this) { } dComIfGs_BossLife_public_Set(0xFF); + + #if DEBUG + if (g_env_light.light_mask_type & 0xF0) { + g_env_light.light_mask_type = g_env_light.light_mask_type & 0xF; + } else { + g_env_light.light_mask_type = 0; + } + #else g_env_light.light_mask_type = 0; + #endif JUTReportConsole_f("Start StageName:RoomNo [%s:%d]\n", dComIfGp_getStartStageName(), dComIfGp_getStartStageRoomNo()); dComIfGp_setStatus(0); + if (dComIfG_syncStageRes("Stg_00") < 0) { - dComIfG_setStageRes("Stg_00", NULL); + int rt = dComIfG_setStageRes("Stg_00", NULL); + JUT_ASSERT(2442, rt == 1); } + return cPhs_NEXT_e; } static int phase_1_0(dScnPly_c* i_this) { static char camparamarc[10] = "CamParam"; - if (dComIfG_syncStageRes("Stg_00")) { + int rt = dComIfG_syncStageRes("Stg_00"); + JUT_ASSERT(2469, rt >= 0); + + if (rt != 0) { return cPhs_INIT_e; } else { dStage_infoCreate(); @@ -533,8 +1319,8 @@ static int phase_1_0(dScnPly_c* i_this) { } static int phase_2(dScnPly_c* i_this) { - int tmp = dComIfG_syncAllObjectRes(); - if (tmp >= 0 && tmp != 0) { + int rt = dComIfG_syncAllObjectRes(); + if (rt >= 0 && rt != 0) { return cPhs_INIT_e; } @@ -544,6 +1330,13 @@ static int phase_2(dScnPly_c* i_this) { particle_no = dStage_stagInfo_GetParticleNo(dComIfGp_getStage()->getStagInfo()); } + #if DEBUG + if (fapGm_HIO_c::mParticle254Fix) { + particle_no = 0xFE; + } + #endif + + OS_REPORT("============== sceneParticleNo=%d\n", particle_no); dComIfGp_particle_readScene(particle_no, &i_this->sceneCommand); dMsgObject_readMessageGroup(&i_this->field_0x1d0); return cPhs_NEXT_e; @@ -558,6 +1351,10 @@ static int phase_3(dScnPly_c* i_this) { return cPhs_INIT_e; } + #if VERSION == VERSION_SHIELD_DEBUG + dBgp_c::createShare(); + #endif + return cPhs_NEXT_e; } @@ -570,9 +1367,16 @@ dScnPly_preset_HIO_c g_presetHIO; #endif static int phase_4(dScnPly_c* i_this) { + #if VERSION == VERSION_SHIELD_DEBUG + if (!dBgp_c::executeShare()) { + return cPhs_INIT_e; + } + #endif + if (i_this->sceneCommand) { + JUT_ASSERT(2610, i_this->sceneCommand->getMemAddress() != NULL); dComIfGp_particle_createScene(i_this->sceneCommand->getMemAddress()); - i_this->sceneCommand->destroy(); + delete i_this->sceneCommand; } else { dComIfGp_particle_createScene(NULL); } @@ -583,13 +1387,25 @@ static int phase_4(dScnPly_c* i_this) { } dComIfGp_calcNowRegion(); + #if DEBUG + dComIfG_initStopwatch(); + #endif dComIfG_Bgsp().Ct(); fopAcM_lc_c::getLineCheck()->ClearPi(); fopAcM_gc_c::getGroundCheck()->ClearPi(); fopAcM_rc_c::getRoofCheck()->ClearPi(); fopAcM_wt_c::getWaterCheck()->ClearPi(); dComIfG_Ccsp()->Ct(); + #if VERSION == VERSION_SHIELD_DEBUG + dPath_Ct(); + #endif dDemo_c::create(); + dEyeHL_mng_c::create(); + + #if DEBUG + dJcame_c::create(dDemo_c::getSystem(), 0.03333334f, *mDoCPd_c::getGamePad(PAD_4)); + dJprev_c::create((JStudio::TControl*)dDemo_c::getControl(), *mDoCPd_c::getGamePad(PAD_4)); + #endif dComIfGp_setPlayerInfo(0, NULL, 0); for (int i = 0; i < 2; i++) { @@ -602,11 +1418,19 @@ static int phase_4(dScnPly_c* i_this) { dComIfGd_setViewport(NULL); dComIfGd_setView(NULL); - dComIfGp_setExpHeap2D(fopMsgM_createExpHeap(0xBB800, NULL)); - dComIfGp_setMsgExpHeap(fopMsgM_createExpHeap(0xA800, NULL)); + JKRExpHeap* heap = fopMsgM_createExpHeap(0xBB800, NULL); + JUT_ASSERT(2704, heap != NULL); + dComIfGp_setExpHeap2D(heap); + + JKRExpHeap* heap2 = fopMsgM_createExpHeap(0xA800, NULL); + JUT_ASSERT(2709, heap2 != NULL); + dComIfGp_setMsgExpHeap(heap2); if (fpcM_GetName(i_this) == PROC_OPENING_SCENE) { fopAcM_create(PROC_TITLE, 0, NULL, -1, NULL, NULL, -1); + #if DEBUG + g_playerKind = 0; + #endif dComIfGs_init(); dComIfGs_setOptPointer(0); dComIfGs_setLife(12); @@ -622,10 +1446,20 @@ static int phase_4(dScnPly_c* i_this) { dComIfGp_createSimpleModel(); dMdl_mng_c::create(); - mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 30); - g_envHIO.field_0x4 = -1; - g_save_bit_HIO.field_0x4 = -1; - new (dComIfGp_getAttention()) dAttention_c(dComIfGp_getPlayer(0), 0); + mDoGph_gInf_c::setTickRate(OS_TIMER_CLOCK / 30); + + #if DEBUG + g_preLoadHIO.entryHIO("プリロード制御"); + #endif + g_envHIO.field_0x4 = mDoHIO_CREATE_CHILD("描画設定", &g_envHIO); + g_save_bit_HIO.field_0x4 = mDoHIO_CREATE_CHILD("記録ビット", &g_save_bit_HIO); + + #if DEBUG + daObj::HioObj_c::init(); + #endif + + dAttention_c* attention = dComIfGp_getAttention(); + new (attention) dAttention_c(dComIfGp_getPlayer(0), 0); dComIfGp_getVibration().Init(); daYkgr_c::init(); @@ -650,6 +1484,7 @@ static int phase_4(dScnPly_c* i_this) { return cPhs_COMPLEATE_e; } + OS_REPORT("\x1b[32mプリロードやります\n\x1b[m"); resPreLoadTime0 = OSGetTime(); return cPhs_NEXT_e; } @@ -657,25 +1492,30 @@ static int phase_4(dScnPly_c* i_this) { static int phase_5(dScnPly_c* i_this) { if (preLoadNo >= 0) { int phase_state = cPhs_NEXT_e; + int goodLoads = 0; + int loadNum = 0; const char** resNames = PreLoadInfoT[preLoadNo].resNameTbl; s32 resNameNum = PreLoadInfoT[preLoadNo].resNameNum; if (resNames != NULL && *resNames != NULL) { JUT_ASSERT(2830, resNameNum <= ARRAY_SIZEU(resPhase)); - int goodLoads = 0; - int loadNum = 0; + for (int i = 0; i < resNameNum; i++) { - if (dComIfG_resLoad(&resPhase[i], resNames[i]) == 4) { - goodLoads++; - } else { + int load_phase = dComIfG_resLoad(&resPhase[i], resNames[i]); + if (load_phase != cPhs_COMPLEATE_e) { phase_state = cPhs_INIT_e; + } else { + goodLoads++; } loadNum++; } + + OS_REPORT("\x1b[32mリソースプリロード %d/%d\n\x1b[m", goodLoads, loadNum); } if (phase_state == cPhs_COMPLEATE_e) { resPreLoadTime1 = OSGetTime(); + OS_REPORT("\x1b[32mリソースプリロード %lld ms\n\x1b[m", OSTicksToMilliseconds(resPreLoadTime1 - resPreLoadTime0)); } return phase_state; @@ -687,25 +1527,30 @@ static int phase_5(dScnPly_c* i_this) { static int phase_6(dScnPly_c* i_this) { if (preLoadNo >= 0) { int phase_state = cPhs_NEXT_e; + int goodLoads = 0; + int loadNum = 0; const s16* dylKeyTbl = PreLoadInfoT[preLoadNo].profNameTbl; s32 dylKeyTblNum = PreLoadInfoT[preLoadNo].dylKeyTblNum; if (dylKeyTbl != NULL && *dylKeyTbl != 0) { JUT_ASSERT(2864, dylKeyTblNum <= ARRAY_SIZEU(dylPhase)); - int goodLoads = 0; - int loadNum = 0; + for (int i = 0; i < dylKeyTblNum; i++) { - if (cDylPhs::Link(&dylPhase[i], dylKeyTbl[i]) == cPhs_COMPLEATE_e) { - goodLoads++; - } else { + int load_phase = cDylPhs::Link(&dylPhase[i], dylKeyTbl[i]); + if (load_phase != cPhs_COMPLEATE_e) { phase_state = cPhs_INIT_e; + } else { + goodLoads++; } loadNum++; } + + OS_REPORT("\x1b[32mダイナミックリンクプリロード %d/%d\n\x1b[m", goodLoads, loadNum); } if (phase_state == cPhs_COMPLEATE_e) { dylPreLoadTime1 = OSGetTime(); + OS_REPORT("\x1b[32mダイナミックリンクプリロード %lld ms\n\x1b[m", OSTicksToMilliseconds(dylPreLoadTime1 - dylPreLoadTime0)); } return phase_state; @@ -718,17 +1563,24 @@ static int phase_compleate(void* i_this) { return cPhs_COMPLEATE_e; } -static void dScnPly_Create(scene_class* i_this) { +static int dScnPly_Create(scene_class* i_this) { static request_of_phase_process_fn l_method[] = { - (request_of_phase_process_fn)phase_00, (request_of_phase_process_fn)phase_1, - (request_of_phase_process_fn)phase_1_0, (request_of_phase_process_fn)phase_01, - (request_of_phase_process_fn)phase_0, (request_of_phase_process_fn)phase_2, - (request_of_phase_process_fn)phase_3, (request_of_phase_process_fn)phase_4, - (request_of_phase_process_fn)phase_5, (request_of_phase_process_fn)phase_6, + (request_of_phase_process_fn)phase_00, + (request_of_phase_process_fn)phase_1, + (request_of_phase_process_fn)phase_1_0, + (request_of_phase_process_fn)phase_01, + (request_of_phase_process_fn)phase_0, + (request_of_phase_process_fn)phase_2, + (request_of_phase_process_fn)phase_3, + (request_of_phase_process_fn)phase_4, + (request_of_phase_process_fn)phase_5, + (request_of_phase_process_fn)phase_6, (request_of_phase_process_fn)phase_compleate, }; - dComLbG_PhaseHandler(&static_cast(i_this)->field_0x1c4, l_method, i_this); + dScnPly_c* a_this = (dScnPly_c*)i_this; + int phase_state = dComLbG_PhaseHandler(&a_this->field_0x1c4, l_method, a_this); + return phase_state; } static scene_method_class l_dScnPly_Method = { diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index cd0fcd0958b..e1bd46d431d 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1552,7 +1552,7 @@ u8 data_8074C56A_debug; u8 data_8074C56B_debug; u8 data_8074C56C_debug; -u32 dStage_roomControl_c::mProcID; +fpc_ProcID dStage_roomControl_c::mProcID; s8 dStage_roomControl_c::mStayNo; @@ -2485,7 +2485,7 @@ static void dStage_dt_c_stageInitLoader(void* i_data, dStage_dt_c* i_stage) { } #if DEBUG -static void dStage_DebugDisp() { +void dStage_DebugDisp() { if (data_8074C569_debug) { JUTReport(30, 270, "envLayerSet: EnvRoom None"); } diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 2bc28c20142..8c0bb21f31b 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -895,7 +895,7 @@ bool fopAcM_checkCullingBox(Mtx m, f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32 z return false; } -static cull_box l_cullSizeBox[] = { +cull_box l_cullSizeBox[fopAc_CULLBOX_MAX_e] = { { {-40.0f, 0.0f, -40.0f}, {40.0f, 125.0f, 40.0f}, @@ -960,7 +960,7 @@ static cull_box l_cullSizeBox[] = { #endif }; -static cull_sphere l_cullSizeSphere[] = { +cull_sphere l_cullSizeSphere[fopAc_CULLSPHERE_MAX_e] = { { {0.0f, 0.0f, 0.0f}, 80.0f, diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index c65007622a1..2e0563f2c97 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -12,8 +12,8 @@ static int fopKy_KANKYO_TYPE; -void fopKy_IsKankyo(void* i_this) { - fpcM_IsJustType(fopKy_KANKYO_TYPE, ((kankyo_class*)i_this)->type); +BOOL fopKy_IsKankyo(void* i_this) { + return fpcM_IsJustType(fopKy_KANKYO_TYPE, ((kankyo_class*)i_this)->type); } static int fopKy_Draw(void* i_this) { diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index 00931738171..fe71a828c22 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -11,8 +11,8 @@ void dummy(fpcLyIt_JudgeFunc i_createFunc, void* i_this) { fpcM_Search(i_createFunc, i_this); } -void fopKyM_IsKy(void* i_this) { - fopKy_IsKankyo((fopKyM_prm_class*)i_this); +BOOL fopKyM_IsKy(void* i_this) { + return fopKy_IsKankyo((fopKyM_prm_class*)i_this); } fopKyM_prm_class* fopKyM_CreateAppend() { diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index 231c8184382..9d34eae1ee6 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -22,7 +22,7 @@ u8 mDoAud_zelAudio_c::mInitFlag; u8 mDoAud_zelAudio_c::mResetFlag; -bool mDoAud_zelAudio_c::mBgmSet; +u8 mDoAud_zelAudio_c::mBgmSet; void mDoAud_zelAudio_c::reset() { mBgmSet = false; From 9649319ec4926457ef85e6094f8207474c977c2d Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sun, 1 Mar 2026 15:35:36 -0700 Subject: [PATCH 15/35] Reorganize library code into `libs/` (#3119) * Reorganize files into libs/{dolphin,JSystem,PowerPC_EABI_Support,revolution,TRK_MINNOW_DOLPHIN} * Update configure.py and project.py for new libs structure * Refactor `#include ` -> `` * Remove `__REVOLUTION_SDK__` forwards from dolphin * Fix dolphin/ references in revolution * Wrap `#include ` in `!__REVOLUTION_SDK__` * Always build TRK against dolphin headers * Resolve revolution SDK header resolution issues --- configure.py | 82 +++++++++++-------- include/DynamicLink.h | 2 +- include/NdevExi2A/DebuggerDriver.h | 2 +- .../SSystem/SComponent/c_API_controller_pad.h | 2 +- include/SSystem/SComponent/c_bg_s_chk.h | 2 +- include/SSystem/SComponent/c_bg_s_poly_info.h | 2 +- include/SSystem/SComponent/c_bg_w.h | 2 +- include/SSystem/SComponent/c_counter.h | 2 +- include/SSystem/SComponent/c_lib.h | 2 +- include/SSystem/SComponent/c_m3d.h | 2 +- include/SSystem/SComponent/c_m3d_g_cir.h | 2 +- include/SSystem/SComponent/c_malloc.h | 2 +- include/SSystem/SComponent/c_phase.h | 2 +- include/SSystem/SComponent/c_request.h | 2 +- include/SSystem/SComponent/c_sxyz.h | 2 +- include/SSystem/SComponent/c_tag.h | 2 +- include/SSystem/SComponent/c_xyz.h | 2 +- include/SSystem/SStandard/s_basic.h | 2 +- .../MetroTRK/Portable/dispatch.h | 2 +- .../MetroTRK/Portable/mem_TRK.h | 2 +- .../MetroTRK/Portable/msg.h | 2 +- .../MetroTRK/Portable/mutex_TRK.h | 2 +- .../TRK_MINNOW_DOLPHIN/Os/dolphin/DDH_Stubs.h | 2 +- .../Os/dolphin/GDEV_Stubs.h | 2 +- .../TRK_MINNOW_DOLPHIN/Os/dolphin/UDP_Stubs.h | 2 +- .../Os/dolphin/dolphin_trk_glue.h | 2 +- .../Os/dolphin/target_options.h | 2 +- .../TRK_MINNOW_DOLPHIN/Os/dolphin/usr_put.h | 2 +- .../TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.h | 2 +- .../utils/common/CircleBuffer.h | 2 +- .../TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h | 2 +- .../utils/gc/MWCriticalSection_gc.h | 2 +- include/Z2AudioCS/Z2AudioCS.h | 2 +- include/Z2AudioLib/Z2Calc.h | 2 +- include/Z2AudioLib/Z2Param.h | 2 +- include/Z2AudioLib/Z2StatusMgr.h | 2 +- include/d/actor/d_a_balloon_2D.h | 2 +- include/d/actor/d_a_door_bossL1.h | 2 +- include/d/actor/d_a_door_bossL5.h | 2 +- include/d/actor/d_a_door_mbossL1.h | 2 +- include/d/actor/d_a_door_shutter.h | 2 +- include/d/actor/d_a_e_db_leaf.h | 2 +- include/d/actor/d_a_e_oct_bg.h | 2 +- include/d/actor/d_a_fr.h | 2 +- include/d/actor/d_a_kytag12.h | 2 +- include/d/actor/d_a_kytag13.h | 2 +- include/d/actor/d_a_movie_player.h | 2 +- include/d/actor/d_a_npc_cd2.h | 2 +- include/d/actor/d_a_npc_toby.h | 2 +- include/d/actor/d_a_obj_avalanche.h | 2 +- include/d/actor/d_a_obj_bed.h | 2 +- include/d/actor/d_a_obj_bmWindow.h | 2 +- include/d/actor/d_a_obj_hata.h | 2 +- include/d/actor/d_a_obj_stopper.h | 2 +- include/d/actor/d_a_path_line.h | 2 +- include/d/actor/d_a_peru.h | 2 +- include/d/actor/d_a_ppolamp.h | 2 +- include/d/actor/d_a_tag_kmsg.h | 2 +- include/d/d_bg_pc.h | 2 +- include/d/d_bg_s.h | 2 +- include/d/d_bg_w.h | 4 +- include/d/d_bg_w_base.h | 2 +- include/d/d_cc_uty.h | 2 +- include/d/d_debug_viewer.h | 2 +- include/d/d_door_param2.h | 2 +- include/d/d_event_lib.h | 2 +- include/d/d_eye_hl.h | 2 +- include/d/d_item.h | 2 +- include/d/d_item_data.h | 2 +- include/d/d_jpreviewer.h | 2 +- include/d/d_kankyo_data.h | 2 +- include/d/d_kankyo_rain.h | 2 +- include/d/d_kankyo_tev_str.h | 2 +- include/d/d_lib.h | 4 +- include/d/d_menu_dmap.h | 2 +- include/d/d_menu_fmap2D.h | 2 +- include/d/d_menu_fmap_map.h | 2 +- include/d/d_menu_map_common.h | 2 +- include/d/d_menu_window_HIO.h | 2 +- include/d/d_msg_flow.h | 2 +- include/d/d_msg_out_font.h | 2 +- include/d/d_msg_scrn_arrow.h | 2 +- include/d/d_msg_scrn_item.h | 2 +- include/d/d_msg_scrn_talk.h | 2 +- include/d/d_particle_name.h | 2 +- include/d/d_path.h | 4 +- include/d/d_save.h | 2 +- include/d/d_tresure.h | 2 +- include/d/d_vib_pattern.h | 2 +- include/f_op/f_op_view.h | 2 +- include/f_pc/f_pc_create_iter.h | 2 +- include/f_pc/f_pc_debug_sv.h | 6 +- include/f_pc/f_pc_deletor.h | 2 +- include/f_pc/f_pc_draw.h | 2 +- include/f_pc/f_pc_draw_priority.h | 2 +- include/f_pc/f_pc_layer_iter.h | 2 +- include/f_pc/f_pc_load.h | 2 +- include/f_pc/f_pc_method.h | 2 +- include/f_pc/f_pc_method_iter.h | 2 +- include/f_pc/f_pc_pause.h | 2 +- include/f_pc/f_pc_profile.h | 2 +- include/m_Do/m_Do_MemCard.h | 4 +- include/m_Do/m_Do_MemCardRWmng.h | 2 +- include/m_Do/m_Do_Reset.h | 2 +- include/m_Do/m_Do_dvd_thread.h | 4 +- include/m_Do/m_Do_machine.h | 2 +- include/m_Do/m_Do_main.h | 2 +- include/m_Do/m_Do_mtx.h | 2 +- include/m_Do/m_Do_printf.h | 2 +- .../include}/JSystem/J2DGraph/J2DAnimation.h | 0 .../include}/JSystem/J2DGraph/J2DAnmLoader.h | 0 .../JSystem/J2DGraph/J2DGrafContext.h | 2 +- .../include}/JSystem/J2DGraph/J2DManage.h | 2 +- .../include}/JSystem/J2DGraph/J2DMatBlock.h | 0 .../include}/JSystem/J2DGraph/J2DMaterial.h | 0 .../JSystem/J2DGraph/J2DMaterialFactory.h | 0 .../include}/JSystem/J2DGraph/J2DOrthoGraph.h | 0 .../include}/JSystem/J2DGraph/J2DPane.h | 4 +- .../include}/JSystem/J2DGraph/J2DPicture.h | 0 .../include}/JSystem/J2DGraph/J2DPictureEx.h | 0 .../include}/JSystem/J2DGraph/J2DPrint.h | 0 .../include}/JSystem/J2DGraph/J2DScreen.h | 0 .../include}/JSystem/J2DGraph/J2DTevs.h | 4 +- .../include}/JSystem/J2DGraph/J2DTextBox.h | 0 .../include}/JSystem/J2DGraph/J2DTextBoxEx.h | 0 .../include}/JSystem/J2DGraph/J2DWindow.h | 0 .../include}/JSystem/J2DGraph/J2DWindowEx.h | 0 .../JSystem/include}/JSystem/J3DAssert.h | 0 .../JSystem/J3DGraphAnimator/J3DAnimation.h | 2 +- .../JSystem/J3DGraphAnimator/J3DCluster.h | 0 .../JSystem/J3DGraphAnimator/J3DJoint.h | 0 .../JSystem/J3DGraphAnimator/J3DJointTree.h | 0 .../JSystem/J3DGraphAnimator/J3DMaterialAnm.h | 0 .../J3DGraphAnimator/J3DMaterialAttach.h | 0 .../JSystem/J3DGraphAnimator/J3DModel.h | 2 +- .../JSystem/J3DGraphAnimator/J3DModelData.h | 0 .../JSystem/J3DGraphAnimator/J3DMtxBuffer.h | 0 .../JSystem/J3DGraphAnimator/J3DShapeTable.h | 0 .../JSystem/J3DGraphAnimator/J3DSkinDeform.h | 2 +- .../JSystem/J3DGraphBase/J3DDrawBuffer.h | 0 .../include}/JSystem/J3DGraphBase/J3DEnum.h | 0 .../include}/JSystem/J3DGraphBase/J3DFifo.h | 4 +- .../include}/JSystem/J3DGraphBase/J3DGD.h | 4 +- .../JSystem/J3DGraphBase/J3DMatBlock.h | 0 .../JSystem/J3DGraphBase/J3DMaterial.h | 0 .../include}/JSystem/J3DGraphBase/J3DPacket.h | 4 +- .../include}/JSystem/J3DGraphBase/J3DShape.h | 2 +- .../JSystem/J3DGraphBase/J3DShapeDraw.h | 2 +- .../JSystem/J3DGraphBase/J3DShapeMtx.h | 2 +- .../include}/JSystem/J3DGraphBase/J3DStruct.h | 6 +- .../include}/JSystem/J3DGraphBase/J3DSys.h | 4 +- .../include}/JSystem/J3DGraphBase/J3DTevs.h | 4 +- .../JSystem/J3DGraphBase/J3DTexture.h | 0 .../JSystem/J3DGraphBase/J3DTransform.h | 2 +- .../include}/JSystem/J3DGraphBase/J3DVertex.h | 4 +- .../JSystem/J3DGraphLoader/J3DAnmLoader.h | 0 .../JSystem/J3DGraphLoader/J3DClusterLoader.h | 0 .../JSystem/J3DGraphLoader/J3DJointFactory.h | 0 .../J3DGraphLoader/J3DMaterialFactory.h | 2 +- .../J3DGraphLoader/J3DMaterialFactory_v21.h | 2 +- .../JSystem/J3DGraphLoader/J3DModelLoader.h | 2 +- .../J3DGraphLoader/J3DModelLoaderCalcSize.h | 2 +- .../JSystem/J3DGraphLoader/J3DModelSaver.h | 0 .../JSystem/J3DGraphLoader/J3DShapeFactory.h | 2 +- .../include}/JSystem/J3DU/J3DUClipper.h | 2 +- .../JSystem/include}/JSystem/J3DU/J3DUD.h | 2 +- .../JSystem/include}/JSystem/J3DU/J3DUDL.h | 0 .../JSystem/include}/JSystem/J3DU/J3DUFur.h | 0 .../include}/JSystem/J3DU/J3DUMotion.h | 0 .../include}/JSystem/J3DU/J3DUShadow.h | 0 .../JSystem/JAHNodeLib/JAHSoundPlayerNode.h | 0 .../include}/JSystem/JAHostIO/JAHFrameNode.h | 2 +- .../include}/JSystem/JAHostIO/JAHPubDefine.h | 0 .../include}/JSystem/JAHostIO/JAHUTableEdit.h | 0 .../JSystem/JAHostIO/JAHVirtualNode.h | 0 .../include}/JSystem/JAHostIO/JAHioMessage.h | 2 +- .../include}/JSystem/JAHostIO/JAHioMgr.h | 0 .../include}/JSystem/JAHostIO/JAHioNode.h | 0 .../include}/JSystem/JAHostIO/JAHioUtil.h | 0 .../JSystem/JAWExtSystem/JAWExtSystem.h | 0 .../JSystem/JAWExtSystem/JAWGraphContext.h | 0 .../include}/JSystem/JAWExtSystem/JAWSystem.h | 0 .../include}/JSystem/JAWExtSystem/JAWWindow.h | 0 .../JSystem/JAWExtSystem/JAWWindow3D.h | 0 .../include}/JSystem/JAWWinLib/JAWBankView.h | 0 .../include}/JSystem/JAWWinLib/JAWChView.h | 0 .../JSystem/JAWWinLib/JAWEntrySeView.h | 0 .../JSystem/JAWWinLib/JAWHioBankEdit.h | 0 .../JSystem/JAWWinLib/JAWHioReceiver.h | 0 .../JSystem/JAWWinLib/JAWPlaySeView.h | 0 .../JSystem/JAWWinLib/JAWPlayerChView.h | 0 .../JSystem/JAWWinLib/JAWReportView.h | 0 .../JSystem/JAWWinLib/JAWSysMemView.h | 0 .../include}/JSystem/JAWWinLib/JAWVolume.h | 0 .../include}/JSystem/JAudio2/JAIAudible.h | 0 .../include}/JSystem/JAudio2/JAIAudience.h | 0 .../JSystem/include}/JSystem/JAudio2/JAISe.h | 0 .../include}/JSystem/JAudio2/JAISeMgr.h | 0 .../JSystem/include}/JSystem/JAudio2/JAISeq.h | 0 .../include}/JSystem/JAudio2/JAISeqDataMgr.h | 0 .../include}/JSystem/JAudio2/JAISeqMgr.h | 0 .../include}/JSystem/JAudio2/JAISound.h | 0 .../include}/JSystem/JAudio2/JAISoundChild.h | 0 .../JSystem/JAudio2/JAISoundHandles.h | 0 .../include}/JSystem/JAudio2/JAISoundInfo.h | 0 .../include}/JSystem/JAudio2/JAISoundParams.h | 0 .../JSystem/JAudio2/JAISoundStarter.h | 0 .../include}/JSystem/JAudio2/JAIStream.h | 0 .../JSystem/JAudio2/JAIStreamDataMgr.h | 0 .../include}/JSystem/JAudio2/JAIStreamMgr.h | 0 .../include}/JSystem/JAudio2/JASAiCtrl.h | 2 +- .../include}/JSystem/JAudio2/JASAramStream.h | 2 +- .../JSystem/JAudio2/JASAudioReseter.h | 2 +- .../include}/JSystem/JAudio2/JASAudioThread.h | 0 .../include}/JSystem/JAudio2/JASBNKParser.h | 0 .../include}/JSystem/JAudio2/JASBank.h | 2 +- .../include}/JSystem/JAudio2/JASBankList.h | 2 +- .../include}/JSystem/JAudio2/JASBankTable.h | 0 .../include}/JSystem/JAudio2/JASBasicBank.h | 0 .../include}/JSystem/JAudio2/JASBasicInst.h | 0 .../JSystem/JAudio2/JASBasicWaveBank.h | 0 .../include}/JSystem/JAudio2/JASCalc.h | 2 +- .../include}/JSystem/JAudio2/JASCallback.h | 2 +- .../include}/JSystem/JAudio2/JASChannel.h | 2 +- .../include}/JSystem/JAudio2/JASCmdStack.h | 0 .../JSystem/JAudio2/JASCriticalSection.h | 2 +- .../include}/JSystem/JAudio2/JASDSPChannel.h | 0 .../JSystem/JAudio2/JASDSPInterface.h | 2 +- .../include}/JSystem/JAudio2/JASDriverIF.h | 0 .../include}/JSystem/JAudio2/JASDrumSet.h | 0 .../include}/JSystem/JAudio2/JASDvdThread.h | 2 +- .../include}/JSystem/JAudio2/JASGadget.h | 0 .../include}/JSystem/JAudio2/JASHeapCtrl.h | 4 +- .../JSystem/include}/JSystem/JAudio2/JASLfo.h | 2 +- .../include}/JSystem/JAudio2/JASMutex.h | 2 +- .../include}/JSystem/JAudio2/JASOscillator.h | 2 +- .../include}/JSystem/JAudio2/JASProbe.h | 2 +- .../JSystem/JAudio2/JASRegisterParam.h | 2 +- .../include}/JSystem/JAudio2/JASReport.h | 0 .../JSystem/JAudio2/JASResArcLoader.h | 2 +- .../include}/JSystem/JAudio2/JASSeqCtrl.h | 0 .../include}/JSystem/JAudio2/JASSeqParser.h | 2 +- .../include}/JSystem/JAudio2/JASSeqReader.h | 2 +- .../JSystem/JAudio2/JASSimpleWaveBank.h | 0 .../include}/JSystem/JAudio2/JASSoundParams.h | 2 +- .../include}/JSystem/JAudio2/JASTaskThread.h | 0 .../include}/JSystem/JAudio2/JASTrack.h | 0 .../include}/JSystem/JAudio2/JASTrackPort.h | 2 +- .../include}/JSystem/JAudio2/JASVoiceBank.h | 0 .../include}/JSystem/JAudio2/JASWSParser.h | 0 .../JSystem/JAudio2/JASWaveArcLoader.h | 2 +- .../include}/JSystem/JAudio2/JASWaveInfo.h | 2 +- .../JSystem/JAudio2/JAUAudibleParam.h | 2 +- .../include}/JSystem/JAudio2/JAUAudience.h | 0 .../JSystem/JAudio2/JAUAudioArcInterpreter.h | 2 +- .../JSystem/JAudio2/JAUAudioArcLoader.h | 0 .../include}/JSystem/JAudio2/JAUAudioMgr.h | 0 .../include}/JSystem/JAudio2/JAUBankTable.h | 0 .../JSystem/JAudio2/JAUClusterSound.h | 0 .../include}/JSystem/JAudio2/JAUInitializer.h | 2 +- .../include}/JSystem/JAudio2/JAUSectionHeap.h | 0 .../JSystem/JAudio2/JAUSeqCollection.h | 0 .../JSystem/JAudio2/JAUSeqDataBlockMgr.h | 0 .../JSystem/JAudio2/JAUSoundAnimator.h | 0 .../include}/JSystem/JAudio2/JAUSoundInfo.h | 0 .../include}/JSystem/JAudio2/JAUSoundObject.h | 0 .../include}/JSystem/JAudio2/JAUSoundTable.h | 0 .../JSystem/JAudio2/JAUStreamAramMgr.h | 0 .../JSystem/JAudio2/JAUStreamFileTable.h | 0 .../include}/JSystem/JAudio2/dspproc.h | 2 +- .../include}/JSystem/JAudio2/dsptask.h | 2 +- .../JSystem/include}/JSystem/JAudio2/osdsp.h | 2 +- .../include}/JSystem/JAudio2/osdsp_task.h | 2 +- .../include}/JSystem/JFramework/JFWDisplay.h | 2 +- .../include}/JSystem/JFramework/JFWSystem.h | 2 +- .../JSystem/include}/JSystem/JGadget/binary.h | 0 .../JSystem/include}/JSystem/JGadget/define.h | 2 +- .../include}/JSystem/JGadget/linklist.h | 0 .../include}/JSystem/JGadget/pointer.h | 0 .../JSystem/include}/JSystem/JGadget/search.h | 2 +- .../include}/JSystem/JGadget/std-list.h | 0 .../include}/JSystem/JGadget/std-memory.h | 0 .../include}/JSystem/JGadget/std-stream.h | 0 .../include}/JSystem/JGadget/std-streambuf.h | 2 +- .../include}/JSystem/JGadget/std-vector.h | 0 .../JSystem/include}/JSystem/JGadget/vector.h | 0 .../JSystem/include}/JSystem/JGeometry.h | 2 +- .../include}/JSystem/JHostIO/JHIComm.h | 0 .../include}/JSystem/JHostIO/JHICommonMem.h | 2 +- .../include}/JSystem/JHostIO/JHIMccBuf.h | 0 .../include}/JSystem/JHostIO/JHIRMcc.h | 6 +- .../include}/JSystem/JHostIO/JHIhioASync.h | 2 +- .../include}/JSystem/JHostIO/JOREntry.h | 2 +- .../include}/JSystem/JHostIO/JORFile.h | 0 .../include}/JSystem/JHostIO/JORHostInfo.h | 6 +- .../include}/JSystem/JHostIO/JORMContext.h | 6 +- .../include}/JSystem/JHostIO/JORReflexible.h | 2 +- .../include}/JSystem/JHostIO/JORServer.h | 0 .../include}/JSystem/JKernel/JKRAram.h | 0 .../include}/JSystem/JKernel/JKRAramArchive.h | 0 .../include}/JSystem/JKernel/JKRAramBlock.h | 0 .../include}/JSystem/JKernel/JKRAramHeap.h | 2 +- .../include}/JSystem/JKernel/JKRAramPiece.h | 6 +- .../include}/JSystem/JKernel/JKRAramStream.h | 0 .../include}/JSystem/JKernel/JKRArchive.h | 0 .../include}/JSystem/JKernel/JKRAssertHeap.h | 0 .../include}/JSystem/JKernel/JKRCompArchive.h | 0 .../include}/JSystem/JKernel/JKRCompression.h | 0 .../include}/JSystem/JKernel/JKRDecomp.h | 0 .../include}/JSystem/JKernel/JKRDisposer.h | 0 .../JSystem/JKernel/JKRDvdAramRipper.h | 0 .../include}/JSystem/JKernel/JKRDvdArchive.h | 0 .../include}/JSystem/JKernel/JKRDvdFile.h | 6 +- .../include}/JSystem/JKernel/JKRDvdRipper.h | 0 .../include}/JSystem/JKernel/JKRExpHeap.h | 0 .../include}/JSystem/JKernel/JKRFile.h | 0 .../include}/JSystem/JKernel/JKRFileCache.h | 0 .../include}/JSystem/JKernel/JKRFileFinder.h | 2 +- .../include}/JSystem/JKernel/JKRFileLoader.h | 0 .../include}/JSystem/JKernel/JKRHeap.h | 2 +- .../include}/JSystem/JKernel/JKRMemArchive.h | 0 .../include}/JSystem/JKernel/JKRSolidHeap.h | 0 .../include}/JSystem/JKernel/JKRThread.h | 4 +- .../JSystem/include}/JSystem/JKernel/SArc.h | 0 .../include}/JSystem/JMath/JMATrigonometric.h | 2 +- .../JSystem/include}/JSystem/JMath/JMath.h | 2 +- .../JSystem/include}/JSystem/JMath/random.h | 2 +- .../include}/JSystem/JMessage/JMessage.h | 6 +- .../include}/JSystem/JMessage/control.h | 0 .../JSystem/include}/JSystem/JMessage/data.h | 0 .../include}/JSystem/JMessage/locale.h | 6 +- .../include}/JSystem/JMessage/processor.h | 0 .../include}/JSystem/JMessage/resource.h | 0 .../include}/JSystem/JParticle/JPABaseShape.h | 2 +- .../JSystem/JParticle/JPAChildShape.h | 2 +- .../include}/JSystem/JParticle/JPADrawInfo.h | 2 +- .../JSystem/JParticle/JPADynamicsBlock.h | 2 +- .../include}/JSystem/JParticle/JPAEmitter.h | 2 +- .../JSystem/JParticle/JPAEmitterManager.h | 2 +- .../JSystem/JParticle/JPAExTexShape.h | 2 +- .../JSystem/JParticle/JPAExtraShape.h | 2 +- .../JSystem/JParticle/JPAFieldBlock.h | 2 +- .../include}/JSystem/JParticle/JPAKeyBlock.h | 2 +- .../include}/JSystem/JParticle/JPAList.h | 2 +- .../include}/JSystem/JParticle/JPAMath.h | 2 +- .../include}/JSystem/JParticle/JPAParticle.h | 2 +- .../include}/JSystem/JParticle/JPARandom.h | 2 +- .../include}/JSystem/JParticle/JPAResource.h | 2 +- .../JSystem/JParticle/JPAResourceLoader.h | 2 +- .../JSystem/JParticle/JPAResourceManager.h | 0 .../include}/JSystem/JParticle/JPATexture.h | 0 .../include}/JSystem/JStage/JSGActor.h | 0 .../include}/JSystem/JStage/JSGAmbientLight.h | 2 +- .../include}/JSystem/JStage/JSGCamera.h | 0 .../JSystem/include}/JSystem/JStage/JSGFog.h | 2 +- .../include}/JSystem/JStage/JSGLight.h | 2 +- .../include}/JSystem/JStage/JSGObject.h | 2 +- .../include}/JSystem/JStage/JSGSystem.h | 0 .../JSystem/JStudio/JStudio/ctb-data.h | 0 .../include}/JSystem/JStudio/JStudio/ctb.h | 0 .../JSystem/JStudio/JStudio/functionvalue.h | 0 .../JSystem/JStudio/JStudio/fvb-data-parse.h | 0 .../JSystem/JStudio/JStudio/fvb-data.h | 0 .../include}/JSystem/JStudio/JStudio/fvb.h | 0 .../JSystem/JStudio/JStudio/jstudio-control.h | 4 +- .../JSystem/JStudio/JStudio/jstudio-data.h | 0 .../JSystem/JStudio/JStudio/jstudio-math.h | 2 +- .../JSystem/JStudio/JStudio/jstudio-object.h | 0 .../JSystem/JStudio/JStudio/object-id.h | 2 +- .../JSystem/JStudio/JStudio/stb-data-parse.h | 0 .../JSystem/JStudio/JStudio/stb-data.h | 2 +- .../include}/JSystem/JStudio/JStudio/stb.h | 2 +- .../JStudio/JStudioCameraEditor/control.h | 0 .../controlset-csb-valueset.h | 0 .../JSystem/JStudio/JStudioCameraEditor/csb.h | 2 +- .../JStudio/JStudioCameraEditor/sequence.h | 0 .../JStudio/JStudioToolLibrary/anchor.h | 0 .../JStudio/JStudioToolLibrary/console.h | 0 .../JStudioToolLibrary/controlset-preview.h | 0 .../JStudioToolLibrary/controlset-transform.h | 0 .../JStudio/JStudioToolLibrary/controlset.h | 0 .../JStudio/JStudioToolLibrary/interface.h | 0 .../JStudio/JStudioToolLibrary/scroll.h | 0 .../JStudio/JStudioToolLibrary/visual.h | 0 .../JSystem/JStudio/JStudio_JAudio2/control.h | 0 .../JStudio/JStudio_JAudio2/object-sound.h | 0 .../JStudio/JStudio_JParticle/control.h | 0 .../JStudio_JParticle/object-particle.h | 0 .../JStudio/JStudio_JPreviewer/control.h | 0 .../JSystem/JStudio/JStudio_JStage/control.h | 0 .../JStudio/JStudio_JStage/object-actor.h | 0 .../JStudio_JStage/object-ambientlight.h | 0 .../JStudio/JStudio_JStage/object-camera.h | 0 .../JStudio/JStudio_JStage/object-fog.h | 0 .../JStudio/JStudio_JStage/object-light.h | 0 .../JSystem/JStudio/JStudio_JStage/object.h | 0 .../include}/JSystem/JSupport/JSUFileStream.h | 0 .../JSystem/JSupport/JSUInputStream.h | 0 .../include}/JSystem/JSupport/JSUIosBase.h | 2 +- .../include}/JSystem/JSupport/JSUList.h | 2 +- .../JSystem/JSupport/JSUMemoryStream.h | 0 .../JSystem/JSupport/JSUOutputStream.h | 0 .../JSystem/JSupport/JSURandomInputStream.h | 0 .../JSystem/JSupport/JSURandomOutputStream.h | 0 .../include}/JSystem/JSupport/JSupport.h | 6 +- .../JSystem/include}/JSystem/JSystem.h | 0 .../JSystem/include}/JSystem/JSystem.pch | 0 .../include}/JSystem/JUtility/JUTAssert.h | 2 +- .../include}/JSystem/JUtility/JUTCacheFont.h | 0 .../include}/JSystem/JUtility/JUTConsole.h | 0 .../include}/JSystem/JUtility/JUTDbPrint.h | 0 .../include}/JSystem/JUtility/JUTDirectFile.h | 2 +- .../JSystem/JUtility/JUTDirectPrint.h | 0 .../include}/JSystem/JUtility/JUTException.h | 4 +- .../include}/JSystem/JUtility/JUTFader.h | 0 .../include}/JSystem/JUtility/JUTFont.h | 0 .../JUtility/JUTFontData_Ascfont_fix12.h | 2 +- .../include}/JSystem/JUtility/JUTGamePad.h | 6 +- .../include}/JSystem/JUtility/JUTGraphFifo.h | 2 +- .../include}/JSystem/JUtility/JUTNameTab.h | 2 +- .../include}/JSystem/JUtility/JUTPalette.h | 2 +- .../include}/JSystem/JUtility/JUTProcBar.h | 2 +- .../include}/JSystem/JUtility/JUTReport.h | 0 .../include}/JSystem/JUtility/JUTResFont.h | 0 .../include}/JSystem/JUtility/JUTResource.h | 2 +- .../include}/JSystem/JUtility/JUTTexture.h | 2 +- .../include}/JSystem/JUtility/JUTVideo.h | 6 +- .../include}/JSystem/JUtility/JUTXfb.h | 0 .../include}/JSystem/JUtility/TColor.h | 2 +- .../JSystem/include}/JSystem/TPosition3.h | 2 +- .../JSystem/src}/J2DGraph/J2DAnimation.cpp | 2 +- .../JSystem/src}/J2DGraph/J2DAnmLoader.cpp | 0 .../JSystem/src}/J2DGraph/J2DGrafContext.cpp | 2 +- .../JSystem/src}/J2DGraph/J2DManage.cpp | 0 .../JSystem/src}/J2DGraph/J2DMatBlock.cpp | 2 +- .../JSystem/src}/J2DGraph/J2DMaterial.cpp | 0 .../src}/J2DGraph/J2DMaterialFactory.cpp | 2 +- .../JSystem/src}/J2DGraph/J2DOrthoGraph.cpp | 2 +- .../JSystem/src}/J2DGraph/J2DPane.cpp | 0 .../JSystem/src}/J2DGraph/J2DPicture.cpp | 2 +- .../JSystem/src}/J2DGraph/J2DPictureEx.cpp | 2 +- .../JSystem/src}/J2DGraph/J2DPrint.cpp | 0 .../JSystem/src}/J2DGraph/J2DScreen.cpp | 2 +- .../JSystem/src}/J2DGraph/J2DTevs.cpp | 2 +- .../JSystem/src}/J2DGraph/J2DTextBox.cpp | 0 .../JSystem/src}/J2DGraph/J2DTextBoxEx.cpp | 0 .../JSystem/src}/J2DGraph/J2DWindow.cpp | 0 .../JSystem/src}/J2DGraph/J2DWindowEx.cpp | 0 .../src}/J3DGraphAnimator/J3DAnimation.cpp | 0 .../src}/J3DGraphAnimator/J3DCluster.cpp | 2 +- .../src}/J3DGraphAnimator/J3DJoint.cpp | 0 .../src}/J3DGraphAnimator/J3DJointTree.cpp | 0 .../src}/J3DGraphAnimator/J3DMaterialAnm.cpp | 0 .../J3DGraphAnimator/J3DMaterialAttach.cpp | 0 .../src}/J3DGraphAnimator/J3DModel.cpp | 0 .../src}/J3DGraphAnimator/J3DModelData.cpp | 0 .../src}/J3DGraphAnimator/J3DMtxBuffer.cpp | 0 .../src}/J3DGraphAnimator/J3DShapeTable.cpp | 0 .../src}/J3DGraphAnimator/J3DSkinDeform.cpp | 0 .../src}/J3DGraphBase/J3DDrawBuffer.cpp | 0 .../JSystem/src}/J3DGraphBase/J3DGD.cpp | 0 .../JSystem/src}/J3DGraphBase/J3DMatBlock.cpp | 0 .../JSystem/src}/J3DGraphBase/J3DMaterial.cpp | 0 .../JSystem/src}/J3DGraphBase/J3DPacket.cpp | 2 +- .../JSystem/src}/J3DGraphBase/J3DShape.cpp | 2 +- .../src}/J3DGraphBase/J3DShapeDraw.cpp | 2 +- .../JSystem/src}/J3DGraphBase/J3DShapeMtx.cpp | 0 .../JSystem/src}/J3DGraphBase/J3DStruct.cpp | 0 .../JSystem/src}/J3DGraphBase/J3DSys.cpp | 0 .../JSystem/src}/J3DGraphBase/J3DTevs.cpp | 0 .../JSystem/src}/J3DGraphBase/J3DTexture.cpp | 0 .../src}/J3DGraphBase/J3DTransform.cpp | 0 .../JSystem/src}/J3DGraphBase/J3DVertex.cpp | 0 .../src}/J3DGraphLoader/J3DAnmLoader.cpp | 2 +- .../src}/J3DGraphLoader/J3DClusterLoader.cpp | 2 +- .../src}/J3DGraphLoader/J3DJointFactory.cpp | 0 .../J3DGraphLoader/J3DMaterialFactory.cpp | 0 .../J3DGraphLoader/J3DMaterialFactory_v21.cpp | 0 .../src}/J3DGraphLoader/J3DModelLoader.cpp | 0 .../J3DGraphLoader/J3DModelLoaderCalcSize.cpp | 2 +- .../src}/J3DGraphLoader/J3DShapeFactory.cpp | 2 +- .../JSystem/src}/J3DU/J3DUClipper.cpp | 0 .../JSystem/src}/J3DU/J3DUDL.cpp | 0 .../JSystem/src}/J3DU/J3DUFur.cpp | 0 .../JSystem/src}/J3DU/J3DUMotion.cpp | 0 .../JSystem/src}/J3DU/J3DUShadow.cpp | 0 .../JSystem/src}/JAHostIO/JAHioMessage.cpp | 0 .../JSystem/src}/JAHostIO/JAHioMgr.cpp | 0 .../JSystem/src}/JAHostIO/JAHioNode.cpp | 0 .../JSystem/src}/JAHostIO/JAHioUtil.cpp | 0 .../src}/JAWExtSystem/JAWExtSystem.cpp | 0 .../src}/JAWExtSystem/JAWGraphContext.cpp | 0 .../JSystem/src}/JAWExtSystem/JAWSystem.cpp | 0 .../JSystem/src}/JAWExtSystem/JAWWindow.cpp | 0 .../JSystem/src}/JAWExtSystem/JAWWindow3D.cpp | 0 .../JSystem/src}/JAudio2/JAIAudible.cpp | 0 .../JSystem/src}/JAudio2/JAIAudience.cpp | 0 .../JSystem/src}/JAudio2/JAISe.cpp | 0 .../JSystem/src}/JAudio2/JAISeMgr.cpp | 0 .../JSystem/src}/JAudio2/JAISeq.cpp | 0 .../JSystem/src}/JAudio2/JAISeqDataMgr.cpp | 0 .../JSystem/src}/JAudio2/JAISeqMgr.cpp | 0 .../JSystem/src}/JAudio2/JAISound.cpp | 0 .../JSystem/src}/JAudio2/JAISoundChild.cpp | 0 .../JSystem/src}/JAudio2/JAISoundHandles.cpp | 0 .../JSystem/src}/JAudio2/JAISoundInfo.cpp | 0 .../JSystem/src}/JAudio2/JAISoundParams.cpp | 0 .../JSystem/src}/JAudio2/JAISoundStarter.cpp | 0 .../JSystem/src}/JAudio2/JAIStream.cpp | 0 .../JSystem/src}/JAudio2/JAIStreamDataMgr.cpp | 0 .../JSystem/src}/JAudio2/JAIStreamMgr.cpp | 0 .../JSystem/src}/JAudio2/JASAiCtrl.cpp | 4 +- .../JSystem/src}/JAudio2/JASAramStream.cpp | 0 .../JSystem/src}/JAudio2/JASAudioReseter.cpp | 2 +- .../JSystem/src}/JAudio2/JASAudioThread.cpp | 2 +- .../JSystem/src}/JAudio2/JASBNKParser.cpp | 0 .../JSystem/src}/JAudio2/JASBank.cpp | 0 .../JSystem/src}/JAudio2/JASBasicBank.cpp | 0 .../JSystem/src}/JAudio2/JASBasicInst.cpp | 0 .../JSystem/src}/JAudio2/JASBasicWaveBank.cpp | 0 .../JSystem/src}/JAudio2/JASCalc.cpp | 0 .../JSystem/src}/JAudio2/JASCallback.cpp | 0 .../JSystem/src}/JAudio2/JASChannel.cpp | 0 .../JSystem/src}/JAudio2/JASCmdStack.cpp | 2 +- .../JSystem/src}/JAudio2/JASDSPChannel.cpp | 0 .../JSystem/src}/JAudio2/JASDSPInterface.cpp | 2 +- .../JSystem/src}/JAudio2/JASDriverIF.cpp | 2 +- .../JSystem/src}/JAudio2/JASDrumSet.cpp | 0 .../JSystem/src}/JAudio2/JASDvdThread.cpp | 0 .../JSystem/src}/JAudio2/JASHeapCtrl.cpp | 5 ++ .../JSystem/src}/JAudio2/JASLfo.cpp | 0 .../JSystem/src}/JAudio2/JASOscillator.cpp | 0 .../JSystem/src}/JAudio2/JASProbe.cpp | 0 .../JSystem/src}/JAudio2/JASRegisterParam.cpp | 0 .../JSystem/src}/JAudio2/JASReport.cpp | 0 .../JSystem/src}/JAudio2/JASResArcLoader.cpp | 0 .../JSystem/src}/JAudio2/JASSeqCtrl.cpp | 0 .../JSystem/src}/JAudio2/JASSeqParser.cpp | 0 .../JSystem/src}/JAudio2/JASSeqReader.cpp | 0 .../src}/JAudio2/JASSimpleWaveBank.cpp | 0 .../JSystem/src}/JAudio2/JASSoundParams.cpp | 0 .../JSystem/src}/JAudio2/JASTaskThread.cpp | 0 .../JSystem/src}/JAudio2/JASTrack.cpp | 0 .../JSystem/src}/JAudio2/JASTrackPort.cpp | 0 .../JSystem/src}/JAudio2/JASVoiceBank.cpp | 0 .../JSystem/src}/JAudio2/JASWSParser.cpp | 0 .../JSystem/src}/JAudio2/JASWaveArcLoader.cpp | 2 +- .../JSystem/src}/JAudio2/JAUAudience.cpp | 0 .../src}/JAudio2/JAUAudioArcInterpreter.cpp | 0 .../src}/JAudio2/JAUAudioArcLoader.cpp | 0 .../JSystem/src}/JAudio2/JAUAudioMgr.cpp | 0 .../JSystem/src}/JAudio2/JAUBankTable.cpp | 0 .../JSystem/src}/JAudio2/JAUClusterSound.cpp | 0 .../JSystem/src}/JAudio2/JAUInitializer.cpp | 0 .../JSystem/src}/JAudio2/JAUSectionHeap.cpp | 2 +- .../JSystem/src}/JAudio2/JAUSeqCollection.cpp | 0 .../src}/JAudio2/JAUSeqDataBlockMgr.cpp | 2 +- .../JSystem/src}/JAudio2/JAUSoundAnimator.cpp | 0 .../JSystem/src}/JAudio2/JAUSoundObject.cpp | 0 .../JSystem/src}/JAudio2/JAUSoundTable.cpp | 0 .../src}/JAudio2/JAUStreamFileTable.cpp | 0 .../JSystem/src}/JAudio2/dspproc.cpp | 0 .../JSystem/src}/JAudio2/dsptask.cpp | 0 .../JSystem/src}/JAudio2/osdsp.cpp | 4 +- .../JSystem/src}/JAudio2/osdsp_task.cpp | 4 +- .../JSystem/src}/JFramework/JFWDisplay.cpp | 4 +- .../JSystem/src}/JFramework/JFWSystem.cpp | 0 .../JSystem/src}/JGadget/binary.cpp | 0 .../JSystem/src}/JGadget/define.cpp | 0 .../src}/JGadget/dolphin-stream-JORFile.cpp | 0 .../JSystem/src}/JGadget/linklist.cpp | 0 .../JSystem/src}/JGadget/search.cpp | 0 .../JSystem/src}/JGadget/std-list.cpp | 0 .../JSystem/src}/JGadget/std-stream.cpp | 0 .../JSystem/src}/JGadget/std-streambuf.cpp | 0 .../JSystem/src}/JGadget/std-string.cpp | 0 .../JSystem/src}/JGadget/std-vector.cpp | 0 .../JSystem/src}/JGadget/textreader.cpp | 0 .../JSystem/src}/JGadget/xml-scanner.cpp | 0 .../JSystem/src}/JHostIO/JHIComm.cpp | 0 .../JSystem/src}/JHostIO/JHICommonMem.cpp | 0 .../JSystem/src}/JHostIO/JHIMccBuf.cpp | 0 .../JSystem/src}/JHostIO/JHIMemBuf.cpp | 6 +- .../JSystem/src}/JHostIO/JHIRMcc.cpp | 0 .../JSystem/src}/JHostIO/JHIhioASync.cpp | 6 +- .../JSystem/src}/JHostIO/JOREntry.cpp | 0 .../JSystem/src}/JHostIO/JORFile.cpp | 6 +- .../JSystem/src}/JHostIO/JORHostInfo.cpp | 0 .../JSystem/src}/JHostIO/JORMessageBox.cpp | 0 .../JSystem/src}/JHostIO/JORServer.cpp | 0 .../JSystem/src}/JHostIO/JORShellExecute.cpp | 0 .../JSystem/src}/JKernel/JKRAram.cpp | 5 ++ .../JSystem/src}/JKernel/JKRAramArchive.cpp | 0 .../JSystem/src}/JKernel/JKRAramBlock.cpp | 0 .../JSystem/src}/JKernel/JKRAramHeap.cpp | 0 .../JSystem/src}/JKernel/JKRAramPiece.cpp | 2 +- .../JSystem/src}/JKernel/JKRAramStream.cpp | 0 .../JSystem/src}/JKernel/JKRArchivePri.cpp | 0 .../JSystem/src}/JKernel/JKRArchivePub.cpp | 0 .../JSystem/src}/JKernel/JKRAssertHeap.cpp | 0 .../JSystem/src}/JKernel/JKRCompArchive.cpp | 0 .../JSystem/src}/JKernel/JKRDecomp.cpp | 0 .../JSystem/src}/JKernel/JKRDisposer.cpp | 0 .../JSystem/src}/JKernel/JKRDvdAramRipper.cpp | 6 +- .../JSystem/src}/JKernel/JKRDvdArchive.cpp | 0 .../JSystem/src}/JKernel/JKRDvdFile.cpp | 0 .../JSystem/src}/JKernel/JKRDvdRipper.cpp | 4 +- .../JSystem/src}/JKernel/JKRExpHeap.cpp | 0 .../JSystem/src}/JKernel/JKRFile.cpp | 2 +- .../JSystem/src}/JKernel/JKRFileCache.cpp | 0 .../JSystem/src}/JKernel/JKRFileFinder.cpp | 0 .../JSystem/src}/JKernel/JKRFileLoader.cpp | 0 .../JSystem/src}/JKernel/JKRHeap.cpp | 0 .../JSystem/src}/JKernel/JKRMemArchive.cpp | 0 .../JSystem/src}/JKernel/JKRSolidHeap.cpp | 0 .../JSystem/src}/JKernel/JKRThread.cpp | 0 .../JSystem/src}/JMath/JMATrigonometric.cpp | 0 .../JSystem/src}/JMath/JMath.cpp | 0 .../JSystem/src}/JMath/random.cpp | 0 .../JSystem/src}/JMessage/control.cpp | 0 .../JSystem/src}/JMessage/data.cpp | 0 .../JSystem/src}/JMessage/locale.cpp | 0 .../JSystem/src}/JMessage/processor.cpp | 0 .../JSystem/src}/JMessage/resource.cpp | 0 .../JSystem/src}/JParticle/JPABaseShape.cpp | 4 +- .../JSystem/src}/JParticle/JPAChildShape.cpp | 4 +- .../src}/JParticle/JPADynamicsBlock.cpp | 0 .../JSystem/src}/JParticle/JPAEmitter.cpp | 2 +- .../src}/JParticle/JPAEmitterManager.cpp | 2 +- .../JSystem/src}/JParticle/JPAExTexShape.cpp | 2 +- .../JSystem/src}/JParticle/JPAExtraShape.cpp | 2 +- .../JSystem/src}/JParticle/JPAFieldBlock.cpp | 0 .../JSystem/src}/JParticle/JPAKeyBlock.cpp | 0 .../JSystem/src}/JParticle/JPAMath.cpp | 0 .../JSystem/src}/JParticle/JPAParticle.cpp | 0 .../JSystem/src}/JParticle/JPAResource.cpp | 2 +- .../src}/JParticle/JPAResourceLoader.cpp | 0 .../src}/JParticle/JPAResourceManager.cpp | 0 .../JSystem/src}/JParticle/JPATexture.cpp | 0 .../JSystem/src}/JStage/JSGActor.cpp | 0 .../JSystem/src}/JStage/JSGAmbientLight.cpp | 0 .../JSystem/src}/JStage/JSGCamera.cpp | 0 .../JSystem/src}/JStage/JSGFog.cpp | 0 .../JSystem/src}/JStage/JSGLight.cpp | 0 .../JSystem/src}/JStage/JSGObject.cpp | 0 .../JSystem/src}/JStage/JSGSystem.cpp | 0 .../JSystem/src}/JStudio/JStudio/ctb-data.cpp | 0 .../JSystem/src}/JStudio/JStudio/ctb.cpp | 0 .../src}/JStudio/JStudio/functionvalue.cpp | 0 .../src}/JStudio/JStudio/fvb-data-parse.cpp | 0 .../JSystem/src}/JStudio/JStudio/fvb-data.cpp | 0 .../JSystem/src}/JStudio/JStudio/fvb.cpp | 0 .../src}/JStudio/JStudio/jstudio-control.cpp | 0 .../src}/JStudio/JStudio/jstudio-data.cpp | 0 .../src}/JStudio/JStudio/jstudio-math.cpp | 0 .../src}/JStudio/JStudio/jstudio-object.cpp | 0 .../src}/JStudio/JStudio/object-id.cpp | 0 .../src}/JStudio/JStudio/stb-data-parse.cpp | 2 +- .../JSystem/src}/JStudio/JStudio/stb-data.cpp | 0 .../JSystem/src}/JStudio/JStudio/stb.cpp | 0 .../JStudio/JStudioCameraEditor/control.cpp | 0 .../controlset-csb-valueset.cpp | 0 .../JStudio/JStudioCameraEditor/csb-data.cpp | 0 .../src}/JStudio/JStudioCameraEditor/csb.cpp | 0 .../JStudio/JStudioCameraEditor/sequence.cpp | 0 .../src}/JStudio/JStudioPreviewer/control.cpp | 0 .../JStudio/JStudioToolLibrary/anchor.cpp | 0 .../JStudio/JStudioToolLibrary/console.cpp | 0 .../JStudioToolLibrary/controlset-anchor.cpp | 0 .../JStudioToolLibrary/controlset-preview.cpp | 0 .../JStudio/JStudioToolLibrary/controlset.cpp | 0 .../JStudio/JStudioToolLibrary/interface.cpp | 0 .../jstudio-controlset-transform.cpp | 0 .../JStudio/JStudioToolLibrary/scroll.cpp | 0 .../JStudio/JStudioToolLibrary/visual.cpp | 0 .../src}/JStudio/JStudioToolLibrary/xml.cpp | 0 .../src}/JStudio/JStudio_JAudio2/control.cpp | 0 .../JStudio/JStudio_JAudio2/object-sound.cpp | 0 .../JStudio/JStudio_JParticle/control.cpp | 0 .../JStudio_JParticle/object-particle.cpp | 0 .../src}/JStudio/JStudio_JStage/control.cpp | 0 .../JStudio/JStudio_JStage/object-actor.cpp | 0 .../JStudio_JStage/object-ambientlight.cpp | 0 .../JStudio/JStudio_JStage/object-camera.cpp | 0 .../JStudio/JStudio_JStage/object-fog.cpp | 0 .../JStudio/JStudio_JStage/object-light.cpp | 0 .../src}/JStudio/JStudio_JStage/object.cpp | 0 .../JSystem/src}/JSupport/JSUFileStream.cpp | 0 .../JSystem/src}/JSupport/JSUInputStream.cpp | 6 +- .../JSystem/src}/JSupport/JSUList.cpp | 0 .../JSystem/src}/JSupport/JSUMemoryStream.cpp | 0 .../JSystem/src}/JSupport/JSUOutputStream.cpp | 6 +- .../JSystem/src}/JUtility/JUTAssert.cpp | 2 +- .../JSystem/src}/JUtility/JUTCacheFont.cpp | 2 +- .../JSystem/src}/JUtility/JUTConsole.cpp | 2 +- .../JSystem/src}/JUtility/JUTDbPrint.cpp | 0 .../JSystem/src}/JUtility/JUTDirectFile.cpp | 2 +- .../JSystem/src}/JUtility/JUTDirectPrint.cpp | 2 +- .../JSystem/src}/JUtility/JUTException.cpp | 6 +- .../JSystem/src}/JUtility/JUTFader.cpp | 0 .../JSystem/src}/JUtility/JUTFont.cpp | 0 .../JUtility/JUTFontData_Ascfont_fix12.cpp | 6 +- .../JSystem/src}/JUtility/JUTGamePad.cpp | 0 .../JSystem/src}/JUtility/JUTGraphFifo.cpp | 0 .../JSystem/src}/JUtility/JUTNameTab.cpp | 0 .../JSystem/src}/JUtility/JUTPalette.cpp | 4 +- .../JSystem/src}/JUtility/JUTProcBar.cpp | 0 .../JSystem/src}/JUtility/JUTResFont.cpp | 2 +- .../JSystem/src}/JUtility/JUTResource.cpp | 0 .../JSystem/src}/JUtility/JUTTexture.cpp | 2 +- .../JSystem/src}/JUtility/JUTVideo.cpp | 4 +- .../JSystem/src}/JUtility/JUTXfb.cpp | 2 +- .../MSL/MSL_C++/MSL_Common/Include/algorithm | 0 .../MSL/MSL_C++/MSL_Common/Include/bitset | 0 .../MSL/MSL_C++/MSL_Common/Include/cstdint | 0 .../MSL/MSL_C++/MSL_Common/Include/functional | 0 .../MSL/MSL_C++/MSL_Common/Include/iterator | 0 .../MSL/MSL_C++/MSL_Common/Include/limits | 0 .../MSL/MSL_C++/MSL_Common/Include/memory | 0 .../MSL/MSL_C++/MSL_Common/Include/new | 0 .../MSL/MSL_C++/MSL_Common/Include/stdint.h | 0 .../MSL_C++/MSL_Common/Include/type_traits | 0 .../MSL/MSL_C++/MSL_Common/Include/utility | 0 .../MSL/MSL_C/MSL_Common/Include/FILE_POS.h | 0 .../MSL/MSL_C/MSL_Common/Include/abort_exit.h | 0 .../MSL/MSL_C/MSL_Common/Include/alloc.h | 0 .../MSL/MSL_C/MSL_Common/Include/ansi_files.h | 0 .../MSL/MSL_C/MSL_Common/Include/ansi_fp.h | 0 .../MSL/MSL_C/MSL_Common/Include/arith.h | 0 .../MSL/MSL_C/MSL_Common/Include/buffer_io.h | 0 .../MSL/MSL_C/MSL_Common/Include/cctype | 0 .../MSL/MSL_C/MSL_Common/Include/char_io.h | 0 .../MSL/MSL_C/MSL_Common/Include/climits | 0 .../MSL/MSL_C/MSL_Common/Include/cmath | 0 .../MSL_Common/Include/critical_regions.h | 0 .../MSL/MSL_C/MSL_Common/Include/cstdarg | 0 .../MSL/MSL_C/MSL_Common/Include/cstddef | 0 .../MSL/MSL_C/MSL_Common/Include/cstdio | 0 .../MSL/MSL_C/MSL_Common/Include/cstdlib | 0 .../MSL/MSL_C/MSL_Common/Include/cstring | 0 .../MSL/MSL_C/MSL_Common/Include/direct_io.h | 0 .../MSL/MSL_C/MSL_Common/Include/errno.h | 0 .../MSL/MSL_C/MSL_Common/Include/extras.h | 0 .../MSL/MSL_C/MSL_Common/Include/file_io.h | 0 .../MSL/MSL_C/MSL_Common/Include/float.h | 0 .../MSL/MSL_C/MSL_Common/Include/locale | 0 .../MSL/MSL_C/MSL_Common/Include/mbstring.h | 0 .../MSL/MSL_C/MSL_Common/Include/mem_funcs.h | 0 .../MSL/MSL_C/MSL_Common/Include/misc_io.h | 0 .../MSL/MSL_C/MSL_Common/Include/printf.h | 0 .../MSL/MSL_C/MSL_Common/Include/scanf.h | 0 .../MSL/MSL_C/MSL_Common/Include/signal.h | 0 .../MSL/MSL_C/MSL_Common/Include/stdarg | 0 .../MSL/MSL_C/MSL_Common/Include/stddef | 0 .../MSL/MSL_C/MSL_Common/Include/stdio | 0 .../MSL/MSL_C/MSL_Common/Include/stdlib | 0 .../MSL/MSL_C/MSL_Common/Include/string | 0 .../MSL/MSL_C/MSL_Common/Include/strtold.h | 0 .../MSL/MSL_C/MSL_Common/Include/strtoul.h | 0 .../MSL/MSL_C/MSL_Common/Include/va_list | 0 .../MSL/MSL_C/MSL_Common/Include/wchar_io.h | 0 .../MSL/MSL_C/MSL_Common/Include/wcstoul.h | 0 .../MSL/MSL_C/MSL_Common/Include/wctype_api.h | 0 .../MSL/MSL_C/MSL_Common/Include/wmem.h | 0 .../MSL/MSL_C/MSL_Common/Include/wprintf.h | 0 .../MSL/MSL_C/MSL_Common/Include/wscanf.h | 0 .../MSL/MSL_C/MSL_Common/Include/wstring.h | 0 .../MSL/MSL_C/MSL_Common/Src/FILE_POS.c | 0 .../MSL/MSL_C/MSL_Common/Src/abort_exit.c | 0 .../MSL/MSL_C/MSL_Common/Src/alloc.c | 0 .../MSL/MSL_C/MSL_Common/Src/ansi_files.c | 0 .../MSL/MSL_C/MSL_Common/Src/arith.c | 0 .../MSL/MSL_C/MSL_Common/Src/buffer_io.c | 0 .../MSL/MSL_C/MSL_Common/Src/char_io.c | 0 .../MSL/MSL_C/MSL_Common/Src/ctype.c | 0 .../MSL/MSL_C/MSL_Common/Src/direct_io.c | 0 .../MSL/MSL_C/MSL_Common/Src/errno.c | 0 .../MSL/MSL_C/MSL_Common/Src/extras.c | 0 .../MSL/MSL_C/MSL_Common/Src/file_io.c | 0 .../MSL/MSL_C/MSL_Common/Src/float.c | 0 .../MSL/MSL_C/MSL_Common/Src/locale.c | 0 .../MSL/MSL_C/MSL_Common/Src/math_api.c | 0 .../MSL/MSL_C/MSL_Common/Src/math_double.c | 0 .../MSL/MSL_C/MSL_Common/Src/mbstring.c | 0 .../MSL/MSL_C/MSL_Common/Src/mem.c | 0 .../MSL/MSL_C/MSL_Common/Src/mem_funcs.c | 0 .../MSL/MSL_C/MSL_Common/Src/misc_io.c | 0 .../MSL/MSL_C/MSL_Common/Src/printf.c | 0 .../MSL/MSL_C/MSL_Common/Src/scanf.c | 0 .../MSL/MSL_C/MSL_Common/Src/secure_error.c | 0 .../MSL/MSL_C/MSL_Common/Src/signal.c | 0 .../MSL/MSL_C/MSL_Common/Src/string.c | 0 .../MSL/MSL_C/MSL_Common/Src/strtold.c | 0 .../MSL/MSL_C/MSL_Common/Src/strtoul.c | 0 .../MSL/MSL_C/MSL_Common/Src/wchar_io.c | 0 .../MSL/MSL_C/MSL_Common/Src/wcstoul.c | 0 .../MSL/MSL_C/MSL_Common/Src/wctype.c | 0 .../MSL/MSL_C/MSL_Common/Src/wmem.c | 0 .../MSL/MSL_C/MSL_Common/Src/wprintf.c | 0 .../MSL/MSL_C/MSL_Common/Src/wscanf.c | 0 .../MSL/MSL_C/MSL_Common/Src/wstring.c | 0 .../Math/Double_precision/e_acos.c | 0 .../Math/Double_precision/e_asin.c | 0 .../Math/Double_precision/e_atan2.c | 0 .../Math/Double_precision/e_exp.c | 0 .../Math/Double_precision/e_fmod.c | 0 .../Math/Double_precision/e_log.c | 0 .../Math/Double_precision/e_log10.c | 0 .../Math/Double_precision/e_pow.c | 0 .../Math/Double_precision/e_rem_pio2.c | 0 .../Math/Double_precision/e_sqrt.c | 0 .../Math/Double_precision/k_cos.c | 0 .../Math/Double_precision/k_rem_pio2.c | 0 .../Math/Double_precision/k_sin.c | 0 .../Math/Double_precision/k_tan.c | 0 .../Math/Double_precision/s_atan.c | 0 .../Math/Double_precision/s_ceil.c | 0 .../Math/Double_precision/s_copysign.c | 0 .../Math/Double_precision/s_cos.c | 0 .../Math/Double_precision/s_floor.c | 0 .../Math/Double_precision/s_frexp.c | 0 .../Math/Double_precision/s_ldexp.c | 0 .../Math/Double_precision/s_modf.c | 0 .../Math/Double_precision/s_sin.c | 0 .../Math/Double_precision/s_tan.c | 0 .../Math/Double_precision/w_acos.c | 0 .../Math/Double_precision/w_asin.c | 0 .../Math/Double_precision/w_atan2.c | 0 .../Math/Double_precision/w_exp.c | 0 .../Math/Double_precision/w_fmod.c | 0 .../Math/Double_precision/w_log10.c | 0 .../Math/Double_precision/w_pow.c | 0 .../Math/Double_precision/w_sqrt.c | 0 .../MSL_Common_Embedded/Math/Include/fdlibm.h | 0 .../MSL_C/MSL_Common_Embedded/Src/ansi_fp.c | 0 .../MSL_C/MSL_Common_Embedded/Src/math_sun.c | 0 .../Include/critical_regions.gamecube.h | 0 .../MSL/MSL_C/PPC_EABI/Include/math_ppc.h | 0 .../PPC_EABI/Include/uart_console_io_gcn.h | 0 .../MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c | 0 .../PPC_EABI/Src/critical_regions.gamecube.c | 0 .../MSL/MSL_C/PPC_EABI/Src/math_ppc.c | 0 .../MSL_C/PPC_EABI/Src/uart_console_io_gcn.c | 2 +- .../PowerPC_EABI_Support/MetroTRK/trk.h | 2 +- .../Runtime/Inc/CPlusLibPPC.h | 2 +- .../Runtime/Inc/GCN_mem_alloc.h | 0 .../Runtime/Inc/Gecko_ExceptionPPC.h | 0 .../Runtime/Inc/MWCPlusLib.h | 0 .../Runtime/Inc/NMWException.h | 0 .../Runtime/Inc/__init_cpp_exceptions.h | 2 +- .../Runtime/Inc/__ppc_eabi_linker.h | 0 .../Runtime/Inc/global_destructor_chain.h | 0 .../PowerPC_EABI_Support/Runtime/Inc/ptmf.h | 0 .../Runtime/Inc/runtime.h | 2 +- .../Runtime/Src/CPlusLibPPC.cp | 0 .../Runtime/Src/GCN_mem_alloc.c | 2 +- .../Runtime/Src/Gecko_ExceptionPPC.cp | 0 .../Runtime/Src/NMWException.cp | 0 .../Runtime/Src/__init_cpp_exceptions.cpp | 0 .../PowerPC_EABI_Support/Runtime/Src/__mem.c | 6 +- .../Runtime/Src/__va_arg.c | 0 .../Runtime/Src/global_destructor_chain.c | 0 .../PowerPC_EABI_Support/Runtime/Src/ptmf.c | 0 .../Runtime/Src/runtime.c | 6 +- .../embedded/MetroTRK/Export/mslsupp.c | 0 .../embedded/MetroTRK/Os/dolphin/UDP_Stubs.c | 0 .../MetroTRK/Os/dolphin/dolphin_trk.c | 4 + .../MetroTRK/Os/dolphin/dolphin_trk_glue.c | 2 +- .../embedded/MetroTRK/Os/dolphin/targcont.c | 0 .../MetroTRK/Os/dolphin/target_options.c | 0 .../embedded/MetroTRK/Os/dolphin/usr_put.c | 2 +- .../embedded/MetroTRK/Portable/dispatch.c | 0 .../embedded/MetroTRK/Portable/main_TRK.c | 0 .../embedded/MetroTRK/Portable/mainloop.c | 0 .../embedded/MetroTRK/Portable/mem_TRK.c | 0 .../debugger/embedded/MetroTRK/Portable/msg.c | 0 .../embedded/MetroTRK/Portable/msgbuf.c | 0 .../embedded/MetroTRK/Portable/msghndlr.c | 0 .../embedded/MetroTRK/Portable/mutex_TRK.c | 0 .../embedded/MetroTRK/Portable/notify.c | 0 .../embedded/MetroTRK/Portable/nubevent.c | 0 .../embedded/MetroTRK/Portable/nubinit.c | 0 .../embedded/MetroTRK/Portable/serpoll.c | 0 .../embedded/MetroTRK/Portable/string_TRK.c | 0 .../embedded/MetroTRK/Portable/support.c | 0 .../MetroTRK/Processor/ppc/Export/targsupp.s | 0 .../Processor/ppc/Generic/exception.s | 0 .../Processor/ppc/Generic/flush_cache.c | 2 +- .../Processor/ppc/Generic/mpc_7xx_603e.c | 0 .../MetroTRK/Processor/ppc/Generic/targimpl.c | 0 .../cc/exi2/GCN/EXI2_DDH_GCN/main.c | 2 +- .../cc/exi2/GCN/EXI2_GDEV_GCN/main.c | 4 +- .../utils/common/CircleBuffer.c | 0 .../cust_connection/utils/common/MWTrace.c | 0 .../utils/gc/MWCriticalSection_gc.c | 0 .../cust_connection/utils/gc/cc_gdev.c | 0 .../dolphin/include}/dolphin/G2D.h | 0 .../dolphin/include}/dolphin/ai.h | 4 - .../dolphin/include}/dolphin/am.h | 0 .../include}/dolphin/amc/AmcExi2Comm.h | 0 .../dolphin/include}/dolphin/amc/AmcTypes.h | 0 .../dolphin/include}/dolphin/ar.h | 4 - .../dolphin/include}/dolphin/ax.h | 4 - .../dolphin/include}/dolphin/axart.h | 4 - .../dolphin/include}/dolphin/axfx.h | 4 - .../dolphin/include}/dolphin/base/PPCArch.h | 4 - .../dolphin/include}/dolphin/card.h | 4 - .../include}/dolphin/charPipeline/fileCache.h | 0 .../dolphin/charPipeline/structures.h | 0 .../dolphin/charPipeline/structures/HTable.h | 0 .../dolphin/charPipeline/structures/List.h | 0 .../dolphin/charPipeline/structures/Tree.h | 0 .../charPipeline/structures/dolphinString.h | 0 .../dolphin/charPipeline/texPalette.h | 0 .../dolphin/include}/dolphin/db.h | 4 - .../dolphin/include}/dolphin/db/DBInterface.h | 4 - .../dolphin/include}/dolphin/demo.h | 0 .../dolphin/include}/dolphin/demo/DEMOAVX.h | 0 .../dolphin/include}/dolphin/demo/DEMOInit.h | 0 .../dolphin/include}/dolphin/demo/DEMOPad.h | 0 .../dolphin/include}/dolphin/demo/DEMOPuts.h | 0 .../dolphin/include}/dolphin/demo/DEMOStats.h | 0 .../dolphin/include}/dolphin/demo/DEMOWin.h | 0 .../dolphin/include}/dolphin/dolphin.h | 4 - .../dolphin/include}/dolphin/dsp.h | 4 - .../dolphin/include}/dolphin/dtk.h | 0 .../dolphin/include}/dolphin/dvd.h | 4 - .../dolphin/include}/dolphin/exi.h | 4 - .../dolphin/include}/dolphin/gd.h | 4 - .../dolphin/include}/dolphin/gd/GDBase.h | 4 - .../dolphin/include}/dolphin/gd/GDFile.h | 4 - .../dolphin/include}/dolphin/gd/GDGeometry.h | 4 - .../dolphin/include}/dolphin/gd/GDIndirect.h | 4 - .../dolphin/include}/dolphin/gd/GDLight.h | 4 - .../dolphin/include}/dolphin/gd/GDPixel.h | 4 - .../dolphin/include}/dolphin/gd/GDTev.h | 4 - .../dolphin/include}/dolphin/gd/GDTexture.h | 4 - .../dolphin/include}/dolphin/gd/GDTransform.h | 4 - .../dolphin/include}/dolphin/gf.h | 4 - .../dolphin/include}/dolphin/gf/GFGeometry.h | 4 - .../dolphin/include}/dolphin/gf/GFLight.h | 4 - .../dolphin/include}/dolphin/gf/GFPixel.h | 4 - .../dolphin/include}/dolphin/gf/GFTev.h | 4 - .../dolphin/include}/dolphin/gx.h | 4 - .../dolphin/include}/dolphin/gx/GXBump.h | 4 - .../include}/dolphin/gx/GXCommandList.h | 4 - .../dolphin/include}/dolphin/gx/GXCpu2Efb.h | 4 - .../dolphin/include}/dolphin/gx/GXCull.h | 4 - .../dolphin/include}/dolphin/gx/GXDispList.h | 4 - .../dolphin/include}/dolphin/gx/GXDraw.h | 4 - .../dolphin/include}/dolphin/gx/GXEnum.h | 4 - .../dolphin/include}/dolphin/gx/GXFifo.h | 4 - .../include}/dolphin/gx/GXFrameBuffer.h | 4 - .../dolphin/include}/dolphin/gx/GXGeometry.h | 4 - .../dolphin/include}/dolphin/gx/GXGet.h | 4 - .../dolphin/include}/dolphin/gx/GXLighting.h | 4 - .../dolphin/include}/dolphin/gx/GXManage.h | 4 - .../dolphin/include}/dolphin/gx/GXPerf.h | 4 - .../dolphin/include}/dolphin/gx/GXPixel.h | 4 - .../dolphin/include}/dolphin/gx/GXStruct.h | 4 - .../dolphin/include}/dolphin/gx/GXTev.h | 4 - .../dolphin/include}/dolphin/gx/GXTexture.h | 4 - .../dolphin/include}/dolphin/gx/GXTransform.h | 5 +- .../dolphin/include}/dolphin/gx/GXVerify.h | 4 - .../dolphin/include}/dolphin/gx/GXVert.h | 4 - .../dolphin/include}/dolphin/hio.h | 0 .../dolphin/include}/dolphin/hw_regs.h | 0 .../dolphin/include}/dolphin/mcc.h | 0 .../dolphin/include}/dolphin/mix.h | 4 - .../dolphin/include}/dolphin/mtx.h | 4 - .../dolphin/include}/dolphin/os.h | 4 - .../dolphin/include}/dolphin/os/OSAlarm.h | 4 - .../dolphin/include}/dolphin/os/OSAlloc.h | 4 - .../dolphin/include}/dolphin/os/OSCache.h | 4 - .../dolphin/include}/dolphin/os/OSContext.h | 4 - .../dolphin/include}/dolphin/os/OSDC.h | 5 -- .../dolphin/include}/dolphin/os/OSError.h | 4 - .../dolphin/include}/dolphin/os/OSException.h | 4 - .../dolphin/include}/dolphin/os/OSExec.h | 4 - .../dolphin/include}/dolphin/os/OSFont.h | 4 - .../dolphin/include}/dolphin/os/OSIC.h | 5 -- .../dolphin/include}/dolphin/os/OSInterrupt.h | 4 - .../dolphin/include}/dolphin/os/OSL2.h | 4 - .../dolphin/include}/dolphin/os/OSLC.h | 4 - .../dolphin/include}/dolphin/os/OSMemory.h | 4 - .../dolphin/include}/dolphin/os/OSMessage.h | 4 - .../dolphin/include}/dolphin/os/OSModule.h | 4 - .../dolphin/include}/dolphin/os/OSMutex.h | 4 - .../dolphin/include}/dolphin/os/OSReboot.h | 4 - .../dolphin/include}/dolphin/os/OSReset.h | 4 - .../dolphin/include}/dolphin/os/OSResetSW.h | 4 - .../dolphin/include}/dolphin/os/OSRtc.h | 4 - .../dolphin/include}/dolphin/os/OSSemaphore.h | 4 - .../dolphin/include}/dolphin/os/OSSerial.h | 4 - .../dolphin/include}/dolphin/os/OSThread.h | 4 - .../dolphin/include}/dolphin/os/OSTime.h | 4 - .../dolphin/include}/dolphin/os/OSTimer.h | 4 - .../dolphin/include}/dolphin/os/OSUtf.h | 4 - .../dolphin/include}/dolphin/pad.h | 4 - .../dolphin/include}/dolphin/perf.h | 0 .../dolphin/include}/dolphin/sdk_math.h | 0 .../dolphin/include}/dolphin/seq.h | 4 - .../dolphin/include}/dolphin/si.h | 4 - .../dolphin/include}/dolphin/sp.h | 4 - .../dolphin/include}/dolphin/syn.h | 4 - .../dolphin/include}/dolphin/thp.h | 4 - .../dolphin/include}/dolphin/types.h | 4 - .../dolphin/include}/dolphin/vi.h | 4 - .../dolphin/include}/dolphin/vi/vifuncs.h | 4 - .../dolphin/include}/dolphin/vi/vitypes.h | 4 - {src/dolphin => libs/dolphin/src}/G2D/G2D.c | 0 {src/dolphin => libs/dolphin/src}/ai/ai.c | 0 {src/dolphin => libs/dolphin/src}/am/__am.h | 0 {src/dolphin => libs/dolphin/src}/am/am.c | 0 .../dolphin/src}/amcnotstub/amcnotstub.c | 0 .../dolphin/src}/amcstubs/AmcExi2Stubs.c | 0 {src/dolphin => libs/dolphin/src}/ar/__ar.h | 0 {src/dolphin => libs/dolphin/src}/ar/ar.c | 0 {src/dolphin => libs/dolphin/src}/ar/arq.c | 0 {src/dolphin => libs/dolphin/src}/ax/AX.c | 0 .../dolphin => libs/dolphin/src}/ax/AXAlloc.c | 0 {src/dolphin => libs/dolphin/src}/ax/AXAux.c | 0 {src/dolphin => libs/dolphin/src}/ax/AXCL.c | 0 {src/dolphin => libs/dolphin/src}/ax/AXComp.c | 0 {src/dolphin => libs/dolphin/src}/ax/AXOut.c | 0 {src/dolphin => libs/dolphin/src}/ax/AXProf.c | 0 {src/dolphin => libs/dolphin/src}/ax/AXSPB.c | 0 {src/dolphin => libs/dolphin/src}/ax/AXVPB.c | 0 .../dolphin => libs/dolphin/src}/ax/DSPCode.c | 0 {src/dolphin => libs/dolphin/src}/ax/__ax.h | 0 .../dolphin/src}/axart/axart.c | 0 .../dolphin/src}/axart/axart3d.c | 0 .../dolphin/src}/axart/axartcents.c | 0 .../dolphin/src}/axart/axartenv.c | 0 .../dolphin/src}/axart/axartlfo.c | 0 .../dolphin/src}/axart/axartlpf.c | 0 .../dolphin/src}/axart/axartsound.c | 0 .../dolphin/src}/axfx/__axfx.h | 0 {src/dolphin => libs/dolphin/src}/axfx/axfx.c | 0 .../dolphin/src}/axfx/chorus.c | 0 .../dolphin => libs/dolphin/src}/axfx/delay.c | 0 .../dolphin/src}/axfx/reverb_hi.c | 0 .../dolphin/src}/axfx/reverb_hi_4ch.c | 0 .../dolphin/src}/axfx/reverb_std.c | 0 .../dolphin/src}/base/PPCArch.c | 0 .../dolphin => libs/dolphin/src}/base/PPCPm.c | 0 .../dolphin/src}/card/CARDBios.c | 0 .../dolphin/src}/card/CARDBlock.c | 0 .../dolphin/src}/card/CARDCheck.c | 0 .../dolphin/src}/card/CARDCreate.c | 0 .../dolphin/src}/card/CARDDelete.c | 0 .../dolphin/src}/card/CARDDir.c | 0 .../dolphin/src}/card/CARDErase.c | 0 .../dolphin/src}/card/CARDFormat.c | 0 .../dolphin/src}/card/CARDMount.c | 0 .../dolphin/src}/card/CARDNet.c | 0 .../dolphin/src}/card/CARDOpen.c | 0 .../dolphin/src}/card/CARDProgram.c | 0 .../dolphin/src}/card/CARDRaw.c | 0 .../dolphin/src}/card/CARDRdwr.c | 0 .../dolphin/src}/card/CARDRead.c | 0 .../dolphin/src}/card/CARDRename.c | 0 .../dolphin/src}/card/CARDStat.c | 0 .../dolphin/src}/card/CARDStatEx.c | 0 .../dolphin/src}/card/CARDUnlock.c | 0 .../dolphin/src}/card/CARDWrite.c | 0 .../dolphin/src}/card/__card.h | 0 {src/dolphin => libs/dolphin/src}/db/db.c | 0 .../dolphin/src}/demo/DEMOAVX.c | 0 .../dolphin/src}/demo/DEMOFont.c | 0 .../dolphin/src}/demo/DEMOInit.c | 0 .../dolphin/src}/demo/DEMOPad.c | 0 .../dolphin/src}/demo/DEMOPuts.c | 0 .../dolphin/src}/demo/DEMOStats.c | 0 .../dolphin/src}/demo/DEMOWin.c | 0 .../dolphin/src}/demo/__demo.h | 0 {src/dolphin => libs/dolphin/src}/dsp/__dsp.h | 0 {src/dolphin => libs/dolphin/src}/dsp/dsp.c | 0 .../dolphin/src}/dsp/dsp_debug.c | 0 .../dolphin/src}/dsp/dsp_perf.c | 0 .../dolphin/src}/dsp/dsp_task.c | 0 {src/dolphin => libs/dolphin/src}/dtk/dtk.c | 0 {src/dolphin => libs/dolphin/src}/dvd/__dvd.h | 0 {src/dolphin => libs/dolphin/src}/dvd/dvd.c | 0 .../dolphin/src}/dvd/dvdFatal.c | 0 .../dolphin/src}/dvd/dvderror.c | 0 {src/dolphin => libs/dolphin/src}/dvd/dvdfs.c | 0 .../dolphin/src}/dvd/dvdidutils.c | 0 .../dolphin => libs/dolphin/src}/dvd/dvdlow.c | 0 .../dolphin/src}/dvd/dvdqueue.c | 0 .../dolphin/src}/dvd/fstload.c | 0 .../dolphin/src}/exi/EXIAd16.c | 0 .../dolphin/src}/exi/EXIBios.c | 0 .../dolphin/src}/exi/EXIUart.c | 0 .../dolphin/src}/fileCache/fileCache.c | 0 {src/dolphin => libs/dolphin/src}/gd/GDBase.c | 0 {src/dolphin => libs/dolphin/src}/gd/GDFile.c | 0 .../dolphin/src}/gd/GDGeometry.c | 0 .../dolphin/src}/gd/GDIndirect.c | 0 .../dolphin => libs/dolphin/src}/gd/GDLight.c | 0 .../dolphin => libs/dolphin/src}/gd/GDPixel.c | 0 {src/dolphin => libs/dolphin/src}/gd/GDTev.c | 0 .../dolphin/src}/gd/GDTexture.c | 0 .../dolphin/src}/gd/GDTransform.c | 0 .../dolphin/src}/gf/GFGeometry.cpp | 0 .../dolphin/src}/gf/GFLight.cpp | 0 .../dolphin/src}/gf/GFPixel.cpp | 0 .../dolphin => libs/dolphin/src}/gf/GFTev.cpp | 0 {src/dolphin => libs/dolphin/src}/gx/GXAttr.c | 0 {src/dolphin => libs/dolphin/src}/gx/GXBump.c | 0 .../dolphin/src}/gx/GXDisplayList.c | 0 {src/dolphin => libs/dolphin/src}/gx/GXDraw.c | 0 {src/dolphin => libs/dolphin/src}/gx/GXFifo.c | 0 .../dolphin/src}/gx/GXFrameBuf.c | 0 .../dolphin/src}/gx/GXGeometry.c | 0 {src/dolphin => libs/dolphin/src}/gx/GXInit.c | 0 .../dolphin => libs/dolphin/src}/gx/GXLight.c | 0 {src/dolphin => libs/dolphin/src}/gx/GXMisc.c | 0 {src/dolphin => libs/dolphin/src}/gx/GXPerf.c | 0 .../dolphin => libs/dolphin/src}/gx/GXPixel.c | 0 {src/dolphin => libs/dolphin/src}/gx/GXSave.c | 0 .../dolphin => libs/dolphin/src}/gx/GXStubs.c | 0 {src/dolphin => libs/dolphin/src}/gx/GXTev.c | 0 .../dolphin/src}/gx/GXTexture.c | 0 .../dolphin/src}/gx/GXTransform.c | 0 .../dolphin/src}/gx/GXVerifRAS.c | 0 .../dolphin/src}/gx/GXVerifXF.c | 0 .../dolphin/src}/gx/GXVerify.c | 0 {src/dolphin => libs/dolphin/src}/gx/GXVert.c | 0 {src/dolphin => libs/dolphin/src}/gx/__gx.h | 0 {src/dolphin => libs/dolphin/src}/hio/hio.c | 0 {src/dolphin => libs/dolphin/src}/mcc/fio.c | 0 {src/dolphin => libs/dolphin/src}/mcc/mcc.c | 0 {src/dolphin => libs/dolphin/src}/mcc/tty.c | 0 {src/dolphin => libs/dolphin/src}/mix/mix.c | 0 {src/dolphin => libs/dolphin/src}/mtx/mtx.c | 0 {src/dolphin => libs/dolphin/src}/mtx/mtx44.c | 0 .../dolphin/src}/mtx/mtx44vec.c | 0 .../dolphin/src}/mtx/mtxstack.c | 0 .../dolphin => libs/dolphin/src}/mtx/mtxvec.c | 0 {src/dolphin => libs/dolphin/src}/mtx/psmtx.c | 0 {src/dolphin => libs/dolphin/src}/mtx/quat.c | 0 {src/dolphin => libs/dolphin/src}/mtx/vec.c | 0 .../dolphin/src}/odemustubs/odemustubs.c | 0 .../dolphin/src}/odenotstub/odenotstub.c | 0 {src/dolphin => libs/dolphin/src}/os/OS.c | 0 .../dolphin/src}/os/OSAddress.c | 0 .../dolphin => libs/dolphin/src}/os/OSAlarm.c | 0 .../dolphin => libs/dolphin/src}/os/OSAlloc.c | 0 .../dolphin => libs/dolphin/src}/os/OSArena.c | 0 .../dolphin/src}/os/OSAudioSystem.c | 0 .../dolphin => libs/dolphin/src}/os/OSCache.c | 0 .../dolphin/src}/os/OSContext.c | 0 .../dolphin => libs/dolphin/src}/os/OSError.c | 0 {src/dolphin => libs/dolphin/src}/os/OSExec.c | 0 .../dolphin => libs/dolphin/src}/os/OSFatal.c | 0 {src/dolphin => libs/dolphin/src}/os/OSFont.c | 0 .../dolphin/src}/os/OSInterrupt.c | 0 {src/dolphin => libs/dolphin/src}/os/OSLink.c | 0 .../dolphin/src}/os/OSMemory.c | 0 .../dolphin/src}/os/OSMessage.c | 0 .../dolphin => libs/dolphin/src}/os/OSMutex.c | 0 .../dolphin/src}/os/OSReboot.c | 0 .../dolphin => libs/dolphin/src}/os/OSReset.c | 0 .../dolphin/src}/os/OSResetSW.c | 0 {src/dolphin => libs/dolphin/src}/os/OSRtc.c | 0 .../dolphin/src}/os/OSSemaphore.c | 0 .../dolphin/src}/os/OSStopwatch.c | 0 {src/dolphin => libs/dolphin/src}/os/OSSync.c | 0 .../dolphin/src}/os/OSThread.c | 0 {src/dolphin => libs/dolphin/src}/os/OSTime.c | 0 .../dolphin => libs/dolphin/src}/os/OSTimer.c | 0 {src/dolphin => libs/dolphin/src}/os/OSUtf.c | 0 {src/dolphin => libs/dolphin/src}/os/__os.h | 0 .../dolphin/src}/os/__ppc_eabi_init.c | 0 .../dolphin/src}/os/__ppc_eabi_init.cpp | 0 .../dolphin => libs/dolphin/src}/os/__start.c | 0 .../dolphin/src}/os/time.dolphin.c | 0 {src/dolphin => libs/dolphin/src}/pad/Pad.c | 0 .../dolphin/src}/pad/Padclamp.c | 0 .../dolphin/src}/perf/__perf.h | 0 {src/dolphin => libs/dolphin/src}/perf/perf.c | 0 .../dolphin/src}/perf/perfdraw.c | 0 {src/dolphin => libs/dolphin/src}/seq/seq.c | 0 {src/dolphin => libs/dolphin/src}/si/SIBios.c | 0 .../dolphin/src}/si/SISamplingRate.c | 0 .../dolphin/src}/si/SISteering.c | 0 .../dolphin/src}/si/SISteeringAuto.c | 0 .../dolphin/src}/si/SISteeringXfer.c | 0 {src/dolphin => libs/dolphin/src}/si/__si.h | 0 {src/dolphin => libs/dolphin/src}/sp/sp.c | 0 .../dolphin/src}/support/HTable.c | 0 .../dolphin/src}/support/List.c | 0 .../dolphin/src}/support/Tree.c | 0 .../dolphin/src}/support/string.c | 0 {src/dolphin => libs/dolphin/src}/syn/__syn.h | 0 {src/dolphin => libs/dolphin/src}/syn/syn.c | 0 .../dolphin/src}/syn/synctrl.c | 0 .../dolphin => libs/dolphin/src}/syn/synenv.c | 0 .../dolphin => libs/dolphin/src}/syn/synlfo.c | 0 .../dolphin => libs/dolphin/src}/syn/synmix.c | 0 .../dolphin/src}/syn/synpitch.c | 0 .../dolphin/src}/syn/synsample.c | 0 .../dolphin/src}/syn/synvoice.c | 0 {src/dolphin => libs/dolphin/src}/syn/synwt.c | 0 .../dolphin/src}/texPalette/texPalette.c | 0 {src/dolphin => libs/dolphin/src}/vi/__vi.h | 0 .../dolphin => libs/dolphin/src}/vi/gpioexi.c | 0 {src/dolphin => libs/dolphin/src}/vi/i2c.c | 0 .../dolphin/src}/vi/initphilips.c | 0 {src/dolphin => libs/dolphin/src}/vi/vi.c | 0 .../revolution/include}/revolution/ai.h | 0 .../include}/revolution/amc/AmcExi2Comm.h | 0 .../include}/revolution/amc/AmcTypes.h | 0 .../revolution/include}/revolution/aralt.h | 0 .../revolution/include}/revolution/arc.h | 0 .../revolution/include}/revolution/ax.h | 0 .../revolution/include}/revolution/axart.h | 0 .../revolution/include}/revolution/axfx.h | 0 .../include}/revolution/base/PPCArch.h | 0 .../revolution/include}/revolution/card.h | 0 .../revolution/include}/revolution/db.h | 0 .../include}/revolution/db/DBInterface.h | 0 .../revolution/include}/revolution/dsp.h | 0 .../revolution/include}/revolution/dvd.h | 0 .../revolution/include}/revolution/esp.h | 0 .../revolution/include}/revolution/euart.h | 0 .../revolution/include}/revolution/exi.h | 0 .../revolution/include}/revolution/fs.h | 0 .../revolution/include}/revolution/gd.h | 0 .../include}/revolution/gd/GDBase.h | 0 .../include}/revolution/gd/GDFile.h | 0 .../include}/revolution/gd/GDGeometry.h | 0 .../include}/revolution/gd/GDIndirect.h | 0 .../include}/revolution/gd/GDLight.h | 0 .../include}/revolution/gd/GDPixel.h | 0 .../revolution/include}/revolution/gd/GDTev.h | 0 .../include}/revolution/gd/GDTexture.h | 0 .../include}/revolution/gd/GDTransform.h | 0 .../revolution/include}/revolution/gf.h | 0 .../include}/revolution/gf/GFGeometry.h | 0 .../include}/revolution/gf/GFLight.h | 0 .../include}/revolution/gf/GFPixel.h | 0 .../revolution/include}/revolution/gf/GFTev.h | 0 .../revolution/include}/revolution/gx.h | 0 .../include}/revolution/gx/GXBump.h | 0 .../include}/revolution/gx/GXCommandList.h | 0 .../include}/revolution/gx/GXCpu2Efb.h | 0 .../include}/revolution/gx/GXCull.h | 0 .../include}/revolution/gx/GXDispList.h | 0 .../include}/revolution/gx/GXDraw.h | 0 .../include}/revolution/gx/GXEnum.h | 0 .../include}/revolution/gx/GXFifo.h | 0 .../include}/revolution/gx/GXFrameBuffer.h | 0 .../include}/revolution/gx/GXGeometry.h | 0 .../revolution/include}/revolution/gx/GXGet.h | 0 .../include}/revolution/gx/GXLighting.h | 0 .../include}/revolution/gx/GXManage.h | 0 .../include}/revolution/gx/GXPerf.h | 0 .../include}/revolution/gx/GXPixel.h | 0 .../include}/revolution/gx/GXStruct.h | 0 .../revolution/include}/revolution/gx/GXTev.h | 0 .../include}/revolution/gx/GXTexture.h | 0 .../include}/revolution/gx/GXTransform.h | 0 .../include}/revolution/gx/GXVerify.h | 0 .../include}/revolution/gx/GXVert.h | 0 .../revolution/include}/revolution/hbm.h | 0 .../revolution/include}/revolution/hio2.h | 0 .../revolution/include}/revolution/hw_regs.h | 0 .../revolution/include}/revolution/ipc.h | 0 .../include}/revolution/ipc/ipcProfile.h | 0 .../include}/revolution/ipc/ipcclt.h | 0 .../include}/revolution/ipc/memory.h | 0 .../revolution/include}/revolution/kpad.h | 0 .../revolution/include}/revolution/mem.h | 0 .../include}/revolution/mem/allocator.h | 0 .../include}/revolution/mem/expHeap.h | 0 .../include}/revolution/mem/heapCommon.h | 0 .../revolution/include}/revolution/mem/list.h | 0 .../revolution/include}/revolution/mix.h | 0 .../revolution/include}/revolution/mtx.h | 0 .../revolution/include}/revolution/nand.h | 0 .../revolution/include}/revolution/os.h | 0 .../include}/revolution/os/OSAlarm.h | 0 .../include}/revolution/os/OSAlloc.h | 0 .../include}/revolution/os/OSCache.h | 0 .../include}/revolution/os/OSContext.h | 0 .../revolution/include}/revolution/os/OSDC.h | 0 .../include}/revolution/os/OSError.h | 0 .../include}/revolution/os/OSException.h | 0 .../include}/revolution/os/OSExec.h | 0 .../include}/revolution/os/OSFont.h | 0 .../include}/revolution/os/OSHardware.h | 0 .../revolution/include}/revolution/os/OSIC.h | 0 .../include}/revolution/os/OSInterrupt.h | 0 .../revolution/include}/revolution/os/OSIpc.h | 0 .../revolution/include}/revolution/os/OSL2.h | 0 .../revolution/include}/revolution/os/OSLC.h | 0 .../include}/revolution/os/OSMemory.h | 0 .../include}/revolution/os/OSMessage.h | 0 .../include}/revolution/os/OSModule.h | 0 .../include}/revolution/os/OSMutex.h | 0 .../include}/revolution/os/OSNandbootInfo.h | 0 .../revolution/include}/revolution/os/OSNet.h | 0 .../include}/revolution/os/OSPlayRecord.h | 0 .../include}/revolution/os/OSPlayTime.h | 0 .../include}/revolution/os/OSReboot.h | 0 .../include}/revolution/os/OSReset.h | 0 .../include}/revolution/os/OSResetSW.h | 0 .../revolution/include}/revolution/os/OSRtc.h | 0 .../include}/revolution/os/OSSemaphore.h | 0 .../include}/revolution/os/OSSerial.h | 0 .../include}/revolution/os/OSStateFlags.h | 0 .../include}/revolution/os/OSThread.h | 0 .../include}/revolution/os/OSTime.h | 0 .../include}/revolution/os/OSTimer.h | 0 .../revolution/include}/revolution/os/OSUtf.h | 0 .../revolution/include}/revolution/pad.h | 0 .../revolution/private/GXFDLShortcut.h | 0 .../include}/revolution/private/GXRegs.h | 0 .../include}/revolution/private/bp_reg.h | 0 .../include}/revolution/private/cp_reg.h | 0 .../include}/revolution/private/gen_reg.h | 0 .../include}/revolution/private/iosrestypes.h | 0 .../include}/revolution/private/iostypes.h | 0 .../include}/revolution/private/pe_reg.h | 0 .../include}/revolution/private/pi_reg.h | 0 .../include}/revolution/private/ras_reg.h | 0 .../include}/revolution/private/su_reg.h | 0 .../include}/revolution/private/tev_reg.h | 0 .../include}/revolution/private/tx_reg.h | 0 .../include}/revolution/private/xf_mem.h | 0 .../include}/revolution/revolution.h | 0 .../revolution/include}/revolution/sc.h | 0 .../revolution/include}/revolution/sdk_math.h | 0 .../revolution/include}/revolution/seq.h | 0 .../revolution/include}/revolution/si.h | 0 .../revolution/include}/revolution/sp.h | 0 .../revolution/include}/revolution/syn.h | 0 .../revolution/include}/revolution/thp.h | 0 .../revolution/include}/revolution/tpl.h | 0 .../revolution/include}/revolution/types.h | 0 .../revolution/include}/revolution/usb.h | 0 .../revolution/include}/revolution/vi.h | 0 .../include}/revolution/vi/vifuncs.h | 0 .../include}/revolution/vi/vitypes.h | 0 .../revolution/include}/revolution/wenc.h | 0 .../revolution/include}/revolution/wpad.h | 0 .../revolution/include}/revolution/wpad/bte.h | 0 .../revolution/include}/revolution/wpad/wud.h | 0 .../revolution/include}/revolution/wud.h | 0 .../revolution/src}/ai/ai.c | 0 .../revolution/src}/aralt/__ar.h | 0 .../revolution/src}/aralt/aralt.c | 0 .../revolution/src}/arc/arc.c | 0 .../revolution/src}/ax/AXAux.c | 0 .../revolution/src}/ax/AXCL.c | 0 .../revolution/src}/axfx/AXFXHooks.c | 0 .../revolution/src}/axfx/AXFXReverbHi.c | 0 .../revolution/src}/axfx/AXFXReverbHiExp.c | 0 .../revolution/src}/base/PPCArch.c | 0 .../revolution/src}/base/PPCPm.c | 0 .../revolution/src}/card/CARDBios.c | 0 .../revolution/src}/card/CARDBlock.c | 2 +- .../revolution/src}/card/CARDCheck.c | 2 +- .../revolution/src}/card/CARDCreate.c | 2 +- .../revolution/src}/card/CARDDelete.c | 2 +- .../revolution/src}/card/CARDDir.c | 2 +- .../revolution/src}/card/CARDErase.c | 2 +- .../revolution/src}/card/CARDFormat.c | 2 +- .../revolution/src}/card/CARDMount.c | 4 +- .../revolution/src}/card/CARDNet.c | 2 +- .../revolution/src}/card/CARDOpen.c | 2 +- .../revolution/src}/card/CARDProgram.c | 2 +- .../revolution/src}/card/CARDRaw.c | 2 +- .../revolution/src}/card/CARDRdwr.c | 2 +- .../revolution/src}/card/CARDRead.c | 2 +- .../revolution/src}/card/CARDRename.c | 2 +- .../revolution/src}/card/CARDStat.c | 2 +- .../revolution/src}/card/CARDStatEx.c | 4 +- .../revolution/src}/card/CARDUnlock.c | 3 +- .../revolution/src}/card/CARDWrite.c | 2 +- .../revolution/src}/card/__card.h | 0 .../revolution/src}/dsp/__dsp.h | 0 .../revolution/src}/dsp/dsp.c | 0 .../revolution/src}/dsp/dsp_debug.c | 0 .../revolution/src}/dsp/dsp_task.c | 0 .../revolution/src}/dvd/__dvd.h | 0 .../revolution/src}/dvd/dvd.c | 0 .../revolution/src}/dvd/dvdDeviceError.c | 0 .../revolution/src}/dvd/dvdFatal.c | 0 .../revolution/src}/dvd/dvd_broadway.c | 0 .../revolution/src}/dvd/dvderror.c | 0 .../revolution/src}/dvd/dvdfs.c | 0 .../revolution/src}/dvd/dvdidutils.c | 0 .../revolution/src}/dvd/dvdqueue.c | 0 .../revolution/src}/esp/esp.c | 0 .../revolution/src}/euart/euart.c | 0 .../revolution/src}/exi/EXIBios.c | 0 .../revolution/src}/exi/EXICommon.c | 0 .../revolution/src}/exi/EXIUart.c | 0 .../revolution/src}/fs/fs.c | 0 .../revolution/src}/gd/GDBase.c | 0 .../revolution/src}/gd/GDFile.c | 0 .../revolution/src}/gd/GDGeometry.c | 0 .../revolution/src}/gd/GDIndirect.c | 0 .../revolution/src}/gd/GDLight.c | 0 .../revolution/src}/gd/GDPixel.c | 0 .../revolution/src}/gd/GDTev.c | 0 .../revolution/src}/gd/GDTexture.c | 0 .../revolution/src}/gd/GDTransform.c | 0 .../revolution/src}/gf/GFGeometry.cpp | 0 .../revolution/src}/gf/GFLight.cpp | 0 .../revolution/src}/gf/GFPixel.cpp | 0 .../revolution/src}/gf/GFTev.cpp | 0 .../revolution/src}/gx/GXAttr.c | 0 .../revolution/src}/gx/GXBump.c | 0 .../revolution/src}/gx/GXDisplayList.c | 0 .../revolution/src}/gx/GXDraw.c | 0 .../revolution/src}/gx/GXFifo.c | 0 .../revolution/src}/gx/GXFrameBuf.c | 0 .../revolution/src}/gx/GXGeometry.c | 0 .../revolution/src}/gx/GXInit.c | 0 .../revolution/src}/gx/GXLight.c | 0 .../revolution/src}/gx/GXMisc.c | 0 .../revolution/src}/gx/GXPerf.c | 0 .../revolution/src}/gx/GXPixel.c | 0 .../revolution/src}/gx/GXSave.c | 0 .../revolution/src}/gx/GXStubs.c | 0 .../revolution/src}/gx/GXTev.c | 0 .../revolution/src}/gx/GXTexture.c | 0 .../revolution/src}/gx/GXTransform.c | 0 .../revolution/src}/gx/GXVerifRAS.c | 0 .../revolution/src}/gx/GXVerifXF.c | 0 .../revolution/src}/gx/GXVerify.c | 0 .../revolution/src}/gx/GXVert.c | 0 .../revolution/src}/gx/__gx.h | 0 .../revolution/src}/hio2/hio2.c | 0 .../src}/homebuttonLib/HBMAnmController.cpp | 0 .../src}/homebuttonLib/HBMAnmController.h | 0 .../revolution/src}/homebuttonLib/HBMBase.cpp | 0 .../revolution/src}/homebuttonLib/HBMBase.h | 0 .../revolution/src}/homebuttonLib/HBMCommon.h | 0 .../src}/homebuttonLib/HBMController.cpp | 0 .../src}/homebuttonLib/HBMController.h | 0 .../src}/homebuttonLib/HBMFrameController.cpp | 0 .../src}/homebuttonLib/HBMFrameController.h | 0 .../src}/homebuttonLib/HBMGUIManager.cpp | 0 .../src}/homebuttonLib/HBMGUIManager.h | 0 .../src}/homebuttonLib/HBMRemoteSpk.cpp | 0 .../src}/homebuttonLib/HBMRemoteSpk.h | 0 .../homebuttonLib/nw4hbm/db/DbgPrintBase.h | 0 .../src}/homebuttonLib/nw4hbm/db/assert.h | 0 .../src}/homebuttonLib/nw4hbm/db/console.h | 0 .../nw4hbm/db/db_DbgPrintBase.cpp | 0 .../homebuttonLib/nw4hbm/db/db_assert.cpp | 0 .../homebuttonLib/nw4hbm/db/db_console.cpp | 0 .../nw4hbm/db/db_directPrint.cpp | 0 .../homebuttonLib/nw4hbm/db/db_mapFile.cpp | 0 .../homebuttonLib/nw4hbm/db/directPrint.h | 0 .../src}/homebuttonLib/nw4hbm/db/mapFile.h | 0 .../src}/homebuttonLib/nw4hbm/lyt/animation.h | 0 .../nw4hbm/lyt/arcResourceAccessor.h | 0 .../src}/homebuttonLib/nw4hbm/lyt/bounding.h | 0 .../src}/homebuttonLib/nw4hbm/lyt/common.h | 0 .../src}/homebuttonLib/nw4hbm/lyt/drawInfo.h | 0 .../src}/homebuttonLib/nw4hbm/lyt/group.h | 0 .../src}/homebuttonLib/nw4hbm/lyt/layout.h | 0 .../nw4hbm/lyt/lyt_animation.cpp | 0 .../nw4hbm/lyt/lyt_arcResourceAccessor.cpp | 0 .../homebuttonLib/nw4hbm/lyt/lyt_bounding.cpp | 0 .../homebuttonLib/nw4hbm/lyt/lyt_common.cpp | 0 .../homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp | 0 .../homebuttonLib/nw4hbm/lyt/lyt_group.cpp | 0 .../homebuttonLib/nw4hbm/lyt/lyt_layout.cpp | 0 .../homebuttonLib/nw4hbm/lyt/lyt_material.cpp | 0 .../homebuttonLib/nw4hbm/lyt/lyt_pane.cpp | 0 .../homebuttonLib/nw4hbm/lyt/lyt_picture.cpp | 0 .../nw4hbm/lyt/lyt_resourceAccessor.cpp | 0 .../homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp | 0 .../src}/homebuttonLib/nw4hbm/lyt/lyt_types.h | 0 .../homebuttonLib/nw4hbm/lyt/lyt_window.cpp | 0 .../src}/homebuttonLib/nw4hbm/lyt/material.h | 0 .../src}/homebuttonLib/nw4hbm/lyt/pane.h | 0 .../src}/homebuttonLib/nw4hbm/lyt/picture.h | 0 .../nw4hbm/lyt/resourceAccessor.h | 0 .../src}/homebuttonLib/nw4hbm/lyt/resources.h | 0 .../src}/homebuttonLib/nw4hbm/lyt/textBox.h | 0 .../src}/homebuttonLib/nw4hbm/lyt/window.h | 0 .../src}/homebuttonLib/nw4hbm/macros.h | 0 .../homebuttonLib/nw4hbm/math/arithmetic.h | 0 .../homebuttonLib/nw4hbm/math/constants.h | 0 .../src}/homebuttonLib/nw4hbm/math/equation.h | 0 .../src}/homebuttonLib/nw4hbm/math/geometry.h | 0 .../nw4hbm/math/math_triangular.cpp | 0 .../homebuttonLib/nw4hbm/math/triangular.h | 0 .../src}/homebuttonLib/nw4hbm/math/types.h | 0 .../src}/homebuttonLib/nw4hbm/snd/AxManager.h | 0 .../src}/homebuttonLib/nw4hbm/snd/AxVoice.h | 0 .../src}/homebuttonLib/nw4hbm/snd/Bank.h | 0 .../src}/homebuttonLib/nw4hbm/snd/BankFile.h | 0 .../homebuttonLib/nw4hbm/snd/BasicPlayer.h | 0 .../homebuttonLib/nw4hbm/snd/BasicSound.h | 0 .../src}/homebuttonLib/nw4hbm/snd/Channel.h | 0 .../homebuttonLib/nw4hbm/snd/ChannelManager.h | 0 .../nw4hbm/snd/DisposeCallback.h | 0 .../nw4hbm/snd/DisposeCallbackManager.h | 0 .../nw4hbm/snd/DvdSoundArchive.h | 0 .../homebuttonLib/nw4hbm/snd/EnvGenerator.h | 0 .../nw4hbm/snd/ExternalSoundPlayer.h | 0 .../src}/homebuttonLib/nw4hbm/snd/FrameHeap.h | 0 .../src}/homebuttonLib/nw4hbm/snd/FxBase.h | 0 .../nw4hbm/snd/InstanceManager.h | 0 .../homebuttonLib/nw4hbm/snd/InstancePool.h | 0 .../src}/homebuttonLib/nw4hbm/snd/Lfo.h | 0 .../nw4hbm/snd/MemorySoundArchive.h | 0 .../homebuttonLib/nw4hbm/snd/MidiSeqPlayer.h | 0 .../homebuttonLib/nw4hbm/snd/MidiSeqTrack.h | 0 .../src}/homebuttonLib/nw4hbm/snd/MmlParser.h | 0 .../homebuttonLib/nw4hbm/snd/MmlSeqTrack.h | 0 .../nw4hbm/snd/MmlSeqTrackAllocator.h | 0 .../src}/homebuttonLib/nw4hbm/snd/MoveValue.h | 0 .../nw4hbm/snd/NandSoundArchive.h | 0 .../homebuttonLib/nw4hbm/snd/NoteOnCallback.h | 0 .../homebuttonLib/nw4hbm/snd/PlayerHeap.h | 0 .../homebuttonLib/nw4hbm/snd/RemoteSpeaker.h | 0 .../nw4hbm/snd/RemoteSpeakerManager.h | 0 .../src}/homebuttonLib/nw4hbm/snd/SeqFile.h | 0 .../src}/homebuttonLib/nw4hbm/snd/SeqPlayer.h | 0 .../src}/homebuttonLib/nw4hbm/snd/SeqSound.h | 0 .../homebuttonLib/nw4hbm/snd/SeqSoundHandle.h | 0 .../src}/homebuttonLib/nw4hbm/snd/SeqTrack.h | 0 .../nw4hbm/snd/SeqTrackAllocator.h | 0 .../homebuttonLib/nw4hbm/snd/SoundArchive.h | 0 .../nw4hbm/snd/SoundArchiveFile.h | 0 .../nw4hbm/snd/SoundArchiveLoader.h | 0 .../nw4hbm/snd/SoundArchivePlayer.h | 0 .../homebuttonLib/nw4hbm/snd/SoundHandle.h | 0 .../src}/homebuttonLib/nw4hbm/snd/SoundHeap.h | 0 .../nw4hbm/snd/SoundInstanceManager.h | 0 .../nw4hbm/snd/SoundMemoryAllocatable.h | 0 .../homebuttonLib/nw4hbm/snd/SoundPlayer.h | 0 .../homebuttonLib/nw4hbm/snd/SoundStartable.h | 0 .../homebuttonLib/nw4hbm/snd/SoundSystem.h | 0 .../homebuttonLib/nw4hbm/snd/SoundThread.h | 0 .../homebuttonLib/nw4hbm/snd/StrmChannel.h | 0 .../src}/homebuttonLib/nw4hbm/snd/StrmFile.h | 0 .../homebuttonLib/nw4hbm/snd/StrmPlayer.h | 0 .../src}/homebuttonLib/nw4hbm/snd/StrmSound.h | 0 .../nw4hbm/snd/StrmSoundHandle.h | 0 .../src}/homebuttonLib/nw4hbm/snd/Task.h | 0 .../homebuttonLib/nw4hbm/snd/TaskManager.h | 0 .../homebuttonLib/nw4hbm/snd/TaskThread.h | 0 .../src}/homebuttonLib/nw4hbm/snd/Util.h | 0 .../src}/homebuttonLib/nw4hbm/snd/WaveFile.h | 0 .../homebuttonLib/nw4hbm/snd/WavePlayer.h | 0 .../src}/homebuttonLib/nw4hbm/snd/WaveSound.h | 0 .../nw4hbm/snd/WaveSoundHandle.h | 0 .../src}/homebuttonLib/nw4hbm/snd/WsdFile.h | 0 .../src}/homebuttonLib/nw4hbm/snd/WsdPlayer.h | 0 .../src}/homebuttonLib/nw4hbm/snd/WsdTrack.h | 0 .../src}/homebuttonLib/nw4hbm/snd/debug.h | 0 .../nw4hbm/snd/snd_SoundArchivePlayer.cpp | 0 .../nw4hbm/snd/snd_SoundHandle.cpp | 0 .../nw4hbm/snd/snd_SoundPlayer.cpp | 0 .../nw4hbm/snd/snd_SoundStartable.cpp | 0 .../homebuttonLib/nw4hbm/snd/snd_global.h | 0 .../src}/homebuttonLib/nw4hbm/snd/snd_types.h | 0 .../homebuttonLib/nw4hbm/ut/CharStrmReader.h | 0 .../src}/homebuttonLib/nw4hbm/ut/CharWriter.h | 0 .../src}/homebuttonLib/nw4hbm/ut/Color.h | 0 .../homebuttonLib/nw4hbm/ut/DvdFileStream.h | 0 .../nw4hbm/ut/DvdLockedFileStream.h | 0 .../src}/homebuttonLib/nw4hbm/ut/FileStream.h | 0 .../src}/homebuttonLib/nw4hbm/ut/Font.h | 0 .../src}/homebuttonLib/nw4hbm/ut/IOStream.h | 0 .../src}/homebuttonLib/nw4hbm/ut/LinkList.h | 0 .../src}/homebuttonLib/nw4hbm/ut/Lock.h | 0 .../homebuttonLib/nw4hbm/ut/NandFileStream.h | 0 .../src}/homebuttonLib/nw4hbm/ut/Rect.h | 0 .../src}/homebuttonLib/nw4hbm/ut/ResFont.h | 0 .../homebuttonLib/nw4hbm/ut/RuntimeTypeInfo.h | 0 .../homebuttonLib/nw4hbm/ut/TagProcessor.h | 0 .../nw4hbm/ut/TagProcessorBase.h | 0 .../src}/homebuttonLib/nw4hbm/ut/TextWriter.h | 0 .../homebuttonLib/nw4hbm/ut/TextWriterBase.h | 0 .../nw4hbm/ut/WideTagProcessor.h | 0 .../homebuttonLib/nw4hbm/ut/WideTextWriter.h | 0 .../nw4hbm/ut/binaryFileFormat.h | 0 .../homebuttonLib/nw4hbm/ut/fontResources.h | 0 .../src}/homebuttonLib/nw4hbm/ut/inlines.h | 0 .../src}/homebuttonLib/nw4hbm/ut/list.h | 0 .../nw4hbm/ut/ut_CharStrmReader.cpp | 0 .../homebuttonLib/nw4hbm/ut/ut_CharWriter.cpp | 0 .../nw4hbm/ut/ut_DvdFileStream.cpp | 0 .../homebuttonLib/nw4hbm/ut/ut_FileStream.cpp | 0 .../src}/homebuttonLib/nw4hbm/ut/ut_Font.cpp | 0 .../homebuttonLib/nw4hbm/ut/ut_IOStream.cpp | 0 .../homebuttonLib/nw4hbm/ut/ut_LinkList.cpp | 0 .../nw4hbm/ut/ut_NandFileStream.cpp | 0 .../homebuttonLib/nw4hbm/ut/ut_ResFont.cpp | 0 .../nw4hbm/ut/ut_ResFontBase.cpp | 0 .../nw4hbm/ut/ut_TagProcessorBase.cpp | 0 .../nw4hbm/ut/ut_TextWriterBase.cpp | 0 .../nw4hbm/ut/ut_binaryFileFormat.cpp | 0 .../src}/homebuttonLib/nw4hbm/ut/ut_list.cpp | 0 .../src}/homebuttonLib/sound/mix.cpp | 0 .../revolution/src}/homebuttonLib/sound/mix.h | 0 .../src}/homebuttonLib/sound/seq.cpp | 0 .../revolution/src}/homebuttonLib/sound/seq.h | 0 .../src}/homebuttonLib/sound/syn.cpp | 0 .../revolution/src}/homebuttonLib/sound/syn.h | 0 .../src}/homebuttonLib/sound/synctrl.cpp | 0 .../src}/homebuttonLib/sound/synenv.cpp | 0 .../src}/homebuttonLib/sound/synmix.cpp | 0 .../src}/homebuttonLib/sound/synpitch.cpp | 0 .../src}/homebuttonLib/sound/synprivate.h | 0 .../src}/homebuttonLib/sound/synsample.cpp | 0 .../src}/homebuttonLib/sound/synvoice.cpp | 0 .../revolution/src}/ipc/ipcMain.c | 0 .../revolution/src}/ipc/ipcProfile.c | 0 .../revolution/src}/ipc/ipcclt.c | 0 .../revolution/src}/ipc/memory.c | 0 .../revolution/src}/kpad/KPAD.c | 3 +- .../revolution/src}/kpad/__kpad.h | 0 .../revolution/src}/mem/mem_allocator.c | 0 .../revolution/src}/mem/mem_expHeap.c | 0 .../revolution/src}/mem/mem_heapCommon.c | 0 .../revolution/src}/mem/mem_list.c | 0 .../revolution/src}/mtx/mtx.c | 0 .../revolution/src}/mtx/mtx44.c | 0 .../revolution/src}/mtx/mtx44vec.c | 0 .../revolution/src}/mtx/mtxstack.c | 0 .../revolution/src}/mtx/mtxvec.c | 0 .../revolution/src}/mtx/psmtx.c | 0 .../revolution/src}/mtx/quat.c | 0 .../revolution/src}/mtx/vec.c | 0 .../revolution/src}/nand/NANDCheck.c | 0 .../revolution/src}/nand/NANDCore.c | 0 .../revolution/src}/nand/NANDErrorMessage.c | 0 .../revolution/src}/nand/NANDLogging.c | 0 .../revolution/src}/nand/NANDOpenClose.c | 0 .../revolution/src}/nand/nand.c | 0 .../revolution/src}/os/OS.c | 0 .../revolution/src}/os/OSAddress.c | 0 .../revolution/src}/os/OSAlarm.c | 0 .../revolution/src}/os/OSAlloc.c | 0 .../revolution/src}/os/OSArena.c | 0 .../revolution/src}/os/OSAudioSystem.c | 0 .../revolution/src}/os/OSCache.c | 0 .../revolution/src}/os/OSContext.c | 0 .../revolution/src}/os/OSError.c | 0 .../revolution/src}/os/OSExec.c | 0 .../revolution/src}/os/OSFatal.c | 0 .../revolution/src}/os/OSFont.c | 0 .../revolution/src}/os/OSInterrupt.c | 0 .../revolution/src}/os/OSIpc.c | 0 .../revolution/src}/os/OSLaunch.c | 0 .../revolution/src}/os/OSLink.c | 0 .../revolution/src}/os/OSMemory.c | 0 .../revolution/src}/os/OSMessage.c | 0 .../revolution/src}/os/OSMutex.c | 0 .../revolution/src}/os/OSNandbootInfo.c | 0 .../revolution/src}/os/OSNet.c | 0 .../revolution/src}/os/OSPlayRecord.c | 0 .../revolution/src}/os/OSPlayTime.c | 0 .../revolution/src}/os/OSReboot.c | 0 .../revolution/src}/os/OSReset.c | 0 .../revolution/src}/os/OSRtc.c | 0 .../revolution/src}/os/OSStateFlags.c | 0 .../revolution/src}/os/OSStateTM.c | 0 .../revolution/src}/os/OSStopwatch.c | 0 .../revolution/src}/os/OSSync.c | 0 .../revolution/src}/os/OSThread.c | 0 .../revolution/src}/os/OSTime.c | 0 .../revolution/src}/os/OSUtf.c | 0 .../revolution/src}/os/__os.h | 0 .../revolution/src}/os/__ppc_eabi_init.cpp | 0 .../revolution/src}/os/__start.c | 0 .../revolution/src}/pad/Pad.c | 2 +- .../revolution/src}/pad/Padclamp.c | 0 .../revolution/src}/sc/scapi.c | 0 .../revolution/src}/sc/scapi_prdinfo.c | 0 .../revolution/src}/sc/scsystem.c | 0 .../revolution/src}/si/SIBios.c | 0 .../revolution/src}/si/SISamplingRate.c | 0 .../revolution/src}/si/__si.h | 0 .../revolution/src}/tpl/TPL.c | 0 .../revolution/src}/usb/__usb.h | 0 .../revolution/src}/usb/usb.c | 3 +- .../revolution/src}/vi/__vi.h | 0 .../revolution/src}/vi/i2c.c | 0 .../revolution/src}/vi/vi.c | 0 .../revolution/src}/vi/vi3in1.c | 0 .../revolution/src}/wenc/wenc.c | 0 .../revolution/src}/wpad/WPAD.c | 5 +- .../revolution/src}/wpad/WPADEncrypt.c | 2 +- .../revolution/src}/wpad/WPADHIDParser.c | 3 +- .../revolution/src}/wpad/WPADMem.c | 2 +- .../revolution/src}/wpad/__wpad.h | 0 .../revolution/src}/wpad/wpad_debug_msg.c | 2 +- .../revolution/src}/wud/WUD.c | 3 +- .../revolution/src}/wud/WUDHidHost.c | 3 +- .../revolution/src}/wud/__wud.h | 0 .../revolution/src}/wud/debug_msg.c | 3 +- src/NdevExi2A/DebuggerDriver.c | 4 +- src/SSystem/SComponent/c_list.cpp | 2 +- src/SSystem/SComponent/c_list_iter.cpp | 2 +- src/SSystem/SComponent/c_node.cpp | 2 +- src/SSystem/SComponent/c_node_iter.cpp | 2 +- src/SSystem/SComponent/c_tree_iter.cpp | 2 +- src/amcstubs/AmcExi2Stubs.c | 2 +- src/d/actor/d_a_bg_obj.cpp | 2 +- src/d/actor/d_a_cow.cpp | 2 +- src/d/actor/d_a_e_oct_bg.cpp | 2 +- src/d/actor/d_a_mirror.cpp | 4 +- src/d/actor/d_a_npc_taro.cpp | 2 +- src/d/actor/d_a_npc_wrestler.cpp | 2 +- src/d/actor/d_a_obj_maki.cpp | 2 +- src/d/actor/d_a_obj_nameplate.cpp | 2 +- src/d/actor/d_a_obj_sekizoa.cpp | 2 +- src/d/actor/d_a_obj_wind_stone.cpp | 2 +- src/d/actor/d_grass.inc | 2 +- src/d/d_com_inf_actor.cpp | 2 +- src/d/d_kankyo.cpp | 8 +- src/d/d_menu_collect.cpp | 2 +- src/d/d_menu_letter.cpp | 2 +- src/d/d_menu_option.cpp | 4 +- src/f_pc/f_pc_stdcreate_req.cpp | 6 +- src/m_Do/m_Do_DVDError.cpp | 2 +- src/m_Do/m_Do_MemCard.cpp | 2 +- src/m_Do/m_Do_Reset.cpp | 2 +- src/m_Do/m_Do_ext.cpp | 4 +- src/m_Do/m_Do_graphic.cpp | 2 +- src/m_Do/m_Do_hostIO.cpp | 6 +- src/m_Do/m_Do_lib.cpp | 2 +- src/m_Do/m_Do_printf.cpp | 2 +- src/odemuexi2/DebuggerDriver.c | 4 +- src/odenotstub/odenotstub.c | 6 +- tools/project.py | 29 +++---- 1740 files changed, 583 insertions(+), 825 deletions(-) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DAnimation.h (100%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DAnmLoader.h (100%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DGrafContext.h (98%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DManage.h (95%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DMatBlock.h (100%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DMaterial.h (100%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DMaterialFactory.h (100%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DOrthoGraph.h (100%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DPane.h (99%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DPicture.h (100%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DPictureEx.h (100%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DPrint.h (100%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DScreen.h (100%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DTevs.h (99%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DTextBox.h (100%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DTextBoxEx.h (100%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DWindow.h (100%) rename {include => libs/JSystem/include}/JSystem/J2DGraph/J2DWindowEx.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DAssert.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphAnimator/J3DAnimation.h (99%) rename {include => libs/JSystem/include}/JSystem/J3DGraphAnimator/J3DCluster.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphAnimator/J3DJoint.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphAnimator/J3DJointTree.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphAnimator/J3DMaterialAnm.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphAnimator/J3DMaterialAttach.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphAnimator/J3DModel.h (99%) rename {include => libs/JSystem/include}/JSystem/J3DGraphAnimator/J3DModelData.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphAnimator/J3DMtxBuffer.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphAnimator/J3DShapeTable.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphAnimator/J3DSkinDeform.h (99%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DDrawBuffer.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DEnum.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DFifo.h (97%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DGD.h (99%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DMatBlock.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DMaterial.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DPacket.h (99%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DShape.h (99%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DShapeDraw.h (95%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DShapeMtx.h (99%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DStruct.h (98%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DSys.h (99%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DTevs.h (99%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DTexture.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DTransform.h (99%) rename {include => libs/JSystem/include}/JSystem/J3DGraphBase/J3DVertex.h (98%) rename {include => libs/JSystem/include}/JSystem/J3DGraphLoader/J3DAnmLoader.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphLoader/J3DClusterLoader.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphLoader/J3DJointFactory.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphLoader/J3DMaterialFactory.h (99%) rename {include => libs/JSystem/include}/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h (99%) rename {include => libs/JSystem/include}/JSystem/J3DGraphLoader/J3DModelLoader.h (99%) rename {include => libs/JSystem/include}/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h (79%) rename {include => libs/JSystem/include}/JSystem/J3DGraphLoader/J3DModelSaver.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DGraphLoader/J3DShapeFactory.h (98%) rename {include => libs/JSystem/include}/JSystem/J3DU/J3DUClipper.h (97%) rename {include => libs/JSystem/include}/JSystem/J3DU/J3DUD.h (86%) rename {include => libs/JSystem/include}/JSystem/J3DU/J3DUDL.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DU/J3DUFur.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DU/J3DUMotion.h (100%) rename {include => libs/JSystem/include}/JSystem/J3DU/J3DUShadow.h (100%) rename {include => libs/JSystem/include}/JSystem/JAHNodeLib/JAHSoundPlayerNode.h (100%) rename {include => libs/JSystem/include}/JSystem/JAHostIO/JAHFrameNode.h (96%) rename {include => libs/JSystem/include}/JSystem/JAHostIO/JAHPubDefine.h (100%) rename {include => libs/JSystem/include}/JSystem/JAHostIO/JAHUTableEdit.h (100%) rename {include => libs/JSystem/include}/JSystem/JAHostIO/JAHVirtualNode.h (100%) rename {include => libs/JSystem/include}/JSystem/JAHostIO/JAHioMessage.h (97%) rename {include => libs/JSystem/include}/JSystem/JAHostIO/JAHioMgr.h (100%) rename {include => libs/JSystem/include}/JSystem/JAHostIO/JAHioNode.h (100%) rename {include => libs/JSystem/include}/JSystem/JAHostIO/JAHioUtil.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWExtSystem/JAWExtSystem.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWExtSystem/JAWGraphContext.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWExtSystem/JAWSystem.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWExtSystem/JAWWindow.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWExtSystem/JAWWindow3D.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWWinLib/JAWBankView.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWWinLib/JAWChView.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWWinLib/JAWEntrySeView.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWWinLib/JAWHioBankEdit.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWWinLib/JAWHioReceiver.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWWinLib/JAWPlaySeView.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWWinLib/JAWPlayerChView.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWWinLib/JAWReportView.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWWinLib/JAWSysMemView.h (100%) rename {include => libs/JSystem/include}/JSystem/JAWWinLib/JAWVolume.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAIAudible.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAIAudience.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAISe.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAISeMgr.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAISeq.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAISeqDataMgr.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAISeqMgr.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAISound.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAISoundChild.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAISoundHandles.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAISoundInfo.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAISoundParams.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAISoundStarter.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAIStream.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAIStreamDataMgr.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAIStreamMgr.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASAiCtrl.h (98%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASAramStream.h (99%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASAudioReseter.h (94%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASAudioThread.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASBNKParser.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASBank.h (97%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASBankList.h (89%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASBankTable.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASBasicBank.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASBasicInst.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASBasicWaveBank.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASCalc.h (97%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASCallback.h (95%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASChannel.h (99%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASCmdStack.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASCriticalSection.h (93%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASDSPChannel.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASDSPInterface.h (99%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASDriverIF.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASDrumSet.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASDvdThread.h (92%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASGadget.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASHeapCtrl.h (99%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASLfo.h (96%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASMutex.h (92%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASOscillator.h (98%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASProbe.h (94%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASRegisterParam.h (93%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASReport.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASResArcLoader.h (98%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASSeqCtrl.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASSeqParser.h (99%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASSeqReader.h (98%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASSimpleWaveBank.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASSoundParams.h (98%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASTaskThread.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASTrack.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASTrackPort.h (95%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASVoiceBank.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASWSParser.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASWaveArcLoader.h (98%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JASWaveInfo.h (97%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUAudibleParam.h (96%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUAudience.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUAudioArcInterpreter.h (97%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUAudioArcLoader.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUAudioMgr.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUBankTable.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUClusterSound.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUInitializer.h (97%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUSectionHeap.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUSeqCollection.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUSeqDataBlockMgr.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUSoundAnimator.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUSoundInfo.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUSoundObject.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUSoundTable.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUStreamAramMgr.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/JAUStreamFileTable.h (100%) rename {include => libs/JSystem/include}/JSystem/JAudio2/dspproc.h (92%) rename {include => libs/JSystem/include}/JSystem/JAudio2/dsptask.h (87%) rename {include => libs/JSystem/include}/JSystem/JAudio2/osdsp.h (85%) rename {include => libs/JSystem/include}/JSystem/JAudio2/osdsp_task.h (86%) rename {include => libs/JSystem/include}/JSystem/JFramework/JFWDisplay.h (99%) rename {include => libs/JSystem/include}/JSystem/JFramework/JFWSystem.h (98%) rename {include => libs/JSystem/include}/JSystem/JGadget/binary.h (100%) rename {include => libs/JSystem/include}/JSystem/JGadget/define.h (98%) rename {include => libs/JSystem/include}/JSystem/JGadget/linklist.h (100%) rename {include => libs/JSystem/include}/JSystem/JGadget/pointer.h (100%) rename {include => libs/JSystem/include}/JSystem/JGadget/search.h (99%) rename {include => libs/JSystem/include}/JSystem/JGadget/std-list.h (100%) rename {include => libs/JSystem/include}/JSystem/JGadget/std-memory.h (100%) rename {include => libs/JSystem/include}/JSystem/JGadget/std-stream.h (100%) rename {include => libs/JSystem/include}/JSystem/JGadget/std-streambuf.h (98%) rename {include => libs/JSystem/include}/JSystem/JGadget/std-vector.h (100%) rename {include => libs/JSystem/include}/JSystem/JGadget/vector.h (100%) rename {include => libs/JSystem/include}/JSystem/JGeometry.h (99%) rename {include => libs/JSystem/include}/JSystem/JHostIO/JHIComm.h (100%) rename {include => libs/JSystem/include}/JSystem/JHostIO/JHICommonMem.h (98%) rename {include => libs/JSystem/include}/JSystem/JHostIO/JHIMccBuf.h (100%) rename {include => libs/JSystem/include}/JSystem/JHostIO/JHIRMcc.h (77%) rename {include => libs/JSystem/include}/JSystem/JHostIO/JHIhioASync.h (88%) rename {include => libs/JSystem/include}/JSystem/JHostIO/JOREntry.h (99%) rename {include => libs/JSystem/include}/JSystem/JHostIO/JORFile.h (100%) rename {include => libs/JSystem/include}/JSystem/JHostIO/JORHostInfo.h (94%) rename {include => libs/JSystem/include}/JSystem/JHostIO/JORMContext.h (99%) rename {include => libs/JSystem/include}/JSystem/JHostIO/JORReflexible.h (97%) rename {include => libs/JSystem/include}/JSystem/JHostIO/JORServer.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRAram.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRAramArchive.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRAramBlock.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRAramHeap.h (98%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRAramPiece.h (95%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRAramStream.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRArchive.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRAssertHeap.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRCompArchive.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRCompression.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRDecomp.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRDisposer.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRDvdAramRipper.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRDvdArchive.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRDvdFile.h (96%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRDvdRipper.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRExpHeap.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRFile.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRFileCache.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRFileFinder.h (98%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRFileLoader.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRHeap.h (99%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRMemArchive.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRSolidHeap.h (100%) rename {include => libs/JSystem/include}/JSystem/JKernel/JKRThread.h (99%) rename {include => libs/JSystem/include}/JSystem/JKernel/SArc.h (100%) rename {include => libs/JSystem/include}/JSystem/JMath/JMATrigonometric.h (99%) rename {include => libs/JSystem/include}/JSystem/JMath/JMath.h (99%) rename {include => libs/JSystem/include}/JSystem/JMath/random.h (97%) rename {include => libs/JSystem/include}/JSystem/JMessage/JMessage.h (94%) rename {include => libs/JSystem/include}/JSystem/JMessage/control.h (100%) rename {include => libs/JSystem/include}/JSystem/JMessage/data.h (100%) rename {include => libs/JSystem/include}/JSystem/JMessage/locale.h (88%) rename {include => libs/JSystem/include}/JSystem/JMessage/processor.h (100%) rename {include => libs/JSystem/include}/JSystem/JMessage/resource.h (100%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPABaseShape.h (99%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPAChildShape.h (99%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPADrawInfo.h (96%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPADynamicsBlock.h (99%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPAEmitter.h (99%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPAEmitterManager.h (98%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPAExTexShape.h (97%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPAExtraShape.h (99%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPAFieldBlock.h (99%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPAKeyBlock.h (94%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPAList.h (99%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPAMath.h (96%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPAParticle.h (99%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPARandom.h (96%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPAResource.h (98%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPAResourceLoader.h (90%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPAResourceManager.h (100%) rename {include => libs/JSystem/include}/JSystem/JParticle/JPATexture.h (100%) rename {include => libs/JSystem/include}/JSystem/JStage/JSGActor.h (100%) rename {include => libs/JSystem/include}/JSystem/JStage/JSGAmbientLight.h (94%) rename {include => libs/JSystem/include}/JSystem/JStage/JSGCamera.h (100%) rename {include => libs/JSystem/include}/JSystem/JStage/JSGFog.h (96%) rename {include => libs/JSystem/include}/JSystem/JStage/JSGLight.h (97%) rename {include => libs/JSystem/include}/JSystem/JStage/JSGObject.h (97%) rename {include => libs/JSystem/include}/JSystem/JStage/JSGSystem.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/ctb-data.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/ctb.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/functionvalue.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/fvb-data-parse.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/fvb-data.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/fvb.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/jstudio-control.h (99%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/jstudio-data.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/jstudio-math.h (98%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/jstudio-object.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/object-id.h (97%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/stb-data-parse.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/stb-data.h (98%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio/stb.h (99%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudioCameraEditor/control.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudioCameraEditor/csb.h (99%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudioCameraEditor/sequence.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudioToolLibrary/anchor.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudioToolLibrary/console.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudioToolLibrary/controlset-preview.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudioToolLibrary/controlset-transform.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudioToolLibrary/controlset.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudioToolLibrary/interface.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudioToolLibrary/scroll.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudioToolLibrary/visual.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio_JAudio2/control.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio_JAudio2/object-sound.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio_JParticle/control.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio_JParticle/object-particle.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio_JPreviewer/control.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio_JStage/control.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio_JStage/object-actor.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio_JStage/object-ambientlight.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio_JStage/object-camera.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio_JStage/object-fog.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio_JStage/object-light.h (100%) rename {include => libs/JSystem/include}/JSystem/JStudio/JStudio_JStage/object.h (100%) rename {include => libs/JSystem/include}/JSystem/JSupport/JSUFileStream.h (100%) rename {include => libs/JSystem/include}/JSystem/JSupport/JSUInputStream.h (100%) rename {include => libs/JSystem/include}/JSystem/JSupport/JSUIosBase.h (95%) rename {include => libs/JSystem/include}/JSystem/JSupport/JSUList.h (99%) rename {include => libs/JSystem/include}/JSystem/JSupport/JSUMemoryStream.h (100%) rename {include => libs/JSystem/include}/JSystem/JSupport/JSUOutputStream.h (100%) rename {include => libs/JSystem/include}/JSystem/JSupport/JSURandomInputStream.h (100%) rename {include => libs/JSystem/include}/JSystem/JSupport/JSURandomOutputStream.h (100%) rename {include => libs/JSystem/include}/JSystem/JSupport/JSupport.h (91%) rename {include => libs/JSystem/include}/JSystem/JSystem.h (100%) rename {include => libs/JSystem/include}/JSystem/JSystem.pch (100%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTAssert.h (99%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTCacheFont.h (100%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTConsole.h (100%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTDbPrint.h (100%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTDirectFile.h (95%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTDirectPrint.h (100%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTException.h (98%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTFader.h (100%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTFont.h (100%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTFontData_Ascfont_fix12.h (80%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTGamePad.h (99%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTGraphFifo.h (97%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTNameTab.h (97%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTPalette.h (97%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTProcBar.h (99%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTReport.h (100%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTResFont.h (100%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTResource.h (96%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTTexture.h (99%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTVideo.h (96%) rename {include => libs/JSystem/include}/JSystem/JUtility/JUTXfb.h (100%) rename {include => libs/JSystem/include}/JSystem/JUtility/TColor.h (96%) rename {include => libs/JSystem/include}/JSystem/TPosition3.h (98%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DAnimation.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DAnmLoader.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DGrafContext.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DManage.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DMatBlock.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DMaterial.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DMaterialFactory.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DOrthoGraph.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DPane.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DPicture.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DPictureEx.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DPrint.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DScreen.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DTevs.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DTextBox.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DTextBoxEx.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DWindow.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J2DGraph/J2DWindowEx.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphAnimator/J3DAnimation.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphAnimator/J3DCluster.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J3DGraphAnimator/J3DJoint.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphAnimator/J3DJointTree.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphAnimator/J3DMaterialAnm.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphAnimator/J3DMaterialAttach.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphAnimator/J3DModel.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphAnimator/J3DModelData.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphAnimator/J3DMtxBuffer.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphAnimator/J3DShapeTable.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphAnimator/J3DSkinDeform.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DDrawBuffer.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DGD.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DMatBlock.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DMaterial.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DPacket.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DShape.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DShapeDraw.cpp (98%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DShapeMtx.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DStruct.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DSys.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DTevs.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DTexture.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DTransform.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphBase/J3DVertex.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphLoader/J3DAnmLoader.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J3DGraphLoader/J3DClusterLoader.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J3DGraphLoader/J3DJointFactory.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphLoader/J3DMaterialFactory.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphLoader/J3DMaterialFactory_v21.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphLoader/J3DModelLoader.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DGraphLoader/J3DModelLoaderCalcSize.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J3DGraphLoader/J3DShapeFactory.cpp (99%) rename {src/JSystem => libs/JSystem/src}/J3DU/J3DUClipper.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DU/J3DUDL.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DU/J3DUFur.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DU/J3DUMotion.cpp (100%) rename {src/JSystem => libs/JSystem/src}/J3DU/J3DUShadow.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAHostIO/JAHioMessage.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAHostIO/JAHioMgr.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAHostIO/JAHioNode.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAHostIO/JAHioUtil.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAWExtSystem/JAWExtSystem.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAWExtSystem/JAWGraphContext.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAWExtSystem/JAWSystem.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAWExtSystem/JAWWindow.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAWExtSystem/JAWWindow3D.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAIAudible.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAIAudience.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAISe.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAISeMgr.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAISeq.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAISeqDataMgr.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAISeqMgr.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAISound.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAISoundChild.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAISoundHandles.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAISoundInfo.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAISoundParams.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAISoundStarter.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAIStream.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAIStreamDataMgr.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAIStreamMgr.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASAiCtrl.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASAramStream.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASAudioReseter.cpp (98%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASAudioThread.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASBNKParser.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASBank.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASBasicBank.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASBasicInst.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASBasicWaveBank.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASCalc.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASCallback.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASChannel.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASCmdStack.cpp (98%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASDSPChannel.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASDSPInterface.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASDriverIF.cpp (98%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASDrumSet.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASDvdThread.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASHeapCtrl.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASLfo.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASOscillator.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASProbe.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASRegisterParam.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASReport.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASResArcLoader.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASSeqCtrl.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASSeqParser.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASSeqReader.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASSimpleWaveBank.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASSoundParams.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASTaskThread.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASTrack.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASTrackPort.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASVoiceBank.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASWSParser.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JASWaveArcLoader.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUAudience.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUAudioArcInterpreter.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUAudioArcLoader.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUAudioMgr.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUBankTable.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUClusterSound.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUInitializer.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUSectionHeap.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUSeqCollection.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUSeqDataBlockMgr.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUSoundAnimator.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUSoundObject.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUSoundTable.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/JAUStreamFileTable.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/dspproc.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/dsptask.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JAudio2/osdsp.cpp (94%) rename {src/JSystem => libs/JSystem/src}/JAudio2/osdsp_task.cpp (98%) rename {src/JSystem => libs/JSystem/src}/JFramework/JFWDisplay.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JFramework/JFWSystem.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JGadget/binary.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JGadget/define.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JGadget/dolphin-stream-JORFile.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JGadget/linklist.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JGadget/search.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JGadget/std-list.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JGadget/std-stream.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JGadget/std-streambuf.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JGadget/std-string.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JGadget/std-vector.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JGadget/textreader.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JGadget/xml-scanner.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JHostIO/JHIComm.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JHostIO/JHICommonMem.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JHostIO/JHIMccBuf.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JHostIO/JHIMemBuf.cpp (94%) rename {src/JSystem => libs/JSystem/src}/JHostIO/JHIRMcc.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JHostIO/JHIhioASync.cpp (98%) rename {src/JSystem => libs/JSystem/src}/JHostIO/JOREntry.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JHostIO/JORFile.cpp (98%) rename {src/JSystem => libs/JSystem/src}/JHostIO/JORHostInfo.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JHostIO/JORMessageBox.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JHostIO/JORServer.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JHostIO/JORShellExecute.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRAram.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRAramArchive.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRAramBlock.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRAramHeap.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRAramPiece.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRAramStream.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRArchivePri.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRArchivePub.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRAssertHeap.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRCompArchive.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRDecomp.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRDisposer.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRDvdAramRipper.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRDvdArchive.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRDvdFile.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRDvdRipper.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRExpHeap.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRFile.cpp (93%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRFileCache.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRFileFinder.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRFileLoader.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRHeap.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRMemArchive.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRSolidHeap.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JKernel/JKRThread.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JMath/JMATrigonometric.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JMath/JMath.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JMath/random.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JMessage/control.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JMessage/data.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JMessage/locale.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JMessage/processor.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JMessage/resource.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPABaseShape.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPAChildShape.cpp (96%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPADynamicsBlock.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPAEmitter.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPAEmitterManager.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPAExTexShape.cpp (97%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPAExtraShape.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPAFieldBlock.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPAKeyBlock.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPAMath.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPAParticle.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPAResource.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPAResourceLoader.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPAResourceManager.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JParticle/JPATexture.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStage/JSGActor.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStage/JSGAmbientLight.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStage/JSGCamera.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStage/JSGFog.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStage/JSGLight.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStage/JSGObject.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStage/JSGSystem.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/ctb-data.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/ctb.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/functionvalue.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/fvb-data-parse.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/fvb-data.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/fvb.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/jstudio-control.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/jstudio-data.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/jstudio-math.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/jstudio-object.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/object-id.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/stb-data-parse.cpp (98%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/stb-data.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio/stb.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioCameraEditor/control.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioCameraEditor/csb-data.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioCameraEditor/csb.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioCameraEditor/sequence.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioPreviewer/control.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioToolLibrary/anchor.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioToolLibrary/console.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioToolLibrary/controlset-anchor.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioToolLibrary/controlset-preview.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioToolLibrary/controlset.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioToolLibrary/interface.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioToolLibrary/scroll.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioToolLibrary/visual.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudioToolLibrary/xml.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio_JAudio2/control.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio_JAudio2/object-sound.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio_JParticle/control.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio_JParticle/object-particle.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio_JStage/control.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio_JStage/object-actor.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio_JStage/object-ambientlight.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio_JStage/object-camera.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio_JStage/object-fog.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio_JStage/object-light.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JStudio/JStudio_JStage/object.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JSupport/JSUFileStream.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JSupport/JSUInputStream.cpp (96%) rename {src/JSystem => libs/JSystem/src}/JSupport/JSUList.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JSupport/JSUMemoryStream.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JSupport/JSUOutputStream.cpp (94%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTAssert.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTCacheFont.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTConsole.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTDbPrint.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTDirectFile.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTDirectPrint.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTException.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTFader.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTFont.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTFontData_Ascfont_fix12.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTGamePad.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTGraphFifo.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTNameTab.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTPalette.cpp (95%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTProcBar.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTResFont.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTResource.cpp (100%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTTexture.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTVideo.cpp (99%) rename {src/JSystem => libs/JSystem/src}/JUtility/JUTXfb.cpp (98%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/abort_exit.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cctype (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/errno.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/misc_io.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/signal.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtold.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wcstoul.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wmem.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wprintf.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wscanf.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wcstoul.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wmem.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wprintf.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wscanf.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/critical_regions.gamecube.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/math_ppc.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/uart_console_io_gcn.h (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c (100%) rename {src => libs}/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c (97%) rename {src => libs}/PowerPC_EABI_Support/MetroTRK/trk.h (99%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h (73%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Inc/GCN_mem_alloc.h (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Inc/Gecko_ExceptionPPC.h (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Inc/NMWException.h (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h (79%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Inc/__ppc_eabi_linker.h (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Inc/global_destructor_chain.h (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Inc/ptmf.h (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Inc/runtime.h (69%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c (96%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Src/NMWException.cp (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Src/__mem.c (95%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Src/__va_arg.c (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Src/ptmf.c (100%) rename {src => libs}/PowerPC_EABI_Support/Runtime/Src/runtime.c (99%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c (99%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c (99%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c (95%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c (93%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c (98%) rename {src => libs}/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c (97%) rename {src => libs}/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c (100%) rename {src => libs}/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/cc_gdev.c (100%) rename {include => libs/dolphin/include}/dolphin/G2D.h (100%) rename {include => libs/dolphin/include}/dolphin/ai.h (94%) rename {include => libs/dolphin/include}/dolphin/am.h (100%) rename {include => libs/dolphin/include}/dolphin/amc/AmcExi2Comm.h (100%) rename {include => libs/dolphin/include}/dolphin/amc/AmcTypes.h (100%) rename {include => libs/dolphin/include}/dolphin/ar.h (96%) rename {include => libs/dolphin/include}/dolphin/ax.h (99%) rename {include => libs/dolphin/include}/dolphin/axart.h (98%) rename {include => libs/dolphin/include}/dolphin/axfx.h (98%) rename {include => libs/dolphin/include}/dolphin/base/PPCArch.h (99%) rename {include => libs/dolphin/include}/dolphin/card.h (99%) rename {include => libs/dolphin/include}/dolphin/charPipeline/fileCache.h (100%) rename {include => libs/dolphin/include}/dolphin/charPipeline/structures.h (100%) rename {include => libs/dolphin/include}/dolphin/charPipeline/structures/HTable.h (100%) rename {include => libs/dolphin/include}/dolphin/charPipeline/structures/List.h (100%) rename {include => libs/dolphin/include}/dolphin/charPipeline/structures/Tree.h (100%) rename {include => libs/dolphin/include}/dolphin/charPipeline/structures/dolphinString.h (100%) rename {include => libs/dolphin/include}/dolphin/charPipeline/texPalette.h (100%) rename {include => libs/dolphin/include}/dolphin/db.h (84%) rename {include => libs/dolphin/include}/dolphin/db/DBInterface.h (89%) rename {include => libs/dolphin/include}/dolphin/demo.h (100%) rename {include => libs/dolphin/include}/dolphin/demo/DEMOAVX.h (100%) rename {include => libs/dolphin/include}/dolphin/demo/DEMOInit.h (100%) rename {include => libs/dolphin/include}/dolphin/demo/DEMOPad.h (100%) rename {include => libs/dolphin/include}/dolphin/demo/DEMOPuts.h (100%) rename {include => libs/dolphin/include}/dolphin/demo/DEMOStats.h (100%) rename {include => libs/dolphin/include}/dolphin/demo/DEMOWin.h (100%) rename {include => libs/dolphin/include}/dolphin/dolphin.h (87%) rename {include => libs/dolphin/include}/dolphin/dsp.h (95%) rename {include => libs/dolphin/include}/dolphin/dtk.h (100%) rename {include => libs/dolphin/include}/dolphin/dvd.h (99%) rename {include => libs/dolphin/include}/dolphin/exi.h (97%) rename {include => libs/dolphin/include}/dolphin/gd.h (84%) rename {include => libs/dolphin/include}/dolphin/gd/GDBase.h (97%) rename {include => libs/dolphin/include}/dolphin/gd/GDFile.h (88%) rename {include => libs/dolphin/include}/dolphin/gd/GDGeometry.h (99%) rename {include => libs/dolphin/include}/dolphin/gd/GDIndirect.h (97%) rename {include => libs/dolphin/include}/dolphin/gd/GDLight.h (96%) rename {include => libs/dolphin/include}/dolphin/gd/GDPixel.h (97%) rename {include => libs/dolphin/include}/dolphin/gd/GDTev.h (98%) rename {include => libs/dolphin/include}/dolphin/gd/GDTexture.h (97%) rename {include => libs/dolphin/include}/dolphin/gd/GDTransform.h (95%) rename {include => libs/dolphin/include}/dolphin/gf.h (73%) rename {include => libs/dolphin/include}/dolphin/gf/GFGeometry.h (92%) rename {include => libs/dolphin/include}/dolphin/gf/GFLight.h (70%) rename {include => libs/dolphin/include}/dolphin/gf/GFPixel.h (87%) rename {include => libs/dolphin/include}/dolphin/gf/GFTev.h (70%) rename {include => libs/dolphin/include}/dolphin/gx.h (93%) rename {include => libs/dolphin/include}/dolphin/gx/GXBump.h (95%) rename {include => libs/dolphin/include}/dolphin/gx/GXCommandList.h (92%) rename {include => libs/dolphin/include}/dolphin/gx/GXCpu2Efb.h (91%) rename {include => libs/dolphin/include}/dolphin/gx/GXCull.h (80%) rename {include => libs/dolphin/include}/dolphin/gx/GXDispList.h (79%) rename {include => libs/dolphin/include}/dolphin/gx/GXDraw.h (86%) rename {include => libs/dolphin/include}/dolphin/gx/GXEnum.h (99%) rename {include => libs/dolphin/include}/dolphin/gx/GXFifo.h (95%) rename {include => libs/dolphin/include}/dolphin/gx/GXFrameBuffer.h (96%) rename {include => libs/dolphin/include}/dolphin/gx/GXGeometry.h (95%) rename {include => libs/dolphin/include}/dolphin/gx/GXGet.h (97%) rename {include => libs/dolphin/include}/dolphin/gx/GXLighting.h (94%) rename {include => libs/dolphin/include}/dolphin/gx/GXManage.h (91%) rename {include => libs/dolphin/include}/dolphin/gx/GXPerf.h (93%) rename {include => libs/dolphin/include}/dolphin/gx/GXPixel.h (93%) rename {include => libs/dolphin/include}/dolphin/gx/GXStruct.h (94%) rename {include => libs/dolphin/include}/dolphin/gx/GXTev.h (95%) rename {include => libs/dolphin/include}/dolphin/gx/GXTexture.h (97%) rename {include => libs/dolphin/include}/dolphin/gx/GXTransform.h (93%) rename {include => libs/dolphin/include}/dolphin/gx/GXVerify.h (88%) rename {include => libs/dolphin/include}/dolphin/gx/GXVert.h (97%) rename {include => libs/dolphin/include}/dolphin/hio.h (100%) rename {include => libs/dolphin/include}/dolphin/hw_regs.h (100%) rename {include => libs/dolphin/include}/dolphin/mcc.h (100%) rename {include => libs/dolphin/include}/dolphin/mix.h (97%) rename {include => libs/dolphin/include}/dolphin/mtx.h (99%) rename {include => libs/dolphin/include}/dolphin/os.h (99%) rename {include => libs/dolphin/include}/dolphin/os/OSAlarm.h (92%) rename {include => libs/dolphin/include}/dolphin/os/OSAlloc.h (91%) rename {include => libs/dolphin/include}/dolphin/os/OSCache.h (93%) rename {include => libs/dolphin/include}/dolphin/os/OSContext.h (98%) rename {include => libs/dolphin/include}/dolphin/os/OSDC.h (84%) rename {include => libs/dolphin/include}/dolphin/os/OSError.h (93%) rename {include => libs/dolphin/include}/dolphin/os/OSException.h (97%) rename {include => libs/dolphin/include}/dolphin/os/OSExec.h (91%) rename {include => libs/dolphin/include}/dolphin/os/OSFont.h (94%) rename {include => libs/dolphin/include}/dolphin/os/OSIC.h (80%) rename {include => libs/dolphin/include}/dolphin/os/OSInterrupt.h (98%) rename {include => libs/dolphin/include}/dolphin/os/OSL2.h (81%) rename {include => libs/dolphin/include}/dolphin/os/OSLC.h (83%) rename {include => libs/dolphin/include}/dolphin/os/OSMemory.h (89%) rename {include => libs/dolphin/include}/dolphin/os/OSMessage.h (90%) rename {include => libs/dolphin/include}/dolphin/os/OSModule.h (97%) rename {include => libs/dolphin/include}/dolphin/os/OSMutex.h (89%) rename {include => libs/dolphin/include}/dolphin/os/OSReboot.h (82%) rename {include => libs/dolphin/include}/dolphin/os/OSReset.h (91%) rename {include => libs/dolphin/include}/dolphin/os/OSResetSW.h (81%) rename {include => libs/dolphin/include}/dolphin/os/OSRtc.h (95%) rename {include => libs/dolphin/include}/dolphin/os/OSSemaphore.h (86%) rename {include => libs/dolphin/include}/dolphin/os/OSSerial.h (60%) rename {include => libs/dolphin/include}/dolphin/os/OSThread.h (97%) rename {include => libs/dolphin/include}/dolphin/os/OSTime.h (93%) rename {include => libs/dolphin/include}/dolphin/os/OSTimer.h (83%) rename {include => libs/dolphin/include}/dolphin/os/OSUtf.h (86%) rename {include => libs/dolphin/include}/dolphin/pad.h (97%) rename {include => libs/dolphin/include}/dolphin/perf.h (100%) rename {include => libs/dolphin/include}/dolphin/sdk_math.h (100%) rename {include => libs/dolphin/include}/dolphin/seq.h (95%) rename {include => libs/dolphin/include}/dolphin/si.h (98%) rename {include => libs/dolphin/include}/dolphin/sp.h (92%) rename {include => libs/dolphin/include}/dolphin/syn.h (98%) rename {include => libs/dolphin/include}/dolphin/thp.h (98%) rename {include => libs/dolphin/include}/dolphin/types.h (96%) rename {include => libs/dolphin/include}/dolphin/vi.h (64%) rename {include => libs/dolphin/include}/dolphin/vi/vifuncs.h (92%) rename {include => libs/dolphin/include}/dolphin/vi/vitypes.h (95%) rename {src/dolphin => libs/dolphin/src}/G2D/G2D.c (100%) rename {src/dolphin => libs/dolphin/src}/ai/ai.c (100%) rename {src/dolphin => libs/dolphin/src}/am/__am.h (100%) rename {src/dolphin => libs/dolphin/src}/am/am.c (100%) rename {src/dolphin => libs/dolphin/src}/amcnotstub/amcnotstub.c (100%) rename {src/dolphin => libs/dolphin/src}/amcstubs/AmcExi2Stubs.c (100%) rename {src/dolphin => libs/dolphin/src}/ar/__ar.h (100%) rename {src/dolphin => libs/dolphin/src}/ar/ar.c (100%) rename {src/dolphin => libs/dolphin/src}/ar/arq.c (100%) rename {src/dolphin => libs/dolphin/src}/ax/AX.c (100%) rename {src/dolphin => libs/dolphin/src}/ax/AXAlloc.c (100%) rename {src/dolphin => libs/dolphin/src}/ax/AXAux.c (100%) rename {src/dolphin => libs/dolphin/src}/ax/AXCL.c (100%) rename {src/dolphin => libs/dolphin/src}/ax/AXComp.c (100%) rename {src/dolphin => libs/dolphin/src}/ax/AXOut.c (100%) rename {src/dolphin => libs/dolphin/src}/ax/AXProf.c (100%) rename {src/dolphin => libs/dolphin/src}/ax/AXSPB.c (100%) rename {src/dolphin => libs/dolphin/src}/ax/AXVPB.c (100%) rename {src/dolphin => libs/dolphin/src}/ax/DSPCode.c (100%) rename {src/dolphin => libs/dolphin/src}/ax/__ax.h (100%) rename {src/dolphin => libs/dolphin/src}/axart/axart.c (100%) rename {src/dolphin => libs/dolphin/src}/axart/axart3d.c (100%) rename {src/dolphin => libs/dolphin/src}/axart/axartcents.c (100%) rename {src/dolphin => libs/dolphin/src}/axart/axartenv.c (100%) rename {src/dolphin => libs/dolphin/src}/axart/axartlfo.c (100%) rename {src/dolphin => libs/dolphin/src}/axart/axartlpf.c (100%) rename {src/dolphin => libs/dolphin/src}/axart/axartsound.c (100%) rename {src/dolphin => libs/dolphin/src}/axfx/__axfx.h (100%) rename {src/dolphin => libs/dolphin/src}/axfx/axfx.c (100%) rename {src/dolphin => libs/dolphin/src}/axfx/chorus.c (100%) rename {src/dolphin => libs/dolphin/src}/axfx/delay.c (100%) rename {src/dolphin => libs/dolphin/src}/axfx/reverb_hi.c (100%) rename {src/dolphin => libs/dolphin/src}/axfx/reverb_hi_4ch.c (100%) rename {src/dolphin => libs/dolphin/src}/axfx/reverb_std.c (100%) rename {src/dolphin => libs/dolphin/src}/base/PPCArch.c (100%) rename {src/dolphin => libs/dolphin/src}/base/PPCPm.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDBios.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDBlock.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDCheck.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDCreate.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDDelete.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDDir.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDErase.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDFormat.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDMount.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDNet.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDOpen.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDProgram.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDRaw.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDRdwr.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDRead.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDRename.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDStat.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDStatEx.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDUnlock.c (100%) rename {src/dolphin => libs/dolphin/src}/card/CARDWrite.c (100%) rename {src/dolphin => libs/dolphin/src}/card/__card.h (100%) rename {src/dolphin => libs/dolphin/src}/db/db.c (100%) rename {src/dolphin => libs/dolphin/src}/demo/DEMOAVX.c (100%) rename {src/dolphin => libs/dolphin/src}/demo/DEMOFont.c (100%) rename {src/dolphin => libs/dolphin/src}/demo/DEMOInit.c (100%) rename {src/dolphin => libs/dolphin/src}/demo/DEMOPad.c (100%) rename {src/dolphin => libs/dolphin/src}/demo/DEMOPuts.c (100%) rename {src/dolphin => libs/dolphin/src}/demo/DEMOStats.c (100%) rename {src/dolphin => libs/dolphin/src}/demo/DEMOWin.c (100%) rename {src/dolphin => libs/dolphin/src}/demo/__demo.h (100%) rename {src/dolphin => libs/dolphin/src}/dsp/__dsp.h (100%) rename {src/dolphin => libs/dolphin/src}/dsp/dsp.c (100%) rename {src/dolphin => libs/dolphin/src}/dsp/dsp_debug.c (100%) rename {src/dolphin => libs/dolphin/src}/dsp/dsp_perf.c (100%) rename {src/dolphin => libs/dolphin/src}/dsp/dsp_task.c (100%) rename {src/dolphin => libs/dolphin/src}/dtk/dtk.c (100%) rename {src/dolphin => libs/dolphin/src}/dvd/__dvd.h (100%) rename {src/dolphin => libs/dolphin/src}/dvd/dvd.c (100%) rename {src/dolphin => libs/dolphin/src}/dvd/dvdFatal.c (100%) rename {src/dolphin => libs/dolphin/src}/dvd/dvderror.c (100%) rename {src/dolphin => libs/dolphin/src}/dvd/dvdfs.c (100%) rename {src/dolphin => libs/dolphin/src}/dvd/dvdidutils.c (100%) rename {src/dolphin => libs/dolphin/src}/dvd/dvdlow.c (100%) rename {src/dolphin => libs/dolphin/src}/dvd/dvdqueue.c (100%) rename {src/dolphin => libs/dolphin/src}/dvd/fstload.c (100%) rename {src/dolphin => libs/dolphin/src}/exi/EXIAd16.c (100%) rename {src/dolphin => libs/dolphin/src}/exi/EXIBios.c (100%) rename {src/dolphin => libs/dolphin/src}/exi/EXIUart.c (100%) rename {src/dolphin => libs/dolphin/src}/fileCache/fileCache.c (100%) rename {src/dolphin => libs/dolphin/src}/gd/GDBase.c (100%) rename {src/dolphin => libs/dolphin/src}/gd/GDFile.c (100%) rename {src/dolphin => libs/dolphin/src}/gd/GDGeometry.c (100%) rename {src/dolphin => libs/dolphin/src}/gd/GDIndirect.c (100%) rename {src/dolphin => libs/dolphin/src}/gd/GDLight.c (100%) rename {src/dolphin => libs/dolphin/src}/gd/GDPixel.c (100%) rename {src/dolphin => libs/dolphin/src}/gd/GDTev.c (100%) rename {src/dolphin => libs/dolphin/src}/gd/GDTexture.c (100%) rename {src/dolphin => libs/dolphin/src}/gd/GDTransform.c (100%) rename {src/dolphin => libs/dolphin/src}/gf/GFGeometry.cpp (100%) rename {src/dolphin => libs/dolphin/src}/gf/GFLight.cpp (100%) rename {src/dolphin => libs/dolphin/src}/gf/GFPixel.cpp (100%) rename {src/dolphin => libs/dolphin/src}/gf/GFTev.cpp (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXAttr.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXBump.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXDisplayList.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXDraw.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXFifo.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXFrameBuf.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXGeometry.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXInit.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXLight.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXMisc.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXPerf.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXPixel.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXSave.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXStubs.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXTev.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXTexture.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXTransform.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXVerifRAS.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXVerifXF.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXVerify.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/GXVert.c (100%) rename {src/dolphin => libs/dolphin/src}/gx/__gx.h (100%) rename {src/dolphin => libs/dolphin/src}/hio/hio.c (100%) rename {src/dolphin => libs/dolphin/src}/mcc/fio.c (100%) rename {src/dolphin => libs/dolphin/src}/mcc/mcc.c (100%) rename {src/dolphin => libs/dolphin/src}/mcc/tty.c (100%) rename {src/dolphin => libs/dolphin/src}/mix/mix.c (100%) rename {src/dolphin => libs/dolphin/src}/mtx/mtx.c (100%) rename {src/dolphin => libs/dolphin/src}/mtx/mtx44.c (100%) rename {src/dolphin => libs/dolphin/src}/mtx/mtx44vec.c (100%) rename {src/dolphin => libs/dolphin/src}/mtx/mtxstack.c (100%) rename {src/dolphin => libs/dolphin/src}/mtx/mtxvec.c (100%) rename {src/dolphin => libs/dolphin/src}/mtx/psmtx.c (100%) rename {src/dolphin => libs/dolphin/src}/mtx/quat.c (100%) rename {src/dolphin => libs/dolphin/src}/mtx/vec.c (100%) rename {src/dolphin => libs/dolphin/src}/odemustubs/odemustubs.c (100%) rename {src/dolphin => libs/dolphin/src}/odenotstub/odenotstub.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OS.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSAddress.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSAlarm.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSAlloc.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSArena.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSAudioSystem.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSCache.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSContext.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSError.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSExec.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSFatal.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSFont.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSInterrupt.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSLink.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSMemory.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSMessage.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSMutex.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSReboot.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSReset.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSResetSW.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSRtc.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSSemaphore.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSStopwatch.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSSync.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSThread.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSTime.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSTimer.c (100%) rename {src/dolphin => libs/dolphin/src}/os/OSUtf.c (100%) rename {src/dolphin => libs/dolphin/src}/os/__os.h (100%) rename {src/dolphin => libs/dolphin/src}/os/__ppc_eabi_init.c (100%) rename {src/dolphin => libs/dolphin/src}/os/__ppc_eabi_init.cpp (100%) rename {src/dolphin => libs/dolphin/src}/os/__start.c (100%) rename {src/dolphin => libs/dolphin/src}/os/time.dolphin.c (100%) rename {src/dolphin => libs/dolphin/src}/pad/Pad.c (100%) rename {src/dolphin => libs/dolphin/src}/pad/Padclamp.c (100%) rename {src/dolphin => libs/dolphin/src}/perf/__perf.h (100%) rename {src/dolphin => libs/dolphin/src}/perf/perf.c (100%) rename {src/dolphin => libs/dolphin/src}/perf/perfdraw.c (100%) rename {src/dolphin => libs/dolphin/src}/seq/seq.c (100%) rename {src/dolphin => libs/dolphin/src}/si/SIBios.c (100%) rename {src/dolphin => libs/dolphin/src}/si/SISamplingRate.c (100%) rename {src/dolphin => libs/dolphin/src}/si/SISteering.c (100%) rename {src/dolphin => libs/dolphin/src}/si/SISteeringAuto.c (100%) rename {src/dolphin => libs/dolphin/src}/si/SISteeringXfer.c (100%) rename {src/dolphin => libs/dolphin/src}/si/__si.h (100%) rename {src/dolphin => libs/dolphin/src}/sp/sp.c (100%) rename {src/dolphin => libs/dolphin/src}/support/HTable.c (100%) rename {src/dolphin => libs/dolphin/src}/support/List.c (100%) rename {src/dolphin => libs/dolphin/src}/support/Tree.c (100%) rename {src/dolphin => libs/dolphin/src}/support/string.c (100%) rename {src/dolphin => libs/dolphin/src}/syn/__syn.h (100%) rename {src/dolphin => libs/dolphin/src}/syn/syn.c (100%) rename {src/dolphin => libs/dolphin/src}/syn/synctrl.c (100%) rename {src/dolphin => libs/dolphin/src}/syn/synenv.c (100%) rename {src/dolphin => libs/dolphin/src}/syn/synlfo.c (100%) rename {src/dolphin => libs/dolphin/src}/syn/synmix.c (100%) rename {src/dolphin => libs/dolphin/src}/syn/synpitch.c (100%) rename {src/dolphin => libs/dolphin/src}/syn/synsample.c (100%) rename {src/dolphin => libs/dolphin/src}/syn/synvoice.c (100%) rename {src/dolphin => libs/dolphin/src}/syn/synwt.c (100%) rename {src/dolphin => libs/dolphin/src}/texPalette/texPalette.c (100%) rename {src/dolphin => libs/dolphin/src}/vi/__vi.h (100%) rename {src/dolphin => libs/dolphin/src}/vi/gpioexi.c (100%) rename {src/dolphin => libs/dolphin/src}/vi/i2c.c (100%) rename {src/dolphin => libs/dolphin/src}/vi/initphilips.c (100%) rename {src/dolphin => libs/dolphin/src}/vi/vi.c (100%) rename {include => libs/revolution/include}/revolution/ai.h (100%) rename {include => libs/revolution/include}/revolution/amc/AmcExi2Comm.h (100%) rename {include => libs/revolution/include}/revolution/amc/AmcTypes.h (100%) rename {include => libs/revolution/include}/revolution/aralt.h (100%) rename {include => libs/revolution/include}/revolution/arc.h (100%) rename {include => libs/revolution/include}/revolution/ax.h (100%) rename {include => libs/revolution/include}/revolution/axart.h (100%) rename {include => libs/revolution/include}/revolution/axfx.h (100%) rename {include => libs/revolution/include}/revolution/base/PPCArch.h (100%) rename {include => libs/revolution/include}/revolution/card.h (100%) rename {include => libs/revolution/include}/revolution/db.h (100%) rename {include => libs/revolution/include}/revolution/db/DBInterface.h (100%) rename {include => libs/revolution/include}/revolution/dsp.h (100%) rename {include => libs/revolution/include}/revolution/dvd.h (100%) rename {include => libs/revolution/include}/revolution/esp.h (100%) rename {include => libs/revolution/include}/revolution/euart.h (100%) rename {include => libs/revolution/include}/revolution/exi.h (100%) rename {include => libs/revolution/include}/revolution/fs.h (100%) rename {include => libs/revolution/include}/revolution/gd.h (100%) rename {include => libs/revolution/include}/revolution/gd/GDBase.h (100%) rename {include => libs/revolution/include}/revolution/gd/GDFile.h (100%) rename {include => libs/revolution/include}/revolution/gd/GDGeometry.h (100%) rename {include => libs/revolution/include}/revolution/gd/GDIndirect.h (100%) rename {include => libs/revolution/include}/revolution/gd/GDLight.h (100%) rename {include => libs/revolution/include}/revolution/gd/GDPixel.h (100%) rename {include => libs/revolution/include}/revolution/gd/GDTev.h (100%) rename {include => libs/revolution/include}/revolution/gd/GDTexture.h (100%) rename {include => libs/revolution/include}/revolution/gd/GDTransform.h (100%) rename {include => libs/revolution/include}/revolution/gf.h (100%) rename {include => libs/revolution/include}/revolution/gf/GFGeometry.h (100%) rename {include => libs/revolution/include}/revolution/gf/GFLight.h (100%) rename {include => libs/revolution/include}/revolution/gf/GFPixel.h (100%) rename {include => libs/revolution/include}/revolution/gf/GFTev.h (100%) rename {include => libs/revolution/include}/revolution/gx.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXBump.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXCommandList.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXCpu2Efb.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXCull.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXDispList.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXDraw.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXEnum.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXFifo.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXFrameBuffer.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXGeometry.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXGet.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXLighting.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXManage.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXPerf.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXPixel.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXStruct.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXTev.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXTexture.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXTransform.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXVerify.h (100%) rename {include => libs/revolution/include}/revolution/gx/GXVert.h (100%) rename {include => libs/revolution/include}/revolution/hbm.h (100%) rename {include => libs/revolution/include}/revolution/hio2.h (100%) rename {include => libs/revolution/include}/revolution/hw_regs.h (100%) rename {include => libs/revolution/include}/revolution/ipc.h (100%) rename {include => libs/revolution/include}/revolution/ipc/ipcProfile.h (100%) rename {include => libs/revolution/include}/revolution/ipc/ipcclt.h (100%) rename {include => libs/revolution/include}/revolution/ipc/memory.h (100%) rename {include => libs/revolution/include}/revolution/kpad.h (100%) rename {include => libs/revolution/include}/revolution/mem.h (100%) rename {include => libs/revolution/include}/revolution/mem/allocator.h (100%) rename {include => libs/revolution/include}/revolution/mem/expHeap.h (100%) rename {include => libs/revolution/include}/revolution/mem/heapCommon.h (100%) rename {include => libs/revolution/include}/revolution/mem/list.h (100%) rename {include => libs/revolution/include}/revolution/mix.h (100%) rename {include => libs/revolution/include}/revolution/mtx.h (100%) rename {include => libs/revolution/include}/revolution/nand.h (100%) rename {include => libs/revolution/include}/revolution/os.h (100%) rename {include => libs/revolution/include}/revolution/os/OSAlarm.h (100%) rename {include => libs/revolution/include}/revolution/os/OSAlloc.h (100%) rename {include => libs/revolution/include}/revolution/os/OSCache.h (100%) rename {include => libs/revolution/include}/revolution/os/OSContext.h (100%) rename {include => libs/revolution/include}/revolution/os/OSDC.h (100%) rename {include => libs/revolution/include}/revolution/os/OSError.h (100%) rename {include => libs/revolution/include}/revolution/os/OSException.h (100%) rename {include => libs/revolution/include}/revolution/os/OSExec.h (100%) rename {include => libs/revolution/include}/revolution/os/OSFont.h (100%) rename {include => libs/revolution/include}/revolution/os/OSHardware.h (100%) rename {include => libs/revolution/include}/revolution/os/OSIC.h (100%) rename {include => libs/revolution/include}/revolution/os/OSInterrupt.h (100%) rename {include => libs/revolution/include}/revolution/os/OSIpc.h (100%) rename {include => libs/revolution/include}/revolution/os/OSL2.h (100%) rename {include => libs/revolution/include}/revolution/os/OSLC.h (100%) rename {include => libs/revolution/include}/revolution/os/OSMemory.h (100%) rename {include => libs/revolution/include}/revolution/os/OSMessage.h (100%) rename {include => libs/revolution/include}/revolution/os/OSModule.h (100%) rename {include => libs/revolution/include}/revolution/os/OSMutex.h (100%) rename {include => libs/revolution/include}/revolution/os/OSNandbootInfo.h (100%) rename {include => libs/revolution/include}/revolution/os/OSNet.h (100%) rename {include => libs/revolution/include}/revolution/os/OSPlayRecord.h (100%) rename {include => libs/revolution/include}/revolution/os/OSPlayTime.h (100%) rename {include => libs/revolution/include}/revolution/os/OSReboot.h (100%) rename {include => libs/revolution/include}/revolution/os/OSReset.h (100%) rename {include => libs/revolution/include}/revolution/os/OSResetSW.h (100%) rename {include => libs/revolution/include}/revolution/os/OSRtc.h (100%) rename {include => libs/revolution/include}/revolution/os/OSSemaphore.h (100%) rename {include => libs/revolution/include}/revolution/os/OSSerial.h (100%) rename {include => libs/revolution/include}/revolution/os/OSStateFlags.h (100%) rename {include => libs/revolution/include}/revolution/os/OSThread.h (100%) rename {include => libs/revolution/include}/revolution/os/OSTime.h (100%) rename {include => libs/revolution/include}/revolution/os/OSTimer.h (100%) rename {include => libs/revolution/include}/revolution/os/OSUtf.h (100%) rename {include => libs/revolution/include}/revolution/pad.h (100%) rename {include => libs/revolution/include}/revolution/private/GXFDLShortcut.h (100%) rename {include => libs/revolution/include}/revolution/private/GXRegs.h (100%) rename {include => libs/revolution/include}/revolution/private/bp_reg.h (100%) rename {include => libs/revolution/include}/revolution/private/cp_reg.h (100%) rename {include => libs/revolution/include}/revolution/private/gen_reg.h (100%) rename {include => libs/revolution/include}/revolution/private/iosrestypes.h (100%) rename {include => libs/revolution/include}/revolution/private/iostypes.h (100%) rename {include => libs/revolution/include}/revolution/private/pe_reg.h (100%) rename {include => libs/revolution/include}/revolution/private/pi_reg.h (100%) rename {include => libs/revolution/include}/revolution/private/ras_reg.h (100%) rename {include => libs/revolution/include}/revolution/private/su_reg.h (100%) rename {include => libs/revolution/include}/revolution/private/tev_reg.h (100%) rename {include => libs/revolution/include}/revolution/private/tx_reg.h (100%) rename {include => libs/revolution/include}/revolution/private/xf_mem.h (100%) rename {include => libs/revolution/include}/revolution/revolution.h (100%) rename {include => libs/revolution/include}/revolution/sc.h (100%) rename {include => libs/revolution/include}/revolution/sdk_math.h (100%) rename {include => libs/revolution/include}/revolution/seq.h (100%) rename {include => libs/revolution/include}/revolution/si.h (100%) rename {include => libs/revolution/include}/revolution/sp.h (100%) rename {include => libs/revolution/include}/revolution/syn.h (100%) rename {include => libs/revolution/include}/revolution/thp.h (100%) rename {include => libs/revolution/include}/revolution/tpl.h (100%) rename {include => libs/revolution/include}/revolution/types.h (100%) rename {include => libs/revolution/include}/revolution/usb.h (100%) rename {include => libs/revolution/include}/revolution/vi.h (100%) rename {include => libs/revolution/include}/revolution/vi/vifuncs.h (100%) rename {include => libs/revolution/include}/revolution/vi/vitypes.h (100%) rename {include => libs/revolution/include}/revolution/wenc.h (100%) rename {include => libs/revolution/include}/revolution/wpad.h (100%) rename {include => libs/revolution/include}/revolution/wpad/bte.h (100%) rename {include => libs/revolution/include}/revolution/wpad/wud.h (100%) rename {include => libs/revolution/include}/revolution/wud.h (100%) rename {src/revolution => libs/revolution/src}/ai/ai.c (100%) rename {src/revolution => libs/revolution/src}/aralt/__ar.h (100%) rename {src/revolution => libs/revolution/src}/aralt/aralt.c (100%) rename {src/revolution => libs/revolution/src}/arc/arc.c (100%) rename {src/revolution => libs/revolution/src}/ax/AXAux.c (100%) rename {src/revolution => libs/revolution/src}/ax/AXCL.c (100%) rename {src/revolution => libs/revolution/src}/axfx/AXFXHooks.c (100%) rename {src/revolution => libs/revolution/src}/axfx/AXFXReverbHi.c (100%) rename {src/revolution => libs/revolution/src}/axfx/AXFXReverbHiExp.c (100%) rename {src/revolution => libs/revolution/src}/base/PPCArch.c (100%) rename {src/revolution => libs/revolution/src}/base/PPCPm.c (100%) rename {src/revolution => libs/revolution/src}/card/CARDBios.c (100%) rename {src/revolution => libs/revolution/src}/card/CARDBlock.c (99%) rename {src/revolution => libs/revolution/src}/card/CARDCheck.c (99%) rename {src/revolution => libs/revolution/src}/card/CARDCreate.c (99%) rename {src/revolution => libs/revolution/src}/card/CARDDelete.c (98%) rename {src/revolution => libs/revolution/src}/card/CARDDir.c (98%) rename {src/revolution => libs/revolution/src}/card/CARDErase.c (98%) rename {src/revolution => libs/revolution/src}/card/CARDFormat.c (99%) rename {src/revolution => libs/revolution/src}/card/CARDMount.c (99%) rename {src/revolution => libs/revolution/src}/card/CARDNet.c (99%) rename {src/revolution => libs/revolution/src}/card/CARDOpen.c (99%) rename {src/revolution => libs/revolution/src}/card/CARDProgram.c (99%) rename {src/revolution => libs/revolution/src}/card/CARDRaw.c (98%) rename {src/revolution => libs/revolution/src}/card/CARDRdwr.c (98%) rename {src/revolution => libs/revolution/src}/card/CARDRead.c (99%) rename {src/revolution => libs/revolution/src}/card/CARDRename.c (98%) rename {src/revolution => libs/revolution/src}/card/CARDStat.c (99%) rename {src/revolution => libs/revolution/src}/card/CARDStatEx.c (98%) rename {src/revolution => libs/revolution/src}/card/CARDUnlock.c (99%) rename {src/revolution => libs/revolution/src}/card/CARDWrite.c (99%) rename {src/revolution => libs/revolution/src}/card/__card.h (100%) rename {src/revolution => libs/revolution/src}/dsp/__dsp.h (100%) rename {src/revolution => libs/revolution/src}/dsp/dsp.c (100%) rename {src/revolution => libs/revolution/src}/dsp/dsp_debug.c (100%) rename {src/revolution => libs/revolution/src}/dsp/dsp_task.c (100%) rename {src/revolution => libs/revolution/src}/dvd/__dvd.h (100%) rename {src/revolution => libs/revolution/src}/dvd/dvd.c (100%) rename {src/revolution => libs/revolution/src}/dvd/dvdDeviceError.c (100%) rename {src/revolution => libs/revolution/src}/dvd/dvdFatal.c (100%) rename {src/revolution => libs/revolution/src}/dvd/dvd_broadway.c (100%) rename {src/revolution => libs/revolution/src}/dvd/dvderror.c (100%) rename {src/revolution => libs/revolution/src}/dvd/dvdfs.c (100%) rename {src/revolution => libs/revolution/src}/dvd/dvdidutils.c (100%) rename {src/revolution => libs/revolution/src}/dvd/dvdqueue.c (100%) rename {src/revolution => libs/revolution/src}/esp/esp.c (100%) rename {src/revolution => libs/revolution/src}/euart/euart.c (100%) rename {src/revolution => libs/revolution/src}/exi/EXIBios.c (100%) rename {src/revolution => libs/revolution/src}/exi/EXICommon.c (100%) rename {src/revolution => libs/revolution/src}/exi/EXIUart.c (100%) rename {src/revolution => libs/revolution/src}/fs/fs.c (100%) rename {src/revolution => libs/revolution/src}/gd/GDBase.c (100%) rename {src/revolution => libs/revolution/src}/gd/GDFile.c (100%) rename {src/revolution => libs/revolution/src}/gd/GDGeometry.c (100%) rename {src/revolution => libs/revolution/src}/gd/GDIndirect.c (100%) rename {src/revolution => libs/revolution/src}/gd/GDLight.c (100%) rename {src/revolution => libs/revolution/src}/gd/GDPixel.c (100%) rename {src/revolution => libs/revolution/src}/gd/GDTev.c (100%) rename {src/revolution => libs/revolution/src}/gd/GDTexture.c (100%) rename {src/revolution => libs/revolution/src}/gd/GDTransform.c (100%) rename {src/revolution => libs/revolution/src}/gf/GFGeometry.cpp (100%) rename {src/revolution => libs/revolution/src}/gf/GFLight.cpp (100%) rename {src/revolution => libs/revolution/src}/gf/GFPixel.cpp (100%) rename {src/revolution => libs/revolution/src}/gf/GFTev.cpp (100%) rename {src/revolution => libs/revolution/src}/gx/GXAttr.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXBump.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXDisplayList.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXDraw.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXFifo.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXFrameBuf.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXGeometry.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXInit.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXLight.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXMisc.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXPerf.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXPixel.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXSave.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXStubs.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXTev.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXTexture.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXTransform.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXVerifRAS.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXVerifXF.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXVerify.c (100%) rename {src/revolution => libs/revolution/src}/gx/GXVert.c (100%) rename {src/revolution => libs/revolution/src}/gx/__gx.h (100%) rename {src/revolution => libs/revolution/src}/hio2/hio2.c (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/HBMAnmController.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/HBMAnmController.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/HBMBase.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/HBMBase.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/HBMCommon.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/HBMController.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/HBMController.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/HBMFrameController.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/HBMFrameController.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/HBMGUIManager.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/HBMGUIManager.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/HBMRemoteSpk.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/HBMRemoteSpk.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/db/DbgPrintBase.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/db/assert.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/db/console.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/db/db_DbgPrintBase.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/db/db_assert.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/db/db_console.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/db/db_directPrint.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/db/db_mapFile.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/db/directPrint.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/db/mapFile.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/animation.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/arcResourceAccessor.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/bounding.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/common.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/drawInfo.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/group.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/layout.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_bounding.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_common.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_group.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_material.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_resourceAccessor.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_types.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/lyt_window.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/material.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/pane.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/picture.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/resourceAccessor.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/resources.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/textBox.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/lyt/window.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/macros.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/math/arithmetic.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/math/constants.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/math/equation.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/math/geometry.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/math/math_triangular.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/math/triangular.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/math/types.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/AxManager.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/AxVoice.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/Bank.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/BankFile.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/BasicPlayer.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/BasicSound.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/Channel.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/ChannelManager.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/DisposeCallback.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/DisposeCallbackManager.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/DvdSoundArchive.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/EnvGenerator.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/ExternalSoundPlayer.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/FrameHeap.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/FxBase.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/InstanceManager.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/InstancePool.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/Lfo.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/MemorySoundArchive.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/MidiSeqPlayer.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/MidiSeqTrack.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/MmlParser.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/MmlSeqTrack.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/MmlSeqTrackAllocator.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/MoveValue.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/NandSoundArchive.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/NoteOnCallback.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/PlayerHeap.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/RemoteSpeaker.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/RemoteSpeakerManager.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SeqFile.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SeqPlayer.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SeqSound.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SeqSoundHandle.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SeqTrack.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SeqTrackAllocator.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SoundArchive.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SoundArchiveFile.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SoundArchiveLoader.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SoundArchivePlayer.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SoundHandle.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SoundHeap.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SoundMemoryAllocatable.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SoundPlayer.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SoundStartable.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SoundSystem.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/SoundThread.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/StrmChannel.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/StrmFile.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/StrmPlayer.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/StrmSound.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/StrmSoundHandle.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/Task.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/TaskManager.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/TaskThread.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/Util.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/WaveFile.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/WavePlayer.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/WaveSound.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/WaveSoundHandle.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/WsdFile.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/WsdPlayer.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/WsdTrack.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/debug.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/snd_SoundArchivePlayer.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/snd_SoundHandle.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/snd_SoundPlayer.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/snd_SoundStartable.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/snd_global.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/snd/snd_types.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/CharStrmReader.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/CharWriter.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/Color.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/DvdFileStream.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/DvdLockedFileStream.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/FileStream.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/Font.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/IOStream.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/LinkList.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/Lock.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/NandFileStream.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/Rect.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ResFont.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/RuntimeTypeInfo.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/TagProcessor.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/TagProcessorBase.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/TextWriter.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/TextWriterBase.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/WideTagProcessor.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/WideTextWriter.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/binaryFileFormat.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/fontResources.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/inlines.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/list.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_CharStrmReader.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_CharWriter.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_DvdFileStream.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_FileStream.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_Font.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_IOStream.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_LinkList.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_NandFileStream.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_ResFont.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_ResFontBase.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_TagProcessorBase.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_binaryFileFormat.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/nw4hbm/ut/ut_list.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/sound/mix.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/sound/mix.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/sound/seq.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/sound/seq.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/sound/syn.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/sound/syn.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/sound/synctrl.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/sound/synenv.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/sound/synmix.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/sound/synpitch.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/sound/synprivate.h (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/sound/synsample.cpp (100%) rename {src/revolution => libs/revolution/src}/homebuttonLib/sound/synvoice.cpp (100%) rename {src/revolution => libs/revolution/src}/ipc/ipcMain.c (100%) rename {src/revolution => libs/revolution/src}/ipc/ipcProfile.c (100%) rename {src/revolution => libs/revolution/src}/ipc/ipcclt.c (100%) rename {src/revolution => libs/revolution/src}/ipc/memory.c (100%) rename {src/revolution => libs/revolution/src}/kpad/KPAD.c (99%) rename {src/revolution => libs/revolution/src}/kpad/__kpad.h (100%) rename {src/revolution => libs/revolution/src}/mem/mem_allocator.c (100%) rename {src/revolution => libs/revolution/src}/mem/mem_expHeap.c (100%) rename {src/revolution => libs/revolution/src}/mem/mem_heapCommon.c (100%) rename {src/revolution => libs/revolution/src}/mem/mem_list.c (100%) rename {src/revolution => libs/revolution/src}/mtx/mtx.c (100%) rename {src/revolution => libs/revolution/src}/mtx/mtx44.c (100%) rename {src/revolution => libs/revolution/src}/mtx/mtx44vec.c (100%) rename {src/revolution => libs/revolution/src}/mtx/mtxstack.c (100%) rename {src/revolution => libs/revolution/src}/mtx/mtxvec.c (100%) rename {src/revolution => libs/revolution/src}/mtx/psmtx.c (100%) rename {src/revolution => libs/revolution/src}/mtx/quat.c (100%) rename {src/revolution => libs/revolution/src}/mtx/vec.c (100%) rename {src/revolution => libs/revolution/src}/nand/NANDCheck.c (100%) rename {src/revolution => libs/revolution/src}/nand/NANDCore.c (100%) rename {src/revolution => libs/revolution/src}/nand/NANDErrorMessage.c (100%) rename {src/revolution => libs/revolution/src}/nand/NANDLogging.c (100%) rename {src/revolution => libs/revolution/src}/nand/NANDOpenClose.c (100%) rename {src/revolution => libs/revolution/src}/nand/nand.c (100%) rename {src/revolution => libs/revolution/src}/os/OS.c (100%) rename {src/revolution => libs/revolution/src}/os/OSAddress.c (100%) rename {src/revolution => libs/revolution/src}/os/OSAlarm.c (100%) rename {src/revolution => libs/revolution/src}/os/OSAlloc.c (100%) rename {src/revolution => libs/revolution/src}/os/OSArena.c (100%) rename {src/revolution => libs/revolution/src}/os/OSAudioSystem.c (100%) rename {src/revolution => libs/revolution/src}/os/OSCache.c (100%) rename {src/revolution => libs/revolution/src}/os/OSContext.c (100%) rename {src/revolution => libs/revolution/src}/os/OSError.c (100%) rename {src/revolution => libs/revolution/src}/os/OSExec.c (100%) rename {src/revolution => libs/revolution/src}/os/OSFatal.c (100%) rename {src/revolution => libs/revolution/src}/os/OSFont.c (100%) rename {src/revolution => libs/revolution/src}/os/OSInterrupt.c (100%) rename {src/revolution => libs/revolution/src}/os/OSIpc.c (100%) rename {src/revolution => libs/revolution/src}/os/OSLaunch.c (100%) rename {src/revolution => libs/revolution/src}/os/OSLink.c (100%) rename {src/revolution => libs/revolution/src}/os/OSMemory.c (100%) rename {src/revolution => libs/revolution/src}/os/OSMessage.c (100%) rename {src/revolution => libs/revolution/src}/os/OSMutex.c (100%) rename {src/revolution => libs/revolution/src}/os/OSNandbootInfo.c (100%) rename {src/revolution => libs/revolution/src}/os/OSNet.c (100%) rename {src/revolution => libs/revolution/src}/os/OSPlayRecord.c (100%) rename {src/revolution => libs/revolution/src}/os/OSPlayTime.c (100%) rename {src/revolution => libs/revolution/src}/os/OSReboot.c (100%) rename {src/revolution => libs/revolution/src}/os/OSReset.c (100%) rename {src/revolution => libs/revolution/src}/os/OSRtc.c (100%) rename {src/revolution => libs/revolution/src}/os/OSStateFlags.c (100%) rename {src/revolution => libs/revolution/src}/os/OSStateTM.c (100%) rename {src/revolution => libs/revolution/src}/os/OSStopwatch.c (100%) rename {src/revolution => libs/revolution/src}/os/OSSync.c (100%) rename {src/revolution => libs/revolution/src}/os/OSThread.c (100%) rename {src/revolution => libs/revolution/src}/os/OSTime.c (100%) rename {src/revolution => libs/revolution/src}/os/OSUtf.c (100%) rename {src/revolution => libs/revolution/src}/os/__os.h (100%) rename {src/revolution => libs/revolution/src}/os/__ppc_eabi_init.cpp (100%) rename {src/revolution => libs/revolution/src}/os/__start.c (100%) rename {src/revolution => libs/revolution/src}/pad/Pad.c (99%) rename {src/revolution => libs/revolution/src}/pad/Padclamp.c (100%) rename {src/revolution => libs/revolution/src}/sc/scapi.c (100%) rename {src/revolution => libs/revolution/src}/sc/scapi_prdinfo.c (100%) rename {src/revolution => libs/revolution/src}/sc/scsystem.c (100%) rename {src/revolution => libs/revolution/src}/si/SIBios.c (100%) rename {src/revolution => libs/revolution/src}/si/SISamplingRate.c (100%) rename {src/revolution => libs/revolution/src}/si/__si.h (100%) rename {src/revolution => libs/revolution/src}/tpl/TPL.c (100%) rename {src/revolution => libs/revolution/src}/usb/__usb.h (100%) rename {src/revolution => libs/revolution/src}/usb/usb.c (99%) rename {src/revolution => libs/revolution/src}/vi/__vi.h (100%) rename {src/revolution => libs/revolution/src}/vi/i2c.c (100%) rename {src/revolution => libs/revolution/src}/vi/vi.c (100%) rename {src/revolution => libs/revolution/src}/vi/vi3in1.c (100%) rename {src/revolution => libs/revolution/src}/wenc/wenc.c (100%) rename {src/revolution => libs/revolution/src}/wpad/WPAD.c (99%) rename {src/revolution => libs/revolution/src}/wpad/WPADEncrypt.c (99%) rename {src/revolution => libs/revolution/src}/wpad/WPADHIDParser.c (99%) rename {src/revolution => libs/revolution/src}/wpad/WPADMem.c (57%) rename {src/revolution => libs/revolution/src}/wpad/__wpad.h (100%) rename {src/revolution => libs/revolution/src}/wpad/wpad_debug_msg.c (63%) rename {src/revolution => libs/revolution/src}/wud/WUD.c (99%) rename {src/revolution => libs/revolution/src}/wud/WUDHidHost.c (99%) rename {src/revolution => libs/revolution/src}/wud/__wud.h (100%) rename {src/revolution => libs/revolution/src}/wud/debug_msg.c (74%) diff --git a/configure.py b/configure.py index 914bafa0475..210dc3f14d0 100755 --- a/configure.py +++ b/configure.py @@ -272,21 +272,29 @@ f"-i build/{config.version}/include", f"-i assets/{config.version}", "-i src", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include", - "-i src/PowerPC_EABI_Support/Runtime/Inc", - "-i src/PowerPC_EABI_Support/MetroTRK", - "-i include/dolphin", + "-i libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include", + "-i libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include", + "-i libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include", + "-i libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include", + "-i libs/PowerPC_EABI_Support/Runtime/Inc", + "-i libs/PowerPC_EABI_Support/MetroTRK", + "-i libs/JSystem/include", f"-DVERSION={version_num}", "-D__GEKKO__", ] if config.version in WII_VERSIONS or config.version in SHIELD_VERSIONS: - cflags_base.extend(["-enc SJIS"]) + cflags_base.extend([ + "-i libs/revolution/include", + "-i libs/revolution/include/revolution", # for types.h includes + "-enc SJIS", + ]) else: - cflags_base.extend(["-multibyte"]) + cflags_base.extend([ + "-i libs/dolphin/include", + "-i libs/dolphin/include/dolphin", # for types.h includes + "-multibyte", + ]) USE_REVOLUTION_SDK_VERSIONS = [ "RZDE01_00", # Wii USA Rev 0 @@ -351,7 +359,7 @@ # Dolphin library flags cflags_dolphin = [ *cflags_base, - "-ir src/dolphin", + "-ir libs/dolphin/src", "-fp_contract off", "-char unsigned", "-sym on", @@ -361,12 +369,11 @@ # Revolution library flags cflags_revolution_base = [ *cflags_base, - "-ir src/revolution", + "-ir libs/revolution/src", "-fp_contract off", "-sym on", "-inline auto", "-ipa file", - "-i include/revolution", "-D__REVOLUTION_SDK__", ] @@ -466,6 +473,8 @@ def MWVersion(cfg_version: str | None) -> str: def DolphinLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]: return { "lib": lib_name, + "src_dir": "libs/dolphin/src", + "strip_prefix": "dolphin/", "mw_version": "GC/1.2.5n", "cflags": cflags_dolphin, "progress_category": "sdk", @@ -476,6 +485,8 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict if config.version == "ShieldD": return { "lib": lib_name, + "src_dir": "libs/revolution/src", + "strip_prefix": "revolution/", "mw_version": "Wii/1.0", "cflags": [*cflags_revolution_debug, "-DSDK_AUG2010", *extra_cflags], "progress_category": "sdk", @@ -484,6 +495,8 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict elif config.version == "Shield": return { "lib": lib_name, + "src_dir": "libs/revolution/src", + "strip_prefix": "revolution/", "mw_version": "Wii/1.0", "cflags": [*cflags_revolution_retail, "-DSDK_AUG2010", *extra_cflags], "progress_category": "sdk", @@ -492,6 +505,8 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict elif config.version == "RZDE01_00": return { "lib": lib_name, + "src_dir": "libs/revolution/src", + "strip_prefix": "revolution/", "mw_version": "GC/3.0a3", "cflags": [*cflags_revolution_retail, "-DSDK_SEP2006", "-DNW4HBM_DEBUG", *extra_cflags], "progress_category": "sdk", @@ -500,6 +515,8 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict else: return { "lib": lib_name, + "src_dir": "libs/revolution/src", + "strip_prefix": "revolution/", "mw_version": "GC/3.0a3", "cflags": [*cflags_revolution_retail, "-DSDK_SEP2006", *extra_cflags], "progress_category": "sdk", @@ -525,6 +542,8 @@ def ActorRel(status: bool, rel_name: str, extra_cflags: List[str]=[]) -> Dict[st def JSystemLib(lib_name: str, objects: List[Object], progress_category: str="third_party") -> Dict[str, Any]: return { "lib": lib_name, + "src_dir": "libs/JSystem/src", + "strip_prefix": "JSystem/", "mw_version": MWVersion(config.version), "cflags": [*cflags_jsystem], "progress_category": progress_category, @@ -560,17 +579,20 @@ def MatchingFor(*versions) -> bool: config.warn_missing_source = False config.precompiled_headers = [ { - "source": "d/dolzel.pch", + "source": "include/d/dolzel.pch", + "output": "d/dolzel.mch", "mw_version": MWVersion(config.version), "cflags": ["-lang=c++", *cflags_dolzel_framework], }, { - "source": "d/dolzel_rel.pch", + "source": "include/d/dolzel_rel.pch", + "output": "d/dolzel_rel.mch", "mw_version": MWVersion(config.version), "cflags": ["-lang=c++", *cflags_dolzel_rel], }, { - "source": "JSystem/JSystem.pch", + "source": "libs/JSystem/include/JSystem/JSystem.pch", + "output": "JSystem/JSystem.mch", "mw_version": MWVersion(config.version), "cflags": ["-lang=c++", *cflags_framework], }, @@ -581,7 +603,6 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "core", - "host": True, "objects": [ Object(MatchingFor(ALL_GCN), "m_Do/m_Do_main.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_printf.cpp"), @@ -608,7 +629,6 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "game", - "host": True, "objects": [ Object(MatchingFor(ALL_GCN), "c/c_damagereaction.cpp"), Object(MatchingFor(ALL_GCN), "c/c_dylink.cpp"), @@ -619,7 +639,6 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "core", - "host": True, "objects": [ # f_ap Object(MatchingFor(ALL_GCN), "f_ap/f_ap_game.cpp"), @@ -688,7 +707,6 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "game", - "host": True, "objects": [ Object(NonMatching, "d/d_home_button.cpp"), Object(NonMatching, "d/d_cursor_mng.cpp"), @@ -876,7 +894,6 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "core", - "host": True, "objects": [ Object(MatchingFor(ALL_GCN), "DynamicLink.cpp"), ], @@ -886,7 +903,6 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "core", - "host": True, "objects": [ Object(NonMatching, "CaptureScreen.cpp"), ], @@ -896,7 +912,6 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "third_party", - "host": True, "objects": [ Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_malloc.cpp"), Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_API.cpp"), @@ -1221,7 +1236,6 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "core", - "host": True, "objects": [ Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2Calc.cpp"), Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2AudioArcLoader.cpp"), @@ -1257,7 +1271,6 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "core", - "host": True, "objects": [ Object(Matching, "Z2AudioCS/SpkSpeakerCtrl.cpp"), Object(Equivalent, "Z2AudioCS/SpkSystem.cpp"), @@ -1271,6 +1284,8 @@ def MatchingFor(*versions) -> bool: }, { "lib": "gf", + "src_dir": "libs/dolphin/src", + "strip_prefix": "dolphin/", "mw_version": MWVersion(config.version), "cflags": [*cflags_noopt, "-O3"], "progress_category": "sdk", @@ -1503,8 +1518,10 @@ def MatchingFor(*versions) -> bool: ), { "lib": "exi", + "src_dir": "libs/dolphin/src", + "strip_prefix": "dolphin/", "mw_version": "GC/1.2.5n", - "cflags": [*cflags_noopt, "-ir src/dolphin"], + "cflags": [*cflags_noopt, "-ir libs/dolphin/src"], "progress_category": "sdk", "objects": [ Object(Matching, "dolphin/exi/EXIBios.c", extra_cflags=["-O3,p"]), @@ -1976,10 +1993,10 @@ def MatchingFor(*versions) -> bool: ), { "lib": "Runtime.PPCEABI.H", + "src_dir": "libs", "mw_version": MWVersion(config.version), "cflags": cflags_runtime, "progress_category": "sdk", - "host": False, "objects": [ Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/Runtime/Src/__mem.c"), Object(MatchingFor(ALL_GCN, "Shield"), "PowerPC_EABI_Support/Runtime/Src/__va_arg.c"), @@ -1995,10 +2012,10 @@ def MatchingFor(*versions) -> bool: }, { "lib": "MSL_C", + "src_dir": "libs", "mw_version": MWVersion(config.version), "cflags": cflags_runtime, "progress_category": "sdk", - "host": False, "objects": [ Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c"), @@ -2076,10 +2093,10 @@ def MatchingFor(*versions) -> bool: }, { "lib": "TRK_MINNOW_DOLPHIN", + "src_dir": "libs", "mw_version": MWVersion(config.version), "cflags": cflags_trk, "progress_category": "sdk", - "host": False, "objects": [ # debugger Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c"), @@ -2123,7 +2140,6 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_dolphin, "progress_category": "sdk", - "host": False, "objects": [ Object(MatchingFor(ALL_GCN), "amcstubs/AmcExi2Stubs.c"), ], @@ -2133,7 +2149,6 @@ def MatchingFor(*versions) -> bool: "mw_version": "GC/1.2.5n", "cflags": cflags_runtime, "progress_category": "sdk", - "host": False, "objects": [ Object(MatchingFor(ALL_GCN), "odemuexi2/DebuggerDriver.c"), ], @@ -2143,7 +2158,6 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_dolphin, "progress_category": "sdk", - "host": False, "objects": [ Object(MatchingFor(ALL_GCN), "odenotstub/odenotstub.c"), ], @@ -2154,7 +2168,6 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "sdk", - "host": False, "objects": [ Object(NonMatching, "NdevExi2A/DebuggerDriver.c"), Object(NonMatching, "NdevExi2A/exi2.c"), @@ -2165,7 +2178,6 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_framework, "progress_category": "third_party", - "host": False, "objects": [ Object(MatchingFor("Shield"), "lingcod/LingcodPatch.c"), ], @@ -2177,13 +2189,13 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_rel, "progress_category": "sdk", - "host": False, "objects": [ Object(MatchingFor(ALL_GCN), "REL/executor.c"), Object( MatchingFor(ALL_GCN), "REL/global_destructor_chain.c", - source="PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c", + src_dir="libs/PowerPC_EABI_Support/Runtime/Src", + source="global_destructor_chain.c", ), ], }, diff --git a/include/DynamicLink.h b/include/DynamicLink.h index f59cab5b3ef..7f6d8568ebd 100644 --- a/include/DynamicLink.h +++ b/include/DynamicLink.h @@ -1,7 +1,7 @@ #ifndef DYNAMICLINK_H #define DYNAMICLINK_H -#include +#include #include "JSystem/JKernel/JKRHeap.h" #include "global.h" diff --git a/include/NdevExi2A/DebuggerDriver.h b/include/NdevExi2A/DebuggerDriver.h index 44cf7daad79..53f3c8ff839 100644 --- a/include/NdevExi2A/DebuggerDriver.h +++ b/include/NdevExi2A/DebuggerDriver.h @@ -1,7 +1,7 @@ #ifndef NDEVEXI2A_DEBUGGERDRIVER_H #define NDEVEXI2A_DEBUGGERDRIVER_H -#include +#include #include "types.h" typedef void (*MtrCallback)(s32, OSContext*); diff --git a/include/SSystem/SComponent/c_API_controller_pad.h b/include/SSystem/SComponent/c_API_controller_pad.h index 501e7aee723..d45b483daa3 100644 --- a/include/SSystem/SComponent/c_API_controller_pad.h +++ b/include/SSystem/SComponent/c_API_controller_pad.h @@ -1,7 +1,7 @@ #ifndef C_API_CONTROLLER_PAD_ #define C_API_CONTROLLER_PAD_ -#include +#include struct interface_of_controller_pad { /* 0x00 */ f32 mMainStickPosX; diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h index 390a203e168..badc04679af 100644 --- a/include/SSystem/SComponent/c_bg_s_chk.h +++ b/include/SSystem/SComponent/c_bg_s_chk.h @@ -1,7 +1,7 @@ #ifndef C_BG_S_CHK_H #define C_BG_S_CHK_H -#include +#include #include "f_pc/f_pc_base.h" #include "SSystem/SComponent/c_bg_s_grp_pass_chk.h" #include "SSystem/SComponent/c_bg_s_poly_pass_chk.h" diff --git a/include/SSystem/SComponent/c_bg_s_poly_info.h b/include/SSystem/SComponent/c_bg_s_poly_info.h index 214118476c7..179a0565ecb 100644 --- a/include/SSystem/SComponent/c_bg_s_poly_info.h +++ b/include/SSystem/SComponent/c_bg_s_poly_info.h @@ -1,7 +1,7 @@ #ifndef C_BG_S_POLY_INFO_H #define C_BG_S_POLY_INFO_H -#include +#include #include "f_pc/f_pc_manager.h" class cBgS_PolyInfo { diff --git a/include/SSystem/SComponent/c_bg_w.h b/include/SSystem/SComponent/c_bg_w.h index 85233888a61..f1d5e291b4e 100644 --- a/include/SSystem/SComponent/c_bg_w.h +++ b/include/SSystem/SComponent/c_bg_w.h @@ -1,7 +1,7 @@ #ifndef C_BG_W_H #define C_BG_W_H -#include +#include class cBgW_BgId { private: diff --git a/include/SSystem/SComponent/c_counter.h b/include/SSystem/SComponent/c_counter.h index 124d623fd0c..864554b1a7a 100644 --- a/include/SSystem/SComponent/c_counter.h +++ b/include/SSystem/SComponent/c_counter.h @@ -1,7 +1,7 @@ #ifndef C_COUNTER_H #define C_COUNTER_H -#include +#include struct counter_class { u32 mCounter0; diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index 16488c5a123..e3654846e00 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -2,7 +2,7 @@ #define C_LIB_H_ #include "SSystem/SComponent/c_xyz.h" -#include +#include #include "SSystem/SComponent/c_math.h" inline bool cLib_IsZero(f32 value) { diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index 58f0e28753b..94762d5a298 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -2,7 +2,7 @@ #define C_M3D_H_ #include -#include +#include class cM3dGAab; class cM3dGCps; diff --git a/include/SSystem/SComponent/c_m3d_g_cir.h b/include/SSystem/SComponent/c_m3d_g_cir.h index 8ad96fa2a6f..eccd553c86a 100644 --- a/include/SSystem/SComponent/c_m3d_g_cir.h +++ b/include/SSystem/SComponent/c_m3d_g_cir.h @@ -1,7 +1,7 @@ #ifndef C_M3D_G_CIR_H #define C_M3D_G_CIR_H -#include +#include class cM2dGCir { public: diff --git a/include/SSystem/SComponent/c_malloc.h b/include/SSystem/SComponent/c_malloc.h index bbcff9ae689..95b2d8f298b 100644 --- a/include/SSystem/SComponent/c_malloc.h +++ b/include/SSystem/SComponent/c_malloc.h @@ -1,7 +1,7 @@ #ifndef C_MALLOC_H #define C_MALLOC_H -#include +#include class JKRHeap; diff --git a/include/SSystem/SComponent/c_phase.h b/include/SSystem/SComponent/c_phase.h index 8b88d2f8357..81386b613f5 100644 --- a/include/SSystem/SComponent/c_phase.h +++ b/include/SSystem/SComponent/c_phase.h @@ -1,7 +1,7 @@ #ifndef C_PHASE_H #define C_PHASE_H -#include +#include typedef int (*cPhs__Handler)(void*); diff --git a/include/SSystem/SComponent/c_request.h b/include/SSystem/SComponent/c_request.h index 22bca520e86..b31c0e34aa5 100644 --- a/include/SSystem/SComponent/c_request.h +++ b/include/SSystem/SComponent/c_request.h @@ -1,7 +1,7 @@ #ifndef C_REQUEST_H #define C_REQUEST_H -#include +#include struct request_base_class { u8 flag0 : 1; diff --git a/include/SSystem/SComponent/c_sxyz.h b/include/SSystem/SComponent/c_sxyz.h index 0a2a9df11db..bfaa035de98 100644 --- a/include/SSystem/SComponent/c_sxyz.h +++ b/include/SSystem/SComponent/c_sxyz.h @@ -1,7 +1,7 @@ #ifndef C_SXYZ_H #define C_SXYZ_H -#include +#include struct SVec { s16 x, y, z; diff --git a/include/SSystem/SComponent/c_tag.h b/include/SSystem/SComponent/c_tag.h index 9e9b4a894eb..08aec1b867b 100644 --- a/include/SSystem/SComponent/c_tag.h +++ b/include/SSystem/SComponent/c_tag.h @@ -2,7 +2,7 @@ #define C_TAG_H #include "SSystem/SComponent/c_node.h" -#include +#include typedef struct node_list_class node_list_class; typedef struct node_lists_tree_class node_lists_tree_class; diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 7876d12c3c0..49693091ad1 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -1,7 +1,7 @@ #ifndef C_XYZ_H #define C_XYZ_H -#include +#include #include struct cXyz : Vec { diff --git a/include/SSystem/SStandard/s_basic.h b/include/SSystem/SStandard/s_basic.h index d173a0bc773..c689c7b2aa8 100644 --- a/include/SSystem/SStandard/s_basic.h +++ b/include/SSystem/SStandard/s_basic.h @@ -1,7 +1,7 @@ #ifndef S_BASIC_H #define S_BASIC_H -#include +#include void sBs_FillArea_s(void* pPtr, u32 pNumBytes, s16 pValue); void sBs_ClearArea(void* pPtr, u32 pNumBytes); diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.h index 64312808a0f..91158c4152d 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/dispatch.h @@ -1,7 +1,7 @@ #ifndef METROTRK_PORTABLE_DISPATCH_H #define METROTRK_PORTABLE_DISPATCH_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h index 924fb5ee290..1463655447a 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h @@ -1,7 +1,7 @@ #ifndef METROTRK_PORTABLE_MEM_TRK_H #define METROTRK_PORTABLE_MEM_TRK_H -#include +#include void* TRK_memset(void* dest, int val, size_t count); void* TRK_memcpy(void* dest, const void* src, size_t count); diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.h index debc0353862..76d839ff178 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msg.h @@ -1,7 +1,7 @@ #ifndef METROTRK_PORTABLE_MSG_H #define METROTRK_PORTABLE_MSG_H -#include +#include typedef struct _TRK_Msg { u8 _00[8]; diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h index fe34214e6ed..3597aa6d887 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h @@ -1,7 +1,7 @@ #ifndef METROTRK_PORTABLE_MUTEX_TRK_H #define METROTRK_PORTABLE_MUTEX_TRK_H -#include +#include u8 TRKReleaseMutex(); u8 TRKAcquireMutex(); diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/DDH_Stubs.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/DDH_Stubs.h index 93035ade093..7865b7ac116 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/DDH_Stubs.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/DDH_Stubs.h @@ -1,7 +1,7 @@ #ifndef OS_DOLPHIN_DDH_STUBS_H #define OS_DOLPHIN_DDH_STUBS_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/GDEV_Stubs.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/GDEV_Stubs.h index 4179c1754d2..f5d14165311 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/GDEV_Stubs.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/GDEV_Stubs.h @@ -1,7 +1,7 @@ #ifndef OS_DOLPHIN_GDEV_STUBS_H #define OS_DOLPHIN_GDEV_STUBS_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/UDP_Stubs.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/UDP_Stubs.h index 1c646301810..20e8c858313 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/UDP_Stubs.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/UDP_Stubs.h @@ -1,7 +1,7 @@ #ifndef OS_DOLPHIN_UDP_STUBS_H #define OS_DOLPHIN_UDP_STUBS_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h index f205a325907..ca0310a953e 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h @@ -1,7 +1,7 @@ #ifndef OS_DOLPHIN_DOLPHIN_TRK_GLUE_H #define OS_DOLPHIN_DOLPHIN_TRK_GLUE_H -#include +#include #include "trk.h" #ifdef __cplusplus diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h index 473eca26f59..6c105b82d6e 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.h @@ -1,7 +1,7 @@ #ifndef OS_DOLPHIN_TARGET_OPTIONS_H #define OS_DOLPHIN_TARGET_OPTIONS_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/usr_put.h b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/usr_put.h index 7bccc876eea..181c262796f 100644 --- a/include/TRK_MINNOW_DOLPHIN/Os/dolphin/usr_put.h +++ b/include/TRK_MINNOW_DOLPHIN/Os/dolphin/usr_put.h @@ -1,6 +1,6 @@ #ifndef OS_DOLPHIN_USR_PUT_H #define OS_DOLPHIN_USR_PUT_H -#include +#include #endif /* OS_DOLPHIN_USR_PUT_H */ diff --git a/include/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.h b/include/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.h index 3fc0ee3cb86..916a86f200d 100644 --- a/include/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.h +++ b/include/TRK_MINNOW_DOLPHIN/ppc/Export/targsupp.h @@ -1,7 +1,7 @@ #ifndef PPC_EXPORT_TARGSUPP_H #define PPC_EXPORT_TARGSUPP_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h b/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h index 5bb30fbde1c..0e4e4c09095 100644 --- a/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h +++ b/include/TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h @@ -1,7 +1,7 @@ #ifndef UTILS_COMMON_CIRCLEBUFFER_H #define UTILS_COMMON_CIRCLEBUFFER_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h b/include/TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h index 7c38df31927..47d7475537a 100644 --- a/include/TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h +++ b/include/TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h @@ -1,7 +1,7 @@ #ifndef UTILS_COMMON_MWTRACE_H #define UTILS_COMMON_MWTRACE_H -#include +#include void MWTRACE(u8, char*, ...); diff --git a/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h b/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h index bf2586b403a..bcfe09eddf5 100644 --- a/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h +++ b/include/TRK_MINNOW_DOLPHIN/utils/gc/MWCriticalSection_gc.h @@ -1,7 +1,7 @@ #ifndef UTILS_GC_MWCRITICALSECTION_GC_H #define UTILS_GC_MWCRITICALSECTION_GC_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/Z2AudioCS/Z2AudioCS.h b/include/Z2AudioCS/Z2AudioCS.h index b0788de7868..7d13accabc4 100644 --- a/include/Z2AudioCS/Z2AudioCS.h +++ b/include/Z2AudioCS/Z2AudioCS.h @@ -3,7 +3,7 @@ #include "Z2AudioCS/SpkTable.h" #include "Z2AudioCS/SpkSound.h" -#include +#include class JKRHeap; class JKRArchive; diff --git a/include/Z2AudioLib/Z2Calc.h b/include/Z2AudioLib/Z2Calc.h index db6e0561c83..e8eee29571c 100644 --- a/include/Z2AudioLib/Z2Calc.h +++ b/include/Z2AudioLib/Z2Calc.h @@ -1,7 +1,7 @@ #ifndef Z2CALC_H #define Z2CALC_H -#include +#include #include "m_Do/m_Do_lib.h" namespace Z2Calc { diff --git a/include/Z2AudioLib/Z2Param.h b/include/Z2AudioLib/Z2Param.h index c0d2bf53c7c..e6c8aac993c 100644 --- a/include/Z2AudioLib/Z2Param.h +++ b/include/Z2AudioLib/Z2Param.h @@ -1,7 +1,7 @@ #ifndef Z2PARAM_H #define Z2PARAM_H -#include +#include struct Z2Param { static f32 DISTANCE_MAX; diff --git a/include/Z2AudioLib/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr.h index 615374f2be7..f5584a7260d 100644 --- a/include/Z2AudioLib/Z2StatusMgr.h +++ b/include/Z2AudioLib/Z2StatusMgr.h @@ -2,7 +2,7 @@ #define Z2STATUSMGR_H #include "JSystem/JAudio2/JASGadget.h" -#include +#include struct Z2StatusMgr : public JASGlobalInstance { Z2StatusMgr(); diff --git a/include/d/actor/d_a_balloon_2D.h b/include/d/actor/d_a_balloon_2D.h index cf8a24116bd..f2dfa5e99fe 100644 --- a/include/d/actor/d_a_balloon_2D.h +++ b/include/d/actor/d_a_balloon_2D.h @@ -1,7 +1,7 @@ #ifndef D_A_BALLOON_2D_H #define D_A_BALLOON_2D_H -#include +#include #include "f_op/f_op_actor.h" #include "SSystem/SComponent/c_phase.h" #include "d/d_drawlist.h" diff --git a/include/d/actor/d_a_door_bossL1.h b/include/d/actor/d_a_door_bossL1.h index 81d9f5b8443..397b7d90cee 100644 --- a/include/d/actor/d_a_door_bossL1.h +++ b/include/d/actor/d_a_door_bossL1.h @@ -1,7 +1,7 @@ #ifndef D_A_DOOR_BOSSL1_H #define D_A_DOOR_BOSSL1_H -#include +#include #include "f_op/f_op_actor.h" #include "d/d_bg_w.h" #include "d/d_bg_s_acch.h" diff --git a/include/d/actor/d_a_door_bossL5.h b/include/d/actor/d_a_door_bossL5.h index 11e7bf78435..832f575ac1f 100644 --- a/include/d/actor/d_a_door_bossL5.h +++ b/include/d/actor/d_a_door_bossL5.h @@ -1,7 +1,7 @@ #ifndef D_A_DOOR_BOSSL5_H #define D_A_DOOR_BOSSL5_H -#include +#include #include "f_op/f_op_actor.h" #include "SSystem/SComponent/c_phase.h" #include "d/d_bg_w.h" diff --git a/include/d/actor/d_a_door_mbossL1.h b/include/d/actor/d_a_door_mbossL1.h index ce2be23aa0a..fc495290189 100644 --- a/include/d/actor/d_a_door_mbossL1.h +++ b/include/d/actor/d_a_door_mbossL1.h @@ -1,7 +1,7 @@ #ifndef D_A_DOOR_MBOSSL1_H #define D_A_DOOR_MBOSSL1_H -#include +#include #include "f_op/f_op_actor.h" #include "SSystem/SComponent/c_phase.h" #include "d/d_bg_w.h" diff --git a/include/d/actor/d_a_door_shutter.h b/include/d/actor/d_a_door_shutter.h index 5df7c2f4afb..1b32c7d3577 100644 --- a/include/d/actor/d_a_door_shutter.h +++ b/include/d/actor/d_a_door_shutter.h @@ -1,7 +1,7 @@ #ifndef D_A_DOOR_SHUTTER_H #define D_A_DOOR_SHUTTER_H -#include +#include #include "f_op/f_op_actor.h" #include "SSystem/SComponent/c_phase.h" #include "d/d_bg_w.h" diff --git a/include/d/actor/d_a_e_db_leaf.h b/include/d/actor/d_a_e_db_leaf.h index 2a19d4b01b6..f783ea35961 100644 --- a/include/d/actor/d_a_e_db_leaf.h +++ b/include/d/actor/d_a_e_db_leaf.h @@ -2,7 +2,7 @@ #define D_A_E_DB_LEAF_H #include "d/d_com_inf_game.h" -#include +#include /** * @ingroup actors-enemies diff --git a/include/d/actor/d_a_e_oct_bg.h b/include/d/actor/d_a_e_oct_bg.h index 7c54d6e84bf..cd5b6b27cd2 100644 --- a/include/d/actor/d_a_e_oct_bg.h +++ b/include/d/actor/d_a_e_oct_bg.h @@ -1,7 +1,7 @@ #ifndef D_A_E_OCT_BG_H #define D_A_E_OCT_BG_H -#include +#include #include "f_op/f_op_actor.h" #include "d/d_bg_s_acch.h" #include "Z2AudioLib/Z2Creature.h" diff --git a/include/d/actor/d_a_fr.h b/include/d/actor/d_a_fr.h index cf44361b89c..bb8da171a6e 100644 --- a/include/d/actor/d_a_fr.h +++ b/include/d/actor/d_a_fr.h @@ -4,7 +4,7 @@ #include "d/d_bg_s_acch.h" #include "d/d_cc_d.h" #include "d/d_msg_flow.h" -#include +#include #include "SSystem/SComponent/c_phase.h" #include "f_op/f_op_actor_mng.h" diff --git a/include/d/actor/d_a_kytag12.h b/include/d/actor/d_a_kytag12.h index a043aafaadb..73b46a0efe0 100644 --- a/include/d/actor/d_a_kytag12.h +++ b/include/d/actor/d_a_kytag12.h @@ -1,7 +1,7 @@ #ifndef D_A_KYTAG12_H #define D_A_KYTAG12_H -#include +#include #include "f_op/f_op_actor_mng.h" /** diff --git a/include/d/actor/d_a_kytag13.h b/include/d/actor/d_a_kytag13.h index e03d9c579c2..03d835e9c7b 100644 --- a/include/d/actor/d_a_kytag13.h +++ b/include/d/actor/d_a_kytag13.h @@ -1,7 +1,7 @@ #ifndef D_A_KYTAG13_H #define D_A_KYTAG13_H -#include +#include #include "f_op/f_op_actor_mng.h" /** diff --git a/include/d/actor/d_a_movie_player.h b/include/d/actor/d_a_movie_player.h index 22f3b2b43cb..e064d558ddf 100644 --- a/include/d/actor/d_a_movie_player.h +++ b/include/d/actor/d_a_movie_player.h @@ -1,7 +1,7 @@ #ifndef D_A_MOVIE_PLAYER_H #define D_A_MOVIE_PLAYER_H -#include +#include #include "f_op/f_op_actor.h" #include "d/d_drawlist.h" diff --git a/include/d/actor/d_a_npc_cd2.h b/include/d/actor/d_a_npc_cd2.h index 85ec30b4e2c..3d2eaa87c5c 100644 --- a/include/d/actor/d_a_npc_cd2.h +++ b/include/d/actor/d_a_npc_cd2.h @@ -5,7 +5,7 @@ #include "d/actor/d_a_tag_escape.h" #include "d/d_npc_lib.h" #include "d/d_path.h" -#include +#include enum { MdlMANa_e = 0, diff --git a/include/d/actor/d_a_npc_toby.h b/include/d/actor/d_a_npc_toby.h index 2168d289479..0c3de69c6f3 100644 --- a/include/d/actor/d_a_npc_toby.h +++ b/include/d/actor/d_a_npc_toby.h @@ -1,7 +1,7 @@ #ifndef D_A_NPC_TOBY_H #define D_A_NPC_TOBY_H -#include +#include #include "d/actor/d_a_npc.h" struct daNpc_Toby_HIOParam { diff --git a/include/d/actor/d_a_obj_avalanche.h b/include/d/actor/d_a_obj_avalanche.h index 18912da8f71..89de60d2e88 100644 --- a/include/d/actor/d_a_obj_avalanche.h +++ b/include/d/actor/d_a_obj_avalanche.h @@ -1,7 +1,7 @@ #ifndef D_A_OBJ_AVALANCHE_H #define D_A_OBJ_AVALANCHE_H -#include +#include #include "d/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor_mng.h" diff --git a/include/d/actor/d_a_obj_bed.h b/include/d/actor/d_a_obj_bed.h index 0997e253536..68919a84617 100644 --- a/include/d/actor/d_a_obj_bed.h +++ b/include/d/actor/d_a_obj_bed.h @@ -4,7 +4,7 @@ #include "SSystem/SComponent/c_phase.h" #include "d/d_bg_s_acch.h" #include "f_op/f_op_actor.h" -#include +#include class dBgW; diff --git a/include/d/actor/d_a_obj_bmWindow.h b/include/d/actor/d_a_obj_bmWindow.h index fd04b16ccbe..85b5ab8f86b 100644 --- a/include/d/actor/d_a_obj_bmWindow.h +++ b/include/d/actor/d_a_obj_bmWindow.h @@ -1,7 +1,7 @@ #ifndef D_A_OBJ_BMWINDOW_H #define D_A_OBJ_BMWINDOW_H -#include +#include #include "d/d_bg_s_movebg_actor.h" #include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" diff --git a/include/d/actor/d_a_obj_hata.h b/include/d/actor/d_a_obj_hata.h index e0763a9c75e..db42f9d42da 100644 --- a/include/d/actor/d_a_obj_hata.h +++ b/include/d/actor/d_a_obj_hata.h @@ -2,7 +2,7 @@ #define D_A_OBJ_HATA_H #include "SSystem/SComponent/c_phase.h" -#include +#include #include "f_op/f_op_actor.h" /** diff --git a/include/d/actor/d_a_obj_stopper.h b/include/d/actor/d_a_obj_stopper.h index 562d5a87ca6..9a100c754b5 100644 --- a/include/d/actor/d_a_obj_stopper.h +++ b/include/d/actor/d_a_obj_stopper.h @@ -5,7 +5,7 @@ #include "d/d_bg_s_movebg_actor.h" #include "d/d_cc_d.h" #include "d/d_particle.h" -#include +#include #include "f_op/f_op_actor_mng.h" /** diff --git a/include/d/actor/d_a_path_line.h b/include/d/actor/d_a_path_line.h index a03c5445e7b..9cf086adaff 100644 --- a/include/d/actor/d_a_path_line.h +++ b/include/d/actor/d_a_path_line.h @@ -1,6 +1,6 @@ #ifndef D_A_PATH_LINE_H #define D_A_PATH_LINE_H -#include +#include #endif /* D_A_PATH_LINE_H */ diff --git a/include/d/actor/d_a_peru.h b/include/d/actor/d_a_peru.h index 583f7c62d0d..df9f494936b 100644 --- a/include/d/actor/d_a_peru.h +++ b/include/d/actor/d_a_peru.h @@ -2,7 +2,7 @@ #define D_A_PERU_H #include "d/actor/d_a_tag_evtarea.h" -#include +#include #include "d/actor/d_a_npc.h" #include "SSystem/SComponent/c_counter.h" diff --git a/include/d/actor/d_a_ppolamp.h b/include/d/actor/d_a_ppolamp.h index f6a6da2e668..f1e1a9f26df 100644 --- a/include/d/actor/d_a_ppolamp.h +++ b/include/d/actor/d_a_ppolamp.h @@ -1,7 +1,7 @@ #ifndef D_A_PPOLAMP_H #define D_A_PPOLAMP_H -#include +#include #include "f_op/f_op_actor_mng.h" /** diff --git a/include/d/actor/d_a_tag_kmsg.h b/include/d/actor/d_a_tag_kmsg.h index 2875ca3210c..92cd33f35b9 100644 --- a/include/d/actor/d_a_tag_kmsg.h +++ b/include/d/actor/d_a_tag_kmsg.h @@ -1,7 +1,7 @@ #ifndef D_A_TAG_KMSG_H #define D_A_TAG_KMSG_H -#include +#include #include "f_op/f_op_actor.h" #include "f_op/f_op_actor_mng.h" #include "d/d_msg_flow.h" diff --git a/include/d/d_bg_pc.h b/include/d/d_bg_pc.h index 949c38e6091..65850104518 100644 --- a/include/d/d_bg_pc.h +++ b/include/d/d_bg_pc.h @@ -1,7 +1,7 @@ #ifndef D_BG_D_BG_PC_H #define D_BG_D_BG_PC_H -#include +#include struct sBgPc { /* 0x00 */ u32 code0; diff --git a/include/d/d_bg_s.h b/include/d/d_bg_s.h index 537748470ce..315a7be614e 100644 --- a/include/d/d_bg_s.h +++ b/include/d/d_bg_s.h @@ -3,7 +3,7 @@ #include "d/d_bg_w_base.h" #include "JSystem/JHostIO/JORReflexible.h" -#include +#include #include "global.h" class dBgW; diff --git a/include/d/d_bg_w.h b/include/d/d_bg_w.h index bf65baccdf5..09970f9f4dc 100644 --- a/include/d/d_bg_w.h +++ b/include/d/d_bg_w.h @@ -4,8 +4,8 @@ #include "SSystem/SComponent/c_m3d_g_aab.h" #include "SSystem/SComponent/c_sxyz.h" #include "d/d_bg_w_base.h" -#include -#include +#include +#include class cBgS_GrpPassChk; class cBgS_PolyPassChk; diff --git a/include/d/d_bg_w_base.h b/include/d/d_bg_w_base.h index 089af244b87..b8127cde6a9 100644 --- a/include/d/d_bg_w_base.h +++ b/include/d/d_bg_w_base.h @@ -4,7 +4,7 @@ #include "SSystem/SComponent/c_bg_s_poly_info.h" #include "SSystem/SComponent/c_bg_w.h" #include "SSystem/SComponent/c_m3d_g_pla.h" -#include +#include #include "f_pc/f_pc_base.h" class cBgS_GndChk; diff --git a/include/d/d_cc_uty.h b/include/d/d_cc_uty.h index bc58f99dc8a..d070512cc16 100644 --- a/include/d/d_cc_uty.h +++ b/include/d/d_cc_uty.h @@ -2,7 +2,7 @@ #define D_CC_D_CC_UTY_H #include "SSystem/SComponent/c_sxyz.h" -#include +#include class cCcD_Obj; class fopAc_ac_c; diff --git a/include/d/d_debug_viewer.h b/include/d/d_debug_viewer.h index f535207a3ab..dc72f972d81 100644 --- a/include/d/d_debug_viewer.h +++ b/include/d/d_debug_viewer.h @@ -1,7 +1,7 @@ #ifndef D_DEBUG_VIEWER_H #define D_DEBUG_VIEWER_H -#include +#include #include "SSystem/SComponent/c_xyz.h" #include "SSystem/SComponent/c_sxyz.h" diff --git a/include/d/d_door_param2.h b/include/d/d_door_param2.h index ffb6f9a9c2d..2b98243b562 100644 --- a/include/d/d_door_param2.h +++ b/include/d/d_door_param2.h @@ -1,7 +1,7 @@ #ifndef D_D_DOOR_PARAM2_H #define D_D_DOOR_PARAM2_H -#include +#include class fopAc_ac_c; diff --git a/include/d/d_event_lib.h b/include/d/d_event_lib.h index 7220534f5cd..b0ee88a6f39 100644 --- a/include/d/d_event_lib.h +++ b/include/d/d_event_lib.h @@ -1,7 +1,7 @@ #ifndef D_EVENT_D_EVENT_LIB_H #define D_EVENT_D_EVENT_LIB_H -#include +#include class fopAc_ac_c; diff --git a/include/d/d_eye_hl.h b/include/d/d_eye_hl.h index 382938c5a56..e7a4d82d3c4 100644 --- a/include/d/d_eye_hl.h +++ b/include/d/d_eye_hl.h @@ -1,7 +1,7 @@ #ifndef D_D_EYE_HL_H #define D_D_EYE_HL_H -#include +#include class J3DModelData; struct ResTIMG; diff --git a/include/d/d_item.h b/include/d/d_item.h index 8b988ce10c1..0d379c05784 100644 --- a/include/d/d_item.h +++ b/include/d/d_item.h @@ -1,7 +1,7 @@ #ifndef D_D_ITEM_H #define D_D_ITEM_H -#include +#include class dEnemyItem_c { public: diff --git a/include/d/d_item_data.h b/include/d/d_item_data.h index 00fb9e5b9b1..a7e658c1a38 100644 --- a/include/d/d_item_data.h +++ b/include/d/d_item_data.h @@ -1,7 +1,7 @@ #ifndef D_D_ITEM_DATA_H #define D_D_ITEM_DATA_H -#include +#include struct dItem_itemInfo { /* 0x0 */ u8 mShadowSize; diff --git a/include/d/d_jpreviewer.h b/include/d/d_jpreviewer.h index b3b9776de9e..6f00adbb938 100644 --- a/include/d/d_jpreviewer.h +++ b/include/d/d_jpreviewer.h @@ -1,7 +1,7 @@ #ifndef D_JPREVIEWER_H #define D_JPREVIEWER_H -#include +#include #include "JSystem/JStudio/JStudio_JPreviewer/control.h" namespace JStudio { diff --git a/include/d/d_kankyo_data.h b/include/d/d_kankyo_data.h index 93b0cecfcb0..e8d38992ab1 100644 --- a/include/d/d_kankyo_data.h +++ b/include/d/d_kankyo_data.h @@ -1,7 +1,7 @@ #ifndef D_KANKYO_D_KANKYO_DATA_H #define D_KANKYO_D_KANKYO_DATA_H -#include +#include struct color_RGB_class { /* 0x0 */ u8 r; diff --git a/include/d/d_kankyo_rain.h b/include/d/d_kankyo_rain.h index 0feb428cd2b..d74e03aa0f0 100644 --- a/include/d/d_kankyo_rain.h +++ b/include/d/d_kankyo_rain.h @@ -1,7 +1,7 @@ #ifndef D_KANKYO_D_KANKYO_RAIN_H #define D_KANKYO_D_KANKYO_RAIN_H -#include +#include struct cXyz; struct _GXColor; diff --git a/include/d/d_kankyo_tev_str.h b/include/d/d_kankyo_tev_str.h index 177dc80d652..d5403876c54 100644 --- a/include/d/d_kankyo_tev_str.h +++ b/include/d/d_kankyo_tev_str.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphBase/J3DTevs.h" #include "SSystem/SComponent/c_xyz.h" -#include +#include class dKy_tevstr_c { public: diff --git a/include/d/d_lib.h b/include/d/d_lib.h index 212bf517f52..1d3103ce962 100644 --- a/include/d/d_lib.h +++ b/include/d/d_lib.h @@ -2,8 +2,8 @@ #define D_D_LIB_H #include "SSystem/SComponent/c_xyz.h" -#include -#include +#include +#include class fopAc_ac_c; diff --git a/include/d/d_menu_dmap.h b/include/d/d_menu_dmap.h index fafa30e0c05..78c659e2cf6 100644 --- a/include/d/d_menu_dmap.h +++ b/include/d/d_menu_dmap.h @@ -5,7 +5,7 @@ #include "d/d_msg_flow.h" #include "d/d_menu_map_common.h" #include "d/d_map_path_dmap.h" -#include +#include class CPaneMgr; struct CSTControl; diff --git a/include/d/d_menu_fmap2D.h b/include/d/d_menu_fmap2D.h index ba8fd8659f1..c0344c79033 100644 --- a/include/d/d_menu_fmap2D.h +++ b/include/d/d_menu_fmap2D.h @@ -7,7 +7,7 @@ #include "d/d_menu_map_common.h" #include "d/d_meter_haihai.h" #include "d/d_pane_class.h" -#include +#include class dMsgScrnExplain_c; diff --git a/include/d/d_menu_fmap_map.h b/include/d/d_menu_fmap_map.h index b77e43ba702..95294ffb35e 100644 --- a/include/d/d_menu_fmap_map.h +++ b/include/d/d_menu_fmap_map.h @@ -2,7 +2,7 @@ #define D_MENU_D_MENU_FMAP_MAP_H #include "SSystem/SComponent/c_counter.h" -#include +#include #include #include "d/d_menu_fmap.h" #include "d/d_map.h" diff --git a/include/d/d_menu_map_common.h b/include/d/d_menu_map_common.h index 7d81ba620d9..84da15328ca 100644 --- a/include/d/d_menu_map_common.h +++ b/include/d/d_menu_map_common.h @@ -1,7 +1,7 @@ #ifndef D_MENU_D_MENU_MAP_COMMON_H #define D_MENU_D_MENU_MAP_COMMON_H -#include +#include class J2DPicture; class JKRArchive; diff --git a/include/d/d_menu_window_HIO.h b/include/d/d_menu_window_HIO.h index 9a6e82fa06c..1df1b5cb720 100644 --- a/include/d/d_menu_window_HIO.h +++ b/include/d/d_menu_window_HIO.h @@ -1,7 +1,7 @@ #ifndef D_MENU_D_MENU_WINDOW_HIO_H #define D_MENU_D_MENU_WINDOW_HIO_H -#include +#include class dMw_DHIO_c { public: diff --git a/include/d/d_msg_flow.h b/include/d/d_msg_flow.h index 8f242f3eec4..98a53083852 100644 --- a/include/d/d_msg_flow.h +++ b/include/d/d_msg_flow.h @@ -1,7 +1,7 @@ #ifndef D_MSG_D_MSG_FLOW_H #define D_MSG_D_MSG_FLOW_H -#include +#include enum { NODETYPE_MESSAGE_e = 1, diff --git a/include/d/d_msg_out_font.h b/include/d/d_msg_out_font.h index f1cb15a5c4d..2b2d0fa33d9 100644 --- a/include/d/d_msg_out_font.h +++ b/include/d/d_msg_out_font.h @@ -1,7 +1,7 @@ #ifndef D_MSG_D_MSG_OUT_FONT_H #define D_MSG_D_MSG_OUT_FONT_H -#include +#include class J2DPicture; class J2DTextBox; diff --git a/include/d/d_msg_scrn_arrow.h b/include/d/d_msg_scrn_arrow.h index 0f651810338..725fbf8658d 100644 --- a/include/d/d_msg_scrn_arrow.h +++ b/include/d/d_msg_scrn_arrow.h @@ -1,7 +1,7 @@ #ifndef MSG_SCRN_D_MSG_SCRN_ARROW_H #define MSG_SCRN_D_MSG_SCRN_ARROW_H -#include +#include class J2DScreen; class J2DAnmTransform; diff --git a/include/d/d_msg_scrn_item.h b/include/d/d_msg_scrn_item.h index 2d82bb21384..4b0e55cbd91 100644 --- a/include/d/d_msg_scrn_item.h +++ b/include/d/d_msg_scrn_item.h @@ -1,7 +1,7 @@ #ifndef MSG_SCRN_D_MSG_SCRN_ITEM_H #define MSG_SCRN_D_MSG_SCRN_ITEM_H -#include +#include #include "d/d_msg_scrn_base.h" class dMsgScrnArrow_c; diff --git a/include/d/d_msg_scrn_talk.h b/include/d/d_msg_scrn_talk.h index cac9efc97b5..05b187e709c 100644 --- a/include/d/d_msg_scrn_talk.h +++ b/include/d/d_msg_scrn_talk.h @@ -1,7 +1,7 @@ #ifndef MSG_SCRN_D_MSG_SCRN_TALK_H #define MSG_SCRN_D_MSG_SCRN_TALK_H -#include +#include #include "d/d_msg_scrn_base.h" class dMsgScrnArrow_c; diff --git a/include/d/d_particle_name.h b/include/d/d_particle_name.h index 61a7c4d7e58..f66bbd91a67 100644 --- a/include/d/d_particle_name.h +++ b/include/d/d_particle_name.h @@ -1,7 +1,7 @@ #ifndef D_PARTICLE_D_PARTICLE_NAME_H #define D_PARTICLE_D_PARTICLE_NAME_H -#include +#include // Room scenes use a bit to specify an ID is from a room particle pack, not the common particle pack #define dPa_RM(id) (0x8000 | (id)) diff --git a/include/d/d_path.h b/include/d/d_path.h index 5ef65cfaef6..d8ac2af6746 100644 --- a/include/d/d_path.h +++ b/include/d/d_path.h @@ -1,8 +1,8 @@ #ifndef D_D_PATH_H #define D_D_PATH_H -#include -#include +#include +#include class cBgS_PolyInfo; struct cXyz; diff --git a/include/d/d_save.h b/include/d/d_save.h index abb77dd69c6..9a57f9eb159 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -3,7 +3,7 @@ #include #include "SSystem/SComponent/c_xyz.h" -#include +#include #include "global.h" #include "f_pc/f_pc_name.h" #include "JSystem/JUtility/JUTAssert.h" diff --git a/include/d/d_tresure.h b/include/d/d_tresure.h index 53315bacdcd..773de7d06b2 100644 --- a/include/d/d_tresure.h +++ b/include/d/d_tresure.h @@ -1,7 +1,7 @@ #ifndef D_D_TRESURE_H #define D_D_TRESURE_H -#include +#include class dTres_c { public: diff --git a/include/d/d_vib_pattern.h b/include/d/d_vib_pattern.h index 55d213513bb..a794bdbf398 100644 --- a/include/d/d_vib_pattern.h +++ b/include/d/d_vib_pattern.h @@ -1,7 +1,7 @@ #ifndef D_D_VIB_PATTERN_H #define D_D_VIB_PATTERN_H -#include +#include diff --git a/include/f_op/f_op_view.h b/include/f_op/f_op_view.h index 07971a76426..9d78ba47a9c 100644 --- a/include/f_op/f_op_view.h +++ b/include/f_op/f_op_view.h @@ -2,7 +2,7 @@ #define F_F_OP_VIEW_H_ #include "SSystem/SComponent/c_xyz.h" -#include +#include #include "f_pc/f_pc_leaf.h" struct view_process_profile_definition { diff --git a/include/f_pc/f_pc_create_iter.h b/include/f_pc/f_pc_create_iter.h index 509a0fe1c08..c9e25c98ff4 100644 --- a/include/f_pc/f_pc_create_iter.h +++ b/include/f_pc/f_pc_create_iter.h @@ -2,7 +2,7 @@ #ifndef F_PC_CREATE_ITER_H_ #define F_PC_CREATE_ITER_H_ -#include +#include typedef struct create_tag create_tag; diff --git a/include/f_pc/f_pc_debug_sv.h b/include/f_pc/f_pc_debug_sv.h index 680f90bd829..d2fcfcb84cc 100644 --- a/include/f_pc/f_pc_debug_sv.h +++ b/include/f_pc/f_pc_debug_sv.h @@ -2,7 +2,11 @@ #ifndef F_PC_DEBUG_SV_H_ #define F_PC_DEBUG_SV_H_ -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #if DEBUG diff --git a/include/f_pc/f_pc_deletor.h b/include/f_pc/f_pc_deletor.h index 9f4cbeb0143..c0b7da0fc27 100644 --- a/include/f_pc/f_pc_deletor.h +++ b/include/f_pc/f_pc_deletor.h @@ -2,7 +2,7 @@ #ifndef F_PC_DELETOR_H_ #define F_PC_DELETOR_H_ -#include +#include typedef struct base_process_class base_process_class; diff --git a/include/f_pc/f_pc_draw.h b/include/f_pc/f_pc_draw.h index dc971c8c274..889a67ab35f 100644 --- a/include/f_pc/f_pc_draw.h +++ b/include/f_pc/f_pc_draw.h @@ -1,7 +1,7 @@ #ifndef F_PC_DRAW_H_ #define F_PC_DRAW_H_ -#include +#include typedef struct base_process_class base_process_class; diff --git a/include/f_pc/f_pc_draw_priority.h b/include/f_pc/f_pc_draw_priority.h index b34a810f700..467d53ced26 100644 --- a/include/f_pc/f_pc_draw_priority.h +++ b/include/f_pc/f_pc_draw_priority.h @@ -2,7 +2,7 @@ #ifndef F_PC_DRAW_PRIORITY_H_ #define F_PC_DRAW_PRIORITY_H_ -#include +#include typedef struct draw_priority_class { s16 priority; diff --git a/include/f_pc/f_pc_layer_iter.h b/include/f_pc/f_pc_layer_iter.h index 35e16fd8fac..19130d4d673 100644 --- a/include/f_pc/f_pc_layer_iter.h +++ b/include/f_pc/f_pc_layer_iter.h @@ -1,7 +1,7 @@ #ifndef F_PC_LAYER_ITER_H_ #define F_PC_LAYER_ITER_H_ -#include +#include typedef struct layer_class layer_class; diff --git a/include/f_pc/f_pc_load.h b/include/f_pc/f_pc_load.h index b71a7679826..80db744aefb 100644 --- a/include/f_pc/f_pc_load.h +++ b/include/f_pc/f_pc_load.h @@ -2,7 +2,7 @@ #ifndef F_PC_LOAD_H_ #define F_PC_LOAD_H_ -#include +#include BOOL fpcLd_Use(s16 i_procName); BOOL fpcLd_IsLoaded(s16 i_procName); diff --git a/include/f_pc/f_pc_method.h b/include/f_pc/f_pc_method.h index b87aa81e157..342a41008c0 100644 --- a/include/f_pc/f_pc_method.h +++ b/include/f_pc/f_pc_method.h @@ -1,7 +1,7 @@ #ifndef F_PC_METHOD_H_ #define F_PC_METHOD_H_ -#include +#include typedef int (*process_method_func)(void*); diff --git a/include/f_pc/f_pc_method_iter.h b/include/f_pc/f_pc_method_iter.h index 05c1de4402a..94e77c24d85 100644 --- a/include/f_pc/f_pc_method_iter.h +++ b/include/f_pc/f_pc_method_iter.h @@ -2,7 +2,7 @@ #ifndef F_PC_METHOD_ITER_H_ #define F_PC_METHOD_ITER_H_ -#include +#include typedef struct node_list_class node_list_class; diff --git a/include/f_pc/f_pc_pause.h b/include/f_pc/f_pc_pause.h index 0bc14c72b3f..fb1c5f2c1e0 100644 --- a/include/f_pc/f_pc_pause.h +++ b/include/f_pc/f_pc_pause.h @@ -1,7 +1,7 @@ #ifndef F_PC_PAUSE_ #define F_PC_PAUSE_ -#include +#include int fpcPause_IsEnable(void* pProc, u8 expected); int fpcPause_Enable(void* pProc, u8 pauseMask); diff --git a/include/f_pc/f_pc_profile.h b/include/f_pc/f_pc_profile.h index 8bc40fadc76..865d9a9a4f6 100644 --- a/include/f_pc/f_pc_profile.h +++ b/include/f_pc/f_pc_profile.h @@ -2,7 +2,7 @@ #ifndef F_PC_PROFILE_H_ #define F_PC_PROFILE_H_ -#include +#include typedef struct nodedraw_method_class nodedraw_method_class; typedef struct leafdraw_method_class leafdraw_method_class; diff --git a/include/m_Do/m_Do_MemCard.h b/include/m_Do/m_Do_MemCard.h index 1dd2c37b13c..f369bf2f2f7 100644 --- a/include/m_Do/m_Do_MemCard.h +++ b/include/m_Do/m_Do_MemCard.h @@ -1,8 +1,8 @@ #ifndef M_DO_M_DO_MEMCARD_H #define M_DO_M_DO_MEMCARD_H -#include -#include +#include +#include #include "global.h" #define SAVEDATA_SIZE 0xA94 // Size of 1 Quest Log diff --git a/include/m_Do/m_Do_MemCardRWmng.h b/include/m_Do/m_Do_MemCardRWmng.h index 5263a533275..15f95d6347d 100644 --- a/include/m_Do/m_Do_MemCardRWmng.h +++ b/include/m_Do/m_Do_MemCardRWmng.h @@ -2,7 +2,7 @@ #define M_DO_M_DO_MEMCARDRWMNG_H #include "global.h" -#include +#include #if PLATFORM_WII || PLATFORM_SHIELD #include diff --git a/include/m_Do/m_Do_Reset.h b/include/m_Do/m_Do_Reset.h index 8a19c8fbe37..a426460ba9a 100644 --- a/include/m_Do/m_Do_Reset.h +++ b/include/m_Do/m_Do_Reset.h @@ -1,7 +1,7 @@ #ifndef M_DO_M_DO_RESET_H #define M_DO_M_DO_RESET_H -#include +#include void mDoRst_reset(int, u32, int); void mDoRst_resetCallBack(int, void*); diff --git a/include/m_Do/m_Do_dvd_thread.h b/include/m_Do/m_Do_dvd_thread.h index ad053bd051d..16e7b1f9abd 100644 --- a/include/m_Do/m_Do_dvd_thread.h +++ b/include/m_Do/m_Do_dvd_thread.h @@ -2,8 +2,8 @@ #define M_DO_M_DO_DVD_THREAD_H #include "JSystem/JKernel/JKRArchive.h" -#include -#include +#include +#include #include "f_pc/f_pc_node.h" #define mDoDvd_MOUNT_DIRECTION_HEAD 0 diff --git a/include/m_Do/m_Do_machine.h b/include/m_Do/m_Do_machine.h index 47879f3adbf..53c47c07a75 100644 --- a/include/m_Do/m_Do_machine.h +++ b/include/m_Do/m_Do_machine.h @@ -1,7 +1,7 @@ #ifndef M_DO_M_DO_MACHINE_H #define M_DO_M_DO_MACHINE_H -#include +#include typedef struct OSContext OSContext; class JKRHeap; diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h index ff5aa4d12ab..9bedc21a396 100644 --- a/include/m_Do/m_Do_main.h +++ b/include/m_Do/m_Do_main.h @@ -2,7 +2,7 @@ #define M_DO_M_DO_MAIN_H #include "JSystem/JKernel/JKRExpHeap.h" -#include +#include class JKRExpHeap; diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index e25f8b620ee..4a7bfaf4c5e 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -3,7 +3,7 @@ #include "SSystem/SComponent/c_sxyz.h" #include "SSystem/SComponent/c_xyz.h" -#include +#include extern u8 g_printCurrentHeapDebug; extern u8 g_printOtherHeapDebug; diff --git a/include/m_Do/m_Do_printf.h b/include/m_Do/m_Do_printf.h index 13ca5b0e018..dc30b1c7200 100644 --- a/include/m_Do/m_Do_printf.h +++ b/include/m_Do/m_Do_printf.h @@ -1,7 +1,7 @@ #ifndef M_DO_M_DO_PRINTF_H #define M_DO_M_DO_PRINTF_H -#include +#include void my_PutString(const char*); void mDoPrintf_vprintf_Interrupt(char const*, va_list); diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/libs/JSystem/include/JSystem/J2DGraph/J2DAnimation.h similarity index 100% rename from include/JSystem/J2DGraph/J2DAnimation.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DAnimation.h diff --git a/include/JSystem/J2DGraph/J2DAnmLoader.h b/libs/JSystem/include/JSystem/J2DGraph/J2DAnmLoader.h similarity index 100% rename from include/JSystem/J2DGraph/J2DAnmLoader.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DAnmLoader.h diff --git a/include/JSystem/J2DGraph/J2DGrafContext.h b/libs/JSystem/include/JSystem/J2DGraph/J2DGrafContext.h similarity index 98% rename from include/JSystem/J2DGraph/J2DGrafContext.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DGrafContext.h index 9f9ff431a77..8a7e1a74a22 100644 --- a/include/JSystem/J2DGraph/J2DGrafContext.h +++ b/libs/JSystem/include/JSystem/J2DGraph/J2DGrafContext.h @@ -3,7 +3,7 @@ #include "JSystem/JGeometry.h" #include "JSystem/JUtility/TColor.h" -#include +#include /** * @ingroup jsystem-j2d diff --git a/include/JSystem/J2DGraph/J2DManage.h b/libs/JSystem/include/JSystem/J2DGraph/J2DManage.h similarity index 95% rename from include/JSystem/J2DGraph/J2DManage.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DManage.h index abccbe04c25..ebbf3cf46d5 100644 --- a/include/JSystem/J2DGraph/J2DManage.h +++ b/libs/JSystem/include/JSystem/J2DGraph/J2DManage.h @@ -1,7 +1,7 @@ #ifndef J2DMANAGE_H #define J2DMANAGE_H -#include +#include class JSUInputStream; diff --git a/include/JSystem/J2DGraph/J2DMatBlock.h b/libs/JSystem/include/JSystem/J2DGraph/J2DMatBlock.h similarity index 100% rename from include/JSystem/J2DGraph/J2DMatBlock.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DMatBlock.h diff --git a/include/JSystem/J2DGraph/J2DMaterial.h b/libs/JSystem/include/JSystem/J2DGraph/J2DMaterial.h similarity index 100% rename from include/JSystem/J2DGraph/J2DMaterial.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DMaterial.h diff --git a/include/JSystem/J2DGraph/J2DMaterialFactory.h b/libs/JSystem/include/JSystem/J2DGraph/J2DMaterialFactory.h similarity index 100% rename from include/JSystem/J2DGraph/J2DMaterialFactory.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DMaterialFactory.h diff --git a/include/JSystem/J2DGraph/J2DOrthoGraph.h b/libs/JSystem/include/JSystem/J2DGraph/J2DOrthoGraph.h similarity index 100% rename from include/JSystem/J2DGraph/J2DOrthoGraph.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DOrthoGraph.h diff --git a/include/JSystem/J2DGraph/J2DPane.h b/libs/JSystem/include/JSystem/J2DGraph/J2DPane.h similarity index 99% rename from include/JSystem/J2DGraph/J2DPane.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DPane.h index 8ef7bd802f0..921e6630352 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/libs/JSystem/include/JSystem/J2DGraph/J2DPane.h @@ -3,8 +3,8 @@ #include "JSystem/JGeometry.h" #include "JSystem/JSupport/JSUList.h" -#include -#include +#include +#include class J2DAnmBase; class J2DAnmColor; diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/libs/JSystem/include/JSystem/J2DGraph/J2DPicture.h similarity index 100% rename from include/JSystem/J2DGraph/J2DPicture.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DPicture.h diff --git a/include/JSystem/J2DGraph/J2DPictureEx.h b/libs/JSystem/include/JSystem/J2DGraph/J2DPictureEx.h similarity index 100% rename from include/JSystem/J2DGraph/J2DPictureEx.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DPictureEx.h diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/libs/JSystem/include/JSystem/J2DGraph/J2DPrint.h similarity index 100% rename from include/JSystem/J2DGraph/J2DPrint.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DPrint.h diff --git a/include/JSystem/J2DGraph/J2DScreen.h b/libs/JSystem/include/JSystem/J2DGraph/J2DScreen.h similarity index 100% rename from include/JSystem/J2DGraph/J2DScreen.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DScreen.h diff --git a/include/JSystem/J2DGraph/J2DTevs.h b/libs/JSystem/include/JSystem/J2DGraph/J2DTevs.h similarity index 99% rename from include/JSystem/J2DGraph/J2DTevs.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DTevs.h index f7ce3f4ef9c..ff9605ae891 100644 --- a/include/JSystem/J2DGraph/J2DTevs.h +++ b/libs/JSystem/include/JSystem/J2DGraph/J2DTevs.h @@ -1,8 +1,8 @@ #ifndef J2DTEVS_H #define J2DTEVS_H -#include -#include +#include +#include #include "global.h" /** diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/libs/JSystem/include/JSystem/J2DGraph/J2DTextBox.h similarity index 100% rename from include/JSystem/J2DGraph/J2DTextBox.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DTextBox.h diff --git a/include/JSystem/J2DGraph/J2DTextBoxEx.h b/libs/JSystem/include/JSystem/J2DGraph/J2DTextBoxEx.h similarity index 100% rename from include/JSystem/J2DGraph/J2DTextBoxEx.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DTextBoxEx.h diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/libs/JSystem/include/JSystem/J2DGraph/J2DWindow.h similarity index 100% rename from include/JSystem/J2DGraph/J2DWindow.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DWindow.h diff --git a/include/JSystem/J2DGraph/J2DWindowEx.h b/libs/JSystem/include/JSystem/J2DGraph/J2DWindowEx.h similarity index 100% rename from include/JSystem/J2DGraph/J2DWindowEx.h rename to libs/JSystem/include/JSystem/J2DGraph/J2DWindowEx.h diff --git a/include/JSystem/J3DAssert.h b/libs/JSystem/include/JSystem/J3DAssert.h similarity index 100% rename from include/JSystem/J3DAssert.h rename to libs/JSystem/include/JSystem/J3DAssert.h diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.h similarity index 99% rename from include/JSystem/J3DGraphAnimator/J3DAnimation.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.h index b75b092c287..8df7f6f591c 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -3,7 +3,7 @@ #include "JSystem/J3DAssert.h" #include "JSystem/JUtility/JUTNameTab.h" -#include +#include #include "global.h" struct J3DTransformInfo; diff --git a/include/JSystem/J3DGraphAnimator/J3DCluster.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DCluster.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DCluster.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DCluster.h diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJoint.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DJoint.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJoint.h diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJointTree.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DJointTree.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJointTree.h diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModel.h similarity index 99% rename from include/JSystem/J3DGraphAnimator/J3DModel.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModel.h index 4de7175e85c..5ec2aa5f2ed 100644 --- a/include/JSystem/J3DGraphAnimator/J3DModel.h +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModel.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h" #include "JSystem/J3DGraphBase/J3DPacket.h" -#include +#include enum J3DMdlFlag { J3DMdlFlag_None = 0x0, diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModelData.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DModelData.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModelData.h diff --git a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h diff --git a/include/JSystem/J3DGraphAnimator/J3DShapeTable.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DShapeTable.h similarity index 100% rename from include/JSystem/J3DGraphAnimator/J3DShapeTable.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DShapeTable.h diff --git a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h similarity index 99% rename from include/JSystem/J3DGraphAnimator/J3DSkinDeform.h rename to libs/JSystem/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h index 74cc8f9fa02..ca33a4049db 100644 --- a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphAnimator/J3DCluster.h" #include "JSystem/J3DGraphAnimator/J3DMtxBuffer.h" -#include +#include class J3DModel; class J3DAnmCluster; diff --git a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DDrawBuffer.h similarity index 100% rename from include/JSystem/J3DGraphBase/J3DDrawBuffer.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DDrawBuffer.h diff --git a/include/JSystem/J3DGraphBase/J3DEnum.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DEnum.h similarity index 100% rename from include/JSystem/J3DGraphBase/J3DEnum.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DEnum.h diff --git a/include/JSystem/J3DGraphBase/J3DFifo.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DFifo.h similarity index 97% rename from include/JSystem/J3DGraphBase/J3DFifo.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DFifo.h index c93943864c6..dc2d69cdb28 100644 --- a/include/JSystem/J3DGraphBase/J3DFifo.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DFifo.h @@ -1,8 +1,8 @@ #ifndef J3DFIFO_H #define J3DFIFO_H -#include -#include +#include +#include inline void J3DFifoLoadBPCmd(u32 regval) { GXCmd1u8(GX_LOAD_BP_REG); diff --git a/include/JSystem/J3DGraphBase/J3DGD.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DGD.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DGD.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DGD.h index b01dc7187fb..bac0b991e5f 100644 --- a/include/JSystem/J3DGraphBase/J3DGD.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DGD.h @@ -1,8 +1,8 @@ #ifndef J3DGD_H #define J3DGD_H -#include -#include +#include +#include inline void J3DGDWrite_u8(u8 data) { __GDWrite(data); diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DMatBlock.h similarity index 100% rename from include/JSystem/J3DGraphBase/J3DMatBlock.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DMatBlock.h diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DMaterial.h similarity index 100% rename from include/JSystem/J3DGraphBase/J3DMaterial.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DMaterial.h diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DPacket.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DPacket.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DPacket.h index 3e94e1830ca..79e19651e44 100644 --- a/include/JSystem/J3DGraphBase/J3DPacket.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DPacket.h @@ -4,8 +4,8 @@ #include "JSystem/J3DAssert.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/J3DGraphBase/J3DEnum.h" -#include -#include +#include +#include #include class J3DMatPacket; diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DShape.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.h index 9380c39328b..7663827c5a1 100644 --- a/include/JSystem/J3DGraphBase/J3DShape.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.h @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphBase/J3DShapeDraw.h" #include "JSystem/J3DAssert.h" #include "JSystem/J3DGraphBase/J3DFifo.h" -#include +#include class J3DShapeMtx; diff --git a/include/JSystem/J3DGraphBase/J3DShapeDraw.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeDraw.h similarity index 95% rename from include/JSystem/J3DGraphBase/J3DShapeDraw.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeDraw.h index ad3f7ec4cbc..e6e8d61786c 100644 --- a/include/JSystem/J3DGraphBase/J3DShapeDraw.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeDraw.h @@ -1,7 +1,7 @@ #ifndef J3DSHAPEDRAW_H #define J3DSHAPEDRAW_H -#include +#include /** * @ingroup jsystem-j3d diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeMtx.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DShapeMtx.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeMtx.h index d840b66c7a7..c674c9a8d7e 100644 --- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShapeMtx.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphBase/J3DShape.h" #include "JSystem/J3DAssert.h" -#include +#include class J3DTexMtx; class J3DTexGenBlock; diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.h similarity index 98% rename from include/JSystem/J3DGraphBase/J3DStruct.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.h index cd41270401b..2726f622556 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.h @@ -1,9 +1,9 @@ #ifndef J3DSTRUCT_H #define J3DSTRUCT_H -#include -#include -#include +#include +#include +#include #include "global.h" /** diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DSys.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.h index 2f6c692e02d..f4a874352a5 100644 --- a/include/JSystem/J3DGraphBase/J3DSys.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.h @@ -1,8 +1,8 @@ #ifndef J3DSYS_H #define J3DSYS_H -#include -#include +#include +#include #include "JSystem/J3DAssert.h" enum J3DSysDrawBuf { diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DTevs.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DTevs.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DTevs.h index 3d702452205..6b4f5eaf73b 100644 --- a/include/JSystem/J3DGraphBase/J3DTevs.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DTevs.h @@ -1,8 +1,8 @@ #ifndef J3DTEVS_H #define J3DTEVS_H -#include -#include +#include +#include #include "JSystem/J3DGraphBase/J3DGD.h" #include "JSystem/J3DGraphBase/J3DStruct.h" diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DTexture.h similarity index 100% rename from include/JSystem/J3DGraphBase/J3DTexture.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DTexture.h diff --git a/include/JSystem/J3DGraphBase/J3DTransform.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DTransform.h similarity index 99% rename from include/JSystem/J3DGraphBase/J3DTransform.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DTransform.h index 5dccb2bc9b2..f03870a64d7 100644 --- a/include/JSystem/J3DGraphBase/J3DTransform.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DTransform.h @@ -1,7 +1,7 @@ #ifndef J3DTRANSFORM_H #define J3DTRANSFORM_H -#include +#include struct J3DTextureSRTInfo; diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/libs/JSystem/include/JSystem/J3DGraphBase/J3DVertex.h similarity index 98% rename from include/JSystem/J3DGraphBase/J3DVertex.h rename to libs/JSystem/include/JSystem/J3DGraphBase/J3DVertex.h index 2486fdc41c6..bd8a21c4837 100644 --- a/include/JSystem/J3DGraphBase/J3DVertex.h +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DVertex.h @@ -1,8 +1,8 @@ #ifndef J3DVERTEX_H #define J3DVERTEX_H -#include -#include +#include +#include typedef struct _GXColor GXColor; class J3DModel; diff --git a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DAnmLoader.h similarity index 100% rename from include/JSystem/J3DGraphLoader/J3DAnmLoader.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DAnmLoader.h diff --git a/include/JSystem/J3DGraphLoader/J3DClusterLoader.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DClusterLoader.h similarity index 100% rename from include/JSystem/J3DGraphLoader/J3DClusterLoader.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DClusterLoader.h diff --git a/include/JSystem/J3DGraphLoader/J3DJointFactory.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DJointFactory.h similarity index 100% rename from include/JSystem/J3DGraphLoader/J3DJointFactory.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DJointFactory.h diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h similarity index 99% rename from include/JSystem/J3DGraphLoader/J3DMaterialFactory.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h index 6c5f371b1d9..cd57862866a 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h +++ b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "JSystem/J3DGraphLoader/J3DModelLoader.h" -#include +#include class J3DMaterial; diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h similarity index 99% rename from include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h index e59d1589597..381c27a1e73 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h +++ b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "JSystem/J3DGraphLoader/J3DModelLoader.h" -#include +#include class J3DMaterial; struct J3DTexCoord2Info; diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoader.h similarity index 99% rename from include/JSystem/J3DGraphLoader/J3DModelLoader.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoader.h index e2569cee19c..3dfcfa0e9e6 100644 --- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h +++ b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoader.h @@ -2,7 +2,7 @@ #define J3DMODELLOADER_H #include "JSystem/J3DGraphBase/J3DSys.h" -#include +#include class J3DModelData; class J3DMaterialTable; diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h similarity index 79% rename from include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h index 2fec016614f..f9a2347fdc7 100644 --- a/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h +++ b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h @@ -1,6 +1,6 @@ #ifndef J3DMODELLOADERCALCSIZE_H #define J3DMODELLOADERCALCSIZE_H -#include +#include #endif /* J3DMODELLOADERCALCSIZE_H */ diff --git a/include/JSystem/J3DGraphLoader/J3DModelSaver.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelSaver.h similarity index 100% rename from include/JSystem/J3DGraphLoader/J3DModelSaver.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelSaver.h diff --git a/include/JSystem/J3DGraphLoader/J3DShapeFactory.h b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DShapeFactory.h similarity index 98% rename from include/JSystem/J3DGraphLoader/J3DShapeFactory.h rename to libs/JSystem/include/JSystem/J3DGraphLoader/J3DShapeFactory.h index 702de3bdf44..3275fc2f105 100644 --- a/include/JSystem/J3DGraphLoader/J3DShapeFactory.h +++ b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DShapeFactory.h @@ -2,7 +2,7 @@ #define J3DSHAPEFACTORY_H #include "JSystem/J3DGraphLoader/J3DModelLoader.h" -#include +#include class J3DShape; class J3DShapeMtx; diff --git a/include/JSystem/J3DU/J3DUClipper.h b/libs/JSystem/include/JSystem/J3DU/J3DUClipper.h similarity index 97% rename from include/JSystem/J3DU/J3DUClipper.h rename to libs/JSystem/include/JSystem/J3DU/J3DUClipper.h index c8417b2a697..01127d3239c 100644 --- a/include/JSystem/J3DU/J3DUClipper.h +++ b/libs/JSystem/include/JSystem/J3DU/J3DUClipper.h @@ -1,7 +1,7 @@ #ifndef J3DUCLIPPER_H #define J3DUCLIPPER_H -#include +#include /** * @ingroup jsystem-j3d diff --git a/include/JSystem/J3DU/J3DUD.h b/libs/JSystem/include/JSystem/J3DU/J3DUD.h similarity index 86% rename from include/JSystem/J3DU/J3DUD.h rename to libs/JSystem/include/JSystem/J3DU/J3DUD.h index ec9357c96b7..50ff6560397 100644 --- a/include/JSystem/J3DU/J3DUD.h +++ b/libs/JSystem/include/JSystem/J3DU/J3DUD.h @@ -1,7 +1,7 @@ #ifndef J3DUD_H #define J3DUD_H -#include +#include namespace J3DUD { inline f32 JMAAbs(f32 x) { diff --git a/include/JSystem/J3DU/J3DUDL.h b/libs/JSystem/include/JSystem/J3DU/J3DUDL.h similarity index 100% rename from include/JSystem/J3DU/J3DUDL.h rename to libs/JSystem/include/JSystem/J3DU/J3DUDL.h diff --git a/include/JSystem/J3DU/J3DUFur.h b/libs/JSystem/include/JSystem/J3DU/J3DUFur.h similarity index 100% rename from include/JSystem/J3DU/J3DUFur.h rename to libs/JSystem/include/JSystem/J3DU/J3DUFur.h diff --git a/include/JSystem/J3DU/J3DUMotion.h b/libs/JSystem/include/JSystem/J3DU/J3DUMotion.h similarity index 100% rename from include/JSystem/J3DU/J3DUMotion.h rename to libs/JSystem/include/JSystem/J3DU/J3DUMotion.h diff --git a/include/JSystem/J3DU/J3DUShadow.h b/libs/JSystem/include/JSystem/J3DU/J3DUShadow.h similarity index 100% rename from include/JSystem/J3DU/J3DUShadow.h rename to libs/JSystem/include/JSystem/J3DU/J3DUShadow.h diff --git a/include/JSystem/JAHNodeLib/JAHSoundPlayerNode.h b/libs/JSystem/include/JSystem/JAHNodeLib/JAHSoundPlayerNode.h similarity index 100% rename from include/JSystem/JAHNodeLib/JAHSoundPlayerNode.h rename to libs/JSystem/include/JSystem/JAHNodeLib/JAHSoundPlayerNode.h diff --git a/include/JSystem/JAHostIO/JAHFrameNode.h b/libs/JSystem/include/JSystem/JAHostIO/JAHFrameNode.h similarity index 96% rename from include/JSystem/JAHostIO/JAHFrameNode.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHFrameNode.h index ed9830e8b31..1b4ad740431 100644 --- a/include/JSystem/JAHostIO/JAHFrameNode.h +++ b/libs/JSystem/include/JSystem/JAHostIO/JAHFrameNode.h @@ -1,7 +1,7 @@ #ifndef JAHFRAMENODE_H #define JAHFRAMENODE_H -#include +#include #include "JSystem/JAHostIO/JAHioNode.h" class JAHVirtualNode; diff --git a/include/JSystem/JAHostIO/JAHPubDefine.h b/libs/JSystem/include/JSystem/JAHostIO/JAHPubDefine.h similarity index 100% rename from include/JSystem/JAHostIO/JAHPubDefine.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHPubDefine.h diff --git a/include/JSystem/JAHostIO/JAHUTableEdit.h b/libs/JSystem/include/JSystem/JAHostIO/JAHUTableEdit.h similarity index 100% rename from include/JSystem/JAHostIO/JAHUTableEdit.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHUTableEdit.h diff --git a/include/JSystem/JAHostIO/JAHVirtualNode.h b/libs/JSystem/include/JSystem/JAHostIO/JAHVirtualNode.h similarity index 100% rename from include/JSystem/JAHostIO/JAHVirtualNode.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHVirtualNode.h diff --git a/include/JSystem/JAHostIO/JAHioMessage.h b/libs/JSystem/include/JSystem/JAHostIO/JAHioMessage.h similarity index 97% rename from include/JSystem/JAHostIO/JAHioMessage.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHioMessage.h index 766456bc104..558882bfa3f 100644 --- a/include/JSystem/JAHostIO/JAHioMessage.h +++ b/libs/JSystem/include/JSystem/JAHostIO/JAHioMessage.h @@ -1,7 +1,7 @@ #ifndef JAHIOMESSAGE_H #define JAHIOMESSAGE_H -#include +#include class JAHioNode; class JORMContext; diff --git a/include/JSystem/JAHostIO/JAHioMgr.h b/libs/JSystem/include/JSystem/JAHostIO/JAHioMgr.h similarity index 100% rename from include/JSystem/JAHostIO/JAHioMgr.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHioMgr.h diff --git a/include/JSystem/JAHostIO/JAHioNode.h b/libs/JSystem/include/JSystem/JAHostIO/JAHioNode.h similarity index 100% rename from include/JSystem/JAHostIO/JAHioNode.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHioNode.h diff --git a/include/JSystem/JAHostIO/JAHioUtil.h b/libs/JSystem/include/JSystem/JAHostIO/JAHioUtil.h similarity index 100% rename from include/JSystem/JAHostIO/JAHioUtil.h rename to libs/JSystem/include/JSystem/JAHostIO/JAHioUtil.h diff --git a/include/JSystem/JAWExtSystem/JAWExtSystem.h b/libs/JSystem/include/JSystem/JAWExtSystem/JAWExtSystem.h similarity index 100% rename from include/JSystem/JAWExtSystem/JAWExtSystem.h rename to libs/JSystem/include/JSystem/JAWExtSystem/JAWExtSystem.h diff --git a/include/JSystem/JAWExtSystem/JAWGraphContext.h b/libs/JSystem/include/JSystem/JAWExtSystem/JAWGraphContext.h similarity index 100% rename from include/JSystem/JAWExtSystem/JAWGraphContext.h rename to libs/JSystem/include/JSystem/JAWExtSystem/JAWGraphContext.h diff --git a/include/JSystem/JAWExtSystem/JAWSystem.h b/libs/JSystem/include/JSystem/JAWExtSystem/JAWSystem.h similarity index 100% rename from include/JSystem/JAWExtSystem/JAWSystem.h rename to libs/JSystem/include/JSystem/JAWExtSystem/JAWSystem.h diff --git a/include/JSystem/JAWExtSystem/JAWWindow.h b/libs/JSystem/include/JSystem/JAWExtSystem/JAWWindow.h similarity index 100% rename from include/JSystem/JAWExtSystem/JAWWindow.h rename to libs/JSystem/include/JSystem/JAWExtSystem/JAWWindow.h diff --git a/include/JSystem/JAWExtSystem/JAWWindow3D.h b/libs/JSystem/include/JSystem/JAWExtSystem/JAWWindow3D.h similarity index 100% rename from include/JSystem/JAWExtSystem/JAWWindow3D.h rename to libs/JSystem/include/JSystem/JAWExtSystem/JAWWindow3D.h diff --git a/include/JSystem/JAWWinLib/JAWBankView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWBankView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWBankView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWBankView.h diff --git a/include/JSystem/JAWWinLib/JAWChView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWChView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWChView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWChView.h diff --git a/include/JSystem/JAWWinLib/JAWEntrySeView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWEntrySeView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWEntrySeView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWEntrySeView.h diff --git a/include/JSystem/JAWWinLib/JAWHioBankEdit.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWHioBankEdit.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWHioBankEdit.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWHioBankEdit.h diff --git a/include/JSystem/JAWWinLib/JAWHioReceiver.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWHioReceiver.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWHioReceiver.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWHioReceiver.h diff --git a/include/JSystem/JAWWinLib/JAWPlaySeView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWPlaySeView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWPlaySeView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWPlaySeView.h diff --git a/include/JSystem/JAWWinLib/JAWPlayerChView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWPlayerChView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWPlayerChView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWPlayerChView.h diff --git a/include/JSystem/JAWWinLib/JAWReportView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWReportView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWReportView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWReportView.h diff --git a/include/JSystem/JAWWinLib/JAWSysMemView.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWSysMemView.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWSysMemView.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWSysMemView.h diff --git a/include/JSystem/JAWWinLib/JAWVolume.h b/libs/JSystem/include/JSystem/JAWWinLib/JAWVolume.h similarity index 100% rename from include/JSystem/JAWWinLib/JAWVolume.h rename to libs/JSystem/include/JSystem/JAWWinLib/JAWVolume.h diff --git a/include/JSystem/JAudio2/JAIAudible.h b/libs/JSystem/include/JSystem/JAudio2/JAIAudible.h similarity index 100% rename from include/JSystem/JAudio2/JAIAudible.h rename to libs/JSystem/include/JSystem/JAudio2/JAIAudible.h diff --git a/include/JSystem/JAudio2/JAIAudience.h b/libs/JSystem/include/JSystem/JAudio2/JAIAudience.h similarity index 100% rename from include/JSystem/JAudio2/JAIAudience.h rename to libs/JSystem/include/JSystem/JAudio2/JAIAudience.h diff --git a/include/JSystem/JAudio2/JAISe.h b/libs/JSystem/include/JSystem/JAudio2/JAISe.h similarity index 100% rename from include/JSystem/JAudio2/JAISe.h rename to libs/JSystem/include/JSystem/JAudio2/JAISe.h diff --git a/include/JSystem/JAudio2/JAISeMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAISeMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAISeMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAISeMgr.h diff --git a/include/JSystem/JAudio2/JAISeq.h b/libs/JSystem/include/JSystem/JAudio2/JAISeq.h similarity index 100% rename from include/JSystem/JAudio2/JAISeq.h rename to libs/JSystem/include/JSystem/JAudio2/JAISeq.h diff --git a/include/JSystem/JAudio2/JAISeqDataMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAISeqDataMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAISeqDataMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAISeqDataMgr.h diff --git a/include/JSystem/JAudio2/JAISeqMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAISeqMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAISeqMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAISeqMgr.h diff --git a/include/JSystem/JAudio2/JAISound.h b/libs/JSystem/include/JSystem/JAudio2/JAISound.h similarity index 100% rename from include/JSystem/JAudio2/JAISound.h rename to libs/JSystem/include/JSystem/JAudio2/JAISound.h diff --git a/include/JSystem/JAudio2/JAISoundChild.h b/libs/JSystem/include/JSystem/JAudio2/JAISoundChild.h similarity index 100% rename from include/JSystem/JAudio2/JAISoundChild.h rename to libs/JSystem/include/JSystem/JAudio2/JAISoundChild.h diff --git a/include/JSystem/JAudio2/JAISoundHandles.h b/libs/JSystem/include/JSystem/JAudio2/JAISoundHandles.h similarity index 100% rename from include/JSystem/JAudio2/JAISoundHandles.h rename to libs/JSystem/include/JSystem/JAudio2/JAISoundHandles.h diff --git a/include/JSystem/JAudio2/JAISoundInfo.h b/libs/JSystem/include/JSystem/JAudio2/JAISoundInfo.h similarity index 100% rename from include/JSystem/JAudio2/JAISoundInfo.h rename to libs/JSystem/include/JSystem/JAudio2/JAISoundInfo.h diff --git a/include/JSystem/JAudio2/JAISoundParams.h b/libs/JSystem/include/JSystem/JAudio2/JAISoundParams.h similarity index 100% rename from include/JSystem/JAudio2/JAISoundParams.h rename to libs/JSystem/include/JSystem/JAudio2/JAISoundParams.h diff --git a/include/JSystem/JAudio2/JAISoundStarter.h b/libs/JSystem/include/JSystem/JAudio2/JAISoundStarter.h similarity index 100% rename from include/JSystem/JAudio2/JAISoundStarter.h rename to libs/JSystem/include/JSystem/JAudio2/JAISoundStarter.h diff --git a/include/JSystem/JAudio2/JAIStream.h b/libs/JSystem/include/JSystem/JAudio2/JAIStream.h similarity index 100% rename from include/JSystem/JAudio2/JAIStream.h rename to libs/JSystem/include/JSystem/JAudio2/JAIStream.h diff --git a/include/JSystem/JAudio2/JAIStreamDataMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAIStreamDataMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAIStreamDataMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAIStreamDataMgr.h diff --git a/include/JSystem/JAudio2/JAIStreamMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAIStreamMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAIStreamMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAIStreamMgr.h diff --git a/include/JSystem/JAudio2/JASAiCtrl.h b/libs/JSystem/include/JSystem/JAudio2/JASAiCtrl.h similarity index 98% rename from include/JSystem/JAudio2/JASAiCtrl.h rename to libs/JSystem/include/JSystem/JAudio2/JASAiCtrl.h index cebae770f81..5bba1b94eef 100644 --- a/include/JSystem/JAudio2/JASAiCtrl.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASAiCtrl.h @@ -1,7 +1,7 @@ #ifndef JASAICTRL_H #define JASAICTRL_H -#include +#include enum JASOutputRate { OUTPUT_RATE_0, diff --git a/include/JSystem/JAudio2/JASAramStream.h b/libs/JSystem/include/JSystem/JAudio2/JASAramStream.h similarity index 99% rename from include/JSystem/JAudio2/JASAramStream.h rename to libs/JSystem/include/JSystem/JAudio2/JASAramStream.h index 385b47f627f..17d4c6f5217 100644 --- a/include/JSystem/JAudio2/JASAramStream.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASAramStream.h @@ -3,7 +3,7 @@ #include "JSystem/JAudio2/JASTaskThread.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include class JASChannel; diff --git a/include/JSystem/JAudio2/JASAudioReseter.h b/libs/JSystem/include/JSystem/JAudio2/JASAudioReseter.h similarity index 94% rename from include/JSystem/JAudio2/JASAudioReseter.h rename to libs/JSystem/include/JSystem/JAudio2/JASAudioReseter.h index 2c699b0eb07..9b5065df899 100644 --- a/include/JSystem/JAudio2/JASAudioReseter.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASAudioReseter.h @@ -1,7 +1,7 @@ #ifndef JASAUDIORESETER_H #define JASAUDIORESETER_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASAudioThread.h b/libs/JSystem/include/JSystem/JAudio2/JASAudioThread.h similarity index 100% rename from include/JSystem/JAudio2/JASAudioThread.h rename to libs/JSystem/include/JSystem/JAudio2/JASAudioThread.h diff --git a/include/JSystem/JAudio2/JASBNKParser.h b/libs/JSystem/include/JSystem/JAudio2/JASBNKParser.h similarity index 100% rename from include/JSystem/JAudio2/JASBNKParser.h rename to libs/JSystem/include/JSystem/JAudio2/JASBNKParser.h diff --git a/include/JSystem/JAudio2/JASBank.h b/libs/JSystem/include/JSystem/JAudio2/JASBank.h similarity index 97% rename from include/JSystem/JAudio2/JASBank.h rename to libs/JSystem/include/JSystem/JAudio2/JASBank.h index 1a99601f3db..516eaa161bd 100644 --- a/include/JSystem/JAudio2/JASBank.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASBank.h @@ -1,7 +1,7 @@ #ifndef JASBANK_H #define JASBANK_H -#include +#include class JASChannel; struct JASInstParam; diff --git a/include/JSystem/JAudio2/JASBankList.h b/libs/JSystem/include/JSystem/JAudio2/JASBankList.h similarity index 89% rename from include/JSystem/JAudio2/JASBankList.h rename to libs/JSystem/include/JSystem/JAudio2/JASBankList.h index 6d3fd440889..39ecb019352 100644 --- a/include/JSystem/JAudio2/JASBankList.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASBankList.h @@ -1,7 +1,7 @@ #ifndef JASBANKLIST_H #define JASBANKLIST_H -#include +#include class JASBank; diff --git a/include/JSystem/JAudio2/JASBankTable.h b/libs/JSystem/include/JSystem/JAudio2/JASBankTable.h similarity index 100% rename from include/JSystem/JAudio2/JASBankTable.h rename to libs/JSystem/include/JSystem/JAudio2/JASBankTable.h diff --git a/include/JSystem/JAudio2/JASBasicBank.h b/libs/JSystem/include/JSystem/JAudio2/JASBasicBank.h similarity index 100% rename from include/JSystem/JAudio2/JASBasicBank.h rename to libs/JSystem/include/JSystem/JAudio2/JASBasicBank.h diff --git a/include/JSystem/JAudio2/JASBasicInst.h b/libs/JSystem/include/JSystem/JAudio2/JASBasicInst.h similarity index 100% rename from include/JSystem/JAudio2/JASBasicInst.h rename to libs/JSystem/include/JSystem/JAudio2/JASBasicInst.h diff --git a/include/JSystem/JAudio2/JASBasicWaveBank.h b/libs/JSystem/include/JSystem/JAudio2/JASBasicWaveBank.h similarity index 100% rename from include/JSystem/JAudio2/JASBasicWaveBank.h rename to libs/JSystem/include/JSystem/JAudio2/JASBasicWaveBank.h diff --git a/include/JSystem/JAudio2/JASCalc.h b/libs/JSystem/include/JSystem/JAudio2/JASCalc.h similarity index 97% rename from include/JSystem/JAudio2/JASCalc.h rename to libs/JSystem/include/JSystem/JAudio2/JASCalc.h index 7e22ec1240c..bb8054675fc 100644 --- a/include/JSystem/JAudio2/JASCalc.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASCalc.h @@ -1,7 +1,7 @@ #ifndef JASCALC_H #define JASCALC_H -#include +#include #include /** diff --git a/include/JSystem/JAudio2/JASCallback.h b/libs/JSystem/include/JSystem/JAudio2/JASCallback.h similarity index 95% rename from include/JSystem/JAudio2/JASCallback.h rename to libs/JSystem/include/JSystem/JAudio2/JASCallback.h index f1dddc7492f..4850f8d3697 100644 --- a/include/JSystem/JAudio2/JASCallback.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASCallback.h @@ -1,7 +1,7 @@ #ifndef JASCALLBACK_H #define JASCALLBACK_H -#include +#include typedef s32 JASCallback(void*); diff --git a/include/JSystem/JAudio2/JASChannel.h b/libs/JSystem/include/JSystem/JAudio2/JASChannel.h similarity index 99% rename from include/JSystem/JAudio2/JASChannel.h rename to libs/JSystem/include/JSystem/JAudio2/JASChannel.h index 8c80268d461..e9e57785b20 100644 --- a/include/JSystem/JAudio2/JASChannel.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASChannel.h @@ -6,7 +6,7 @@ #include "JSystem/JAudio2/JASOscillator.h" #include "JSystem/JAudio2/JASSoundParams.h" #include "JSystem/JAudio2/JASWaveInfo.h" -#include +#include struct JASDSPChannel; diff --git a/include/JSystem/JAudio2/JASCmdStack.h b/libs/JSystem/include/JSystem/JAudio2/JASCmdStack.h similarity index 100% rename from include/JSystem/JAudio2/JASCmdStack.h rename to libs/JSystem/include/JSystem/JAudio2/JASCmdStack.h diff --git a/include/JSystem/JAudio2/JASCriticalSection.h b/libs/JSystem/include/JSystem/JAudio2/JASCriticalSection.h similarity index 93% rename from include/JSystem/JAudio2/JASCriticalSection.h rename to libs/JSystem/include/JSystem/JAudio2/JASCriticalSection.h index 44f5f21f4a0..53faae80fe6 100644 --- a/include/JSystem/JAudio2/JASCriticalSection.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASCriticalSection.h @@ -1,7 +1,7 @@ #ifndef JASCRITICALSECTION_H #define JASCRITICALSECTION_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASDSPChannel.h b/libs/JSystem/include/JSystem/JAudio2/JASDSPChannel.h similarity index 100% rename from include/JSystem/JAudio2/JASDSPChannel.h rename to libs/JSystem/include/JSystem/JAudio2/JASDSPChannel.h diff --git a/include/JSystem/JAudio2/JASDSPInterface.h b/libs/JSystem/include/JSystem/JAudio2/JASDSPInterface.h similarity index 99% rename from include/JSystem/JAudio2/JASDSPInterface.h rename to libs/JSystem/include/JSystem/JAudio2/JASDSPInterface.h index 0642fdc018a..a653431bee4 100644 --- a/include/JSystem/JAudio2/JASDSPInterface.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASDSPInterface.h @@ -1,7 +1,7 @@ #ifndef JASDSPINTERFACE_H #define JASDSPINTERFACE_H -#include +#include struct JASWaveInfo; diff --git a/include/JSystem/JAudio2/JASDriverIF.h b/libs/JSystem/include/JSystem/JAudio2/JASDriverIF.h similarity index 100% rename from include/JSystem/JAudio2/JASDriverIF.h rename to libs/JSystem/include/JSystem/JAudio2/JASDriverIF.h diff --git a/include/JSystem/JAudio2/JASDrumSet.h b/libs/JSystem/include/JSystem/JAudio2/JASDrumSet.h similarity index 100% rename from include/JSystem/JAudio2/JASDrumSet.h rename to libs/JSystem/include/JSystem/JAudio2/JASDrumSet.h diff --git a/include/JSystem/JAudio2/JASDvdThread.h b/libs/JSystem/include/JSystem/JAudio2/JASDvdThread.h similarity index 92% rename from include/JSystem/JAudio2/JASDvdThread.h rename to libs/JSystem/include/JSystem/JAudio2/JASDvdThread.h index 7fbe4e188f9..553dffb7ca8 100644 --- a/include/JSystem/JAudio2/JASDvdThread.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASDvdThread.h @@ -1,7 +1,7 @@ #ifndef JASDVDTHREAD_H #define JASDVDTHREAD_H -#include +#include class JASTaskThread; diff --git a/include/JSystem/JAudio2/JASGadget.h b/libs/JSystem/include/JSystem/JAudio2/JASGadget.h similarity index 100% rename from include/JSystem/JAudio2/JASGadget.h rename to libs/JSystem/include/JSystem/JAudio2/JASGadget.h diff --git a/include/JSystem/JAudio2/JASHeapCtrl.h b/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.h similarity index 99% rename from include/JSystem/JAudio2/JASHeapCtrl.h rename to libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.h index 90d2fe728e3..e2cc9d5f627 100644 --- a/include/JSystem/JAudio2/JASHeapCtrl.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.h @@ -4,8 +4,8 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSUList.h" #include "JSystem/JUtility/JUTAssert.h" -#include -#include +#include +#include struct JASDisposer; class JKRHeap; diff --git a/include/JSystem/JAudio2/JASLfo.h b/libs/JSystem/include/JSystem/JAudio2/JASLfo.h similarity index 96% rename from include/JSystem/JAudio2/JASLfo.h rename to libs/JSystem/include/JSystem/JAudio2/JASLfo.h index ac76c9924af..adc27a83251 100644 --- a/include/JSystem/JAudio2/JASLfo.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASLfo.h @@ -1,7 +1,7 @@ #ifndef JASLFO_H #define JASLFO_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASMutex.h b/libs/JSystem/include/JSystem/JAudio2/JASMutex.h similarity index 92% rename from include/JSystem/JAudio2/JASMutex.h rename to libs/JSystem/include/JSystem/JAudio2/JASMutex.h index 3155f462c24..e6805d6029a 100644 --- a/include/JSystem/JAudio2/JASMutex.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASMutex.h @@ -1,7 +1,7 @@ #ifndef JASMUTEX_H #define JASMUTEX_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASOscillator.h b/libs/JSystem/include/JSystem/JAudio2/JASOscillator.h similarity index 98% rename from include/JSystem/JAudio2/JASOscillator.h rename to libs/JSystem/include/JSystem/JAudio2/JASOscillator.h index 8b47f37acbb..4dc7b171b60 100644 --- a/include/JSystem/JAudio2/JASOscillator.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASOscillator.h @@ -1,7 +1,7 @@ #ifndef JASOSCILLATOR_H #define JASOSCILLATOR_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASProbe.h b/libs/JSystem/include/JSystem/JAudio2/JASProbe.h similarity index 94% rename from include/JSystem/JAudio2/JASProbe.h rename to libs/JSystem/include/JSystem/JAudio2/JASProbe.h index a431f991f5b..03337adce7d 100644 --- a/include/JSystem/JAudio2/JASProbe.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASProbe.h @@ -1,7 +1,7 @@ #ifndef JASPROBE_H #define JASPROBE_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASRegisterParam.h b/libs/JSystem/include/JSystem/JAudio2/JASRegisterParam.h similarity index 93% rename from include/JSystem/JAudio2/JASRegisterParam.h rename to libs/JSystem/include/JSystem/JAudio2/JASRegisterParam.h index f02e3a18396..cd350d257b8 100644 --- a/include/JSystem/JAudio2/JASRegisterParam.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASRegisterParam.h @@ -1,7 +1,7 @@ #ifndef JASREGISTERPARAM_H #define JASREGISTERPARAM_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASReport.h b/libs/JSystem/include/JSystem/JAudio2/JASReport.h similarity index 100% rename from include/JSystem/JAudio2/JASReport.h rename to libs/JSystem/include/JSystem/JAudio2/JASReport.h diff --git a/include/JSystem/JAudio2/JASResArcLoader.h b/libs/JSystem/include/JSystem/JAudio2/JASResArcLoader.h similarity index 98% rename from include/JSystem/JAudio2/JASResArcLoader.h rename to libs/JSystem/include/JSystem/JAudio2/JASResArcLoader.h index bcaf1fb06ff..966b1199e72 100644 --- a/include/JSystem/JAudio2/JASResArcLoader.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASResArcLoader.h @@ -2,7 +2,7 @@ #define JASRESARCLOADER_H #include "JSystem/JKernel/JKRArchive.h" -#include +#include namespace JASResArcLoader { size_t getResSize(JKRArchive const*, u16); diff --git a/include/JSystem/JAudio2/JASSeqCtrl.h b/libs/JSystem/include/JSystem/JAudio2/JASSeqCtrl.h similarity index 100% rename from include/JSystem/JAudio2/JASSeqCtrl.h rename to libs/JSystem/include/JSystem/JAudio2/JASSeqCtrl.h diff --git a/include/JSystem/JAudio2/JASSeqParser.h b/libs/JSystem/include/JSystem/JAudio2/JASSeqParser.h similarity index 99% rename from include/JSystem/JAudio2/JASSeqParser.h rename to libs/JSystem/include/JSystem/JAudio2/JASSeqParser.h index e8f425de848..096cbadd98e 100644 --- a/include/JSystem/JAudio2/JASSeqParser.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASSeqParser.h @@ -1,7 +1,7 @@ #ifndef JASSEQPARSER_H #define JASSEQPARSER_H -#include +#include struct JASTrack; diff --git a/include/JSystem/JAudio2/JASSeqReader.h b/libs/JSystem/include/JSystem/JAudio2/JASSeqReader.h similarity index 98% rename from include/JSystem/JAudio2/JASSeqReader.h rename to libs/JSystem/include/JSystem/JAudio2/JASSeqReader.h index 2fed6253fe3..9dce7f56f70 100644 --- a/include/JSystem/JAudio2/JASSeqReader.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASSeqReader.h @@ -1,7 +1,7 @@ #ifndef JASSEQREADER_H #define JASSEQREADER_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASSimpleWaveBank.h b/libs/JSystem/include/JSystem/JAudio2/JASSimpleWaveBank.h similarity index 100% rename from include/JSystem/JAudio2/JASSimpleWaveBank.h rename to libs/JSystem/include/JSystem/JAudio2/JASSimpleWaveBank.h diff --git a/include/JSystem/JAudio2/JASSoundParams.h b/libs/JSystem/include/JSystem/JAudio2/JASSoundParams.h similarity index 98% rename from include/JSystem/JAudio2/JASSoundParams.h rename to libs/JSystem/include/JSystem/JAudio2/JASSoundParams.h index a7314da2f0a..122e5b684d6 100644 --- a/include/JSystem/JAudio2/JASSoundParams.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASSoundParams.h @@ -1,7 +1,7 @@ #ifndef JASSOUNDPARAMS_H #define JASSOUNDPARAMS_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASTaskThread.h b/libs/JSystem/include/JSystem/JAudio2/JASTaskThread.h similarity index 100% rename from include/JSystem/JAudio2/JASTaskThread.h rename to libs/JSystem/include/JSystem/JAudio2/JASTaskThread.h diff --git a/include/JSystem/JAudio2/JASTrack.h b/libs/JSystem/include/JSystem/JAudio2/JASTrack.h similarity index 100% rename from include/JSystem/JAudio2/JASTrack.h rename to libs/JSystem/include/JSystem/JAudio2/JASTrack.h diff --git a/include/JSystem/JAudio2/JASTrackPort.h b/libs/JSystem/include/JSystem/JAudio2/JASTrackPort.h similarity index 95% rename from include/JSystem/JAudio2/JASTrackPort.h rename to libs/JSystem/include/JSystem/JAudio2/JASTrackPort.h index 536f85eada3..393a701c27d 100644 --- a/include/JSystem/JAudio2/JASTrackPort.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASTrackPort.h @@ -1,7 +1,7 @@ #ifndef JASTRACKPORT_H #define JASTRACKPORT_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASVoiceBank.h b/libs/JSystem/include/JSystem/JAudio2/JASVoiceBank.h similarity index 100% rename from include/JSystem/JAudio2/JASVoiceBank.h rename to libs/JSystem/include/JSystem/JAudio2/JASVoiceBank.h diff --git a/include/JSystem/JAudio2/JASWSParser.h b/libs/JSystem/include/JSystem/JAudio2/JASWSParser.h similarity index 100% rename from include/JSystem/JAudio2/JASWSParser.h rename to libs/JSystem/include/JSystem/JAudio2/JASWSParser.h diff --git a/include/JSystem/JAudio2/JASWaveArcLoader.h b/libs/JSystem/include/JSystem/JAudio2/JASWaveArcLoader.h similarity index 98% rename from include/JSystem/JAudio2/JASWaveArcLoader.h rename to libs/JSystem/include/JSystem/JAudio2/JASWaveArcLoader.h index a3e930ebf17..593e69f1fdb 100644 --- a/include/JSystem/JAudio2/JASWaveArcLoader.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASWaveArcLoader.h @@ -2,7 +2,7 @@ #define JASWAVEARCLOADER_H #include "JSystem/JAudio2/JASHeapCtrl.h" -#include +#include class JKRHeap; class JKRSolidHeap; diff --git a/include/JSystem/JAudio2/JASWaveInfo.h b/libs/JSystem/include/JSystem/JAudio2/JASWaveInfo.h similarity index 97% rename from include/JSystem/JAudio2/JASWaveInfo.h rename to libs/JSystem/include/JSystem/JAudio2/JASWaveInfo.h index 1ed6996bae9..33571fef139 100644 --- a/include/JSystem/JAudio2/JASWaveInfo.h +++ b/libs/JSystem/include/JSystem/JAudio2/JASWaveInfo.h @@ -1,7 +1,7 @@ #ifndef JASWAVEINFO_H #define JASWAVEINFO_H -#include +#include class JASWaveArc; diff --git a/include/JSystem/JAudio2/JAUAudibleParam.h b/libs/JSystem/include/JSystem/JAudio2/JAUAudibleParam.h similarity index 96% rename from include/JSystem/JAudio2/JAUAudibleParam.h rename to libs/JSystem/include/JSystem/JAudio2/JAUAudibleParam.h index 0fd3058f82e..89b016cb0a6 100644 --- a/include/JSystem/JAudio2/JAUAudibleParam.h +++ b/libs/JSystem/include/JSystem/JAudio2/JAUAudibleParam.h @@ -1,7 +1,7 @@ #ifndef JAUAUDIBLEPARAM_H #define JAUAUDIBLEPARAM_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JAUAudience.h b/libs/JSystem/include/JSystem/JAudio2/JAUAudience.h similarity index 100% rename from include/JSystem/JAudio2/JAUAudience.h rename to libs/JSystem/include/JSystem/JAudio2/JAUAudience.h diff --git a/include/JSystem/JAudio2/JAUAudioArcInterpreter.h b/libs/JSystem/include/JSystem/JAudio2/JAUAudioArcInterpreter.h similarity index 97% rename from include/JSystem/JAudio2/JAUAudioArcInterpreter.h rename to libs/JSystem/include/JSystem/JAudio2/JAUAudioArcInterpreter.h index 7516848350e..0ac53ec21ee 100644 --- a/include/JSystem/JAudio2/JAUAudioArcInterpreter.h +++ b/libs/JSystem/include/JSystem/JAudio2/JAUAudioArcInterpreter.h @@ -1,7 +1,7 @@ #ifndef JAUAUDIOARCINTERPRETER_H #define JAUAUDIOARCINTERPRETER_H -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JAUAudioArcLoader.h b/libs/JSystem/include/JSystem/JAudio2/JAUAudioArcLoader.h similarity index 100% rename from include/JSystem/JAudio2/JAUAudioArcLoader.h rename to libs/JSystem/include/JSystem/JAudio2/JAUAudioArcLoader.h diff --git a/include/JSystem/JAudio2/JAUAudioMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAUAudioMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAUAudioMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAUAudioMgr.h diff --git a/include/JSystem/JAudio2/JAUBankTable.h b/libs/JSystem/include/JSystem/JAudio2/JAUBankTable.h similarity index 100% rename from include/JSystem/JAudio2/JAUBankTable.h rename to libs/JSystem/include/JSystem/JAudio2/JAUBankTable.h diff --git a/include/JSystem/JAudio2/JAUClusterSound.h b/libs/JSystem/include/JSystem/JAudio2/JAUClusterSound.h similarity index 100% rename from include/JSystem/JAudio2/JAUClusterSound.h rename to libs/JSystem/include/JSystem/JAudio2/JAUClusterSound.h diff --git a/include/JSystem/JAudio2/JAUInitializer.h b/libs/JSystem/include/JSystem/JAudio2/JAUInitializer.h similarity index 97% rename from include/JSystem/JAudio2/JAUInitializer.h rename to libs/JSystem/include/JSystem/JAudio2/JAUInitializer.h index 77f28218dcb..8b5090c580d 100644 --- a/include/JSystem/JAudio2/JAUInitializer.h +++ b/libs/JSystem/include/JSystem/JAudio2/JAUInitializer.h @@ -1,7 +1,7 @@ #ifndef JAUINITIALIZER_H #define JAUINITIALIZER_H -#include +#include class JKRSolidHeap; diff --git a/include/JSystem/JAudio2/JAUSectionHeap.h b/libs/JSystem/include/JSystem/JAudio2/JAUSectionHeap.h similarity index 100% rename from include/JSystem/JAudio2/JAUSectionHeap.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSectionHeap.h diff --git a/include/JSystem/JAudio2/JAUSeqCollection.h b/libs/JSystem/include/JSystem/JAudio2/JAUSeqCollection.h similarity index 100% rename from include/JSystem/JAudio2/JAUSeqCollection.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSeqCollection.h diff --git a/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAUSeqDataBlockMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h diff --git a/include/JSystem/JAudio2/JAUSoundAnimator.h b/libs/JSystem/include/JSystem/JAudio2/JAUSoundAnimator.h similarity index 100% rename from include/JSystem/JAudio2/JAUSoundAnimator.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSoundAnimator.h diff --git a/include/JSystem/JAudio2/JAUSoundInfo.h b/libs/JSystem/include/JSystem/JAudio2/JAUSoundInfo.h similarity index 100% rename from include/JSystem/JAudio2/JAUSoundInfo.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSoundInfo.h diff --git a/include/JSystem/JAudio2/JAUSoundObject.h b/libs/JSystem/include/JSystem/JAudio2/JAUSoundObject.h similarity index 100% rename from include/JSystem/JAudio2/JAUSoundObject.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSoundObject.h diff --git a/include/JSystem/JAudio2/JAUSoundTable.h b/libs/JSystem/include/JSystem/JAudio2/JAUSoundTable.h similarity index 100% rename from include/JSystem/JAudio2/JAUSoundTable.h rename to libs/JSystem/include/JSystem/JAudio2/JAUSoundTable.h diff --git a/include/JSystem/JAudio2/JAUStreamAramMgr.h b/libs/JSystem/include/JSystem/JAudio2/JAUStreamAramMgr.h similarity index 100% rename from include/JSystem/JAudio2/JAUStreamAramMgr.h rename to libs/JSystem/include/JSystem/JAudio2/JAUStreamAramMgr.h diff --git a/include/JSystem/JAudio2/JAUStreamFileTable.h b/libs/JSystem/include/JSystem/JAudio2/JAUStreamFileTable.h similarity index 100% rename from include/JSystem/JAudio2/JAUStreamFileTable.h rename to libs/JSystem/include/JSystem/JAudio2/JAUStreamFileTable.h diff --git a/include/JSystem/JAudio2/dspproc.h b/libs/JSystem/include/JSystem/JAudio2/dspproc.h similarity index 92% rename from include/JSystem/JAudio2/dspproc.h rename to libs/JSystem/include/JSystem/JAudio2/dspproc.h index 09266bbf815..868080031a6 100644 --- a/include/JSystem/JAudio2/dspproc.h +++ b/libs/JSystem/include/JSystem/JAudio2/dspproc.h @@ -1,7 +1,7 @@ #ifndef DSPPROC_H #define DSPPROC_H -#include +#include void DSPReleaseHalt2(u32 msg); void DsetupTable(u32 param_0, u32 param_1, u32 param_2, u32 param_3, u32 param_4); diff --git a/include/JSystem/JAudio2/dsptask.h b/libs/JSystem/include/JSystem/JAudio2/dsptask.h similarity index 87% rename from include/JSystem/JAudio2/dsptask.h rename to libs/JSystem/include/JSystem/JAudio2/dsptask.h index b331a6c8675..8042d1884bc 100644 --- a/include/JSystem/JAudio2/dsptask.h +++ b/libs/JSystem/include/JSystem/JAudio2/dsptask.h @@ -1,7 +1,7 @@ #ifndef DSPTASK_H #define DSPTASK_H -#include +#include void DspBoot(void (*)(void*)); void DspFinishWork(u16 param_0); diff --git a/include/JSystem/JAudio2/osdsp.h b/libs/JSystem/include/JSystem/JAudio2/osdsp.h similarity index 85% rename from include/JSystem/JAudio2/osdsp.h rename to libs/JSystem/include/JSystem/JAudio2/osdsp.h index 7c3c91d0a37..8a929c4652b 100644 --- a/include/JSystem/JAudio2/osdsp.h +++ b/libs/JSystem/include/JSystem/JAudio2/osdsp.h @@ -1,7 +1,7 @@ #ifndef OSDSP_H #define OSDSP_H -#include +#include extern "C" DSPTaskInfo* DSPAddTask(DSPTaskInfo*); void DSPAddPriorTask(STRUCT_DSP_TASK*); diff --git a/include/JSystem/JAudio2/osdsp_task.h b/libs/JSystem/include/JSystem/JAudio2/osdsp_task.h similarity index 86% rename from include/JSystem/JAudio2/osdsp_task.h rename to libs/JSystem/include/JSystem/JAudio2/osdsp_task.h index 6c662b50a33..4c74f290f1d 100644 --- a/include/JSystem/JAudio2/osdsp_task.h +++ b/libs/JSystem/include/JSystem/JAudio2/osdsp_task.h @@ -1,7 +1,7 @@ #ifndef OSDSP_TASK_H #define OSDSP_TASK_H -#include +#include extern DSPTaskInfo* DSP_prior_task; diff --git a/include/JSystem/JFramework/JFWDisplay.h b/libs/JSystem/include/JSystem/JFramework/JFWDisplay.h similarity index 99% rename from include/JSystem/JFramework/JFWDisplay.h rename to libs/JSystem/include/JSystem/JFramework/JFWDisplay.h index b451f584bf9..a61ad36637f 100644 --- a/include/JSystem/JFramework/JFWDisplay.h +++ b/libs/JSystem/include/JSystem/JFramework/JFWDisplay.h @@ -5,7 +5,7 @@ #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTFader.h" #include "JSystem/JUtility/JUTXfb.h" -#include +#include typedef struct _GXColor GXColor; typedef struct _GXRenderModeObj GXRenderModeObj; diff --git a/include/JSystem/JFramework/JFWSystem.h b/libs/JSystem/include/JSystem/JFramework/JFWSystem.h similarity index 98% rename from include/JSystem/JFramework/JFWSystem.h rename to libs/JSystem/include/JSystem/JFramework/JFWSystem.h index 0078e9aa1ac..579ca975c31 100644 --- a/include/JSystem/JFramework/JFWSystem.h +++ b/libs/JSystem/include/JSystem/JFramework/JFWSystem.h @@ -1,7 +1,7 @@ #ifndef JFWSYSTEM_H #define JFWSYSTEM_H -#include +#include #include "JSystem/JUtility/JUTAssert.h" typedef struct _GXRenderModeObj GXRenderModeObj; diff --git a/include/JSystem/JGadget/binary.h b/libs/JSystem/include/JSystem/JGadget/binary.h similarity index 100% rename from include/JSystem/JGadget/binary.h rename to libs/JSystem/include/JSystem/JGadget/binary.h diff --git a/include/JSystem/JGadget/define.h b/libs/JSystem/include/JSystem/JGadget/define.h similarity index 98% rename from include/JSystem/JGadget/define.h rename to libs/JSystem/include/JSystem/JGadget/define.h index a8c7323e8f5..a0ad4251748 100644 --- a/include/JSystem/JGadget/define.h +++ b/libs/JSystem/include/JSystem/JGadget/define.h @@ -1,7 +1,7 @@ #ifndef JGADGET_DEFINE_H #define JGADGET_DEFINE_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/JSystem/JGadget/linklist.h b/libs/JSystem/include/JSystem/JGadget/linklist.h similarity index 100% rename from include/JSystem/JGadget/linklist.h rename to libs/JSystem/include/JSystem/JGadget/linklist.h diff --git a/include/JSystem/JGadget/pointer.h b/libs/JSystem/include/JSystem/JGadget/pointer.h similarity index 100% rename from include/JSystem/JGadget/pointer.h rename to libs/JSystem/include/JSystem/JGadget/pointer.h diff --git a/include/JSystem/JGadget/search.h b/libs/JSystem/include/JSystem/JGadget/search.h similarity index 99% rename from include/JSystem/JGadget/search.h rename to libs/JSystem/include/JSystem/JGadget/search.h index 12507f3dc73..141df55f6c1 100644 --- a/include/JSystem/JGadget/search.h +++ b/libs/JSystem/include/JSystem/JGadget/search.h @@ -1,7 +1,7 @@ #ifndef JGADGET_SEARCH_H #define JGADGET_SEARCH_H -#include +#include #include #include #include diff --git a/include/JSystem/JGadget/std-list.h b/libs/JSystem/include/JSystem/JGadget/std-list.h similarity index 100% rename from include/JSystem/JGadget/std-list.h rename to libs/JSystem/include/JSystem/JGadget/std-list.h diff --git a/include/JSystem/JGadget/std-memory.h b/libs/JSystem/include/JSystem/JGadget/std-memory.h similarity index 100% rename from include/JSystem/JGadget/std-memory.h rename to libs/JSystem/include/JSystem/JGadget/std-memory.h diff --git a/include/JSystem/JGadget/std-stream.h b/libs/JSystem/include/JSystem/JGadget/std-stream.h similarity index 100% rename from include/JSystem/JGadget/std-stream.h rename to libs/JSystem/include/JSystem/JGadget/std-stream.h diff --git a/include/JSystem/JGadget/std-streambuf.h b/libs/JSystem/include/JSystem/JGadget/std-streambuf.h similarity index 98% rename from include/JSystem/JGadget/std-streambuf.h rename to libs/JSystem/include/JSystem/JGadget/std-streambuf.h index dae56d317c8..7f50621108c 100644 --- a/include/JSystem/JGadget/std-streambuf.h +++ b/libs/JSystem/include/JSystem/JGadget/std-streambuf.h @@ -1,7 +1,7 @@ #ifndef JGADGET_STD_STREAMBUF_H #define JGADGET_STD_STREAMBUF_H -#include +#include #include namespace JGadget { diff --git a/include/JSystem/JGadget/std-vector.h b/libs/JSystem/include/JSystem/JGadget/std-vector.h similarity index 100% rename from include/JSystem/JGadget/std-vector.h rename to libs/JSystem/include/JSystem/JGadget/std-vector.h diff --git a/include/JSystem/JGadget/vector.h b/libs/JSystem/include/JSystem/JGadget/vector.h similarity index 100% rename from include/JSystem/JGadget/vector.h rename to libs/JSystem/include/JSystem/JGadget/vector.h diff --git a/include/JSystem/JGeometry.h b/libs/JSystem/include/JSystem/JGeometry.h similarity index 99% rename from include/JSystem/JGeometry.h rename to libs/JSystem/include/JSystem/JGeometry.h index d0e7c8c03e2..97cb96c4d3c 100644 --- a/include/JSystem/JGeometry.h +++ b/libs/JSystem/include/JSystem/JGeometry.h @@ -1,7 +1,7 @@ #ifndef JGEOMETRY_H #define JGEOMETRY_H -#include +#include #include #include "JSystem/JMath/JMath.h" diff --git a/include/JSystem/JHostIO/JHIComm.h b/libs/JSystem/include/JSystem/JHostIO/JHIComm.h similarity index 100% rename from include/JSystem/JHostIO/JHIComm.h rename to libs/JSystem/include/JSystem/JHostIO/JHIComm.h diff --git a/include/JSystem/JHostIO/JHICommonMem.h b/libs/JSystem/include/JSystem/JHostIO/JHICommonMem.h similarity index 98% rename from include/JSystem/JHostIO/JHICommonMem.h rename to libs/JSystem/include/JSystem/JHostIO/JHICommonMem.h index 57c810c46f8..4d87233beac 100644 --- a/include/JSystem/JHostIO/JHICommonMem.h +++ b/libs/JSystem/include/JSystem/JHostIO/JHICommonMem.h @@ -1,7 +1,7 @@ #ifndef JHICOMMONMEM_H #define JHICOMMONMEM_H -#include +#include inline u32 JHIhtonl(u32 v) { #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ diff --git a/include/JSystem/JHostIO/JHIMccBuf.h b/libs/JSystem/include/JSystem/JHostIO/JHIMccBuf.h similarity index 100% rename from include/JSystem/JHostIO/JHIMccBuf.h rename to libs/JSystem/include/JSystem/JHostIO/JHIMccBuf.h diff --git a/include/JSystem/JHostIO/JHIRMcc.h b/libs/JSystem/include/JSystem/JHostIO/JHIRMcc.h similarity index 77% rename from include/JSystem/JHostIO/JHIRMcc.h rename to libs/JSystem/include/JSystem/JHostIO/JHIRMcc.h index 9e8c00ca397..adcc95043f9 100644 --- a/include/JSystem/JHostIO/JHIRMcc.h +++ b/libs/JSystem/include/JSystem/JHostIO/JHIRMcc.h @@ -1,7 +1,11 @@ #ifndef JHIRMCC_H #define JHIRMCC_H -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif struct JHIMccContext; diff --git a/include/JSystem/JHostIO/JHIhioASync.h b/libs/JSystem/include/JSystem/JHostIO/JHIhioASync.h similarity index 88% rename from include/JSystem/JHostIO/JHIhioASync.h rename to libs/JSystem/include/JSystem/JHostIO/JHIhioASync.h index fa9d90ef71d..438da0235fe 100644 --- a/include/JSystem/JHostIO/JHIhioASync.h +++ b/libs/JSystem/include/JSystem/JHostIO/JHIhioASync.h @@ -1,7 +1,7 @@ #ifndef JHIHIOASYNC_H #define JHIHIOASYNC_H -#include +#include struct JHIContext; diff --git a/include/JSystem/JHostIO/JOREntry.h b/libs/JSystem/include/JSystem/JHostIO/JOREntry.h similarity index 99% rename from include/JSystem/JHostIO/JOREntry.h rename to libs/JSystem/include/JSystem/JHostIO/JOREntry.h index da1ec2e68cf..b4ab15a7bf2 100644 --- a/include/JSystem/JHostIO/JOREntry.h +++ b/libs/JSystem/include/JSystem/JHostIO/JOREntry.h @@ -2,7 +2,7 @@ #define JORENTRY_H #include "JSystem/JHostIO/JHIComm.h" -#include +#include template class JHIpvector { diff --git a/include/JSystem/JHostIO/JORFile.h b/libs/JSystem/include/JSystem/JHostIO/JORFile.h similarity index 100% rename from include/JSystem/JHostIO/JORFile.h rename to libs/JSystem/include/JSystem/JHostIO/JORFile.h diff --git a/include/JSystem/JHostIO/JORHostInfo.h b/libs/JSystem/include/JSystem/JHostIO/JORHostInfo.h similarity index 94% rename from include/JSystem/JHostIO/JORHostInfo.h rename to libs/JSystem/include/JSystem/JHostIO/JORHostInfo.h index 965b00ef931..54ccd0ebf61 100644 --- a/include/JSystem/JHostIO/JORHostInfo.h +++ b/libs/JSystem/include/JSystem/JHostIO/JORHostInfo.h @@ -1,7 +1,11 @@ #ifndef JORHOSTINFO_H #define JORHOSTINFO_H -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #define HOSTINFO_REQ_COMPUTER_NAME 0 #define HOSTINFO_REQ_USERNAME 1 diff --git a/include/JSystem/JHostIO/JORMContext.h b/libs/JSystem/include/JSystem/JHostIO/JORMContext.h similarity index 99% rename from include/JSystem/JHostIO/JORMContext.h rename to libs/JSystem/include/JSystem/JHostIO/JORMContext.h index 725cae652e9..b06adad45be 100644 --- a/include/JSystem/JHostIO/JORMContext.h +++ b/libs/JSystem/include/JSystem/JHostIO/JORMContext.h @@ -1,7 +1,11 @@ #ifndef JORMCONTEXT_H #define JORMCONTEXT_H -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #include #include "JSystem/JHostIO/JORReflexible.h" #include "JSystem/JSupport/JSUMemoryStream.h" diff --git a/include/JSystem/JHostIO/JORReflexible.h b/libs/JSystem/include/JSystem/JHostIO/JORReflexible.h similarity index 97% rename from include/JSystem/JHostIO/JORReflexible.h rename to libs/JSystem/include/JSystem/JHostIO/JORReflexible.h index 6af87805150..030c6fd9f91 100644 --- a/include/JSystem/JHostIO/JORReflexible.h +++ b/libs/JSystem/include/JSystem/JHostIO/JORReflexible.h @@ -1,7 +1,7 @@ #ifndef JORREFLEXIBLE_H #define JORREFLEXIBLE_H -#include +#include class JORReflexible; diff --git a/include/JSystem/JHostIO/JORServer.h b/libs/JSystem/include/JSystem/JHostIO/JORServer.h similarity index 100% rename from include/JSystem/JHostIO/JORServer.h rename to libs/JSystem/include/JSystem/JHostIO/JORServer.h diff --git a/include/JSystem/JKernel/JKRAram.h b/libs/JSystem/include/JSystem/JKernel/JKRAram.h similarity index 100% rename from include/JSystem/JKernel/JKRAram.h rename to libs/JSystem/include/JSystem/JKernel/JKRAram.h diff --git a/include/JSystem/JKernel/JKRAramArchive.h b/libs/JSystem/include/JSystem/JKernel/JKRAramArchive.h similarity index 100% rename from include/JSystem/JKernel/JKRAramArchive.h rename to libs/JSystem/include/JSystem/JKernel/JKRAramArchive.h diff --git a/include/JSystem/JKernel/JKRAramBlock.h b/libs/JSystem/include/JSystem/JKernel/JKRAramBlock.h similarity index 100% rename from include/JSystem/JKernel/JKRAramBlock.h rename to libs/JSystem/include/JSystem/JKernel/JKRAramBlock.h diff --git a/include/JSystem/JKernel/JKRAramHeap.h b/libs/JSystem/include/JSystem/JKernel/JKRAramHeap.h similarity index 98% rename from include/JSystem/JKernel/JKRAramHeap.h rename to libs/JSystem/include/JSystem/JKernel/JKRAramHeap.h index 034a90c3ebe..87a6e819a81 100644 --- a/include/JSystem/JKernel/JKRAramHeap.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRAramHeap.h @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRAramBlock.h" #include "JSystem/JKernel/JKRDisposer.h" -#include +#include /** * @ingroup jsystem-jkernel diff --git a/include/JSystem/JKernel/JKRAramPiece.h b/libs/JSystem/include/JSystem/JKernel/JKRAramPiece.h similarity index 95% rename from include/JSystem/JKernel/JKRAramPiece.h rename to libs/JSystem/include/JSystem/JKernel/JKRAramPiece.h index 25f304f02bb..623c3575a43 100644 --- a/include/JSystem/JKernel/JKRAramPiece.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRAramPiece.h @@ -2,9 +2,13 @@ #define JKRARAMPIECE_H #include "JSystem/JSupport/JSUList.h" +#ifdef __REVOLUTION_SDK__ +#include +#include +#else #include #include -#include +#endif class JKRAramBlock; class JKRDecompCommand; diff --git a/include/JSystem/JKernel/JKRAramStream.h b/libs/JSystem/include/JSystem/JKernel/JKRAramStream.h similarity index 100% rename from include/JSystem/JKernel/JKRAramStream.h rename to libs/JSystem/include/JSystem/JKernel/JKRAramStream.h diff --git a/include/JSystem/JKernel/JKRArchive.h b/libs/JSystem/include/JSystem/JKernel/JKRArchive.h similarity index 100% rename from include/JSystem/JKernel/JKRArchive.h rename to libs/JSystem/include/JSystem/JKernel/JKRArchive.h diff --git a/include/JSystem/JKernel/JKRAssertHeap.h b/libs/JSystem/include/JSystem/JKernel/JKRAssertHeap.h similarity index 100% rename from include/JSystem/JKernel/JKRAssertHeap.h rename to libs/JSystem/include/JSystem/JKernel/JKRAssertHeap.h diff --git a/include/JSystem/JKernel/JKRCompArchive.h b/libs/JSystem/include/JSystem/JKernel/JKRCompArchive.h similarity index 100% rename from include/JSystem/JKernel/JKRCompArchive.h rename to libs/JSystem/include/JSystem/JKernel/JKRCompArchive.h diff --git a/include/JSystem/JKernel/JKRCompression.h b/libs/JSystem/include/JSystem/JKernel/JKRCompression.h similarity index 100% rename from include/JSystem/JKernel/JKRCompression.h rename to libs/JSystem/include/JSystem/JKernel/JKRCompression.h diff --git a/include/JSystem/JKernel/JKRDecomp.h b/libs/JSystem/include/JSystem/JKernel/JKRDecomp.h similarity index 100% rename from include/JSystem/JKernel/JKRDecomp.h rename to libs/JSystem/include/JSystem/JKernel/JKRDecomp.h diff --git a/include/JSystem/JKernel/JKRDisposer.h b/libs/JSystem/include/JSystem/JKernel/JKRDisposer.h similarity index 100% rename from include/JSystem/JKernel/JKRDisposer.h rename to libs/JSystem/include/JSystem/JKernel/JKRDisposer.h diff --git a/include/JSystem/JKernel/JKRDvdAramRipper.h b/libs/JSystem/include/JSystem/JKernel/JKRDvdAramRipper.h similarity index 100% rename from include/JSystem/JKernel/JKRDvdAramRipper.h rename to libs/JSystem/include/JSystem/JKernel/JKRDvdAramRipper.h diff --git a/include/JSystem/JKernel/JKRDvdArchive.h b/libs/JSystem/include/JSystem/JKernel/JKRDvdArchive.h similarity index 100% rename from include/JSystem/JKernel/JKRDvdArchive.h rename to libs/JSystem/include/JSystem/JKernel/JKRDvdArchive.h diff --git a/include/JSystem/JKernel/JKRDvdFile.h b/libs/JSystem/include/JSystem/JKernel/JKRDvdFile.h similarity index 96% rename from include/JSystem/JKernel/JKRDvdFile.h rename to libs/JSystem/include/JSystem/JKernel/JKRDvdFile.h index b06d4e76d5a..f32c8c67788 100644 --- a/include/JSystem/JKernel/JKRDvdFile.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRDvdFile.h @@ -2,9 +2,9 @@ #define JKRDVDFILE_H #include "JSystem/JKernel/JKRFile.h" -#include -#include -#include +#include +#include +#include struct OSThread; diff --git a/include/JSystem/JKernel/JKRDvdRipper.h b/libs/JSystem/include/JSystem/JKernel/JKRDvdRipper.h similarity index 100% rename from include/JSystem/JKernel/JKRDvdRipper.h rename to libs/JSystem/include/JSystem/JKernel/JKRDvdRipper.h diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/libs/JSystem/include/JSystem/JKernel/JKRExpHeap.h similarity index 100% rename from include/JSystem/JKernel/JKRExpHeap.h rename to libs/JSystem/include/JSystem/JKernel/JKRExpHeap.h diff --git a/include/JSystem/JKernel/JKRFile.h b/libs/JSystem/include/JSystem/JKernel/JKRFile.h similarity index 100% rename from include/JSystem/JKernel/JKRFile.h rename to libs/JSystem/include/JSystem/JKernel/JKRFile.h diff --git a/include/JSystem/JKernel/JKRFileCache.h b/libs/JSystem/include/JSystem/JKernel/JKRFileCache.h similarity index 100% rename from include/JSystem/JKernel/JKRFileCache.h rename to libs/JSystem/include/JSystem/JKernel/JKRFileCache.h diff --git a/include/JSystem/JKernel/JKRFileFinder.h b/libs/JSystem/include/JSystem/JKernel/JKRFileFinder.h similarity index 98% rename from include/JSystem/JKernel/JKRFileFinder.h rename to libs/JSystem/include/JSystem/JKernel/JKRFileFinder.h index 195fd9685e6..1c9339cde05 100644 --- a/include/JSystem/JKernel/JKRFileFinder.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRFileFinder.h @@ -1,7 +1,7 @@ #ifndef JKRFILEFINDER_H #define JKRFILEFINDER_H -#include +#include /** * @ingroup jsystem-jkernel diff --git a/include/JSystem/JKernel/JKRFileLoader.h b/libs/JSystem/include/JSystem/JKernel/JKRFileLoader.h similarity index 100% rename from include/JSystem/JKernel/JKRFileLoader.h rename to libs/JSystem/include/JSystem/JKernel/JKRFileLoader.h diff --git a/include/JSystem/JKernel/JKRHeap.h b/libs/JSystem/include/JSystem/JKernel/JKRHeap.h similarity index 99% rename from include/JSystem/JKernel/JKRHeap.h rename to libs/JSystem/include/JSystem/JKernel/JKRHeap.h index e3ce79f00be..2c38aa19847 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRHeap.h @@ -2,7 +2,7 @@ #define JKRHEAP_H #include "JSystem/JKernel/JKRDisposer.h" -#include +#include #include "global.h" #include #include diff --git a/include/JSystem/JKernel/JKRMemArchive.h b/libs/JSystem/include/JSystem/JKernel/JKRMemArchive.h similarity index 100% rename from include/JSystem/JKernel/JKRMemArchive.h rename to libs/JSystem/include/JSystem/JKernel/JKRMemArchive.h diff --git a/include/JSystem/JKernel/JKRSolidHeap.h b/libs/JSystem/include/JSystem/JKernel/JKRSolidHeap.h similarity index 100% rename from include/JSystem/JKernel/JKRSolidHeap.h rename to libs/JSystem/include/JSystem/JKernel/JKRSolidHeap.h diff --git a/include/JSystem/JKernel/JKRThread.h b/libs/JSystem/include/JSystem/JKernel/JKRThread.h similarity index 99% rename from include/JSystem/JKernel/JKRThread.h rename to libs/JSystem/include/JSystem/JKernel/JKRThread.h index 027d6640e41..b58dc6232d1 100644 --- a/include/JSystem/JKernel/JKRThread.h +++ b/libs/JSystem/include/JSystem/JKernel/JKRThread.h @@ -2,8 +2,8 @@ #define JKRTHREAD_H #include "JSystem/JKernel/JKRHeap.h" -#include -#include +#include +#include /** * @ingroup jsystem-jkernel diff --git a/include/JSystem/JKernel/SArc.h b/libs/JSystem/include/JSystem/JKernel/SArc.h similarity index 100% rename from include/JSystem/JKernel/SArc.h rename to libs/JSystem/include/JSystem/JKernel/SArc.h diff --git a/include/JSystem/JMath/JMATrigonometric.h b/libs/JSystem/include/JSystem/JMath/JMATrigonometric.h similarity index 99% rename from include/JSystem/JMath/JMATrigonometric.h rename to libs/JSystem/include/JSystem/JMath/JMATrigonometric.h index f764be5b6b5..e51296ba3b9 100644 --- a/include/JSystem/JMath/JMATrigonometric.h +++ b/libs/JSystem/include/JSystem/JMath/JMATrigonometric.h @@ -1,7 +1,7 @@ #ifndef JMATRIGONOMETRIC_H #define JMATRIGONOMETRIC_H -#include +#include #include #include diff --git a/include/JSystem/JMath/JMath.h b/libs/JSystem/include/JSystem/JMath/JMath.h similarity index 99% rename from include/JSystem/JMath/JMath.h rename to libs/JSystem/include/JSystem/JMath/JMath.h index ab0faee0495..97779726f21 100644 --- a/include/JSystem/JMath/JMath.h +++ b/libs/JSystem/include/JSystem/JMath/JMath.h @@ -1,7 +1,7 @@ #ifndef JMATH_H #define JMATH_H -#include +#include #include void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32); diff --git a/include/JSystem/JMath/random.h b/libs/JSystem/include/JSystem/JMath/random.h similarity index 97% rename from include/JSystem/JMath/random.h rename to libs/JSystem/include/JSystem/JMath/random.h index 29b542d00d5..5ea54ce7040 100644 --- a/include/JSystem/JMath/random.h +++ b/libs/JSystem/include/JSystem/JMath/random.h @@ -1,7 +1,7 @@ #ifndef RANDOM_H #define RANDOM_H -#include +#include namespace JMath { diff --git a/include/JSystem/JMessage/JMessage.h b/libs/JSystem/include/JSystem/JMessage/JMessage.h similarity index 94% rename from include/JSystem/JMessage/JMessage.h rename to libs/JSystem/include/JSystem/JMessage/JMessage.h index a097187998d..736252f7d51 100644 --- a/include/JSystem/JMessage/JMessage.h +++ b/libs/JSystem/include/JSystem/JMessage/JMessage.h @@ -1,7 +1,11 @@ #ifndef JMESSAGE_H #define JMESSAGE_H -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif // Struct definitions might be wrong typedef struct bmg_header_t { diff --git a/include/JSystem/JMessage/control.h b/libs/JSystem/include/JSystem/JMessage/control.h similarity index 100% rename from include/JSystem/JMessage/control.h rename to libs/JSystem/include/JSystem/JMessage/control.h diff --git a/include/JSystem/JMessage/data.h b/libs/JSystem/include/JSystem/JMessage/data.h similarity index 100% rename from include/JSystem/JMessage/data.h rename to libs/JSystem/include/JSystem/JMessage/data.h diff --git a/include/JSystem/JMessage/locale.h b/libs/JSystem/include/JSystem/JMessage/locale.h similarity index 88% rename from include/JSystem/JMessage/locale.h rename to libs/JSystem/include/JSystem/JMessage/locale.h index c5dc58512a4..76c4313f1ab 100644 --- a/include/JSystem/JMessage/locale.h +++ b/libs/JSystem/include/JSystem/JMessage/locale.h @@ -1,7 +1,11 @@ #ifndef JMESSAGE_LOCALE_H #define JMESSAGE_LOCALE_H -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif namespace JMessage { diff --git a/include/JSystem/JMessage/processor.h b/libs/JSystem/include/JSystem/JMessage/processor.h similarity index 100% rename from include/JSystem/JMessage/processor.h rename to libs/JSystem/include/JSystem/JMessage/processor.h diff --git a/include/JSystem/JMessage/resource.h b/libs/JSystem/include/JSystem/JMessage/resource.h similarity index 100% rename from include/JSystem/JMessage/resource.h rename to libs/JSystem/include/JSystem/JMessage/resource.h diff --git a/include/JSystem/JParticle/JPABaseShape.h b/libs/JSystem/include/JSystem/JParticle/JPABaseShape.h similarity index 99% rename from include/JSystem/JParticle/JPABaseShape.h rename to libs/JSystem/include/JSystem/JParticle/JPABaseShape.h index 9bab6d815a4..07c2c26dc51 100644 --- a/include/JSystem/JParticle/JPABaseShape.h +++ b/libs/JSystem/include/JSystem/JParticle/JPABaseShape.h @@ -1,7 +1,7 @@ #ifndef JPABASESHAPE_H #define JPABASESHAPE_H -#include +#include struct JPAEmitterWorkData; class JPABaseParticle; diff --git a/include/JSystem/JParticle/JPAChildShape.h b/libs/JSystem/include/JSystem/JParticle/JPAChildShape.h similarity index 99% rename from include/JSystem/JParticle/JPAChildShape.h rename to libs/JSystem/include/JSystem/JParticle/JPAChildShape.h index ff22d2d69ef..7b036b8391a 100644 --- a/include/JSystem/JParticle/JPAChildShape.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAChildShape.h @@ -1,7 +1,7 @@ #ifndef JPACHILDSHAPE_H #define JPACHILDSHAPE_H -#include +#include struct JPAEmitterWorkData; class JPABaseParticle; diff --git a/include/JSystem/JParticle/JPADrawInfo.h b/libs/JSystem/include/JSystem/JParticle/JPADrawInfo.h similarity index 96% rename from include/JSystem/JParticle/JPADrawInfo.h rename to libs/JSystem/include/JSystem/JParticle/JPADrawInfo.h index d98448f5f47..c9a62bfd6fa 100644 --- a/include/JSystem/JParticle/JPADrawInfo.h +++ b/libs/JSystem/include/JSystem/JParticle/JPADrawInfo.h @@ -1,7 +1,7 @@ #ifndef JPADRAWINFO_H #define JPADRAWINFO_H -#include +#include /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JParticle/JPADynamicsBlock.h b/libs/JSystem/include/JSystem/JParticle/JPADynamicsBlock.h similarity index 99% rename from include/JSystem/JParticle/JPADynamicsBlock.h rename to libs/JSystem/include/JSystem/JParticle/JPADynamicsBlock.h index 5b891924982..5b53fac40c0 100644 --- a/include/JSystem/JParticle/JPADynamicsBlock.h +++ b/libs/JSystem/include/JSystem/JParticle/JPADynamicsBlock.h @@ -3,7 +3,7 @@ #include "JSystem/JGeometry.h" -#include +#include struct JPAEmitterWorkData; diff --git a/include/JSystem/JParticle/JPAEmitter.h b/libs/JSystem/include/JSystem/JParticle/JPAEmitter.h similarity index 99% rename from include/JSystem/JParticle/JPAEmitter.h rename to libs/JSystem/include/JSystem/JParticle/JPAEmitter.h index 691096babe3..2f5e4f56cbf 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAEmitter.h @@ -1,7 +1,7 @@ #ifndef JPAEMITTER_H #define JPAEMITTER_H -#include +#include #include #include "JSystem/JParticle/JPAResource.h" #include "JSystem/JParticle/JPAList.h" diff --git a/include/JSystem/JParticle/JPAEmitterManager.h b/libs/JSystem/include/JSystem/JParticle/JPAEmitterManager.h similarity index 98% rename from include/JSystem/JParticle/JPAEmitterManager.h rename to libs/JSystem/include/JSystem/JParticle/JPAEmitterManager.h index a36d8041c02..b10c4a69a06 100644 --- a/include/JSystem/JParticle/JPAEmitterManager.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAEmitterManager.h @@ -1,7 +1,7 @@ #ifndef JPAEMITTERMANAGER_H #define JPAEMITTERMANAGER_H -#include +#include #include "JSystem/JParticle/JPAList.h" #include "JSystem/JParticle/JPADrawInfo.h" #include "JSystem/JSupport/JSUList.h" diff --git a/include/JSystem/JParticle/JPAExTexShape.h b/libs/JSystem/include/JSystem/JParticle/JPAExTexShape.h similarity index 97% rename from include/JSystem/JParticle/JPAExTexShape.h rename to libs/JSystem/include/JSystem/JParticle/JPAExTexShape.h index 8a0c345c10a..9021813591a 100644 --- a/include/JSystem/JParticle/JPAExTexShape.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAExTexShape.h @@ -1,7 +1,7 @@ #ifndef JPAEXTEXSHAPE_H #define JPAEXTEXSHAPE_H -#include +#include struct JPAEmitterWorkData; diff --git a/include/JSystem/JParticle/JPAExtraShape.h b/libs/JSystem/include/JSystem/JParticle/JPAExtraShape.h similarity index 99% rename from include/JSystem/JParticle/JPAExtraShape.h rename to libs/JSystem/include/JSystem/JParticle/JPAExtraShape.h index 613413711c9..8154a3bb782 100644 --- a/include/JSystem/JParticle/JPAExtraShape.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAExtraShape.h @@ -1,7 +1,7 @@ #ifndef JPAEXTRASHAPE_H #define JPAEXTRASHAPE_H -#include +#include struct JPAEmitterWorkData; class JPABaseParticle; diff --git a/include/JSystem/JParticle/JPAFieldBlock.h b/libs/JSystem/include/JSystem/JParticle/JPAFieldBlock.h similarity index 99% rename from include/JSystem/JParticle/JPAFieldBlock.h rename to libs/JSystem/include/JSystem/JParticle/JPAFieldBlock.h index a43488c7818..e4e8dedda39 100644 --- a/include/JSystem/JParticle/JPAFieldBlock.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAFieldBlock.h @@ -2,7 +2,7 @@ #define JPAFIELDBLOCK_H #include "JSystem/JGeometry.h" -#include +#include class JKRHeap; struct JPAEmitterWorkData; diff --git a/include/JSystem/JParticle/JPAKeyBlock.h b/libs/JSystem/include/JSystem/JParticle/JPAKeyBlock.h similarity index 94% rename from include/JSystem/JParticle/JPAKeyBlock.h rename to libs/JSystem/include/JSystem/JParticle/JPAKeyBlock.h index 07c1f571710..e5fb0f47017 100644 --- a/include/JSystem/JParticle/JPAKeyBlock.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAKeyBlock.h @@ -1,7 +1,7 @@ #ifndef JPAKEYBLOCK_H #define JPAKEYBLOCK_H -#include +#include /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JParticle/JPAList.h b/libs/JSystem/include/JSystem/JParticle/JPAList.h similarity index 99% rename from include/JSystem/JParticle/JPAList.h rename to libs/JSystem/include/JSystem/JParticle/JPAList.h index 6f201b73b84..3ea0bc4967c 100644 --- a/include/JSystem/JParticle/JPAList.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAList.h @@ -1,7 +1,7 @@ #ifndef JPALIST_H #define JPALIST_H -#include +#include /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JParticle/JPAMath.h b/libs/JSystem/include/JSystem/JParticle/JPAMath.h similarity index 96% rename from include/JSystem/JParticle/JPAMath.h rename to libs/JSystem/include/JSystem/JParticle/JPAMath.h index e48758c4d80..669d4bf984e 100644 --- a/include/JSystem/JParticle/JPAMath.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAMath.h @@ -1,7 +1,7 @@ #ifndef JPAMATH_H #define JPAMATH_H -#include +#include #include "JSystem/JGeometry.h" void JPAGetDirMtx(JGeometry::TVec3 const& param_0, f32 (*param_1)[4]); diff --git a/include/JSystem/JParticle/JPAParticle.h b/libs/JSystem/include/JSystem/JParticle/JPAParticle.h similarity index 99% rename from include/JSystem/JParticle/JPAParticle.h rename to libs/JSystem/include/JSystem/JParticle/JPAParticle.h index 64d682cfa20..842f2932868 100644 --- a/include/JSystem/JParticle/JPAParticle.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAParticle.h @@ -1,7 +1,7 @@ #ifndef JPAPARTICLE_H #define JPAPARTICLE_H -#include +#include #include "JSystem/JGeometry.h" class JKRHeap; diff --git a/include/JSystem/JParticle/JPARandom.h b/libs/JSystem/include/JSystem/JParticle/JPARandom.h similarity index 96% rename from include/JSystem/JParticle/JPARandom.h rename to libs/JSystem/include/JSystem/JParticle/JPARandom.h index 551e6f69346..be4420cad81 100644 --- a/include/JSystem/JParticle/JPARandom.h +++ b/libs/JSystem/include/JSystem/JParticle/JPARandom.h @@ -1,7 +1,7 @@ #ifndef JPARANDOM_H #define JPARANDOM_H -#include +#include /** * @ingroup jsystem-jparticle diff --git a/include/JSystem/JParticle/JPAResource.h b/libs/JSystem/include/JSystem/JParticle/JPAResource.h similarity index 98% rename from include/JSystem/JParticle/JPAResource.h rename to libs/JSystem/include/JSystem/JParticle/JPAResource.h index 0088c497c22..440cc914cb2 100644 --- a/include/JSystem/JParticle/JPAResource.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAResource.h @@ -1,7 +1,7 @@ #ifndef JPARESOURCE_H #define JPARESOURCE_H -#include +#include class JKRHeap; struct JPAEmitterWorkData; diff --git a/include/JSystem/JParticle/JPAResourceLoader.h b/libs/JSystem/include/JSystem/JParticle/JPAResourceLoader.h similarity index 90% rename from include/JSystem/JParticle/JPAResourceLoader.h rename to libs/JSystem/include/JSystem/JParticle/JPAResourceLoader.h index 7e411a84975..c49d1d84642 100644 --- a/include/JSystem/JParticle/JPAResourceLoader.h +++ b/libs/JSystem/include/JSystem/JParticle/JPAResourceLoader.h @@ -1,7 +1,7 @@ #ifndef JPARESOURCELOADER_H #define JPARESOURCELOADER_H -#include +#include class JPAResourceManager; diff --git a/include/JSystem/JParticle/JPAResourceManager.h b/libs/JSystem/include/JSystem/JParticle/JPAResourceManager.h similarity index 100% rename from include/JSystem/JParticle/JPAResourceManager.h rename to libs/JSystem/include/JSystem/JParticle/JPAResourceManager.h diff --git a/include/JSystem/JParticle/JPATexture.h b/libs/JSystem/include/JSystem/JParticle/JPATexture.h similarity index 100% rename from include/JSystem/JParticle/JPATexture.h rename to libs/JSystem/include/JSystem/JParticle/JPATexture.h diff --git a/include/JSystem/JStage/JSGActor.h b/libs/JSystem/include/JSystem/JStage/JSGActor.h similarity index 100% rename from include/JSystem/JStage/JSGActor.h rename to libs/JSystem/include/JSystem/JStage/JSGActor.h diff --git a/include/JSystem/JStage/JSGAmbientLight.h b/libs/JSystem/include/JSystem/JStage/JSGAmbientLight.h similarity index 94% rename from include/JSystem/JStage/JSGAmbientLight.h rename to libs/JSystem/include/JSystem/JStage/JSGAmbientLight.h index 049ce7a479c..a9e6f842a44 100644 --- a/include/JSystem/JStage/JSGAmbientLight.h +++ b/libs/JSystem/include/JSystem/JStage/JSGAmbientLight.h @@ -2,7 +2,7 @@ #define JSGAMBIENTLIGHT_H #include "JSystem/JStage/JSGObject.h" -#include +#include namespace JStage { diff --git a/include/JSystem/JStage/JSGCamera.h b/libs/JSystem/include/JSystem/JStage/JSGCamera.h similarity index 100% rename from include/JSystem/JStage/JSGCamera.h rename to libs/JSystem/include/JSystem/JStage/JSGCamera.h diff --git a/include/JSystem/JStage/JSGFog.h b/libs/JSystem/include/JSystem/JStage/JSGFog.h similarity index 96% rename from include/JSystem/JStage/JSGFog.h rename to libs/JSystem/include/JSystem/JStage/JSGFog.h index 1109da9a179..342b7049a15 100644 --- a/include/JSystem/JStage/JSGFog.h +++ b/libs/JSystem/include/JSystem/JStage/JSGFog.h @@ -2,7 +2,7 @@ #define JSGFOG_H #include "JSystem/JStage/JSGObject.h" -#include +#include namespace JStage { diff --git a/include/JSystem/JStage/JSGLight.h b/libs/JSystem/include/JSystem/JStage/JSGLight.h similarity index 97% rename from include/JSystem/JStage/JSGLight.h rename to libs/JSystem/include/JSystem/JStage/JSGLight.h index 3400f806d5f..f1f274771c3 100644 --- a/include/JSystem/JStage/JSGLight.h +++ b/libs/JSystem/include/JSystem/JStage/JSGLight.h @@ -2,7 +2,7 @@ #define JSGLIGHT_H #include "JSystem/JStage/JSGObject.h" -#include +#include namespace JStage { enum TELight { diff --git a/include/JSystem/JStage/JSGObject.h b/libs/JSystem/include/JSystem/JStage/JSGObject.h similarity index 97% rename from include/JSystem/JStage/JSGObject.h rename to libs/JSystem/include/JSystem/JStage/JSGObject.h index cdf1849a485..2080fbe439e 100644 --- a/include/JSystem/JStage/JSGObject.h +++ b/libs/JSystem/include/JSystem/JStage/JSGObject.h @@ -1,7 +1,7 @@ #ifndef JSGOBJECT_H #define JSGOBJECT_H -#include +#include namespace JStage { /** diff --git a/include/JSystem/JStage/JSGSystem.h b/libs/JSystem/include/JSystem/JStage/JSGSystem.h similarity index 100% rename from include/JSystem/JStage/JSGSystem.h rename to libs/JSystem/include/JSystem/JStage/JSGSystem.h diff --git a/include/JSystem/JStudio/JStudio/ctb-data.h b/libs/JSystem/include/JSystem/JStudio/JStudio/ctb-data.h similarity index 100% rename from include/JSystem/JStudio/JStudio/ctb-data.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/ctb-data.h diff --git a/include/JSystem/JStudio/JStudio/ctb.h b/libs/JSystem/include/JSystem/JStudio/JStudio/ctb.h similarity index 100% rename from include/JSystem/JStudio/JStudio/ctb.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/ctb.h diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/libs/JSystem/include/JSystem/JStudio/JStudio/functionvalue.h similarity index 100% rename from include/JSystem/JStudio/JStudio/functionvalue.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/functionvalue.h diff --git a/include/JSystem/JStudio/JStudio/fvb-data-parse.h b/libs/JSystem/include/JSystem/JStudio/JStudio/fvb-data-parse.h similarity index 100% rename from include/JSystem/JStudio/JStudio/fvb-data-parse.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/fvb-data-parse.h diff --git a/include/JSystem/JStudio/JStudio/fvb-data.h b/libs/JSystem/include/JSystem/JStudio/JStudio/fvb-data.h similarity index 100% rename from include/JSystem/JStudio/JStudio/fvb-data.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/fvb-data.h diff --git a/include/JSystem/JStudio/JStudio/fvb.h b/libs/JSystem/include/JSystem/JStudio/JStudio/fvb.h similarity index 100% rename from include/JSystem/JStudio/JStudio/fvb.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/fvb.h diff --git a/include/JSystem/JStudio/JStudio/jstudio-control.h b/libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-control.h similarity index 99% rename from include/JSystem/JStudio/JStudio/jstudio-control.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-control.h index 3dd1bdb2854..4ae758f3304 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-control.h +++ b/libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-control.h @@ -4,8 +4,8 @@ #include "JSystem/JStudio/JStudio/fvb.h" #include "JSystem/JStudio/JStudio/stb.h" #include "JSystem/JStudio/JStudio/ctb.h" -#include -#include +#include +#include namespace JStudio { struct TObject; diff --git a/include/JSystem/JStudio/JStudio/jstudio-data.h b/libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-data.h similarity index 100% rename from include/JSystem/JStudio/JStudio/jstudio-data.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-data.h diff --git a/include/JSystem/JStudio/JStudio/jstudio-math.h b/libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-math.h similarity index 98% rename from include/JSystem/JStudio/JStudio/jstudio-math.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-math.h index 9e065300765..e30da039c9c 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-math.h +++ b/libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-math.h @@ -1,7 +1,7 @@ #ifndef JSTUDIO_MATH_H #define JSTUDIO_MATH_H -#include +#include #include #define m_PI_D 3.141592653589793 diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-object.h similarity index 100% rename from include/JSystem/JStudio/JStudio/jstudio-object.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/jstudio-object.h diff --git a/include/JSystem/JStudio/JStudio/object-id.h b/libs/JSystem/include/JSystem/JStudio/JStudio/object-id.h similarity index 97% rename from include/JSystem/JStudio/JStudio/object-id.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/object-id.h index 9aaebe9039c..23ef72c9528 100644 --- a/include/JSystem/JStudio/JStudio/object-id.h +++ b/libs/JSystem/include/JSystem/JStudio/JStudio/object-id.h @@ -1,7 +1,7 @@ #ifndef OBJECT_ID_H #define OBJECT_ID_H -#include +#include namespace JStudio { namespace object { diff --git a/include/JSystem/JStudio/JStudio/stb-data-parse.h b/libs/JSystem/include/JSystem/JStudio/JStudio/stb-data-parse.h similarity index 100% rename from include/JSystem/JStudio/JStudio/stb-data-parse.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/stb-data-parse.h diff --git a/include/JSystem/JStudio/JStudio/stb-data.h b/libs/JSystem/include/JSystem/JStudio/JStudio/stb-data.h similarity index 98% rename from include/JSystem/JStudio/JStudio/stb-data.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/stb-data.h index 2cd1a298043..f66cd5f6f66 100644 --- a/include/JSystem/JStudio/JStudio/stb-data.h +++ b/libs/JSystem/include/JSystem/JStudio/JStudio/stb-data.h @@ -1,7 +1,7 @@ #ifndef STB_DATA_H #define STB_DATA_H -#include +#include namespace JStudio { namespace stb { diff --git a/include/JSystem/JStudio/JStudio/stb.h b/libs/JSystem/include/JSystem/JStudio/JStudio/stb.h similarity index 99% rename from include/JSystem/JStudio/JStudio/stb.h rename to libs/JSystem/include/JSystem/JStudio/JStudio/stb.h index b17bb57a8c2..276bbe6429b 100644 --- a/include/JSystem/JStudio/JStudio/stb.h +++ b/libs/JSystem/include/JSystem/JStudio/JStudio/stb.h @@ -4,7 +4,7 @@ #include "JSystem/JGadget/linklist.h" #include "JSystem/JStudio/JStudio/object-id.h" #include "JSystem/JStudio/JStudio/stb-data-parse.h" -#include +#include #include namespace JStudio { diff --git a/include/JSystem/JStudio/JStudioCameraEditor/control.h b/libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/control.h similarity index 100% rename from include/JSystem/JStudio/JStudioCameraEditor/control.h rename to libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/control.h diff --git a/include/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.h b/libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.h similarity index 100% rename from include/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.h rename to libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.h diff --git a/include/JSystem/JStudio/JStudioCameraEditor/csb.h b/libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/csb.h similarity index 99% rename from include/JSystem/JStudio/JStudioCameraEditor/csb.h rename to libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/csb.h index de1a42421cf..eb48ea835ac 100644 --- a/include/JSystem/JStudio/JStudioCameraEditor/csb.h +++ b/libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/csb.h @@ -1,7 +1,7 @@ #ifndef JSTUDIOCAMERAEDITOR_CSB_H #define JSTUDIOCAMERAEDITOR_CSB_H -#include +#include #include "JSystem/JGadget/linklist.h" #include "JSystem/JGadget/std-vector.h" #include "JSystem/JStudio/JStudio/functionvalue.h" diff --git a/include/JSystem/JStudio/JStudioCameraEditor/sequence.h b/libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/sequence.h similarity index 100% rename from include/JSystem/JStudio/JStudioCameraEditor/sequence.h rename to libs/JSystem/include/JSystem/JStudio/JStudioCameraEditor/sequence.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/anchor.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/anchor.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/anchor.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/anchor.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/console.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/console.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/console.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/console.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/controlset-preview.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/controlset-preview.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/controlset-preview.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/controlset-preview.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/controlset-transform.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/controlset-transform.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/controlset-transform.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/controlset-transform.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/controlset.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/controlset.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/controlset.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/controlset.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/interface.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/interface.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/interface.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/interface.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/scroll.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/scroll.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/scroll.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/scroll.h diff --git a/include/JSystem/JStudio/JStudioToolLibrary/visual.h b/libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/visual.h similarity index 100% rename from include/JSystem/JStudio/JStudioToolLibrary/visual.h rename to libs/JSystem/include/JSystem/JStudio/JStudioToolLibrary/visual.h diff --git a/include/JSystem/JStudio/JStudio_JAudio2/control.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JAudio2/control.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JAudio2/control.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JAudio2/control.h diff --git a/include/JSystem/JStudio/JStudio_JAudio2/object-sound.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JAudio2/object-sound.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JAudio2/object-sound.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JAudio2/object-sound.h diff --git a/include/JSystem/JStudio/JStudio_JParticle/control.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JParticle/control.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JParticle/control.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JParticle/control.h diff --git a/include/JSystem/JStudio/JStudio_JParticle/object-particle.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JParticle/object-particle.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JParticle/object-particle.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JParticle/object-particle.h diff --git a/include/JSystem/JStudio/JStudio_JPreviewer/control.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JPreviewer/control.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JPreviewer/control.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JPreviewer/control.h diff --git a/include/JSystem/JStudio/JStudio_JStage/control.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/control.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/control.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/control.h diff --git a/include/JSystem/JStudio/JStudio_JStage/object-actor.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-actor.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/object-actor.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-actor.h diff --git a/include/JSystem/JStudio/JStudio_JStage/object-ambientlight.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-ambientlight.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/object-ambientlight.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-ambientlight.h diff --git a/include/JSystem/JStudio/JStudio_JStage/object-camera.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-camera.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/object-camera.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-camera.h diff --git a/include/JSystem/JStudio/JStudio_JStage/object-fog.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-fog.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/object-fog.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-fog.h diff --git a/include/JSystem/JStudio/JStudio_JStage/object-light.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-light.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/object-light.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object-light.h diff --git a/include/JSystem/JStudio/JStudio_JStage/object.h b/libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object.h similarity index 100% rename from include/JSystem/JStudio/JStudio_JStage/object.h rename to libs/JSystem/include/JSystem/JStudio/JStudio_JStage/object.h diff --git a/include/JSystem/JSupport/JSUFileStream.h b/libs/JSystem/include/JSystem/JSupport/JSUFileStream.h similarity index 100% rename from include/JSystem/JSupport/JSUFileStream.h rename to libs/JSystem/include/JSystem/JSupport/JSUFileStream.h diff --git a/include/JSystem/JSupport/JSUInputStream.h b/libs/JSystem/include/JSystem/JSupport/JSUInputStream.h similarity index 100% rename from include/JSystem/JSupport/JSUInputStream.h rename to libs/JSystem/include/JSystem/JSupport/JSUInputStream.h diff --git a/include/JSystem/JSupport/JSUIosBase.h b/libs/JSystem/include/JSystem/JSupport/JSUIosBase.h similarity index 95% rename from include/JSystem/JSupport/JSUIosBase.h rename to libs/JSystem/include/JSystem/JSupport/JSUIosBase.h index 64ad4dba059..395ce577452 100644 --- a/include/JSystem/JSupport/JSUIosBase.h +++ b/libs/JSystem/include/JSystem/JSupport/JSUIosBase.h @@ -1,7 +1,7 @@ #ifndef JSUIOSBASE_H_ #define JSUIOSBASE_H_ -#include +#include enum JSUStreamSeekFrom { JSUStreamSeekFrom_SET = 0, // absolute diff --git a/include/JSystem/JSupport/JSUList.h b/libs/JSystem/include/JSystem/JSupport/JSUList.h similarity index 99% rename from include/JSystem/JSupport/JSUList.h rename to libs/JSystem/include/JSystem/JSupport/JSUList.h index 30a28b57cfd..3021a3a879e 100644 --- a/include/JSystem/JSupport/JSUList.h +++ b/libs/JSystem/include/JSystem/JSupport/JSUList.h @@ -1,7 +1,7 @@ #ifndef JSULIST_H #define JSULIST_H -#include +#include template class JSUList; diff --git a/include/JSystem/JSupport/JSUMemoryStream.h b/libs/JSystem/include/JSystem/JSupport/JSUMemoryStream.h similarity index 100% rename from include/JSystem/JSupport/JSUMemoryStream.h rename to libs/JSystem/include/JSystem/JSupport/JSUMemoryStream.h diff --git a/include/JSystem/JSupport/JSUOutputStream.h b/libs/JSystem/include/JSystem/JSupport/JSUOutputStream.h similarity index 100% rename from include/JSystem/JSupport/JSUOutputStream.h rename to libs/JSystem/include/JSystem/JSupport/JSUOutputStream.h diff --git a/include/JSystem/JSupport/JSURandomInputStream.h b/libs/JSystem/include/JSystem/JSupport/JSURandomInputStream.h similarity index 100% rename from include/JSystem/JSupport/JSURandomInputStream.h rename to libs/JSystem/include/JSystem/JSupport/JSURandomInputStream.h diff --git a/include/JSystem/JSupport/JSURandomOutputStream.h b/libs/JSystem/include/JSystem/JSupport/JSURandomOutputStream.h similarity index 100% rename from include/JSystem/JSupport/JSURandomOutputStream.h rename to libs/JSystem/include/JSystem/JSupport/JSURandomOutputStream.h diff --git a/include/JSystem/JSupport/JSupport.h b/libs/JSystem/include/JSystem/JSupport/JSupport.h similarity index 91% rename from include/JSystem/JSupport/JSupport.h rename to libs/JSystem/include/JSystem/JSupport/JSupport.h index c982af61038..a9caccef089 100644 --- a/include/JSystem/JSupport/JSupport.h +++ b/libs/JSystem/include/JSystem/JSupport/JSupport.h @@ -1,7 +1,11 @@ #ifndef JSUPPORT_H #define JSUPPORT_H -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #include /** diff --git a/include/JSystem/JSystem.h b/libs/JSystem/include/JSystem/JSystem.h similarity index 100% rename from include/JSystem/JSystem.h rename to libs/JSystem/include/JSystem/JSystem.h diff --git a/include/JSystem/JSystem.pch b/libs/JSystem/include/JSystem/JSystem.pch similarity index 100% rename from include/JSystem/JSystem.pch rename to libs/JSystem/include/JSystem/JSystem.pch diff --git a/include/JSystem/JUtility/JUTAssert.h b/libs/JSystem/include/JSystem/JUtility/JUTAssert.h similarity index 99% rename from include/JSystem/JUtility/JUTAssert.h rename to libs/JSystem/include/JSystem/JUtility/JUTAssert.h index 5a37e2b03c4..5e26c0ee608 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTAssert.h @@ -1,7 +1,7 @@ #ifndef JUTASSERT_H #define JUTASSERT_H -#include +#include #if DEBUG #define JUT_SHOW_ASSERT(LINE, COND) JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND) diff --git a/include/JSystem/JUtility/JUTCacheFont.h b/libs/JSystem/include/JSystem/JUtility/JUTCacheFont.h similarity index 100% rename from include/JSystem/JUtility/JUTCacheFont.h rename to libs/JSystem/include/JSystem/JUtility/JUTCacheFont.h diff --git a/include/JSystem/JUtility/JUTConsole.h b/libs/JSystem/include/JSystem/JUtility/JUTConsole.h similarity index 100% rename from include/JSystem/JUtility/JUTConsole.h rename to libs/JSystem/include/JSystem/JUtility/JUTConsole.h diff --git a/include/JSystem/JUtility/JUTDbPrint.h b/libs/JSystem/include/JSystem/JUtility/JUTDbPrint.h similarity index 100% rename from include/JSystem/JUtility/JUTDbPrint.h rename to libs/JSystem/include/JSystem/JUtility/JUTDbPrint.h diff --git a/include/JSystem/JUtility/JUTDirectFile.h b/libs/JSystem/include/JSystem/JUtility/JUTDirectFile.h similarity index 95% rename from include/JSystem/JUtility/JUTDirectFile.h rename to libs/JSystem/include/JSystem/JUtility/JUTDirectFile.h index caebf09dd1f..f6b14fad3f6 100644 --- a/include/JSystem/JUtility/JUTDirectFile.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTDirectFile.h @@ -1,7 +1,7 @@ #ifndef JUTDIRECTFILE_H #define JUTDIRECTFILE_H -#include +#include #define JUTDF_BUFSIZE (0x800) diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/libs/JSystem/include/JSystem/JUtility/JUTDirectPrint.h similarity index 100% rename from include/JSystem/JUtility/JUTDirectPrint.h rename to libs/JSystem/include/JSystem/JUtility/JUTDirectPrint.h diff --git a/include/JSystem/JUtility/JUTException.h b/libs/JSystem/include/JSystem/JUtility/JUTException.h similarity index 98% rename from include/JSystem/JUtility/JUTException.h rename to libs/JSystem/include/JSystem/JUtility/JUTException.h index 522551dd63c..68c91d93780 100644 --- a/include/JSystem/JUtility/JUTException.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTException.h @@ -4,8 +4,8 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTGamePad.h" #include -#include -#include +#include +#include #include "global.h" typedef struct _GXRenderModeObj GXRenderModeObj; diff --git a/include/JSystem/JUtility/JUTFader.h b/libs/JSystem/include/JSystem/JUtility/JUTFader.h similarity index 100% rename from include/JSystem/JUtility/JUTFader.h rename to libs/JSystem/include/JSystem/JUtility/JUTFader.h diff --git a/include/JSystem/JUtility/JUTFont.h b/libs/JSystem/include/JSystem/JUtility/JUTFont.h similarity index 100% rename from include/JSystem/JUtility/JUTFont.h rename to libs/JSystem/include/JSystem/JUtility/JUTFont.h diff --git a/include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h b/libs/JSystem/include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h similarity index 80% rename from include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h rename to libs/JSystem/include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h index da5d5006534..d26d0287dd6 100644 --- a/include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h @@ -1,6 +1,6 @@ #ifndef JUTFONTDATA_ASCFONT_FIX12_H #define JUTFONTDATA_ASCFONT_FIX12_H -#include +#include #endif /* JUTFONTDATA_ASCFONT_FIX12_H */ diff --git a/include/JSystem/JUtility/JUTGamePad.h b/libs/JSystem/include/JSystem/JUtility/JUTGamePad.h similarity index 99% rename from include/JSystem/JUtility/JUTGamePad.h rename to libs/JSystem/include/JSystem/JUtility/JUTGamePad.h index 919ad238770..bf939f0831a 100644 --- a/include/JSystem/JUtility/JUTGamePad.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTGamePad.h @@ -3,7 +3,11 @@ #include "JSystem/JKernel/JKRDisposer.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif typedef void (*callbackFn)(int, void*); diff --git a/include/JSystem/JUtility/JUTGraphFifo.h b/libs/JSystem/include/JSystem/JUtility/JUTGraphFifo.h similarity index 97% rename from include/JSystem/JUtility/JUTGraphFifo.h rename to libs/JSystem/include/JSystem/JUtility/JUTGraphFifo.h index 97ae67541e7..1680d00178d 100644 --- a/include/JSystem/JUtility/JUTGraphFifo.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTGraphFifo.h @@ -1,7 +1,7 @@ #ifndef JUTGRAPHFIFO_H #define JUTGRAPHFIFO_H -#include +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTNameTab.h b/libs/JSystem/include/JSystem/JUtility/JUTNameTab.h similarity index 97% rename from include/JSystem/JUtility/JUTNameTab.h rename to libs/JSystem/include/JSystem/JUtility/JUTNameTab.h index 0aa772a40d5..657a8a871ed 100644 --- a/include/JSystem/JUtility/JUTNameTab.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTNameTab.h @@ -1,7 +1,7 @@ #ifndef JUTNAMETAB_H #define JUTNAMETAB_H -#include +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTPalette.h b/libs/JSystem/include/JSystem/JUtility/JUTPalette.h similarity index 97% rename from include/JSystem/JUtility/JUTPalette.h rename to libs/JSystem/include/JSystem/JUtility/JUTPalette.h index 00539136305..b3c47319114 100644 --- a/include/JSystem/JUtility/JUTPalette.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTPalette.h @@ -1,7 +1,7 @@ #ifndef JUTPALETTE_H #define JUTPALETTE_H -#include +#include enum JUTTransparency { UNK0, UNK1 }; diff --git a/include/JSystem/JUtility/JUTProcBar.h b/libs/JSystem/include/JSystem/JUtility/JUTProcBar.h similarity index 99% rename from include/JSystem/JUtility/JUTProcBar.h rename to libs/JSystem/include/JSystem/JUtility/JUTProcBar.h index ac9811f8fd7..c491641218c 100644 --- a/include/JSystem/JUtility/JUTProcBar.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTProcBar.h @@ -2,7 +2,7 @@ #define JUTPROCBAR_H #include "JSystem/JUtility/TColor.h" -#include +#include class JKRHeap; diff --git a/include/JSystem/JUtility/JUTReport.h b/libs/JSystem/include/JSystem/JUtility/JUTReport.h similarity index 100% rename from include/JSystem/JUtility/JUTReport.h rename to libs/JSystem/include/JSystem/JUtility/JUTReport.h diff --git a/include/JSystem/JUtility/JUTResFont.h b/libs/JSystem/include/JSystem/JUtility/JUTResFont.h similarity index 100% rename from include/JSystem/JUtility/JUTResFont.h rename to libs/JSystem/include/JSystem/JUtility/JUTResFont.h diff --git a/include/JSystem/JUtility/JUTResource.h b/libs/JSystem/include/JSystem/JUtility/JUTResource.h similarity index 96% rename from include/JSystem/JUtility/JUTResource.h rename to libs/JSystem/include/JSystem/JUtility/JUTResource.h index 4a4b8e6c8c6..f54dd8b1bb4 100644 --- a/include/JSystem/JUtility/JUTResource.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTResource.h @@ -1,7 +1,7 @@ #ifndef JUTRESOURCE_H #define JUTRESOURCE_H -#include +#include class JKRArchive; class JSUInputStream; diff --git a/include/JSystem/JUtility/JUTTexture.h b/libs/JSystem/include/JSystem/JUtility/JUTTexture.h similarity index 99% rename from include/JSystem/JUtility/JUTTexture.h rename to libs/JSystem/include/JSystem/JUtility/JUTTexture.h index b5965eb1852..db8ae5e8694 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTTexture.h @@ -1,7 +1,7 @@ #ifndef JUTTEXTURE_H #define JUTTEXTURE_H -#include +#include #include class JUTPalette; diff --git a/include/JSystem/JUtility/JUTVideo.h b/libs/JSystem/include/JSystem/JUtility/JUTVideo.h similarity index 96% rename from include/JSystem/JUtility/JUTVideo.h rename to libs/JSystem/include/JSystem/JUtility/JUTVideo.h index 3c3eeeadaa7..856d8338477 100644 --- a/include/JSystem/JUtility/JUTVideo.h +++ b/libs/JSystem/include/JSystem/JUtility/JUTVideo.h @@ -1,9 +1,9 @@ #ifndef JUTVIDEO_H #define JUTVIDEO_H -#include -#include -#include +#include +#include +#include typedef u8 (*Pattern)[2]; diff --git a/include/JSystem/JUtility/JUTXfb.h b/libs/JSystem/include/JSystem/JUtility/JUTXfb.h similarity index 100% rename from include/JSystem/JUtility/JUTXfb.h rename to libs/JSystem/include/JSystem/JUtility/JUTXfb.h diff --git a/include/JSystem/JUtility/TColor.h b/libs/JSystem/include/JSystem/JUtility/TColor.h similarity index 96% rename from include/JSystem/JUtility/TColor.h rename to libs/JSystem/include/JSystem/JUtility/TColor.h index 0f2a684289f..fdeadec5d43 100644 --- a/include/JSystem/JUtility/TColor.h +++ b/libs/JSystem/include/JSystem/JUtility/TColor.h @@ -1,7 +1,7 @@ #ifndef TCOLOR_H #define TCOLOR_H -#include +#include namespace JUtility { diff --git a/include/JSystem/TPosition3.h b/libs/JSystem/include/JSystem/TPosition3.h similarity index 98% rename from include/JSystem/TPosition3.h rename to libs/JSystem/include/JSystem/TPosition3.h index 7a8094e45e7..0e973c9c504 100644 --- a/include/JSystem/TPosition3.h +++ b/libs/JSystem/include/JSystem/TPosition3.h @@ -1,7 +1,7 @@ #ifndef TPOSITION3_H #define TPOSITION3_H -#include +#include #include "JSystem/JMath/JMath.h" #include "JSystem/JGeometry.h" diff --git a/src/JSystem/J2DGraph/J2DAnimation.cpp b/libs/JSystem/src/J2DGraph/J2DAnimation.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DAnimation.cpp rename to libs/JSystem/src/J2DGraph/J2DAnimation.cpp index 9a0405c4d9c..5d898b55f97 100644 --- a/src/JSystem/J2DGraph/J2DAnimation.cpp +++ b/libs/JSystem/src/J2DGraph/J2DAnimation.cpp @@ -6,7 +6,7 @@ #include "JSystem/J3DGraphBase/J3DTransform.h" #include "JSystem/JUtility/JUTPalette.h" #include "JSystem/JUtility/JUTResource.h" -#include +#include template f32 J2DGetKeyFrameInterpolation(f32 param_0, J3DAnmKeyTableBase* param_1, T* param_2) { diff --git a/src/JSystem/J2DGraph/J2DAnmLoader.cpp b/libs/JSystem/src/J2DGraph/J2DAnmLoader.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DAnmLoader.cpp rename to libs/JSystem/src/J2DGraph/J2DAnmLoader.cpp diff --git a/src/JSystem/J2DGraph/J2DGrafContext.cpp b/libs/JSystem/src/J2DGraph/J2DGrafContext.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DGrafContext.cpp rename to libs/JSystem/src/J2DGraph/J2DGrafContext.cpp index 9f676cd7e5f..3ac3e5d197e 100644 --- a/src/JSystem/J2DGraph/J2DGrafContext.cpp +++ b/libs/JSystem/src/J2DGraph/J2DGrafContext.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DGrafContext.h" -#include +#include J2DGrafContext::J2DGrafContext(f32 x, f32 y, f32 width, f32 height) : mBounds(x, y, x + width, y + height), mScissorBounds(x, y, x + width, y + height) { diff --git a/src/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/src/J2DGraph/J2DManage.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DManage.cpp rename to libs/JSystem/src/J2DGraph/J2DManage.cpp diff --git a/src/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/src/J2DGraph/J2DMatBlock.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DMatBlock.cpp rename to libs/JSystem/src/J2DGraph/J2DMatBlock.cpp index 9bb4f87572c..1bf28751ac2 100644 --- a/src/JSystem/J2DGraph/J2DMatBlock.cpp +++ b/libs/JSystem/src/J2DGraph/J2DMatBlock.cpp @@ -5,7 +5,7 @@ #include "JSystem/JUtility/JUTPalette.h" #include "JSystem/JUtility/JUTResFont.h" #include "JSystem/JUtility/JUTTexture.h" -#include +#include void J2DColorBlock::initialize() { for (int i = 0; i < 2; i++) { diff --git a/src/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/src/J2DGraph/J2DMaterial.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DMaterial.cpp rename to libs/JSystem/src/J2DGraph/J2DMaterial.cpp diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/src/J2DGraph/J2DMaterialFactory.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DMaterialFactory.cpp rename to libs/JSystem/src/J2DGraph/J2DMaterialFactory.cpp index 156a0926158..bdc552810ef 100644 --- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/libs/JSystem/src/J2DGraph/J2DMaterialFactory.cpp @@ -6,7 +6,7 @@ #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTResource.h" #include -#include +#include J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) { field_0x0 = param_0.field_0x8; diff --git a/src/JSystem/J2DGraph/J2DOrthoGraph.cpp b/libs/JSystem/src/J2DGraph/J2DOrthoGraph.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DOrthoGraph.cpp rename to libs/JSystem/src/J2DGraph/J2DOrthoGraph.cpp index 5cd6778572d..18309118025 100644 --- a/src/JSystem/J2DGraph/J2DOrthoGraph.cpp +++ b/libs/JSystem/src/J2DGraph/J2DOrthoGraph.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DOrthoGraph.h" -#include +#include J2DOrthoGraph::J2DOrthoGraph() : J2DGrafContext(0, 0, 0, 0) { this->setLookat(); diff --git a/src/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/src/J2DGraph/J2DPane.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DPane.cpp rename to libs/JSystem/src/J2DGraph/J2DPane.cpp diff --git a/src/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/src/J2DGraph/J2DPicture.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DPicture.cpp rename to libs/JSystem/src/J2DGraph/J2DPicture.cpp index 65ce621e404..95176e6e561 100644 --- a/src/JSystem/J2DGraph/J2DPicture.cpp +++ b/libs/JSystem/src/J2DGraph/J2DPicture.cpp @@ -7,7 +7,7 @@ #include "JSystem/JUtility/JUTTexture.h" #include "JSystem/JUtility/JUTResource.h" #include "JSystem/JSupport/JSURandomInputStream.h" -#include +#include J2DPicture::J2DPicture() : mPalette(NULL) { for (u32 i = 0; i < 2; i++) { diff --git a/src/JSystem/J2DGraph/J2DPictureEx.cpp b/libs/JSystem/src/J2DGraph/J2DPictureEx.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DPictureEx.cpp rename to libs/JSystem/src/J2DGraph/J2DPictureEx.cpp index bf2ea7168a1..549aa15be11 100644 --- a/src/JSystem/J2DGraph/J2DPictureEx.cpp +++ b/libs/JSystem/src/J2DGraph/J2DPictureEx.cpp @@ -5,7 +5,7 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/JSupport/JSURandomInputStream.h" #include "JSystem/JUtility/JUTTexture.h" -#include +#include void J2DPictureEx::initiate(ResTIMG const* param_0, ResTLUT const* param_1) { u32 texGenNum = mMaterial->getTexGenBlock()->getTexGenNum(); diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/src/J2DGraph/J2DPrint.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DPrint.cpp rename to libs/JSystem/src/J2DGraph/J2DPrint.cpp diff --git a/src/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/src/J2DGraph/J2DScreen.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DScreen.cpp rename to libs/JSystem/src/J2DGraph/J2DScreen.cpp index 37c9aef084d..3dcf6fe5b2a 100644 --- a/src/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/src/J2DGraph/J2DScreen.cpp @@ -9,7 +9,7 @@ #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSUMemoryStream.h" -#include +#include J2DScreen::J2DScreen() : J2DPane(NULL, true, 'root', JGeometry::TBox2(JGeometry::TVec2(0, 0), JGeometry::TVec2(640, 480))), mColor() { diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/libs/JSystem/src/J2DGraph/J2DTevs.cpp similarity index 99% rename from src/JSystem/J2DGraph/J2DTevs.cpp rename to libs/JSystem/src/J2DGraph/J2DTevs.cpp index fc9306507a8..870a33590c3 100644 --- a/src/JSystem/J2DGraph/J2DTevs.cpp +++ b/libs/JSystem/src/J2DGraph/J2DTevs.cpp @@ -7,7 +7,7 @@ #include "JSystem/J2DGraph/J2DTevs.h" #include "JSystem/J2DGraph/J2DMaterial.h" #include -#include +#include void J2DTexMtx::load(u32 mtxIdx) { GXLoadTexMtxImm(mTexMtx, mtxIdx * 3 + GX_TEXMTX0, (GXTexMtxType)mInfo.mTexMtxType); diff --git a/src/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/src/J2DGraph/J2DTextBox.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DTextBox.cpp rename to libs/JSystem/src/J2DGraph/J2DTextBox.cpp diff --git a/src/JSystem/J2DGraph/J2DTextBoxEx.cpp b/libs/JSystem/src/J2DGraph/J2DTextBoxEx.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DTextBoxEx.cpp rename to libs/JSystem/src/J2DGraph/J2DTextBoxEx.cpp diff --git a/src/JSystem/J2DGraph/J2DWindow.cpp b/libs/JSystem/src/J2DGraph/J2DWindow.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DWindow.cpp rename to libs/JSystem/src/J2DGraph/J2DWindow.cpp diff --git a/src/JSystem/J2DGraph/J2DWindowEx.cpp b/libs/JSystem/src/J2DGraph/J2DWindowEx.cpp similarity index 100% rename from src/JSystem/J2DGraph/J2DWindowEx.cpp rename to libs/JSystem/src/J2DGraph/J2DWindowEx.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DAnimation.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DAnimation.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DAnimation.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DCluster.cpp similarity index 99% rename from src/JSystem/J3DGraphAnimator/J3DCluster.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DCluster.cpp index 3f6398fda8e..d5bd1977a97 100644 --- a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp +++ b/libs/JSystem/src/J3DGraphAnimator/J3DCluster.cpp @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/JMath/JMATrigonometric.h" -#include +#include J3DDeformData::J3DDeformData() { mClusterNum = 0; diff --git a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DJoint.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DJoint.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DJoint.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DJointTree.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DJointTree.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DJointTree.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DMaterialAnm.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DMaterialAnm.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DMaterialAttach.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DMaterialAttach.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DModel.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DModel.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DModel.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DModel.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DModelData.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DModelData.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DModelData.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DModelData.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DMtxBuffer.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DMtxBuffer.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DShapeTable.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DShapeTable.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DShapeTable.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DShapeTable.cpp diff --git a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/libs/JSystem/src/J3DGraphAnimator/J3DSkinDeform.cpp similarity index 100% rename from src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp rename to libs/JSystem/src/J3DGraphAnimator/J3DSkinDeform.cpp diff --git a/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp b/libs/JSystem/src/J3DGraphBase/J3DDrawBuffer.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp rename to libs/JSystem/src/J3DGraphBase/J3DDrawBuffer.cpp diff --git a/src/JSystem/J3DGraphBase/J3DGD.cpp b/libs/JSystem/src/J3DGraphBase/J3DGD.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DGD.cpp rename to libs/JSystem/src/J3DGraphBase/J3DGD.cpp diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/libs/JSystem/src/J3DGraphBase/J3DMatBlock.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DMatBlock.cpp rename to libs/JSystem/src/J3DGraphBase/J3DMatBlock.cpp diff --git a/src/JSystem/J3DGraphBase/J3DMaterial.cpp b/libs/JSystem/src/J3DGraphBase/J3DMaterial.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DMaterial.cpp rename to libs/JSystem/src/J3DGraphBase/J3DMaterial.cpp diff --git a/src/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/src/J3DGraphBase/J3DPacket.cpp similarity index 99% rename from src/JSystem/J3DGraphBase/J3DPacket.cpp rename to libs/JSystem/src/J3DGraphBase/J3DPacket.cpp index 5eb6e773926..71ddc165fc1 100644 --- a/src/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/libs/JSystem/src/J3DGraphBase/J3DPacket.cpp @@ -6,7 +6,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphBase/J3DShapeMtx.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include #include #include "global.h" diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/libs/JSystem/src/J3DGraphBase/J3DShape.cpp similarity index 99% rename from src/JSystem/J3DGraphBase/J3DShape.cpp rename to libs/JSystem/src/J3DGraphBase/J3DShape.cpp index 1cf379df4e0..0180ed8f827 100644 --- a/src/JSystem/J3DGraphBase/J3DShape.cpp +++ b/libs/JSystem/src/J3DGraphBase/J3DShape.cpp @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphBase/J3DPacket.h" #include "JSystem/J3DGraphBase/J3DVertex.h" #include "JSystem/J3DGraphBase/J3DFifo.h" -#include +#include void J3DGDSetVtxAttrFmtv(_GXVtxFmt, GXVtxAttrFmtList const*, bool); void J3DFifoLoadPosMtxImm(Mtx, u32); diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/libs/JSystem/src/J3DGraphBase/J3DShapeDraw.cpp similarity index 98% rename from src/JSystem/J3DGraphBase/J3DShapeDraw.cpp rename to libs/JSystem/src/J3DGraphBase/J3DShapeDraw.cpp index 94d4534a82c..8cbde85d079 100644 --- a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/libs/JSystem/src/J3DGraphBase/J3DShapeDraw.cpp @@ -4,7 +4,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include #include -#include +#include u32 J3DShapeDraw::countVertex(u32 stride) { u32 count = 0; diff --git a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/libs/JSystem/src/J3DGraphBase/J3DShapeMtx.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DShapeMtx.cpp rename to libs/JSystem/src/J3DGraphBase/J3DShapeMtx.cpp diff --git a/src/JSystem/J3DGraphBase/J3DStruct.cpp b/libs/JSystem/src/J3DGraphBase/J3DStruct.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DStruct.cpp rename to libs/JSystem/src/J3DGraphBase/J3DStruct.cpp diff --git a/src/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/src/J3DGraphBase/J3DSys.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DSys.cpp rename to libs/JSystem/src/J3DGraphBase/J3DSys.cpp diff --git a/src/JSystem/J3DGraphBase/J3DTevs.cpp b/libs/JSystem/src/J3DGraphBase/J3DTevs.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DTevs.cpp rename to libs/JSystem/src/J3DGraphBase/J3DTevs.cpp diff --git a/src/JSystem/J3DGraphBase/J3DTexture.cpp b/libs/JSystem/src/J3DGraphBase/J3DTexture.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DTexture.cpp rename to libs/JSystem/src/J3DGraphBase/J3DTexture.cpp diff --git a/src/JSystem/J3DGraphBase/J3DTransform.cpp b/libs/JSystem/src/J3DGraphBase/J3DTransform.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DTransform.cpp rename to libs/JSystem/src/J3DGraphBase/J3DTransform.cpp diff --git a/src/JSystem/J3DGraphBase/J3DVertex.cpp b/libs/JSystem/src/J3DGraphBase/J3DVertex.cpp similarity index 100% rename from src/JSystem/J3DGraphBase/J3DVertex.cpp rename to libs/JSystem/src/J3DGraphBase/J3DVertex.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/libs/JSystem/src/J3DGraphLoader/J3DAnmLoader.cpp similarity index 99% rename from src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DAnmLoader.cpp index daef72afec8..6f80bedea3f 100644 --- a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp +++ b/libs/JSystem/src/J3DGraphLoader/J3DAnmLoader.cpp @@ -7,7 +7,7 @@ #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" #include "JSystem/J3DGraphAnimator/J3DAnimation.h" #include "JSystem/JSupport/JSupport.h" -#include +#include J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseFlag flag) { const JUTDataFileHeader* header = (const JUTDataFileHeader*)i_data; diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/libs/JSystem/src/J3DGraphLoader/J3DClusterLoader.cpp similarity index 99% rename from src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DClusterLoader.cpp index a4097a8884e..147bce05d67 100644 --- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/libs/JSystem/src/J3DGraphLoader/J3DClusterLoader.cpp @@ -8,7 +8,7 @@ #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h" #include "JSystem/JSupport/JSupport.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include #include void* J3DClusterLoaderDataBase::load(const void* i_data) { diff --git a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp b/libs/JSystem/src/J3DGraphLoader/J3DJointFactory.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DJointFactory.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DJointFactory.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/libs/JSystem/src/J3DGraphLoader/J3DMaterialFactory.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DMaterialFactory.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/libs/JSystem/src/J3DGraphLoader/J3DMaterialFactory_v21.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DMaterialFactory_v21.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/libs/JSystem/src/J3DGraphLoader/J3DModelLoader.cpp similarity index 100% rename from src/JSystem/J3DGraphLoader/J3DModelLoader.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DModelLoader.cpp diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/libs/JSystem/src/J3DGraphLoader/J3DModelLoaderCalcSize.cpp similarity index 99% rename from src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DModelLoaderCalcSize.cpp index 2fbe4a0c771..2e6f7e586c3 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp +++ b/libs/JSystem/src/J3DGraphLoader/J3DModelLoaderCalcSize.cpp @@ -8,7 +8,7 @@ #include "JSystem/J3DGraphAnimator/J3DJoint.h" #include "JSystem/J3DGraphAnimator/J3DModelData.h" #include "JSystem/JSupport/JSupport.h" -#include +#include #include "global.h" u16 J3DModelLoader::countMaterialNum(const void* stream) { diff --git a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/libs/JSystem/src/J3DGraphLoader/J3DShapeFactory.cpp similarity index 99% rename from src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp rename to libs/JSystem/src/J3DGraphLoader/J3DShapeFactory.cpp index a37319a74ca..ad7f1189db7 100644 --- a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp +++ b/libs/JSystem/src/J3DGraphLoader/J3DShapeFactory.cpp @@ -5,7 +5,7 @@ #include "JSystem/J3DGraphBase/J3DShapeMtx.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSupport.h" -#include +#include #include "global.h" J3DShapeFactory::J3DShapeFactory(J3DShapeBlock const& block) { diff --git a/src/JSystem/J3DU/J3DUClipper.cpp b/libs/JSystem/src/J3DU/J3DUClipper.cpp similarity index 100% rename from src/JSystem/J3DU/J3DUClipper.cpp rename to libs/JSystem/src/J3DU/J3DUClipper.cpp diff --git a/src/JSystem/J3DU/J3DUDL.cpp b/libs/JSystem/src/J3DU/J3DUDL.cpp similarity index 100% rename from src/JSystem/J3DU/J3DUDL.cpp rename to libs/JSystem/src/J3DU/J3DUDL.cpp diff --git a/src/JSystem/J3DU/J3DUFur.cpp b/libs/JSystem/src/J3DU/J3DUFur.cpp similarity index 100% rename from src/JSystem/J3DU/J3DUFur.cpp rename to libs/JSystem/src/J3DU/J3DUFur.cpp diff --git a/src/JSystem/J3DU/J3DUMotion.cpp b/libs/JSystem/src/J3DU/J3DUMotion.cpp similarity index 100% rename from src/JSystem/J3DU/J3DUMotion.cpp rename to libs/JSystem/src/J3DU/J3DUMotion.cpp diff --git a/src/JSystem/J3DU/J3DUShadow.cpp b/libs/JSystem/src/J3DU/J3DUShadow.cpp similarity index 100% rename from src/JSystem/J3DU/J3DUShadow.cpp rename to libs/JSystem/src/J3DU/J3DUShadow.cpp diff --git a/src/JSystem/JAHostIO/JAHioMessage.cpp b/libs/JSystem/src/JAHostIO/JAHioMessage.cpp similarity index 100% rename from src/JSystem/JAHostIO/JAHioMessage.cpp rename to libs/JSystem/src/JAHostIO/JAHioMessage.cpp diff --git a/src/JSystem/JAHostIO/JAHioMgr.cpp b/libs/JSystem/src/JAHostIO/JAHioMgr.cpp similarity index 100% rename from src/JSystem/JAHostIO/JAHioMgr.cpp rename to libs/JSystem/src/JAHostIO/JAHioMgr.cpp diff --git a/src/JSystem/JAHostIO/JAHioNode.cpp b/libs/JSystem/src/JAHostIO/JAHioNode.cpp similarity index 100% rename from src/JSystem/JAHostIO/JAHioNode.cpp rename to libs/JSystem/src/JAHostIO/JAHioNode.cpp diff --git a/src/JSystem/JAHostIO/JAHioUtil.cpp b/libs/JSystem/src/JAHostIO/JAHioUtil.cpp similarity index 100% rename from src/JSystem/JAHostIO/JAHioUtil.cpp rename to libs/JSystem/src/JAHostIO/JAHioUtil.cpp diff --git a/src/JSystem/JAWExtSystem/JAWExtSystem.cpp b/libs/JSystem/src/JAWExtSystem/JAWExtSystem.cpp similarity index 100% rename from src/JSystem/JAWExtSystem/JAWExtSystem.cpp rename to libs/JSystem/src/JAWExtSystem/JAWExtSystem.cpp diff --git a/src/JSystem/JAWExtSystem/JAWGraphContext.cpp b/libs/JSystem/src/JAWExtSystem/JAWGraphContext.cpp similarity index 100% rename from src/JSystem/JAWExtSystem/JAWGraphContext.cpp rename to libs/JSystem/src/JAWExtSystem/JAWGraphContext.cpp diff --git a/src/JSystem/JAWExtSystem/JAWSystem.cpp b/libs/JSystem/src/JAWExtSystem/JAWSystem.cpp similarity index 100% rename from src/JSystem/JAWExtSystem/JAWSystem.cpp rename to libs/JSystem/src/JAWExtSystem/JAWSystem.cpp diff --git a/src/JSystem/JAWExtSystem/JAWWindow.cpp b/libs/JSystem/src/JAWExtSystem/JAWWindow.cpp similarity index 100% rename from src/JSystem/JAWExtSystem/JAWWindow.cpp rename to libs/JSystem/src/JAWExtSystem/JAWWindow.cpp diff --git a/src/JSystem/JAWExtSystem/JAWWindow3D.cpp b/libs/JSystem/src/JAWExtSystem/JAWWindow3D.cpp similarity index 100% rename from src/JSystem/JAWExtSystem/JAWWindow3D.cpp rename to libs/JSystem/src/JAWExtSystem/JAWWindow3D.cpp diff --git a/src/JSystem/JAudio2/JAIAudible.cpp b/libs/JSystem/src/JAudio2/JAIAudible.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIAudible.cpp rename to libs/JSystem/src/JAudio2/JAIAudible.cpp diff --git a/src/JSystem/JAudio2/JAIAudience.cpp b/libs/JSystem/src/JAudio2/JAIAudience.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIAudience.cpp rename to libs/JSystem/src/JAudio2/JAIAudience.cpp diff --git a/src/JSystem/JAudio2/JAISe.cpp b/libs/JSystem/src/JAudio2/JAISe.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISe.cpp rename to libs/JSystem/src/JAudio2/JAISe.cpp diff --git a/src/JSystem/JAudio2/JAISeMgr.cpp b/libs/JSystem/src/JAudio2/JAISeMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISeMgr.cpp rename to libs/JSystem/src/JAudio2/JAISeMgr.cpp diff --git a/src/JSystem/JAudio2/JAISeq.cpp b/libs/JSystem/src/JAudio2/JAISeq.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISeq.cpp rename to libs/JSystem/src/JAudio2/JAISeq.cpp diff --git a/src/JSystem/JAudio2/JAISeqDataMgr.cpp b/libs/JSystem/src/JAudio2/JAISeqDataMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISeqDataMgr.cpp rename to libs/JSystem/src/JAudio2/JAISeqDataMgr.cpp diff --git a/src/JSystem/JAudio2/JAISeqMgr.cpp b/libs/JSystem/src/JAudio2/JAISeqMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISeqMgr.cpp rename to libs/JSystem/src/JAudio2/JAISeqMgr.cpp diff --git a/src/JSystem/JAudio2/JAISound.cpp b/libs/JSystem/src/JAudio2/JAISound.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISound.cpp rename to libs/JSystem/src/JAudio2/JAISound.cpp diff --git a/src/JSystem/JAudio2/JAISoundChild.cpp b/libs/JSystem/src/JAudio2/JAISoundChild.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundChild.cpp rename to libs/JSystem/src/JAudio2/JAISoundChild.cpp diff --git a/src/JSystem/JAudio2/JAISoundHandles.cpp b/libs/JSystem/src/JAudio2/JAISoundHandles.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundHandles.cpp rename to libs/JSystem/src/JAudio2/JAISoundHandles.cpp diff --git a/src/JSystem/JAudio2/JAISoundInfo.cpp b/libs/JSystem/src/JAudio2/JAISoundInfo.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundInfo.cpp rename to libs/JSystem/src/JAudio2/JAISoundInfo.cpp diff --git a/src/JSystem/JAudio2/JAISoundParams.cpp b/libs/JSystem/src/JAudio2/JAISoundParams.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundParams.cpp rename to libs/JSystem/src/JAudio2/JAISoundParams.cpp diff --git a/src/JSystem/JAudio2/JAISoundStarter.cpp b/libs/JSystem/src/JAudio2/JAISoundStarter.cpp similarity index 100% rename from src/JSystem/JAudio2/JAISoundStarter.cpp rename to libs/JSystem/src/JAudio2/JAISoundStarter.cpp diff --git a/src/JSystem/JAudio2/JAIStream.cpp b/libs/JSystem/src/JAudio2/JAIStream.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIStream.cpp rename to libs/JSystem/src/JAudio2/JAIStream.cpp diff --git a/src/JSystem/JAudio2/JAIStreamDataMgr.cpp b/libs/JSystem/src/JAudio2/JAIStreamDataMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIStreamDataMgr.cpp rename to libs/JSystem/src/JAudio2/JAIStreamDataMgr.cpp diff --git a/src/JSystem/JAudio2/JAIStreamMgr.cpp b/libs/JSystem/src/JAudio2/JAIStreamMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAIStreamMgr.cpp rename to libs/JSystem/src/JAudio2/JAIStreamMgr.cpp diff --git a/src/JSystem/JAudio2/JASAiCtrl.cpp b/libs/JSystem/src/JAudio2/JASAiCtrl.cpp similarity index 99% rename from src/JSystem/JAudio2/JASAiCtrl.cpp rename to libs/JSystem/src/JAudio2/JASAiCtrl.cpp index f4cdfa4d46c..ad98c2b08bf 100644 --- a/src/JSystem/JAudio2/JASAiCtrl.cpp +++ b/libs/JSystem/src/JAudio2/JASAiCtrl.cpp @@ -14,8 +14,8 @@ #include "JSystem/JAudio2/JASLfo.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include -#include +#include +#include #include s16* JASDriver::sDmaDacBuffer[3]; diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/libs/JSystem/src/JAudio2/JASAramStream.cpp similarity index 100% rename from src/JSystem/JAudio2/JASAramStream.cpp rename to libs/JSystem/src/JAudio2/JASAramStream.cpp diff --git a/src/JSystem/JAudio2/JASAudioReseter.cpp b/libs/JSystem/src/JAudio2/JASAudioReseter.cpp similarity index 98% rename from src/JSystem/JAudio2/JASAudioReseter.cpp rename to libs/JSystem/src/JAudio2/JASAudioReseter.cpp index 9ef9f57b312..4d4f3517c17 100644 --- a/src/JSystem/JAudio2/JASAudioReseter.cpp +++ b/libs/JSystem/src/JAudio2/JASAudioReseter.cpp @@ -5,7 +5,7 @@ #include "JSystem/JAudio2/JASCriticalSection.h" #include "JSystem/JAudio2/JASDriverIF.h" #include "JSystem/JAudio2/JASDSPChannel.h" -#include +#include JASAudioReseter::JASAudioReseter() { field_0x0 = 0; diff --git a/src/JSystem/JAudio2/JASAudioThread.cpp b/libs/JSystem/src/JAudio2/JASAudioThread.cpp similarity index 99% rename from src/JSystem/JAudio2/JASAudioThread.cpp rename to libs/JSystem/src/JAudio2/JASAudioThread.cpp index 0277f00804a..be06ff53888 100644 --- a/src/JSystem/JAudio2/JASAudioThread.cpp +++ b/libs/JSystem/src/JAudio2/JASAudioThread.cpp @@ -9,7 +9,7 @@ #include "JSystem/JAudio2/JASProbe.h" #include "JSystem/JAudio2/JASReport.h" #include "JSystem/JKernel/JKRSolidHeap.h" -#include +#include #include JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority) diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/libs/JSystem/src/JAudio2/JASBNKParser.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBNKParser.cpp rename to libs/JSystem/src/JAudio2/JASBNKParser.cpp diff --git a/src/JSystem/JAudio2/JASBank.cpp b/libs/JSystem/src/JAudio2/JASBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBank.cpp rename to libs/JSystem/src/JAudio2/JASBank.cpp diff --git a/src/JSystem/JAudio2/JASBasicBank.cpp b/libs/JSystem/src/JAudio2/JASBasicBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBasicBank.cpp rename to libs/JSystem/src/JAudio2/JASBasicBank.cpp diff --git a/src/JSystem/JAudio2/JASBasicInst.cpp b/libs/JSystem/src/JAudio2/JASBasicInst.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBasicInst.cpp rename to libs/JSystem/src/JAudio2/JASBasicInst.cpp diff --git a/src/JSystem/JAudio2/JASBasicWaveBank.cpp b/libs/JSystem/src/JAudio2/JASBasicWaveBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASBasicWaveBank.cpp rename to libs/JSystem/src/JAudio2/JASBasicWaveBank.cpp diff --git a/src/JSystem/JAudio2/JASCalc.cpp b/libs/JSystem/src/JAudio2/JASCalc.cpp similarity index 100% rename from src/JSystem/JAudio2/JASCalc.cpp rename to libs/JSystem/src/JAudio2/JASCalc.cpp diff --git a/src/JSystem/JAudio2/JASCallback.cpp b/libs/JSystem/src/JAudio2/JASCallback.cpp similarity index 100% rename from src/JSystem/JAudio2/JASCallback.cpp rename to libs/JSystem/src/JAudio2/JASCallback.cpp diff --git a/src/JSystem/JAudio2/JASChannel.cpp b/libs/JSystem/src/JAudio2/JASChannel.cpp similarity index 100% rename from src/JSystem/JAudio2/JASChannel.cpp rename to libs/JSystem/src/JAudio2/JASChannel.cpp diff --git a/src/JSystem/JAudio2/JASCmdStack.cpp b/libs/JSystem/src/JAudio2/JASCmdStack.cpp similarity index 98% rename from src/JSystem/JAudio2/JASCmdStack.cpp rename to libs/JSystem/src/JAudio2/JASCmdStack.cpp index 22b5a340e1a..beaeee492e9 100644 --- a/src/JSystem/JAudio2/JASCmdStack.cpp +++ b/libs/JSystem/src/JAudio2/JASCmdStack.cpp @@ -6,7 +6,7 @@ #include "JSystem/JAudio2/JASCmdStack.h" #include "JSystem/JAudio2/JASCriticalSection.h" -#include +#include JASPortCmd::TPortHead JASPortCmd::sCommandListOnce; diff --git a/src/JSystem/JAudio2/JASDSPChannel.cpp b/libs/JSystem/src/JAudio2/JASDSPChannel.cpp similarity index 100% rename from src/JSystem/JAudio2/JASDSPChannel.cpp rename to libs/JSystem/src/JAudio2/JASDSPChannel.cpp diff --git a/src/JSystem/JAudio2/JASDSPInterface.cpp b/libs/JSystem/src/JAudio2/JASDSPInterface.cpp similarity index 99% rename from src/JSystem/JAudio2/JASDSPInterface.cpp rename to libs/JSystem/src/JAudio2/JASDSPInterface.cpp index f4e85d1bd59..e9dfd0d45d5 100644 --- a/src/JSystem/JAudio2/JASDSPInterface.cpp +++ b/libs/JSystem/src/JAudio2/JASDSPInterface.cpp @@ -9,7 +9,7 @@ #include "JSystem/JAudio2/osdsp_task.h" #include "JSystem/JAudio2/JASCriticalSection.h" #include "JSystem/JKernel/JKRSolidHeap.h" -#include +#include JASDsp::TChannel* JASDsp::CH_BUF; diff --git a/src/JSystem/JAudio2/JASDriverIF.cpp b/libs/JSystem/src/JAudio2/JASDriverIF.cpp similarity index 98% rename from src/JSystem/JAudio2/JASDriverIF.cpp rename to libs/JSystem/src/JAudio2/JASDriverIF.cpp index 083a969413a..2c9f305b614 100644 --- a/src/JSystem/JAudio2/JASDriverIF.cpp +++ b/libs/JSystem/src/JAudio2/JASDriverIF.cpp @@ -3,7 +3,7 @@ #include "JSystem/JAudio2/JASDriverIF.h" #include "JSystem/JAudio2/JASAiCtrl.h" #include "JSystem/JAudio2/JASDSPInterface.h" -#include +#include void JASDriver::setDSPLevel(f32 param_0) { JASDsp::setDSPMixerLevel(param_0); diff --git a/src/JSystem/JAudio2/JASDrumSet.cpp b/libs/JSystem/src/JAudio2/JASDrumSet.cpp similarity index 100% rename from src/JSystem/JAudio2/JASDrumSet.cpp rename to libs/JSystem/src/JAudio2/JASDrumSet.cpp diff --git a/src/JSystem/JAudio2/JASDvdThread.cpp b/libs/JSystem/src/JAudio2/JASDvdThread.cpp similarity index 100% rename from src/JSystem/JAudio2/JASDvdThread.cpp rename to libs/JSystem/src/JAudio2/JASDvdThread.cpp diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/libs/JSystem/src/JAudio2/JASHeapCtrl.cpp similarity index 99% rename from src/JSystem/JAudio2/JASHeapCtrl.cpp rename to libs/JSystem/src/JAudio2/JASHeapCtrl.cpp index 44abd98ba47..453fa24a855 100644 --- a/src/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/libs/JSystem/src/JAudio2/JASHeapCtrl.cpp @@ -6,7 +6,12 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JUtility/JUTAssert.h" + +#ifdef __REVOLUTION_SDK__ +#include +#else #include +#endif JASHeap::JASHeap(JASDisposer* disposer) : mTree(this) { mDisposer = disposer; diff --git a/src/JSystem/JAudio2/JASLfo.cpp b/libs/JSystem/src/JAudio2/JASLfo.cpp similarity index 100% rename from src/JSystem/JAudio2/JASLfo.cpp rename to libs/JSystem/src/JAudio2/JASLfo.cpp diff --git a/src/JSystem/JAudio2/JASOscillator.cpp b/libs/JSystem/src/JAudio2/JASOscillator.cpp similarity index 100% rename from src/JSystem/JAudio2/JASOscillator.cpp rename to libs/JSystem/src/JAudio2/JASOscillator.cpp diff --git a/src/JSystem/JAudio2/JASProbe.cpp b/libs/JSystem/src/JAudio2/JASProbe.cpp similarity index 100% rename from src/JSystem/JAudio2/JASProbe.cpp rename to libs/JSystem/src/JAudio2/JASProbe.cpp diff --git a/src/JSystem/JAudio2/JASRegisterParam.cpp b/libs/JSystem/src/JAudio2/JASRegisterParam.cpp similarity index 100% rename from src/JSystem/JAudio2/JASRegisterParam.cpp rename to libs/JSystem/src/JAudio2/JASRegisterParam.cpp diff --git a/src/JSystem/JAudio2/JASReport.cpp b/libs/JSystem/src/JAudio2/JASReport.cpp similarity index 100% rename from src/JSystem/JAudio2/JASReport.cpp rename to libs/JSystem/src/JAudio2/JASReport.cpp diff --git a/src/JSystem/JAudio2/JASResArcLoader.cpp b/libs/JSystem/src/JAudio2/JASResArcLoader.cpp similarity index 100% rename from src/JSystem/JAudio2/JASResArcLoader.cpp rename to libs/JSystem/src/JAudio2/JASResArcLoader.cpp diff --git a/src/JSystem/JAudio2/JASSeqCtrl.cpp b/libs/JSystem/src/JAudio2/JASSeqCtrl.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSeqCtrl.cpp rename to libs/JSystem/src/JAudio2/JASSeqCtrl.cpp diff --git a/src/JSystem/JAudio2/JASSeqParser.cpp b/libs/JSystem/src/JAudio2/JASSeqParser.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSeqParser.cpp rename to libs/JSystem/src/JAudio2/JASSeqParser.cpp diff --git a/src/JSystem/JAudio2/JASSeqReader.cpp b/libs/JSystem/src/JAudio2/JASSeqReader.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSeqReader.cpp rename to libs/JSystem/src/JAudio2/JASSeqReader.cpp diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/libs/JSystem/src/JAudio2/JASSimpleWaveBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSimpleWaveBank.cpp rename to libs/JSystem/src/JAudio2/JASSimpleWaveBank.cpp diff --git a/src/JSystem/JAudio2/JASSoundParams.cpp b/libs/JSystem/src/JAudio2/JASSoundParams.cpp similarity index 100% rename from src/JSystem/JAudio2/JASSoundParams.cpp rename to libs/JSystem/src/JAudio2/JASSoundParams.cpp diff --git a/src/JSystem/JAudio2/JASTaskThread.cpp b/libs/JSystem/src/JAudio2/JASTaskThread.cpp similarity index 100% rename from src/JSystem/JAudio2/JASTaskThread.cpp rename to libs/JSystem/src/JAudio2/JASTaskThread.cpp diff --git a/src/JSystem/JAudio2/JASTrack.cpp b/libs/JSystem/src/JAudio2/JASTrack.cpp similarity index 100% rename from src/JSystem/JAudio2/JASTrack.cpp rename to libs/JSystem/src/JAudio2/JASTrack.cpp diff --git a/src/JSystem/JAudio2/JASTrackPort.cpp b/libs/JSystem/src/JAudio2/JASTrackPort.cpp similarity index 100% rename from src/JSystem/JAudio2/JASTrackPort.cpp rename to libs/JSystem/src/JAudio2/JASTrackPort.cpp diff --git a/src/JSystem/JAudio2/JASVoiceBank.cpp b/libs/JSystem/src/JAudio2/JASVoiceBank.cpp similarity index 100% rename from src/JSystem/JAudio2/JASVoiceBank.cpp rename to libs/JSystem/src/JAudio2/JASVoiceBank.cpp diff --git a/src/JSystem/JAudio2/JASWSParser.cpp b/libs/JSystem/src/JAudio2/JASWSParser.cpp similarity index 100% rename from src/JSystem/JAudio2/JASWSParser.cpp rename to libs/JSystem/src/JAudio2/JASWSParser.cpp diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp similarity index 99% rename from src/JSystem/JAudio2/JASWaveArcLoader.cpp rename to libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp index 277933fdb6a..ad1a1e2a765 100644 --- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/libs/JSystem/src/JAudio2/JASWaveArcLoader.cpp @@ -6,7 +6,7 @@ #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRDvdAramRipper.h" #include -#include +#include #include JASHeap* JASWaveArcLoader::sAramHeap; diff --git a/src/JSystem/JAudio2/JAUAudience.cpp b/libs/JSystem/src/JAudio2/JAUAudience.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUAudience.cpp rename to libs/JSystem/src/JAudio2/JAUAudience.cpp diff --git a/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp b/libs/JSystem/src/JAudio2/JAUAudioArcInterpreter.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp rename to libs/JSystem/src/JAudio2/JAUAudioArcInterpreter.cpp diff --git a/src/JSystem/JAudio2/JAUAudioArcLoader.cpp b/libs/JSystem/src/JAudio2/JAUAudioArcLoader.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUAudioArcLoader.cpp rename to libs/JSystem/src/JAudio2/JAUAudioArcLoader.cpp diff --git a/src/JSystem/JAudio2/JAUAudioMgr.cpp b/libs/JSystem/src/JAudio2/JAUAudioMgr.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUAudioMgr.cpp rename to libs/JSystem/src/JAudio2/JAUAudioMgr.cpp diff --git a/src/JSystem/JAudio2/JAUBankTable.cpp b/libs/JSystem/src/JAudio2/JAUBankTable.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUBankTable.cpp rename to libs/JSystem/src/JAudio2/JAUBankTable.cpp diff --git a/src/JSystem/JAudio2/JAUClusterSound.cpp b/libs/JSystem/src/JAudio2/JAUClusterSound.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUClusterSound.cpp rename to libs/JSystem/src/JAudio2/JAUClusterSound.cpp diff --git a/src/JSystem/JAudio2/JAUInitializer.cpp b/libs/JSystem/src/JAudio2/JAUInitializer.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUInitializer.cpp rename to libs/JSystem/src/JAudio2/JAUInitializer.cpp diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/libs/JSystem/src/JAudio2/JAUSectionHeap.cpp similarity index 99% rename from src/JSystem/JAudio2/JAUSectionHeap.cpp rename to libs/JSystem/src/JAudio2/JAUSectionHeap.cpp index eb1f2110708..9bf781b56aa 100644 --- a/src/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/libs/JSystem/src/JAudio2/JAUSectionHeap.cpp @@ -14,7 +14,7 @@ #include "JSystem/JAudio2/JAUSoundTable.h" #include "JSystem/JAudio2/JAUStreamFileTable.h" #include "JSystem/JKernel/JKRSolidHeap.h" -#include +#include #include namespace { diff --git a/src/JSystem/JAudio2/JAUSeqCollection.cpp b/libs/JSystem/src/JAudio2/JAUSeqCollection.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUSeqCollection.cpp rename to libs/JSystem/src/JAudio2/JAUSeqCollection.cpp diff --git a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp b/libs/JSystem/src/JAudio2/JAUSeqDataBlockMgr.cpp similarity index 99% rename from src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp rename to libs/JSystem/src/JAudio2/JAUSeqDataBlockMgr.cpp index 596dfb27425..c90c36e3b8e 100644 --- a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp +++ b/libs/JSystem/src/JAudio2/JAUSeqDataBlockMgr.cpp @@ -7,7 +7,7 @@ #include "JSystem/JAudio2/JAUSeqDataBlockMgr.h" #include "JSystem/JAudio2/JAUSoundInfo.h" #include "JSystem/JAudio2/JASResArcLoader.h" -#include +#include JAUSeqDataBlock::JAUSeqDataBlock() : field_0x0(this) {} diff --git a/src/JSystem/JAudio2/JAUSoundAnimator.cpp b/libs/JSystem/src/JAudio2/JAUSoundAnimator.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUSoundAnimator.cpp rename to libs/JSystem/src/JAudio2/JAUSoundAnimator.cpp diff --git a/src/JSystem/JAudio2/JAUSoundObject.cpp b/libs/JSystem/src/JAudio2/JAUSoundObject.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUSoundObject.cpp rename to libs/JSystem/src/JAudio2/JAUSoundObject.cpp diff --git a/src/JSystem/JAudio2/JAUSoundTable.cpp b/libs/JSystem/src/JAudio2/JAUSoundTable.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUSoundTable.cpp rename to libs/JSystem/src/JAudio2/JAUSoundTable.cpp diff --git a/src/JSystem/JAudio2/JAUStreamFileTable.cpp b/libs/JSystem/src/JAudio2/JAUStreamFileTable.cpp similarity index 100% rename from src/JSystem/JAudio2/JAUStreamFileTable.cpp rename to libs/JSystem/src/JAudio2/JAUStreamFileTable.cpp diff --git a/src/JSystem/JAudio2/dspproc.cpp b/libs/JSystem/src/JAudio2/dspproc.cpp similarity index 100% rename from src/JSystem/JAudio2/dspproc.cpp rename to libs/JSystem/src/JAudio2/dspproc.cpp diff --git a/src/JSystem/JAudio2/dsptask.cpp b/libs/JSystem/src/JAudio2/dsptask.cpp similarity index 100% rename from src/JSystem/JAudio2/dsptask.cpp rename to libs/JSystem/src/JAudio2/dsptask.cpp diff --git a/src/JSystem/JAudio2/osdsp.cpp b/libs/JSystem/src/JAudio2/osdsp.cpp similarity index 94% rename from src/JSystem/JAudio2/osdsp.cpp rename to libs/JSystem/src/JAudio2/osdsp.cpp index f147b6e81b7..a5641a7e6da 100644 --- a/src/JSystem/JAudio2/osdsp.cpp +++ b/libs/JSystem/src/JAudio2/osdsp.cpp @@ -2,8 +2,8 @@ #include "JSystem/JAudio2/osdsp.h" #include "JSystem/JAudio2/osdsp_task.h" -#include -#include +#include +#include extern "C" void __DSP_insert_task(DSPTaskInfo*); extern "C" void __DSP_boot_task(DSPTaskInfo*); diff --git a/src/JSystem/JAudio2/osdsp_task.cpp b/libs/JSystem/src/JAudio2/osdsp_task.cpp similarity index 98% rename from src/JSystem/JAudio2/osdsp_task.cpp rename to libs/JSystem/src/JAudio2/osdsp_task.cpp index 4643d93af8c..d9f49738804 100644 --- a/src/JSystem/JAudio2/osdsp_task.cpp +++ b/libs/JSystem/src/JAudio2/osdsp_task.cpp @@ -2,8 +2,8 @@ #include "JSystem/JAudio2/osdsp_task.h" #include "JSystem/JAudio2/dspproc.h" -#include -#include +#include +#include extern DSPTaskInfo* __DSP_first_task; extern DSPTaskInfo* __DSP_curr_task; diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/src/JFramework/JFWDisplay.cpp similarity index 99% rename from src/JSystem/JFramework/JFWDisplay.cpp rename to libs/JSystem/src/JFramework/JFWDisplay.cpp index eb40c484e4f..bb762db378c 100644 --- a/src/JSystem/JFramework/JFWDisplay.cpp +++ b/libs/JSystem/src/JFramework/JFWDisplay.cpp @@ -6,8 +6,8 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTProcBar.h" -#include -#include +#include +#include #include "global.h" #include diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/libs/JSystem/src/JFramework/JFWSystem.cpp similarity index 100% rename from src/JSystem/JFramework/JFWSystem.cpp rename to libs/JSystem/src/JFramework/JFWSystem.cpp diff --git a/src/JSystem/JGadget/binary.cpp b/libs/JSystem/src/JGadget/binary.cpp similarity index 100% rename from src/JSystem/JGadget/binary.cpp rename to libs/JSystem/src/JGadget/binary.cpp diff --git a/src/JSystem/JGadget/define.cpp b/libs/JSystem/src/JGadget/define.cpp similarity index 100% rename from src/JSystem/JGadget/define.cpp rename to libs/JSystem/src/JGadget/define.cpp diff --git a/src/JSystem/JGadget/dolphin-stream-JORFile.cpp b/libs/JSystem/src/JGadget/dolphin-stream-JORFile.cpp similarity index 100% rename from src/JSystem/JGadget/dolphin-stream-JORFile.cpp rename to libs/JSystem/src/JGadget/dolphin-stream-JORFile.cpp diff --git a/src/JSystem/JGadget/linklist.cpp b/libs/JSystem/src/JGadget/linklist.cpp similarity index 100% rename from src/JSystem/JGadget/linklist.cpp rename to libs/JSystem/src/JGadget/linklist.cpp diff --git a/src/JSystem/JGadget/search.cpp b/libs/JSystem/src/JGadget/search.cpp similarity index 100% rename from src/JSystem/JGadget/search.cpp rename to libs/JSystem/src/JGadget/search.cpp diff --git a/src/JSystem/JGadget/std-list.cpp b/libs/JSystem/src/JGadget/std-list.cpp similarity index 100% rename from src/JSystem/JGadget/std-list.cpp rename to libs/JSystem/src/JGadget/std-list.cpp diff --git a/src/JSystem/JGadget/std-stream.cpp b/libs/JSystem/src/JGadget/std-stream.cpp similarity index 100% rename from src/JSystem/JGadget/std-stream.cpp rename to libs/JSystem/src/JGadget/std-stream.cpp diff --git a/src/JSystem/JGadget/std-streambuf.cpp b/libs/JSystem/src/JGadget/std-streambuf.cpp similarity index 100% rename from src/JSystem/JGadget/std-streambuf.cpp rename to libs/JSystem/src/JGadget/std-streambuf.cpp diff --git a/src/JSystem/JGadget/std-string.cpp b/libs/JSystem/src/JGadget/std-string.cpp similarity index 100% rename from src/JSystem/JGadget/std-string.cpp rename to libs/JSystem/src/JGadget/std-string.cpp diff --git a/src/JSystem/JGadget/std-vector.cpp b/libs/JSystem/src/JGadget/std-vector.cpp similarity index 100% rename from src/JSystem/JGadget/std-vector.cpp rename to libs/JSystem/src/JGadget/std-vector.cpp diff --git a/src/JSystem/JGadget/textreader.cpp b/libs/JSystem/src/JGadget/textreader.cpp similarity index 100% rename from src/JSystem/JGadget/textreader.cpp rename to libs/JSystem/src/JGadget/textreader.cpp diff --git a/src/JSystem/JGadget/xml-scanner.cpp b/libs/JSystem/src/JGadget/xml-scanner.cpp similarity index 100% rename from src/JSystem/JGadget/xml-scanner.cpp rename to libs/JSystem/src/JGadget/xml-scanner.cpp diff --git a/src/JSystem/JHostIO/JHIComm.cpp b/libs/JSystem/src/JHostIO/JHIComm.cpp similarity index 100% rename from src/JSystem/JHostIO/JHIComm.cpp rename to libs/JSystem/src/JHostIO/JHIComm.cpp diff --git a/src/JSystem/JHostIO/JHICommonMem.cpp b/libs/JSystem/src/JHostIO/JHICommonMem.cpp similarity index 100% rename from src/JSystem/JHostIO/JHICommonMem.cpp rename to libs/JSystem/src/JHostIO/JHICommonMem.cpp diff --git a/src/JSystem/JHostIO/JHIMccBuf.cpp b/libs/JSystem/src/JHostIO/JHIMccBuf.cpp similarity index 100% rename from src/JSystem/JHostIO/JHIMccBuf.cpp rename to libs/JSystem/src/JHostIO/JHIMccBuf.cpp diff --git a/src/JSystem/JHostIO/JHIMemBuf.cpp b/libs/JSystem/src/JHostIO/JHIMemBuf.cpp similarity index 94% rename from src/JSystem/JHostIO/JHIMemBuf.cpp rename to libs/JSystem/src/JHostIO/JHIMemBuf.cpp index 7f02ca32b82..4fec9ad5328 100644 --- a/src/JSystem/JHostIO/JHIMemBuf.cpp +++ b/libs/JSystem/src/JHostIO/JHIMemBuf.cpp @@ -2,7 +2,11 @@ #include "JSystem/JHostIO/JHICommonMem.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif int JHIMemBuf::create() { int rt = 1; diff --git a/src/JSystem/JHostIO/JHIRMcc.cpp b/libs/JSystem/src/JHostIO/JHIRMcc.cpp similarity index 100% rename from src/JSystem/JHostIO/JHIRMcc.cpp rename to libs/JSystem/src/JHostIO/JHIRMcc.cpp diff --git a/src/JSystem/JHostIO/JHIhioASync.cpp b/libs/JSystem/src/JHostIO/JHIhioASync.cpp similarity index 98% rename from src/JSystem/JHostIO/JHIhioASync.cpp rename to libs/JSystem/src/JHostIO/JHIhioASync.cpp index 0dc75b4e768..bc8c5b9e2c6 100644 --- a/src/JSystem/JHostIO/JHIhioASync.cpp +++ b/libs/JSystem/src/JHostIO/JHIhioASync.cpp @@ -2,7 +2,11 @@ #include "JSystem/JHostIO/JHIMccBuf.h" #include "JSystem/JHostIO/JHIRMcc.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #include "global.h" u32 gsEnableHostio; diff --git a/src/JSystem/JHostIO/JOREntry.cpp b/libs/JSystem/src/JHostIO/JOREntry.cpp similarity index 100% rename from src/JSystem/JHostIO/JOREntry.cpp rename to libs/JSystem/src/JHostIO/JOREntry.cpp diff --git a/src/JSystem/JHostIO/JORFile.cpp b/libs/JSystem/src/JHostIO/JORFile.cpp similarity index 98% rename from src/JSystem/JHostIO/JORFile.cpp rename to libs/JSystem/src/JHostIO/JORFile.cpp index 10dfa2af9aa..f689f06534a 100644 --- a/src/JSystem/JHostIO/JORFile.cpp +++ b/libs/JSystem/src/JHostIO/JORFile.cpp @@ -2,7 +2,11 @@ #include "JSystem/JHostIO/JORFile.h" #include "JSystem/JHostIO/JORServer.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif JORFile::JORFile() : mHandle(0), diff --git a/src/JSystem/JHostIO/JORHostInfo.cpp b/libs/JSystem/src/JHostIO/JORHostInfo.cpp similarity index 100% rename from src/JSystem/JHostIO/JORHostInfo.cpp rename to libs/JSystem/src/JHostIO/JORHostInfo.cpp diff --git a/src/JSystem/JHostIO/JORMessageBox.cpp b/libs/JSystem/src/JHostIO/JORMessageBox.cpp similarity index 100% rename from src/JSystem/JHostIO/JORMessageBox.cpp rename to libs/JSystem/src/JHostIO/JORMessageBox.cpp diff --git a/src/JSystem/JHostIO/JORServer.cpp b/libs/JSystem/src/JHostIO/JORServer.cpp similarity index 100% rename from src/JSystem/JHostIO/JORServer.cpp rename to libs/JSystem/src/JHostIO/JORServer.cpp diff --git a/src/JSystem/JHostIO/JORShellExecute.cpp b/libs/JSystem/src/JHostIO/JORShellExecute.cpp similarity index 100% rename from src/JSystem/JHostIO/JORShellExecute.cpp rename to libs/JSystem/src/JHostIO/JORShellExecute.cpp diff --git a/src/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/src/JKernel/JKRAram.cpp similarity index 99% rename from src/JSystem/JKernel/JKRAram.cpp rename to libs/JSystem/src/JKernel/JKRAram.cpp index 64f14da1a7e..e1da269cbd2 100644 --- a/src/JSystem/JKernel/JKRAram.cpp +++ b/libs/JSystem/src/JKernel/JKRAram.cpp @@ -6,8 +6,13 @@ #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTException.h" +#ifdef __REVOLUTION_SDK__ +#include +#include +#else #include #include +#endif #include #if PLATFORM_GCN diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/src/JKernel/JKRAramArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramArchive.cpp rename to libs/JSystem/src/JKernel/JKRAramArchive.cpp diff --git a/src/JSystem/JKernel/JKRAramBlock.cpp b/libs/JSystem/src/JKernel/JKRAramBlock.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramBlock.cpp rename to libs/JSystem/src/JKernel/JKRAramBlock.cpp diff --git a/src/JSystem/JKernel/JKRAramHeap.cpp b/libs/JSystem/src/JKernel/JKRAramHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramHeap.cpp rename to libs/JSystem/src/JKernel/JKRAramHeap.cpp diff --git a/src/JSystem/JKernel/JKRAramPiece.cpp b/libs/JSystem/src/JKernel/JKRAramPiece.cpp similarity index 99% rename from src/JSystem/JKernel/JKRAramPiece.cpp rename to libs/JSystem/src/JKernel/JKRAramPiece.cpp index e74cf5d5c70..44ea6971e09 100644 --- a/src/JSystem/JKernel/JKRAramPiece.cpp +++ b/libs/JSystem/src/JKernel/JKRAramPiece.cpp @@ -4,7 +4,7 @@ #include "JSystem/JKernel/JKRAram.h" #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JUtility/JUTException.h" -#include +#include JKRAMCommand* JKRAramPiece::prepareCommand(int direction, u32 src, u32 dst, u32 length, JKRAramBlock* block, diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/libs/JSystem/src/JKernel/JKRAramStream.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAramStream.cpp rename to libs/JSystem/src/JKernel/JKRAramStream.cpp diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/libs/JSystem/src/JKernel/JKRArchivePri.cpp similarity index 100% rename from src/JSystem/JKernel/JKRArchivePri.cpp rename to libs/JSystem/src/JKernel/JKRArchivePri.cpp diff --git a/src/JSystem/JKernel/JKRArchivePub.cpp b/libs/JSystem/src/JKernel/JKRArchivePub.cpp similarity index 100% rename from src/JSystem/JKernel/JKRArchivePub.cpp rename to libs/JSystem/src/JKernel/JKRArchivePub.cpp diff --git a/src/JSystem/JKernel/JKRAssertHeap.cpp b/libs/JSystem/src/JKernel/JKRAssertHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRAssertHeap.cpp rename to libs/JSystem/src/JKernel/JKRAssertHeap.cpp diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/src/JKernel/JKRCompArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRCompArchive.cpp rename to libs/JSystem/src/JKernel/JKRCompArchive.cpp diff --git a/src/JSystem/JKernel/JKRDecomp.cpp b/libs/JSystem/src/JKernel/JKRDecomp.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDecomp.cpp rename to libs/JSystem/src/JKernel/JKRDecomp.cpp diff --git a/src/JSystem/JKernel/JKRDisposer.cpp b/libs/JSystem/src/JKernel/JKRDisposer.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDisposer.cpp rename to libs/JSystem/src/JKernel/JKRDisposer.cpp diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp similarity index 99% rename from src/JSystem/JKernel/JKRDvdAramRipper.cpp rename to libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp index 930b4df3548..f7a5e9d0bd6 100644 --- a/src/JSystem/JKernel/JKRDvdAramRipper.cpp +++ b/libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp @@ -7,9 +7,9 @@ #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JSupport/JSUFileStream.h" -#include -#include -#include +#include +#include +#include #include "global.h" #include diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/src/JKernel/JKRDvdArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDvdArchive.cpp rename to libs/JSystem/src/JKernel/JKRDvdArchive.cpp diff --git a/src/JSystem/JKernel/JKRDvdFile.cpp b/libs/JSystem/src/JKernel/JKRDvdFile.cpp similarity index 100% rename from src/JSystem/JKernel/JKRDvdFile.cpp rename to libs/JSystem/src/JKernel/JKRDvdFile.cpp diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/src/JKernel/JKRDvdRipper.cpp similarity index 99% rename from src/JSystem/JKernel/JKRDvdRipper.cpp rename to libs/JSystem/src/JKernel/JKRDvdRipper.cpp index fb5806c0a95..733a4229414 100644 --- a/src/JSystem/JKernel/JKRDvdRipper.cpp +++ b/libs/JSystem/src/JKernel/JKRDvdRipper.cpp @@ -9,8 +9,8 @@ #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JUtility/JUTException.h" #include -#include -#include +#include +#include #include static int JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*); diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/libs/JSystem/src/JKernel/JKRExpHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRExpHeap.cpp rename to libs/JSystem/src/JKernel/JKRExpHeap.cpp diff --git a/src/JSystem/JKernel/JKRFile.cpp b/libs/JSystem/src/JKernel/JKRFile.cpp similarity index 93% rename from src/JSystem/JKernel/JKRFile.cpp rename to libs/JSystem/src/JKernel/JKRFile.cpp index b267e932356..9aed6945fd5 100644 --- a/src/JSystem/JKernel/JKRFile.cpp +++ b/libs/JSystem/src/JKernel/JKRFile.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JKernel/JKRFile.h" -#include +#include void JKRFile::read(void* data, s32 length, s32 offset) { JUT_ASSERT(32, ( length & 0x1f ) == 0); diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/libs/JSystem/src/JKernel/JKRFileCache.cpp similarity index 100% rename from src/JSystem/JKernel/JKRFileCache.cpp rename to libs/JSystem/src/JKernel/JKRFileCache.cpp diff --git a/src/JSystem/JKernel/JKRFileFinder.cpp b/libs/JSystem/src/JKernel/JKRFileFinder.cpp similarity index 100% rename from src/JSystem/JKernel/JKRFileFinder.cpp rename to libs/JSystem/src/JKernel/JKRFileFinder.cpp diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/libs/JSystem/src/JKernel/JKRFileLoader.cpp similarity index 100% rename from src/JSystem/JKernel/JKRFileLoader.cpp rename to libs/JSystem/src/JKernel/JKRFileLoader.cpp diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/src/JKernel/JKRHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRHeap.cpp rename to libs/JSystem/src/JKernel/JKRHeap.cpp diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/src/JKernel/JKRMemArchive.cpp similarity index 100% rename from src/JSystem/JKernel/JKRMemArchive.cpp rename to libs/JSystem/src/JKernel/JKRMemArchive.cpp diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/libs/JSystem/src/JKernel/JKRSolidHeap.cpp similarity index 100% rename from src/JSystem/JKernel/JKRSolidHeap.cpp rename to libs/JSystem/src/JKernel/JKRSolidHeap.cpp diff --git a/src/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/src/JKernel/JKRThread.cpp similarity index 100% rename from src/JSystem/JKernel/JKRThread.cpp rename to libs/JSystem/src/JKernel/JKRThread.cpp diff --git a/src/JSystem/JMath/JMATrigonometric.cpp b/libs/JSystem/src/JMath/JMATrigonometric.cpp similarity index 100% rename from src/JSystem/JMath/JMATrigonometric.cpp rename to libs/JSystem/src/JMath/JMATrigonometric.cpp diff --git a/src/JSystem/JMath/JMath.cpp b/libs/JSystem/src/JMath/JMath.cpp similarity index 100% rename from src/JSystem/JMath/JMath.cpp rename to libs/JSystem/src/JMath/JMath.cpp diff --git a/src/JSystem/JMath/random.cpp b/libs/JSystem/src/JMath/random.cpp similarity index 100% rename from src/JSystem/JMath/random.cpp rename to libs/JSystem/src/JMath/random.cpp diff --git a/src/JSystem/JMessage/control.cpp b/libs/JSystem/src/JMessage/control.cpp similarity index 100% rename from src/JSystem/JMessage/control.cpp rename to libs/JSystem/src/JMessage/control.cpp diff --git a/src/JSystem/JMessage/data.cpp b/libs/JSystem/src/JMessage/data.cpp similarity index 100% rename from src/JSystem/JMessage/data.cpp rename to libs/JSystem/src/JMessage/data.cpp diff --git a/src/JSystem/JMessage/locale.cpp b/libs/JSystem/src/JMessage/locale.cpp similarity index 100% rename from src/JSystem/JMessage/locale.cpp rename to libs/JSystem/src/JMessage/locale.cpp diff --git a/src/JSystem/JMessage/processor.cpp b/libs/JSystem/src/JMessage/processor.cpp similarity index 100% rename from src/JSystem/JMessage/processor.cpp rename to libs/JSystem/src/JMessage/processor.cpp diff --git a/src/JSystem/JMessage/resource.cpp b/libs/JSystem/src/JMessage/resource.cpp similarity index 100% rename from src/JSystem/JMessage/resource.cpp rename to libs/JSystem/src/JMessage/resource.cpp diff --git a/src/JSystem/JParticle/JPABaseShape.cpp b/libs/JSystem/src/JParticle/JPABaseShape.cpp similarity index 99% rename from src/JSystem/JParticle/JPABaseShape.cpp rename to libs/JSystem/src/JParticle/JPABaseShape.cpp index 54991d2560f..fffcf05cad1 100644 --- a/src/JSystem/JParticle/JPABaseShape.cpp +++ b/libs/JSystem/src/JParticle/JPABaseShape.cpp @@ -6,8 +6,8 @@ #include "JSystem/JParticle/JPAEmitter.h" #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JMath/JMATrigonometric.h" -#include -#include +#include +#include void JPASetPointSize(JPAEmitterWorkData* work) { GXSetPointSize((u8)(25.0f * work->mGlobalPtclScl.x), GX_TO_ONE); diff --git a/src/JSystem/JParticle/JPAChildShape.cpp b/libs/JSystem/src/JParticle/JPAChildShape.cpp similarity index 96% rename from src/JSystem/JParticle/JPAChildShape.cpp rename to libs/JSystem/src/JParticle/JPAChildShape.cpp index 4c2a0403b55..e3600700227 100644 --- a/src/JSystem/JParticle/JPAChildShape.cpp +++ b/libs/JSystem/src/JParticle/JPAChildShape.cpp @@ -3,8 +3,8 @@ #include "JSystem/JParticle/JPAChildShape.h" #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAEmitter.h" -#include -#include +#include +#include void JPARegistChildPrmEnv(JPAEmitterWorkData* work) { JPAChildShape* csp = work->mpRes->getCsp(); diff --git a/src/JSystem/JParticle/JPADynamicsBlock.cpp b/libs/JSystem/src/JParticle/JPADynamicsBlock.cpp similarity index 100% rename from src/JSystem/JParticle/JPADynamicsBlock.cpp rename to libs/JSystem/src/JParticle/JPADynamicsBlock.cpp diff --git a/src/JSystem/JParticle/JPAEmitter.cpp b/libs/JSystem/src/JParticle/JPAEmitter.cpp similarity index 99% rename from src/JSystem/JParticle/JPAEmitter.cpp rename to libs/JSystem/src/JParticle/JPAEmitter.cpp index 5e7ccbc6dd7..aa168a44a40 100644 --- a/src/JSystem/JParticle/JPAEmitter.cpp +++ b/libs/JSystem/src/JParticle/JPAEmitter.cpp @@ -5,7 +5,7 @@ #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JParticle/JPABaseShape.h" -#include +#include JPAEmitterCallBack::~JPAEmitterCallBack() { } diff --git a/src/JSystem/JParticle/JPAEmitterManager.cpp b/libs/JSystem/src/JParticle/JPAEmitterManager.cpp similarity index 99% rename from src/JSystem/JParticle/JPAEmitterManager.cpp rename to libs/JSystem/src/JParticle/JPAEmitterManager.cpp index 5af57850554..bd24df12d38 100644 --- a/src/JSystem/JParticle/JPAEmitterManager.cpp +++ b/libs/JSystem/src/JParticle/JPAEmitterManager.cpp @@ -6,7 +6,7 @@ #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, JKRHeap* pHeap, u8 i_gidMax, u8 i_ridMax) { diff --git a/src/JSystem/JParticle/JPAExTexShape.cpp b/libs/JSystem/src/JParticle/JPAExTexShape.cpp similarity index 97% rename from src/JSystem/JParticle/JPAExTexShape.cpp rename to libs/JSystem/src/JParticle/JPAExTexShape.cpp index 0cf01703b93..bb9510050ef 100644 --- a/src/JSystem/JParticle/JPAExTexShape.cpp +++ b/libs/JSystem/src/JParticle/JPAExTexShape.cpp @@ -3,7 +3,7 @@ #include "JSystem/JParticle/JPAExTexShape.h" #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JParticle/JPAEmitter.h" -#include +#include void JPALoadExTex(JPAEmitterWorkData* work) { JPAExTexShape* ets = work->mpRes->getEts(); diff --git a/src/JSystem/JParticle/JPAExtraShape.cpp b/libs/JSystem/src/JParticle/JPAExtraShape.cpp similarity index 99% rename from src/JSystem/JParticle/JPAExtraShape.cpp rename to libs/JSystem/src/JParticle/JPAExtraShape.cpp index 43244dbce62..9fb84c36b61 100644 --- a/src/JSystem/JParticle/JPAExtraShape.cpp +++ b/libs/JSystem/src/JParticle/JPAExtraShape.cpp @@ -4,7 +4,7 @@ #include "JSystem/JMath/JMATrigonometric.h" #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAEmitter.h" -#include +#include void JPACalcScaleX(JPAEmitterWorkData* work, JPABaseParticle* ptcl) { JPAExtraShape* esp = work->mpRes->getEsp(); diff --git a/src/JSystem/JParticle/JPAFieldBlock.cpp b/libs/JSystem/src/JParticle/JPAFieldBlock.cpp similarity index 100% rename from src/JSystem/JParticle/JPAFieldBlock.cpp rename to libs/JSystem/src/JParticle/JPAFieldBlock.cpp diff --git a/src/JSystem/JParticle/JPAKeyBlock.cpp b/libs/JSystem/src/JParticle/JPAKeyBlock.cpp similarity index 100% rename from src/JSystem/JParticle/JPAKeyBlock.cpp rename to libs/JSystem/src/JParticle/JPAKeyBlock.cpp diff --git a/src/JSystem/JParticle/JPAMath.cpp b/libs/JSystem/src/JParticle/JPAMath.cpp similarity index 100% rename from src/JSystem/JParticle/JPAMath.cpp rename to libs/JSystem/src/JParticle/JPAMath.cpp diff --git a/src/JSystem/JParticle/JPAParticle.cpp b/libs/JSystem/src/JParticle/JPAParticle.cpp similarity index 100% rename from src/JSystem/JParticle/JPAParticle.cpp rename to libs/JSystem/src/JParticle/JPAParticle.cpp diff --git a/src/JSystem/JParticle/JPAResource.cpp b/libs/JSystem/src/JParticle/JPAResource.cpp similarity index 99% rename from src/JSystem/JParticle/JPAResource.cpp rename to libs/JSystem/src/JParticle/JPAResource.cpp index efba3f323ff..52d191daf69 100644 --- a/src/JSystem/JParticle/JPAResource.cpp +++ b/libs/JSystem/src/JParticle/JPAResource.cpp @@ -11,7 +11,7 @@ #include "JSystem/JParticle/JPAKeyBlock.h" #include "JSystem/JParticle/JPAParticle.h" #include "JSystem/JParticle/JPAResourceManager.h" -#include +#include #include "global.h" JPAResource::JPAResource() { diff --git a/src/JSystem/JParticle/JPAResourceLoader.cpp b/libs/JSystem/src/JParticle/JPAResourceLoader.cpp similarity index 100% rename from src/JSystem/JParticle/JPAResourceLoader.cpp rename to libs/JSystem/src/JParticle/JPAResourceLoader.cpp diff --git a/src/JSystem/JParticle/JPAResourceManager.cpp b/libs/JSystem/src/JParticle/JPAResourceManager.cpp similarity index 100% rename from src/JSystem/JParticle/JPAResourceManager.cpp rename to libs/JSystem/src/JParticle/JPAResourceManager.cpp diff --git a/src/JSystem/JParticle/JPATexture.cpp b/libs/JSystem/src/JParticle/JPATexture.cpp similarity index 100% rename from src/JSystem/JParticle/JPATexture.cpp rename to libs/JSystem/src/JParticle/JPATexture.cpp diff --git a/src/JSystem/JStage/JSGActor.cpp b/libs/JSystem/src/JStage/JSGActor.cpp similarity index 100% rename from src/JSystem/JStage/JSGActor.cpp rename to libs/JSystem/src/JStage/JSGActor.cpp diff --git a/src/JSystem/JStage/JSGAmbientLight.cpp b/libs/JSystem/src/JStage/JSGAmbientLight.cpp similarity index 100% rename from src/JSystem/JStage/JSGAmbientLight.cpp rename to libs/JSystem/src/JStage/JSGAmbientLight.cpp diff --git a/src/JSystem/JStage/JSGCamera.cpp b/libs/JSystem/src/JStage/JSGCamera.cpp similarity index 100% rename from src/JSystem/JStage/JSGCamera.cpp rename to libs/JSystem/src/JStage/JSGCamera.cpp diff --git a/src/JSystem/JStage/JSGFog.cpp b/libs/JSystem/src/JStage/JSGFog.cpp similarity index 100% rename from src/JSystem/JStage/JSGFog.cpp rename to libs/JSystem/src/JStage/JSGFog.cpp diff --git a/src/JSystem/JStage/JSGLight.cpp b/libs/JSystem/src/JStage/JSGLight.cpp similarity index 100% rename from src/JSystem/JStage/JSGLight.cpp rename to libs/JSystem/src/JStage/JSGLight.cpp diff --git a/src/JSystem/JStage/JSGObject.cpp b/libs/JSystem/src/JStage/JSGObject.cpp similarity index 100% rename from src/JSystem/JStage/JSGObject.cpp rename to libs/JSystem/src/JStage/JSGObject.cpp diff --git a/src/JSystem/JStage/JSGSystem.cpp b/libs/JSystem/src/JStage/JSGSystem.cpp similarity index 100% rename from src/JSystem/JStage/JSGSystem.cpp rename to libs/JSystem/src/JStage/JSGSystem.cpp diff --git a/src/JSystem/JStudio/JStudio/ctb-data.cpp b/libs/JSystem/src/JStudio/JStudio/ctb-data.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/ctb-data.cpp rename to libs/JSystem/src/JStudio/JStudio/ctb-data.cpp diff --git a/src/JSystem/JStudio/JStudio/ctb.cpp b/libs/JSystem/src/JStudio/JStudio/ctb.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/ctb.cpp rename to libs/JSystem/src/JStudio/JStudio/ctb.cpp diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/libs/JSystem/src/JStudio/JStudio/functionvalue.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/functionvalue.cpp rename to libs/JSystem/src/JStudio/JStudio/functionvalue.cpp diff --git a/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp b/libs/JSystem/src/JStudio/JStudio/fvb-data-parse.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/fvb-data-parse.cpp rename to libs/JSystem/src/JStudio/JStudio/fvb-data-parse.cpp diff --git a/src/JSystem/JStudio/JStudio/fvb-data.cpp b/libs/JSystem/src/JStudio/JStudio/fvb-data.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/fvb-data.cpp rename to libs/JSystem/src/JStudio/JStudio/fvb-data.cpp diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/libs/JSystem/src/JStudio/JStudio/fvb.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/fvb.cpp rename to libs/JSystem/src/JStudio/JStudio/fvb.cpp diff --git a/src/JSystem/JStudio/JStudio/jstudio-control.cpp b/libs/JSystem/src/JStudio/JStudio/jstudio-control.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/jstudio-control.cpp rename to libs/JSystem/src/JStudio/JStudio/jstudio-control.cpp diff --git a/src/JSystem/JStudio/JStudio/jstudio-data.cpp b/libs/JSystem/src/JStudio/JStudio/jstudio-data.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/jstudio-data.cpp rename to libs/JSystem/src/JStudio/JStudio/jstudio-data.cpp diff --git a/src/JSystem/JStudio/JStudio/jstudio-math.cpp b/libs/JSystem/src/JStudio/JStudio/jstudio-math.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/jstudio-math.cpp rename to libs/JSystem/src/JStudio/JStudio/jstudio-math.cpp diff --git a/src/JSystem/JStudio/JStudio/jstudio-object.cpp b/libs/JSystem/src/JStudio/JStudio/jstudio-object.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/jstudio-object.cpp rename to libs/JSystem/src/JStudio/JStudio/jstudio-object.cpp diff --git a/src/JSystem/JStudio/JStudio/object-id.cpp b/libs/JSystem/src/JStudio/JStudio/object-id.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/object-id.cpp rename to libs/JSystem/src/JStudio/JStudio/object-id.cpp diff --git a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp b/libs/JSystem/src/JStudio/JStudio/stb-data-parse.cpp similarity index 98% rename from src/JSystem/JStudio/JStudio/stb-data-parse.cpp rename to libs/JSystem/src/JStudio/JStudio/stb-data-parse.cpp index ec263a18e51..242f9f9beb9 100644 --- a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp +++ b/libs/JSystem/src/JStudio/JStudio/stb-data-parse.cpp @@ -2,7 +2,7 @@ #include "JSystem/JStudio/JStudio/stb-data-parse.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include #include namespace JStudio { diff --git a/src/JSystem/JStudio/JStudio/stb-data.cpp b/libs/JSystem/src/JStudio/JStudio/stb-data.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/stb-data.cpp rename to libs/JSystem/src/JStudio/JStudio/stb-data.cpp diff --git a/src/JSystem/JStudio/JStudio/stb.cpp b/libs/JSystem/src/JStudio/JStudio/stb.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio/stb.cpp rename to libs/JSystem/src/JStudio/JStudio/stb.cpp diff --git a/src/JSystem/JStudio/JStudioCameraEditor/control.cpp b/libs/JSystem/src/JStudio/JStudioCameraEditor/control.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioCameraEditor/control.cpp rename to libs/JSystem/src/JStudio/JStudioCameraEditor/control.cpp diff --git a/src/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp b/libs/JSystem/src/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp rename to libs/JSystem/src/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp diff --git a/src/JSystem/JStudio/JStudioCameraEditor/csb-data.cpp b/libs/JSystem/src/JStudio/JStudioCameraEditor/csb-data.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioCameraEditor/csb-data.cpp rename to libs/JSystem/src/JStudio/JStudioCameraEditor/csb-data.cpp diff --git a/src/JSystem/JStudio/JStudioCameraEditor/csb.cpp b/libs/JSystem/src/JStudio/JStudioCameraEditor/csb.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioCameraEditor/csb.cpp rename to libs/JSystem/src/JStudio/JStudioCameraEditor/csb.cpp diff --git a/src/JSystem/JStudio/JStudioCameraEditor/sequence.cpp b/libs/JSystem/src/JStudio/JStudioCameraEditor/sequence.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioCameraEditor/sequence.cpp rename to libs/JSystem/src/JStudio/JStudioCameraEditor/sequence.cpp diff --git a/src/JSystem/JStudio/JStudioPreviewer/control.cpp b/libs/JSystem/src/JStudio/JStudioPreviewer/control.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioPreviewer/control.cpp rename to libs/JSystem/src/JStudio/JStudioPreviewer/control.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/anchor.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/anchor.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/anchor.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/anchor.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/console.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/console.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/console.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/console.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/controlset-anchor.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/controlset-anchor.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/controlset-anchor.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/controlset-anchor.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/controlset-preview.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/controlset-preview.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/controlset-preview.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/controlset-preview.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/controlset.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/controlset.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/controlset.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/controlset.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/interface.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/interface.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/interface.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/interface.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/scroll.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/scroll.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/scroll.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/scroll.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/visual.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/visual.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/visual.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/visual.cpp diff --git a/src/JSystem/JStudio/JStudioToolLibrary/xml.cpp b/libs/JSystem/src/JStudio/JStudioToolLibrary/xml.cpp similarity index 100% rename from src/JSystem/JStudio/JStudioToolLibrary/xml.cpp rename to libs/JSystem/src/JStudio/JStudioToolLibrary/xml.cpp diff --git a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp b/libs/JSystem/src/JStudio/JStudio_JAudio2/control.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JAudio2/control.cpp rename to libs/JSystem/src/JStudio/JStudio_JAudio2/control.cpp diff --git a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/libs/JSystem/src/JStudio/JStudio_JAudio2/object-sound.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp rename to libs/JSystem/src/JStudio/JStudio_JAudio2/object-sound.cpp diff --git a/src/JSystem/JStudio/JStudio_JParticle/control.cpp b/libs/JSystem/src/JStudio/JStudio_JParticle/control.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JParticle/control.cpp rename to libs/JSystem/src/JStudio/JStudio_JParticle/control.cpp diff --git a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp b/libs/JSystem/src/JStudio/JStudio_JParticle/object-particle.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp rename to libs/JSystem/src/JStudio/JStudio_JParticle/object-particle.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/control.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/control.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/control.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/control.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/object-actor.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/object-actor.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/object-actor.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/object-ambientlight.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/object-ambientlight.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/object-camera.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/object-camera.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/object-camera.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/object-fog.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/object-fog.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/object-fog.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/object-fog.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/object-light.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/object-light.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/object-light.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/object-light.cpp diff --git a/src/JSystem/JStudio/JStudio_JStage/object.cpp b/libs/JSystem/src/JStudio/JStudio_JStage/object.cpp similarity index 100% rename from src/JSystem/JStudio/JStudio_JStage/object.cpp rename to libs/JSystem/src/JStudio/JStudio_JStage/object.cpp diff --git a/src/JSystem/JSupport/JSUFileStream.cpp b/libs/JSystem/src/JSupport/JSUFileStream.cpp similarity index 100% rename from src/JSystem/JSupport/JSUFileStream.cpp rename to libs/JSystem/src/JSupport/JSUFileStream.cpp diff --git a/src/JSystem/JSupport/JSUInputStream.cpp b/libs/JSystem/src/JSupport/JSUInputStream.cpp similarity index 96% rename from src/JSystem/JSupport/JSUInputStream.cpp rename to libs/JSystem/src/JSupport/JSUInputStream.cpp index cb5a2fdc094..7a4cdcd003d 100644 --- a/src/JSystem/JSupport/JSUInputStream.cpp +++ b/libs/JSystem/src/JSupport/JSUInputStream.cpp @@ -2,7 +2,11 @@ #include "JSystem/JSupport/JSUInputStream.h" #include "JSystem/JSupport/JSURandomInputStream.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif JSUInputStream::~JSUInputStream() { if (!isGood()) { diff --git a/src/JSystem/JSupport/JSUList.cpp b/libs/JSystem/src/JSupport/JSUList.cpp similarity index 100% rename from src/JSystem/JSupport/JSUList.cpp rename to libs/JSystem/src/JSupport/JSUList.cpp diff --git a/src/JSystem/JSupport/JSUMemoryStream.cpp b/libs/JSystem/src/JSupport/JSUMemoryStream.cpp similarity index 100% rename from src/JSystem/JSupport/JSUMemoryStream.cpp rename to libs/JSystem/src/JSupport/JSUMemoryStream.cpp diff --git a/src/JSystem/JSupport/JSUOutputStream.cpp b/libs/JSystem/src/JSupport/JSUOutputStream.cpp similarity index 94% rename from src/JSystem/JSupport/JSUOutputStream.cpp rename to libs/JSystem/src/JSupport/JSUOutputStream.cpp index dec0976ad3d..d9f4a781002 100644 --- a/src/JSystem/JSupport/JSUOutputStream.cpp +++ b/libs/JSystem/src/JSupport/JSUOutputStream.cpp @@ -2,7 +2,11 @@ #include "JSystem/JSupport/JSUOutputStream.h" #include "JSystem/JSupport/JSURandomOutputStream.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #include JSUOutputStream::~JSUOutputStream() { diff --git a/src/JSystem/JUtility/JUTAssert.cpp b/libs/JSystem/src/JUtility/JUTAssert.cpp similarity index 99% rename from src/JSystem/JUtility/JUTAssert.cpp rename to libs/JSystem/src/JUtility/JUTAssert.cpp index d074bfbf18e..8ecc502d60c 100644 --- a/src/JSystem/JUtility/JUTAssert.cpp +++ b/libs/JSystem/src/JUtility/JUTAssert.cpp @@ -5,7 +5,7 @@ #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include -#include +#include namespace JUTAssertion { diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/libs/JSystem/src/JUtility/JUTCacheFont.cpp similarity index 99% rename from src/JSystem/JUtility/JUTCacheFont.cpp rename to libs/JSystem/src/JUtility/JUTCacheFont.cpp index e58f619871e..f87e1902801 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/libs/JSystem/src/JUtility/JUTCacheFont.cpp @@ -5,7 +5,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JKernel/JKRAram.h" -#include +#include #include #include #include "angle_utils.h" diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/src/JUtility/JUTConsole.cpp similarity index 99% rename from src/JSystem/JUtility/JUTConsole.cpp rename to libs/JSystem/src/JUtility/JUTConsole.cpp index ded14d0fc09..5f923984006 100644 --- a/src/JSystem/JUtility/JUTConsole.cpp +++ b/libs/JSystem/src/JUtility/JUTConsole.cpp @@ -6,7 +6,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTVideo.h" -#include +#include #include #include "global.h" diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/libs/JSystem/src/JUtility/JUTDbPrint.cpp similarity index 100% rename from src/JSystem/JUtility/JUTDbPrint.cpp rename to libs/JSystem/src/JUtility/JUTDbPrint.cpp diff --git a/src/JSystem/JUtility/JUTDirectFile.cpp b/libs/JSystem/src/JUtility/JUTDirectFile.cpp similarity index 99% rename from src/JSystem/JUtility/JUTDirectFile.cpp rename to libs/JSystem/src/JUtility/JUTDirectFile.cpp index ce2c4354d5a..52d124d74e3 100644 --- a/src/JSystem/JUtility/JUTDirectFile.cpp +++ b/libs/JSystem/src/JUtility/JUTDirectFile.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTDirectFile.h" -#include +#include #include "global.h" #include diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/libs/JSystem/src/JUtility/JUTDirectPrint.cpp similarity index 99% rename from src/JSystem/JUtility/JUTDirectPrint.cpp rename to libs/JSystem/src/JUtility/JUTDirectPrint.cpp index ccb1f5c2e01..b8d5345c1de 100644 --- a/src/JSystem/JUtility/JUTDirectPrint.cpp +++ b/libs/JSystem/src/JUtility/JUTDirectPrint.cpp @@ -2,7 +2,7 @@ #include "JSystem/JUtility/JUTDirectPrint.h" #include -#include +#include #include "global.h" #include "angle_utils.h" diff --git a/src/JSystem/JUtility/JUTException.cpp b/libs/JSystem/src/JUtility/JUTException.cpp similarity index 99% rename from src/JSystem/JUtility/JUTException.cpp rename to libs/JSystem/src/JUtility/JUTException.cpp index 13c370797c1..6fe1078c4af 100644 --- a/src/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/src/JUtility/JUTException.cpp @@ -7,7 +7,11 @@ #include #include #include -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #include #include diff --git a/src/JSystem/JUtility/JUTFader.cpp b/libs/JSystem/src/JUtility/JUTFader.cpp similarity index 100% rename from src/JSystem/JUtility/JUTFader.cpp rename to libs/JSystem/src/JUtility/JUTFader.cpp diff --git a/src/JSystem/JUtility/JUTFont.cpp b/libs/JSystem/src/JUtility/JUTFont.cpp similarity index 100% rename from src/JSystem/JUtility/JUTFont.cpp rename to libs/JSystem/src/JUtility/JUTFont.cpp diff --git a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp b/libs/JSystem/src/JUtility/JUTFontData_Ascfont_fix12.cpp similarity index 99% rename from src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp rename to libs/JSystem/src/JUtility/JUTFontData_Ascfont_fix12.cpp index f37bad6200e..35979ebc9f5 100644 --- a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp +++ b/libs/JSystem/src/JUtility/JUTFontData_Ascfont_fix12.cpp @@ -1,7 +1,11 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTResFont.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #include "global.h" u8 const JUTResFONT_Ascfont_fix12[] ATTRIBUTE_ALIGN(32) = { diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/src/JUtility/JUTGamePad.cpp similarity index 100% rename from src/JSystem/JUtility/JUTGamePad.cpp rename to libs/JSystem/src/JUtility/JUTGamePad.cpp diff --git a/src/JSystem/JUtility/JUTGraphFifo.cpp b/libs/JSystem/src/JUtility/JUTGraphFifo.cpp similarity index 100% rename from src/JSystem/JUtility/JUTGraphFifo.cpp rename to libs/JSystem/src/JUtility/JUTGraphFifo.cpp diff --git a/src/JSystem/JUtility/JUTNameTab.cpp b/libs/JSystem/src/JUtility/JUTNameTab.cpp similarity index 100% rename from src/JSystem/JUtility/JUTNameTab.cpp rename to libs/JSystem/src/JUtility/JUTNameTab.cpp diff --git a/src/JSystem/JUtility/JUTPalette.cpp b/libs/JSystem/src/JUtility/JUTPalette.cpp similarity index 95% rename from src/JSystem/JUtility/JUTPalette.cpp rename to libs/JSystem/src/JUtility/JUTPalette.cpp index 07e924f5981..c7525c60062 100644 --- a/src/JSystem/JUtility/JUTPalette.cpp +++ b/libs/JSystem/src/JUtility/JUTPalette.cpp @@ -1,8 +1,8 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTPalette.h" -#include -#include +#include +#include void JUTPalette::storeTLUT(GXTlut param_0, ResTLUT* tlut) { if (tlut == NULL) { diff --git a/src/JSystem/JUtility/JUTProcBar.cpp b/libs/JSystem/src/JUtility/JUTProcBar.cpp similarity index 100% rename from src/JSystem/JUtility/JUTProcBar.cpp rename to libs/JSystem/src/JUtility/JUTProcBar.cpp diff --git a/src/JSystem/JUtility/JUTResFont.cpp b/libs/JSystem/src/JUtility/JUTResFont.cpp similarity index 99% rename from src/JSystem/JUtility/JUTResFont.cpp rename to libs/JSystem/src/JUtility/JUTResFont.cpp index b733171ca30..025afbe8e7e 100644 --- a/src/JSystem/JUtility/JUTResFont.cpp +++ b/libs/JSystem/src/JUtility/JUTResFont.cpp @@ -5,7 +5,7 @@ #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" -#include +#include JUTResFont::JUTResFont() { initialize_state(); diff --git a/src/JSystem/JUtility/JUTResource.cpp b/libs/JSystem/src/JUtility/JUTResource.cpp similarity index 100% rename from src/JSystem/JUtility/JUTResource.cpp rename to libs/JSystem/src/JUtility/JUTResource.cpp diff --git a/src/JSystem/JUtility/JUTTexture.cpp b/libs/JSystem/src/JUtility/JUTTexture.cpp similarity index 99% rename from src/JSystem/JUtility/JUTTexture.cpp rename to libs/JSystem/src/JUtility/JUTTexture.cpp index a4de8c2bafb..92e05fa872e 100644 --- a/src/JSystem/JUtility/JUTTexture.cpp +++ b/libs/JSystem/src/JUtility/JUTTexture.cpp @@ -2,7 +2,7 @@ #include "JSystem/JUtility/JUTTexture.h" #include "JSystem/JUtility/JUTPalette.h" -#include +#include JUTTexture::~JUTTexture() { if (getCaptureFlag()) { diff --git a/src/JSystem/JUtility/JUTVideo.cpp b/libs/JSystem/src/JUtility/JUTVideo.cpp similarity index 99% rename from src/JSystem/JUtility/JUTVideo.cpp rename to libs/JSystem/src/JUtility/JUTVideo.cpp index 77d9be31b1e..5f52c936d3b 100644 --- a/src/JSystem/JUtility/JUTVideo.cpp +++ b/libs/JSystem/src/JUtility/JUTVideo.cpp @@ -3,8 +3,8 @@ #include "JSystem/JUtility/JUTVideo.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTXfb.h" -#include -#include +#include +#include JUTVideo* JUTVideo::sManager; diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/libs/JSystem/src/JUtility/JUTXfb.cpp similarity index 98% rename from src/JSystem/JUtility/JUTXfb.cpp rename to libs/JSystem/src/JUtility/JUTXfb.cpp index 8e2f0a91731..2ce6085bf9f 100644 --- a/src/JSystem/JUtility/JUTXfb.cpp +++ b/libs/JSystem/src/JUtility/JUTXfb.cpp @@ -3,7 +3,7 @@ #include "JSystem/JUtility/JUTXfb.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include void JUTXfb::clearIndex() { mDrawingXfbIndex = -1; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility b/libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility rename to libs/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/abort_exit.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/abort_exit.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/abort_exit.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/abort_exit.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cctype b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cctype similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cctype rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cctype diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/errno.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/errno.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/errno.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/errno.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/misc_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/misc_io.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/misc_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/misc_io.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/signal.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/signal.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/signal.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/signal.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtold.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtold.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtold.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtold.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wcstoul.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wcstoul.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wcstoul.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wcstoul.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wmem.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wmem.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wmem.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wmem.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wprintf.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wprintf.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wprintf.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wprintf.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wscanf.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wscanf.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wscanf.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wscanf.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wcstoul.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wcstoul.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wcstoul.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wcstoul.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wmem.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wmem.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wmem.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wmem.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wprintf.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wprintf.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wprintf.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wprintf.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wscanf.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wscanf.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wscanf.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wscanf.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_sin.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_atan.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ceil.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_copysign.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_cos.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_floor.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_frexp.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_modf.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_sin.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_tan.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/critical_regions.gamecube.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/critical_regions.gamecube.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/critical_regions.gamecube.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/critical_regions.gamecube.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/math_ppc.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/math_ppc.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/math_ppc.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/math_ppc.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/uart_console_io_gcn.h b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/uart_console_io_gcn.h similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/uart_console_io_gcn.h rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include/uart_console_io_gcn.h diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c similarity index 97% rename from src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c rename to libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c index 3916d033153..e94e6773c78 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c +++ b/libs/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c @@ -1,5 +1,5 @@ #include "uart_console_io_gcn.h" -#include +#include int InitializeUART(size_t); int WriteUARTN(unsigned char*, size_t); diff --git a/src/PowerPC_EABI_Support/MetroTRK/trk.h b/libs/PowerPC_EABI_Support/MetroTRK/trk.h similarity index 99% rename from src/PowerPC_EABI_Support/MetroTRK/trk.h rename to libs/PowerPC_EABI_Support/MetroTRK/trk.h index a90cf24d757..a8318922363 100644 --- a/src/PowerPC_EABI_Support/MetroTRK/trk.h +++ b/libs/PowerPC_EABI_Support/MetroTRK/trk.h @@ -1,7 +1,7 @@ #ifndef __METROTRK_TRK_H__ #define __METROTRK_TRK_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h b/libs/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h similarity index 73% rename from src/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h index 6ef61bc186a..28a45130e21 100644 --- a/src/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h +++ b/libs/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h @@ -1,6 +1,6 @@ #ifndef CPLUSLIBPPC_H #define CPLUSLIBPPC_H -#include +#include #endif /* CPLUSLIBPPC_H */ diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/GCN_mem_alloc.h b/libs/PowerPC_EABI_Support/Runtime/Inc/GCN_mem_alloc.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/GCN_mem_alloc.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/GCN_mem_alloc.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/Gecko_ExceptionPPC.h b/libs/PowerPC_EABI_Support/Runtime/Inc/Gecko_ExceptionPPC.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/Gecko_ExceptionPPC.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/Gecko_ExceptionPPC.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h b/libs/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/NMWException.h b/libs/PowerPC_EABI_Support/Runtime/Inc/NMWException.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/NMWException.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/NMWException.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h b/libs/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h similarity index 79% rename from src/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h index 63cc4225145..ba17672d648 100644 --- a/src/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h +++ b/libs/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h @@ -1,6 +1,6 @@ #ifndef __INIT_CPP_EXCEPTIONS_H #define __INIT_CPP_EXCEPTIONS_H -#include +#include #endif /* __INIT_CPP_EXCEPTIONS_H */ diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/__ppc_eabi_linker.h b/libs/PowerPC_EABI_Support/Runtime/Inc/__ppc_eabi_linker.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/__ppc_eabi_linker.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/__ppc_eabi_linker.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/global_destructor_chain.h b/libs/PowerPC_EABI_Support/Runtime/Inc/global_destructor_chain.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/global_destructor_chain.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/global_destructor_chain.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/ptmf.h b/libs/PowerPC_EABI_Support/Runtime/Inc/ptmf.h similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Inc/ptmf.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/ptmf.h diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/runtime.h b/libs/PowerPC_EABI_Support/Runtime/Inc/runtime.h similarity index 69% rename from src/PowerPC_EABI_Support/Runtime/Inc/runtime.h rename to libs/PowerPC_EABI_Support/Runtime/Inc/runtime.h index b70bc020869..5d2ba1cce4a 100644 --- a/src/PowerPC_EABI_Support/Runtime/Inc/runtime.h +++ b/libs/PowerPC_EABI_Support/Runtime/Inc/runtime.h @@ -1,6 +1,6 @@ #ifndef RUNTIME_H #define RUNTIME_H -#include +#include #endif /* RUNTIME_H */ diff --git a/src/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp b/libs/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp rename to libs/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp diff --git a/src/PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c b/libs/PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c similarity index 96% rename from src/PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c rename to libs/PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c index 33b700446dc..6e59889e96f 100644 --- a/src/PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c +++ b/libs/PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c @@ -3,7 +3,7 @@ * Description: */ -#include +#include inline static void InitDefaultHeap(void) { void* arenaLo; diff --git a/src/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp b/libs/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp rename to libs/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp diff --git a/src/PowerPC_EABI_Support/Runtime/Src/NMWException.cp b/libs/PowerPC_EABI_Support/Runtime/Src/NMWException.cp similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/NMWException.cp rename to libs/PowerPC_EABI_Support/Runtime/Src/NMWException.cp diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp b/libs/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp rename to libs/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__mem.c b/libs/PowerPC_EABI_Support/Runtime/Src/__mem.c similarity index 95% rename from src/PowerPC_EABI_Support/Runtime/Src/__mem.c rename to libs/PowerPC_EABI_Support/Runtime/Src/__mem.c index bdf34102511..84c77474c0d 100644 --- a/src/PowerPC_EABI_Support/Runtime/Src/__mem.c +++ b/libs/PowerPC_EABI_Support/Runtime/Src/__mem.c @@ -1,4 +1,8 @@ -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif __declspec(section ".init") void* memcpy(void* dst, const void* src, size_t n) { const unsigned char* s; diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c b/libs/PowerPC_EABI_Support/Runtime/Src/__va_arg.c similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c rename to libs/PowerPC_EABI_Support/Runtime/Src/__va_arg.c diff --git a/src/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c b/libs/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c rename to libs/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c diff --git a/src/PowerPC_EABI_Support/Runtime/Src/ptmf.c b/libs/PowerPC_EABI_Support/Runtime/Src/ptmf.c similarity index 100% rename from src/PowerPC_EABI_Support/Runtime/Src/ptmf.c rename to libs/PowerPC_EABI_Support/Runtime/Src/ptmf.c diff --git a/src/PowerPC_EABI_Support/Runtime/Src/runtime.c b/libs/PowerPC_EABI_Support/Runtime/Src/runtime.c similarity index 99% rename from src/PowerPC_EABI_Support/Runtime/Src/runtime.c rename to libs/PowerPC_EABI_Support/Runtime/Src/runtime.c index c06b108a4d5..db6721f101f 100644 --- a/src/PowerPC_EABI_Support/Runtime/Src/runtime.c +++ b/libs/PowerPC_EABI_Support/Runtime/Src/runtime.c @@ -1,4 +1,8 @@ -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #ifdef __cplusplus extern "C" { diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c similarity index 99% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c index d881cbad20f..13a30383ba1 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c +++ b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c @@ -3,7 +3,11 @@ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h" #include "TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h" #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" +#ifdef __REVOLUTION_SDK__ +#include +#else #include +#endif #include "global.h" extern u32 _db_stack_addr; diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c similarity index 99% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c index 9bfd2e02fd5..4bf7447b6ba 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c +++ b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c @@ -2,7 +2,7 @@ #include "TRK_MINNOW_DOLPHIN/Os/dolphin/DDH_Stubs.h" #include "TRK_MINNOW_DOLPHIN/Os/dolphin/GDEV_Stubs.h" #include "TRK_MINNOW_DOLPHIN/Os/dolphin/UDP_Stubs.h" -#include +#include #include "trk.h" void TRKInterruptHandler(); diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c similarity index 95% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c index 0a73fe5f10b..f70141de34f 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c +++ b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c @@ -4,7 +4,7 @@ */ #include "TRK_MINNOW_DOLPHIN/Os/dolphin/usr_put.h" -// #include +// #include // void OSReport(char* fmt, ...) causes extra crclr instruction. // look into issue later diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c similarity index 93% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c index 53db0e46bac..3b2c4087152 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c +++ b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c @@ -3,7 +3,7 @@ * Description: */ -#include +#include asm void TRK_flush_cache(u32, int) { // clang-format off diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c b/libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c rename to libs/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c similarity index 98% rename from src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c rename to libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c index 43c1dbe374f..a5abd68cdba 100644 --- a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c +++ b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c @@ -1,6 +1,6 @@ #include "TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" -#include +#include #define DDH_ERR_NOT_INITIALIZED -0x2711 #define DDH_ERR_ALREADY_INITIALIZED -0x2715 diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c similarity index 97% rename from src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c rename to libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c index 50e60d6ea9f..6b99d18e019 100644 --- a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c +++ b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c @@ -1,8 +1,8 @@ #include "TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" #include "global.h" -#include -#include +#include +#include #define GDEV_BUF_SIZE (0x500) diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c rename to libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c rename to libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c rename to libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/cc_gdev.c b/libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/cc_gdev.c similarity index 100% rename from src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/cc_gdev.c rename to libs/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/cc_gdev.c diff --git a/include/dolphin/G2D.h b/libs/dolphin/include/dolphin/G2D.h similarity index 100% rename from include/dolphin/G2D.h rename to libs/dolphin/include/dolphin/G2D.h diff --git a/include/dolphin/ai.h b/libs/dolphin/include/dolphin/ai.h similarity index 94% rename from include/dolphin/ai.h rename to libs/dolphin/include/dolphin/ai.h index a42a59da2f1..84db3343b08 100644 --- a/include/dolphin/ai.h +++ b/libs/dolphin/include/dolphin/ai.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_AI_H_ #define _DOLPHIN_AI_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -51,4 +48,3 @@ void AIReset(void); #endif #endif -#endif diff --git a/include/dolphin/am.h b/libs/dolphin/include/dolphin/am.h similarity index 100% rename from include/dolphin/am.h rename to libs/dolphin/include/dolphin/am.h diff --git a/include/dolphin/amc/AmcExi2Comm.h b/libs/dolphin/include/dolphin/amc/AmcExi2Comm.h similarity index 100% rename from include/dolphin/amc/AmcExi2Comm.h rename to libs/dolphin/include/dolphin/amc/AmcExi2Comm.h diff --git a/include/dolphin/amc/AmcTypes.h b/libs/dolphin/include/dolphin/amc/AmcTypes.h similarity index 100% rename from include/dolphin/amc/AmcTypes.h rename to libs/dolphin/include/dolphin/amc/AmcTypes.h diff --git a/include/dolphin/ar.h b/libs/dolphin/include/dolphin/ar.h similarity index 96% rename from include/dolphin/ar.h rename to libs/dolphin/include/dolphin/ar.h index 0a5d781a8fb..9e5aca28ada 100644 --- a/include/dolphin/ar.h +++ b/libs/dolphin/include/dolphin/ar.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_AR_H_ #define _DOLPHIN_AR_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -75,4 +72,3 @@ void __ARClearInterrupt(void); #endif #endif -#endif diff --git a/include/dolphin/ax.h b/libs/dolphin/include/dolphin/ax.h similarity index 99% rename from include/dolphin/ax.h rename to libs/dolphin/include/dolphin/ax.h index c43a3cb6390..0148446ee81 100644 --- a/include/dolphin/ax.h +++ b/libs/dolphin/include/dolphin/ax.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_AX_H_ #define _DOLPHIN_AX_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -325,5 +322,4 @@ extern u16 axDspSlave[AX_DSP_SLAVE_LENGTH]; } #endif -#endif #endif // _DOLPHIN_AX_H_ diff --git a/include/dolphin/axart.h b/libs/dolphin/include/dolphin/axart.h similarity index 98% rename from include/dolphin/axart.h rename to libs/dolphin/include/dolphin/axart.h index 1f12409f8f0..46c375f71ce 100644 --- a/include/dolphin/axart.h +++ b/libs/dolphin/include/dolphin/axart.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_AXART_H_ #define _DOLPHIN_AXART_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -224,5 +221,4 @@ void AXARTLpf(AXART_LPF*, AXVPB*); } #endif -#endif #endif // _DOLPHIN_AXART_H_ diff --git a/include/dolphin/axfx.h b/libs/dolphin/include/dolphin/axfx.h similarity index 98% rename from include/dolphin/axfx.h rename to libs/dolphin/include/dolphin/axfx.h index 93b34d33b6f..53933c858f4 100644 --- a/include/dolphin/axfx.h +++ b/libs/dolphin/include/dolphin/axfx.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_AXFX_H_ #define _DOLPHIN_AXFX_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -196,5 +193,4 @@ void AXFXReverbStdCallback(AXFX_BUFFERUPDATE* bufferUpdate, AXFX_REVERBSTD* reve } #endif -#endif #endif // _DOLPHIN_AXFX_H_ diff --git a/include/dolphin/base/PPCArch.h b/libs/dolphin/include/dolphin/base/PPCArch.h similarity index 99% rename from include/dolphin/base/PPCArch.h rename to libs/dolphin/include/dolphin/base/PPCArch.h index bb9e2845ab5..8bdd0dd9763 100644 --- a/include/dolphin/base/PPCArch.h +++ b/libs/dolphin/include/dolphin/base/PPCArch.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_PPCARCH #define _DOLPHIN_PPCARCH -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -542,5 +539,4 @@ void PMInstructions(void); } #endif -#endif #endif // _DOLPHIN_PPCARCH diff --git a/include/dolphin/card.h b/libs/dolphin/include/dolphin/card.h similarity index 99% rename from include/dolphin/card.h rename to libs/dolphin/include/dolphin/card.h index 6487d88f436..6ed175b71c9 100644 --- a/include/dolphin/card.h +++ b/libs/dolphin/include/dolphin/card.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_CARD_H_ #define _DOLPHIN_CARD_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -323,4 +320,3 @@ s32 CARDWrite(CARDFileInfo* fileInfo, void* buf, s32 length, s32 offset); #endif #endif -#endif diff --git a/include/dolphin/charPipeline/fileCache.h b/libs/dolphin/include/dolphin/charPipeline/fileCache.h similarity index 100% rename from include/dolphin/charPipeline/fileCache.h rename to libs/dolphin/include/dolphin/charPipeline/fileCache.h diff --git a/include/dolphin/charPipeline/structures.h b/libs/dolphin/include/dolphin/charPipeline/structures.h similarity index 100% rename from include/dolphin/charPipeline/structures.h rename to libs/dolphin/include/dolphin/charPipeline/structures.h diff --git a/include/dolphin/charPipeline/structures/HTable.h b/libs/dolphin/include/dolphin/charPipeline/structures/HTable.h similarity index 100% rename from include/dolphin/charPipeline/structures/HTable.h rename to libs/dolphin/include/dolphin/charPipeline/structures/HTable.h diff --git a/include/dolphin/charPipeline/structures/List.h b/libs/dolphin/include/dolphin/charPipeline/structures/List.h similarity index 100% rename from include/dolphin/charPipeline/structures/List.h rename to libs/dolphin/include/dolphin/charPipeline/structures/List.h diff --git a/include/dolphin/charPipeline/structures/Tree.h b/libs/dolphin/include/dolphin/charPipeline/structures/Tree.h similarity index 100% rename from include/dolphin/charPipeline/structures/Tree.h rename to libs/dolphin/include/dolphin/charPipeline/structures/Tree.h diff --git a/include/dolphin/charPipeline/structures/dolphinString.h b/libs/dolphin/include/dolphin/charPipeline/structures/dolphinString.h similarity index 100% rename from include/dolphin/charPipeline/structures/dolphinString.h rename to libs/dolphin/include/dolphin/charPipeline/structures/dolphinString.h diff --git a/include/dolphin/charPipeline/texPalette.h b/libs/dolphin/include/dolphin/charPipeline/texPalette.h similarity index 100% rename from include/dolphin/charPipeline/texPalette.h rename to libs/dolphin/include/dolphin/charPipeline/texPalette.h diff --git a/include/dolphin/db.h b/libs/dolphin/include/dolphin/db.h similarity index 84% rename from include/dolphin/db.h rename to libs/dolphin/include/dolphin/db.h index 0a35c061988..c62f188e404 100644 --- a/include/dolphin/db.h +++ b/libs/dolphin/include/dolphin/db.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_DB_H_ #define _DOLPHIN_DB_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -22,5 +19,4 @@ u32 DBRead(u8*, u32); } #endif -#endif #endif // _DOLPHIN_DB_H_ diff --git a/include/dolphin/db/DBInterface.h b/libs/dolphin/include/dolphin/db/DBInterface.h similarity index 89% rename from include/dolphin/db/DBInterface.h rename to libs/dolphin/include/dolphin/db/DBInterface.h index 58a90f1e5de..7bfa3542724 100644 --- a/include/dolphin/db/DBInterface.h +++ b/libs/dolphin/include/dolphin/db/DBInterface.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_DBINTERFACE_H_ #define _DOLPHIN_DBINTERFACE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -32,4 +29,3 @@ void __DBSetPresent(u32 value); #endif #endif -#endif diff --git a/include/dolphin/demo.h b/libs/dolphin/include/dolphin/demo.h similarity index 100% rename from include/dolphin/demo.h rename to libs/dolphin/include/dolphin/demo.h diff --git a/include/dolphin/demo/DEMOAVX.h b/libs/dolphin/include/dolphin/demo/DEMOAVX.h similarity index 100% rename from include/dolphin/demo/DEMOAVX.h rename to libs/dolphin/include/dolphin/demo/DEMOAVX.h diff --git a/include/dolphin/demo/DEMOInit.h b/libs/dolphin/include/dolphin/demo/DEMOInit.h similarity index 100% rename from include/dolphin/demo/DEMOInit.h rename to libs/dolphin/include/dolphin/demo/DEMOInit.h diff --git a/include/dolphin/demo/DEMOPad.h b/libs/dolphin/include/dolphin/demo/DEMOPad.h similarity index 100% rename from include/dolphin/demo/DEMOPad.h rename to libs/dolphin/include/dolphin/demo/DEMOPad.h diff --git a/include/dolphin/demo/DEMOPuts.h b/libs/dolphin/include/dolphin/demo/DEMOPuts.h similarity index 100% rename from include/dolphin/demo/DEMOPuts.h rename to libs/dolphin/include/dolphin/demo/DEMOPuts.h diff --git a/include/dolphin/demo/DEMOStats.h b/libs/dolphin/include/dolphin/demo/DEMOStats.h similarity index 100% rename from include/dolphin/demo/DEMOStats.h rename to libs/dolphin/include/dolphin/demo/DEMOStats.h diff --git a/include/dolphin/demo/DEMOWin.h b/libs/dolphin/include/dolphin/demo/DEMOWin.h similarity index 100% rename from include/dolphin/demo/DEMOWin.h rename to libs/dolphin/include/dolphin/demo/DEMOWin.h diff --git a/include/dolphin/dolphin.h b/libs/dolphin/include/dolphin/dolphin.h similarity index 87% rename from include/dolphin/dolphin.h rename to libs/dolphin/include/dolphin/dolphin.h index a81740a6cf0..ac1ebcf7b0d 100644 --- a/include/dolphin/dolphin.h +++ b/libs/dolphin/include/dolphin/dolphin.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_H_ #define _DOLPHIN_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -25,4 +22,3 @@ #include #endif -#endif diff --git a/include/dolphin/dsp.h b/libs/dolphin/include/dolphin/dsp.h similarity index 95% rename from include/dolphin/dsp.h rename to libs/dolphin/include/dolphin/dsp.h index 42c5e5f97f0..72ffa82e620 100644 --- a/include/dolphin/dsp.h +++ b/libs/dolphin/include/dolphin/dsp.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_DSP_H_ #define _DOLPHIN_DSP_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -58,4 +55,3 @@ DSPTaskInfo* __DSPGetCurrentTask(void); #endif #endif -#endif diff --git a/include/dolphin/dtk.h b/libs/dolphin/include/dolphin/dtk.h similarity index 100% rename from include/dolphin/dtk.h rename to libs/dolphin/include/dolphin/dtk.h diff --git a/include/dolphin/dvd.h b/libs/dolphin/include/dolphin/dvd.h similarity index 99% rename from include/dolphin/dvd.h rename to libs/dolphin/include/dolphin/dvd.h index 382e82c318f..ae036cad3fc 100644 --- a/include/dolphin/dvd.h +++ b/libs/dolphin/include/dolphin/dvd.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_DVD_H_ #define _DOLPHIN_DVD_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -237,4 +234,3 @@ void DVDDumpWaitingQueue(void); #endif #endif -#endif diff --git a/include/dolphin/exi.h b/libs/dolphin/include/dolphin/exi.h similarity index 97% rename from include/dolphin/exi.h rename to libs/dolphin/include/dolphin/exi.h index 17cfc7d563a..f094c361308 100644 --- a/include/dolphin/exi.h +++ b/libs/dolphin/include/dolphin/exi.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_EXI_H_ #define _DOLPHIN_EXI_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -104,4 +101,3 @@ char* EXIGetTypeString(u32 type); #endif #endif -#endif diff --git a/include/dolphin/gd.h b/libs/dolphin/include/dolphin/gd.h similarity index 84% rename from include/dolphin/gd.h rename to libs/dolphin/include/dolphin/gd.h index 2a39517353c..57c929dad62 100644 --- a/include/dolphin/gd.h +++ b/libs/dolphin/include/dolphin/gd.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_H_ #define _DOLPHIN_GD_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -15,4 +12,3 @@ #include #endif -#endif diff --git a/include/dolphin/gd/GDBase.h b/libs/dolphin/include/dolphin/gd/GDBase.h similarity index 97% rename from include/dolphin/gd/GDBase.h rename to libs/dolphin/include/dolphin/gd/GDBase.h index 264f25bc4d8..3e148c32282 100644 --- a/include/dolphin/gd/GDBase.h +++ b/libs/dolphin/include/dolphin/gd/GDBase.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_BASE_H #define _DOLPHIN_GD_BASE_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -152,4 +149,3 @@ static inline u32 GDGetGDLObjOffset(const GDLObj* dl) { #endif #endif -#endif diff --git a/include/dolphin/gd/GDFile.h b/libs/dolphin/include/dolphin/gd/GDFile.h similarity index 88% rename from include/dolphin/gd/GDFile.h rename to libs/dolphin/include/dolphin/gd/GDFile.h index 8ccd30a19b3..3589fbb7ee9 100644 --- a/include/dolphin/gd/GDFile.h +++ b/libs/dolphin/include/dolphin/gd/GDFile.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_FILE_H #define _DOLPHIN_GD_FILE_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -32,4 +29,3 @@ s32 GDReadDLFile(const char* fName, u32* numDLs, u32* numPLs, GDGList** DLDescAr #endif #endif -#endif diff --git a/include/dolphin/gd/GDGeometry.h b/libs/dolphin/include/dolphin/gd/GDGeometry.h similarity index 99% rename from include/dolphin/gd/GDGeometry.h rename to libs/dolphin/include/dolphin/gd/GDGeometry.h index 77bb3137253..3b0424fbd4b 100644 --- a/include/dolphin/gd/GDGeometry.h +++ b/libs/dolphin/include/dolphin/gd/GDGeometry.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_GEOMETRY_H_ #define _DOLPHIN_GD_GEOMETRY_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -525,4 +522,3 @@ void GDSetCoPlanar(u8 enable); #endif #endif -#endif diff --git a/include/dolphin/gd/GDIndirect.h b/libs/dolphin/include/dolphin/gd/GDIndirect.h similarity index 97% rename from include/dolphin/gd/GDIndirect.h rename to libs/dolphin/include/dolphin/gd/GDIndirect.h index 80064d577cc..4ca854c31b3 100644 --- a/include/dolphin/gd/GDIndirect.h +++ b/libs/dolphin/include/dolphin/gd/GDIndirect.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_INDIRECT_H_ #define _DOLPHIN_GD_INDIRECT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -92,4 +89,3 @@ void __GDSetIndTexMask(u32 mask); #endif #endif -#endif diff --git a/include/dolphin/gd/GDLight.h b/libs/dolphin/include/dolphin/gd/GDLight.h similarity index 96% rename from include/dolphin/gd/GDLight.h rename to libs/dolphin/include/dolphin/gd/GDLight.h index a725830fe45..549b07a26eb 100644 --- a/include/dolphin/gd/GDLight.h +++ b/libs/dolphin/include/dolphin/gd/GDLight.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_LIGHT_H_ #define _DOLPHIN_GD_LIGHT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include "global.h" @@ -75,4 +72,3 @@ inline static u16 __GDLightID2Offset(GXLightID id) { #endif #endif -#endif diff --git a/include/dolphin/gd/GDPixel.h b/libs/dolphin/include/dolphin/gd/GDPixel.h similarity index 97% rename from include/dolphin/gd/GDPixel.h rename to libs/dolphin/include/dolphin/gd/GDPixel.h index 8d9611f22f9..158b04ec1f6 100644 --- a/include/dolphin/gd/GDPixel.h +++ b/libs/dolphin/include/dolphin/gd/GDPixel.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_PIXEL_H #define _DOLPHIN_GD_PIXEL_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -96,4 +93,3 @@ void GDSetDrawSync(u16 token); #endif #endif -#endif diff --git a/include/dolphin/gd/GDTev.h b/libs/dolphin/include/dolphin/gd/GDTev.h similarity index 98% rename from include/dolphin/gd/GDTev.h rename to libs/dolphin/include/dolphin/gd/GDTev.h index f81cba54edb..baec8b5e2ec 100644 --- a/include/dolphin/gd/GDTev.h +++ b/libs/dolphin/include/dolphin/gd/GDTev.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_TEV_H #define _DOLPHIN_GD_TEV_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -134,4 +131,3 @@ void GDSetTevOrder(GXTevStageID evenStage, GXTexCoordID coord0, GXTexMapID map0, #endif #endif -#endif diff --git a/include/dolphin/gd/GDTexture.h b/libs/dolphin/include/dolphin/gd/GDTexture.h similarity index 97% rename from include/dolphin/gd/GDTexture.h rename to libs/dolphin/include/dolphin/gd/GDTexture.h index d041de665b5..2370cbb52ba 100644 --- a/include/dolphin/gd/GDTexture.h +++ b/libs/dolphin/include/dolphin/gd/GDTexture.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_TEXTURE_H #define _DOLPHIN_GD_TEXTURE_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -128,4 +125,3 @@ void GDLoadTlutRaw(u32 tlut_ptr_raw, u32 tmem_addr, GXTlutSize size); #endif #endif -#endif diff --git a/include/dolphin/gd/GDTransform.h b/libs/dolphin/include/dolphin/gd/GDTransform.h similarity index 95% rename from include/dolphin/gd/GDTransform.h rename to libs/dolphin/include/dolphin/gd/GDTransform.h index e3699519f9b..8d0159fdb0a 100644 --- a/include/dolphin/gd/GDTransform.h +++ b/libs/dolphin/include/dolphin/gd/GDTransform.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GD_TRANSFORM_H_ #define _DOLPHIN_GD_TRANSFORM_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -57,4 +54,3 @@ void GDSetProjection(const Mtx44 mtx, GXProjectionType type); #endif #endif -#endif diff --git a/include/dolphin/gf.h b/libs/dolphin/include/dolphin/gf.h similarity index 73% rename from include/dolphin/gf.h rename to libs/dolphin/include/dolphin/gf.h index 31a7fd59103..50676aeab80 100644 --- a/include/dolphin/gf.h +++ b/libs/dolphin/include/dolphin/gf.h @@ -1,13 +1,9 @@ #ifndef _DOLPHIN_GF_H_ #define _DOLPHIN_GF_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include #include #endif -#endif diff --git a/include/dolphin/gf/GFGeometry.h b/libs/dolphin/include/dolphin/gf/GFGeometry.h similarity index 92% rename from include/dolphin/gf/GFGeometry.h rename to libs/dolphin/include/dolphin/gf/GFGeometry.h index 4d6c885807a..c0866a5e109 100644 --- a/include/dolphin/gf/GFGeometry.h +++ b/libs/dolphin/include/dolphin/gf/GFGeometry.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GF_GFGEOMETRY_H_ #define _DOLPHIN_GF_GFGEOMETRY_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #define GF_GEN_MODE(nTexGens, nChans, nTevs, cm, nInds) \ @@ -41,5 +38,4 @@ static inline void GFWriteXFCmd(u16 addr, u32 val) { void GFSetGenMode2(u8 nTexGens, u8 nChans, u8 nTevs, u8 nInds, GXCullMode cm); -#endif #endif /* _DOLPHIN_GF_GFGEOMETRY_H_ */ diff --git a/include/dolphin/gf/GFLight.h b/libs/dolphin/include/dolphin/gf/GFLight.h similarity index 70% rename from include/dolphin/gf/GFLight.h rename to libs/dolphin/include/dolphin/gf/GFLight.h index 570f58e88e2..3c4e222ae65 100644 --- a/include/dolphin/gf/GFLight.h +++ b/libs/dolphin/include/dolphin/gf/GFLight.h @@ -1,12 +1,8 @@ #ifndef _DOLPHIN_GF_GFLIGHT_H #define _DOLPHIN_GF_GFLIGHT_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include void GFSetChanAmbColor(GXChannelID chan, GXColor color); -#endif #endif /* _DOLPHIN_GF_GFLIGHT_H */ diff --git a/include/dolphin/gf/GFPixel.h b/libs/dolphin/include/dolphin/gf/GFPixel.h similarity index 87% rename from include/dolphin/gf/GFPixel.h rename to libs/dolphin/include/dolphin/gf/GFPixel.h index a200b776f19..93b7ff99a12 100644 --- a/include/dolphin/gf/GFPixel.h +++ b/libs/dolphin/include/dolphin/gf/GFPixel.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GF_GFPIXEL_H #define _DOLPHIN_GF_GFPIXEL_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include void GFSetFog(GXFogType type, f32 startz, f32 endz, f32 nearz, f32 farz, GXColor color); @@ -13,5 +10,4 @@ void GFSetBlendModeEtc(GXBlendMode type, GXBlendFactor src_factor, u8 dither_enable); void GFSetZMode(u8 compare_enable, GXCompare func, u8 update_enable); -#endif #endif /* _DOLPHIN_GF_GFPIXEL_H */ diff --git a/include/dolphin/gf/GFTev.h b/libs/dolphin/include/dolphin/gf/GFTev.h similarity index 70% rename from include/dolphin/gf/GFTev.h rename to libs/dolphin/include/dolphin/gf/GFTev.h index 2a20479e707..ade4c412aea 100644 --- a/include/dolphin/gf/GFTev.h +++ b/libs/dolphin/include/dolphin/gf/GFTev.h @@ -1,12 +1,8 @@ #ifndef _DOLPHIN_GF_GFTEV_H #define _DOLPHIN_GF_GFTEV_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include void GFSetTevColorS10(GXTevRegID reg, GXColorS10 color); -#endif #endif /* _DOLPHIN_GF_GFTEV_H */ diff --git a/include/dolphin/gx.h b/libs/dolphin/include/dolphin/gx.h similarity index 93% rename from include/dolphin/gx.h rename to libs/dolphin/include/dolphin/gx.h index 100fe8a8d95..0e90e543e17 100644 --- a/include/dolphin/gx.h +++ b/libs/dolphin/include/dolphin/gx.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_H_ #define _DOLPHIN_GX_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -41,4 +38,3 @@ void GXSetDrawSync(u16 token); #endif #endif -#endif diff --git a/include/dolphin/gx/GXBump.h b/libs/dolphin/include/dolphin/gx/GXBump.h similarity index 95% rename from include/dolphin/gx/GXBump.h rename to libs/dolphin/include/dolphin/gx/GXBump.h index 61118c08763..2a24dc69f84 100644 --- a/include/dolphin/gx/GXBump.h +++ b/libs/dolphin/include/dolphin/gx/GXBump.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXBUMP_H_ #define _DOLPHIN_GX_GXBUMP_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -30,4 +27,3 @@ void __GXSetIndirectMask(u32 mask); #endif #endif -#endif diff --git a/include/dolphin/gx/GXCommandList.h b/libs/dolphin/include/dolphin/gx/GXCommandList.h similarity index 92% rename from include/dolphin/gx/GXCommandList.h rename to libs/dolphin/include/dolphin/gx/GXCommandList.h index e89037e7741..9adae3cb791 100644 --- a/include/dolphin/gx/GXCommandList.h +++ b/libs/dolphin/include/dolphin/gx/GXCommandList.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXCOMMANDLIST_H_ #define _DOLPHIN_GX_GXCOMMANDLIST_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #define GX_NOP 0x00 @@ -38,4 +35,3 @@ extern u8 GXTexImage3Ids[8]; extern u8 GXTexTlutIds[8]; #endif -#endif diff --git a/include/dolphin/gx/GXCpu2Efb.h b/libs/dolphin/include/dolphin/gx/GXCpu2Efb.h similarity index 91% rename from include/dolphin/gx/GXCpu2Efb.h rename to libs/dolphin/include/dolphin/gx/GXCpu2Efb.h index 32263310b95..46aa3e3369e 100644 --- a/include/dolphin/gx/GXCpu2Efb.h +++ b/libs/dolphin/include/dolphin/gx/GXCpu2Efb.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXCPU2EFB_H_ #define _DOLPHIN_GX_GXCPU2EFB_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -30,4 +27,3 @@ u32 GXDecompressZ16(u32 z16, GXZFmt16 zfmt); #endif #endif -#endif diff --git a/include/dolphin/gx/GXCull.h b/libs/dolphin/include/dolphin/gx/GXCull.h similarity index 80% rename from include/dolphin/gx/GXCull.h rename to libs/dolphin/include/dolphin/gx/GXCull.h index 14a3fcbfd3b..cac43818127 100644 --- a/include/dolphin/gx/GXCull.h +++ b/libs/dolphin/include/dolphin/gx/GXCull.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXCULL_H_ #define _DOLPHIN_GX_GXCULL_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -19,4 +16,3 @@ void GXSetCoPlanar(GXBool enable); #endif #endif -#endif diff --git a/include/dolphin/gx/GXDispList.h b/libs/dolphin/include/dolphin/gx/GXDispList.h similarity index 79% rename from include/dolphin/gx/GXDispList.h rename to libs/dolphin/include/dolphin/gx/GXDispList.h index fb6fd3d400b..357fb8f7e0a 100644 --- a/include/dolphin/gx/GXDispList.h +++ b/libs/dolphin/include/dolphin/gx/GXDispList.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXDISPLIST_H_ #define _DOLPHIN_GX_GXDISPLIST_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -19,4 +16,3 @@ void GXCallDisplayList(void* list, u32 nbytes); #endif #endif -#endif diff --git a/include/dolphin/gx/GXDraw.h b/libs/dolphin/include/dolphin/gx/GXDraw.h similarity index 86% rename from include/dolphin/gx/GXDraw.h rename to libs/dolphin/include/dolphin/gx/GXDraw.h index 75e58d7408f..c8e779345a2 100644 --- a/include/dolphin/gx/GXDraw.h +++ b/libs/dolphin/include/dolphin/gx/GXDraw.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXDRAW_H_ #define _DOLPHIN_GX_GXDRAW_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -25,4 +22,3 @@ u32 GXGenNormalTable(u8 depth, f32* table); #endif #endif -#endif diff --git a/include/dolphin/gx/GXEnum.h b/libs/dolphin/include/dolphin/gx/GXEnum.h similarity index 99% rename from include/dolphin/gx/GXEnum.h rename to libs/dolphin/include/dolphin/gx/GXEnum.h index 49f97ace7bf..cd84f223996 100644 --- a/include/dolphin/gx/GXEnum.h +++ b/libs/dolphin/include/dolphin/gx/GXEnum.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXENUM_H_ #define _DOLPHIN_GX_GXENUM_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include typedef u8 GXBool; @@ -925,4 +922,3 @@ typedef enum _GXCPRegs { } GXCPRegs; #endif -#endif diff --git a/include/dolphin/gx/GXFifo.h b/libs/dolphin/include/dolphin/gx/GXFifo.h similarity index 95% rename from include/dolphin/gx/GXFifo.h rename to libs/dolphin/include/dolphin/gx/GXFifo.h index 8dbc0203638..069f36a4eaf 100644 --- a/include/dolphin/gx/GXFifo.h +++ b/libs/dolphin/include/dolphin/gx/GXFifo.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXFIFO_H_ #define _DOLPHIN_GX_GXFIFO_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -47,4 +44,3 @@ void GXRestoreWriteGatherPipe(void); #endif #endif -#endif diff --git a/include/dolphin/gx/GXFrameBuffer.h b/libs/dolphin/include/dolphin/gx/GXFrameBuffer.h similarity index 96% rename from include/dolphin/gx/GXFrameBuffer.h rename to libs/dolphin/include/dolphin/gx/GXFrameBuffer.h index 99b1af436f4..73b513fa32e 100644 --- a/include/dolphin/gx/GXFrameBuffer.h +++ b/libs/dolphin/include/dolphin/gx/GXFrameBuffer.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXFRAMEBUFFER_H_ #define _DOLPHIN_GX_GXFRAMEBUFFER_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -67,4 +64,3 @@ f32 GXGetYScaleFactor(u16 efbHeight, u16 xfbHeight); #endif #endif -#endif diff --git a/include/dolphin/gx/GXGeometry.h b/libs/dolphin/include/dolphin/gx/GXGeometry.h similarity index 95% rename from include/dolphin/gx/GXGeometry.h rename to libs/dolphin/include/dolphin/gx/GXGeometry.h index f2e9965ad0f..c12a6f1b467 100644 --- a/include/dolphin/gx/GXGeometry.h +++ b/libs/dolphin/include/dolphin/gx/GXGeometry.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXGEOMETRY_H_ #define _DOLPHIN_GX_GXGEOMETRY_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -48,4 +45,3 @@ void GXEnableTexOffsets(GXTexCoordID coord, u8 line_enable, u8 point_enable); #endif #endif -#endif diff --git a/include/dolphin/gx/GXGet.h b/libs/dolphin/include/dolphin/gx/GXGet.h similarity index 97% rename from include/dolphin/gx/GXGet.h rename to libs/dolphin/include/dolphin/gx/GXGet.h index 553201d51f6..d1ba630a46c 100644 --- a/include/dolphin/gx/GXGet.h +++ b/libs/dolphin/include/dolphin/gx/GXGet.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXGET_H_ #define _DOLPHIN_GX_GXGET_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -65,4 +62,3 @@ void GXGetScissor(u32* left, u32* top, u32* wd, u32* ht); #endif #endif -#endif diff --git a/include/dolphin/gx/GXLighting.h b/libs/dolphin/include/dolphin/gx/GXLighting.h similarity index 94% rename from include/dolphin/gx/GXLighting.h rename to libs/dolphin/include/dolphin/gx/GXLighting.h index fb1af068826..83c5aae423a 100644 --- a/include/dolphin/gx/GXLighting.h +++ b/libs/dolphin/include/dolphin/gx/GXLighting.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXLIGHTING_H_ #define _DOLPHIN_GX_GXLIGHTING_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -33,4 +30,3 @@ void GXSetChanCtrl(GXChannelID chan, GXBool enable, GXColorSrc amb_src, GXColorS #endif #endif -#endif diff --git a/include/dolphin/gx/GXManage.h b/libs/dolphin/include/dolphin/gx/GXManage.h similarity index 91% rename from include/dolphin/gx/GXManage.h rename to libs/dolphin/include/dolphin/gx/GXManage.h index 2a5784b84ad..fd899d36199 100644 --- a/include/dolphin/gx/GXManage.h +++ b/libs/dolphin/include/dolphin/gx/GXManage.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXMANAGE_H_ #define _DOLPHIN_GX_GXMANAGE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -37,4 +34,3 @@ GXDrawDoneCallback GXSetDrawDoneCallback(GXDrawDoneCallback cb); #endif #endif -#endif diff --git a/include/dolphin/gx/GXPerf.h b/libs/dolphin/include/dolphin/gx/GXPerf.h similarity index 93% rename from include/dolphin/gx/GXPerf.h rename to libs/dolphin/include/dolphin/gx/GXPerf.h index f579e4201a8..bd1b474aa8b 100644 --- a/include/dolphin/gx/GXPerf.h +++ b/libs/dolphin/include/dolphin/gx/GXPerf.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXPERF_H_ #define _DOLPHIN_GX_GXPERF_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -31,4 +28,3 @@ u32 GXReadClksPerVtx(void); #endif #endif -#endif diff --git a/include/dolphin/gx/GXPixel.h b/libs/dolphin/include/dolphin/gx/GXPixel.h similarity index 93% rename from include/dolphin/gx/GXPixel.h rename to libs/dolphin/include/dolphin/gx/GXPixel.h index ed3e245db59..d61838d1a99 100644 --- a/include/dolphin/gx/GXPixel.h +++ b/libs/dolphin/include/dolphin/gx/GXPixel.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXPIXEL_H_ #define _DOLPHIN_GX_GXPIXEL_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -31,4 +28,3 @@ void GXSetFogColor(GXColor color); #endif #endif -#endif diff --git a/include/dolphin/gx/GXStruct.h b/libs/dolphin/include/dolphin/gx/GXStruct.h similarity index 94% rename from include/dolphin/gx/GXStruct.h rename to libs/dolphin/include/dolphin/gx/GXStruct.h index faba188d249..0e7dc0be690 100644 --- a/include/dolphin/gx/GXStruct.h +++ b/libs/dolphin/include/dolphin/gx/GXStruct.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXSTRUCT_H_ #define _DOLPHIN_GX_GXSTRUCT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -76,4 +73,3 @@ typedef struct _GXVtxAttrFmtList { #endif #endif -#endif diff --git a/include/dolphin/gx/GXTev.h b/libs/dolphin/include/dolphin/gx/GXTev.h similarity index 95% rename from include/dolphin/gx/GXTev.h rename to libs/dolphin/include/dolphin/gx/GXTev.h index a804fd0ccd9..8deb22d0837 100644 --- a/include/dolphin/gx/GXTev.h +++ b/libs/dolphin/include/dolphin/gx/GXTev.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXTEV_H_ #define _DOLPHIN_GX_GXTEV_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -34,4 +31,3 @@ void GXSetNumTevStages(u8 nStages); #endif #endif -#endif diff --git a/include/dolphin/gx/GXTexture.h b/libs/dolphin/include/dolphin/gx/GXTexture.h similarity index 97% rename from include/dolphin/gx/GXTexture.h rename to libs/dolphin/include/dolphin/gx/GXTexture.h index e84dcffe470..f42dc2295a9 100644 --- a/include/dolphin/gx/GXTexture.h +++ b/libs/dolphin/include/dolphin/gx/GXTexture.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXTEXTURE_H_ #define _DOLPHIN_GX_GXTEXTURE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -53,4 +50,3 @@ void GXInitTexObjMaxAniso(GXTexObj* obj, GXAnisotropy max_aniso); #endif #endif -#endif diff --git a/include/dolphin/gx/GXTransform.h b/libs/dolphin/include/dolphin/gx/GXTransform.h similarity index 93% rename from include/dolphin/gx/GXTransform.h rename to libs/dolphin/include/dolphin/gx/GXTransform.h index f433f65f445..1e7f94e5796 100644 --- a/include/dolphin/gx/GXTransform.h +++ b/libs/dolphin/include/dolphin/gx/GXTransform.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXTRANSFORM_H_ #define _DOLPHIN_GX_GXTRANSFORM_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -33,5 +30,5 @@ void GXSetZScaleOffset(f32 scale, f32 offset); #ifdef __cplusplus } #endif -#endif + #endif diff --git a/include/dolphin/gx/GXVerify.h b/libs/dolphin/include/dolphin/gx/GXVerify.h similarity index 88% rename from include/dolphin/gx/GXVerify.h rename to libs/dolphin/include/dolphin/gx/GXVerify.h index b1a299e0da5..93a1b29e58c 100644 --- a/include/dolphin/gx/GXVerify.h +++ b/libs/dolphin/include/dolphin/gx/GXVerify.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXVERIFY_H_ #define _DOLPHIN_GX_GXVERIFY_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -30,4 +27,3 @@ void __GXVerifyVATImm(GXAttr attr, GXCompCnt cnt, GXCompType type, u8 frac); #endif #endif -#endif diff --git a/include/dolphin/gx/GXVert.h b/libs/dolphin/include/dolphin/gx/GXVert.h similarity index 97% rename from include/dolphin/gx/GXVert.h rename to libs/dolphin/include/dolphin/gx/GXVert.h index c508e164bbb..91b7d7cc0ba 100644 --- a/include/dolphin/gx/GXVert.h +++ b/libs/dolphin/include/dolphin/gx/GXVert.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_GX_GXVERT_H_ #define _DOLPHIN_GX_GXVERT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -141,4 +138,3 @@ FUNC_1PARAM(GXMatrixIndex, u8) #endif #endif -#endif diff --git a/include/dolphin/hio.h b/libs/dolphin/include/dolphin/hio.h similarity index 100% rename from include/dolphin/hio.h rename to libs/dolphin/include/dolphin/hio.h diff --git a/include/dolphin/hw_regs.h b/libs/dolphin/include/dolphin/hw_regs.h similarity index 100% rename from include/dolphin/hw_regs.h rename to libs/dolphin/include/dolphin/hw_regs.h diff --git a/include/dolphin/mcc.h b/libs/dolphin/include/dolphin/mcc.h similarity index 100% rename from include/dolphin/mcc.h rename to libs/dolphin/include/dolphin/mcc.h diff --git a/include/dolphin/mix.h b/libs/dolphin/include/dolphin/mix.h similarity index 97% rename from include/dolphin/mix.h rename to libs/dolphin/include/dolphin/mix.h index aa9a22b1dd9..f58b3d63dc6 100644 --- a/include/dolphin/mix.h +++ b/libs/dolphin/include/dolphin/mix.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_MIX_H_ #define _DOLPHIN_MIX_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -95,5 +92,4 @@ void MIXUpdateSettings(void); } #endif -#endif #endif // _DOLPHIN_MIX_H_ diff --git a/include/dolphin/mtx.h b/libs/dolphin/include/dolphin/mtx.h similarity index 99% rename from include/dolphin/mtx.h rename to libs/dolphin/include/dolphin/mtx.h index da308658ab6..b7c265e7588 100644 --- a/include/dolphin/mtx.h +++ b/libs/dolphin/include/dolphin/mtx.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_MTX_H_ #define _DOLPHIN_MTX_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -384,4 +381,3 @@ void C_QUATCompA(const Quaternion* qprev, const Quaternion* q, const Quaternion* #endif #endif -#endif diff --git a/include/dolphin/os.h b/libs/dolphin/include/dolphin/os.h similarity index 99% rename from include/dolphin/os.h rename to libs/dolphin/include/dolphin/os.h index f9bd33ab5b0..b2118079120 100644 --- a/include/dolphin/os.h +++ b/libs/dolphin/include/dolphin/os.h @@ -3,9 +3,6 @@ #include -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include void OSReportInit(void); @@ -354,4 +351,3 @@ static inline void OSInitFastCast(void) { #endif #endif -#endif diff --git a/include/dolphin/os/OSAlarm.h b/libs/dolphin/include/dolphin/os/OSAlarm.h similarity index 92% rename from include/dolphin/os/OSAlarm.h rename to libs/dolphin/include/dolphin/os/OSAlarm.h index 43e48221425..31050391818 100644 --- a/include/dolphin/os/OSAlarm.h +++ b/libs/dolphin/include/dolphin/os/OSAlarm.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSALARM_H_ #define _DOLPHIN_OSALARM_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -36,5 +33,4 @@ void OSCancelAlarms(u32 tag); } #endif -#endif #endif // _DOLPHIN_OSALARM_H_ diff --git a/include/dolphin/os/OSAlloc.h b/libs/dolphin/include/dolphin/os/OSAlloc.h similarity index 91% rename from include/dolphin/os/OSAlloc.h rename to libs/dolphin/include/dolphin/os/OSAlloc.h index 426b6ae4391..77eb88661fa 100644 --- a/include/dolphin/os/OSAlloc.h +++ b/libs/dolphin/include/dolphin/os/OSAlloc.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSALLOC_H_ #define _DOLPHIN_OSALLOC_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -35,4 +32,3 @@ void OSVisitAllocated(void (*visitor)(void*, u32)); #endif #endif -#endif diff --git a/include/dolphin/os/OSCache.h b/libs/dolphin/include/dolphin/os/OSCache.h similarity index 93% rename from include/dolphin/os/OSCache.h rename to libs/dolphin/include/dolphin/os/OSCache.h index 2b4bbfd07e0..89e7ce96bad 100644 --- a/include/dolphin/os/OSCache.h +++ b/libs/dolphin/include/dolphin/os/OSCache.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSCACHE_H_ #define _DOLPHIN_OSCACHE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -39,4 +36,3 @@ void __OSCacheInit(void); #endif #endif -#endif diff --git a/include/dolphin/os/OSContext.h b/libs/dolphin/include/dolphin/os/OSContext.h similarity index 98% rename from include/dolphin/os/OSContext.h rename to libs/dolphin/include/dolphin/os/OSContext.h index 900baf40af3..cbb0b92e4e5 100644 --- a/include/dolphin/os/OSContext.h +++ b/libs/dolphin/include/dolphin/os/OSContext.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSCONTEXT_H_ #define _DOLPHIN_OSCONTEXT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -174,4 +171,3 @@ void OSFillFPUContext(OSContext* context); #endif #endif -#endif diff --git a/include/dolphin/os/OSDC.h b/libs/dolphin/include/dolphin/os/OSDC.h similarity index 84% rename from include/dolphin/os/OSDC.h rename to libs/dolphin/include/dolphin/os/OSDC.h index 995c1630cc7..bab2d68edcb 100644 --- a/include/dolphin/os/OSDC.h +++ b/libs/dolphin/include/dolphin/os/OSDC.h @@ -1,10 +1,6 @@ #ifndef _DOLPHIN_OSDC_H_ #define _DOLPHIN_OSDC_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else - #ifdef __cplusplus extern "C" { #endif @@ -25,4 +21,3 @@ void DCBlockInvalidate(void* addr); #endif #endif -#endif diff --git a/include/dolphin/os/OSError.h b/libs/dolphin/include/dolphin/os/OSError.h similarity index 93% rename from include/dolphin/os/OSError.h rename to libs/dolphin/include/dolphin/os/OSError.h index aeeaede1485..4a2fc7bd71a 100644 --- a/include/dolphin/os/OSError.h +++ b/libs/dolphin/include/dolphin/os/OSError.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSERROR_H_ #define _DOLPHIN_OSERROR_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -39,4 +36,3 @@ extern OSErrorHandler __OSErrorTable[17]; #endif #endif -#endif diff --git a/include/dolphin/os/OSException.h b/libs/dolphin/include/dolphin/os/OSException.h similarity index 97% rename from include/dolphin/os/OSException.h rename to libs/dolphin/include/dolphin/os/OSException.h index 0b909ca202d..e9a2f225697 100644 --- a/include/dolphin/os/OSException.h +++ b/libs/dolphin/include/dolphin/os/OSException.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSEXCEPTION_H_ #define _DOLPHIN_OSEXCEPTION_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -61,5 +58,4 @@ __OSExceptionHandler __OSGetExceptionHandler(__OSException exception); } #endif -#endif #endif // _DOLPHIN_OSEXCEPTION_H_ diff --git a/include/dolphin/os/OSExec.h b/libs/dolphin/include/dolphin/os/OSExec.h similarity index 91% rename from include/dolphin/os/OSExec.h rename to libs/dolphin/include/dolphin/os/OSExec.h index 7fd5380b705..af0dc4da0c0 100644 --- a/include/dolphin/os/OSExec.h +++ b/libs/dolphin/include/dolphin/os/OSExec.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSEXEC_H_ #define _DOLPHIN_OSEXEC_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -36,4 +33,3 @@ void OSExecl(const char* dolfile, const char* arg0, ...); #endif #endif -#endif diff --git a/include/dolphin/os/OSFont.h b/libs/dolphin/include/dolphin/os/OSFont.h similarity index 94% rename from include/dolphin/os/OSFont.h rename to libs/dolphin/include/dolphin/os/OSFont.h index 1c1d480ab4f..1fff41a6296 100644 --- a/include/dolphin/os/OSFont.h +++ b/libs/dolphin/include/dolphin/os/OSFont.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSFONT_H_ #define _DOLPHIN_OSFONT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -59,4 +56,3 @@ int OSSetFontWidth(int fixed); #endif #endif -#endif diff --git a/include/dolphin/os/OSIC.h b/libs/dolphin/include/dolphin/os/OSIC.h similarity index 80% rename from include/dolphin/os/OSIC.h rename to libs/dolphin/include/dolphin/os/OSIC.h index 20156e68747..3309d3a6f15 100644 --- a/include/dolphin/os/OSIC.h +++ b/libs/dolphin/include/dolphin/os/OSIC.h @@ -1,10 +1,6 @@ #ifndef _DOLPHIN_OSIC_H_ #define _DOLPHIN_OSIC_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else - #ifdef __cplusplus extern "C" { #endif @@ -22,4 +18,3 @@ void ICSync(void); #endif #endif -#endif diff --git a/include/dolphin/os/OSInterrupt.h b/libs/dolphin/include/dolphin/os/OSInterrupt.h similarity index 98% rename from include/dolphin/os/OSInterrupt.h rename to libs/dolphin/include/dolphin/os/OSInterrupt.h index 37e4f969580..fb74135a2b6 100644 --- a/include/dolphin/os/OSInterrupt.h +++ b/libs/dolphin/include/dolphin/os/OSInterrupt.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSINTERRUPT_H_ #define _DOLPHIN_OSINTERRUPT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -119,4 +116,3 @@ OSInterruptMask __OSUnmaskInterrupts(OSInterruptMask mask); #endif #endif -#endif diff --git a/include/dolphin/os/OSL2.h b/libs/dolphin/include/dolphin/os/OSL2.h similarity index 81% rename from include/dolphin/os/OSL2.h rename to libs/dolphin/include/dolphin/os/OSL2.h index 0622de06dd4..01b4a620c0d 100644 --- a/include/dolphin/os/OSL2.h +++ b/libs/dolphin/include/dolphin/os/OSL2.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSL2_H_ #define _DOLPHIN_OSL2_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -21,4 +18,3 @@ void L2SetWriteThrough(BOOL writeThrough); #endif #endif -#endif diff --git a/include/dolphin/os/OSLC.h b/libs/dolphin/include/dolphin/os/OSLC.h similarity index 83% rename from include/dolphin/os/OSLC.h rename to libs/dolphin/include/dolphin/os/OSLC.h index c266b20e7b3..af49708b146 100644 --- a/include/dolphin/os/OSLC.h +++ b/libs/dolphin/include/dolphin/os/OSLC.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSLC_H_ #define _DOLPHIN_OSLC_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -20,4 +17,3 @@ void LCAllocNoInvalidate(void *addr, u32 nBytes); #endif #endif -#endif diff --git a/include/dolphin/os/OSMemory.h b/libs/dolphin/include/dolphin/os/OSMemory.h similarity index 89% rename from include/dolphin/os/OSMemory.h rename to libs/dolphin/include/dolphin/os/OSMemory.h index b1eaaf498c3..a5debebc90b 100644 --- a/include/dolphin/os/OSMemory.h +++ b/libs/dolphin/include/dolphin/os/OSMemory.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSMEMORY_H_ #define _DOLPHIN_OSMEMORY_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -29,4 +26,3 @@ u32 OSGetConsoleSimulatedMemSize(void); #endif #endif -#endif diff --git a/include/dolphin/os/OSMessage.h b/libs/dolphin/include/dolphin/os/OSMessage.h similarity index 90% rename from include/dolphin/os/OSMessage.h rename to libs/dolphin/include/dolphin/os/OSMessage.h index 0660be565de..8cdd3f1b028 100644 --- a/include/dolphin/os/OSMessage.h +++ b/libs/dolphin/include/dolphin/os/OSMessage.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSMESSAGE_H_ #define _DOLPHIN_OSMESSAGE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -33,5 +30,4 @@ int OSJamMessage(OSMessageQueue* mq, void* msg, s32 flags); } #endif -#endif #endif // _DOLPHIN_OSMESSAGE_H_ diff --git a/include/dolphin/os/OSModule.h b/libs/dolphin/include/dolphin/os/OSModule.h similarity index 97% rename from include/dolphin/os/OSModule.h rename to libs/dolphin/include/dolphin/os/OSModule.h index d104cf7a189..6e66e9b0032 100644 --- a/include/dolphin/os/OSModule.h +++ b/libs/dolphin/include/dolphin/os/OSModule.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSMODULE_H_ #define _DOLPHIN_OSMODULE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -118,4 +115,3 @@ void OSNotifyUnlink(OSModuleInfo* module); #endif #endif -#endif diff --git a/include/dolphin/os/OSMutex.h b/libs/dolphin/include/dolphin/os/OSMutex.h similarity index 89% rename from include/dolphin/os/OSMutex.h rename to libs/dolphin/include/dolphin/os/OSMutex.h index 58985f7a3c4..ef5565eb67f 100644 --- a/include/dolphin/os/OSMutex.h +++ b/libs/dolphin/include/dolphin/os/OSMutex.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSMUTEX_H_ #define _DOLPHIN_OSMUTEX_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -34,4 +31,3 @@ void OSSignalCond(OSCond* cond); #endif #endif -#endif diff --git a/include/dolphin/os/OSReboot.h b/libs/dolphin/include/dolphin/os/OSReboot.h similarity index 82% rename from include/dolphin/os/OSReboot.h rename to libs/dolphin/include/dolphin/os/OSReboot.h index 517851aa34d..65095347934 100644 --- a/include/dolphin/os/OSReboot.h +++ b/libs/dolphin/include/dolphin/os/OSReboot.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSREBOOT_H_ #define _DOLPHIN_OSREBOOT_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -20,4 +17,3 @@ void __OSReboot(u32 resetCode, u32 bootDol); #endif #endif -#endif diff --git a/include/dolphin/os/OSReset.h b/libs/dolphin/include/dolphin/os/OSReset.h similarity index 91% rename from include/dolphin/os/OSReset.h rename to libs/dolphin/include/dolphin/os/OSReset.h index 221861a4a6d..15c2ba62fff 100644 --- a/include/dolphin/os/OSReset.h +++ b/libs/dolphin/include/dolphin/os/OSReset.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSRESET_H_ #define _DOLPHIN_OSRESET_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -40,4 +37,3 @@ u32 OSSetBootDol(u32 dolOffset); #endif #endif -#endif diff --git a/include/dolphin/os/OSResetSW.h b/libs/dolphin/include/dolphin/os/OSResetSW.h similarity index 81% rename from include/dolphin/os/OSResetSW.h rename to libs/dolphin/include/dolphin/os/OSResetSW.h index 88a7f194f43..3c630b85736 100644 --- a/include/dolphin/os/OSResetSW.h +++ b/libs/dolphin/include/dolphin/os/OSResetSW.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSRESETSW_H_ #define _DOLPHIN_OSRESETSW_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -21,4 +18,3 @@ BOOL OSGetResetButtonState(void); #endif #endif -#endif diff --git a/include/dolphin/os/OSRtc.h b/libs/dolphin/include/dolphin/os/OSRtc.h similarity index 95% rename from include/dolphin/os/OSRtc.h rename to libs/dolphin/include/dolphin/os/OSRtc.h index e35525dae98..583043f4a41 100644 --- a/include/dolphin/os/OSRtc.h +++ b/libs/dolphin/include/dolphin/os/OSRtc.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSRTC_H_ #define _DOLPHIN_OSRTC_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -84,5 +81,4 @@ void OSSetWirelessID(s32 chan, u16 id); } #endif -#endif #endif // _DOLPHIN_OSRTC_H_ diff --git a/include/dolphin/os/OSSemaphore.h b/libs/dolphin/include/dolphin/os/OSSemaphore.h similarity index 86% rename from include/dolphin/os/OSSemaphore.h rename to libs/dolphin/include/dolphin/os/OSSemaphore.h index 93b942f9e1b..aac23811a8e 100644 --- a/include/dolphin/os/OSSemaphore.h +++ b/libs/dolphin/include/dolphin/os/OSSemaphore.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSSEMAPHORE_H_ #define _DOLPHIN_OSSEMAPHORE_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -25,5 +22,4 @@ s32 OSGetSemaphoreCount(OSSemaphore* sem); } #endif -#endif #endif // _DOLPHIN_OSSEMAPHORE_H_ diff --git a/include/dolphin/os/OSSerial.h b/libs/dolphin/include/dolphin/os/OSSerial.h similarity index 60% rename from include/dolphin/os/OSSerial.h rename to libs/dolphin/include/dolphin/os/OSSerial.h index c6dd0a59e4b..7c38395f715 100644 --- a/include/dolphin/os/OSSerial.h +++ b/libs/dolphin/include/dolphin/os/OSSerial.h @@ -1,10 +1,6 @@ #ifndef _DOLPHIN_OSSERIAL_H #define _DOLPHIN_OSSERIAL_H -#ifdef __REVOLUTION_SDK__ -#include -#else #include -#endif #endif // _DOLPHIN_OSSERIAL_H diff --git a/include/dolphin/os/OSThread.h b/libs/dolphin/include/dolphin/os/OSThread.h similarity index 97% rename from include/dolphin/os/OSThread.h rename to libs/dolphin/include/dolphin/os/OSThread.h index c1135759832..5511c7595bf 100644 --- a/include/dolphin/os/OSThread.h +++ b/libs/dolphin/include/dolphin/os/OSThread.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSTHREAD_H_ #define _DOLPHIN_OSTHREAD_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -113,4 +110,3 @@ OSSwitchThreadCallback OSSetSwitchThreadCallback(OSSwitchThreadCallback callback #endif #endif -#endif diff --git a/include/dolphin/os/OSTime.h b/libs/dolphin/include/dolphin/os/OSTime.h similarity index 93% rename from include/dolphin/os/OSTime.h rename to libs/dolphin/include/dolphin/os/OSTime.h index b6e9fd7b8c9..118adee7c2a 100644 --- a/include/dolphin/os/OSTime.h +++ b/libs/dolphin/include/dolphin/os/OSTime.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSTIME_H_ #define _DOLPHIN_OSTIME_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -44,5 +41,4 @@ extern "C" { } #endif -#endif #endif // _DOLPHIN_OSTIME_H_ diff --git a/include/dolphin/os/OSTimer.h b/libs/dolphin/include/dolphin/os/OSTimer.h similarity index 83% rename from include/dolphin/os/OSTimer.h rename to libs/dolphin/include/dolphin/os/OSTimer.h index caa4076ffed..490cccb67ce 100644 --- a/include/dolphin/os/OSTimer.h +++ b/libs/dolphin/include/dolphin/os/OSTimer.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSTIMER_H_ #define _DOLPHIN_OSTIMER_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -21,5 +18,4 @@ void OSStopTimer(void); } #endif -#endif #endif // _DOLPHIN_OSTIMER_H_ diff --git a/include/dolphin/os/OSUtf.h b/libs/dolphin/include/dolphin/os/OSUtf.h similarity index 86% rename from include/dolphin/os/OSUtf.h rename to libs/dolphin/include/dolphin/os/OSUtf.h index 44c908ef0f2..2f721d5787d 100644 --- a/include/dolphin/os/OSUtf.h +++ b/libs/dolphin/include/dolphin/os/OSUtf.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_OSUTF_H_ #define _DOLPHIN_OSUTF_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -23,5 +20,4 @@ u32 OSSJIStoUTF32(u16 sjis); } #endif -#endif #endif // _DOLPHIN_OSUTF_H_ diff --git a/include/dolphin/pad.h b/libs/dolphin/include/dolphin/pad.h similarity index 97% rename from include/dolphin/pad.h rename to libs/dolphin/include/dolphin/pad.h index eb208d4287a..d966b80945d 100644 --- a/include/dolphin/pad.h +++ b/libs/dolphin/include/dolphin/pad.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_PAD_H_ #define _DOLPHIN_PAD_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -105,4 +102,3 @@ void PADClampCircle(PADStatus* status); #endif #endif -#endif diff --git a/include/dolphin/perf.h b/libs/dolphin/include/dolphin/perf.h similarity index 100% rename from include/dolphin/perf.h rename to libs/dolphin/include/dolphin/perf.h diff --git a/include/dolphin/sdk_math.h b/libs/dolphin/include/dolphin/sdk_math.h similarity index 100% rename from include/dolphin/sdk_math.h rename to libs/dolphin/include/dolphin/sdk_math.h diff --git a/include/dolphin/seq.h b/libs/dolphin/include/dolphin/seq.h similarity index 95% rename from include/dolphin/seq.h rename to libs/dolphin/include/dolphin/seq.h index 8c950ca2a38..754798093d5 100644 --- a/include/dolphin/seq.h +++ b/libs/dolphin/include/dolphin/seq.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_SEQ_H_ #define _DOLPHIN_SEQ_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -54,5 +51,4 @@ s32 SEQGetVolume(SEQSEQUENCE* sequence); } #endif -#endif #endif // _DOLPHIN_SEQ_H_ diff --git a/include/dolphin/si.h b/libs/dolphin/include/dolphin/si.h similarity index 98% rename from include/dolphin/si.h rename to libs/dolphin/include/dolphin/si.h index ed1b442ad82..04b01ba4d7f 100644 --- a/include/dolphin/si.h +++ b/libs/dolphin/include/dolphin/si.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_SI_H_ #define _DOLPHIN_SI_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -175,5 +172,4 @@ void SIControlSteering(s32 chan, u32 control, s32 level); } #endif -#endif #endif // _DOLPHIN_SI_H_ diff --git a/include/dolphin/sp.h b/libs/dolphin/include/dolphin/sp.h similarity index 92% rename from include/dolphin/sp.h rename to libs/dolphin/include/dolphin/sp.h index 4401b8c9fc4..52f4fff0202 100644 --- a/include/dolphin/sp.h +++ b/libs/dolphin/include/dolphin/sp.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_SP_H_ #define _DOLPHIN_SP_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -41,4 +38,3 @@ void SPPrepareEnd(SPSoundEntry* sound, AXVPB* axvpb); #endif #endif -#endif diff --git a/include/dolphin/syn.h b/libs/dolphin/include/dolphin/syn.h similarity index 98% rename from include/dolphin/syn.h rename to libs/dolphin/include/dolphin/syn.h index 0b8848f9d49..8373c5db914 100644 --- a/include/dolphin/syn.h +++ b/libs/dolphin/include/dolphin/syn.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_SYN_H_ #define _DOLPHIN_SYN_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include @@ -172,5 +169,4 @@ u8 SYNGetMidiController(SYNSYNTH* synth, u8 midiChannel, u8 function); } #endif -#endif #endif // _DOLPHIN_SYN_H_ diff --git a/include/dolphin/thp.h b/libs/dolphin/include/dolphin/thp.h similarity index 98% rename from include/dolphin/thp.h rename to libs/dolphin/include/dolphin/thp.h index 250c518f6bd..455afe6ccbc 100644 --- a/include/dolphin/thp.h +++ b/libs/dolphin/include/dolphin/thp.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_THP_H_ #define _DOLPHIN_THP_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #ifdef __cplusplus @@ -154,5 +151,4 @@ static s32 __THPHuffDecodeTab(THPFileInfo* info, THPHuffmanTab* h); } #endif -#endif #endif // _DOLPHIN_THP_H_ diff --git a/include/dolphin/types.h b/libs/dolphin/include/dolphin/types.h similarity index 96% rename from include/dolphin/types.h rename to libs/dolphin/include/dolphin/types.h index 4eb63aa1da3..d99adca78cf 100644 --- a/include/dolphin/types.h +++ b/libs/dolphin/include/dolphin/types.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_TYPES_H_ #define _DOLPHIN_TYPES_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else typedef signed char s8; typedef unsigned char u8; typedef signed short int s16; @@ -89,4 +86,3 @@ typedef unsigned int uint; #include #endif -#endif diff --git a/include/dolphin/vi.h b/libs/dolphin/include/dolphin/vi.h similarity index 64% rename from include/dolphin/vi.h rename to libs/dolphin/include/dolphin/vi.h index b8fa79160e2..af41844266e 100644 --- a/include/dolphin/vi.h +++ b/libs/dolphin/include/dolphin/vi.h @@ -1,11 +1,7 @@ #ifndef _DOLPHIN_VI_H_ #define _DOLPHIN_VI_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #endif -#endif diff --git a/include/dolphin/vi/vifuncs.h b/libs/dolphin/include/dolphin/vi/vifuncs.h similarity index 92% rename from include/dolphin/vi/vifuncs.h rename to libs/dolphin/include/dolphin/vi/vifuncs.h index b05611a4276..eb95984ede5 100644 --- a/include/dolphin/vi/vifuncs.h +++ b/libs/dolphin/include/dolphin/vi/vifuncs.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_VIFUNCS_H_ #define _DOLPHIN_VIFUNCS_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #include #include @@ -37,4 +34,3 @@ u32 VIGetDTVStatus(void); #endif #endif -#endif diff --git a/include/dolphin/vi/vitypes.h b/libs/dolphin/include/dolphin/vi/vitypes.h similarity index 95% rename from include/dolphin/vi/vitypes.h rename to libs/dolphin/include/dolphin/vi/vitypes.h index 998082d3c95..983a89b7ea1 100644 --- a/include/dolphin/vi/vitypes.h +++ b/libs/dolphin/include/dolphin/vi/vitypes.h @@ -1,9 +1,6 @@ #ifndef _DOLPHIN_VITYPES_H_ #define _DOLPHIN_VITYPES_H_ -#ifdef __REVOLUTION_SDK__ -#include -#else #include #define VI_TVMODE(format, interlace) (((format) << 2) + (interlace)) @@ -42,4 +39,3 @@ typedef enum { typedef void (*VIRetraceCallback)(u32 retraceCount); #endif -#endif diff --git a/src/dolphin/G2D/G2D.c b/libs/dolphin/src/G2D/G2D.c similarity index 100% rename from src/dolphin/G2D/G2D.c rename to libs/dolphin/src/G2D/G2D.c diff --git a/src/dolphin/ai/ai.c b/libs/dolphin/src/ai/ai.c similarity index 100% rename from src/dolphin/ai/ai.c rename to libs/dolphin/src/ai/ai.c diff --git a/src/dolphin/am/__am.h b/libs/dolphin/src/am/__am.h similarity index 100% rename from src/dolphin/am/__am.h rename to libs/dolphin/src/am/__am.h diff --git a/src/dolphin/am/am.c b/libs/dolphin/src/am/am.c similarity index 100% rename from src/dolphin/am/am.c rename to libs/dolphin/src/am/am.c diff --git a/src/dolphin/amcnotstub/amcnotstub.c b/libs/dolphin/src/amcnotstub/amcnotstub.c similarity index 100% rename from src/dolphin/amcnotstub/amcnotstub.c rename to libs/dolphin/src/amcnotstub/amcnotstub.c diff --git a/src/dolphin/amcstubs/AmcExi2Stubs.c b/libs/dolphin/src/amcstubs/AmcExi2Stubs.c similarity index 100% rename from src/dolphin/amcstubs/AmcExi2Stubs.c rename to libs/dolphin/src/amcstubs/AmcExi2Stubs.c diff --git a/src/dolphin/ar/__ar.h b/libs/dolphin/src/ar/__ar.h similarity index 100% rename from src/dolphin/ar/__ar.h rename to libs/dolphin/src/ar/__ar.h diff --git a/src/dolphin/ar/ar.c b/libs/dolphin/src/ar/ar.c similarity index 100% rename from src/dolphin/ar/ar.c rename to libs/dolphin/src/ar/ar.c diff --git a/src/dolphin/ar/arq.c b/libs/dolphin/src/ar/arq.c similarity index 100% rename from src/dolphin/ar/arq.c rename to libs/dolphin/src/ar/arq.c diff --git a/src/dolphin/ax/AX.c b/libs/dolphin/src/ax/AX.c similarity index 100% rename from src/dolphin/ax/AX.c rename to libs/dolphin/src/ax/AX.c diff --git a/src/dolphin/ax/AXAlloc.c b/libs/dolphin/src/ax/AXAlloc.c similarity index 100% rename from src/dolphin/ax/AXAlloc.c rename to libs/dolphin/src/ax/AXAlloc.c diff --git a/src/dolphin/ax/AXAux.c b/libs/dolphin/src/ax/AXAux.c similarity index 100% rename from src/dolphin/ax/AXAux.c rename to libs/dolphin/src/ax/AXAux.c diff --git a/src/dolphin/ax/AXCL.c b/libs/dolphin/src/ax/AXCL.c similarity index 100% rename from src/dolphin/ax/AXCL.c rename to libs/dolphin/src/ax/AXCL.c diff --git a/src/dolphin/ax/AXComp.c b/libs/dolphin/src/ax/AXComp.c similarity index 100% rename from src/dolphin/ax/AXComp.c rename to libs/dolphin/src/ax/AXComp.c diff --git a/src/dolphin/ax/AXOut.c b/libs/dolphin/src/ax/AXOut.c similarity index 100% rename from src/dolphin/ax/AXOut.c rename to libs/dolphin/src/ax/AXOut.c diff --git a/src/dolphin/ax/AXProf.c b/libs/dolphin/src/ax/AXProf.c similarity index 100% rename from src/dolphin/ax/AXProf.c rename to libs/dolphin/src/ax/AXProf.c diff --git a/src/dolphin/ax/AXSPB.c b/libs/dolphin/src/ax/AXSPB.c similarity index 100% rename from src/dolphin/ax/AXSPB.c rename to libs/dolphin/src/ax/AXSPB.c diff --git a/src/dolphin/ax/AXVPB.c b/libs/dolphin/src/ax/AXVPB.c similarity index 100% rename from src/dolphin/ax/AXVPB.c rename to libs/dolphin/src/ax/AXVPB.c diff --git a/src/dolphin/ax/DSPCode.c b/libs/dolphin/src/ax/DSPCode.c similarity index 100% rename from src/dolphin/ax/DSPCode.c rename to libs/dolphin/src/ax/DSPCode.c diff --git a/src/dolphin/ax/__ax.h b/libs/dolphin/src/ax/__ax.h similarity index 100% rename from src/dolphin/ax/__ax.h rename to libs/dolphin/src/ax/__ax.h diff --git a/src/dolphin/axart/axart.c b/libs/dolphin/src/axart/axart.c similarity index 100% rename from src/dolphin/axart/axart.c rename to libs/dolphin/src/axart/axart.c diff --git a/src/dolphin/axart/axart3d.c b/libs/dolphin/src/axart/axart3d.c similarity index 100% rename from src/dolphin/axart/axart3d.c rename to libs/dolphin/src/axart/axart3d.c diff --git a/src/dolphin/axart/axartcents.c b/libs/dolphin/src/axart/axartcents.c similarity index 100% rename from src/dolphin/axart/axartcents.c rename to libs/dolphin/src/axart/axartcents.c diff --git a/src/dolphin/axart/axartenv.c b/libs/dolphin/src/axart/axartenv.c similarity index 100% rename from src/dolphin/axart/axartenv.c rename to libs/dolphin/src/axart/axartenv.c diff --git a/src/dolphin/axart/axartlfo.c b/libs/dolphin/src/axart/axartlfo.c similarity index 100% rename from src/dolphin/axart/axartlfo.c rename to libs/dolphin/src/axart/axartlfo.c diff --git a/src/dolphin/axart/axartlpf.c b/libs/dolphin/src/axart/axartlpf.c similarity index 100% rename from src/dolphin/axart/axartlpf.c rename to libs/dolphin/src/axart/axartlpf.c diff --git a/src/dolphin/axart/axartsound.c b/libs/dolphin/src/axart/axartsound.c similarity index 100% rename from src/dolphin/axart/axartsound.c rename to libs/dolphin/src/axart/axartsound.c diff --git a/src/dolphin/axfx/__axfx.h b/libs/dolphin/src/axfx/__axfx.h similarity index 100% rename from src/dolphin/axfx/__axfx.h rename to libs/dolphin/src/axfx/__axfx.h diff --git a/src/dolphin/axfx/axfx.c b/libs/dolphin/src/axfx/axfx.c similarity index 100% rename from src/dolphin/axfx/axfx.c rename to libs/dolphin/src/axfx/axfx.c diff --git a/src/dolphin/axfx/chorus.c b/libs/dolphin/src/axfx/chorus.c similarity index 100% rename from src/dolphin/axfx/chorus.c rename to libs/dolphin/src/axfx/chorus.c diff --git a/src/dolphin/axfx/delay.c b/libs/dolphin/src/axfx/delay.c similarity index 100% rename from src/dolphin/axfx/delay.c rename to libs/dolphin/src/axfx/delay.c diff --git a/src/dolphin/axfx/reverb_hi.c b/libs/dolphin/src/axfx/reverb_hi.c similarity index 100% rename from src/dolphin/axfx/reverb_hi.c rename to libs/dolphin/src/axfx/reverb_hi.c diff --git a/src/dolphin/axfx/reverb_hi_4ch.c b/libs/dolphin/src/axfx/reverb_hi_4ch.c similarity index 100% rename from src/dolphin/axfx/reverb_hi_4ch.c rename to libs/dolphin/src/axfx/reverb_hi_4ch.c diff --git a/src/dolphin/axfx/reverb_std.c b/libs/dolphin/src/axfx/reverb_std.c similarity index 100% rename from src/dolphin/axfx/reverb_std.c rename to libs/dolphin/src/axfx/reverb_std.c diff --git a/src/dolphin/base/PPCArch.c b/libs/dolphin/src/base/PPCArch.c similarity index 100% rename from src/dolphin/base/PPCArch.c rename to libs/dolphin/src/base/PPCArch.c diff --git a/src/dolphin/base/PPCPm.c b/libs/dolphin/src/base/PPCPm.c similarity index 100% rename from src/dolphin/base/PPCPm.c rename to libs/dolphin/src/base/PPCPm.c diff --git a/src/dolphin/card/CARDBios.c b/libs/dolphin/src/card/CARDBios.c similarity index 100% rename from src/dolphin/card/CARDBios.c rename to libs/dolphin/src/card/CARDBios.c diff --git a/src/dolphin/card/CARDBlock.c b/libs/dolphin/src/card/CARDBlock.c similarity index 100% rename from src/dolphin/card/CARDBlock.c rename to libs/dolphin/src/card/CARDBlock.c diff --git a/src/dolphin/card/CARDCheck.c b/libs/dolphin/src/card/CARDCheck.c similarity index 100% rename from src/dolphin/card/CARDCheck.c rename to libs/dolphin/src/card/CARDCheck.c diff --git a/src/dolphin/card/CARDCreate.c b/libs/dolphin/src/card/CARDCreate.c similarity index 100% rename from src/dolphin/card/CARDCreate.c rename to libs/dolphin/src/card/CARDCreate.c diff --git a/src/dolphin/card/CARDDelete.c b/libs/dolphin/src/card/CARDDelete.c similarity index 100% rename from src/dolphin/card/CARDDelete.c rename to libs/dolphin/src/card/CARDDelete.c diff --git a/src/dolphin/card/CARDDir.c b/libs/dolphin/src/card/CARDDir.c similarity index 100% rename from src/dolphin/card/CARDDir.c rename to libs/dolphin/src/card/CARDDir.c diff --git a/src/dolphin/card/CARDErase.c b/libs/dolphin/src/card/CARDErase.c similarity index 100% rename from src/dolphin/card/CARDErase.c rename to libs/dolphin/src/card/CARDErase.c diff --git a/src/dolphin/card/CARDFormat.c b/libs/dolphin/src/card/CARDFormat.c similarity index 100% rename from src/dolphin/card/CARDFormat.c rename to libs/dolphin/src/card/CARDFormat.c diff --git a/src/dolphin/card/CARDMount.c b/libs/dolphin/src/card/CARDMount.c similarity index 100% rename from src/dolphin/card/CARDMount.c rename to libs/dolphin/src/card/CARDMount.c diff --git a/src/dolphin/card/CARDNet.c b/libs/dolphin/src/card/CARDNet.c similarity index 100% rename from src/dolphin/card/CARDNet.c rename to libs/dolphin/src/card/CARDNet.c diff --git a/src/dolphin/card/CARDOpen.c b/libs/dolphin/src/card/CARDOpen.c similarity index 100% rename from src/dolphin/card/CARDOpen.c rename to libs/dolphin/src/card/CARDOpen.c diff --git a/src/dolphin/card/CARDProgram.c b/libs/dolphin/src/card/CARDProgram.c similarity index 100% rename from src/dolphin/card/CARDProgram.c rename to libs/dolphin/src/card/CARDProgram.c diff --git a/src/dolphin/card/CARDRaw.c b/libs/dolphin/src/card/CARDRaw.c similarity index 100% rename from src/dolphin/card/CARDRaw.c rename to libs/dolphin/src/card/CARDRaw.c diff --git a/src/dolphin/card/CARDRdwr.c b/libs/dolphin/src/card/CARDRdwr.c similarity index 100% rename from src/dolphin/card/CARDRdwr.c rename to libs/dolphin/src/card/CARDRdwr.c diff --git a/src/dolphin/card/CARDRead.c b/libs/dolphin/src/card/CARDRead.c similarity index 100% rename from src/dolphin/card/CARDRead.c rename to libs/dolphin/src/card/CARDRead.c diff --git a/src/dolphin/card/CARDRename.c b/libs/dolphin/src/card/CARDRename.c similarity index 100% rename from src/dolphin/card/CARDRename.c rename to libs/dolphin/src/card/CARDRename.c diff --git a/src/dolphin/card/CARDStat.c b/libs/dolphin/src/card/CARDStat.c similarity index 100% rename from src/dolphin/card/CARDStat.c rename to libs/dolphin/src/card/CARDStat.c diff --git a/src/dolphin/card/CARDStatEx.c b/libs/dolphin/src/card/CARDStatEx.c similarity index 100% rename from src/dolphin/card/CARDStatEx.c rename to libs/dolphin/src/card/CARDStatEx.c diff --git a/src/dolphin/card/CARDUnlock.c b/libs/dolphin/src/card/CARDUnlock.c similarity index 100% rename from src/dolphin/card/CARDUnlock.c rename to libs/dolphin/src/card/CARDUnlock.c diff --git a/src/dolphin/card/CARDWrite.c b/libs/dolphin/src/card/CARDWrite.c similarity index 100% rename from src/dolphin/card/CARDWrite.c rename to libs/dolphin/src/card/CARDWrite.c diff --git a/src/dolphin/card/__card.h b/libs/dolphin/src/card/__card.h similarity index 100% rename from src/dolphin/card/__card.h rename to libs/dolphin/src/card/__card.h diff --git a/src/dolphin/db/db.c b/libs/dolphin/src/db/db.c similarity index 100% rename from src/dolphin/db/db.c rename to libs/dolphin/src/db/db.c diff --git a/src/dolphin/demo/DEMOAVX.c b/libs/dolphin/src/demo/DEMOAVX.c similarity index 100% rename from src/dolphin/demo/DEMOAVX.c rename to libs/dolphin/src/demo/DEMOAVX.c diff --git a/src/dolphin/demo/DEMOFont.c b/libs/dolphin/src/demo/DEMOFont.c similarity index 100% rename from src/dolphin/demo/DEMOFont.c rename to libs/dolphin/src/demo/DEMOFont.c diff --git a/src/dolphin/demo/DEMOInit.c b/libs/dolphin/src/demo/DEMOInit.c similarity index 100% rename from src/dolphin/demo/DEMOInit.c rename to libs/dolphin/src/demo/DEMOInit.c diff --git a/src/dolphin/demo/DEMOPad.c b/libs/dolphin/src/demo/DEMOPad.c similarity index 100% rename from src/dolphin/demo/DEMOPad.c rename to libs/dolphin/src/demo/DEMOPad.c diff --git a/src/dolphin/demo/DEMOPuts.c b/libs/dolphin/src/demo/DEMOPuts.c similarity index 100% rename from src/dolphin/demo/DEMOPuts.c rename to libs/dolphin/src/demo/DEMOPuts.c diff --git a/src/dolphin/demo/DEMOStats.c b/libs/dolphin/src/demo/DEMOStats.c similarity index 100% rename from src/dolphin/demo/DEMOStats.c rename to libs/dolphin/src/demo/DEMOStats.c diff --git a/src/dolphin/demo/DEMOWin.c b/libs/dolphin/src/demo/DEMOWin.c similarity index 100% rename from src/dolphin/demo/DEMOWin.c rename to libs/dolphin/src/demo/DEMOWin.c diff --git a/src/dolphin/demo/__demo.h b/libs/dolphin/src/demo/__demo.h similarity index 100% rename from src/dolphin/demo/__demo.h rename to libs/dolphin/src/demo/__demo.h diff --git a/src/dolphin/dsp/__dsp.h b/libs/dolphin/src/dsp/__dsp.h similarity index 100% rename from src/dolphin/dsp/__dsp.h rename to libs/dolphin/src/dsp/__dsp.h diff --git a/src/dolphin/dsp/dsp.c b/libs/dolphin/src/dsp/dsp.c similarity index 100% rename from src/dolphin/dsp/dsp.c rename to libs/dolphin/src/dsp/dsp.c diff --git a/src/dolphin/dsp/dsp_debug.c b/libs/dolphin/src/dsp/dsp_debug.c similarity index 100% rename from src/dolphin/dsp/dsp_debug.c rename to libs/dolphin/src/dsp/dsp_debug.c diff --git a/src/dolphin/dsp/dsp_perf.c b/libs/dolphin/src/dsp/dsp_perf.c similarity index 100% rename from src/dolphin/dsp/dsp_perf.c rename to libs/dolphin/src/dsp/dsp_perf.c diff --git a/src/dolphin/dsp/dsp_task.c b/libs/dolphin/src/dsp/dsp_task.c similarity index 100% rename from src/dolphin/dsp/dsp_task.c rename to libs/dolphin/src/dsp/dsp_task.c diff --git a/src/dolphin/dtk/dtk.c b/libs/dolphin/src/dtk/dtk.c similarity index 100% rename from src/dolphin/dtk/dtk.c rename to libs/dolphin/src/dtk/dtk.c diff --git a/src/dolphin/dvd/__dvd.h b/libs/dolphin/src/dvd/__dvd.h similarity index 100% rename from src/dolphin/dvd/__dvd.h rename to libs/dolphin/src/dvd/__dvd.h diff --git a/src/dolphin/dvd/dvd.c b/libs/dolphin/src/dvd/dvd.c similarity index 100% rename from src/dolphin/dvd/dvd.c rename to libs/dolphin/src/dvd/dvd.c diff --git a/src/dolphin/dvd/dvdFatal.c b/libs/dolphin/src/dvd/dvdFatal.c similarity index 100% rename from src/dolphin/dvd/dvdFatal.c rename to libs/dolphin/src/dvd/dvdFatal.c diff --git a/src/dolphin/dvd/dvderror.c b/libs/dolphin/src/dvd/dvderror.c similarity index 100% rename from src/dolphin/dvd/dvderror.c rename to libs/dolphin/src/dvd/dvderror.c diff --git a/src/dolphin/dvd/dvdfs.c b/libs/dolphin/src/dvd/dvdfs.c similarity index 100% rename from src/dolphin/dvd/dvdfs.c rename to libs/dolphin/src/dvd/dvdfs.c diff --git a/src/dolphin/dvd/dvdidutils.c b/libs/dolphin/src/dvd/dvdidutils.c similarity index 100% rename from src/dolphin/dvd/dvdidutils.c rename to libs/dolphin/src/dvd/dvdidutils.c diff --git a/src/dolphin/dvd/dvdlow.c b/libs/dolphin/src/dvd/dvdlow.c similarity index 100% rename from src/dolphin/dvd/dvdlow.c rename to libs/dolphin/src/dvd/dvdlow.c diff --git a/src/dolphin/dvd/dvdqueue.c b/libs/dolphin/src/dvd/dvdqueue.c similarity index 100% rename from src/dolphin/dvd/dvdqueue.c rename to libs/dolphin/src/dvd/dvdqueue.c diff --git a/src/dolphin/dvd/fstload.c b/libs/dolphin/src/dvd/fstload.c similarity index 100% rename from src/dolphin/dvd/fstload.c rename to libs/dolphin/src/dvd/fstload.c diff --git a/src/dolphin/exi/EXIAd16.c b/libs/dolphin/src/exi/EXIAd16.c similarity index 100% rename from src/dolphin/exi/EXIAd16.c rename to libs/dolphin/src/exi/EXIAd16.c diff --git a/src/dolphin/exi/EXIBios.c b/libs/dolphin/src/exi/EXIBios.c similarity index 100% rename from src/dolphin/exi/EXIBios.c rename to libs/dolphin/src/exi/EXIBios.c diff --git a/src/dolphin/exi/EXIUart.c b/libs/dolphin/src/exi/EXIUart.c similarity index 100% rename from src/dolphin/exi/EXIUart.c rename to libs/dolphin/src/exi/EXIUart.c diff --git a/src/dolphin/fileCache/fileCache.c b/libs/dolphin/src/fileCache/fileCache.c similarity index 100% rename from src/dolphin/fileCache/fileCache.c rename to libs/dolphin/src/fileCache/fileCache.c diff --git a/src/dolphin/gd/GDBase.c b/libs/dolphin/src/gd/GDBase.c similarity index 100% rename from src/dolphin/gd/GDBase.c rename to libs/dolphin/src/gd/GDBase.c diff --git a/src/dolphin/gd/GDFile.c b/libs/dolphin/src/gd/GDFile.c similarity index 100% rename from src/dolphin/gd/GDFile.c rename to libs/dolphin/src/gd/GDFile.c diff --git a/src/dolphin/gd/GDGeometry.c b/libs/dolphin/src/gd/GDGeometry.c similarity index 100% rename from src/dolphin/gd/GDGeometry.c rename to libs/dolphin/src/gd/GDGeometry.c diff --git a/src/dolphin/gd/GDIndirect.c b/libs/dolphin/src/gd/GDIndirect.c similarity index 100% rename from src/dolphin/gd/GDIndirect.c rename to libs/dolphin/src/gd/GDIndirect.c diff --git a/src/dolphin/gd/GDLight.c b/libs/dolphin/src/gd/GDLight.c similarity index 100% rename from src/dolphin/gd/GDLight.c rename to libs/dolphin/src/gd/GDLight.c diff --git a/src/dolphin/gd/GDPixel.c b/libs/dolphin/src/gd/GDPixel.c similarity index 100% rename from src/dolphin/gd/GDPixel.c rename to libs/dolphin/src/gd/GDPixel.c diff --git a/src/dolphin/gd/GDTev.c b/libs/dolphin/src/gd/GDTev.c similarity index 100% rename from src/dolphin/gd/GDTev.c rename to libs/dolphin/src/gd/GDTev.c diff --git a/src/dolphin/gd/GDTexture.c b/libs/dolphin/src/gd/GDTexture.c similarity index 100% rename from src/dolphin/gd/GDTexture.c rename to libs/dolphin/src/gd/GDTexture.c diff --git a/src/dolphin/gd/GDTransform.c b/libs/dolphin/src/gd/GDTransform.c similarity index 100% rename from src/dolphin/gd/GDTransform.c rename to libs/dolphin/src/gd/GDTransform.c diff --git a/src/dolphin/gf/GFGeometry.cpp b/libs/dolphin/src/gf/GFGeometry.cpp similarity index 100% rename from src/dolphin/gf/GFGeometry.cpp rename to libs/dolphin/src/gf/GFGeometry.cpp diff --git a/src/dolphin/gf/GFLight.cpp b/libs/dolphin/src/gf/GFLight.cpp similarity index 100% rename from src/dolphin/gf/GFLight.cpp rename to libs/dolphin/src/gf/GFLight.cpp diff --git a/src/dolphin/gf/GFPixel.cpp b/libs/dolphin/src/gf/GFPixel.cpp similarity index 100% rename from src/dolphin/gf/GFPixel.cpp rename to libs/dolphin/src/gf/GFPixel.cpp diff --git a/src/dolphin/gf/GFTev.cpp b/libs/dolphin/src/gf/GFTev.cpp similarity index 100% rename from src/dolphin/gf/GFTev.cpp rename to libs/dolphin/src/gf/GFTev.cpp diff --git a/src/dolphin/gx/GXAttr.c b/libs/dolphin/src/gx/GXAttr.c similarity index 100% rename from src/dolphin/gx/GXAttr.c rename to libs/dolphin/src/gx/GXAttr.c diff --git a/src/dolphin/gx/GXBump.c b/libs/dolphin/src/gx/GXBump.c similarity index 100% rename from src/dolphin/gx/GXBump.c rename to libs/dolphin/src/gx/GXBump.c diff --git a/src/dolphin/gx/GXDisplayList.c b/libs/dolphin/src/gx/GXDisplayList.c similarity index 100% rename from src/dolphin/gx/GXDisplayList.c rename to libs/dolphin/src/gx/GXDisplayList.c diff --git a/src/dolphin/gx/GXDraw.c b/libs/dolphin/src/gx/GXDraw.c similarity index 100% rename from src/dolphin/gx/GXDraw.c rename to libs/dolphin/src/gx/GXDraw.c diff --git a/src/dolphin/gx/GXFifo.c b/libs/dolphin/src/gx/GXFifo.c similarity index 100% rename from src/dolphin/gx/GXFifo.c rename to libs/dolphin/src/gx/GXFifo.c diff --git a/src/dolphin/gx/GXFrameBuf.c b/libs/dolphin/src/gx/GXFrameBuf.c similarity index 100% rename from src/dolphin/gx/GXFrameBuf.c rename to libs/dolphin/src/gx/GXFrameBuf.c diff --git a/src/dolphin/gx/GXGeometry.c b/libs/dolphin/src/gx/GXGeometry.c similarity index 100% rename from src/dolphin/gx/GXGeometry.c rename to libs/dolphin/src/gx/GXGeometry.c diff --git a/src/dolphin/gx/GXInit.c b/libs/dolphin/src/gx/GXInit.c similarity index 100% rename from src/dolphin/gx/GXInit.c rename to libs/dolphin/src/gx/GXInit.c diff --git a/src/dolphin/gx/GXLight.c b/libs/dolphin/src/gx/GXLight.c similarity index 100% rename from src/dolphin/gx/GXLight.c rename to libs/dolphin/src/gx/GXLight.c diff --git a/src/dolphin/gx/GXMisc.c b/libs/dolphin/src/gx/GXMisc.c similarity index 100% rename from src/dolphin/gx/GXMisc.c rename to libs/dolphin/src/gx/GXMisc.c diff --git a/src/dolphin/gx/GXPerf.c b/libs/dolphin/src/gx/GXPerf.c similarity index 100% rename from src/dolphin/gx/GXPerf.c rename to libs/dolphin/src/gx/GXPerf.c diff --git a/src/dolphin/gx/GXPixel.c b/libs/dolphin/src/gx/GXPixel.c similarity index 100% rename from src/dolphin/gx/GXPixel.c rename to libs/dolphin/src/gx/GXPixel.c diff --git a/src/dolphin/gx/GXSave.c b/libs/dolphin/src/gx/GXSave.c similarity index 100% rename from src/dolphin/gx/GXSave.c rename to libs/dolphin/src/gx/GXSave.c diff --git a/src/dolphin/gx/GXStubs.c b/libs/dolphin/src/gx/GXStubs.c similarity index 100% rename from src/dolphin/gx/GXStubs.c rename to libs/dolphin/src/gx/GXStubs.c diff --git a/src/dolphin/gx/GXTev.c b/libs/dolphin/src/gx/GXTev.c similarity index 100% rename from src/dolphin/gx/GXTev.c rename to libs/dolphin/src/gx/GXTev.c diff --git a/src/dolphin/gx/GXTexture.c b/libs/dolphin/src/gx/GXTexture.c similarity index 100% rename from src/dolphin/gx/GXTexture.c rename to libs/dolphin/src/gx/GXTexture.c diff --git a/src/dolphin/gx/GXTransform.c b/libs/dolphin/src/gx/GXTransform.c similarity index 100% rename from src/dolphin/gx/GXTransform.c rename to libs/dolphin/src/gx/GXTransform.c diff --git a/src/dolphin/gx/GXVerifRAS.c b/libs/dolphin/src/gx/GXVerifRAS.c similarity index 100% rename from src/dolphin/gx/GXVerifRAS.c rename to libs/dolphin/src/gx/GXVerifRAS.c diff --git a/src/dolphin/gx/GXVerifXF.c b/libs/dolphin/src/gx/GXVerifXF.c similarity index 100% rename from src/dolphin/gx/GXVerifXF.c rename to libs/dolphin/src/gx/GXVerifXF.c diff --git a/src/dolphin/gx/GXVerify.c b/libs/dolphin/src/gx/GXVerify.c similarity index 100% rename from src/dolphin/gx/GXVerify.c rename to libs/dolphin/src/gx/GXVerify.c diff --git a/src/dolphin/gx/GXVert.c b/libs/dolphin/src/gx/GXVert.c similarity index 100% rename from src/dolphin/gx/GXVert.c rename to libs/dolphin/src/gx/GXVert.c diff --git a/src/dolphin/gx/__gx.h b/libs/dolphin/src/gx/__gx.h similarity index 100% rename from src/dolphin/gx/__gx.h rename to libs/dolphin/src/gx/__gx.h diff --git a/src/dolphin/hio/hio.c b/libs/dolphin/src/hio/hio.c similarity index 100% rename from src/dolphin/hio/hio.c rename to libs/dolphin/src/hio/hio.c diff --git a/src/dolphin/mcc/fio.c b/libs/dolphin/src/mcc/fio.c similarity index 100% rename from src/dolphin/mcc/fio.c rename to libs/dolphin/src/mcc/fio.c diff --git a/src/dolphin/mcc/mcc.c b/libs/dolphin/src/mcc/mcc.c similarity index 100% rename from src/dolphin/mcc/mcc.c rename to libs/dolphin/src/mcc/mcc.c diff --git a/src/dolphin/mcc/tty.c b/libs/dolphin/src/mcc/tty.c similarity index 100% rename from src/dolphin/mcc/tty.c rename to libs/dolphin/src/mcc/tty.c diff --git a/src/dolphin/mix/mix.c b/libs/dolphin/src/mix/mix.c similarity index 100% rename from src/dolphin/mix/mix.c rename to libs/dolphin/src/mix/mix.c diff --git a/src/dolphin/mtx/mtx.c b/libs/dolphin/src/mtx/mtx.c similarity index 100% rename from src/dolphin/mtx/mtx.c rename to libs/dolphin/src/mtx/mtx.c diff --git a/src/dolphin/mtx/mtx44.c b/libs/dolphin/src/mtx/mtx44.c similarity index 100% rename from src/dolphin/mtx/mtx44.c rename to libs/dolphin/src/mtx/mtx44.c diff --git a/src/dolphin/mtx/mtx44vec.c b/libs/dolphin/src/mtx/mtx44vec.c similarity index 100% rename from src/dolphin/mtx/mtx44vec.c rename to libs/dolphin/src/mtx/mtx44vec.c diff --git a/src/dolphin/mtx/mtxstack.c b/libs/dolphin/src/mtx/mtxstack.c similarity index 100% rename from src/dolphin/mtx/mtxstack.c rename to libs/dolphin/src/mtx/mtxstack.c diff --git a/src/dolphin/mtx/mtxvec.c b/libs/dolphin/src/mtx/mtxvec.c similarity index 100% rename from src/dolphin/mtx/mtxvec.c rename to libs/dolphin/src/mtx/mtxvec.c diff --git a/src/dolphin/mtx/psmtx.c b/libs/dolphin/src/mtx/psmtx.c similarity index 100% rename from src/dolphin/mtx/psmtx.c rename to libs/dolphin/src/mtx/psmtx.c diff --git a/src/dolphin/mtx/quat.c b/libs/dolphin/src/mtx/quat.c similarity index 100% rename from src/dolphin/mtx/quat.c rename to libs/dolphin/src/mtx/quat.c diff --git a/src/dolphin/mtx/vec.c b/libs/dolphin/src/mtx/vec.c similarity index 100% rename from src/dolphin/mtx/vec.c rename to libs/dolphin/src/mtx/vec.c diff --git a/src/dolphin/odemustubs/odemustubs.c b/libs/dolphin/src/odemustubs/odemustubs.c similarity index 100% rename from src/dolphin/odemustubs/odemustubs.c rename to libs/dolphin/src/odemustubs/odemustubs.c diff --git a/src/dolphin/odenotstub/odenotstub.c b/libs/dolphin/src/odenotstub/odenotstub.c similarity index 100% rename from src/dolphin/odenotstub/odenotstub.c rename to libs/dolphin/src/odenotstub/odenotstub.c diff --git a/src/dolphin/os/OS.c b/libs/dolphin/src/os/OS.c similarity index 100% rename from src/dolphin/os/OS.c rename to libs/dolphin/src/os/OS.c diff --git a/src/dolphin/os/OSAddress.c b/libs/dolphin/src/os/OSAddress.c similarity index 100% rename from src/dolphin/os/OSAddress.c rename to libs/dolphin/src/os/OSAddress.c diff --git a/src/dolphin/os/OSAlarm.c b/libs/dolphin/src/os/OSAlarm.c similarity index 100% rename from src/dolphin/os/OSAlarm.c rename to libs/dolphin/src/os/OSAlarm.c diff --git a/src/dolphin/os/OSAlloc.c b/libs/dolphin/src/os/OSAlloc.c similarity index 100% rename from src/dolphin/os/OSAlloc.c rename to libs/dolphin/src/os/OSAlloc.c diff --git a/src/dolphin/os/OSArena.c b/libs/dolphin/src/os/OSArena.c similarity index 100% rename from src/dolphin/os/OSArena.c rename to libs/dolphin/src/os/OSArena.c diff --git a/src/dolphin/os/OSAudioSystem.c b/libs/dolphin/src/os/OSAudioSystem.c similarity index 100% rename from src/dolphin/os/OSAudioSystem.c rename to libs/dolphin/src/os/OSAudioSystem.c diff --git a/src/dolphin/os/OSCache.c b/libs/dolphin/src/os/OSCache.c similarity index 100% rename from src/dolphin/os/OSCache.c rename to libs/dolphin/src/os/OSCache.c diff --git a/src/dolphin/os/OSContext.c b/libs/dolphin/src/os/OSContext.c similarity index 100% rename from src/dolphin/os/OSContext.c rename to libs/dolphin/src/os/OSContext.c diff --git a/src/dolphin/os/OSError.c b/libs/dolphin/src/os/OSError.c similarity index 100% rename from src/dolphin/os/OSError.c rename to libs/dolphin/src/os/OSError.c diff --git a/src/dolphin/os/OSExec.c b/libs/dolphin/src/os/OSExec.c similarity index 100% rename from src/dolphin/os/OSExec.c rename to libs/dolphin/src/os/OSExec.c diff --git a/src/dolphin/os/OSFatal.c b/libs/dolphin/src/os/OSFatal.c similarity index 100% rename from src/dolphin/os/OSFatal.c rename to libs/dolphin/src/os/OSFatal.c diff --git a/src/dolphin/os/OSFont.c b/libs/dolphin/src/os/OSFont.c similarity index 100% rename from src/dolphin/os/OSFont.c rename to libs/dolphin/src/os/OSFont.c diff --git a/src/dolphin/os/OSInterrupt.c b/libs/dolphin/src/os/OSInterrupt.c similarity index 100% rename from src/dolphin/os/OSInterrupt.c rename to libs/dolphin/src/os/OSInterrupt.c diff --git a/src/dolphin/os/OSLink.c b/libs/dolphin/src/os/OSLink.c similarity index 100% rename from src/dolphin/os/OSLink.c rename to libs/dolphin/src/os/OSLink.c diff --git a/src/dolphin/os/OSMemory.c b/libs/dolphin/src/os/OSMemory.c similarity index 100% rename from src/dolphin/os/OSMemory.c rename to libs/dolphin/src/os/OSMemory.c diff --git a/src/dolphin/os/OSMessage.c b/libs/dolphin/src/os/OSMessage.c similarity index 100% rename from src/dolphin/os/OSMessage.c rename to libs/dolphin/src/os/OSMessage.c diff --git a/src/dolphin/os/OSMutex.c b/libs/dolphin/src/os/OSMutex.c similarity index 100% rename from src/dolphin/os/OSMutex.c rename to libs/dolphin/src/os/OSMutex.c diff --git a/src/dolphin/os/OSReboot.c b/libs/dolphin/src/os/OSReboot.c similarity index 100% rename from src/dolphin/os/OSReboot.c rename to libs/dolphin/src/os/OSReboot.c diff --git a/src/dolphin/os/OSReset.c b/libs/dolphin/src/os/OSReset.c similarity index 100% rename from src/dolphin/os/OSReset.c rename to libs/dolphin/src/os/OSReset.c diff --git a/src/dolphin/os/OSResetSW.c b/libs/dolphin/src/os/OSResetSW.c similarity index 100% rename from src/dolphin/os/OSResetSW.c rename to libs/dolphin/src/os/OSResetSW.c diff --git a/src/dolphin/os/OSRtc.c b/libs/dolphin/src/os/OSRtc.c similarity index 100% rename from src/dolphin/os/OSRtc.c rename to libs/dolphin/src/os/OSRtc.c diff --git a/src/dolphin/os/OSSemaphore.c b/libs/dolphin/src/os/OSSemaphore.c similarity index 100% rename from src/dolphin/os/OSSemaphore.c rename to libs/dolphin/src/os/OSSemaphore.c diff --git a/src/dolphin/os/OSStopwatch.c b/libs/dolphin/src/os/OSStopwatch.c similarity index 100% rename from src/dolphin/os/OSStopwatch.c rename to libs/dolphin/src/os/OSStopwatch.c diff --git a/src/dolphin/os/OSSync.c b/libs/dolphin/src/os/OSSync.c similarity index 100% rename from src/dolphin/os/OSSync.c rename to libs/dolphin/src/os/OSSync.c diff --git a/src/dolphin/os/OSThread.c b/libs/dolphin/src/os/OSThread.c similarity index 100% rename from src/dolphin/os/OSThread.c rename to libs/dolphin/src/os/OSThread.c diff --git a/src/dolphin/os/OSTime.c b/libs/dolphin/src/os/OSTime.c similarity index 100% rename from src/dolphin/os/OSTime.c rename to libs/dolphin/src/os/OSTime.c diff --git a/src/dolphin/os/OSTimer.c b/libs/dolphin/src/os/OSTimer.c similarity index 100% rename from src/dolphin/os/OSTimer.c rename to libs/dolphin/src/os/OSTimer.c diff --git a/src/dolphin/os/OSUtf.c b/libs/dolphin/src/os/OSUtf.c similarity index 100% rename from src/dolphin/os/OSUtf.c rename to libs/dolphin/src/os/OSUtf.c diff --git a/src/dolphin/os/__os.h b/libs/dolphin/src/os/__os.h similarity index 100% rename from src/dolphin/os/__os.h rename to libs/dolphin/src/os/__os.h diff --git a/src/dolphin/os/__ppc_eabi_init.c b/libs/dolphin/src/os/__ppc_eabi_init.c similarity index 100% rename from src/dolphin/os/__ppc_eabi_init.c rename to libs/dolphin/src/os/__ppc_eabi_init.c diff --git a/src/dolphin/os/__ppc_eabi_init.cpp b/libs/dolphin/src/os/__ppc_eabi_init.cpp similarity index 100% rename from src/dolphin/os/__ppc_eabi_init.cpp rename to libs/dolphin/src/os/__ppc_eabi_init.cpp diff --git a/src/dolphin/os/__start.c b/libs/dolphin/src/os/__start.c similarity index 100% rename from src/dolphin/os/__start.c rename to libs/dolphin/src/os/__start.c diff --git a/src/dolphin/os/time.dolphin.c b/libs/dolphin/src/os/time.dolphin.c similarity index 100% rename from src/dolphin/os/time.dolphin.c rename to libs/dolphin/src/os/time.dolphin.c diff --git a/src/dolphin/pad/Pad.c b/libs/dolphin/src/pad/Pad.c similarity index 100% rename from src/dolphin/pad/Pad.c rename to libs/dolphin/src/pad/Pad.c diff --git a/src/dolphin/pad/Padclamp.c b/libs/dolphin/src/pad/Padclamp.c similarity index 100% rename from src/dolphin/pad/Padclamp.c rename to libs/dolphin/src/pad/Padclamp.c diff --git a/src/dolphin/perf/__perf.h b/libs/dolphin/src/perf/__perf.h similarity index 100% rename from src/dolphin/perf/__perf.h rename to libs/dolphin/src/perf/__perf.h diff --git a/src/dolphin/perf/perf.c b/libs/dolphin/src/perf/perf.c similarity index 100% rename from src/dolphin/perf/perf.c rename to libs/dolphin/src/perf/perf.c diff --git a/src/dolphin/perf/perfdraw.c b/libs/dolphin/src/perf/perfdraw.c similarity index 100% rename from src/dolphin/perf/perfdraw.c rename to libs/dolphin/src/perf/perfdraw.c diff --git a/src/dolphin/seq/seq.c b/libs/dolphin/src/seq/seq.c similarity index 100% rename from src/dolphin/seq/seq.c rename to libs/dolphin/src/seq/seq.c diff --git a/src/dolphin/si/SIBios.c b/libs/dolphin/src/si/SIBios.c similarity index 100% rename from src/dolphin/si/SIBios.c rename to libs/dolphin/src/si/SIBios.c diff --git a/src/dolphin/si/SISamplingRate.c b/libs/dolphin/src/si/SISamplingRate.c similarity index 100% rename from src/dolphin/si/SISamplingRate.c rename to libs/dolphin/src/si/SISamplingRate.c diff --git a/src/dolphin/si/SISteering.c b/libs/dolphin/src/si/SISteering.c similarity index 100% rename from src/dolphin/si/SISteering.c rename to libs/dolphin/src/si/SISteering.c diff --git a/src/dolphin/si/SISteeringAuto.c b/libs/dolphin/src/si/SISteeringAuto.c similarity index 100% rename from src/dolphin/si/SISteeringAuto.c rename to libs/dolphin/src/si/SISteeringAuto.c diff --git a/src/dolphin/si/SISteeringXfer.c b/libs/dolphin/src/si/SISteeringXfer.c similarity index 100% rename from src/dolphin/si/SISteeringXfer.c rename to libs/dolphin/src/si/SISteeringXfer.c diff --git a/src/dolphin/si/__si.h b/libs/dolphin/src/si/__si.h similarity index 100% rename from src/dolphin/si/__si.h rename to libs/dolphin/src/si/__si.h diff --git a/src/dolphin/sp/sp.c b/libs/dolphin/src/sp/sp.c similarity index 100% rename from src/dolphin/sp/sp.c rename to libs/dolphin/src/sp/sp.c diff --git a/src/dolphin/support/HTable.c b/libs/dolphin/src/support/HTable.c similarity index 100% rename from src/dolphin/support/HTable.c rename to libs/dolphin/src/support/HTable.c diff --git a/src/dolphin/support/List.c b/libs/dolphin/src/support/List.c similarity index 100% rename from src/dolphin/support/List.c rename to libs/dolphin/src/support/List.c diff --git a/src/dolphin/support/Tree.c b/libs/dolphin/src/support/Tree.c similarity index 100% rename from src/dolphin/support/Tree.c rename to libs/dolphin/src/support/Tree.c diff --git a/src/dolphin/support/string.c b/libs/dolphin/src/support/string.c similarity index 100% rename from src/dolphin/support/string.c rename to libs/dolphin/src/support/string.c diff --git a/src/dolphin/syn/__syn.h b/libs/dolphin/src/syn/__syn.h similarity index 100% rename from src/dolphin/syn/__syn.h rename to libs/dolphin/src/syn/__syn.h diff --git a/src/dolphin/syn/syn.c b/libs/dolphin/src/syn/syn.c similarity index 100% rename from src/dolphin/syn/syn.c rename to libs/dolphin/src/syn/syn.c diff --git a/src/dolphin/syn/synctrl.c b/libs/dolphin/src/syn/synctrl.c similarity index 100% rename from src/dolphin/syn/synctrl.c rename to libs/dolphin/src/syn/synctrl.c diff --git a/src/dolphin/syn/synenv.c b/libs/dolphin/src/syn/synenv.c similarity index 100% rename from src/dolphin/syn/synenv.c rename to libs/dolphin/src/syn/synenv.c diff --git a/src/dolphin/syn/synlfo.c b/libs/dolphin/src/syn/synlfo.c similarity index 100% rename from src/dolphin/syn/synlfo.c rename to libs/dolphin/src/syn/synlfo.c diff --git a/src/dolphin/syn/synmix.c b/libs/dolphin/src/syn/synmix.c similarity index 100% rename from src/dolphin/syn/synmix.c rename to libs/dolphin/src/syn/synmix.c diff --git a/src/dolphin/syn/synpitch.c b/libs/dolphin/src/syn/synpitch.c similarity index 100% rename from src/dolphin/syn/synpitch.c rename to libs/dolphin/src/syn/synpitch.c diff --git a/src/dolphin/syn/synsample.c b/libs/dolphin/src/syn/synsample.c similarity index 100% rename from src/dolphin/syn/synsample.c rename to libs/dolphin/src/syn/synsample.c diff --git a/src/dolphin/syn/synvoice.c b/libs/dolphin/src/syn/synvoice.c similarity index 100% rename from src/dolphin/syn/synvoice.c rename to libs/dolphin/src/syn/synvoice.c diff --git a/src/dolphin/syn/synwt.c b/libs/dolphin/src/syn/synwt.c similarity index 100% rename from src/dolphin/syn/synwt.c rename to libs/dolphin/src/syn/synwt.c diff --git a/src/dolphin/texPalette/texPalette.c b/libs/dolphin/src/texPalette/texPalette.c similarity index 100% rename from src/dolphin/texPalette/texPalette.c rename to libs/dolphin/src/texPalette/texPalette.c diff --git a/src/dolphin/vi/__vi.h b/libs/dolphin/src/vi/__vi.h similarity index 100% rename from src/dolphin/vi/__vi.h rename to libs/dolphin/src/vi/__vi.h diff --git a/src/dolphin/vi/gpioexi.c b/libs/dolphin/src/vi/gpioexi.c similarity index 100% rename from src/dolphin/vi/gpioexi.c rename to libs/dolphin/src/vi/gpioexi.c diff --git a/src/dolphin/vi/i2c.c b/libs/dolphin/src/vi/i2c.c similarity index 100% rename from src/dolphin/vi/i2c.c rename to libs/dolphin/src/vi/i2c.c diff --git a/src/dolphin/vi/initphilips.c b/libs/dolphin/src/vi/initphilips.c similarity index 100% rename from src/dolphin/vi/initphilips.c rename to libs/dolphin/src/vi/initphilips.c diff --git a/src/dolphin/vi/vi.c b/libs/dolphin/src/vi/vi.c similarity index 100% rename from src/dolphin/vi/vi.c rename to libs/dolphin/src/vi/vi.c diff --git a/include/revolution/ai.h b/libs/revolution/include/revolution/ai.h similarity index 100% rename from include/revolution/ai.h rename to libs/revolution/include/revolution/ai.h diff --git a/include/revolution/amc/AmcExi2Comm.h b/libs/revolution/include/revolution/amc/AmcExi2Comm.h similarity index 100% rename from include/revolution/amc/AmcExi2Comm.h rename to libs/revolution/include/revolution/amc/AmcExi2Comm.h diff --git a/include/revolution/amc/AmcTypes.h b/libs/revolution/include/revolution/amc/AmcTypes.h similarity index 100% rename from include/revolution/amc/AmcTypes.h rename to libs/revolution/include/revolution/amc/AmcTypes.h diff --git a/include/revolution/aralt.h b/libs/revolution/include/revolution/aralt.h similarity index 100% rename from include/revolution/aralt.h rename to libs/revolution/include/revolution/aralt.h diff --git a/include/revolution/arc.h b/libs/revolution/include/revolution/arc.h similarity index 100% rename from include/revolution/arc.h rename to libs/revolution/include/revolution/arc.h diff --git a/include/revolution/ax.h b/libs/revolution/include/revolution/ax.h similarity index 100% rename from include/revolution/ax.h rename to libs/revolution/include/revolution/ax.h diff --git a/include/revolution/axart.h b/libs/revolution/include/revolution/axart.h similarity index 100% rename from include/revolution/axart.h rename to libs/revolution/include/revolution/axart.h diff --git a/include/revolution/axfx.h b/libs/revolution/include/revolution/axfx.h similarity index 100% rename from include/revolution/axfx.h rename to libs/revolution/include/revolution/axfx.h diff --git a/include/revolution/base/PPCArch.h b/libs/revolution/include/revolution/base/PPCArch.h similarity index 100% rename from include/revolution/base/PPCArch.h rename to libs/revolution/include/revolution/base/PPCArch.h diff --git a/include/revolution/card.h b/libs/revolution/include/revolution/card.h similarity index 100% rename from include/revolution/card.h rename to libs/revolution/include/revolution/card.h diff --git a/include/revolution/db.h b/libs/revolution/include/revolution/db.h similarity index 100% rename from include/revolution/db.h rename to libs/revolution/include/revolution/db.h diff --git a/include/revolution/db/DBInterface.h b/libs/revolution/include/revolution/db/DBInterface.h similarity index 100% rename from include/revolution/db/DBInterface.h rename to libs/revolution/include/revolution/db/DBInterface.h diff --git a/include/revolution/dsp.h b/libs/revolution/include/revolution/dsp.h similarity index 100% rename from include/revolution/dsp.h rename to libs/revolution/include/revolution/dsp.h diff --git a/include/revolution/dvd.h b/libs/revolution/include/revolution/dvd.h similarity index 100% rename from include/revolution/dvd.h rename to libs/revolution/include/revolution/dvd.h diff --git a/include/revolution/esp.h b/libs/revolution/include/revolution/esp.h similarity index 100% rename from include/revolution/esp.h rename to libs/revolution/include/revolution/esp.h diff --git a/include/revolution/euart.h b/libs/revolution/include/revolution/euart.h similarity index 100% rename from include/revolution/euart.h rename to libs/revolution/include/revolution/euart.h diff --git a/include/revolution/exi.h b/libs/revolution/include/revolution/exi.h similarity index 100% rename from include/revolution/exi.h rename to libs/revolution/include/revolution/exi.h diff --git a/include/revolution/fs.h b/libs/revolution/include/revolution/fs.h similarity index 100% rename from include/revolution/fs.h rename to libs/revolution/include/revolution/fs.h diff --git a/include/revolution/gd.h b/libs/revolution/include/revolution/gd.h similarity index 100% rename from include/revolution/gd.h rename to libs/revolution/include/revolution/gd.h diff --git a/include/revolution/gd/GDBase.h b/libs/revolution/include/revolution/gd/GDBase.h similarity index 100% rename from include/revolution/gd/GDBase.h rename to libs/revolution/include/revolution/gd/GDBase.h diff --git a/include/revolution/gd/GDFile.h b/libs/revolution/include/revolution/gd/GDFile.h similarity index 100% rename from include/revolution/gd/GDFile.h rename to libs/revolution/include/revolution/gd/GDFile.h diff --git a/include/revolution/gd/GDGeometry.h b/libs/revolution/include/revolution/gd/GDGeometry.h similarity index 100% rename from include/revolution/gd/GDGeometry.h rename to libs/revolution/include/revolution/gd/GDGeometry.h diff --git a/include/revolution/gd/GDIndirect.h b/libs/revolution/include/revolution/gd/GDIndirect.h similarity index 100% rename from include/revolution/gd/GDIndirect.h rename to libs/revolution/include/revolution/gd/GDIndirect.h diff --git a/include/revolution/gd/GDLight.h b/libs/revolution/include/revolution/gd/GDLight.h similarity index 100% rename from include/revolution/gd/GDLight.h rename to libs/revolution/include/revolution/gd/GDLight.h diff --git a/include/revolution/gd/GDPixel.h b/libs/revolution/include/revolution/gd/GDPixel.h similarity index 100% rename from include/revolution/gd/GDPixel.h rename to libs/revolution/include/revolution/gd/GDPixel.h diff --git a/include/revolution/gd/GDTev.h b/libs/revolution/include/revolution/gd/GDTev.h similarity index 100% rename from include/revolution/gd/GDTev.h rename to libs/revolution/include/revolution/gd/GDTev.h diff --git a/include/revolution/gd/GDTexture.h b/libs/revolution/include/revolution/gd/GDTexture.h similarity index 100% rename from include/revolution/gd/GDTexture.h rename to libs/revolution/include/revolution/gd/GDTexture.h diff --git a/include/revolution/gd/GDTransform.h b/libs/revolution/include/revolution/gd/GDTransform.h similarity index 100% rename from include/revolution/gd/GDTransform.h rename to libs/revolution/include/revolution/gd/GDTransform.h diff --git a/include/revolution/gf.h b/libs/revolution/include/revolution/gf.h similarity index 100% rename from include/revolution/gf.h rename to libs/revolution/include/revolution/gf.h diff --git a/include/revolution/gf/GFGeometry.h b/libs/revolution/include/revolution/gf/GFGeometry.h similarity index 100% rename from include/revolution/gf/GFGeometry.h rename to libs/revolution/include/revolution/gf/GFGeometry.h diff --git a/include/revolution/gf/GFLight.h b/libs/revolution/include/revolution/gf/GFLight.h similarity index 100% rename from include/revolution/gf/GFLight.h rename to libs/revolution/include/revolution/gf/GFLight.h diff --git a/include/revolution/gf/GFPixel.h b/libs/revolution/include/revolution/gf/GFPixel.h similarity index 100% rename from include/revolution/gf/GFPixel.h rename to libs/revolution/include/revolution/gf/GFPixel.h diff --git a/include/revolution/gf/GFTev.h b/libs/revolution/include/revolution/gf/GFTev.h similarity index 100% rename from include/revolution/gf/GFTev.h rename to libs/revolution/include/revolution/gf/GFTev.h diff --git a/include/revolution/gx.h b/libs/revolution/include/revolution/gx.h similarity index 100% rename from include/revolution/gx.h rename to libs/revolution/include/revolution/gx.h diff --git a/include/revolution/gx/GXBump.h b/libs/revolution/include/revolution/gx/GXBump.h similarity index 100% rename from include/revolution/gx/GXBump.h rename to libs/revolution/include/revolution/gx/GXBump.h diff --git a/include/revolution/gx/GXCommandList.h b/libs/revolution/include/revolution/gx/GXCommandList.h similarity index 100% rename from include/revolution/gx/GXCommandList.h rename to libs/revolution/include/revolution/gx/GXCommandList.h diff --git a/include/revolution/gx/GXCpu2Efb.h b/libs/revolution/include/revolution/gx/GXCpu2Efb.h similarity index 100% rename from include/revolution/gx/GXCpu2Efb.h rename to libs/revolution/include/revolution/gx/GXCpu2Efb.h diff --git a/include/revolution/gx/GXCull.h b/libs/revolution/include/revolution/gx/GXCull.h similarity index 100% rename from include/revolution/gx/GXCull.h rename to libs/revolution/include/revolution/gx/GXCull.h diff --git a/include/revolution/gx/GXDispList.h b/libs/revolution/include/revolution/gx/GXDispList.h similarity index 100% rename from include/revolution/gx/GXDispList.h rename to libs/revolution/include/revolution/gx/GXDispList.h diff --git a/include/revolution/gx/GXDraw.h b/libs/revolution/include/revolution/gx/GXDraw.h similarity index 100% rename from include/revolution/gx/GXDraw.h rename to libs/revolution/include/revolution/gx/GXDraw.h diff --git a/include/revolution/gx/GXEnum.h b/libs/revolution/include/revolution/gx/GXEnum.h similarity index 100% rename from include/revolution/gx/GXEnum.h rename to libs/revolution/include/revolution/gx/GXEnum.h diff --git a/include/revolution/gx/GXFifo.h b/libs/revolution/include/revolution/gx/GXFifo.h similarity index 100% rename from include/revolution/gx/GXFifo.h rename to libs/revolution/include/revolution/gx/GXFifo.h diff --git a/include/revolution/gx/GXFrameBuffer.h b/libs/revolution/include/revolution/gx/GXFrameBuffer.h similarity index 100% rename from include/revolution/gx/GXFrameBuffer.h rename to libs/revolution/include/revolution/gx/GXFrameBuffer.h diff --git a/include/revolution/gx/GXGeometry.h b/libs/revolution/include/revolution/gx/GXGeometry.h similarity index 100% rename from include/revolution/gx/GXGeometry.h rename to libs/revolution/include/revolution/gx/GXGeometry.h diff --git a/include/revolution/gx/GXGet.h b/libs/revolution/include/revolution/gx/GXGet.h similarity index 100% rename from include/revolution/gx/GXGet.h rename to libs/revolution/include/revolution/gx/GXGet.h diff --git a/include/revolution/gx/GXLighting.h b/libs/revolution/include/revolution/gx/GXLighting.h similarity index 100% rename from include/revolution/gx/GXLighting.h rename to libs/revolution/include/revolution/gx/GXLighting.h diff --git a/include/revolution/gx/GXManage.h b/libs/revolution/include/revolution/gx/GXManage.h similarity index 100% rename from include/revolution/gx/GXManage.h rename to libs/revolution/include/revolution/gx/GXManage.h diff --git a/include/revolution/gx/GXPerf.h b/libs/revolution/include/revolution/gx/GXPerf.h similarity index 100% rename from include/revolution/gx/GXPerf.h rename to libs/revolution/include/revolution/gx/GXPerf.h diff --git a/include/revolution/gx/GXPixel.h b/libs/revolution/include/revolution/gx/GXPixel.h similarity index 100% rename from include/revolution/gx/GXPixel.h rename to libs/revolution/include/revolution/gx/GXPixel.h diff --git a/include/revolution/gx/GXStruct.h b/libs/revolution/include/revolution/gx/GXStruct.h similarity index 100% rename from include/revolution/gx/GXStruct.h rename to libs/revolution/include/revolution/gx/GXStruct.h diff --git a/include/revolution/gx/GXTev.h b/libs/revolution/include/revolution/gx/GXTev.h similarity index 100% rename from include/revolution/gx/GXTev.h rename to libs/revolution/include/revolution/gx/GXTev.h diff --git a/include/revolution/gx/GXTexture.h b/libs/revolution/include/revolution/gx/GXTexture.h similarity index 100% rename from include/revolution/gx/GXTexture.h rename to libs/revolution/include/revolution/gx/GXTexture.h diff --git a/include/revolution/gx/GXTransform.h b/libs/revolution/include/revolution/gx/GXTransform.h similarity index 100% rename from include/revolution/gx/GXTransform.h rename to libs/revolution/include/revolution/gx/GXTransform.h diff --git a/include/revolution/gx/GXVerify.h b/libs/revolution/include/revolution/gx/GXVerify.h similarity index 100% rename from include/revolution/gx/GXVerify.h rename to libs/revolution/include/revolution/gx/GXVerify.h diff --git a/include/revolution/gx/GXVert.h b/libs/revolution/include/revolution/gx/GXVert.h similarity index 100% rename from include/revolution/gx/GXVert.h rename to libs/revolution/include/revolution/gx/GXVert.h diff --git a/include/revolution/hbm.h b/libs/revolution/include/revolution/hbm.h similarity index 100% rename from include/revolution/hbm.h rename to libs/revolution/include/revolution/hbm.h diff --git a/include/revolution/hio2.h b/libs/revolution/include/revolution/hio2.h similarity index 100% rename from include/revolution/hio2.h rename to libs/revolution/include/revolution/hio2.h diff --git a/include/revolution/hw_regs.h b/libs/revolution/include/revolution/hw_regs.h similarity index 100% rename from include/revolution/hw_regs.h rename to libs/revolution/include/revolution/hw_regs.h diff --git a/include/revolution/ipc.h b/libs/revolution/include/revolution/ipc.h similarity index 100% rename from include/revolution/ipc.h rename to libs/revolution/include/revolution/ipc.h diff --git a/include/revolution/ipc/ipcProfile.h b/libs/revolution/include/revolution/ipc/ipcProfile.h similarity index 100% rename from include/revolution/ipc/ipcProfile.h rename to libs/revolution/include/revolution/ipc/ipcProfile.h diff --git a/include/revolution/ipc/ipcclt.h b/libs/revolution/include/revolution/ipc/ipcclt.h similarity index 100% rename from include/revolution/ipc/ipcclt.h rename to libs/revolution/include/revolution/ipc/ipcclt.h diff --git a/include/revolution/ipc/memory.h b/libs/revolution/include/revolution/ipc/memory.h similarity index 100% rename from include/revolution/ipc/memory.h rename to libs/revolution/include/revolution/ipc/memory.h diff --git a/include/revolution/kpad.h b/libs/revolution/include/revolution/kpad.h similarity index 100% rename from include/revolution/kpad.h rename to libs/revolution/include/revolution/kpad.h diff --git a/include/revolution/mem.h b/libs/revolution/include/revolution/mem.h similarity index 100% rename from include/revolution/mem.h rename to libs/revolution/include/revolution/mem.h diff --git a/include/revolution/mem/allocator.h b/libs/revolution/include/revolution/mem/allocator.h similarity index 100% rename from include/revolution/mem/allocator.h rename to libs/revolution/include/revolution/mem/allocator.h diff --git a/include/revolution/mem/expHeap.h b/libs/revolution/include/revolution/mem/expHeap.h similarity index 100% rename from include/revolution/mem/expHeap.h rename to libs/revolution/include/revolution/mem/expHeap.h diff --git a/include/revolution/mem/heapCommon.h b/libs/revolution/include/revolution/mem/heapCommon.h similarity index 100% rename from include/revolution/mem/heapCommon.h rename to libs/revolution/include/revolution/mem/heapCommon.h diff --git a/include/revolution/mem/list.h b/libs/revolution/include/revolution/mem/list.h similarity index 100% rename from include/revolution/mem/list.h rename to libs/revolution/include/revolution/mem/list.h diff --git a/include/revolution/mix.h b/libs/revolution/include/revolution/mix.h similarity index 100% rename from include/revolution/mix.h rename to libs/revolution/include/revolution/mix.h diff --git a/include/revolution/mtx.h b/libs/revolution/include/revolution/mtx.h similarity index 100% rename from include/revolution/mtx.h rename to libs/revolution/include/revolution/mtx.h diff --git a/include/revolution/nand.h b/libs/revolution/include/revolution/nand.h similarity index 100% rename from include/revolution/nand.h rename to libs/revolution/include/revolution/nand.h diff --git a/include/revolution/os.h b/libs/revolution/include/revolution/os.h similarity index 100% rename from include/revolution/os.h rename to libs/revolution/include/revolution/os.h diff --git a/include/revolution/os/OSAlarm.h b/libs/revolution/include/revolution/os/OSAlarm.h similarity index 100% rename from include/revolution/os/OSAlarm.h rename to libs/revolution/include/revolution/os/OSAlarm.h diff --git a/include/revolution/os/OSAlloc.h b/libs/revolution/include/revolution/os/OSAlloc.h similarity index 100% rename from include/revolution/os/OSAlloc.h rename to libs/revolution/include/revolution/os/OSAlloc.h diff --git a/include/revolution/os/OSCache.h b/libs/revolution/include/revolution/os/OSCache.h similarity index 100% rename from include/revolution/os/OSCache.h rename to libs/revolution/include/revolution/os/OSCache.h diff --git a/include/revolution/os/OSContext.h b/libs/revolution/include/revolution/os/OSContext.h similarity index 100% rename from include/revolution/os/OSContext.h rename to libs/revolution/include/revolution/os/OSContext.h diff --git a/include/revolution/os/OSDC.h b/libs/revolution/include/revolution/os/OSDC.h similarity index 100% rename from include/revolution/os/OSDC.h rename to libs/revolution/include/revolution/os/OSDC.h diff --git a/include/revolution/os/OSError.h b/libs/revolution/include/revolution/os/OSError.h similarity index 100% rename from include/revolution/os/OSError.h rename to libs/revolution/include/revolution/os/OSError.h diff --git a/include/revolution/os/OSException.h b/libs/revolution/include/revolution/os/OSException.h similarity index 100% rename from include/revolution/os/OSException.h rename to libs/revolution/include/revolution/os/OSException.h diff --git a/include/revolution/os/OSExec.h b/libs/revolution/include/revolution/os/OSExec.h similarity index 100% rename from include/revolution/os/OSExec.h rename to libs/revolution/include/revolution/os/OSExec.h diff --git a/include/revolution/os/OSFont.h b/libs/revolution/include/revolution/os/OSFont.h similarity index 100% rename from include/revolution/os/OSFont.h rename to libs/revolution/include/revolution/os/OSFont.h diff --git a/include/revolution/os/OSHardware.h b/libs/revolution/include/revolution/os/OSHardware.h similarity index 100% rename from include/revolution/os/OSHardware.h rename to libs/revolution/include/revolution/os/OSHardware.h diff --git a/include/revolution/os/OSIC.h b/libs/revolution/include/revolution/os/OSIC.h similarity index 100% rename from include/revolution/os/OSIC.h rename to libs/revolution/include/revolution/os/OSIC.h diff --git a/include/revolution/os/OSInterrupt.h b/libs/revolution/include/revolution/os/OSInterrupt.h similarity index 100% rename from include/revolution/os/OSInterrupt.h rename to libs/revolution/include/revolution/os/OSInterrupt.h diff --git a/include/revolution/os/OSIpc.h b/libs/revolution/include/revolution/os/OSIpc.h similarity index 100% rename from include/revolution/os/OSIpc.h rename to libs/revolution/include/revolution/os/OSIpc.h diff --git a/include/revolution/os/OSL2.h b/libs/revolution/include/revolution/os/OSL2.h similarity index 100% rename from include/revolution/os/OSL2.h rename to libs/revolution/include/revolution/os/OSL2.h diff --git a/include/revolution/os/OSLC.h b/libs/revolution/include/revolution/os/OSLC.h similarity index 100% rename from include/revolution/os/OSLC.h rename to libs/revolution/include/revolution/os/OSLC.h diff --git a/include/revolution/os/OSMemory.h b/libs/revolution/include/revolution/os/OSMemory.h similarity index 100% rename from include/revolution/os/OSMemory.h rename to libs/revolution/include/revolution/os/OSMemory.h diff --git a/include/revolution/os/OSMessage.h b/libs/revolution/include/revolution/os/OSMessage.h similarity index 100% rename from include/revolution/os/OSMessage.h rename to libs/revolution/include/revolution/os/OSMessage.h diff --git a/include/revolution/os/OSModule.h b/libs/revolution/include/revolution/os/OSModule.h similarity index 100% rename from include/revolution/os/OSModule.h rename to libs/revolution/include/revolution/os/OSModule.h diff --git a/include/revolution/os/OSMutex.h b/libs/revolution/include/revolution/os/OSMutex.h similarity index 100% rename from include/revolution/os/OSMutex.h rename to libs/revolution/include/revolution/os/OSMutex.h diff --git a/include/revolution/os/OSNandbootInfo.h b/libs/revolution/include/revolution/os/OSNandbootInfo.h similarity index 100% rename from include/revolution/os/OSNandbootInfo.h rename to libs/revolution/include/revolution/os/OSNandbootInfo.h diff --git a/include/revolution/os/OSNet.h b/libs/revolution/include/revolution/os/OSNet.h similarity index 100% rename from include/revolution/os/OSNet.h rename to libs/revolution/include/revolution/os/OSNet.h diff --git a/include/revolution/os/OSPlayRecord.h b/libs/revolution/include/revolution/os/OSPlayRecord.h similarity index 100% rename from include/revolution/os/OSPlayRecord.h rename to libs/revolution/include/revolution/os/OSPlayRecord.h diff --git a/include/revolution/os/OSPlayTime.h b/libs/revolution/include/revolution/os/OSPlayTime.h similarity index 100% rename from include/revolution/os/OSPlayTime.h rename to libs/revolution/include/revolution/os/OSPlayTime.h diff --git a/include/revolution/os/OSReboot.h b/libs/revolution/include/revolution/os/OSReboot.h similarity index 100% rename from include/revolution/os/OSReboot.h rename to libs/revolution/include/revolution/os/OSReboot.h diff --git a/include/revolution/os/OSReset.h b/libs/revolution/include/revolution/os/OSReset.h similarity index 100% rename from include/revolution/os/OSReset.h rename to libs/revolution/include/revolution/os/OSReset.h diff --git a/include/revolution/os/OSResetSW.h b/libs/revolution/include/revolution/os/OSResetSW.h similarity index 100% rename from include/revolution/os/OSResetSW.h rename to libs/revolution/include/revolution/os/OSResetSW.h diff --git a/include/revolution/os/OSRtc.h b/libs/revolution/include/revolution/os/OSRtc.h similarity index 100% rename from include/revolution/os/OSRtc.h rename to libs/revolution/include/revolution/os/OSRtc.h diff --git a/include/revolution/os/OSSemaphore.h b/libs/revolution/include/revolution/os/OSSemaphore.h similarity index 100% rename from include/revolution/os/OSSemaphore.h rename to libs/revolution/include/revolution/os/OSSemaphore.h diff --git a/include/revolution/os/OSSerial.h b/libs/revolution/include/revolution/os/OSSerial.h similarity index 100% rename from include/revolution/os/OSSerial.h rename to libs/revolution/include/revolution/os/OSSerial.h diff --git a/include/revolution/os/OSStateFlags.h b/libs/revolution/include/revolution/os/OSStateFlags.h similarity index 100% rename from include/revolution/os/OSStateFlags.h rename to libs/revolution/include/revolution/os/OSStateFlags.h diff --git a/include/revolution/os/OSThread.h b/libs/revolution/include/revolution/os/OSThread.h similarity index 100% rename from include/revolution/os/OSThread.h rename to libs/revolution/include/revolution/os/OSThread.h diff --git a/include/revolution/os/OSTime.h b/libs/revolution/include/revolution/os/OSTime.h similarity index 100% rename from include/revolution/os/OSTime.h rename to libs/revolution/include/revolution/os/OSTime.h diff --git a/include/revolution/os/OSTimer.h b/libs/revolution/include/revolution/os/OSTimer.h similarity index 100% rename from include/revolution/os/OSTimer.h rename to libs/revolution/include/revolution/os/OSTimer.h diff --git a/include/revolution/os/OSUtf.h b/libs/revolution/include/revolution/os/OSUtf.h similarity index 100% rename from include/revolution/os/OSUtf.h rename to libs/revolution/include/revolution/os/OSUtf.h diff --git a/include/revolution/pad.h b/libs/revolution/include/revolution/pad.h similarity index 100% rename from include/revolution/pad.h rename to libs/revolution/include/revolution/pad.h diff --git a/include/revolution/private/GXFDLShortcut.h b/libs/revolution/include/revolution/private/GXFDLShortcut.h similarity index 100% rename from include/revolution/private/GXFDLShortcut.h rename to libs/revolution/include/revolution/private/GXFDLShortcut.h diff --git a/include/revolution/private/GXRegs.h b/libs/revolution/include/revolution/private/GXRegs.h similarity index 100% rename from include/revolution/private/GXRegs.h rename to libs/revolution/include/revolution/private/GXRegs.h diff --git a/include/revolution/private/bp_reg.h b/libs/revolution/include/revolution/private/bp_reg.h similarity index 100% rename from include/revolution/private/bp_reg.h rename to libs/revolution/include/revolution/private/bp_reg.h diff --git a/include/revolution/private/cp_reg.h b/libs/revolution/include/revolution/private/cp_reg.h similarity index 100% rename from include/revolution/private/cp_reg.h rename to libs/revolution/include/revolution/private/cp_reg.h diff --git a/include/revolution/private/gen_reg.h b/libs/revolution/include/revolution/private/gen_reg.h similarity index 100% rename from include/revolution/private/gen_reg.h rename to libs/revolution/include/revolution/private/gen_reg.h diff --git a/include/revolution/private/iosrestypes.h b/libs/revolution/include/revolution/private/iosrestypes.h similarity index 100% rename from include/revolution/private/iosrestypes.h rename to libs/revolution/include/revolution/private/iosrestypes.h diff --git a/include/revolution/private/iostypes.h b/libs/revolution/include/revolution/private/iostypes.h similarity index 100% rename from include/revolution/private/iostypes.h rename to libs/revolution/include/revolution/private/iostypes.h diff --git a/include/revolution/private/pe_reg.h b/libs/revolution/include/revolution/private/pe_reg.h similarity index 100% rename from include/revolution/private/pe_reg.h rename to libs/revolution/include/revolution/private/pe_reg.h diff --git a/include/revolution/private/pi_reg.h b/libs/revolution/include/revolution/private/pi_reg.h similarity index 100% rename from include/revolution/private/pi_reg.h rename to libs/revolution/include/revolution/private/pi_reg.h diff --git a/include/revolution/private/ras_reg.h b/libs/revolution/include/revolution/private/ras_reg.h similarity index 100% rename from include/revolution/private/ras_reg.h rename to libs/revolution/include/revolution/private/ras_reg.h diff --git a/include/revolution/private/su_reg.h b/libs/revolution/include/revolution/private/su_reg.h similarity index 100% rename from include/revolution/private/su_reg.h rename to libs/revolution/include/revolution/private/su_reg.h diff --git a/include/revolution/private/tev_reg.h b/libs/revolution/include/revolution/private/tev_reg.h similarity index 100% rename from include/revolution/private/tev_reg.h rename to libs/revolution/include/revolution/private/tev_reg.h diff --git a/include/revolution/private/tx_reg.h b/libs/revolution/include/revolution/private/tx_reg.h similarity index 100% rename from include/revolution/private/tx_reg.h rename to libs/revolution/include/revolution/private/tx_reg.h diff --git a/include/revolution/private/xf_mem.h b/libs/revolution/include/revolution/private/xf_mem.h similarity index 100% rename from include/revolution/private/xf_mem.h rename to libs/revolution/include/revolution/private/xf_mem.h diff --git a/include/revolution/revolution.h b/libs/revolution/include/revolution/revolution.h similarity index 100% rename from include/revolution/revolution.h rename to libs/revolution/include/revolution/revolution.h diff --git a/include/revolution/sc.h b/libs/revolution/include/revolution/sc.h similarity index 100% rename from include/revolution/sc.h rename to libs/revolution/include/revolution/sc.h diff --git a/include/revolution/sdk_math.h b/libs/revolution/include/revolution/sdk_math.h similarity index 100% rename from include/revolution/sdk_math.h rename to libs/revolution/include/revolution/sdk_math.h diff --git a/include/revolution/seq.h b/libs/revolution/include/revolution/seq.h similarity index 100% rename from include/revolution/seq.h rename to libs/revolution/include/revolution/seq.h diff --git a/include/revolution/si.h b/libs/revolution/include/revolution/si.h similarity index 100% rename from include/revolution/si.h rename to libs/revolution/include/revolution/si.h diff --git a/include/revolution/sp.h b/libs/revolution/include/revolution/sp.h similarity index 100% rename from include/revolution/sp.h rename to libs/revolution/include/revolution/sp.h diff --git a/include/revolution/syn.h b/libs/revolution/include/revolution/syn.h similarity index 100% rename from include/revolution/syn.h rename to libs/revolution/include/revolution/syn.h diff --git a/include/revolution/thp.h b/libs/revolution/include/revolution/thp.h similarity index 100% rename from include/revolution/thp.h rename to libs/revolution/include/revolution/thp.h diff --git a/include/revolution/tpl.h b/libs/revolution/include/revolution/tpl.h similarity index 100% rename from include/revolution/tpl.h rename to libs/revolution/include/revolution/tpl.h diff --git a/include/revolution/types.h b/libs/revolution/include/revolution/types.h similarity index 100% rename from include/revolution/types.h rename to libs/revolution/include/revolution/types.h diff --git a/include/revolution/usb.h b/libs/revolution/include/revolution/usb.h similarity index 100% rename from include/revolution/usb.h rename to libs/revolution/include/revolution/usb.h diff --git a/include/revolution/vi.h b/libs/revolution/include/revolution/vi.h similarity index 100% rename from include/revolution/vi.h rename to libs/revolution/include/revolution/vi.h diff --git a/include/revolution/vi/vifuncs.h b/libs/revolution/include/revolution/vi/vifuncs.h similarity index 100% rename from include/revolution/vi/vifuncs.h rename to libs/revolution/include/revolution/vi/vifuncs.h diff --git a/include/revolution/vi/vitypes.h b/libs/revolution/include/revolution/vi/vitypes.h similarity index 100% rename from include/revolution/vi/vitypes.h rename to libs/revolution/include/revolution/vi/vitypes.h diff --git a/include/revolution/wenc.h b/libs/revolution/include/revolution/wenc.h similarity index 100% rename from include/revolution/wenc.h rename to libs/revolution/include/revolution/wenc.h diff --git a/include/revolution/wpad.h b/libs/revolution/include/revolution/wpad.h similarity index 100% rename from include/revolution/wpad.h rename to libs/revolution/include/revolution/wpad.h diff --git a/include/revolution/wpad/bte.h b/libs/revolution/include/revolution/wpad/bte.h similarity index 100% rename from include/revolution/wpad/bte.h rename to libs/revolution/include/revolution/wpad/bte.h diff --git a/include/revolution/wpad/wud.h b/libs/revolution/include/revolution/wpad/wud.h similarity index 100% rename from include/revolution/wpad/wud.h rename to libs/revolution/include/revolution/wpad/wud.h diff --git a/include/revolution/wud.h b/libs/revolution/include/revolution/wud.h similarity index 100% rename from include/revolution/wud.h rename to libs/revolution/include/revolution/wud.h diff --git a/src/revolution/ai/ai.c b/libs/revolution/src/ai/ai.c similarity index 100% rename from src/revolution/ai/ai.c rename to libs/revolution/src/ai/ai.c diff --git a/src/revolution/aralt/__ar.h b/libs/revolution/src/aralt/__ar.h similarity index 100% rename from src/revolution/aralt/__ar.h rename to libs/revolution/src/aralt/__ar.h diff --git a/src/revolution/aralt/aralt.c b/libs/revolution/src/aralt/aralt.c similarity index 100% rename from src/revolution/aralt/aralt.c rename to libs/revolution/src/aralt/aralt.c diff --git a/src/revolution/arc/arc.c b/libs/revolution/src/arc/arc.c similarity index 100% rename from src/revolution/arc/arc.c rename to libs/revolution/src/arc/arc.c diff --git a/src/revolution/ax/AXAux.c b/libs/revolution/src/ax/AXAux.c similarity index 100% rename from src/revolution/ax/AXAux.c rename to libs/revolution/src/ax/AXAux.c diff --git a/src/revolution/ax/AXCL.c b/libs/revolution/src/ax/AXCL.c similarity index 100% rename from src/revolution/ax/AXCL.c rename to libs/revolution/src/ax/AXCL.c diff --git a/src/revolution/axfx/AXFXHooks.c b/libs/revolution/src/axfx/AXFXHooks.c similarity index 100% rename from src/revolution/axfx/AXFXHooks.c rename to libs/revolution/src/axfx/AXFXHooks.c diff --git a/src/revolution/axfx/AXFXReverbHi.c b/libs/revolution/src/axfx/AXFXReverbHi.c similarity index 100% rename from src/revolution/axfx/AXFXReverbHi.c rename to libs/revolution/src/axfx/AXFXReverbHi.c diff --git a/src/revolution/axfx/AXFXReverbHiExp.c b/libs/revolution/src/axfx/AXFXReverbHiExp.c similarity index 100% rename from src/revolution/axfx/AXFXReverbHiExp.c rename to libs/revolution/src/axfx/AXFXReverbHiExp.c diff --git a/src/revolution/base/PPCArch.c b/libs/revolution/src/base/PPCArch.c similarity index 100% rename from src/revolution/base/PPCArch.c rename to libs/revolution/src/base/PPCArch.c diff --git a/src/revolution/base/PPCPm.c b/libs/revolution/src/base/PPCPm.c similarity index 100% rename from src/revolution/base/PPCPm.c rename to libs/revolution/src/base/PPCPm.c diff --git a/src/revolution/card/CARDBios.c b/libs/revolution/src/card/CARDBios.c similarity index 100% rename from src/revolution/card/CARDBios.c rename to libs/revolution/src/card/CARDBios.c diff --git a/src/revolution/card/CARDBlock.c b/libs/revolution/src/card/CARDBlock.c similarity index 99% rename from src/revolution/card/CARDBlock.c rename to libs/revolution/src/card/CARDBlock.c index b7af255ddf9..9a1f02145fe 100644 --- a/src/revolution/card/CARDBlock.c +++ b/libs/revolution/src/card/CARDBlock.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDCheck.c b/libs/revolution/src/card/CARDCheck.c similarity index 99% rename from src/revolution/card/CARDCheck.c rename to libs/revolution/src/card/CARDCheck.c index 4a9b78c736a..1d1b715b189 100644 --- a/src/revolution/card/CARDCheck.c +++ b/libs/revolution/src/card/CARDCheck.c @@ -1,4 +1,4 @@ -#include +#include #include "os/__os.h" #include "__card.h" diff --git a/src/revolution/card/CARDCreate.c b/libs/revolution/src/card/CARDCreate.c similarity index 99% rename from src/revolution/card/CARDCreate.c rename to libs/revolution/src/card/CARDCreate.c index 7da5ab09111..a94036d8325 100644 --- a/src/revolution/card/CARDCreate.c +++ b/libs/revolution/src/card/CARDCreate.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDDelete.c b/libs/revolution/src/card/CARDDelete.c similarity index 98% rename from src/revolution/card/CARDDelete.c rename to libs/revolution/src/card/CARDDelete.c index 0acf24be1c4..a72d01bdeba 100644 --- a/src/revolution/card/CARDDelete.c +++ b/libs/revolution/src/card/CARDDelete.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDDir.c b/libs/revolution/src/card/CARDDir.c similarity index 98% rename from src/revolution/card/CARDDir.c rename to libs/revolution/src/card/CARDDir.c index e154a9c428c..87e289e1aeb 100644 --- a/src/revolution/card/CARDDir.c +++ b/libs/revolution/src/card/CARDDir.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDErase.c b/libs/revolution/src/card/CARDErase.c similarity index 98% rename from src/revolution/card/CARDErase.c rename to libs/revolution/src/card/CARDErase.c index 73bb8ef04b9..0b55994fb9c 100644 --- a/src/revolution/card/CARDErase.c +++ b/libs/revolution/src/card/CARDErase.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDFormat.c b/libs/revolution/src/card/CARDFormat.c similarity index 99% rename from src/revolution/card/CARDFormat.c rename to libs/revolution/src/card/CARDFormat.c index 7bcc76daa1e..7719fbb03cc 100644 --- a/src/revolution/card/CARDFormat.c +++ b/libs/revolution/src/card/CARDFormat.c @@ -1,4 +1,4 @@ -#include +#include #include "os/__os.h" #include "__card.h" diff --git a/src/revolution/card/CARDMount.c b/libs/revolution/src/card/CARDMount.c similarity index 99% rename from src/revolution/card/CARDMount.c rename to libs/revolution/src/card/CARDMount.c index 4ca607dc3b5..472606427a4 100644 --- a/src/revolution/card/CARDMount.c +++ b/libs/revolution/src/card/CARDMount.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "os/__os.h" #include "__card.h" diff --git a/src/revolution/card/CARDNet.c b/libs/revolution/src/card/CARDNet.c similarity index 99% rename from src/revolution/card/CARDNet.c rename to libs/revolution/src/card/CARDNet.c index 5f43d3becf7..513997c685f 100644 --- a/src/revolution/card/CARDNet.c +++ b/libs/revolution/src/card/CARDNet.c @@ -1,4 +1,4 @@ -#include +#include #include "os/__os.h" #include "__card.h" diff --git a/src/revolution/card/CARDOpen.c b/libs/revolution/src/card/CARDOpen.c similarity index 99% rename from src/revolution/card/CARDOpen.c rename to libs/revolution/src/card/CARDOpen.c index bd86568291b..0a48c0e5274 100644 --- a/src/revolution/card/CARDOpen.c +++ b/libs/revolution/src/card/CARDOpen.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDProgram.c b/libs/revolution/src/card/CARDProgram.c similarity index 99% rename from src/revolution/card/CARDProgram.c rename to libs/revolution/src/card/CARDProgram.c index 2e603777fa4..30bdc42d38b 100644 --- a/src/revolution/card/CARDProgram.c +++ b/libs/revolution/src/card/CARDProgram.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDRaw.c b/libs/revolution/src/card/CARDRaw.c similarity index 98% rename from src/revolution/card/CARDRaw.c rename to libs/revolution/src/card/CARDRaw.c index 584a9be9c2e..91c0ab92fa6 100644 --- a/src/revolution/card/CARDRaw.c +++ b/libs/revolution/src/card/CARDRaw.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDRdwr.c b/libs/revolution/src/card/CARDRdwr.c similarity index 98% rename from src/revolution/card/CARDRdwr.c rename to libs/revolution/src/card/CARDRdwr.c index 8350f57ac44..b94ac032cdd 100644 --- a/src/revolution/card/CARDRdwr.c +++ b/libs/revolution/src/card/CARDRdwr.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDRead.c b/libs/revolution/src/card/CARDRead.c similarity index 99% rename from src/revolution/card/CARDRead.c rename to libs/revolution/src/card/CARDRead.c index 74bd544a6f4..4a468e1faa7 100644 --- a/src/revolution/card/CARDRead.c +++ b/libs/revolution/src/card/CARDRead.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDRename.c b/libs/revolution/src/card/CARDRename.c similarity index 98% rename from src/revolution/card/CARDRename.c rename to libs/revolution/src/card/CARDRename.c index 0a76aca32ba..590208480ab 100644 --- a/src/revolution/card/CARDRename.c +++ b/libs/revolution/src/card/CARDRename.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDStat.c b/libs/revolution/src/card/CARDStat.c similarity index 99% rename from src/revolution/card/CARDStat.c rename to libs/revolution/src/card/CARDStat.c index f99455b42b1..61810867957 100644 --- a/src/revolution/card/CARDStat.c +++ b/libs/revolution/src/card/CARDStat.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDStatEx.c b/libs/revolution/src/card/CARDStatEx.c similarity index 98% rename from src/revolution/card/CARDStatEx.c rename to libs/revolution/src/card/CARDStatEx.c index 0ec84c1cea4..4a5fa87e817 100644 --- a/src/revolution/card/CARDStatEx.c +++ b/libs/revolution/src/card/CARDStatEx.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDUnlock.c b/libs/revolution/src/card/CARDUnlock.c similarity index 99% rename from src/revolution/card/CARDUnlock.c rename to libs/revolution/src/card/CARDUnlock.c index 48f64e500a4..93298297c83 100644 --- a/src/revolution/card/CARDUnlock.c +++ b/libs/revolution/src/card/CARDUnlock.c @@ -1,6 +1,5 @@ #include -#include -#include +#include #include "__card.h" diff --git a/src/revolution/card/CARDWrite.c b/libs/revolution/src/card/CARDWrite.c similarity index 99% rename from src/revolution/card/CARDWrite.c rename to libs/revolution/src/card/CARDWrite.c index ad9fa4a2731..b76255ea72c 100644 --- a/src/revolution/card/CARDWrite.c +++ b/libs/revolution/src/card/CARDWrite.c @@ -1,4 +1,4 @@ -#include +#include #include "__card.h" diff --git a/src/revolution/card/__card.h b/libs/revolution/src/card/__card.h similarity index 100% rename from src/revolution/card/__card.h rename to libs/revolution/src/card/__card.h diff --git a/src/revolution/dsp/__dsp.h b/libs/revolution/src/dsp/__dsp.h similarity index 100% rename from src/revolution/dsp/__dsp.h rename to libs/revolution/src/dsp/__dsp.h diff --git a/src/revolution/dsp/dsp.c b/libs/revolution/src/dsp/dsp.c similarity index 100% rename from src/revolution/dsp/dsp.c rename to libs/revolution/src/dsp/dsp.c diff --git a/src/revolution/dsp/dsp_debug.c b/libs/revolution/src/dsp/dsp_debug.c similarity index 100% rename from src/revolution/dsp/dsp_debug.c rename to libs/revolution/src/dsp/dsp_debug.c diff --git a/src/revolution/dsp/dsp_task.c b/libs/revolution/src/dsp/dsp_task.c similarity index 100% rename from src/revolution/dsp/dsp_task.c rename to libs/revolution/src/dsp/dsp_task.c diff --git a/src/revolution/dvd/__dvd.h b/libs/revolution/src/dvd/__dvd.h similarity index 100% rename from src/revolution/dvd/__dvd.h rename to libs/revolution/src/dvd/__dvd.h diff --git a/src/revolution/dvd/dvd.c b/libs/revolution/src/dvd/dvd.c similarity index 100% rename from src/revolution/dvd/dvd.c rename to libs/revolution/src/dvd/dvd.c diff --git a/src/revolution/dvd/dvdDeviceError.c b/libs/revolution/src/dvd/dvdDeviceError.c similarity index 100% rename from src/revolution/dvd/dvdDeviceError.c rename to libs/revolution/src/dvd/dvdDeviceError.c diff --git a/src/revolution/dvd/dvdFatal.c b/libs/revolution/src/dvd/dvdFatal.c similarity index 100% rename from src/revolution/dvd/dvdFatal.c rename to libs/revolution/src/dvd/dvdFatal.c diff --git a/src/revolution/dvd/dvd_broadway.c b/libs/revolution/src/dvd/dvd_broadway.c similarity index 100% rename from src/revolution/dvd/dvd_broadway.c rename to libs/revolution/src/dvd/dvd_broadway.c diff --git a/src/revolution/dvd/dvderror.c b/libs/revolution/src/dvd/dvderror.c similarity index 100% rename from src/revolution/dvd/dvderror.c rename to libs/revolution/src/dvd/dvderror.c diff --git a/src/revolution/dvd/dvdfs.c b/libs/revolution/src/dvd/dvdfs.c similarity index 100% rename from src/revolution/dvd/dvdfs.c rename to libs/revolution/src/dvd/dvdfs.c diff --git a/src/revolution/dvd/dvdidutils.c b/libs/revolution/src/dvd/dvdidutils.c similarity index 100% rename from src/revolution/dvd/dvdidutils.c rename to libs/revolution/src/dvd/dvdidutils.c diff --git a/src/revolution/dvd/dvdqueue.c b/libs/revolution/src/dvd/dvdqueue.c similarity index 100% rename from src/revolution/dvd/dvdqueue.c rename to libs/revolution/src/dvd/dvdqueue.c diff --git a/src/revolution/esp/esp.c b/libs/revolution/src/esp/esp.c similarity index 100% rename from src/revolution/esp/esp.c rename to libs/revolution/src/esp/esp.c diff --git a/src/revolution/euart/euart.c b/libs/revolution/src/euart/euart.c similarity index 100% rename from src/revolution/euart/euart.c rename to libs/revolution/src/euart/euart.c diff --git a/src/revolution/exi/EXIBios.c b/libs/revolution/src/exi/EXIBios.c similarity index 100% rename from src/revolution/exi/EXIBios.c rename to libs/revolution/src/exi/EXIBios.c diff --git a/src/revolution/exi/EXICommon.c b/libs/revolution/src/exi/EXICommon.c similarity index 100% rename from src/revolution/exi/EXICommon.c rename to libs/revolution/src/exi/EXICommon.c diff --git a/src/revolution/exi/EXIUart.c b/libs/revolution/src/exi/EXIUart.c similarity index 100% rename from src/revolution/exi/EXIUart.c rename to libs/revolution/src/exi/EXIUart.c diff --git a/src/revolution/fs/fs.c b/libs/revolution/src/fs/fs.c similarity index 100% rename from src/revolution/fs/fs.c rename to libs/revolution/src/fs/fs.c diff --git a/src/revolution/gd/GDBase.c b/libs/revolution/src/gd/GDBase.c similarity index 100% rename from src/revolution/gd/GDBase.c rename to libs/revolution/src/gd/GDBase.c diff --git a/src/revolution/gd/GDFile.c b/libs/revolution/src/gd/GDFile.c similarity index 100% rename from src/revolution/gd/GDFile.c rename to libs/revolution/src/gd/GDFile.c diff --git a/src/revolution/gd/GDGeometry.c b/libs/revolution/src/gd/GDGeometry.c similarity index 100% rename from src/revolution/gd/GDGeometry.c rename to libs/revolution/src/gd/GDGeometry.c diff --git a/src/revolution/gd/GDIndirect.c b/libs/revolution/src/gd/GDIndirect.c similarity index 100% rename from src/revolution/gd/GDIndirect.c rename to libs/revolution/src/gd/GDIndirect.c diff --git a/src/revolution/gd/GDLight.c b/libs/revolution/src/gd/GDLight.c similarity index 100% rename from src/revolution/gd/GDLight.c rename to libs/revolution/src/gd/GDLight.c diff --git a/src/revolution/gd/GDPixel.c b/libs/revolution/src/gd/GDPixel.c similarity index 100% rename from src/revolution/gd/GDPixel.c rename to libs/revolution/src/gd/GDPixel.c diff --git a/src/revolution/gd/GDTev.c b/libs/revolution/src/gd/GDTev.c similarity index 100% rename from src/revolution/gd/GDTev.c rename to libs/revolution/src/gd/GDTev.c diff --git a/src/revolution/gd/GDTexture.c b/libs/revolution/src/gd/GDTexture.c similarity index 100% rename from src/revolution/gd/GDTexture.c rename to libs/revolution/src/gd/GDTexture.c diff --git a/src/revolution/gd/GDTransform.c b/libs/revolution/src/gd/GDTransform.c similarity index 100% rename from src/revolution/gd/GDTransform.c rename to libs/revolution/src/gd/GDTransform.c diff --git a/src/revolution/gf/GFGeometry.cpp b/libs/revolution/src/gf/GFGeometry.cpp similarity index 100% rename from src/revolution/gf/GFGeometry.cpp rename to libs/revolution/src/gf/GFGeometry.cpp diff --git a/src/revolution/gf/GFLight.cpp b/libs/revolution/src/gf/GFLight.cpp similarity index 100% rename from src/revolution/gf/GFLight.cpp rename to libs/revolution/src/gf/GFLight.cpp diff --git a/src/revolution/gf/GFPixel.cpp b/libs/revolution/src/gf/GFPixel.cpp similarity index 100% rename from src/revolution/gf/GFPixel.cpp rename to libs/revolution/src/gf/GFPixel.cpp diff --git a/src/revolution/gf/GFTev.cpp b/libs/revolution/src/gf/GFTev.cpp similarity index 100% rename from src/revolution/gf/GFTev.cpp rename to libs/revolution/src/gf/GFTev.cpp diff --git a/src/revolution/gx/GXAttr.c b/libs/revolution/src/gx/GXAttr.c similarity index 100% rename from src/revolution/gx/GXAttr.c rename to libs/revolution/src/gx/GXAttr.c diff --git a/src/revolution/gx/GXBump.c b/libs/revolution/src/gx/GXBump.c similarity index 100% rename from src/revolution/gx/GXBump.c rename to libs/revolution/src/gx/GXBump.c diff --git a/src/revolution/gx/GXDisplayList.c b/libs/revolution/src/gx/GXDisplayList.c similarity index 100% rename from src/revolution/gx/GXDisplayList.c rename to libs/revolution/src/gx/GXDisplayList.c diff --git a/src/revolution/gx/GXDraw.c b/libs/revolution/src/gx/GXDraw.c similarity index 100% rename from src/revolution/gx/GXDraw.c rename to libs/revolution/src/gx/GXDraw.c diff --git a/src/revolution/gx/GXFifo.c b/libs/revolution/src/gx/GXFifo.c similarity index 100% rename from src/revolution/gx/GXFifo.c rename to libs/revolution/src/gx/GXFifo.c diff --git a/src/revolution/gx/GXFrameBuf.c b/libs/revolution/src/gx/GXFrameBuf.c similarity index 100% rename from src/revolution/gx/GXFrameBuf.c rename to libs/revolution/src/gx/GXFrameBuf.c diff --git a/src/revolution/gx/GXGeometry.c b/libs/revolution/src/gx/GXGeometry.c similarity index 100% rename from src/revolution/gx/GXGeometry.c rename to libs/revolution/src/gx/GXGeometry.c diff --git a/src/revolution/gx/GXInit.c b/libs/revolution/src/gx/GXInit.c similarity index 100% rename from src/revolution/gx/GXInit.c rename to libs/revolution/src/gx/GXInit.c diff --git a/src/revolution/gx/GXLight.c b/libs/revolution/src/gx/GXLight.c similarity index 100% rename from src/revolution/gx/GXLight.c rename to libs/revolution/src/gx/GXLight.c diff --git a/src/revolution/gx/GXMisc.c b/libs/revolution/src/gx/GXMisc.c similarity index 100% rename from src/revolution/gx/GXMisc.c rename to libs/revolution/src/gx/GXMisc.c diff --git a/src/revolution/gx/GXPerf.c b/libs/revolution/src/gx/GXPerf.c similarity index 100% rename from src/revolution/gx/GXPerf.c rename to libs/revolution/src/gx/GXPerf.c diff --git a/src/revolution/gx/GXPixel.c b/libs/revolution/src/gx/GXPixel.c similarity index 100% rename from src/revolution/gx/GXPixel.c rename to libs/revolution/src/gx/GXPixel.c diff --git a/src/revolution/gx/GXSave.c b/libs/revolution/src/gx/GXSave.c similarity index 100% rename from src/revolution/gx/GXSave.c rename to libs/revolution/src/gx/GXSave.c diff --git a/src/revolution/gx/GXStubs.c b/libs/revolution/src/gx/GXStubs.c similarity index 100% rename from src/revolution/gx/GXStubs.c rename to libs/revolution/src/gx/GXStubs.c diff --git a/src/revolution/gx/GXTev.c b/libs/revolution/src/gx/GXTev.c similarity index 100% rename from src/revolution/gx/GXTev.c rename to libs/revolution/src/gx/GXTev.c diff --git a/src/revolution/gx/GXTexture.c b/libs/revolution/src/gx/GXTexture.c similarity index 100% rename from src/revolution/gx/GXTexture.c rename to libs/revolution/src/gx/GXTexture.c diff --git a/src/revolution/gx/GXTransform.c b/libs/revolution/src/gx/GXTransform.c similarity index 100% rename from src/revolution/gx/GXTransform.c rename to libs/revolution/src/gx/GXTransform.c diff --git a/src/revolution/gx/GXVerifRAS.c b/libs/revolution/src/gx/GXVerifRAS.c similarity index 100% rename from src/revolution/gx/GXVerifRAS.c rename to libs/revolution/src/gx/GXVerifRAS.c diff --git a/src/revolution/gx/GXVerifXF.c b/libs/revolution/src/gx/GXVerifXF.c similarity index 100% rename from src/revolution/gx/GXVerifXF.c rename to libs/revolution/src/gx/GXVerifXF.c diff --git a/src/revolution/gx/GXVerify.c b/libs/revolution/src/gx/GXVerify.c similarity index 100% rename from src/revolution/gx/GXVerify.c rename to libs/revolution/src/gx/GXVerify.c diff --git a/src/revolution/gx/GXVert.c b/libs/revolution/src/gx/GXVert.c similarity index 100% rename from src/revolution/gx/GXVert.c rename to libs/revolution/src/gx/GXVert.c diff --git a/src/revolution/gx/__gx.h b/libs/revolution/src/gx/__gx.h similarity index 100% rename from src/revolution/gx/__gx.h rename to libs/revolution/src/gx/__gx.h diff --git a/src/revolution/hio2/hio2.c b/libs/revolution/src/hio2/hio2.c similarity index 100% rename from src/revolution/hio2/hio2.c rename to libs/revolution/src/hio2/hio2.c diff --git a/src/revolution/homebuttonLib/HBMAnmController.cpp b/libs/revolution/src/homebuttonLib/HBMAnmController.cpp similarity index 100% rename from src/revolution/homebuttonLib/HBMAnmController.cpp rename to libs/revolution/src/homebuttonLib/HBMAnmController.cpp diff --git a/src/revolution/homebuttonLib/HBMAnmController.h b/libs/revolution/src/homebuttonLib/HBMAnmController.h similarity index 100% rename from src/revolution/homebuttonLib/HBMAnmController.h rename to libs/revolution/src/homebuttonLib/HBMAnmController.h diff --git a/src/revolution/homebuttonLib/HBMBase.cpp b/libs/revolution/src/homebuttonLib/HBMBase.cpp similarity index 100% rename from src/revolution/homebuttonLib/HBMBase.cpp rename to libs/revolution/src/homebuttonLib/HBMBase.cpp diff --git a/src/revolution/homebuttonLib/HBMBase.h b/libs/revolution/src/homebuttonLib/HBMBase.h similarity index 100% rename from src/revolution/homebuttonLib/HBMBase.h rename to libs/revolution/src/homebuttonLib/HBMBase.h diff --git a/src/revolution/homebuttonLib/HBMCommon.h b/libs/revolution/src/homebuttonLib/HBMCommon.h similarity index 100% rename from src/revolution/homebuttonLib/HBMCommon.h rename to libs/revolution/src/homebuttonLib/HBMCommon.h diff --git a/src/revolution/homebuttonLib/HBMController.cpp b/libs/revolution/src/homebuttonLib/HBMController.cpp similarity index 100% rename from src/revolution/homebuttonLib/HBMController.cpp rename to libs/revolution/src/homebuttonLib/HBMController.cpp diff --git a/src/revolution/homebuttonLib/HBMController.h b/libs/revolution/src/homebuttonLib/HBMController.h similarity index 100% rename from src/revolution/homebuttonLib/HBMController.h rename to libs/revolution/src/homebuttonLib/HBMController.h diff --git a/src/revolution/homebuttonLib/HBMFrameController.cpp b/libs/revolution/src/homebuttonLib/HBMFrameController.cpp similarity index 100% rename from src/revolution/homebuttonLib/HBMFrameController.cpp rename to libs/revolution/src/homebuttonLib/HBMFrameController.cpp diff --git a/src/revolution/homebuttonLib/HBMFrameController.h b/libs/revolution/src/homebuttonLib/HBMFrameController.h similarity index 100% rename from src/revolution/homebuttonLib/HBMFrameController.h rename to libs/revolution/src/homebuttonLib/HBMFrameController.h diff --git a/src/revolution/homebuttonLib/HBMGUIManager.cpp b/libs/revolution/src/homebuttonLib/HBMGUIManager.cpp similarity index 100% rename from src/revolution/homebuttonLib/HBMGUIManager.cpp rename to libs/revolution/src/homebuttonLib/HBMGUIManager.cpp diff --git a/src/revolution/homebuttonLib/HBMGUIManager.h b/libs/revolution/src/homebuttonLib/HBMGUIManager.h similarity index 100% rename from src/revolution/homebuttonLib/HBMGUIManager.h rename to libs/revolution/src/homebuttonLib/HBMGUIManager.h diff --git a/src/revolution/homebuttonLib/HBMRemoteSpk.cpp b/libs/revolution/src/homebuttonLib/HBMRemoteSpk.cpp similarity index 100% rename from src/revolution/homebuttonLib/HBMRemoteSpk.cpp rename to libs/revolution/src/homebuttonLib/HBMRemoteSpk.cpp diff --git a/src/revolution/homebuttonLib/HBMRemoteSpk.h b/libs/revolution/src/homebuttonLib/HBMRemoteSpk.h similarity index 100% rename from src/revolution/homebuttonLib/HBMRemoteSpk.h rename to libs/revolution/src/homebuttonLib/HBMRemoteSpk.h diff --git a/src/revolution/homebuttonLib/nw4hbm/db/DbgPrintBase.h b/libs/revolution/src/homebuttonLib/nw4hbm/db/DbgPrintBase.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/DbgPrintBase.h rename to libs/revolution/src/homebuttonLib/nw4hbm/db/DbgPrintBase.h diff --git a/src/revolution/homebuttonLib/nw4hbm/db/assert.h b/libs/revolution/src/homebuttonLib/nw4hbm/db/assert.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/assert.h rename to libs/revolution/src/homebuttonLib/nw4hbm/db/assert.h diff --git a/src/revolution/homebuttonLib/nw4hbm/db/console.h b/libs/revolution/src/homebuttonLib/nw4hbm/db/console.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/console.h rename to libs/revolution/src/homebuttonLib/nw4hbm/db/console.h diff --git a/src/revolution/homebuttonLib/nw4hbm/db/db_DbgPrintBase.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/db/db_DbgPrintBase.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/db_DbgPrintBase.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/db/db_DbgPrintBase.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/db/db_assert.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/db/db_assert.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/db_assert.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/db/db_assert.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/db/db_console.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/db/db_console.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/db_console.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/db/db_console.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/db/db_directPrint.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/db/db_directPrint.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/db_directPrint.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/db/db_directPrint.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/db/db_mapFile.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/db/db_mapFile.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/db_mapFile.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/db/db_mapFile.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/db/directPrint.h b/libs/revolution/src/homebuttonLib/nw4hbm/db/directPrint.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/directPrint.h rename to libs/revolution/src/homebuttonLib/nw4hbm/db/directPrint.h diff --git a/src/revolution/homebuttonLib/nw4hbm/db/mapFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/db/mapFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/db/mapFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/db/mapFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/animation.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/animation.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/animation.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/animation.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/arcResourceAccessor.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/arcResourceAccessor.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/arcResourceAccessor.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/arcResourceAccessor.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/bounding.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/bounding.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/bounding.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/bounding.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/common.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/common.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/common.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/common.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/drawInfo.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/drawInfo.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/drawInfo.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/drawInfo.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/group.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/group.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/group.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/group.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/layout.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/layout.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/layout.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/layout.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_bounding.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_bounding.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_bounding.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_bounding.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_common.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_common.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_group.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_group.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_material.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_material.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_resourceAccessor.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_resourceAccessor.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_resourceAccessor.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_resourceAccessor.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_types.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_types.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_types.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_types.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_window.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/lyt_window.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/material.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/material.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/material.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/material.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/pane.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/pane.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/pane.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/pane.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/picture.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/picture.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/picture.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/picture.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/resourceAccessor.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/resourceAccessor.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/resourceAccessor.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/resourceAccessor.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/resources.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/resources.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/resources.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/resources.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/textBox.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/textBox.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/textBox.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/textBox.h diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/window.h b/libs/revolution/src/homebuttonLib/nw4hbm/lyt/window.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/lyt/window.h rename to libs/revolution/src/homebuttonLib/nw4hbm/lyt/window.h diff --git a/src/revolution/homebuttonLib/nw4hbm/macros.h b/libs/revolution/src/homebuttonLib/nw4hbm/macros.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/macros.h rename to libs/revolution/src/homebuttonLib/nw4hbm/macros.h diff --git a/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h b/libs/revolution/src/homebuttonLib/nw4hbm/math/arithmetic.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h rename to libs/revolution/src/homebuttonLib/nw4hbm/math/arithmetic.h diff --git a/src/revolution/homebuttonLib/nw4hbm/math/constants.h b/libs/revolution/src/homebuttonLib/nw4hbm/math/constants.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/constants.h rename to libs/revolution/src/homebuttonLib/nw4hbm/math/constants.h diff --git a/src/revolution/homebuttonLib/nw4hbm/math/equation.h b/libs/revolution/src/homebuttonLib/nw4hbm/math/equation.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/equation.h rename to libs/revolution/src/homebuttonLib/nw4hbm/math/equation.h diff --git a/src/revolution/homebuttonLib/nw4hbm/math/geometry.h b/libs/revolution/src/homebuttonLib/nw4hbm/math/geometry.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/geometry.h rename to libs/revolution/src/homebuttonLib/nw4hbm/math/geometry.h diff --git a/src/revolution/homebuttonLib/nw4hbm/math/math_triangular.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/math/math_triangular.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/math_triangular.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/math/math_triangular.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/math/triangular.h b/libs/revolution/src/homebuttonLib/nw4hbm/math/triangular.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/triangular.h rename to libs/revolution/src/homebuttonLib/nw4hbm/math/triangular.h diff --git a/src/revolution/homebuttonLib/nw4hbm/math/types.h b/libs/revolution/src/homebuttonLib/nw4hbm/math/types.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/math/types.h rename to libs/revolution/src/homebuttonLib/nw4hbm/math/types.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/AxManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/AxManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/AxManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/AxManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/AxVoice.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/AxVoice.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Bank.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/Bank.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/Bank.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/Bank.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/BankFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/BankFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/BankFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/BankFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/BasicPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/BasicPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/BasicPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/BasicPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/BasicSound.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/BasicSound.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/BasicSound.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/BasicSound.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/Channel.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/Channel.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/Channel.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/ChannelManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/ChannelManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/ChannelManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/ChannelManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/DisposeCallback.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/DisposeCallback.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/DisposeCallback.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/DisposeCallback.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/DisposeCallbackManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/DisposeCallbackManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/DisposeCallbackManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/DisposeCallbackManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/DvdSoundArchive.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/DvdSoundArchive.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/DvdSoundArchive.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/DvdSoundArchive.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/EnvGenerator.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/EnvGenerator.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/EnvGenerator.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/EnvGenerator.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/ExternalSoundPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/ExternalSoundPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/ExternalSoundPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/ExternalSoundPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/FrameHeap.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/FrameHeap.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/FrameHeap.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/FrameHeap.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/FxBase.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/FxBase.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/FxBase.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/FxBase.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/InstanceManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/InstanceManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/InstanceManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/InstanceManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/InstancePool.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/InstancePool.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Lfo.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/Lfo.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/Lfo.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/Lfo.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MemorySoundArchive.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MemorySoundArchive.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MemorySoundArchive.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MemorySoundArchive.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MidiSeqPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MidiSeqPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MidiSeqPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MidiSeqPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MidiSeqTrack.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MidiSeqTrack.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MidiSeqTrack.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MidiSeqTrack.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MmlParser.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MmlParser.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MmlParser.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MmlParser.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MmlSeqTrack.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MmlSeqTrack.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MmlSeqTrack.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MmlSeqTrack.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MmlSeqTrackAllocator.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MmlSeqTrackAllocator.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MmlSeqTrackAllocator.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MmlSeqTrackAllocator.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/MoveValue.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/MoveValue.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/MoveValue.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/MoveValue.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/NandSoundArchive.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/NandSoundArchive.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/NandSoundArchive.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/NandSoundArchive.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/NoteOnCallback.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/NoteOnCallback.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/NoteOnCallback.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/NoteOnCallback.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/PlayerHeap.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/PlayerHeap.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/PlayerHeap.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/PlayerHeap.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/RemoteSpeaker.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/RemoteSpeaker.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/RemoteSpeaker.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/RemoteSpeaker.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/RemoteSpeakerManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/RemoteSpeakerManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/RemoteSpeakerManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/RemoteSpeakerManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SeqFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SeqFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SeqPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SeqPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SeqSound.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqSound.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SeqSound.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqSound.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SeqSoundHandle.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqSoundHandle.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SeqSoundHandle.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqSoundHandle.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SeqTrack.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqTrack.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SeqTrack.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqTrack.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SeqTrackAllocator.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqTrackAllocator.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SeqTrackAllocator.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SeqTrackAllocator.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundArchive.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchive.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundArchive.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchive.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundArchiveFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchiveFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundArchiveFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchiveFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundArchiveLoader.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchiveLoader.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundArchiveLoader.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchiveLoader.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundArchivePlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchivePlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundArchivePlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundArchivePlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundHandle.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundHandle.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundHandle.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundHandle.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundHeap.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundHeap.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundHeap.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundHeap.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundMemoryAllocatable.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundMemoryAllocatable.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundMemoryAllocatable.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundMemoryAllocatable.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundStartable.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundStartable.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundStartable.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundStartable.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundSystem.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundSystem.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundSystem.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundSystem.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundThread.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundThread.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/SoundThread.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/SoundThread.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/StrmChannel.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmChannel.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/StrmChannel.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmChannel.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/StrmFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/StrmFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/StrmPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/StrmPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/StrmSound.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmSound.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/StrmSound.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmSound.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/StrmSoundHandle.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmSoundHandle.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/StrmSoundHandle.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/StrmSoundHandle.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Task.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/Task.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/Task.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/Task.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/TaskManager.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/TaskManager.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/TaskManager.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/TaskManager.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/TaskThread.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/TaskThread.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/TaskThread.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/TaskThread.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Util.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/Util.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/Util.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/Util.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WaveFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WaveFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WaveFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WaveFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WavePlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WavePlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WavePlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WavePlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WaveSound.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WaveSound.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WaveSound.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WaveSound.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WaveSoundHandle.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WaveSoundHandle.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WaveSoundHandle.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WaveSoundHandle.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WsdFile.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WsdFile.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WsdFile.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WsdFile.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WsdPlayer.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WsdPlayer.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WsdPlayer.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WsdPlayer.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/WsdTrack.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/WsdTrack.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/WsdTrack.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/WsdTrack.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/debug.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/debug.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/debug.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/debug.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundArchivePlayer.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundArchivePlayer.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundArchivePlayer.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundArchivePlayer.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundHandle.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundHandle.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundHandle.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundHandle.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundPlayer.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundPlayer.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundPlayer.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundPlayer.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundStartable.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundStartable.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/snd_SoundStartable.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_SoundStartable.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/snd_global.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_global.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/snd_global.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_global.h diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/snd_types.h b/libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_types.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/snd/snd_types.h rename to libs/revolution/src/homebuttonLib/nw4hbm/snd/snd_types.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/CharStrmReader.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/CharStrmReader.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/CharStrmReader.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/CharStrmReader.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/CharWriter.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/CharWriter.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/CharWriter.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/CharWriter.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/Color.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/Color.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/Color.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/Color.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/DvdFileStream.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/DvdFileStream.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/DvdFileStream.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/DvdFileStream.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/DvdLockedFileStream.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/DvdLockedFileStream.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/DvdLockedFileStream.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/DvdLockedFileStream.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/FileStream.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/FileStream.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/FileStream.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/FileStream.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/Font.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/Font.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/Font.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/Font.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/IOStream.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/IOStream.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/IOStream.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/IOStream.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/LinkList.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/LinkList.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/Lock.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/Lock.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/Lock.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/Lock.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/NandFileStream.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/NandFileStream.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/NandFileStream.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/NandFileStream.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/Rect.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/Rect.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/Rect.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/Rect.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ResFont.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ResFont.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ResFont.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ResFont.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/RuntimeTypeInfo.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/RuntimeTypeInfo.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/RuntimeTypeInfo.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/RuntimeTypeInfo.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/TagProcessor.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/TagProcessor.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/TagProcessor.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/TagProcessor.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/TagProcessorBase.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/TagProcessorBase.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/TagProcessorBase.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/TagProcessorBase.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriter.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/TextWriter.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/TextWriter.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/TextWriter.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/TextWriterBase.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/TextWriterBase.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/WideTagProcessor.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/WideTagProcessor.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/WideTagProcessor.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/WideTagProcessor.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/WideTextWriter.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/WideTextWriter.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/WideTextWriter.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/WideTextWriter.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/binaryFileFormat.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/binaryFileFormat.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/binaryFileFormat.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/binaryFileFormat.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/fontResources.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/fontResources.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/fontResources.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/fontResources.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/inlines.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/inlines.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/inlines.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/inlines.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/list.h b/libs/revolution/src/homebuttonLib/nw4hbm/ut/list.h similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/list.h rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/list.h diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_CharStrmReader.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_CharStrmReader.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_CharStrmReader.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_CharStrmReader.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_CharWriter.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_CharWriter.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_CharWriter.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_CharWriter.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_DvdFileStream.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_DvdFileStream.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_DvdFileStream.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_DvdFileStream.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_FileStream.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_FileStream.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_FileStream.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_FileStream.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_Font.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_Font.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_Font.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_Font.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_IOStream.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_IOStream.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_IOStream.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_IOStream.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_LinkList.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_LinkList.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_LinkList.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_LinkList.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_NandFileStream.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_NandFileStream.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_NandFileStream.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_NandFileStream.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_ResFont.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_ResFont.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_ResFont.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_ResFont.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_ResFontBase.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_ResFontBase.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_ResFontBase.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_ResFontBase.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_TagProcessorBase.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_TagProcessorBase.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_TagProcessorBase.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_TagProcessorBase.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_TextWriterBase.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_binaryFileFormat.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_binaryFileFormat.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_binaryFileFormat.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_binaryFileFormat.cpp diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/ut_list.cpp b/libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_list.cpp similarity index 100% rename from src/revolution/homebuttonLib/nw4hbm/ut/ut_list.cpp rename to libs/revolution/src/homebuttonLib/nw4hbm/ut/ut_list.cpp diff --git a/src/revolution/homebuttonLib/sound/mix.cpp b/libs/revolution/src/homebuttonLib/sound/mix.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/mix.cpp rename to libs/revolution/src/homebuttonLib/sound/mix.cpp diff --git a/src/revolution/homebuttonLib/sound/mix.h b/libs/revolution/src/homebuttonLib/sound/mix.h similarity index 100% rename from src/revolution/homebuttonLib/sound/mix.h rename to libs/revolution/src/homebuttonLib/sound/mix.h diff --git a/src/revolution/homebuttonLib/sound/seq.cpp b/libs/revolution/src/homebuttonLib/sound/seq.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/seq.cpp rename to libs/revolution/src/homebuttonLib/sound/seq.cpp diff --git a/src/revolution/homebuttonLib/sound/seq.h b/libs/revolution/src/homebuttonLib/sound/seq.h similarity index 100% rename from src/revolution/homebuttonLib/sound/seq.h rename to libs/revolution/src/homebuttonLib/sound/seq.h diff --git a/src/revolution/homebuttonLib/sound/syn.cpp b/libs/revolution/src/homebuttonLib/sound/syn.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/syn.cpp rename to libs/revolution/src/homebuttonLib/sound/syn.cpp diff --git a/src/revolution/homebuttonLib/sound/syn.h b/libs/revolution/src/homebuttonLib/sound/syn.h similarity index 100% rename from src/revolution/homebuttonLib/sound/syn.h rename to libs/revolution/src/homebuttonLib/sound/syn.h diff --git a/src/revolution/homebuttonLib/sound/synctrl.cpp b/libs/revolution/src/homebuttonLib/sound/synctrl.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/synctrl.cpp rename to libs/revolution/src/homebuttonLib/sound/synctrl.cpp diff --git a/src/revolution/homebuttonLib/sound/synenv.cpp b/libs/revolution/src/homebuttonLib/sound/synenv.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/synenv.cpp rename to libs/revolution/src/homebuttonLib/sound/synenv.cpp diff --git a/src/revolution/homebuttonLib/sound/synmix.cpp b/libs/revolution/src/homebuttonLib/sound/synmix.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/synmix.cpp rename to libs/revolution/src/homebuttonLib/sound/synmix.cpp diff --git a/src/revolution/homebuttonLib/sound/synpitch.cpp b/libs/revolution/src/homebuttonLib/sound/synpitch.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/synpitch.cpp rename to libs/revolution/src/homebuttonLib/sound/synpitch.cpp diff --git a/src/revolution/homebuttonLib/sound/synprivate.h b/libs/revolution/src/homebuttonLib/sound/synprivate.h similarity index 100% rename from src/revolution/homebuttonLib/sound/synprivate.h rename to libs/revolution/src/homebuttonLib/sound/synprivate.h diff --git a/src/revolution/homebuttonLib/sound/synsample.cpp b/libs/revolution/src/homebuttonLib/sound/synsample.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/synsample.cpp rename to libs/revolution/src/homebuttonLib/sound/synsample.cpp diff --git a/src/revolution/homebuttonLib/sound/synvoice.cpp b/libs/revolution/src/homebuttonLib/sound/synvoice.cpp similarity index 100% rename from src/revolution/homebuttonLib/sound/synvoice.cpp rename to libs/revolution/src/homebuttonLib/sound/synvoice.cpp diff --git a/src/revolution/ipc/ipcMain.c b/libs/revolution/src/ipc/ipcMain.c similarity index 100% rename from src/revolution/ipc/ipcMain.c rename to libs/revolution/src/ipc/ipcMain.c diff --git a/src/revolution/ipc/ipcProfile.c b/libs/revolution/src/ipc/ipcProfile.c similarity index 100% rename from src/revolution/ipc/ipcProfile.c rename to libs/revolution/src/ipc/ipcProfile.c diff --git a/src/revolution/ipc/ipcclt.c b/libs/revolution/src/ipc/ipcclt.c similarity index 100% rename from src/revolution/ipc/ipcclt.c rename to libs/revolution/src/ipc/ipcclt.c diff --git a/src/revolution/ipc/memory.c b/libs/revolution/src/ipc/memory.c similarity index 100% rename from src/revolution/ipc/memory.c rename to libs/revolution/src/ipc/memory.c diff --git a/src/revolution/kpad/KPAD.c b/libs/revolution/src/kpad/KPAD.c similarity index 99% rename from src/revolution/kpad/KPAD.c rename to libs/revolution/src/kpad/KPAD.c index 672a62cfa0c..01cf8854d1e 100644 --- a/src/revolution/kpad/KPAD.c +++ b/libs/revolution/src/kpad/KPAD.c @@ -1,5 +1,4 @@ #include -#include #include #include "types.h" @@ -7,6 +6,8 @@ #include #include +#include "__kpad.h" + static const char* __KPADVersion = "<< RVL_SDK - KPAD \trelease build: Oct 4 2006 11:56:50 (0x4199_60726) >>"; static Vec2 icenter_org = {0.000f, 0.000f}; diff --git a/src/revolution/kpad/__kpad.h b/libs/revolution/src/kpad/__kpad.h similarity index 100% rename from src/revolution/kpad/__kpad.h rename to libs/revolution/src/kpad/__kpad.h diff --git a/src/revolution/mem/mem_allocator.c b/libs/revolution/src/mem/mem_allocator.c similarity index 100% rename from src/revolution/mem/mem_allocator.c rename to libs/revolution/src/mem/mem_allocator.c diff --git a/src/revolution/mem/mem_expHeap.c b/libs/revolution/src/mem/mem_expHeap.c similarity index 100% rename from src/revolution/mem/mem_expHeap.c rename to libs/revolution/src/mem/mem_expHeap.c diff --git a/src/revolution/mem/mem_heapCommon.c b/libs/revolution/src/mem/mem_heapCommon.c similarity index 100% rename from src/revolution/mem/mem_heapCommon.c rename to libs/revolution/src/mem/mem_heapCommon.c diff --git a/src/revolution/mem/mem_list.c b/libs/revolution/src/mem/mem_list.c similarity index 100% rename from src/revolution/mem/mem_list.c rename to libs/revolution/src/mem/mem_list.c diff --git a/src/revolution/mtx/mtx.c b/libs/revolution/src/mtx/mtx.c similarity index 100% rename from src/revolution/mtx/mtx.c rename to libs/revolution/src/mtx/mtx.c diff --git a/src/revolution/mtx/mtx44.c b/libs/revolution/src/mtx/mtx44.c similarity index 100% rename from src/revolution/mtx/mtx44.c rename to libs/revolution/src/mtx/mtx44.c diff --git a/src/revolution/mtx/mtx44vec.c b/libs/revolution/src/mtx/mtx44vec.c similarity index 100% rename from src/revolution/mtx/mtx44vec.c rename to libs/revolution/src/mtx/mtx44vec.c diff --git a/src/revolution/mtx/mtxstack.c b/libs/revolution/src/mtx/mtxstack.c similarity index 100% rename from src/revolution/mtx/mtxstack.c rename to libs/revolution/src/mtx/mtxstack.c diff --git a/src/revolution/mtx/mtxvec.c b/libs/revolution/src/mtx/mtxvec.c similarity index 100% rename from src/revolution/mtx/mtxvec.c rename to libs/revolution/src/mtx/mtxvec.c diff --git a/src/revolution/mtx/psmtx.c b/libs/revolution/src/mtx/psmtx.c similarity index 100% rename from src/revolution/mtx/psmtx.c rename to libs/revolution/src/mtx/psmtx.c diff --git a/src/revolution/mtx/quat.c b/libs/revolution/src/mtx/quat.c similarity index 100% rename from src/revolution/mtx/quat.c rename to libs/revolution/src/mtx/quat.c diff --git a/src/revolution/mtx/vec.c b/libs/revolution/src/mtx/vec.c similarity index 100% rename from src/revolution/mtx/vec.c rename to libs/revolution/src/mtx/vec.c diff --git a/src/revolution/nand/NANDCheck.c b/libs/revolution/src/nand/NANDCheck.c similarity index 100% rename from src/revolution/nand/NANDCheck.c rename to libs/revolution/src/nand/NANDCheck.c diff --git a/src/revolution/nand/NANDCore.c b/libs/revolution/src/nand/NANDCore.c similarity index 100% rename from src/revolution/nand/NANDCore.c rename to libs/revolution/src/nand/NANDCore.c diff --git a/src/revolution/nand/NANDErrorMessage.c b/libs/revolution/src/nand/NANDErrorMessage.c similarity index 100% rename from src/revolution/nand/NANDErrorMessage.c rename to libs/revolution/src/nand/NANDErrorMessage.c diff --git a/src/revolution/nand/NANDLogging.c b/libs/revolution/src/nand/NANDLogging.c similarity index 100% rename from src/revolution/nand/NANDLogging.c rename to libs/revolution/src/nand/NANDLogging.c diff --git a/src/revolution/nand/NANDOpenClose.c b/libs/revolution/src/nand/NANDOpenClose.c similarity index 100% rename from src/revolution/nand/NANDOpenClose.c rename to libs/revolution/src/nand/NANDOpenClose.c diff --git a/src/revolution/nand/nand.c b/libs/revolution/src/nand/nand.c similarity index 100% rename from src/revolution/nand/nand.c rename to libs/revolution/src/nand/nand.c diff --git a/src/revolution/os/OS.c b/libs/revolution/src/os/OS.c similarity index 100% rename from src/revolution/os/OS.c rename to libs/revolution/src/os/OS.c diff --git a/src/revolution/os/OSAddress.c b/libs/revolution/src/os/OSAddress.c similarity index 100% rename from src/revolution/os/OSAddress.c rename to libs/revolution/src/os/OSAddress.c diff --git a/src/revolution/os/OSAlarm.c b/libs/revolution/src/os/OSAlarm.c similarity index 100% rename from src/revolution/os/OSAlarm.c rename to libs/revolution/src/os/OSAlarm.c diff --git a/src/revolution/os/OSAlloc.c b/libs/revolution/src/os/OSAlloc.c similarity index 100% rename from src/revolution/os/OSAlloc.c rename to libs/revolution/src/os/OSAlloc.c diff --git a/src/revolution/os/OSArena.c b/libs/revolution/src/os/OSArena.c similarity index 100% rename from src/revolution/os/OSArena.c rename to libs/revolution/src/os/OSArena.c diff --git a/src/revolution/os/OSAudioSystem.c b/libs/revolution/src/os/OSAudioSystem.c similarity index 100% rename from src/revolution/os/OSAudioSystem.c rename to libs/revolution/src/os/OSAudioSystem.c diff --git a/src/revolution/os/OSCache.c b/libs/revolution/src/os/OSCache.c similarity index 100% rename from src/revolution/os/OSCache.c rename to libs/revolution/src/os/OSCache.c diff --git a/src/revolution/os/OSContext.c b/libs/revolution/src/os/OSContext.c similarity index 100% rename from src/revolution/os/OSContext.c rename to libs/revolution/src/os/OSContext.c diff --git a/src/revolution/os/OSError.c b/libs/revolution/src/os/OSError.c similarity index 100% rename from src/revolution/os/OSError.c rename to libs/revolution/src/os/OSError.c diff --git a/src/revolution/os/OSExec.c b/libs/revolution/src/os/OSExec.c similarity index 100% rename from src/revolution/os/OSExec.c rename to libs/revolution/src/os/OSExec.c diff --git a/src/revolution/os/OSFatal.c b/libs/revolution/src/os/OSFatal.c similarity index 100% rename from src/revolution/os/OSFatal.c rename to libs/revolution/src/os/OSFatal.c diff --git a/src/revolution/os/OSFont.c b/libs/revolution/src/os/OSFont.c similarity index 100% rename from src/revolution/os/OSFont.c rename to libs/revolution/src/os/OSFont.c diff --git a/src/revolution/os/OSInterrupt.c b/libs/revolution/src/os/OSInterrupt.c similarity index 100% rename from src/revolution/os/OSInterrupt.c rename to libs/revolution/src/os/OSInterrupt.c diff --git a/src/revolution/os/OSIpc.c b/libs/revolution/src/os/OSIpc.c similarity index 100% rename from src/revolution/os/OSIpc.c rename to libs/revolution/src/os/OSIpc.c diff --git a/src/revolution/os/OSLaunch.c b/libs/revolution/src/os/OSLaunch.c similarity index 100% rename from src/revolution/os/OSLaunch.c rename to libs/revolution/src/os/OSLaunch.c diff --git a/src/revolution/os/OSLink.c b/libs/revolution/src/os/OSLink.c similarity index 100% rename from src/revolution/os/OSLink.c rename to libs/revolution/src/os/OSLink.c diff --git a/src/revolution/os/OSMemory.c b/libs/revolution/src/os/OSMemory.c similarity index 100% rename from src/revolution/os/OSMemory.c rename to libs/revolution/src/os/OSMemory.c diff --git a/src/revolution/os/OSMessage.c b/libs/revolution/src/os/OSMessage.c similarity index 100% rename from src/revolution/os/OSMessage.c rename to libs/revolution/src/os/OSMessage.c diff --git a/src/revolution/os/OSMutex.c b/libs/revolution/src/os/OSMutex.c similarity index 100% rename from src/revolution/os/OSMutex.c rename to libs/revolution/src/os/OSMutex.c diff --git a/src/revolution/os/OSNandbootInfo.c b/libs/revolution/src/os/OSNandbootInfo.c similarity index 100% rename from src/revolution/os/OSNandbootInfo.c rename to libs/revolution/src/os/OSNandbootInfo.c diff --git a/src/revolution/os/OSNet.c b/libs/revolution/src/os/OSNet.c similarity index 100% rename from src/revolution/os/OSNet.c rename to libs/revolution/src/os/OSNet.c diff --git a/src/revolution/os/OSPlayRecord.c b/libs/revolution/src/os/OSPlayRecord.c similarity index 100% rename from src/revolution/os/OSPlayRecord.c rename to libs/revolution/src/os/OSPlayRecord.c diff --git a/src/revolution/os/OSPlayTime.c b/libs/revolution/src/os/OSPlayTime.c similarity index 100% rename from src/revolution/os/OSPlayTime.c rename to libs/revolution/src/os/OSPlayTime.c diff --git a/src/revolution/os/OSReboot.c b/libs/revolution/src/os/OSReboot.c similarity index 100% rename from src/revolution/os/OSReboot.c rename to libs/revolution/src/os/OSReboot.c diff --git a/src/revolution/os/OSReset.c b/libs/revolution/src/os/OSReset.c similarity index 100% rename from src/revolution/os/OSReset.c rename to libs/revolution/src/os/OSReset.c diff --git a/src/revolution/os/OSRtc.c b/libs/revolution/src/os/OSRtc.c similarity index 100% rename from src/revolution/os/OSRtc.c rename to libs/revolution/src/os/OSRtc.c diff --git a/src/revolution/os/OSStateFlags.c b/libs/revolution/src/os/OSStateFlags.c similarity index 100% rename from src/revolution/os/OSStateFlags.c rename to libs/revolution/src/os/OSStateFlags.c diff --git a/src/revolution/os/OSStateTM.c b/libs/revolution/src/os/OSStateTM.c similarity index 100% rename from src/revolution/os/OSStateTM.c rename to libs/revolution/src/os/OSStateTM.c diff --git a/src/revolution/os/OSStopwatch.c b/libs/revolution/src/os/OSStopwatch.c similarity index 100% rename from src/revolution/os/OSStopwatch.c rename to libs/revolution/src/os/OSStopwatch.c diff --git a/src/revolution/os/OSSync.c b/libs/revolution/src/os/OSSync.c similarity index 100% rename from src/revolution/os/OSSync.c rename to libs/revolution/src/os/OSSync.c diff --git a/src/revolution/os/OSThread.c b/libs/revolution/src/os/OSThread.c similarity index 100% rename from src/revolution/os/OSThread.c rename to libs/revolution/src/os/OSThread.c diff --git a/src/revolution/os/OSTime.c b/libs/revolution/src/os/OSTime.c similarity index 100% rename from src/revolution/os/OSTime.c rename to libs/revolution/src/os/OSTime.c diff --git a/src/revolution/os/OSUtf.c b/libs/revolution/src/os/OSUtf.c similarity index 100% rename from src/revolution/os/OSUtf.c rename to libs/revolution/src/os/OSUtf.c diff --git a/src/revolution/os/__os.h b/libs/revolution/src/os/__os.h similarity index 100% rename from src/revolution/os/__os.h rename to libs/revolution/src/os/__os.h diff --git a/src/revolution/os/__ppc_eabi_init.cpp b/libs/revolution/src/os/__ppc_eabi_init.cpp similarity index 100% rename from src/revolution/os/__ppc_eabi_init.cpp rename to libs/revolution/src/os/__ppc_eabi_init.cpp diff --git a/src/revolution/os/__start.c b/libs/revolution/src/os/__start.c similarity index 100% rename from src/revolution/os/__start.c rename to libs/revolution/src/os/__start.c diff --git a/src/revolution/pad/Pad.c b/libs/revolution/src/pad/Pad.c similarity index 99% rename from src/revolution/pad/Pad.c rename to libs/revolution/src/pad/Pad.c index 1dcc38c52b5..b20da7bb148 100644 --- a/src/revolution/pad/Pad.c +++ b/libs/revolution/src/pad/Pad.c @@ -5,7 +5,7 @@ #include #include "__si.h" -#include "revolution/vi/__vi.h" +#include "__vi.h" #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAX(a, b) ((a) > (b) ? (a) : (b)) diff --git a/src/revolution/pad/Padclamp.c b/libs/revolution/src/pad/Padclamp.c similarity index 100% rename from src/revolution/pad/Padclamp.c rename to libs/revolution/src/pad/Padclamp.c diff --git a/src/revolution/sc/scapi.c b/libs/revolution/src/sc/scapi.c similarity index 100% rename from src/revolution/sc/scapi.c rename to libs/revolution/src/sc/scapi.c diff --git a/src/revolution/sc/scapi_prdinfo.c b/libs/revolution/src/sc/scapi_prdinfo.c similarity index 100% rename from src/revolution/sc/scapi_prdinfo.c rename to libs/revolution/src/sc/scapi_prdinfo.c diff --git a/src/revolution/sc/scsystem.c b/libs/revolution/src/sc/scsystem.c similarity index 100% rename from src/revolution/sc/scsystem.c rename to libs/revolution/src/sc/scsystem.c diff --git a/src/revolution/si/SIBios.c b/libs/revolution/src/si/SIBios.c similarity index 100% rename from src/revolution/si/SIBios.c rename to libs/revolution/src/si/SIBios.c diff --git a/src/revolution/si/SISamplingRate.c b/libs/revolution/src/si/SISamplingRate.c similarity index 100% rename from src/revolution/si/SISamplingRate.c rename to libs/revolution/src/si/SISamplingRate.c diff --git a/src/revolution/si/__si.h b/libs/revolution/src/si/__si.h similarity index 100% rename from src/revolution/si/__si.h rename to libs/revolution/src/si/__si.h diff --git a/src/revolution/tpl/TPL.c b/libs/revolution/src/tpl/TPL.c similarity index 100% rename from src/revolution/tpl/TPL.c rename to libs/revolution/src/tpl/TPL.c diff --git a/src/revolution/usb/__usb.h b/libs/revolution/src/usb/__usb.h similarity index 100% rename from src/revolution/usb/__usb.h rename to libs/revolution/src/usb/__usb.h diff --git a/src/revolution/usb/usb.c b/libs/revolution/src/usb/usb.c similarity index 99% rename from src/revolution/usb/usb.c rename to libs/revolution/src/usb/usb.c index 822171d5104..4f25d1aaf21 100644 --- a/src/revolution/usb/usb.c +++ b/libs/revolution/src/usb/usb.c @@ -1,5 +1,4 @@ #include -#include #include #include @@ -10,6 +9,8 @@ #include #include +#include "__usb.h" + #if SDK_AUG2010 #define IPC_ARENA_SIZE 0x4000 #else diff --git a/src/revolution/vi/__vi.h b/libs/revolution/src/vi/__vi.h similarity index 100% rename from src/revolution/vi/__vi.h rename to libs/revolution/src/vi/__vi.h diff --git a/src/revolution/vi/i2c.c b/libs/revolution/src/vi/i2c.c similarity index 100% rename from src/revolution/vi/i2c.c rename to libs/revolution/src/vi/i2c.c diff --git a/src/revolution/vi/vi.c b/libs/revolution/src/vi/vi.c similarity index 100% rename from src/revolution/vi/vi.c rename to libs/revolution/src/vi/vi.c diff --git a/src/revolution/vi/vi3in1.c b/libs/revolution/src/vi/vi3in1.c similarity index 100% rename from src/revolution/vi/vi3in1.c rename to libs/revolution/src/vi/vi3in1.c diff --git a/src/revolution/wenc/wenc.c b/libs/revolution/src/wenc/wenc.c similarity index 100% rename from src/revolution/wenc/wenc.c rename to libs/revolution/src/wenc/wenc.c diff --git a/src/revolution/wpad/WPAD.c b/libs/revolution/src/wpad/WPAD.c similarity index 99% rename from src/revolution/wpad/WPAD.c rename to libs/revolution/src/wpad/WPAD.c index 31a40e1ab8d..20e7509da37 100644 --- a/src/revolution/wpad/WPAD.c +++ b/libs/revolution/src/wpad/WPAD.c @@ -1,15 +1,16 @@ #include -#include #include #include #include #include #include -#include #include #include +#include "__wpad.h" +#include "__wud.h" + extern volatile BOOL __OSIsReturnToIdle; //TODO: this apparently should be aligned to 32 bytes, but diff --git a/src/revolution/wpad/WPADEncrypt.c b/libs/revolution/src/wpad/WPADEncrypt.c similarity index 99% rename from src/revolution/wpad/WPADEncrypt.c rename to libs/revolution/src/wpad/WPADEncrypt.c index 9852cc61624..d910e806367 100644 --- a/src/revolution/wpad/WPADEncrypt.c +++ b/libs/revolution/src/wpad/WPADEncrypt.c @@ -1,4 +1,4 @@ -#include +#include "__wpad.h" #include "cstring" diff --git a/src/revolution/wpad/WPADHIDParser.c b/libs/revolution/src/wpad/WPADHIDParser.c similarity index 99% rename from src/revolution/wpad/WPADHIDParser.c rename to libs/revolution/src/wpad/WPADHIDParser.c index 4b8b774b7c3..b7d1339c48d 100644 --- a/src/revolution/wpad/WPADHIDParser.c +++ b/libs/revolution/src/wpad/WPADHIDParser.c @@ -1,7 +1,8 @@ #include -#include #include +#include "__wpad.h" + extern void DEBUGPrint(const char*, ...); void __a1_20_status_report(u8 chan, u8* data); diff --git a/src/revolution/wpad/WPADMem.c b/libs/revolution/src/wpad/WPADMem.c similarity index 57% rename from src/revolution/wpad/WPADMem.c rename to libs/revolution/src/wpad/WPADMem.c index efbcc8b9e5f..906cc50a058 100644 --- a/src/revolution/wpad/WPADMem.c +++ b/libs/revolution/src/wpad/WPADMem.c @@ -1,3 +1,3 @@ -#include +#include "__wpad.h" WPADMEMControlBlock _wmb[WPAD_MAX_CONTROLLERS]; diff --git a/src/revolution/wpad/__wpad.h b/libs/revolution/src/wpad/__wpad.h similarity index 100% rename from src/revolution/wpad/__wpad.h rename to libs/revolution/src/wpad/__wpad.h diff --git a/src/revolution/wpad/wpad_debug_msg.c b/libs/revolution/src/wpad/wpad_debug_msg.c similarity index 63% rename from src/revolution/wpad/wpad_debug_msg.c rename to libs/revolution/src/wpad/wpad_debug_msg.c index 2713ba81c9d..ae5f4982264 100644 --- a/src/revolution/wpad/wpad_debug_msg.c +++ b/libs/revolution/src/wpad/wpad_debug_msg.c @@ -1,4 +1,4 @@ -#include +#include "__wpad.h" void DEBUGPrint(const char* fmt, ...) { // NONMATCHING diff --git a/src/revolution/wud/WUD.c b/libs/revolution/src/wud/WUD.c similarity index 99% rename from src/revolution/wud/WUD.c rename to libs/revolution/src/wud/WUD.c index b6f70736991..72a2c9b60b9 100644 --- a/src/revolution/wud/WUD.c +++ b/libs/revolution/src/wud/WUD.c @@ -1,5 +1,4 @@ #include -#include #include #include @@ -10,6 +9,8 @@ #include #include +#include "__wud.h" + #define MAX(a, b) ((a) > (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define CLAMP(val, min, max) ((val) > (max) ? (max) : (val) < (min) ? (min) : (val)) diff --git a/src/revolution/wud/WUDHidHost.c b/libs/revolution/src/wud/WUDHidHost.c similarity index 99% rename from src/revolution/wud/WUDHidHost.c rename to libs/revolution/src/wud/WUDHidHost.c index aaae4d0aa2f..0eed6c623a3 100644 --- a/src/revolution/wud/WUDHidHost.c +++ b/libs/revolution/src/wud/WUDHidHost.c @@ -1,9 +1,10 @@ #include -#include #include #include #include +#include "__wud.h" + #define DEBUGPrint WUD_DEBUGPrint // TODO(kiwi) Is this from BTA? diff --git a/src/revolution/wud/__wud.h b/libs/revolution/src/wud/__wud.h similarity index 100% rename from src/revolution/wud/__wud.h rename to libs/revolution/src/wud/__wud.h diff --git a/src/revolution/wud/debug_msg.c b/libs/revolution/src/wud/debug_msg.c similarity index 74% rename from src/revolution/wud/debug_msg.c rename to libs/revolution/src/wud/debug_msg.c index 8e05cc0499b..470b33e68f7 100644 --- a/src/revolution/wud/debug_msg.c +++ b/libs/revolution/src/wud/debug_msg.c @@ -1,8 +1,7 @@ -#include +#include "__wud.h" #include void WUD_DEBUGPrint(const char* msg, ...) { va_list list; } - diff --git a/src/NdevExi2A/DebuggerDriver.c b/src/NdevExi2A/DebuggerDriver.c index 8bbc082f230..670de960db8 100644 --- a/src/NdevExi2A/DebuggerDriver.c +++ b/src/NdevExi2A/DebuggerDriver.c @@ -1,8 +1,8 @@ #include "NdevExi2A/DebuggerDriver.h" #include "NdevExi2A/exi2.h" -#include -#include +#include +#include static s32 __DBRecvDataSize; static u32 __DBRecvMail; diff --git a/src/SSystem/SComponent/c_list.cpp b/src/SSystem/SComponent/c_list.cpp index 57f49cec1a1..0f590a969a2 100644 --- a/src/SSystem/SComponent/c_list.cpp +++ b/src/SSystem/SComponent/c_list.cpp @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_list.h" #include "SSystem/SComponent/c_node.h" -#include +#include void cLs_Init(node_list_class* list) { list->mpHead = NULL; diff --git a/src/SSystem/SComponent/c_list_iter.cpp b/src/SSystem/SComponent/c_list_iter.cpp index 077840f8383..be97b39c0bd 100644 --- a/src/SSystem/SComponent/c_list_iter.cpp +++ b/src/SSystem/SComponent/c_list_iter.cpp @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_list_iter.h" #include "SSystem/SComponent/c_list.h" -#include +#include int cLsIt_Method(node_list_class* list, cNdIt_MethodFunc method, void* data) { if (list->mSize > 0) diff --git a/src/SSystem/SComponent/c_node.cpp b/src/SSystem/SComponent/c_node.cpp index a1957273ef6..f23b7b3371e 100644 --- a/src/SSystem/SComponent/c_node.cpp +++ b/src/SSystem/SComponent/c_node.cpp @@ -4,7 +4,7 @@ */ #include "SSystem/SComponent/c_node.h" -#include +#include void cNd_Join(node_class* node_a, node_class* node_b) { node_a->mpNextNode = node_b; diff --git a/src/SSystem/SComponent/c_node_iter.cpp b/src/SSystem/SComponent/c_node_iter.cpp index a26b6a17432..5eeb939ad40 100644 --- a/src/SSystem/SComponent/c_node_iter.cpp +++ b/src/SSystem/SComponent/c_node_iter.cpp @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_node_iter.h" #include "SSystem/SComponent/c_node.h" -#include +#include int cNdIt_Method(node_class* node, cNdIt_MethodFunc method, void* data) { int ret = 1; diff --git a/src/SSystem/SComponent/c_tree_iter.cpp b/src/SSystem/SComponent/c_tree_iter.cpp index f7ffabf4c71..9446dbd52c6 100644 --- a/src/SSystem/SComponent/c_tree_iter.cpp +++ b/src/SSystem/SComponent/c_tree_iter.cpp @@ -7,7 +7,7 @@ #include "SSystem/SComponent/c_list.h" #include "SSystem/SComponent/c_list_iter.h" #include "SSystem/SComponent/c_tree.h" -#include +#include int cTrIt_Method(node_lists_tree_class* tree, cNdIt_MethodFunc method, void* data) { node_list_class* list = tree->mpLists; diff --git a/src/amcstubs/AmcExi2Stubs.c b/src/amcstubs/AmcExi2Stubs.c index dcb3b944f70..a036e57a0d0 100644 --- a/src/amcstubs/AmcExi2Stubs.c +++ b/src/amcstubs/AmcExi2Stubs.c @@ -3,7 +3,7 @@ * Description: */ -#include +#include void EXI2_Init(vu8**, EXICallback) {} diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 599a69d4524..062aaa975ea 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_bg_obj.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include -#include +#include #include #include "d/actor/d_a_set_bgobj.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index 8244ee8446c..1830791f66f 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -15,7 +15,7 @@ #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" #include "d/d_timer.h" -#include +#include #include #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera_mng.h" diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index a16544f2041..da094293f16 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -4,7 +4,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep -#include +#include #include "d/actor/d_a_e_oct_bg.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index 35cd34d8cfd..13b86985229 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -10,8 +10,8 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include -#include +#include +#include #include "m_Do/m_Do_lib.h" static BOOL daMirror_c_createHeap(fopAc_ac_c* i_this) { diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 4e501fcb670..35879aa9cd0 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -18,7 +18,7 @@ #include "d/d_msg_object.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_camera_mng.h" -#include +#include #include daNpc_Maro_c::actionFunc dummy_lit_3931() { diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 8143b8c1afd..f57c4c34a7a 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_npc_wrestler.h" #include "d/d_timer.h" -#include +#include #include #include "d/actor/d_a_tag_arena.h" #include "d/actor/d_a_npc_gra.h" diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index 131ccf39e16..d646637bbfa 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -19,7 +19,7 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -#include +#include #include daObj_Maki_HIO_c::daObj_Maki_HIO_c() { diff --git a/src/d/actor/d_a_obj_nameplate.cpp b/src/d/actor/d_a_obj_nameplate.cpp index fc9e9074abb..586d6451a1b 100644 --- a/src/d/actor/d_a_obj_nameplate.cpp +++ b/src/d/actor/d_a_obj_nameplate.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_nameplate.h" #include "d/actor/d_a_alink.h" #include "d/d_a_obj.h" -#include +#include #include "f_op/f_op_actor.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index fcf5bf8107a..b29714116e1 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -6,7 +6,7 @@ #include "d/actor/d_a_obj_smtile.h" #include "d/actor/d_a_tag_evtarea.h" #include "d/actor/d_a_tag_kmsg.h" -#include +#include #include #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg.h" diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp index 5a1c51639f8..bdbd66e1980 100644 --- a/src/d/actor/d_a_obj_wind_stone.cpp +++ b/src/d/actor/d_a_obj_wind_stone.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_wind_stone.h" #include "d/actor/d_a_alink.h" #include "d/d_meter2_info.h" -#include +#include static int daWindStone_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc index b78ccd81123..230b3386ed6 100644 --- a/src/d/actor/d_grass.inc +++ b/src/d/actor/d_grass.inc @@ -5,7 +5,7 @@ #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "SSystem/SComponent/c_lib.h" #include "f_op/f_op_overlap_mng.h" -#include +#include #include #include "d/d_camera.h" diff --git a/src/d/d_com_inf_actor.cpp b/src/d/d_com_inf_actor.cpp index e9f7bd97f9e..772ad8542a6 100644 --- a/src/d/d_com_inf_actor.cpp +++ b/src/d/d_com_inf_actor.cpp @@ -6,7 +6,7 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_com_inf_actor.h" -#include +#include dComIfAc_info_c g_dComIfAc_gameInfo = { 0, // field_0x0 diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 8ac0947461e..bdc92e3cb47 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -1,8 +1,12 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kankyo.h" -#include -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif +#include #include "JSystem/JHostIO/JORFile.h" #include "JSystem/JHostIO/JORServer.h" diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index 0cdfcde90b9..6536067bcf5 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -27,7 +27,7 @@ #include "d/d_item.h" #include "d/d_lib.h" #include "d/d_meter2_info.h" -#include +#include #include #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_mtx.h" diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index 2cb342c37d1..efb35e6d503 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -10,7 +10,7 @@ #include "d/d_meter2_info.h" #include "d/d_meter_HIO.h" #include "d/d_msg_string.h" -#include +#include #include #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index cc34f26938f..32762905d98 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -4,7 +4,7 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/JKernel/JKRMemArchive.h" #include "d/d_com_inf_game.h" @@ -18,7 +18,7 @@ #include "d/d_meter_haihai.h" #include "d/d_msg_string.h" #include "d/d_select_cursor.h" -#include +#include #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index 4d4c7784aee..34c8644b5c3 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -9,7 +9,11 @@ #include "f_pc/f_pc_manager.h" #include "f_pc/f_pc_debug_sv.h" #include "SSystem/SComponent/c_phase.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif typedef struct standard_create_request_class { /* 0x00 */ create_request base; diff --git a/src/m_Do/m_Do_DVDError.cpp b/src/m_Do/m_Do_DVDError.cpp index d4884aeb1c3..0ada1ce24a6 100644 --- a/src/m_Do/m_Do_DVDError.cpp +++ b/src/m_Do/m_Do_DVDError.cpp @@ -5,7 +5,7 @@ #include "m_Do/m_Do_DVDError.h" #include "JSystem/JKernel/JKRAssertHeap.h" -#include +#include #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_Reset.h" diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp index 29c72ac1876..7832906589f 100644 --- a/src/m_Do/m_Do_MemCard.cpp +++ b/src/m_Do/m_Do_MemCard.cpp @@ -3,7 +3,7 @@ * Memory Card Control */ -#include +#include #include "m_Do/m_Do_MemCard.h" #include "JSystem/JKernel/JKRAssertHeap.h" #include "m_Do/m_Do_ext.h" diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp index e2a062d2049..88f840bbcd5 100644 --- a/src/m_Do/m_Do_Reset.cpp +++ b/src/m_Do/m_Do_Reset.cpp @@ -8,7 +8,7 @@ #include "JSystem/JUtility/JUTGamePad.h" #include "JSystem/JUtility/JUTXfb.h" #include "SSystem/SComponent/c_API_controller_pad.h" -#include +#include #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_DVDError.h" #include "m_Do/m_Do_ext.h" diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 26f86522117..b0d2a8a8213 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -5,8 +5,8 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include -#include +#include +#include #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 5fab98666f5..1d0537599b0 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -20,7 +20,7 @@ #include "d/d_menu_collect.h" #include "d/d_jcam_editor.h" #include "d/d_jpreviewer.h" -#include +#include #include "f_ap/f_ap_game.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_controller_pad.h" diff --git a/src/m_Do/m_Do_hostIO.cpp b/src/m_Do/m_Do_hostIO.cpp index 286a9421104..6a3347efb55 100644 --- a/src/m_Do/m_Do_hostIO.cpp +++ b/src/m_Do/m_Do_hostIO.cpp @@ -1,6 +1,10 @@ #include "m_Do/m_Do_hostIO.h" #include "JSystem/JHostIO/JORServer.h" -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif #if DEBUG diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp index 292a10869a0..18b33c23bae 100644 --- a/src/m_Do/m_Do_lib.cpp +++ b/src/m_Do/m_Do_lib.cpp @@ -8,7 +8,7 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -#include +#include u32 mDoLib_setResTimgObj(ResTIMG const* i_img, GXTexObj* o_texObj, u32 tlut_name, GXTlutObj* o_tlutObj) { diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index 154d54c737d..6c0f6193ca3 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -5,7 +5,7 @@ #include "m_Do/m_Do_printf.h" #include -#include +#include #include "m_Do/m_Do_ext.h" u8 __OSReport_disable; diff --git a/src/odemuexi2/DebuggerDriver.c b/src/odemuexi2/DebuggerDriver.c index 2102bb8e16d..d8821f5ce33 100644 --- a/src/odemuexi2/DebuggerDriver.c +++ b/src/odemuexi2/DebuggerDriver.c @@ -1,7 +1,7 @@ #include "odemuexi2/DebuggerDriver.h" -#include -#include +#include +#include static MTRCallbackType MTRCallback; diff --git a/src/odenotstub/odenotstub.c b/src/odenotstub/odenotstub.c index 48e09dbd05b..282962e911f 100644 --- a/src/odenotstub/odenotstub.c +++ b/src/odenotstub/odenotstub.c @@ -1,4 +1,8 @@ -#include +#ifdef __REVOLUTION_SDK__ +#include +#else +#include +#endif u8 Hu_IsStub() { return 0; diff --git a/tools/project.py b/tools/project.py index b1417ae69a8..f51482d98e9 100644 --- a/tools/project.py +++ b/tools/project.py @@ -68,6 +68,7 @@ def __init__(self, completed: bool, name: str, **options: Any) -> None: "shift_jis": None, "source": name, "src_dir": None, + "strip_prefix": None, } self.options.update(options) @@ -115,10 +116,13 @@ def check_category(category: str): # Resolve paths build_dir = config.out_path() - obj.src_path = Path(obj.options["src_dir"]) / obj.options["source"] + source = obj.options["source"] + if obj.options["strip_prefix"]: + source = source.removeprefix(obj.options["strip_prefix"]) + obj.src_path = Path(obj.options["src_dir"]) / source if obj.options["asm_dir"] is not None: obj.asm_path = ( - Path(obj.options["asm_dir"]) / obj.options["source"] + Path(obj.options["asm_dir"]) / source ).with_suffix(".s") base_name = Path(self.name).with_suffix("") obj.src_obj_path = build_dir / "src" / f"{base_name}.o" @@ -356,14 +360,13 @@ def make_flags_str(flags: Optional[List[str]]) -> str: return " ".join(flags) -def get_pch_out_name(config: ProjectConfig, pch: PrecompiledHeader) -> str: - pch_rel_path = Path(pch["source"]) - pch_out_name = pch_rel_path.with_suffix(".mch") +def get_pch_out_path(config: ProjectConfig, pch: PrecompiledHeader) -> str: + pch_rel_path = Path(pch["output"]) # Use absolute path as a workaround to allow this target to be matched with absolute paths in depfiles. # # Without this any object which includes the PCH would depend on the .mch filesystem entry but not the # corresponding Ninja task, so the MCH would not be implicitly rebuilt when the PCH is modified. - return os.path.abspath(config.out_path() / "include" / pch_out_name) + return os.path.abspath(config.out_path() / "include" / pch_rel_path) # Unit configuration @@ -863,7 +866,7 @@ def write_custom_step( # Add all build steps needed before we compile (e.g. processing assets) pch_out_names = [ - get_pch_out_name(config, pch) for pch in config.precompiled_headers or [] + get_pch_out_path(config, pch) for pch in config.precompiled_headers or [] ] write_custom_step("pre-compile", extra_inputs=pch_out_names) @@ -967,14 +970,12 @@ def write(self, n: ninja_syntax.Writer) -> None: if config.precompiled_headers: for pch in config.precompiled_headers: - src_path_rel_str = Path(pch["source"]) - src_path_rel = Path(src_path_rel_str) - pch_out_name = src_path_rel.with_suffix(".mch") - pch_out_abs_path = Path(get_pch_out_name(config, pch)) + src_path = Path(pch["source"]) + pch_out_abs_path = Path(get_pch_out_path(config, pch)) # Add appropriate language flag if it doesn't exist already cflags = pch["cflags"] if not any(flag.startswith("-lang") for flag in cflags): - if file_is_cpp(src_path_rel): + if file_is_cpp(src_path): cflags.insert(0, "-lang=c++") else: cflags.insert(0, "-lang=c") @@ -982,11 +983,11 @@ def write(self, n: ninja_syntax.Writer) -> None: cflags_str = make_flags_str(cflags) shift_jis = pch.get("shift_jis", config.shift_jis) - n.comment(f"Precompiled header {pch_out_name}") + n.comment(f"Precompiled header {pch['output']}") n.build( outputs=pch_out_abs_path, rule="mwcc_pch_sjis" if shift_jis else "mwcc_pch", - inputs=f"include/{src_path_rel_str}", + inputs=src_path, variables={ "mw_version": Path(pch["mw_version"]), "cflags": cflags_str, From 6c72b91f8e477ee94ccdc56b94605140e9f2abd6 Mon Sep 17 00:00:00 2001 From: qwertyquerty Date: Mon, 2 Mar 2026 16:29:07 -0800 Subject: [PATCH 16/35] JUTDataFileHeader (#3121) --- src/d/actor/d_a_alink.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 5f6bd7ca17d..cf2f1b47198 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -13904,8 +13904,8 @@ void daAlink_c::setBasAnime(daAlink_c::daAlink_UNDER i_underIdx) { initBasAnime(); } } else { - u8* temp_r3_2 = anmHeap->getBuffer(); - if (*(u32*)(temp_r3_2 + 0x1C) == 0xFFFFFFFF) { + JUTDataFileHeader* temp_r3_2 = (JUTDataFileHeader*)anmHeap->getBuffer(); + if (temp_r3_2->mSeAnmOffset == 0xFFFFFFFF) { resetBasAnime(); return; } @@ -13917,12 +13917,12 @@ void daAlink_c::setBasAnime(daAlink_c::daAlink_UNDER i_underIdx) { } } - u32 dataSize = *(u32*)(temp_r3_2 + 0x8) - *(u32*)(temp_r3_2 + 0x1C); + u32 dataSize = temp_r3_2->mFileSize - temp_r3_2->mSeAnmOffset; const u32 l_basAnmBufferSize = 0x800; JUT_ASSERT(20661, dataSize < l_basAnmBufferSize); - cLib_memCpy(field_0x2d78, anmHeap->getBuffer() + *(u32*)(temp_r3_2 + 0x1C), dataSize); + cLib_memCpy(field_0x2d78, anmHeap->getBuffer() + temp_r3_2->mSeAnmOffset, dataSize); field_0x2d7c = framectrl; field_0x3084 = anmHeap->getIdx(); field_0x3086 = anmHeap->getArcNo(); From 9f590ae4e38a94128b2becc0c14c87eba7e602f9 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 5 Mar 2026 11:24:14 -0700 Subject: [PATCH 17/35] checkpoint --- .vscode/launch.json | 18 +- configure.py | 55 +++-- src/umbra/umbra_gdb.cpp | 200 +++++++++++------ tools/gen_dwarf2_debug.py | 429 ++++++++++++++++++++++++++++++++++++ tools/gen_gdb_rel_loader.py | 116 +++++++++- 5 files changed, 727 insertions(+), 91 deletions(-) create mode 100644 tools/gen_dwarf2_debug.py diff --git a/.vscode/launch.json b/.vscode/launch.json index 12294c81e01..40db1564d11 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,8 +9,16 @@ "cwd": "${workspaceFolder}", "MIMode": "gdb", "miDebuggerPath": "/opt/devkitpro/devkitPPC/bin/powerpc-eabi-gdb", - "miDebuggerServerAddress": "192.168.86.208:2159", + "miDebuggerServerAddress": "${input:wiiAddress}:2159", "stopAtConnect": true, + "logging": { + "engineLogging": false, + "traceResponse": false + }, + "symbolLoadInfo": { + "loadAll": true, + "exceptionList": "" + }, "setupCommands": [ { "text": "set confirm off", @@ -28,5 +36,13 @@ } ] } + ], + "inputs": [ + { + "id": "wiiAddress", + "type": "promptString", + "description": "Wii IP address", + "default": "192.168.1.100" + } ] } diff --git a/configure.py b/configure.py index a9452d43647..32a3ffb7c39 100755 --- a/configure.py +++ b/configure.py @@ -223,7 +223,7 @@ config.dtk_tag = "v1.8.0" config.objdiff_tag = "v3.6.1" config.sjiswrap_tag = "v1.2.2" -config.wibo_tag = "1.0.0" +config.wibo_tag = "1.0.3" # Project config.config_path = Path("config") / config.version / "config.yml" @@ -239,12 +239,9 @@ config.ldflags = [ "-fp hardware", "-nodefaults", + "-mapunused", ] -if args.debug: - config.ldflags.append("-g") # Or -gdwarf-2 for Wii linkers -if args.map: - config.ldflags.append("-mapunused") - # config.ldflags.append("-listclosure") # For Wii linkers +# config.ldflags.append("-listclosure") # For Wii linkers # Use for any additional files that should cause a re-configure when modified config.reconfig_deps = [] @@ -317,7 +314,7 @@ # Debug flags if args.debug: - # Or -sym dwarf-2 for Wii compilers + # Or -sym on for Wii compilers cflags_base.extend(["-sym on", "-DDEBUG=1"]) elif config.version == "ShieldD": cflags_base.extend(["-DDEBUG=1"]) @@ -3075,19 +3072,35 @@ def link_order_callback(module_id: int, objects: List[str]) -> List[str]: }) # Generate GDB REL symbol loader script after all PLFs are linked -if config.non_matching: - gdb_loader_out = f"build/{version}/load_rel_symbols.gdb" - config.custom_build_rules.append({ - "name": "gen_gdb_rel_loader", - "command": f"$python tools/gen_gdb_rel_loader.py build/{version}", - "description": "GDB REL LOADER $out", - }) - config.custom_build_steps.setdefault("post-build", []).append({ - "outputs": gdb_loader_out, - "rule": "gen_gdb_rel_loader", - "inputs": [f"build/{version}/config.json"], - "implicit": ["tools/gen_gdb_rel_loader.py"], - }) +gdb_loader_out = f"build/{version}/load_rel_symbols.gdb" +config.custom_build_rules.append({ + "name": "gen_gdb_rel_loader", + "command": f"$python tools/gen_gdb_rel_loader.py build/{version}", + "description": "GDB REL LOADER $out", +}) +config.custom_build_steps.setdefault("post-build", []).append({ + "outputs": gdb_loader_out, + "rule": "gen_gdb_rel_loader", + "inputs": [f"build/{version}/config.json"], + "implicit": ["tools/gen_gdb_rel_loader.py"], +}) + +# Generate DWARF 2 debug info from DWARF 1 .o files after link +debug_info_out = f"build/{version}/debug_info.o" +config.custom_build_rules.append({ + "name": "gen_dwarf2_debug", + "command": f"$python tools/gen_dwarf2_debug.py build/{version}", + "description": "DWARF2 DEBUG $out", +}) +config.custom_build_steps.setdefault("post-build", []).append({ + "outputs": debug_info_out, + "rule": "gen_dwarf2_debug", + "inputs": [f"build/{version}/framework.elf.MAP"], + "implicit": [ + f"build/{version}/framework.elf", + "tools/gen_dwarf2_debug.py", + ], +}) # Optional extra categories for progress tracking config.progress_categories = [ @@ -3143,7 +3156,7 @@ def link_order_callback(module_id: int, objects: List[str]) -> List[str]: build {assets_stamp}: mod_assets_checksum | always # Rebuild ISO -build {output_iso}: rebuild_iso | {dol_output} {rel_output} tools/rebuild-decomp-tp.py {assets_stamp} +build {output_iso}: rebuild_iso | {dol_output} {rel_output} tools/rebuild-decomp-tp.py {assets_stamp} || post-build """ # Add phony always target if not already present diff --git a/src/umbra/umbra_gdb.cpp b/src/umbra/umbra_gdb.cpp index b4a18f7c6f4..90424b8b75e 100644 --- a/src/umbra/umbra_gdb.cpp +++ b/src/umbra/umbra_gdb.cpp @@ -19,7 +19,7 @@ extern "C" { /* Must match kernel/gdb.h */ -#define GDB_SHM_BASE ((volatile u32*)0x93003600) +#define GDB_SHM_BASE ((volatile u32*)0xD3003600) /* uncached MEM2 mirror */ #define GDB_SHM_SIZE 512 #define GDB_SHM_MAGIC 0x47444253 /* "GDBS" */ @@ -44,11 +44,15 @@ extern "C" { #define SHM_FPR_BYTE_OFF 0x0A8 #define SHM_FPSCR_BYTE_OFF 0x1A8 #define SHM_HALT_REQ 108 +#define SHM_PPC_HEARTBEAT 109 +#define SHM_PPC_HALT_SEEN 110 +#define SHM_EXIT_REQ 111 +#define SHM_IC_INVAL_CNT 112 /* 0x1C0 / 4 */ +#define SHM_IC_INVAL_ADDR 113 /* 0x1C4 / 4, array of up to 8 addrs */ #define MSR_SE (1 << 10) -#define SI_C0INBUFH (*(volatile u32*)0xCC006404) -#define PAD_TRIGGER_Z 0x0010 +static void do_game_exit(void); static u32 exception_to_signal(u32 exception_id) { switch (exception_id & 0xFFFF) { @@ -80,11 +84,26 @@ static const char* exception_name(u32 exception_id) { } } -/* Reads SI hardware directly — works in exception context */ -static bool read_z_button(void) { - u32 data0 = SI_C0INBUFH; - u16 buttons = (u16)(data0 >> 16); - return (buttons & PAD_TRIGGER_Z) != 0; +/* Process ARM's I-cache invalidation queue. + * ARM writes instructions directly to physical memory, bypassing all PPC + * caches. To make the new instruction visible to the I-pipeline: + * 1. DCInvalidateRange (dcbi) — discard any stale D-cache line for the + * address. On 750CL the L2 is unified; a dirty D-cache castout could + * refill L2 with old data that shadows what ARM wrote to DRAM. + * 2. ICInvalidateRange (icbi) — invalidate both L1 I-cache AND L2 for + * the address, forcing the next I-fetch to go all the way to DRAM. */ +static void process_ic_inval(void) { + u32 cnt = GDB_SHM_BASE[SHM_IC_INVAL_CNT]; + if (cnt == 0) + return; + if (cnt > 8) + cnt = 8; + for (u32 i = 0; i < cnt; i++) { + u32 addr = GDB_SHM_BASE[SHM_IC_INVAL_ADDR + i]; + DCInvalidateRange((void*)addr, 32); + ICInvalidateRange((void*)addr, 4); + } + GDB_SHM_BASE[SHM_IC_INVAL_CNT] = 0; } static int start_gdb_server(u16 port) { @@ -116,6 +135,9 @@ static int start_gdb_server(u16 port) { static __OSExceptionHandler old_handlers[__OS_EXCEPTION_MAX]; +/* Forward declaration — C implementation called from asm crash handler stub */ +extern "C" void crash_handler_impl(__OSException exception, OSContext* ctx); + static void save_ctx_to_shm(OSContext* ctx, u32 exc_vector) { for (int i = 0; i < 32; i++) GDB_SHM_BASE[SHM_GPR_BASE + i] = ctx->gpr[i]; @@ -163,7 +185,26 @@ static void restore_shm_to_ctx(OSContext* ctx, u32 state) { ctx->fpscr = (u32)*fpscr_shm; } -static void umbra_gdb_crash_handler(__OSException exception, OSContext* ctx) { +/* Assembly crash handler entry point. + * The OS exception dispatch (OS.c __OSEVStart) saves only r3-r5, CR, LR, + * CTR, XER, SRR0, SRR1 to the context. ALL other GPRs (r0, r1, r2, r6-r31) + * and GQRs still hold the interrupted program's values and MUST be saved + * before any C code runs — C function prologues immediately clobber r0 + * (mflr r0) and r1 (stwu r1, -N(r1)). + * + * This follows the exact SDK pattern used by DecrementerExceptionHandler, + * ExternalInterruptHandler, and OSDefaultExceptionHandler. */ +static asm void umbra_gdb_crash_handler(__REGISTER __OSException exception, + __REGISTER OSContext* ctx) { + nofralloc + OS_EXCEPTION_SAVE_GPRS(ctx) + stwu r1, -8(r1) + b crash_handler_impl + /* crash_handler_impl calls OSLoadContext and never returns */ +} + +/* C implementation of the crash handler — entered with full context saved. */ +extern "C" void crash_handler_impl(__OSException exception, OSContext* ctx) { u32 exc_vector = ((u32)exception + 1) * 0x100; OSReport("tpgz: exception 0x%04X (%s) at PC=0x%08X LR=0x%08X\n", @@ -175,53 +216,65 @@ static void umbra_gdb_crash_handler(__OSException exception, OSContext* ctx) { OSReport("tpgz: gdbserver listening on port 2159\n"); if (old_handlers[exception]) old_handlers[exception](exception, ctx); - return; + OSLoadContext(ctx); } - int server_err = start_gdb_server(2159); - OSReport("tpgz: gdbserver start result=%d\n", server_err); - - if (server_err != 0) { - OSReport("tpgz: gdb server failed to start\n"); - if (old_handlers[exception]) - old_handlers[exception](exception, ctx); - return; + /* Only start the GDB server if it's not already running. Avoid EXI + * transfers from exception context when possible — they can leave + * the bus in an inconsistent state for the game. */ + if (GDB_SHM_BASE[SHM_MAGIC] != GDB_SHM_MAGIC) { + int server_err = start_gdb_server(2159); + OSReport("tpgz: gdbserver start result=%d\n", server_err); + + if (server_err != 0) { + OSReport("tpgz: gdb server failed to start\n"); + if (old_handlers[exception]) + old_handlers[exception](exception, ctx); + OSLoadContext(ctx); + } } for (int wait = 0; wait < 500000000; wait++) { - DCInvalidateRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); if (GDB_SHM_BASE[SHM_MAGIC] == GDB_SHM_MAGIC) { save_ctx_to_shm(ctx, exc_vector); GDB_SHM_BASE[SHM_STATE] = GDB_STATE_STOPPED; - DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); OSReport("tpgz: gdb shm ready, waiting for debugger\n"); + AIStopDMA(); + while (1) { - DCInvalidateRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); u32 state = GDB_SHM_BASE[SHM_STATE]; if (state == GDB_STATE_RESUME || state == GDB_STATE_STEP) { restore_shm_to_ctx(ctx, state); + process_ic_inval(); + ICFlashInvalidate(); + AIStartDMA(); OSLoadContext(ctx); - } else if (state == GDB_STATE_DETACH) { - GDB_SHM_BASE[SHM_MAGIC] = 0; - DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); - OSLoadContext(ctx); + /* does not return */ } - - if (read_z_button()) { + else if (state == GDB_STATE_DETACH) { + u32 exit_req = GDB_SHM_BASE[SHM_EXIT_REQ]; + restore_shm_to_ctx(ctx, GDB_STATE_RESUME); GDB_SHM_BASE[SHM_MAGIC] = 0; - DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); - break; + process_ic_inval(); + ICFlashInvalidate(); + AIStartDMA(); + if (exit_req == 1) { + GDB_SHM_BASE[SHM_EXIT_REQ] = 0; + do_game_exit(); /* does not return */ + } + OSLoadContext(ctx); + /* does not return */ } } - break; } } OSReport("tpgz: gdb exiting crash handler\n"); if (old_handlers[exception]) old_handlers[exception](exception, ctx); + OSLoadContext(ctx); } static void arm_crash_gdb(u16 port) { @@ -254,6 +307,8 @@ extern "C" void umbra_gdb_install_crash_handlers(void) { __OS_EXCEPTION_DSI, __OS_EXCEPTION_ISI, __OS_EXCEPTION_ALIGNMENT, + __OS_EXCEPTION_PROGRAM, /* trap instructions (breakpoints) */ + __OS_EXCEPTION_TRACE, /* single-step (MSR_SE) */ /* NOT FLOATING_POINT — OS uses it for lazy FPU context switching */ }; @@ -317,27 +372,28 @@ static void restore_regs_from_shm(u32 state) { static void gdb_spin_wait(void) { while (1) { - DCInvalidateRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); u32 state = GDB_SHM_BASE[SHM_STATE]; if (state == GDB_STATE_RESUME || state == GDB_STATE_STEP) { restore_regs_from_shm(state); - ICFlashInvalidate(); /* ARM may have patched PPC code */ + process_ic_inval(); + ICFlashInvalidate(); TRKSwapAndGo(); } else if (state == GDB_STATE_DETACH) { + u32 exit_req = GDB_SHM_BASE[SHM_EXIT_REQ]; GDB_SHM_BASE[SHM_MAGIC] = 0; - DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + process_ic_inval(); ICFlashInvalidate(); + if (exit_req == 1) { + GDB_SHM_BASE[SHM_EXIT_REQ] = 0; + do_game_exit(); + } TRKSwapAndGo(); } } } -#define SHM_PPC_HEARTBEAT 109 -#define SHM_PPC_HALT_SEEN 110 -#define SHM_EXIT_REQ 111 - /* Uncached MEM2 mirror, shared with Nintendont kernel at 0x13003420 */ #define PPC_RESET_STATUS ((volatile u32*)0xD3003420) @@ -366,27 +422,42 @@ static void do_game_exit(void) { extern "C" void umbra_gdb_poll(void) { static u32 heartbeat = 0; - static bool auto_started = false; + static bool dbg_plat = false; + static bool dbg_magic = false; - if (!auto_started) { - auto_started = true; - start_gdb_server(2159); + /* SHM lives in uncached MEM2 (0xD3xxxxxx) — only exists on real Wii. + * GC games on Dolphin don't have MEM2 mapped; access will DSI. */ + if (!umbraIsNintendont()) { + if (!dbg_plat) { + dbg_plat = true; + OSReport("gdb_poll: not nintendont, skipping\n"); + } + return; } - DCInvalidateRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + u32 magic = GDB_SHM_BASE[SHM_MAGIC]; + if (magic != GDB_SHM_MAGIC) + return; + /* EXIT_REQ is checked after MAGIC to avoid reading uninitialized MEM2 + * before the GDB server has set up the SHM area. Kill while halted + * is handled directly by the DETACH handlers in each spin loop. */ if (GDB_SHM_BASE[SHM_EXIT_REQ] == 1) { GDB_SHM_BASE[SHM_EXIT_REQ] = 0; - DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); do_game_exit(); /* does not return */ } + u32 halt = GDB_SHM_BASE[SHM_HALT_REQ]; GDB_SHM_BASE[SHM_PPC_HEARTBEAT] = ++heartbeat; - GDB_SHM_BASE[SHM_PPC_HALT_SEEN] = GDB_SHM_BASE[SHM_HALT_REQ]; - DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + GDB_SHM_BASE[SHM_PPC_HALT_SEEN] = halt; - if (GDB_SHM_BASE[SHM_HALT_REQ] != 1) + if (halt != 1) { + if (heartbeat <= 3) + OSReport("gdb_poll: hb=%u halt=%u\n", heartbeat, halt); return; + } + + OSReport("gdb_poll: HALTING! hb=%u\n", heartbeat); OSContext ctx; OSSaveContext(&ctx); @@ -403,7 +474,6 @@ extern "C" void umbra_gdb_poll(void) { GDB_SHM_BASE[SHM_SIGNAL] = 2; /* SIGINT */ GDB_SHM_BASE[SHM_STATE] = GDB_STATE_STOPPED; GDB_SHM_BASE[SHM_HALT_REQ] = 0; - DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); /* Flush stack so ARM can read PPC memory via physical addresses */ DCFlushRange((void*)(sp & ~0x1F), 32 * 1024); @@ -411,39 +481,45 @@ extern "C" void umbra_gdb_poll(void) { AIStopDMA(); while (1) { - DCInvalidateRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); u32 state = GDB_SHM_BASE[SHM_STATE]; - if (state == GDB_STATE_RESUME || state == GDB_STATE_STEP) { - ICFlashInvalidate(); /* ARM may have patched PPC code */ + if (state == GDB_STATE_STEP) { + process_ic_inval(); + ICFlashInvalidate(); + AIStartDMA(); + /* Single-step: set MSR_SE and resume via OSLoadContext so the + * trace exception fires on the next instruction, which TRK + * catches and routes back to umbra_gdb_trk_hook. */ + ctx.srr1 |= MSR_SE; + OSLoadContext(&ctx); + /* does not return */ + } else if (state == GDB_STATE_RESUME) { + process_ic_inval(); + ICFlashInvalidate(); AIStartDMA(); return; } else if (state == GDB_STATE_DETACH) { + u32 exit_req = GDB_SHM_BASE[SHM_EXIT_REQ]; GDB_SHM_BASE[SHM_MAGIC] = 0; - DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); + process_ic_inval(); ICFlashInvalidate(); AIStartDMA(); + if (exit_req == 1) { + GDB_SHM_BASE[SHM_EXIT_REQ] = 0; + do_game_exit(); + } return; } - if (read_z_button()) { - GDB_SHM_BASE[SHM_HALT_REQ] = 0; - GDB_SHM_BASE[SHM_STATE] = GDB_STATE_RESUME; - DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); - ICFlashInvalidate(); - AIStartDMA(); - return; - } } } extern "C" void umbra_gdb_trk_hook(void) { - DCInvalidateRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); - + if (!umbraIsNintendont()) + return; if (GDB_SHM_BASE[SHM_MAGIC] == GDB_SHM_MAGIC) { save_regs_to_shm(); GDB_SHM_BASE[SHM_STATE] = GDB_STATE_STOPPED; - DCFlushRange((void*)GDB_SHM_BASE, GDB_SHM_SIZE); gdb_spin_wait(); /* does not return */ } } diff --git a/tools/gen_dwarf2_debug.py b/tools/gen_dwarf2_debug.py new file mode 100644 index 00000000000..879d9f7eeed --- /dev/null +++ b/tools/gen_dwarf2_debug.py @@ -0,0 +1,429 @@ +#!/usr/bin/env python3 +"""Convert DWARF 1 debug info from MW .o files into DWARF 2 assembly files. + +MW's mwcceppc emits DWARF 1.1 (.line/.debug sections) which GDB 8.2+ cannot +read. This script parses the DWARF 1 line info from each .o, cross-references +with the linker MAP to find per-object .text offsets, and emits .s files using +.file/.loc directives that powerpc-eabi-as assembles into DWARF 2 line tables. + +Processes both the DOL (framework.elf) and all REL modules. + +Usage: + python3 tools/gen_dwarf2_debug.py + # e.g. python3 tools/gen_dwarf2_debug.py build/GZ2E01 +""" + +import os +import re +import struct +import subprocess +import sys + +# DWARF 1 form sizes (low nibble of attr word) +FORM_SIZES = { + 0x1: 4, # FORM_ADDR + 0x2: 4, # FORM_REF + # 0x3: FORM_BLOCK2 — variable + # 0x4: FORM_BLOCK4 — variable + 0x5: 2, # FORM_DATA2 + 0x6: 4, # FORM_DATA4 + 0x7: 8, # FORM_DATA8 + # 0x8: FORM_STRING — variable (null-terminated) +} + +TAG_COMPILE_UNIT = 0x0011 +AT_NAME_WITH_STRING = 0x0038 # AT_name (0x0030) | FORM_STRING (0x8) + + +def read_elf_sections(path): + """Parse ELF section headers, return dict of {name: (offset, size, addr)}. + + Note: for duplicate section names (e.g. multiple .text), only the first + is returned. Use read_elf_sections_all() if you need all of them. + """ + sections = {} + with open(path, "rb") as f: + magic = f.read(4) + if magic != b"\x7fELF": + return sections + f.seek(0) + ehdr = f.read(52) + e_shoff = struct.unpack(">I", ehdr[32:36])[0] + e_shentsize = struct.unpack(">H", ehdr[46:48])[0] + e_shnum = struct.unpack(">H", ehdr[48:50])[0] + e_shstrndx = struct.unpack(">H", ehdr[50:52])[0] + + # Read shstrtab + f.seek(e_shoff + e_shstrndx * e_shentsize) + shdr = f.read(e_shentsize) + strtab_off = struct.unpack(">I", shdr[16:20])[0] + strtab_sz = struct.unpack(">I", shdr[20:24])[0] + f.seek(strtab_off) + strtab = f.read(strtab_sz) + + for i in range(e_shnum): + f.seek(e_shoff + i * e_shentsize) + shdr = f.read(e_shentsize) + name_idx = struct.unpack(">I", shdr[0:4])[0] + end = strtab.index(b"\x00", name_idx) + name = strtab[name_idx:end].decode("ascii", errors="replace") + sh_addr = struct.unpack(">I", shdr[12:16])[0] + sh_off = struct.unpack(">I", shdr[16:20])[0] + sh_size = struct.unpack(">I", shdr[20:24])[0] + if name and name not in sections: + sections[name] = (sh_off, sh_size, sh_addr) + return sections + + +def get_text_base(elf_path): + """Get the .text section virtual address from an ELF.""" + sections = read_elf_sections(elf_path) + if ".text" in sections: + return sections[".text"][2] # sh_addr + return None + + +def parse_dwarf1_source_name(f, debug_off, debug_size): + """Extract AT_name (source filename) from first compile_unit DIE.""" + f.seek(debug_off) + if debug_size < 6: + return None + + die_len = struct.unpack(">I", f.read(4))[0] + tag = struct.unpack(">H", f.read(2))[0] + if tag != TAG_COMPILE_UNIT: + return None + + die_end = debug_off + 4 + die_len + while f.tell() < die_end: + if f.tell() + 2 > die_end: + break + attr_word = struct.unpack(">H", f.read(2))[0] + if attr_word == 0: + break + + form = attr_word & 0xF + + if attr_word == AT_NAME_WITH_STRING: + # Read null-terminated string + chars = [] + while True: + c = f.read(1) + if c == b"\x00" or c == b"": + break + chars.append(c) + return b"".join(chars).decode("ascii", errors="replace") + + # Skip this attribute's value + if form == 0x8: # FORM_STRING + while True: + c = f.read(1) + if c == b"\x00" or c == b"": + break + elif form == 0x3: # FORM_BLOCK2 + blen = struct.unpack(">H", f.read(2))[0] + f.seek(blen, 1) + elif form == 0x4: # FORM_BLOCK4 + blen = struct.unpack(">I", f.read(4))[0] + f.seek(blen, 1) + elif form in FORM_SIZES: + f.seek(FORM_SIZES[form], 1) + else: + # Unknown form, bail + break + + return None + + +def parse_dwarf1_line(f, line_off, line_size): + """Parse DWARF 1 .line section (all sub-sections). + + MW objects with multiple .text sections have multiple sub-sections in .line, + each with its own header. Returns list of entry-lists, one per sub-section: + [[(line_number, pc_address), ...], ...] + """ + all_subsections = [] + if line_size < 8: + return all_subsections + + offset = 0 + while offset + 8 <= line_size: + f.seek(line_off + offset) + total_length = struct.unpack(">I", f.read(4))[0] + _base_address = struct.unpack(">I", f.read(4))[0] + + if total_length < 8: + break + + entries = [] + pos = 8 + while pos + 10 <= total_length: + line_no = struct.unpack(">I", f.read(4))[0] + src_idx = struct.unpack(">H", f.read(2))[0] + pc_addr = struct.unpack(">I", f.read(4))[0] + pos += 10 + + if line_no == 0: + break + + if src_idx == 0xFFFF: + entries.append((line_no, pc_addr)) + + all_subsections.append(entries) + offset += total_length + + return all_subsections + + +def parse_object_debug(o_path): + """Parse DWARF 1 from a .o file. + + Returns (source_name, [[(line, pc), ...], ...]) — one list per .line + sub-section (one per .text section in the object). + """ + sections = read_elf_sections(o_path) + if ".line" not in sections or ".debug" not in sections: + return None, [] + + line_off, line_size, _ = sections[".line"] + debug_off, debug_size, _ = sections[".debug"] + + with open(o_path, "rb") as f: + source_name = parse_dwarf1_source_name(f, debug_off, debug_size) + line_subsections = parse_dwarf1_line(f, line_off, line_size) + + return source_name, line_subsections + + +def parse_map_file(map_path): + """Parse MAP file .text section layout. + + Returns {obj_basename: [(starting_address, size), ...]} with all .text + entries per object in order. MW can split an object's code into multiple + .text sections; each gets its own alignment-1 entry and matches a + sub-section in the DWARF 1 .line section. + """ + obj_offsets = {} + in_text_layout = False + past_header = False + + with open(map_path) as f: + for line in f: + line = line.rstrip() + + if ".text section layout" in line: + in_text_layout = True + past_header = False + continue + + if in_text_layout: + if line.strip().startswith("---"): + past_header = True + continue + + if not past_header: + continue + + # Empty line or new section ends .text layout + if not line.strip(): + continue + if line.strip() and not line.startswith(" "): + in_text_layout = False + continue + + m = re.match( + r"\s+([0-9a-fA-F]+)\s+([0-9a-fA-F]+)\s+[0-9a-fA-F]+\s+[0-9a-fA-F]+\s+" + r"(\d+)\s+(\S+)\s+(\S+)", + line, + ) + if m: + start_addr = int(m.group(1), 16) + size = int(m.group(2), 16) + alignment = int(m.group(3)) + section_name = m.group(4) + obj_name = m.group(5) + + if alignment == 1 and section_name == ".text" and size > 0: + obj_offsets.setdefault(obj_name, []).append( + (start_addr, size) + ) + + return obj_offsets + + +def build_o_index(search_dirs): + """Build {basename: path} index of .o files, preferring src/ over obj/.""" + o_by_basename = {} + for search_dir in search_dirs: + if not os.path.isdir(search_dir): + continue + for dirpath, _, filenames in os.walk(search_dir): + for fn in filenames: + if fn.endswith(".o") and fn != "debug_info.o": + full = os.path.join(dirpath, fn) + # Prefer src/ over obj/ (rebuilt sources have debug info) + if fn not in o_by_basename or "/src/" in full: + o_by_basename[fn] = full + return o_by_basename + + +def generate_debug_obj(map_path, o_index, out_s, out_o, build_dir, label=""): + """Generate a debug_info.o from a MAP file and .o file index. + + Returns (processed, skipped, n_entries) or None if no entries found. + """ + obj_offsets = parse_map_file(map_path) + if not obj_offsets: + return None + + file_table = {} # source_path -> file_index (1-based) + all_entries = [] # [(global_pc, file_index, line_number)] + skipped = 0 + processed = 0 + + for obj_basename, map_entries in obj_offsets.items(): + if obj_basename not in o_index: + skipped += 1 + continue + + o_path = o_index[obj_basename] + + # Parse DWARF 1 — returns sub-sections matching .text sections + source_name, line_subsections = parse_object_debug(o_path) + if not source_name or not line_subsections: + skipped += 1 + continue + + # Construct full source path from .o path + o_rel_norm = os.path.relpath(o_path, build_dir) + parts = o_rel_norm.split(os.sep) + if len(parts) >= 2: + src_dir = os.path.join(*parts[:-1]) + else: + src_dir = "." + + source_path = os.path.join(src_dir, source_name) + + # Assign file index + if source_path not in file_table: + file_table[source_path] = len(file_table) + 1 + + file_idx = file_table[source_path] + + # Match .line sub-sections to MAP .text entries by index + for i, sub_entries in enumerate(line_subsections): + if i < len(map_entries): + map_offset = map_entries[i][0] + else: + # More .line sub-sections than MAP entries; skip extras + break + + for line_no, pc_addr in sub_entries: + global_pc = map_offset + pc_addr + all_entries.append((global_pc, file_idx, line_no)) + + processed += 1 + + if not all_entries: + return None + + # Sort entries by global PC address + all_entries.sort(key=lambda e: e[0]) + + # Emit .s file + with open(out_s, "w") as f: + f.write("# Auto-generated DWARF 2 line info — do not edit\n\n") + + for source_path, idx in sorted(file_table.items(), key=lambda x: x[1]): + f.write(' .file %d "%s"\n' % (idx, source_path)) + f.write("\n .section .text\n") + + prev_pc = -1 + for global_pc, file_idx, line_no in all_entries: + if global_pc == prev_pc or global_pc < prev_pc: + continue + f.write(" .org 0x%x\n .loc %d %d\n nop\n" % + (global_pc, file_idx, line_no)) + prev_pc = global_pc + 4 + + # Assemble + as_cmd = ["powerpc-eabi-as", "-o", out_o, out_s] + result = subprocess.run(as_cmd, capture_output=True, text=True) + if result.returncode != 0: + print(" Assembly failed for %s: %s" % (label or out_o, result.stderr.strip())) + return None + + return (processed, skipped, len(all_entries)) + + +def main(): + if len(sys.argv) < 2: + print("Usage: %s " % sys.argv[0]) + print(" e.g. %s build/GZ2E01" % sys.argv[0]) + sys.exit(1) + + build_dir = os.path.abspath(sys.argv[1]) + + # --- DOL --- + dol_map = os.path.join(build_dir, "framework.elf.MAP") + elf_path = os.path.join(build_dir, "framework.elf") + dol_s = os.path.join(build_dir, "debug_info.s") + dol_o = os.path.join(build_dir, "debug_info.o") + + if not os.path.exists(dol_map): + print("Error: MAP file not found: %s" % dol_map) + sys.exit(1) + + # Build .o index from the whole build tree (src/ preferred over obj/) + o_index = build_o_index([build_dir]) + + text_base = get_text_base(elf_path) if os.path.exists(elf_path) else None + if text_base is not None: + print("DOL .text base: 0x%08X" % text_base) + + result = generate_debug_obj(dol_map, o_index, dol_s, dol_o, build_dir, "DOL") + if result: + processed, skipped, n_entries = result + print("DOL: %d files, %d entries (%d skipped)" % + (processed, n_entries, skipped)) + else: + print("DOL: no debug entries (MAP may be empty)") + + # --- RELs --- + rel_count = 0 + rel_skipped = 0 + + for entry in sorted(os.listdir(build_dir)): + module_dir = os.path.join(build_dir, entry) + if not os.path.isdir(module_dir): + continue + + plf_map = os.path.join(module_dir, "%s.plf.MAP" % entry) + if not os.path.exists(plf_map): + continue + + rel_s = os.path.join(module_dir, "debug_info.s") + rel_o = os.path.join(module_dir, "debug_info.o") + + # For RELs, search both the global src/ tree and the module's obj/ dir + rel_o_index = build_o_index([ + os.path.join(build_dir, "src"), + os.path.join(module_dir, "obj"), + ]) + + result = generate_debug_obj(plf_map, rel_o_index, rel_s, rel_o, + build_dir, entry) + if result: + rel_count += 1 + else: + rel_skipped += 1 + # Clean up empty files + for p in (rel_s, rel_o): + if os.path.exists(p): + os.remove(p) + + print("RELs: %d with debug info, %d without" % (rel_count, rel_skipped)) + + +if __name__ == "__main__": + main() diff --git a/tools/gen_gdb_rel_loader.py b/tools/gen_gdb_rel_loader.py index bed40f5a6fc..16c67aaeaf2 100644 --- a/tools/gen_gdb_rel_loader.py +++ b/tools/gen_gdb_rel_loader.py @@ -54,6 +54,41 @@ def get_elf_sections(plf_path): return sections +def get_elf_text_base(elf_path): + """Get the .text section virtual address from an ELF file.""" + try: + with open(elf_path, "rb") as f: + magic = f.read(4) + if magic != b"\x7fELF": + return None + f.seek(0) + ehdr = f.read(52) + e_shoff = struct.unpack(">I", ehdr[32:36])[0] + e_shentsize = struct.unpack(">H", ehdr[46:48])[0] + e_shnum = struct.unpack(">H", ehdr[48:50])[0] + e_shstrndx = struct.unpack(">H", ehdr[50:52])[0] + + f.seek(e_shoff + e_shstrndx * e_shentsize) + shstrtab_hdr = f.read(e_shentsize) + strtab_off = struct.unpack(">I", shstrtab_hdr[16:20])[0] + strtab_size = struct.unpack(">I", shstrtab_hdr[20:24])[0] + f.seek(strtab_off) + strtab = f.read(strtab_size) + + for i in range(e_shnum): + f.seek(e_shoff + i * e_shentsize) + shdr = f.read(e_shentsize) + sh_name_idx = struct.unpack(">I", shdr[0:4])[0] + end = strtab.index(b"\x00", sh_name_idx) + name = strtab[sh_name_idx:end].decode("ascii", errors="replace") + if name == ".text": + sh_addr = struct.unpack(">I", shdr[12:16])[0] + return sh_addr + except Exception: + pass + return None + + def main(): script_dir = os.path.dirname(os.path.abspath(__file__)) repo_root = os.path.dirname(script_dir) @@ -71,7 +106,7 @@ def main(): with open(config_path) as f: cfg = json.load(f) - # Build module_id -> (plf_path, set of section names) + # Build module_id -> (plf_path, set of section names, debug_o or None) modules = {} for m in cfg.get("modules", []): mid = m.get("module_id") @@ -80,7 +115,10 @@ def main(): plf = os.path.join(build_dir, name, "%s.plf" % name) if os.path.exists(plf): elf_sections = get_elf_sections(plf) - modules[mid] = (plf, elf_sections) + debug_o = os.path.join(build_dir, name, "debug_info.o") + if not os.path.exists(debug_o): + debug_o = None + modules[mid] = (plf, elf_sections, debug_o) out_path = os.path.join(build_dir, "load_rel_symbols.gdb") @@ -90,14 +128,20 @@ def main(): # load-dol-symbols elf_path = os.path.join(build_dir, "framework.elf") + debug_o_path = os.path.join(build_dir, "debug_info.o") + text_base = get_elf_text_base(elf_path) f.write("define load-dol-symbols\n") f.write(" symbol-file %s\n" % elf_path) - f.write(" printf \"Loaded DOL symbols\\n\"\n") + if text_base is not None and os.path.exists(debug_o_path): + f.write(" add-symbol-file %s 0x%X\n" % (debug_o_path, text_base)) + f.write(" printf \"Loaded DOL symbols + debug info\\n\"\n") + else: + f.write(" printf \"Loaded DOL symbols\\n\"\n") f.write("end\n\n") - # Per-module loader commands + # Per-module loader commands (PLF symbols only) for mid in sorted(modules.keys()): - plf, elf_sections = modules[mid] + plf, elf_sections, debug_o = modules[mid] # Determine which extra sections this PLF actually has extra_secs = [] @@ -133,7 +177,23 @@ def main(): f.write(" end\n") f.write("end\n\n") - # load-rel-symbols: walk the OS module linked list + # Per-module debug info loader commands (DWARF 2 line info) + modules_with_debug = { + mid: debug_o for mid, (plf, elf_sections, debug_o) in modules.items() + if debug_o + } + for mid in sorted(modules_with_debug.keys()): + debug_o = modules_with_debug[mid] + f.write("define __dbg_%d\n" % mid) + f.write(" set $__t = *(unsigned int*)($__si + 8) & ~1\n") + f.write(" set $__ts = *(unsigned int*)($__si + 12)\n") + f.write(" if $__t != 0 && $__ts != 0\n") + f.write(" add-symbol-file %s $__t\n" % debug_o) + f.write(" set $__loaded = $__loaded + 1\n") + f.write(" end\n") + f.write("end\n\n") + + # load-rel-symbols: walk the OS module linked list (PLF only) f.write("define load-rel-symbols\n") f.write(" set confirm off\n") f.write(" set $__mod = *(unsigned int*)0x800030C8\n") @@ -155,7 +215,49 @@ def main(): f.write(' printf "Loaded %d REL modules\\n", $__loaded\n') f.write("end\n\n") - # load-all-symbols + # load-debug-for: walk module list, load debug info for one module by ID + # Usage: load-debug-for + f.write("define load-debug-for\n") + f.write(" set confirm off\n") + f.write(" set $__target_id = $arg0\n") + f.write(" set $__mod = *(unsigned int*)0x800030C8\n") + f.write(" set $__loaded = 0\n") + f.write(" while $__mod != 0 && $__loaded == 0\n") + f.write(" set $__id = *(unsigned int*)($__mod)\n") + f.write(" set $__next = *(unsigned int*)($__mod + 4)\n") + f.write(" set $__ns = *(unsigned int*)($__mod + 0x0C)\n") + f.write(" set $__si = *(unsigned int*)($__mod + 0x10)\n") + f.write(" if $__id == $__target_id\n") + + for mid in sorted(modules_with_debug.keys()): + f.write(" if $__id == %d\n" % mid) + f.write(" __dbg_%d\n" % mid) + f.write(" end\n") + + f.write(" end\n") + f.write(" set $__mod = $__next\n") + f.write(" end\n") + f.write(" set confirm on\n") + f.write(" if $__loaded == 0\n") + f.write(' printf "Module %d not found or has no debug info\\n", $__target_id\n') + f.write(" end\n") + f.write("end\n\n") + + # Named convenience commands: dbg- + # Generates e.g. "define dbg-d_a_grass" -> "load-debug-for 73" + module_names = {} # mid -> name + for m in cfg.get("modules", []): + mid = m.get("module_id") + name = m.get("name") + if mid in modules_with_debug and name: + module_names[mid] = name + + for mid, name in sorted(module_names.items(), key=lambda x: x[1]): + f.write("define dbg-%s\n" % name) + f.write(" load-debug-for %d\n" % mid) + f.write("end\n") + + # load-all-symbols (PLF symbols only — use load-debug-info separately) f.write("define load-all-symbols\n") f.write(" load-dol-symbols\n") f.write(" load-rel-symbols\n") From 30e839c28be83fb07bfbe008d3eb9eb9127e3801 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Fri, 6 Mar 2026 22:30:25 -0800 Subject: [PATCH 18/35] d_s_room / d_s_name / d_a_title debug work (#3123) * d_s_room / d_s_name debug work * camera_class rtti fix * d_a_title debug / handle shield rel changes * fix shield build * fix regressions --- configure.py | 53 +++-- include/d/actor/d_a_title.h | 9 +- include/d/d_bg_parts.h | 2 +- include/d/d_bright_check.h | 6 + include/d/d_com_inf_game.h | 29 ++- include/d/d_drawlist.h | 4 +- include/d/d_file_select.h | 10 +- include/d/d_menu_collect.h | 4 + include/d/d_s_name.h | 71 ++----- include/d/d_s_room.h | 8 +- include/d/d_stage.h | 42 ++-- include/d/dolzel_rel.h | 16 +- include/f_op/f_op_camera_mng.h | 31 +-- src/c/c_dylink.cpp | 20 +- src/d/actor/d_a_L7demo_dr.cpp | 18 +- src/d/actor/d_a_L7op_demo_dr.cpp | 16 +- src/d/actor/d_a_alink.cpp | 2 +- src/d/actor/d_a_alink_kandelaar.inc | 2 +- src/d/actor/d_a_b_bq.cpp | 8 +- src/d/actor/d_a_b_dr.cpp | 22 +- src/d/actor/d_a_b_dre.cpp | 14 +- src/d/actor/d_a_b_ds.cpp | 20 +- src/d/actor/d_a_b_gg.cpp | 14 +- src/d/actor/d_a_b_gm.cpp | 4 +- src/d/actor/d_a_b_gnd.cpp | 4 +- src/d/actor/d_a_b_mgn.cpp | 6 +- src/d/actor/d_a_b_ob.cpp | 12 +- src/d/actor/d_a_b_tn.cpp | 10 +- src/d/actor/d_a_b_yo.cpp | 8 +- src/d/actor/d_a_b_zant.cpp | 2 +- src/d/actor/d_a_bd.cpp | 12 +- src/d/actor/d_a_bg.cpp | 2 +- src/d/actor/d_a_boomerang.cpp | 4 +- src/d/actor/d_a_cstatue.cpp | 2 +- src/d/actor/d_a_e_bee.cpp | 4 +- src/d/actor/d_a_e_bg.cpp | 4 +- src/d/actor/d_a_e_df.cpp | 6 +- src/d/actor/d_a_e_dt.cpp | 4 +- src/d/actor/d_a_e_fm.cpp | 8 +- src/d/actor/d_a_e_gb.cpp | 4 +- src/d/actor/d_a_e_ge.cpp | 2 +- src/d/actor/d_a_e_gi.cpp | 2 +- src/d/actor/d_a_e_gob.cpp | 4 +- src/d/actor/d_a_e_hp.cpp | 2 +- src/d/actor/d_a_e_hzelda.cpp | 4 +- src/d/actor/d_a_e_mk.cpp | 14 +- src/d/actor/d_a_e_nest.cpp | 2 +- src/d/actor/d_a_e_oc.cpp | 4 +- src/d/actor/d_a_e_ph.cpp | 6 +- src/d/actor/d_a_e_pm.cpp | 16 +- src/d/actor/d_a_e_po.cpp | 18 +- src/d/actor/d_a_e_pz.cpp | 16 +- src/d/actor/d_a_e_rd.cpp | 10 +- src/d/actor/d_a_e_rdb.cpp | 2 +- src/d/actor/d_a_e_rdy.cpp | 10 +- src/d/actor/d_a_e_s1.cpp | 4 +- src/d/actor/d_a_e_sf.cpp | 2 +- src/d/actor/d_a_e_sh.cpp | 4 +- src/d/actor/d_a_e_sm.cpp | 8 +- src/d/actor/d_a_e_sm2.cpp | 8 +- src/d/actor/d_a_e_sw.cpp | 4 +- src/d/actor/d_a_e_th.cpp | 4 +- src/d/actor/d_a_e_tt.cpp | 2 +- src/d/actor/d_a_e_vt.cpp | 4 +- src/d/actor/d_a_e_warpappear.cpp | 4 +- src/d/actor/d_a_e_wb.cpp | 4 +- src/d/actor/d_a_e_ww.cpp | 6 +- src/d/actor/d_a_e_ym.cpp | 2 +- src/d/actor/d_a_e_ymb.cpp | 12 +- src/d/actor/d_a_e_zh.cpp | 16 +- src/d/actor/d_a_horse.cpp | 2 +- src/d/actor/d_a_kago.cpp | 2 +- src/d/actor/d_a_kytag00.cpp | 4 +- src/d/actor/d_a_kytag01.cpp | 16 +- src/d/actor/d_a_kytag03.cpp | 8 +- src/d/actor/d_a_kytag04.cpp | 2 +- src/d/actor/d_a_kytag06.cpp | 12 +- src/d/actor/d_a_kytag10.cpp | 6 +- src/d/actor/d_a_kytag13.cpp | 10 +- src/d/actor/d_a_mg_fshop.cpp | 6 +- src/d/actor/d_a_mg_rod.cpp | 52 ++--- src/d/actor/d_a_nbomb.cpp | 4 +- src/d/actor/d_a_ni.cpp | 10 +- src/d/actor/d_a_npc_henna.cpp | 46 ++--- src/d/actor/d_a_npc_ks.cpp | 26 +-- src/d/actor/d_a_npc_lf.cpp | 6 +- src/d/actor/d_a_npc_ne.cpp | 10 +- src/d/actor/d_a_npc_sq.cpp | 8 +- src/d/actor/d_a_npc_taro.cpp | 4 +- src/d/actor/d_a_npc_tk.cpp | 2 +- src/d/actor/d_a_obj_ari.cpp | 2 +- src/d/actor/d_a_obj_brg.cpp | 4 +- src/d/actor/d_a_obj_cho.cpp | 2 +- src/d/actor/d_a_obj_crvgate.cpp | 4 +- src/d/actor/d_a_obj_dan.cpp | 2 +- src/d/actor/d_a_obj_drop.cpp | 4 +- src/d/actor/d_a_obj_gra2_base.inc | 4 +- src/d/actor/d_a_obj_gra2_soldier.inc | 8 +- src/d/actor/d_a_obj_hhashi.cpp | 6 +- src/d/actor/d_a_obj_iceblock.cpp | 4 +- src/d/actor/d_a_obj_item.cpp | 2 +- src/d/actor/d_a_obj_kabuto.cpp | 2 +- src/d/actor/d_a_obj_kamakiri.cpp | 2 +- src/d/actor/d_a_obj_katatsumuri.cpp | 2 +- src/d/actor/d_a_obj_kuwagata.cpp | 2 +- src/d/actor/d_a_obj_lp.cpp | 12 +- src/d/actor/d_a_obj_scannon.cpp | 4 +- src/d/actor/d_a_obj_scannon_ten.cpp | 4 +- src/d/actor/d_a_obj_smallkey.cpp | 2 +- src/d/actor/d_a_obj_so.cpp | 2 +- src/d/actor/d_a_obj_sw.cpp | 4 +- src/d/actor/d_a_obj_ten.cpp | 2 +- src/d/actor/d_a_obj_toby.cpp | 2 +- src/d/actor/d_a_obj_tobyhouse.cpp | 4 +- src/d/actor/d_a_obj_tombo.cpp | 2 +- src/d/actor/d_a_ppolamp.cpp | 4 +- src/d/actor/d_a_tag_waterfall.cpp | 2 +- src/d/actor/d_a_tbox.cpp | 4 +- src/d/actor/d_a_title.cpp | 155 +++++++++----- src/d/actor/d_a_vrbox2.cpp | 20 +- src/d/actor/d_a_ykgr.cpp | 4 +- src/d/actor/d_grass.inc | 4 +- src/d/d_bg_parts.cpp | 2 +- src/d/d_camera.cpp | 77 ++++--- src/d/d_com_inf_game.cpp | 2 +- src/d/d_demo.cpp | 2 +- src/d/d_kankyo.cpp | 150 +++++++------- src/d/d_kankyo_debug.cpp | 12 +- src/d/d_kankyo_rain.cpp | 248 +++++++++++----------- src/d/d_kankyo_wether.cpp | 4 +- src/d/d_ky_thunder.cpp | 14 +- src/d/d_kyeff.cpp | 2 +- src/d/d_resorce.cpp | 2 +- src/d/d_s_name.cpp | 221 ++++++++++++++------ src/d/d_s_room.cpp | 297 ++++++++++++++++----------- src/d/d_shop_camera.cpp | 6 +- src/d/d_stage.cpp | 8 +- src/f_op/f_op_actor.cpp | 2 +- src/f_op/f_op_actor_mng.cpp | 2 +- src/m_Do/m_Do_graphic.cpp | 50 ++--- 140 files changed, 1291 insertions(+), 1040 deletions(-) diff --git a/configure.py b/configure.py index 210dc3f14d0..12860d0c1b9 100755 --- a/configure.py +++ b/configure.py @@ -524,18 +524,31 @@ def RevolutionLib(lib_name: str, objects: List[Object], extra_cflags=[]) -> Dict } # Helper function for REL script objects -def Rel(lib_name: str, objects: List[Object]) -> Dict[str, Any]: - return { - "lib": lib_name, - "mw_version": MWVersion(config.version), - "cflags": [*cflags_rel], - "progress_category": "game", - "objects": objects, - } +def Rel(lib_name: str, objects: List[Object], isInDol=False) -> Dict[str, Any]: + if (config.version == "ShieldD") and isInDol: + # For Shield Debug version, some RELs were moved into the DOL + return { + "lib": lib_name, + "mw_version": MWVersion(config.version), + "cflags": [*cflags_framework, "-D__FORCE_REL_IN_DOL__=1"], + "progress_category": "game", + "objects": objects, + } + else: + return { + "lib": lib_name, + "mw_version": MWVersion(config.version), + "cflags": [*cflags_rel], + "progress_category": "game", + "objects": objects, + } # Helper function for actor RELs -def ActorRel(status: bool, rel_name: str, extra_cflags: List[str]=[]) -> Dict[str, Any]: - return Rel(rel_name, [Object(status, f"d/actor/{rel_name}.cpp", extra_cflags=extra_cflags, scratch_preset_id=70)]) +def ActorRel(status: bool, rel_name: str, extra_cflags: List[str]=[], isInDol=False) -> Dict[str, Any]: + if isInDol: + return Rel(rel_name, [Object(status, f"d/actor/{rel_name}.cpp", extra_cflags=extra_cflags, scratch_preset_id=70)], True) + else: + return Rel(rel_name, [Object(status, f"d/actor/{rel_name}.cpp", extra_cflags=extra_cflags, scratch_preset_id=70)]) # Helper function for JSystem libraries @@ -2228,7 +2241,7 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor(ALL_GCN), "d_a_tag_allmato"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_camera"), # debug extra weak fns ActorRel(MatchingFor(ALL_GCN), "d_a_tag_chkpoint"), # debug weak func order - ActorRel(MatchingFor(ALL_GCN), "d_a_tag_event"), # TODO: this is part of Rframework in ShieldD + ActorRel(MatchingFor(ALL_GCN), "d_a_tag_event", [], True), # TODO: this is part of Rframework in ShieldD ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evt"), # debug extra weak fns ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evtarea"), # debug weak func order ActorRel(MatchingFor(ALL_GCN), "d_a_tag_evtmsg"), # debug weak func order @@ -2236,7 +2249,7 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor(ALL_GCN), "d_a_tag_kmsg"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lantern"), # debug weak func order ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mist"), # debug weak func order - ActorRel(MatchingFor(ALL_GCN), "d_a_tag_msg"), # TODO: this is part of Rframework in ShieldD + ActorRel(MatchingFor(ALL_GCN), "d_a_tag_msg", [], True), # TODO: this is part of Rframework in ShieldD ActorRel(MatchingFor(ALL_GCN), "d_a_tag_push"), # debug weak func order ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_telop"), # debug weak func order ActorRel(MatchingFor(ALL_GCN), "d_a_tbox"), @@ -2257,7 +2270,7 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor(ALL_GCN), "d_a_suspend"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_attention"), ActorRel(MatchingFor(ALL_GCN), "d_a_alldie"), - ActorRel(MatchingFor(ALL_GCN), "d_a_andsw2"), + ActorRel(MatchingFor(ALL_GCN), "d_a_andsw2", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_bd"), ActorRel(MatchingFor(ALL_GCN), "d_a_canoe"), ActorRel(MatchingFor(ALL_GCN), "d_a_cstaF"), @@ -2271,7 +2284,7 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor(ALL_GCN), "d_a_e_rd"), ActorRel(MatchingFor(ALL_GCN), "d_a_econt"), ActorRel(MatchingFor(ALL_GCN), "d_a_fr"), - ActorRel(MatchingFor(ALL_GCN), "d_a_grass"), + ActorRel(MatchingFor(ALL_GCN), "d_a_grass", [], True), ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_kytag05"), ActorRel(MatchingFor(ALL_GCN), "d_a_kytag10"), ActorRel(MatchingFor(ALL_GCN), "d_a_kytag11"), @@ -2316,9 +2329,9 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor(ALL_GCN), "d_a_obj_swpush5"), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_yobikusa"), ActorRel(MatchingFor(ALL_GCN), "d_a_scene_exit2"), - ActorRel(MatchingFor(ALL_GCN), "d_a_shop_item"), + ActorRel(MatchingFor(ALL_GCN), "d_a_shop_item", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_sq"), - ActorRel(MatchingFor(ALL_GCN), "d_a_swc00"), + ActorRel(MatchingFor(ALL_GCN), "d_a_swc00", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_CstaSw"), # debug weak func order ActorRel(MatchingFor(ALL_GCN), "d_a_tag_ajnot"), # debug weak func order ActorRel(MatchingFor(ALL_GCN), "d_a_tag_attack_item"), # debug weak func order @@ -2464,7 +2477,7 @@ def MatchingFor(*versions) -> bool: ActorRel(Equivalent, "d_a_hozelda"), # weak func order (J3DMtxCalcNoAnm) ActorRel(MatchingFor(ALL_GCN), "d_a_izumi_gate"), ActorRel(MatchingFor(ALL_GCN), "d_a_kago"), - ActorRel(MatchingFor(ALL_GCN), "d_a_kytag01"), + ActorRel(MatchingFor(ALL_GCN), "d_a_kytag01", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_kytag02"), ActorRel(MatchingFor(ALL_GCN), "d_a_kytag03"), ActorRel(MatchingFor(ALL_GCN), "d_a_kytag06"), @@ -2534,7 +2547,7 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor(ALL_GCN), "d_a_npc_lf"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_lud"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_midp"), - ActorRel(MatchingFor(ALL_GCN, ALL_SHIELD), "d_a_npc_mk"), + ActorRel(MatchingFor(ALL_GCN, ALL_SHIELD), "d_a_npc_mk", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_moi"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_moir"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_myna2"), @@ -2682,7 +2695,7 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor(ALL_GCN), "d_a_obj_iceblock"), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_iceleaf"), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_ihasi"), - ActorRel(MatchingFor(ALL_GCN), "d_a_obj_ikada"), + ActorRel(MatchingFor(ALL_GCN), "d_a_obj_ikada", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_inobone"), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_ita"), ActorRel(MatchingFor(ALL_GCN), "d_a_obj_itamato"), @@ -2954,7 +2967,7 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor(ALL_GCN), "d_a_tag_yami"), # debug weak func order ActorRel(MatchingFor(ALL_GCN), "d_a_talk"), ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tboxSw"), - ActorRel(MatchingFor(ALL_GCN), "d_a_title"), + ActorRel(MatchingFor(ALL_GCN), "d_a_title", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_warp_bug"), ] diff --git a/include/d/actor/d_a_title.h b/include/d/actor/d_a_title.h index 2e498c8d2e5..465fe689c19 100644 --- a/include/d/actor/d_a_title.h +++ b/include/d/actor/d_a_title.h @@ -25,7 +25,6 @@ class CPaneMgrAlpha; */ class daTitle_c : public fopAc_ac_c { public: - //daTitle_c() {} int CreateHeap(); int create(); static int createHeapCallBack(fopAc_ac_c*); @@ -47,6 +46,10 @@ class daTitle_c : public fopAc_ac_c { int Draw(); int Delete(); + #if VERSION == VERSION_SHIELD_DEBUG + void KeyWaitPosMove(); + #endif + private: /* 0x568 */ request_of_phase_process_class mPhaseReq; /* 0x570 */ JKRHeap* mpHeap; @@ -60,11 +63,11 @@ class daTitle_c : public fopAc_ac_c { /* 0x5E4 */ dDlst_daTitle_c mTitle; /* 0x5EC */ JUTFont* mpFont; /* 0x5F0 */ u8 field_0x5f0[8]; - /* 0x5F8 */ u8 field_0x5f8; + /* 0x5F8 */ u8 mIsDispLogo; /* 0x5F9 */ u8 field_0x5f9; /* 0x5FA */ u8 field_0x5fa; /* 0x5FB */ u8 mProcID; - /* 0x5FC */ u8 field_0x5fc; + /* 0x5FC */ u8 mWaitTimer; /* 0x600 */ CPaneMgrAlpha* field_0x600; /* 0x604 */ u8 field_0x604; }; // Size: 0x608 diff --git a/include/d/d_bg_parts.h b/include/d/d_bg_parts.h index adfb97d2b98..a8dba411658 100644 --- a/include/d/d_bg_parts.h +++ b/include/d/d_bg_parts.h @@ -189,7 +189,7 @@ class dBgp_c { }; dBgp_c(); - ~dBgp_c(); + ~dBgp_c() {} void create(s8, void*); int remove(); diff --git a/include/d/d_bright_check.h b/include/d/d_bright_check.h index d3f48ce9a7d..d8686944e6b 100644 --- a/include/d/d_bright_check.h +++ b/include/d/d_bright_check.h @@ -31,6 +31,12 @@ class dBrightCheck_c { void modeMove(); void _draw(); + void draw() { + _draw(); + } + + u8 isEnd() { return mCompleteCheck; } + /* 0x04 */ JKRArchive* mArchive; /* 0x08 */ dDlst_BrightCheck_c mBrightCheck; /* 0x18 */ u8 mMode; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index d8556e2fde1..18165eb6284 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -213,6 +213,7 @@ class phaseParam_c { }; class camera_class; +class camera_process_class; class dComIfG_camera_info_class { public: dComIfG_camera_info_class() {} @@ -949,12 +950,7 @@ class dComIfG_play_c { class dComIfG_inf_c { public: - dComIfG_inf_c() { this->ct(); } - ~dComIfG_inf_c() {} - void ct(); - static void createBaseCsr(); - -#if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG +#if PLATFORM_WII || PLATFORM_SHIELD class baseCsr_c : public mDoGph_gInf_c::csr_c { public: class navi_c { @@ -987,6 +983,9 @@ class dComIfG_inf_c { static void particleExecute(); static navi_c* getNavi() { return m_navi; } + dDlst_blo_c* getCsr() { return &field_0x8; } + void onNavi() { field_0x13d = 1; } + /* 0x008 */ dDlst_blo_c field_0x8; /* 0x130 */ dDlst_blo_c::anm_c anm; /* 0x13C */ u8 field_0x13c; @@ -1007,6 +1006,18 @@ class dComIfG_inf_c { }; #endif + dComIfG_inf_c() { this->ct(); } + ~dComIfG_inf_c() {} + void ct(); + +#if PLATFORM_WII || PLATFORM_SHIELD + static void createBaseCsr(); + + static baseCsr_c* getBaseCsr() { + return m_baseCsr; + } +#endif + /* 0x00000 */ dSv_info_c info; /* 0x00F38 */ dComIfG_play_c play; /* 0x05F64 */ dDlst_list_c drawlist; @@ -1027,7 +1038,7 @@ class dComIfG_inf_c { #endif static __d_timer_info_c dComIfG_mTimerInfo; - #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG + #if PLATFORM_WII || PLATFORM_SHIELD static baseCsr_c* m_baseCsr; #endif }; // Size: 0x1DE10 @@ -3319,8 +3330,8 @@ inline void dComIfGp_setWindow(u8 i, f32 param_1, f32 param_2, f32 param_3, f32 camID, mode); } -inline camera_class* dComIfGp_getCamera(int idx) { - return g_dComIfG_gameInfo.play.getCamera(idx); +inline camera_process_class* dComIfGp_getCamera(int idx) { + return (camera_process_class*)g_dComIfG_gameInfo.play.getCamera(idx); } inline void dComIfGp_setCamera(int i, camera_class* cam) { diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index c287b16ce95..04369d346db 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -67,6 +67,8 @@ class dDlst_blo_c : public dDlst_base_c { } + void setBlackColor(u64 i_tag, JUtility::TColor i_color); + class anm_c { public: inline anm_c() { @@ -325,7 +327,7 @@ class dDlst_window_c { private: /* 0x00 */ view_port_class mViewport; /* 0x28 */ s8 mCameraID; - /* 0x29 */ s8 mMode; + /* 0x29 */ u8 mMode; }; STATIC_ASSERT(sizeof(dDlst_window_c) == 0x2C); diff --git a/include/d/d_file_select.h b/include/d/d_file_select.h index db10b927e22..8cf8aa7dbce 100644 --- a/include/d/d_file_select.h +++ b/include/d/d_file_select.h @@ -452,10 +452,14 @@ class dFile_select_c { void errorMsgCheck(); #endif - bool getFadeFlag() { return mFadeFlag; } + void draw() { + _draw(); + } + + u8 getFadeFlag() { return mFadeFlag; } int isDataNew(u8 i) { return mIsDataNew[i]; } int isSelectEnd() { return mIsSelectEnd; } - u8 getSelectNum() { return mSelectNum; } + int getSelectNum() { return mSelectNum; } void setUseType(u8 type) { mUseType = type; } /* 0x0004 */ u8 field_0x04[4]; @@ -663,7 +667,7 @@ class dFile_select_c { /* 0x03B2 */ u16 field_0x03b2; /* 0x03B4 */ s32 field_0x03b4; /* 0x03B8 */ SaveDataBuf mSaveData[SAVEDATA_NUM]; - /* 0x2374 */ bool mFadeFlag; + /* 0x2374 */ u8 mFadeFlag; /* 0x2375 */ bool mHasDrawn; #if PLATFORM_GCN diff --git a/include/d/d_menu_collect.h b/include/d/d_menu_collect.h index 127ae7ee2b2..01ee32f6d49 100644 --- a/include/d/d_menu_collect.h +++ b/include/d/d_menu_collect.h @@ -209,6 +209,10 @@ class dMenu_Collect3D_c { virtual ~dMenu_Collect3D_c(); + static void setViewPortOffsetY(f32 i_offset) { + mViewOffsetY = i_offset; + } + static f32 mViewOffsetY; private: diff --git a/include/d/d_s_name.h b/include/d/d_s_name.h index 0c55f409309..73d3d703bee 100644 --- a/include/d/d_s_name.h +++ b/include/d/d_s_name.h @@ -4,66 +4,37 @@ #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_scene.h" -class dSn_HIO_c { +#include "d/d_file_select.h" +#include "d/d_bright_check.h" + +class dSn_HIO_c : public JORReflexible { public: dSn_HIO_c(); virtual ~dSn_HIO_c() {} - /* 0x4 */ s8 field_0x4; + void genMessage(JORMContext*); + + /* 0x4 */ s8 id; /* 0x5 */ u8 mFileSelWaitTime; }; -class dScnName_camera_c : public camera_process_class { +class dScnName_camera_c : public camera_class { public: dScnName_camera_c() { field_0x22f = 84; } virtual ~dScnName_camera_c() {} }; -// remove later and use header instead -class dFile_select_c { -public: - dFile_select_c(JKRArchive*); - virtual ~dFile_select_c(); - void _create(); - void _move(); - void _draw(); - - bool getFadeFlag() { return mFadeFlag; } - int isDataNew(u8 i) { return mDataNew[i]; } - int isSelectEnd() { return mSelectEnd; } - u8 getSelectNum() { return mSelectNum; } - void setUseType(u8 type) { mUseType = type; } - -private: - u8 field_0x4[0x254]; - /* 0x0258 */ u8 mDataNew[3]; - /* 0x025B */ u8 field_0x25b[0x265 - 0x25b]; - /* 0x0265 */ u8 mSelectNum; - /* 0x0266 */ u8 field_0x266[0x270 - 0x266]; - /* 0x0270 */ bool mSelectEnd; - /* 0x0271 */ u8 field_0x271[0x3b0 - 0x271]; - /* 0x03B0 */ u8 mUseType; - /* 0x03B1 */ u8 field_0x3b1[0x2374 - 0x3b1]; - /* 0x2374 */ bool mFadeFlag; - /* 0x2375 */ u8 field_0x2375[0x237c - 0x2375]; -}; - -// remove later and use header instead -class dBrightCheck_c { -public: - dBrightCheck_c(JKRArchive*); - virtual ~dBrightCheck_c(); - void _move(); - void _draw(); - - bool isEnd() { return mEnd; } - - u8 field_0x4[0x15]; - /* 0x19 */ bool mEnd; -}; - class dScnName_c : public scene_class { public: + enum dScnName_PROC { + dScnName_PROC_FileSelectOpen, + dScnName_PROC_FileSelectMain, + dScnName_PROC_FileSelectClose, + dScnName_PROC_BrightCheckOpen, + dScnName_PROC_BrightCheck, + dScnName_PROC_ChangeGameScene, + }; + dScnName_c() {} s32 create(); @@ -88,15 +59,15 @@ class dScnName_c : public scene_class { #if VERSION == VERSION_GCN_PAL u8 field_0x1c4_pal[0x28]; #endif - /* 0x1C4 */ request_of_phase_process_class field_0x1c4; + /* 0x1C4 */ request_of_phase_process_class phase; /* 0x1CC */ JKRExpHeap* mHeap; /* 0x1D0 */ JKRExpHeap* field_0x1d0; /* 0x1D4 */ dScnName_camera_c mCamera; /* 0x414 */ dFile_select_c* dFs_c; /* 0x418 */ dBrightCheck_c* mBrightCheck; - /* 0x41C */ u8 field_0x41c; - /* 0x41D */ u8 field_0x41d; - /* 0x41E */ u8 field_0x41e; + /* 0x41C */ u8 mDrawProc; + /* 0x41D */ u8 mProc; + /* 0x41E */ u8 mWaitTimer; /* 0x41F */ u8 field_0x41f; /* 0x420 */ u8 field_0x420; }; diff --git a/include/d/d_s_room.h b/include/d/d_s_room.h index d261bda101d..cc50b3cad75 100644 --- a/include/d/d_s_room.h +++ b/include/d/d_s_room.h @@ -7,12 +7,12 @@ class dStage_roomDt_c; class room_of_scene_class : public scene_class { public: - /* 0x1C4 */ request_of_phase_process_class field_0x1c4; - /* 0x1CC */ void* mpDzrRes; - /* 0x1D0 */ dStage_roomDt_c* mpRoomDt; + /* 0x1C4 */ request_of_phase_process_class phase; + /* 0x1CC */ void* roomInfo; + /* 0x1D0 */ dStage_roomDt_c* roomDt; /* 0x1D4 */ s8 field_0x1d4; /* 0x1D5 */ u8 field_0x1d5; - /* 0x1D6 */ u8 field_0x1d6[2]; + /* 0x1D6 */ u8 unk_0x1d6[0x1D8 - 0x1D6]; /* 0x1D8 */ u8 field_0x1d8; }; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index a4b72182bb8..d18be4f09f2 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1084,20 +1084,32 @@ class dStage_roomControl_c { /* 0x04 */ void** m_dzs; }; - struct nameData { - /* 0x0 */ s8 m_num; - /* 0x1 */ char m_names[32][10]; // ? + /** + * dStage_bankName (made up name) + * - Represent's Stage resource "name.bin" + */ + struct dStage_bankName { + /* 0x0 */ u8 m_num; // number of name entries + /* 0x1 */ char m_names[1][10]; // variable number of name entries (up to 32 max), each 10 characters long }; - struct bankDataEntry { - u8 field_0x0; - u8 mLayerNo; - u8 field_0x2[0x20]; + /** + * dStage_bankDataEntry (made up name) + * - Entry that goes into dStage_bankData + */ + struct dStage_bankDataEntry { + u8 roomNo; // required room ID for the bank + u8 layerNo; // required layer for the bank + u8 nameIDs[32]; // indexes into dStage_bankName m_names list. 0xFF used for unused entries }; - struct bankData { + /** + * dStage_bankData (made up name) + * - Represent's Stage resource "bank.bin" + */ + struct dStage_bankData { /* 0x0 */ u8 m_num; - /* 0x1 */ bankDataEntry m_entries[32]; // ? + /* 0x1 */ dStage_bankDataEntry m_entries[1]; // variable number of entries }; dStage_roomControl_c() {} @@ -1124,8 +1136,8 @@ class dStage_roomControl_c { static int getNextStayNo() { return mNextStayNo; } static BOOL GetTimePass() { return m_time_pass; } static void SetTimePass(int i_TimePass) { m_time_pass = i_TimePass; } - static nameData* getArcBankName() { return mArcBankName; } - static bankData* getArcBankData() { return mArcBankData; } + static dStage_bankName* getArcBankName() { return mArcBankName; } + static dStage_bankData* getArcBankData() { return mArcBankData; } static void createRoomDzs(u8 i_num) { m_roomDzs.create(i_num); } static void removeRoomDzs() { m_roomDzs.remove(); } static void* addRoomDzs(u8 i_num, u8 roomNo) { return m_roomDzs.add(i_num, roomNo); } @@ -1214,7 +1226,9 @@ class dStage_roomControl_c { static void onNoChangeRoom() { mNoChangeRoom = true; } #if DEBUG - static void setBgp(int, void*); + static void setBgp(int i_roomNo, void* i_bgp) { + mBgp[i_roomNo] = i_bgp; + } #endif static const int MEMORY_BLOCK_MAX = 19; @@ -1224,8 +1238,8 @@ class dStage_roomControl_c { static dStage_roomStatus_c mStatus[0x40]; static char mDemoArcName[10]; static fpc_ProcID mProcID; - static nameData* mArcBankName; - static bankData* mArcBankData; + static dStage_bankName* mArcBankName; + static dStage_bankData* mArcBankData; static roomDzs_c m_roomDzs; static s8 mStayNo; static s8 mOldStayNo; diff --git a/include/d/dolzel_rel.h b/include/d/dolzel_rel.h index 6e08fbd66e4..c9256323150 100644 --- a/include/d/dolzel_rel.h +++ b/include/d/dolzel_rel.h @@ -1,10 +1,20 @@ #ifndef DOLZEL_REL_H #define DOLZEL_REL_H -#if __MWERKS__ && !defined(DECOMPCTX) -#include "d/dolzel_rel.mch" +// Shield versions move some RELs into the DOL, so need a way to switch which +// precompiled headers are being used depending on some variable +#if __FORCE_REL_IN_DOL__ + #if __MWERKS__ && !defined(DECOMPCTX) + #include "d/dolzel.mch" + #else + #include "d/dolzel.pch" + #endif #else -#include "d/dolzel_rel.pch" + #if __MWERKS__ && !defined(DECOMPCTX) + #include "d/dolzel_rel.mch" + #else + #include "d/dolzel_rel.pch" + #endif #endif #endif // DOLZEL_REL_H diff --git a/include/f_op/f_op_camera_mng.h b/include/f_op/f_op_camera_mng.h index c7227843865..b2c98305c61 100644 --- a/include/f_op/f_op_camera_mng.h +++ b/include/f_op/f_op_camera_mng.h @@ -10,8 +10,9 @@ struct fopCamM_prm_class { /* 0x00 */ fopAcM_prmBase_class base; }; // Size: 0x18 -class camera_process_class : public view_class { +class camera_class { public: + /* 0x000 */ view_class view; /* 0x210 */ create_tag_class create_tag; /* 0x224 */ leafdraw_method_class* submethod; /* 0x228 */ u8 field_0x228[4]; @@ -23,7 +24,7 @@ class camera_process_class : public view_class { /* 0x238 */ int field_0x238; }; -class camera_class : public camera_process_class { +class camera_process_class : public camera_class { public: /* 0x23C */ int field_0x23c; /* 0x240 */ request_of_phase_process_class phase_request; @@ -39,35 +40,35 @@ inline void fopCamM_SetAngleY(camera_class* i_camera, s16 angle) { } inline void fopCamM_SetNear(camera_class* i_this, f32 near) { - i_this->near = near; + i_this->view.near = near; } inline void fopCamM_SetFar(camera_class* i_this, f32 far) { - i_this->far = far; + i_this->view.far = far; } inline void fopCamM_SetFovy(camera_class* i_this, f32 fovy) { - i_this->fovy = fovy; + i_this->view.fovy = fovy; } inline void fopCamM_SetAspect(camera_class* i_this, f32 aspect) { - i_this->aspect = aspect; + i_this->view.aspect = aspect; } inline void fopCamM_SetEye(camera_class* i_this, f32 x, f32 y, f32 z) { - i_this->lookat.eye.set(x, y, z); + i_this->view.lookat.eye.set(x, y, z); } inline void fopCamM_SetCenter(camera_class* i_this, f32 x, f32 y, f32 z) { - i_this->lookat.center.set(x, y, z); + i_this->view.lookat.center.set(x, y, z); } inline void fopCamM_SetUp(camera_class* i_this, f32 x, f32 y, f32 z) { - i_this->lookat.up.set(x, y, z); + i_this->view.lookat.up.set(x, y, z); } inline void fopCamM_SetBank(camera_class* i_this, s16 bank) { - i_this->bank = bank; + i_this->view.bank = bank; } inline void fopCamM_SetPrm1(camera_class* i_this, int prm1) { @@ -95,23 +96,23 @@ inline s16 fopCamM_GetAngleZ(camera_class* i_camera) { } inline f32 fopCamM_GetFovy(camera_class* i_camera) { - return i_camera->fovy; + return i_camera->view.fovy; } inline cXyz* fopCamM_GetEye_p(camera_class* i_camera) { - return &i_camera->lookat.eye; + return &i_camera->view.lookat.eye; } inline cXyz* fopCamM_GetCenter_p(camera_class* i_camera) { - return &i_camera->lookat.center; + return &i_camera->view.lookat.center; } inline cXyz* fopCamM_GetUp_p(camera_class* i_camera) { - return &i_camera->lookat.up; + return &i_camera->view.lookat.up; } inline s16 fopCamM_GetBank(camera_class* i_camera) { - return i_camera->bank; + return i_camera->view.bank; } fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 i_procName, void* i_append); diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index ed8b6dece94..a811f7fb7f5 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -99,7 +99,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_Obj_BkDoor, "d_a_obj_bkdoor"}, {PROC_Obj_Cboard, "d_a_obj_cboard"}, {PROC_Obj_MGate, "d_a_obj_mgate"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_Obj_Ikada, "d_a_obj_ikada"}, #endif {PROC_Obj_Ice_l, "d_a_obj_ice_l"}, @@ -540,7 +540,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_Obj_LifeContainer, "d_a_obj_life_container"}, {PROC_Obj_Shield, "d_a_obj_shield"}, {PROC_Demo_Item, "d_a_demo_item"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_ShopItem, "d_a_shop_item"}, #endif {PROC_Obj_Drop, "d_a_obj_drop"}, @@ -549,7 +549,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_TAG_CSW, "d_a_tag_csw"}, {PROC_TAG_QS, "d_a_tag_qs"}, {PROC_HOZELDA, "d_a_hozelda"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_SWC00, "d_a_swc00"}, #endif {PROC_KNOB20, "d_a_door_knob00"}, @@ -563,7 +563,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_Tag_ChgRestart, "d_a_tag_chgrestart"}, {PROC_Tag_Restart, "d_a_tag_setrestart"}, {PROC_ANDSW, "d_a_andsw"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_ANDSW2, "d_a_andsw2"}, #endif {PROC_MYNA, "d_a_myna"}, @@ -684,12 +684,12 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_NPC_CHIN, "d_a_npc_chin"}, {PROC_NPC_INS, "d_a_npc_ins"}, {PROC_NPC_SHOP0, "d_a_npc_shop0"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_NPC_MK, "d_a_npc_mk"}, #endif {PROC_NPC_P2, "d_a_npc_p2"}, {PROC_KYTAG00, "d_a_kytag00"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_KYTAG01, "d_a_kytag01"}, #endif {PROC_KYTAG02, "d_a_kytag02"}, @@ -729,13 +729,13 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_DEMO00, "d_a_demo00"}, {PROC_TAG_CAMERA, "d_a_tag_camera"}, {PROC_TAG_CHKPOINT, "d_a_tag_chkpoint"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_TAG_EVENT, "d_a_tag_event"}, #endif {PROC_TAG_EVT, "d_a_tag_evt"}, {PROC_TAG_TELOP, "d_a_tag_telop"}, {PROC_TAG_HOWL, "d_a_tag_howl"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_TAG_MSG, "d_a_tag_msg"}, #endif {PROC_TAG_LANTERN, "d_a_tag_lantern"}, @@ -748,7 +748,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_BG_OBJ, "d_a_bg_obj"}, {PROC_MIRROR, "d_a_mirror"}, {PROC_MOVIE_PLAYER, "d_a_movie_player"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_TITLE, "d_a_title"}, #endif {PROC_FR, "d_a_fr"}, @@ -793,7 +793,7 @@ static DynamicNameTableEntry const DynamicNameTable[] = { {PROC_Obj_Timer, "d_a_obj_timer"}, {PROC_SCENE_EXIT, "d_a_scene_exit"}, {PROC_SUSPEND, "d_a_suspend"}, - #if !PLATFORM_SHIELD + #if VERSION != VERSION_SHIELD_DEBUG {PROC_GRASS, "d_a_grass"}, #endif {-1, NULL}, diff --git a/src/d/actor/d_a_L7demo_dr.cpp b/src/d/actor/d_a_L7demo_dr.cpp index 5408b1eb9d0..046c7313e5d 100644 --- a/src/d/actor/d_a_L7demo_dr.cpp +++ b/src/d/actor/d_a_L7demo_dr.cpp @@ -69,8 +69,8 @@ void daDr_c::wait() { current.angle.y = 0; field_0x654++; } else if (field_0x654 != -1) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); if (eventInfo.checkCommandDemoAccrpt()) { camera->mCamera.Stop(); @@ -86,15 +86,15 @@ void daDr_c::wait() { fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0); eventInfo.onCondition(2); - mDemoCamEye = camera0->lookat.eye; - mDemoCamCenter = camera0->lookat.center; + mDemoCamEye = camera0->view.lookat.eye; + mDemoCamCenter = camera0->view.lookat.center; } } } void daDr_c::pl_walk() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp4C; @@ -167,8 +167,8 @@ void daDr_c::pl_turn() { } void daDr_c::bridge_destroy() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daPy_py_c* player = daPy_getPlayerActorClass(); if (field_0x654 == 0) { @@ -216,7 +216,7 @@ void daDr_c::bridge_destroy() { } void daDr_c::bridge_destroy2() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dComIfGp_getCamera(0); daPy_getPlayerActorClass(); diff --git a/src/d/actor/d_a_L7op_demo_dr.cpp b/src/d/actor/d_a_L7op_demo_dr.cpp index f6051370b16..e707f4d5541 100644 --- a/src/d/actor/d_a_L7op_demo_dr.cpp +++ b/src/d/actor/d_a_L7op_demo_dr.cpp @@ -85,8 +85,8 @@ void daL7ODR_c::wait() { if (field_0x888 == 0) { field_0x888++; } else if (field_0x888 != -1) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); if (eventInfo.checkCommandDemoAccrpt()) { dComIfGs_onZoneSwitch(Z2SE_DPD_SCREEN_OUT, fopAcM_GetRoomNo(this)); @@ -99,15 +99,15 @@ void daL7ODR_c::wait() { if (check_start()) { fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0); eventInfo.onCondition(2); - mDemoCamEye = camera0->lookat.eye; - mDemoCamCenter = camera0->lookat.center; + mDemoCamEye = camera0->view.lookat.eye; + mDemoCamCenter = camera0->view.lookat.center; } } } void daL7ODR_c::pl_walk() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daPy_py_c* player = daPy_getPlayerActorClass(); if (field_0x888 == 0) { @@ -264,8 +264,8 @@ void daL7ODR_c::dr_wait() { } void daL7ODR_c::dr_fly() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp264(0.0f, 0.0f, 0.0f); diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index cf2f1b47198..66ffb5484d6 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -13962,7 +13962,7 @@ void daAlink_c::resetBasAnime() { } BOOL daAlink_c::checkSightLine(f32 i_maxDist, cXyz* o_sightPos) { - camera_class* camera = dComIfGp_getCamera(field_0x317c); + camera_process_class* camera = dComIfGp_getCamera(field_0x317c); cXyz* line_start_pos = fopCamM_GetEye_p(camera); cXyz sp3C; cXyz sp30(mHeldItemRootPos); diff --git a/src/d/actor/d_a_alink_kandelaar.inc b/src/d/actor/d_a_alink_kandelaar.inc index d2769b7f24d..6eab0095946 100644 --- a/src/d/actor/d_a_alink_kandelaar.inc +++ b/src/d/actor/d_a_alink_kandelaar.inc @@ -182,7 +182,7 @@ void daAlink_c::preKandelaarDraw() { cXyz proj; mDoLib_project(&mKandelaarFlamePos, &proj); - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); f32 trimHeight; if (camera_p != NULL) { trimHeight = camera_p->mCamera.TrimHeight(); diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 17ef77cdf09..4b4af6a06f6 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -1195,8 +1195,8 @@ static void fish_set(b_bq_class* i_this) { static void demo_camera(b_bq_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); fopAc_ac_c* tentacle = fopAcM_SearchByID(i_this->mTentacleIDs[i_this->field_0x123c]); e_mb_class* monkeybomb = (e_mb_class*)fopAcM_SearchByID(i_this->mMonkeyBombID); @@ -1420,8 +1420,8 @@ static void demo_camera(b_bq_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); - i_this->mDemoCamEye = camera0->lookat.eye; - i_this->mDemoCamCenter = camera0->lookat.center; + i_this->mDemoCamEye = camera0->view.lookat.eye; + i_this->mDemoCamCenter = camera0->view.lookat.center; dComIfGp_getEvent()->startCheckSkipEdge(a_this); // fallthrough diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index 0a9d6c7a9a5..b47801849d7 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -1384,7 +1384,7 @@ void daB_DR_c::executeFlyWait() { void daB_DR_c::executeTailHit() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz mae; cXyz ato; @@ -3025,14 +3025,14 @@ void daB_DR_c::executePillarWait() { } bool daB_DR_c::startDemoCheck() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0); eventInfo.onCondition(2); - mDemoCamEye = camera0->lookat.eye; - mDemoCamCenter = camera0->lookat.center; + mDemoCamEye = camera0->view.lookat.eye; + mDemoCamCenter = camera0->view.lookat.center; return false; } else { camera->mCamera.Stop(); @@ -3043,7 +3043,7 @@ bool daB_DR_c::startDemoCheck() { } void daB_DR_c::executeDamageDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz unused; cXyz unused2; @@ -3238,7 +3238,7 @@ void daB_DR_c::executeDamageDemo() { } void daB_DR_c::executeMiddleDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz unused; cXyz unused2; @@ -3269,7 +3269,7 @@ void daB_DR_c::executeMiddleDemo() { } void daB_DR_c::executeDead() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz unused; cXyz unused2; @@ -3351,7 +3351,7 @@ void daB_DR_c::executeBullet() { } void daB_DR_c::executeParts() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz mae; cXyz ato; @@ -3399,7 +3399,7 @@ void daB_DR_c::executeParts() { mTimer[0] = 50; ANGLE_ADD(current.angle.x, cM_rndFX(16384.0f)); - mae = camera->lookat.center - current.pos; + mae = camera->view.lookat.center - current.pos; current.angle.y = mae.atan2sX_Z(); ANGLE_ADD(current.angle.y, cM_rndFX(16384.0f)); @@ -3813,7 +3813,7 @@ void daB_DR_c::down_cc_set() { void daB_DR_c::demo_skip(int) { fopAc_ac_c* parent; if (cDmr_SkipInfo == 0 && fopAcM_SearchByID(parentActorID, &parent) && parent != NULL) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dStage_changeScene(1, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); Z2GetAudioMgr()->subBgmStop(); dKy_getEnvlight()->wether = 1; diff --git a/src/d/actor/d_a_b_dre.cpp b/src/d/actor/d_a_b_dre.cpp index b501877178a..8701a1f2616 100644 --- a/src/d/actor/d_a_b_dre.cpp +++ b/src/d/actor/d_a_b_dre.cpp @@ -70,7 +70,7 @@ static int daB_DRE_Delete(daB_DRE_c* i_this) { } bool daB_DRE_c::CameraSet() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* cam_body = dCam_getBody(); if (!eventInfo.checkCommandDemoAccrpt()) { @@ -92,12 +92,12 @@ bool daB_DRE_c::CameraSet() { } void daB_DRE_c::SetStopingCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Set(mCamCenter, mCamEye, mCamFovy, 0); } void daB_DRE_c::SetStopCam(cXyz i_center, f32 param_1, f32 i_eyeY, s16 i_offsetAngle) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz eye_pos(0.0f, i_eyeY, param_1); mCamCenter.set(i_center.x, i_center.y, i_center.z); @@ -127,7 +127,7 @@ void daB_DRE_c::SetCMoveCam(cXyz i_target, f32 i_scale, f32 i_step) { void daB_DRE_c::SetEyeMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 i_offsetAngle, f32 i_step) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz offset(0.0f, param_2, param_1); cXyz target(0.0f, 0.0f, 0.0f); @@ -140,7 +140,7 @@ void daB_DRE_c::SetEyeMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 i_offs void daB_DRE_c::SetEyeMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 i_offsetAngle, f32 i_scale, f32 i_step) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz target(0.0f, param_2, param_1); cLib_offsetPos(&target, ¶m_0, i_offsetAngle, &target); @@ -151,7 +151,7 @@ void daB_DRE_c::SetEyeMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 i_offs } void daB_DRE_c::SetMoveCam(f32 i_scale, f32 i_step) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cLib_addCalcPos(&mCamCenter, mCamCenterTarget, i_scale, i_step, 0.0f); cLib_addCalcPos(&mCamEye, mCamEyeTarget, i_scale, i_step, 0.0f); @@ -160,7 +160,7 @@ void daB_DRE_c::SetMoveCam(f32 i_scale, f32 i_step) { } void daB_DRE_c::SetReleaseCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mCamCenter, mCamEye); camera->mCamera.Start(); diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index d817769dedb..4fc5d127eb7 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -1116,7 +1116,7 @@ bool daB_DS_c::mCutTypeCheck() { } bool daB_DS_c::startDemoCheck() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (daPy_py_c::checkNowWolf()) { return false; @@ -1159,7 +1159,7 @@ bool daB_DS_c::doYoMessage() { } void daB_DS_c::executeOpeningDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* pla = daPy_getPlayerActorClass(); dBgS_GndChk gnd_chk; @@ -1856,7 +1856,7 @@ void daB_DS_c::damageSet() { } void daB_DS_c::damageHitCamera() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz offset, pos; mDoMtx_YrotS(*calc_mtx, field_0x7d0); @@ -1947,7 +1947,7 @@ void daB_DS_c::executeDamage() { static u16 eff_spHit_id[2] = {0x8BD9, 0x8BDA}; static u16 eff_LastSmoke_id[4] = {0x8C25, 0x8C26, 0x8C27, 0x8C28}; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* pla = daPy_getPlayerActorClass(); csXyz angle = shape_angle; cXyz sp1BC, sp1B0; @@ -2547,7 +2547,7 @@ void daB_DS_c::executeBreathSearch() { } void daB_DS_c::executeBattle2OpeningDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* pla = daPy_getPlayerActorClass(); cXyz vec, center, eye, unused; center.zero(); @@ -2958,11 +2958,11 @@ void daB_DS_c::mSetFirstPos() { } bool daB_DS_c::mChkScreenIn() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz vec1, vec2; - vec2 = camera->lookat.eye - camera->lookat.center; - vec1 = camera->lookat.eye - current.pos; + vec2 = camera->view.lookat.eye - camera->view.lookat.center; + vec1 = camera->view.lookat.eye - current.pos; return abs((s16)(vec1.atan2sX_Z() - vec2.atan2sX_Z())) < 0x3000; } @@ -3253,7 +3253,7 @@ void daB_DS_c::executeBattle2Tired() { } void daB_DS_c::executeBattle2Damage() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* pla = daPy_getPlayerActorClass(); JPABaseEmitter* emitter; @@ -3633,7 +3633,7 @@ void daB_DS_c::executeBattle2Dead() { }; static u16 eff_Demo_sasi_id[2] = {0x8BF8, 0x8BF9}; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); csXyz particle_angle = shape_angle; cXyz mae, ato; cXyz particle_scale(1.5f, 1.5f, 1.5f); diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index dc37eae4e83..212225ece2d 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -592,7 +592,7 @@ int daB_GG_c::DemoSkipCallBack(void* i_process, int param_1) { } bool daB_GG_c::CameraSet() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* cam_body = dCam_getBody(); if (!eventInfo.checkCommandDemoAccrpt()) { @@ -612,12 +612,12 @@ bool daB_GG_c::CameraSet() { } void daB_GG_c::SetStopingCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Set(mCamCenter, mCamEye, mCamFovy, 0); } void daB_GG_c::SetStopCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_3) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp38(0.0f, param_2, param_1); cXyz sp2C(0.0f, 0.0f, 0.0f); @@ -635,7 +635,7 @@ void daB_GG_c::SetStopCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_3) { void daB_GG_c::SetMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_3, f32 param_4, f32 param_5) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp38(0.0f, param_2, param_1); cXyz sp2C(0.0f, 0.0f, 0.0f); field_0x60c = param_0; @@ -652,7 +652,7 @@ void daB_GG_c::SetMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_3, f } void daB_GG_c::SetMoveCam1(f32 i_scale, f32 i_step) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cLib_addCalcPos(&mCamCenterTarget, field_0x60c, i_scale, i_step, 0.0f); cLib_addCalcPos(&mCamEyeTarget, field_0x618, i_scale, i_step, 0.0f); @@ -663,7 +663,7 @@ void daB_GG_c::SetMoveCam1(f32 i_scale, f32 i_step) { } void daB_GG_c::SetReleaseCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mCamCenter, mCamEye); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); @@ -689,7 +689,7 @@ void daB_GG_c::St_CamAction() { cXyz sp4C(0.0f, 0.0f, -300.0f); cXyz sp40; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (mCamMode) { case 0: diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index 4f911c8a90e..99a0f3bd732 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -1010,8 +1010,8 @@ static void cam_spd_set(b_gm_class* i_this) { static void demo_camera(b_gm_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* sp20 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* sp20 = dComIfGp_getCamera(0); cXyz spC8; cXyz spBC; cXyz spB0; diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index ee80e287f2d..76cbb32249e 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -2869,8 +2869,8 @@ static void cam_spd_set(b_gnd_class* i_this) { static void demo_camera(b_gnd_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; daPy_py_c* player = (daPy_py_c *)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); mant_class* mant_p = (mant_class*)fopAcM_SearchByID(i_this->mMantChildID); dScnKy_env_light_c* kankyo = dKy_getEnvlight(); diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index f08b4bc9a67..a050b672cac 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -2489,7 +2489,7 @@ void daB_MGN_c::executeFall() { void daB_MGN_c::demo_skip(int param_1) { UNUSED(param_1); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); mBlurRate = 0.0f; @@ -2529,7 +2529,7 @@ int daB_MGN_c::DemoSkipCallBack(void* i_this, int param_1) { } void daB_MGN_c::executeOpening() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); J3DModelData* modelData = mpMgnModelMorf->getModel()->getModelData(); @@ -2821,7 +2821,7 @@ void daB_MGN_c::executeOpening() { } void daB_MGN_c::executeDeath() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp60; cXyz sp54; diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 8b4c5eedb6f..41c2bdddbfe 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -286,7 +286,7 @@ static int daB_OB_Draw(b_ob_class* i_this) { for (int i = 0; i < 19; i++) { if (!i_this->mBodyParts[i].mHide) { - if ((i_this->mBodyParts[i].mPos - camera->lookat.eye).abs() > + if ((i_this->mBodyParts[i].mPos - camera->view.lookat.eye).abs() > i_this->mBodyParts[i].mSize * (JREG_F(17) + 500.0f)) { g_env_light.setLightTevColorType_MAJI(i_this->mBodyParts[i].mpMorf->getModel(), @@ -1946,7 +1946,7 @@ static void fish_move(b_ob_class* i_this) { a_this->attention_info.position.y += 50.0f; if (i_this->mDemoAction == 21 || i_this->mDemoAction == 22) { - sp84 = dComIfGp_getCamera(0)->lookat.eye - sp90; + sp84 = dComIfGp_getCamera(0)->view.lookat.eye - sp90; } else { sp84 = player->eyePos - sp90; } @@ -1996,8 +1996,8 @@ static void* s_hasidel_sub(void* i_this, void* i_data) { static void demo_camera(b_ob_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); cXyz sp58; cXyz sp64; @@ -2027,8 +2027,8 @@ static void demo_camera(b_ob_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); daPy_getPlayerActorClass()->changeDemoMode(46, 0, 0, 0); - i_this->mDemoCamEye = camera0->lookat.eye; - i_this->mDemoCamCenter = camera0->lookat.center; + i_this->mDemoCamEye = camera0->view.lookat.eye; + i_this->mDemoCamCenter = camera0->view.lookat.center; sp58 = i_this->mDemoCamEye - tentacle->current.pos; i_this->field_0x5ce0 = cM_atan2s(sp58.x, sp58.z); diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 82e0f3d8443..137195e838d 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -1631,7 +1631,7 @@ static void* s_obj_sub(void* i_actor, void* i_data) { } void daB_TN_c::demo_skip(int param_1) { - camera_class* cameraClass = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* cameraClass = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); if (param_1 == 0) { @@ -1675,7 +1675,7 @@ int daB_TN_c::DemoSkipCallBack(void* i_this, int param_1) { void daB_TN_c::executeRoomDemo() { daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp24 = player->current.pos; cXyz sp30; @@ -1825,7 +1825,7 @@ void daB_TN_c::executeRoomDemo() { void daB_TN_c::executeOpening() { cXyz sp7c, sp34; daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); fopAcM_searchPlayerDistance(this); @@ -2678,7 +2678,7 @@ void daB_TN_c::executeDamageH() { void daB_TN_c::executeChangeDemo() { cXyz sp28, sp34, sp40; daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (mActionMode2) { case ACTION2_0_e: @@ -4178,7 +4178,7 @@ void daB_TN_c::executeYoroke() { void daB_TN_c::executeEnding() { daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp1c, sp28; switch (mActionMode2) { diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index c837457a8d9..e358f7786cf 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -757,7 +757,7 @@ int daB_YO_c::doYoMessage() { } void daB_YO_c::executeOpening() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz cam_pos, player_pos, ystone_pos; daPy_py_c* player = daPy_getPlayerActorClass(); obj_ystone_class* ystone; @@ -1509,7 +1509,7 @@ void daB_YO_c::executeChase() { } void daB_YO_c::executeSeriousDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz pos; switch (mMode) { @@ -2104,7 +2104,7 @@ void daB_YO_c::executeAttackBody() { } void daB_YO_c::executeDemoRevival() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (mMode) { case 0: @@ -2277,7 +2277,7 @@ void daB_YO_c::executeDamage() { void daB_YO_c::executeDeath() { daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz pos1; cXyz pos2 = current.pos; pos2.y += 300.0f; diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index b38aa09b989..4a951541306 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -1324,7 +1324,7 @@ void daB_ZANT_c::executeConfuse() { } void daB_ZANT_c::executeOpening() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp34(0.0f, 0.0f, 0.0f); diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index 76ecb886072..31260589357 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -213,9 +213,9 @@ static int land_check(bd_class* i_this) { } fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz sp30; - sp30 = camera->lookat.center - camera->lookat.eye; + sp30 = camera->view.lookat.center - camera->view.lookat.eye; s16 spA = cM_atan2s(sp30.x, sp30.z); if (strcmp(dComIfGp_getStartStageName(), "F_SP103") == 0) { @@ -238,15 +238,15 @@ static int land_check(bd_class* i_this) { if (temp_r1[j] != 0) { continue; } - sp30.x = land_pos[j].x - camera->lookat.eye.x; - sp30.z = land_pos[j].z - camera->lookat.eye.z; + sp30.x = land_pos[j].x - camera->view.lookat.eye.x; + sp30.z = land_pos[j].z - camera->view.lookat.eye.z; s16 sVar2 = cM_atan2s(sp30.x, sp30.z) - spA; if (sVar2 >= 0x2000 || sVar2 <= -0x2000) { continue; } - sp30.x = camera->lookat.eye.x - land_pos[j].x; - sp30.z = camera->lookat.eye.z - land_pos[j].z; + sp30.x = camera->view.lookat.eye.x - land_pos[j].x; + sp30.z = camera->view.lookat.eye.z - land_pos[j].z; f32 temp_f1 = JMAFastSqrt((sp30.x * sp30.x) + (sp30.z * sp30.z)); if (!(temp_f1 >= 600.0f) || !(temp_f1 < var_f31)) { diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 825ace2314f..ddc1184212e 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -284,7 +284,7 @@ int daBg_c::draw() { int sp38 = 0; dDlst_window_c* sp34 = dComIfGp_getWindow(0); - camera_class* sp30 = dComIfGp_getCamera(sp34->getCameraID()); + camera_process_class* sp30 = dComIfGp_getCamera(sp34->getCameraID()); dComIfGd_setListBG(); mDoLib_clipper::changeFar(1000000.0f); diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 85e416298a1..7d05a714ae9 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -993,7 +993,7 @@ int daBoomerang_c::procWait() { field_0x6d8 = lock_line_actor; } - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); f32 cps_size; if (field_0x6d8 != NULL) { cps_size = 30.0f; @@ -1261,7 +1261,7 @@ int daBoomerang_c::execute() { field_0x962--; } - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s16 cam_angleY = fopCamM_GetAngleY(camera); s16 cam_angleX = fopCamM_GetAngleX(camera); diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 6a1f0a126b7..812d52c878f 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -799,7 +799,7 @@ void daCstatue_c::setDemo() { cXyz eyePos; cXyz centerPos; if (eventInfo.checkCommandDemoAccrpt()) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); fopAcM_onSwitch(this, mParam1); if (mDemoMode == daCstatue_DemoMode_0) { camera->mCamera.Stop(); diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index f668842d7f9..947767da630 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -543,8 +543,8 @@ static void bee_control(e_bee_class* i_this) { bee->mNoDraw = false; if (dComIfGp_checkPlayerStatus0(0, 0x200000)) { - vec3.x = bee->mPos.x - camera->lookat.eye.x; - vec3.z = bee->mPos.z - camera->lookat.eye.z; + vec3.x = bee->mPos.x - camera->view.lookat.eye.x; + vec3.z = bee->mPos.z - camera->view.lookat.eye.z; if (JMAFastSqrt(vec3.x * vec3.x + vec3.z * vec3.z) > NREG_F(0) + 2500.0f) { bee->mNoDraw = true; } diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index 9c8320c1888..dbce499069f 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -430,7 +430,7 @@ void daE_BG_c::executeAttack() { s16 unkShort1; cXyz unkXyz1; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz playerPos = daPy_getPlayerActorClass()->current.pos; @@ -1099,7 +1099,7 @@ void daE_BG_c::action() { mCreatureSound.setLinkSearch(isAttacking); if (mActionMode != 0 && mActionMode != 3) { dBgS_LinChk linChk; - linChk.Set(&dComIfGp_getCamera(0)->lookat.eye, &attention_info.position, this); + linChk.Set(&dComIfGp_getCamera(0)->view.lookat.eye, &attention_info.position, this); if (dComIfG_Bgsp().LineCross(&linChk)) { attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e; } else { diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index 9ae161b9682..ccd68a90832 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -90,7 +90,7 @@ void daE_DF_c::SetAnm(int i_index, int i_attr, f32 i_morf, f32 i_rate) { } void daE_DF_c::CameraSet(f32 i_posz) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz center = current.pos; center.y += 100.0f; @@ -121,7 +121,7 @@ void daE_DF_c::CameraSet(f32 i_posz) { } bool daE_DF_c::DemoStart() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* body = dCam_getBody(); if (eventInfo.checkCommandDemoAccrpt() == 0) { @@ -140,7 +140,7 @@ bool daE_DF_c::DemoStart() { } void daE_DF_c::SetReleaseCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mCenterPos, mEyePos); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index 7b52cf0f37e..a5a0014a3e6 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -1417,7 +1417,7 @@ void daE_DT_c::executeBombDamage() { void daE_DT_c::executeDeath() { cXyz player_pos(0.0f, 0.0f, 450.0f); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz offset, disappear_pos; daPy_py_c* player = daPy_getPlayerActorClass(); @@ -1941,7 +1941,7 @@ void daE_DT_c::calcCamera() { dBgS_LinChk lin_chk; cXyz start, end, offset_pos, offset; cXyz player_pos = daPy_getPlayerActorClass()->current.pos; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz cam_center, vec, cam_eye; s16 angle; diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index 959d733b953..ca5a982bfaa 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -1152,8 +1152,8 @@ static int demo_stop; static void demo_camera(e_fm_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); cXyz spEC; cXyz spE0; @@ -1280,8 +1280,8 @@ static void demo_camera(e_fm_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); i_this->mDemoCamFovy = 50.0f; - i_this->mDemoCamEye = camera0->lookat.eye; - i_this->mDemoCamCenter = camera0->lookat.center; + i_this->mDemoCamEye = camera0->view.lookat.eye; + i_this->mDemoCamCenter = camera0->view.lookat.center; i_this->field_0x778 = 0.0f; camera->mCamera.SetTrimSize(3); dComIfGp_getEvent()->startCheckSkipEdge(actor); diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index bb1305d96ea..a1995a663bf 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -1105,8 +1105,8 @@ static void cam_3d_morf(e_gb_class* i_this, f32 param_2) { static void demo_camera(e_gb_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera2 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera2 = dComIfGp_getCamera(0); fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); cXyz work, pos, sp34, sp40; diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index ba9816f8c53..4221e24b56c 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -488,7 +488,7 @@ void daE_GE_c::executeAttack() { mDoMtx_stack_c::copy(daPy_getLinkPlayerActorClass()->getModelJointMtx(0)); mDoMtx_stack_c::multVecZero(&position); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s16 distAngleS = cLib_distanceAngleS(fopCamM_GetAngleY(camera), fopAcM_searchPlayerAngleY(this)); diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index cfdcd944422..387e8619b30 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -816,7 +816,7 @@ void daE_GI_c::action() { if (attention_info.flags & fopAc_AttnFlag_BATTLE_e) { dBgS_LinChk linecheck; - linecheck.Set(&dComIfGp_getCamera(0)->lookat.eye, &attention_info.position, this); + linecheck.Set(&dComIfGp_getCamera(0)->view.lookat.eye, &attention_info.position, this); if (dComIfG_Bgsp().LineCross(&linecheck)) { attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e; } diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp index 724c4ff83e2..ac352decea5 100644 --- a/src/d/actor/d_a_e_gob.cpp +++ b/src/d/actor/d_a_e_gob.cpp @@ -1639,8 +1639,8 @@ static void cam_3d_morf(e_gob_class* i_this, f32 param_1) { static void demo_camera(e_gob_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); cXyz sp94; cXyz sp88; cXyz cam_eye; diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index 114ca27387e..cdb00ae7b7e 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -230,7 +230,7 @@ int daE_HP_c::draw() { mDoMtx_stack_c::multVec(&unkXyz1, &field_0x75c); mDoMtx_stack_c::transS(field_0x75c); - unkXyz1 = dComIfGp_getCamera(0)->lookat.eye - field_0x75c; + unkXyz1 = dComIfGp_getCamera(0)->view.lookat.eye - field_0x75c; mDoMtx_stack_c::YrotM(unkXyz1.atan2sX_Z()); mDoMtx_stack_c::XrotM((s16)unkXyz1.atan2sY_XZ()); mDoMtx_stack_c::scaleM(l_HIO.modelSize, l_HIO.modelSize, l_HIO.modelSize); diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp index 1630397e1a9..6ecd3313e79 100644 --- a/src/d/actor/d_a_e_hzelda.cpp +++ b/src/d/actor/d_a_e_hzelda.cpp @@ -822,8 +822,8 @@ static BOOL ball_bg_check(e_hzelda_class* i_this) { static void demo_camera(e_hzelda_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* unused = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* unused = dComIfGp_getCamera(0); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); cXyz offset; diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index a5a3bf869c4..9fc1c620d43 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -1254,7 +1254,7 @@ static void demo_camera_start(e_mk_class* i_this) { fopAc_ac_c* deku_baba_p[2]; fopAc_ac_c* boomerang_p; boomerang_p = fopAcM_SearchByID(i_this->boomerangId); - camera_class* camera1 = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera1 = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_class* camera2 = (camera_class*)dComIfGp_getCamera(0); cXyz work, offset, offset_2, unused; @@ -1279,8 +1279,8 @@ static void demo_camera_start(e_mk_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); Z2GetAudioMgr()->bgmStreamPrepare(0x200000D); - i_this->camEye = camera2->lookat.eye; - i_this->camCenter = camera2->lookat.center; + i_this->camEye = camera2->view.lookat.eye; + i_this->camCenter = camera2->view.lookat.center; i_this->camEyeTarget.set(-271.0f, 4559.0f, -7241.0f); i_this->camCenterTarget.set(-70.0f, 4378.0f, -6233.0f); @@ -1551,7 +1551,7 @@ static void demo_camera_end(e_mk_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); fopAc_ac_c* boomerang_p = (fopAc_ac_c*)fopAcM_SearchByID(i_this->boomerangId); - camera_class* camera = (camera_class*)dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = (camera_process_class*)dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz work, pos, unused_1, unused_2; switch (i_this->demoSubMode) { @@ -1973,7 +1973,7 @@ static void demo_camera_r04(e_mk_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; daPy_py_c* player = (daPy_py_c *)dComIfGp_getPlayer(0); fopAc_ac_c* boomerang_p = fopAcM_SearchByID(i_this->boomerangId); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz work, pos, unused, unused2; npc_ks_class* monkey_p = (npc_ks_class*)fpcM_Search(s_ks_sub, i_this); @@ -2239,7 +2239,7 @@ static void demo_camera_r04(e_mk_class* i_this) { static void demo_camera_bohit(e_mk_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; daPy_py_c* player = (daPy_py_c *)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz work, unused_1, unused_2, unused_3; switch (i_this->demoSubMode) { @@ -2292,7 +2292,7 @@ static void demo_camera_bohit(e_mk_class* i_this) { static void demo_camera(e_mk_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz unused_1, unused_2; switch (i_this->demoMode) { diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 37d3ad8d957..d3988cec467 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -785,7 +785,7 @@ static void* shot_b_sub(void* i_actor, void* i_data) { } static void demo_camera(e_nest_class* i_this) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s8 end_demo = false; switch (i_this->mDemoStage) { diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index b1f7d965f47..3f7d418ee64 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -1944,7 +1944,7 @@ void daE_OC_c::executeDemoMaster() { cXyz my_vec_1(16200.0f, 2850.0f, 7000.0f); my_vec_1 += my_vec_0; mPrevShapeAngle = shape_angle.y; - camera_class* p_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* p_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); switch (mOcState) { case 0: mHide = false; @@ -2585,7 +2585,7 @@ int daE_OC_c::execute() { if (field_0x6c8) { --field_0x6c8; if (field_0x6c8 == 0) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); mPlayerPos = daPy_getPlayerActorClass()->current.pos; mPlayerPos.y += 500.0f; field_0x704 = 55.0f; diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index 3d766b8e3e8..01440f62abb 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -84,13 +84,13 @@ static BOOL other_bg_check(daE_PH_c* i_this, fopAc_ac_c* i_other) { } void daE_PH_c::SetStopingCam() { - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_p->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0); } void daE_PH_c::SetStopCam(cXyz i_center, f32 i_offsetZ, f32 i_offsetY, s16 i_offsetAngle) { - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz offset(0.0f, i_offsetY, i_offsetZ); cXyz eye_offset(0.0f, 0.0f, 0.0f); @@ -110,7 +110,7 @@ void daE_PH_c::SetCMoveCam(cXyz i_target, f32 i_scale, f32 i_maxStep) { } void daE_PH_c::SetReleaseCam() { - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_p->mCamera.Reset(mCamCenter, mCamEye); camera_p->mCamera.Start(); diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index 39c86f914ad..4d3cae2e62f 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -392,7 +392,7 @@ void daE_PM_c::SetGakkiEffect() { } bool daE_PM_c::CameraSet() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camera_body = dCam_getBody(); if (!eventInfo.checkCommandDemoAccrpt()) { @@ -414,12 +414,12 @@ bool daE_PM_c::CameraSet() { } void daE_PM_c::SetStopingCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0); } void daE_PM_c::SetStopCam(cXyz i_center, f32 i_offsetXZ, f32 i_offsetY, s16 i_angle) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz offset(0.0f, i_offsetY, i_offsetXZ); cXyz eye(0.0f, 0.0f, 0.0f); mCamCenter.set(i_center.x, i_center.y, i_center.z); @@ -433,7 +433,7 @@ void daE_PM_c::SetStopCam(cXyz i_center, f32 i_offsetXZ, f32 i_offsetY, s16 i_an } void daE_PM_c::SetMoveCam2(f32 i_scale, f32 i_step) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cLib_addCalcPos(&mCamCenterTarget2, mCamCenterTarget, i_scale * 2.0f, i_step * 2.0f, 0.0f); cLib_addCalcPos(&mCamCenter, mCamCenterTarget2, i_scale, i_step, 0.0f); cLib_addCalcPos(&mCamEyeTarget2, mCamEyeTarget, i_scale * 2.0f, 160.0f, 0.0f); @@ -442,14 +442,14 @@ void daE_PM_c::SetMoveCam2(f32 i_scale, f32 i_step) { } void daE_PM_c::SetMoveCam(f32 i_scale, f32 i_step) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cLib_addCalcPos(&mCamCenter, mCamCenterTarget, i_scale, i_step, 0.0f); cLib_addCalcPos(&mCamEye, mCamEyeTarget, i_scale, 100.0f, 0.0f); camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0); } void daE_PM_c::SetReleaseCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mCamCenter, mCamEye); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); @@ -458,7 +458,7 @@ void daE_PM_c::SetReleaseCam() { void daE_PM_c::Ap_StartAction() { cXyz offset; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz player_pos(-10728.0f, s_LinkPos->y, 17052.0f); cXyz player_offset(0.0f, 0.0f, 0.0f); daPy_py_c* player = daPy_getPlayerActorClass(); @@ -2671,7 +2671,7 @@ void daE_PM_c::setLampBaseMtx() { } mDoMtx_stack_c::transS(vec2.x, vec2.y, vec2.z); - vec1 = dComIfGp_getCamera(0)->lookat.eye - vec2; + vec1 = dComIfGp_getCamera(0)->view.lookat.eye - vec2; mDoMtx_stack_c::YrotM(cM_atan2s(vec1.x, vec1.z)); mDoMtx_stack_c::XrotM(-cM_atan2s(vec1.y, JMAFastSqrt(vec1.x * vec1.x + vec1.z * vec1.z))); mDoMtx_stack_c::scaleM(l_HIO.mGlowEffectScale, l_HIO.mGlowEffectScale, l_HIO.mGlowEffectScale); diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 9a13c7e1825..c4790c355ea 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -220,8 +220,8 @@ static void e_po_opening(e_po_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; fopAc_ac_c* player_p = dComIfGp_getPlayer(0); - camera_class* camera1 = - static_cast(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); + camera_process_class* camera1 = + static_cast(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); camera_class* camera2 = static_cast(dComIfGp_getCamera(0)); cXyz temp_vec; @@ -839,8 +839,8 @@ static void e_po_dead(e_po_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera_player = - static_cast(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); + camera_process_class* camera_player = + static_cast(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); camera_class* camera = static_cast(dComIfGp_getCamera(0)); dBgS_LinChk lin_chk; cXyz scale(1.0f, 1.0f, 1.0f); @@ -1326,8 +1326,8 @@ static void e_po_limbering(e_po_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; fopAc_ac_c* player_p = dComIfGp_getPlayer(0); - camera_class* camera_player = - static_cast(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); + camera_process_class* camera_player = + static_cast(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); camera_class* camera = static_cast(dComIfGp_getCamera(0)); switch (i_this->mType) { @@ -1703,8 +1703,8 @@ static void e_po_holl_demo(e_po_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera_player = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera_player = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz scale(1.0f, 1.0f, 1.0f); u32 param = 7; @@ -2741,7 +2741,7 @@ static int daE_PO_Execute(e_po_class* i_this) { if (i_this->field_0x800) { MTXTrans(mDoMtx_stack_c::now, i_this->field_0x794.x, i_this->field_0x794.y, i_this->field_0x794.z); - local_4c = dComIfGp_getCamera(0)->lookat.eye - i_this->field_0x794; + local_4c = dComIfGp_getCamera(0)->view.lookat.eye - i_this->field_0x794; mDoMtx_stack_c::YrotM((int)local_4c.atan2sX_Z()); mDoMtx_stack_c::XrotM((int)local_4c.atan2sY_XZ()); mDoMtx_stack_c::scaleM(l_HIO.mModelSize, l_HIO.mModelSize, l_HIO.mModelSize); diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index bb5e1c6688d..3801be9c803 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -454,8 +454,8 @@ void daE_PZ_c::executeOpeningDemo() { cXyz(15.0f, 285.0f, -760.0f), }; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); cXyz sp120; @@ -479,8 +479,8 @@ void daE_PZ_c::executeOpeningDemo() { if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0); eventInfo.onCondition(2); - mDemoCameraEye = camera0->lookat.eye; - mDemoCameraCenter = camera0->lookat.center; + mDemoCameraEye = camera0->view.lookat.eye; + mDemoCameraCenter = camera0->view.lookat.center; break; } @@ -1550,8 +1550,8 @@ void daE_PZ_c::executeDamage() { } void daE_PZ_c::executeDead() { - camera_class* sp1C = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* sp18 = dComIfGp_getCamera(0); + camera_process_class* sp1C = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* sp18 = dComIfGp_getCamera(0); fopAc_ac_c* sp14 = dComIfGp_getPlayer(0); cXyz sp68; cXyz sp5C; @@ -1577,8 +1577,8 @@ void daE_PZ_c::executeDead() { if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0); eventInfo.onCondition(2); - mDemoCameraEye = sp18->lookat.eye; - mDemoCameraCenter = sp18->lookat.center; + mDemoCameraEye = sp18->view.lookat.eye; + mDemoCameraCenter = sp18->view.lookat.center; speedF = 0.0f; mCylCollider.ClrTgHit(); diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index 884ed1759dc..257067c169c 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -5829,7 +5829,7 @@ static void cam_spd_set(e_rd_class* i_this) { static void demo_camera(e_rd_class* i_this) { fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy; daPy_py_c* pla = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = (camera_class*) dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = (camera_process_class*) dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_class* camera0 = (camera_class*) dComIfGp_getCamera(0); daNPC_TK_c* taka = (daNPC_TK_c*) fopAcM_SearchByName(PROC_NPC_TK); fopAc_ac_c* actor = taka; @@ -5917,7 +5917,7 @@ static void demo_camera(e_rd_class* i_this) { i_this->demo_cam_center = enemy->current.pos; i_this->demo_cam_center.y = (enemy->eyePos.y - 80.0f) + 60.0f + TREG_F(5); - i_this->demo_cam_eye = camera0->lookat.eye; + i_this->demo_cam_eye = camera0->view.lookat.eye; enemy->current.angle.y = i_this->angleY; i_this->field_0x1300 = 2000.0f; // fallthrough @@ -5970,8 +5970,8 @@ static void demo_camera(e_rd_class* i_this) { i_this->demo_cam_zoom = 55.0f; camera->mCamera.SetTrimSize(3); - i_this->demo_cam_center = camera0->lookat.center; - i_this->demo_cam_eye = camera0->lookat.eye; + i_this->demo_cam_center = camera0->view.lookat.center; + i_this->demo_cam_eye = camera0->view.lookat.eye; i_this->field_0x12cc.set(-7875.0f, 2125.0f, 7895.0f); i_this->field_0x12c0.set(-7527.0f, 2084.0f, 7552.0f); cam_spd_set(i_this); @@ -6584,7 +6584,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { if (i == 0) { mae.set(38.0f, 0.0f, 0.0f); MtxPosition(&mae, &ato); - mae = camera->lookat.eye - ato; + mae = camera->view.lookat.eye - ato; y = cM_atan2s(mae.x, mae.z); x = -cM_atan2s(mae.y, JMAFastSqrt(mae.x * mae.x + mae.z * mae.z)); diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index 6f603444799..48a0872833a 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -1088,7 +1088,7 @@ static void cam_spd_set(e_rdb_class* i_this) { static void demo_camera(e_rdb_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp28, sp34, sp40, sp4c; s8 sVar1 = 0; diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index 05971e055f1..3f37e1c1193 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -3793,8 +3793,8 @@ static void* s_adel_sub(void* i_proc, void* i_this) { static void demo_camera(e_rdy_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz vec1, vec2, vec3, vec4, vec5; u8 unused_u8 = 1; (void) unused_u8; @@ -3817,8 +3817,8 @@ static void demo_camera(e_rdy_class* i_this) { player_camera->mCamera.SetTrimSize(3); daPy_getPlayerActorClass()->changeOriginalDemo(); daPy_getPlayerActorClass()->changeDemoMode(0x38, 0, 0, 0); - i_this->mCamEye = camera->lookat.eye; - i_this->mCamCenter = camera->lookat.center; + i_this->mCamEye = camera->view.lookat.eye; + i_this->mCamCenter = camera->view.lookat.center; s16 sang_y_diff = a_karg->shape_angle.y - player->shape_angle.y; if (sang_y_diff > 0) { i_this->field_0x13d4 = -0x4000; @@ -4504,7 +4504,7 @@ static int daE_RDY_Execute(e_rdy_class* i_this) { if (i == 0) { vec1.set(38.0f, 0.0f, 0.0f); MtxPosition(&vec1, &vec2); - vec1 = camera->lookat.eye - vec2; + vec1 = camera->view.lookat.eye - vec2; ang_y = cM_atan2s(vec1.x, vec1.z); ang_x = -cM_atan2s(vec1.y, JMAFastSqrt(vec1.x * vec1.x + vec1.z * vec1.z)); scale = vec1.abs() * (0.001f + JREG_F(8)); diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index f91adc3e2e8..0d28f23cdae 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -1596,8 +1596,8 @@ static void ke_set(e_s1_class* i_this) { static void demo_camera(e_s1_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* spC = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* spC = dComIfGp_getCamera(0); cXyz spC4; cXyz spD0; diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index 22e73cfb0b9..a989779dfbc 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -1364,7 +1364,7 @@ static void anm_se_set(e_sf_class* i_this) { static void demo_camera(e_sf_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dComIfGp_getCamera(0); cXyz sp30, sp3c, sp48, sp54; s8 sVar1 = 0; diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index b05c57eef82..397f067d201 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -1003,7 +1003,7 @@ static int daE_SH_Execute(e_sh_class* i_this) { MTXCopy(model->getAnmMtx(13), *calc_mtx); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); s16 rotX; s16 rotY; @@ -1014,7 +1014,7 @@ static int daE_SH_Execute(e_sh_class* i_this) { if (i == 0) { unkXyz1.set(15.0f + TREG_F(0), 3.5f + TREG_F(1), TREG_F(2)); MtxPosition(&unkXyz1, &unkXyz2); - unkXyz1 = camera->lookat.eye - unkXyz2; + unkXyz1 = camera->view.lookat.eye - unkXyz2; rotY = cM_atan2s(unkXyz1.x, unkXyz1.z); rotX = -cM_atan2s(unkXyz1.y, JMAFastSqrt(unkXyz1.x * unkXyz1.x + unkXyz1.z * unkXyz1.z)); diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index 51e7972f245..3e05e7ad619 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -1373,7 +1373,7 @@ bool daE_SM_c::CheckViewArea() { } bool daE_SM_c::CameraSet() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camBody = dCam_getBody(); bool rv; @@ -1396,7 +1396,7 @@ bool daE_SM_c::CameraSet() { } void daE_SM_c::SetStopCam(cXyz param_1, f32 param_2, f32 param_3, s16 param_4) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp28(0.0f, param_3, param_2); cXyz eye(0.0f, 0.0f, 0.0f); @@ -1414,12 +1414,12 @@ void daE_SM_c::SetCMoveCam(cXyz param_1, f32 i_scale, f32 i_maxStep) { } void daE_SM_c::SetStopingCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mFovy, 0); } void daE_SM_c::SetReleaseCam() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mDemoCamCenter, mDemoCamEye); camera->mCamera.Start(); diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index e1bd691a5d5..c81be26d70e 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -1358,15 +1358,15 @@ static int daE_SM2_Execute(e_sm2_class* i_this) { if (i_this->field_0x83e != 0) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz start; cXyz end; i_this->field_0x83e--; - start.x = camera->lookat.eye.x; - start.y = camera->lookat.eye.y; - start.z = camera->lookat.eye.z; + start.x = camera->view.lookat.eye.x; + start.y = camera->view.lookat.eye.y; + start.z = camera->view.lookat.eye.z; end = actor->current.pos; end.y += 20.0f; diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index 62b0ada4907..b1b861e86a6 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -1158,7 +1158,7 @@ static void* s_child_sub(void* i_actor, void* i_data) { } void daE_SW_c::executeMaster() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); attention_info.flags = 0; @@ -2106,7 +2106,7 @@ bool daE_SW_c::d_chaseCheck() { } } - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s16 sVar1 = cLib_distanceAngleS(fopCamM_GetAngleY(camera), field_0x6cc); if (bVar1 || (sVar1 > 0x6000 && (abs((s16)(current.angle.y - field_0x6cc)) < 0x2000 || diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index cb9caf6fa0f..d030dd75652 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -683,8 +683,8 @@ static void cam_3d_morf(e_th_class* i_this, f32 param_1) { static void demo_camera(e_th_class* i_this) { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); cXyz sp8C; cXyz sp80; cXyz sp74; diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index a8ad2190253..1c26e5c7212 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -1078,7 +1078,7 @@ void daE_TT_c::action() { mSound.setLinkSearch(linkSearch); if (mAction != ACTION_DEATH && !fopAcM_CheckCondition(this, fopAcCnd_NODRAW_e)) { dBgS_LinChk linChk; - linChk.Set(&dComIfGp_getCamera(0)->lookat.eye, &attention_info.position, this); + linChk.Set(&dComIfGp_getCamera(0)->view.lookat.eye, &attention_info.position, this); if (dComIfG_Bgsp().LineCross(&linChk)) { attention_info.flags = 0; } else { diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index 64029be198b..a660d5bead4 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -1441,7 +1441,7 @@ void daE_VA_c::executeDemoOpWait() { } void daE_VA_c::executeDemoOp() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp2C; cXyz sp38; f32 old; @@ -2917,7 +2917,7 @@ void daE_VA_c::executeOpaciFadeAway() { } void daE_VA_c::executeOpaciDeath() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp24; cXyz sp30; diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index ca93e3a89de..e0111012824 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -292,8 +292,8 @@ static void demo_camera(e_warpappear_class* i_this) { }; daPy_py_c* pla = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); daHorse_c* horse = (daHorse_c*)dComIfGp_getHorseActor(); cXyz sp48, sp54; diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index 587f091acf6..bf0ea1ddaad 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -3706,8 +3706,8 @@ static void cam_3d_morf(e_wb_class* i_this, f32 i_scale) { static void demo_camera(e_wb_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; - camera_class* local_184 = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* local_188 = dComIfGp_getCamera(0); + camera_process_class* local_184 = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* local_188 = dComIfGp_getCamera(0); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); daHorse_c* horse; e_rd_class* local_194; diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index 4385f5e916c..2ca44c2c193 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -650,7 +650,7 @@ static cXyz create_pos[15] = { }; void daE_WW_c::executeMaster() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp48 = daPy_getPlayerActorClass()->current.pos; f32 temp_f30 = sp48.absXZ(current.pos); cXyz sp3C; @@ -1055,7 +1055,7 @@ void daE_WW_c::executeAttack() { bool daE_WW_c::checkAttackStart() { if (field_0x734 == 0) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s16 temp_r28 = (fopCamM_GetAngleY(camera) + 0x8000) - fopAcM_searchPlayerAngleY(this); cXyz sp14 = daPy_getPlayerActorClass()->current.pos; @@ -1880,7 +1880,7 @@ void daE_WW_c::action() { if (field_0x75d) { dBgS_LinChk lin_chk; - lin_chk.Set(&dComIfGp_getCamera(0)->lookat.eye, &attention_info.position, this); + lin_chk.Set(&dComIfGp_getCamera(0)->view.lookat.eye, &attention_info.position, this); if (dComIfG_Bgsp().LineCross(&lin_chk)) { attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e; diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index 38e63b4fa49..e77595aae99 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -3137,7 +3137,7 @@ void daE_YM_c::action() { offWolfNoLock(); if (mType == 1 && fopAcM_CheckCondition(this, 4) == 0) { dBgS_LinChk lin_chk; - lin_chk.Set(&dComIfGp_getCamera(0)->lookat.eye, &attention_info.position, this); + lin_chk.Set(&dComIfGp_getCamera(0)->view.lookat.eye, &attention_info.position, this); if (dComIfG_Bgsp().LineCross(&lin_chk)) { onWolfNoLock(); } diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index 70142c85976..74c4743c4f4 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -1316,7 +1316,7 @@ void daE_YMB_c::executeGuard() { } void daE_YMB_c::executeSwim() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s16 camAngleY = (s16) fopCamM_GetAngleY(camera); s16 cam_ply_ang_diff = camAngleY - fopAcM_searchPlayerAngleY(this); daPy_py_c* player = daPy_getPlayerActorClass(); @@ -2062,7 +2062,7 @@ void daE_YMB_c::setCreateDrop() { } void daE_YMB_c::executeDeath() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp24, pos; @@ -2207,7 +2207,7 @@ void daE_YMB_c::demo_skip(int param_1) { break; } - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mDemoCamCenter, mDemoCamEye); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); @@ -2230,7 +2230,7 @@ void daE_YMB_c::calcLakeDemoPlayerPos() { } void daE_YMB_c::executeLakeDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp24; @@ -2391,7 +2391,7 @@ void daE_YMB_c::executeLakeDemo() { } void daE_YMB_c::executeStartDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp28, sp34; @@ -2591,7 +2591,7 @@ bool daE_YMB_c::checkStartBattleDemo() { } void daE_YMB_c::executeBattleDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz sp1c(player->current.pos); cXyz sp28, sp34; diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 099d07ce37e..ea976762440 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -316,14 +316,14 @@ static void* s_BallSearch_Tag(void* i_actor, void* i_data) { } bool daE_ZH_c::startDemoCheck() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera2 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera2 = dComIfGp_getCamera(0); if (!eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0); eventInfo.onCondition(dEvtCnd_CANDEMO_e); - mDemoCamEye = camera2->lookat.eye; - mDemoCamCenter = camera2->lookat.center; + mDemoCamEye = camera2->view.lookat.eye; + mDemoCamCenter = camera2->view.lookat.center; return false; } @@ -745,7 +745,7 @@ void daE_ZH_c::damage_check() { } void daE_ZH_c::executeStartDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp48; f32 fVar1, fVar2; @@ -832,7 +832,7 @@ void daE_ZH_c::executeWait() { void daE_ZH_c::executeBallWait() { dBgS_LinChk lin_chk; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz spa4, spb0; switch (mMoveMode) { @@ -963,7 +963,7 @@ void daE_ZH_c::executeBallWait() { } void daE_ZH_c::executeOpenStart() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp28, sp34; field_0xb40.OnCoSPrmBit(0x40); @@ -1563,7 +1563,7 @@ void daE_ZH_c::executeCatchFlyMove() { } void daE_ZH_c::executeReturnDemo() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp1c, sp28; s16 sVar1; diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 433a9030b1c..fd6f20f3eb2 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -2201,7 +2201,7 @@ void daHorse_c::setMatrix() { } void daHorse_c::setDashEffect(u32* i_emitterID) { - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz* eye_p = fopCamM_GetEye_p(camera_p); if (eye_p->abs(current.pos) > 1200.0f) { diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index de8cd355c40..0fe3243d046 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -3346,7 +3346,7 @@ void daKago_c::setDamageEffect() { void daKago_c::setDashBlurEffect(int param_0) { UNUSED(param_0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz cameraEye = dCam_getBody()->Eye(); cXyz cameraEyeOffset; cXyz local_78; diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index 00416444ed5..1bebf6216cf 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -16,12 +16,12 @@ static cXyz get_check_pos(kytag00_class* i_this) { cXyz pos; if (player_p != NULL) { - f32 dist_to_cameye = a_this->current.pos.abs(camera_p->lookat.eye); + f32 dist_to_cameye = a_this->current.pos.abs(camera_p->view.lookat.eye); f32 dist_to_player = a_this->current.pos.abs(player_p->current.pos); pos = player_p->current.pos; if (dComIfGp_event_runCheck() && dist_to_cameye < dist_to_player) { - pos = camera_p->lookat.eye; + pos = camera_p->view.lookat.eye; } } else { pos.set(0.0f, 0.0f, 0.0f); diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index 2025f6acf1b..05f55eb5c5c 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -18,12 +18,12 @@ static cXyz get_check_pos(kytag01_class* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz pos; - f32 dist_to_cameye = a_this->current.pos.abs(camera->lookat.eye); + f32 dist_to_cameye = a_this->current.pos.abs(camera->view.lookat.eye); f32 dist_to_player = a_this->current.pos.abs(player->current.pos); if (dComIfGp_event_runCheck()) { if (dist_to_cameye < dist_to_player) { - pos = camera->lookat.eye; + pos = camera->view.lookat.eye; } else { pos = player->current.pos; } @@ -70,13 +70,13 @@ static void mist_tag_move(kytag01_class* i_this) { var_f31 *= i_this->field_0x594; - spBC = camera->lookat.center; - spBC.y = camera->lookat.eye.y; + spBC = camera->view.lookat.center; + spBC.y = camera->view.lookat.eye.y; - dKyr_get_vectle_calc(&camera->lookat.eye, &spBC, &sp98); - sp80.y = camera->lookat.eye.y; + dKyr_get_vectle_calc(&camera->view.lookat.eye, &spBC, &sp98); + sp80.y = camera->view.lookat.eye.y; - dKyr_get_vectle_calc(&camera->lookat.eye, &sp80, &spA4); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &sp80, &spA4); s16 var_r29_2 = cM_atan2s(sp98.x, sp98.z); s16 var_r26 = cM_atan2s(spA4.x, spA4.z); @@ -111,7 +111,7 @@ static int daKytag01_Draw(kytag01_class* i_this) { static int daKytag01_Execute(kytag01_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); fopAc_ac_c* player = dComIfGp_getPlayer(0); if ((a_this->argument & 0xFF) == 2) { diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index b1a5c745ea2..9c07bf12396 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -105,7 +105,7 @@ static dPath* set_path_info(fopAc_ac_c* i_actor) { } static void getSound_pos(fopAc_ac_c* i_actor) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz eye = camera->mCamera.Eye(); cXyz sp28; @@ -161,8 +161,8 @@ static void odour_move(kytag03_class* i_this) { if (path != NULL) { int sp40; int sp38; - var_r27 = get_Extent_pos_start_get(i_this, path, &camera->lookat.eye, 1000.0f, &sp40); - var_r25 = get_Extent_pos_end_get(i_this, path, &camera->lookat.eye, 1000.0f, &sp38); + var_r27 = get_Extent_pos_start_get(i_this, path, &camera->view.lookat.eye, 1000.0f, &sp40); + var_r25 = get_Extent_pos_end_get(i_this, path, &camera->view.lookat.eye, 1000.0f, &sp38); s16 spA; s16 sp8; @@ -214,7 +214,7 @@ static void odour_move(kytag03_class* i_this) { temp_f22 *= temp_f22; var_f23 *= i_this->field_0x57c; - f32 var_f1_4 = camera->lookat.eye.abs(sp94); + f32 var_f1_4 = camera->view.lookat.eye.abs(sp94); if (var_f23 > 0.0f && var_f1_4 < 4000.0f) { csXyz spFC; cXyz spB8; diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index f1b6f691b42..b246ce93e55 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -13,7 +13,7 @@ static int daKytag04_Draw(kytag04_class* i_this) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); Mtx sp40; cXyz sp50; cXyz sp5C; diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index b4e1b871313..45b52b99997 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -513,7 +513,7 @@ static void daKytag06_type_07_Execute(kytag06_class* i_this) { cXyz spX; f32 current_time = dComIfGs_getTime(); dScnKy_env_light_c* env_light = dKy_getEnvlight(); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (i_this->field_0x574 == 0) { if (current_time > 285.0f || current_time < 82.5f) { @@ -573,7 +573,7 @@ static void daKytag06_type_07_Execute(kytag06_class* i_this) { daKytag06_type_07_wether_Execute(i_this); if (camera != NULL) { - if (camera->lookat.eye.y > 0.0f) { + if (camera->view.lookat.eye.y > 0.0f) { dKy_BossLight_set(&spX, &color, i_this->mWindPower * 2.0f, 0); g_env_light.bg_amb_col[3].r = (u8)(i_this->mWindPower * 230.0f + 25.0f); g_env_light.bg_amb_col[3].g = (u8)(i_this->mWindPower * 215.0f + 30.0f); @@ -711,9 +711,9 @@ static void daKytag06_type_10_Execute(kytag06_class* i_this) { } dKyw_evt_wind_set_go(); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); - cXyz eye(camera->lookat.eye); + cXyz eye(camera->view.lookat.eye); if (camera != NULL) { if (((eye.x > 2079.0f && eye.x < 3013.0f && eye.y < 864.0f && eye.z > -6000.0f && @@ -865,12 +865,12 @@ static int daKytag06_Execute(kytag06_class* i_this) { switch (i_this->mType) { case 1: { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (i_this->mpPath != NULL) { int target1 = 0; int target2 = 0; - dPnt* pnt = near_rail_get(i_this, &camera->lookat.eye); + dPnt* pnt = near_rail_get(i_this, &camera->view.lookat.eye); if (pnt != NULL && pnt->mArg0 != 0xFF) { dKy_change_colpat(pnt->mArg0); diff --git a/src/d/actor/d_a_kytag10.cpp b/src/d/actor/d_a_kytag10.cpp index 57db98a16e9..b0d7d550238 100644 --- a/src/d/actor/d_a_kytag10.cpp +++ b/src/d/actor/d_a_kytag10.cpp @@ -64,7 +64,7 @@ static dPath* get_Extent_pos_end_get(kytag10_class* i_this, dPath* i_path, cXyz* } static void sparks_move(kytag10_class* i_this) { - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); cXyz ratio_pos_1; cXyz ratio_pos_2; @@ -76,11 +76,11 @@ static void sparks_move(kytag10_class* i_this) { if (path_p != NULL) { int start_point_idx; - dPath* path_start = get_Extent_pos_start_get(i_this, path_p, &camera_p->lookat.eye, + dPath* path_start = get_Extent_pos_start_get(i_this, path_p, &camera_p->view.lookat.eye, 1000.0f, &start_point_idx); int end_point_idx; - dPath* path_end = get_Extent_pos_end_get(i_this, path_p, &camera_p->lookat.eye, 1000.0f, + dPath* path_end = get_Extent_pos_end_get(i_this, path_p, &camera_p->view.lookat.eye, 1000.0f, &end_point_idx); s16 spD6; diff --git a/src/d/actor/d_a_kytag13.cpp b/src/d/actor/d_a_kytag13.cpp index a320e1b8752..d6e90889b79 100644 --- a/src/d/actor/d_a_kytag13.cpp +++ b/src/d/actor/d_a_kytag13.cpp @@ -67,7 +67,7 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) { } } - snow_packet->field_0x6d74 = camera->lookat.eye; + snow_packet->field_0x6d74 = camera->view.lookat.eye; sp110.x = sp110.y = sp110.z = 0.0f; cXyz* temp_r27 = dKyw_get_wind_vec(); @@ -87,9 +87,9 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) { dKyr_get_vectle_calc(&sp158, &a_this->current.pos, &sp64); cXyz sp170; - sp88.x = camera->lookat.center.x - camera->lookat.eye.x; + sp88.x = camera->view.lookat.center.x - camera->view.lookat.eye.x; sp88.y = 0.0; - sp88.z = camera->lookat.center.z - camera->lookat.eye.z; + sp88.z = camera->view.lookat.center.z - camera->view.lookat.eye.z; vectle_calc(&sp88, &sp170); snow_packet->field_0x6d84 = cM3d_VectorProduct2d(0.0f, 0.0f, -sp11c.x, -sp11c.z, sp170.x, sp170.z); @@ -170,11 +170,11 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) { var_f29 = 0.0f; } - if (camera->lookat.eye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f) { + if (camera->view.lookat.eye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f) { var_f28 = temp_f30; } - if (camera->lookat.eye.abs(snow_packet->mSnowEff[i].mBasePos) < 500.0f) { + if (camera->view.lookat.eye.abs(snow_packet->mSnowEff[i].mBasePos) < 500.0f) { var_f29 = temp_f30; } diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index cd3ff1ef191..02801d4b98a 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -321,8 +321,8 @@ static int daFshop_Draw(fshop_class* i_this) { camera_class* camera = (camera_class*)dComIfGp_getCamera(0); for (int i = 0; i < 48; i++) { - f32 fVar4 = i_this->mLure[i].field_0x00.x - camera->lookat.eye.x; - f32 fVar5 = i_this->mLure[i].field_0x00.z - camera->lookat.eye.z; + f32 fVar4 = i_this->mLure[i].field_0x00.x - camera->view.lookat.eye.x; + f32 fVar5 = i_this->mLure[i].field_0x00.z - camera->view.lookat.eye.z; if (SQUARE(fVar4) + SQUARE(fVar5) > KREG_F(11) + 1200.0f) { g_env_light.setLightTevColorType_MAJI(i_this->mLure[i].model, &actor->tevStr); mDoExt_modelUpdateDL(i_this->mLure[i].model); @@ -1037,7 +1037,7 @@ static int daFshop_Execute(fshop_class* i_this) { mDoMtx_stack_c::scaleM(actor->scale.x, actor->scale.x, actor->scale.x); mDoMtx_stack_c::transM(0.0f, (190.0f + hREG_F(11)) * actor->scale.x, 0.0f); - local_cc = pmVar11->lookat.eye - actor->current.pos; + local_cc = pmVar11->view.lookat.eye - actor->current.pos; mDoMtx_stack_c::YrotM(cM_atan2s(local_cc.x, local_cc.z)); mDoMtx_stack_c::XrotM(-cM_atan2s(local_cc.y, JMAFastSqrt((local_cc.x * local_cc.x + local_cc.z * local_cc.z)))); i_this->ballModel->setBaseTRMtx(mDoMtx_stack_c::get()); diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index c849337c1eb..830f5a9553f 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -221,9 +221,9 @@ static int dmg_rod_Draw(dmg_rod_class* i_this) { } else { if (dComIfGp_checkPlayerStatus0(0, 0x2000)) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(0); - f32 dx = player->current.pos.x - camera->lookat.eye.x; - f32 dz = player->current.pos.z - camera->lookat.eye.z; + camera_process_class* camera = dComIfGp_getCamera(0); + f32 dx = player->current.pos.x - camera->view.lookat.eye.x; + f32 dz = player->current.pos.z - camera->view.lookat.eye.z; if ((SQUARE(dx) + SQUARE(dz)) < 5000.0f) { return 1; @@ -1085,9 +1085,9 @@ static void lure_onboat(dmg_rod_class* i_this) { i_this->timers[1] = 10; i_this->field_0x14f8 = 0; - camera_class* camera = dComIfGp_getCamera(0); - f32 x_delta = camera->lookat.center.x - camera->lookat.eye.x; - f32 z_delta = camera->lookat.center.z - camera->lookat.eye.z; + camera_process_class* camera = dComIfGp_getCamera(0); + f32 x_delta = camera->view.lookat.center.x - camera->view.lookat.eye.x; + f32 z_delta = camera->view.lookat.center.z - camera->view.lookat.eye.z; i_this->field_0x1418 = cM_atan2s(x_delta, z_delta); daAlink_getAlinkActorClass()->setCanoeFishingWaitAngle(i_this->field_0x1418); @@ -1267,7 +1267,7 @@ static int lure_standby(dmg_rod_class* i_this) { i_this->action = ACTION_LURE_ONBOAT; i_this->play_cam_mode = 0; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(i_this->play_cam_center, i_this->play_cam_eye, i_this->play_cam_fovy, 0); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); @@ -1301,7 +1301,7 @@ static void lure_cast(dmg_rod_class* i_this) { i_this->action = ACTION_LURE_ONBOAT; i_this->play_cam_mode = 0; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(i_this->play_cam_center, i_this->play_cam_eye, i_this->play_cam_fovy, 0); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); @@ -2301,7 +2301,7 @@ static void lure_action(dmg_rod_class* i_this) { i_this->play_cam_mode = 20; i_this->play_cam_timer = 0; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.SetTrimSize(1); i_this->action = ACTION_LURE_BARE; @@ -2690,7 +2690,7 @@ static void lure_catch(dmg_rod_class* i_this) { i_this->field_0x1418 = daAlink_getAlinkActorClass()->shape_angle.y; i_this->camera_morf_rate = 0.0f; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.SetTrimSize(1); daAlink_getAlinkActorClass()->onFishingKeep(); data_80450C9B = 2; @@ -2778,7 +2778,7 @@ static void lure_bare(dmg_rod_class* i_this) { i_this->play_cam_mode = 5; i_this->camera_morf_rate = 1.0f; i_this->field_0x1407 = 110; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.SetTrimSize(1); i_this->action = ACTION_LURE_ACTION; i_this->field_0x1006 = 0; @@ -2884,7 +2884,7 @@ static void lure_heart(dmg_rod_class* i_this) { i_this->field_0x1418 = daAlink_getAlinkActorClass()->shape_angle.y; i_this->camera_morf_rate = 0.0f; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.SetTrimSize(1); daAlink_getAlinkActorClass()->onFishingKeep(); @@ -4470,8 +4470,8 @@ static void play_camera(dmg_rod_class* i_this) { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); fopAc_ac_c* mgfish_a = fopAcM_SearchByID(i_this->mg_fish_id); mg_fish_class* mgfish = (mg_fish_class*)mgfish_a; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera0 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera0 = dComIfGp_getCamera(0); dBgS_GndChk gndChk; dBgS_ObjGndChk_Spl sp1F0; @@ -4531,8 +4531,8 @@ static void play_camera(dmg_rod_class* i_this) { i_this->field_0x1428 = 100.0f + WREG_F(1); sp58 = (camera_class*)dComIfGp_getCamera(0); - i_this->field_0x144c = sp58->lookat.eye; - i_this->field_0x1458 = sp58->lookat.center; + i_this->field_0x144c = sp58->view.lookat.eye; + i_this->field_0x1458 = sp58->view.lookat.center; i_this->play_cam_eye = i_this->field_0x144c; i_this->play_cam_center = i_this->field_0x1458; @@ -4778,8 +4778,8 @@ static void play_camera(dmg_rod_class* i_this) { f32 sp2C = -20.0f + (20.0f * cM_ssin(i_this->counter * 700)); actor->eyePos.y = actor->current.pos.y + sp2C; if (TREG_S(7) != 0) { - camera_class* sp28 = dComIfGp_getCamera(0); - actor->eyePos = sp28->lookat.eye; + camera_process_class* sp28 = dComIfGp_getCamera(0); + actor->eyePos = sp28->view.lookat.eye; } i_this->field_0xf78 = 0.05f; break; @@ -4909,9 +4909,9 @@ static void play_camera(dmg_rod_class* i_this) { player->changeOriginalDemo(); player->changeDemoMode(1, 1, 0, 0); - sp174.x = camera0->lookat.eye.x - camera0->lookat.center.x; - sp174.y = camera0->lookat.eye.y - camera0->lookat.center.y; - sp174.z = camera0->lookat.eye.z - camera0->lookat.center.z; + sp174.x = camera0->view.lookat.eye.x - camera0->view.lookat.center.x; + sp174.y = camera0->view.lookat.eye.y - camera0->view.lookat.center.y; + sp174.z = camera0->view.lookat.eye.z - camera0->view.lookat.center.z; i_this->field_0x1400 = cM_atan2s(sp174.x, sp174.z) - player->shape_angle.y; if (i_this->field_0x1400 >= 0) { @@ -4922,7 +4922,7 @@ static void play_camera(dmg_rod_class* i_this) { i_this->field_0x1404 = -cM_atan2s(sp174.y, JMAFastSqrt(SQUARE(sp174.x) + SQUARE(sp174.z))); i_this->field_0x1464 = sp174.abs(); - i_this->play_cam_center_target = camera0->lookat.center; + i_this->play_cam_center_target = camera0->view.lookat.center; case 901: if (daAlink_getAlinkActorClass()->checkCanoeRide()) { fopAc_ac_c* sp24 = fopAcM_SearchByID(i_this->boat_actor_id); @@ -5300,7 +5300,7 @@ static void play_camera_u(dmg_rod_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor; fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); fopAc_ac_c* mgfish_a = fopAcM_SearchByID(i_this->mg_fish_id); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); i_this->field_0x13b0 = i_this->rod_substick_y; i_this->field_0x13ac = i_this->rod_substick_x; @@ -5327,8 +5327,8 @@ static void play_camera_u(dmg_rod_class* i_this) { camera_class* sp10 = (camera_class*)dComIfGp_getCamera(0); camera->mCamera.SetTrimSize(1); - i_this->play_cam_eye = sp10->lookat.eye; - i_this->play_cam_center = sp10->lookat.center; + i_this->play_cam_eye = sp10->view.lookat.eye; + i_this->play_cam_center = sp10->view.lookat.center; i_this->camera_morf_rate = 1000.0f; } /* fallthrough */ @@ -6048,7 +6048,7 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { static int dmg_rod_IsDelete(dmg_rod_class* i_this) { if (i_this->play_cam_mode != 0) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(i_this->play_cam_center, i_this->play_cam_eye, i_this->play_cam_fovy, 0); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 48d785a7cec..10c0fe849af 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -708,13 +708,13 @@ BOOL daNbomb_c::procExplodeInit() { } BOOL daNbomb_c::procExplode() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); f32 dist_scale = 0.0f; mLightInfluence.mPow = mExplosionStrength * 1500.0f; mWindInfluence.mStrength = mExplosionStrength; - f32 dist_to_cam = current.pos.abs(camera->lookat.eye); + f32 dist_to_cam = current.pos.abs(camera->view.lookat.eye); if (dist_to_cam < 1500.0f) { dist_scale = dist_to_cam / 1500.0f; dist_scale *= dist_scale * dist_scale; diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp index 9d31126b3e5..720f86b6c99 100644 --- a/src/d/actor/d_a_ni.cpp +++ b/src/d/actor/d_a_ni.cpp @@ -1040,8 +1040,8 @@ static int ni_play(ni_class* i_this) { sp78.y = 0.0f; sp78.z = -i_this->mPadMainStickY; - camera_class* camera = dComIfGp_getCamera(0); - sp84 = camera->lookat.center - camera->lookat.eye; + camera_process_class* camera = dComIfGp_getCamera(0); + sp84 = camera->view.lookat.center - camera->view.lookat.eye; cMtx_YrotS(*calc_mtx, cM_atan2s(-sp84.x, -sp84.z)); MtxPosition(&sp78, &sp84); @@ -1159,7 +1159,7 @@ static int ni_play(ni_class* i_this) { static void play_camera(ni_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_class* camera0 = (camera_class*)dComIfGp_getCamera(0); daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); cXyz sp1D8; @@ -1200,8 +1200,8 @@ static void play_camera(ni_class* i_this) { camera->mCamera.Stop(); i_this->field_0xafc = 500.0f; - i_this->field_0xac8 = camera0->lookat.eye; - i_this->field_0xad4 = camera0->lookat.center; + i_this->field_0xac8 = camera0->view.lookat.eye; + i_this->field_0xad4 = camera0->view.lookat.center; i_this->field_0xaec = dComIfGd_getView()->fovy; player->changeOriginalDemo(); diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 0b41cad2b4b..55a35befc27 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -152,10 +152,10 @@ static int daNpc_Henna_Draw(npc_henna_class* i_this) { g_env_light.settingTevStruct(0, &a_this->current.pos, &a_this->tevStr); if (i_this->field_0x694 == 0) { - camera_class* camera = dComIfGp_getCamera(0); - f32 lookOffsetX = camera->lookat.eye.x - a_this->current.pos.x; - f32 lookOffsetY = camera->lookat.eye.y - a_this->current.pos.y; - f32 lookOffsetZ = camera->lookat.eye.z - a_this->current.pos.z; + camera_process_class* camera = dComIfGp_getCamera(0); + f32 lookOffsetX = camera->view.lookat.eye.x - a_this->current.pos.x; + f32 lookOffsetY = camera->view.lookat.eye.y - a_this->current.pos.y; + f32 lookOffsetZ = camera->view.lookat.eye.z - a_this->current.pos.z; if (lookOffsetY > 190.0f + JREG_F(16) || lookOffsetY < 0.0f || lookOffsetX * lookOffsetX + lookOffsetZ * lookOffsetZ > 700.0f + JREG_F(17)) { @@ -658,11 +658,11 @@ static void henna_ride(npc_henna_class* i_this) { } if (dComIfGp_checkPlayerStatus0(0, 0x2000) != 0) { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz vecToPlayer; - vecToPlayer = actor->eyePos - camera->lookat.eye; - lookat_pos = camera->lookat.center - camera->lookat.eye; + vecToPlayer = actor->eyePos - camera->view.lookat.eye; + lookat_pos = camera->view.lookat.center - camera->view.lookat.eye; s16 reg_r27 = (s16)cM_atan2s(lookat_pos.x, lookat_pos.z); s16 sp_0x8 = (s16)cM_atan2s(vecToPlayer.x, vecToPlayer.z); @@ -848,11 +848,11 @@ static void cam_3d_morf(npc_henna_class* i_this, f32 param_1) { static void demo_camera(npc_henna_class* i_this) { fopAc_ac_c* actor = &i_this->actor; - camera_class* camera; + camera_process_class* camera; fopAc_ac_c* unused1 = dComIfGp_getPlayer(0); camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* unused2 = dComIfGp_getCamera(0); + camera_process_class* unused2 = dComIfGp_getCamera(0); cXyz unkXyz; cXyz unkXyz2; // unused @@ -923,16 +923,16 @@ static int zoom_check(npc_henna_class* i_this, cXyz* target, s16 tolerance) { // unused assignments are needed for debug match fopAc_ac_c* a_this = &i_this->actor; fopAc_ac_c* unusedPlayer = (fopAc_ac_c*)dComIfGp_getPlayer(0); - camera_class* unusedCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* unusedCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_class* camera = (camera_class*)dComIfGp_getCamera(0); cXyz target_pos; cXyz lookat_pos; - target_pos = *target - camera->lookat.eye; + target_pos = *target - camera->view.lookat.eye; if (JMAFastSqrt(target_pos.x * target_pos.x + target_pos.z * target_pos.z) < 300.0f + XREG_F(10)) { - lookat_pos = camera->lookat.center - camera->lookat.eye; + lookat_pos = camera->view.lookat.center - camera->view.lookat.eye; s16 lookat_angle = (s16)cM_atan2s(lookat_pos.x, lookat_pos.z); s16 target_angle = (s16)cM_atan2s(target_pos.x, target_pos.z); lookat_angle -= target_angle; @@ -984,8 +984,8 @@ static void demo_camera_shop(npc_henna_class* i_this) { fopAc_ac_c* actor = &i_this->actor; fopAc_ac_c* player = dComIfGp_getPlayer(0); - camera_class* playerCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* playerCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz unkXyz_78; cXyz unkXyz_6c; @@ -1407,14 +1407,14 @@ static void demo_camera_shop(npc_henna_class* i_this) { i_this->field_0x7bc = 50.0f; playerCamera->mCamera.SetTrimSize(1); daPy_getPlayerActorClass()->onPlayerNoDraw(); - unkXyz_78 = camera->lookat.center - camera->lookat.eye; + unkXyz_78 = camera->view.lookat.center - camera->view.lookat.eye; i_this->field_0x758 = (s16) cM_atan2s(unkXyz_78.x, unkXyz_78.z); i_this->field_0x75c = -cM_atan2s( unkXyz_78.y, JMAFastSqrt(unkXyz_78.x * unkXyz_78.x + unkXyz_78.z * unkXyz_78.z)); i_this->field_0x7c4 = unkXyz_78.abs(); } case 41: { - i_this->field_0x760 = camera->lookat.eye; + i_this->field_0x760 = camera->view.lookat.eye; cMtx_YrotS(*calc_mtx, i_this->field_0x758); cMtx_XrotM(*calc_mtx, i_this->field_0x75c); unkXyz_78.x = 0.0f; @@ -1422,7 +1422,7 @@ static void demo_camera_shop(npc_henna_class* i_this) { unkXyz_78.z = i_this->field_0x7c4; MtxPosition(&unkXyz_78, &i_this->field_0x76c); i_this->field_0x76c += i_this->field_0x760; - unkXyz_78 = i_this->field_0x7a8 - camera->lookat.eye; + unkXyz_78 = i_this->field_0x7a8 - camera->view.lookat.eye; if (i_this->field_0x7b4 != 8 && i_this->field_0x7b4 != 7) { cLib_addCalcAngleS2(&i_this->field_0x758, cM_atan2s(unkXyz_78.x, unkXyz_78.z), 8, 0x800); @@ -2272,7 +2272,7 @@ static void env_control(npc_henna_class* i_this) { cXyz mae; cXyz ato; dScnKy_env_light_c* env = dKy_getEnvlight(); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); mae.x = -2591.0f - player->current.pos.x; mae.z = -6742.0f - player->current.pos.z; @@ -2532,14 +2532,14 @@ static int daNpc_Henna_Execute(npc_henna_class* i_this) { i_this->field_0x694 = 0; if (i_this->field_0x7e1 == 0) { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); - lookat_pos.x = camera->lookat.center.x - camera->lookat.eye.x; - lookat_pos.z = camera->lookat.center.z - camera->lookat.eye.z; + lookat_pos.x = camera->view.lookat.center.x - camera->view.lookat.eye.x; + lookat_pos.z = camera->view.lookat.center.z - camera->view.lookat.eye.z; s16 camera_rot = cM_atan2s(lookat_pos.x, lookat_pos.z); - lookat_pos.x = actor->current.pos.x - camera->lookat.eye.x; - lookat_pos.z = actor->current.pos.z - camera->lookat.eye.z; + lookat_pos.x = actor->current.pos.x - camera->view.lookat.eye.x; + lookat_pos.z = actor->current.pos.z - camera->view.lookat.eye.z; s16 angle_diff = cM_atan2s(lookat_pos.x, lookat_pos.z) - camera_rot; if (i_this->cam_mode == 0 && (angle_diff > 0x4000 || angle_diff < -0x4000) && diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 851fe491aef..3630f58d8cd 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -1033,9 +1033,9 @@ static void npc_ks_home(npc_ks_class* i_this) { i_this->path_no = 0; i_this->field_0xaec = 1; if (fopAcM_CheckCondition(actor, 4) != 0) { - camera_class* camera = dComIfGp_getCamera(0); - mae.x = camera->lookat.eye.x - camera->lookat.center.x; - mae.z = camera->lookat.eye.z - camera->lookat.center.z; + camera_process_class* camera = dComIfGp_getCamera(0); + mae.x = camera->view.lookat.eye.x - camera->view.lookat.center.x; + mae.z = camera->view.lookat.eye.z - camera->view.lookat.center.z; cMtx_YrotS(*calc_mtx, cM_atan2s(mae.x, mae.z)); if ((i_this->set_id & 1) != 0) { mae.x = 100.0f; @@ -1045,7 +1045,7 @@ static void npc_ks_home(npc_ks_class* i_this) { mae.y = -50.0f; mae.z = 200.0f; MtxPosition(&mae, &ato); - actor->current.pos = camera->lookat.eye + ato; + actor->current.pos = camera->view.lookat.eye + ato; actor->old = actor->current; } } @@ -1802,12 +1802,12 @@ static void hang_end_check(npc_ks_class* i_this) { i_this->field_0xaec = 1; actor->current.angle.x = 0; if (fopAcM_CheckCondition(actor, 4) != 0) { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (checkDoorDemo()) { cMtx_YrotS(*calc_mtx, player->shape_angle.y + 0x8000); } else { - mae.x = camera->lookat.eye.x - camera->lookat.center.x; - mae.z = camera->lookat.eye.z - camera->lookat.center.z; + mae.x = camera->view.lookat.eye.x - camera->view.lookat.center.x; + mae.z = camera->view.lookat.eye.z - camera->view.lookat.center.z; cMtx_YrotS(*calc_mtx, cM_atan2s(mae.x, mae.z)); } @@ -1819,7 +1819,7 @@ static void hang_end_check(npc_ks_class* i_this) { mae.y = -50.0f; mae.z = 100.0f; MtxPosition(&mae, &ato); - actor->current.pos = camera->lookat.eye + ato; + actor->current.pos = camera->view.lookat.eye + ato; actor->old = actor->current; } } @@ -2537,8 +2537,8 @@ static void* s_fsdown_sub(void* i_actor, void* i_data) { static void demo_camera(npc_ks_class* i_this) { fopAc_ac_c* actor = &i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* unused_cam_p = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* unused_cam_p = dComIfGp_getCamera(0); obj_sw_class* sw_p = i_this->child_no; fopAc_ac_c* base_sw_p = &sw_p->actor; cXyz mae, ato; @@ -4048,14 +4048,14 @@ static int npc_ks_option(npc_ks_class* i_this) { (fopAcM_CheckCondition(actor, 4) != 0 && fopAcM_otherBgCheck(actor, dComIfGp_getPlayer(0)))) { if (iVar1 != 0 && player3->speedF > 2.0f) { camera_class* camera = (camera_class*) dComIfGp_getCamera(0); - mae.x = camera->lookat.eye.x - camera->lookat.center.x; - mae.z = camera->lookat.eye.z - camera->lookat.center.z; + mae.x = camera->view.lookat.eye.x - camera->view.lookat.center.x; + mae.z = camera->view.lookat.eye.z - camera->view.lookat.center.z; cMtx_YrotS(*calc_mtx, cM_atan2s(mae.x, mae.z)); mae.x = 0.0f; mae.y = -50.0f; mae.z = 100.0f; MtxPosition(&mae, &ato); - ato += camera->lookat.eye; + ato += camera->view.lookat.eye; dBgS_GndChk gnd_chk; gnd_chk.SetPos(&ato); diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp index e1d196d8293..06b44c70bb3 100644 --- a/src/d/actor/d_a_npc_lf.cpp +++ b/src/d/actor/d_a_npc_lf.cpp @@ -202,15 +202,15 @@ static void action(fopAc_ac_c* param_0, lf_s* pFish) { static int daNPC_LF_Execute(npc_lf_class* i_this2) { npc_lf_class* i_this = (npc_lf_class*) i_this2; - view_class* camera; + camera_class* camera; lf_s* fish; cXyz pos; cXyz pos2; camera = dComIfGp_getCamera(0); fish = i_this->mFish; for (int i = 0; i < i_this->mIter; i++, fish++) { - pos.x = fish->mPos.x - camera->lookat.eye.x; - pos.z = fish->mPos.z - camera->lookat.eye.z; + pos.x = fish->mPos.x - camera->view.lookat.eye.x; + pos.z = fish->mPos.z - camera->view.lookat.eye.z; if (JMAFastSqrt((pos.x * pos.x) + (pos.z * pos.z)) < 1500.0f) { fish->field_0x17 = 0; diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index 5d1c8bde1eb..a4242188411 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -2345,13 +2345,13 @@ static void action(npc_ne_class* i_this) { } else if (!i_this->mNoFollow) { if (i_this->mDistToTarget > 700.0f && fopAcM_CheckCondition(_this, 4) && player->speedF > 2.0f) { - camera_class* camera = dComIfGp_getCamera(0); - vec1.x = camera->lookat.eye.x - camera->lookat.center.x; - vec1.z = camera->lookat.eye.z - camera->lookat.center.z; + camera_process_class* camera = dComIfGp_getCamera(0); + vec1.x = camera->view.lookat.eye.x - camera->view.lookat.center.x; + vec1.z = camera->view.lookat.eye.z - camera->view.lookat.center.z; mDoMtx_YrotS(*calc_mtx, cM_atan2s(vec1.x, vec1.z)); vec1.set(0.0f, -50.0f, 100.0f); MtxPosition(&vec1, &vec2); - vec2 += camera->lookat.eye; + vec2 += camera->view.lookat.eye; dBgS_ObjGndChk_Spl gnd_chk_spl; gnd_chk_spl.SetPos(&vec2); f32 cross = dComIfG_Bgsp().GroundCross(&gnd_chk_spl); @@ -2603,7 +2603,7 @@ static void action(npc_ne_class* i_this) { static void demo_camera(npc_ne_class* i_this) { fopAc_ac_c* _this = static_cast(i_this); daPy_py_c* player = static_cast(dComIfGp_getPlayer(0)); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (i_this->mDemoTimer != 0) { i_this->mDemoTimer--; diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp index cb883f0b241..4f0ba6b40b2 100644 --- a/src/d/actor/d_a_npc_sq.cpp +++ b/src/d/actor/d_a_npc_sq.cpp @@ -126,8 +126,8 @@ static void cam_3d_morf(npc_sq_class* i_this, f32 i_scale) { static void demo_camera(npc_sq_class* i_this) { fopAc_ac_c* _this = static_cast(i_this); - camera_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz vec; s8 end = 0; @@ -144,8 +144,8 @@ static void demo_camera(npc_sq_class* i_this) { i_this->mCameraFovY = 55.0f; player_camera->mCamera.SetTrimSize(3); i_this->mMsgFlow.init(_this, i_this->mFlowID, 0, NULL); - i_this->mCameraEye = camera->lookat.eye; - i_this->mCameraCenter = camera->lookat.center; + i_this->mCameraEye = camera->view.lookat.eye; + i_this->mCameraCenter = camera->view.lookat.center; daPy_getPlayerActorClass()->changeOriginalDemo(); // no break diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 35879aa9cd0..ed8e4d98034 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -2363,7 +2363,7 @@ int daNpc_Taro_c::cutArrowTutorial(int param_1) { mMotionSeqMngr.setNo(0, 0.0f, 0, 0); mEventTimer = timer; if (!daNpcT_chkEvtBit(0x4c)) { - camera_class* pCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* pCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); mJntAnm.lookCamera(0); mPlayerAngle = cLib_targetAngleY(fopAcM_GetPosition_p(this), fopCamM_GetEye_p(pCamera)); } else { @@ -2433,7 +2433,7 @@ int daNpc_Taro_c::cutArrowTutorial(int param_1) { case 7: if (cLib_calcTimer(&mEventTimer) == 0) { if (!daNpcT_chkEvtBit(0x4c)) { - camera_class* pCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* pCamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); mJntAnm.lookCamera(0); cStack_48.y = cLib_targetAngleY(fopAcM_GetPosition_p(this), fopCamM_GetEye_p(pCamera)); } else { diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index 8b83afb997d..4d5440d21ff 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -2848,7 +2848,7 @@ void daNPC_TK_c::checkActionSet() { } if (mFlags & 0x1) { - camera_class* cam = dComIfGp_getCamera(0); + camera_process_class* cam = dComIfGp_getCamera(0); field_0x69e = -fopCamM_GetAngleX(cam); setActionMode(3); mFlags ^= (u16)0x1; diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index 09568aa6f6f..27382c969a7 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -501,7 +501,7 @@ void daObjARI_c::Z_BufferChk() { vec1.y += 20.0f; mDoLib_project(&vec1, &vec2); f32 trim_height; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (camera != NULL) { trim_height = camera->mCamera.TrimHeight(); } else { diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index 2085c5e0e14..c66a45b20f1 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -921,7 +921,7 @@ static int daObj_Brg_Execute(obj_brg_class* i_this) { cXyz spE8; camera_class* camera = (camera_class*) dComIfGp_getCamera(0); - spC4 = a_this->current.pos - camera->lookat.eye; + spC4 = a_this->current.pos - camera->view.lookat.eye; if (i_this->field_0xb1ef != 0) { i_this->field_0xb1ef--; @@ -937,7 +937,7 @@ static int daObj_Brg_Execute(obj_brg_class* i_this) { } if (spC4.abs() > sp1BC) { - spD0 = camera->lookat.center - camera->lookat.eye; + spD0 = camera->view.lookat.center - camera->view.lookat.eye; s16 atan_res = cM_atan2s(spD0.x, spD0.z); cMtx_YrotS(*calc_mtx, -atan_res); diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index 8082da406a3..d40992d89c7 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -291,7 +291,7 @@ void daObjCHO_c::Z_BufferChk() { vec1.y += 20.0f; mDoLib_project(&vec1, &vec2); f32 trim_height; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (camera != NULL) { trim_height = camera->mCamera.TrimHeight(); } else { diff --git a/src/d/actor/d_a_obj_crvgate.cpp b/src/d/actor/d_a_obj_crvgate.cpp index 58be175cafe..a69083ff06d 100644 --- a/src/d/actor/d_a_obj_crvgate.cpp +++ b/src/d/actor/d_a_obj_crvgate.cpp @@ -100,7 +100,7 @@ int daObjCRVGATE_c::checkOpen() { } void daObjCRVGATE_c::actionStartEvent() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camera_body = dCam_getBody(); if (!eventInfo.checkCommandDemoAccrpt()) { @@ -173,7 +173,7 @@ void daObjCRVGATE_c::actionDemoEvent() { ANGLE_ADD(mMoveAngle.z, 0x300); if (mDoorOpenAngle.x == 0x4000) { mEventID = 3; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(mCamCenter, mCamEye); camera->mCamera.Start(); diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index e8497b29854..5cdba0081f0 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -269,7 +269,7 @@ void daObjDAN_c::Z_BufferChk() { vec1.y += 20.0f; mDoLib_project(&vec1, &vec2); f32 trim_height; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (camera != NULL) { trim_height = camera->mCamera.TrimHeight(); } else { diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index 549bda0bb92..3dbd1123ed7 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -463,7 +463,7 @@ int daObjDrop_c::actionCompleteWait() { } int daObjDrop_c::actionOrderCompleteDemo() { - camera_class* pcamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* pcamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (eventInfo.checkCommandDemoAccrpt()) { pcamera->mCamera.SetTrimTypeForce(1); @@ -480,7 +480,7 @@ int daObjDrop_c::actionOrderCompleteDemo() { } int daObjDrop_c::actionCompleateDemo() { - camera_class* pcamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* pcamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); pcamera->mCamera.SetTrimTypeForce(1); if (eventInfo.checkCommandDemoAccrpt()) { diff --git a/src/d/actor/d_a_obj_gra2_base.inc b/src/d/actor/d_a_obj_gra2_base.inc index a7b10b987a7..b99ee70315c 100644 --- a/src/d/actor/d_a_obj_gra2_base.inc +++ b/src/d/actor/d_a_obj_gra2_base.inc @@ -89,7 +89,7 @@ int daObj_GrA_c::waitDemo(void* param_1) { } int daObj_GrA_c::skipDemoGra() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); daObj_GrA_c* gra_p = (daObj_GrA_c*)field_0x204c.getActor(); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); @@ -110,7 +110,7 @@ static int skipCallBack(void* param_1, int param_2) { int daObj_GrA_c::startDemo(void* param_1) { daPy_py_c* player = daPy_getPlayerActorClass(); daObj_GrA_c* gra_p = (daObj_GrA_c *)field_0x204c.getActor(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camBody = dCam_getBody(); switch (field_0xa7c) { diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index b94a6117e66..f1f496ce8b0 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -1440,7 +1440,7 @@ void daObj_GrA_c::demo_camera() { f32 fVar1; int prm_short; daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camBody = dCam_getBody(); switch (mDemoCamMode) { @@ -1581,7 +1581,7 @@ void daObj_GrA_c::rollAttackedDemo() { daPy_py_c* player = daPy_getPlayerActorClass(); int cmp_val; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camBody = dCam_getBody(); switch (mDemoCamMode) { @@ -1701,7 +1701,7 @@ void daObj_GrA_c::rollAttackedDemo() { void daObj_GrA_c::graThrowDemo() { cXyz sp2c; daPy_py_c* player = daPy_getPlayerActorClass(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); dCamera_c* camBody = dCam_getBody(); switch (mDemoCamMode) { @@ -2021,7 +2021,7 @@ void daObj_GrA_c::executeCrazyThrow() { } void daObj_GrA_c::initCrazyAttack() { - camera_class* camera; + camera_process_class* camera; if (field_0x1ff0 == 3 && field_0x1ff8 == 0) { field_0x1ff0 = 4; diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index 78c7653e700..1868121f5ff 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -341,9 +341,9 @@ int daObjHHASHI_c::Execute(f32 (**param_1)[3][4]) { int daObjHHASHI_c::Draw() { if (dComIfGp_event_runCheck()) { - camera_class* pCamera = dComIfGp_getCamera(0); - f32 xdiff = current.pos.x - pCamera->lookat.eye.x; - f32 zdiff = current.pos.z - pCamera->lookat.eye.z; + camera_process_class* pCamera = dComIfGp_getCamera(0); + f32 xdiff = current.pos.x - pCamera->view.lookat.eye.x; + f32 zdiff = current.pos.z - pCamera->view.lookat.eye.z; if (JMAFastSqrt(xdiff * xdiff + zdiff * zdiff) < 200.0f) { return 1; } diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 43a078154cd..3c6fdd1ae24 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -746,7 +746,7 @@ void daObjIceBlk_c::actionWait() { } void daObjIceBlk_c::actionOrderEvent() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (eventInfo.checkCommandDemoAccrpt()) { setAction(ACTION_EVENT_e); @@ -761,7 +761,7 @@ void daObjIceBlk_c::actionOrderEvent() { } void daObjIceBlk_c::actionEvent() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (mMode != MODE_PROC_WALK_e) { camera->mCamera.Start(); diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index 919629415b9..97f8029d4bb 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -445,7 +445,7 @@ void daItem_c::procMainSimpleGetDemo() { current.pos.y = item_pos.y; } - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); shape_angle.x = fopCamM_GetAngleX(camera); shape_angle.y = fopCamM_GetAngleY(camera); shape_angle.z = fopCamM_GetAngleZ(camera); diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index c1435c9724e..7cc28ed5cf9 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -435,7 +435,7 @@ void daObjKABUTO_c::Z_BufferChk() { vec1.y += 20.0f; mDoLib_project(&vec1, &vec2); f32 trim_height; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (camera != NULL) { trim_height = camera->mCamera.TrimHeight(); } else { diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index b654e91fa5c..a03409ef012 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -518,7 +518,7 @@ void daObjKAM_c::Z_BufferChk() { currentOffset = current.pos; currentOffset.y += 20.0f; mDoLib_project(¤tOffset, ¤tProj); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); f32 cameraHeight; if (camera != NULL) { cameraHeight = camera->mCamera.TrimHeight(); diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index 6cb86dc3e48..f4bedd7f150 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -613,7 +613,7 @@ void daObjKAT_c::Z_BufferChk() { curWithOff.y += 20.0f; mDoLib_project(&curWithOff, &projected); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); f32 unkFloat1; if (camera != NULL) { unkFloat1 = camera->mCamera.TrimHeight(); diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index 31481c7faff..f5d27fa4aec 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -530,7 +530,7 @@ void daObjKUW_c::Z_BufferChk() { cStack_68.y += 20.0f; mDoLib_project(&cStack_68, &local_5c); - camera_class* cc = dComIfGp_getCamera(0); + camera_process_class* cc = dComIfGp_getCamera(0); f32 trimHeight; if (cc != NULL) { trimHeight = cc->mCamera.TrimHeight(); diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index 77011548d5c..9352de063fa 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -197,10 +197,10 @@ static int set_out_check(obj_lp_class* i_this, cXyz* param_2) { return 1; } - camera_class* camera = dComIfGp_getCamera(0); - sp3c = camera->lookat.center - camera->lookat.eye; + camera_process_class* camera = dComIfGp_getCamera(0); + sp3c = camera->view.lookat.center - camera->view.lookat.eye; s16 sVar1 = cM_atan2s(sp3c.x, sp3c.z); - sp3c = *param_2 - camera->lookat.eye; + sp3c = *param_2 - camera->view.lookat.eye; s16 sVar2 = cM_atan2s(sp3c.x, sp3c.z); s16 diff = sVar1 - sVar2; @@ -242,12 +242,12 @@ static int daObj_Lp_Execute(obj_lp_class* i_this) { } } - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); wd_ss* WdSs = i_this->mWdSs; for (int i = 0; i < i_this->field_0xad98; i++, WdSs++) { if ((i_this->field_0x574 + i & 0x1f) == 0) { - f32 fVar1 = WdSs->field_0x10.x - camera->lookat.eye.x; - f32 fVar2 = WdSs->field_0x10.z - camera->lookat.eye.z; + f32 fVar1 = WdSs->field_0x10.x - camera->view.lookat.eye.x; + f32 fVar2 = WdSs->field_0x10.z - camera->view.lookat.eye.z; fVar1 = JMAFastSqrt(fVar1 * fVar1 + fVar2 * fVar2); if (fVar1 < 5000.0f) { WdSs->field_0x4f = 0; diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index 4a67dd0f3aa..3dcc1837dee 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -782,7 +782,7 @@ void daSCannon_c::initEmtLine() { cXyz pos; csXyz rot; - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (camera_p != NULL) { pos = *fopCamM_GetEye_p(camera_p); rot.set(dCam_getAngleX(camera_p), dCam_getAngleY(camera_p), 0); @@ -795,7 +795,7 @@ void daSCannon_c::exeEmtLine() { cXyz pos; JGeometry::TVec3 rot; if (mpEmtLine != NULL) { - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (camera_p != NULL) { pos = *fopCamM_GetEye_p(camera_p); rot.x = dCam_getAngleX(camera_p); diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index fe265afb004..e425d3b490c 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -410,7 +410,7 @@ void daObjSCannonTen_c::initEmtLine() { cXyz pos; csXyz rot; - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (camera_p != NULL) { pos = *fopCamM_GetEye_p(camera_p); rot.set(dCam_getAngleX(camera_p), dCam_getAngleY(camera_p), 0); @@ -423,7 +423,7 @@ void daObjSCannonTen_c::exeEmtLine() { cXyz pos; JGeometry::TVec3 rot; if (mpEmtLine != NULL) { - camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (camera_p != NULL) { pos = *fopCamM_GetEye_p(camera_p); rot.x = dCam_getAngleX(camera_p); diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index c5e18e4756b..01319f599d6 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -433,7 +433,7 @@ void daKey_c::effectStop() { void daKey_c::effectCtrl() { cXyz eff_scale; - f32 cam_dist = current.pos.abs(dComIfGp_getCamera(0)->lookat.eye); + f32 cam_dist = current.pos.abs(dComIfGp_getCamera(0)->view.lookat.eye); f32 var_f29 = 1000.0f; f32 max_size = 3.0f; f32 size = 1.0f; diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 47ffa2a36c0..d3e41127843 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -805,7 +805,7 @@ static void part_move(obj_so_class* i_this) { static void demo_camera(obj_so_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz sp30, sp3c; switch (i_this->mDemoMode) { diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp index 4f5209e7bcc..a3673ea61f0 100644 --- a/src/d/actor/d_a_obj_sw.cpp +++ b/src/d/actor/d_a_obj_sw.cpp @@ -277,8 +277,8 @@ static void sc_move(obj_sw_class* i_this) { static void demo_camera(obj_sw_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - camera_class* zero_camera_p = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* zero_camera_p = dComIfGp_getCamera(0); cXyz sp24, sp30; switch (i_this->mDemoMode) { diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index 3b93a8ee2ee..a391ee007d0 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -594,7 +594,7 @@ void daObjTEN_c::Z_BufferChk() { cStack_68 = current.pos; cStack_68.y += 20.0f; mDoLib_project(&cStack_68, &local_5c); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); f32 trimHeight; if (camera != NULL) { trimHeight = camera->mCamera.TrimHeight(); diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index 246b26e4235..0ea49a1a085 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -325,7 +325,7 @@ static void yuka_control(obj_toby_class* i_this) { static void demo_camera(obj_toby_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz acStack_2c; cXyz cStack_38; cXyz cStack_44; diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index d184d922171..d9b890b65d4 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -328,7 +328,7 @@ void daObjTobyHouse_c::demoProc() { csXyz cStack_98; fopAcM_SearchByName(PROC_NPC_TOBY); cXyz cStack_30(-600.0f, 70.0f, 380.0f); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz* pCamEye = fopCamM_GetEye_p(camera); csXyz local_a0(dCam_getAngleX(camera), dCam_getAngleY(camera), 0); int actIdx = dComIfGp_evmng_getMyActIdx(mStaffId, (char**)action_table, 7, 0, 0); @@ -534,7 +534,7 @@ BOOL daObjTobyHouse_c::checkLODModel() { return FALSE; } - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); if (camera != NULL && fopCamM_GetEye_p(camera)->abs(current.pos) > 20000.0f) { return TRUE; } diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 60ef3736c8f..82c77154766 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -505,7 +505,7 @@ void daObjTOMBO_c::Z_BufferChk() { cStack_68 = current.pos; cStack_68.y += 20.0f; mDoLib_project(&cStack_68, &local_5c); - camera_class* pCamera = dComIfGp_getCamera(0); + camera_process_class* pCamera = dComIfGp_getCamera(0); f32 trimHeight; if (pCamera != NULL) { trimHeight = pCamera->mCamera.TrimHeight(); diff --git a/src/d/actor/d_a_ppolamp.cpp b/src/d/actor/d_a_ppolamp.cpp index dd22f0ebaf3..036f5b66a0e 100644 --- a/src/d/actor/d_a_ppolamp.cpp +++ b/src/d/actor/d_a_ppolamp.cpp @@ -92,9 +92,9 @@ void daPPolamp_c::setPclModelMtx() { Vec local_2c = {0.0f, -45.0f, 0.0f}; cMtx_multVec(mModel1->getBaseTRMtx(), &local_2c, &local_20); mDoMtx_stack_c::transS(local_20.x, local_20.y, local_20.z); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (camera != NULL) { - cXyz cStack_38 = camera->lookat.eye - current.pos; + cXyz cStack_38 = camera->view.lookat.eye - current.pos; mDoMtx_stack_c::YrotM(cStack_38.atan2sX_Z()); mDoMtx_stack_c::XrotM(cStack_38.atan2sY_XZ()); } diff --git a/src/d/actor/d_a_tag_waterfall.cpp b/src/d/actor/d_a_tag_waterfall.cpp index f9016da7729..fab5afccace 100644 --- a/src/d/actor/d_a_tag_waterfall.cpp +++ b/src/d/actor/d_a_tag_waterfall.cpp @@ -187,7 +187,7 @@ bool daTagWaterFall_c::checkHitWaterFall(cXyz objPos) { } bool daTagWaterFall_c::checkHitWaterFallCamera() { - return checkHitWaterFall(dComIfGp_getCamera(0)->lookat.eye); + return checkHitWaterFall(dComIfGp_getCamera(0)->view.lookat.eye); } int daTagWaterFall_c::execute() { diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 12b0d6468ee..55e3d5f8ee1 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -1064,7 +1064,7 @@ int daTbox_c::actionDropDemo() { home.pos = current.pos; if (field_0x9c9 != 0) { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); field_0x9c9 = 0; @@ -1477,7 +1477,7 @@ int daTbox_c::checkDrop() { } void daTbox_c::settingDropDemoCamera() { - camera_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); player_camera->mCamera.Stop(); dStage_MapEvent_dt_c* maptooldata = dEvt_control_c::searchMapEventData(getEvent(), fopAcM_GetRoomNo(this)); diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 55229336b89..fef3260ef17 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -1,6 +1,8 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_title.h" +#include "d/d_s_logo.h" +#include "d/d_s_play.h" #include "d/d_demo.h" #include "d/d_pane_class_alpha.h" #include "d/d_menu_collect.h" @@ -16,17 +18,21 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "m_Do/m_Do_graphic.h" -class daTit_HIO_c { +class daTit_HIO_c : public JORReflexible { public: daTit_HIO_c(); virtual ~daTit_HIO_c() {} + void genMessage(JORMContext*); - /* 0x04 */ s8 field_0x4; + /* 0x04 */ s8 id; /* 0x08 */ f32 mPSScaleX; /* 0x0C */ f32 mPSScaleY; /* 0x10 */ f32 mPSPosX; /* 0x14 */ f32 mPSPosY; + #if DEBUG + /* 0x18 */ u8 unk_0x18[0x48 - 0x18]; + #endif /* 0x18 */ u8 mAppear; /* 0x19 */ u8 mArrow; /* 0x1A */ u8 field_0x1a; @@ -44,17 +50,11 @@ static char const l_arcName[] = "TitlePal"; static char const l_arcName[] = "Title"; #endif -static procFunc daTitleProc[6] = { - &daTitle_c::loadWait_proc, &daTitle_c::logoDispWait, &daTitle_c::logoDispAnm, - &daTitle_c::keyWait, &daTitle_c::nextScene_proc, &daTitle_c::fastLogoDisp, -}; - daTit_HIO_c::daTit_HIO_c() { mPSScaleX = 1.0f; mPSScaleY = 1.0f; #if VERSION == VERSION_GCN_PAL - switch (OSGetLanguage()) { case OS_LANGUAGE_ENGLISH: case OS_LANGUAGE_GERMAN: @@ -77,29 +77,49 @@ daTit_HIO_c::daTit_HIO_c() { field_0x1a = 15; } +#if DEBUG +void daTit_HIO_c::genMessage(JORMContext* mctx) { + mctx->genLabel("\n======= PRESS START ========", 0); + mctx->genSlider("Scale Ｘ", &mPSScaleX, 0.1f, 100.0f); + mctx->genSlider("Scale Ｙ", &mPSScaleY, 0.1f, 100.0f); + mctx->genSlider("Pos Ｘ", &mPSPosX, 0.0f, 1000.0f); + mctx->genSlider("Pos Ｙ", &mPSPosY, 0.0f, 1000.0f); + + mctx->genLabel("\n======= ", 0); + mctx->genSlider("出現", &mAppear, 0, 255); + mctx->genSlider("矢印", &mArrow, 0, 255); +} +#endif + int daTitle_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 10); + JUT_ASSERT(258, modelData); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000285); if (mpModel == NULL) { return 0; } - void* res = dComIfG_getObjectRes(l_arcName, 7); - mBck.init((J3DAnmTransform*)res, 1, 0, 2.0f, 0, -1, false); + int res = mBck.init((J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 7), 1, 0, 2.0f, 0, -1, false); + JUT_ASSERT(276, res == 1); - res = dComIfG_getObjectRes(l_arcName, 13); - mBpk.init(modelData, (J3DAnmColor*)res, 1, 0, 2.0f, 0, -1); + res = mBpk.init(modelData, (J3DAnmColor*)dComIfG_getObjectRes(l_arcName, 13), 1, 0, 2.0f, 0, -1); + JUT_ASSERT(283, res == 1); - res = dComIfG_getObjectRes(l_arcName, 16); - mBrk.init(modelData, (J3DAnmTevRegKey*)res, 1, 0, 2.0f, 0, -1); + res = mBrk.init(modelData, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 16), 1, 0, 2.0f, 0, -1); + JUT_ASSERT(290, res == 1); - res = dComIfG_getObjectRes(l_arcName, 19); - mBtk.init(modelData, (J3DAnmTextureSRTKey*)res, 1, 0, 2.0f, 0, -1); + res = mBtk.init(modelData, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 19), 1, 0, 2.0f, 0, -1); + JUT_ASSERT(297, res == 1); return 1; } +static procFunc daTitleProc[6] = { + &daTitle_c::loadWait_proc, &daTitle_c::logoDispWait, &daTitle_c::logoDispAnm, + &daTitle_c::keyWait, &daTitle_c::nextScene_proc, &daTitle_c::fastLogoDisp, +}; + int daTitle_c::create() { fopAcM_ct(this, daTitle_c); @@ -113,27 +133,33 @@ int daTitle_c::create() { } mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/Title2D.arc", 0, NULL); - field_0x5f8 = 0; + mIsDispLogo = 0; field_0x5f9 = 0; - m2DHeap = JKRExpHeap::create(0x8000, mDoExt_getGameHeap(), false); + m2DHeap = JKRCreateExpHeap(0x8000, mDoExt_getGameHeap(), false); JUT_ASSERT(345, m2DHeap != NULL); loadWait_init(); - g_daTitHIO.field_0x4 = -1; + + g_daTitHIO.id = mDoHIO_CREATE_CHILD("タイトルロゴ", &g_daTitHIO); return phase_state; } -int daTitle_c::createHeapCallBack(fopAc_ac_c* title) { - return ((daTitle_c*)title)->CreateHeap(); +int daTitle_c::createHeapCallBack(fopAc_ac_c* actor) { + daTitle_c* i_this = (daTitle_c*)actor; + return i_this->CreateHeap(); } int daTitle_c::Execute() { + #if PLATFORM_WII || PLATFORM_SHIELD + mDoGph_gInf_c::resetDimming(); + #endif + if (fopOvlpM_IsPeek()) { return 1; } - dMenu_Collect3D_c::mViewOffsetY = 0.0f; + dMenu_Collect3D_c::setViewPortOffsetY(0.0f); if (mDoRst::isReset()) { return 1; @@ -141,6 +167,11 @@ int daTitle_c::Execute() { (this->*daTitleProc[mProcID])(); KeyWaitAnm(); + + #if VERSION == VERSION_SHIELD_DEBUG + KeyWaitPosMove(); + #endif + return 1; } @@ -167,17 +198,26 @@ void daTitle_c::KeyWaitAnm() { } } +#if VERSION == VERSION_SHIELD_DEBUG +void daTitle_c::KeyWaitPosMove() { + J2DPane* pane = mTitle.Scr->search(MULTI_CHAR('n_all')); + pane->translate(g_daTitHIO.mPSPosX, g_daTitHIO.mPSPosY); + pane->scale(g_daTitHIO.mPSScaleX, g_daTitHIO.mPSScaleY); +} +#endif + void daTitle_c::loadWait_init() { mProcID = 0; } void daTitle_c::loadWait_proc() { if (mpMount->sync()) { - JKRHeap* heap = mDoExt_setCurrentHeap(m2DHeap); - mpHeap = heap; + mpHeap = mDoExt_setCurrentHeap(m2DHeap); mpFont = mDoExt_getMesgFont(); + mTitle.Scr = new J2DScreen(); + JUT_ASSERT(529, mTitle.Scr != NULL); mTitle.Scr->setPriority("zelda_press_start.blo", 0x100000, mpMount->getArchive()); @@ -193,7 +233,9 @@ void daTitle_c::loadWait_proc() { for (int i = 0; i < 7; i++) { text[i]->setFont(mpFont); text[i]->setString(0x80, ""); - fopMsgM_messageGet(text[i]->getStringPtr(), 100); + + char* msg = text[i]->getStringPtr(); + fopMsgM_messageGet(msg, 100); } field_0x600 = new CPaneMgrAlpha(mTitle.Scr, MULTI_CHAR('n_all'), 2, NULL); @@ -201,7 +243,7 @@ void daTitle_c::loadWait_proc() { J2DPane* pane = mTitle.Scr->search(MULTI_CHAR('n_all')); pane->translate(g_daTitHIO.mPSPosX, g_daTitHIO.mPSPosY); pane->scale(g_daTitHIO.mPSScaleX, g_daTitHIO.mPSScaleY); - mpHeap->becomeCurrentHeap(); + JKRSetCurrentHeap(mpHeap); logoDispWaitInit(); } } @@ -223,7 +265,7 @@ void daTitle_c::logoDispAnmInit() { mBpk.setPlaySpeed(1.0f); mBrk.setPlaySpeed(1.0f); mBtk.setPlaySpeed(1.0f); - field_0x5f8 = 1; + mIsDispLogo = 1; mProcID = 2; } @@ -258,13 +300,29 @@ void daTitle_c::nextScene_init() { } void daTitle_c::nextScene_proc() { + scene_class* playScene; + if (!fopOvlpM_IsPeek() && !mDoRst::isReset()) { - scene_class* playScene = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); + playScene = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); JUT_ASSERT(706, playScene != NULL); - fopScnM_ChangeReq(playScene, 13, 0, 5); -#if VERSION != VERSION_SHIELD_DEBUG + + #if DEBUG + if (!dScnLogo_c::isOpeningCut()) + #endif + { + fopScnM_ChangeReq(playScene, PROC_NAME_SCENE, 0, 5); + } + #if DEBUG + else { + fopScnM_ChangeReq(playScene, PROC_MENU_SCENE, 0, 5); + dComIfGs_init(); + dComIfG_playerStatusD(); + } + #endif + + #if VERSION != VERSION_SHIELD_DEBUG mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); -#endif + #endif } } @@ -276,39 +334,37 @@ void daTitle_c::fastLogoDispInit() { field_0x600->alphaAnimeStart(0); field_0x604 = 0; - field_0x5fc = 30; + mWaitTimer = 30; mProcID = 5; } void daTitle_c::fastLogoDisp() { - if (field_0x5fc != 0) { - field_0x5fc--; + if (mWaitTimer != 0) { + mWaitTimer--; return; } field_0x5f9 = 1; field_0x5fa = 1; - field_0x5f8 = 1; + mIsDispLogo = 1; keyWaitInit(); } int daTitle_c::getDemoPrm() { dDemo_actor_c* demoActor = dDemo_c::getActor(demoActorID); dDemo_prm_c* prm; - if (demoActor != NULL && demoActor->checkEnable(1) && - (prm = demoActor->getPrm())) - { - void* data = (void*)prm->getData(); - JStudio::stb::TParseData_fixed<49> aTStack_30(data); - TValueIterator_raw iter = aTStack_30.begin(); - return *iter & 0xff; + if (demoActor != NULL && demoActor->checkEnable(1) && (prm = demoActor->getPrm())) { + JStudio::stb::TParseData_fixed<49> parser(prm->getData()); + TValueIterator_raw iter = parser.begin(); + return *iter; } + return -1; } int daTitle_c::Draw() { J3DModelData* modelData = mpModel->getModelData(); - MTXTrans(mpModel->getBaseTRMtx(), 0.0f, 0.0f, -430.0f); + cMtx_trans(mpModel->getBaseTRMtx(), IREG_F(7), IREG_F(8), IREG_F(9) + -430.0f); mpModel->getBaseScale()->x = -1.0f; mBck.entry(modelData); @@ -320,7 +376,7 @@ int daTitle_c::Draw() { mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); - if (field_0x5f8) { + if (mIsDispLogo) { dComIfGd_set2DOpaTop(&mTitle); } @@ -328,13 +384,15 @@ int daTitle_c::Draw() { } int daTitle_c::Delete() { + mDoHIO_DELETE_CHILD(g_daTitHIO.id); + dComIfG_resDelete(&mPhaseReq, l_arcName); delete mTitle.Scr; delete field_0x600; mpMount->getArchive()->removeResourceAll(); - mpMount->getArchive()->unmount(); - delete mpMount; + JKRUnmountArchive(mpMount->getArchive()); + mpMount->destroy(); if (m2DHeap != NULL) { m2DHeap->destroy(); @@ -352,11 +410,14 @@ static int daTitle_Execute(daTitle_c* i_this) { } static int daTitle_Delete(daTitle_c* i_this) { + fpc_ProcID id = fopAcM_GetID(i_this); return i_this->Delete(); } static int daTitle_Create(fopAc_ac_c* i_this) { - return static_cast(i_this)->create(); + daTitle_c* a_this = (daTitle_c*)i_this; + fpc_ProcID id = fopAcM_GetID(i_this); + return a_this->create(); } void dDlst_daTitle_c::draw() { diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 33d9a277625..a357efb07a0 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -142,15 +142,15 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { #if !DEBUG cXyz sp8; if (strcmp(dComIfGp_getStartStageName(), "F_SP102") == 0) { - dKyr_get_vectle_calc(&camera_p->lookat.eye, &g_env_light.sun_pos, &sp8); - sp14.x = camera_p->lookat.eye.x + (8000.0f * sp8.x); - sp14.y = camera_p->lookat.eye.y + (8000.0f * sp8.y); - sp14.z = camera_p->lookat.eye.z + (8000.0f * sp8.z); + dKyr_get_vectle_calc(&camera_p->view.lookat.eye, &g_env_light.sun_pos, &sp8); + sp14.x = camera_p->view.lookat.eye.x + (8000.0f * sp8.x); + sp14.y = camera_p->view.lookat.eye.y + (8000.0f * sp8.y); + sp14.z = camera_p->view.lookat.eye.z + (8000.0f * sp8.z); } #endif - temp_r19 = cLib_targetAngleX(&camera_p->lookat.eye, &sp14); - temp_r18 = cLib_targetAngleY(&camera_p->lookat.eye, &sp14); + temp_r19 = cLib_targetAngleX(&camera_p->view.lookat.eye, &sp14); + temp_r18 = cLib_targetAngleY(&camera_p->view.lookat.eye, &sp14); mDoMtx_stack_c::transS(sp14.x, sp14.y, sp14.z); mDoMtx_stack_c::YrotM((s16)temp_r18); mDoMtx_stack_c::XrotM(0x7FFF + -temp_r19); @@ -185,8 +185,8 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { sp14 = sun_p->mPos[0]; sp14.y = 300.0f + -(sp14.y * 0.85f); - temp_r19 = cLib_targetAngleX(&camera_p->lookat.eye, &sp14); - temp_r18 = cLib_targetAngleY(&camera_p->lookat.eye, &sp14); + temp_r19 = cLib_targetAngleX(&camera_p->view.lookat.eye, &sp14); + temp_r18 = cLib_targetAngleY(&camera_p->view.lookat.eye, &sp14); mDoMtx_stack_c::transS(sp14.x, sp14.y, sp14.z); mDoMtx_stack_c::YrotM((s16)temp_r18); mDoMtx_stack_c::XrotM(0x7FFF + -temp_r19); @@ -246,8 +246,8 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { sp10 = dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()); - cam_eye = camera_p->lookat.eye; - cam_center = camera_p->lookat.center; + cam_eye = camera_p->view.lookat.eye; + cam_center = camera_p->view.lookat.center; cam_eye.y = 0.0f; cam_center.y = 0.0f; diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 1225cad07b7..d059db6862e 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -220,11 +220,11 @@ static int daYkgrExecute(void* i_this) { } void daYkgr_c::set_mtx() { - camera_class* iVar1 = dComIfGp_getCamera(0); + camera_process_class* iVar1 = dComIfGp_getCamera(0); cXyz local_28; cXyz* r29 = fopCamM_GetEye_p(iVar1); current.pos = *r29; - dKyr_get_vectle_calc(&iVar1->lookat.eye, &iVar1->lookat.center, &local_28); + dKyr_get_vectle_calc(&iVar1->view.lookat.eye, &iVar1->view.lookat.center, &local_28); current.angle.y = (s16)cM_atan2s(local_28.x, local_28.z); current.angle.x = -cM_atan2s( local_28.y, JMAFastSqrt((local_28.x * local_28.x + local_28.z * local_28.z))); diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc index 230b3386ed6..a0a86ab079f 100644 --- a/src/d/actor/d_grass.inc +++ b/src/d/actor/d_grass.inc @@ -611,13 +611,13 @@ void dGrass_packet_c::draw() { f32 temp1 = 0.001953125f; // fakematch #if DEBUG - camera_class* sp34 = dComIfGp_getCamera(0); + camera_process_class* sp34 = dComIfGp_getCamera(0); int sp30 = 0; if (dCam_getBody() != NULL && (dCam_getBody()->Mode() == 7 || dCam_getBody()->Mode() == 8) && sp34 != NULL && dCam_getBody()->V() < -750.0f && - var_r29->m_pos.abs(sp34->lookat.eye) < 200.0f) { + var_r29->m_pos.abs(sp34->view.lookat.eye) < 200.0f) { sp30 = 1; } #endif diff --git a/src/d/d_bg_parts.cpp b/src/d/d_bg_parts.cpp index d4e8ff019a6..ccafb31b5b0 100644 --- a/src/d/d_bg_parts.cpp +++ b/src/d/d_bg_parts.cpp @@ -678,7 +678,7 @@ void dBgp_c::draw(fopAc_ac_c* i_actor) { mPacket.reset(); mDoLib_clipper::changeFar(100000.0f); - camera_class* sp30 = dComIfGp_getCamera(0); + camera_process_class* sp30 = dComIfGp_getCamera(0); dCamera_c* camera = &sp30->mCamera; JUT_ASSERT(1287, camera != NULL) diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 1baf13362a2..3b857b8b302 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -10709,15 +10709,15 @@ int dCamera_c::ForceLockOff(fopAc_ac_c* i_actor) { } s16 dCam_getAngleY(camera_class* i_cam) { - return i_cam->mCamera.U(); + return ((camera_process_class*)i_cam)->mCamera.U(); } s16 dCam_getAngleX(camera_class* i_cam) { - return i_cam->mCamera.V(); + return ((camera_process_class*)i_cam)->mCamera.V(); } s16 dCam_getControledAngleY(camera_class* i_cam) { - return i_cam->mCamera.U2(); + return ((camera_process_class*)i_cam)->mCamera.U2(); } camera_class* dCam_getCamera() { @@ -10725,14 +10725,14 @@ camera_class* dCam_getCamera() { } dCamera_c* dCam_getBody() { - camera_class* camera = dCam_getCamera(); + camera_process_class* camera = (camera_process_class*)dCam_getCamera(); return &camera->mCamera; } static void preparation(camera_process_class* i_this) { camera_process_class* process = i_this; camera_class* a_this = (camera_class*)i_this; - dCamera_c* camera = &((camera_class*)i_this)->mCamera; + dCamera_c* camera = &i_this->mCamera; int camera_id = get_camera_id(a_this); dDlst_window_c* window = get_window(camera_id); @@ -10786,7 +10786,7 @@ static void view_setup(camera_process_class* i_this) { static void store(camera_process_class* i_camera) { camera_process_class* process = (camera_process_class*)i_camera; camera_class* camera = (camera_class*)i_camera; - dCamera_c* dCamera = &((camera_class*)i_camera)->mCamera; + dCamera_c* dCamera = &i_camera->mCamera; int camera_id = get_camera_id(camera); dDlst_window_c* window = get_window(camera_id); view_port_class* viewport = window->getViewPort(); @@ -10913,33 +10913,30 @@ cXyz dCamera_c::Center() { } static int camera_execute(camera_process_class* i_this) { - // this variable is likely fake as it doesn't exist in debug, - // but directly casting the parameter on each use breaks retail - camera_class* camera = (camera_class*)i_this; - preparation(camera); + preparation(i_this); if (dDemo_c::getCamera() != NULL) { - camera->mCamera.ResetView(); + i_this->mCamera.ResetView(); } dComIfGp_offCameraAttentionStatus(0, 0x40); - if (camera->mCamera.Active()) { - camera->mCamera.Run(); + if (i_this->mCamera.Active()) { + i_this->mCamera.Run(); } else { - camera->mCamera.NotRun(); + i_this->mCamera.NotRun(); } - camera->mCamera.CalcTrimSize(); + i_this->mCamera.CalcTrimSize(); - store(camera); - view_setup(camera); + store(i_this); + view_setup(i_this); return 1; } static int camera_draw(camera_process_class* i_this) { camera_class* a_this = (camera_class*)i_this; - dCamera_c* body = &((camera_class*)i_this)->mCamera; + dCamera_c* body = &i_this->mCamera; dDlst_window_c* window = get_window(a_this); view_port_class* viewport = window->getViewPort(); camera_process_class* process = i_this; @@ -10991,24 +10988,24 @@ static int camera_draw(camera_process_class* i_this) { int trim_height = body->TrimHeight(); window->setScissor(0.0f, trim_height, FB_WIDTH, FB_HEIGHT - trim_height * 2.0f); - C_MTXPerspective(process->projMtx, process->fovy, process->aspect, process->near, process->far); - mDoMtx_lookAt(process->viewMtx, &process->lookat.eye, &process->lookat.center, - &process->lookat.up, process->bank); + C_MTXPerspective(process->view.projMtx, process->view.fovy, process->view.aspect, process->view.near, process->view.far); + mDoMtx_lookAt(process->view.viewMtx, &process->view.lookat.eye, &process->view.lookat.center, + &process->view.lookat.up, process->view.bank); #if WIDESCREEN_SUPPORT - mDoGph_gInf_c::setWideZoomProjection(process->projMtx); + mDoGph_gInf_c::setWideZoomProjection(process->view.projMtx); #endif - j3dSys.setViewMtx(process->viewMtx); - cMtx_inverse(process->viewMtx, process->invViewMtx); + j3dSys.setViewMtx(process->view.viewMtx); + cMtx_inverse(process->view.viewMtx, process->view.invViewMtx); - Z2GetAudience()->setAudioCamera(process->viewMtx, process->lookat.eye, process->lookat.center, - process->fovy, process->aspect, getComStat(0x80), camera_id, + Z2GetAudience()->setAudioCamera(process->view.viewMtx, process->view.lookat.eye, process->view.lookat.center, + process->view.fovy, process->view.aspect, getComStat(0x80), camera_id, false); dBgS_GndChk gndchk; gndchk.OnWaterGrp(); - gndchk.SetPos(&process->lookat.eye); + gndchk.SetPos(&process->view.lookat.eye); f32 cross = dComIfG_Bgsp().GroundCross(&gndchk); if (cross != -G_CM3D_F_INF) { @@ -11020,27 +11017,27 @@ static int camera_draw(camera_process_class* i_this) { mDoAud_setCameraGroupInfo(dComIfG_Bgsp().GetGrpSoundId(gndchk)); Vec spDC; - spDC.x = process->lookat.eye.x; + spDC.x = process->view.lookat.eye.x; spDC.y = cross; - spDC.z = process->lookat.eye.z; + spDC.z = process->view.lookat.eye.z; Z2AudioMgr::getInterface()->setCameraPolygonPos(&spDC); } else { Z2AudioMgr::getInterface()->setCameraPolygonPos(NULL); } - MTXCopy(process->viewMtx, process->viewMtxNoTrans); - process->viewMtxNoTrans[0][3] = 0.0f; - process->viewMtxNoTrans[1][3] = 0.0f; - process->viewMtxNoTrans[2][3] = 0.0f; - cMtx_concatProjView(process->projMtx, process->viewMtx, process->projViewMtx); + MTXCopy(process->view.viewMtx, process->view.viewMtxNoTrans); + process->view.viewMtxNoTrans[0][3] = 0.0f; + process->view.viewMtxNoTrans[1][3] = 0.0f; + process->view.viewMtxNoTrans[2][3] = 0.0f; + cMtx_concatProjView(process->view.projMtx, process->view.viewMtx, process->view.projViewMtx); body->Draw(); return 1; } static int init_phase1(camera_class* i_this) { - camera_class* camera = i_this; + camera_process_class* camera = (camera_process_class*)i_this; int camera_id = get_camera_id(i_this); dComIfGp_setCamera(camera_id, i_this); @@ -11056,7 +11053,7 @@ static int init_phase1(camera_class* i_this) { } static int init_phase2(camera_class* i_this) { - camera_class* camera = (camera_class*)i_this; + camera_process_class* camera = (camera_process_class*)i_this; dCamera_c* body = &camera->mCamera; int camera_id = get_camera_id(i_this); i_this->field_0x238++; @@ -11138,12 +11135,12 @@ static int camera_create(camera_class* i_this) { (request_of_phase_process_fn)NULL, }; - camera_class* camera = i_this; + camera_process_class* camera = (camera_process_class*)i_this; return dComLbG_PhaseHandler(&camera->phase_request, l_method, i_this); } static int camera_delete(camera_process_class* i_this) { - dCamera_c* camera = &((camera_class*)i_this)->mCamera; + dCamera_c* camera = &i_this->mCamera; if (camera->CameraID() == 0) { #if DEBUG @@ -11212,7 +11209,7 @@ camera_process_profile_definition g_profile_CAMERA = { fpcPi_CURRENT_e, PROC_CAMERA, &g_fpcLf_Method.base, - sizeof(camera_class), + sizeof(camera_process_class), 0, 0, &g_fopVw_Method, @@ -11233,7 +11230,7 @@ camera_process_profile_definition g_profile_CAMERA2 = { fpcPi_CURRENT_e, PROC_CAMERA2, &g_fpcLf_Method.base, - sizeof(camera_class), + sizeof(camera_process_class), 0, 0, &g_fopVw_Method, diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 1f37fc6fe45..5bd6d55b9e3 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -1194,7 +1194,7 @@ void dComIfG_inf_c::ct() { field_0x1de0a = 0xFF; } -#if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG +#if PLATFORM_WII || PLATFORM_SHIELD void dComIfG_inf_c::createBaseCsr() { JUT_ASSERT(1622, m_baseCsr == NULL); m_baseCsr = new baseCsr_c(1); diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 9c38bcb3a2e..2af725c1626 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -448,7 +448,7 @@ static view_class* getView() { dDlst_window_c* window = dComIfGp_getWindow(0); int camID = window->getCameraID(); - return dComIfGp_getCamera(camID); + return &dComIfGp_getCamera(camID)->view; } f32 dDemo_camera_c::JSGGetProjectionNear() const { diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index bdc92e3cb47..51d37db6476 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -494,7 +494,7 @@ void dKy_pos2_get_angle(cXyz* pos1_p, cXyz* pos2_p, s16* pitch_p, s16* yaw_p) { void dKy_twi_wolflight_set(int light_id) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); cXyz vectle; if (camera_p == NULL) { @@ -503,12 +503,12 @@ void dKy_twi_wolflight_set(int light_id) { s16 angle_x; s16 angle_y; - dKy_pos2_get_angle(&camera_p->lookat.center, &camera_p->lookat.eye, &angle_x, &angle_y); - dKyr_get_vectle_calc(&camera_p->lookat.center, &camera_p->lookat.eye, &vectle); + dKy_pos2_get_angle(&camera_p->view.lookat.center, &camera_p->view.lookat.eye, &angle_x, &angle_y); + dKyr_get_vectle_calc(&camera_p->view.lookat.center, &camera_p->view.lookat.eye, &vectle); - kankyo->field_0x0c18[light_id].mPos.x = camera_p->lookat.eye.x + vectle.x * 300.0f; - kankyo->field_0x0c18[light_id].mPos.y = camera_p->lookat.eye.y + vectle.y * 300.0f; - kankyo->field_0x0c18[light_id].mPos.z = camera_p->lookat.eye.z + vectle.z * 300.0f; + kankyo->field_0x0c18[light_id].mPos.x = camera_p->view.lookat.eye.x + vectle.x * 300.0f; + kankyo->field_0x0c18[light_id].mPos.y = camera_p->view.lookat.eye.y + vectle.y * 300.0f; + kankyo->field_0x0c18[light_id].mPos.z = camera_p->view.lookat.eye.z + vectle.z * 300.0f; int size = g_env_light.light_size; #if DEBUG @@ -1633,7 +1633,7 @@ void dScnKy_env_light_c::setDaytime() { } void dScnKy_env_light_c::setSunpos() { - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); cXyz pos; f32 parcent; f32 sun_angle; @@ -1682,9 +1682,9 @@ void dScnKy_env_light_c::setSunpos() { pos.y = cosf(DEG_TO_RAD(sun_angle)) * 80000.0f; pos.z = cosf(DEG_TO_RAD(sun_angle)) * -48000.0f; - sun_pos.x = camera_p->lookat.eye.x + pos.x; - sun_pos.y = camera_p->lookat.eye.y - pos.y; - sun_pos.z = camera_p->lookat.eye.z + pos.z; + sun_pos.x = camera_p->view.lookat.eye.x + pos.x; + sun_pos.y = camera_p->view.lookat.eye.y - pos.y; + sun_pos.z = camera_p->view.lookat.eye.z + pos.z; pos.x = sinf(DEG_TO_RAD(moon_angle)) * 80000.0f; pos.y = cosf(DEG_TO_RAD(moon_angle)) * 80000.0f; @@ -1930,9 +1930,9 @@ void dScnKy_env_light_c::setLight_palno_get(u8* prev_envr_id_p, u8* next_envr_id // use a specific palette for rollgoal (camera eye gets set below 0.0) else if (strcmp(dComIfGp_getStartStageName(), "R_SP127") == 0) { - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); - if (camera_p != NULL && camera_p->lookat.eye.y < 0.0f) { + if (camera_p != NULL && camera_p->view.lookat.eye.y < 0.0f) { psel_idx = envr_p->pselect_id[10]; } } @@ -2146,9 +2146,9 @@ void dScnKy_env_light_c::setLight_palno_get(u8* prev_envr_id_p, u8* next_envr_id // use a specific palette for rollgoal (camera eye gets set below 0.0) else if (strcmp(dComIfGp_getStartStageName(), "R_SP127") == 0) { - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); - if (camera_p != NULL && camera_p->lookat.eye.y < 0.0f) { + if (camera_p != NULL && camera_p->view.lookat.eye.y < 0.0f) { pselect_p = &g_env_light.stage_pselect_info[envr_p->pselect_id[10]]; } } @@ -2257,7 +2257,7 @@ void dScnKy_env_light_c::setLight() { u8* init_timer = &g_env_light.light_init_timer; int i; f32 sp8C; - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); GXColorS10 add_col; add_col.r = 0; @@ -2276,14 +2276,14 @@ void dScnKy_env_light_c::setLight() { dKy_WaterIn_Light_set(); } - chkpos = camera_p->lookat.eye; + chkpos = camera_p->view.lookat.eye; chkpos.y += 100000.0f; camchk.SetPos(&chkpos); sp84 = dComIfG_Bgsp().GroundCross(&camchk); - if (sp84 > camera_p->lookat.eye.y) { - sp84 -= camera_p->lookat.eye.y; + if (sp84 > camera_p->view.lookat.eye.y) { + sp84 -= camera_p->view.lookat.eye.y; sp80 = 1.0f - sp84 / 2250.0f; if (sp80 < 0.0f) { sp80 = 0.0f; @@ -3247,7 +3247,7 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr J3DLightInfo* light0_info = tevstr_p->mLights[0].getLightInfo(); sp9 = 1; - dKyr_get_vectle_calc(&camera->lookat.center, &camera->lookat.eye, &camfwd); + dKyr_get_vectle_calc(&camera->view.lookat.center, &camera->view.lookat.eye, &camfwd); light_pos = *pos_p + (camfwd * 500.0f); light_pos.y += 40.0f; @@ -3256,8 +3256,8 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr #endif if (tevstr_p->Type >= 1 && tevstr_p->Type <= 9) { - dKyr_get_vectle_calc(&camera->lookat.center, &camera->lookat.eye, &camfwd); - light_pos = camera->lookat.eye + (camfwd * 180.0f); + dKyr_get_vectle_calc(&camera->view.lookat.center, &camera->view.lookat.eye, &camfwd); + light_pos = camera->view.lookat.eye + (camfwd * 180.0f); } field_0x10f8.r = light0_info->mColor.r; @@ -3705,7 +3705,7 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst fog_near = 30000.0f; fog_far = 30000.0f; - dKyr_get_vectle_calc(&pos, &camera_p->lookat.eye, &calc_pos); + dKyr_get_vectle_calc(&pos, &camera_p->view.lookat.eye, &calc_pos); for (int i = 0; i < 6; i++) { J3DLightInfo& light_info = *tevstr_p->mLights[i].getLightInfo(); @@ -3794,9 +3794,9 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst Vec sp8C; Vec sp80; - sp80.x = camera_p->lookat.eye.x; - sp80.y = camera_p->lookat.eye.y; - sp80.z = camera_p->lookat.eye.z; + sp80.x = camera_p->view.lookat.eye.x; + sp80.y = camera_p->view.lookat.eye.y; + sp80.z = camera_p->view.lookat.eye.z; light_info = tevstr_p->mLightObj.getLightInfo(); cMtx_multVec(view_mtx, &sp80, &sp8C); @@ -3868,7 +3868,7 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst fog_far = 30000.0f; for (int i = 0; i < 6; i++) { - camera_class* sp30 = dComIfGp_getCamera(0); + camera_process_class* sp30 = dComIfGp_getCamera(0); J3DLightInfo& temp_r31 = *tevstr_p->mLights[i].getLightInfo(); if (i == 0) { @@ -3946,9 +3946,9 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst Vec sp74; Vec sp68; - sp68.x = camera_p->lookat.eye.x; - sp68.y = camera_p->lookat.eye.y; - sp68.z = camera_p->lookat.eye.z; + sp68.x = camera_p->view.lookat.eye.x; + sp68.y = camera_p->view.lookat.eye.y; + sp68.z = camera_p->view.lookat.eye.z; light_info = tevstr_p->mLightObj.getLightInfo(); cMtx_multVec(view_mtx, &sp68, &sp74); @@ -4635,7 +4635,7 @@ void dScnKy_env_light_c::SetBaseLight() { if (daytime > 67.5f && daytime < 292.5f) { base_light.mPosition = kankyo->sun_light_pos; } else if (camera != NULL) { - base_light.mPosition = camera->lookat.eye + kankyo->moon_pos; + base_light.mPosition = camera->view.lookat.eye + kankyo->moon_pos; } else { base_light.mPosition = kankyo->moon_pos; } @@ -8089,7 +8089,7 @@ void dKy_undwater_filter_draw() { static cXyz S_old_camctr(0.0f, 0.0f, 0.0f); if (dKy_camera_water_in_status_check()) { - f32 dist_to_old = camera->lookat.eye.abs(S_old_cameye); + f32 dist_to_old = camera->view.lookat.eye.abs(S_old_cameye); if (dist_to_old > 100.0f) { dist_to_old = 100.0f; } @@ -8099,7 +8099,7 @@ void dKy_undwater_filter_draw() { 0.0001f); } - dist_to_old = camera->lookat.center.abs(S_old_camctr); + dist_to_old = camera->view.lookat.center.abs(S_old_camctr); if (dist_to_old > 100.0f) { dist_to_old = 100.0f; } @@ -8109,8 +8109,8 @@ void dKy_undwater_filter_draw() { 0.0001f); } - S_old_cameye = camera->lookat.eye; - S_old_camctr = camera->lookat.center; + S_old_cameye = camera->view.lookat.eye; + S_old_camctr = camera->view.lookat.center; mDoMtx_stack_c::transS(0.0f, 0.0f, 0.0f); @@ -8424,7 +8424,7 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) { } if (camera != 0) { - eflight_id = dKy_eflight_influence_id(camera->lookat.eye, 0); + eflight_id = dKy_eflight_influence_id(camera->view.lookat.eye, 0); if (eflight_id >= 0) { dKy_bgparts_activelight_set(g_env_light.efplight[eflight_id], 1); if (dKy_Indoor_check() == TRUE) { @@ -8513,7 +8513,7 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) { if (i == 0) { (lightStatusPt + 2)[i].position = kankyo->sun_pos; } else if (camera != 0) { - (lightStatusPt + 2)[i].position = camera->lookat.eye + kankyo->moon_pos; + (lightStatusPt + 2)[i].position = camera->view.lookat.eye + kankyo->moon_pos; } else { (lightStatusPt + 2)[i].position = kankyo->moon_pos; } @@ -8642,7 +8642,7 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) { void dKy_setLight_nowroom(char room_no) { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); fopAc_ac_c* player = dComIfGp_getPlayer(0); MtxPtr var_r28 = j3dSys.getViewMtx(); @@ -8806,9 +8806,9 @@ void dKy_setLight_nowroom_actor(dKy_tevstr_c* tevstr_p) { sp3C.y = kankyo->sun_pos.y; sp3C.z = kankyo->sun_pos.z; } else if (camera != NULL) { - sp3C.x = camera->lookat.eye.x + kankyo->moon_pos.x; - sp3C.y = camera->lookat.eye.y + kankyo->moon_pos.y; - sp3C.z = camera->lookat.eye.z + kankyo->moon_pos.z; + sp3C.x = camera->view.lookat.eye.x + kankyo->moon_pos.x; + sp3C.y = camera->view.lookat.eye.y + kankyo->moon_pos.y; + sp3C.z = camera->view.lookat.eye.z + kankyo->moon_pos.z; } else { sp3C.x = kankyo->moon_pos.x; sp3C.y = kankyo->moon_pos.y; @@ -9286,8 +9286,8 @@ void dKy_Sound_init() { void dKy_Sound_set(cXyz pos, int param_1, fpc_ProcID actor_id, int timer) { camera_class* camera_p = (camera_class*)dComIfGp_getCamera(0); BOOL set_sound = FALSE; - f32 dist_pos_to_eye = pos.abs(camera_p->lookat.eye); - f32 dist_sndpos_to_eye = g_env_light.sound_influence.position.abs(camera_p->lookat.eye); + f32 dist_pos_to_eye = pos.abs(camera_p->view.lookat.eye); + f32 dist_sndpos_to_eye = g_env_light.sound_influence.position.abs(camera_p->view.lookat.eye); if (dist_pos_to_eye < dist_sndpos_to_eye) { if (dist_sndpos_to_eye < 1500.0f) { @@ -9969,22 +9969,22 @@ int dKy_BossLight_set(cXyz* pos_p, GXColor* color_p, f32 ref_dist, u8 param_3) { cXyz sp1C(boss_light_p[i].mPos); if (strcmp(dComIfGp_getStartStageName(), "D_SB03") == 0) { - sp1C.x = camera->lookat.eye.x; - sp1C.z = camera->lookat.eye.z; + sp1C.x = camera->view.lookat.eye.x; + sp1C.z = camera->view.lookat.eye.z; - if (sp1C.abs(camera->lookat.eye) > 2000.0f) { + if (sp1C.abs(camera->view.lookat.eye) > 2000.0f) { var_f31 = 99999.9f; spA = i; break; } else { - if (boss_light_p[i].mPos.abs(camera->lookat.eye) > var_f31) { - var_f31 = boss_light_p[i].mPos.abs(camera->lookat.eye); + if (boss_light_p[i].mPos.abs(camera->view.lookat.eye) > var_f31) { + var_f31 = boss_light_p[i].mPos.abs(camera->view.lookat.eye); spA = i; } } } else { - if (boss_light_p[i].mPos.abs(camera->lookat.eye) > var_f31) { - var_f31 = boss_light_p[i].mPos.abs(camera->lookat.eye); + if (boss_light_p[i].mPos.abs(camera->view.lookat.eye) > var_f31) { + var_f31 = boss_light_p[i].mPos.abs(camera->view.lookat.eye); spA = i; } } @@ -9993,7 +9993,7 @@ int dKy_BossLight_set(cXyz* pos_p, GXColor* color_p, f32 ref_dist, u8 param_3) { if (sp10 == 0 && spA != 0xFF) { i = spA; - if (i < 6 && pos_p->abs(camera->lookat.eye) < var_f31) { + if (i < 6 && pos_p->abs(camera->view.lookat.eye) < var_f31) { boss_light_p[i].mPos = *pos_p; boss_light_p[i].mColor.r = color_p->r; boss_light_p[i].mColor.g = color_p->g; @@ -10053,17 +10053,17 @@ int dKy_BossSpotLight_set(cXyz* pos_p, f32 angle_x, f32 angle_y, f32 cutoff, GXC if (spC == 0) { for (i = 1; i < 6; i++) { if (kankyo->field_0x0c18[i].field_0x26 != 0 && - kankyo->field_0x0c18[i].mPos.abs(camera->lookat.eye) > var_f31) + kankyo->field_0x0c18[i].mPos.abs(camera->view.lookat.eye) > var_f31) { - var_f31 = kankyo->field_0x0c18[i].mPos.abs(camera->lookat.eye); + var_f31 = kankyo->field_0x0c18[i].mPos.abs(camera->view.lookat.eye); sp8 = i; } } if (sp8 != 0xFF) { i = sp8; - if (i < 6 && pos_p->abs(camera->lookat.eye) < - kankyo->field_0x0c18[i].mPos.abs(camera->lookat.eye)) + if (i < 6 && pos_p->abs(camera->view.lookat.eye) < + kankyo->field_0x0c18[i].mPos.abs(camera->view.lookat.eye)) { kankyo->field_0x0c18[i].mPos = *pos_p; kankyo->field_0x0c18[i].mColor.r = color_p->r; @@ -10224,7 +10224,7 @@ void dKy_twilight_camelight_set() { var_f31 = 0.0f; if (player_p != NULL) { - var_f30 = camera_p->lookat.eye.y - player_p->current.pos.y; + var_f30 = camera_p->view.lookat.eye.y - player_p->current.pos.y; if (var_f30 < 0.0f) { var_f30 = 0.0f; } @@ -10364,7 +10364,7 @@ void dKy_WaterIn_Light_set() { var_f26 = 0.0f; if (player_p != NULL) { - var_f31 = camera->lookat.eye.y - player_p->current.pos.y; + var_f31 = camera->view.lookat.eye.y - player_p->current.pos.y; if (var_f31 < 0.0f) { var_f31 = 0.0f; } @@ -10385,12 +10385,12 @@ void dKy_WaterIn_Light_set() { sp8 = 1; kankyo->field_0x0c18[i].mCutoffAngle = 60.0f; - sp1C = camera->lookat.eye; + sp1C = camera->view.lookat.eye; sp1C.y += 100000.0f; sp28.SetPos(&sp1C); var_f25 = dComIfG_Bgsp().GroundCross(&sp28); - var_f30 = (var_f25 - camera->lookat.eye.y) / 3000.0f; + var_f30 = (var_f25 - camera->view.lookat.eye.y) / 3000.0f; if (var_f30 < 0.0f) { var_f30 = 0.0f; } @@ -10961,11 +10961,11 @@ void dKy_depth_dist_set(void* process_p) { sp24 = actor_p->eyePos; if (dComIfGp_event_runCheck() && actor_p->tevStr.Type <= 10) { - if (fabsf(sp24.y - camera_p->lookat.eye.y) < 400.0f) { - sp24.y = camera_p->lookat.eye.y; + if (fabsf(sp24.y - camera_p->view.lookat.eye.y) < 400.0f) { + sp24.y = camera_p->view.lookat.eye.y; } - f32 var_f31 = sp24.abs(camera_p->lookat.eye); + f32 var_f31 = sp24.abs(camera_p->view.lookat.eye); if (var_f31 < 2000.0f && var_f31 < kankyo->field_0x1268) { mDoLib_project(&actor_p->eyePos, &sp30); @@ -10978,8 +10978,8 @@ void dKy_depth_dist_set(void* process_p) { )) { cXyz sp18; cXyz spC; - dKyr_get_vectle_calc(&camera_p->lookat.eye, &camera_p->lookat.center, &sp18); - dKyr_get_vectle_calc(&camera_p->lookat.eye, &actor_p->eyePos, &spC); + dKyr_get_vectle_calc(&camera_p->view.lookat.eye, &camera_p->view.lookat.center, &sp18); + dKyr_get_vectle_calc(&camera_p->view.lookat.eye, &actor_p->eyePos, &spC); s16 temp_r27 = cM_atan2s(sp18.x, sp18.z); s16 temp_r26 = cM_atan2s(spC.x, spC.z); @@ -11226,12 +11226,12 @@ void dKy_murky_set(J3DMaterial* material_p) { tev_col.g = (u8)((s16)tev_col.g + (s16)((36.0f - tev_col.g) * var_f31)); tev_col.b = (u8)((s16)tev_col.b + (s16)((29.0f - tev_col.b) * var_f31)); - if (camera_p != NULL && camera_p->lookat.eye.z < 1800.0f) { + if (camera_p != NULL && camera_p->view.lookat.eye.z < 1800.0f) { f32 var_f30 = 1.0f; - if (camera_p->lookat.eye.z < 1550.0f) { + if (camera_p->view.lookat.eye.z < 1550.0f) { var_f30 = 1.0f; } else { - var_f30 = 1.0f - ((camera_p->lookat.eye.z - 1550.0f) / 250.0f); + var_f30 = 1.0f - ((camera_p->view.lookat.eye.z - 1550.0f) / 250.0f); } tev_col.a = (u8)(255.0f * var_f30); } else { @@ -11369,10 +11369,10 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { Mtx sp1D8; if (mat_name[6] == '2') { C_MTXLightPerspective(sp1D8, dComIfGd_getView()->fovy, - camera_p->aspect, 1.0f, 1.0f, -0.01f, 0.0f); + camera_p->view.aspect, 1.0f, 1.0f, -0.01f, 0.0f); } else { C_MTXLightPerspective(sp1D8, dComIfGd_getView()->fovy, - camera_p->aspect, 0.49f, -0.49f, 0.5f, 0.5f); + camera_p->view.aspect, 0.49f, -0.49f, 0.5f, 0.5f); } #if WIDESCREEN_SUPPORT @@ -11592,20 +11592,20 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { f32 temp_f29; f32 temp_f31; cXyz spB4; - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); J3DGXColor sp10; cXyz spA8; spA8.x = -5853.0f; - spA8.y = camera_p->lookat.eye.y; + spA8.y = camera_p->view.lookat.eye.y; spA8.z = -879.0f; - temp_f31 = spA8.abs(camera_p->lookat.eye); + temp_f31 = spA8.abs(camera_p->view.lookat.eye); temp_f31 = -0.2f + (temp_f31 / 4500.0f); #if DEBUG if (g_kankyoHIO.navy.rainbow_adjust_ON) { - temp_f31 = spA8.abs(camera_p->lookat.eye); + temp_f31 = spA8.abs(camera_p->view.lookat.eye); temp_f31 = temp_f31 / g_kankyoHIO.navy.rainbow_separation_dist + -0.2f; } #endif @@ -11642,9 +11642,9 @@ void dKy_bg_MAxx_proc(void* bg_model_p) { f32 temp_f25 = 1.0f; - spA8 = camera_p->lookat.center; - spA8.y = camera_p->lookat.eye.y; - dKyr_get_vectle_calc(&camera_p->lookat.eye, &spA8, &spB4); + spA8 = camera_p->view.lookat.center; + spA8.y = camera_p->view.lookat.eye.y; + dKyr_get_vectle_calc(&camera_p->view.lookat.eye, &spA8, &spB4); f32 temp_f27 = cM3d_VectorProduct2d(0.0f, 0.0f, -0.81f, 0.583f, spB4.x, spB4.z); f32 temp_f26; diff --git a/src/d/d_kankyo_debug.cpp b/src/d/d_kankyo_debug.cpp index db88bf37d3b..7fdad26ed26 100644 --- a/src/d/d_kankyo_debug.cpp +++ b/src/d/d_kankyo_debug.cpp @@ -495,7 +495,7 @@ void dKydb_HIO_debug_TVdsp(f32 param_0, f32 param_1, int param_2, int param_3, u void dKydb_HIO_debug_Wind() { dScnKy_env_light_c* kankyo = dKy_getEnvlight(); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); f32 substick_x = mDoCPd_c::getSubStickX(PAD_3); f32 substick_y = mDoCPd_c::getSubStickY(PAD_3); @@ -539,7 +539,7 @@ void dKydb_HIO_debug_draw() { cXyz pos; cXyz size; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); dKy_set_eyevect_calc2(camera, &pos, 200.0f, 200.0f); s16 var_r30 = g_kankyoHIO.light.field_0x5c; @@ -561,7 +561,7 @@ void dKydb_HIO_debug_draw() { void dKydb_HIO_winddebug_draw() { cXyz size; csXyz rot; - camera_class* temp_r31 = dComIfGp_getCamera(0); + camera_process_class* temp_r31 = dComIfGp_getCamera(0); cXyz pos; if (!mDoCPd_c::getHoldB(PAD_3)) { @@ -591,7 +591,7 @@ void dKydb_winddisp_draw() { csXyz rot; cXyz pos; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); dKy_set_eyevect_calc2(camera, &pos, 200.0f, 200.0f); if (g_kankyoHIO.wind.display_wind_dir == TRUE) { @@ -787,7 +787,7 @@ void dKydb_plight_monitor() { void dKydb_dungeonlight_draw() { cXyz proj; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); int i; fopAc_ac_c* player = dComIfGp_getPlayer(0); @@ -946,7 +946,7 @@ void dKydb_dungeonlight_draw() { if ((g_kankyoHIO.dungeonLight.field_0x8 - 1) == i) { g_env_light.dungeonlight[i].mPosition = player->current.pos; } else if (g_kankyoHIO.dungeonLight.field_0x8 == i + 160) { - g_env_light.dungeonlight[i].mPosition = camera->lookat.center; + g_env_light.dungeonlight[i].mPosition = camera->view.lookat.center; } } } diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index fce7f79a713..8150e828876 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -42,29 +42,29 @@ void dKyr_get_vectle_calc(cXyz* i_vecA, cXyz* i_vecB, cXyz* o_out) { static void dKy_set_eyevect_calc(camera_class* i_camera, Vec* o_out, f32 param_2, f32 param_3) { cXyz calc; - get_vectle_calc(&i_camera->lookat.eye, &i_camera->lookat.center, &calc); - o_out->x = i_camera->lookat.eye.x + calc.x * param_2; - o_out->y = (i_camera->lookat.eye.y + calc.y * param_3) - 200.0f; - o_out->z = i_camera->lookat.eye.z + calc.z * param_2; + get_vectle_calc(&i_camera->view.lookat.eye, &i_camera->view.lookat.center, &calc); + o_out->x = i_camera->view.lookat.eye.x + calc.x * param_2; + o_out->y = (i_camera->view.lookat.eye.y + calc.y * param_3) - 200.0f; + o_out->z = i_camera->view.lookat.eye.z + calc.z * param_2; } void dKy_set_eyevect_calc2(camera_class* i_camera, Vec* o_out, f32 param_2, f32 param_3) { cXyz calc; DOUBLE_POS pos; - pos.x = i_camera->lookat.center.x - i_camera->lookat.eye.x; + pos.x = i_camera->view.lookat.center.x - i_camera->view.lookat.eye.x; if (param_3 != 0.0f) { - pos.y = i_camera->lookat.center.y - i_camera->lookat.eye.y; + pos.y = i_camera->view.lookat.center.y - i_camera->view.lookat.eye.y; } else { pos.y = 0.0f; } - pos.z = i_camera->lookat.center.z - i_camera->lookat.eye.z; + pos.z = i_camera->view.lookat.center.z - i_camera->view.lookat.eye.z; vectle_calc(&pos, &calc); - o_out->x = i_camera->lookat.eye.x + calc.x * param_2; - o_out->y = i_camera->lookat.eye.y + calc.y * param_3; - o_out->z = i_camera->lookat.eye.z + calc.z * param_2; + o_out->x = i_camera->view.lookat.eye.x + calc.x * param_2; + o_out->y = i_camera->view.lookat.eye.y + calc.y * param_3; + o_out->z = i_camera->view.lookat.eye.z + calc.z * param_2; if (param_3 == 0.0f) { o_out->y = 0.0f; @@ -91,7 +91,7 @@ static void dKyr_set_btitex(GXTexObj* i_obj, ResTIMG* i_img) { void dKyr_lenzflare_move() { dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket; dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunLenzPacket; - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz eyeVect; cXyz field_0x3c; @@ -121,7 +121,7 @@ void dKyr_lenzflare_move() { lenz_packet->field_0x94 *= S2DEG_CONSTANT; // convert from short angle to degrees lenz_packet->field_0x94 += 180.0f; - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &camFwd); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &camFwd); for (int i = 2; i < 8; i++) { if (i == 2) { @@ -149,8 +149,8 @@ static BOOL dKyr_moon_arrival_check() { void dKyr_sun_move() { dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket; dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunLenzPacket; - camera_class* camera_p2 = dComIfGp_getCamera(0); - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera_p2 = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); cXyz lightDir; f32 pulse_pos; @@ -165,17 +165,17 @@ void dKyr_sun_move() { u32 stage_type = dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()); if (g_env_light.base_light.mColor.r == 0 && stage_type != ST_ROOM) { - dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.base_light.mPosition, + dKyr_get_vectle_calc(&camera_p2->view.lookat.eye, &g_env_light.base_light.mPosition, &lightDir); } else { - dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.sun_light_pos, &lightDir); + dKyr_get_vectle_calc(&camera_p2->view.lookat.eye, &g_env_light.sun_light_pos, &lightDir); } - sun_packet->mPos[0].x = camera_p2->lookat.eye.x + 8000.0f * lightDir.x; - sun_packet->mPos[0].y = camera_p2->lookat.eye.y + 8000.0f * lightDir.y; - sun_packet->mPos[0].z = camera_p2->lookat.eye.z + 8000.0f * lightDir.z; + sun_packet->mPos[0].x = camera_p2->view.lookat.eye.x + 8000.0f * lightDir.x; + sun_packet->mPos[0].y = camera_p2->view.lookat.eye.y + 8000.0f * lightDir.y; + sun_packet->mPos[0].z = camera_p2->view.lookat.eye.z + 8000.0f * lightDir.z; - f32 horizon_y = (sun_packet->mPos[0].y - camera_p2->lookat.eye.y) / 8000.0f; + f32 horizon_y = (sun_packet->mPos[0].y - camera_p2->view.lookat.eye.y) / 8000.0f; if (horizon_y < 0.0f) { horizon_y = 0.0f; } @@ -389,7 +389,7 @@ void dKyr_sun_move() { } if (dKyr_moon_arrival_check()) { - f32 alpha = (sun_packet->mPos[0].y - camera_p2->lookat.eye.y) / -8000.0f; + f32 alpha = (sun_packet->mPos[0].y - camera_p2->view.lookat.eye.y) / -8000.0f; alpha *= alpha; alpha *= 6.0f; @@ -406,10 +406,10 @@ void dKyr_sun_move() { sun_packet->mSunAlpha >= 0.2f) { cXyz sp24; - dKyr_get_vectle_calc(&camera_p2->lookat.eye, &g_env_light.sun_light_pos, &lightDir); - sp24.x = camera_p2->lookat.eye.x + 30160.0f * lightDir.x; - sp24.y = camera_p2->lookat.eye.y + 30160.0f * lightDir.y; - sp24.z = camera_p2->lookat.eye.z + 30160.0f * lightDir.z; + dKyr_get_vectle_calc(&camera_p2->view.lookat.eye, &g_env_light.sun_light_pos, &lightDir); + sp24.x = camera_p2->view.lookat.eye.x + 30160.0f * lightDir.x; + sp24.y = camera_p2->view.lookat.eye.y + 30160.0f * lightDir.y; + sp24.z = camera_p2->view.lookat.eye.z + 30160.0f * lightDir.z; sp24.y -= 21678.0f; sun_packet->field_0x58 = dComIfGp_particle_set(sun_packet->field_0x58, 0x11C, &sp24, 0, 0); } @@ -419,8 +419,8 @@ void dKyr_rain_init() { camera_class* camera = (camera_class*)dComIfGp_getCamera(0); g_env_light.mpRainPacket->mpTex = (u8*)dComIfG_getObjectRes("Always", 0x4a); g_env_light.mpRainPacket->mpTex2 = (u8*)dComIfG_getObjectRes("Always", 0x57); - g_env_light.mpRainPacket->mCamEyePos = camera->lookat.eye; - g_env_light.mpRainPacket->mCamCenterPos = camera->lookat.center; + g_env_light.mpRainPacket->mCamEyePos = camera->view.lookat.eye; + g_env_light.mpRainPacket->mCamCenterPos = camera->view.lookat.center; g_env_light.mpRainPacket->mCenterDeltaMul = 0.0f; g_env_light.mpRainPacket->field_0x3700 = 0.0f; g_env_light.mpRainPacket->mSibukiAlpha = 0.0f; @@ -439,17 +439,17 @@ void dKyr_rain_init() { } static void rain_bg_chk(dKankyo_rain_Packet* i_packet, int i_idx) { - i_packet->mRainEff[i_idx].field_0x30 = dComIfGp_getCamera(0)->lookat.center.y + -800.0f; + i_packet->mRainEff[i_idx].field_0x30 = dComIfGp_getCamera(0)->view.lookat.center.y + -800.0f; } static BOOL overhead_bg_chk() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); BOOL chk = false; dBgS_ObjGndChk_All gndchk; dBgS_RoofChk roofchk; - cXyz chkPos = camera->lookat.eye; + cXyz chkPos = camera->view.lookat.eye; chkPos.y += 50.0f; roofchk.SetPos(chkPos); @@ -465,7 +465,7 @@ static BOOL overhead_bg_chk() { chkPos.y += 10000.0f; gndchk.SetPos(&chkPos); - if (dComIfG_Bgsp().GroundCross(&gndchk) > camera->lookat.eye.y + 50.0f) { + if (dComIfG_Bgsp().GroundCross(&gndchk) > camera->view.lookat.eye.y + 50.0f) { chk = true; } @@ -473,7 +473,7 @@ static BOOL overhead_bg_chk() { } static BOOL forward_overhead_bg_chk(cXyz* ppos, f32 dist) { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); BOOL chk = FALSE; dBgS_ObjGndChk_All gndchk; @@ -481,11 +481,11 @@ static BOOL forward_overhead_bg_chk(cXyz* ppos, f32 dist) { cXyz chk_pos; cXyz vectle; - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &vectle); - chk_pos.x = camera->lookat.eye.x + vectle.x * dist; - chk_pos.y = camera->lookat.eye.y + vectle.y * dist; - chk_pos.z = camera->lookat.eye.z + vectle.z * dist; - chk_pos.y = 50.0f + camera->lookat.eye.y; + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &vectle); + chk_pos.x = camera->view.lookat.eye.x + vectle.x * dist; + chk_pos.y = camera->view.lookat.eye.y + vectle.y * dist; + chk_pos.z = camera->view.lookat.eye.z + vectle.z * dist; + chk_pos.y = 50.0f + camera->view.lookat.eye.y; *ppos = chk_pos; roofchk.SetPos(chk_pos); @@ -501,7 +501,7 @@ static BOOL forward_overhead_bg_chk(cXyz* ppos, f32 dist) { chk_pos.y += 10000.0f; gndchk.SetPos(&chk_pos); - if (dComIfG_Bgsp().GroundCross(&gndchk) > 50.0f + camera->lookat.eye.y) { + if (dComIfG_Bgsp().GroundCross(&gndchk) > 50.0f + camera->view.lookat.eye.y) { chk = TRUE; } return chk; @@ -552,9 +552,9 @@ void dKyr_rain_move() { } if (rain_packet->raincnt != 0) { - dKyr_get_vectle_calc(&camera->lookat.center, &rain_packet->mCamCenterPos, &spB4); + dKyr_get_vectle_calc(&camera->view.lookat.center, &rain_packet->mCamCenterPos, &spB4); - var_f30 = rain_packet->mCamEyePos.abs(camera->lookat.eye); + var_f30 = rain_packet->mCamEyePos.abs(camera->view.lookat.eye); if (var_f30 > 10.0f) { var_f30 = (var_f30 - 10.0f) / 50.0f; @@ -565,19 +565,19 @@ void dKyr_rain_move() { var_f30 = 0.0f; } - rain_packet->mCamEyePos.x = camera->lookat.eye.x; - rain_packet->mCamEyePos.z = camera->lookat.eye.z; + rain_packet->mCamEyePos.x = camera->view.lookat.eye.x; + rain_packet->mCamEyePos.z = camera->view.lookat.eye.z; - var_f28 = rain_packet->mCamEyePos.abs(camera->lookat.eye); + var_f28 = rain_packet->mCamEyePos.abs(camera->view.lookat.eye); var_f28 = var_f28 / 20.0f; if (var_f28 > 1.0f) { var_f28 = 1.0f; } spA8.y += -(var_f28 * 15.0f); - rain_packet->mCamEyePos = camera->lookat.eye; + rain_packet->mCamEyePos = camera->view.lookat.eye; - var_f29 = rain_packet->mCamCenterPos.abs(camera->lookat.center); + var_f29 = rain_packet->mCamCenterPos.abs(camera->view.lookat.center); if (var_f29 > 10.0f) { var_f29 = (var_f29 - 10.0f) / 50.0f; if (var_f29 > 1.0f) { @@ -595,7 +595,7 @@ void dKyr_rain_move() { cLib_addCalc(&rain_packet->mCenterDelta.x, spB4.x, 0.2f, 0.1f, 0.01f); cLib_addCalc(&rain_packet->mCenterDelta.y, spB4.y, 0.2f, 0.1f, 0.01f); cLib_addCalc(&rain_packet->mCenterDelta.z, spB4.z, 0.2f, 0.1f, 0.01f); - rain_packet->mCamCenterPos = camera->lookat.center; + rain_packet->mCamCenterPos = camera->view.lookat.center; dKy_set_eyevect_calc2(camera, &spFC, 700.0f, 600.0f); spD8.x = spD8.y = spD8.z = 0.0f; @@ -756,9 +756,9 @@ void dKyr_rain_move() { cXyz sp80; f32 sp10 = 800.0f; sp80 = spC0; - sp80.y = camera->lookat.eye.y; + sp80.y = camera->view.lookat.eye.y; - if (camera->lookat.eye.abs(sp80) < sp10) { + if (camera->view.lookat.eye.abs(sp80) < sp10) { var_f31 *= rain_packet->mOverheadFade * 1.0f; } } @@ -820,7 +820,7 @@ void dKyr_rain_move() { var_f31 = 0.0f; } - if (camera->lookat.eye.y < 0.0f) { + if (camera->view.lookat.eye.y < 0.0f) { var_f31 = 0.0f; } } else { @@ -901,7 +901,7 @@ void dKyr_housi_move() { } if (g_env_light.field_0xea9 == 2) { - sp54 = camera->lookat.eye; + sp54 = camera->view.lookat.eye; sp54.y += 100000.0f; cam_gndchk.SetPos(&sp54); @@ -952,14 +952,14 @@ void dKyr_housi_move() { dBgS_CamGndChk_Wtr sp90; cXyz sp48; - camera_class* cam_p = dComIfGp_getCamera(0); - sp48 = cam_p->lookat.eye; + camera_process_class* cam_p = dComIfGp_getCamera(0); + sp48 = cam_p->view.lookat.eye; sp48.y += 100000.0f; sp90.SetPos(&sp48); f32 gnd_cross = dComIfG_Bgsp().GroundCross(&sp90); - if (gnd_cross > cam_p->lookat.eye.y) { - var_f31 = (gnd_cross - cam_p->lookat.eye.y) / 700.0f; + if (gnd_cross > cam_p->view.lookat.eye.y) { + var_f31 = (gnd_cross - cam_p->view.lookat.eye.y) / 700.0f; if (var_f31 < 0.0f) { var_f31 = 0.0f; } @@ -1202,7 +1202,7 @@ void dKyr_housi_move() { } if (dKy_darkworld_check() == true || var_r24 == 1) { - f32 var_f1_6 = sp6C.abs(camera->lookat.eye); + f32 var_f1_6 = sp6C.abs(camera->view.lookat.eye); effect->field_0x48 = var_f1_6; f32 var_f1_7; @@ -1218,7 +1218,7 @@ void dKyr_housi_move() { effect->mAlpha = var_f1_7; } - f32 var_f1_8 = sp6C.abs(camera->lookat.eye); + f32 var_f1_8 = sp6C.abs(camera->view.lookat.eye); f32 temp_f25 = var_f1_8 / 2000.0f; effect->field_0x48 = 1.0f - (temp_f25 * temp_f25); } @@ -1239,7 +1239,7 @@ void dKyr_snow_init() { } g_env_light.mpSnowPacket->field_0x6d88 = 0; - g_env_light.mpSnowPacket->field_0x6d74 = camera->lookat.eye; + g_env_light.mpSnowPacket->field_0x6d74 = camera->view.lookat.eye; g_env_light.mpSnowPacket->field_0x6d80 = 0.0f; g_env_light.mpSnowPacket->field_0x6d84 = 0.0f; g_env_light.mpSnowPacket->field_0x6d8a = 0; @@ -1283,11 +1283,11 @@ void dKyr_snow_move() { dKy_set_eyevect_calc2(camera, &spB8, 500.0f, 500.0f); dKy_set_eyevect_calc2(camera, &spAC, 1000.0f, 1000.0f); - if (snow_packet->field_0x6d74.abs(camera->lookat.eye) > 1500.0f) { + if (snow_packet->field_0x6d74.abs(camera->view.lookat.eye) > 1500.0f) { snow_packet->field_0x6d88 = 0; } - snow_packet->field_0x6d74 = camera->lookat.eye; + snow_packet->field_0x6d74 = camera->view.lookat.eye; spA0.x = spA0.y = spA0.z = 0.0f; cXyz* temp_r21 = dKyw_get_wind_vec(); @@ -1304,9 +1304,9 @@ void dKyr_snow_move() { } cXyz sp58; - spC8.x = camera->lookat.center.x - camera->lookat.eye.x; + spC8.x = camera->view.lookat.center.x - camera->view.lookat.eye.x; spC8.y = 0.0f; - spC8.z = camera->lookat.center.z - camera->lookat.eye.z; + spC8.z = camera->view.lookat.center.z - camera->view.lookat.eye.z; vectle_calc(&spC8, &sp58); snow_packet->field_0x6d84 = @@ -1341,7 +1341,7 @@ void dKyr_snow_move() { cXyz sp4C; sp88 = sp94; - if (camera->lookat.eye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f && + if (camera->view.lookat.eye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f && snow_packet->mSnowEff[i].mPosition.y < temp_f19 + 250.0f) { f32 var_f1_3 = ((temp_f19 + 250.0f) - snow_packet->mSnowEff[i].mPosition.y) / 250.0f; @@ -1368,7 +1368,7 @@ void dKyr_snow_move() { snow_packet->mSnowEff[i].mPosition.z += sp4C.z * 5.3f; sp88 = sp94; - if (camera->lookat.eye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f && + if (camera->view.lookat.eye.abs(snow_packet->mSnowEff[i].mPosition) < 500.0f && snow_packet->mSnowEff[i].mBasePos.y < temp_f19 + 250.0f) { f32 var_f1_5 = ((temp_f19 + 250.0f) - snow_packet->mSnowEff[i].mBasePos.y) / 250.0f; @@ -1438,7 +1438,7 @@ void dKyr_snow_move() { sp7C = snow_packet->mSnowEff[i].mPosition; - f32 var_f1_11 = sp7C.abs(camera->lookat.eye); + f32 var_f1_11 = sp7C.abs(camera->view.lookat.eye); f32 var_f26 = var_f1_11 / 100.0f; if (var_f26 > 1.0) { var_f26 = 1.0; @@ -1481,7 +1481,7 @@ void dKyr_snow_move() { sp7C = snow_packet->mSnowEff[i].mBasePos; - var_f1_11 = sp7C.abs(camera->lookat.eye); + var_f1_11 = sp7C.abs(camera->view.lookat.eye); f32 temp_f29 = var_f1_11 / 100.0f; if (temp_f29 > 1.0) { temp_f29 = 1.0; @@ -1708,7 +1708,7 @@ void cloud_shadow_move() { f32 sp20 = 0.0f; f32 sp1C = 700.0f; - f32 sp24 = pos.abs(camera->lookat.eye); + f32 sp24 = pos.abs(camera->view.lookat.eye); f32 sp18 = (sp24 / rnd_pos); if (sp18 > 1.0f) { @@ -1869,7 +1869,7 @@ void vrkumo_move() { #endif } - sp6C -= 0.09f * (camera->lookat.eye.y - sp2C); + sp6C -= 0.09f * (camera->view.lookat.eye.y - sp2C); } for (int i = 0; i < 100; i++) { @@ -2035,13 +2035,13 @@ static void dKyr_draw_rev_moon(Mtx drawMtx, u8** tex) { cXyz pos[4]; u16 date = dComIfGs_getDate(); - cXyz sp60 = camera->lookat.eye + g_env_light.moon_pos; - sp60.y = camera->lookat.eye.y - g_env_light.moon_pos.y; + cXyz sp60 = camera->view.lookat.eye + g_env_light.moon_pos; + sp60.y = camera->view.lookat.eye.y - g_env_light.moon_pos.y; cXyz moon_pos; - moon_pos.x = sp60.x - camera->lookat.eye.x; - moon_pos.y = sp60.y - camera->lookat.eye.y; - moon_pos.z = sp60.z - camera->lookat.eye.z; + moon_pos.x = sp60.x - camera->view.lookat.eye.x; + moon_pos.y = sp60.y - camera->view.lookat.eye.y; + moon_pos.z = sp60.z - camera->view.lookat.eye.z; Vec vp, lp; @@ -2166,7 +2166,7 @@ static void dKyr_draw_rev_moon(Mtx drawMtx, u8** tex) { 1.0f, 0.78f, 0.6f, 0.83f, }; - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &camfwd); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &camfwd); f32 cam_distXZ = JMAFastSqrt((camfwd.x * camfwd.x) + (camfwd.z * camfwd.z)); f32 cam_theta = atan2f(camfwd.x, camfwd.z); @@ -2363,21 +2363,21 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) { spB4 = envlight->moon_pos; moon_pos = spB4; } else { - spB4 = camera->lookat.eye + envlight->moon_pos; - moon_pos.x = spB4.x - camera->lookat.eye.x; - moon_pos.y = spB4.y - camera->lookat.eye.y; - moon_pos.z = spB4.z - camera->lookat.eye.z; + spB4 = camera->view.lookat.eye + envlight->moon_pos; + moon_pos.x = spB4.x - camera->view.lookat.eye.x; + moon_pos.y = spB4.y - camera->view.lookat.eye.y; + moon_pos.z = spB4.z - camera->view.lookat.eye.z; } } if (strcmp(dComIfGp_getStartStageName(), "F_SP103") == 0 && dKy_daynight_check()) { - spB4.x = 3900.0f + camera->lookat.eye.x; - spB4.y = 8052.0f + camera->lookat.eye.y; - spB4.z = -9072.0f + camera->lookat.eye.z; + spB4.x = 3900.0f + camera->view.lookat.eye.x; + spB4.y = 8052.0f + camera->view.lookat.eye.y; + spB4.z = -9072.0f + camera->view.lookat.eye.z; - moon_pos.x = spB4.x - camera->lookat.eye.x; - moon_pos.y = spB4.y - camera->lookat.eye.y; - moon_pos.z = spB4.z - camera->lookat.eye.z; + moon_pos.x = spB4.x - camera->view.lookat.eye.x; + moon_pos.y = spB4.y - camera->view.lookat.eye.y; + moon_pos.z = spB4.z - camera->view.lookat.eye.z; } int weekday = date % 8; @@ -2516,7 +2516,7 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) { }; if (strcmp(dComIfGp_getStartStageName(), "F_SP200") != 0) { - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &camfwd); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &camfwd); f32 cam_distXZ = JMAFastSqrt((camfwd.x * camfwd.x) + (camfwd.z * camfwd.z)); f32 cam_theta = atan2f(camfwd.x, camfwd.z); f32 cam_phi = atan2f(camfwd.y, cam_distXZ); @@ -3167,7 +3167,7 @@ void dKyr_drawRain(Mtx drawMtx, u8** tex) { sp3C.y = rain_packet->mRainEff[i].mBasePos.y + rain_packet->mRainEff[i].mPosition.y; sp3C.z = rain_packet->mRainEff[i].mBasePos.z + rain_packet->mRainEff[i].mPosition.z; - f32 dist = 0.1f + (sp3C.abs(camera->lookat.eye) / 1500.0f); + f32 dist = 0.1f + (sp3C.abs(camera->view.lookat.eye) / 1500.0f); if (dist > 1.0f) { dist = 1.0f; } @@ -3254,8 +3254,8 @@ void dKyr_drawSibuki(Mtx drawMtx, u8** tex) { } if (strcmp(dComIfGp_getStartStageName(), "F_SP113") == 0 && dComIfGp_roomControl_getStayNo() == 1) { - if ((camera->lookat.eye.z < 5100.0f || (camera->lookat.eye.x < -3250.0f && camera->lookat.eye.y < -50.0f)) || - (camera->lookat.eye.x < -2700.0f && camera->lookat.eye.z > 15750.0f)) + if ((camera->view.lookat.eye.z < 5100.0f || (camera->view.lookat.eye.x < -3250.0f && camera->view.lookat.eye.y < -50.0f)) || + (camera->view.lookat.eye.x < -2700.0f && camera->view.lookat.eye.z > 15750.0f)) { return; } @@ -3271,7 +3271,7 @@ void dKyr_drawSibuki(Mtx drawMtx, u8** tex) { cLib_addCalc(&rain_packet->mSibukiAlpha, alpha, 0.2f, 30.0f, 0.001f); dKy_set_eyevect_calc(camera, &eyevect, 7000.0f, 4000.0f); cXyz camdir; - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &camdir); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &camdir); f32 alphaFade = 0.0f; if (camdir.y > alphaFade) { @@ -3439,7 +3439,7 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) { GXColor sp1C = {0x32, 0x32, 0x32, 0xFF}; GXColor sp18 = {0xFF, 0xD7, 0xF0, 0xFF}; - camera_class* cam_p = dComIfGp_getCamera(0); + camera_process_class* cam_p = dComIfGp_getCamera(0); if (g_env_light.fishing_hole_season == 3) { sp1C.r = 0x78; sp1C.g = 0x0A; @@ -3450,7 +3450,7 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) { sp18.b = 0x00; } - dKy_ParticleColor_get_bg(&cam_p->lookat.eye, NULL, &color_reg1, &color_reg0, &sp1C, &sp18, + dKy_ParticleColor_get_bg(&cam_p->view.lookat.eye, NULL, &color_reg1, &color_reg0, &sp1C, &sp18, 0.0f); var_f25 = 255.0f; } @@ -3774,7 +3774,7 @@ void dKyr_drawSnow(Mtx drawMtx, u8** tex) { } if (!g_env_light.camera_water_in_status) { - dKy_ParticleColor_get_bg(&camera->lookat.eye, NULL, &sp64, &sp60, &sp5C, &sp58, 0.0f); + dKy_ParticleColor_get_bg(&camera->view.lookat.eye, NULL, &sp64, &sp60, &sp5C, &sp58, 0.0f); color_reg0.r = 178.5f + (0.3f * sp60.r); color_reg0.g = 178.5f + (0.3f * sp60.g); color_reg0.b = 178.5f + (0.3f * sp60.b); @@ -3892,7 +3892,7 @@ void dKyr_drawSnow(Mtx drawMtx, u8** tex) { GXSetTevColor(GX_TEVREG0, color_reg0); f32 sp38 = 2.0f * (i / 500.0f) * snow_packet->field_0x6d80; - f32 sp68 = sp50 * (camera->lookat.eye.abs(sp7C) / 1000.0f); + f32 sp68 = sp50 * (camera->view.lookat.eye.abs(sp7C) / 1000.0f); if (sp68 > 1.0f) { sp68 = 1.0f; } @@ -4100,11 +4100,11 @@ void dKyr_drawStar(Mtx drawMtx, u8** tex) { if (strcmp(dComIfGp_getStartStageName(), "F_SP200") == 0 && dComIfG_play_c::getLayerNo(0) == 0) { moon_pos = envlight->moon_pos; } else { - moon_pos = camera->lookat.eye + envlight->moon_pos; + moon_pos = camera->view.lookat.eye + envlight->moon_pos; if (sp38) { - moon_pos.x = 3900.0f + camera->lookat.eye.x; - moon_pos.y = 8052.0f + camera->lookat.eye.y; - moon_pos.z = -9072.0f + camera->lookat.eye.z; + moon_pos.x = 3900.0f + camera->view.lookat.eye.x; + moon_pos.y = 8052.0f + camera->view.lookat.eye.y; + moon_pos.z = -9072.0f + camera->view.lookat.eye.z; } } @@ -4140,9 +4140,9 @@ void dKyr_drawStar(Mtx drawMtx, u8** tex) { rot = 0.0f; } - spBC.x = camera->lookat.eye.x; - spBC.y = camera->lookat.eye.y; - spBC.z = camera->lookat.eye.z; + spBC.x = camera->view.lookat.eye.x; + spBC.y = camera->view.lookat.eye.y; + spBC.z = camera->view.lookat.eye.z; f32 sp34 = -1.0f; int sp30 = 0; @@ -4336,7 +4336,7 @@ void drawCloudShadow(Mtx drawMtx, u8** tex) { GXTexObj texobj, fb_texobj; if (g_env_light.mMoyaMode < 50) { - dKy_ParticleColor_get_bg(&camera->lookat.eye, NULL, &sp48, &sp44, &sp40, &sp3C, 0.0f); + dKy_ParticleColor_get_bg(&camera->view.lookat.eye, NULL, &sp48, &sp44, &sp40, &sp3C, 0.0f); f32 temp_f30 = 0.4f; color_reg0.r = (sp38.r * temp_f30) + (sp44.r * (1.0f - temp_f30)); @@ -4396,11 +4396,11 @@ void drawCloudShadow(Mtx drawMtx, u8** tex) { ResTIMG* fb_timg = mDoGph_gInf_c::getFrameBufferTimg(); dDlst_window_c* window = dComIfGp_getWindow(0); - camera_class* window_cam = dComIfGp_getCamera(window->getCameraID()); + camera_process_class* window_cam = dComIfGp_getCamera(window->getCameraID()); dKyr_set_btitex_common(&fb_texobj, fb_timg, GX_TEXMAP0); f32 scale = 0.49f; - C_MTXLightPerspective(sp120, window_cam->fovy, window_cam->aspect, scale, -scale, 0.5f, 0.5f); + C_MTXLightPerspective(sp120, window_cam->view.fovy, window_cam->view.aspect, scale, -scale, 0.5f, 0.5f); #if WIDESCREEN_SUPPORT mDoGph_gInf_c::setWideZoomLightProjection(sp120); #endif @@ -4534,7 +4534,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) { dScnKy_env_light_c* envlight = dKy_getEnvlight(); dKankyo_vrkumo_Packet* vrkumo_packet = g_env_light.mpVrkumoPacket; camera_class* camera = (camera_class*)dComIfGp_getCamera(0); - camera_class* camera2 = (camera_class*)dComIfGp_getCamera(0); + camera_process_class* camera2 = (camera_process_class*)dComIfGp_getCamera(0); Mtx camMtx; Mtx rotMtx; @@ -4623,7 +4623,7 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) { } #endif - unused = 1.0f - (0.09f * (camera->lookat.eye.y - sp70)); + unused = 1.0f - (0.09f * (camera->view.lookat.eye.y - sp70)); } if (g_env_light.daytime > 105.0f && g_env_light.daytime < 240.0f && !dComIfGp_event_runCheck() && sun_packet != NULL && sun_packet->mSunAlpha > 0.0f) { @@ -4875,10 +4875,10 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) { pos[3].y = sp108.y * spCC; pos[3].z = sp108.z * spCC; - pos[0] += camera->lookat.eye; - pos[1] += camera->lookat.eye; - pos[2] += camera->lookat.eye; - pos[3] += camera->lookat.eye; + pos[0] += camera->view.lookat.eye; + pos[1] += camera->view.lookat.eye; + pos[2] += camera->view.lookat.eye; + pos[3] += camera->view.lookat.eye; sp84 = 0; if (dComIfGd_getView()->fovy > 40.0f) { @@ -5029,7 +5029,7 @@ void dKyr_thunder_move() { } if (sp8 == 1) { - effect->mLightInfluence.mPosition = camera->lookat.eye; + effect->mLightInfluence.mPosition = camera->view.lookat.eye; effect->mLightInfluence.mColor.r = 0; effect->mLightInfluence.mColor.g = 0; effect->mLightInfluence.mColor.b = 0; @@ -5044,7 +5044,7 @@ void dKyr_thunder_move() { if (g_env_light.mThunderEff.field_0x2 != 0) { g_env_light.mThunderEff.field_0x2 = 0; - effect->mLightInfluence.mPosition = camera->lookat.eye; + effect->mLightInfluence.mPosition = camera->view.lookat.eye; effect->mLightInfluence.mColor.r = 0; effect->mLightInfluence.mColor.g = 0; effect->mLightInfluence.mColor.b = 0; @@ -5062,7 +5062,7 @@ void dKyr_thunder_move() { fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL); } } else if (cM_rndF(1.0f) < 0.005f && g_env_light.mThunderEff.mMode < 10 && sp10 != 1) { - effect->mLightInfluence.mPosition = camera->lookat.eye; + effect->mLightInfluence.mPosition = camera->view.lookat.eye; effect->mLightInfluence.mColor.r = 0; effect->mLightInfluence.mColor.g = 0; effect->mLightInfluence.mColor.b = 0; @@ -5108,10 +5108,10 @@ void dKyr_thunder_move() { if (effect->mState != 0) { if (effect->mState < 10) { - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &sp28); - effect->mLightInfluence.mPosition.x = camera->lookat.eye.x - (sp28.x * effect->field_0x14); - effect->mLightInfluence.mPosition.y = camera->lookat.eye.y + 2000.0f; - effect->mLightInfluence.mPosition.z = camera->lookat.eye.z - (sp28.z * effect->field_0x18); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &sp28); + effect->mLightInfluence.mPosition.x = camera->view.lookat.eye.x - (sp28.x * effect->field_0x14); + effect->mLightInfluence.mPosition.y = camera->view.lookat.eye.y + 2000.0f; + effect->mLightInfluence.mPosition.z = camera->view.lookat.eye.z - (sp28.z * effect->field_0x18); if (sp10 == 2) { effect->mLightInfluence.mPosition.x = 195520.0f; @@ -5125,7 +5125,7 @@ void dKyr_thunder_move() { if (g_env_light.field_0x12d6 == 0) { if (sp10 == 0) { - dKyr_get_vectle_calc(&camera->lookat.eye, &camera->lookat.center, &sp28); + dKyr_get_vectle_calc(&camera->view.lookat.eye, &camera->view.lookat.center, &sp28); f32 temp_f31; if (sp28.y < 0.2f) { @@ -5375,11 +5375,11 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { ResTIMG* fb_timg = mDoGph_gInf_c::getFrameBufferTimg(); dDlst_window_c* window = dComIfGp_getWindow(0); - camera_class* window_cam = dComIfGp_getCamera(window->getCameraID()); + camera_process_class* window_cam = dComIfGp_getCamera(window->getCameraID()); dKyr_set_btitex_common(&fb_texobj, fb_timg, GX_TEXMAP0); f32 scale = 0.49f; - C_MTXLightPerspective(sp120, window_cam->fovy, window_cam->aspect, scale, -scale, 0.5f, 0.5f); + C_MTXLightPerspective(sp120, window_cam->view.fovy, window_cam->view.aspect, scale, -scale, 0.5f, 0.5f); cMtx_concat(sp120, j3dSys.getViewMtx(), spF0); rot += 2.0f; @@ -5433,7 +5433,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { if (effect->mStatus != 0 && effect->mStatus != 1 && effect->mStatus != 11) { sp4C = effect->mBasePos + effect->mPosition; - f32 var_f31 = camera->lookat.eye.abs(sp4C); + f32 var_f31 = camera->view.lookat.eye.abs(sp4C); if (var_f31 < 250.0f) { if (var_f31 < 150.0f) { var_f31 = 0.0f; @@ -5657,10 +5657,10 @@ void dKyr_mud_move() { cLib_addCalc(&mud_packet->mEffect[i].field_0x38, sp10 * mud_packet->field_0x1c3c, 0.25f, sp1C, 0.000001f); sp68.x = mud_packet->mEffect[i].mBasePos.x + mud_packet->mEffect[i].mPosition.x; - sp68.y = camera->lookat.eye.y; + sp68.y = camera->view.lookat.eye.y; sp68.z = mud_packet->mEffect[i].mBasePos.z + mud_packet->mEffect[i].mPosition.z; - f32 spC = sp68.abs(camera->lookat.eye); + f32 spC = sp68.abs(camera->view.lookat.eye); f32 var_f30 = spC / 400.0f; if (var_f30 > 1.0f) { var_f30 = 1.0f; @@ -5970,7 +5970,7 @@ static void dKyr_evil_draw2(Mtx drawMtx, u8** tex) { f32 temp_f30 = 0.2f + (0.8f * fabsf(cM_ssin(effect->field_0x3c))); sp7C = effect->mBasePos + effect->mPosition; - if ((strcmp(dComIfGp_getStartStageName(), "D_MN08") != 0 || dComIfGp_roomControl_getStayNo() != 1 || i < 1600 || !(camera->lookat.eye.x >= -5000.0f)) && !(var_f31 > 9000.0f)) { + if ((strcmp(dComIfGp_getStartStageName(), "D_MN08") != 0 || dComIfGp_roomControl_getStayNo() != 1 || i < 1600 || !(camera->view.lookat.eye.x >= -5000.0f)) && !(var_f31 > 9000.0f)) { if (dComIfGd_getView()->fovy > 40.0f) { cXyz proj; Vec sp34; @@ -5991,7 +5991,7 @@ static void dKyr_evil_draw2(Mtx drawMtx, u8** tex) { f32 sp3C = 150.0f; f32 sp38 = 250.0f; - f32 var_f29 = camera->lookat.eye.abs(sp7C); + f32 var_f29 = camera->view.lookat.eye.abs(sp7C); if (var_f29 < sp38) { if (var_f29 < sp3C) { var_f29 = 0.0f; @@ -6216,7 +6216,7 @@ void dKyr_evil_draw(Mtx drawMtx, u8** tex) { f32 sp50 = 50.0f; f32 sp4C = 800.0f; - f32 var_f31 = camera->lookat.eye.abs(spA4); + f32 var_f31 = camera->view.lookat.eye.abs(spA4); if (var_f31 < sp4C) { if (var_f31 < sp50) { var_f31 = 0.0f; diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index 0e0617639dc..5ab08fd2b03 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -530,12 +530,12 @@ static void wether_move_rain() { } break; case TRUE: - camera_class* cam = dComIfGp_getCamera(0); + camera_process_class* cam = dComIfGp_getCamera(0); dKyr_rain_move(); if (g_env_light.mSnowCount == 0 && cam != NULL) { // Stage is not Fishing Pond - if (strcmp(dComIfGp_getStartStageName(), "R_SP127") || cam->lookat.eye.y > 0.0f) { + if (strcmp(dComIfGp_getStartStageName(), "R_SP127") || cam->view.lookat.eye.y > 0.0f) { if (g_env_light.raincnt < 125.0f) { mDoAud_rainPlay(FALSE); } else { diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 0dd064f69ac..7b795d99810 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -43,7 +43,7 @@ int dThunder_c::draw() { static cXyz l_offsetPos(0.0f, 40.0f, -250.0f); static cXyz l_scale(1.0f, 1.0f, 1.0f); - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); mDoMtx_stack_c::transS(mThunderPos.x, mThunderPos.y, mThunderPos.z); mDoMtx_stack_c::YrotM(field_0x168); @@ -141,7 +141,7 @@ static int dThunder_Create(kankyo_class* i_this) { int dThunder_c::create() { dScnKy_env_light_c* env_light = dKy_getEnvlight(); - camera_class* camera_p = dComIfGp_getCamera(0); + camera_process_class* camera_p = dComIfGp_getCamera(0); cXyz spB8; cXyz spC4; cXyz spD0; @@ -180,7 +180,7 @@ int dThunder_c::create() { var_f29 = 0.25f; } - field_0x168 = cLib_targetAngleY(&camera_p->lookat.eye, &camera_p->lookat.center); + field_0x168 = cLib_targetAngleY(&camera_p->view.lookat.eye, &camera_p->view.lookat.center); if (!(g_Counter.mCounter0 & 1)) { field_0x168 += 0x7FFF; @@ -217,7 +217,7 @@ int dThunder_c::create() { field_0x138.y = var_f29 * (var_f31 + cM_rndF(var_f30 - var_f31)); field_0x138.z = 1.0f; - dKyr_get_vectle_calc(&camera_p->lookat.eye, &camera_p->lookat.center, &spB8); + dKyr_get_vectle_calc(&camera_p->view.lookat.eye, &camera_p->view.lookat.center, &spB8); // JMAFastSqrt doesn't match here when it should, probably needs to be fixed // var_f29_2 = JMAFastSqrt(spB8.x * spB8.x + spB8.z * spB8.z); @@ -244,9 +244,9 @@ int dThunder_c::create() { spD0.z = cM_scos(temp_r31) * cM_scos(temp_r28); f32 temp_f1_3 = cM_rndF(spC4.x); - mThunderPos.x = camera_p->lookat.eye.x + (spB8.x * 100000.0f) + (spD0.x * temp_f1_3); - mThunderPos.y = camera_p->lookat.eye.y + 2000.0f + cM_rndF(spC4.y); - mThunderPos.z = camera_p->lookat.eye.z + (spB8.z * 100000.0f) + (spD0.z * temp_f1_3); + mThunderPos.x = camera_p->view.lookat.eye.x + (spB8.x * 100000.0f) + (spD0.x * temp_f1_3); + mThunderPos.y = camera_p->view.lookat.eye.y + 2000.0f + cM_rndF(spC4.y); + mThunderPos.z = camera_p->view.lookat.eye.z + (spB8.z * 100000.0f) + (spD0.z * temp_f1_3); if (!strcmp(dComIfGp_getStartStageName(), "R_SP30") && dComIfGp_roomControl_getStayNo() == 4) { mThunderPos.x = cM_rndFX(260.0f) + 19635.0f; diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 92d4b97b8e6..447cb916c3e 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -117,7 +117,7 @@ static int dKyeff_Create(kankyo_class* i_this) { dKyw_wether_init(); if (strcmp(dComIfGp_getStartStageName(), "Name") == 0) { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); OSTime time = OSGetTime(); OSTicksToCalendarTime(time, &calendar); diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index d63a7438baa..e21ef10575f 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -213,7 +213,7 @@ void dRes_info_c::setWarpSRT(J3DModelData* i_modelData, const cXyz& i_pos, f32 i texMtxInfo.mSRT.mTranslationY = i_transY; mDoMtx_stack_c::transS(-i_pos.x, -i_pos.y, -i_pos.z); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); mDoMtx_stack_c::YrotM(fopCamM_GetAngleY(camera)); cMtx_concat(l_texMtxInfo.mEffectMtx, mDoMtx_stack_c::get(), texMtxInfo.mEffectMtx); } diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index a4fe5558fbc..fd240538d17 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -14,6 +14,7 @@ #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" #include "m_Do/m_Do_mtx.h" +#include "m_Do/m_Do_main.h" #include "f_op/f_op_overlap_mng.h" static dSn_HIO_c g_snHIO; @@ -22,33 +23,33 @@ static dSn_HIO_c g_snHIO; static int mBmgStatus; #endif -typedef void (dScnName_c::*mainProcFunc)(void); -static mainProcFunc MainProc[6] = { - &dScnName_c::FileSelectOpen, &dScnName_c::FileSelectMain, &dScnName_c::FileSelectClose, - &dScnName_c::brightCheckOpen, &dScnName_c::brightCheck, &dScnName_c::changeGameScene, -}; - dSn_HIO_c::dSn_HIO_c() { mFileSelWaitTime = 15; } -static s32 phase_1(char* resName) { +#if DEBUG +void dSn_HIO_c::genMessage(JORMContext* mctx) { + mctx->genLabel("\n*****表示調整用*****", 0); + mctx->genSlider("ファイル選択開始WaitTime", &mFileSelWaitTime, 0, 120); +} +#endif + +static s32 phase_1(char* i_resName) { mDoAud_bgmStart(-1); - if (dComIfG_setObjectRes(resName, (u8)0, NULL) == 0) { + if (dComIfG_setObjectRes(i_resName, (u8)0, NULL) == 0) { return cPhs_ERROR_e; } return cPhs_NEXT_e; } -static s32 phase_2(char* resName) { - int syncStatus = dComIfG_syncObjectRes(resName); - - if (syncStatus < 0) { +static s32 phase_2(char* i_resName) { + int rt = dComIfG_syncObjectRes(i_resName); + if (rt < 0) { return cPhs_ERROR_e; } - if (syncStatus > 0) { + if (rt > 0) { return cPhs_INIT_e; } else { return cPhs_COMPLEATE_e; @@ -65,13 +66,19 @@ static s32 resLoad(request_of_phase_process_class* i_phase, char* i_resName) { } s32 dScnName_c::create() { - int phase_state = resLoad(&field_0x1c4, "fileSel"); + int phase_state = resLoad(&phase, "fileSel"); if (phase_state == cPhs_COMPLEATE_e) { - mHeap = JKRExpHeap::create(0x180000, mDoExt_getGameHeap(), false); + mHeap = JKRCreateExpHeap(0x180000, mDoExt_getGameHeap(), false); + JUT_ASSERT(289, mHeap != NULL); + field_0x1d0 = (JKRExpHeap*)mDoExt_setCurrentHeap(mHeap); - dRes_info_c* res = dComIfG_getObjectResInfo("fileSel"); - dFs_c = new dFile_select_c(res->getArchive()); + dRes_info_c* resInfo = dComIfG_getObjectResInfo("fileSel"); + JUT_ASSERT(293, resInfo != NULL); + + dFs_c = new dFile_select_c(resInfo->getArchive()); + JUT_ASSERT(297, dFs_c != NULL); + #if VERSION == VERSION_GCN_PAL for (int i = 0; i < 5; i++); @@ -81,41 +88,46 @@ s32 dScnName_c::create() { if (fpcM_GetName(this) == PROC_NAME_SCENE) { dFs_c->setUseType(0); + + #if !PLATFORM_SHIELD dComIfGs_setNoFile(0); + #endif } - mBrightCheck = new dBrightCheck_c(res->getArchive()); + mBrightCheck = new dBrightCheck_c(resInfo->getArchive()); field_0x420 = 0; - g_snHIO.field_0x4 = -1; - field_0x1d0->becomeCurrentHeap(); + g_snHIO.id = mDoHIO_CREATE_CHILD("名前登録シーン", &g_snHIO); + JKRSetCurrentHeap(field_0x1d0); dComIfGp_setWindowNum(1); dComIfGp_setWindow(0, 0.0f, 0.0f, mDoMch_render_c::getFbWidth(), mDoMch_render_c::getEfbHeight(), 0.0f, 1.0f, 0, 2); + dComIfGp_setCamera(0, &mCamera); + dDlst_window_c* window = dComIfGp_getWindow(0); - dComIfGp_setCamera(0, (camera_class*)&mCamera); + view_port_class* viewport = window->getViewPort(); - mCamera.near = 1.0f; - mCamera.far = 100000.0f; - mCamera.fovy = 45.0f; - mCamera.aspect = mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF(); - mCamera.lookat.eye.set(0.0f, 0.0f, -1000.0f); - mCamera.lookat.center.set(0.0f, 0.0f, 0.0f); - mCamera.bank = 0; + fopCamM_SetNear(&mCamera, 1.0f); + fopCamM_SetFar(&mCamera, 100000.0f); + fopCamM_SetFovy(&mCamera, 45.0f); + fopCamM_SetAspect(&mCamera, mDoGph_gInf_c::getWidthF() / mDoGph_gInf_c::getHeightF()); + fopCamM_SetEye(&mCamera, 0.0f, 0.0f, -1000.0f); + fopCamM_SetCenter(&mCamera, 0.0f, 0.0f, 0.0f); + fopCamM_SetBank(&mCamera, 0); dComIfGp_setPlayer(0, NULL); dComIfGd_setWindow(window); - dComIfGd_setViewport(window->getViewPort()); - dComIfGd_setView(&mCamera); + dComIfGd_setViewport(viewport); + dComIfGd_setView(&mCamera.view); mDoGph_gInf_c::offAutoForcus(); setView(); dKy_setLight_init(); - field_0x41e = g_snHIO.mFileSelWaitTime; - field_0x41c = 0; - field_0x41d = 0; - mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 30); + mWaitTimer = g_snHIO.mFileSelWaitTime; + mDrawProc = 0; + mProc = dScnName_PROC_FileSelectOpen; + mDoGph_gInf_c::setTickRate(OS_TIMER_CLOCK / 30); #if VERSION == VERSION_GCN_PAL mBmgStatus = 0; @@ -139,21 +151,48 @@ static const char* dummyString(int i) { #endif void dScnName_c::setView() { - C_MTXPerspective(mCamera.projMtx, mCamera.fovy, mCamera.aspect, mCamera.near, - mCamera.far); - mDoMtx_lookAt(mCamera.viewMtx, &mCamera.lookat.eye, &mCamera.lookat.center, - mCamera.bank); - MTXInverse(mCamera.viewMtx, mCamera.invViewMtx); - MTXCopy(mCamera.viewMtx, mCamera.viewMtxNoTrans); - mCamera.viewMtxNoTrans[0][3] = 0.0f; - mCamera.viewMtxNoTrans[1][3] = 0.0f; - mCamera.viewMtxNoTrans[2][3] = 0.0f; - MTXCopy(mCamera.viewMtx, j3dSys.mViewMtx); - mDoMtx_concatProjView(mCamera.projMtx, mCamera.viewMtx, mCamera.projViewMtx); + dDlst_window_c* window = dComIfGp_getWindow(0); + view_port_class* viewport = window->getViewPort(); + camera_class* camera = &mCamera; + + C_MTXPerspective(camera->view.projMtx, camera->view.fovy, camera->view.aspect, camera->view.near, + camera->view.far); + mDoMtx_lookAt(camera->view.viewMtx, &camera->view.lookat.eye, &camera->view.lookat.center, + camera->view.bank); + cMtx_inverse(camera->view.viewMtx, camera->view.invViewMtx); + MTXCopy(camera->view.viewMtx, camera->view.viewMtxNoTrans); + camera->view.viewMtxNoTrans[0][3] = 0.0f; + camera->view.viewMtxNoTrans[1][3] = 0.0f; + camera->view.viewMtxNoTrans[2][3] = 0.0f; + j3dSys.setViewMtx(camera->view.viewMtx); + cMtx_concatProjView(camera->view.projMtx, camera->view.viewMtx, camera->view.projViewMtx); } +#if PLATFORM_WII || PLATFORM_SHIELD +static void setBaseCsrColor(int i_no) { + static const GXColor l_csrColor[] = { + {255, 0, 0 , 0}, + {255, 0, 255 , 0}, + {0, 182, 255 , 0}, + {0, 255, 0 , 0}, + {255, 255, 0 , 0}, + }; + + JUT_ASSERT(656, 0 <= i_no && i_no < (sizeof(l_csrColor)/sizeof(GXColor))); + + dComIfG_inf_c::baseCsr_c* baseCsr = dComIfG_inf_c::getBaseCsr(); + JUT_ASSERT(658, baseCsr != NULL); + + dDlst_blo_c* baseCsrBlo = baseCsr->getCsr(); + JUT_ASSERT(660, baseCsrBlo != NULL); + + const JUtility::TColor& color = l_csrColor[i_no]; + baseCsrBlo->setBlackColor('cursor00', color); +} +#endif + #if VERSION == VERSION_GCN_PAL -void dScnName_c::bmg_data_set(){ +void dScnName_c::bmg_data_set() { if (fopAcM_GetName(this) == PROC_NAMEEX_SCENE) { mBmgStatus = 10; } @@ -162,8 +201,14 @@ void dScnName_c::bmg_data_set(){ void dScnName_c::tex_data_set() {} #endif +typedef void (dScnName_c::*mainProcFunc)(void); +static mainProcFunc MainProc[6] = { + &dScnName_c::FileSelectOpen, &dScnName_c::FileSelectMain, &dScnName_c::FileSelectClose, + &dScnName_c::brightCheckOpen, &dScnName_c::brightCheck, &dScnName_c::changeGameScene, +}; + s32 dScnName_c::execute() { - if (fopOvlpM_IsPeek() == 0) { + if (!fopOvlpM_IsPeek()) { dComIfG_resetToOpening(this); } @@ -171,31 +216,54 @@ s32 dScnName_c::execute() { return 1; } - (this->*MainProc[field_0x41d])(); + (this->*MainProc[mProc])(); + + #if DEBUG + if (!fopOvlpM_IsPeek() && dComIfG_isSceneResetButton()) { + fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 5); + dComIfGs_init(); + dComIfG_playerStatusD(); + } + #endif + return 1; } s32 dScnName_c::draw() { dComIfGp_getVibration().Run(); - switch (field_0x41c) { + switch (mDrawProc) { case 0: - dFs_c->_draw(); + dFs_c->draw(); break; case 1: - mBrightCheck->_draw(); + mBrightCheck->draw(); break; } + #if VERSION == VERSION_SHIELD_DEBUG + dComIfGp_particle_calc3D(); + dComIfGp_particle_calc2D(); + #endif return 1; } dScnName_c::~dScnName_c() { + mDoHIO_DELETE_CHILD(g_snHIO.id); + delete dFs_c; delete mBrightCheck; dComIfG_deleteObjectResMain("fileSel"); mHeap->destroy(); + #if PLATFORM_WII || PLATFORM_SHIELD + dComIfG_inf_c::baseCsr_c* baseCsr = dComIfG_inf_c::getBaseCsr(); + JUT_ASSERT(870, baseCsr != NULL); + baseCsr->onNavi(); + setBaseCsrColor(2); + #endif + + // Reset Hotspring Water bottles to normal water for (int i = 0; i < 4; i++) { dMeter2Info_changeWater(i + SLOT_11); } @@ -205,12 +273,12 @@ dScnName_c::~dScnName_c() { } void dScnName_c::FileSelectOpen() { - if (field_0x41e != 0) { - field_0x41e--; + if (mWaitTimer != 0) { + mWaitTimer--; } else { mDoAud_bgmStreamPrepare(0x2000000); mDoAud_bgmStreamPlay(); - field_0x41d = 1; + mProc = dScnName_PROC_FileSelectMain; } } @@ -225,22 +293,22 @@ void dScnName_c::FileSelectMain() { void dScnName_c::FileSelectMainNormal() { switch(dFs_c->isSelectEnd()) { case 1: - field_0x41e = 15; + mWaitTimer = 15; mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); mDoGph_gInf_c::startFadeOut(15); - field_0x41d = 2; + mProc = dScnName_PROC_FileSelectClose; field_0x420 = 1; break; } } void dScnName_c::FileSelectClose() { - field_0x41e--; + mWaitTimer--; - if (field_0x41e == 0) { - field_0x41d = 3; - field_0x41e = 15; - field_0x41c = 1; + if (mWaitTimer == 0) { + mProc = dScnName_PROC_BrightCheckOpen; + mWaitTimer = 15; + mDrawProc = 1; mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); mDoGph_gInf_c::startFadeIn(15); field_0x420 = 0; @@ -249,9 +317,9 @@ void dScnName_c::FileSelectClose() { void dScnName_c::brightCheckOpen() { if (!mDoRst::isReset()) { - field_0x41e--; - if (field_0x41e == 0) { - field_0x41d = 4; + mWaitTimer--; + if (mWaitTimer == 0) { + mProc = dScnName_PROC_BrightCheck; } } } @@ -262,11 +330,12 @@ void dScnName_c::brightCheck() { if (mBrightCheck->isEnd()) { dComIfGs_setSaveTotalTime(dComIfGs_getTotalTime()); dComIfGs_setSaveStartTime(OSGetTime()); - mDoAud_bgmStop(0x2D); + mDoAud_bgmStop(45); field_0x41f = 0; - field_0x41d = 5; + mProc = dScnName_PROC_ChangeGameScene; + // Reset rupee "first-time collection" flags so the collection cutscene will play again dComIfGs_offItemFirstBit(fpcNm_ITEM_GREEN_RUPEE); dComIfGs_offItemFirstBit(fpcNm_ITEM_BLUE_RUPEE); dComIfGs_offItemFirstBit(fpcNm_ITEM_YELLOW_RUPEE); @@ -280,7 +349,22 @@ void dScnName_c::brightCheck() { void dScnName_c::changeGameScene() { if (!mDoRst::isReset() && !fopOvlpM_IsPeek()) { dComIfGs_gameStart(); + + #if DEBUG + // Goto Map Select debug menu if opening File 1 with development mode on + if (dFs_c->getSelectNum() == 0 && mDoMain::developmentMode) { + fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 5); + dComIfGs_init(); + dComIfG_playerStatusD(); + return; + } + #endif + + #if VERSION == VERSION_SHIELD_DEBUG + fopScnM_ChangeReq(this, PROC_PLAY_SCENE, 0, 5); + #else fopScnM_ChangeReq(this, field_0x41f == 0 ? PROC_PLAY_SCENE : PROC_PLAY_SCENE, 0, 5); + #endif dComIfGp_offEnableNextStage(); if (dFs_c->isDataNew(dFs_c->getSelectNum())) { @@ -314,6 +398,11 @@ static int dScnName_Delete(dScnName_c* i_this) { #endif i_this->~dScnName_c(); + + #if VERSION == VERSION_SHIELD_DEBUG + dComIfGp_particle_removeScene(true); + #endif + return 1; } diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 18dd48bedea..3b171087ae6 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -11,147 +11,177 @@ #include "d/d_s_room.h" #include "d/d_bg_parts.h" #include "m_Do/m_Do_Reset.h" +#include "f_ap/f_ap_game.h" + #include #include static int dScnRoom_Draw(room_of_scene_class* i_this) { + fpc_ProcID id = fpcM_GetID(i_this); return 1; } -static int getResetArchiveBank(int param_1, u8 const** param_2) { - dStage_roomControl_c::nameData* arcBankName = dStage_roomControl_c::getArcBankName(); - int local_30 = 0; +static int getResetArchiveBank(int i_roomNo, const u8** o_bankIDList) { + dStage_roomControl_c::dStage_bankName* arcBankName = dStage_roomControl_c::getArcBankName(); + int bankNum = 0; + + *o_bankIDList = NULL; - *param_2 = NULL; if (arcBankName != NULL) { - dStage_roomControl_c::bankData* arcBankData = dStage_roomControl_c::getArcBankData(); - dStage_roomControl_c::bankDataEntry* entries = arcBankData->m_entries; + dStage_roomControl_c::dStage_bankData* arcBankData = dStage_roomControl_c::getArcBankData(); + dStage_roomControl_c::dStage_bankDataEntry* entries = arcBankData->m_entries; for (int i = 0; i < arcBankData->m_num; entries++, i++) { - if (entries->field_0x0 == param_1) { - if (entries->mLayerNo == dComIfG_play_c::getLayerNo(0)) { - local_30 = 0x20; - *param_2 = entries->field_0x2; + if (entries->roomNo == i_roomNo) { + if (entries->layerNo == dComIfG_play_c::getLayerNo(0)) { + bankNum = 32; + *o_bankIDList = entries->nameIDs; break; } } } } - u8 const* pbVar1 = *param_2; - for (int i = 0; i < local_30; pbVar1++, i++) { + const u8* pbank = *o_bankIDList; + for (int i = 0; i < bankNum; pbank++, i++) { char* arcBank = dStage_roomControl_c::getArcBank(i); char* name = ""; - int id = *pbVar1; - if (id != 0xff) { + int id = *pbank; + if (id != 0xFF) { JUT_ASSERT(160, 0 <= id && id < arcBankName->m_num); name = arcBankName->m_names[id]; } if (strcmp(arcBank, name) != 0) { + #if DEBUG + if (strcmp(arcBank, "") != 0) { + // "archive has been deleted from bank! <%d:%s!=%s>" + OSReport_Warning("バンクから削除するアーカイブが発生しました！ <%d:%s!=%s>\n", i, arcBank, name); + } + #endif + return i; } } - - return local_30; + + return bankNum; } -static bool resetArchiveBank(int param_0) { - const u8* tmp; - return dStage_roomControl_c::resetArchiveBank(getResetArchiveBank(param_0, &tmp)); +static bool resetArchiveBank(int i_roomNo) { + const u8* bankIDList; + return dStage_roomControl_c::resetArchiveBank(getResetArchiveBank(i_roomNo, &bankIDList)); } -static bool setArchiveBank(int param_0) { - u8* arr[4]; - int bank_no = getResetArchiveBank(param_0, (u8 const**)&arr); - if (arr[0] == NULL) { +static bool setArchiveBank(int i_roomNo) { + u8* bankIDList; + int bankNo = getResetArchiveBank(i_roomNo, (const u8**)&bankIDList); + if (bankIDList == NULL) { return true; } - dStage_roomControl_c::nameData* arcBankName = dStage_roomControl_c::getArcBankName(); - for (; (int)bank_no < 0x20; bank_no++) { + dStage_roomControl_c::dStage_bankName* arcBankName = dStage_roomControl_c::getArcBankName(); + for (; bankNo < 32; bankNo++) { const char* name = ""; - int id = arr[0][bank_no]; - if (id != 0xff) { + int id = bankIDList[bankNo]; + if (id != 0xFF) { JUT_ASSERT(216, 0 <= id && id < arcBankName->m_num); name = arcBankName->m_names[id]; } if (strcmp(name, "") != 0) { if (strnicmp(name, "pack", 4) == 0) { - int syncres = dComIfG_syncObjectRes(name); - if (syncres < 0) { - if (!dComIfG_setObjectRes(name, 0, mDoExt_getArchiveHeap())) { - OSReport_Error("Bank[%d] : %s.arc Read Error !!\n", bank_no, name); - } else { + #if DEBUG + if (fapGm_HIO_c::mPackArchiveMode) + #endif + { + int rt = dComIfG_syncObjectRes(name); + if (rt < 0) { + if (!dComIfG_setObjectRes(name, 0, mDoExt_getArchiveHeap())) { + OSReport_Error("Bank[%d] : %s.arc Read Error !!\n", bankNo, name); + } else { + return false; + } + } else if (rt != 0) { return false; } - } else if (syncres != 0) { - return false; } } else { if (!dComIfG_setObjectRes(name, 0, mDoExt_getArchiveHeap())) { - OSReport_Error("Bank[%d] : %s.arc Read Error !!\n", bank_no, name); + OSReport_Error("Bank[%d] : %s.arc Read Error !!\n", bankNo, name); } } } - dStage_roomControl_c::setArcBank(bank_no, name); + OS_REPORT(">>>>>>>>>>> create Bank[%d] : %s\n", bankNo, name); + dStage_roomControl_c::setArcBank(bankNo, name); } return true; } -static int objectDeleteJugge(void* i_obj, void*) { - if (fpcM_GetProfName(i_obj) != PROC_BG) { - if (fopAcM_IsActor(i_obj) && !fopAcM_CheckCondition((fopAc_ac_c*)i_obj, 4)) { - return 0; +static int objectDeleteJugge(void* i_process, void* i_data) { + if (fpcM_GetProfName(i_process) != PROC_BG) { + if (fopAcM_IsActor(i_process)) { + #if DEBUG + char namebuf[16]; + fopAcM_getNameString((fopAc_ac_c*)i_process, namebuf); + #endif + + if (!fopAcM_CheckCondition((fopAc_ac_c*)i_process, fopAcCnd_NODRAW_e)) { + return 0; + } + + OS_REPORT("削除！<%s>\n", namebuf); } - fpcM_Delete(i_obj); + + fpcM_Delete(i_process); } return 0; } -static int deleteJugge(void* i_obj, void*) { - fpcM_Delete(i_obj); +static int deleteJugge(void* i_process, void* i_data) { + fpcM_Delete(i_process); return 0; } -static void* isCreatingCallback(create_tag* param_1, fpc_ProcID* param_2) { - create_request* create_req = (create_request*)param_1->base.mpTagData; - if (create_req->layer->layer_id == *param_2) { +static void* isCreatingCallback(create_tag* i_createTag, fpc_ProcID* i_procId) { + create_request* create_req = (create_request*)i_createTag->base.mpTagData; + if (create_req->layer->layer_id == *i_procId) { return create_req; } return NULL; } -static bool isCreating(fpc_ProcID param_0) { - return fpcCtIt_Judge((fpcCtIt_JudgeFunc)isCreatingCallback, ¶m_0); +static u8 isCreating(fpc_ProcID i_id) { + if (fpcCtIt_Judge((fpcCtIt_JudgeFunc)isCreatingCallback, &i_id)) { + return TRUE; + } + + return FALSE; } -static int loadDemoArchive(int room_no) { +static int loadDemoArchive(int i_roomNo) { if (*dStage_roomControl_c::getDemoArcName() == 0) { - dStage_Lbnk_c* lbnk = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLbnk(); + dStage_Lbnk_c* lbnk = dComIfGp_roomControl_getStatusRoomDt(i_roomNo)->getLbnk(); if (lbnk != NULL) { dStage_Lbnk_dt_c* entries = lbnk->entries; - if (entries != NULL) { - int bank = entries[dComIfG_play_c::getLayerNo(room_no)].bank; - - if (bank != 0xff) { + int bank = entries[dComIfG_play_c::getLayerNo(i_roomNo)].bank; + if (bank != 0xFF) { JUT_ASSERT(350, 0 <= bank && bank < 100); - u8 bank2 = entries[dComIfG_play_c::getLayerNo(room_no)].bank2; + int bank2 = entries[dComIfG_play_c::getLayerNo(i_roomNo)].bank2; JUT_ASSERT(353, 0 <= bank2 && bank2 < 100); sprintf(dStage_roomControl_c::getDemoArcName(), "Demo%02d_%02d", bank, bank2); - if (!dComIfG_setObjectRes(dStage_roomControl_c::getDemoArcName(), 0, - (JKRHeap*)NULL)) - { + if (!dComIfG_setObjectRes(dStage_roomControl_c::getDemoArcName(), 0, (JKRHeap*)NULL)) { + const char* name = dStage_roomControl_c::getDemoArcName(); *dStage_roomControl_c::getDemoArcName() = 0; } else { + // "Loading demo archive <%s>" + OS_REPORT("デモアーカイブ読み込み<%s>\n", dStage_roomControl_c::getDemoArcName()); return 1; } } @@ -180,30 +210,33 @@ static bool objectSetCheck(room_of_scene_class* i_this) { return 0; } - if (i_this->mpDzrRes != NULL) { + if (i_this->roomInfo != NULL) { loadDemoArchive(roomNo); } + break; default: - if (*dStage_roomControl_c::getDemoArcName() != '\0') { - int phase = dComIfG_syncObjectRes(dStage_roomControl_c::getDemoArcName()); - - if (phase < 0) { - #if VERSION == VERSION_WII_USA_R0 - dStage_escapeRestart(); - #endif - } else if (phase > 0) { - return 0; - } - } + JUT_ASSERT(417, 0); + } - fopAcM_create(PROC_BG, roomNo, NULL, -1, NULL, NULL, -1); - dComIfGp_getPEvtManager()->demoInit(); - dComIfGp_getPEvtManager()->roomInit(roomNo); - dStage_dt_c_roomReLoader(i_this->mpDzrRes, i_this->mpRoomDt, roomNo); - dComIfGp_ret_wp_set(roomNo); - i_this->field_0x1d4 = -1; - i_this->field_0x1d5 = 1; + if (*dStage_roomControl_c::getDemoArcName() != '\0') { + int phase = dComIfG_syncObjectRes(dStage_roomControl_c::getDemoArcName()); + + if (phase < 0) { + #if VERSION == VERSION_WII_USA_R0 + dStage_escapeRestart(); + #endif + } else if (phase > 0) { + return 0; + } } + + fopAcM_create(PROC_BG, roomNo, NULL, -1, NULL, NULL, -1); + dComIfGp_getPEvtManager()->demoInit(); + dComIfGp_getPEvtManager()->roomInit(roomNo); + dStage_dt_c_roomReLoader(i_this->roomInfo, i_this->roomDt, roomNo); + dComIfGp_ret_wp_set(roomNo); + i_this->field_0x1d4 = -1; + i_this->field_0x1d5 = 1; } } else if (status_flag_8) { if (isCreating(fpcM_LayerID(i_this))) { @@ -212,6 +245,10 @@ static bool objectSetCheck(room_of_scene_class* i_this) { fpcM_LyJudge(&i_this->base, (fpcLyIt_JudgeFunc)deleteJugge, NULL); g_dComIfG_gameInfo.play.getParticle()->levelAllForceOnEventMove(); + + // "Object deleted! <%d>" + OS_REPORT("\x1b[32mオブジェクト削除！<%d>\n\x1b[m", roomNo); + dComIfGs_clearRoomSwitch(dComIfGp_roomControl_getZoneNo(roomNo)); dComIfGs_clearRoomItem(dComIfGp_roomControl_getZoneNo(roomNo)); dComIfGp_roomControl_offStatusFlag(roomNo, 0x20); @@ -233,14 +270,14 @@ static int dScnRoom_Execute(room_of_scene_class* i_this) { } else if (objectSetCheck(i_this)) { if (dComIfGp_roomControl_checkStatusFlag(roomNo, 4)) { fopScnM_DeleteReq(i_this); - } else if (i_this->field_0x1d4 < 0 && i_this->field_0x1d5 != 0 && - !dComIfGp_event_runCheck() && - (int)fopScnM_GetParam(i_this) == dComIfGp_roomControl_getStayNo()) - { - if (isCreating(fpcM_LayerID(i_this))) { - dScnPly_c::nextPauseTimer = 2; - } else { - i_this->field_0x1d5 = 0; + } else if (i_this->field_0x1d4 < 0 && i_this->field_0x1d5 != 0 && !dComIfGp_event_runCheck()) { + int param = fopScnM_GetParam(i_this); + if (param == dComIfGp_roomControl_getStayNo()) { + if (isCreating(fpcM_LayerID(i_this))) { + dScnPly_c::setPauseTimer(2); + } else { + i_this->field_0x1d5 = 0; + } } } } @@ -252,27 +289,27 @@ static int dScnRoom_IsDelete(room_of_scene_class*) { return 1; } -static bool isReadRoom(int param_0) { +static bool isReadRoom(int i_roomNo) { roomRead_class* room = dComIfGp_getStageRoom(); - if (room == NULL) { return false; } - - if (room->num <= param_0) { + if (room->num <= i_roomNo) { return false; } + JUT_ASSERT(589, 0 <= dComIfGp_getNextStageRoomNo() && dComIfGp_getNextStageRoomNo() < 64); + roomRead_data_class* roomData = room->m_entries[dComIfGp_getNextStageRoomNo()]; - u8* tmp = roomData->m_rooms; + u8* room_data = roomData->m_rooms; for (int i = 0; i < roomData->num; i++) { - if (dStage_roomRead_dt_c_ChkBg(*tmp) && - param_0 == dStage_roomRead_dt_c_GetLoadRoomIndex(*tmp)) + if (dStage_roomRead_dt_c_ChkBg(*room_data) && + i_roomNo == dStage_roomRead_dt_c_GetLoadRoomIndex(*room_data)) { return true; } - tmp++; + room_data++; } return false; @@ -283,7 +320,22 @@ inline const char* setArcName(room_of_scene_class* i_room) { } static int dScnRoom_Delete(room_of_scene_class* i_this) { + OS_REPORT("dScnRoom_Delete():room%d\n", fopScnM_GetParam(i_this)); + int roomNo = fopScnM_GetParam(i_this); + + #if DEBUG + dBgp_c* bgp = dStage_roomControl_c::getBgp(roomNo); + if (bgp != NULL) { + if (!bgp->remove()) { + return 0; + } + + delete bgp; + dStage_roomControl_c::setBgp(roomNo, NULL); + } + #endif + dComIfGp_roomControl_setStatusFlag(roomNo, 0); dComIfGp_roomControl_getStatusRoomDt(roomNo)->init(); @@ -297,6 +349,9 @@ static int dScnRoom_Delete(room_of_scene_class* i_this) { if (heap != NULL) { heap->freeAll(); } + } else { + // "Room(%d) data saved!" + OS_REPORT(">>> 部屋(%d)データ保持！\n", roomNo); } dComIfGp_roomControl_getStatusRoomDt(roomNo)->init(); @@ -305,6 +360,7 @@ static int dScnRoom_Delete(room_of_scene_class* i_this) { } static int phase_0(room_of_scene_class* i_this) { + int param = fopScnM_GetParam(i_this); int roomNo = fopScnM_GetParam(i_this); dStage_roomControl_c::setStatusProcID(roomNo, fopScnM_GetID(i_this)); return cPhs_NEXT_e; @@ -320,18 +376,21 @@ static int phase_1(room_of_scene_class* i_this) { JKRExpHeap* heap = dStage_roomControl_c::getMemoryBlock(roomNo); if (heap != NULL) { + OS_REPORT("#######<%d>\n", heap->getTotalUsedSize()); + if (heap->getTotalUsedSize() != 0) { return cPhs_INIT_e; } } else { - stage_stag_info_class* stagInfo = dComIfGp_getStage()->getStagInfo(); - - if (dStage_staginfo_GetArchiveHeap(stagInfo) != FALSE) { + if (dStage_staginfo_GetArchiveHeap(dComIfGp_getStage()->getStagInfo()) != FALSE) { heap = mDoExt_getArchiveHeap(); } } - if (!dComIfG_setStageRes(arcName, heap)) { + int rt = dComIfG_setStageRes(arcName, heap); + if (!rt) { + //! In Wii USA Revision 0, if a stage's resources fail to load, the stage will restart as a failsafe. + //! In later versions this failsafe was removed, and the room will simply not load. #if VERSION == VERSION_WII_USA_R0 dStage_escapeRestart(); #endif @@ -344,9 +403,11 @@ static int phase_1(room_of_scene_class* i_this) { static int phase_2(room_of_scene_class* i_this) { const char* arcName = setArcName(i_this); - int rt = dComIfG_syncStageRes(arcName); + int rt = dComIfG_syncStageRes(arcName); if (rt < 0) { + //! In Wii USA Revision 0, if a stage's resources fail to load, the stage will restart as a failsafe. + //! In later versions this failsafe was removed, and the room will simply not load. #if VERSION == VERSION_WII_USA_R0 dStage_escapeRestart(); #endif @@ -374,12 +435,12 @@ static int phase_2(room_of_scene_class* i_this) { dComIfGp_roomControl_setZoneNo(roomNo, dComIfGs_createZone(roomNo)); } - i_this->mpRoomDt = dComIfGp_roomControl_getStatusRoomDt(roomNo); - i_this->mpRoomDt->setRoomNo(roomNo); - i_this->mpDzrRes = dComIfG_getStageRes(arcName, "room.dzr"); + i_this->roomDt = dComIfGp_roomControl_getStatusRoomDt(roomNo); + i_this->roomDt->setRoomNo(roomNo); + i_this->roomInfo = dComIfG_getStageRes(arcName, "room.dzr"); - if (i_this->mpDzrRes != NULL) { - dStage_dt_c_roomLoader(i_this->mpDzrRes, i_this->mpRoomDt, roomNo); + if (i_this->roomInfo != NULL) { + dStage_dt_c_roomLoader(i_this->roomInfo, i_this->roomDt, roomNo); } JKRHeap* old_heap = NULL; @@ -390,12 +451,12 @@ static int phase_2(room_of_scene_class* i_this) { } #if DEBUG - void* mpat = dComIfGp_roomControl_getStatusRoomDt(roomNo)->getMapPath(); - if (mpat != NULL) { + void* unit = dComIfGp_roomControl_getStatusRoomDt(roomNo)->getUnit(); + if (unit != NULL) { dBgp_c* bgp = new dBgp_c(); JUT_ASSERT(786, bgp != NULL); - bgp->create(roomNo, mpat); + bgp->create(roomNo, unit); dStage_roomControl_c::setBgp(roomNo, bgp); } #endif @@ -408,10 +469,10 @@ static int phase_2(room_of_scene_class* i_this) { } static int phase_3(room_of_scene_class* i_this) { - if (objectSetCheck(i_this)) { - return cPhs_NEXT_e; - } else { + if (!objectSetCheck(i_this)) { return cPhs_INIT_e; + } else { + return cPhs_NEXT_e; } } @@ -420,21 +481,25 @@ static int phase_4(room_of_scene_class* i_this) { return cPhs_INIT_e; } - if (objectSetCheck(i_this)) { - return cPhs_COMPLEATE_e; - } else { + if (!objectSetCheck(i_this)) { return cPhs_INIT_e; } + + OS_REPORT("dScnRoom_Create(): End !! room%d\n", fopScnM_GetParam(i_this)); + return cPhs_COMPLEATE_e; } static int dScnRoom_Create(scene_class* i_this) { - static int (*l_method[5])(void*) = { - (int (*)(void*))phase_0, (int (*)(void*))phase_1, (int (*)(void*))phase_2, - (int (*)(void*))phase_3, (int (*)(void*))phase_4, + static request_of_phase_process_fn l_method[5] = { + (request_of_phase_process_fn)phase_0, + (request_of_phase_process_fn)phase_1, + (request_of_phase_process_fn)phase_2, + (request_of_phase_process_fn)phase_3, + (request_of_phase_process_fn)phase_4, }; room_of_scene_class* room = static_cast(i_this); - return dComLbG_PhaseHandler(&room->field_0x1c4, l_method, i_this); + return dComLbG_PhaseHandler(&room->phase, l_method, i_this); } static scene_method_class l_dScnRoom_Method = { diff --git a/src/d/d_shop_camera.cpp b/src/d/d_shop_camera.cpp index c2a8f8a7118..18df2331be8 100644 --- a/src/d/d_shop_camera.cpp +++ b/src/d/d_shop_camera.cpp @@ -67,7 +67,7 @@ int ShopCam_action_c::shop_cam_action_init() { } int ShopCam_action_c::shop_cam_action() { - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Stay(); camera->mCamera.SetTrimSize(1); @@ -131,7 +131,7 @@ int ShopCam_action_c::shop_cam_action() { } void ShopCam_action_c::Save() { - camera_class* camera = dComIfGp_getCamera(0); + camera_process_class* camera = dComIfGp_getCamera(0); if (camera != NULL) { field_0x98 = *fopCamM_GetCenter_p(camera); field_0xa4 = *fopCamM_GetEye_p(camera); @@ -150,7 +150,7 @@ void ShopCam_action_c::Reset() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); player->offPlayerNoDraw(); - camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Set(field_0x98, field_0xa4, field_0xbc, 0); camera->mCamera.Stay(); camera->mCamera.Reset(field_0x98, field_0xa4, field_0xbc, 0); diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index e1bd46d431d..ff254b40d05 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -191,8 +191,8 @@ void dStage_roomControl_c::init() { status++; } - mArcBankName = (dStage_roomControl_c::nameData*)dComIfG_getStageRes("name.bin"); - mArcBankData = (dStage_roomControl_c::bankData*)dComIfG_getStageRes("bank.bin"); + mArcBankName = (dStage_roomControl_c::dStage_bankName*)dComIfG_getStageRes("name.bin"); + mArcBankData = (dStage_roomControl_c::dStage_bankData*)dComIfG_getStageRes("bank.bin"); if (mArcBankName == NULL) { JUT_ASSERT(449, mArcBankData == NULL); @@ -1564,9 +1564,9 @@ u8 dStage_roomControl_c::m_time_pass; u8 dStage_roomControl_c::mNoChangeRoom; -dStage_roomControl_c::nameData* dStage_roomControl_c::mArcBankName; +dStage_roomControl_c::dStage_bankName* dStage_roomControl_c::mArcBankName; -dStage_roomControl_c::bankData* dStage_roomControl_c::mArcBankData; +dStage_roomControl_c::dStage_bankData* dStage_roomControl_c::mArcBankData; dStage_roomControl_c::roomDzs_c dStage_roomControl_c::m_roomDzs; #if DEBUG diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 1d4ad443266..db39a252ed0 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -493,7 +493,7 @@ static int fopAc_Create(void* i_this) { dKy_tevstr_init(&actor->tevStr, actor->home.roomNo, -1); dStage_FileList_dt_c* sp14 = NULL; - camera_class* sp10 = dComIfGp_getCamera(0); + camera_process_class* sp10 = dComIfGp_getCamera(0); if (dComIfGp_roomControl_getStayNo() >= 0) { sp14 = dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getFileListInfo(); diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 8c0bb21f31b..000d790c3e8 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -2162,7 +2162,7 @@ static void get_vectle_calc(const cXyz* pXyzA, const cXyz* pXyzB, cXyz* pOut) { void fopAcM_setEffectMtx(const fopAc_ac_c* i_actor, const J3DModelData* modelData) { const cXyz* pEyePos = &i_actor->eyePos; camera_class* camera = dCam_getCamera(); - cXyz v1 = *pEyePos - camera->lookat.eye; + cXyz v1 = *pEyePos - camera->view.lookat.eye; cXyz v2; get_vectle_calc(&i_actor->tevStr.field_0x32c, pEyePos, &v2); cXyz half; diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 1d0537599b0..99c6fbeb7bb 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -814,7 +814,7 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ if (dCam_getBody()->Mode() != 4 && dCam_getBody()->Mode() != 7) { int cam_id = dComIfGp_getPlayerCameraID(0); - camera_class* temp_r4 = dComIfGp_getCamera(cam_id); + camera_process_class* temp_r4 = dComIfGp_getCamera(cam_id); dAttention_c* attention = dComIfGp_getAttention(); f32 var_f30; @@ -832,11 +832,11 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ if (atn_actor != NULL) { cXyz sp28; sp28 = atn_actor->eyePos; - if (std::fabs(sp28.y - camera_p->lookat.eye.y) < 400.0f) { - sp28.y = camera_p->lookat.eye.y; + if (std::fabs(sp28.y - camera_p->view.lookat.eye.y) < 400.0f) { + sp28.y = camera_p->view.lookat.eye.y; } - var_f29 = atn_actor->current.pos.abs(camera_p->lookat.eye); + var_f29 = atn_actor->current.pos.abs(camera_p->view.lookat.eye); var_f31 = var_f29 / ((SREG_F(2) + 280.0f) * var_f30); var_f31 -= 0.8f; if (var_f31 < 0.0f) { @@ -1564,14 +1564,14 @@ int mDoGph_Painter() { if (dComIfGp_getWindowNum() != 0) { dDlst_window_c* window_p = dComIfGp_getWindow(0); int camera_id = window_p->getCameraID(); - camera_class* camera_p = dComIfGp_getCamera(camera_id); + camera_process_class* camera_p = dComIfGp_getCamera(camera_id); if (camera_p != NULL) { #if DEBUG fapGm_HIO_c::startCpuTimer(); #endif - dComIfGd_imageDrawShadow(camera_p->viewMtx); + dComIfGd_imageDrawShadow(camera_p->view.viewMtx); #if DEBUG // "drawing Shadow Texture (Rendering)" @@ -1604,7 +1604,7 @@ int mDoGph_Painter() { GXSetScissor(view_port->x_orig, view_port->y_orig, view_port->width, view_port->height); - JPADrawInfo draw_info(camera_p->viewMtx, camera_p->fovy, camera_p->aspect); + JPADrawInfo draw_info(camera_p->view.viewMtx, camera_p->view.fovy, camera_p->view.aspect); #if WIDESCREEN_SUPPORT if (mDoGph_gInf_c::isWideZoom()) { @@ -1632,17 +1632,17 @@ int mDoGph_Painter() { #endif dComIfGp_setCurrentWindow(window_p); - dComIfGp_setCurrentView(camera_p); + dComIfGp_setCurrentView(&camera_p->view); dComIfGp_setCurrentViewport(view_port); - GXSetProjection(camera_p->projMtx, GX_PERSPECTIVE); + GXSetProjection(camera_p->view.projMtx, GX_PERSPECTIVE); #if DEBUG - captureScreenSetProjection(camera_p->projMtx); + captureScreenSetProjection(camera_p->view.projMtx); #endif PPCSync(); - j3dSys.setViewMtx(camera_p->viewMtx); + j3dSys.setViewMtx(camera_p->view.viewMtx); dKy_setLight(); dComIfGd_drawOpaListSky(); dComIfGd_drawXluListSky(); @@ -1675,7 +1675,7 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - dComIfGd_drawShadow(camera_p->viewMtx); + dComIfGd_drawShadow(camera_p->view.viewMtx); #if DEBUG // "shadow drawing (Rendering)" @@ -1738,10 +1738,10 @@ int mDoGph_Painter() { #if DEBUG if (dJcame_c::get()) { - dJcame_c::get()->show3D(camera_p->viewMtx); + dJcame_c::get()->show3D(camera_p->view.viewMtx); } if (dJprev_c::get()) { - dJprev_c::get()->show3D(camera_p->viewMtx); + dJprev_c::get()->show3D(camera_p->view.viewMtx); } #endif @@ -1750,7 +1750,7 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - motionBlure(camera_p); + motionBlure(&camera_p->view); #if DEBUG // "blur filter (Rendering)" @@ -1759,7 +1759,7 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - drawDepth2(camera_p, view_port, dComIfGp_getCameraZoomForcus(camera_id)); + drawDepth2(&camera_p->view, view_port, dComIfGp_getCameraZoomForcus(camera_id)); GXInvalidateTexAll(); GXSetClipMode(GX_CLIP_ENABLE); @@ -1843,7 +1843,7 @@ int mDoGph_Painter() { fapGm_HIO_c::startCpuTimer(); #endif - retry_captue_frame(camera_p, view_port, dComIfGp_getCameraZoomForcus(camera_id)); + retry_captue_frame(&camera_p->view, view_port, dComIfGp_getCameraZoomForcus(camera_id)); #if DEBUG // "Frame Buffer capture 2nd time (Rendering)" @@ -1878,7 +1878,7 @@ int mDoGph_Painter() { dComIfGd_drawIndScreen(); if (strcmp(dComIfGp_getStartStageName(), "F_SP124") == 0) { - retry_captue_frame(camera_p, view_port, + retry_captue_frame(&camera_p->view, view_port, dComIfGp_getCameraZoomForcus(camera_id)); } @@ -1895,8 +1895,8 @@ int mDoGph_Painter() { j3dSys.setViewMtx(m2); dComIfGd_drawXluList2DScreen(); - j3dSys.setViewMtx(camera_p->viewMtx); - GXSetProjection(camera_p->projMtx, GX_PERSPECTIVE); + j3dSys.setViewMtx(camera_p->view.viewMtx); + GXSetProjection(camera_p->view.projMtx, GX_PERSPECTIVE); #if DEBUG // "drawing up to full projection screen (Rendering)" @@ -1912,7 +1912,7 @@ int mDoGph_Painter() { u8 enable = mDoGph_gInf_c::getBloom()->getEnable(); GXColor color = *mDoGph_gInf_c::getBloom()->getMonoColor(); if (color.a != 0 || enable) { - retry_captue_frame(camera_p, view_port, + retry_captue_frame(&camera_p->view, view_port, dComIfGp_getCameraZoomForcus(camera_id)); } } @@ -1925,14 +1925,14 @@ int mDoGph_Painter() { #endif mDoGph_gInf_c::getBloom()->draw(); - j3dSys.setViewMtx(camera_p->viewMtx); - GXSetProjection(camera_p->projMtx, GX_PERSPECTIVE); + j3dSys.setViewMtx(camera_p->view.viewMtx); + GXSetProjection(camera_p->view.projMtx, GX_PERSPECTIVE); #if DEBUG if (g_kankyoHIO.navy.field_0x30d != 0 && dKy_darkworld_check() == TRUE) { dComIfGd_drawOpaListDark(); dComIfGd_drawXluListDark(); - retry_captue_frame(camera_p, view_port, + retry_captue_frame(&camera_p->view, view_port, dComIfGp_getCameraZoomForcus(camera_id)); dComIfGd_drawOpaListInvisible(); dComIfGd_drawXluListInvisible(); @@ -1968,7 +1968,7 @@ int mDoGph_Painter() { dComIfGp_particle_draw2Dgame(&draw_info2); } - trimming(camera_p, view_port); + trimming(&camera_p->view, view_port); if (strcmp(dComIfGp_getStartStageName(), "F_SP127") != 0 && (mDoGph_gInf_c::isFade() & 0x80) == 0) From c89d6f423f66124ea4e08b54d4aef1a605ebf123 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 7 Mar 2026 14:09:28 -0700 Subject: [PATCH 19/35] gdb support --- .gitignore | 3 + .vscode/launch.json | 47 ++ README.md | 70 +- configure.py | 57 +- include/umbra/umbra_gdb.h | 18 + include/umbra/umbra_net.h | 2 + include/umbra/umbra_nintendont.h | 1 + src/umbra/umbra_gdb.cpp | 356 +++++++++ src/umbra/umbra_net.cpp | 19 + tools/build_gdb.py | 142 ++++ tools/download_tool.py | 8 + tools/gen_dwarf2_debug.py | 1244 ++++++++++++++++++++++++++++++ tools/gen_dwarf2_varinfo.py | 992 ++++++++++++++++++++++++ tools/gen_gdb_rel_loader.py | 313 ++++++++ tools/project.py | 17 +- 15 files changed, 3282 insertions(+), 7 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 include/umbra/umbra_gdb.h create mode 100644 src/umbra/umbra_gdb.cpp create mode 100644 tools/build_gdb.py create mode 100644 tools/gen_dwarf2_debug.py create mode 100644 tools/gen_dwarf2_varinfo.py create mode 100644 tools/gen_gdb_rel_loader.py diff --git a/.gitignore b/.gitignore index fc44133f1ed..ba74004c1a5 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,6 @@ compile_commands.json # ISOs *.iso + +# GDB init (generated by ninja post-build) +.gdbinit diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000000..97ff768c4a8 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,47 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Attach to Nintendont", + "type": "gdb-dap", + "request": "attach", + "program": "${workspaceFolder}/build/${input:gameId}/framework.elf", + "target": "${input:wiiAddress}:${input:gdbPort}", + "debugAdapterExecutable": "${workspaceFolder}/build/binutils/powerpc-eabi-gdb" + }, + { + "name": "Attach to Dolphin", + "type": "gdb-dap", + "request": "attach", + "program": "${workspaceFolder}/build/${input:gameId}/framework.elf", + "target": "${input:dolphinAddress}:${input:gdbPort}", + "debugAdapterExecutable": "${workspaceFolder}/build/binutils/powerpc-eabi-gdb" + } + ], + "inputs": [ + { + "id": "gameId", + "type": "promptString", + "description": "Game ID (e.g. GZ2E01)", + "default": "GZ2E01" + }, + { + "id": "wiiAddress", + "type": "promptString", + "description": "Wii IP address", + "default": "192.168.1.100" + }, + { + "id": "dolphinAddress", + "type": "promptString", + "description": "Dolphin IP address", + "default": "127.0.0.1" + }, + { + "id": "gdbPort", + "type": "promptString", + "description": "GDB port", + "default": "2159" + } + ] +} diff --git a/README.md b/README.md index 44e800583ab..a6c07f9adff 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ Umbra provides a platform abstraction layer and build system for creating mods t - **Storage abstraction** -- write/read settings via Nintendont kernel FatFS or physical memory card (CARD API) - **Return to loader** -- clean exit back to the Nintendont loader - **Game hooks** -- scaffolded `execute()`/`draw()`/`startInit()` entry points wired into the game loop +- **GDB remote debugging** -- on-device GDB stub via shared memory, with stepping and Python-based symbol loading +- **DWARF debug info** -- converts MetroWerks DWARF 1 to DWARF 2 for source-level debugging of DOL and REL modules - **Build system** -- compiles custom code alongside the decomp, patches it into the DOL, and rebuilds the ISO ## Dependencies @@ -139,6 +141,60 @@ python setup_mod.py mymod --no-hooks Place files in the `mod_assets/` directory. The directory structure is copied 1:1 into the final disc image during ISO rebuild. +## GDB Remote Debugging + +Umbra includes a GDB remote stub for source-level debugging of game code. It supports both real hardware via [umbra-nintendont](https://github.com/zsrtp/umbra-nintendont) (PPC-to-ARM communication over shared memory) and emulation via [umbra-dolphin](https://github.com/zsrtp/umbra-dolphin). + +### Setup + +GDB tooling is not built by default. If you want to use the debugger, run the post-build step after your initial build: + +```sh +ninja post-build +``` + +This builds `powerpc-eabi-gdb` from source with Python scripting support, generates the symbol loader script, and converts MetroWerks DWARF 1 debug info to DWARF 2. This only needs to run once (or when source files change). + +### Enabling GDB in your mod + +```cpp +#include "umbra/umbra_gdb.h" + +// Start the GDB server from your settings menu: +umbra_gdb_auto_start(2159); // start GDB server on port 2159 + +// In your game loop: +umbra_gdb_poll(); // check for halt requests from GDB +``` + +`umbra_gdb_auto_start()` sends the GDB server start command to the kernel. + +`umbra_gdb_poll()` should be called every frame. It checks for async halt requests (GDB's Ctrl-C) and handles stepping/resuming. + +### Connecting + +**VS Code (recommended):** Install the [GDB DAP](https://marketplace.visualstudio.com/items?itemName=OlegTolmatcev.gdb-dap) extension. Launch configurations are provided in `.vscode/launch.json` ("Attach to Nintendont" or "Attach to Dolphin"). Symbols are loaded automatically on connect. + +**Command line:** + +```sh +build/binutils/powerpc-eabi-gdb build/GZ2E01/framework.elf \ + -ex "source build/GZ2E01/load_rel_symbols.py" \ + -ex "target remote 192.168.1.100:2159" +``` + +### GDB Commands + +DOL and REL symbols are loaded automatically on connect via a stop event handler. The following commands are also available manually in the GDB console: + +| Command | Description | +|---------|-------------| +| `load-dol-symbols` | Load DOL (framework.elf) symbols + DWARF debug info | +| `load-rel-symbols` | Walk the OS module list and load PLF symbols for all RELs | +| `load-all-symbols` | Run both `load-dol-symbols` and `load-rel-symbols` | +| `load-debug-for ` | Load DWARF debug info for a specific REL module by ID | +| `dbg-` | Shorthand for `load-debug-for` (e.g. `dbg-d_a_grass`) | + ## Umbra Platform API The umbra layer is always available to your mod code: @@ -178,6 +234,13 @@ net.disconnect(); net.sendUDP(ip, port, data, len); net.recvUDP(buf, maxLen); +// Start GDB server on the kernel (for programmatic use) +net.gdbStart(2159); + +// GDB server + polling (see GDB section above) +umbra_gdb_auto_start(2159); +umbra_gdb_poll(); + // Return to the Nintendont loader ninReturnToLoader(); ``` @@ -194,9 +257,14 @@ umbra/ ├── include// # Your mod's headers ├── src// # Your mod's source ├── mod_assets/ # Custom assets copied into ISO +├── .vscode/launch.json # VS Code debug configs (Nintendont + Dolphin) ├── tools/ │ ├── rebuild-decomp-tp.py # ISO rebuild script │ ├── patch_forceactive.py # Auto-patches linker script with custom symbols -│ └── check_mod_assets.py # Asset checksum tracker +│ ├── check_mod_assets.py # Asset checksum tracker +│ ├── build_gdb.py # Builds powerpc-eabi-gdb from source +│ ├── gen_gdb_rel_loader.py # Generates Python GDB symbol loader +│ └── gen_dwarf2_debug.py # Converts MW DWARF 1 to DWARF 2 debug info +├── build/binutils/ # Cross-tools (powerpc-eabi-gdb, etc.) └── orig/GZ2E01/ # Vanilla disc image (not checked in) ``` diff --git a/configure.py b/configure.py index df1940cb587..3b14f2f1fee 100755 --- a/configure.py +++ b/configure.py @@ -15,6 +15,7 @@ import argparse import importlib import json +import os import sys from pathlib import Path from typing import Any, Dict, List @@ -217,7 +218,7 @@ config.asm_dir = None # Tool versions -config.binutils_tag = "2.42-1" +config.binutils_tag = "2.42-2" config.compilers_tag = "20251118" config.dtk_tag = "v1.8.0" config.objdiff_tag = "v3.6.1" @@ -3072,6 +3073,38 @@ def link_order_callback(module_id: int, objects: List[str]) -> List[str]: "implicit": [ldscript_path, "build/binutils", "tools/patch_forceactive.py"], }) +# Generate DWARF 2 debug info from DWARF 1 .o files after link +debug_info_out = f"build/{version}/debug_info.o" +config.custom_build_rules.append({ + "name": "gen_dwarf2_debug", + "command": f"$python tools/gen_dwarf2_debug.py build/{version}", + "description": "DWARF2 DEBUG $out", + "pool": "console", +}) +config.custom_build_steps.setdefault("post-build", []).append({ + "outputs": debug_info_out, + "rule": "gen_dwarf2_debug", + "inputs": [f"build/{version}/framework.elf.MAP"], + "implicit": [ + f"build/{version}/framework.elf", + "tools/gen_dwarf2_debug.py", + ], +}) + +# Generate GDB REL symbol loader script after debug info is ready +gdb_loader_out = f"build/{version}/load_rel_symbols.py" +config.custom_build_rules.append({ + "name": "gen_gdb_rel_loader", + "command": f"$python tools/gen_gdb_rel_loader.py build/{version}", + "description": "GDB REL LOADER $out", +}) +config.custom_build_steps.setdefault("post-build", []).append({ + "outputs": gdb_loader_out, + "rule": "gen_gdb_rel_loader", + "inputs": [f"build/{version}/config.json"], + "implicit": ["tools/gen_gdb_rel_loader.py", debug_info_out], +}) + # Optional extra categories for progress tracking config.progress_categories = [ ProgressCategory("game", "TP Game Code"), @@ -3088,6 +3121,15 @@ def link_order_callback(module_id: int, objects: List[str]) -> List[str]: ] if args.mode == "configure": + # Save existing build.ninja to detect no-op regenerations + try: + old_ninja_stat = os.stat("build.ninja") + with open("build.ninja", "r") as f: + old_ninja_content = f.read() + except FileNotFoundError: + old_ninja_stat = None + old_ninja_content = None + # Write build.ninja and objdiff.json generate_build(config) @@ -3123,15 +3165,12 @@ def link_order_callback(module_id: int, objects: List[str]) -> List[str]: # Add the build step before the default rule iso_build = f"""# mod_assets checksum -build {assets_stamp}: mod_assets_checksum | always +build {assets_stamp}: mod_assets_checksum | tools/check_mod_assets.py always # Rebuild ISO build {output_iso}: rebuild_iso | {dol_output} {rel_output} tools/rebuild-decomp-tp.py {assets_stamp} """ - # Add phony always target if not already present - if "build always: phony" not in content: - iso_build = "build always: phony\n\n" + iso_build content = content.replace( "# Default rule\n", iso_build + "# Default rule\n" @@ -3145,6 +3184,14 @@ def link_order_callback(module_id: int, objects: List[str]) -> List[str]: with open("build.ninja", "w") as f: f.write(content) + + # If build.ninja content is unchanged, restore the original mtime so ninja + # doesn't re-evaluate the entire build graph on the next invocation. + if old_ninja_content is not None: + with open("build.ninja", "r") as f: + new_ninja_content = f.read() + if new_ninja_content == old_ninja_content: + os.utime("build.ninja", (old_ninja_stat.st_atime, old_ninja_stat.st_mtime)) elif args.mode == "progress": # Print progress information calculate_progress(config) diff --git a/include/umbra/umbra_gdb.h b/include/umbra/umbra_gdb.h new file mode 100644 index 00000000000..9a8b02d5079 --- /dev/null +++ b/include/umbra/umbra_gdb.h @@ -0,0 +1,18 @@ +#ifndef UMBRA_GDB_H +#define UMBRA_GDB_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void umbra_gdb_trk_hook(void); +void umbra_gdb_auto_start(u16 port); +void umbra_gdb_poll(void); + +#ifdef __cplusplus +} +#endif + +#endif /* UMBRA_GDB_H */ diff --git a/include/umbra/umbra_net.h b/include/umbra/umbra_net.h index 71dc35ab2bd..50f7e852ee5 100644 --- a/include/umbra/umbra_net.h +++ b/include/umbra/umbra_net.h @@ -13,6 +13,8 @@ class umbraNet { int stateWrite(const void* data, u32 len); int stateRead(void* buf, u32 maxLen); + int gdbStart(u16 port); + static u32 makeIP(u8 a, u8 b, u8 c, u8 d) { return ((u32)a << 24) | ((u32)b << 16) | ((u32)c << 8) | (u32)d; } diff --git a/include/umbra/umbra_nintendont.h b/include/umbra/umbra_nintendont.h index 9276a645ab5..43dfa749bf8 100644 --- a/include/umbra/umbra_nintendont.h +++ b/include/umbra/umbra_nintendont.h @@ -17,6 +17,7 @@ #define UMBRA_CMD_NET_STATE_WRITE 0x07 #define UMBRA_CMD_NET_STATE_READ 0x08 #define UMBRA_CMD_NET_DISCONNECT 0x09 +#define UMBRA_CMD_GDB_START 0x0A #define UMBRA_CMD_WORD(cmd) (((u32)UMBRA_MAGIC << 16) | ((u32)(cmd) << 8)) diff --git a/src/umbra/umbra_gdb.cpp b/src/umbra/umbra_gdb.cpp new file mode 100644 index 00000000000..7da509b8dc2 --- /dev/null +++ b/src/umbra/umbra_gdb.cpp @@ -0,0 +1,356 @@ +/* Do NOT include d/dolzel.h — conflicts with targimpl.h struct definitions */ + +#include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" +#include +#include +#include + +#include "umbra/umbra_gdb.h" +#include "umbra/umbra_nintendont.h" +#include "umbra/umbra_platform.h" + +extern "C" { + void AIStopDMA(void); + void AIStartDMA(void); + BOOL OSDisableInterrupts(void); +} + +/* Must match kernel/gdb.h */ + +#define GDB_SHM_BASE ((volatile u32*)0xD3003600) +#define GDB_SHM_SIZE 512 + +#define GDB_SHM_MAGIC 0x47444253 /* "GDBS" */ + +#define GDB_STATE_IDLE 0 +#define GDB_STATE_STOPPED 1 +#define GDB_STATE_RESUME 2 +#define GDB_STATE_STEP 3 +#define GDB_STATE_DETACH 4 + +#define SHM_MAGIC 0 +#define SHM_STATE 1 +#define SHM_STOP_REASON 2 +#define SHM_SIGNAL 3 +#define SHM_GPR_BASE 4 +#define SHM_PC 36 +#define SHM_LR 37 +#define SHM_CR 38 +#define SHM_CTR 39 +#define SHM_XER 40 +#define SHM_MSR 41 +#define SHM_FPR_BYTE_OFF 0x0A8 +#define SHM_FPSCR_BYTE_OFF 0x1A8 +#define SHM_HALT_REQ 108 +#define SHM_PPC_HEARTBEAT 109 +#define SHM_PPC_HALT_SEEN 110 +#define SHM_EXIT_REQ 111 +#define SHM_IC_INVAL_CNT 112 +#define SHM_IC_INVAL_ADDR 113 +#define SHM_TBU_SAVE 121 +#define SHM_TBL_SAVE 122 +#define SHM_DEC_SAVE 123 + +#define MSR_SE (1 << 10) +#define MSR_EE (1 << 15) + +static u16 s_gdb_port = 2159; + +/* Freeze PPC time during halt so game timers don't see a multi-second gap. */ +static asm u32 get_tbu(void) { nofralloc; mftbu r3; blr; } +static asm u32 get_tbl(void) { nofralloc; mftb r3; blr; } +static asm u32 get_dec(void) { nofralloc; mfspr r3, 22; blr; } +static asm void set_tb(register u32 tbu, register u32 tbl) { + nofralloc + li r5, 0 + mtspr 284, r5 + mtspr 285, r3 + mtspr 284, r4 + blr +} +static asm void set_dec(register u32 val) { nofralloc; mtspr 22, r3; blr; } + +static void save_timebase(void) { + u32 tbu1, tbu2, tbl; + do { + tbu1 = get_tbu(); + tbl = get_tbl(); + tbu2 = get_tbu(); + } while (tbu1 != tbu2); + GDB_SHM_BASE[SHM_TBU_SAVE] = tbu1; + GDB_SHM_BASE[SHM_TBL_SAVE] = tbl; + GDB_SHM_BASE[SHM_DEC_SAVE] = get_dec(); +} + +static void restore_timebase(void) { + set_tb(GDB_SHM_BASE[SHM_TBU_SAVE], GDB_SHM_BASE[SHM_TBL_SAVE]); + set_dec(GDB_SHM_BASE[SHM_DEC_SAVE]); +} + +static u32 s_saved_msr_ee = 0; + +static void do_game_exit(void); + +static u32 exception_to_signal(u32 exception_id) { + switch (exception_id & 0xFFFF) { + case 0x0200: return 11; + case 0x0300: return 11; + case 0x0400: return 11; + case 0x0500: return 2; + case 0x0600: return 11; + case 0x0700: return 5; + case 0x0800: return 8; + case 0x0900: return 14; + case 0x0D00: return 5; + default: return 5; + } +} + +/* ARM writes instructions to physical memory, bypassing PPC caches. + * DCInvalidateRange prevents stale D-cache castouts from refilling L2. + * ICInvalidateRange forces I-fetch from DRAM. */ +static void process_ic_inval(void) { + u32 cnt = GDB_SHM_BASE[SHM_IC_INVAL_CNT]; + if (cnt == 0) + return; + if (cnt > 8) + cnt = 8; + for (u32 i = 0; i < cnt; i++) { + u32 addr = GDB_SHM_BASE[SHM_IC_INVAL_ADDR + i]; + DCInvalidateRange((void*)addr, 32); + ICInvalidateRange((void*)addr, 4); + } + GDB_SHM_BASE[SHM_IC_INVAL_CNT] = 0; +} + +static int start_gdb_server(u16 port) { + if (!umbraHasUmbraSupport()) { + return -1; + } + + u8 buf[32] ATTRIBUTE_ALIGN(32); + u8 statusBuf[32] ATTRIBUTE_ALIGN(32); + + for (int i = 0; i < 32; i++) { + buf[i] = 0; + statusBuf[i] = 0; + } + + *(u32*)(buf + 0) = UMBRA_CMD_WORD(UMBRA_CMD_GDB_START); + buf[4] = (port >> 8) & 0xFF; + buf[5] = port & 0xFF; + + if (!umbraTransfer(buf, sizeof(buf), 1) || + !umbraTransfer(statusBuf, sizeof(statusBuf), 0)) { + return -1; + } + + u32 status = *(u32*)(statusBuf + 0); + return (status == 0) ? 0 : -1; +} + +static void save_ctx_to_shm(OSContext* ctx, u32 exc_vector) { + for (int i = 0; i < 32; i++) + GDB_SHM_BASE[SHM_GPR_BASE + i] = ctx->gpr[i]; + + GDB_SHM_BASE[SHM_PC] = ctx->srr0; + GDB_SHM_BASE[SHM_LR] = ctx->lr; + GDB_SHM_BASE[SHM_CR] = ctx->cr; + GDB_SHM_BASE[SHM_CTR] = ctx->ctr; + GDB_SHM_BASE[SHM_XER] = ctx->xer; + GDB_SHM_BASE[SHM_MSR] = ctx->srr1; + + volatile u64* fpr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPR_BYTE_OFF); + for (int i = 0; i < 32; i++) + fpr_shm[i] = *(volatile u64*)&ctx->fpr[i]; + + volatile u64* fpscr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPSCR_BYTE_OFF); + *fpscr_shm = (u64)ctx->fpscr; + + GDB_SHM_BASE[SHM_STOP_REASON] = exc_vector; + GDB_SHM_BASE[SHM_SIGNAL] = exception_to_signal(exc_vector); +} + +extern "C" void umbra_gdb_auto_start(u16 port) { + s_gdb_port = port; + start_gdb_server(port); +} + +static void save_regs_to_shm(void) { + for (int i = 0; i < 32; i++) + GDB_SHM_BASE[SHM_GPR_BASE + i] = gTRKCPUState.Default.GPR[i]; + + GDB_SHM_BASE[SHM_PC] = gTRKCPUState.Default.PC; + GDB_SHM_BASE[SHM_LR] = gTRKCPUState.Default.LR; + GDB_SHM_BASE[SHM_CR] = gTRKCPUState.Default.CR; + GDB_SHM_BASE[SHM_CTR] = gTRKCPUState.Default.CTR; + GDB_SHM_BASE[SHM_XER] = gTRKCPUState.Default.XER; + GDB_SHM_BASE[SHM_MSR] = gTRKCPUState.Extended1.MSR; + + volatile u64* fpr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPR_BYTE_OFF); + for (int i = 0; i < 32; i++) + fpr_shm[i] = gTRKCPUState.Float.FPR[i]; + + volatile u64* fpscr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPSCR_BYTE_OFF); + *fpscr_shm = gTRKCPUState.Float.FPSCR; + + u32 exc_id = gTRKCPUState.Extended1.exceptionID; + GDB_SHM_BASE[SHM_STOP_REASON] = exc_id; + GDB_SHM_BASE[SHM_SIGNAL] = exception_to_signal(exc_id); +} + +static void restore_regs_from_shm(u32 state) { + for (int i = 0; i < 32; i++) + gTRKCPUState.Default.GPR[i] = GDB_SHM_BASE[SHM_GPR_BASE + i]; + + gTRKCPUState.Default.PC = GDB_SHM_BASE[SHM_PC]; + gTRKCPUState.Default.LR = GDB_SHM_BASE[SHM_LR]; + gTRKCPUState.Default.CR = GDB_SHM_BASE[SHM_CR]; + gTRKCPUState.Default.CTR = GDB_SHM_BASE[SHM_CTR]; + gTRKCPUState.Default.XER = GDB_SHM_BASE[SHM_XER]; + + u32 msr = GDB_SHM_BASE[SHM_MSR]; + if (state == GDB_STATE_STEP) { + msr |= MSR_SE; + } else { + msr &= ~MSR_SE; + } + gTRKCPUState.Extended1.MSR = msr; + + volatile u64* fpr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPR_BYTE_OFF); + for (int i = 0; i < 32; i++) + gTRKCPUState.Float.FPR[i] = fpr_shm[i]; + volatile u64* fpscr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPSCR_BYTE_OFF); + gTRKCPUState.Float.FPSCR = *fpscr_shm; +} + +static void gdb_spin_wait(void) { + while (1) { + u32 state = GDB_SHM_BASE[SHM_STATE]; + + if (state == GDB_STATE_RESUME || state == GDB_STATE_STEP) { + restore_regs_from_shm(state); + process_ic_inval(); + ICFlashInvalidate(); + TRKSwapAndGo(); + } + else if (state == GDB_STATE_DETACH) { + u32 exit_req = GDB_SHM_BASE[SHM_EXIT_REQ]; + GDB_SHM_BASE[SHM_MAGIC] = 0; + process_ic_inval(); + ICFlashInvalidate(); + if (exit_req == 1) { + GDB_SHM_BASE[SHM_EXIT_REQ] = 0; + do_game_exit(); + } + TRKSwapAndGo(); + } + } +} + +#define PPC_RESET_STATUS ((volatile u32*)0xD3003420) + +/* Must match loader/source/ppc/PADReadGC/source/PADReadGC.c DoGameExit() */ +static void do_game_exit(void) { + OSDisableInterrupts(); + AIStopDMA(); + *PPC_RESET_STATUS = 0x1DEA; + while (*PPC_RESET_STATUS == 0x1DEA) + ; + *(volatile u32*)0xCC00403C = 0xF; + *(volatile u32*)0xCC004040 = 0; + *(volatile u32*)0xCC004020 = 0xFF; + volatile u32* dest = (volatile u32*)0x80004000; + volatile u32* src = (volatile u32*)0x93011810; + u32 size = 0x1800; + do { *dest++ = *src++; } while ((size -= 4) > 0); + DCFlushRange((void*)0x80004000, 0x1800); + ICInvalidateRange((void*)0x80004000, 0x1800); + *(volatile u32*)0xCD800004 = 0x36; + ((void(*)(void))0x80004000)(); +} + +extern "C" void umbra_gdb_poll(void) { + static u32 heartbeat = 0; + + /* SHM lives in uncached MEM2 — only exists on real Wii, not Dolphin. */ + if (!umbraIsNintendont()) + return; + + u32 magic = GDB_SHM_BASE[SHM_MAGIC]; + if (magic != GDB_SHM_MAGIC) + return; + + if (GDB_SHM_BASE[SHM_EXIT_REQ] == 1) { + GDB_SHM_BASE[SHM_EXIT_REQ] = 0; + do_game_exit(); + } + + u32 halt = GDB_SHM_BASE[SHM_HALT_REQ]; + GDB_SHM_BASE[SHM_PPC_HEARTBEAT] = ++heartbeat; + GDB_SHM_BASE[SHM_PPC_HALT_SEEN] = halt; + + if (halt != 1) + return; + + OSContext ctx; + OSSaveContext(&ctx); + + /* OSSaveContext saves its own return address as LR, not our caller's. */ + u32 sp = ctx.gpr[1]; + u32 back_chain = *(volatile u32*)sp; + if (back_chain >= 0x80000000 && back_chain < 0x81800000) { + ctx.lr = *(volatile u32*)(back_chain + 4); + } + + save_ctx_to_shm(&ctx, 0x0500); + GDB_SHM_BASE[SHM_SIGNAL] = 2; + GDB_SHM_BASE[SHM_STATE] = GDB_STATE_STOPPED; + GDB_SHM_BASE[SHM_HALT_REQ] = 0; + + save_timebase(); + + DCFlushRange((void*)(sp & ~0x1F), 32 * 1024); + + AIStopDMA(); + + while (1) { + u32 state = GDB_SHM_BASE[SHM_STATE]; + + if (state == GDB_STATE_STEP) { + process_ic_inval(); + ICFlashInvalidate(); + s_saved_msr_ee = ctx.srr1 & MSR_EE; + ctx.srr1 = (ctx.srr1 | MSR_SE) & ~MSR_EE; + OSLoadContext(&ctx); + } else if (state == GDB_STATE_RESUME) { + process_ic_inval(); + ICFlashInvalidate(); + restore_timebase(); + AIStartDMA(); + return; + } else if (state == GDB_STATE_DETACH) { + u32 exit_req = GDB_SHM_BASE[SHM_EXIT_REQ]; + GDB_SHM_BASE[SHM_MAGIC] = 0; + process_ic_inval(); + ICFlashInvalidate(); + restore_timebase(); + AIStartDMA(); + if (exit_req == 1) { + GDB_SHM_BASE[SHM_EXIT_REQ] = 0; + do_game_exit(); + } + return; + } + } +} + +extern "C" void umbra_gdb_trk_hook(void) { + if (!umbraIsNintendont()) + return; + if (GDB_SHM_BASE[SHM_MAGIC] == GDB_SHM_MAGIC) { + save_regs_to_shm(); + GDB_SHM_BASE[SHM_STATE] = GDB_STATE_STOPPED; + gdb_spin_wait(); + } +} diff --git a/src/umbra/umbra_net.cpp b/src/umbra/umbra_net.cpp index 4b096de8016..5c1d24a3501 100644 --- a/src/umbra/umbra_net.cpp +++ b/src/umbra/umbra_net.cpp @@ -159,6 +159,25 @@ int umbraNet::stateRead(void* buf, u32 maxLen) { return (int)dataLen; } +int umbraNet::gdbStart(u16 port) { + if (!umbraHasUmbraSupport()) { + return -1; + } + u8 buf[32] ATTRIBUTE_ALIGN(32); + memset(buf, 0, sizeof(buf)); + *(u32*)(buf + 0) = UMBRA_CMD_WORD(UMBRA_CMD_GDB_START); + buf[4] = (port >> 8) & 0xFF; + buf[5] = port & 0xFF; + u8 statusBuf[32] ATTRIBUTE_ALIGN(32); + memset(statusBuf, 0, sizeof(statusBuf)); + if (!umbraTransfer(buf, sizeof(buf), 1) || + !umbraTransfer(statusBuf, sizeof(statusBuf), 0)) { + return -1; + } + u32 status = *(u32*)(statusBuf + 0); + return (status == 0) ? 0 : -1; +} + int umbraNet::recvUDP(void* buf, u32 maxLen) { if (!umbraHasUmbraSupport()) { return -1; diff --git a/tools/build_gdb.py b/tools/build_gdb.py new file mode 100644 index 00000000000..432f1efc409 --- /dev/null +++ b/tools/build_gdb.py @@ -0,0 +1,142 @@ +#!/usr/bin/env python3 + +""" +Downloads and builds powerpc-eabi-gdb from source with Python scripting support. +Installs into an existing binutils directory. + +Usage: + python3 tools/build_gdb.py build/binutils --version 17.1 +""" + +import argparse +import io +import os +import shutil +import subprocess +import sys +import tarfile +import urllib.request +from pathlib import Path + + +GDB_MIRROR = "https://sourceware.org/pub/gdb/releases" + + +def download_source(version: str, work_dir: Path) -> Path: + src_dir = work_dir / "gdb-src" + if src_dir.exists(): + return src_dir + + url = f"{GDB_MIRROR}/gdb-{version}.tar.xz" + print(f"Downloading {url}") + req = urllib.request.Request(url, headers={"User-Agent": "Mozilla/5.0"}) + with urllib.request.urlopen(req) as resp: + data = io.BytesIO(resp.read()) + + src_dir.mkdir(parents=True) + import lzma + + with lzma.open(data) as xz: + with tarfile.open(fileobj=xz) as tar: + tar.extractall(src_dir, filter="data") + + # tar extracts into gdb-/ subfolder + subdirs = list(src_dir.iterdir()) + if len(subdirs) == 1 and subdirs[0].is_dir(): + inner = subdirs[0] + tmp = work_dir / "_gdb_inner" + inner.rename(tmp) + src_dir.rmdir() + tmp.rename(src_dir) + + return src_dir + + +def build_gdb(src_dir: Path, work_dir: Path, prefix: Path) -> None: + build_dir = work_dir / "gdb-build" + build_dir.mkdir(parents=True, exist_ok=True) + + jobs = str(os.cpu_count() or 4) + + # Configure + configure = src_dir / "configure" + cmd = [ + str(configure), + "--target=powerpc-eabi", + f"--prefix={prefix}", + "--with-python=python3", + "--disable-sim", + "--disable-nls", + "--disable-werror", + ] + print("Configuring GDB...") + subprocess.check_call(cmd, cwd=build_dir, stdout=subprocess.DEVNULL) + + # Build + print("Building GDB (this may take a few minutes)...") + subprocess.check_call( + ["make", f"-j{jobs}"], cwd=build_dir, stdout=subprocess.DEVNULL + ) + + # Install + subprocess.check_call( + ["make", "install"], cwd=build_dir, stdout=subprocess.DEVNULL + ) + + +def main() -> None: + parser = argparse.ArgumentParser(description="Build powerpc-eabi-gdb from source") + parser.add_argument( + "binutils_dir", type=Path, help="Binutils directory to install into" + ) + parser.add_argument( + "--version", default="17.1", help="GDB version (default: 17.1)" + ) + args = parser.parse_args() + + binutils_dir = args.binutils_dir.resolve() + if not binutils_dir.exists(): + sys.exit(f"Binutils directory not found: {binutils_dir}") + + gdb_binary = binutils_dir / "powerpc-eabi-gdb" + if gdb_binary.exists(): + print(f"GDB already exists at {gdb_binary}, skipping build") + return + + work_dir = binutils_dir.parent / "gdb-build" + work_dir.mkdir(parents=True, exist_ok=True) + + # Install to temp prefix, then merge into binutils dir. + # GDB's `make install` puts binaries in {prefix}/bin/ and data in {prefix}/share/gdb/. + # The binutils dir has tools flat (no bin/ subdir), so we copy selectively. + install_dir = work_dir / "install" + install_dir.mkdir(parents=True, exist_ok=True) + + src_dir = download_source(args.version, work_dir) + build_gdb(src_dir, work_dir, install_dir) + + # Copy GDB binary + installed_gdb = install_dir / "bin" / "powerpc-eabi-gdb" + if not installed_gdb.exists(): + sys.exit(f"GDB build succeeded but binary not found at {installed_gdb}") + shutil.copy2(installed_gdb, gdb_binary) + os.chmod(gdb_binary, 0o755) + + # Copy GDB data directory (Python/Guile modules needed at runtime). + # GDB resolves its data dir relative to the binary: {binary}/../../share/gdb. + # Binary is at build/binutils/powerpc-eabi-gdb, so data goes to build/share/gdb. + gdb_data = install_dir / "share" / "gdb" + if gdb_data.exists(): + dest_data = binutils_dir.parent / "share" / "gdb" + if dest_data.exists(): + shutil.rmtree(dest_data) + shutil.copytree(gdb_data, dest_data) + + print(f"Installed {gdb_binary}") + + # Clean up source and build artifacts + shutil.rmtree(work_dir) + + +if __name__ == "__main__": + main() diff --git a/tools/download_tool.py b/tools/download_tool.py index 22465267a55..76d790850cd 100755 --- a/tools/download_tool.py +++ b/tools/download_tool.py @@ -108,11 +108,19 @@ def download(url, response, output) -> None: for name in files: os.chmod(os.path.join(root, name), 0o755) output.touch(mode=0o755) # Update dir modtime + # Truncate to whole seconds — MWCC via Wine only produces + # second-precision timestamps, so sub-second causes spurious rebuilds. + t = int(output.stat().st_mtime) + os.utime(output, (t, t)) else: with open(output, "wb") as f: shutil.copyfileobj(response, f) st = os.stat(output) os.chmod(output, st.st_mode | stat.S_IEXEC) + # Truncate to whole seconds — MWCC via Wine only produces + # second-precision timestamps, so sub-second causes spurious rebuilds. + t = int(os.stat(output).st_mtime) + os.utime(output, (t, t)) def main() -> None: diff --git a/tools/gen_dwarf2_debug.py b/tools/gen_dwarf2_debug.py new file mode 100644 index 00000000000..002ef81012a --- /dev/null +++ b/tools/gen_dwarf2_debug.py @@ -0,0 +1,1244 @@ +#!/usr/bin/env python3 +"""Convert DWARF 1 debug info from MW .o files into a combined DWARF 2 object. + +mwcceppc emits DWARF 1.1 (.line/.debug sections) which GDB 8.2+ cannot +read. This script parses both line tables and variable/type info from each .o, +cross-references with the linker MAP, and generates a single .o file containing: + - .debug_line (line number tables) + - .debug_info (CU + subprogram/variable DIEs) + - .debug_abbrev + +All in one CU so GDB can resolve both line info and variable info for the same +address range without conflicts. + +Processes both the DOL (framework.elf) and all REL modules. + +Usage: + python3 tools/gen_dwarf2_debug.py + # e.g. python3 tools/gen_dwarf2_debug.py build/GZ2E01 +""" + +import bisect +import os +import re +import struct +import subprocess +import sys + + +# --------------------------------------------------------------------------- +# DWARF 1 constants (TIS DWARF 1 spec — used by MetroWerks) +# --------------------------------------------------------------------------- + +DW1_TAG_COMPILE_UNIT = 0x0011 +DW1_TAG_GLOBAL_SUBR = 0x0006 +DW1_TAG_SUBROUTINE = 0x0014 +DW1_TAG_FORMAL_PARAM = 0x0005 +DW1_TAG_LOCAL_VAR = 0x000C + +DW1_AT_SIBLING = 0x0010 +DW1_AT_LOCATION = 0x0020 +DW1_AT_NAME = 0x0030 +DW1_AT_FUND_TYPE = 0x0050 +DW1_AT_LOW_PC = 0x0110 +DW1_AT_HIGH_PC = 0x0120 +DW1_AT_MW_MANGLED = 0x2000 + +AT_NAME_WITH_STRING = 0x0038 # AT_name | FORM_STRING + +# Location ops +DW1_OP_REG = 0x01 +DW1_OP_BASEREG = 0x02 +DW1_OP_ADDR = 0x03 +DW1_OP_CONST = 0x04 + +# Form sizes +FORM_SIZES = {0x1: 4, 0x2: 4, 0x5: 2, 0x6: 4, 0x7: 8} + +# Fundamental types: ft_code -> (name, byte_size, DW_ATE_encoding) +FT_INFO = { + 0x01: ("char", 1, 0x06), + 0x02: ("signed char", 1, 0x06), + 0x03: ("unsigned char", 1, 0x08), + 0x04: ("short", 2, 0x05), + 0x05: ("signed short", 2, 0x05), + 0x06: ("unsigned short", 2, 0x07), + 0x07: ("int", 4, 0x05), + 0x08: ("signed int", 4, 0x05), + 0x09: ("unsigned int", 4, 0x07), + 0x0A: ("long", 4, 0x05), + 0x0B: ("signed long", 4, 0x05), + 0x0C: ("unsigned long", 4, 0x07), + 0x0D: ("void *", 4, 0x01), + 0x0E: ("float", 4, 0x04), + 0x0F: ("double", 8, 0x04), + 0x14: ("void", 0, 0x00), + 0x15: ("bool", 1, 0x02), +} + +FT_CANONICAL = { + 0x02: 0x01, 0x05: 0x04, 0x08: 0x07, 0x0B: 0x0A, +} + + +# --------------------------------------------------------------------------- +# ELF parsing +# --------------------------------------------------------------------------- + +def read_elf_sections(path): + """Parse ELF section headers, return {name: (offset, size, addr)}.""" + sections = {} + with open(path, "rb") as f: + magic = f.read(4) + if magic != b"\x7fELF": + return sections + f.seek(0) + ehdr = f.read(52) + e_shoff = struct.unpack(">I", ehdr[32:36])[0] + e_shentsize = struct.unpack(">H", ehdr[46:48])[0] + e_shnum = struct.unpack(">H", ehdr[48:50])[0] + e_shstrndx = struct.unpack(">H", ehdr[50:52])[0] + + f.seek(e_shoff + e_shstrndx * e_shentsize) + shdr = f.read(e_shentsize) + strtab_off = struct.unpack(">I", shdr[16:20])[0] + strtab_sz = struct.unpack(">I", shdr[20:24])[0] + f.seek(strtab_off) + strtab = f.read(strtab_sz) + + for i in range(e_shnum): + f.seek(e_shoff + i * e_shentsize) + shdr = f.read(e_shentsize) + name_idx = struct.unpack(">I", shdr[0:4])[0] + end = strtab.index(b"\x00", name_idx) + name = strtab[name_idx:end].decode("ascii", errors="replace") + sh_addr = struct.unpack(">I", shdr[12:16])[0] + sh_off = struct.unpack(">I", shdr[16:20])[0] + sh_size = struct.unpack(">I", shdr[20:24])[0] + if name and name not in sections: + sections[name] = (sh_off, sh_size, sh_addr) + return sections + + +def read_elf_sections_detailed(path): + """Parse ELF returning (section_list, section_dict).""" + sec_list = [] + sec_dict = {} + with open(path, "rb") as f: + magic = f.read(4) + if magic != b"\x7fELF": + return sec_list, sec_dict + f.seek(0) + ehdr = f.read(52) + e_shoff = struct.unpack(">I", ehdr[32:36])[0] + e_shentsize = struct.unpack(">H", ehdr[46:48])[0] + e_shnum = struct.unpack(">H", ehdr[48:50])[0] + e_shstrndx = struct.unpack(">H", ehdr[50:52])[0] + + f.seek(e_shoff + e_shstrndx * e_shentsize) + shdr = f.read(e_shentsize) + strtab_off = struct.unpack(">I", shdr[16:20])[0] + strtab_sz = struct.unpack(">I", shdr[20:24])[0] + f.seek(strtab_off) + strtab = f.read(strtab_sz) + + for i in range(e_shnum): + f.seek(e_shoff + i * e_shentsize) + shdr = f.read(e_shentsize) + name_idx = struct.unpack(">I", shdr[0:4])[0] + end_idx = strtab.index(b"\x00", name_idx) + name = strtab[name_idx:end_idx].decode("ascii", errors="replace") + sh_type = struct.unpack(">I", shdr[4:8])[0] + sh_addr = struct.unpack(">I", shdr[12:16])[0] + sh_off = struct.unpack(">I", shdr[16:20])[0] + sh_size = struct.unpack(">I", shdr[20:24])[0] + sh_link = struct.unpack(">I", shdr[24:28])[0] + sec_list.append((name, sh_type, sh_off, sh_size, sh_link, sh_addr)) + if name and name not in sec_dict: + sec_dict[name] = (sh_off, sh_size, sh_addr) + return sec_list, sec_dict + + +def get_text_base(elf_path): + """Get the .text section virtual address from an ELF.""" + sections = read_elf_sections(elf_path) + if ".text" in sections: + return sections[".text"][2] + return None + + +# --------------------------------------------------------------------------- +# MAP file parsing +# --------------------------------------------------------------------------- + +def parse_map_file(map_path): + """Parse MAP file .text section layout. + + Returns (obj_offsets, obj_func_map) where: + obj_offsets: {obj_basename: [(starting_address, size), ...]} (alignment-1) + obj_func_map: {obj_basename: [(func_name, linked_offset, size), ...]} (alignment-4) + """ + obj_offsets = {} + obj_func_map = {} + in_text_layout = False + past_header = False + + with open(map_path) as f: + for line in f: + line = line.rstrip() + if ".text section layout" in line: + in_text_layout = True + past_header = False + continue + if in_text_layout: + if line.strip().startswith("---"): + past_header = True + continue + if not past_header: + continue + if not line.strip(): + continue + if line.strip() and not line.startswith(" "): + in_text_layout = False + continue + + m = re.match( + r"\s+([0-9a-fA-F]+)\s+([0-9a-fA-F]+)\s+[0-9a-fA-F]+\s+[0-9a-fA-F]+\s+" + r"(\d+)\s+(\S+)\s+(\S+)", + line, + ) + if m: + start_addr = int(m.group(1), 16) + size = int(m.group(2), 16) + alignment = int(m.group(3)) + section_name = m.group(4) + obj_name = m.group(5) + if alignment == 1 and section_name == ".text" and size > 0: + obj_offsets.setdefault(obj_name, []).append( + (start_addr, size) + ) + elif alignment >= 4 and size > 0: + # Per-function entry: section_name is the symbol name + func_name = section_name + obj_func_map.setdefault(obj_name, []).append( + (func_name, start_addr, size) + ) + return obj_offsets, obj_func_map + + +def build_o_index(search_dirs): + """Build {basename: path} index of .o files.""" + o_by_basename = {} + for search_dir in search_dirs: + if not os.path.isdir(search_dir): + continue + for dirpath, _, filenames in os.walk(search_dir): + for fn in filenames: + if fn.endswith(".o") and fn not in ( + "debug_info.o", "debug_varinfo.o" + ): + full = os.path.join(dirpath, fn) + if fn not in o_by_basename or "/src/" in full: + o_by_basename[fn] = full + return o_by_basename + + +def read_o_text_symbols(o_path): + """Read function symbols from .o ELF symbol table. + + Returns {symbol_name: offset_in_text} for defined function symbols + in the .text section. + """ + sec_list, sec_dict = read_elf_sections_detailed(o_path) + if ".symtab" not in sec_dict: + return {} + + text_shndx = None + for i, (name, sh_type, sh_off, sh_size, sh_link, sh_addr) in enumerate(sec_list): + if name == ".text": + text_shndx = i + break + if text_shndx is None: + return {} + + with open(o_path, "rb") as f: + soff, ssz, _ = sec_dict[".symtab"] + f.seek(soff) + symtab_data = f.read(ssz) + + # Find strtab for symtab + symtab_link = None + for name, sh_type, sh_off, sh_size, sh_link, sh_addr in sec_list: + if name == ".symtab": + symtab_link = sh_link + break + if symtab_link is None: + return {} + + st_off, st_sz, _ = sec_dict[sec_list[symtab_link][0]] + f.seek(st_off) + strtab_data = f.read(st_sz) + + result = {} + n_syms = ssz // 16 + for i in range(n_syms): + base = i * 16 + st_name_off = struct.unpack(">I", symtab_data[base:base+4])[0] + st_value = struct.unpack(">I", symtab_data[base+4:base+8])[0] + st_info = symtab_data[base + 12] + st_shndx = struct.unpack(">H", symtab_data[base+14:base+16])[0] + + # STT_FUNC = 2, STT_OBJECT can also be in .text for some compilers + sym_type = st_info & 0xF + if st_shndx == text_shndx and sym_type == 2: # STT_FUNC + end = strtab_data.index(b"\x00", st_name_off) + sym_name = strtab_data[st_name_off:end].decode("ascii", errors="replace") + if sym_name: + result[sym_name] = st_value + return result + + +def build_remap_table(o_path, map_funcs): + """Build a remapping table for function-level address correction. + + The MW linker can reorder functions within an .o file (e.g., moving + __sinit_* to the end). The .line section pc_addresses reflect the + original .o layout, so we need per-function deltas to compute the + correct linked addresses. + + Returns (remap_offsets, remap_deltas) — parallel sorted lists — or + (None, None) if the remap can't be built. + """ + if not map_funcs: + return None, None + + o_syms = read_o_text_symbols(o_path) + if not o_syms: + return None, None + + map_by_name = {name: off for name, off, sz in map_funcs} + + pairs = [] # (o_offset, linked_offset) + for sym_name, o_off in o_syms.items(): + if sym_name in map_by_name: + pairs.append((o_off, map_by_name[sym_name])) + + if not pairs: + return None, None + + pairs.sort() + remap_offsets = [p[0] for p in pairs] + remap_deltas = [p[1] - p[0] for p in pairs] + return remap_offsets, remap_deltas + + +def remap_pc(pc_addr, remap_offsets, remap_deltas, fallback_offset): + """Remap a .o-relative pc_addr to a linked .text offset. + + Uses binary search on remap_offsets to find the function containing + pc_addr, then applies that function's delta. + """ + if remap_offsets is None: + return fallback_offset + pc_addr + + idx = bisect.bisect_right(remap_offsets, pc_addr) - 1 + if idx < 0: + return fallback_offset + pc_addr + + return pc_addr + remap_deltas[idx] + + +# --------------------------------------------------------------------------- +# DWARF 1 .line section parsing +# --------------------------------------------------------------------------- + +def parse_dwarf1_source_name(f, debug_off, debug_size): + """Extract AT_name (source filename) from first compile_unit DIE.""" + f.seek(debug_off) + if debug_size < 6: + return None + + die_len = struct.unpack(">I", f.read(4))[0] + tag = struct.unpack(">H", f.read(2))[0] + if tag != DW1_TAG_COMPILE_UNIT: + return None + + die_end = debug_off + 4 + die_len + while f.tell() < die_end: + if f.tell() + 2 > die_end: + break + attr_word = struct.unpack(">H", f.read(2))[0] + if attr_word == 0: + break + form = attr_word & 0xF + + if attr_word == AT_NAME_WITH_STRING: + chars = [] + while True: + c = f.read(1) + if c == b"\x00" or c == b"": + break + chars.append(c) + return b"".join(chars).decode("ascii", errors="replace") + + if form == 0x8: + while True: + c = f.read(1) + if c == b"\x00" or c == b"": + break + elif form == 0x3: + blen = struct.unpack(">H", f.read(2))[0] + f.seek(blen, 1) + elif form == 0x4: + blen = struct.unpack(">I", f.read(4))[0] + f.seek(blen, 1) + elif form in FORM_SIZES: + f.seek(FORM_SIZES[form], 1) + else: + break + return None + + +def parse_dwarf1_line(f, line_off, line_size): + """Parse DWARF 1 .line section. + + Returns list of entry-lists per sub-section: + [[(line_number, pc_address), ...], ...] + """ + all_subsections = [] + if line_size < 8: + return all_subsections + + offset = 0 + while offset + 8 <= line_size: + f.seek(line_off + offset) + total_length = struct.unpack(">I", f.read(4))[0] + _base_address = struct.unpack(">I", f.read(4))[0] + if total_length < 8: + break + + entries = [] + pos = 8 + while pos + 10 <= total_length: + line_no = struct.unpack(">I", f.read(4))[0] + src_idx = struct.unpack(">H", f.read(2))[0] + pc_addr = struct.unpack(">I", f.read(4))[0] + pos += 10 + if line_no == 0: + break + if src_idx == 0xFFFF: + entries.append((line_no, pc_addr)) + all_subsections.append(entries) + offset += total_length + return all_subsections + + +def parse_object_lines(o_path): + """Parse DWARF 1 line info from a .o file. + + Returns (source_name, [[(line, pc), ...], ...]) + """ + sections = read_elf_sections(o_path) + if ".line" not in sections or ".debug" not in sections: + return None, [] + + line_off, line_size, _ = sections[".line"] + debug_off, debug_size, _ = sections[".debug"] + + with open(o_path, "rb") as f: + source_name = parse_dwarf1_source_name(f, debug_off, debug_size) + line_subsections = parse_dwarf1_line(f, line_off, line_size) + return source_name, line_subsections + + +# --------------------------------------------------------------------------- +# DWARF 1 .debug section parsing (variable/type info) +# --------------------------------------------------------------------------- + +def parse_dwarf1_dies(o_path): + """Parse DWARF 1 .debug section with relocations. + + Returns list of DIEs: [(offset, tag, attrs_dict, sibling_offset), ...] + """ + sec_list, sec_dict = read_elf_sections_detailed(o_path) + if ".debug" not in sec_dict or ".rela.debug" not in sec_dict: + return [] + + with open(o_path, "rb") as f: + doff, dsz, _ = sec_dict[".debug"] + f.seek(doff) + debug_data = f.read(dsz) + + roff, rsz, _ = sec_dict[".rela.debug"] + f.seek(roff) + rela_data = f.read(rsz) + + if ".symtab" not in sec_dict: + return [] + soff, ssz, _ = sec_dict[".symtab"] + f.seek(soff) + symtab_data = f.read(ssz) + + symtab_link = None + for name, sh_type, sh_off, sh_size, sh_link, sh_addr in sec_list: + if name == ".symtab": + symtab_link = sh_link + break + if symtab_link is None: + return [] + + strtab_name = sec_list[symtab_link][0] + st_off, st_sz, _ = sec_dict[strtab_name] + f.seek(st_off) + sym_strtab = f.read(st_sz) + + n_syms = ssz // 16 + symbols = [] + for i in range(n_syms): + st_name_off = struct.unpack(">I", symtab_data[i*16:i*16+4])[0] + st_value = struct.unpack(">I", symtab_data[i*16+4:i*16+8])[0] + st_shndx = struct.unpack(">H", symtab_data[i*16+14:i*16+16])[0] + end_idx = sym_strtab.index(b"\x00", st_name_off) + sym_name = sym_strtab[st_name_off:end_idx].decode("ascii", errors="replace") + symbols.append((sym_name, st_value, st_shndx)) + + debug_shndx = None + text_shndx = None + for i, (name, sh_type, sh_off, sh_size, sh_link, sh_addr) in enumerate(sec_list): + if name == ".debug": + debug_shndx = i + elif name == ".text" and text_shndx is None: + text_shndx = i + + rela_map = {} + for i in range(rsz // 12): + r_off = struct.unpack(">I", rela_data[i*12:i*12+4])[0] + r_info = struct.unpack(">I", rela_data[i*12+4:i*12+8])[0] + r_addend = struct.unpack(">i", rela_data[i*12+8:i*12+12])[0] + r_sym_idx = r_info >> 8 + if r_sym_idx >= len(symbols): + continue + sym_name, sym_val, sym_shndx = symbols[r_sym_idx] + resolved_value = sym_val + r_addend + if sym_shndx == text_shndx: + rela_map[r_off] = ("text", resolved_value) + elif sym_shndx == debug_shndx: + rela_map[r_off] = ("debug", resolved_value) + else: + section_name = sec_list[sym_shndx][0] if sym_shndx < len(sec_list) else "?" + rela_map[r_off] = (section_name, resolved_value) + + dies = [] + pos = 0 + while pos < len(debug_data): + if pos + 4 > len(debug_data): + break + die_len = struct.unpack(">I", debug_data[pos:pos+4])[0] + if die_len < 6: + pos += 4 + continue + + die_start = pos + die_end = pos + die_len + pos += 4 + + tag = struct.unpack(">H", debug_data[pos:pos+2])[0] + pos += 2 + + attrs = {} + while pos < die_end: + if pos + 2 > die_end: + break + attr_word = struct.unpack(">H", debug_data[pos:pos+2])[0] + if attr_word == 0: + break + pos += 2 + form = attr_word & 0xF + attr_base = attr_word & 0xFFF0 + value_pos = pos + + if form == 0x8: + start = pos + while pos < die_end and debug_data[pos] != 0: + pos += 1 + value = debug_data[start:pos].decode("ascii", errors="replace") + pos += 1 + elif form == 0x3: + blen = struct.unpack(">H", debug_data[pos:pos+2])[0] + pos += 2 + value = bytes(debug_data[pos:pos+blen]) + pos += blen + elif form == 0x4: + blen = struct.unpack(">I", debug_data[pos:pos+4])[0] + pos += 4 + value = bytes(debug_data[pos:pos+blen]) + pos += blen + elif form in FORM_SIZES: + sz = FORM_SIZES[form] + if sz == 2: + value = struct.unpack(">H", debug_data[pos:pos+2])[0] + elif sz == 4: + value = struct.unpack(">I", debug_data[pos:pos+4])[0] + elif sz == 8: + value = struct.unpack(">Q", debug_data[pos:pos+8])[0] + else: + value = 0 + if value_pos in rela_map: + section, resolved = rela_map[value_pos] + value = (section, resolved) + pos += sz + else: + break + attrs[attr_base] = value + + sibling_offset = None + sib = attrs.get(DW1_AT_SIBLING) + if isinstance(sib, tuple) and sib[0] == "debug": + sibling_offset = sib[1] + + dies.append((die_start, tag, attrs, sibling_offset)) + pos = die_end + return dies + + +def extract_varinfo(dies): + """Extract functions, parameters, and local variables from parsed DIEs. + + Returns (source_name, functions_list). + """ + source_name = None + functions = [] + current_func = None + current_func_end = None + + for die_start, tag, attrs, sibling_offset in dies: + if tag == DW1_TAG_COMPILE_UNIT: + source_name = attrs.get(DW1_AT_NAME) + continue + + if tag in (DW1_TAG_GLOBAL_SUBR, DW1_TAG_SUBROUTINE): + name = attrs.get(DW1_AT_NAME, "") + low_pc = attrs.get(DW1_AT_LOW_PC) + high_pc = attrs.get(DW1_AT_HIGH_PC) + lp = low_pc[1] if isinstance(low_pc, tuple) and low_pc[0] == "text" else None + hp = high_pc[1] if isinstance(high_pc, tuple) and high_pc[0] == "text" else None + if lp is not None and hp is not None: + current_func = {"name": name, "low_pc": lp, "high_pc": hp, "children": []} + current_func_end = sibling_offset + functions.append(current_func) + else: + current_func = None + current_func_end = None + continue + + if current_func is None: + continue + if current_func_end is not None and die_start >= current_func_end: + current_func = None + current_func_end = None + continue + + if tag == DW1_TAG_FORMAL_PARAM: + name = attrs.get(DW1_AT_NAME) + if name: + current_func["children"].append( + ("param", name, attrs.get(DW1_AT_FUND_TYPE), attrs.get(DW1_AT_LOCATION))) + elif tag == DW1_TAG_LOCAL_VAR: + name = attrs.get(DW1_AT_NAME) + if name: + current_func["children"].append( + ("local", name, attrs.get(DW1_AT_FUND_TYPE), attrs.get(DW1_AT_LOCATION))) + + return source_name, functions + + +# --------------------------------------------------------------------------- +# DWARF 1 -> DWARF 2 location conversion +# --------------------------------------------------------------------------- + +def sleb128_bytes(value): + """Encode a signed value as SLEB128.""" + result = [] + more = True + while more: + byte = value & 0x7F + value >>= 7 + if (value == 0 and (byte & 0x40) == 0) or \ + (value == -1 and (byte & 0x40) != 0): + more = False + else: + byte |= 0x80 + result.append(byte) + return bytes(result) + + +def uleb128_bytes(value): + """Encode an unsigned value as ULEB128.""" + result = [] + while True: + byte = value & 0x7F + value >>= 7 + if value: + byte |= 0x80 + result.append(byte) + if not value: + break + return bytes(result) + + +def convert_location(loc_block): + """Convert DWARF 1 location expression to DWARF 2 bytes.""" + if not loc_block or len(loc_block) < 1: + return None + op = loc_block[0] + + if op == DW1_OP_REG and len(loc_block) >= 5: + regnum = struct.unpack(">I", loc_block[1:5])[0] + if regnum < 32: + return bytes([0x50 + regnum]) + result = [0x90] + result.extend(uleb128_bytes(regnum)) + return bytes(result) + + elif op == DW1_OP_BASEREG and len(loc_block) >= 5: + regnum = struct.unpack(">I", loc_block[1:5])[0] + offset = 0 + if len(loc_block) >= 10 and loc_block[5] == DW1_OP_CONST: + offset = struct.unpack(">I", loc_block[6:10])[0] + if regnum < 32: + return bytes([0x70 + regnum]) + sleb128_bytes(offset) + + elif op == DW1_OP_ADDR and len(loc_block) >= 5: + addr = struct.unpack(">I", loc_block[1:5])[0] + return bytes([0x03]) + struct.pack(">I", addr) + + return None + + +# --------------------------------------------------------------------------- +# LEB128 helpers for assembly output +# --------------------------------------------------------------------------- + +def format_sleb128(value): + """Return .byte directive string for SLEB128-encoded value.""" + data = sleb128_bytes(value) + return ", ".join("0x%02x" % b for b in data) + + +def format_uleb128(value): + """Return .byte directive string for ULEB128-encoded value.""" + data = uleb128_bytes(value) + return ", ".join("0x%02x" % b for b in data) + + +# --------------------------------------------------------------------------- +# Combined DWARF 2 assembly generation +# --------------------------------------------------------------------------- + +def generate_combined_asm(line_entries, all_functions, file_table, text_base, + out_s): + """Generate combined DWARF 2 assembly with line tables + variable info. + + line_entries: sorted [(global_pc, file_idx, line_no), ...] + all_functions: sorted [(global_lp, global_hp, name, children), ...] + file_table: {source_path: file_idx (1-based)} + text_base: .text section virtual address (for absolute addresses) + """ + lines = [] + lines.append("# Auto-generated combined DWARF 2 debug info — do not edit") + lines.append("") + + # --- .debug_abbrev --- + lines.append(' .section .debug_abbrev,"",@progbits') + lines.append(".Labbrev_start:") + + # Abbrev 1: DW_TAG_compile_unit [has children] + lines.append(" .byte 1") + lines.append(" .byte 0x11") # DW_TAG_compile_unit + lines.append(" .byte 1") # DW_CHILDREN_yes + lines.append(" .byte 0x10, 0x06") # DW_AT_stmt_list, DW_FORM_data4 + lines.append(" .byte 0x11, 0x01") # DW_AT_low_pc, DW_FORM_addr + lines.append(" .byte 0x12, 0x01") # DW_AT_high_pc, DW_FORM_addr + lines.append(" .byte 0x03, 0x08") # DW_AT_name, DW_FORM_string + lines.append(" .byte 0, 0") + + # Abbrev 2: DW_TAG_subprogram [has children] (with frame_base) + lines.append(" .byte 2") + lines.append(" .byte 0x2e") + lines.append(" .byte 1") # DW_CHILDREN_yes + lines.append(" .byte 0x03, 0x08") # DW_AT_name + lines.append(" .byte 0x11, 0x01") # DW_AT_low_pc + lines.append(" .byte 0x12, 0x01") # DW_AT_high_pc + lines.append(" .byte 0x40, 0x0a") # DW_AT_frame_base, DW_FORM_block1 + lines.append(" .byte 0, 0") + + # Abbrev 3: DW_TAG_subprogram [no children] + lines.append(" .byte 3") + lines.append(" .byte 0x2e") + lines.append(" .byte 0") + lines.append(" .byte 0x03, 0x08") + lines.append(" .byte 0x11, 0x01") + lines.append(" .byte 0x12, 0x01") + lines.append(" .byte 0, 0") + + # Abbrev 4: DW_TAG_formal_parameter [no children] (with location) + lines.append(" .byte 4") + lines.append(" .byte 0x05") + lines.append(" .byte 0") + lines.append(" .byte 0x03, 0x08") # DW_AT_name + lines.append(" .byte 0x49, 0x13") # DW_AT_type, DW_FORM_ref4 + lines.append(" .byte 0x02, 0x0a") # DW_AT_location, DW_FORM_block1 + lines.append(" .byte 0, 0") + + # Abbrev 5: DW_TAG_variable [no children] (with location) + lines.append(" .byte 5") + lines.append(" .byte 0x34") + lines.append(" .byte 0") + lines.append(" .byte 0x03, 0x08") + lines.append(" .byte 0x49, 0x13") + lines.append(" .byte 0x02, 0x0a") + lines.append(" .byte 0, 0") + + # Abbrev 6: DW_TAG_base_type [no children] + lines.append(" .byte 6") + lines.append(" .byte 0x24") + lines.append(" .byte 0") + lines.append(" .byte 0x03, 0x08") # DW_AT_name + lines.append(" .byte 0x0b, 0x0b") # DW_AT_byte_size, DW_FORM_data1 + lines.append(" .byte 0x3e, 0x0b") # DW_AT_encoding, DW_FORM_data1 + lines.append(" .byte 0, 0") + + # Abbrev 7: DW_TAG_pointer_type [no children] + lines.append(" .byte 7") + lines.append(" .byte 0x0f") + lines.append(" .byte 0") + lines.append(" .byte 0x0b, 0x0b") # DW_AT_byte_size + lines.append(" .byte 0x49, 0x13") # DW_AT_type, DW_FORM_ref4 + lines.append(" .byte 0, 0") + + # Abbrev 8: DW_TAG_formal_parameter [no children] (no location) + lines.append(" .byte 8") + lines.append(" .byte 0x05") + lines.append(" .byte 0") + lines.append(" .byte 0x03, 0x08") + lines.append(" .byte 0x49, 0x13") + lines.append(" .byte 0, 0") + + # Abbrev 9: DW_TAG_variable [no children] (no location) + lines.append(" .byte 9") + lines.append(" .byte 0x34") + lines.append(" .byte 0") + lines.append(" .byte 0x03, 0x08") + lines.append(" .byte 0x49, 0x13") + lines.append(" .byte 0, 0") + + lines.append(" .byte 0") # end abbrev table + lines.append("") + + # --- Compute address range --- + all_addrs = set() + for pc, _, _ in line_entries: + all_addrs.add(text_base + pc) + for lp, hp, _, _ in all_functions: + all_addrs.add(text_base + lp) + all_addrs.add(text_base + hp) + + if all_addrs: + min_addr = min(all_addrs) + max_addr = max(all_addrs) + else: + min_addr = text_base + max_addr = text_base + + # --- Collect used fundamental types --- + used_ft = set() + for _, _, _, children in all_functions: + for kind, name, ft, loc in children: + if ft is not None: + used_ft.add(FT_CANONICAL.get(ft, ft)) + used_ft.add(0x0D) # void* fallback + + # --- .debug_info --- + lines.append(' .section .debug_info,"",@progbits') + lines.append(".Lcu_header:") + lines.append(" .4byte .Lcu_end - .Lcu_start") + lines.append(".Lcu_start:") + lines.append(" .2byte 2") + lines.append(" .4byte .Labbrev_start") + lines.append(" .byte 4") + lines.append("") + + # CU DIE (abbrev 1) + lines.append(" .byte 1") + lines.append(" .4byte 0 /* DW_AT_stmt_list = offset 0 in .debug_line */") + lines.append(" .4byte 0x%08x /* DW_AT_low_pc */" % min_addr) + lines.append(" .4byte 0x%08x /* DW_AT_high_pc */" % max_addr) + lines.append(' .asciz "debug"') + lines.append("") + + # Base type DIEs + ft_labels = {} + for ft_code in sorted(used_ft): + info = FT_INFO.get(ft_code) + if info is None: + continue + ft_name, ft_size, ft_encoding = info + label = ".Ltype_%02x" % ft_code + ft_labels[ft_code] = label + lines.append("%s:" % label) + lines.append(" .byte 6") + lines.append(' .asciz "%s"' % ft_name) + lines.append(" .byte %d" % ft_size) + lines.append(" .byte %d" % ft_encoding) + lines.append("") + + default_type_label = ft_labels.get(0x0D, ".Ltype_0d") + + # Subprogram + variable DIEs + func_count = 0 + var_count = 0 + for global_lp, global_hp, func_name, children in all_functions: + abs_lp = text_base + global_lp + abs_hp = text_base + global_hp + has_children = len(children) > 0 + + if has_children: + lines.append(" .byte 2") + lines.append(' .asciz "%s"' % func_name) + lines.append(" .4byte 0x%08x" % abs_lp) + lines.append(" .4byte 0x%08x" % abs_hp) + lines.append(" .byte 1") # frame_base block length + lines.append(" .byte 0x51") # DW_OP_reg1 (r1) + + for kind, var_name, ft, dw2_loc in children: + type_label = default_type_label + if ft is not None: + canon = FT_CANONICAL.get(ft, ft) + if canon in ft_labels: + type_label = ft_labels[canon] + + if dw2_loc is not None: + abbrev_code = 4 if kind == "param" else 5 + lines.append(" .byte %d" % abbrev_code) + lines.append(' .asciz "%s"' % var_name) + lines.append(" .4byte %s - .Lcu_header" % type_label) + loc_bytes = ", ".join("0x%02x" % b for b in dw2_loc) + lines.append(" .byte %d" % len(dw2_loc)) + lines.append(" .byte %s" % loc_bytes) + else: + abbrev_code = 8 if kind == "param" else 9 + lines.append(" .byte %d" % abbrev_code) + lines.append(' .asciz "%s"' % var_name) + lines.append(" .4byte %s - .Lcu_header" % type_label) + var_count += 1 + + lines.append(" .byte 0 /* end children */") + else: + lines.append(" .byte 3") + lines.append(' .asciz "%s"' % func_name) + lines.append(" .4byte 0x%08x" % abs_lp) + lines.append(" .4byte 0x%08x" % abs_hp) + + func_count += 1 + + lines.append(" .byte 0 /* end CU children */") + lines.append(".Lcu_end:") + lines.append("") + + # --- .debug_line (manually generated) --- + sorted_files = sorted(file_table.items(), key=lambda x: x[1]) + + lines.append(' .section .debug_line,"",@progbits') + lines.append(".Ldl_unit_start:") + lines.append(" .4byte .Ldl_unit_end - .Ldl_after_length") + lines.append(".Ldl_after_length:") + lines.append(" .2byte 2 /* DWARF version */") + lines.append(" .4byte .Ldl_program - .Ldl_after_header_length") + lines.append(".Ldl_after_header_length:") + lines.append(" .byte 4 /* minimum_instruction_length */") + lines.append(" .byte 1 /* default_is_stmt */") + lines.append(" .byte 0 /* line_base (signed) */") + lines.append(" .byte 1 /* line_range */") + lines.append(" .byte 10 /* opcode_base */") + # standard_opcode_lengths for opcodes 1-9 + lines.append(" .byte 0, 1, 1, 1, 1, 0, 0, 0, 1") + # include_directories — empty + lines.append(" .byte 0") + # file_names + for src_path, idx in sorted_files: + lines.append(' .asciz "%s"' % src_path) + lines.append(" .byte 0, 0, 0 /* dir=0, time=0, size=0 */") + lines.append(" .byte 0 /* end file names */") + + # Line number program + lines.append(".Ldl_program:") + + if line_entries: + # Dedup and sort by address + deduped = [] + prev_pc = -1 + for global_pc, file_idx, line_no in line_entries: + abs_pc = text_base + global_pc + if abs_pc <= prev_pc: + continue + deduped.append((abs_pc, file_idx, line_no)) + prev_pc = abs_pc + + cur_file = 1 + cur_line = 1 + cur_addr = 0 + + for i, (abs_pc, file_idx, line_no) in enumerate(deduped): + # Set file if changed + if file_idx != cur_file: + lines.append(" .byte 4 /* DW_LNS_set_file */") + lines.append(" .byte %s" % format_uleb128(file_idx)) + cur_file = file_idx + + # Set address — use DW_LNE_set_address for first entry or when + # gap is large; otherwise use DW_LNS_advance_pc + if i == 0 or (abs_pc - cur_addr) > 0xFFFF: + # DW_LNE_set_address + lines.append(" .byte 0") + lines.append(" .byte %s /* length: 1+4 */" % format_uleb128(5)) + lines.append(" .byte 2 /* DW_LNE_set_address */") + lines.append(" .4byte 0x%08x" % abs_pc) + else: + delta = abs_pc - cur_addr + if delta > 0: + lines.append(" .byte 2 /* DW_LNS_advance_pc */") + lines.append(" .byte %s /* advance %d instrs */" % ( + format_uleb128(delta // 4), delta // 4)) + cur_addr = abs_pc + + # Advance line + line_delta = line_no - cur_line + if line_delta != 0: + lines.append(" .byte 3 /* DW_LNS_advance_line */") + lines.append(" .byte %s" % format_sleb128(line_delta)) + cur_line = line_no + + # Copy (emit row) + lines.append(" .byte 1 /* DW_LNS_copy */") + + # End sequence + lines.append(" .byte 0") + lines.append(" .byte 1") + lines.append(" .byte 1 /* DW_LNE_end_sequence */") + + lines.append(".Ldl_unit_end:") + lines.append("") + + with open(out_s, "w") as f: + f.write("\n".join(lines) + "\n") + + return func_count, var_count, len(line_entries) + + +# --------------------------------------------------------------------------- +# Processing pipeline +# --------------------------------------------------------------------------- + +def process_object_varinfo(o_path, map_entries, remap_offsets=None, + remap_deltas=None): + """Process a single .o for variable info. + + Returns list of (global_lp, global_hp, name, children). + """ + dies = parse_dwarf1_dies(o_path) + if not dies: + return [] + + _, functions = extract_varinfo(dies) + if not functions or not map_entries: + return [] + + map_base = map_entries[0][0] + result = [] + for func in functions: + global_lp = remap_pc(func["low_pc"], remap_offsets, remap_deltas, + map_base) + # Compute high_pc from function size to avoid remap boundary issues + # (high_pc may fall exactly on the next function's start offset, + # which would pick the wrong delta in remap_pc) + func_size = func["high_pc"] - func["low_pc"] + global_hp = global_lp + func_size + converted = [] + for kind, name, ft, loc in func["children"]: + dw2_loc = convert_location(loc) if isinstance(loc, bytes) else None + converted.append((kind, name, ft, dw2_loc)) + result.append((global_lp, global_hp, func["name"], converted)) + return result + + +def generate_combined_obj(map_path, o_index, out_s, out_o, build_dir, + text_base, label=""): + """Generate a combined debug_info.o from MAP file and .o index. + + Returns (n_funcs, n_vars, n_lines, n_skipped) or None. + """ + obj_offsets, obj_func_map = parse_map_file(map_path) + if not obj_offsets: + return None + + file_table = {} # source_path -> file_index (1-based) + all_line_entries = [] # [(global_pc, file_idx, line_no)] + all_functions = [] # [(global_lp, global_hp, name, children)] + skipped = 0 + processed = 0 + + for obj_basename, map_entries in obj_offsets.items(): + if obj_basename not in o_index: + skipped += 1 + continue + + o_path = o_index[obj_basename] + + # Build per-function remap table for this .o + map_funcs = obj_func_map.get(obj_basename, []) + remap_offsets, remap_deltas = build_remap_table(o_path, map_funcs) + fallback_offset = map_entries[0][0] + + # --- Line info --- + source_name, line_subsections = parse_object_lines(o_path) + if source_name and line_subsections: + o_rel_norm = os.path.relpath(o_path, build_dir) + parts = o_rel_norm.split(os.sep) + src_dir = os.path.join(*parts[:-1]) if len(parts) >= 2 else "." + source_path = os.path.join(src_dir, source_name) + + if source_path not in file_table: + file_table[source_path] = len(file_table) + 1 + file_idx = file_table[source_path] + + # Process ALL subsections — remap handles function reordering + for sub_entries in line_subsections: + for line_no, pc_addr in sub_entries: + global_pc = remap_pc(pc_addr, remap_offsets, + remap_deltas, fallback_offset) + all_line_entries.append((global_pc, file_idx, line_no)) + + # --- Variable info --- + funcs = process_object_varinfo(o_path, map_entries, remap_offsets, + remap_deltas) + if funcs: + all_functions.extend(funcs) + + processed += 1 + + if not all_line_entries and not all_functions: + return None + + # Sort and deduplicate + all_line_entries.sort(key=lambda e: e[0]) + all_functions.sort(key=lambda f: f[0]) + + # Deduplicate functions with the same low_pc (e.g., template/inline + # instantiations compiled into multiple .o files but linked once). + # Keep the version with more children (more complete debug info). + if all_functions: + deduped = [all_functions[0]] + for f in all_functions[1:]: + if f[0] == deduped[-1][0]: # same low_pc + # Keep the one with more children + if len(f[3]) > len(deduped[-1][3]): + deduped[-1] = f + else: + deduped.append(f) + all_functions = deduped + + result = generate_combined_asm( + all_line_entries, all_functions, file_table, text_base, out_s) + if not result: + return None + + func_count, var_count, line_count = result + + # Assemble + as_cmd = ["powerpc-eabi-as", "-o", out_o, out_s] + res = subprocess.run(as_cmd, capture_output=True, text=True) + if res.returncode != 0: + print(" Assembly failed for %s: %s" % (label or out_o, res.stderr.strip())) + return None + + return (func_count, var_count, line_count, skipped) + + +def main(): + if len(sys.argv) < 2: + print("Usage: %s " % sys.argv[0]) + sys.exit(1) + + build_dir = os.path.abspath(sys.argv[1]) + + # --- DOL --- + dol_map = os.path.join(build_dir, "framework.elf.MAP") + elf_path = os.path.join(build_dir, "framework.elf") + dol_s = os.path.join(build_dir, "debug_info.s") + dol_o = os.path.join(build_dir, "debug_info.o") + + if not os.path.exists(dol_map): + print("Error: MAP file not found: %s" % dol_map) + sys.exit(1) + if not os.path.exists(elf_path): + print("Error: ELF not found: %s" % elf_path) + sys.exit(1) + + text_base = get_text_base(elf_path) + if text_base is None: + print("Error: could not read .text base from %s" % elf_path) + sys.exit(1) + + print("DOL .text base: 0x%08X" % text_base) + o_index = build_o_index([build_dir]) + + result = generate_combined_obj(dol_map, o_index, dol_s, dol_o, build_dir, + text_base, "DOL") + if result: + func_count, var_count, line_count, skip = result + print("DOL: %d functions, %d params/vars, %d line entries (%d skipped)" % + (func_count, var_count, line_count, skip)) + else: + print("DOL: no debug info found") + + # --- RELs --- + rel_count = 0 + rel_skipped = 0 + + for entry in sorted(os.listdir(build_dir)): + module_dir = os.path.join(build_dir, entry) + if not os.path.isdir(module_dir): + continue + + plf_map = os.path.join(module_dir, "%s.plf.MAP" % entry) + plf_path = os.path.join(module_dir, "%s.plf" % entry) + if not os.path.exists(plf_map): + continue + + rel_text_base = get_text_base(plf_path) if os.path.exists(plf_path) else 0 + if rel_text_base is None: + rel_text_base = 0 + + rel_s = os.path.join(module_dir, "debug_info.s") + rel_o = os.path.join(module_dir, "debug_info.o") + + rel_o_index = build_o_index([ + os.path.join(build_dir, "src"), + os.path.join(module_dir, "obj"), + ]) + + result = generate_combined_obj(plf_map, rel_o_index, rel_s, rel_o, + build_dir, rel_text_base, entry) + if result: + rel_count += 1 + else: + rel_skipped += 1 + for p in (rel_s, rel_o): + if os.path.exists(p): + os.remove(p) + + print("RELs: %d with debug info, %d without" % (rel_count, rel_skipped)) + + +if __name__ == "__main__": + main() diff --git a/tools/gen_dwarf2_varinfo.py b/tools/gen_dwarf2_varinfo.py new file mode 100644 index 00000000000..7d51b093eba --- /dev/null +++ b/tools/gen_dwarf2_varinfo.py @@ -0,0 +1,992 @@ +#!/usr/bin/env python3 +"""Convert DWARF 1 variable/type info from .o files into DWARF 2. + +mwcceppc emits DWARF 1.1 (.debug sections) which newer version of GDB cannot read. +This script parses the DWARF 1 debug info from each .o, extracts function +boundaries, parameters, local variables, and basic type information, then +generates DWARF 2 .debug_abbrev/.debug_info sections as gas assembly. + +Works alongside gen_dwarf2_debug.py (which handles line tables) to provide +full source-level debugging with `info locals`, `info args`, `print var`. + +Usage: + python3 tools/gen_dwarf2_varinfo.py + # e.g. python3 tools/gen_dwarf2_varinfo.py build/GZ2E01 +""" + +import os +import re +import struct +import subprocess +import sys + + +# --------------------------------------------------------------------------- +# DWARF 1 constants (TIS DWARF 1 spec — used by MetroWerks) +# --------------------------------------------------------------------------- + +# Tags +DW1_TAG_PADDING = 0x0000 +DW1_TAG_ARRAY_TYPE = 0x0001 +DW1_TAG_CLASS_TYPE = 0x0002 +DW1_TAG_ENTRY_POINT = 0x0003 +DW1_TAG_ENUM_TYPE = 0x0004 +DW1_TAG_FORMAL_PARAM = 0x0005 +DW1_TAG_GLOBAL_SUBR = 0x0006 +DW1_TAG_GLOBAL_VAR = 0x0007 +DW1_TAG_LOCAL_VAR = 0x000C +DW1_TAG_MEMBER = 0x000D +DW1_TAG_POINTER_TYPE = 0x000F +DW1_TAG_COMPILE_UNIT = 0x0011 +DW1_TAG_STRUCT_TYPE = 0x0013 +DW1_TAG_SUBROUTINE = 0x0014 +DW1_TAG_SUBROUTINE_TYPE = 0x0015 +DW1_TAG_TYPEDEF = 0x0016 +DW1_TAG_UNION_TYPE = 0x0017 + +# Attributes (base values — form is OR'd into low nibble) +DW1_AT_SIBLING = 0x0010 +DW1_AT_LOCATION = 0x0020 +DW1_AT_NAME = 0x0030 +DW1_AT_FUND_TYPE = 0x0050 +DW1_AT_MOD_FUND_TYPE = 0x0060 +DW1_AT_MOD_U_D_TYPE = 0x0070 +DW1_AT_BYTE_SIZE = 0x00A0 +DW1_AT_STMT_LIST = 0x0100 +DW1_AT_LOW_PC = 0x0110 +DW1_AT_HIGH_PC = 0x0120 +DW1_AT_LANGUAGE = 0x0130 +DW1_AT_MEMBER = 0x0140 +DW1_AT_PRODUCER = 0x0250 +DW1_AT_MW_MANGLED = 0x2000 + +# Location ops +DW1_OP_REG = 0x01 +DW1_OP_BASEREG = 0x02 +DW1_OP_ADDR = 0x03 +DW1_OP_CONST = 0x04 +DW1_OP_ADD = 0x07 + +# Form sizes +FORM_SIZES = {0x1: 4, 0x2: 4, 0x5: 2, 0x6: 4, 0x7: 8} + +# Fundamental types: ft_code -> (name, byte_size, DW_ATE_encoding) +FT_INFO = { + 0x01: ("char", 1, 0x06), # DW_ATE_signed_char + 0x02: ("signed char", 1, 0x06), + 0x03: ("unsigned char", 1, 0x08), # DW_ATE_unsigned_char + 0x04: ("short", 2, 0x05), # DW_ATE_signed + 0x05: ("signed short", 2, 0x05), + 0x06: ("unsigned short", 2, 0x07), # DW_ATE_unsigned + 0x07: ("int", 4, 0x05), + 0x08: ("signed int", 4, 0x05), + 0x09: ("unsigned int", 4, 0x07), + 0x0A: ("long", 4, 0x05), + 0x0B: ("signed long", 4, 0x05), + 0x0C: ("unsigned long", 4, 0x07), + 0x0D: ("void *", 4, 0x01), # DW_ATE_address + 0x0E: ("float", 4, 0x04), # DW_ATE_float + 0x0F: ("double", 8, 0x04), + 0x14: ("void", 0, 0x00), + 0x15: ("bool", 1, 0x02), # DW_ATE_boolean +} + +# Canonical fund_type for dedup (e.g., int == signed int) +FT_CANONICAL = { + 0x02: 0x01, # signed char -> char + 0x05: 0x04, # signed short -> short + 0x08: 0x07, # signed int -> int + 0x0B: 0x0A, # signed long -> long +} + + +# --------------------------------------------------------------------------- +# ELF parsing (reused from gen_dwarf2_debug.py) +# --------------------------------------------------------------------------- + +def read_elf_sections(path): + """Parse ELF section headers, return {name: (offset, size, addr)}.""" + sections = {} + with open(path, "rb") as f: + magic = f.read(4) + if magic != b"\x7fELF": + return sections + f.seek(0) + ehdr = f.read(52) + e_shoff = struct.unpack(">I", ehdr[32:36])[0] + e_shentsize = struct.unpack(">H", ehdr[46:48])[0] + e_shnum = struct.unpack(">H", ehdr[48:50])[0] + e_shstrndx = struct.unpack(">H", ehdr[50:52])[0] + + f.seek(e_shoff + e_shstrndx * e_shentsize) + shdr = f.read(e_shentsize) + strtab_off = struct.unpack(">I", shdr[16:20])[0] + strtab_sz = struct.unpack(">I", shdr[20:24])[0] + f.seek(strtab_off) + strtab = f.read(strtab_sz) + + for i in range(e_shnum): + f.seek(e_shoff + i * e_shentsize) + shdr = f.read(e_shentsize) + name_idx = struct.unpack(">I", shdr[0:4])[0] + end = strtab.index(b"\x00", name_idx) + name = strtab[name_idx:end].decode("ascii", errors="replace") + sh_addr = struct.unpack(">I", shdr[12:16])[0] + sh_off = struct.unpack(">I", shdr[16:20])[0] + sh_size = struct.unpack(">I", shdr[20:24])[0] + if name and name not in sections: + sections[name] = (sh_off, sh_size, sh_addr) + return sections + + +def read_elf_sections_detailed(path): + """Parse ELF returning (section_list, section_dict). + + section_list: [(name, sh_type, sh_off, sh_size, sh_link, sh_addr), ...] + section_dict: {name: (sh_off, sh_size, sh_addr)} + """ + sec_list = [] + sec_dict = {} + with open(path, "rb") as f: + magic = f.read(4) + if magic != b"\x7fELF": + return sec_list, sec_dict + f.seek(0) + ehdr = f.read(52) + e_shoff = struct.unpack(">I", ehdr[32:36])[0] + e_shentsize = struct.unpack(">H", ehdr[46:48])[0] + e_shnum = struct.unpack(">H", ehdr[48:50])[0] + e_shstrndx = struct.unpack(">H", ehdr[50:52])[0] + + f.seek(e_shoff + e_shstrndx * e_shentsize) + shdr = f.read(e_shentsize) + strtab_off = struct.unpack(">I", shdr[16:20])[0] + strtab_sz = struct.unpack(">I", shdr[20:24])[0] + f.seek(strtab_off) + strtab = f.read(strtab_sz) + + for i in range(e_shnum): + f.seek(e_shoff + i * e_shentsize) + shdr = f.read(e_shentsize) + name_idx = struct.unpack(">I", shdr[0:4])[0] + end = strtab.index(b"\x00", name_idx) + name = strtab[name_idx:end].decode("ascii", errors="replace") + sh_type = struct.unpack(">I", shdr[4:8])[0] + sh_addr = struct.unpack(">I", shdr[12:16])[0] + sh_off = struct.unpack(">I", shdr[16:20])[0] + sh_size = struct.unpack(">I", shdr[20:24])[0] + sh_link = struct.unpack(">I", shdr[24:28])[0] + sec_list.append((name, sh_type, sh_off, sh_size, sh_link, sh_addr)) + if name and name not in sec_dict: + sec_dict[name] = (sh_off, sh_size, sh_addr) + return sec_list, sec_dict + + +def get_text_base(elf_path): + """Get the .text section virtual address from an ELF.""" + sections = read_elf_sections(elf_path) + if ".text" in sections: + return sections[".text"][2] + return None + + +# --------------------------------------------------------------------------- +# MAP file parsing (reused from gen_dwarf2_debug.py) +# --------------------------------------------------------------------------- + +def parse_map_file(map_path): + """Parse MAP file .text section layout. + + Returns {obj_basename: [(starting_address, size), ...]} + """ + obj_offsets = {} + in_text_layout = False + past_header = False + + with open(map_path) as f: + for line in f: + line = line.rstrip() + if ".text section layout" in line: + in_text_layout = True + past_header = False + continue + if in_text_layout: + if line.strip().startswith("---"): + past_header = True + continue + if not past_header: + continue + if not line.strip(): + continue + if line.strip() and not line.startswith(" "): + in_text_layout = False + continue + + m = re.match( + r"\s+([0-9a-fA-F]+)\s+([0-9a-fA-F]+)\s+[0-9a-fA-F]+\s+[0-9a-fA-F]+\s+" + r"(\d+)\s+(\S+)\s+(\S+)", + line, + ) + if m: + start_addr = int(m.group(1), 16) + size = int(m.group(2), 16) + alignment = int(m.group(3)) + section_name = m.group(4) + obj_name = m.group(5) + if alignment == 1 and section_name == ".text" and size > 0: + obj_offsets.setdefault(obj_name, []).append( + (start_addr, size) + ) + return obj_offsets + + +def build_o_index(search_dirs): + """Build {basename: path} index of .o files.""" + o_by_basename = {} + for search_dir in search_dirs: + if not os.path.isdir(search_dir): + continue + for dirpath, _, filenames in os.walk(search_dir): + for fn in filenames: + if fn.endswith(".o") and fn not in ("debug_info.o", "debug_varinfo.o"): + full = os.path.join(dirpath, fn) + if fn not in o_by_basename or "/src/" in full: + o_by_basename[fn] = full + return o_by_basename + + +# --------------------------------------------------------------------------- +# DWARF 1 parsing — variable/type info +# --------------------------------------------------------------------------- + +def parse_dwarf1_dies(o_path): + """Parse DWARF 1 .debug section from a .o file. + + Returns list of DIEs: [(offset, tag, attrs_dict, sibling_offset), ...] + where attrs_dict maps AT_xxx constant -> value. + + Resolves .rela.debug relocations for addresses and sibling references. + """ + sec_list, sec_dict = read_elf_sections_detailed(o_path) + if ".debug" not in sec_dict or ".rela.debug" not in sec_dict: + return [] + + with open(o_path, "rb") as f: + # Read .debug + doff, dsz, _ = sec_dict[".debug"] + f.seek(doff) + debug_data = f.read(dsz) + + # Read .rela.debug + roff, rsz, _ = sec_dict[".rela.debug"] + f.seek(roff) + rela_data = f.read(rsz) + + # Read .symtab + if ".symtab" not in sec_dict: + return [] + soff, ssz, _ = sec_dict[".symtab"] + f.seek(soff) + symtab_data = f.read(ssz) + + # Find .symtab's string table link + symtab_link = None + for name, sh_type, sh_off, sh_size, sh_link, sh_addr in sec_list: + if name == ".symtab": + symtab_link = sh_link + break + if symtab_link is None: + return [] + + strtab_name = sec_list[symtab_link][0] + st_off, st_sz, _ = sec_dict[strtab_name] + f.seek(st_off) + sym_strtab = f.read(st_sz) + + # Build symbol table: [(name, value, shndx), ...] + n_syms = ssz // 16 + symbols = [] + for i in range(n_syms): + st_name_off = struct.unpack(">I", symtab_data[i*16:i*16+4])[0] + st_value = struct.unpack(">I", symtab_data[i*16+4:i*16+8])[0] + st_shndx = struct.unpack(">H", symtab_data[i*16+14:i*16+16])[0] + end_idx = sym_strtab.index(b"\x00", st_name_off) + sym_name = sym_strtab[st_name_off:end_idx].decode("ascii", errors="replace") + symbols.append((sym_name, st_value, st_shndx)) + + # Find .debug and .text section indices + debug_shndx = None + text_shndx = None + for i, (name, sh_type, sh_off, sh_size, sh_link, sh_addr) in enumerate(sec_list): + if name == ".debug": + debug_shndx = i + elif name == ".text" and text_shndx is None: + text_shndx = i + + # Build relocation map: {offset_in_debug: (section_name, addend)} + rela_map = {} + for i in range(rsz // 12): + r_off = struct.unpack(">I", rela_data[i*12:i*12+4])[0] + r_info = struct.unpack(">I", rela_data[i*12+4:i*12+8])[0] + r_addend = struct.unpack(">i", rela_data[i*12+8:i*12+12])[0] + r_sym_idx = r_info >> 8 + + if r_sym_idx >= len(symbols): + continue + + sym_name, sym_val, sym_shndx = symbols[r_sym_idx] + resolved_value = sym_val + r_addend + + if sym_shndx == text_shndx: + rela_map[r_off] = ("text", resolved_value) + elif sym_shndx == debug_shndx or (sym_name.startswith(".dwarf.")): + rela_map[r_off] = ("debug", resolved_value) + else: + # Other sections (rodata, data, etc.) — treat as address + section_name = sec_list[sym_shndx][0] if sym_shndx < len(sec_list) else "?" + rela_map[r_off] = (section_name, resolved_value) + + # Parse DIEs + dies = [] + pos = 0 + while pos < len(debug_data): + if pos + 4 > len(debug_data): + break + die_len = struct.unpack(">I", debug_data[pos:pos+4])[0] + if die_len < 6: + pos += 4 + continue + + die_start = pos + die_end = pos + die_len + pos += 4 + + tag = struct.unpack(">H", debug_data[pos:pos+2])[0] + pos += 2 + + attrs = {} + while pos < die_end: + if pos + 2 > die_end: + break + attr_word = struct.unpack(">H", debug_data[pos:pos+2])[0] + if attr_word == 0: + break + pos += 2 + + form = attr_word & 0xF + attr_base = attr_word & 0xFFF0 + value_pos = pos + + if form == 0x8: # FORM_STRING + start = pos + while pos < die_end and debug_data[pos] != 0: + pos += 1 + value = debug_data[start:pos].decode("ascii", errors="replace") + pos += 1 + elif form == 0x3: # FORM_BLOCK2 + blen = struct.unpack(">H", debug_data[pos:pos+2])[0] + pos += 2 + value = bytes(debug_data[pos:pos+blen]) + pos += blen + elif form == 0x4: # FORM_BLOCK4 + blen = struct.unpack(">I", debug_data[pos:pos+4])[0] + pos += 4 + value = bytes(debug_data[pos:pos+blen]) + pos += blen + elif form in FORM_SIZES: + sz = FORM_SIZES[form] + if sz == 2: + value = struct.unpack(">H", debug_data[pos:pos+2])[0] + elif sz == 4: + value = struct.unpack(">I", debug_data[pos:pos+4])[0] + elif sz == 8: + value = struct.unpack(">Q", debug_data[pos:pos+8])[0] + else: + value = 0 + + # Resolve relocation + if value_pos in rela_map: + section, resolved = rela_map[value_pos] + value = (section, resolved) + + pos += sz + else: + break + + attrs[attr_base] = value + + # Resolve sibling offset + sibling_offset = None + sib = attrs.get(DW1_AT_SIBLING) + if isinstance(sib, tuple) and sib[0] == "debug": + sibling_offset = sib[1] + + dies.append((die_start, tag, attrs, sibling_offset)) + pos = die_end + + return dies + + +def extract_varinfo(dies): + """Extract functions, parameters, and local variables from parsed DIEs. + + Returns (source_name, functions) where functions is: + [(name, mangled, low_pc, high_pc, [(var_kind, name, fund_type, location), ...]), ...] + + low_pc/high_pc are .text-relative offsets. + var_kind is "param" or "local". + fund_type is the fundamental type code (or None). + location is the raw DWARF 1 location block bytes (or None). + """ + source_name = None + functions = [] + current_func = None + current_func_end = None # sibling offset to determine children + + for die_start, tag, attrs, sibling_offset in dies: + if tag == DW1_TAG_COMPILE_UNIT: + source_name = attrs.get(DW1_AT_NAME) + continue + + if tag == DW1_TAG_GLOBAL_SUBR or tag == DW1_TAG_SUBROUTINE: + # Start a new function + name = attrs.get(DW1_AT_NAME, "") + mangled = attrs.get(DW1_AT_MW_MANGLED, name) + low_pc = attrs.get(DW1_AT_LOW_PC) + high_pc = attrs.get(DW1_AT_HIGH_PC) + + # Resolve text-relative addresses + lp = None + hp = None + if isinstance(low_pc, tuple) and low_pc[0] == "text": + lp = low_pc[1] + if isinstance(high_pc, tuple) and high_pc[0] == "text": + hp = high_pc[1] + + if lp is not None and hp is not None: + current_func = { + "name": name, + "mangled": mangled, + "low_pc": lp, + "high_pc": hp, + "children": [], + } + current_func_end = sibling_offset + functions.append(current_func) + else: + current_func = None + current_func_end = None + continue + + # Check if this DIE is a child of the current function + if current_func is None: + continue + if current_func_end is not None and die_start >= current_func_end: + current_func = None + current_func_end = None + continue + + if tag == DW1_TAG_FORMAL_PARAM: + name = attrs.get(DW1_AT_NAME) + if name is None: + continue + ft = attrs.get(DW1_AT_FUND_TYPE) + loc = attrs.get(DW1_AT_LOCATION) + current_func["children"].append(("param", name, ft, loc)) + + elif tag == DW1_TAG_LOCAL_VAR: + name = attrs.get(DW1_AT_NAME) + if name is None: + continue + ft = attrs.get(DW1_AT_FUND_TYPE) + loc = attrs.get(DW1_AT_LOCATION) + current_func["children"].append(("local", name, ft, loc)) + + return source_name, functions + + +# --------------------------------------------------------------------------- +# DWARF 1 → DWARF 2 location conversion +# --------------------------------------------------------------------------- + +def sleb128_bytes(value): + """Encode a signed value as SLEB128.""" + result = [] + more = True + while more: + byte = value & 0x7F + value >>= 7 + if (value == 0 and (byte & 0x40) == 0) or \ + (value == -1 and (byte & 0x40) != 0): + more = False + else: + byte |= 0x80 + result.append(byte) + return bytes(result) + + +def convert_location(loc_block): + """Convert DWARF 1 location expression to DWARF 2. + + Returns list of bytes for the DWARF 2 location expression, + or None if conversion fails. + """ + if not loc_block or len(loc_block) < 1: + return None + + op = loc_block[0] + + if op == DW1_OP_REG and len(loc_block) >= 5: + # OP_REG + u32 regnum → DW_OP_regN + regnum = struct.unpack(">I", loc_block[1:5])[0] + if regnum < 32: + return bytes([0x50 + regnum]) # DW_OP_reg0..DW_OP_reg31 + else: + # DW_OP_regx + ULEB128 + result = [0x90] + val = regnum + while True: + b = val & 0x7F + val >>= 7 + if val: + b |= 0x80 + result.append(b) + if not val: + break + return bytes(result) + + elif op == DW1_OP_BASEREG and len(loc_block) >= 5: + # OP_BASEREG + u32 regnum [+ OP_CONST + u32 offset + OP_ADD] + regnum = struct.unpack(">I", loc_block[1:5])[0] + offset = 0 + + # Check for OP_CONST + OP_ADD + if len(loc_block) >= 10 and loc_block[5] == DW1_OP_CONST: + offset = struct.unpack(">I", loc_block[6:10])[0] + # OP_ADD may follow but we don't need to check + + if regnum < 32: + # DW_OP_bregN + SLEB128 offset + return bytes([0x70 + regnum]) + sleb128_bytes(offset) + + elif op == DW1_OP_ADDR and len(loc_block) >= 5: + # OP_ADDR + u32 address → DW_OP_addr + u32 + addr = struct.unpack(">I", loc_block[1:5])[0] + return bytes([0x03]) + struct.pack(">I", addr) + + return None + + +# --------------------------------------------------------------------------- +# DWARF 2 assembly generation +# --------------------------------------------------------------------------- + +def generate_abbrev_table(): + """Generate the .debug_abbrev section as gas assembly lines.""" + lines = [] + lines.append(' .section .debug_abbrev,"",@progbits') + lines.append(".Labbrev_start:") + + # Abbrev 1: DW_TAG_compile_unit [has children] + # NOTE: No low_pc/high_pc — prevents this CU from intercepting + # address-to-line lookups that should go to the line-info CU. + lines.append(" .byte 1") # abbrev code + lines.append(" .byte 0x11") # DW_TAG_compile_unit + lines.append(" .byte 1") # DW_CHILDREN_yes + lines.append(" .byte 0x03, 0x08") # DW_AT_name, DW_FORM_string + lines.append(" .byte 0, 0") # end attrs + + # Abbrev 2: DW_TAG_subprogram [has children] (with frame_base) + lines.append(" .byte 2") + lines.append(" .byte 0x2e") # DW_TAG_subprogram + lines.append(" .byte 1") # DW_CHILDREN_yes + lines.append(" .byte 0x03, 0x08") # DW_AT_name, DW_FORM_string + lines.append(" .byte 0x11, 0x01") # DW_AT_low_pc, DW_FORM_addr + lines.append(" .byte 0x12, 0x01") # DW_AT_high_pc, DW_FORM_addr + lines.append(" .byte 0x40, 0x0a") # DW_AT_frame_base, DW_FORM_block1 + lines.append(" .byte 0, 0") + + # Abbrev 3: DW_TAG_subprogram [no children] + lines.append(" .byte 3") + lines.append(" .byte 0x2e") + lines.append(" .byte 0") # DW_CHILDREN_no + lines.append(" .byte 0x03, 0x08") # DW_AT_name, DW_FORM_string + lines.append(" .byte 0x11, 0x01") # DW_AT_low_pc, DW_FORM_addr + lines.append(" .byte 0x12, 0x01") # DW_AT_high_pc, DW_FORM_addr + lines.append(" .byte 0, 0") + + # Abbrev 4: DW_TAG_formal_parameter [no children] + lines.append(" .byte 4") + lines.append(" .byte 0x05") # DW_TAG_formal_parameter + lines.append(" .byte 0") + lines.append(" .byte 0x03, 0x08") # DW_AT_name, DW_FORM_string + lines.append(" .byte 0x49, 0x13") # DW_AT_type, DW_FORM_ref4 + lines.append(" .byte 0x02, 0x0a") # DW_AT_location, DW_FORM_block1 + lines.append(" .byte 0, 0") + + # Abbrev 5: DW_TAG_variable [no children] + lines.append(" .byte 5") + lines.append(" .byte 0x34") # DW_TAG_variable + lines.append(" .byte 0") + lines.append(" .byte 0x03, 0x08") # DW_AT_name, DW_FORM_string + lines.append(" .byte 0x49, 0x13") # DW_AT_type, DW_FORM_ref4 + lines.append(" .byte 0x02, 0x0a") # DW_AT_location, DW_FORM_block1 + lines.append(" .byte 0, 0") + + # Abbrev 6: DW_TAG_base_type [no children] + lines.append(" .byte 6") + lines.append(" .byte 0x24") # DW_TAG_base_type + lines.append(" .byte 0") + lines.append(" .byte 0x03, 0x08") # DW_AT_name, DW_FORM_string + lines.append(" .byte 0x0b, 0x0b") # DW_AT_byte_size, DW_FORM_data1 + lines.append(" .byte 0x3e, 0x0b") # DW_AT_encoding, DW_FORM_data1 + lines.append(" .byte 0, 0") + + # Abbrev 7: DW_TAG_pointer_type [no children] + lines.append(" .byte 7") + lines.append(" .byte 0x0f") # DW_TAG_pointer_type + lines.append(" .byte 0") + lines.append(" .byte 0x0b, 0x0b") # DW_AT_byte_size, DW_FORM_data1 + lines.append(" .byte 0x49, 0x13") # DW_AT_type, DW_FORM_ref4 + lines.append(" .byte 0, 0") + + # Abbrev 8: DW_TAG_formal_parameter [no children] (no location) + lines.append(" .byte 8") + lines.append(" .byte 0x05") # DW_TAG_formal_parameter + lines.append(" .byte 0") + lines.append(" .byte 0x03, 0x08") # DW_AT_name, DW_FORM_string + lines.append(" .byte 0x49, 0x13") # DW_AT_type, DW_FORM_ref4 + lines.append(" .byte 0, 0") + + # Abbrev 9: DW_TAG_variable [no children] (no location) + lines.append(" .byte 9") + lines.append(" .byte 0x34") # DW_TAG_variable + lines.append(" .byte 0") + lines.append(" .byte 0x03, 0x08") # DW_AT_name, DW_FORM_string + lines.append(" .byte 0x49, 0x13") # DW_AT_type, DW_FORM_ref4 + lines.append(" .byte 0, 0") + + lines.append(" .byte 0") # end of abbreviation table + return lines + + +def generate_varinfo_asm(all_functions, text_base, out_s): + """Generate DWARF 2 assembly for functions, params, and local variables. + + all_functions: list of (global_low_pc, global_high_pc, name, children) + where children: [(var_kind, name, fund_type, dw2_location), ...] + text_base: .text section virtual address + """ + if not all_functions: + return False + + # Collect used fundamental types + used_ft = set() + for _, _, _, children in all_functions: + for kind, name, ft, loc in children: + if ft is not None: + canon = FT_CANONICAL.get(ft, ft) + used_ft.add(canon) + # Always include void* as fallback + used_ft.add(0x0D) # void* + + # Sort functions by address + all_functions.sort(key=lambda f: f[0]) + + lines = [] + lines.append("# Auto-generated DWARF 2 variable info — do not edit") + lines.append("") + + # Abbreviation table + lines.extend(generate_abbrev_table()) + lines.append("") + + # Debug info section + lines.append(' .section .debug_info,"",@progbits') + lines.append(".Lcu_header:") + lines.append(" .4byte .Lcu_end - .Lcu_start /* CU length */") + lines.append(".Lcu_start:") + lines.append(" .2byte 2 /* DWARF version */") + lines.append(" .4byte .Labbrev_start /* abbrev offset */") + lines.append(" .byte 4 /* address size */") + lines.append("") + + # Compile unit DIE (abbrev 1) — no address range to avoid + # intercepting line lookups from the separate line-info .o file + lines.append(" /* DW_TAG_compile_unit */") + lines.append(" .byte 1") + lines.append(' .asciz "varinfo"') + lines.append("") + + # Emit base type DIEs + ft_labels = {} # ft_code -> label name + for ft_code in sorted(used_ft): + info = FT_INFO.get(ft_code) + if info is None: + continue + ft_name, ft_size, ft_encoding = info + label = ".Ltype_%02x" % ft_code + ft_labels[ft_code] = label + + lines.append(" /* DW_TAG_base_type: %s */" % ft_name) + lines.append("%s:" % label) + lines.append(" .byte 6") + lines.append(' .asciz "%s"' % ft_name) + lines.append(" .byte %d /* byte_size */" % ft_size) + lines.append(" .byte %d /* encoding */" % ft_encoding) + lines.append("") + + # Default type label (void* for unknown types) + default_type_label = ft_labels.get(0x0D, ".Ltype_0d") + + # Emit function DIEs + func_count = 0 + var_count = 0 + + for global_lp, global_hp, func_name, children in all_functions: + has_children = len(children) > 0 + abs_lp = text_base + global_lp + abs_hp = text_base + global_hp + + if has_children: + lines.append(" /* DW_TAG_subprogram: %s */" % func_name) + lines.append(" .byte 2 /* abbrev 2: subprogram with children */") + lines.append(' .asciz "%s"' % func_name) + lines.append(" .4byte 0x%08x /* low_pc */" % abs_lp) + lines.append(" .4byte 0x%08x /* high_pc */" % abs_hp) + # frame_base = DW_OP_reg1 (r1 = stack pointer) + lines.append(" .byte 1 /* frame_base block length */") + lines.append(" .byte 0x51 /* DW_OP_reg1 */") + + for kind, var_name, ft, dw2_loc in children: + # Determine type label + type_label = default_type_label + if ft is not None: + canon = FT_CANONICAL.get(ft, ft) + if canon in ft_labels: + type_label = ft_labels[canon] + + if dw2_loc is not None: + # Abbrev 4 (param) or 5 (variable) — with location + abbrev_code = 4 if kind == "param" else 5 + lines.append(" .byte %d /* %s: %s */" % ( + abbrev_code, kind, var_name)) + lines.append(' .asciz "%s"' % var_name) + lines.append(" .4byte %s - .Lcu_header /* type ref */" % + type_label) + # Location block + loc_bytes = ", ".join("0x%02x" % b for b in dw2_loc) + lines.append(" .byte %d /* location block length */" % + len(dw2_loc)) + lines.append(" .byte %s" % loc_bytes) + else: + # Abbrev 8 (param) or 9 (variable) — no location + abbrev_code = 8 if kind == "param" else 9 + lines.append(" .byte %d /* %s: %s (no loc) */" % ( + abbrev_code, kind, var_name)) + lines.append(' .asciz "%s"' % var_name) + lines.append(" .4byte %s - .Lcu_header /* type ref */" % + type_label) + + var_count += 1 + + # End children + lines.append(" .byte 0 /* end children */") + else: + # No children — use abbrev 3 + lines.append(" /* DW_TAG_subprogram: %s */" % func_name) + lines.append(" .byte 3 /* abbrev 3: subprogram no children */") + lines.append(' .asciz "%s"' % func_name) + lines.append(" .4byte 0x%08x /* low_pc */" % abs_lp) + lines.append(" .4byte 0x%08x /* high_pc */" % abs_hp) + + lines.append("") + func_count += 1 + + # End CU children + lines.append(" .byte 0 /* end CU children */") + lines.append(".Lcu_end:") + + with open(out_s, "w") as f: + f.write("\n".join(lines) + "\n") + + return func_count, var_count + + +def assemble(out_s, out_o, label=""): + """Assemble a .s file to .o using powerpc-eabi-as.""" + as_cmd = ["powerpc-eabi-as", "-o", out_o, out_s] + result = subprocess.run(as_cmd, capture_output=True, text=True) + if result.returncode != 0: + print(" Assembly failed for %s: %s" % (label or out_o, + result.stderr.strip())) + return False + return True + + +# --------------------------------------------------------------------------- +# Main processing pipeline +# --------------------------------------------------------------------------- + +def process_object(o_path, map_entries_for_obj): + """Process a single .o file, return list of (global_lp, global_hp, name, children). + + map_entries_for_obj: [(map_start_addr, map_size), ...] from MAP file. + """ + dies = parse_dwarf1_dies(o_path) + if not dies: + return [] + + source_name, functions = extract_varinfo(dies) + if not functions: + return [] + + result = [] + + # Match functions to MAP entries by .text offset + # MW objects have a single .text section, so all functions use map_entries[0] + if not map_entries_for_obj: + return [] + + map_base = map_entries_for_obj[0][0] # first .text entry's starting address + + for func in functions: + global_lp = map_base + func["low_pc"] + global_hp = map_base + func["high_pc"] + + # Convert DWARF 1 locations to DWARF 2 + converted_children = [] + for kind, name, ft, loc in func["children"]: + dw2_loc = None + if isinstance(loc, bytes): + dw2_loc = convert_location(loc) + converted_children.append((kind, name, ft, dw2_loc)) + + result.append((global_lp, global_hp, func["name"], converted_children)) + + return result + + +def generate_varinfo_obj(map_path, o_index, out_s, out_o, build_dir, + text_base, label=""): + """Generate a debug_varinfo.o from a MAP file and .o file index. + + Returns (n_funcs, n_vars, n_skipped) or None. + """ + obj_offsets = parse_map_file(map_path) + if not obj_offsets: + return None + + all_functions = [] + skipped = 0 + processed = 0 + + for obj_basename, map_entries in obj_offsets.items(): + if obj_basename not in o_index: + skipped += 1 + continue + + o_path = o_index[obj_basename] + funcs = process_object(o_path, map_entries) + if funcs: + all_functions.extend(funcs) + processed += 1 + else: + skipped += 1 + + if not all_functions: + return None + + result = generate_varinfo_asm(all_functions, text_base, out_s) + if not result: + return None + + func_count, var_count = result + + if not assemble(out_s, out_o, label): + return None + + return (func_count, var_count, skipped) + + +def main(): + if len(sys.argv) < 2: + print("Usage: %s " % sys.argv[0]) + print(" e.g. %s build/GZ2E01" % sys.argv[0]) + sys.exit(1) + + build_dir = os.path.abspath(sys.argv[1]) + + # --- DOL --- + dol_map = os.path.join(build_dir, "framework.elf.MAP") + elf_path = os.path.join(build_dir, "framework.elf") + dol_s = os.path.join(build_dir, "debug_varinfo.s") + dol_o = os.path.join(build_dir, "debug_varinfo.o") + + if not os.path.exists(dol_map): + print("Error: MAP file not found: %s" % dol_map) + sys.exit(1) + + if not os.path.exists(elf_path): + print("Error: ELF not found: %s" % elf_path) + sys.exit(1) + + text_base = get_text_base(elf_path) + if text_base is None: + print("Error: could not read .text base from %s" % elf_path) + sys.exit(1) + + print("DOL .text base: 0x%08X" % text_base) + + o_index = build_o_index([build_dir]) + + result = generate_varinfo_obj(dol_map, o_index, dol_s, dol_o, build_dir, + text_base, "DOL") + if result: + func_count, var_count, skipped = result + print("DOL: %d functions, %d params/vars (%d objects skipped)" % + (func_count, var_count, skipped)) + else: + print("DOL: no variable info found") + + # --- RELs --- + rel_count = 0 + rel_skipped = 0 + + for entry in sorted(os.listdir(build_dir)): + module_dir = os.path.join(build_dir, entry) + if not os.path.isdir(module_dir): + continue + + plf_map = os.path.join(module_dir, "%s.plf.MAP" % entry) + plf_path = os.path.join(module_dir, "%s.plf" % entry) + if not os.path.exists(plf_map): + continue + + rel_text_base = get_text_base(plf_path) if os.path.exists(plf_path) else 0 + if rel_text_base is None: + rel_text_base = 0 + + rel_s = os.path.join(module_dir, "debug_varinfo.s") + rel_o = os.path.join(module_dir, "debug_varinfo.o") + + rel_o_index = build_o_index([ + os.path.join(build_dir, "src"), + os.path.join(module_dir, "obj"), + ]) + + result = generate_varinfo_obj(plf_map, rel_o_index, rel_s, rel_o, + build_dir, rel_text_base, entry) + if result: + rel_count += 1 + else: + rel_skipped += 1 + for p in (rel_s, rel_o): + if os.path.exists(p): + os.remove(p) + + print("RELs: %d with varinfo, %d without" % (rel_count, rel_skipped)) + + +if __name__ == "__main__": + main() diff --git a/tools/gen_gdb_rel_loader.py b/tools/gen_gdb_rel_loader.py new file mode 100644 index 00000000000..8b742746c89 --- /dev/null +++ b/tools/gen_gdb_rel_loader.py @@ -0,0 +1,313 @@ +#!/usr/bin/env python3 +"""Generate load_rel_symbols.py (Python GDB extension) from config.json and PLF ELF headers.""" + +import json +import os +import struct +import sys + + +# REL section index -> ELF section name +REL_SECTIONS = { + 1: ".text", + 4: ".rodata", + 5: ".data", + 6: ".bss", +} + + +def get_elf_sections(plf_path): + """Parse ELF section headers and return set of section names.""" + sections = set() + try: + with open(plf_path, "rb") as f: + magic = f.read(4) + if magic != b"\x7fELF": + return sections + f.seek(0) + ehdr = f.read(52) # ELF32 header + e_shoff = struct.unpack(">I", ehdr[32:36])[0] + e_shentsize = struct.unpack(">H", ehdr[46:48])[0] + e_shnum = struct.unpack(">H", ehdr[48:50])[0] + e_shstrndx = struct.unpack(">H", ehdr[50:52])[0] + + # Read section header string table + f.seek(e_shoff + e_shstrndx * e_shentsize) + shstrtab_hdr = f.read(e_shentsize) + strtab_off = struct.unpack(">I", shstrtab_hdr[16:20])[0] + strtab_size = struct.unpack(">I", shstrtab_hdr[20:24])[0] + f.seek(strtab_off) + strtab = f.read(strtab_size) + + # Read each section header + for i in range(e_shnum): + f.seek(e_shoff + i * e_shentsize) + shdr = f.read(e_shentsize) + sh_name_idx = struct.unpack(">I", shdr[0:4])[0] + # Extract null-terminated string + end = strtab.index(b"\x00", sh_name_idx) + name = strtab[sh_name_idx:end].decode("ascii", errors="replace") + if name: + sections.add(name) + except Exception: + pass + return sections + + +def get_elf_text_base(elf_path): + """Get the .text section virtual address from an ELF file.""" + try: + with open(elf_path, "rb") as f: + magic = f.read(4) + if magic != b"\x7fELF": + return None + f.seek(0) + ehdr = f.read(52) + e_shoff = struct.unpack(">I", ehdr[32:36])[0] + e_shentsize = struct.unpack(">H", ehdr[46:48])[0] + e_shnum = struct.unpack(">H", ehdr[48:50])[0] + e_shstrndx = struct.unpack(">H", ehdr[50:52])[0] + + f.seek(e_shoff + e_shstrndx * e_shentsize) + shstrtab_hdr = f.read(e_shentsize) + strtab_off = struct.unpack(">I", shstrtab_hdr[16:20])[0] + strtab_size = struct.unpack(">I", shstrtab_hdr[20:24])[0] + f.seek(strtab_off) + strtab = f.read(strtab_size) + + for i in range(e_shnum): + f.seek(e_shoff + i * e_shentsize) + shdr = f.read(e_shentsize) + sh_name_idx = struct.unpack(">I", shdr[0:4])[0] + end = strtab.index(b"\x00", sh_name_idx) + name = strtab[sh_name_idx:end].decode("ascii", errors="replace") + if name == ".text": + sh_addr = struct.unpack(">I", shdr[12:16])[0] + return sh_addr + except Exception: + pass + return None + + +def main(): + script_dir = os.path.dirname(os.path.abspath(__file__)) + repo_root = os.path.dirname(script_dir) + + if len(sys.argv) < 2: + print("Usage: %s " % sys.argv[0]) + sys.exit(1) + build_dir = os.path.abspath(sys.argv[1]) + + config_path = os.path.join(build_dir, "config.json") + if not os.path.exists(config_path): + print("Error: config.json not found at %s" % config_path) + sys.exit(1) + + with open(config_path) as f: + cfg = json.load(f) + + # Build module_id -> (plf_path, set of section names, debug_o) + modules = {} + for m in cfg.get("modules", []): + mid = m.get("module_id") + name = m.get("name") + if mid is not None and name: + plf = os.path.join(build_dir, name, "%s.plf" % name) + if os.path.exists(plf): + elf_sections = get_elf_sections(plf) + debug_o = os.path.join(build_dir, name, "debug_info.o") + if not os.path.exists(debug_o): + debug_o = None + modules[mid] = (plf, elf_sections, debug_o) + + modules_with_debug = { + mid: debug_o + for mid, (plf, elf_sections, debug_o) in modules.items() + if debug_o + } + + # Build module_names for dbg- convenience commands + module_names = {} # mid -> name + for m in cfg.get("modules", []): + mid = m.get("module_id") + name = m.get("name") + if mid in modules_with_debug and name: + module_names[mid] = name + + elf_path = os.path.join(build_dir, "framework.elf") + debug_o_path = os.path.join(build_dir, "debug_info.o") + has_debug = os.path.exists(debug_o_path) + + out_path = os.path.join(build_dir, "load_rel_symbols.py") + + with open(out_path, "w") as f: + f.write('# Auto-generated by gen_gdb_rel_loader.py — do not edit\n') + f.write('# Source this file in GDB, then run: load-all-symbols\n') + f.write('\n') + f.write('import gdb\n') + f.write('\n') + + # --- Helper --- + f.write('def _read_u32(addr):\n') + f.write(' return int(gdb.parse_and_eval("*(unsigned int*)%d" % addr))\n') + f.write('\n') + + # --- Module data tables --- + # REL_MODULES: mid -> (plf_path, [(sec_idx, sec_name), ...]) + f.write('REL_MODULES = {\n') + for mid in sorted(modules.keys()): + plf, elf_sections, debug_o = modules[mid] + extra_secs = [] + for sec_idx, sec_name in sorted(REL_SECTIONS.items()): + if sec_idx == 1: + continue + if sec_name in elf_sections: + extra_secs.append((sec_idx, sec_name)) + f.write(' %d: (%r, %r),\n' % (mid, plf, extra_secs)) + f.write('}\n') + f.write('\n') + + # DEBUG_MODULES: mid -> debug_o_path + f.write('DEBUG_MODULES = {\n') + for mid in sorted(modules_with_debug.keys()): + f.write(' %d: %r,\n' % (mid, modules_with_debug[mid])) + f.write('}\n') + f.write('\n') + + # MODULE_NAMES: mid -> name (for dbg- commands) + f.write('MODULE_NAMES = {\n') + for mid, name in sorted(module_names.items(), key=lambda x: x[1]): + f.write(' %d: %r,\n' % (mid, name)) + f.write('}\n') + f.write('\n') + + # --- load-dol-symbols --- + f.write('class LoadDolSymbols(gdb.Command):\n') + f.write(' """Load DOL (framework.elf) symbols."""\n') + f.write(' def __init__(self):\n') + f.write(' super().__init__("load-dol-symbols", gdb.COMMAND_USER)\n') + f.write(' def invoke(self, arg, from_tty):\n') + f.write(' gdb.execute("symbol-file %s")\n' % elf_path) + if has_debug: + f.write(' gdb.execute("add-symbol-file %s 0")\n' % debug_o_path) + f.write(' print("Loaded DOL symbols + debug info")\n') + else: + f.write(' print("Loaded DOL symbols")\n') + f.write('LoadDolSymbols()\n') + f.write('\n') + + # --- load-rel-symbols --- + f.write('def _load_rel(mid, ns, si):\n') + f.write(' if mid not in REL_MODULES:\n') + f.write(' return False\n') + f.write(' plf, extra_secs = REL_MODULES[mid]\n') + f.write(' t = _read_u32(si + 8) & ~1\n') + f.write(' ts = _read_u32(si + 12)\n') + f.write(' if t == 0 or ts == 0:\n') + f.write(' return False\n') + f.write(' cmd = "add-symbol-file %s 0x%x" % (plf, t)\n') + f.write(' for sec_idx, sec_name in extra_secs:\n') + f.write(' if ns > sec_idx:\n') + f.write(' addr = _read_u32(si + sec_idx * 8) & ~1\n') + f.write(' cmd += " -s %s 0x%x" % (sec_name, addr)\n') + f.write(' gdb.execute(cmd)\n') + f.write(' return True\n') + f.write('\n') + + f.write('def _walk_modules():\n') + f.write(' """Walk the OS module linked list. Yields (mid, ns, si) tuples."""\n') + f.write(' mod = _read_u32(0x800030C8)\n') + f.write(' while mod != 0:\n') + f.write(' mid = _read_u32(mod)\n') + f.write(' nxt = _read_u32(mod + 4)\n') + f.write(' ns = _read_u32(mod + 0x0C)\n') + f.write(' si = _read_u32(mod + 0x10)\n') + f.write(' yield (mid, ns, si)\n') + f.write(' mod = nxt\n') + f.write('\n') + + f.write('class LoadRelSymbols(gdb.Command):\n') + f.write(' """Walk the OS module list and load PLF symbols for each REL."""\n') + f.write(' def __init__(self):\n') + f.write(' super().__init__("load-rel-symbols", gdb.COMMAND_USER)\n') + f.write(' def invoke(self, arg, from_tty):\n') + f.write(' gdb.execute("set confirm off")\n') + f.write(' loaded = 0\n') + f.write(' for mid, ns, si in _walk_modules():\n') + f.write(' if _load_rel(mid, ns, si):\n') + f.write(' loaded += 1\n') + f.write(' gdb.execute("set confirm on")\n') + f.write(' print("Loaded %d REL modules" % loaded)\n') + f.write('LoadRelSymbols()\n') + f.write('\n') + + # --- load-debug-for --- + f.write('class LoadDebugFor(gdb.Command):\n') + f.write(' """Load debug info for a REL module by ID. Usage: load-debug-for """\n') + f.write(' def __init__(self):\n') + f.write(' super().__init__("load-debug-for", gdb.COMMAND_USER)\n') + f.write(' def invoke(self, arg, from_tty):\n') + f.write(' target_id = int(gdb.parse_and_eval(arg))\n') + f.write(' if target_id not in DEBUG_MODULES:\n') + f.write(' print("Module %d has no debug info" % target_id)\n') + f.write(' return\n') + f.write(' gdb.execute("set confirm off")\n') + f.write(' loaded = False\n') + f.write(' for mid, ns, si in _walk_modules():\n') + f.write(' if mid != target_id:\n') + f.write(' continue\n') + f.write(' t = _read_u32(si + 8) & ~1\n') + f.write(' ts = _read_u32(si + 12)\n') + f.write(' if t != 0 and ts != 0:\n') + f.write(' gdb.execute("add-symbol-file %s 0" % DEBUG_MODULES[mid])\n') + f.write(' loaded = True\n') + f.write(' break\n') + f.write(' gdb.execute("set confirm on")\n') + f.write(' if not loaded:\n') + f.write(' print("Module %d not found in module list" % target_id)\n') + f.write('LoadDebugFor()\n') + f.write('\n') + + # --- dbg- convenience commands --- + f.write('class _DbgModule(gdb.Command):\n') + f.write(' def __init__(self, name, mid):\n') + f.write(' super().__init__("dbg-%s" % name, gdb.COMMAND_USER)\n') + f.write(' self._mid = mid\n') + f.write(' def invoke(self, arg, from_tty):\n') + f.write(' gdb.execute("load-debug-for %d" % self._mid)\n') + f.write('\n') + f.write('for _mid, _name in MODULE_NAMES.items():\n') + f.write(' _DbgModule(_name, _mid)\n') + f.write('\n') + + # --- load-all-symbols --- + f.write('class LoadAllSymbols(gdb.Command):\n') + f.write(' """Load DOL + all REL symbols."""\n') + f.write(' def __init__(self):\n') + f.write(' super().__init__("load-all-symbols", gdb.COMMAND_USER)\n') + f.write(' def invoke(self, arg, from_tty):\n') + f.write(' gdb.execute("load-dol-symbols")\n') + f.write(' gdb.execute("load-rel-symbols")\n') + f.write('LoadAllSymbols()\n') + f.write('\n') + + # --- Auto-load on first stop (for DAP mode) --- + f.write('def _auto_load_on_stop(event):\n') + f.write(' gdb.events.stop.disconnect(_auto_load_on_stop)\n') + f.write(' try:\n') + f.write(' gdb.execute("load-all-symbols")\n') + f.write(' except Exception as e:\n') + f.write(' print("Auto-load symbols failed: %s" % e)\n') + f.write('gdb.events.stop.connect(_auto_load_on_stop)\n') + + # Generate .gdbinit in repo root (gitignored) + gdbinit_path = os.path.join(repo_root, ".gdbinit") + with open(gdbinit_path, "w") as f: + f.write("set confirm off\n") + f.write("source %s\n" % out_path) + + print("Generated %s (%d module mappings)" % (out_path, len(modules))) + + +if __name__ == "__main__": + main() diff --git a/tools/project.py b/tools/project.py index b1417ae69a8..0e9342e4db7 100644 --- a/tools/project.py +++ b/tools/project.py @@ -646,6 +646,21 @@ def write_cargo_rule(): else: sys.exit("ProjectConfig.binutils_tag missing") + # Build GDB from source (links against system Python for scripting support) + build_gdb_script = config.tools_dir / "build_gdb.py" + gdb = binutils / f"powerpc-eabi-gdb{EXE}" + gdb_version = getattr(config, "gdb_version", "17.1") + n.rule( + name="build_gdb", + command=f"$python {build_gdb_script} {binutils} --version {gdb_version}", + description="GDB $out", + ) + n.build( + outputs=gdb, + rule="build_gdb", + implicit=[build_gdb_script, binutils_implicit or binutils], + ) + n.newline() ### @@ -1296,7 +1311,7 @@ def add_unit(build_obj: BuildConfigUnit, link_step: LinkStep): n.newline() # Add all build steps needed post-build (re-building archives and such) - write_custom_step("post-build", "post-link") + write_custom_step("post-build", "post-link", extra_inputs=[gdb]) ### # Helper rule for building all source files From 2d2aef4570dd2d2fad0965f60cd4ade7ee0832aa Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 7 Mar 2026 14:47:21 -0700 Subject: [PATCH 20/35] revert to pre-merge --- include/d/d_s_logo.h | 185 ++---- src/d/d_s_logo.cpp | 1394 +++++------------------------------------- 2 files changed, 212 insertions(+), 1367 deletions(-) diff --git a/include/d/d_s_logo.h b/include/d/d_s_logo.h index 151b3847a74..c1bb353bd26 100644 --- a/include/d/d_s_logo.h +++ b/include/d/d_s_logo.h @@ -2,7 +2,6 @@ #define D_S_D_S_LOGO_H #include "f_op/f_op_scene.h" -#include "m_Do/m_Do_dvd_thread.h" class JKRExpHeap; class JKRHeap; @@ -12,41 +11,19 @@ class mDoDvdThd_mountXArchive_c; class mDoDvdThd_mountArchive_c; class mDoDvdThd_toMainRam_c; -class dScnLogo_c : public scene_class { +class dLog_HIO_c { public: - enum { - /* 0 */ EXEC_WARNING_IN, - /* 1 */ EXEC_WARNING_DISP, - /* 2 */ EXEC_WARNING_OUT, - /* 3 */ EXEC_NINTENDO_IN, - /* 4 */ EXEC_NINTENDO_OUT, - /* 5 */ EXEC_DOLBY_IN, - /* 6 */ EXEC_DOLBY_OUT, - /* 7 */ EXEC_DOLBY_OUT2, - /* 8 */ EXEC_PROG_IN, - /* 9 */ EXEC_PROG_SEL, - /* 10 */ EXEC_PROG_OUT, - /* 11 */ EXEC_PROG_SET, - /* 12 */ EXEC_PROG_SET2, - /* 13 */ EXEC_PROG_CHANGE, - /* 14 */ EXEC_DVD_WAIT, - /* 15 */ EXEC_SCENE_CHANGE, + dLog_HIO_c(); + virtual ~dLog_HIO_c(); - #if PLATFORM_WII || PLATFORM_SHIELD - /* 16 */ EXEC_STRAP_IN, - /* 17 */ EXEC_STRAP_DISP, - /* 18 */ EXEC_STRAP_OUT, - /* 19 */ EXEC_STRAP_OUT2, - #endif + u8 field_0x4[0x8 - 0x4]; +}; // Size: 0x8 - #if VERSION == VERSION_SHIELD - /* 20 */ EXEC_MOC_IN, - /* 21 */ EXEC_MOC_DISP, - /* 22 */ EXEC_MOC_OUT, - /* 23 */ EXEC_NVLOGO_IN, - /* 24 */ EXEC_NVLOGO_DISP, - /* 25 */ EXEC_NVLOGO_OUT, - #endif +class dScnLogo_c : public scene_class { +public: + enum { + EXEC_DVD_WAIT, + EXEC_SCENE_CHANGE, }; dScnLogo_c() {} @@ -66,122 +43,60 @@ class dScnLogo_c : public scene_class { void setRenderMode(); void setupGameResources(); - #if VERSION == VERSION_GCN_PAL || PLATFORM_WII || PLATFORM_SHIELD + #if VERSION == VERSION_GCN_PAL u8 getPalLanguage(); #endif - #if PLATFORM_WII || PLATFORM_SHIELD - void logoInitWii(); - void strapInDraw(); - void strapDispDraw(); - void strapOutDraw(); - void strapOut2Draw(); - #else - void logoInitGC(); - #endif - - #if VERSION == VERSION_SHIELD - void mocInDraw(); - void mocDispDraw(); - void mocOutDraw(); - void nvLogoInDraw(); - void nvLogoDispDraw(); - void nvLogoOutDraw(); - #endif - - mDoDvdThd_mountXArchive_c* aramMount(const char* i_arcPath, JKRHeap* i_heap) { - return mDoDvdThd_mountXArchive_c::create(i_arcPath, 0, JKRArchive::MOUNT_ARAM, i_heap); - } - - mDoDvdThd_mountXArchive_c* onMemMount(const char* i_arcPath) { - return mDoDvdThd_mountXArchive_c::create(i_arcPath, 0, JKRArchive::MOUNT_MEM, NULL); - } - + #if DEBUG static void onOpeningCut() { - #if DEBUG mOpeningCut = true; - #endif - } - - static u8 isOpeningCut() { - #if DEBUG - return mOpeningCut; - #else - return 0; - #endif } - #if DEBUG static u8 mOpeningCut; #endif public: - /* 0x1C4 */ request_of_phase_process_class field_0x1c4; - /* 0x1CC */ mDoDvdThd_toMainRam_c* sceneCommand; - /* 0x1D0 */ JKRExpHeap* mLogoHeap; - /* 0x1D4 */ JKRExpHeap* mLogo01Heap; - /* 0x1D8 */ JKRHeap* mpHeap; - /* 0x1DC */ dDlst_2D_c* mWarning; - /* 0x1E0 */ dDlst_2D_c* mWarningStart; - /* 0x1E4 */ dDlst_2D_c* mNintendoLogo; - /* 0x1E8 */ dDlst_2D_c* mDolbyLogo; - /* 0x1EC */ dDlst_2D_c* mProgressiveChoice; - /* 0x1F0 */ dDlst_2D_c* mProgressiveYes; - /* 0x1F4 */ dDlst_2D_c* mProgressiveNo; - /* 0x1F8 */ dDlst_2D_c* mProgressiveSel; -#if PLATFORM_WII || PLATFORM_SHIELD - /* 0x1FC */ dDlst_2D_c* mStrapImg; -#endif -#if VERSION == VERSION_SHIELD - /* 0x200 */ dDlst_2D_c* mNvLogo; - /* 0x204 */ dDlst_2D_c* mMocImg; -#endif + request_of_phase_process_class field_0x1c4; + mDoDvdThd_toMainRam_c* sceneCommand; + JKRExpHeap* field_0x1d0; + JKRExpHeap* field_0x1d4; + JKRHeap* mpHeap; #if VERSION == VERSION_GCN_PAL mDoDvdThd_mountArchive_c* mpPalLogoResCommand; #endif - /* 0x1FC */ request_of_phase_process_class* m_preLoad_dylPhase; - /* 0x200 */ ResTIMG* mProgressivePro; - /* 0x204 */ ResTIMG* mProgressiveInter; - /* 0x208 */ u8 mExecCommand; - /* 0x209 */ u8 field_0x209; - /* 0x20A */ u8 field_0x20a; - /* 0x20B */ u8 field_0x20b; - /* 0x20C */ u16 mTimer; - /* 0x20E */ u16 field_0x20e; - /* 0x210 */ u16 field_0x210; - /* 0x212 */ u16 field_0x212; - /* 0x214 */ u16 field_0x214; - /* 0x218 */ u32 field_0x218; - /* 0x21C */ void* dummyGameAlloc; -#if PLATFORM_WII || VERSION == VERSION_SHIELD - /* 0x224 */ mDoDvdThd_toMainRam_c* mpHomeBtnCommand; - /* 0x228 */ int mHomeBtnRegion; -#endif - /* 0x220 */ mDoDvdThd_mountXArchive_c* mpField0Command; - /* 0x224 */ mDoDvdThd_mountXArchive_c* mpAlAnmCommand; - /* 0x228 */ u8 field_0x228[4]; - /* 0x22C */ mDoDvdThd_mountXArchive_c* mpFmapResCommand; - /* 0x230 */ mDoDvdThd_mountXArchive_c* mpDmapResCommand; - /* 0x234 */ mDoDvdThd_mountXArchive_c* mpCollectResCommand; - /* 0x238 */ u8 field_0x238[4]; - /* 0x23C */ mDoDvdThd_mountXArchive_c* mpItemIconCommand; - /* 0x240 */ mDoDvdThd_mountXArchive_c* mpRingResCommand; - /* 0x244 */ u8 field_0x244[4]; - /* 0x248 */ mDoDvdThd_mountXArchive_c* mpPlayerNameCommand; - /* 0x24C */ mDoDvdThd_mountXArchive_c* mpItemInfResCommand; - /* 0x250 */ mDoDvdThd_mountXArchive_c* mpButtonCommand; - /* 0x254 */ u8 field_0x254[4]; - /* 0x258 */ mDoDvdThd_mountXArchive_c* mpCardIconCommand; - /* 0x25C */ mDoDvdThd_mountXArchive_c* mpBmgResCommand; - /* 0x260 */ mDoDvdThd_mountXArchive_c* mpMsgComCommand; - /* 0x264 */ mDoDvdThd_mountXArchive_c* mpMsgResCommand[7]; - /* 0x280 */ u8 field_0x280[0x10]; - /* 0x290 */ mDoDvdThd_mountXArchive_c* mpFontResCommand; - /* 0x294 */ mDoDvdThd_mountXArchive_c* mpMain2DCommand; - /* 0x298 */ mDoDvdThd_mountXArchive_c* mpRubyResCommand; - /* 0x29C */ mDoDvdThd_toMainRam_c* mParticleCommand; - /* 0x2A0 */ mDoDvdThd_toMainRam_c* mItemTableCommand; - /* 0x2A4 */ mDoDvdThd_toMainRam_c* mEnemyItemCommand; + request_of_phase_process_class* m_preLoad_dylPhase; + u8 mExecCommand; + u16 field_0x20e; + u16 field_0x210; + u16 field_0x212; + u16 field_0x214; + u32 field_0x218; + void* dummyGameAlloc; + mDoDvdThd_mountXArchive_c* mpField0Command; + mDoDvdThd_mountXArchive_c* mpAlAnmCommand; + u8 field_0x228[4]; + mDoDvdThd_mountXArchive_c* mpFmapResCommand; + mDoDvdThd_mountXArchive_c* mpDmapResCommand; + mDoDvdThd_mountXArchive_c* mpCollectResCommand; + u8 field_0x238[4]; + mDoDvdThd_mountXArchive_c* mpItemIconCommand; + mDoDvdThd_mountXArchive_c* mpRingResCommand; + u8 field_0x244[4]; + mDoDvdThd_mountXArchive_c* mpPlayerNameCommand; + mDoDvdThd_mountXArchive_c* mpItemInfResCommand; + mDoDvdThd_mountXArchive_c* mpButtonCommand; + u8 field_0x254[4]; + mDoDvdThd_mountXArchive_c* mpCardIconCommand; + mDoDvdThd_mountXArchive_c* mpBmgResCommand; + mDoDvdThd_mountXArchive_c* mpMsgComCommand; + mDoDvdThd_mountXArchive_c* mpMsgResCommand[7]; + u8 field_0x280[0x10]; + mDoDvdThd_mountXArchive_c* mpFontResCommand; + mDoDvdThd_mountXArchive_c* mpMain2DCommand; + mDoDvdThd_mountXArchive_c* mpRubyResCommand; + mDoDvdThd_toMainRam_c* mParticleCommand; + mDoDvdThd_toMainRam_c* mItemTableCommand; + mDoDvdThd_toMainRam_c* mEnemyItemCommand; }; static int phase_0(dScnLogo_c* logo); diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index f29a968f081..34334d27479 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -15,34 +15,13 @@ #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_machine.h" -#include -#include "m_Do/m_Do_main.h" -#include "JSystem/JUtility/JUTConsole.h" #include "gz/gz.h" -#if !PLATFORM_GCN -#include -#include -#include "m_Do/m_Do_Reset.h" - -#include "res/Object/LogoUsWii.h" -#endif - -#if PLATFORM_WII || VERSION == VERSION_SHIELD -#include "m_Re/m_Re_controller_pad.h" +#if PLATFORM_WII #include "d/d_cursor_mng.h" -#include "d/d_home_button.h" - -struct homeBtnData { - /* 0x0 */ int region; - /* 0x4 */ const char* path; -}; #endif -#if VERSION == VERSION_SHIELD -#define LOGO_ARC "LogoUs" -#define MSG_PATH "/res/Msgcn/bmgres.arc" -#elif VERSION == VERSION_GCN_JPN +#if VERSION == VERSION_GCN_JPN #define LOGO_ARC "Logo" #define MSG_PATH "/res/Msgjp/bmgres.arc" #elif VERSION == VERSION_GCN_PAL @@ -61,70 +40,14 @@ struct homeBtnData { #define PROGRESSIVE_MODE_ON OS_PROGRESSIVE_MODE_ON #endif -#if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG -#define FMAP_RES_PATH "/res/LayoutRevo/fmapresR.arc" -#define DMAP_RES_PATH "/res/LayoutRevo/dmapresR.arc" -#define COLLECT_RES_PATH "/res/LayoutRevo/clctresR.arc" - -#define MSG_COM_PATH "/res/LayoutRevo/msgcomR.arc" -#define MSG_RES0_PATH "/res/LayoutRevo/msgres00R.arc" -#define MSG_RES1_PATH "/res/LayoutRevo/msgres01R.arc" -#define MSG_RES2_PATH "/res/LayoutRevo/msgres02R.arc" -#define MSG_RES3_PATH "/res/LayoutRevo/msgres03R.arc" -#else -#define FMAP_RES_PATH "/res/Layout/fmapres.arc" -#define DMAP_RES_PATH "/res/Layout/dmapres.arc" -#define COLLECT_RES_PATH "/res/Layout/clctres.arc" - -#define MSG_COM_PATH "/res/Layout/msgcom.arc" -#define MSG_RES0_PATH "/res/Layout/msgres00.arc" -#define MSG_RES1_PATH "/res/Layout/msgres01.arc" -#define MSG_RES2_PATH "/res/Layout/msgres02.arc" -#define MSG_RES3_PATH "/res/Layout/msgres03.arc" -#endif - -#if PLATFORM_WII || PLATFORM_SHIELD -#define ICON_RES_PATH "/res/WiiBannerIcon/bannerIcon.arc" -#define PARTICLE_COM_PATH "/res/Particle/common-r.jpc" -#else -#define ICON_RES_PATH "/res/CardIcon/cardicon.arc" -#define PARTICLE_COM_PATH "/res/Particle/common.jpc" -#endif - -#if PLATFORM_WII -#define RING_RES_PATH "/res/LayoutRevo/ringresR.arc" -#define ITEM_INF_RES_PATH "/res/LayoutRevo/itmInfResR.arc" -#define BUTTON_RES_PATH "/res/LayoutRevo/buttonR.arc" -#define MAIN2D_PATH "/res/LayoutRevo/main2DR.arc" -#else -#define RING_RES_PATH "/res/Layout/ringres.arc" -#define ITEM_INF_RES_PATH "/res/Layout/itmInfRes.arc" -#define BUTTON_RES_PATH "/res/Layout/button.arc" -#define MAIN2D_PATH "/res/Layout/main2D.arc" -#endif - -class dLog_HIO_c : public JORReflexible { -public: - dLog_HIO_c(); - virtual ~dLog_HIO_c() {} - - void genMessage(JORMContext*); - - u8 field_0x4[0x8 - 0x4]; -}; // Size: 0x8 - -static dLog_HIO_c g_LogHIO; - -dLog_HIO_c::dLog_HIO_c() {} - -#if DEBUG -void dLog_HIO_c::genMessage(JORMContext*) {} -#endif +typedef void (dScnLogo_c::*execFunc)(); +static execFunc l_execFunc[2] = { + &dScnLogo_c::dvdWaitDraw, + &dScnLogo_c::nextSceneChange, +}; void dScnLogo_c::preLoad_dyl_create() { m_preLoad_dylPhase = new request_of_phase_process_class[14]; - JUT_ASSERT(194, m_preLoad_dylPhase != NULL); - memset(m_preLoad_dylPhase, 0, sizeof(request_of_phase_process_class) * 14); } @@ -132,54 +55,15 @@ void dScnLogo_c::preLoad_dyl_remove() { delete[] m_preLoad_dylPhase; } -typedef void (dScnLogo_c::*execFunc)(); -static execFunc l_execFunc[] = { - &dScnLogo_c::warningInDraw, &dScnLogo_c::warningDispDraw, &dScnLogo_c::warningOutDraw, - &dScnLogo_c::nintendoInDraw, &dScnLogo_c::nintendoOutDraw, &dScnLogo_c::dolbyInDraw, - &dScnLogo_c::dolbyOutDraw, &dScnLogo_c::dolbyOutDraw2, &dScnLogo_c::progInDraw, - &dScnLogo_c::progSelDraw, &dScnLogo_c::progOutDraw, &dScnLogo_c::progSetDraw, - &dScnLogo_c::progSet2Draw, &dScnLogo_c::progChangeDraw, &dScnLogo_c::dvdWaitDraw, - &dScnLogo_c::nextSceneChange, - - #if PLATFORM_WII || PLATFORM_SHIELD - &dScnLogo_c::strapInDraw, - &dScnLogo_c::strapDispDraw, - &dScnLogo_c::strapOutDraw, - &dScnLogo_c::strapOut2Draw, - #endif - - #if VERSION == VERSION_SHIELD - &dScnLogo_c::mocInDraw, - &dScnLogo_c::mocDispDraw, - &dScnLogo_c::mocOutDraw, - &dScnLogo_c::nvLogoInDraw, - &dScnLogo_c::nvLogoDispDraw, - &dScnLogo_c::nvLogoOutDraw, - #endif -}; - static s16 const l_preLoad_dylKeyTbl[14] = { - PROC_BG, - PROC_DEMO00, - PROC_NBOMB, - PROC_SPINNER, - PROC_Obj_LifeContainer, - PROC_CROD, - PROC_DISAPPEAR, - PROC_Tag_Attp, - PROC_MG_ROD, - PROC_BOOMERANG, - PROC_ARROW, - PROC_SUSPEND, - PROC_MIDNA, - PROC_Obj_Yousei, + 0x02DC, 0x02CE, 0x0221, 0x00F2, 0x021B, 0x02F4, 0x0139, + 0x015A, 0x02E4, 0x00FE, 0x0308, 0x030F, 0x00FF, 0x013F, }; bool dScnLogo_c::preLoad_dyl() { bool ret = true; - int var_r28 = 14; - for (int i = 0; i < var_r28; i++) { + for (int i = 0; i < 14; i++) { int phase_state = cDylPhs::Link(&m_preLoad_dylPhase[i], l_preLoad_dylKeyTbl[i]); if (phase_state != cPhs_COMPLEATE_e) { @@ -190,637 +74,38 @@ bool dScnLogo_c::preLoad_dyl() { return ret; } -#if DEBUG -u8 dScnLogo_c::mOpeningCut; -#endif - -void dScnLogo_c::checkProgSelect() { - #if VERSION == VERSION_GCN_PAL - if (mDoRst::getProgSeqFlag() == 0) { - field_0x20a = 1; - - if (isProgressiveMode()) { - field_0x209 = 0; - } else { - field_0x209 = 1; - } - } - #else - if (mDoRst::getProgSeqFlag() == 0 && VIGetDTVStatus() != 0) { - if (isProgressiveMode() || mDoCPd_c::getHoldB(PAD_1)) { - field_0x20a = 1; - field_0x209 = 0; - } - } - #endif -} - int dScnLogo_c::draw() { (this->*l_execFunc[mExecCommand])(); return 1; } -void dScnLogo_c::progInDraw() { - dComIfGd_set2DOpa(mProgressiveChoice); - dComIfGd_set2DOpa(mProgressiveYes); - dComIfGd_set2DOpa(mProgressiveNo); - - if (mTimer == 0) { - mExecCommand = EXEC_PROG_SEL; - mTimer = 600; - field_0x20e = 30; - field_0x210 = field_0x20e; - field_0x212 = 0; - field_0x20b = 0; - } -} - -void dScnLogo_c::progSelDraw() { - dComIfGd_set2DOpa(mProgressiveChoice); - dComIfGd_set2DOpa(mProgressiveYes); - dComIfGd_set2DOpa(mProgressiveNo); - - if (field_0x20b == 0) { - if (field_0x209 == 0) { - #if PLATFORM_WII - if (mReCPd::getTrigRight(PAD_1) || mReCPd::getStickX(PAD_1) > 0.5f) - #else - if (mDoCPd_c::getHoldRight(PAD_1) || mDoCPd_c::getStickX(PAD_1) > 0.5f) - #endif - { - #if PLATFORM_WII || PLATFORM_SHIELD - mDoAud_seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0); - #else - mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0); - #endif - field_0x209 = 1; - field_0x20e = 30; - field_0x210 = field_0x20e; - field_0x212 = 0; - } - } else { - #if PLATFORM_WII - if (mReCPd::getTrigLeft(PAD_1) || mReCPd::getStickX(PAD_1) < -0.5f) - #else - if (mDoCPd_c::getHoldLeft(PAD_1) || mDoCPd_c::getStickX(PAD_1) < -0.5f) - #endif - { - #if PLATFORM_WII || PLATFORM_SHIELD - mDoAud_seStart(Z2SE_SY_CURSOR_OPTION, NULL, 0, 0); - #else - mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, NULL, 0, 0); - #endif - field_0x209 = 0; - field_0x20e = 30; - field_0x210 = field_0x20e; - field_0x212 = 0; - } - } - - #if PLATFORM_WII - if (cAPICPad_A_TRIGGER(PAD_1) || mTimer == 0) - #else - if (mDoCPd_c::getTrigA(PAD_1) || mTimer == 0) - #endif - { - if (field_0x209 == 0) { - J2DPicture* pic = mProgressiveSel->getPicture(); - pic->changeTexture(mProgressivePro, 0); - - #if VERSION != VERSION_SHIELD - setProgressiveMode(PROGRESSIVE_MODE_ON); - #endif - - mDoRst::setProgChgFlag(1); - - #if PLATFORM_WII || PLATFORM_SHIELD - mDoAud_seStart(Z2SE_SY_TALK_WIN_CLOSE, NULL, 0, 0); - #else - mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); - #endif - } else { - J2DPicture* pic = mProgressiveSel->getPicture(); - pic->changeTexture(mProgressiveInter, 0); - - #if VERSION != VERSION_SHIELD - setProgressiveMode(PROGRESSIVE_MODE_OFF); - #endif - - #if PLATFORM_WII || PLATFORM_SHIELD - mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0); - #else - mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0); - #endif - } - - if (mTimer > 540) { - field_0x20b = 1; - field_0x214 = mTimer - 540; - } else { - mExecCommand = EXEC_PROG_OUT; - mTimer = 30; - mDoGph_gInf_c::startFadeOut(mTimer); - field_0x20e = 30; - field_0x210 = field_0x20e; - field_0x212 = 0; - } - - #if PLATFORM_WII || PLATFORM_SHIELD - mDoRst::setProgSeqFlag(0); - #else - mDoRst::setProgSeqFlag(1); - #endif - } - } else { - if (field_0x214 == 0) { - mExecCommand = EXEC_PROG_OUT; - mTimer = 30; - mDoGph_gInf_c::startFadeOut(30); - field_0x20e = 30; - field_0x210 = field_0x20e; - field_0x212 = 0; - } else { - field_0x214--; - } - } - - f32 alpha = (f32)field_0x210 / (f32)field_0x20e; - if (field_0x212 != 0) { - alpha = 1.0f - alpha; - } - u8 r = alpha * 255.0f; - u8 g = alpha * 200.0f; - - if (field_0x209 != 0) { - mProgressiveYes->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); - mProgressiveYes->getPicture()->setBlack(JUtility::TColor(0, 0, 0, 0)); - - mProgressiveNo->getPicture()->setWhite(JUtility::TColor(255, 200, 0, 255)); - mProgressiveNo->getPicture()->setBlack(JUtility::TColor(r, g, 0, 0)); - } else { - mProgressiveYes->getPicture()->setWhite(JUtility::TColor(255, 200, 0, 255)); - mProgressiveYes->getPicture()->setBlack(JUtility::TColor(r, g, 0, 0)); - - mProgressiveNo->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); - mProgressiveNo->getPicture()->setBlack(JUtility::TColor(0, 0, 0, 0)); - } - - if (field_0x210 == 0) { - field_0x210 = field_0x20e; - field_0x212 ^= 1; - } else { - field_0x210--; - } -} - -void dScnLogo_c::progOutDraw() { - dComIfGd_set2DOpa(mProgressiveChoice); - dComIfGd_set2DOpa(mProgressiveYes); - dComIfGd_set2DOpa(mProgressiveNo); - - if (mTimer == 0) { - #if VERSION == VERSION_GCN_PAL - if (field_0x218 == 1 && field_0x209 == 0) - #else - if (field_0x218 != 0 && field_0x209 == 0) - #endif - { - mExecCommand = EXEC_PROG_CHANGE; - mTimer = 150; - } else if (field_0x218 == 0 && field_0x209 != 0) { - #if PLATFORM_WII || PLATFORM_SHIELD - mTimer = 90; - mExecCommand = EXEC_NINTENDO_IN; - #else - if (mDoRst::getWarningDispFlag() != 0) { - mTimer = 90; - mExecCommand = EXEC_NINTENDO_IN; - } else { - mTimer = 120; - mExecCommand = EXEC_WARNING_IN; - } - #endif - - mDoGph_gInf_c::startFadeIn(30); - } else { - mExecCommand = EXEC_PROG_SET; - mTimer = 150; - mDoGph_gInf_c::startFadeIn(30); - } - } -} - -void dScnLogo_c::progSetDraw() { - dComIfGd_set2DOpa(mProgressiveSel); - - if (mTimer == 0) { - mExecCommand = EXEC_PROG_SET2; - mTimer = 30; - mDoGph_gInf_c::startFadeOut(30); - } -} - -void dScnLogo_c::progSet2Draw() { - dComIfGd_set2DOpa(mProgressiveSel); - - if (mTimer == 0) { - if (getProgressiveMode() != 0) { - mTimer = 150; - } else { - mTimer = 30; - } - - mExecCommand = EXEC_PROG_CHANGE; - } -} - -void dScnLogo_c::progChangeDraw() { - #if PLATFORM_SHIELD - OSReport("progChangeDraw"); - #endif - - if (getProgressiveMode() != 0 && mTimer == 90 && field_0x209 == 0) { - setRenderMode(); - } - - if (mTimer == 0) { - #if VERSION == VERSION_SHIELD_DEBUG - mExecCommand = EXEC_STRAP_IN; - mTimer = 0; - #elif PLATFORM_WII || PLATFORM_SHIELD - mExecCommand = EXEC_STRAP_IN; - mTimer = 90; - #else - if (mDoRst::getWarningDispFlag() != 0) { - mTimer = 90; - mExecCommand = EXEC_NINTENDO_IN; - } else { - mTimer = 120; - mExecCommand = EXEC_WARNING_IN; - } - #endif - - mDoGph_gInf_c::startFadeIn(30); - } -} - -void dScnLogo_c::warningInDraw() { - dComIfGd_set2DOpa(mWarning); - - if (mTimer == 0) { - mExecCommand = EXEC_WARNING_DISP; - mTimer = 3510; - field_0x20e = 30; - field_0x210 = field_0x20e; - field_0x212 = 1; - } -} - -void dScnLogo_c::warningDispDraw() { - dComIfGd_set2DOpa(mWarning); - dComIfGd_set2DOpa(mWarningStart); - - f32 alphaf = (f32)field_0x210 / (f32)field_0x20e; - if (field_0x212 != 0) { - alphaf = 1.0f - alphaf; - } - - u8 alpha = 255.0f * alphaf; - mWarningStart->setAlpha(alpha); - - if (field_0x210 == 0) { - field_0x210 = field_0x20e; - field_0x212 ^= 1; - } else { - field_0x210--; - } - - #if PLATFORM_WII - if (mTimer == 0 || cAPICPad_A_TRIGGER(PAD_1) || cAPICPad_B_TRIGGER(PAD_1) || cAPICPad_START_TRIGGER(PAD_1)) - #else - if (mTimer == 0 || mDoCPd_c::getTrig(PAD_1) & - (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_Y | PAD_BUTTON_START | - PAD_TRIGGER_Z | PAD_TRIGGER_L | PAD_TRIGGER_R | PAD_BUTTON_LEFT | - PAD_BUTTON_RIGHT | PAD_BUTTON_DOWN | PAD_BUTTON_UP)) - #endif - { - mExecCommand = EXEC_WARNING_OUT; - mTimer = 30; - mDoGph_gInf_c::startFadeOut(30); - mDoRst::setWarningDispFlag(1); - } -} - -void dScnLogo_c::warningOutDraw() { - dComIfGd_set2DOpa(mWarning); - - if (mTimer == 0) { - mTimer = 90; - mExecCommand = EXEC_NINTENDO_IN; - mDoGph_gInf_c::startFadeIn(30); - } -} - -void dScnLogo_c::nintendoInDraw() { - dComIfGd_set2DOpa(mNintendoLogo); - - if (mTimer == 0) { - mExecCommand = EXEC_NINTENDO_OUT; - mTimer = 30; - mDoGph_gInf_c::startFadeOut(30); - } -} - -void dScnLogo_c::nintendoOutDraw() { - dComIfGd_set2DOpa(mNintendoLogo); - - if (mTimer == 0) { - mExecCommand = EXEC_DOLBY_IN; - mTimer = 90; - mDoGph_gInf_c::startFadeIn(30); - } -} - -void dScnLogo_c::dolbyInDraw() { - dComIfGd_set2DOpa(mDolbyLogo); - - if (mTimer == 0) { - mExecCommand = EXEC_DOLBY_OUT; - mTimer = 30; - mDoGph_gInf_c::startFadeOut(30); - } -} - -void dScnLogo_c::dolbyOutDraw() { - dComIfGd_set2DOpa(mDolbyLogo); - - if (mTimer == 0) { - mExecCommand = EXEC_DOLBY_OUT2; - mTimer = 30; - mDoGph_gInf_c::startFadeIn(30); - } -} - -void dScnLogo_c::dolbyOutDraw2() { - if (mTimer == 0) { - mExecCommand = EXEC_DVD_WAIT; - } -} - -#if PLATFORM_WII || PLATFORM_SHIELD -void dScnLogo_c::strapInDraw() { - dComIfGd_set2DOpa(mStrapImg); - if (mTimer == 0) { - mExecCommand = EXEC_STRAP_DISP; - - #if VERSION == VERSION_SHIELD_DEBUG - mTimer = 0; - #elif VERSION == VERSION_SHIELD - mTimer = 60; - #else - mTimer = 840; - #endif - } -} - -void dScnLogo_c::strapDispDraw() { - dComIfGd_set2DOpa(mStrapImg); - - #if VERSION == VERSION_SHIELD_DEBUG - if (mTimer == 0) - #elif VERSION == VERSION_SHIELD - if (mTimer == 0 || cAPICPad_ANY_BUTTON(PAD_1)) - #else - if (mTimer == 0 || mReCPd::getTrig(PAD_1) & ~WPAD_BUTTON_HOME) - #endif - { - mExecCommand = EXEC_DVD_WAIT; - } -} - -void dScnLogo_c::strapOutDraw() { - dComIfGd_set2DOpa(mStrapImg); - if (mTimer == 0) { - #if VERSION == VERSION_SHIELD - mExecCommand = EXEC_NVLOGO_IN; - #else - mExecCommand = EXEC_STRAP_OUT2; - #endif - - mTimer = 30; - mDoGph_gInf_c::startFadeIn(30); - } -} - -void dScnLogo_c::strapOut2Draw() { - if (mTimer == 0) { - mExecCommand = EXEC_SCENE_CHANGE; - } -} -#endif - -#if VERSION == VERSION_SHIELD -void dScnLogo_c::mocInDraw() { - dComIfGd_set2DOpa(mMocImg); - - if (mTimer == 0) { - mExecCommand = EXEC_MOC_DISP; - mTimer = 120; - } -} - -void dScnLogo_c::mocDispDraw() { - dComIfGd_set2DOpa(mMocImg); - - if (mTimer == 0 || cAPICPad_ANY_BUTTON(PAD_1)) { - mExecCommand = EXEC_MOC_OUT; - mTimer = 30; - mDoGph_gInf_c::startFadeOut(30); - } -} - -void dScnLogo_c::mocOutDraw() { - dComIfGd_set2DOpa(mMocImg); - - if (mTimer == 0) { - mExecCommand = EXEC_STRAP_IN; - mTimer = 90; - mDoGph_gInf_c::startFadeIn(30); - } -} - -void dScnLogo_c::nvLogoInDraw() { - dComIfGd_set2DOpa(mNvLogo); - - if (mTimer == 0) { - mExecCommand = EXEC_NVLOGO_DISP; - mTimer = 120; - } -} - -void dScnLogo_c::nvLogoDispDraw() { - dComIfGd_set2DOpa(mNvLogo); - - if (mTimer == 0 || cAPICPad_ANY_BUTTON(PAD_1)) { - mExecCommand = EXEC_NVLOGO_OUT; - mTimer = 30; - mDoGph_gInf_c::startFadeOut(30); - } -} - -void dScnLogo_c::nvLogoOutDraw() { - dComIfGd_set2DOpa(mNvLogo); - - if (mTimer == 0) { - mExecCommand = EXEC_STRAP_OUT2; - mTimer = 30; - mDoGph_gInf_c::startFadeIn(30); - } -} -#endif - void dScnLogo_c::dvdWaitDraw() { - #if PLATFORM_WII || PLATFORM_SHIELD - dComIfGd_set2DOpa(mStrapImg); - #endif + if (g_gzInfo.mpFont == NULL && mpFontResCommand->sync()) { + dComIfGp_setFontArchive(mpFontResCommand->getArchive()); + g_gzInfo.setFont(mDoExt_getMesgFont()); + } if (!dComIfG_syncAllObjectRes()) { - if ( - #if PLATFORM_WII || VERSION == VERSION_SHIELD - mpHomeBtnCommand->sync() && - #endif - mpField0Command->sync() - && mpAlAnmCommand->sync() - && mpFmapResCommand->sync() - && mpDmapResCommand->sync() - && mpCollectResCommand->sync() - && mpItemIconCommand->sync() - && mpRingResCommand->sync() - && mpPlayerNameCommand->sync() - && mpItemInfResCommand->sync() - && mpButtonCommand->sync() - && mpCardIconCommand->sync() - && mpBmgResCommand->sync() - && mpMsgComCommand->sync() - && mpMsgResCommand[0]->sync() - && mpMsgResCommand[1]->sync() - && mpMsgResCommand[2]->sync() - && mpMsgResCommand[3]->sync() - && mpMsgResCommand[4]->sync() - && mpMsgResCommand[5]->sync() - && mpMsgResCommand[6]->sync() - && mpFontResCommand->sync() - && mpMain2DCommand->sync() - && mpRubyResCommand->sync() - && mParticleCommand->sync() - && mItemTableCommand->sync() - && mEnemyItemCommand->sync() - && preLoad_dyl()) + if (mpField0Command->sync() && mpAlAnmCommand->sync() && mpFmapResCommand->sync() && + mpDmapResCommand->sync() && mpCollectResCommand->sync() && mpItemIconCommand->sync() && + mpRingResCommand->sync() && mpPlayerNameCommand->sync() && + mpItemInfResCommand->sync() && mpButtonCommand->sync() && mpCardIconCommand->sync() && + mpBmgResCommand->sync() && mpMsgComCommand->sync() && mpMsgResCommand[0]->sync() && + mpMsgResCommand[1]->sync() && mpMsgResCommand[2]->sync() && + mpMsgResCommand[3]->sync() && mpMsgResCommand[4]->sync() && + mpMsgResCommand[5]->sync() && mpMsgResCommand[6]->sync() && mpFontResCommand->sync() && + mpMain2DCommand->sync() && mpRubyResCommand->sync() && mParticleCommand->sync() && + mItemTableCommand->sync() && mEnemyItemCommand->sync() && preLoad_dyl()) { setupGameResources(); g_gzInfo.startInit(); mDoRst::setLogoScnFlag(0); - - #if PLATFORM_WII || PLATFORM_SHIELD - mDoRst::setProgSeqFlag(0); - #endif - mDoRst::setProgChgFlag(0); - - #if PLATFORM_WII || PLATFORM_SHIELD - mExecCommand = EXEC_STRAP_OUT; - mTimer = 30; - mDoGph_gInf_c::startFadeOut(30); - #else mExecCommand = EXEC_SCENE_CHANGE; - #endif - } - } -} - -void dScnLogo_c::nextSceneChange() { - if (!mDoRst::isReset()) { - if (!isOpeningCut()) - { - dComIfG_changeOpeningScene(this, PROC_OPENING_SCENE); - } else { - #if DEBUG - fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 30); - dComIfGs_init(); - dComIfG_playerStatusD(); - return; - #endif } } } -dScnLogo_c::~dScnLogo_c() { - if (mDoRst::isReset()) { - #if !(PLATFORM_WII || PLATFORM_SHIELD) - if (mDoAud_zelAudio_c::isInitFlag()) - #endif - { - Z2AudioMgr::getInterface()->resetProcess(5, true); - } - - mDoRst_reset(0, 0x80000000, 0); - } - - #if PLATFORM_WII || PLATFORM_SHIELD - delete mStrapImg; - #endif - - #if !(PLATFORM_WII || PLATFORM_SHIELD) - delete mNintendoLogo; - delete mWarning; - delete mWarningStart; - delete mDolbyLogo; - delete mProgressiveChoice; - delete mProgressiveYes; - delete mProgressiveNo; - delete mProgressiveSel; - - #if VERSION == VERSION_GCN_PAL - mpPalLogoResCommand->getArchive()->removeResourceAll(); - mpPalLogoResCommand->getArchive()->unmount(); - mpPalLogoResCommand->destroy(); - #endif - #endif - - #if VERSION == VERSION_SHIELD - delete mNvLogo; - delete mMocImg; - #endif - - preLoad_dyl_remove(); - - #if PLATFORM_WII || PLATFORM_SHIELD - switch (getPalLanguage()) { - case 2: - dComIfG_deleteObjectResMain("LogoFrWii"); - break; - case 3: - dComIfG_deleteObjectResMain("LogoSpWii"); - break; - case 0: - default: - dComIfG_deleteObjectResMain("LogoUsWii"); - break; - } - #else - dComIfG_deleteObjectResMain(LOGO_ARC); - #endif - - mLogo01Heap->destroy(); - mLogoHeap->destroy(); - JKRFree(dummyGameAlloc); - - #if PLATFORM_WII || VERSION == VERSION_SHIELD - dHomeButton_c::create(mHomeBtnRegion, mpHomeBtnCommand->getMemAddress()); - mpHomeBtnCommand->destroy(); - #endif -} - void dScnLogo_c::setupGameResources() { dComIfGp_particle_createCommon(mParticleCommand->getMemAddress()); dComIfGp_setFieldMapArchive2(mpField0Command->getArchive()); @@ -833,17 +118,7 @@ void dScnLogo_c::setupGameResources() { dComIfGp_setRingResArchive(mpRingResCommand->getArchive()); dComIfGp_setNameResArchive(mpPlayerNameCommand->getArchive()); dComIfGp_setDemoMsgArchive(mpItemInfResCommand->getArchive()); - dComIfGp_setMeterButtonArchive(mpButtonCommand->getArchive()); - #if DEBUG - JKRArchive* button = mpButtonCommand->getArchive(); - if (button != NULL) { - OS_REPORT("button not nullptr\n"); - } else { - OS_REPORT("button nullptr\n"); - } - #endif - dComIfGp_setErrorResArchive(NULL); dComIfGp_setCardIconResArchive(mpCardIconCommand->getArchive()); dComIfGp_setMsgDtArchive(0, mpBmgResCommand->getArchive()); @@ -878,47 +153,69 @@ void dScnLogo_c::setupGameResources() { dMpath_c::createWork(); } -static int phase_0(dScnLogo_c* i_this) { - mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); - dComIfGp_particle_create(); +void dScnLogo_c::nextSceneChange() { + if (!mDoRst::isReset()) { + dComIfG_changeOpeningScene(this, PROC_OPENING_SCENE); + } +} - OS_REPORT("\x1b[31m%d gameHeap->getFreeSize %08x(%d)\n\x1b[m", 1497, mDoExt_getGameHeap()->getFreeSize(), mDoExt_getGameHeap()->getFreeSize()); - u32 var_r29 = 0x340000; - u32 var_r28 = 0x130000; +dScnLogo_c::~dScnLogo_c() { + if (mDoRst::isReset()) { + if (mDoAud_zelAudio_c::isInitFlag()) { + Z2AudioMgr::getInterface()->resetProcess(5, true); + } + mDoRst_reset(0, 0x80000000, 0); + } - i_this->dummyGameAlloc = mDoExt_getGameHeap()->alloc(var_r29, -0x10); - JUT_ASSERT(1523, i_this->dummyGameAlloc != NULL); + preLoad_dyl_remove(); + dComIfG_deleteObjectResMain(LOGO_ARC); - i_this->mLogoHeap = JKRExpHeap::create(i_this->dummyGameAlloc, var_r29, NULL, false); - JUT_ASSERT(1525, i_this->mLogoHeap != NULL); + field_0x1d4->destroy(); + field_0x1d0->destroy(); + JKRFree(dummyGameAlloc); - i_this->mLogo01Heap = JKRCreateExpHeap(var_r28, i_this->mLogoHeap, false); - JUT_ASSERT(1528, i_this->mLogo01Heap != NULL); + mpField0Command->destroy(); + mpAlAnmCommand->destroy(); + mpFmapResCommand->destroy(); + mpDmapResCommand->destroy(); + mpCollectResCommand->destroy(); + mpItemIconCommand->destroy(); + mpRingResCommand->destroy(); + mpPlayerNameCommand->destroy(); + mpItemInfResCommand->destroy(); + mpButtonCommand->destroy(); + mpCardIconCommand->destroy(); + mpBmgResCommand->destroy(); + mpMsgComCommand->destroy(); - #if VERSION == VERSION_GCN_PAL - switch (i_this->getPalLanguage()) { - case 1: - i_this->mpPalLogoResCommand = mDoDvdThd_mountArchive_c::create("/res/Layout/LogoPalGm.arc", 0, NULL); - break; - case 2: - i_this->mpPalLogoResCommand = mDoDvdThd_mountArchive_c::create("/res/Layout/LogoPalFr.arc", 0, NULL); - break; - case 3: - i_this->mpPalLogoResCommand = mDoDvdThd_mountArchive_c::create("/res/Layout/LogoPalSp.arc", 0, NULL); - break; - case 4: - i_this->mpPalLogoResCommand = mDoDvdThd_mountArchive_c::create("/res/Layout/LogoPalIt.arc", 0, NULL); - break; - case 0: - default: - i_this->mpPalLogoResCommand = mDoDvdThd_mountArchive_c::create("/res/Layout/LogoPalUk.arc", 0, NULL); - break; + for (int i = 0; i < 7; i++) { + mpMsgResCommand[i]->destroy(); } - #endif - #if PLATFORM_WII || PLATFORM_SHIELD - OSSetPowerCallback(mDoRst_shutdownCallBack); + mpFontResCommand->destroy(); + mpMain2DCommand->destroy(); + mpRubyResCommand->destroy(); + mParticleCommand->destroy(); + mItemTableCommand->destroy(); + mEnemyItemCommand->destroy(); + + dDlst_shadowControl_c::setSimpleTex((ResTIMG*)dComIfG_getObjectRes("Always", 0x4A)); + dTres_c::createWork(); + dMpath_c::createWork(); + + #if PLATFORM_WII + data_8053a730 = 0; #endif +} + +static int phase_0(dScnLogo_c* i_this) { + mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); + dComIfGp_particle_create(); + + i_this->dummyGameAlloc = mDoExt_getGameHeap()->alloc(0x340000, -0x10); + JUT_ASSERT(1523, i_this->dummyGameAlloc != NULL); + i_this->field_0x1d0 = JKRExpHeap::create(i_this->dummyGameAlloc, 0x340000, NULL, false); + i_this->field_0x1d4 = JKRExpHeap::create(0x130000, i_this->field_0x1d0, false); return cPhs_NEXT_e; } @@ -928,11 +225,9 @@ static int phase_1(dScnLogo_c* i_this) { return cPhs_INIT_e; } - #if !(PLATFORM_WII || PLATFORM_SHIELD) if (!mDoAud_zelAudio_c::isInitFlag() || Z2AudioMgr::getInterface()->checkFirstWaves()) { return cPhs_INIT_e; } - #endif #if VERSION == VERSION_GCN_PAL if (!mDoDvdThd::SyncWidthSound) { @@ -940,29 +235,8 @@ static int phase_1(dScnLogo_c* i_this) { } #endif - int rt; - #if PLATFORM_WII || PLATFORM_SHIELD - switch (i_this->getPalLanguage()) { - case 0: - default: - rt = dComIfG_setObjectRes("LogoUsWii", (u8)0, i_this->mLogoHeap); - break; - case 2: - rt = dComIfG_setObjectRes("LogoFrWii", (u8)0, i_this->mLogoHeap); - break; - case 3: - rt = dComIfG_setObjectRes("LogoSpWii", (u8)0, i_this->mLogoHeap); - break; - } - #else - rt = dComIfG_setObjectRes(LOGO_ARC, (u8)0, i_this->mLogoHeap); - #endif - - JUT_ASSERT(1652, rt == 1); - + dComIfG_setObjectRes(LOGO_ARC, (u8)0, i_this->field_0x1d0); mDoRst::setLogoScnFlag(1); - - OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 1667, archiveHeap->getTotalFreeSize()); archiveHeap->dump_sort(); return cPhs_NEXT_e; } @@ -992,393 +266,129 @@ int dScnLogo_c::create() { data_8053a730 = 1; #endif - mpHeap = mDoExt_setCurrentHeap(mLogo01Heap); - - #if PLATFORM_WII || PLATFORM_SHIELD - logoInitWii(); - #else - logoInitGC(); - #endif - - JKRSetCurrentHeap(mpHeap); - - OS_REPORT("\x1b[31m%d gameHeap->getFreeSize %08x(%d)\n\x1b[m", 1732, mDoExt_getGameHeap()->getFreeSize(), mDoExt_getGameHeap()->getFreeSize()); + mpHeap = mDoExt_setCurrentHeap(field_0x1d4); + mpHeap->becomeCurrentHeap(); dvdDataLoad(); - - OS_REPORT("\x1b[31m%d gameHeap->getFreeSize %08x(%d)\n\x1b[m", 1738, mDoExt_getGameHeap()->getFreeSize(), mDoExt_getGameHeap()->getFreeSize()); - - #if !(PLATFORM_WII || PLATFORM_SHIELD) Z2AudioMgr::getInterface()->loadStaticWaves(); - #endif - - mDoGph_gInf_c::setTickRate(OS_TIMER_CLOCK / 60); + mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 60); mDoGph_gInf_c::waitBlanking(0); + mDoGph_gInf_c::startFadeIn(0); - field_0x20a = 0; - - #if VERSION == VERSION_SHIELD_DEBUG - mExecCommand = EXEC_STRAP_IN; - mTimer = 0; - #elif VERSION == VERSION_SHIELD - mExecCommand = EXEC_MOC_IN; - mTimer = 30; - #elif PLATFORM_WII - mExecCommand = EXEC_STRAP_IN; - mTimer = 90; - #endif - - mDoGph_gInf_c::startFadeIn(30); - - #if !(PLATFORM_WII || PLATFORM_SHIELD) - checkProgSelect(); - if (field_0x20a != 0) { - mExecCommand = EXEC_PROG_IN; - mTimer = 30; - field_0x218 = getProgressiveMode(); - } else { - if (mDoRst::getWarningDispFlag()) { - mTimer = 90; - mExecCommand = EXEC_NINTENDO_IN; - } else { - mTimer = 120; - mExecCommand = EXEC_WARNING_IN; - } - mDoRst::setProgSeqFlag(1); - } + // Always go directly to resource loading + mExecCommand = EXEC_DVD_WAIT; + mDoRst::setProgSeqFlag(1); JUTGamePad::clearResetOccurred(); JUTGamePad::setResetCallback(mDoRst_resetCallBack, NULL); - #endif - mDoRst::offReset(); mDoRst::offResetPrepare(); - #if PLATFORM_WII || VERSION == VERSION_SHIELD - dHomeButton_c::lbl_8053A724 = 0; - #endif - return phase_state; } -#if PLATFORM_WII || PLATFORM_SHIELD -void dScnLogo_c::logoInitWii() { - u8 language = getPalLanguage(); - if (language > 5) { - language = 0; - } - - ResTIMG* timg; - s16 width; - s16 height; - if (mDoGph_gInf_c::isWide()) { - switch (language) { - case 0: - default: - timg = (ResTIMG*)dComIfG_getObjectRes("LogoUsWii", dRes_ID_LOGOUSWII_BTI_STRAP_16_9_832X456_US_e); - break; - case 2: - timg = (ResTIMG*)dComIfG_getObjectRes("LogoFrWii", 3); - break; - case 3: - timg = (ResTIMG*)dComIfG_getObjectRes("LogoSpWii", 3); - break; - } - - width = 832; - height = 456; - } else { - switch (language) { - case 0: - default: - timg = (ResTIMG*)dComIfG_getObjectRes("LogoUsWii", dRes_ID_LOGOUSWII_BTI_STRAP_608X456_US_e); - break; - case 2: - timg = (ResTIMG*)dComIfG_getObjectRes("LogoFrWii", 4); - break; - case 3: - timg = (ResTIMG*)dComIfG_getObjectRes("LogoSpWii", 4); - break; - } - - width = 608; - height = 456; - } - - JUT_ASSERT(2309, timg != NULL); - mStrapImg = new dDlst_2D_c(timg, 304 - (width / 2), 224 - (height / 2), width, height, 255); - - #if VERSION == VERSION_SHIELD - timg = (ResTIMG*)dComIfG_getObjectRes("LogoUsWii", 5); - mNvLogo = new dDlst_2D_c(timg, 304 - (width / 2), 224 - (height / 2), width, height, 255); - - timg = (ResTIMG*)dComIfG_getObjectRes("LogoUsWii", 4); - mMocImg = new dDlst_2D_c(timg, 304 - (width / 2), 224 - (height / 2), width, height, 255); - #endif - - OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 2316, archiveHeap->getTotalFreeSize()); - - JUT_ASSERT(2319, mStrapImg != NULL); +void dScnLogo_c::dvdDataLoad() { + dComIfG_setObjectRes("Always", (u8)0, NULL); + archiveHeap->dump_sort(); - mNintendoLogo = NULL; - mDolbyLogo = NULL; - mWarning = NULL; - mWarningStart = NULL; - mProgressiveChoice = NULL; - mProgressiveYes = NULL; - mProgressiveNo = NULL; - mProgressivePro = NULL; - mProgressiveInter = NULL; - mProgressiveSel = NULL; + dComIfG_setObjectRes("Alink", (u8)0, NULL); - OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 2341, archiveHeap->getTotalFreeSize()); - OS_REPORT("%d mLogo01Heap->getTotalFreeSize %08x\n\x1b[m", 2344, mLogo01Heap->getTotalFreeSize()); -} -#else -void dScnLogo_c::logoInitGC() { - ResTIMG* nintendoImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 4); - mNintendoLogo = new dDlst_2D_c(nintendoImg, 117, 154, 376, 104, 255); + // Mount font archive first so gz can show "tpgz loading..." text early #if VERSION == VERSION_GCN_JPN - mNintendoLogo->getPicture()->setWhite(JUtility::TColor(0, 70, 255, 255)); + mpFontResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontjp/fontres.arc", 1, + JKRArchive::MOUNT_MEM, NULL); +#elif VERSION == VERSION_GCN_PAL + mpFontResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fonteu/fontres.arc", 0, + JKRArchive::MOUNT_MEM, NULL); #else - mNintendoLogo->getPicture()->setWhite(JUtility::TColor(220, 0, 0, 255)); + mpFontResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontus/fontres.arc", 0, + JKRArchive::MOUNT_MEM, NULL); #endif - ResTIMG* dolbyImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 3); - mDolbyLogo = new dDlst_2D_c(dolbyImg, 189, 150, 232, 112, 255); - -#if VERSION == VERSION_GCN_PAL - u8 language = getPalLanguage(); - if (language >= 5) { - language = 0; - } - - static const char* choice[] = { - "50_60_choice_eng.bti", - "50_60_choice_ger.bti", - "50_60_choice_fra.bti", - "50_60_choice_spa.bti", - "50_60_choice_ita.bti", - }; - - static const char* yes[] = { - "60_set_eng.bti", - "60_set_ger.bti", - "60_set_fra.bti", - "60_set_spa.bti", - "60_set_ita.bti", - }; - - static const char* no[] = { - "50_set_eng.bti", - "50_set_ger.bti", - "50_set_fra.bti", - "50_set_spa.bti", - "50_set_ita.bti", - }; - - static const char* prog[] = { - "progressive_pro.bti", - "progressive_pro_gm.bti", - "progressive_pro_fr.bti", - "progressive_pro_sp.bti", - "progressive_pro_it.bti", - }; - - static const char* intr[] = { - "progressive_inter.bti", - "progressive_inter_gm.bti", - "progressive_inter_fr.bti", - "progressive_inter_sp.bti", - "progressive_inter_it.bti", - }; - - static const char* warning[] = { - "warning.bti", - "warning_gm.bti", - "warning_fr.bti", - "warning_sp.bti", - "warning_it.bti", - }; - - static const char* warningPs[] = { - "warning_pstart.bti", - "warning_pstart_gm.bti", - "warning_pstart_fr.bti", - "warning_pstart_sp.bti", - "warning_pstart_it.bti", - }; - - ResTIMG* warningImg = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', warning[language]); - mWarning = new dDlst_2D_c(warningImg, 0, 0, FB_WIDTH, FB_HEIGHT, 255); - - ResTIMG* warnStartImg = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', warningPs[language]); - mWarningStart = new dDlst_2D_c(warnStartImg, 0, 359, FB_WIDTH, 48, 255); - - ResTIMG* progChoiceImg = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', choice[language]); - mProgressiveChoice = new dDlst_2D_c(progChoiceImg, 113, 143, 416, 210, 255); - - ResTIMG* progYesImg = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', yes[language]); - mProgressiveYes = new dDlst_2D_c(progYesImg, 121, 352, 200, 72, 255); - mProgressiveYes->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); - - ResTIMG* progNoImg = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', no[language]); - mProgressiveNo = new dDlst_2D_c(progNoImg, 320, 352, 200, 72, 255); - mProgressiveNo->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); - - mProgressivePro = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', prog[language]); - mProgressiveInter = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', intr[language]); - mProgressiveSel = new dDlst_2D_c(mProgressivePro, 153, 309, 336, 88, 255); -#else - ResTIMG* warningImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 10); - mWarning = new dDlst_2D_c(warningImg, 0, 0, FB_WIDTH, FB_HEIGHT, 255); - - ResTIMG* warnStartImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 11); - mWarningStart = new dDlst_2D_c(warnStartImg, 0, 359, FB_WIDTH, 48, 255); - - ResTIMG* progChoiceImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 5); - mProgressiveChoice = new dDlst_2D_c(progChoiceImg, 113, 281, 416, 72, 255); - - ResTIMG* progYesImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 9); - mProgressiveYes = new dDlst_2D_c(progYesImg, 211, 372, 80, 32, 255); - mProgressiveYes->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); - - ResTIMG* progNoImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 7); - mProgressiveNo = new dDlst_2D_c(progNoImg, 350, 372, 80, 32, 255); - mProgressiveNo->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); - - mProgressivePro = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 8); - mProgressiveInter = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 6); - mProgressiveSel = new dDlst_2D_c(mProgressivePro, 153, 309, 336, 88, 255); -#endif -} -#endif - -void dScnLogo_c::dvdDataLoad() { - int rt; - - #if PLATFORM_WII || VERSION == VERSION_SHIELD - rt = dComIfG_setObjectRes("HomeBtn", (u8)0, NULL); - JUT_ASSERT(__LINE__, rt == 1); - - static const homeBtnData l_homeBtnData[] = { - {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, - {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, - {SC_LANG_FRENCH, "/res/HomeBtn/homeBtn_FRA.arc"}, - {SC_LANG_SPANISH, "/res/HomeBtn/homeBtn_SPA.arc"}, - {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, - {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, - {SC_LANG_ENGLISH, "/res/HomeBtn/homeBtn_ENG.arc"}, - }; - - u8 language = getPalLanguage(); - const homeBtnData* data = &l_homeBtnData[language]; - mpHomeBtnCommand = mDoDvdThd_toMainRam_c::create(data->path, 0, NULL); - mHomeBtnRegion = data->region; - #endif - - rt = dComIfG_setObjectRes("Always", (u8)0, NULL); - JUT_ASSERT(2420, rt == 1); - - OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 2421, archiveHeap->getTotalFreeSize()); - archiveHeap->dump_sort(); - - rt = dComIfG_setObjectRes("Alink", (u8)0, NULL); - JUT_ASSERT(2429, rt == 1); - - #if PLATFORM_WII || PLATFORM_SHIELD - rt = dComIfG_setObjectRes("NNGC", (u8)0, NULL); - JUT_ASSERT(2433, rt == 1); - #endif - - OS_REPORT("\x1b[32m%d archiveHeap->getTotalFreeSize %08x\n\x1b[m", 2436, archiveHeap->getTotalFreeSize()); - - mpField0Command = aramMount("/res/FieldMap/Field0.arc", mDoExt_getJ2dHeap()); - mpAlAnmCommand = aramMount("/res/Object/AlAnm.arc", NULL); - mpFmapResCommand = aramMount(FMAP_RES_PATH, mDoExt_getJ2dHeap()); - mpDmapResCommand = aramMount(DMAP_RES_PATH, mDoExt_getJ2dHeap()); - mpCollectResCommand = aramMount(COLLECT_RES_PATH, mDoExt_getJ2dHeap()); - mpItemIconCommand = aramMount("/res/Layout/itemicon.arc", mDoExt_getJ2dHeap()); - mpRingResCommand = aramMount(RING_RES_PATH, mDoExt_getJ2dHeap()); - mpPlayerNameCommand = aramMount("/res/Layout/playerName.arc", mDoExt_getJ2dHeap()); - mpItemInfResCommand = aramMount(ITEM_INF_RES_PATH, mDoExt_getJ2dHeap()); - mpButtonCommand = aramMount(BUTTON_RES_PATH, mDoExt_getJ2dHeap()); - mpCardIconCommand = aramMount(ICON_RES_PATH, mDoExt_getJ2dHeap()); + mpField0Command = mDoDvdThd_mountXArchive_c::create( + "/res/FieldMap/Field0.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpAlAnmCommand = + mDoDvdThd_mountXArchive_c::create("/res/Object/AlAnm.arc", 0, JKRArchive::MOUNT_ARAM, NULL); + mpFmapResCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/fmapres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpDmapResCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/dmapres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpCollectResCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/clctres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpItemIconCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/itemicon.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpRingResCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/ringres.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpPlayerNameCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/playerName.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpItemInfResCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/itmInfRes.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpButtonCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/button.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpCardIconCommand = mDoDvdThd_mountXArchive_c::create( + "/res/CardIcon/cardicon.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); #if VERSION == VERSION_GCN_PAL switch (getPalLanguage()) { case 1: - mpBmgResCommand = onMemMount("/res/Msgde/bmgres.arc"); + mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msgde/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); break; case 2: - mpBmgResCommand = onMemMount("/res/Msgfr/bmgres.arc"); + mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msgfr/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); break; case 3: - mpBmgResCommand = onMemMount("/res/Msgsp/bmgres.arc"); + mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msgsp/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); break; case 4: - mpBmgResCommand = onMemMount("/res/Msgit/bmgres.arc"); + mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msgit/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); break; case 0: default: - mpBmgResCommand = onMemMount("/res/Msguk/bmgres.arc"); - break; - } - #elif VERSION == VERSION_SHIELD_DEBUG - switch (getPalLanguage()) { - case 2: - mpBmgResCommand = onMemMount("/res/Msgfr/bmgres.arc"); - break; - case 3: - mpBmgResCommand = onMemMount("/res/Msgsp/bmgres.arc"); - break; - default: - mpBmgResCommand = onMemMount("/res/Msgus/bmgres.arc"); + mpBmgResCommand = mDoDvdThd_mountXArchive_c::create("/res/Msguk/bmgres.arc", 0, JKRArchive::MOUNT_MEM, NULL); break; } #else - mpBmgResCommand = onMemMount(MSG_PATH); - #endif - - mpMsgComCommand = aramMount(MSG_COM_PATH, mDoExt_getJ2dHeap()); - mpMsgResCommand[0] = aramMount(MSG_RES0_PATH, mDoExt_getJ2dHeap()); - mpMsgResCommand[1] = aramMount(MSG_RES1_PATH, mDoExt_getJ2dHeap()); - mpMsgResCommand[2] = aramMount(MSG_RES2_PATH, mDoExt_getJ2dHeap()); - mpMsgResCommand[3] = aramMount(MSG_RES3_PATH, mDoExt_getJ2dHeap()); + mpBmgResCommand = mDoDvdThd_mountXArchive_c::create(MSG_PATH, 0, JKRArchive::MOUNT_MEM, NULL); + #endif + + mpMsgComCommand = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgcom.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[0] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres00.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[1] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres01.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[2] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres02.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[3] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres03.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); #if VERSION == VERSION_GCN_JPN - mpMsgResCommand[4] = aramMount("/res/Layout/msgres04.arc", mDoExt_getJ2dHeap()); + mpMsgResCommand[4] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres04.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); #else - mpMsgResCommand[4] = aramMount("/res/Layout/msgres04F.arc", mDoExt_getJ2dHeap()); + mpMsgResCommand[4] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres04F.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); #endif - mpMsgResCommand[5] = aramMount("/res/Layout/msgres05.arc", mDoExt_getJ2dHeap()); - mpMsgResCommand[6] = aramMount("/res/Layout/msgres06.arc", mDoExt_getJ2dHeap()); - - mpMain2DCommand = onMemMount(MAIN2D_PATH); + mpMsgResCommand[5] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres05.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMsgResCommand[6] = mDoDvdThd_mountXArchive_c::create( + "/res/Layout/msgres06.arc", 0, JKRArchive::MOUNT_ARAM, mDoExt_getJ2dHeap()); + mpMain2DCommand = + mDoDvdThd_mountXArchive_c::create("/res/Layout/main2D.arc", 0, JKRArchive::MOUNT_MEM, NULL); #if VERSION == VERSION_GCN_JPN - mpFontResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontjp/fontres.arc", 1, JKRArchive::MOUNT_MEM, NULL); - mpRubyResCommand = onMemMount("/res/Fontjp/rubyres.arc"); + mpRubyResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontjp/rubyres.arc", 0, + JKRArchive::MOUNT_MEM, NULL); #elif VERSION == VERSION_GCN_PAL - mpFontResCommand = onMemMount("/res/Fonteu/fontres.arc"); - mpRubyResCommand = onMemMount("/res/Fonteu/rubyres.arc"); -#elif VERSION == VERSION_SHIELD_DEBUG - mpFontResCommand = onMemMount("/res/Fonteu/fontres.arc"); - mpRubyResCommand = onMemMount("/res/Fontus/rubyres.arc"); -#elif VERSION == VERSION_SHIELD - mpFontResCommand = onMemMount("/res/Fontcn/fontres.arc"); - mpRubyResCommand = onMemMount("/res/Fontcn/rubyres.arc"); + mpRubyResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fonteu/rubyres.arc", 0, + JKRArchive::MOUNT_MEM, NULL); #else - mpFontResCommand = onMemMount("/res/Fontus/fontres.arc"); - mpRubyResCommand = onMemMount("/res/Fontus/rubyres.arc"); + mpRubyResCommand = mDoDvdThd_mountXArchive_c::create("/res/Fontus/rubyres.arc", 0, + JKRArchive::MOUNT_MEM, NULL); #endif - - mParticleCommand = mDoDvdThd_toMainRam_c::create(PARTICLE_COM_PATH, 0, dComIfGp_particle_getResHeap()); - + mParticleCommand = mDoDvdThd_toMainRam_c::create("/res/Particle/common.jpc", 0, + dComIfGp_particle_getResHeap()); mItemTableCommand = mDoDvdThd_toMainRam_c::create("/res/ItemTable/item_table.bin", 0, NULL); - JUT_ASSERT(2620, mItemTableCommand != NULL); - mEnemyItemCommand = mDoDvdThd_toMainRam_c::create("/res/ItemTable/enemy_table.bin", 0, NULL); - JUT_ASSERT(2624, mEnemyItemCommand != NULL); preLoad_dyl_create(); preLoad_dyl(); @@ -1389,58 +399,13 @@ static int dScnLogo_Create(scene_class* i_this) { } static int dScnLogo_Execute(dScnLogo_c* i_this) { - fpc_ProcID id = fpcM_GetID(i_this); - if (mDoRst::isReset()) { fopScnM_ChangeReq(i_this, PROC_LOGO_SCENE, 0, 5); } - return 1; } -#if DEBUG -static u8 lbl_8074CA49; -#endif - static int dScnLogo_Draw(dScnLogo_c* i_this) { - #if DEBUG - int x = 36; - int y = 40; - - y += 12; - JUTReport(x, y, "COPYDATE %s", mDoMain::COPYDATE_STRING); - - y += 12; - JUTReport(x, y, "Build by %s", "Authorized User"); - - y += 12; - JUTReport(x, y, "_DEBUG/Debug version"); - - if (!lbl_8074CA49) { - lbl_8074CA49 = 1; - JUTReportConsole_f("COPYDATE %s\n", mDoMain::COPYDATE_STRING); - JUTReportConsole_f("Build by %s\n", "Authorized User"); - JUTReportConsole_f("_DEBUG/Debug version\n"); - JUTReportConsole_f("SDKVersion %s\n", "11Dec2009Patch02"); - - #if PLATFORM_WII || PLATFORM_SHIELD - JUTReportConsole_f("ConsoleSimMem %08x\n", OSGetConsoleSimulatedMem1Size()); - JUTReportConsole_f("PhysicalMemory %08x\n", OSGetPhysicalMem1Size()); - JUTReportConsole_f("ConsoleType %08x\n", OSGetConsoleType()); - JUTReportConsole_f("Language(PAL) %1x\n", SCGetLanguage()); - JUTReportConsole_f("Progressive %1x\n", SCGetProgressiveMode()); - JUTReportConsole_f("SoundMode %1x\n", SCGetSoundMode()); - #else - JUTReportConsole_f("ConsoleSimMem %08x\n", OSGetConsoleSimulatedMemSize()); - JUTReportConsole_f("PhysicalMemory %08x\n", OSGetPhysicalMemSize()); - JUTReportConsole_f("ConsoleType %08x\n", OSGetConsoleType()); - JUTReportConsole_f("Language(PAL) %1x\n", OSGetLanguage()); - JUTReportConsole_f("Progressive %1x\n", OSGetProgressiveMode()); - JUTReportConsole_f("SoundMode %1x\n", OSGetSoundMode()); - #endif - } - #endif - i_this->draw(); return 1; } @@ -1454,35 +419,9 @@ static int dScnLogo_IsDelete(dScnLogo_c* i_this) { return 1; } -#if VERSION == VERSION_GCN_PAL || PLATFORM_WII || PLATFORM_SHIELD +#if VERSION == VERSION_GCN_PAL u8 dScnLogo_c::getPalLanguage() { u8 language; - - #if PLATFORM_WII || PLATFORM_SHIELD - switch (SCGetLanguage()) { - case SC_LANG_JAPANESE: - language = 6; - break; - case SC_LANG_ENGLISH: - language = 0; - break; - case SC_LANG_GERMAN: - language = 1; - break; - case SC_LANG_FRENCH: - language = 2; - break; - case SC_LANG_SPANISH: - language = 3; - break; - case SC_LANG_ITALIAN: - language = 4; - break; - case SC_LANG_DUTCH: - language = 5; - break; - } - #else switch (OSGetLanguage()) { case OS_LANGUAGE_ENGLISH: language = 0; @@ -1503,20 +442,13 @@ u8 dScnLogo_c::getPalLanguage() { language = 5; break; } - #endif return language; } #endif void dScnLogo_c::setProgressiveMode(u8 mode) { - #if VERSION == VERSION_SHIELD_DEBUG - return; - #endif - - #if PLATFORM_WII - SCSetProgressiveMode(mode); - #elif VERSION == VERSION_GCN_PAL + #if VERSION == VERSION_GCN_PAL OSSetEuRgb60Mode(mode); #else OSSetProgressiveMode(mode); @@ -1524,10 +456,6 @@ void dScnLogo_c::setProgressiveMode(u8 mode) { } u8 dScnLogo_c::getProgressiveMode() { - #if PLATFORM_WII || PLATFORM_SHIELD - return SCGetProgressiveMode(); - #endif - #if VERSION == VERSION_GCN_PAL return OSGetEuRgb60Mode(); #else @@ -1547,6 +475,8 @@ void dScnLogo_c::setRenderMode() { mDoMch_render_c::setProgressiveMode(); } +dLog_HIO_c::~dLog_HIO_c() {} + static scene_method_class l_dScnLogo_Method = { (process_method_func)dScnLogo_Create, (process_method_func)dScnLogo_Delete, @@ -1566,5 +496,5 @@ scene_process_profile_definition g_profile_LOGO_SCENE = { 0, &g_fopScn_Method.base, &l_dScnLogo_Method, - 0, + NULL, }; From b5ecc28a5efac3eab7024cc31434620b7126c30d Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 7 Mar 2026 14:47:54 -0700 Subject: [PATCH 21/35] continue merging --- .gdbinit | 5 +---- configure.py | 20 ++++++++++++++++++-- libs/dolphin/src/card/CARDBios.c | 2 +- libs/dolphin/src/card/CARDBlock.c | 2 +- libs/dolphin/src/card/CARDCheck.c | 2 +- libs/dolphin/src/card/CARDCreate.c | 2 +- libs/dolphin/src/card/CARDDelete.c | 2 +- libs/dolphin/src/card/CARDDir.c | 2 +- libs/dolphin/src/card/CARDErase.c | 2 +- libs/dolphin/src/card/CARDFormat.c | 2 +- libs/dolphin/src/card/CARDMount.c | 2 +- libs/dolphin/src/card/CARDNet.c | 2 +- libs/dolphin/src/card/CARDOpen.c | 2 +- libs/dolphin/src/card/CARDProgram.c | 2 +- libs/dolphin/src/card/CARDRaw.c | 2 +- libs/dolphin/src/card/CARDRdwr.c | 2 +- libs/dolphin/src/card/CARDRead.c | 2 +- libs/dolphin/src/card/CARDRename.c | 2 +- libs/dolphin/src/card/CARDStat.c | 2 +- libs/dolphin/src/card/CARDStatEx.c | 2 +- libs/dolphin/src/card/CARDUnlock.c | 2 +- libs/dolphin/src/card/CARDWrite.c | 2 +- src/d/d_s_play.cpp | 4 +++- src/gz/gz.cpp | 2 -- 24 files changed, 42 insertions(+), 29 deletions(-) diff --git a/.gdbinit b/.gdbinit index 14b6f187fc1..82677572da4 100644 --- a/.gdbinit +++ b/.gdbinit @@ -1,5 +1,2 @@ set confirm off -file build/GZ2E01/framework.elf -source build/GZ2E01/load_rel_symbols.gdb -target remote 192.168.86.208:2159 -load-all-symbols +source /home/pheenoh/git/cpp/decompgz/build/GZ2E01/load_rel_symbols.py diff --git a/configure.py b/configure.py index 2a7277adcb9..e31be542908 100755 --- a/configure.py +++ b/configure.py @@ -2981,6 +2981,23 @@ def MatchingFor(*versions) -> bool: ActorRel(MatchingFor(ALL_GCN), "d_a_title", [], True), ActorRel(MatchingFor(ALL_GCN), "d_a_warp_bug"), + # Extra dolphin SDK objects needed by the mod (not in the vanilla DOL). + *( + [ + { + "lib": "mod_dolphin", + "src_dir": "libs/dolphin/src", + "strip_prefix": "dolphin/", + "mw_version": "GC/1.2.5n", + "cflags": cflags_dolphin, + "objects": [Object(Custom, obj) for obj in + getattr(mod_config, "extra_objects", []) + ], + }, + ] + if mod_config is not None and getattr(mod_config, "extra_objects", []) + else [] + ), # mod objects (read from mod_config.py, generated by setup_mod.py) *( [ @@ -2989,8 +3006,7 @@ def MatchingFor(*versions) -> bool: "mw_version": MWVersion(config.version), "cflags": cflags_framework, "objects": [Object(Custom, obj) for obj in ( - getattr(mod_config, "extra_objects", []) - + getattr(mod_config, "umbra_objects", []) + getattr(mod_config, "umbra_objects", []) + getattr(mod_config, "mod_objects", []) )], }, diff --git a/libs/dolphin/src/card/CARDBios.c b/libs/dolphin/src/card/CARDBios.c index e5960311dc4..e29345675a0 100644 --- a/libs/dolphin/src/card/CARDBios.c +++ b/libs/dolphin/src/card/CARDBios.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" #if DEBUG const char* __CARDVersion = "<< Dolphin SDK - CARD\tdebug build: Apr 5 2004 03:56:53 (0x2301) >>"; diff --git a/libs/dolphin/src/card/CARDBlock.c b/libs/dolphin/src/card/CARDBlock.c index 974386c09c1..b7af255ddf9 100644 --- a/libs/dolphin/src/card/CARDBlock.c +++ b/libs/dolphin/src/card/CARDBlock.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" // prototypes static void WriteCallback(s32 chan, s32 result); diff --git a/libs/dolphin/src/card/CARDCheck.c b/libs/dolphin/src/card/CARDCheck.c index b3f5792840c..4a9b78c736a 100644 --- a/libs/dolphin/src/card/CARDCheck.c +++ b/libs/dolphin/src/card/CARDCheck.c @@ -1,7 +1,7 @@ #include #include "os/__os.h" -#include +#include "__card.h" // prototypes static s32 VerifyID(CARDControl* card); diff --git a/libs/dolphin/src/card/CARDCreate.c b/libs/dolphin/src/card/CARDCreate.c index ad4ddd67991..7da5ab09111 100644 --- a/libs/dolphin/src/card/CARDCreate.c +++ b/libs/dolphin/src/card/CARDCreate.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" // prototypes static void CreateCallbackFat(s32 chan, s32 result); diff --git a/libs/dolphin/src/card/CARDDelete.c b/libs/dolphin/src/card/CARDDelete.c index 223c43c5486..0acf24be1c4 100644 --- a/libs/dolphin/src/card/CARDDelete.c +++ b/libs/dolphin/src/card/CARDDelete.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" // prototypes static void DeleteCallback(s32 chan, s32 result); diff --git a/libs/dolphin/src/card/CARDDir.c b/libs/dolphin/src/card/CARDDir.c index 8e2f73750e9..e154a9c428c 100644 --- a/libs/dolphin/src/card/CARDDir.c +++ b/libs/dolphin/src/card/CARDDir.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" // prototypes static void WriteCallback(s32 chan, s32 result); diff --git a/libs/dolphin/src/card/CARDErase.c b/libs/dolphin/src/card/CARDErase.c index cbf3e1e8982..73bb8ef04b9 100644 --- a/libs/dolphin/src/card/CARDErase.c +++ b/libs/dolphin/src/card/CARDErase.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" static void EraseCallback(s32 chan, s32 result) { CARDControl* card; diff --git a/libs/dolphin/src/card/CARDFormat.c b/libs/dolphin/src/card/CARDFormat.c index 5b20ffa5a1c..7bcc76daa1e 100644 --- a/libs/dolphin/src/card/CARDFormat.c +++ b/libs/dolphin/src/card/CARDFormat.c @@ -1,7 +1,7 @@ #include #include "os/__os.h" -#include +#include "__card.h" static void FormatCallback(s32 chan, s32 result) { CARDControl* card; diff --git a/libs/dolphin/src/card/CARDMount.c b/libs/dolphin/src/card/CARDMount.c index 988e832b28d..4ca607dc3b5 100644 --- a/libs/dolphin/src/card/CARDMount.c +++ b/libs/dolphin/src/card/CARDMount.c @@ -2,7 +2,7 @@ #include #include "os/__os.h" -#include +#include "__card.h" static u32 SectorSizeTable[8] = { 8 * 1024, 16 * 1024, 32 * 1024, 64 * 1024, 128 * 1024, 256 * 1024, 0, 0, diff --git a/libs/dolphin/src/card/CARDNet.c b/libs/dolphin/src/card/CARDNet.c index 3dcd369f94c..5f43d3becf7 100644 --- a/libs/dolphin/src/card/CARDNet.c +++ b/libs/dolphin/src/card/CARDNet.c @@ -1,7 +1,7 @@ #include #include "os/__os.h" -#include +#include "__card.h" u16 __CARDVendorID = 0xFFFF; u8 __CARDPermMask = 0x1C; diff --git a/libs/dolphin/src/card/CARDOpen.c b/libs/dolphin/src/card/CARDOpen.c index 24a89e15f4f..bd86568291b 100644 --- a/libs/dolphin/src/card/CARDOpen.c +++ b/libs/dolphin/src/card/CARDOpen.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" BOOL __CARDCompareFileName(CARDDir* ent, const char* fileName) { char* entName = (char*)ent->fileName; diff --git a/libs/dolphin/src/card/CARDProgram.c b/libs/dolphin/src/card/CARDProgram.c index f1183d937ce..2e603777fa4 100644 --- a/libs/dolphin/src/card/CARDProgram.c +++ b/libs/dolphin/src/card/CARDProgram.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" #define TRUNC(n, a) (((u32)(n)) & ~((a)-1)) #define CARD_PROGRAM_SIZE 128 diff --git a/libs/dolphin/src/card/CARDRaw.c b/libs/dolphin/src/card/CARDRaw.c index 5b412d8a613..584a9be9c2e 100644 --- a/libs/dolphin/src/card/CARDRaw.c +++ b/libs/dolphin/src/card/CARDRaw.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" s32 __CARDRawReadAsync(s32 chan, void* buf, s32 length, s32 offset, CARDCallback callback) { CARDControl* card; diff --git a/libs/dolphin/src/card/CARDRdwr.c b/libs/dolphin/src/card/CARDRdwr.c index 5716227214f..8350f57ac44 100644 --- a/libs/dolphin/src/card/CARDRdwr.c +++ b/libs/dolphin/src/card/CARDRdwr.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" // prototypes static void BlockReadCallback(s32 chan, s32 result); diff --git a/libs/dolphin/src/card/CARDRead.c b/libs/dolphin/src/card/CARDRead.c index 4ecbfbcca9c..74bd544a6f4 100644 --- a/libs/dolphin/src/card/CARDRead.c +++ b/libs/dolphin/src/card/CARDRead.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" #define TRUNC(n, a) (((u32)(n)) & ~((a)-1)) diff --git a/libs/dolphin/src/card/CARDRename.c b/libs/dolphin/src/card/CARDRename.c index 2873347d263..0a76aca32ba 100644 --- a/libs/dolphin/src/card/CARDRename.c +++ b/libs/dolphin/src/card/CARDRename.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" s32 CARDRenameAsync(s32 chan, const char* old, const char* new, CARDCallback callback) { CARDControl* card; diff --git a/libs/dolphin/src/card/CARDStat.c b/libs/dolphin/src/card/CARDStat.c index 89e303f5a56..f99455b42b1 100644 --- a/libs/dolphin/src/card/CARDStat.c +++ b/libs/dolphin/src/card/CARDStat.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" static void UpdateIconOffsets(CARDDir* ent, CARDStat* stat) { u32 offset; diff --git a/libs/dolphin/src/card/CARDStatEx.c b/libs/dolphin/src/card/CARDStatEx.c index 1555a17fe91..0ec84c1cea4 100644 --- a/libs/dolphin/src/card/CARDStatEx.c +++ b/libs/dolphin/src/card/CARDStatEx.c @@ -1,7 +1,7 @@ #include #include -#include +#include "__card.h" s32 __CARDGetStatusEx(s32 chan, s32 fileNo, CARDDir* dirent) { ASSERTLINE(85, 0 <= chan && chan < 2); diff --git a/libs/dolphin/src/card/CARDUnlock.c b/libs/dolphin/src/card/CARDUnlock.c index eb16f062244..48f64e500a4 100644 --- a/libs/dolphin/src/card/CARDUnlock.c +++ b/libs/dolphin/src/card/CARDUnlock.c @@ -2,7 +2,7 @@ #include #include -#include +#include "__card.h" static u8 CardData[352] ATTRIBUTE_ALIGN(DOLPHIN_ALIGNMENT) = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, diff --git a/libs/dolphin/src/card/CARDWrite.c b/libs/dolphin/src/card/CARDWrite.c index 082947558c8..ad9fa4a2731 100644 --- a/libs/dolphin/src/card/CARDWrite.c +++ b/libs/dolphin/src/card/CARDWrite.c @@ -1,6 +1,6 @@ #include -#include +#include "__card.h" // prototypes static void WriteCallback(s32 chan, s32 result); diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 5e340046326..9391c21cf11 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -142,7 +142,7 @@ s8 dScnPly_c::calcPauseTimer() { } } -#if DEBUG +#if ENABLE_REGHIO dScnPly_reg_childHIO_c::dScnPly_reg_childHIO_c() { for (int i = 0; i < 30; i++) { mFloatReg[i] = 0.0f; @@ -218,7 +218,9 @@ void dScnPly_reg_HIO_c::genMessage(JORMContext* mctx) { mctx->genNode(l_nodeName[i], &mChildReg[i], 0, 0); } } +#endif +#if DEBUG dScnPly_preset_HIO_c::dScnPly_preset_HIO_c() { field_0x5 = 0; memset(mPresetData, 0, sizeof(mPresetData)); diff --git a/src/gz/gz.cpp b/src/gz/gz.cpp index dfc64e48ae1..1d2f428ff2e 100644 --- a/src/gz/gz.cpp +++ b/src/gz/gz.cpp @@ -523,8 +523,6 @@ int gzInfo_c::execute() { #ifndef __REVOLUTION_SDK__ umbraDetectPlatform(); #endif - umbra_gdb_install_crash_handlers(); - int settingsResult = loadSettings(); mGZInitialized = true; From e3c8b7282656aa114fb989773050c55d9caa0748 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 7 Mar 2026 14:49:01 -0700 Subject: [PATCH 22/35] make post-build opt in --- configure.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.py b/configure.py index e31be542908..a7208e397c0 100755 --- a/configure.py +++ b/configure.py @@ -3208,7 +3208,7 @@ def link_order_callback(module_id: int, objects: List[str]) -> List[str]: build {assets_stamp}: mod_assets_checksum | tools/check_mod_assets.py always # Rebuild ISO -build {output_iso}: rebuild_iso | {dol_output} {rel_output} tools/rebuild-decomp-tp.py {assets_stamp} || post-build +build {output_iso}: rebuild_iso | {dol_output} {rel_output} tools/rebuild-decomp-tp.py {assets_stamp} """ content = content.replace( From aa97f72d9a46f8425be902817b1b1172d905fab9 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 7 Mar 2026 15:08:04 -0700 Subject: [PATCH 23/35] update README with gdb info --- README.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/README.md b/README.md index 89681c569ba..130941d1662 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,44 @@ To add new features to the practice ROM: - Look at existing custom files in `src/gz/` for examples of how to structure and integrate new code - Re-run `python configure.py -v VERSION` and `ninja` to include your changes +## GDB Remote Debugging + +Umbra includes a GDB remote stub for source-level debugging of game code. It supports both real hardware via [umbra-nintendont](https://github.com/zsrtp/umbra-nintendont) and emulation via [umbra-dolphin](https://github.com/zsrtp/umbra-dolphin). + +### Setup + +GDB tooling is not built by default. If you want to use the debugger, run the post-build step after your initial build: + +```sh +ninja post-build +``` + +This builds `powerpc-eabi-gdb` from source with Python scripting support, generates the symbol loader script, and converts MetroWerks DWARF 1 debug info to DWARF 2. This only needs to run once (or when source files change). + +### Connecting + +**VS Code (recommended):** Install the [GDB DAP](https://marketplace.visualstudio.com/items?itemName=OlegTolmatcev.gdb-dap) extension. Launch configurations are provided in `.vscode/launch.json` ("Attach to Nintendont" or "Attach to Dolphin"). Symbols are loaded automatically on connect. + +**Command line:** + +```sh +build/binutils/powerpc-eabi-gdb build/GZ2E01/framework.elf \ + -ex "source build/GZ2E01/load_rel_symbols.py" \ + -ex "target remote 192.168.1.100:2159" +``` + +### GDB Commands + +DOL and REL symbols are loaded automatically on connect via a stop event handler. The following commands are also available manually in the GDB console: + +| Command | Description | +|---------|-------------| +| `load-dol-symbols` | Load DOL (framework.elf) symbols + DWARF debug info | +| `load-rel-symbols` | Walk the OS module list and load PLF symbols for all RELs | +| `load-all-symbols` | Run both `load-dol-symbols` and `load-rel-symbols` | +| `load-debug-for ` | Load DWARF debug info for a specific REL module by ID | +| `dbg-` | Shorthand for `load-debug-for` (e.g. `dbg-d_a_grass`) | + ## Adding Custom Assets - Place your custom asset into the `mod_assets` directory. The directory structure will be copied 1:1 to the final disc image. From b9d907e6b5e1516acc8f92a4c785470c594f32fa Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 7 Mar 2026 15:59:40 -0700 Subject: [PATCH 24/35] use gdb wrapper script --- .vscode/launch.json | 4 ++-- tools/gen_gdb_rel_loader.py | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 97ff768c4a8..b4fee64e86f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -7,7 +7,7 @@ "request": "attach", "program": "${workspaceFolder}/build/${input:gameId}/framework.elf", "target": "${input:wiiAddress}:${input:gdbPort}", - "debugAdapterExecutable": "${workspaceFolder}/build/binutils/powerpc-eabi-gdb" + "debugAdapterExecutable": "${workspaceFolder}/build/binutils/gdb-wrapper.sh" }, { "name": "Attach to Dolphin", @@ -15,7 +15,7 @@ "request": "attach", "program": "${workspaceFolder}/build/${input:gameId}/framework.elf", "target": "${input:dolphinAddress}:${input:gdbPort}", - "debugAdapterExecutable": "${workspaceFolder}/build/binutils/powerpc-eabi-gdb" + "debugAdapterExecutable": "${workspaceFolder}/build/binutils/gdb-wrapper.sh" } ], "inputs": [ diff --git a/tools/gen_gdb_rel_loader.py b/tools/gen_gdb_rel_loader.py index 8b742746c89..40659046606 100644 --- a/tools/gen_gdb_rel_loader.py +++ b/tools/gen_gdb_rel_loader.py @@ -306,6 +306,19 @@ def main(): f.write("set confirm off\n") f.write("source %s\n" % out_path) + # Generate GDB wrapper script for VS Code DAP. + # The gdb-dap extension may not set CWD to the workspace folder, so + # GDB wouldn't find .gdbinit. The wrapper ensures GDB starts in the + # repo root. + binutils_dir = os.path.join(repo_root, "build", "binutils") + gdb_binary = os.path.join(binutils_dir, "powerpc-eabi-gdb") + wrapper_path = os.path.join(binutils_dir, "gdb-wrapper.sh") + with open(wrapper_path, "w") as f: + f.write("#!/bin/bash\n") + f.write('cd "%s"\n' % repo_root) + f.write('exec "%s" "$@"\n' % gdb_binary) + os.chmod(wrapper_path, 0o755) + print("Generated %s (%d module mappings)" % (out_path, len(modules))) From 2654105d2350c9a6466ffe1f143a9ee81ac4c3ff Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Sat, 7 Mar 2026 18:42:55 -0700 Subject: [PATCH 25/35] nintendont gdb support, skip building gdb on windows --- src/umbra/umbra_gdb.cpp | 156 ++++++++++++++++++++++++++++++++++++++++ tools/build_gdb.py | 33 +++++---- 2 files changed, 177 insertions(+), 12 deletions(-) diff --git a/src/umbra/umbra_gdb.cpp b/src/umbra/umbra_gdb.cpp index 7da509b8dc2..3219bfa81b1 100644 --- a/src/umbra/umbra_gdb.cpp +++ b/src/umbra/umbra_gdb.cpp @@ -3,6 +3,7 @@ #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" #include #include +#include #include #include "umbra/umbra_gdb.h" @@ -10,9 +11,13 @@ #include "umbra/umbra_platform.h" extern "C" { + void OSReport(const char* msg, ...); void AIStopDMA(void); void AIStartDMA(void); BOOL OSDisableInterrupts(void); + __OSExceptionHandler __OSSetExceptionHandler(__OSException exception, + __OSExceptionHandler handler); + void OSLoadContext(OSContext* ctx); } /* Must match kernel/gdb.h */ @@ -171,8 +176,148 @@ static void save_ctx_to_shm(OSContext* ctx, u32 exc_vector) { GDB_SHM_BASE[SHM_SIGNAL] = exception_to_signal(exc_vector); } +static void restore_shm_to_ctx(OSContext* ctx, u32 state) { + for (int i = 0; i < 32; i++) + ctx->gpr[i] = GDB_SHM_BASE[SHM_GPR_BASE + i]; + + ctx->srr0 = GDB_SHM_BASE[SHM_PC]; + ctx->lr = GDB_SHM_BASE[SHM_LR]; + ctx->cr = GDB_SHM_BASE[SHM_CR]; + ctx->ctr = GDB_SHM_BASE[SHM_CTR]; + ctx->xer = GDB_SHM_BASE[SHM_XER]; + + u32 msr = GDB_SHM_BASE[SHM_MSR]; + if (state == GDB_STATE_STEP) + msr = (msr | MSR_SE) & ~MSR_EE; + else + msr = (msr & ~MSR_SE) | s_saved_msr_ee; + ctx->srr1 = msr; + + volatile u64* fpr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPR_BYTE_OFF); + for (int i = 0; i < 32; i++) + *(volatile u64*)&ctx->fpr[i] = fpr_shm[i]; + volatile u64* fpscr_shm = (volatile u64*)((u8*)GDB_SHM_BASE + SHM_FPSCR_BYTE_OFF); + ctx->fpscr = (u32)*fpscr_shm; +} + +static __OSExceptionHandler s_old_program_handler; +static __OSExceptionHandler s_old_trace_handler; + +/* Forward declaration — C handler entered from asm stub. */ +static void gdb_exc_handler(__OSException exception, OSContext* ctx); + +/* OS exception trampoline saves r3-r5, CR, LR, CTR, XER, SRR0, SRR1. + * This asm stub saves the remaining GPRs before entering C code, + * so OSLoadContext can restore the full register set on resume. */ +static asm void gdb_exc_asm_stub(void) { + nofralloc + stw r0, OS_CONTEXT_R0(r4) + stw r1, OS_CONTEXT_R1(r4) + stw r2, OS_CONTEXT_R2(r4) + stw r6, OS_CONTEXT_R6(r4) + stw r7, OS_CONTEXT_R7(r4) + stw r8, OS_CONTEXT_R8(r4) + stw r9, OS_CONTEXT_R9(r4) + stw r10, OS_CONTEXT_R10(r4) + stw r11, OS_CONTEXT_R11(r4) + stw r12, OS_CONTEXT_R12(r4) + stw r13, OS_CONTEXT_R13(r4) + stw r14, OS_CONTEXT_R14(r4) + stw r15, OS_CONTEXT_R15(r4) + stw r16, OS_CONTEXT_R16(r4) + stw r17, OS_CONTEXT_R17(r4) + stw r18, OS_CONTEXT_R18(r4) + stw r19, OS_CONTEXT_R19(r4) + stw r20, OS_CONTEXT_R20(r4) + stw r21, OS_CONTEXT_R21(r4) + stw r22, OS_CONTEXT_R22(r4) + stw r23, OS_CONTEXT_R23(r4) + stw r24, OS_CONTEXT_R24(r4) + stw r25, OS_CONTEXT_R25(r4) + stw r26, OS_CONTEXT_R26(r4) + stw r27, OS_CONTEXT_R27(r4) + stw r28, OS_CONTEXT_R28(r4) + stw r29, OS_CONTEXT_R29(r4) + stw r30, OS_CONTEXT_R30(r4) + stw r31, OS_CONTEXT_R31(r4) + stwu r1, -8(r1) + b gdb_exc_handler +} + +static void gdb_exc_handler(__OSException exception, OSContext* ctx) { + OSReport("tpgz: gdb_exc_handler entered, exc=%d srr0=0x%08X\n", + exception, ctx->srr0); + + if (GDB_SHM_BASE[SHM_MAGIC] != GDB_SHM_MAGIC) { + OSReport("tpgz: SHM magic not set, chaining\n"); + __OSExceptionHandler old = (exception == __OS_EXCEPTION_PROGRAM) ? + s_old_program_handler : s_old_trace_handler; + if (old) + old(exception, ctx); + return; + } + + u32 exc_vector = (exception == __OS_EXCEPTION_TRACE) ? 0xD00 : 0x700; + + /* Only save MSR_EE / timebase / stop DMA on initial break (Program exception). + * Trace exceptions from single-step have MSR_EE deliberately cleared; + * re-saving would lose the original EE state and resume with interrupts + * permanently disabled — causing DVD errors, timer failures, etc. */ + if (exception != __OS_EXCEPTION_TRACE) { + s_saved_msr_ee = ctx->srr1 & MSR_EE; + } + + save_ctx_to_shm(ctx, exc_vector); + GDB_SHM_BASE[SHM_STATE] = GDB_STATE_STOPPED; + + if (exception != __OS_EXCEPTION_TRACE) { + save_timebase(); + AIStopDMA(); + } + + OSReport("tpgz: waiting for debugger (vec=0x%X)\n", exc_vector); + + while (1) { + u32 state = GDB_SHM_BASE[SHM_STATE]; + + if (state == GDB_STATE_RESUME || state == GDB_STATE_STEP) { + restore_shm_to_ctx(ctx, state); + process_ic_inval(); + ICFlashInvalidate(); + if (state == GDB_STATE_RESUME) { + restore_timebase(); + AIStartDMA(); + } + OSLoadContext(ctx); + } else if (state == GDB_STATE_DETACH) { + u32 exit_req = GDB_SHM_BASE[SHM_EXIT_REQ]; + GDB_SHM_BASE[SHM_MAGIC] = 0; + process_ic_inval(); + ICFlashInvalidate(); + restore_timebase(); + AIStartDMA(); + if (exit_req == 1) { + GDB_SHM_BASE[SHM_EXIT_REQ] = 0; + do_game_exit(); + } + ctx->srr1 = (ctx->srr1 & ~MSR_SE) | s_saved_msr_ee; + OSLoadContext(ctx); + } + } +} + +static void install_exc_handlers(void) { + s_old_program_handler = __OSSetExceptionHandler( + __OS_EXCEPTION_PROGRAM, (__OSExceptionHandler)gdb_exc_asm_stub); + s_old_trace_handler = __OSSetExceptionHandler( + __OS_EXCEPTION_TRACE, (__OSExceptionHandler)gdb_exc_asm_stub); +} + extern "C" void umbra_gdb_auto_start(u16 port) { s_gdb_port = port; + if (umbraIsNintendont()) { + install_exc_handlers(); + } start_gdb_server(port); } @@ -272,6 +417,7 @@ static void do_game_exit(void) { extern "C" void umbra_gdb_poll(void) { static u32 heartbeat = 0; + static bool exc_handlers_installed = false; /* SHM lives in uncached MEM2 — only exists on real Wii, not Dolphin. */ if (!umbraIsNintendont()) @@ -281,6 +427,16 @@ extern "C" void umbra_gdb_poll(void) { if (magic != GDB_SHM_MAGIC) return; + if (!exc_handlers_installed) { + exc_handlers_installed = true; + install_exc_handlers(); + } + + /* Process any pending icache invalidation requests from ARM. + * Critical after dirty disconnect: ARM restores original instructions + * but PPC icache may still have stale trap instructions. */ + process_ic_inval(); + if (GDB_SHM_BASE[SHM_EXIT_REQ] == 1) { GDB_SHM_BASE[SHM_EXIT_REQ] = 0; do_game_exit(); diff --git a/tools/build_gdb.py b/tools/build_gdb.py index 432f1efc409..6cf748d7bbb 100644 --- a/tools/build_gdb.py +++ b/tools/build_gdb.py @@ -57,31 +57,31 @@ def build_gdb(src_dir: Path, work_dir: Path, prefix: Path) -> None: build_dir.mkdir(parents=True, exist_ok=True) jobs = str(os.cpu_count() or 4) + configure_path = str(src_dir / "configure") + prefix_path = str(prefix) + + def run(cmd_args, **kwargs): + subprocess.check_call(cmd_args, cwd=build_dir, **kwargs) # Configure - configure = src_dir / "configure" - cmd = [ - str(configure), + configure_cmd = [ + configure_path, "--target=powerpc-eabi", - f"--prefix={prefix}", + f"--prefix={prefix_path}", "--with-python=python3", "--disable-sim", "--disable-nls", "--disable-werror", ] print("Configuring GDB...") - subprocess.check_call(cmd, cwd=build_dir, stdout=subprocess.DEVNULL) + run(configure_cmd, stdout=subprocess.DEVNULL) # Build print("Building GDB (this may take a few minutes)...") - subprocess.check_call( - ["make", f"-j{jobs}"], cwd=build_dir, stdout=subprocess.DEVNULL - ) + run(["make", f"-j{jobs}"], stdout=subprocess.DEVNULL) # Install - subprocess.check_call( - ["make", "install"], cwd=build_dir, stdout=subprocess.DEVNULL - ) + run(["make", "install"], stdout=subprocess.DEVNULL) def main() -> None: @@ -98,11 +98,20 @@ def main() -> None: if not binutils_dir.exists(): sys.exit(f"Binutils directory not found: {binutils_dir}") - gdb_binary = binutils_dir / "powerpc-eabi-gdb" + EXE = ".exe" if sys.platform == "win32" else "" + gdb_binary = binutils_dir / f"powerpc-eabi-gdb{EXE}" if gdb_binary.exists(): print(f"GDB already exists at {gdb_binary}, skipping build") return + if sys.platform == "win32": + print( + "WARNING: Building GDB from source is not supported on Windows.\n" + "GDB debugging requires powerpc-eabi-gdb (v14.1+, for DAP support).\n" + f"Place powerpc-eabi-gdb.exe in: {binutils_dir}" + ) + return + work_dir = binutils_dir.parent / "gdb-build" work_dir.mkdir(parents=True, exist_ok=True) From 0b0fdd1f60193d1e3e610326cc2cf2a7b558d366 Mon Sep 17 00:00:00 2001 From: Huitzi <73550465+marwernerh@users.noreply.github.com> Date: Mon, 9 Mar 2026 21:33:31 -0400 Subject: [PATCH 26/35] Actor status consolidation & process profile definition editing (#3117) * Consolidate fopAcM_STATUS into fopAc_Status_e * Add _e suffix to fopAcStts enums * Prepare for profile enumeration * Correct typo in scene_process_profile_definition * Manually handle g_profile_Obj_DamCps (inline preprocessing) * Correct g_profile_TAG_LV5SOUP procname to enum * Create d_priority.h * Update process profile definitions * Moved inline comments to the left * Add missing fopAcStts enums * Add d_priority.h include in f_pc_leaf.h * Manually update d_a_obj_damCps profile * Replace fopAcStts enums replacing and anticipatory profile size correction * Changed profile size from literal to sizeof() in anticipation of PR #3116 * Provided putative names to staff-related status enums * Replaced appropriate literals with fopAcStts enums * Fix borked merge * Rename item number enums and move to d_item_data.h * Rename process profile name & draw priority enums * Move process profile name & draw priority enums to appropriate files * Moved fpcNm_ enums from d/d_procname.h to f_pc/f_pc_name.h * Moved fpcDwPi_ enums from d/d_priority.h to f_pc/f_pc_draw_priority.h * ACTUALLY (whoops) stage merge * Correct item mistranslation Co-authored-by: LagoLunatic --------- Co-authored-by: LagoLunatic --- include/d/actor/d_a_alink.h | 20 +- include/d/actor/d_a_arrow.h | 4 +- include/d/actor/d_a_npc_ins.h | 2 +- include/d/actor/d_a_npc_jagar.h | 2 +- include/d/actor/d_a_npc_shad.h | 6 +- include/d/actor/d_a_obj_eff.h | 2 +- include/d/actor/d_a_player.h | 20 +- include/d/actor/d_a_tag_lantern.h | 2 +- include/d/actor/d_a_tag_mhint.h | 2 +- include/d/d_bomb.h | 26 +- include/d/d_com_inf_game.h | 2 +- include/d/d_item_data.h | 259 +++ include/d/d_k_wmark.h | 2 +- include/d/d_procname.h | 805 ---------- include/d/d_save.h | 2 +- include/f_op/f_op_actor.h | 41 +- include/f_op/f_op_actor_mng.h | 49 +- include/f_op/f_op_scene.h | 2 +- include/f_pc/f_pc_draw_priority.h | 786 +++++++++ include/f_pc/f_pc_leaf.h | 2 +- include/f_pc/f_pc_name.h | 1060 +++++++++--- src/c/c_damagereaction.cpp | 6 +- src/c/c_dylink.cpp | 1520 +++++++++--------- src/d/actor/d_a_L7demo_dr.cpp | 32 +- src/d/actor/d_a_L7low_dr.cpp | 28 +- src/d/actor/d_a_L7op_demo_dr.cpp | 28 +- src/d/actor/d_a_alink.cpp | 482 +++--- src/d/actor/d_a_alink_boom.inc | 16 +- src/d/actor/d_a_alink_bottle.inc | 150 +- src/d/actor/d_a_alink_bow.inc | 46 +- src/d/actor/d_a_alink_canoe.inc | 48 +- src/d/actor/d_a_alink_copyrod.inc | 10 +- src/d/actor/d_a_alink_crawl.inc | 2 +- src/d/actor/d_a_alink_cut.inc | 20 +- src/d/actor/d_a_alink_damage.inc | 10 +- src/d/actor/d_a_alink_demo.inc | 652 ++++---- src/d/actor/d_a_alink_effect.inc | 8 +- src/d/actor/d_a_alink_grab.inc | 132 +- src/d/actor/d_a_alink_guard.inc | 28 +- src/d/actor/d_a_alink_hang.inc | 14 +- src/d/actor/d_a_alink_hook.inc | 42 +- src/d/actor/d_a_alink_horse.inc | 18 +- src/d/actor/d_a_alink_hvyboots.inc | 2 +- src/d/actor/d_a_alink_iceleaf.inc | 4 +- src/d/actor/d_a_alink_ironball.inc | 16 +- src/d/actor/d_a_alink_kandelaar.inc | 20 +- src/d/actor/d_a_alink_link.inc | 8 +- src/d/actor/d_a_alink_spinner.inc | 6 +- src/d/actor/d_a_alink_swim.inc | 14 +- src/d/actor/d_a_alink_whistle.inc | 12 +- src/d/actor/d_a_alink_wolf.inc | 108 +- src/d/actor/d_a_alldie.cpp | 28 +- src/d/actor/d_a_andsw.cpp | 30 +- src/d/actor/d_a_andsw2.cpp | 30 +- src/d/actor/d_a_arrow.cpp | 36 +- src/d/actor/d_a_b_bh.cpp | 28 +- src/d/actor/d_a_b_bq.cpp | 56 +- src/d/actor/d_a_b_dr.cpp | 54 +- src/d/actor/d_a_b_dre.cpp | 36 +- src/d/actor/d_a_b_ds.cpp | 52 +- src/d/actor/d_a_b_gg.cpp | 70 +- src/d/actor/d_a_b_gm.cpp | 50 +- src/d/actor/d_a_b_gnd.cpp | 46 +- src/d/actor/d_a_b_go.cpp | 30 +- src/d/actor/d_a_b_gos.cpp | 28 +- src/d/actor/d_a_b_mgn.cpp | 40 +- src/d/actor/d_a_b_ob.cpp | 56 +- src/d/actor/d_a_b_oh.cpp | 30 +- src/d/actor/d_a_b_oh2.cpp | 30 +- src/d/actor/d_a_b_tn.cpp | 40 +- src/d/actor/d_a_b_yo.cpp | 56 +- src/d/actor/d_a_b_yo_ice.cpp | 38 +- src/d/actor/d_a_b_zant.cpp | 56 +- src/d/actor/d_a_b_zant_magic.cpp | 28 +- src/d/actor/d_a_b_zant_mobile.cpp | 30 +- src/d/actor/d_a_b_zant_sima.cpp | 32 +- src/d/actor/d_a_balloon_2D.cpp | 30 +- src/d/actor/d_a_bd.cpp | 38 +- src/d/actor/d_a_bg.cpp | 30 +- src/d/actor/d_a_bg_obj.cpp | 30 +- src/d/actor/d_a_boomerang.cpp | 32 +- src/d/actor/d_a_bullet.cpp | 28 +- src/d/actor/d_a_canoe.cpp | 32 +- src/d/actor/d_a_coach_2D.cpp | 28 +- src/d/actor/d_a_coach_fire.cpp | 28 +- src/d/actor/d_a_cow.cpp | 60 +- src/d/actor/d_a_crod.cpp | 36 +- src/d/actor/d_a_cstaF.cpp | 28 +- src/d/actor/d_a_cstatue.cpp | 36 +- src/d/actor/d_a_demo00.cpp | 30 +- src/d/actor/d_a_demo_item.cpp | 62 +- src/d/actor/d_a_disappear.cpp | 32 +- src/d/actor/d_a_dmidna.cpp | 28 +- src/d/actor/d_a_do.cpp | 60 +- src/d/actor/d_a_door_boss.cpp | 32 +- src/d/actor/d_a_door_bossL1.cpp | 32 +- src/d/actor/d_a_door_bossL5.cpp | 32 +- src/d/actor/d_a_door_dbdoor00.cpp | 28 +- src/d/actor/d_a_door_knob00.cpp | 30 +- src/d/actor/d_a_door_mbossL1.cpp | 38 +- src/d/actor/d_a_door_push.cpp | 30 +- src/d/actor/d_a_door_shutter.cpp | 34 +- src/d/actor/d_a_door_spiral.cpp | 32 +- src/d/actor/d_a_dshutter.cpp | 32 +- src/d/actor/d_a_e_ai.cpp | 28 +- src/d/actor/d_a_e_arrow.cpp | 40 +- src/d/actor/d_a_e_ba.cpp | 36 +- src/d/actor/d_a_e_bee.cpp | 36 +- src/d/actor/d_a_e_bg.cpp | 50 +- src/d/actor/d_a_e_bi.cpp | 50 +- src/d/actor/d_a_e_bi_leaf.cpp | 30 +- src/d/actor/d_a_e_bs.cpp | 30 +- src/d/actor/d_a_e_bu.cpp | 28 +- src/d/actor/d_a_e_bug.cpp | 30 +- src/d/actor/d_a_e_cr.cpp | 32 +- src/d/actor/d_a_e_cr_egg.cpp | 28 +- src/d/actor/d_a_e_db.cpp | 32 +- src/d/actor/d_a_e_db_leaf.cpp | 30 +- src/d/actor/d_a_e_dd.cpp | 28 +- src/d/actor/d_a_e_df.cpp | 36 +- src/d/actor/d_a_e_dk.cpp | 36 +- src/d/actor/d_a_e_dn.cpp | 80 +- src/d/actor/d_a_e_dt.cpp | 50 +- src/d/actor/d_a_e_fb.cpp | 32 +- src/d/actor/d_a_e_fk.cpp | 28 +- src/d/actor/d_a_e_fm.cpp | 52 +- src/d/actor/d_a_e_fs.cpp | 30 +- src/d/actor/d_a_e_fz.cpp | 114 +- src/d/actor/d_a_e_ga.cpp | 28 +- src/d/actor/d_a_e_gb.cpp | 32 +- src/d/actor/d_a_e_ge.cpp | 40 +- src/d/actor/d_a_e_gi.cpp | 32 +- src/d/actor/d_a_e_gm.cpp | 52 +- src/d/actor/d_a_e_gob.cpp | 32 +- src/d/actor/d_a_e_gs.cpp | 28 +- src/d/actor/d_a_e_hb.cpp | 30 +- src/d/actor/d_a_e_hb_leaf.cpp | 28 +- src/d/actor/d_a_e_hm.cpp | 30 +- src/d/actor/d_a_e_hp.cpp | 30 +- src/d/actor/d_a_e_hz.cpp | 38 +- src/d/actor/d_a_e_hzelda.cpp | 32 +- src/d/actor/d_a_e_is.cpp | 30 +- src/d/actor/d_a_e_kg.cpp | 28 +- src/d/actor/d_a_e_kk.cpp | 40 +- src/d/actor/d_a_e_kr.cpp | 30 +- src/d/actor/d_a_e_mb.cpp | 28 +- src/d/actor/d_a_e_md.cpp | 34 +- src/d/actor/d_a_e_mf.cpp | 76 +- src/d/actor/d_a_e_mk.cpp | 50 +- src/d/actor/d_a_e_mk_bo.cpp | 32 +- src/d/actor/d_a_e_mm.cpp | 30 +- src/d/actor/d_a_e_mm_mt.cpp | 100 +- src/d/actor/d_a_e_ms.cpp | 30 +- src/d/actor/d_a_e_nest.cpp | 58 +- src/d/actor/d_a_e_nz.cpp | 28 +- src/d/actor/d_a_e_oc.cpp | 48 +- src/d/actor/d_a_e_oct_bg.cpp | 30 +- src/d/actor/d_a_e_ot.cpp | 40 +- src/d/actor/d_a_e_ph.cpp | 30 +- src/d/actor/d_a_e_pm.cpp | 74 +- src/d/actor/d_a_e_po.cpp | 46 +- src/d/actor/d_a_e_pz.cpp | 64 +- src/d/actor/d_a_e_rb.cpp | 34 +- src/d/actor/d_a_e_rd.cpp | 128 +- src/d/actor/d_a_e_rdb.cpp | 40 +- src/d/actor/d_a_e_rdy.cpp | 84 +- src/d/actor/d_a_e_s1.cpp | 40 +- src/d/actor/d_a_e_sb.cpp | 36 +- src/d/actor/d_a_e_sf.cpp | 72 +- src/d/actor/d_a_e_sg.cpp | 36 +- src/d/actor/d_a_e_sh.cpp | 28 +- src/d/actor/d_a_e_sm.cpp | 66 +- src/d/actor/d_a_e_sm2.cpp | 90 +- src/d/actor/d_a_e_st.cpp | 36 +- src/d/actor/d_a_e_st_line.cpp | 28 +- src/d/actor/d_a_e_sw.cpp | 98 +- src/d/actor/d_a_e_th.cpp | 36 +- src/d/actor/d_a_e_th_ball.cpp | 36 +- src/d/actor/d_a_e_tk.cpp | 30 +- src/d/actor/d_a_e_tk2.cpp | 30 +- src/d/actor/d_a_e_tk_ball.cpp | 28 +- src/d/actor/d_a_e_tt.cpp | 28 +- src/d/actor/d_a_e_vt.cpp | 28 +- src/d/actor/d_a_e_warpappear.cpp | 46 +- src/d/actor/d_a_e_wb.cpp | 88 +- src/d/actor/d_a_e_ws.cpp | 32 +- src/d/actor/d_a_e_ww.cpp | 94 +- src/d/actor/d_a_e_yc.cpp | 30 +- src/d/actor/d_a_e_yd.cpp | 30 +- src/d/actor/d_a_e_yd_leaf.cpp | 28 +- src/d/actor/d_a_e_yg.cpp | 34 +- src/d/actor/d_a_e_yh.cpp | 30 +- src/d/actor/d_a_e_yk.cpp | 34 +- src/d/actor/d_a_e_ym.cpp | 46 +- src/d/actor/d_a_e_ym_tag.cpp | 30 +- src/d/actor/d_a_e_ymb.cpp | 56 +- src/d/actor/d_a_e_yr.cpp | 28 +- src/d/actor/d_a_e_zh.cpp | 66 +- src/d/actor/d_a_e_zm.cpp | 32 +- src/d/actor/d_a_e_zs.cpp | 34 +- src/d/actor/d_a_econt.cpp | 30 +- src/d/actor/d_a_ep.cpp | 28 +- src/d/actor/d_a_formation_mng.cpp | 28 +- src/d/actor/d_a_fr.cpp | 30 +- src/d/actor/d_a_grass.cpp | 30 +- src/d/actor/d_a_guard_mng.cpp | 32 +- src/d/actor/d_a_hitobj.cpp | 28 +- src/d/actor/d_a_horse.cpp | 48 +- src/d/actor/d_a_hozelda.cpp | 30 +- src/d/actor/d_a_izumi_gate.cpp | 30 +- src/d/actor/d_a_kago.cpp | 38 +- src/d/actor/d_a_kytag00.cpp | 28 +- src/d/actor/d_a_kytag01.cpp | 28 +- src/d/actor/d_a_kytag02.cpp | 28 +- src/d/actor/d_a_kytag03.cpp | 30 +- src/d/actor/d_a_kytag04.cpp | 28 +- src/d/actor/d_a_kytag05.cpp | 28 +- src/d/actor/d_a_kytag06.cpp | 30 +- src/d/actor/d_a_kytag07.cpp | 28 +- src/d/actor/d_a_kytag08.cpp | 28 +- src/d/actor/d_a_kytag09.cpp | 30 +- src/d/actor/d_a_kytag10.cpp | 28 +- src/d/actor/d_a_kytag11.cpp | 30 +- src/d/actor/d_a_kytag12.cpp | 32 +- src/d/actor/d_a_kytag13.cpp | 28 +- src/d/actor/d_a_kytag14.cpp | 28 +- src/d/actor/d_a_kytag15.cpp | 30 +- src/d/actor/d_a_kytag16.cpp | 30 +- src/d/actor/d_a_kytag17.cpp | 30 +- src/d/actor/d_a_mant.cpp | 28 +- src/d/actor/d_a_mg_fish.cpp | 66 +- src/d/actor/d_a_mg_fshop.cpp | 54 +- src/d/actor/d_a_mg_rod.cpp | 56 +- src/d/actor/d_a_midna.cpp | 32 +- src/d/actor/d_a_mirror.cpp | 28 +- src/d/actor/d_a_movie_player.cpp | 28 +- src/d/actor/d_a_myna.cpp | 46 +- src/d/actor/d_a_nbomb.cpp | 34 +- src/d/actor/d_a_ni.cpp | 38 +- src/d/actor/d_a_no_chg_room.cpp | 28 +- src/d/actor/d_a_npc.cpp | 10 +- src/d/actor/d_a_npc4.cpp | 14 +- src/d/actor/d_a_npc_aru.cpp | 66 +- src/d/actor/d_a_npc_ash.cpp | 40 +- src/d/actor/d_a_npc_ashB.cpp | 30 +- src/d/actor/d_a_npc_bans.cpp | 70 +- src/d/actor/d_a_npc_besu.cpp | 60 +- src/d/actor/d_a_npc_blue_ns.cpp | 40 +- src/d/actor/d_a_npc_bou.cpp | 34 +- src/d/actor/d_a_npc_bouS.cpp | 38 +- src/d/actor/d_a_npc_cd2.cpp | 12 +- src/d/actor/d_a_npc_cdn3.cpp | 38 +- src/d/actor/d_a_npc_chat.cpp | 110 +- src/d/actor/d_a_npc_chin.cpp | 30 +- src/d/actor/d_a_npc_clerka.cpp | 28 +- src/d/actor/d_a_npc_clerkb.cpp | 28 +- src/d/actor/d_a_npc_clerkt.cpp | 28 +- src/d/actor/d_a_npc_coach.cpp | 60 +- src/d/actor/d_a_npc_df.cpp | 32 +- src/d/actor/d_a_npc_doc.cpp | 52 +- src/d/actor/d_a_npc_doorboy.cpp | 28 +- src/d/actor/d_a_npc_drainSol.cpp | 28 +- src/d/actor/d_a_npc_du.cpp | 28 +- src/d/actor/d_a_npc_fairy.cpp | 28 +- src/d/actor/d_a_npc_fairy_seirei.cpp | 28 +- src/d/actor/d_a_npc_fguard.cpp | 32 +- src/d/actor/d_a_npc_fish.cpp | 36 +- src/d/actor/d_a_npc_gnd.cpp | 40 +- src/d/actor/d_a_npc_gra.cpp | 44 +- src/d/actor/d_a_npc_grc.cpp | 28 +- src/d/actor/d_a_npc_grd.cpp | 32 +- src/d/actor/d_a_npc_grm.cpp | 28 +- src/d/actor/d_a_npc_grmc.cpp | 28 +- src/d/actor/d_a_npc_gro.cpp | 30 +- src/d/actor/d_a_npc_grr.cpp | 28 +- src/d/actor/d_a_npc_grs.cpp | 28 +- src/d/actor/d_a_npc_grz.cpp | 34 +- src/d/actor/d_a_npc_guard.cpp | 28 +- src/d/actor/d_a_npc_gwolf.cpp | 28 +- src/d/actor/d_a_npc_hanjo.cpp | 36 +- src/d/actor/d_a_npc_henna.cpp | 60 +- src/d/actor/d_a_npc_henna0.cpp | 28 +- src/d/actor/d_a_npc_hoz.cpp | 34 +- src/d/actor/d_a_npc_impal.cpp | 32 +- src/d/actor/d_a_npc_inko.cpp | 32 +- src/d/actor/d_a_npc_ins.cpp | 78 +- src/d/actor/d_a_npc_jagar.cpp | 32 +- src/d/actor/d_a_npc_kakashi.cpp | 42 +- src/d/actor/d_a_npc_kasi_hana.cpp | 106 +- src/d/actor/d_a_npc_kasi_kyu.cpp | 54 +- src/d/actor/d_a_npc_kasi_mich.cpp | 50 +- src/d/actor/d_a_npc_kdk.cpp | 28 +- src/d/actor/d_a_npc_kkri.cpp | 42 +- src/d/actor/d_a_npc_kn.cpp | 108 +- src/d/actor/d_a_npc_kn_base.inc | 4 +- src/d/actor/d_a_npc_kn_teach02.inc | 6 +- src/d/actor/d_a_npc_knj.cpp | 28 +- src/d/actor/d_a_npc_kolin.cpp | 74 +- src/d/actor/d_a_npc_kolinb.cpp | 42 +- src/d/actor/d_a_npc_ks.cpp | 60 +- src/d/actor/d_a_npc_kyury.cpp | 32 +- src/d/actor/d_a_npc_len.cpp | 42 +- src/d/actor/d_a_npc_lf.cpp | 28 +- src/d/actor/d_a_npc_lud.cpp | 38 +- src/d/actor/d_a_npc_maro.cpp | 72 +- src/d/actor/d_a_npc_midp.cpp | 30 +- src/d/actor/d_a_npc_mk.cpp | 28 +- src/d/actor/d_a_npc_moi.cpp | 40 +- src/d/actor/d_a_npc_moir.cpp | 52 +- src/d/actor/d_a_npc_myna2.cpp | 30 +- src/d/actor/d_a_npc_ne.cpp | 80 +- src/d/actor/d_a_npc_p2.cpp | 28 +- src/d/actor/d_a_npc_pachi_besu.cpp | 32 +- src/d/actor/d_a_npc_pachi_maro.cpp | 32 +- src/d/actor/d_a_npc_pachi_taro.cpp | 40 +- src/d/actor/d_a_npc_passer.cpp | 28 +- src/d/actor/d_a_npc_passer2.cpp | 28 +- src/d/actor/d_a_npc_post.cpp | 64 +- src/d/actor/d_a_npc_pouya.cpp | 32 +- src/d/actor/d_a_npc_prayer.cpp | 30 +- src/d/actor/d_a_npc_raca.cpp | 30 +- src/d/actor/d_a_npc_rafrel.cpp | 66 +- src/d/actor/d_a_npc_saru.cpp | 34 +- src/d/actor/d_a_npc_seib.cpp | 28 +- src/d/actor/d_a_npc_seic.cpp | 28 +- src/d/actor/d_a_npc_seid.cpp | 28 +- src/d/actor/d_a_npc_seira.cpp | 34 +- src/d/actor/d_a_npc_seira2.cpp | 30 +- src/d/actor/d_a_npc_seirei.cpp | 28 +- src/d/actor/d_a_npc_shad.cpp | 62 +- src/d/actor/d_a_npc_shaman.cpp | 54 +- src/d/actor/d_a_npc_shoe.cpp | 32 +- src/d/actor/d_a_npc_shop0.cpp | 28 +- src/d/actor/d_a_npc_shop_maro.cpp | 30 +- src/d/actor/d_a_npc_sola.cpp | 28 +- src/d/actor/d_a_npc_soldierA.cpp | 28 +- src/d/actor/d_a_npc_soldierB.cpp | 30 +- src/d/actor/d_a_npc_sq.cpp | 30 +- src/d/actor/d_a_npc_taro.cpp | 58 +- src/d/actor/d_a_npc_the.cpp | 30 +- src/d/actor/d_a_npc_theB.cpp | 64 +- src/d/actor/d_a_npc_tk.cpp | 72 +- src/d/actor/d_a_npc_tkc.cpp | 28 +- src/d/actor/d_a_npc_tkj.cpp | 30 +- src/d/actor/d_a_npc_tkj2.cpp | 52 +- src/d/actor/d_a_npc_tks.cpp | 40 +- src/d/actor/d_a_npc_toby.cpp | 64 +- src/d/actor/d_a_npc_tr.cpp | 28 +- src/d/actor/d_a_npc_uri.cpp | 34 +- src/d/actor/d_a_npc_worm.cpp | 28 +- src/d/actor/d_a_npc_wrestler.cpp | 32 +- src/d/actor/d_a_npc_yamid.cpp | 46 +- src/d/actor/d_a_npc_yamis.cpp | 30 +- src/d/actor/d_a_npc_yamit.cpp | 32 +- src/d/actor/d_a_npc_yelia.cpp | 48 +- src/d/actor/d_a_npc_ykm.cpp | 76 +- src/d/actor/d_a_npc_ykw.cpp | 58 +- src/d/actor/d_a_npc_zanb.cpp | 34 +- src/d/actor/d_a_npc_zant.cpp | 30 +- src/d/actor/d_a_npc_zelR.cpp | 30 +- src/d/actor/d_a_npc_zelRo.cpp | 40 +- src/d/actor/d_a_npc_zelda.cpp | 32 +- src/d/actor/d_a_npc_zra.cpp | 32 +- src/d/actor/d_a_npc_zra.inc | 18 +- src/d/actor/d_a_npc_zrc.cpp | 32 +- src/d/actor/d_a_npc_zrz.cpp | 34 +- src/d/actor/d_a_obj_Lv5Key.cpp | 28 +- src/d/actor/d_a_obj_Turara.cpp | 30 +- src/d/actor/d_a_obj_TvCdlst.cpp | 28 +- src/d/actor/d_a_obj_Y_taihou.cpp | 30 +- src/d/actor/d_a_obj_amiShutter.cpp | 30 +- src/d/actor/d_a_obj_ari.cpp | 34 +- src/d/actor/d_a_obj_automata.cpp | 30 +- src/d/actor/d_a_obj_avalanche.cpp | 28 +- src/d/actor/d_a_obj_balloon.cpp | 32 +- src/d/actor/d_a_obj_barDesk.cpp | 30 +- src/d/actor/d_a_obj_batta.cpp | 68 +- src/d/actor/d_a_obj_bbox.cpp | 30 +- src/d/actor/d_a_obj_bed.cpp | 30 +- src/d/actor/d_a_obj_bemos.cpp | 28 +- src/d/actor/d_a_obj_bhashi.cpp | 44 +- src/d/actor/d_a_obj_bhbridge.cpp | 28 +- src/d/actor/d_a_obj_bk_leaf.cpp | 32 +- src/d/actor/d_a_obj_bkdoor.cpp | 30 +- src/d/actor/d_a_obj_bky_rock.cpp | 28 +- src/d/actor/d_a_obj_bmWindow.cpp | 28 +- src/d/actor/d_a_obj_bmshutter.cpp | 28 +- src/d/actor/d_a_obj_bombf.cpp | 30 +- src/d/actor/d_a_obj_bosswarp.cpp | 38 +- src/d/actor/d_a_obj_boumato.cpp | 34 +- src/d/actor/d_a_obj_brakeeff.cpp | 28 +- src/d/actor/d_a_obj_brg.cpp | 32 +- src/d/actor/d_a_obj_bsGate.cpp | 30 +- src/d/actor/d_a_obj_bubblePilar.cpp | 28 +- src/d/actor/d_a_obj_burnbox.cpp | 28 +- src/d/actor/d_a_obj_carry.cpp | 58 +- src/d/actor/d_a_obj_catdoor.cpp | 28 +- src/d/actor/d_a_obj_cb.cpp | 28 +- src/d/actor/d_a_obj_cblock.cpp | 28 +- src/d/actor/d_a_obj_cboard.cpp | 30 +- src/d/actor/d_a_obj_cdoor.cpp | 32 +- src/d/actor/d_a_obj_chandelier.cpp | 30 +- src/d/actor/d_a_obj_chest.cpp | 30 +- src/d/actor/d_a_obj_cho.cpp | 34 +- src/d/actor/d_a_obj_cowdoor.cpp | 30 +- src/d/actor/d_a_obj_crope.cpp | 28 +- src/d/actor/d_a_obj_crvfence.cpp | 38 +- src/d/actor/d_a_obj_crvgate.cpp | 40 +- src/d/actor/d_a_obj_crvhahen.cpp | 28 +- src/d/actor/d_a_obj_crvlh_down.cpp | 34 +- src/d/actor/d_a_obj_crvlh_up.cpp | 32 +- src/d/actor/d_a_obj_crvsteel.cpp | 28 +- src/d/actor/d_a_obj_crystal.cpp | 30 +- src/d/actor/d_a_obj_cwall.cpp | 28 +- src/d/actor/d_a_obj_damCps.cpp | 30 +- src/d/actor/d_a_obj_dan.cpp | 34 +- src/d/actor/d_a_obj_digholl.cpp | 28 +- src/d/actor/d_a_obj_digplace.cpp | 32 +- src/d/actor/d_a_obj_digsnow.cpp | 28 +- src/d/actor/d_a_obj_dmelevator.cpp | 30 +- src/d/actor/d_a_obj_drop.cpp | 40 +- src/d/actor/d_a_obj_dust.cpp | 32 +- src/d/actor/d_a_obj_eff.cpp | 30 +- src/d/actor/d_a_obj_enemy_create.cpp | 52 +- src/d/actor/d_a_obj_fallobj.cpp | 32 +- src/d/actor/d_a_obj_fan.cpp | 28 +- src/d/actor/d_a_obj_fchain.cpp | 28 +- src/d/actor/d_a_obj_fireWood.cpp | 28 +- src/d/actor/d_a_obj_fireWood2.cpp | 28 +- src/d/actor/d_a_obj_firepillar.cpp | 28 +- src/d/actor/d_a_obj_firepillar2.cpp | 28 +- src/d/actor/d_a_obj_flag.cpp | 28 +- src/d/actor/d_a_obj_flag2.cpp | 28 +- src/d/actor/d_a_obj_flag3.cpp | 28 +- src/d/actor/d_a_obj_fmobj.cpp | 30 +- src/d/actor/d_a_obj_food.cpp | 30 +- src/d/actor/d_a_obj_fw.cpp | 30 +- src/d/actor/d_a_obj_gadget.cpp | 28 +- src/d/actor/d_a_obj_ganonwall.cpp | 28 +- src/d/actor/d_a_obj_ganonwall2.cpp | 28 +- src/d/actor/d_a_obj_gb.cpp | 28 +- src/d/actor/d_a_obj_geyser.cpp | 28 +- src/d/actor/d_a_obj_glowSphere.cpp | 28 +- src/d/actor/d_a_obj_gm.cpp | 40 +- src/d/actor/d_a_obj_goGate.cpp | 28 +- src/d/actor/d_a_obj_gomikabe.cpp | 34 +- src/d/actor/d_a_obj_gpTaru.cpp | 32 +- src/d/actor/d_a_obj_gra2.cpp | 52 +- src/d/actor/d_a_obj_gra2_base.inc | 16 +- src/d/actor/d_a_obj_gra2_soldier.inc | 14 +- src/d/actor/d_a_obj_graWall.cpp | 30 +- src/d/actor/d_a_obj_gra_rock.cpp | 30 +- src/d/actor/d_a_obj_grave_stone.cpp | 30 +- src/d/actor/d_a_obj_groundwater.cpp | 28 +- src/d/actor/d_a_obj_grz_rock.cpp | 28 +- src/d/actor/d_a_obj_h_saku.cpp | 28 +- src/d/actor/d_a_obj_hakai_brl.cpp | 28 +- src/d/actor/d_a_obj_hakai_ftr.cpp | 28 +- src/d/actor/d_a_obj_hasu2.cpp | 30 +- src/d/actor/d_a_obj_hata.cpp | 28 +- src/d/actor/d_a_obj_hb.cpp | 30 +- src/d/actor/d_a_obj_hbombkoya.cpp | 28 +- src/d/actor/d_a_obj_heavySw.cpp | 32 +- src/d/actor/d_a_obj_hfuta.cpp | 28 +- src/d/actor/d_a_obj_hhashi.cpp | 30 +- src/d/actor/d_a_obj_hsTarget.cpp | 30 +- src/d/actor/d_a_obj_ice_l.cpp | 36 +- src/d/actor/d_a_obj_ice_s.cpp | 34 +- src/d/actor/d_a_obj_iceblock.cpp | 30 +- src/d/actor/d_a_obj_iceleaf.cpp | 28 +- src/d/actor/d_a_obj_ihasi.cpp | 42 +- src/d/actor/d_a_obj_ikada.cpp | 28 +- src/d/actor/d_a_obj_inobone.cpp | 36 +- src/d/actor/d_a_obj_ita.cpp | 32 +- src/d/actor/d_a_obj_itamato.cpp | 32 +- src/d/actor/d_a_obj_item.cpp | 204 +-- src/d/actor/d_a_obj_ito.cpp | 28 +- src/d/actor/d_a_obj_kabuto.cpp | 34 +- src/d/actor/d_a_obj_kag.cpp | 40 +- src/d/actor/d_a_obj_kage.cpp | 30 +- src/d/actor/d_a_obj_kago.cpp | 30 +- src/d/actor/d_a_obj_kaisou.cpp | 28 +- src/d/actor/d_a_obj_kamakiri.cpp | 32 +- src/d/actor/d_a_obj_kanban2.cpp | 36 +- src/d/actor/d_a_obj_kantera.cpp | 30 +- src/d/actor/d_a_obj_katatsumuri.cpp | 34 +- src/d/actor/d_a_obj_kazeneko.cpp | 32 +- src/d/actor/d_a_obj_kbacket.cpp | 28 +- src/d/actor/d_a_obj_kbox.cpp | 30 +- src/d/actor/d_a_obj_key.cpp | 58 +- src/d/actor/d_a_obj_keyhole.cpp | 28 +- src/d/actor/d_a_obj_kgate.cpp | 30 +- src/d/actor/d_a_obj_ki.cpp | 30 +- src/d/actor/d_a_obj_kiPot.cpp | 30 +- src/d/actor/d_a_obj_kita.cpp | 28 +- src/d/actor/d_a_obj_kjgjs.cpp | 30 +- src/d/actor/d_a_obj_kkanban.cpp | 30 +- src/d/actor/d_a_obj_klift00.cpp | 30 +- src/d/actor/d_a_obj_knBullet.cpp | 28 +- src/d/actor/d_a_obj_kshutter.cpp | 44 +- src/d/actor/d_a_obj_ktOnFire.cpp | 28 +- src/d/actor/d_a_obj_kuwagata.cpp | 152 +- src/d/actor/d_a_obj_kwheel00.cpp | 30 +- src/d/actor/d_a_obj_kwheel01.cpp | 32 +- src/d/actor/d_a_obj_kznkarm.cpp | 62 +- src/d/actor/d_a_obj_ladder.cpp | 28 +- src/d/actor/d_a_obj_laundry.cpp | 30 +- src/d/actor/d_a_obj_laundry_rope.cpp | 30 +- src/d/actor/d_a_obj_lbox.cpp | 28 +- src/d/actor/d_a_obj_life_container.cpp | 36 +- src/d/actor/d_a_obj_lp.cpp | 28 +- src/d/actor/d_a_obj_lv1Candle00.cpp | 32 +- src/d/actor/d_a_obj_lv1Candle01.cpp | 32 +- src/d/actor/d_a_obj_lv2Candle.cpp | 36 +- src/d/actor/d_a_obj_lv3Candle.cpp | 30 +- src/d/actor/d_a_obj_lv3Water.cpp | 30 +- src/d/actor/d_a_obj_lv3Water2.cpp | 28 +- src/d/actor/d_a_obj_lv3WaterB.cpp | 28 +- src/d/actor/d_a_obj_lv3saka00.cpp | 30 +- src/d/actor/d_a_obj_lv3waterEff.cpp | 30 +- src/d/actor/d_a_obj_lv4CandleDemoTag.cpp | 32 +- src/d/actor/d_a_obj_lv4CandleTag.cpp | 28 +- src/d/actor/d_a_obj_lv4EdShutter.cpp | 28 +- src/d/actor/d_a_obj_lv4Gate.cpp | 30 +- src/d/actor/d_a_obj_lv4HsTarget.cpp | 30 +- src/d/actor/d_a_obj_lv4PoGate.cpp | 30 +- src/d/actor/d_a_obj_lv4RailWall.cpp | 34 +- src/d/actor/d_a_obj_lv4SlideWall.cpp | 28 +- src/d/actor/d_a_obj_lv4bridge.cpp | 28 +- src/d/actor/d_a_obj_lv4chandelier.cpp | 30 +- src/d/actor/d_a_obj_lv4digsand.cpp | 30 +- src/d/actor/d_a_obj_lv4floor.cpp | 30 +- src/d/actor/d_a_obj_lv4gear.cpp | 32 +- src/d/actor/d_a_obj_lv4prelvtr.cpp | 30 +- src/d/actor/d_a_obj_lv4prwall.cpp | 30 +- src/d/actor/d_a_obj_lv4sand.cpp | 28 +- src/d/actor/d_a_obj_lv5FloorBoard.cpp | 28 +- src/d/actor/d_a_obj_lv5IceWall.cpp | 28 +- src/d/actor/d_a_obj_lv5SwIce.cpp | 28 +- src/d/actor/d_a_obj_lv5ychndlr.cpp | 28 +- src/d/actor/d_a_obj_lv5yiblltray.cpp | 36 +- src/d/actor/d_a_obj_lv6ChangeGate.cpp | 28 +- src/d/actor/d_a_obj_lv6FurikoTrap.cpp | 28 +- src/d/actor/d_a_obj_lv6Lblock.cpp | 28 +- src/d/actor/d_a_obj_lv6SwGate.cpp | 28 +- src/d/actor/d_a_obj_lv6SzGate.cpp | 28 +- src/d/actor/d_a_obj_lv6Tenbin.cpp | 44 +- src/d/actor/d_a_obj_lv6TogeRoll.cpp | 32 +- src/d/actor/d_a_obj_lv6TogeTrap.cpp | 38 +- src/d/actor/d_a_obj_lv6bemos.cpp | 28 +- src/d/actor/d_a_obj_lv6bemos2.cpp | 30 +- src/d/actor/d_a_obj_lv6egate.cpp | 28 +- src/d/actor/d_a_obj_lv6elevta.cpp | 30 +- src/d/actor/d_a_obj_lv6swturn.cpp | 28 +- src/d/actor/d_a_obj_lv7BsGate.cpp | 28 +- src/d/actor/d_a_obj_lv7PropellerY.cpp | 28 +- src/d/actor/d_a_obj_lv7bridge.cpp | 30 +- src/d/actor/d_a_obj_lv8KekkaiTrap.cpp | 28 +- src/d/actor/d_a_obj_lv8Lift.cpp | 30 +- src/d/actor/d_a_obj_lv8OptiLift.cpp | 30 +- src/d/actor/d_a_obj_lv8UdFloor.cpp | 28 +- src/d/actor/d_a_obj_lv9SwShutter.cpp | 28 +- src/d/actor/d_a_obj_magLift.cpp | 28 +- src/d/actor/d_a_obj_magLiftRot.cpp | 30 +- src/d/actor/d_a_obj_magne_arm.cpp | 32 +- src/d/actor/d_a_obj_maki.cpp | 28 +- src/d/actor/d_a_obj_master_sword.cpp | 36 +- src/d/actor/d_a_obj_mato.cpp | 44 +- src/d/actor/d_a_obj_metalbox.cpp | 28 +- src/d/actor/d_a_obj_mgate.cpp | 30 +- src/d/actor/d_a_obj_mhole.cpp | 30 +- src/d/actor/d_a_obj_mie.cpp | 30 +- src/d/actor/d_a_obj_mirror_6pole.cpp | 30 +- src/d/actor/d_a_obj_mirror_chain.cpp | 28 +- src/d/actor/d_a_obj_mirror_sand.cpp | 30 +- src/d/actor/d_a_obj_mirror_screw.cpp | 44 +- src/d/actor/d_a_obj_mirror_table.cpp | 36 +- src/d/actor/d_a_obj_movebox.cpp | 38 +- src/d/actor/d_a_obj_msima.cpp | 36 +- src/d/actor/d_a_obj_mvstair.cpp | 28 +- src/d/actor/d_a_obj_myogan.cpp | 30 +- src/d/actor/d_a_obj_nagaisu.cpp | 28 +- src/d/actor/d_a_obj_nameplate.cpp | 28 +- src/d/actor/d_a_obj_nan.cpp | 34 +- src/d/actor/d_a_obj_ndoor.cpp | 28 +- src/d/actor/d_a_obj_nougu.cpp | 28 +- src/d/actor/d_a_obj_octhashi.cpp | 28 +- src/d/actor/d_a_obj_oiltubo.cpp | 30 +- src/d/actor/d_a_obj_onsen.cpp | 30 +- src/d/actor/d_a_obj_onsenFire.cpp | 30 +- src/d/actor/d_a_obj_onsenTaru.cpp | 28 +- src/d/actor/d_a_obj_ornament_cloth.cpp | 28 +- src/d/actor/d_a_obj_pdoor.cpp | 28 +- src/d/actor/d_a_obj_pdtile.cpp | 32 +- src/d/actor/d_a_obj_pdwall.cpp | 28 +- src/d/actor/d_a_obj_picture.cpp | 28 +- src/d/actor/d_a_obj_pillar.cpp | 30 +- src/d/actor/d_a_obj_pleaf.cpp | 28 +- src/d/actor/d_a_obj_poCandle.cpp | 28 +- src/d/actor/d_a_obj_poFire.cpp | 36 +- src/d/actor/d_a_obj_poTbox.cpp | 28 +- src/d/actor/d_a_obj_prop.cpp | 30 +- src/d/actor/d_a_obj_pumpkin.cpp | 32 +- src/d/actor/d_a_obj_rcircle.cpp | 30 +- src/d/actor/d_a_obj_rfHole.cpp | 30 +- src/d/actor/d_a_obj_rgate.cpp | 30 +- src/d/actor/d_a_obj_riverrock.cpp | 28 +- src/d/actor/d_a_obj_rock.cpp | 28 +- src/d/actor/d_a_obj_rope_bridge.cpp | 28 +- src/d/actor/d_a_obj_rotBridge.cpp | 30 +- src/d/actor/d_a_obj_rotTrap.cpp | 28 +- src/d/actor/d_a_obj_roten.cpp | 28 +- src/d/actor/d_a_obj_rstair.cpp | 28 +- src/d/actor/d_a_obj_rw.cpp | 36 +- src/d/actor/d_a_obj_sWallShutter.cpp | 28 +- src/d/actor/d_a_obj_saidan.cpp | 28 +- src/d/actor/d_a_obj_sakuita.cpp | 28 +- src/d/actor/d_a_obj_sakuita_rope.cpp | 28 +- src/d/actor/d_a_obj_scannon.cpp | 38 +- src/d/actor/d_a_obj_scannon_crs.cpp | 28 +- src/d/actor/d_a_obj_scannon_ten.cpp | 36 +- src/d/actor/d_a_obj_sekidoor.cpp | 30 +- src/d/actor/d_a_obj_sekizo.cpp | 28 +- src/d/actor/d_a_obj_sekizoa.cpp | 30 +- src/d/actor/d_a_obj_shield.cpp | 30 +- src/d/actor/d_a_obj_sm_door.cpp | 30 +- src/d/actor/d_a_obj_smallkey.cpp | 44 +- src/d/actor/d_a_obj_smgdoor.cpp | 28 +- src/d/actor/d_a_obj_smoke.cpp | 30 +- src/d/actor/d_a_obj_smtile.cpp | 28 +- src/d/actor/d_a_obj_smw_stone.cpp | 28 +- src/d/actor/d_a_obj_snowEffTag.cpp | 30 +- src/d/actor/d_a_obj_snow_soup.cpp | 30 +- src/d/actor/d_a_obj_so.cpp | 36 +- src/d/actor/d_a_obj_spinLift.cpp | 28 +- src/d/actor/d_a_obj_ss_drink.cpp | 28 +- src/d/actor/d_a_obj_ss_item.cpp | 30 +- src/d/actor/d_a_obj_stairBlock.cpp | 28 +- src/d/actor/d_a_obj_stick.cpp | 28 +- src/d/actor/d_a_obj_stone.cpp | 34 +- src/d/actor/d_a_obj_stoneMark.cpp | 28 +- src/d/actor/d_a_obj_stopper.cpp | 28 +- src/d/actor/d_a_obj_stopper2.cpp | 28 +- src/d/actor/d_a_obj_suisya.cpp | 30 +- src/d/actor/d_a_obj_sw.cpp | 36 +- src/d/actor/d_a_obj_swBallA.cpp | 32 +- src/d/actor/d_a_obj_swBallB.cpp | 32 +- src/d/actor/d_a_obj_swBallC.cpp | 40 +- src/d/actor/d_a_obj_swLight.cpp | 28 +- src/d/actor/d_a_obj_swchain.cpp | 34 +- src/d/actor/d_a_obj_swhang.cpp | 30 +- src/d/actor/d_a_obj_sword.cpp | 28 +- src/d/actor/d_a_obj_swpropeller.cpp | 30 +- src/d/actor/d_a_obj_swpush.cpp | 58 +- src/d/actor/d_a_obj_swpush2.cpp | 30 +- src/d/actor/d_a_obj_swpush5.cpp | 34 +- src/d/actor/d_a_obj_swspinner.cpp | 32 +- src/d/actor/d_a_obj_swturn.cpp | 28 +- src/d/actor/d_a_obj_syRock.cpp | 30 +- src/d/actor/d_a_obj_szbridge.cpp | 28 +- src/d/actor/d_a_obj_taFence.cpp | 28 +- src/d/actor/d_a_obj_table.cpp | 30 +- src/d/actor/d_a_obj_takaraDai.cpp | 28 +- src/d/actor/d_a_obj_tatigi.cpp | 28 +- src/d/actor/d_a_obj_ten.cpp | 38 +- src/d/actor/d_a_obj_testcube.cpp | 28 +- src/d/actor/d_a_obj_tgake.cpp | 30 +- src/d/actor/d_a_obj_thashi.cpp | 28 +- src/d/actor/d_a_obj_thdoor.cpp | 28 +- src/d/actor/d_a_obj_timeFire.cpp | 28 +- src/d/actor/d_a_obj_timer.cpp | 28 +- src/d/actor/d_a_obj_tks.cpp | 32 +- src/d/actor/d_a_obj_tmoon.cpp | 28 +- src/d/actor/d_a_obj_toaru_maki.cpp | 28 +- src/d/actor/d_a_obj_toby.cpp | 34 +- src/d/actor/d_a_obj_tobyhouse.cpp | 32 +- src/d/actor/d_a_obj_togeTrap.cpp | 30 +- src/d/actor/d_a_obj_tombo.cpp | 38 +- src/d/actor/d_a_obj_tornado.cpp | 28 +- src/d/actor/d_a_obj_tornado2.cpp | 28 +- src/d/actor/d_a_obj_tp.cpp | 32 +- src/d/actor/d_a_obj_treesh.cpp | 28 +- src/d/actor/d_a_obj_twGate.cpp | 28 +- src/d/actor/d_a_obj_udoor.cpp | 28 +- src/d/actor/d_a_obj_usaku.cpp | 30 +- src/d/actor/d_a_obj_vground.cpp | 30 +- src/d/actor/d_a_obj_volcball.cpp | 30 +- src/d/actor/d_a_obj_volcbom.cpp | 28 +- src/d/actor/d_a_obj_warp_kbrg.cpp | 28 +- src/d/actor/d_a_obj_warp_obrg.cpp | 28 +- src/d/actor/d_a_obj_waterGate.cpp | 28 +- src/d/actor/d_a_obj_waterPillar.cpp | 28 +- src/d/actor/d_a_obj_waterfall.cpp | 30 +- src/d/actor/d_a_obj_wchain.cpp | 30 +- src/d/actor/d_a_obj_wdStick.cpp | 28 +- src/d/actor/d_a_obj_web0.cpp | 28 +- src/d/actor/d_a_obj_web1.cpp | 34 +- src/d/actor/d_a_obj_well_cover.cpp | 30 +- src/d/actor/d_a_obj_wflag.cpp | 28 +- src/d/actor/d_a_obj_wind_stone.cpp | 28 +- src/d/actor/d_a_obj_window.cpp | 30 +- src/d/actor/d_a_obj_wood_pendulum.cpp | 28 +- src/d/actor/d_a_obj_wood_statue.cpp | 34 +- src/d/actor/d_a_obj_wsword.cpp | 28 +- src/d/actor/d_a_obj_yel_bag.cpp | 28 +- src/d/actor/d_a_obj_yobikusa.cpp | 32 +- src/d/actor/d_a_obj_yousei.cpp | 36 +- src/d/actor/d_a_obj_ystone.cpp | 30 +- src/d/actor/d_a_obj_zcloth.cpp | 30 +- src/d/actor/d_a_obj_zdoor.cpp | 28 +- src/d/actor/d_a_obj_zrTurara.cpp | 32 +- src/d/actor/d_a_obj_zrTuraraRock.cpp | 30 +- src/d/actor/d_a_obj_zraMark.cpp | 32 +- src/d/actor/d_a_obj_zra_freeze.cpp | 30 +- src/d/actor/d_a_obj_zra_rock.cpp | 30 +- src/d/actor/d_a_passer_mng.cpp | 30 +- src/d/actor/d_a_path_line.cpp | 30 +- src/d/actor/d_a_peru.cpp | 32 +- src/d/actor/d_a_player.cpp | 60 +- src/d/actor/d_a_ppolamp.cpp | 28 +- src/d/actor/d_a_scene_exit.cpp | 30 +- src/d/actor/d_a_scene_exit2.cpp | 30 +- src/d/actor/d_a_set_bgobj.cpp | 30 +- src/d/actor/d_a_shop_item.cpp | 86 +- src/d/actor/d_a_skip_2D.cpp | 28 +- src/d/actor/d_a_spinner.cpp | 32 +- src/d/actor/d_a_sq.cpp | 32 +- src/d/actor/d_a_startAndGoal.cpp | 28 +- src/d/actor/d_a_suspend.cpp | 30 +- src/d/actor/d_a_swBall.cpp | 32 +- src/d/actor/d_a_swLBall.cpp | 32 +- src/d/actor/d_a_swTime.cpp | 30 +- src/d/actor/d_a_swc00.cpp | 28 +- src/d/actor/d_a_swhit0.cpp | 28 +- src/d/actor/d_a_tag_CstaSw.cpp | 32 +- src/d/actor/d_a_tag_Lv6Gate.cpp | 36 +- src/d/actor/d_a_tag_Lv7Gate.cpp | 34 +- src/d/actor/d_a_tag_Lv8Gate.cpp | 32 +- src/d/actor/d_a_tag_TWgate.cpp | 28 +- src/d/actor/d_a_tag_ajnot.cpp | 30 +- src/d/actor/d_a_tag_allmato.cpp | 36 +- src/d/actor/d_a_tag_arena.cpp | 28 +- src/d/actor/d_a_tag_assistance.cpp | 28 +- src/d/actor/d_a_tag_attack_item.cpp | 28 +- src/d/actor/d_a_tag_attention.cpp | 28 +- src/d/actor/d_a_tag_bottle_item.cpp | 44 +- src/d/actor/d_a_tag_camera.cpp | 28 +- src/d/actor/d_a_tag_chgrestart.cpp | 30 +- src/d/actor/d_a_tag_chkpoint.cpp | 28 +- src/d/actor/d_a_tag_csw.cpp | 32 +- src/d/actor/d_a_tag_escape.cpp | 30 +- src/d/actor/d_a_tag_event.cpp | 28 +- src/d/actor/d_a_tag_evt.cpp | 28 +- src/d/actor/d_a_tag_evtarea.cpp | 30 +- src/d/actor/d_a_tag_evtmsg.cpp | 30 +- src/d/actor/d_a_tag_firewall.cpp | 28 +- src/d/actor/d_a_tag_gra.cpp | 28 +- src/d/actor/d_a_tag_gstart.cpp | 28 +- src/d/actor/d_a_tag_guard.cpp | 30 +- src/d/actor/d_a_tag_hinit.cpp | 28 +- src/d/actor/d_a_tag_hjump.cpp | 28 +- src/d/actor/d_a_tag_howl.cpp | 28 +- src/d/actor/d_a_tag_hstop.cpp | 28 +- src/d/actor/d_a_tag_instruction.cpp | 30 +- src/d/actor/d_a_tag_kago_fall.cpp | 30 +- src/d/actor/d_a_tag_kmsg.cpp | 28 +- src/d/actor/d_a_tag_lantern.cpp | 30 +- src/d/actor/d_a_tag_lightball.cpp | 30 +- src/d/actor/d_a_tag_lv2prchk.cpp | 30 +- src/d/actor/d_a_tag_lv5soup.cpp | 28 +- src/d/actor/d_a_tag_lv6CstaSw.cpp | 32 +- src/d/actor/d_a_tag_magne.cpp | 30 +- src/d/actor/d_a_tag_mhint.cpp | 30 +- src/d/actor/d_a_tag_mist.cpp | 30 +- src/d/actor/d_a_tag_mmsg.cpp | 28 +- src/d/actor/d_a_tag_msg.cpp | 28 +- src/d/actor/d_a_tag_mstop.cpp | 28 +- src/d/actor/d_a_tag_mwait.cpp | 30 +- src/d/actor/d_a_tag_myna2.cpp | 32 +- src/d/actor/d_a_tag_myna_light.cpp | 28 +- src/d/actor/d_a_tag_pachi.cpp | 30 +- src/d/actor/d_a_tag_poFire.cpp | 30 +- src/d/actor/d_a_tag_push.cpp | 56 +- src/d/actor/d_a_tag_qs.cpp | 32 +- src/d/actor/d_a_tag_ret_room.cpp | 28 +- src/d/actor/d_a_tag_river_back.cpp | 30 +- src/d/actor/d_a_tag_rmbit_sw.cpp | 30 +- src/d/actor/d_a_tag_schedule.cpp | 28 +- src/d/actor/d_a_tag_setBall.cpp | 30 +- src/d/actor/d_a_tag_setrestart.cpp | 30 +- src/d/actor/d_a_tag_shop_camera.cpp | 28 +- src/d/actor/d_a_tag_shop_item.cpp | 32 +- src/d/actor/d_a_tag_smk_emt.cpp | 30 +- src/d/actor/d_a_tag_spinner.cpp | 32 +- src/d/actor/d_a_tag_sppath.cpp | 28 +- src/d/actor/d_a_tag_spring.cpp | 30 +- src/d/actor/d_a_tag_ss_drink.cpp | 30 +- src/d/actor/d_a_tag_statue_evt.cpp | 34 +- src/d/actor/d_a_tag_stream.cpp | 30 +- src/d/actor/d_a_tag_telop.cpp | 28 +- src/d/actor/d_a_tag_theB_hint.cpp | 30 +- src/d/actor/d_a_tag_wara_howl.cpp | 30 +- src/d/actor/d_a_tag_watchge.cpp | 32 +- src/d/actor/d_a_tag_waterfall.cpp | 32 +- src/d/actor/d_a_tag_wljump.cpp | 30 +- src/d/actor/d_a_tag_yami.cpp | 28 +- src/d/actor/d_a_talk.cpp | 28 +- src/d/actor/d_a_tbox.cpp | 230 +-- src/d/actor/d_a_tbox2.cpp | 28 +- src/d/actor/d_a_tboxSw.cpp | 30 +- src/d/actor/d_a_title.cpp | 32 +- src/d/actor/d_a_vrbox.cpp | 28 +- src/d/actor/d_a_vrbox2.cpp | 30 +- src/d/actor/d_a_warp_bug.cpp | 30 +- src/d/actor/d_a_ykgr.cpp | 28 +- src/d/actor/d_flower.inc | 4 +- src/d/actor/d_grass.inc | 2 +- src/d/d_a_obj.cpp | 2 +- src/d/d_attention.cpp | 8 +- src/d/d_bg_parts.cpp | 2 +- src/d/d_bg_s_acch.cpp | 2 +- src/d/d_bomb.cpp | 6 +- src/d/d_camera.cpp | 144 +- src/d/d_cc_uty.cpp | 26 +- src/d/d_com_inf_game.cpp | 174 +- src/d/d_envse.cpp | 22 +- src/d/d_event.cpp | 28 +- src/d/d_event_manager.cpp | 30 +- src/d/d_file_select.cpp | 20 +- src/d/d_gameover.cpp | 30 +- src/d/d_insect.cpp | 4 +- src/d/d_item.cpp | 588 +++---- src/d/d_k_wmark.cpp | 22 +- src/d/d_k_wpillar.cpp | 24 +- src/d/d_kankyo.cpp | 22 +- src/d/d_kankyo_rain.cpp | 20 +- src/d/d_ky_thunder.cpp | 22 +- src/d/d_kyeff.cpp | 22 +- src/d/d_kyeff2.cpp | 22 +- src/d/d_menu_collect.cpp | 90 +- src/d/d_menu_dmap.cpp | 36 +- src/d/d_menu_insect.cpp | 20 +- src/d/d_menu_item_explain.cpp | 4 +- src/d/d_menu_ring.cpp | 312 ++-- src/d/d_menu_save.cpp | 4 +- src/d/d_menu_window.cpp | 22 +- src/d/d_menu_window_HIO.cpp | 14 +- src/d/d_meter2.cpp | 96 +- src/d/d_meter2_draw.cpp | 106 +- src/d/d_meter2_info.cpp | 146 +- src/d/d_meter_HIO.cpp | 2 +- src/d/d_meter_button.cpp | 6 +- src/d/d_msg_class.cpp | 18 +- src/d/d_msg_flow.cpp | 122 +- src/d/d_msg_object.cpp | 26 +- src/d/d_ovlp_fade.cpp | 188 +-- src/d/d_ovlp_fade2.cpp | 22 +- src/d/d_ovlp_fade3.cpp | 22 +- src/d/d_s_logo.cpp | 56 +- src/d/d_s_menu.cpp | 412 ++--- src/d/d_s_name.cpp | 72 +- src/d/d_s_play.cpp | 76 +- src/d/d_s_room.cpp | 24 +- src/d/d_s_title.cpp | 40 +- src/d/d_save.cpp | 190 +-- src/d/d_shop_system.cpp | 46 +- src/d/d_stage.cpp | 1856 +++++++++++----------- src/d/d_timer.cpp | 26 +- src/f_ap/f_ap_game.cpp | 8 +- src/f_op/f_op_actor.cpp | 16 +- src/f_op/f_op_actor_mng.cpp | 102 +- src/f_op/f_op_kankyo.cpp | 2 +- src/f_op/f_op_kankyo_mng.cpp | 2 +- 873 files changed, 19722 insertions(+), 18954 deletions(-) delete mode 100644 include/d/d_procname.h diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index ced12d318e8..7c70ea54e57 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -3232,7 +3232,7 @@ class daAlink_c : public daPy_py_c { virtual bool checkChainBlockPushPull(); virtual BOOL checkElecDamage() const { return mProcID == PROC_ELEC_DAMAGE; } virtual BOOL checkEmptyBottleSwing() const { - return mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE && mProcID == PROC_BOTTLE_SWING; + return mEquipItem == dItemNo_EMPTY_BOTTLE_e && mProcID == PROC_BOTTLE_SWING; } virtual BOOL checkBottleSwingMode() const { return mProcID == PROC_BOTTLE_SWING; } virtual BOOL checkHawkWait() const { return mProcID == PROC_HAWK_SUBJECT; } @@ -3334,7 +3334,7 @@ class daAlink_c : public daPy_py_c { virtual u32 checkBoardRide() const; virtual u32 checkSpinnerRide() const; virtual bool checkArrowChargeEnd() const; - virtual bool checkNoEquipItem() const { return mEquipItem == fpcNm_ITEM_NONE; } + virtual bool checkNoEquipItem() const { return mEquipItem == dItemNo_NONE_e; } virtual bool checkKandelaarSwing(int) const; virtual s16 getBoardCutTurnOffsetAngleY() const { if (mProcID == PROC_BOARD_CUT_TURN) { @@ -3402,7 +3402,7 @@ class daAlink_c : public daPy_py_c { } virtual BOOL checkWolfDownAttackPullOut() const { return mProcID == PROC_WOLF_DOWN_AT_LAND; } virtual cXyz* getMidnaAtnPos() const { return (cXyz*)&mMidnaAtnPos; } - virtual bool checkCopyRodEquip() const { return mEquipItem == fpcNm_ITEM_COPY_ROD; } + virtual bool checkCopyRodEquip() const { return mEquipItem == dItemNo_COPY_ROD_e; } virtual void setKandelaarMtx(Mtx i_mtx, int, int); virtual bool getStickAngleFromPlayerShape(s16* o_angle) const; virtual bool checkSpinnerPathMove(); @@ -3487,11 +3487,11 @@ class daAlink_c : public daPy_py_c { return checkHookshotReadyAnime() || checkHookshotShootAnime(); } BOOL checkBoomerangReadyAnime() const { - return (mEquipItem == fpcNm_ITEM_BOOMERANG || mEquipItem == 0x102) && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e); + return (mEquipItem == dItemNo_BOOMERANG_e || mEquipItem == 0x102) && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e); } bool checkDkCaught2Anime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_WAITHDB_e); } BOOL checkCopyRodThrowAnime() const { - return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMTHROW_e); + return mEquipItem == dItemNo_COPY_ROD_e && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMTHROW_e); } BOOL checkCutDashChargeAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_CUTDTP_e); } BOOL checkBoomerangAnimeAndReturnWait() const { return checkBoomerangAnime(); } @@ -3526,7 +3526,7 @@ class daAlink_c : public daPy_py_c { bool checkDashDamageAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_DAMD_e); } bool checkBoomerangCatchAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_BOOMCATCH_e); } BOOL checkCopyRodReadyAnime() const { - return mEquipItem == fpcNm_ITEM_COPY_ROD && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e); + return mEquipItem == dItemNo_COPY_ROD_e && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMWAIT_e); } BOOL checkCanoeFishingWaitAnime() const { return checkUpperAnime(dRes_ID_ALANM_BCK_CANOEREELINGR_e) || checkUpperAnime(dRes_ID_ALANM_BCK_WAITFISHR_e); @@ -3685,12 +3685,12 @@ class daAlink_c : public daPy_py_c { } bool checkFisingRodJewl() const { - return (mEquipItem == fpcNm_ITEM_JEWEL_ROD || mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD) || mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD; + return (mEquipItem == dItemNo_JEWEL_ROD_e || mEquipItem == dItemNo_JEWEL_WORM_ROD_e) || mEquipItem == dItemNo_JEWEL_BEE_ROD_e; } - bool checkFisingRodWorm() const { return mItemMode == fpcNm_ITEM_WORM; } + bool checkFisingRodWorm() const { return mItemMode == dItemNo_WORM_e; } - bool checkFisingRodBee() const { return mItemMode == fpcNm_ITEM_BEE_CHILD; } + bool checkFisingRodBee() const { return mItemMode == dItemNo_BEE_CHILD_e; } void fishingCastWaitAnimeStart() { if (mProcID == PROC_FISHING_CAST) { @@ -3772,7 +3772,7 @@ class daAlink_c : public daPy_py_c { void setGrassCancelStatus(u8 i_status) { setBStatus(i_status); } void seStartSystem(u32 i_soundID) { mDoAud_seStart(i_soundID, NULL, 0, 0); } - bool checkIronBallEquip() const { return mEquipItem == fpcNm_ITEM_IRONBALL; } + bool checkIronBallEquip() const { return mEquipItem == dItemNo_IRONBALL_e; } BOOL checkFishingRodEquip() const { return checkFishingRodItem(mEquipItem); } f32 getAnmSpeedStickRate(f32 param_0, f32 param_1) const { diff --git a/include/d/actor/d_a_arrow.h b/include/d/actor/d_a_arrow.h index 66b4a9d901d..682ffd43d72 100644 --- a/include/d/actor/d_a_arrow.h +++ b/include/d/actor/d_a_arrow.h @@ -74,7 +74,7 @@ class daArrow_c : public fopAc_ac_c { void deleteArrow() { field_0x93f = 1; } static fopAc_ac_c* makeArrow(fopAc_ac_c* i_actor, u16 param_1) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_ARROW_e, param_1 << 8, &i_actor->current.pos, fopAcM_GetRoomNo(i_actor), @@ -86,7 +86,7 @@ class daArrow_c : public fopAc_ac_c { } static fopAc_ac_c* makeSlingStone(fopAc_ac_c* i_actor, cXyz* i_pos) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_ARROW, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_ARROW_e, 0x401, i_pos, fopAcM_GetRoomNo(i_actor), diff --git a/include/d/actor/d_a_npc_ins.h b/include/d/actor/d_a_npc_ins.h index 0437a01e303..3f8b40a9a0f 100644 --- a/include/d/actor/d_a_npc_ins.h +++ b/include/d/actor/d_a_npc_ins.h @@ -107,7 +107,7 @@ class daNpcIns_c : public daNpcF_c { bool isInsect(int type) { bool rv = false; - if (type >= fpcNm_ITEM_M_BEETLE && type <= fpcNm_ITEM_F_MAYFLY) { + if (type >= dItemNo_M_BEETLE_e && type <= dItemNo_F_MAYFLY_e) { rv = true; } diff --git a/include/d/actor/d_a_npc_jagar.h b/include/d/actor/d_a_npc_jagar.h index 63891084fc2..fbedc8ca1ec 100644 --- a/include/d/actor/d_a_npc_jagar.h +++ b/include/d/actor/d_a_npc_jagar.h @@ -206,7 +206,7 @@ class daNpc_Jagar_c : public daNpcT_c { int crashPumpkin(fopAc_ac_c* pumpkin_p) { int reg_r30; - if (mType == 0 && fopAcM_GetName(pumpkin_p) == PROC_OBJ_PUMPKIN && !daNpcT_chkEvtBit(0xAE) + if (mType == 0 && fopAcM_GetName(pumpkin_p) == fpcNm_OBJ_PUMPKIN_e && !daNpcT_chkEvtBit(0xAE) && daNpcT_chkEvtBit(0x25B) && !daNpcT_chkEvtBit(0x235)) { ++field_0xffc; reg_r30 = chkPointInArea(pumpkin_p->current.pos, current.pos, mpHIO->m.pumpkin_watch_range, diff --git a/include/d/actor/d_a_npc_shad.h b/include/d/actor/d_a_npc_shad.h index 0afc7247468..ba94bbe74e4 100644 --- a/include/d/actor/d_a_npc_shad.h +++ b/include/d/actor/d_a_npc_shad.h @@ -214,15 +214,15 @@ class daNpcShad_c : public daNpcF_c { void searchActors() { if (mMode == 0) { if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(fopAcM_SearchByName(PROC_NPC_ASH)); + mActorMngr[1].entry(fopAcM_SearchByName(fpcNm_NPC_ASH_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(fopAcM_SearchByName(PROC_NPC_RAFREL)); + mActorMngr[2].entry(fopAcM_SearchByName(fpcNm_NPC_RAFREL_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(fopAcM_SearchByName(PROC_NPC_MOIR)); + mActorMngr[3].entry(fopAcM_SearchByName(fpcNm_NPC_MOIR_e)); } if (mActorMngr[4].getActorP() == NULL) { diff --git a/include/d/actor/d_a_obj_eff.h b/include/d/actor/d_a_obj_eff.h index 4df3d0502bc..79309d84a6a 100644 --- a/include/d/actor/d_a_obj_eff.h +++ b/include/d/actor/d_a_obj_eff.h @@ -32,7 +32,7 @@ class Act_c : public fopAc_ac_c { static void make_land_smoke(cXyz* i_pos, f32 i_scale) { cXyz scale(i_scale, i_scale, i_scale); scale *= 1.6666666f; - fopAcM_create(PROC_Obj_Eff, 3, i_pos, -1, NULL, &scale, -1); + fopAcM_create(fpcNm_Obj_Eff_e, 3, i_pos, -1, NULL, &scale, -1); } }; }; // namespace daObjEff diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index 0b3dbed490c..e81bce0a941 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -687,8 +687,8 @@ class daPy_py_c : public fopAc_ac_c { static void setMidnaMotionNum(int i_motionNum); static void setMidnaFaceNum(int i_faceNum); - static BOOL checkShieldGet() { return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE; } - static BOOL checkSwordGet() { return dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE; } + static BOOL checkShieldGet() { return dComIfGs_getSelectEquipShield() != dItemNo_NONE_e; } + static BOOL checkSwordGet() { return dComIfGs_getSelectEquipSword() != dItemNo_NONE_e; } cXyz getHeadTopPos() const { return mHeadTopPos; } u32 checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); } @@ -1123,40 +1123,40 @@ class daPy_py_c : public fopAc_ac_c { static int getLastSceneDamage() { return (dComIfGs_getLastSceneMode() >> 4) & 0x7F; } static u32 getLastSceneSwordAtUpTime() { return (dComIfGs_getLastSceneMode() >> 11) & 0xFF; } - static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_SWORD; } + static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == dItemNo_SWORD_e; } static u32 getLastSceneMode() { return dComIfGs_getLastSceneMode() & 0xF; } static bool checkWoodSwordEquip() { - return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_WOOD_STICK; + return dComIfGs_getSelectEquipSword() == dItemNo_WOOD_STICK_e; } static bool checkLightMasterSwordEquip() { - return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD; + return dComIfGs_getSelectEquipSword() == dItemNo_LIGHT_SWORD_e; } static bool checkCasualWearFlg() { - return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_CASUAL; + return dComIfGs_getSelectEquipClothes() == dItemNo_WEAR_CASUAL_e; } static u32 checkNowWolf() { return ((daPy_py_c*)dComIfGp_getLinkPlayer())->checkWolf(); } static bool checkZoraWearFlg() { - return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_ZORA; + return dComIfGs_getSelectEquipClothes() == dItemNo_WEAR_ZORA_e; } static bool checkMagicArmorWearFlg() { - return dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_ARMOR; + return dComIfGs_getSelectEquipClothes() == dItemNo_ARMOR_e; } static bool checkCarvingWoodShieldEquip() { - return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_WOOD_SHIELD; + return dComIfGs_getSelectEquipShield() == dItemNo_WOOD_SHIELD_e; } static bool checkShopWoodShieldEquip() { - return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_SHIELD; + return dComIfGs_getSelectEquipShield() == dItemNo_SHIELD_e; } static BOOL checkPowerGloveGet() { return false; } diff --git a/include/d/actor/d_a_tag_lantern.h b/include/d/actor/d_a_tag_lantern.h index 54e1e5cf224..c0e0c0d152e 100644 --- a/include/d/actor/d_a_tag_lantern.h +++ b/include/d/actor/d_a_tag_lantern.h @@ -45,7 +45,7 @@ class daTag_Lantern_c : public fopAc_ac_c { BOOL rt = false; if (fopAcM_searchPlayerDistanceXZ(this) < scale.x && 0.0f <= var_f31 && var_f31 < scale.y) { - rt = dComIfGp_checkItemGet(fpcNm_ITEM_KANTERA, 1) && dComIfGs_getOil() != 0; + rt = dComIfGp_checkItemGet(dItemNo_KANTERA_e, 1) && dComIfGs_getOil() != 0; field_0x5f8 = rt == true ? 0 : 1; } else { rt = true; diff --git a/include/d/actor/d_a_tag_mhint.h b/include/d/actor/d_a_tag_mhint.h index 29086d4ddf3..e4c52600798 100644 --- a/include/d/actor/d_a_tag_mhint.h +++ b/include/d/actor/d_a_tag_mhint.h @@ -21,7 +21,7 @@ class daTagMhint_c : public fopAc_ac_c { static void createPortalWarpMissTag(u16 param_0, fpc_ProcID i_parentID) { csXyz sp18(-1, -1, param_0); - fopAcM_createChild(PROC_Tag_Mhint, i_parentID, 0x800FFFFF, + fopAcM_createChild(fpcNm_Tag_Mhint_e, i_parentID, 0x800FFFFF, &daPy_getLinkPlayerActorClass()->current.pos, dComIfGp_roomControl_getStayNo(), &sp18, NULL, -1, NULL); } diff --git a/include/d/d_bomb.h b/include/d/d_bomb.h index 79e0d90f08f..66256dacf87 100644 --- a/include/d/d_bomb.h +++ b/include/d/d_bomb.h @@ -39,63 +39,63 @@ class dBomb_c : public fopAc_ac_c { bool checkStateExplode() { return fopAcM_GetParam(this) == 0; } static bool checkBombActor(fopAc_ac_c* i_actor) { - return fopAcM_GetName(i_actor) == PROC_NBOMB; + return fopAcM_GetName(i_actor) == fpcNm_NBOMB_e; } static fopAc_ac_c* createNormalBombPlayer(cXyz* i_pos) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 8, i_pos, -1, NULL, NULL, -1, NULL, NULL); + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 8, i_pos, -1, NULL, NULL, -1, NULL, NULL); } static fopAc_ac_c* createNormalBombExplode(cXyz* i_pos) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 0, i_pos, -1, NULL, NULL, -1, NULL, NULL); + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 0, i_pos, -1, NULL, NULL, -1, NULL, NULL); } static fopAc_ac_c* createWaterBombPlayer(cXyz* i_pos) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 9, i_pos, -1, NULL, NULL, -1, NULL, NULL); + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 9, i_pos, -1, NULL, NULL, -1, NULL, NULL); } static fopAc_ac_c* createFlowerBomb(cXyz* i_pos, csXyz* i_angle, int param_2) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 4, i_pos, param_2, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 4, i_pos, param_2, i_angle, NULL, -1, NULL, NULL); } static fopAc_ac_c* createInsectBombPlayer(cXyz* i_pos) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 10, i_pos, -1, NULL, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 10, i_pos, -1, NULL, NULL, -1, NULL, NULL); } static fopAc_ac_c* createEnemyBombBoomerang(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 12, i_pos, i_roomNo, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 12, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); } static fopAc_ac_c* createWaterBombExplode(cXyz* i_pos) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 18, i_pos, -1, NULL, NULL, -1, NULL, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 18, i_pos, -1, NULL, NULL, -1, NULL, NULL); } static fopAc_ac_c* createEnemyWaterBomb(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 14, i_pos, i_roomNo, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 14, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); } static fopAc_ac_c* createEnemyWaterBombHookshot(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 16, i_pos, i_roomNo, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 16, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); } static fopAc_ac_c* createBombCargoCarry(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 0x11, i_pos, i_roomNo, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 0x11, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); } static fopAc_ac_c* createEnemyBombHookshot(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 13, i_pos, i_roomNo, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 13, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); } static fopAc_ac_c* createEnemyBomb(cXyz* i_pos, csXyz* i_angle, int i_roomNo) { - return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NBOMB, 0xB, i_pos, i_roomNo, i_angle, NULL, -1, + return (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_NBOMB_e, 0xB, i_pos, i_roomNo, i_angle, NULL, -1, NULL, NULL); } }; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 18165eb6284..cc233eb7504 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -4209,7 +4209,7 @@ inline void dComIfGp_clearItemBombNumCount(u8 i_no) { } inline s16 dComIfGp_getItemMaxBombNumCount() { - return g_dComIfG_gameInfo.play.getItemMaxBombNumCount(fpcNm_ITEM_NORMAL_BOMB); + return g_dComIfG_gameInfo.play.getItemMaxBombNumCount(dItemNo_NORMAL_BOMB_e); } inline void dComIfGp_setNowVibration(u8 status) { diff --git a/include/d/d_item_data.h b/include/d/d_item_data.h index a7e658c1a38..a1770be2413 100644 --- a/include/d/d_item_data.h +++ b/include/d/d_item_data.h @@ -91,4 +91,263 @@ struct dItem_data { static dItem_itemInfo item_info[255]; }; +enum { + /* 0x00 */ dItemNo_HEART_e, + /* 0x01 */ dItemNo_GREEN_RUPEE_e, + /* 0x02 */ dItemNo_BLUE_RUPEE_e, + /* 0x03 */ dItemNo_YELLOW_RUPEE_e, + /* 0x04 */ dItemNo_RED_RUPEE_e, + /* 0x05 */ dItemNo_PURPLE_RUPEE_e, + /* 0x06 */ dItemNo_ORANGE_RUPEE_e, + /* 0x07 */ dItemNo_SILVER_RUPEE_e, + /* 0x08 */ dItemNo_S_MAGIC_e, + /* 0x09 */ dItemNo_L_MAGIC_e, + /* 0x0A */ dItemNo_BOMB_5_e, + /* 0x0B */ dItemNo_BOMB_10_e, + /* 0x0C */ dItemNo_BOMB_20_e, + /* 0x0D */ dItemNo_BOMB_30_e, + /* 0x0E */ dItemNo_ARROW_10_e, + /* 0x0F */ dItemNo_ARROW_20_e, + /* 0x10 */ dItemNo_ARROW_30_e, + /* 0x11 */ dItemNo_ARROW_1_e, + /* 0x12 */ dItemNo_PACHINKO_SHOT_e, + /* 0x13 */ dItemNo_NOENTRY_19_e, + /* 0x14 */ dItemNo_NOENTRY_20_e, + /* 0x15 */ dItemNo_NOENTRY_21_e, + /* 0x16 */ dItemNo_WATER_BOMB_5_e, + /* 0x17 */ dItemNo_WATER_BOMB_10_e, + /* 0x18 */ dItemNo_WATER_BOMB_20_e, + /* 0x19 */ dItemNo_WATER_BOMB_30_e, + /* 0x1A */ dItemNo_BOMB_INSECT_5_e, + /* 0x1B */ dItemNo_BOMB_INSECT_10_e, + /* 0x1C */ dItemNo_BOMB_INSECT_20_e, + /* 0x1D */ dItemNo_BOMB_INSECT_30_e, + /* 0x1E */ dItemNo_RECOVERY_FAILY_e, + /* 0x1F */ dItemNo_TRIPLE_HEART_e, + /* 0x20 */ dItemNo_SMALL_KEY_e, + /* 0x21 */ dItemNo_KAKERA_HEART_e, + /* 0x22 */ dItemNo_UTAWA_HEART_e, + /* 0x23 */ dItemNo_MAP_e, + /* 0x24 */ dItemNo_COMPUS_e, + /* 0x25 */ dItemNo_DUNGEON_EXIT_e, + /* 0x26 */ dItemNo_BOSS_KEY_e, + /* 0x27 */ dItemNo_DUNGEON_BACK_e, + /* 0x28 */ dItemNo_SWORD_e, + /* 0x29 */ dItemNo_MASTER_SWORD_e, + /* 0x2A */ dItemNo_WOOD_SHIELD_e, + /* 0x2B */ dItemNo_SHIELD_e, + /* 0x2C */ dItemNo_HYLIA_SHIELD_e, + /* 0x2D */ dItemNo_TKS_LETTER_e, + /* 0x2E */ dItemNo_WEAR_CASUAL_e, + /* 0x2F */ dItemNo_WEAR_KOKIRI_e, + /* 0x30 */ dItemNo_ARMOR_e, + /* 0x31 */ dItemNo_WEAR_ZORA_e, + /* 0x32 */ dItemNo_MAGIC_LV1_e, + /* 0x33 */ dItemNo_DUNGEON_EXIT_2_e, + /* 0x34 */ dItemNo_WALLET_LV1_e, + /* 0x35 */ dItemNo_WALLET_LV2_e, + /* 0x36 */ dItemNo_WALLET_LV3_e, + /* 0x37 */ dItemNo_NOENTRY_55_e, + /* 0x38 */ dItemNo_NOENTRY_56_e, + /* 0x39 */ dItemNo_NOENTRY_57_e, + /* 0x3A */ dItemNo_NOENTRY_58_e, + /* 0x3B */ dItemNo_NOENTRY_59_e, + /* 0x3C */ dItemNo_NOENTRY_60_e, + /* 0x3D */ dItemNo_ZORAS_JEWEL_e, + /* 0x3E */ dItemNo_HAWK_EYE_e, + /* 0x3F */ dItemNo_WOOD_STICK_e, + /* 0x40 */ dItemNo_BOOMERANG_e, + /* 0x41 */ dItemNo_SPINNER_e, + /* 0x42 */ dItemNo_IRONBALL_e, + /* 0x43 */ dItemNo_BOW_e, + /* 0x44 */ dItemNo_HOOKSHOT_e, + /* 0x45 */ dItemNo_HVY_BOOTS_e, + /* 0x46 */ dItemNo_COPY_ROD_e, + /* 0x47 */ dItemNo_W_HOOKSHOT_e, + /* 0x48 */ dItemNo_KANTERA_e, + /* 0x49 */ dItemNo_LIGHT_SWORD_e, + /* 0x4A */ dItemNo_FISHING_ROD_1_e, + /* 0x4B */ dItemNo_PACHINKO_e, + /* 0x4C */ dItemNo_COPY_ROD_2_e, + /* 0x4D */ dItemNo_NOENTRY_77_e, + /* 0x4E */ dItemNo_NOENTRY_78_e, + /* 0x4F */ dItemNo_BOMB_BAG_LV2_e, + /* 0x50 */ dItemNo_BOMB_BAG_LV1_e, + /* 0x51 */ dItemNo_BOMB_IN_BAG_e, + /* 0x52 */ dItemNo_NOENTRY_82_e, + /* 0x53 */ dItemNo_LIGHT_ARROW_e, + /* 0x54 */ dItemNo_ARROW_LV1_e, + /* 0x55 */ dItemNo_ARROW_LV2_e, + /* 0x56 */ dItemNo_ARROW_LV3_e, + /* 0x57 */ dItemNo_NOENTRY_87_e, + /* 0x58 */ dItemNo_LURE_ROD_e, + /* 0x59 */ dItemNo_BOMB_ARROW_e, + /* 0x5A */ dItemNo_HAWK_ARROW_e, + /* 0x5B */ dItemNo_BEE_ROD_e, + /* 0x5C */ dItemNo_JEWEL_ROD_e, + /* 0x5D */ dItemNo_WORM_ROD_e, + /* 0x5E */ dItemNo_JEWEL_BEE_ROD_e, + /* 0x5F */ dItemNo_JEWEL_WORM_ROD_e, + /* 0x60 */ dItemNo_EMPTY_BOTTLE_e, + /* 0x61 */ dItemNo_RED_BOTTLE_e, + /* 0x62 */ dItemNo_GREEN_BOTTLE_e, + /* 0x63 */ dItemNo_BLUE_BOTTLE_e, + /* 0x64 */ dItemNo_MILK_BOTTLE_e, + /* 0x65 */ dItemNo_HALF_MILK_BOTTLE_e, + /* 0x66 */ dItemNo_OIL_BOTTLE_e, + /* 0x67 */ dItemNo_WATER_BOTTLE_e, + /* 0x68 */ dItemNo_OIL_BOTTLE_2_e, + /* 0x69 */ dItemNo_RED_BOTTLE_2_e, + /* 0x6A */ dItemNo_UGLY_SOUP_e, + /* 0x6B */ dItemNo_HOT_SPRING_e, + /* 0x6C */ dItemNo_FAIRY_e, + /* 0x6D */ dItemNo_HOT_SPRING_2_e, + /* 0x6E */ dItemNo_OIL2_e, + /* 0x6F */ dItemNo_OIL_e, + /* 0x70 */ dItemNo_NORMAL_BOMB_e, + /* 0x71 */ dItemNo_WATER_BOMB_e, + /* 0x72 */ dItemNo_POKE_BOMB_e, + /* 0x73 */ dItemNo_FAIRY_DROP_e, + /* 0x74 */ dItemNo_WORM_e, + /* 0x75 */ dItemNo_DROP_BOTTLE_e, + /* 0x76 */ dItemNo_BEE_CHILD_e, + /* 0x77 */ dItemNo_CHUCHU_RARE_e, + /* 0x78 */ dItemNo_CHUCHU_RED_e, + /* 0x79 */ dItemNo_CHUCHU_BLUE_e, + /* 0x7A */ dItemNo_CHUCHU_GREEN_e, + /* 0x7B */ dItemNo_CHUCHU_YELLOW_e, + /* 0x7C */ dItemNo_CHUCHU_PURPLE_e, + /* 0x7D */ dItemNo_LV1_SOUP_e, + /* 0x7E */ dItemNo_LV2_SOUP_e, + /* 0x7F */ dItemNo_LV3_SOUP_e, + /* 0x80 */ dItemNo_LETTER_e, + /* 0x81 */ dItemNo_BILL_e, + /* 0x82 */ dItemNo_WOOD_STATUE_e, + /* 0x83 */ dItemNo_IRIAS_PENDANT_e, + /* 0x84 */ dItemNo_HORSE_FLUTE_e, + /* 0x85 */ dItemNo_NOENTRY_133_e, + /* 0x86 */ dItemNo_NOENTRY_134_e, + /* 0x87 */ dItemNo_NOENTRY_135_e, + /* 0x88 */ dItemNo_NOENTRY_136_e, + /* 0x89 */ dItemNo_NOENTRY_137_e, + /* 0x8A */ dItemNo_NOENTRY_138_e, + /* 0x8B */ dItemNo_NOENTRY_139_e, + /* 0x8C */ dItemNo_NOENTRY_140_e, + /* 0x8D */ dItemNo_NOENTRY_141_e, + /* 0x8E */ dItemNo_NOENTRY_142_e, + /* 0x8F */ dItemNo_NOENTRY_143_e, + /* 0x90 */ dItemNo_RAFRELS_MEMO_e, + /* 0x91 */ dItemNo_ASHS_SCRIBBLING_e, + /* 0x92 */ dItemNo_NOENTRY_146_e, + /* 0x93 */ dItemNo_NOENTRY_147_e, + /* 0x94 */ dItemNo_NOENTRY_148_e, + /* 0x95 */ dItemNo_NOENTRY_149_e, + /* 0x96 */ dItemNo_NOENTRY_150_e, + /* 0x97 */ dItemNo_NOENTRY_151_e, + /* 0x98 */ dItemNo_NOENTRY_152_e, + /* 0x99 */ dItemNo_NOENTRY_153_e, + /* 0x9A */ dItemNo_NOENTRY_154_e, + /* 0x9B */ dItemNo_NOENTRY_155_e, + /* 0x9C */ dItemNo_CHUCHU_YELLOW2_e, + /* 0x9D */ dItemNo_OIL_BOTTLE3_e, + /* 0x9E */ dItemNo_SHOP_BEE_CHILD_e, + /* 0x9F */ dItemNo_CHUCHU_BLACK_e, + /* 0xA0 */ dItemNo_LIGHT_DROP_e, + /* 0xA1 */ dItemNo_DROP_CONTAINER_e, + /* 0xA2 */ dItemNo_DROP_CONTAINER02_e, + /* 0xA3 */ dItemNo_DROP_CONTAINER03_e, + /* 0xA4 */ dItemNo_FILLED_CONTAINER_e, + /* 0xA5 */ dItemNo_MIRROR_PIECE_2_e, + /* 0xA6 */ dItemNo_MIRROR_PIECE_3_e, + /* 0xA7 */ dItemNo_MIRROR_PIECE_4_e, + /* 0xA8 */ dItemNo_NOENTRY_168_e, + /* 0xA9 */ dItemNo_NOENTRY_169_e, + /* 0xAA */ dItemNo_NOENTRY_170_e, + /* 0xAB */ dItemNo_NOENTRY_171_e, + /* 0xAC */ dItemNo_NOENTRY_172_e, + /* 0xAD */ dItemNo_NOENTRY_173_e, + /* 0xAE */ dItemNo_NOENTRY_174_e, + /* 0xAF */ dItemNo_NOENTRY_175_e, + /* 0xB0 */ dItemNo_SMELL_YELIA_POUCH_e, + /* 0xB1 */ dItemNo_SMELL_PUMPKIN_e, + /* 0xB2 */ dItemNo_SMELL_POH_e, + /* 0xB3 */ dItemNo_SMELL_FISH_e, + /* 0xB4 */ dItemNo_SMELL_CHILDREN_e, + /* 0xB5 */ dItemNo_SMELL_MEDICINE_e, + /* 0xB6 */ dItemNo_NOENTRY_182_e, + /* 0xB7 */ dItemNo_NOENTRY_183_e, + /* 0xB8 */ dItemNo_NOENTRY_184_e, + /* 0xB9 */ dItemNo_NOENTRY_185_e, + /* 0xBA */ dItemNo_NOENTRY_186_e, + /* 0xBB */ dItemNo_NOENTRY_187_e, + /* 0xBC */ dItemNo_NOENTRY_188_e, + /* 0xBD */ dItemNo_NOENTRY_189_e, + /* 0xBE */ dItemNo_NOENTRY_190_e, + /* 0xBF */ dItemNo_NOENTRY_191_e, + /* 0xC0 */ dItemNo_M_BEETLE_e, + /* 0xC1 */ dItemNo_F_BEETLE_e, + /* 0xC2 */ dItemNo_M_BUTTERFLY_e, + /* 0xC3 */ dItemNo_F_BUTTERFLY_e, + /* 0xC4 */ dItemNo_M_STAG_BEETLE_e, + /* 0xC5 */ dItemNo_F_STAG_BEETLE_e, + /* 0xC6 */ dItemNo_M_GRASSHOPPER_e, + /* 0xC7 */ dItemNo_F_GRASSHOPPER_e, + /* 0xC8 */ dItemNo_M_NANAFUSHI_e, + /* 0xC9 */ dItemNo_F_NANAFUSHI_e, + /* 0xCA */ dItemNo_M_DANGOMUSHI_e, + /* 0xCB */ dItemNo_F_DANGOMUSHI_e, + /* 0xCC */ dItemNo_M_MANTIS_e, + /* 0xCD */ dItemNo_F_MANTIS_e, + /* 0xCE */ dItemNo_M_LADYBUG_e, + /* 0xCF */ dItemNo_F_LADYBUG_e, + /* 0xD0 */ dItemNo_M_SNAIL_e, + /* 0xD1 */ dItemNo_F_SNAIL_e, + /* 0xD2 */ dItemNo_M_DRAGONFLY_e, + /* 0xD3 */ dItemNo_F_DRAGONFLY_e, + /* 0xD4 */ dItemNo_M_ANT_e, + /* 0xD5 */ dItemNo_F_ANT_e, + /* 0xD6 */ dItemNo_M_MAYFLY_e, + /* 0xD7 */ dItemNo_F_MAYFLY_e, + /* 0xD8 */ dItemNo_NOENTRY_216_e, + /* 0xD9 */ dItemNo_NOENTRY_217_e, + /* 0xDA */ dItemNo_NOENTRY_218_e, + /* 0xDB */ dItemNo_NOENTRY_219_e, + /* 0xDC */ dItemNo_NOENTRY_220_e, + /* 0xDD */ dItemNo_NOENTRY_221_e, + /* 0xDE */ dItemNo_NOENTRY_222_e, + /* 0xDF */ dItemNo_NOENTRY_223_e, + /* 0xE0 */ dItemNo_POU_SPIRIT_e, + /* 0xE1 */ dItemNo_NOENTRY_225_e, + /* 0xE2 */ dItemNo_NOENTRY_226_e, + /* 0xE3 */ dItemNo_NOENTRY_227_e, + /* 0xE4 */ dItemNo_NOENTRY_228_e, + /* 0xE5 */ dItemNo_NOENTRY_229_e, + /* 0xE6 */ dItemNo_NOENTRY_230_e, + /* 0xE7 */ dItemNo_NOENTRY_231_e, + /* 0xE8 */ dItemNo_NOENTRY_232_e, + /* 0xE9 */ dItemNo_ANCIENT_DOCUMENT_e, + /* 0xEA */ dItemNo_AIR_LETTER_e, + /* 0xEB */ dItemNo_ANCIENT_DOCUMENT2_e, + /* 0xEC */ dItemNo_LV7_DUNGEON_EXIT_e, + /* 0xED */ dItemNo_LINKS_SAVINGS_e, + /* 0xEE */ dItemNo_SMALL_KEY2_e, + /* 0xEF */ dItemNo_POU_FIRE1_e, + /* 0xF0 */ dItemNo_POU_FIRE2_e, + /* 0xF1 */ dItemNo_POU_FIRE3_e, + /* 0xF2 */ dItemNo_POU_FIRE4_e, + /* 0xF3 */ dItemNo_BOSSRIDER_KEY_e, + /* 0xF4 */ dItemNo_TOMATO_PUREE_e, + /* 0xF5 */ dItemNo_TASTE_e, + /* 0xF6 */ dItemNo_LV5_BOSS_KEY_e, + /* 0xF7 */ dItemNo_SURFBOARD_e, + /* 0xF8 */ dItemNo_KANTERA2_e, + /* 0xF9 */ dItemNo_L2_KEY_PIECES1_e, + /* 0xFA */ dItemNo_L2_KEY_PIECES2_e, + /* 0xFB */ dItemNo_L2_KEY_PIECES3_e, + /* 0xFC */ dItemNo_KEY_OF_CARAVAN_e, + /* 0xFD */ dItemNo_LV2_BOSS_KEY_e, + /* 0xFE */ dItemNo_KEY_OF_FILONE_e, + /* 0xFF */ dItemNo_NONE_e, +}; + #endif /* D_D_ITEM_DATA_H */ diff --git a/include/d/d_k_wmark.h b/include/d/d_k_wmark.h index 10be281182d..0190c944674 100644 --- a/include/d/d_k_wmark.h +++ b/include/d/d_k_wmark.h @@ -16,7 +16,7 @@ class dkWmark_c : public kankyo_class { static int m_nowID; static void setFootMark(cXyz* i_pos, s16 param_1, int param_2) { - fopKyM_create(PROC_WMARK, param_2 | (param_1 << 0x10), i_pos, NULL, NULL); + fopKyM_create(fpcNm_WMARK_e, param_2 | (param_1 << 0x10), i_pos, NULL, NULL); } /* 0x0F8 */ JKRSolidHeap* mpHeap; diff --git a/include/d/d_procname.h b/include/d/d_procname.h deleted file mode 100644 index bc0ed5efc19..00000000000 --- a/include/d/d_procname.h +++ /dev/null @@ -1,805 +0,0 @@ -#ifndef D_PROCNAME_H -#define D_PROCNAME_H - -#include "global.h" - -enum { - /* 0x000 */ PROC_OVERLAP0, - /* 0x001 */ PROC_OVERLAP1, - /* 0x002 */ PROC_OVERLAP3, - /* 0x003 */ PROC_OVERLAP6, - /* 0x004 */ PROC_OVERLAP7, - /* 0x005 */ PROC_OVERLAP8, - /* 0x006 */ PROC_OVERLAP9, - /* 0x007 */ PROC_OVERLAP10, - /* 0x008 */ PROC_OVERLAP11, - /* 0x009 */ PROC_LOGO_SCENE, - /* 0x00A */ PROC_MENU_SCENE, - /* 0x00B */ PROC_PLAY_SCENE, - /* 0x00C */ PROC_OPENING_SCENE, - /* 0x00D */ PROC_NAME_SCENE, - /* 0x00E */ PROC_NAMEEX_SCENE, -#if VERSION != VERSION_WII_USA_R0 && VERSION != VERSION_WII_PAL - /* 0x00F */ PROC_WARNING_SCENE, - /* 0x010 */ PROC_WARNING2_SCENE, -#endif - /* 0x011 */ PROC_OVERLAP2, - /* 0x012 */ PROC_ROOM_SCENE, - /* 0x013 */ PROC_KANKYO, - /* 0x014 */ PROC_ALLDIE, - /* 0x015 */ PROC_ENVSE, - /* 0x016 */ PROC_Obj_Swpush, - /* 0x017 */ PROC_Obj_Swpush2, - /* 0x018 */ PROC_Obj_Swpush5, - /* 0x019 */ PROC_Tag_Gstart, - /* 0x01A */ PROC_NO_CHG_ROOM, - /* 0x01B */ PROC_Obj_Lv6ElevtA, - /* 0x01C */ PROC_OBJ_SO, - /* 0x01D */ PROC_Obj_Movebox, - /* 0x01E */ PROC_Obj_SwTurn, - /* 0x01F */ PROC_Obj_Lv6SwTurn, - /* 0x020 */ PROC_OBJ_SEKIZOA, - /* 0x021 */ PROC_OBJ_GRA, - /* 0x022 */ PROC_TAG_GRA, - /* 0x023 */ PROC_TAG_YAMI, - /* 0x024 */ PROC_Obj_Ladder, - /* 0x025 */ PROC_OBJ_BEF, - /* 0x026 */ PROC_OBJ_FMOBJ, - /* 0x027 */ PROC_OBJ_LBOX, - /* 0x028 */ PROC_OBJ_WEB0, - /* 0x029 */ PROC_OBJ_WEB1, - /* 0x02A */ PROC_OBJ_CB, - /* 0x02B */ PROC_OBJ_MAKI, - /* 0x02C */ PROC_OBJ_BRG, - /* 0x02D */ PROC_OBJ_GB, - /* 0x02E */ PROC_OBJ_GM, - /* 0x02F */ PROC_OBJ_TOBY, - /* 0x030 */ PROC_OBJ_TP, - /* 0x031 */ PROC_TREESH, - /* 0x032 */ PROC_Obj_ZDoor, - /* 0x033 */ PROC_Obj_Pillar, - /* 0x034 */ PROC_Obj_Cdoor, - /* 0x035 */ PROC_GRDWATER, - /* 0x036 */ PROC_Obj_RotBridge, - /* 0x037 */ PROC_Obj_MagLift, - /* 0x038 */ PROC_Obj_MagLiftRot, - /* 0x039 */ PROC_Obj_Lv1Cdl00, - /* 0x03A */ PROC_Obj_Lv1Cdl01, - /* 0x03B */ PROC_Obj_TvCdlst, - /* 0x03C */ PROC_Obj_HsTarget, - /* 0x03D */ PROC_Obj_HeavySw, - /* 0x03E */ PROC_Obj_GoGate, - /* 0x03F */ PROC_Obj_TaFence, - /* 0x040 */ PROC_Obj_Saidan, - /* 0x041 */ PROC_Obj_SpinLift, - /* 0x042 */ PROC_Obj_BmWindow, - /* 0x043 */ PROC_Obj_RfHole, - /* 0x044 */ PROC_Obj_WaterPillar, - /* 0x045 */ PROC_Obj_SyRock, - /* 0x046 */ PROC_Obj_BsGate, - /* 0x047 */ PROC_Obj_AmiShutter, - /* 0x048 */ PROC_Obj_WtGate, - /* 0x049 */ PROC_Obj_Lv2Candle, - /* 0x04A */ PROC_Obj_TogeTrap, - /* 0x04B */ PROC_Obj_RotTrap, - /* 0x04C */ PROC_Obj_SwallShutter, - /* 0x04D */ PROC_Obj_IceWall, - /* 0x04E */ PROC_Obj_Lv5SwIce, - /* 0x04F */ PROC_Obj_Lv5FBoard, - /* 0x050 */ PROC_Obj_Turara, - /* 0x051 */ PROC_Obj_TwGate, - /* 0x052 */ PROC_Obj_Digholl, - /* 0x053 */ PROC_Obj_Digpl, - /* 0x054 */ PROC_Obj_TestCube, - /* 0x055 */ PROC_Obj_Kshutter, - /* 0x056 */ PROC_NPC_COACH, - /* 0x057 */ PROC_NPC_THEB, - /* 0x058 */ PROC_COACH_FIRE, - /* 0x059 */ PROC_COACH2D, - /* 0x05A */ PROC_BALLOON2D, - /* 0x05B */ PROC_SKIP2D, - /* 0x05C */ PROC_Obj_MvStair, - /* 0x05D */ PROC_Obj_Cowdoor, - /* 0x05E */ PROC_Obj_Swpropeller, - /* 0x05F */ PROC_Obj_BoomShutter, - /* 0x060 */ PROC_NPC_KS, - /* 0x061 */ PROC_Obj_Hfuta, - /* 0x062 */ PROC_Obj_BkDoor, - /* 0x063 */ PROC_Obj_Cboard, - /* 0x064 */ PROC_Obj_MGate, - /* 0x065 */ PROC_Obj_Ikada, - /* 0x066 */ PROC_Obj_Ice_l, - /* 0x067 */ PROC_Obj_Ice_s, - /* 0x068 */ PROC_Obj_E_CREATE, - /* 0x069 */ PROC_Obj_Bhbridge, - /* 0x06A */ PROC_Obj_Kaisou, - /* 0x06B */ PROC_Obj_HHASHI, - /* 0x06C */ PROC_Obj_BHASHI, - /* 0x06D */ PROC_OCTHASHI, - /* 0x06E */ PROC_Obj_THASHI, - /* 0x06F */ PROC_Obj_CRVGATE, - /* 0x070 */ PROC_Obj_CRVFENCE, - /* 0x071 */ PROC_Obj_CRVHAHEN, - /* 0x072 */ PROC_Obj_CRVSTEEL, - /* 0x073 */ PROC_Obj_CRVLH_UP, - /* 0x074 */ PROC_Obj_CRVLH_DW, - /* 0x075 */ PROC_Obj_RIVERROCK, - /* 0x076 */ PROC_Obj_DUST, - /* 0x077 */ PROC_Obj_ITA, - /* 0x078 */ PROC_Obj_Window, - /* 0x079 */ PROC_Obj_MetalBox, - /* 0x07A */ PROC_Obj_BBox, - /* 0x07B */ PROC_OBJ_MSIMA, - /* 0x07C */ PROC_OBJ_MYOGAN, - /* 0x07D */ PROC_B_ZANTS, - /* 0x07E */ PROC_Obj_ChainBlock, - /* 0x07F */ PROC_Obj_ChainWall, - /* 0x080 */ PROC_Obj_KkrGate, - /* 0x081 */ PROC_Obj_RiderGate, - /* 0x082 */ PROC_Obj_Onsen, - /* 0x083 */ PROC_Obj_Chest, - /* 0x084 */ PROC_Obj_Bemos, - /* 0x085 */ PROC_Obj_RopeBridge, - /* 0x086 */ PROC_Obj_WellCover, - /* 0x087 */ PROC_Obj_GraveStone, - /* 0x088 */ PROC_Obj_ZraRock, - /* 0x089 */ PROC_Obj_GraRock, - /* 0x08A */ PROC_Obj_GrzRock, - /* 0x08B */ PROC_GRA_WALL, - /* 0x08C */ PROC_OBJ_ONSEN_FIRE, - /* 0x08D */ PROC_Obj_Lv6bemos, - /* 0x08E */ PROC_Obj_Lv6bemos2, - /* 0x08F */ PROC_Obj_BarDesk, - /* 0x090 */ PROC_Obj_DigSnow, - /* 0x091 */ PROC_Obj_Ytaihou, - /* 0x092 */ PROC_Obj_Elevator, - /* 0x093 */ PROC_Obj_Lv6TogeRoll, - /* 0x094 */ PROC_Obj_Lv6TogeTrap, - /* 0x095 */ PROC_Obj_Lv6Tenbin, - /* 0x096 */ PROC_Obj_Lv6SwGate, - /* 0x097 */ PROC_Obj_Lv6Lblock, - /* 0x098 */ PROC_Obj_Lv6ChgGate, - /* 0x099 */ PROC_Obj_Lv6FuriTrap, - /* 0x09A */ PROC_Obj_Lv6SzGate, - /* 0x09B */ PROC_Obj_Lv4EdShutter, - /* 0x09C */ PROC_Obj_Lv4Gate, - /* 0x09D */ PROC_Obj_Lv4PoGate, - /* 0x09E */ PROC_Obj_Lv4SlideWall, - /* 0x09F */ PROC_Obj_Lv4HsTarget, - /* 0x0A0 */ PROC_Obj_Lv7PropY, - /* 0x0A1 */ PROC_Obj_Lv7BsGate, - /* 0x0A2 */ PROC_Obj_Lv8OptiLift, - /* 0x0A3 */ PROC_Obj_Lv8KekkaiTrap, - /* 0x0A4 */ PROC_Obj_Lv8Lift, - /* 0x0A5 */ PROC_Obj_Lv8UdFloor, - /* 0x0A6 */ PROC_Obj_Lv9SwShutter, - /* 0x0A7 */ PROC_Obj_TobyHouse, - /* 0x0A8 */ PROC_Obj_poCandle, - /* 0x0A9 */ PROC_Obj_Lv4DigSand, - /* 0x0AA */ PROC_Obj_FallObj, - /* 0x0AB */ PROC_Obj_SmgDoor, - /* 0x0AC */ PROC_Obj_SwLight, - /* 0x0AD */ PROC_Obj_Avalanche, - /* 0x0AE */ PROC_Obj_MirrorScrew, - /* 0x0AF */ PROC_Obj_MirrorSand, - /* 0x0B0 */ PROC_Obj_MirrorTable, - /* 0x0B1 */ PROC_Obj_MirrorChain, - /* 0x0B2 */ PROC_Obj_Mirror6Pole, - /* 0x0B3 */ PROC_Obj_SwSpinner, - /* 0x0B4 */ PROC_Obj_TDoor, - /* 0x0B5 */ PROC_Obj_Lv7Bridge, - /* 0x0B6 */ PROC_Obj_zrTurara, - /* 0x0B7 */ PROC_Obj_TakaraDai, - /* 0x0B8 */ PROC_Obj_Table, - /* 0x0B9 */ PROC_Obj_CatDoor, - /* 0x0BA */ PROC_Obj_Gake, - /* 0x0BB */ PROC_CSTAF, - /* 0x0BC */ PROC_Obj_Lv4RailWall, - /* 0x0BD */ PROC_Obj_Lv4Sand, - /* 0x0BE */ PROC_Obj_PushDoor, - /* 0x0BF */ PROC_PushDoor, - /* 0x0C0 */ PROC_Obj_GanonWall2, - /* 0x0C1 */ PROC_Obj_Lv4Bridge, - /* 0x0C2 */ PROC_Obj_Lv4Floor, - /* 0x0C3 */ PROC_Tag_Spinner, - /* 0x0C4 */ PROC_Obj_SwHang, - /* 0x0C5 */ PROC_Obj_RotStair, - /* 0x0C6 */ PROC_Obj_MagneArm, - /* 0x0C7 */ PROC_Obj_KWheel00, - /* 0x0C8 */ PROC_Obj_KWheel01, - /* 0x0C9 */ PROC_Obj_Ychndlr, - /* 0x0CA */ PROC_Obj_PRElvtr, - /* 0x0CB */ PROC_Obj_MHasu, - /* 0x0CC */ PROC_Obj_YIblltray, - /* 0x0CD */ PROC_Obj_Lv6EGate, - /* 0x0CE */ PROC_Obj_PDtile, - /* 0x0CF */ PROC_Obj_PDwall, - /* 0x0D0 */ PROC_Obj_Lv4PRwall, - /* 0x0D1 */ PROC_Obj_KLift00, - /* 0x0D2 */ PROC_B_OH, - /* 0x0D3 */ PROC_Obj_Lv4Chan, - /* 0x0D4 */ PROC_Obj_Lv3R10Saka, - /* 0x0D5 */ PROC_Obj_Lv3Water, - /* 0x0D6 */ PROC_Obj_Lv3Water2, - /* 0x0D7 */ PROC_OBJ_LV3WATERB, - /* 0x0D8 */ PROC_Obj_HBombkoya, - /* 0x0D9 */ PROC_Obj_SZbridge, - /* 0x0DA */ PROC_Obj_KakarikoBrg, - /* 0x0DB */ PROC_Obj_OrdinBrg, - /* 0x0DC */ PROC_Obj_BurnBox, - /* 0x0DD */ PROC_Obj_KJgjs, - /* 0x0DE */ PROC_OBJ_IHASI, - /* 0x0DF */ PROC_Obj_IceBlock, - /* 0x0E0 */ PROC_Obj_VolcanicBall, - /* 0x0E1 */ PROC_Obj_VolcanicBomb, - /* 0x0E2 */ PROC_Obj_VolcGnd, - /* 0x0E3 */ PROC_Obj_KKanban, - /* 0x0E4 */ PROC_E_PH, - /* 0x0E5 */ PROC_NPC_ZRA, - /* 0x0E6 */ PROC_Obj_Chandelier, - /* 0x0E7 */ PROC_Obj_Stopper2, - /* 0x0E8 */ PROC_DOOR20, - /* 0x0E9 */ PROC_Tag_Hinit, - /* 0x0EA */ PROC_Tag_Hjump, - /* 0x0EB */ PROC_Tag_AJnot, - /* 0x0EC */ PROC_Tag_Hstop, - /* 0x0ED */ PROC_CANOE, - /* 0x0EE */ PROC_HORSE, - /* 0x0EF */ PROC_E_WB, - /* 0x0F0 */ PROC_OBJ_ITO, - /* 0x0F1 */ PROC_OBJ_SW, - /* 0x0F2 */ PROC_SPINNER, - /* 0x0F3 */ PROC_B_OB, - /* 0x0F4 */ PROC_KAGO, - /* 0x0F5 */ PROC_E_YC, - /* 0x0F6 */ PROC_B_DS, - /* 0x0F7 */ PROC_B_DR, - /* 0x0F8 */ PROC_B_ZANTZ, - /* 0x0F9 */ PROC_B_ZANT, - /* 0x0FA */ PROC_B_ZANTM, - /* 0x0FB */ PROC_TBOX, - /* 0x0FC */ PROC_TBOX2, - /* 0x0FD */ PROC_ALINK, - /* 0x0FE */ PROC_BOOMERANG, - /* 0x0FF */ PROC_MIDNA, - /* 0x100 */ PROC_NPC_TK, - /* 0x101 */ PROC_NPC_WORM, - /* 0x102 */ PROC_PPolamp, - /* 0x103 */ PROC_BkyRock, - /* 0x104 */ PROC_HITOBJ, - /* 0x105 */ PROC_EP, - /* 0x106 */ PROC_COW, - /* 0x107 */ PROC_PERU, - /* 0x108 */ PROC_NI, - /* 0x109 */ PROC_NPC_TKJ2, - /* 0x10A */ PROC_SQ, - /* 0x10B */ PROC_NPC_SQ, - /* 0x10C */ PROC_DO, - /* 0x10D */ PROC_NPC_NE, - /* 0x10E */ PROC_NPC_TR, - /* 0x10F */ PROC_NPC_LF, - /* 0x110 */ PROC_OBJ_FOOD, - /* 0x111 */ PROC_OBJ_KI, - /* 0x112 */ PROC_OBJ_KITA, - /* 0x113 */ PROC_OBJ_KEY, - /* 0x114 */ PROC_OBJ_KEYHOLE, - /* 0x115 */ PROC_Obj_Lv5Key, - /* 0x116 */ PROC_OBJ_LP, - /* 0x117 */ PROC_OBJ_TATIGI, - /* 0x118 */ PROC_OBJ_ROCK, - /* 0x119 */ PROC_OBJ_WFLAG, - /* 0x11A */ PROC_OBJ_KAGE, - /* 0x11B */ PROC_OBJ_KANBAN2, - /* 0x11C */ PROC_OBJ_BALLOON, - /* 0x11D */ PROC_OBJ_SUISYA, - /* 0x11E */ PROC_OBJ_OILTUBO, - /* 0x11F */ PROC_OBJ_ROTEN, - /* 0x120 */ PROC_OBJ_SSDRINK, - /* 0x121 */ PROC_OBJ_SSITEM, - /* 0x122 */ PROC_TAG_SSDRINK, - /* 0x123 */ PROC_TAG_BTLITM, - /* 0x124 */ PROC_TAG_LV5SOUP, - /* 0x125 */ PROC_TAG_MNLIGHT, - /* 0x126 */ PROC_TAG_SHOPCAM, - /* 0x127 */ PROC_TAG_SHOPITM, - /* 0x128 */ PROC_OBJ_NDOOR, - /* 0x129 */ PROC_OBJ_UDOOR, - /* 0x12A */ PROC_OBJ_USAKU, - /* 0x12B */ PROC_Obj_SM_DOOR, - /* 0x12C */ PROC_OBJ_BED, - /* 0x12D */ PROC_OBJ_BOUMATO, - /* 0x12E */ PROC_OBJ_ITAMATO, - /* 0x12F */ PROC_OBJ_NOUGU, - /* 0x130 */ PROC_OBJ_STICK, - /* 0x131 */ PROC_OBJ_MIE, - /* 0x132 */ PROC_OBJ_SEKIDOOR, - /* 0x133 */ PROC_OBJ_SEKIZO, - /* 0x134 */ PROC_OBJ_SMTILE, - /* 0x135 */ PROC_NPC_FISH, - /* 0x136 */ PROC_MG_FISH, - /* 0x137 */ PROC_FSHOP, - /* 0x138 */ PROC_NPC_DU, - /* 0x139 */ PROC_DISAPPEAR, - /* 0x13A */ PROC_Obj_Mato, - /* 0x13B */ PROC_Obj_Flag, - /* 0x13C */ PROC_Obj_Flag2, - /* 0x13D */ PROC_Obj_Flag3, - /* 0x13E */ PROC_Obj_GOMIKABE, - /* 0x13F */ PROC_Obj_Yousei, - /* 0x140 */ PROC_Obj_Kabuto, - /* 0x141 */ PROC_Obj_Cho, - /* 0x142 */ PROC_Obj_Kuw, - /* 0x143 */ PROC_Obj_Nan, - /* 0x144 */ PROC_Obj_Dan, - /* 0x145 */ PROC_Obj_Kam, - /* 0x146 */ PROC_Obj_Ten, - /* 0x147 */ PROC_Obj_Ari, - /* 0x148 */ PROC_Obj_Kag, - /* 0x149 */ PROC_Obj_Batta, - /* 0x14A */ PROC_Obj_Tombo, - /* 0x14B */ PROC_Obj_Kat, - /* 0x14C */ PROC_Obj_H_Saku, - /* 0x14D */ PROC_Obj_Yobikusa, - /* 0x14E */ PROC_Obj_KazeNeko, - /* 0x14F */ PROC_Obj_KznkArm, - /* 0x150 */ PROC_Obj_NamePlate, - /* 0x151 */ PROC_Obj_OnCloth, - /* 0x152 */ PROC_Obj_LndRope, - /* 0x153 */ PROC_Obj_ItaRope, - /* 0x154 */ PROC_Obj_Sakuita, - /* 0x155 */ PROC_Obj_Laundry, - /* 0x156 */ PROC_WarpBug, - /* 0x157 */ PROC_Izumi_Gate, - /* 0x158 */ PROC_Obj_Fchain, - /* 0x159 */ PROC_Obj_Wchain, - /* 0x15A */ PROC_Tag_Attp, - /* 0x15B */ PROC_Obj_Tornado, - /* 0x15C */ PROC_Obj_Tornado2, - /* 0x15D */ PROC_Obj_FirePillar, - /* 0x15E */ PROC_Obj_FirePillar2, - /* 0x15F */ PROC_Obj_InoBone, - /* 0x160 */ PROC_Obj_Stopper, - /* 0x161 */ PROC_Obj_MHole, - /* 0x162 */ PROC_Tag_Magne, - /* 0x163 */ PROC_Obj_BossWarp, - /* 0x164 */ PROC_Obj_WoodPendulum, - /* 0x165 */ PROC_Obj_WdStick, - /* 0x166 */ PROC_Obj_StairBlock, - /* 0x167 */ PROC_Obj_Geyser, - /* 0x168 */ PROC_Tag_KtOnFire, - /* 0x169 */ PROC_Obj_FireWood, - /* 0x16A */ PROC_Obj_FireWood2, - /* 0x16B */ PROC_Obj_GpTaru, - /* 0x16C */ PROC_Obj_OnsenTaru, - /* 0x16D */ PROC_Obj_KiPot, - /* 0x16E */ PROC_TBOX_SW, - /* 0x16F */ PROC_Obj_SwChain, - /* 0x170 */ PROC_Obj_WoodenSword, - /* 0x171 */ PROC_Obj_StoneMark, - /* 0x172 */ PROC_Obj_Lv3Candle, - /* 0x173 */ PROC_Tag_Lv4Candle, - /* 0x174 */ PROC_Tag_Lv4CandleDm, - /* 0x175 */ PROC_Obj_DamCps, - /* 0x176 */ PROC_Obj_Smoke, - /* 0x177 */ PROC_Obj_WaterFall, - /* 0x178 */ PROC_Obj_ZoraCloth, - /* 0x179 */ PROC_Obj_poFire, - /* 0x17A */ PROC_Tag_poFire, - /* 0x17B */ PROC_Obj_glowSphere, - /* 0x17C */ PROC_Tag_LightBall, - /* 0x17D */ PROC_SwLBall, - /* 0x17E */ PROC_SwBall, - /* 0x17F */ PROC_Obj_WaterEff, - /* 0x180 */ PROC_Tag_RiverBack, - /* 0x181 */ PROC_Tag_KagoFall, - /* 0x182 */ PROC_Tag_Lv2PrChk, - /* 0x183 */ PROC_Obj_Lv4Gear, - /* 0x184 */ PROC_Obj_MasterSword, - /* 0x185 */ PROC_Obj_WoodStatue, - /* 0x186 */ PROC_Obj_Fan, - /* 0x187 */ PROC_Obj_IceLeaf, - /* 0x188 */ PROC_Obj_zrTuraraRc, - /* 0x189 */ PROC_Tag_RetRoom, - /* 0x18A */ PROC_Obj_WindStone, - /* 0x18B */ PROC_Tag_WaraHowl, - /* 0x18C */ PROC_Obj_SCannon, - /* 0x18D */ PROC_Obj_SmWStone, - /* 0x18E */ PROC_Obj_SCannonCrs, - /* 0x18F */ PROC_Tag_SnowEff, - /* 0x190 */ PROC_Tag_CstaSw, - /* 0x191 */ PROC_Tag_Lv6CstaSw, - /* 0x192 */ PROC_Obj_awaPlar, - /* 0x193 */ PROC_Obj_poTbox, - /* 0x194 */ PROC_Obj_TimeFire, - /* 0x195 */ PROC_Obj_TMoon, - /* 0x196 */ PROC_Obj_GanonWall, - /* 0x197 */ PROC_Obj_Prop, - /* 0x198 */ PROC_CSTATUE, - /* 0x199 */ PROC_Obj_SwBallA, - /* 0x19A */ PROC_Obj_SwBallB, - /* 0x19B */ PROC_Obj_SnowSoup, - /* 0x19C */ PROC_Obj_Nagaisu, - /* 0x19D */ PROC_Obj_RCircle, - /* 0x19E */ PROC_Obj_Picture, - /* 0x19F */ PROC_Tag_SetBall, - /* 0x1A0 */ PROC_Tag_SmkEmt, - /* 0x1A1 */ PROC_SwTime, - /* 0x1A2 */ PROC_Obj_HFtr, - /* 0x1A3 */ PROC_Obj_HBarrel, - /* 0x1A4 */ PROC_Obj_Crystal, - /* 0x1A5 */ PROC_Obj_SCannonTen, - /* 0x1A6 */ PROC_Obj_SwBallC, - /* 0x1A7 */ PROC_SCENE_EXIT2, - /* 0x1A8 */ PROC_Obj_Hata, - /* 0x1A9 */ PROC_Obj_ToaruMaki, - /* 0x1AA */ PROC_Tag_AttackItem, - /* 0x1AB */ PROC_Tag_RmbitSw, - /* 0x1AC */ PROC_Obj_Sword, - /* 0x1AD */ PROC_Tag_Spring, - /* 0x1AE */ PROC_Tag_Statue, - /* 0x1AF */ PROC_E_AI, - /* 0x1B0 */ PROC_E_GS, - /* 0x1B1 */ PROC_E_GOB, - /* 0x1B2 */ PROC_E_DD, - /* 0x1B3 */ PROC_E_DN, - /* 0x1B4 */ PROC_E_S1, - /* 0x1B5 */ PROC_E_MF, - /* 0x1B6 */ PROC_E_SG, - /* 0x1B7 */ PROC_E_BS, - /* 0x1B8 */ PROC_E_SF, - /* 0x1B9 */ PROC_E_SH, - /* 0x1BA */ PROC_E_DF, - /* 0x1BB */ PROC_E_GM, - /* 0x1BC */ PROC_E_MD, - /* 0x1BD */ PROC_E_SM, - /* 0x1BE */ PROC_E_SM2, - /* 0x1BF */ PROC_E_ST, - /* 0x1C0 */ PROC_E_ST_LINE, - /* 0x1C1 */ PROC_E_SB, - /* 0x1C2 */ PROC_E_TH, - /* 0x1C3 */ PROC_E_CR, - /* 0x1C4 */ PROC_E_CR_EGG, - /* 0x1C5 */ PROC_E_DB, - /* 0x1C6 */ PROC_E_DB_LEAF, - /* 0x1C7 */ PROC_E_GA, - /* 0x1C8 */ PROC_E_GB, - /* 0x1C9 */ PROC_E_HB, - /* 0x1CA */ PROC_E_HB_LEAF, - /* 0x1CB */ PROC_E_HZELDA, - /* 0x1CC */ PROC_E_YD, - /* 0x1CD */ PROC_E_YH, - /* 0x1CE */ PROC_E_YD_LEAF, - /* 0x1CF */ PROC_E_HM, - /* 0x1D0 */ PROC_E_TK, - /* 0x1D1 */ PROC_E_TK2, - /* 0x1D2 */ PROC_E_TK_BALL, - /* 0x1D3 */ PROC_E_RB, - /* 0x1D4 */ PROC_E_RD, - /* 0x1D5 */ PROC_E_RDB, - /* 0x1D6 */ PROC_E_RDY, - /* 0x1D7 */ PROC_E_FM, - /* 0x1D8 */ PROC_E_FS, - /* 0x1D9 */ PROC_E_PM, - /* 0x1DA */ PROC_E_PO, - /* 0x1DB */ PROC_E_MB, - /* 0x1DC */ PROC_E_MK, - /* 0x1DD */ PROC_E_MM, - /* 0x1DE */ PROC_E_FZ, - /* 0x1DF */ PROC_E_ZS, - /* 0x1E0 */ PROC_E_KK, - /* 0x1E1 */ PROC_E_HP, - /* 0x1E2 */ PROC_E_ZH, - /* 0x1E3 */ PROC_E_ZM, - /* 0x1E4 */ PROC_E_PZ, - /* 0x1E5 */ PROC_E_FB, - /* 0x1E6 */ PROC_E_FK, - /* 0x1E7 */ PROC_E_MS, - /* 0x1E8 */ PROC_E_NEST, - /* 0x1E9 */ PROC_E_NZ, - /* 0x1EA */ PROC_E_BA, - /* 0x1EB */ PROC_E_BU, - /* 0x1EC */ PROC_E_BUG, - /* 0x1ED */ PROC_E_BEE, - /* 0x1EE */ PROC_E_IS, - /* 0x1EF */ PROC_E_KG, - /* 0x1F0 */ PROC_E_KR, - /* 0x1F1 */ PROC_E_SW, - /* 0x1F2 */ PROC_E_GE, - /* 0x1F3 */ PROC_Tag_WatchGe, - /* 0x1F4 */ PROC_E_YM, - /* 0x1F5 */ PROC_E_YM_TAG, - /* 0x1F6 */ PROC_E_YMB, - /* 0x1F7 */ PROC_Tag_FWall, - /* 0x1F8 */ PROC_Tag_WaterFall, - /* 0x1F9 */ PROC_E_YK, - /* 0x1FA */ PROC_E_YR, - /* 0x1FB */ PROC_E_YG, - /* 0x1FC */ PROC_E_HZ, - /* 0x1FD */ PROC_E_WS, - /* 0x1FE */ PROC_E_OC, - /* 0x1FF */ PROC_E_OT, - /* 0x200 */ PROC_E_DT, - /* 0x201 */ PROC_E_BG, - /* 0x202 */ PROC_E_OctBg, - /* 0x203 */ PROC_DR, - /* 0x204 */ PROC_L7lowDr, - /* 0x205 */ PROC_L7ODR, - /* 0x206 */ PROC_E_TT, - /* 0x207 */ PROC_E_DK, - /* 0x208 */ PROC_E_VT, - /* 0x209 */ PROC_E_WW, - /* 0x20A */ PROC_E_GI, - /* 0x20B */ PROC_B_BH, - /* 0x20C */ PROC_B_BQ, - /* 0x20D */ PROC_B_GM, - /* 0x20E */ PROC_B_GND, - /* 0x20F */ PROC_B_GO, - /* 0x210 */ PROC_B_OH2, - /* 0x211 */ PROC_B_YO, - /* 0x212 */ PROC_B_YOI, - /* 0x213 */ PROC_B_TN, - /* 0x214 */ PROC_B_GG, - /* 0x215 */ PROC_B_DRE, - /* 0x216 */ PROC_B_MGN, - /* 0x217 */ PROC_E_WAP, - /* 0x218 */ PROC_ITEM, - /* 0x219 */ PROC_Obj_SmallKey, - /* 0x21A */ PROC_Obj_Kantera, - /* 0x21B */ PROC_Obj_LifeContainer, - /* 0x21C */ PROC_Obj_Shield, - /* 0x21D */ PROC_Demo_Item, - /* 0x21E */ PROC_ShopItem, - /* 0x21F */ PROC_Obj_Drop, - /* 0x220 */ PROC_OBJ_RW, - /* 0x221 */ PROC_NBOMB, - /* 0x222 */ PROC_TAG_CSW, - /* 0x223 */ PROC_TAG_QS, - /* 0x224 */ PROC_HOZELDA, - /* 0x225 */ PROC_SWC00, - /* 0x226 */ PROC_KNOB20, - /* 0x227 */ PROC_DBDOOR, - /* 0x228 */ PROC_BOSS_DOOR, - /* 0x229 */ PROC_L1BOSS_DOOR, - /* 0x22A */ PROC_L1MBOSS_DOOR, - /* 0x22B */ PROC_L5BOSS_DOOR, - /* 0x22C */ PROC_DSHUTTER, - /* 0x22D */ PROC_SPIRAL_DOOR, - /* 0x22E */ PROC_Tag_ChgRestart, - /* 0x22F */ PROC_Tag_Restart, - /* 0x230 */ PROC_ANDSW, - /* 0x231 */ PROC_ANDSW2, - /* 0x232 */ PROC_MYNA, - /* 0x233 */ PROC_NPC_GND, - /* 0x234 */ PROC_NPC_GRA, - /* 0x235 */ PROC_NPC_GRC, - /* 0x236 */ PROC_NPC_GRD, - /* 0x237 */ PROC_NPC_GRM, - /* 0x238 */ PROC_NPC_GRMC, - /* 0x239 */ PROC_NPC_GRO, - /* 0x23A */ PROC_NPC_GRR, - /* 0x23B */ PROC_NPC_GRS, - /* 0x23C */ PROC_NPC_GRZ, - /* 0x23D */ PROC_NPC_YAMID, - /* 0x23E */ PROC_NPC_YAMIT, - /* 0x23F */ PROC_NPC_YAMIS, - /* 0x240 */ PROC_NPC_BLUENS, - /* 0x241 */ PROC_NPC_KAKASHI, - /* 0x242 */ PROC_NPC_KDK, - /* 0x243 */ PROC_NPC_ARU, - /* 0x244 */ PROC_NPC_BANS, - /* 0x245 */ PROC_NPC_BESU, - /* 0x246 */ PROC_NPC_BOU, - /* 0x247 */ PROC_NPC_BOU_S, - /* 0x248 */ PROC_NPC_CLERKA, - /* 0x249 */ PROC_NPC_CLERKB, - /* 0x24A */ PROC_NPC_CLERKT, - /* 0x24B */ PROC_NPC_WRESTLER, - /* 0x24C */ PROC_Tag_Arena, - /* 0x24D */ PROC_Tag_Instruction, - /* 0x24E */ PROC_NPC_DOC, - /* 0x24F */ PROC_NPC_GWOLF, - /* 0x250 */ PROC_NPC_LEN, - /* 0x251 */ PROC_NPC_LUD, - /* 0x252 */ PROC_NPC_FAIRY_SEIREI, - /* 0x253 */ PROC_NPC_FAIRY, - /* 0x254 */ PROC_NPC_HANJO, - /* 0x255 */ PROC_NPC_HENNA, - /* 0x256 */ PROC_NPC_HENNA0, - /* 0x257 */ PROC_NPC_HOZ, - /* 0x258 */ PROC_NPC_JAGAR, - /* 0x259 */ PROC_NPC_KKRI, - /* 0x25A */ PROC_NPC_KN, - /* 0x25B */ PROC_KN_BULLET, - /* 0x25C */ PROC_NPC_KNJ, - /* 0x25D */ PROC_NPC_KOLIN, - /* 0x25E */ PROC_NPC_KOLINB, - /* 0x25F */ PROC_NPC_KYURY, - /* 0x260 */ PROC_NPC_MARO, - /* 0x261 */ PROC_NPC_MIDP, - /* 0x262 */ PROC_NPC_MOI, - /* 0x263 */ PROC_NPC_RACA, - /* 0x264 */ PROC_NPC_SARU, - /* 0x265 */ PROC_NPC_SEIB, - /* 0x266 */ PROC_NPC_SEIC, - /* 0x267 */ PROC_NPC_SEID, - /* 0x268 */ PROC_NPC_SEIRA, - /* 0x269 */ PROC_NPC_SERA2, - /* 0x26A */ PROC_NPC_SEIREI, - /* 0x26B */ PROC_NPC_SHAMAN, - /* 0x26C */ PROC_NPC_SMARO, - /* 0x26D */ PROC_NPC_SOLA, - /* 0x26E */ PROC_NPC_TARO, - /* 0x26F */ PROC_NPC_PACHI_BESU, - /* 0x270 */ PROC_NPC_PACHI_TARO, - /* 0x271 */ PROC_NPC_PACHI_MARO, - /* 0x272 */ PROC_TAG_PATI, - /* 0x273 */ PROC_NPC_THE, - /* 0x274 */ PROC_NPC_TKJ, - /* 0x275 */ PROC_NPC_TKS, - /* 0x276 */ PROC_NPC_TKC, - /* 0x277 */ PROC_OBJ_TKS, - /* 0x278 */ PROC_NPC_TOBY, - /* 0x279 */ PROC_NPC_URI, - /* 0x27A */ PROC_NPC_YELIA, - /* 0x27B */ PROC_NPC_YKM, - /* 0x27C */ PROC_NPC_YKW, - /* 0x27D */ PROC_NPC_ZANB, - /* 0x27E */ PROC_NPC_ZANT, - /* 0x27F */ PROC_NPC_ZELDA, - /* 0x280 */ PROC_NPC_ZELR, - /* 0x281 */ PROC_NPC_ZELRO, - /* 0x282 */ PROC_OBJ_ZRAFREEZE, - /* 0x283 */ PROC_NPC_ZRC, - /* 0x284 */ PROC_NPC_ZRZ, - /* 0x285 */ PROC_ZRA_MARK, - /* 0x286 */ PROC_MYNA2, - /* 0x287 */ PROC_TAG_MYNA2, - /* 0x288 */ PROC_NPC_CD3, - /* 0x289 */ PROC_Tag_Schedule, - /* 0x28A */ PROC_Tag_Escape, - /* 0x28B */ PROC_NPC_CHAT, - /* 0x28C */ PROC_NPC_SOLDIERa, - /* 0x28D */ PROC_NPC_SOLDIERb, - /* 0x28E */ PROC_PASSER_MNG, - /* 0x28F */ PROC_NPC_PASSER, - /* 0x290 */ PROC_NPC_PASSER2, - /* 0x291 */ PROC_NPC_POST, - /* 0x292 */ PROC_NPC_POUYA, - /* 0x293 */ PROC_FORMATION_MNG, - /* 0x294 */ PROC_NPC_FGUARD, - /* 0x295 */ PROC_GUARD_MNG, - /* 0x296 */ PROC_TAG_GUARD, - /* 0x297 */ PROC_NPC_GUARD, - /* 0x298 */ PROC_NPC_ASH, - /* 0x299 */ PROC_NPC_ASHB, - /* 0x29A */ PROC_NPC_SHAD, - /* 0x29B */ PROC_NPC_RAFREL, - /* 0x29C */ PROC_NPC_MOIR, - /* 0x29D */ PROC_NPC_IMPAL, - /* 0x29E */ PROC_NPC_SHOE, - /* 0x29F */ PROC_NPC_DOORBOY, - /* 0x2A0 */ PROC_NPC_PRAYER, - /* 0x2A1 */ PROC_NPC_KASIHANA, - /* 0x2A2 */ PROC_NPC_KASIKYU, - /* 0x2A3 */ PROC_NPC_KASIMICH, - /* 0x2A4 */ PROC_NPC_DRSOL, - /* 0x2A5 */ PROC_NPC_CHIN, - /* 0x2A6 */ PROC_NPC_INS, - /* 0x2A7 */ PROC_NPC_SHOP0, - /* 0x2A8 */ PROC_NPC_MK, - /* 0x2A9 */ PROC_NPC_P2, - /* 0x2AA */ PROC_KYTAG00, - /* 0x2AB */ PROC_KYTAG01, - /* 0x2AC */ PROC_KYTAG02, - /* 0x2AD */ PROC_KYTAG03, - /* 0x2AE */ PROC_KYTAG04, - /* 0x2AF */ PROC_KYTAG05, - /* 0x2B0 */ PROC_KYTAG06, - /* 0x2B1 */ PROC_KYTAG07, - /* 0x2B2 */ PROC_KYTAG08, - /* 0x2B3 */ PROC_KYTAG09, - /* 0x2B4 */ PROC_KYTAG10, - /* 0x2B5 */ PROC_KYTAG11, - /* 0x2B6 */ PROC_KYTAG12, - /* 0x2B7 */ PROC_KYTAG13, - /* 0x2B8 */ PROC_KYTAG14, - /* 0x2B9 */ PROC_KYTAG15, - /* 0x2BA */ PROC_KYTAG16, - /* 0x2BB */ PROC_KYTAG17, - /* 0x2BC */ PROC_Ykgr, - /* 0x2BD */ PROC_TALK, - /* 0x2BE */ PROC_Obj_Crope, - /* 0x2BF */ PROC_Obj_Bombf, - /* 0x2C0 */ PROC_Obj_BkLeaf, - /* 0x2C1 */ PROC_Tag_Mhint, - /* 0x2C2 */ PROC_Tag_Mmsg, - /* 0x2C3 */ PROC_Tag_Mwait, - /* 0x2C4 */ PROC_Tag_Mstop, - /* 0x2C5 */ PROC_Tag_Stream, - /* 0x2C6 */ PROC_Tag_Sppath, - /* 0x2C7 */ PROC_Tag_Wljump, - /* 0x2C8 */ PROC_Tag_TWGate, - /* 0x2C9 */ PROC_Tag_Lv6Gate, - /* 0x2CA */ PROC_Tag_Lv7Gate, - /* 0x2CB */ PROC_Tag_Lv8Gate, - /* 0x2CC */ PROC_Tag_TheBHint, - /* 0x2CD */ PROC_Tag_Assist, - /* 0x2CE */ PROC_DEMO00, - /* 0x2CF */ PROC_TAG_CAMERA, - /* 0x2D0 */ PROC_TAG_CHKPOINT, - /* 0x2D1 */ PROC_TAG_EVENT, - /* 0x2D2 */ PROC_TAG_EVT, - /* 0x2D3 */ PROC_TAG_TELOP, - /* 0x2D4 */ PROC_TAG_HOWL, - /* 0x2D5 */ PROC_TAG_MSG, - /* 0x2D6 */ PROC_TAG_LANTERN, - /* 0x2D7 */ PROC_Tag_Mist, - /* 0x2D8 */ PROC_DMIDNA, - /* 0x2D9 */ PROC_KY_THUNDER, - /* 0x2DA */ PROC_VRBOX, - /* 0x2DB */ PROC_VRBOX2, - /* 0x2DC */ PROC_BG, - /* 0x2DD */ PROC_SET_BG_OBJ, - /* 0x2DE */ PROC_BG_OBJ, - /* 0x2DF */ PROC_MIRROR, - /* 0x2E0 */ PROC_MOVIE_PLAYER, - /* 0x2E1 */ PROC_TITLE, - /* 0x2E2 */ PROC_FR, - /* 0x2E3 */ PROC_ECONT, - /* 0x2E4 */ PROC_MG_ROD, - /* 0x2E5 */ PROC_E_ARROW, - /* 0x2E6 */ PROC_BULLET, - /* 0x2E7 */ PROC_SWHIT0, - /* 0x2E8 */ PROC_E_TH_BALL, - /* 0x2E9 */ PROC_TAG_EVTAREA, - /* 0x2EA */ PROC_TAG_EVTMSG, - /* 0x2EB */ PROC_TAG_KMSG, - /* 0x2EC */ PROC_TAG_PUSH, - /* 0x2ED */ PROC_E_MK_BO, - /* 0x2EE */ PROC_E_MM_MT, - /* 0x2EF */ PROC_OBJ_KBOX, - /* 0x2F0 */ PROC_OBJ_FW, - /* 0x2F1 */ PROC_B_GOS, - /* 0x2F2 */ PROC_OBJ_YSTONE, - /* 0x2F3 */ PROC_MANT, - /* 0x2F4 */ PROC_CROD, - /* 0x2F5 */ PROC_OBJ_PLEAF, - /* 0x2F6 */ PROC_OBJ_KBACKET, - /* 0x2F7 */ PROC_OBJ_YBAG, - /* 0x2F8 */ PROC_OBJ_PUMPKIN, - /* 0x2F9 */ PROC_OBJ_AUTOMATA, - /* 0x2FA */ PROC_OBJ_GADGET, - /* 0x2FB */ PROC_OBJ_KAGO, - /* 0x2FC */ PROC_Obj_Carry, - /* 0x2FD */ PROC_Obj_Stone, - /* 0x2FE */ PROC_OBJ_HB, - /* 0x2FF */ PROC_NPC_INKO, - /* 0x300 */ PROC_BD, - /* 0x301 */ PROC_Obj_Eff, - /* 0x302 */ PROC_WPILLAR, - /* 0x303 */ PROC_WMARK, - /* 0x304 */ PROC_E_BI, - /* 0x305 */ PROC_E_BI_LEAF, - /* 0x306 */ PROC_START_AND_GOAL, - /* 0x307 */ PROC_NPC_DF, - /* 0x308 */ PROC_ARROW, - /* 0x309 */ PROC_PATH_LINE, - /* 0x30A */ PROC_TAG_ALLMATO, - /* 0x30B */ PROC_Obj_Timer, - /* 0x30C */ PROC_SCENE_EXIT, - /* 0x30D */ PROC_CAMERA, - /* 0x30E */ PROC_CAMERA2, - /* 0x30F */ PROC_SUSPEND, - /* 0x310 */ PROC_GRASS, - /* 0x311 */ PROC_KYEFF, - /* 0x312 */ PROC_KYEFF2, - /* 0x313 */ PROC_MSG_OBJECT, - /* 0x314 */ PROC_MENUWINDOW, - /* 0x315 */ PROC_TIMER, - /* 0x316 */ PROC_METER2, - /* 0x317 */ PROC_GAMEOVER, - - PROC_MAX_NUM, -}; - -#endif /* D_PROCNAME_H */ diff --git a/include/d/d_save.h b/include/d/d_save.h index 9a57f9eb159..68a58e3ad1a 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_xyz.h" #include #include "global.h" -#include "f_pc/f_pc_name.h" +#include "d/d_item_data.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JHostIO/JORReflexible.h" diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 221fdf2ffb7..1146ed2c12f 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -28,13 +28,38 @@ struct actor_process_profile_definition2 { }; enum fopAc_Status_e { - fopAcStts_NOEXEC_e = 0x00000080, - fopAcStts_CULL_e = 0x00000100, - fopAcStts_FREEZE_e = 0x00000400, - fopAcStts_CARRY_e = 0x00002000, - fopAcStts_NOPAUSE_e = 0x00020000, - fopAcStts_NODRAW_e = 0x01000000, - fopAcStts_BOSS_e = 0x04000000, + fopAcStts_UNK_0x1_e = 1 << 0, + fopAcStts_UNK_0x2_e = 1 << 1, + fopAcStts_UNK_0x4_e = 1 << 2, + fopAcStts_UNK_0x8_e = 1 << 3, + fopAcStts_UNK_0x10_e = 1 << 4, + fopAcStts_UNK_0x20_e = 1 << 5, + fopAcStts_UNK_0x40_e = 1 << 6, + fopAcStts_NOEXEC_e = 1 << 7, + fopAcStts_CULL_e = 1 << 8, + fopAcStts_UNK_0x200_e = 1 << 9, + fopAcStts_FREEZE_e = 1 << 10, + fopAcStts_STAFF_EXTRA_e = 1 << 11, // Actor is an extra participant of an active staff. Usually handled automatically via an "ALL" staff, but can be manually set/unset by an actor? + fopAcStts_STAFF_SHUTTER_e = 1 << 12, // Actor is a primary participant of an active "SHUTTER_DOOR" staff + fopAcStts_CARRY_NOW_e = 1 << 13, + fopAcStts_UNK_0x4000_e = 1 << 14, + fopAcStts_STAFF_PRIMARY_e = 1 << 15, // Actor is a primary participant of an active staff + fopAcStts_UNK_0x10000_e = 1 << 16, + fopAcStts_NOPAUSE_e = 1 << 17, + fopAcStts_UNK_0x40000_e = 1 << 18, + fopAcStts_UNK_0x80000_e = 1 << 19, + fopAcStts_HOOK_CARRY_NOW_e = 1 << 20, + fopAcStts_UNK_0x200000_e = 1 << 21, + fopAcStts_UNK_0x400000_e = 1 << 22, + fopAcStts_UNK_0x800000_e = 1 << 23, + fopAcStts_NODRAW_e = 1 << 24, + fopAcStts_UNK_0x2000000_e = 1 << 25, + fopAcStts_BOSS_e = 1 << 26, + fopAcStts_UNK_0x8000000_e = 1 << 27, + fopAcStts_UNK_0x10000000_e = 1 << 28, + fopAcStts_UNK_0x20000000_e = 1 << 29, + fopAcStts_UNK_0x40000000_e = 1 << 30, + fopAcStts_HAWK_CARRY_NOW_e = 1 << 31, }; enum fopAc_Group_e { @@ -310,7 +335,7 @@ class fopEn_enemy_c : public fopAc_ac_c { fopEn_flag_WolfDownPullEnd = 0x20, fopEn_flag_WolfBiteDamage = 0x40, fopEn_flag_HeadLock = 0x80, - + fopEn_flag_WolfNoLock = 0x200, }; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 8cb4d1a255e..8bfa4c068ea 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -74,7 +74,7 @@ struct fopAcM_search4ev_prm { void clear() { name[0] = 0; event_id = -1; - procname = PROC_PLAY_SCENE; + procname = fpcNm_PLAY_SCENE_e; argument = 0; } @@ -121,39 +121,6 @@ struct DOUBLE_POS { double x, y, z; }; -enum fopAcM_STATUS { - /* 0x00000001 */ fopAcM_STATUS_UNK_0x1 = 1 << 0, - /* 0x00000002 */ fopAcM_STATUS_UNK_0x2 = 1 << 1, - /* 0x00000004 */ fopAcM_STATUS_UNK_0x4 = 1 << 2, - /* 0x00000008 */ fopAcM_STATUS_UNK_0x8 = 1 << 3, - /* 0x00000010 */ fopAcM_STATUS_UNK_0x10 = 1 << 4, - /* 0x00000020 */ fopAcM_STATUS_UNK_0x20 = 1 << 5, - /* 0x00000040 */ fopAcM_STATUS_UNK_0x40 = 1 << 6, - /* 0x00000080 */ fopAcM_STATUS_UNK_0x80 = 1 << 7, - /* 0x00000100 */ fopAcM_STATUS_UNK_0x100 = 1 << 8, - /* 0x00000200 */ fopAcM_STATUS_UNK_0x200 = 1 << 9, - /* 0x00000400 */ fopAcM_STATUS_UNK_0x400 = 1 << 10, - /* 0x00000800 */ fopAcM_STATUS_UNK_0x800 = 1 << 11, - /* 0x00001000 */ fopAcM_STATUS_UNK_0x1000 = 1 << 12, - /* 0x00002000 */ fopAcM_STATUS_CARRY_NOW = 1 << 13, - /* 0x00004000 */ fopAcM_STATUS_UNK_0x4000 = 1 << 14, - /* 0x00008000 */ fopAcM_STATUS_UNK_0x8000 = 1 << 15, - /* 0x00010000 */ fopAcM_STATUS_UNK_0x10000 = 1 << 16, - /* 0x00020000 */ fopAcM_STATUS_UNK_0x20000 = 1 << 17, - /* 0x00040000 */ fopAcM_STATUS_UNK_0x40000 = 1 << 18, - /* 0x00080000 */ fopAcM_STATUS_UNK_0x80000 = 1 << 19, - /* 0x00100000 */ fopAcM_STATUS_HOOK_CARRY_NOW = 1 << 20, - /* 0x00200000 */ fopAcM_STATUS_UNK_0x200000 = 1 << 21, - /* 0x00400000 */ fopAcM_STATUS_UNK_0x400000 = 1 << 22, - /* 0x00800000 */ fopAcM_STATUS_UNK_0x800000 = 1 << 23, - /* 0x01000000 */ fopAcM_STATUS_UNK_0x1000000 = 1 << 24, - /* 0x02000000 */ fopAcM_STATUS_UNK_0x2000000 = 1 << 25, - /* 0x04000000 */ fopAcM_STATUS_UNK_0x4000000 = 1 << 26, - /* 0x08000000 */ fopAcM_STATUS_UNK_0x8000000 = 1 << 27, - - /* 0x80000000 */ fopAcM_STATUS_HAWK_CARRY_NOW = 1 << 31, -}; - inline s8 fopAcM_GetRoomNo(const fopAc_ac_c* i_actor) { return i_actor->current.roomNo; } @@ -175,11 +142,11 @@ inline u32 fopAcM_CheckStatus(fopAc_ac_c* i_actor, u32 actor_status) { } inline u32 fopAcM_checkCarryNow(fopAc_ac_c* i_actor) { - return i_actor->actor_status & fopAcM_STATUS_CARRY_NOW; + return i_actor->actor_status & fopAcStts_CARRY_NOW_e; } inline u32 fopAcM_checkHawkCarryNow(fopAc_ac_c* actor) { - return fopAcM_CheckStatus(actor, 0x80000000); + return fopAcM_CheckStatus(actor, fopAcStts_HAWK_CARRY_NOW_e); } enum fopAcM_CARRY { @@ -199,7 +166,7 @@ inline u32 fopAcM_CheckCarryType(const fopAc_ac_c* actor, fopAcM_CARRY type) { } inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* i_actor) { - return fopAcM_CheckStatus(i_actor, fopAcM_STATUS_HOOK_CARRY_NOW); + return fopAcM_CheckStatus(i_actor, fopAcStts_HOOK_CARRY_NOW_e); } inline u32 fopAcM_GetParam(const void* i_actor) { @@ -295,19 +262,19 @@ inline void fopAcM_SetRoomNo(fopAc_ac_c* actor, s8 roomNo) { } inline void fopAcM_setHookCarryNow(fopAc_ac_c* actor) { - fopAcM_OnStatus(actor, fopAcM_STATUS_HOOK_CARRY_NOW); + fopAcM_OnStatus(actor, fopAcStts_HOOK_CARRY_NOW_e); } inline void fopAcM_cancelHookCarryNow(fopAc_ac_c* actor) { - fopAcM_OffStatus(actor, fopAcM_STATUS_HOOK_CARRY_NOW); + fopAcM_OffStatus(actor, fopAcStts_HOOK_CARRY_NOW_e); } inline void fopAcM_setHawkCarryNow(fopAc_ac_c* actor) { - fopAcM_OnStatus(actor, fopAcM_STATUS_HAWK_CARRY_NOW); + fopAcM_OnStatus(actor, fopAcStts_HAWK_CARRY_NOW_e); } inline void fopAcM_cancelHawkCarryNow(fopAc_ac_c* actor) { - fopAcM_OffStatus(actor, fopAcM_STATUS_HAWK_CARRY_NOW); + fopAcM_OffStatus(actor, fopAcStts_HAWK_CARRY_NOW_e); } inline s8 fopAcM_GetHomeRoomNo(const fopAc_ac_c* i_actor) { diff --git a/include/f_op/f_op_scene.h b/include/f_op/f_op_scene.h index a42eee72113..0e736093f17 100644 --- a/include/f_op/f_op_scene.h +++ b/include/f_op/f_op_scene.h @@ -12,7 +12,7 @@ struct scene_method_class { }; typedef struct scene_process_profile_definition { - /* 0x00 */ node_process_profile_definition nase; + /* 0x00 */ node_process_profile_definition base; /* 0x20 */ scene_method_class* submethod; // Subclass methods /* 0x24 */ u32 unk_0x24; // padding? } scene_process_profile_definition; diff --git a/include/f_pc/f_pc_draw_priority.h b/include/f_pc/f_pc_draw_priority.h index 467d53ced26..3c189a6d17f 100644 --- a/include/f_pc/f_pc_draw_priority.h +++ b/include/f_pc/f_pc_draw_priority.h @@ -12,4 +12,790 @@ s16 fpcDwPi_Get(const draw_priority_class* i_drawpriority); void fpcDwPi_Set(draw_priority_class* i_drawpriority, s16 i_priority); void fpcDwPi_Init(draw_priority_class* i_drawpriority, s16 i_priority); +enum { + fpcDwPi_CAMERA_e, + fpcDwPi_CAMERA2_e, + fpcDwPi_KANKYO_e, + fpcDwPi_KYEFF2_e, + fpcDwPi_VRBOX2_e, + fpcDwPi_KYEFF_e, + fpcDwPi_KY_THUNDER_e, + fpcDwPi_VRBOX_e, + fpcDwPi_GRASS_e, + fpcDwPi_MOVIE_PLAYER_e, + fpcDwPi_TITLE_e, + fpcDwPi_Obj_Swpush_e, + fpcDwPi_Obj_Swpush2_e, + fpcDwPi_Obj_Swpush5_e, + fpcDwPi_Obj_SwTurn_e, + fpcDwPi_Obj_Lv6SwTurn_e, + fpcDwPi_Obj_RopeBridge_e, + fpcDwPi_Obj_Movebox_e, + fpcDwPi_OBJ_SEKIZOA_e, + fpcDwPi_OBJ_GRA_e, + fpcDwPi_TAG_GRA_e, + fpcDwPi_TAG_YAMI_e, + fpcDwPi_Obj_Timer_e, + fpcDwPi_Obj_Ladder_e, + fpcDwPi_Obj_ZDoor_e, + fpcDwPi_Obj_MvStair_e, + fpcDwPi_Obj_Flag_e, + fpcDwPi_Obj_Flag2_e, + fpcDwPi_Obj_Flag3_e, + fpcDwPi_Obj_Yobikusa_e, + fpcDwPi_Obj_KazeNeko_e, + fpcDwPi_Obj_KznkArm_e, + fpcDwPi_Obj_NamePlate_e, + fpcDwPi_Obj_OnCloth_e, + fpcDwPi_Obj_LndRope_e, + fpcDwPi_Obj_ItaRope_e, + fpcDwPi_Obj_Sakuita_e, + fpcDwPi_Obj_Laundry_e, + fpcDwPi_Izumi_Gate_e, + fpcDwPi_OBJ_BEF_e, + fpcDwPi_OBJ_FMOBJ_e, + fpcDwPi_OBJ_LBOX_e, + fpcDwPi_OBJ_FW_e, + fpcDwPi_OBJ_KBOX_e, + fpcDwPi_OBJ_KEY_e, + fpcDwPi_OBJ_KEYHOLE_e, + fpcDwPi_Obj_Lv5Key_e, + fpcDwPi_OBJ_WEB0_e, + fpcDwPi_OBJ_WEB1_e, + fpcDwPi_OBJ_CB_e, + fpcDwPi_OBJ_MAKI_e, + fpcDwPi_OBJ_MSIMA_e, + fpcDwPi_OBJ_MYOGAN_e, + fpcDwPi_OBJ_WFLAG_e, + fpcDwPi_OBJ_BRG_e, + fpcDwPi_OBJ_SO_e, + fpcDwPi_OBJ_GB_e, + fpcDwPi_OBJ_GM_e, + fpcDwPi_OBJ_TOBY_e, + fpcDwPi_OBJ_TP_e, + fpcDwPi_OBJ_SW_e, + fpcDwPi_OBJ_ITO_e, + fpcDwPi_OBJ_KAGE_e, + fpcDwPi_OBJ_KANBAN2_e, + fpcDwPi_OBJ_BALLOON_e, + fpcDwPi_OBJ_SUISYA_e, + fpcDwPi_OBJ_OILTUBO_e, + fpcDwPi_OBJ_ROTEN_e, + fpcDwPi_OBJ_SSDRINK_e, + fpcDwPi_OBJ_SSITEM_e, + fpcDwPi_TAG_SSDRINK_e, + fpcDwPi_TAG_BTLITM_e, + fpcDwPi_TAG_LV5SOUP_e, + fpcDwPi_TAG_MNLIGHT_e, + fpcDwPi_TAG_SHOPCAM_e, + fpcDwPi_TAG_SHOPITM_e, + fpcDwPi_OBJ_NDOOR_e, + fpcDwPi_OBJ_UDOOR_e, + fpcDwPi_OBJ_USAKU_e, + fpcDwPi_OBJ_BED_e, + fpcDwPi_OBJ_BOUMATO_e, + fpcDwPi_OBJ_AUTOMATA_e, + fpcDwPi_OBJ_GADGET_e, + fpcDwPi_OBJ_ITAMATO_e, + fpcDwPi_OBJ_NOUGU_e, + fpcDwPi_OBJ_STICK_e, + fpcDwPi_OBJ_MIE_e, + fpcDwPi_OBJ_SEKIDOOR_e, + fpcDwPi_OBJ_SEKIZO_e, + fpcDwPi_OBJ_SMTILE_e, + fpcDwPi_HORSE_e, + fpcDwPi_ALINK_e, + fpcDwPi_MIDNA_e, + fpcDwPi_DMIDNA_e, + fpcDwPi_KYTAG00_e, + fpcDwPi_KYTAG01_e, + fpcDwPi_KYTAG02_e, + fpcDwPi_KYTAG03_e, + fpcDwPi_KYTAG04_e, + fpcDwPi_KYTAG05_e, + fpcDwPi_KYTAG06_e, + fpcDwPi_KYTAG07_e, + fpcDwPi_KYTAG08_e, + fpcDwPi_KYTAG09_e, + fpcDwPi_KYTAG10_e, + fpcDwPi_KYTAG11_e, + fpcDwPi_KYTAG12_e, + fpcDwPi_KYTAG13_e, + fpcDwPi_KYTAG14_e, + fpcDwPi_KYTAG15_e, + fpcDwPi_KYTAG16_e, + fpcDwPi_KYTAG17_e, + fpcDwPi_E_AI_e, + fpcDwPi_E_CR_e, + fpcDwPi_E_CR_EGG_e, + fpcDwPi_E_GS_e, + fpcDwPi_E_GOB_e, + fpcDwPi_E_DD_e, + fpcDwPi_E_DN_e, + fpcDwPi_E_GM_e, + fpcDwPi_E_MF_e, + fpcDwPi_E_S1_e, + fpcDwPi_E_SG_e, + fpcDwPi_E_SF_e, + fpcDwPi_E_BS_e, + fpcDwPi_E_SB_e, + fpcDwPi_E_SH_e, + fpcDwPi_E_SM_e, + fpcDwPi_E_SM2_e, + fpcDwPi_E_ST_e, + fpcDwPi_E_DF_e, + fpcDwPi_E_PH_e, + fpcDwPi_E_MD_e, + fpcDwPi_E_ST_LINE_e, + fpcDwPi_E_TH_e, + fpcDwPi_E_TH_BALL_e, + fpcDwPi_E_DB_e, + fpcDwPi_E_DB_LEAF_e, + fpcDwPi_E_GA_e, + fpcDwPi_E_GB_e, + fpcDwPi_E_HB_e, + fpcDwPi_E_HB_LEAF_e, + fpcDwPi_E_HZELDA_e, + fpcDwPi_E_YD_e, + fpcDwPi_E_YH_e, + fpcDwPi_E_YD_LEAF_e, + fpcDwPi_E_HM_e, + fpcDwPi_E_BI_e, + fpcDwPi_E_BI_LEAF_e, + fpcDwPi_E_TK_e, + fpcDwPi_E_TK2_e, + fpcDwPi_E_TK_BALL_e, + fpcDwPi_E_WB_e, + fpcDwPi_E_RB_e, + fpcDwPi_E_RD_e, + fpcDwPi_ECONT_e, + fpcDwPi_E_RDB_e, + fpcDwPi_E_RDY_e, + fpcDwPi_E_FM_e, + fpcDwPi_E_FK_e, + fpcDwPi_E_FS_e, + fpcDwPi_E_PM_e, + fpcDwPi_E_PO_e, + fpcDwPi_E_ARROW_e, + fpcDwPi_E_MB_e, + fpcDwPi_E_MK_e, + fpcDwPi_E_MK_BO_e, + fpcDwPi_E_MM_e, + fpcDwPi_E_MM_MT_e, + fpcDwPi_E_FZ_e, + fpcDwPi_E_ZS_e, + fpcDwPi_E_KK_e, + fpcDwPi_E_HP_e, + fpcDwPi_E_ZH_e, + fpcDwPi_E_ZM_e, + fpcDwPi_E_PZ_e, + fpcDwPi_E_FB_e, + fpcDwPi_E_MS_e, + fpcDwPi_E_NEST_e, + fpcDwPi_E_NZ_e, + fpcDwPi_E_BA_e, + fpcDwPi_E_BU_e, + fpcDwPi_E_BUG_e, + fpcDwPi_E_BEE_e, + fpcDwPi_E_IS_e, + fpcDwPi_E_KG_e, + fpcDwPi_E_KR_e, + fpcDwPi_E_YC_e, + fpcDwPi_E_YK_e, + fpcDwPi_E_YR_e, + fpcDwPi_E_YG_e, + fpcDwPi_E_SW_e, + fpcDwPi_E_GE_e, + fpcDwPi_Tag_WatchGe_e, + fpcDwPi_E_YM_e, + fpcDwPi_E_YM_TAG_e, + fpcDwPi_E_YMB_e, + fpcDwPi_Tag_FWall_e, + fpcDwPi_Tag_WaterFall_e, + fpcDwPi_E_HZ_e, + fpcDwPi_E_WS_e, + fpcDwPi_E_OC_e, + fpcDwPi_E_DT_e, + fpcDwPi_E_OT_e, + fpcDwPi_E_BG_e, + fpcDwPi_E_OctBg_e, + fpcDwPi_DR_e, + fpcDwPi_L7lowDr_e, + fpcDwPi_E_TT_e, + fpcDwPi_E_WW_e, + fpcDwPi_E_GI_e, + fpcDwPi_B_BH_e, + fpcDwPi_B_BQ_e, + fpcDwPi_B_GM_e, + fpcDwPi_B_GND_e, + fpcDwPi_B_GO_e, + fpcDwPi_B_GOS_e, + fpcDwPi_B_OB_e, + fpcDwPi_B_OH_e, + fpcDwPi_B_OH2_e, + fpcDwPi_B_DS_e, + fpcDwPi_B_DR_e, + fpcDwPi_L7ODR_e, + fpcDwPi_B_YO_e, + fpcDwPi_B_YOI_e, + fpcDwPi_B_TN_e, + fpcDwPi_B_ZANT_e, + fpcDwPi_B_ZANTM_e, + fpcDwPi_B_ZANTZ_e, + fpcDwPi_B_ZANTS_e, + fpcDwPi_B_GG_e, + fpcDwPi_B_DRE_e, + fpcDwPi_B_MGN_e, + fpcDwPi_E_WAP_e, + fpcDwPi_MANT_e, + fpcDwPi_FR_e, + fpcDwPi_ITEM_e, + fpcDwPi_Obj_SmallKey_e, + fpcDwPi_Obj_Kantera_e, + fpcDwPi_Obj_LifeContainer_e, + fpcDwPi_Obj_Shield_e, + fpcDwPi_Demo_Item_e, + fpcDwPi_ShopItem_e, + fpcDwPi_Obj_Drop_e, + fpcDwPi_Obj_Carry_e, + fpcDwPi_Obj_Cdoor_e, + fpcDwPi_Obj_Fchain_e, + fpcDwPi_Obj_Wchain_e, + fpcDwPi_Obj_Crope_e, + fpcDwPi_Obj_Digholl_e, + fpcDwPi_Obj_Digpl_e, + fpcDwPi_Obj_Bombf_e, + fpcDwPi_Obj_BkLeaf_e, + fpcDwPi_Obj_WoodPendulum_e, + fpcDwPi_Tag_Mhint_e, + fpcDwPi_Tag_Mmsg_e, + fpcDwPi_Tag_Mwait_e, + fpcDwPi_Tag_Mstop_e, + fpcDwPi_Tag_Sppath_e, + fpcDwPi_Tag_Stream_e, + fpcDwPi_Tag_Wljump_e, + fpcDwPi_Tag_TWGate_e, + fpcDwPi_Tag_Lv6Gate_e, + fpcDwPi_Tag_Lv7Gate_e, + fpcDwPi_Tag_Lv8Gate_e, + fpcDwPi_Tag_TheBHint_e, + fpcDwPi_Tag_Assist_e, + fpcDwPi_Obj_Eff_e, + fpcDwPi_TBOX_e, + fpcDwPi_TBOX2_e, + fpcDwPi_NBOMB_e, + fpcDwPi_CSTATUE_e, + fpcDwPi_CSTAF_e, + fpcDwPi_TAG_CSW_e, + fpcDwPi_TAG_QS_e, + fpcDwPi_HOZELDA_e, + fpcDwPi_SWHIT0_e, + fpcDwPi_SWC00_e, + fpcDwPi_ALLDIE_e, + fpcDwPi_TAG_CAMERA_e, + fpcDwPi_TAG_CHKPOINT_e, + fpcDwPi_TAG_EVENT_e, + fpcDwPi_TAG_TELOP_e, + fpcDwPi_TAG_HOWL_e, + fpcDwPi_TAG_EVT_e, + fpcDwPi_TAG_MSG_e, + fpcDwPi_TAG_LANTERN_e, + fpcDwPi_TAG_EVTAREA_e, + fpcDwPi_TAG_ALLMATO_e, + fpcDwPi_TAG_EVTMSG_e, + fpcDwPi_TAG_KMSG_e, + fpcDwPi_TAG_PUSH_e, + fpcDwPi_Tag_Mist_e, + fpcDwPi_KNOB20_e, + fpcDwPi_DOOR20_e, + fpcDwPi_DBDOOR_e, + fpcDwPi_DSHUTTER_e, + fpcDwPi_BOSS_DOOR_e, + fpcDwPi_L1BOSS_DOOR_e, + fpcDwPi_L1MBOSS_DOOR_e, + fpcDwPi_L5BOSS_DOOR_e, + fpcDwPi_SPIRAL_DOOR_e, + fpcDwPi_ANDSW_e, + fpcDwPi_ANDSW2_e, + fpcDwPi_MYNA_e, + fpcDwPi_NPC_GND_e, + fpcDwPi_NPC_GRA_e, + fpcDwPi_NPC_GRC_e, + fpcDwPi_NPC_GRD_e, + fpcDwPi_NPC_GRM_e, + fpcDwPi_NPC_GRMC_e, + fpcDwPi_NPC_GRO_e, + fpcDwPi_NPC_GRR_e, + fpcDwPi_NPC_GRS_e, + fpcDwPi_NPC_GRZ_e, + fpcDwPi_NPC_YAMID_e, + fpcDwPi_NPC_YAMIT_e, + fpcDwPi_NPC_YAMIS_e, + fpcDwPi_NPC_BLUENS_e, + fpcDwPi_NPC_KAKASHI_e, + fpcDwPi_NPC_KDK_e, + fpcDwPi_NPC_ARU_e, + fpcDwPi_NPC_BANS_e, + fpcDwPi_NPC_BESU_e, + fpcDwPi_NPC_BOU_e, + fpcDwPi_NPC_BOU_S_e, + fpcDwPi_NPC_CLERKA_e, + fpcDwPi_NPC_CLERKB_e, + fpcDwPi_NPC_CLERKT_e, + fpcDwPi_NPC_WRESTLER_e, + fpcDwPi_NPC_COACH_e, + fpcDwPi_NPC_THEB_e, + fpcDwPi_COACH_FIRE_e, + fpcDwPi_Tag_Arena_e, + fpcDwPi_Tag_Instruction_e, + fpcDwPi_NPC_DOC_e, + fpcDwPi_NPC_GWOLF_e, + fpcDwPi_NPC_LEN_e, + fpcDwPi_NPC_LUD_e, + fpcDwPi_NPC_FAIRY_SEIREI_e, + fpcDwPi_NPC_FAIRY_e, + fpcDwPi_NPC_HANJO_e, + fpcDwPi_NPC_HENNA_e, + fpcDwPi_NPC_HENNA0_e, + fpcDwPi_NPC_HOZ_e, + fpcDwPi_NPC_JAGAR_e, + fpcDwPi_NPC_KKRI_e, + fpcDwPi_NPC_KN_e, + fpcDwPi_KN_BULLET_e, + fpcDwPi_NPC_KNJ_e, + fpcDwPi_NPC_KOLIN_e, + fpcDwPi_NPC_KOLINB_e, + fpcDwPi_NPC_KYURY_e, + fpcDwPi_NPC_MARO_e, + fpcDwPi_NPC_MIDP_e, + fpcDwPi_NPC_MOI_e, + fpcDwPi_NPC_RACA_e, + fpcDwPi_NPC_SARU_e, + fpcDwPi_NPC_SEIB_e, + fpcDwPi_NPC_SEIC_e, + fpcDwPi_NPC_SEID_e, + fpcDwPi_NPC_SEIRA_e, + fpcDwPi_NPC_SERA2_e, + fpcDwPi_NPC_SEIREI_e, + fpcDwPi_NPC_SHAMAN_e, + fpcDwPi_NPC_SMARO_e, + fpcDwPi_NPC_SOLA_e, + fpcDwPi_NPC_TARO_e, + fpcDwPi_NPC_PACHI_BESU_e, + fpcDwPi_NPC_PACHI_TARO_e, + fpcDwPi_NPC_PACHI_MARO_e, + fpcDwPi_TAG_PATI_e, + fpcDwPi_NPC_THE_e, + fpcDwPi_NPC_TKJ_e, + fpcDwPi_NPC_TKS_e, + fpcDwPi_NPC_TKC_e, + fpcDwPi_OBJ_TKS_e, + fpcDwPi_NPC_TOBY_e, + fpcDwPi_NPC_URI_e, + fpcDwPi_NPC_YELIA_e, + fpcDwPi_NPC_YKM_e, + fpcDwPi_NPC_YKW_e, + fpcDwPi_NPC_ZANB_e, + fpcDwPi_NPC_ZANT_e, + fpcDwPi_NPC_ZELDA_e, + fpcDwPi_NPC_ZELR_e, + fpcDwPi_NPC_ZELRO_e, + fpcDwPi_NPC_ZRA_e, + fpcDwPi_OBJ_ZRAFREEZE_e, + fpcDwPi_NPC_ZRC_e, + fpcDwPi_NPC_ZRZ_e, + fpcDwPi_START_AND_GOAL_e, + fpcDwPi_ZRA_MARK_e, + fpcDwPi_MYNA2_e, + fpcDwPi_TAG_MYNA2_e, + fpcDwPi_NPC_CD3_e, + fpcDwPi_Tag_Schedule_e, + fpcDwPi_Tag_Escape_e, + fpcDwPi_NPC_CHAT_e, + fpcDwPi_NPC_SOLDIERa_e, + fpcDwPi_NPC_SOLDIERb_e, + fpcDwPi_NPC_PASSER_e, + fpcDwPi_NPC_PASSER2_e, + fpcDwPi_NPC_POST_e, + fpcDwPi_NPC_POUYA_e, + fpcDwPi_PASSER_MNG_e, + fpcDwPi_NPC_GUARD_e, + fpcDwPi_GUARD_MNG_e, + fpcDwPi_TAG_GUARD_e, + fpcDwPi_NPC_FGUARD_e, + fpcDwPi_FORMATION_MNG_e, + fpcDwPi_NPC_ASH_e, + fpcDwPi_NPC_ASHB_e, + fpcDwPi_NPC_SHAD_e, + fpcDwPi_NPC_RAFREL_e, + fpcDwPi_NPC_MOIR_e, + fpcDwPi_NPC_IMPAL_e, + fpcDwPi_NPC_SHOE_e, + fpcDwPi_NPC_DOORBOY_e, + fpcDwPi_NPC_PRAYER_e, + fpcDwPi_NPC_KASIHANA_e, + fpcDwPi_NPC_KASIKYU_e, + fpcDwPi_NPC_KASIMICH_e, + fpcDwPi_NPC_DRSOL_e, + fpcDwPi_NPC_CHIN_e, + fpcDwPi_NPC_INS_e, + fpcDwPi_NPC_SHOP0_e, + fpcDwPi_NPC_MK_e, + fpcDwPi_NPC_P2_e, + fpcDwPi_NPC_WORM_e, + fpcDwPi_Ykgr_e, + fpcDwPi_TREESH_e, + fpcDwPi_Obj_Pillar_e, + fpcDwPi_Tag_Hinit_e, + fpcDwPi_Tag_Hjump_e, + fpcDwPi_Tag_Hstop_e, + fpcDwPi_Tag_AJnot_e, + fpcDwPi_Tag_Gstart_e, + fpcDwPi_MG_ROD_e, + fpcDwPi_NPC_DF_e, + fpcDwPi_Tag_Attp_e, + fpcDwPi_Obj_Mato_e, + fpcDwPi_Obj_TestCube_e, + fpcDwPi_Obj_Kshutter_e, + fpcDwPi_Obj_Tornado_e, + fpcDwPi_Obj_Tornado2_e, + fpcDwPi_Obj_FirePillar_e, + fpcDwPi_Obj_Cowdoor_e, + fpcDwPi_Obj_Swpropeller_e, + fpcDwPi_Obj_BoomShutter_e, + fpcDwPi_Obj_Hfuta_e, + fpcDwPi_Obj_BkDoor_e, + fpcDwPi_Obj_MGate_e, + fpcDwPi_Obj_Cboard_e, + fpcDwPi_Obj_Stopper_e, + fpcDwPi_Obj_Ikada_e, + fpcDwPi_Obj_Ice_l_e, + fpcDwPi_Obj_Ice_s_e, + fpcDwPi_Obj_E_CREATE_e, + fpcDwPi_Obj_Bhbridge_e, + fpcDwPi_Obj_Kaisou_e, + fpcDwPi_Obj_THASHI_e, + fpcDwPi_Obj_HHASHI_e, + fpcDwPi_Obj_BHASHI_e, + fpcDwPi_Obj_H_Saku_e, + fpcDwPi_OCTHASHI_e, + fpcDwPi_Obj_CRVGATE_e, + fpcDwPi_Obj_CRVFENCE_e, + fpcDwPi_Obj_CRVHAHEN_e, + fpcDwPi_Obj_CRVSTEEL_e, + fpcDwPi_Obj_CRVLH_UP_e, + fpcDwPi_Obj_CRVLH_DW_e, + fpcDwPi_Obj_RIVERROCK_e, + fpcDwPi_Obj_DUST_e, + fpcDwPi_Obj_ITA_e, + fpcDwPi_Obj_Yousei_e, + fpcDwPi_Obj_SM_DOOR_e, + fpcDwPi_Obj_Kabuto_e, + fpcDwPi_Obj_Cho_e, + fpcDwPi_Obj_Kuw_e, + fpcDwPi_Obj_Nan_e, + fpcDwPi_Obj_Dan_e, + fpcDwPi_Obj_Kam_e, + fpcDwPi_Obj_Ten_e, + fpcDwPi_Obj_Ari_e, + fpcDwPi_Obj_Kag_e, + fpcDwPi_Obj_Batta_e, + fpcDwPi_Obj_Tombo_e, + fpcDwPi_Obj_Kat_e, + fpcDwPi_GRDWATER_e, + fpcDwPi_Obj_RotBridge_e, + fpcDwPi_Obj_Window_e, + fpcDwPi_Obj_MagLift_e, + fpcDwPi_Obj_MagLiftRot_e, + fpcDwPi_Obj_Lv1Cdl00_e, + fpcDwPi_Obj_Lv1Cdl01_e, + fpcDwPi_Obj_TvCdlst_e, + fpcDwPi_Obj_WdStick_e, + fpcDwPi_Obj_MetalBox_e, + fpcDwPi_Obj_BBox_e, + fpcDwPi_Obj_StairBlock_e, + fpcDwPi_Obj_HsTarget_e, + fpcDwPi_Tag_KtOnFire_e, + fpcDwPi_Obj_HeavySw_e, + fpcDwPi_Obj_GoGate_e, + fpcDwPi_Obj_TaFence_e, + fpcDwPi_Obj_FireWood_e, + fpcDwPi_Obj_FireWood2_e, + fpcDwPi_Obj_Saidan_e, + fpcDwPi_Obj_GpTaru_e, + fpcDwPi_Obj_OnsenTaru_e, + fpcDwPi_Obj_Stone_e, + fpcDwPi_Obj_SpinLift_e, + fpcDwPi_Obj_BmWindow_e, + fpcDwPi_Obj_RfHole_e, + fpcDwPi_Obj_SyRock_e, + fpcDwPi_Obj_SwHang_e, + fpcDwPi_Obj_KiPot_e, + fpcDwPi_Obj_BsGate_e, + fpcDwPi_Obj_GOMIKABE_e, + fpcDwPi_Obj_WaterPillar_e, + fpcDwPi_Obj_AmiShutter_e, + fpcDwPi_Obj_WtGate_e, + fpcDwPi_Obj_Lv2Candle_e, + fpcDwPi_Obj_TogeTrap_e, + fpcDwPi_Obj_RotTrap_e, + fpcDwPi_TBOX_SW_e, + fpcDwPi_Obj_WoodenSword_e, + fpcDwPi_Obj_Lv3R10Saka_e, + fpcDwPi_Obj_FirePillar2_e, + fpcDwPi_Obj_KakarikoBrg_e, + fpcDwPi_Obj_OrdinBrg_e, + fpcDwPi_Obj_BurnBox_e, + fpcDwPi_OBJ_IHASI_e, + fpcDwPi_Obj_StoneMark_e, + fpcDwPi_Obj_IceBlock_e, + fpcDwPi_Obj_IceWall_e, + fpcDwPi_Obj_Lv5SwIce_e, + fpcDwPi_Obj_Lv5FBoard_e, + fpcDwPi_Obj_TwGate_e, + fpcDwPi_Tag_Lv4Candle_e, + fpcDwPi_Tag_Lv4CandleDm_e, + fpcDwPi_Obj_Elevator_e, + fpcDwPi_Obj_WaterFall_e, + fpcDwPi_Obj_ZoraCloth_e, + fpcDwPi_Obj_Turara_e, + fpcDwPi_Obj_TobyHouse_e, + fpcDwPi_Tag_LightBall_e, + fpcDwPi_Obj_KKanban_e, + fpcDwPi_SwLBall_e, + fpcDwPi_SwBall_e, + fpcDwPi_Obj_Lv4DigSand_e, + fpcDwPi_Obj_FallObj_e, + fpcDwPi_Obj_SmgDoor_e, + fpcDwPi_Obj_SwLight_e, + fpcDwPi_Obj_WaterEff_e, + fpcDwPi_Tag_RiverBack_e, + fpcDwPi_Tag_KagoFall_e, + fpcDwPi_Tag_Lv2PrChk_e, + fpcDwPi_Obj_SwSpinner_e, + fpcDwPi_Obj_TDoor_e, + fpcDwPi_Obj_Lv4Gear_e, + fpcDwPi_Obj_MasterSword_e, + fpcDwPi_Obj_WoodStatue_e, + fpcDwPi_Obj_Stopper2_e, + fpcDwPi_Obj_Fan_e, + fpcDwPi_Obj_Lv7Bridge_e, + fpcDwPi_Obj_IceLeaf_e, + fpcDwPi_Obj_Gake_e, + fpcDwPi_Obj_TMoon_e, + fpcDwPi_Obj_GanonWall_e, + fpcDwPi_Obj_SwBallA_e, + fpcDwPi_Obj_SwBallB_e, + fpcDwPi_Obj_Lv4Sand_e, + fpcDwPi_Obj_Lv4RailWall_e, + fpcDwPi_Tag_SetBall_e, + fpcDwPi_SwTime_e, + fpcDwPi_Obj_PushDoor_e, + fpcDwPi_PushDoor_e, + fpcDwPi_Obj_Crystal_e, + fpcDwPi_Obj_GanonWall2_e, + fpcDwPi_Obj_Lv4Bridge_e, + fpcDwPi_Obj_SwBallC_e, + fpcDwPi_SCENE_EXIT2_e, + fpcDwPi_Obj_Lv4Floor_e, + fpcDwPi_Tag_AttackItem_e, + fpcDwPi_Obj_Sword_e, + fpcDwPi_Tag_Spring_e, + fpcDwPi_Tag_Statue_e, + fpcDwPi_Obj_MHole_e, + fpcDwPi_Tag_Magne_e, + fpcDwPi_Tag_ChgRestart_e, + fpcDwPi_Tag_Restart_e, + fpcDwPi_Obj_VolcanicBall_e, + fpcDwPi_Obj_VolcanicBomb_e, + fpcDwPi_Obj_VolcGnd_e, + fpcDwPi_Obj_Geyser_e, + fpcDwPi_Obj_ChainBlock_e, + fpcDwPi_Obj_ChainWall_e, + fpcDwPi_Obj_KkrGate_e, + fpcDwPi_Obj_RiderGate_e, + fpcDwPi_OBJ_YSTONE_e, + fpcDwPi_Obj_Onsen_e, + fpcDwPi_Obj_Chest_e, + fpcDwPi_Obj_Bemos_e, + fpcDwPi_Tag_Spinner_e, + fpcDwPi_Obj_WellCover_e, + fpcDwPi_Obj_GraveStone_e, + fpcDwPi_Obj_ZraRock_e, + fpcDwPi_Obj_GraRock_e, + fpcDwPi_Obj_GrzRock_e, + fpcDwPi_GRA_WALL_e, + fpcDwPi_OBJ_ONSEN_FIRE_e, + fpcDwPi_Obj_RotStair_e, + fpcDwPi_Obj_MagneArm_e, + fpcDwPi_Obj_SwChain_e, + fpcDwPi_Obj_Lv3Water_e, + fpcDwPi_Obj_Lv3Water2_e, + fpcDwPi_OBJ_LV3WATERB_e, + fpcDwPi_Obj_SwallShutter_e, + fpcDwPi_Obj_Lv3Candle_e, + fpcDwPi_Obj_Lv6TogeRoll_e, + fpcDwPi_Obj_Lv6TogeTrap_e, + fpcDwPi_Obj_Lv6Tenbin_e, + fpcDwPi_Obj_Lv6SwGate_e, + fpcDwPi_Obj_Lv6Lblock_e, + fpcDwPi_Obj_Lv6ChgGate_e, + fpcDwPi_Obj_Lv6FuriTrap_e, + fpcDwPi_Obj_Lv6SzGate_e, + fpcDwPi_Obj_DamCps_e, + fpcDwPi_Obj_Lv6bemos_e, + fpcDwPi_Obj_Lv6bemos2_e, + fpcDwPi_Obj_Smoke_e, + fpcDwPi_Obj_BarDesk_e, + fpcDwPi_Obj_DigSnow_e, + fpcDwPi_Obj_Ytaihou_e, + fpcDwPi_Obj_Lv4EdShutter_e, + fpcDwPi_Obj_Lv4Gate_e, + fpcDwPi_Obj_Lv4PoGate_e, + fpcDwPi_Obj_Lv4SlideWall_e, + fpcDwPi_Obj_Lv4HsTarget_e, + fpcDwPi_Obj_Lv7PropY_e, + fpcDwPi_Obj_Lv7BsGate_e, + fpcDwPi_Obj_Lv8OptiLift_e, + fpcDwPi_Obj_Lv8KekkaiTrap_e, + fpcDwPi_Obj_Lv8Lift_e, + fpcDwPi_Obj_Lv8UdFloor_e, + fpcDwPi_Obj_Lv9SwShutter_e, + fpcDwPi_Obj_poFire_e, + fpcDwPi_Tag_poFire_e, + fpcDwPi_Obj_poCandle_e, + fpcDwPi_Obj_glowSphere_e, + fpcDwPi_Obj_zrTurara_e, + fpcDwPi_Obj_zrTuraraRc_e, + fpcDwPi_Obj_TakaraDai_e, + fpcDwPi_Obj_Avalanche_e, + fpcDwPi_Tag_SnowEff_e, + fpcDwPi_Tag_CstaSw_e, + fpcDwPi_Tag_Lv6CstaSw_e, + fpcDwPi_Obj_awaPlar_e, + fpcDwPi_Obj_poTbox_e, + fpcDwPi_Obj_TimeFire_e, + fpcDwPi_Obj_KWheel00_e, + fpcDwPi_Obj_KWheel01_e, + fpcDwPi_Obj_Ychndlr_e, + fpcDwPi_Obj_PRElvtr_e, + fpcDwPi_Obj_MHasu_e, + fpcDwPi_Obj_YIblltray_e, + fpcDwPi_Obj_Lv6EGate_e, + fpcDwPi_Obj_Lv6ElevtA_e, + fpcDwPi_Obj_PDtile_e, + fpcDwPi_Obj_PDwall_e, + fpcDwPi_Obj_Lv4PRwall_e, + fpcDwPi_Obj_KLift00_e, + fpcDwPi_Obj_Lv4Chan_e, + fpcDwPi_Obj_HBombkoya_e, + fpcDwPi_Obj_SZbridge_e, + fpcDwPi_Obj_KJgjs_e, + fpcDwPi_Obj_MirrorScrew_e, + fpcDwPi_Obj_MirrorSand_e, + fpcDwPi_Obj_MirrorTable_e, + fpcDwPi_Obj_MirrorChain_e, + fpcDwPi_Obj_Mirror6Pole_e, + fpcDwPi_Obj_Table_e, + fpcDwPi_Obj_CatDoor_e, + fpcDwPi_DEMO00_e, + fpcDwPi_BOOMERANG_e, + fpcDwPi_SPINNER_e, + fpcDwPi_CROD_e, + fpcDwPi_ENVSE_e, + fpcDwPi_HITOBJ_e, + fpcDwPi_EP_e, + fpcDwPi_COW_e, + fpcDwPi_KAGO_e, + fpcDwPi_PERU_e, + fpcDwPi_NI_e, + fpcDwPi_NPC_TKJ2_e, + fpcDwPi_SQ_e, + fpcDwPi_NPC_SQ_e, + fpcDwPi_DO_e, + fpcDwPi_NPC_NE_e, + fpcDwPi_NPC_KS_e, + fpcDwPi_NPC_LF_e, + fpcDwPi_NPC_TK_e, + fpcDwPi_NPC_INKO_e, + fpcDwPi_OBJ_HB_e, + fpcDwPi_OBJ_KI_e, + fpcDwPi_OBJ_KITA_e, + fpcDwPi_OBJ_LP_e, + fpcDwPi_OBJ_TATIGI_e, + fpcDwPi_OBJ_ROCK_e, + fpcDwPi_OBJ_RW_e, + fpcDwPi_OBJ_FOOD_e, + fpcDwPi_OBJ_PLEAF_e, + fpcDwPi_OBJ_KBACKET_e, + fpcDwPi_OBJ_YBAG_e, + fpcDwPi_OBJ_PUMPKIN_e, + fpcDwPi_OBJ_KAGO_e, + fpcDwPi_BD_e, + fpcDwPi_NPC_FISH_e, + fpcDwPi_MG_FISH_e, + fpcDwPi_FSHOP_e, + fpcDwPi_NPC_DU_e, + fpcDwPi_NPC_TR_e, + fpcDwPi_CANOE_e, + fpcDwPi_DISAPPEAR_e, + fpcDwPi_WarpBug_e, + fpcDwPi_PPolamp_e, + fpcDwPi_BkyRock_e, + fpcDwPi_Obj_InoBone_e, + fpcDwPi_Obj_BossWarp_e, + fpcDwPi_Tag_RetRoom_e, + fpcDwPi_Obj_WindStone_e, + fpcDwPi_Tag_WaraHowl_e, + fpcDwPi_Obj_SCannon_e, + fpcDwPi_Obj_SmWStone_e, + fpcDwPi_Obj_SCannonCrs_e, + fpcDwPi_Obj_Prop_e, + fpcDwPi_Obj_SnowSoup_e, + fpcDwPi_Obj_Nagaisu_e, + fpcDwPi_Obj_RCircle_e, + fpcDwPi_Obj_Chandelier_e, + fpcDwPi_Obj_Picture_e, + fpcDwPi_Tag_SmkEmt_e, + fpcDwPi_Obj_HFtr_e, + fpcDwPi_Obj_HBarrel_e, + fpcDwPi_Obj_SCannonTen_e, + fpcDwPi_Obj_Hata_e, + fpcDwPi_Tag_RmbitSw_e, + fpcDwPi_Obj_ToaruMaki_e, + fpcDwPi_ARROW_e, + fpcDwPi_BULLET_e, + fpcDwPi_BG_OBJ_e, + fpcDwPi_BG_e, + fpcDwPi_SET_BG_OBJ_e, + fpcDwPi_E_DK_e, + fpcDwPi_E_VT_e, + fpcDwPi_MIRROR_e, + fpcDwPi_PATH_LINE_e, + fpcDwPi_WPILLAR_e, + fpcDwPi_WMARK_e, + fpcDwPi_SCENE_EXIT_e, + fpcDwPi_NO_CHG_ROOM_e, + fpcDwPi_SUSPEND_e, + fpcDwPi_COACH2D_e, + fpcDwPi_BALLOON2D_e, + fpcDwPi_TALK_e, + fpcDwPi_MENUWINDOW_e, + fpcDwPi_TIMER_e, + fpcDwPi_METER2_e, + fpcDwPi_MSG_OBJECT_e, + fpcDwPi_GAMEOVER_e, + fpcDwPi_SKIP2D_e, + fpcDwPi_OVERLAP0_e, + fpcDwPi_OVERLAP1_e, + fpcDwPi_OVERLAP2_e, + fpcDwPi_OVERLAP3_e, + fpcDwPi_OVERLAP6_e, + fpcDwPi_OVERLAP7_e, + fpcDwPi_OVERLAP8_e, + fpcDwPi_OVERLAP9_e, + fpcDwPi_OVERLAP10_e, + fpcDwPi_OVERLAP11_e, +}; + #endif diff --git a/include/f_pc/f_pc_leaf.h b/include/f_pc/f_pc_leaf.h index d9de82659c2..d4db6eb1d36 100644 --- a/include/f_pc/f_pc_leaf.h +++ b/include/f_pc/f_pc_leaf.h @@ -6,7 +6,7 @@ #include "f_pc/f_pc_draw_priority.h" #include "f_pc/f_pc_method.h" #include "f_pc/f_pc_profile.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" typedef struct leafdraw_method_class { /* 0x00 */ process_method_class base; diff --git a/include/f_pc/f_pc_name.h b/include/f_pc/f_pc_name.h index 1a837d38076..3c919f6106a 100644 --- a/include/f_pc/f_pc_name.h +++ b/include/f_pc/f_pc_name.h @@ -2,269 +2,805 @@ #ifndef F_PC_NAME_H_ #define F_PC_NAME_H_ -/** - * This is a made up header based on a debug assert from d_a_obj_item: - * "OS_REPORT_ERROR("fpcNm_(ITEM)では扱わないアイテムです<%d>\n", m_itemNo)" - * Making an assumption that `Nm` is shorthand for `Name` - */ +#include "global.h" -enum fpcNm_ITEM { - /* 0x00 */ fpcNm_ITEM_HEART, - /* 0x01 */ fpcNm_ITEM_GREEN_RUPEE, - /* 0x02 */ fpcNm_ITEM_BLUE_RUPEE, - /* 0x03 */ fpcNm_ITEM_YELLOW_RUPEE, - /* 0x04 */ fpcNm_ITEM_RED_RUPEE, - /* 0x05 */ fpcNm_ITEM_PURPLE_RUPEE, - /* 0x06 */ fpcNm_ITEM_ORANGE_RUPEE, - /* 0x07 */ fpcNm_ITEM_SILVER_RUPEE, - /* 0x08 */ fpcNm_ITEM_S_MAGIC, - /* 0x09 */ fpcNm_ITEM_L_MAGIC, - /* 0x0A */ fpcNm_ITEM_BOMB_5, - /* 0x0B */ fpcNm_ITEM_BOMB_10, - /* 0x0C */ fpcNm_ITEM_BOMB_20, - /* 0x0D */ fpcNm_ITEM_BOMB_30, - /* 0x0E */ fpcNm_ITEM_ARROW_10, - /* 0x0F */ fpcNm_ITEM_ARROW_20, - /* 0x10 */ fpcNm_ITEM_ARROW_30, - /* 0x11 */ fpcNm_ITEM_ARROW_1, - /* 0x12 */ fpcNm_ITEM_PACHINKO_SHOT, - /* 0x13 */ fpcNm_ITEM_NOENTRY_19, - /* 0x14 */ fpcNm_ITEM_NOENTRY_20, - /* 0x15 */ fpcNm_ITEM_NOENTRY_21, - /* 0x16 */ fpcNm_ITEM_WATER_BOMB_5, - /* 0x17 */ fpcNm_ITEM_WATER_BOMB_10, - /* 0x18 */ fpcNm_ITEM_WATER_BOMB_20, - /* 0x19 */ fpcNm_ITEM_WATER_BOMB_30, - /* 0x1A */ fpcNm_ITEM_BOMB_INSECT_5, - /* 0x1B */ fpcNm_ITEM_BOMB_INSECT_10, - /* 0x1C */ fpcNm_ITEM_BOMB_INSECT_20, - /* 0x1D */ fpcNm_ITEM_BOMB_INSECT_30, - /* 0x1E */ fpcNm_ITEM_RECOVERY_FAILY, - /* 0x1F */ fpcNm_ITEM_TRIPLE_HEART, - /* 0x20 */ fpcNm_ITEM_SMALL_KEY, - /* 0x21 */ fpcNm_ITEM_KAKERA_HEART, - /* 0x22 */ fpcNm_ITEM_UTAWA_HEART, - /* 0x23 */ fpcNm_ITEM_MAP, - /* 0x24 */ fpcNm_ITEM_COMPUS, - /* 0x25 */ fpcNm_ITEM_DUNGEON_EXIT, - /* 0x26 */ fpcNm_ITEM_BOSS_KEY, - /* 0x27 */ fpcNm_ITEM_DUNGEON_BACK, - /* 0x28 */ fpcNm_ITEM_SWORD, - /* 0x29 */ fpcNm_ITEM_MASTER_SWORD, - /* 0x2A */ fpcNm_ITEM_WOOD_SHIELD, - /* 0x2B */ fpcNm_ITEM_SHIELD, - /* 0x2C */ fpcNm_ITEM_HYLIA_SHIELD, - /* 0x2D */ fpcNm_ITEM_TKS_LETTER, - /* 0x2E */ fpcNm_ITEM_WEAR_CASUAL, - /* 0x2F */ fpcNm_ITEM_WEAR_KOKIRI, - /* 0x30 */ fpcNm_ITEM_ARMOR, - /* 0x31 */ fpcNm_ITEM_WEAR_ZORA, - /* 0x32 */ fpcNm_ITEM_MAGIC_LV1, - /* 0x33 */ fpcNm_ITEM_DUNGEON_EXIT_2, - /* 0x34 */ fpcNm_ITEM_WALLET_LV1, - /* 0x35 */ fpcNm_ITEM_WALLET_LV2, - /* 0x36 */ fpcNm_ITEM_WALLET_LV3, - /* 0x37 */ fpcNm_ITEM_NOENTRY_55, - /* 0x38 */ fpcNm_ITEM_NOENTRY_56, - /* 0x39 */ fpcNm_ITEM_NOENTRY_57, - /* 0x3A */ fpcNm_ITEM_NOENTRY_58, - /* 0x3B */ fpcNm_ITEM_NOENTRY_59, - /* 0x3C */ fpcNm_ITEM_NOENTRY_60, - /* 0x3D */ fpcNm_ITEM_ZORAS_JEWEL, - /* 0x3E */ fpcNm_ITEM_HAWK_EYE, - /* 0x3F */ fpcNm_ITEM_WOOD_STICK, - /* 0x40 */ fpcNm_ITEM_BOOMERANG, - /* 0x41 */ fpcNm_ITEM_SPINNER, - /* 0x42 */ fpcNm_ITEM_IRONBALL, - /* 0x43 */ fpcNm_ITEM_BOW, - /* 0x44 */ fpcNm_ITEM_HOOKSHOT, - /* 0x45 */ fpcNm_ITEM_HVY_BOOTS, - /* 0x46 */ fpcNm_ITEM_COPY_ROD, - /* 0x47 */ fpcNm_ITEM_W_HOOKSHOT, - /* 0x48 */ fpcNm_ITEM_KANTERA, - /* 0x49 */ fpcNm_ITEM_LIGHT_SWORD, - /* 0x4A */ fpcNm_ITEM_FISHING_ROD_1, - /* 0x4B */ fpcNm_ITEM_PACHINKO, - /* 0x4C */ fpcNm_ITEM_COPY_ROD_2, - /* 0x4D */ fpcNm_ITEM_NOENTRY_77, - /* 0x4E */ fpcNm_ITEM_NOENTRY_78, - /* 0x4F */ fpcNm_ITEM_BOMB_BAG_LV2, - /* 0x50 */ fpcNm_ITEM_BOMB_BAG_LV1, - /* 0x51 */ fpcNm_ITEM_BOMB_IN_BAG, - /* 0x52 */ fpcNm_ITEM_NOENTRY_82, - /* 0x53 */ fpcNm_ITEM_LIGHT_ARROW, - /* 0x54 */ fpcNm_ITEM_ARROW_LV1, - /* 0x55 */ fpcNm_ITEM_ARROW_LV2, - /* 0x56 */ fpcNm_ITEM_ARROW_LV3, - /* 0x57 */ fpcNm_ITEM_NOENTRY_87, - /* 0x58 */ fpcNm_ITEM_LURE_ROD, - /* 0x59 */ fpcNm_ITEM_BOMB_ARROW, - /* 0x5A */ fpcNm_ITEM_HAWK_ARROW, - /* 0x5B */ fpcNm_ITEM_BEE_ROD, - /* 0x5C */ fpcNm_ITEM_JEWEL_ROD, - /* 0x5D */ fpcNm_ITEM_WORM_ROD, - /* 0x5E */ fpcNm_ITEM_JEWEL_BEE_ROD, - /* 0x5F */ fpcNm_ITEM_JEWEL_WORM_ROD, - /* 0x60 */ fpcNm_ITEM_EMPTY_BOTTLE, - /* 0x61 */ fpcNm_ITEM_RED_BOTTLE, - /* 0x62 */ fpcNm_ITEM_GREEN_BOTTLE, - /* 0x63 */ fpcNm_ITEM_BLUE_BOTTLE, - /* 0x64 */ fpcNm_ITEM_MILK_BOTTLE, - /* 0x65 */ fpcNm_ITEM_HALF_MILK_BOTTLE, - /* 0x66 */ fpcNm_ITEM_OIL_BOTTLE, - /* 0x67 */ fpcNm_ITEM_WATER_BOTTLE, - /* 0x68 */ fpcNm_ITEM_OIL_BOTTLE_2, - /* 0x69 */ fpcNm_ITEM_RED_BOTTLE_2, - /* 0x6A */ fpcNm_ITEM_UGLY_SOUP, - /* 0x6B */ fpcNm_ITEM_HOT_SPRING, - /* 0x6C */ fpcNm_ITEM_FAIRY, - /* 0x6D */ fpcNm_ITEM_HOT_SPRING_2, - /* 0x6E */ fpcNm_ITEM_OIL2, - /* 0x6F */ fpcNm_ITEM_OIL, - /* 0x70 */ fpcNm_ITEM_NORMAL_BOMB, - /* 0x71 */ fpcNm_ITEM_WATER_BOMB, - /* 0x72 */ fpcNm_ITEM_POKE_BOMB, - /* 0x73 */ fpcNm_ITEM_FAIRY_DROP, - /* 0x74 */ fpcNm_ITEM_WORM, - /* 0x75 */ fpcNm_ITEM_DROP_BOTTLE, - /* 0x76 */ fpcNm_ITEM_BEE_CHILD, - /* 0x77 */ fpcNm_ITEM_CHUCHU_RARE, - /* 0x78 */ fpcNm_ITEM_CHUCHU_RED, - /* 0x79 */ fpcNm_ITEM_CHUCHU_BLUE, - /* 0x7A */ fpcNm_ITEM_CHUCHU_GREEN, - /* 0x7B */ fpcNm_ITEM_CHUCHU_YELLOW, - /* 0x7C */ fpcNm_ITEM_CHUCHU_PURPLE, - /* 0x7D */ fpcNm_ITEM_LV1_SOUP, - /* 0x7E */ fpcNm_ITEM_LV2_SOUP, - /* 0x7F */ fpcNm_ITEM_LV3_SOUP, - /* 0x80 */ fpcNm_ITEM_LETTER, - /* 0x81 */ fpcNm_ITEM_BILL, - /* 0x82 */ fpcNm_ITEM_WOOD_STATUE, - /* 0x83 */ fpcNm_ITEM_IRIAS_PENDANT, - /* 0x84 */ fpcNm_ITEM_HORSE_FLUTE, - /* 0x85 */ fpcNm_ITEM_NOENTRY_133, - /* 0x86 */ fpcNm_ITEM_NOENTRY_134, - /* 0x87 */ fpcNm_ITEM_NOENTRY_135, - /* 0x88 */ fpcNm_ITEM_NOENTRY_136, - /* 0x89 */ fpcNm_ITEM_NOENTRY_137, - /* 0x8A */ fpcNm_ITEM_NOENTRY_138, - /* 0x8B */ fpcNm_ITEM_NOENTRY_139, - /* 0x8C */ fpcNm_ITEM_NOENTRY_140, - /* 0x8D */ fpcNm_ITEM_NOENTRY_141, - /* 0x8E */ fpcNm_ITEM_NOENTRY_142, - /* 0x8F */ fpcNm_ITEM_NOENTRY_143, - /* 0x90 */ fpcNm_ITEM_RAFRELS_MEMO, - /* 0x91 */ fpcNm_ITEM_ASHS_SCRIBBLING, - /* 0x92 */ fpcNm_ITEM_NOENTRY_146, - /* 0x93 */ fpcNm_ITEM_NOENTRY_147, - /* 0x94 */ fpcNm_ITEM_NOENTRY_148, - /* 0x95 */ fpcNm_ITEM_NOENTRY_149, - /* 0x96 */ fpcNm_ITEM_NOENTRY_150, - /* 0x97 */ fpcNm_ITEM_NOENTRY_151, - /* 0x98 */ fpcNm_ITEM_NOENTRY_152, - /* 0x99 */ fpcNm_ITEM_NOENTRY_153, - /* 0x9A */ fpcNm_ITEM_NOENTRY_154, - /* 0x9B */ fpcNm_ITEM_NOENTRY_155, - /* 0x9C */ fpcNm_ITEM_CHUCHU_YELLOW2, - /* 0x9D */ fpcNm_ITEM_OIL_BOTTLE3, - /* 0x9E */ fpcNm_ITEM_SHOP_BEE_CHILD, - /* 0x9F */ fpcNm_ITEM_CHUCHU_BLACK, - /* 0xA0 */ fpcNm_ITEM_LIGHT_DROP, - /* 0xA1 */ fpcNm_ITEM_DROP_CONTAINER, - /* 0xA2 */ fpcNm_ITEM_DROP_CONTAINER02, - /* 0xA3 */ fpcNm_ITEM_DROP_CONTAINER03, - /* 0xA4 */ fpcNm_ITEM_FILLED_CONTAINER, - /* 0xA5 */ fpcNm_ITEM_MIRROR_PIECE_2, - /* 0xA6 */ fpcNm_ITEM_MIRROR_PIECE_3, - /* 0xA7 */ fpcNm_ITEM_MIRROR_PIECE_4, - /* 0xA8 */ fpcNm_ITEM_NOENTRY_168, - /* 0xA9 */ fpcNm_ITEM_NOENTRY_169, - /* 0xAA */ fpcNm_ITEM_NOENTRY_170, - /* 0xAB */ fpcNm_ITEM_NOENTRY_171, - /* 0xAC */ fpcNm_ITEM_NOENTRY_172, - /* 0xAD */ fpcNm_ITEM_NOENTRY_173, - /* 0xAE */ fpcNm_ITEM_NOENTRY_174, - /* 0xAF */ fpcNm_ITEM_NOENTRY_175, - /* 0xB0 */ fpcNm_ITEM_SMELL_YELIA_POUCH, - /* 0xB1 */ fpcNm_ITEM_SMELL_PUMPKIN, - /* 0xB2 */ fpcNm_ITEM_SMELL_POH, - /* 0xB3 */ fpcNm_ITEM_SMELL_FISH, - /* 0xB4 */ fpcNm_ITEM_SMELL_CHILDREN, - /* 0xB5 */ fpcNm_ITEM_SMELL_MEDICINE, - /* 0xB6 */ fpcNm_ITEM_NOENTRY_182, - /* 0xB7 */ fpcNm_ITEM_NOENTRY_183, - /* 0xB8 */ fpcNm_ITEM_NOENTRY_184, - /* 0xB9 */ fpcNm_ITEM_NOENTRY_185, - /* 0xBA */ fpcNm_ITEM_NOENTRY_186, - /* 0xBB */ fpcNm_ITEM_NOENTRY_187, - /* 0xBC */ fpcNm_ITEM_NOENTRY_188, - /* 0xBD */ fpcNm_ITEM_NOENTRY_189, - /* 0xBE */ fpcNm_ITEM_NOENTRY_190, - /* 0xBF */ fpcNm_ITEM_NOENTRY_191, - /* 0xC0 */ fpcNm_ITEM_M_BEETLE, - /* 0xC1 */ fpcNm_ITEM_F_BEETLE, - /* 0xC2 */ fpcNm_ITEM_M_BUTTERFLY, - /* 0xC3 */ fpcNm_ITEM_F_BUTTERFLY, - /* 0xC4 */ fpcNm_ITEM_M_STAG_BEETLE, - /* 0xC5 */ fpcNm_ITEM_F_STAG_BEETLE, - /* 0xC6 */ fpcNm_ITEM_M_GRASSHOPPER, - /* 0xC7 */ fpcNm_ITEM_F_GRASSHOPPER, - /* 0xC8 */ fpcNm_ITEM_M_NANAFUSHI, - /* 0xC9 */ fpcNm_ITEM_F_NANAFUSHI, - /* 0xCA */ fpcNm_ITEM_M_DANGOMUSHI, - /* 0xCB */ fpcNm_ITEM_F_DANGOMUSHI, - /* 0xCC */ fpcNm_ITEM_M_MANTIS, - /* 0xCD */ fpcNm_ITEM_F_MANTIS, - /* 0xCE */ fpcNm_ITEM_M_LADYBUG, - /* 0xCF */ fpcNm_ITEM_F_LADYBUG, - /* 0xD0 */ fpcNm_ITEM_M_SNAIL, - /* 0xD1 */ fpcNm_ITEM_F_SNAIL, - /* 0xD2 */ fpcNm_ITEM_M_DRAGONFLY, - /* 0xD3 */ fpcNm_ITEM_F_DRAGONFLY, - /* 0xD4 */ fpcNm_ITEM_M_ANT, - /* 0xD5 */ fpcNm_ITEM_F_ANT, - /* 0xD6 */ fpcNm_ITEM_M_MAYFLY, - /* 0xD7 */ fpcNm_ITEM_F_MAYFLY, - /* 0xD8 */ fpcNm_ITEM_NOENTRY_216, - /* 0xD9 */ fpcNm_ITEM_NOENTRY_217, - /* 0xDA */ fpcNm_ITEM_NOENTRY_218, - /* 0xDB */ fpcNm_ITEM_NOENTRY_219, - /* 0xDC */ fpcNm_ITEM_NOENTRY_220, - /* 0xDD */ fpcNm_ITEM_NOENTRY_221, - /* 0xDE */ fpcNm_ITEM_NOENTRY_222, - /* 0xDF */ fpcNm_ITEM_NOENTRY_223, - /* 0xE0 */ fpcNm_ITEM_POU_SPIRIT, - /* 0xE1 */ fpcNm_ITEM_NOENTRY_225, - /* 0xE2 */ fpcNm_ITEM_NOENTRY_226, - /* 0xE3 */ fpcNm_ITEM_NOENTRY_227, - /* 0xE4 */ fpcNm_ITEM_NOENTRY_228, - /* 0xE5 */ fpcNm_ITEM_NOENTRY_229, - /* 0xE6 */ fpcNm_ITEM_NOENTRY_230, - /* 0xE7 */ fpcNm_ITEM_NOENTRY_231, - /* 0xE8 */ fpcNm_ITEM_NOENTRY_232, - /* 0xE9 */ fpcNm_ITEM_ANCIENT_DOCUMENT, - /* 0xEA */ fpcNm_ITEM_AIR_LETTER, - /* 0xEB */ fpcNm_ITEM_ANCIENT_DOCUMENT2, - /* 0xEC */ fpcNm_ITEM_LV7_DUNGEON_EXIT, - /* 0xED */ fpcNm_ITEM_LINKS_SAVINGS, - /* 0xEE */ fpcNm_ITEM_SMALL_KEY2, - /* 0xEF */ fpcNm_ITEM_POU_FIRE1, - /* 0xF0 */ fpcNm_ITEM_POU_FIRE2, - /* 0xF1 */ fpcNm_ITEM_POU_FIRE3, - /* 0xF2 */ fpcNm_ITEM_POU_FIRE4, - /* 0xF3 */ fpcNm_ITEM_BOSSRIDER_KEY, - /* 0xF4 */ fpcNm_ITEM_TOMATO_PUREE, - /* 0xF5 */ fpcNm_ITEM_TASTE, - /* 0xF6 */ fpcNm_ITEM_LV5_BOSS_KEY, - /* 0xF7 */ fpcNm_ITEM_SURFBOARD, - /* 0xF8 */ fpcNm_ITEM_KANTERA2, - /* 0xF9 */ fpcNm_ITEM_L2_KEY_PIECES1, - /* 0xFA */ fpcNm_ITEM_L2_KEY_PIECES2, - /* 0xFB */ fpcNm_ITEM_L2_KEY_PIECES3, - /* 0xFC */ fpcNm_ITEM_KEY_OF_CARAVAN, - /* 0xFD */ fpcNm_ITEM_LV2_BOSS_KEY, - /* 0xFE */ fpcNm_ITEM_KEY_OF_FILONE, - /* 0xFF */ fpcNm_ITEM_NONE, +enum { + /* 0x000 */ fpcNm_OVERLAP0_e, + /* 0x001 */ fpcNm_OVERLAP1_e, + /* 0x002 */ fpcNm_OVERLAP3_e, + /* 0x003 */ fpcNm_OVERLAP6_e, + /* 0x004 */ fpcNm_OVERLAP7_e, + /* 0x005 */ fpcNm_OVERLAP8_e, + /* 0x006 */ fpcNm_OVERLAP9_e, + /* 0x007 */ fpcNm_OVERLAP10_e, + /* 0x008 */ fpcNm_OVERLAP11_e, + /* 0x009 */ fpcNm_LOGO_SCENE_e, + /* 0x00A */ fpcNm_MENU_SCENE_e, + /* 0x00B */ fpcNm_PLAY_SCENE_e, + /* 0x00C */ fpcNm_OPENING_SCENE_e, + /* 0x00D */ fpcNm_NAME_SCENE_e, + /* 0x00E */ fpcNm_NAMEEX_SCENE_e, +#if VERSION != VERSION_WII_USA_R0 && VERSION != VERSION_WII_PAL + /* 0x00F */ fpcNm_WARNING_SCENE_e, + /* 0x010 */ fpcNm_WARNING2_SCENE_e, +#endif + /* 0x011 */ fpcNm_OVERLAP2_e, + /* 0x012 */ fpcNm_ROOM_SCENE_e, + /* 0x013 */ fpcNm_KANKYO_e, + /* 0x014 */ fpcNm_ALLDIE_e, + /* 0x015 */ fpcNm_ENVSE_e, + /* 0x016 */ fpcNm_Obj_Swpush_e, + /* 0x017 */ fpcNm_Obj_Swpush2_e, + /* 0x018 */ fpcNm_Obj_Swpush5_e, + /* 0x019 */ fpcNm_Tag_Gstart_e, + /* 0x01A */ fpcNm_NO_CHG_ROOM_e, + /* 0x01B */ fpcNm_Obj_Lv6ElevtA_e, + /* 0x01C */ fpcNm_OBJ_SO_e, + /* 0x01D */ fpcNm_Obj_Movebox_e, + /* 0x01E */ fpcNm_Obj_SwTurn_e, + /* 0x01F */ fpcNm_Obj_Lv6SwTurn_e, + /* 0x020 */ fpcNm_OBJ_SEKIZOA_e, + /* 0x021 */ fpcNm_OBJ_GRA_e, + /* 0x022 */ fpcNm_TAG_GRA_e, + /* 0x023 */ fpcNm_TAG_YAMI_e, + /* 0x024 */ fpcNm_Obj_Ladder_e, + /* 0x025 */ fpcNm_OBJ_BEF_e, + /* 0x026 */ fpcNm_OBJ_FMOBJ_e, + /* 0x027 */ fpcNm_OBJ_LBOX_e, + /* 0x028 */ fpcNm_OBJ_WEB0_e, + /* 0x029 */ fpcNm_OBJ_WEB1_e, + /* 0x02A */ fpcNm_OBJ_CB_e, + /* 0x02B */ fpcNm_OBJ_MAKI_e, + /* 0x02C */ fpcNm_OBJ_BRG_e, + /* 0x02D */ fpcNm_OBJ_GB_e, + /* 0x02E */ fpcNm_OBJ_GM_e, + /* 0x02F */ fpcNm_OBJ_TOBY_e, + /* 0x030 */ fpcNm_OBJ_TP_e, + /* 0x031 */ fpcNm_TREESH_e, + /* 0x032 */ fpcNm_Obj_ZDoor_e, + /* 0x033 */ fpcNm_Obj_Pillar_e, + /* 0x034 */ fpcNm_Obj_Cdoor_e, + /* 0x035 */ fpcNm_GRDWATER_e, + /* 0x036 */ fpcNm_Obj_RotBridge_e, + /* 0x037 */ fpcNm_Obj_MagLift_e, + /* 0x038 */ fpcNm_Obj_MagLiftRot_e, + /* 0x039 */ fpcNm_Obj_Lv1Cdl00_e, + /* 0x03A */ fpcNm_Obj_Lv1Cdl01_e, + /* 0x03B */ fpcNm_Obj_TvCdlst_e, + /* 0x03C */ fpcNm_Obj_HsTarget_e, + /* 0x03D */ fpcNm_Obj_HeavySw_e, + /* 0x03E */ fpcNm_Obj_GoGate_e, + /* 0x03F */ fpcNm_Obj_TaFence_e, + /* 0x040 */ fpcNm_Obj_Saidan_e, + /* 0x041 */ fpcNm_Obj_SpinLift_e, + /* 0x042 */ fpcNm_Obj_BmWindow_e, + /* 0x043 */ fpcNm_Obj_RfHole_e, + /* 0x044 */ fpcNm_Obj_WaterPillar_e, + /* 0x045 */ fpcNm_Obj_SyRock_e, + /* 0x046 */ fpcNm_Obj_BsGate_e, + /* 0x047 */ fpcNm_Obj_AmiShutter_e, + /* 0x048 */ fpcNm_Obj_WtGate_e, + /* 0x049 */ fpcNm_Obj_Lv2Candle_e, + /* 0x04A */ fpcNm_Obj_TogeTrap_e, + /* 0x04B */ fpcNm_Obj_RotTrap_e, + /* 0x04C */ fpcNm_Obj_SwallShutter_e, + /* 0x04D */ fpcNm_Obj_IceWall_e, + /* 0x04E */ fpcNm_Obj_Lv5SwIce_e, + /* 0x04F */ fpcNm_Obj_Lv5FBoard_e, + /* 0x050 */ fpcNm_Obj_Turara_e, + /* 0x051 */ fpcNm_Obj_TwGate_e, + /* 0x052 */ fpcNm_Obj_Digholl_e, + /* 0x053 */ fpcNm_Obj_Digpl_e, + /* 0x054 */ fpcNm_Obj_TestCube_e, + /* 0x055 */ fpcNm_Obj_Kshutter_e, + /* 0x056 */ fpcNm_NPC_COACH_e, + /* 0x057 */ fpcNm_NPC_THEB_e, + /* 0x058 */ fpcNm_COACH_FIRE_e, + /* 0x059 */ fpcNm_COACH2D_e, + /* 0x05A */ fpcNm_BALLOON2D_e, + /* 0x05B */ fpcNm_SKIP2D_e, + /* 0x05C */ fpcNm_Obj_MvStair_e, + /* 0x05D */ fpcNm_Obj_Cowdoor_e, + /* 0x05E */ fpcNm_Obj_Swpropeller_e, + /* 0x05F */ fpcNm_Obj_BoomShutter_e, + /* 0x060 */ fpcNm_NPC_KS_e, + /* 0x061 */ fpcNm_Obj_Hfuta_e, + /* 0x062 */ fpcNm_Obj_BkDoor_e, + /* 0x063 */ fpcNm_Obj_Cboard_e, + /* 0x064 */ fpcNm_Obj_MGate_e, + /* 0x065 */ fpcNm_Obj_Ikada_e, + /* 0x066 */ fpcNm_Obj_Ice_l_e, + /* 0x067 */ fpcNm_Obj_Ice_s_e, + /* 0x068 */ fpcNm_Obj_E_CREATE_e, + /* 0x069 */ fpcNm_Obj_Bhbridge_e, + /* 0x06A */ fpcNm_Obj_Kaisou_e, + /* 0x06B */ fpcNm_Obj_HHASHI_e, + /* 0x06C */ fpcNm_Obj_BHASHI_e, + /* 0x06D */ fpcNm_OCTHASHI_e, + /* 0x06E */ fpcNm_Obj_THASHI_e, + /* 0x06F */ fpcNm_Obj_CRVGATE_e, + /* 0x070 */ fpcNm_Obj_CRVFENCE_e, + /* 0x071 */ fpcNm_Obj_CRVHAHEN_e, + /* 0x072 */ fpcNm_Obj_CRVSTEEL_e, + /* 0x073 */ fpcNm_Obj_CRVLH_UP_e, + /* 0x074 */ fpcNm_Obj_CRVLH_DW_e, + /* 0x075 */ fpcNm_Obj_RIVERROCK_e, + /* 0x076 */ fpcNm_Obj_DUST_e, + /* 0x077 */ fpcNm_Obj_ITA_e, + /* 0x078 */ fpcNm_Obj_Window_e, + /* 0x079 */ fpcNm_Obj_MetalBox_e, + /* 0x07A */ fpcNm_Obj_BBox_e, + /* 0x07B */ fpcNm_OBJ_MSIMA_e, + /* 0x07C */ fpcNm_OBJ_MYOGAN_e, + /* 0x07D */ fpcNm_B_ZANTS_e, + /* 0x07E */ fpcNm_Obj_ChainBlock_e, + /* 0x07F */ fpcNm_Obj_ChainWall_e, + /* 0x080 */ fpcNm_Obj_KkrGate_e, + /* 0x081 */ fpcNm_Obj_RiderGate_e, + /* 0x082 */ fpcNm_Obj_Onsen_e, + /* 0x083 */ fpcNm_Obj_Chest_e, + /* 0x084 */ fpcNm_Obj_Bemos_e, + /* 0x085 */ fpcNm_Obj_RopeBridge_e, + /* 0x086 */ fpcNm_Obj_WellCover_e, + /* 0x087 */ fpcNm_Obj_GraveStone_e, + /* 0x088 */ fpcNm_Obj_ZraRock_e, + /* 0x089 */ fpcNm_Obj_GraRock_e, + /* 0x08A */ fpcNm_Obj_GrzRock_e, + /* 0x08B */ fpcNm_GRA_WALL_e, + /* 0x08C */ fpcNm_OBJ_ONSEN_FIRE_e, + /* 0x08D */ fpcNm_Obj_Lv6bemos_e, + /* 0x08E */ fpcNm_Obj_Lv6bemos2_e, + /* 0x08F */ fpcNm_Obj_BarDesk_e, + /* 0x090 */ fpcNm_Obj_DigSnow_e, + /* 0x091 */ fpcNm_Obj_Ytaihou_e, + /* 0x092 */ fpcNm_Obj_Elevator_e, + /* 0x093 */ fpcNm_Obj_Lv6TogeRoll_e, + /* 0x094 */ fpcNm_Obj_Lv6TogeTrap_e, + /* 0x095 */ fpcNm_Obj_Lv6Tenbin_e, + /* 0x096 */ fpcNm_Obj_Lv6SwGate_e, + /* 0x097 */ fpcNm_Obj_Lv6Lblock_e, + /* 0x098 */ fpcNm_Obj_Lv6ChgGate_e, + /* 0x099 */ fpcNm_Obj_Lv6FuriTrap_e, + /* 0x09A */ fpcNm_Obj_Lv6SzGate_e, + /* 0x09B */ fpcNm_Obj_Lv4EdShutter_e, + /* 0x09C */ fpcNm_Obj_Lv4Gate_e, + /* 0x09D */ fpcNm_Obj_Lv4PoGate_e, + /* 0x09E */ fpcNm_Obj_Lv4SlideWall_e, + /* 0x09F */ fpcNm_Obj_Lv4HsTarget_e, + /* 0x0A0 */ fpcNm_Obj_Lv7PropY_e, + /* 0x0A1 */ fpcNm_Obj_Lv7BsGate_e, + /* 0x0A2 */ fpcNm_Obj_Lv8OptiLift_e, + /* 0x0A3 */ fpcNm_Obj_Lv8KekkaiTrap_e, + /* 0x0A4 */ fpcNm_Obj_Lv8Lift_e, + /* 0x0A5 */ fpcNm_Obj_Lv8UdFloor_e, + /* 0x0A6 */ fpcNm_Obj_Lv9SwShutter_e, + /* 0x0A7 */ fpcNm_Obj_TobyHouse_e, + /* 0x0A8 */ fpcNm_Obj_poCandle_e, + /* 0x0A9 */ fpcNm_Obj_Lv4DigSand_e, + /* 0x0AA */ fpcNm_Obj_FallObj_e, + /* 0x0AB */ fpcNm_Obj_SmgDoor_e, + /* 0x0AC */ fpcNm_Obj_SwLight_e, + /* 0x0AD */ fpcNm_Obj_Avalanche_e, + /* 0x0AE */ fpcNm_Obj_MirrorScrew_e, + /* 0x0AF */ fpcNm_Obj_MirrorSand_e, + /* 0x0B0 */ fpcNm_Obj_MirrorTable_e, + /* 0x0B1 */ fpcNm_Obj_MirrorChain_e, + /* 0x0B2 */ fpcNm_Obj_Mirror6Pole_e, + /* 0x0B3 */ fpcNm_Obj_SwSpinner_e, + /* 0x0B4 */ fpcNm_Obj_TDoor_e, + /* 0x0B5 */ fpcNm_Obj_Lv7Bridge_e, + /* 0x0B6 */ fpcNm_Obj_zrTurara_e, + /* 0x0B7 */ fpcNm_Obj_TakaraDai_e, + /* 0x0B8 */ fpcNm_Obj_Table_e, + /* 0x0B9 */ fpcNm_Obj_CatDoor_e, + /* 0x0BA */ fpcNm_Obj_Gake_e, + /* 0x0BB */ fpcNm_CSTAF_e, + /* 0x0BC */ fpcNm_Obj_Lv4RailWall_e, + /* 0x0BD */ fpcNm_Obj_Lv4Sand_e, + /* 0x0BE */ fpcNm_Obj_PushDoor_e, + /* 0x0BF */ fpcNm_PushDoor_e, + /* 0x0C0 */ fpcNm_Obj_GanonWall2_e, + /* 0x0C1 */ fpcNm_Obj_Lv4Bridge_e, + /* 0x0C2 */ fpcNm_Obj_Lv4Floor_e, + /* 0x0C3 */ fpcNm_Tag_Spinner_e, + /* 0x0C4 */ fpcNm_Obj_SwHang_e, + /* 0x0C5 */ fpcNm_Obj_RotStair_e, + /* 0x0C6 */ fpcNm_Obj_MagneArm_e, + /* 0x0C7 */ fpcNm_Obj_KWheel00_e, + /* 0x0C8 */ fpcNm_Obj_KWheel01_e, + /* 0x0C9 */ fpcNm_Obj_Ychndlr_e, + /* 0x0CA */ fpcNm_Obj_PRElvtr_e, + /* 0x0CB */ fpcNm_Obj_MHasu_e, + /* 0x0CC */ fpcNm_Obj_YIblltray_e, + /* 0x0CD */ fpcNm_Obj_Lv6EGate_e, + /* 0x0CE */ fpcNm_Obj_PDtile_e, + /* 0x0CF */ fpcNm_Obj_PDwall_e, + /* 0x0D0 */ fpcNm_Obj_Lv4PRwall_e, + /* 0x0D1 */ fpcNm_Obj_KLift00_e, + /* 0x0D2 */ fpcNm_B_OH_e, + /* 0x0D3 */ fpcNm_Obj_Lv4Chan_e, + /* 0x0D4 */ fpcNm_Obj_Lv3R10Saka_e, + /* 0x0D5 */ fpcNm_Obj_Lv3Water_e, + /* 0x0D6 */ fpcNm_Obj_Lv3Water2_e, + /* 0x0D7 */ fpcNm_OBJ_LV3WATERB_e, + /* 0x0D8 */ fpcNm_Obj_HBombkoya_e, + /* 0x0D9 */ fpcNm_Obj_SZbridge_e, + /* 0x0DA */ fpcNm_Obj_KakarikoBrg_e, + /* 0x0DB */ fpcNm_Obj_OrdinBrg_e, + /* 0x0DC */ fpcNm_Obj_BurnBox_e, + /* 0x0DD */ fpcNm_Obj_KJgjs_e, + /* 0x0DE */ fpcNm_OBJ_IHASI_e, + /* 0x0DF */ fpcNm_Obj_IceBlock_e, + /* 0x0E0 */ fpcNm_Obj_VolcanicBall_e, + /* 0x0E1 */ fpcNm_Obj_VolcanicBomb_e, + /* 0x0E2 */ fpcNm_Obj_VolcGnd_e, + /* 0x0E3 */ fpcNm_Obj_KKanban_e, + /* 0x0E4 */ fpcNm_E_PH_e, + /* 0x0E5 */ fpcNm_NPC_ZRA_e, + /* 0x0E6 */ fpcNm_Obj_Chandelier_e, + /* 0x0E7 */ fpcNm_Obj_Stopper2_e, + /* 0x0E8 */ fpcNm_DOOR20_e, + /* 0x0E9 */ fpcNm_Tag_Hinit_e, + /* 0x0EA */ fpcNm_Tag_Hjump_e, + /* 0x0EB */ fpcNm_Tag_AJnot_e, + /* 0x0EC */ fpcNm_Tag_Hstop_e, + /* 0x0ED */ fpcNm_CANOE_e, + /* 0x0EE */ fpcNm_HORSE_e, + /* 0x0EF */ fpcNm_E_WB_e, + /* 0x0F0 */ fpcNm_OBJ_ITO_e, + /* 0x0F1 */ fpcNm_OBJ_SW_e, + /* 0x0F2 */ fpcNm_SPINNER_e, + /* 0x0F3 */ fpcNm_B_OB_e, + /* 0x0F4 */ fpcNm_KAGO_e, + /* 0x0F5 */ fpcNm_E_YC_e, + /* 0x0F6 */ fpcNm_B_DS_e, + /* 0x0F7 */ fpcNm_B_DR_e, + /* 0x0F8 */ fpcNm_B_ZANTZ_e, + /* 0x0F9 */ fpcNm_B_ZANT_e, + /* 0x0FA */ fpcNm_B_ZANTM_e, + /* 0x0FB */ fpcNm_TBOX_e, + /* 0x0FC */ fpcNm_TBOX2_e, + /* 0x0FD */ fpcNm_ALINK_e, + /* 0x0FE */ fpcNm_BOOMERANG_e, + /* 0x0FF */ fpcNm_MIDNA_e, + /* 0x100 */ fpcNm_NPC_TK_e, + /* 0x101 */ fpcNm_NPC_WORM_e, + /* 0x102 */ fpcNm_PPolamp_e, + /* 0x103 */ fpcNm_BkyRock_e, + /* 0x104 */ fpcNm_HITOBJ_e, + /* 0x105 */ fpcNm_EP_e, + /* 0x106 */ fpcNm_COW_e, + /* 0x107 */ fpcNm_PERU_e, + /* 0x108 */ fpcNm_NI_e, + /* 0x109 */ fpcNm_NPC_TKJ2_e, + /* 0x10A */ fpcNm_SQ_e, + /* 0x10B */ fpcNm_NPC_SQ_e, + /* 0x10C */ fpcNm_DO_e, + /* 0x10D */ fpcNm_NPC_NE_e, + /* 0x10E */ fpcNm_NPC_TR_e, + /* 0x10F */ fpcNm_NPC_LF_e, + /* 0x110 */ fpcNm_OBJ_FOOD_e, + /* 0x111 */ fpcNm_OBJ_KI_e, + /* 0x112 */ fpcNm_OBJ_KITA_e, + /* 0x113 */ fpcNm_OBJ_KEY_e, + /* 0x114 */ fpcNm_OBJ_KEYHOLE_e, + /* 0x115 */ fpcNm_Obj_Lv5Key_e, + /* 0x116 */ fpcNm_OBJ_LP_e, + /* 0x117 */ fpcNm_OBJ_TATIGI_e, + /* 0x118 */ fpcNm_OBJ_ROCK_e, + /* 0x119 */ fpcNm_OBJ_WFLAG_e, + /* 0x11A */ fpcNm_OBJ_KAGE_e, + /* 0x11B */ fpcNm_OBJ_KANBAN2_e, + /* 0x11C */ fpcNm_OBJ_BALLOON_e, + /* 0x11D */ fpcNm_OBJ_SUISYA_e, + /* 0x11E */ fpcNm_OBJ_OILTUBO_e, + /* 0x11F */ fpcNm_OBJ_ROTEN_e, + /* 0x120 */ fpcNm_OBJ_SSDRINK_e, + /* 0x121 */ fpcNm_OBJ_SSITEM_e, + /* 0x122 */ fpcNm_TAG_SSDRINK_e, + /* 0x123 */ fpcNm_TAG_BTLITM_e, + /* 0x124 */ fpcNm_TAG_LV5SOUP_e, + /* 0x125 */ fpcNm_TAG_MNLIGHT_e, + /* 0x126 */ fpcNm_TAG_SHOPCAM_e, + /* 0x127 */ fpcNm_TAG_SHOPITM_e, + /* 0x128 */ fpcNm_OBJ_NDOOR_e, + /* 0x129 */ fpcNm_OBJ_UDOOR_e, + /* 0x12A */ fpcNm_OBJ_USAKU_e, + /* 0x12B */ fpcNm_Obj_SM_DOOR_e, + /* 0x12C */ fpcNm_OBJ_BED_e, + /* 0x12D */ fpcNm_OBJ_BOUMATO_e, + /* 0x12E */ fpcNm_OBJ_ITAMATO_e, + /* 0x12F */ fpcNm_OBJ_NOUGU_e, + /* 0x130 */ fpcNm_OBJ_STICK_e, + /* 0x131 */ fpcNm_OBJ_MIE_e, + /* 0x132 */ fpcNm_OBJ_SEKIDOOR_e, + /* 0x133 */ fpcNm_OBJ_SEKIZO_e, + /* 0x134 */ fpcNm_OBJ_SMTILE_e, + /* 0x135 */ fpcNm_NPC_FISH_e, + /* 0x136 */ fpcNm_MG_FISH_e, + /* 0x137 */ fpcNm_FSHOP_e, + /* 0x138 */ fpcNm_NPC_DU_e, + /* 0x139 */ fpcNm_DISAPPEAR_e, + /* 0x13A */ fpcNm_Obj_Mato_e, + /* 0x13B */ fpcNm_Obj_Flag_e, + /* 0x13C */ fpcNm_Obj_Flag2_e, + /* 0x13D */ fpcNm_Obj_Flag3_e, + /* 0x13E */ fpcNm_Obj_GOMIKABE_e, + /* 0x13F */ fpcNm_Obj_Yousei_e, + /* 0x140 */ fpcNm_Obj_Kabuto_e, + /* 0x141 */ fpcNm_Obj_Cho_e, + /* 0x142 */ fpcNm_Obj_Kuw_e, + /* 0x143 */ fpcNm_Obj_Nan_e, + /* 0x144 */ fpcNm_Obj_Dan_e, + /* 0x145 */ fpcNm_Obj_Kam_e, + /* 0x146 */ fpcNm_Obj_Ten_e, + /* 0x147 */ fpcNm_Obj_Ari_e, + /* 0x148 */ fpcNm_Obj_Kag_e, + /* 0x149 */ fpcNm_Obj_Batta_e, + /* 0x14A */ fpcNm_Obj_Tombo_e, + /* 0x14B */ fpcNm_Obj_Kat_e, + /* 0x14C */ fpcNm_Obj_H_Saku_e, + /* 0x14D */ fpcNm_Obj_Yobikusa_e, + /* 0x14E */ fpcNm_Obj_KazeNeko_e, + /* 0x14F */ fpcNm_Obj_KznkArm_e, + /* 0x150 */ fpcNm_Obj_NamePlate_e, + /* 0x151 */ fpcNm_Obj_OnCloth_e, + /* 0x152 */ fpcNm_Obj_LndRope_e, + /* 0x153 */ fpcNm_Obj_ItaRope_e, + /* 0x154 */ fpcNm_Obj_Sakuita_e, + /* 0x155 */ fpcNm_Obj_Laundry_e, + /* 0x156 */ fpcNm_WarpBug_e, + /* 0x157 */ fpcNm_Izumi_Gate_e, + /* 0x158 */ fpcNm_Obj_Fchain_e, + /* 0x159 */ fpcNm_Obj_Wchain_e, + /* 0x15A */ fpcNm_Tag_Attp_e, + /* 0x15B */ fpcNm_Obj_Tornado_e, + /* 0x15C */ fpcNm_Obj_Tornado2_e, + /* 0x15D */ fpcNm_Obj_FirePillar_e, + /* 0x15E */ fpcNm_Obj_FirePillar2_e, + /* 0x15F */ fpcNm_Obj_InoBone_e, + /* 0x160 */ fpcNm_Obj_Stopper_e, + /* 0x161 */ fpcNm_Obj_MHole_e, + /* 0x162 */ fpcNm_Tag_Magne_e, + /* 0x163 */ fpcNm_Obj_BossWarp_e, + /* 0x164 */ fpcNm_Obj_WoodPendulum_e, + /* 0x165 */ fpcNm_Obj_WdStick_e, + /* 0x166 */ fpcNm_Obj_StairBlock_e, + /* 0x167 */ fpcNm_Obj_Geyser_e, + /* 0x168 */ fpcNm_Tag_KtOnFire_e, + /* 0x169 */ fpcNm_Obj_FireWood_e, + /* 0x16A */ fpcNm_Obj_FireWood2_e, + /* 0x16B */ fpcNm_Obj_GpTaru_e, + /* 0x16C */ fpcNm_Obj_OnsenTaru_e, + /* 0x16D */ fpcNm_Obj_KiPot_e, + /* 0x16E */ fpcNm_TBOX_SW_e, + /* 0x16F */ fpcNm_Obj_SwChain_e, + /* 0x170 */ fpcNm_Obj_WoodenSword_e, + /* 0x171 */ fpcNm_Obj_StoneMark_e, + /* 0x172 */ fpcNm_Obj_Lv3Candle_e, + /* 0x173 */ fpcNm_Tag_Lv4Candle_e, + /* 0x174 */ fpcNm_Tag_Lv4CandleDm_e, + /* 0x175 */ fpcNm_Obj_DamCps_e, + /* 0x176 */ fpcNm_Obj_Smoke_e, + /* 0x177 */ fpcNm_Obj_WaterFall_e, + /* 0x178 */ fpcNm_Obj_ZoraCloth_e, + /* 0x179 */ fpcNm_Obj_poFire_e, + /* 0x17A */ fpcNm_Tag_poFire_e, + /* 0x17B */ fpcNm_Obj_glowSphere_e, + /* 0x17C */ fpcNm_Tag_LightBall_e, + /* 0x17D */ fpcNm_SwLBall_e, + /* 0x17E */ fpcNm_SwBall_e, + /* 0x17F */ fpcNm_Obj_WaterEff_e, + /* 0x180 */ fpcNm_Tag_RiverBack_e, + /* 0x181 */ fpcNm_Tag_KagoFall_e, + /* 0x182 */ fpcNm_Tag_Lv2PrChk_e, + /* 0x183 */ fpcNm_Obj_Lv4Gear_e, + /* 0x184 */ fpcNm_Obj_MasterSword_e, + /* 0x185 */ fpcNm_Obj_WoodStatue_e, + /* 0x186 */ fpcNm_Obj_Fan_e, + /* 0x187 */ fpcNm_Obj_IceLeaf_e, + /* 0x188 */ fpcNm_Obj_zrTuraraRc_e, + /* 0x189 */ fpcNm_Tag_RetRoom_e, + /* 0x18A */ fpcNm_Obj_WindStone_e, + /* 0x18B */ fpcNm_Tag_WaraHowl_e, + /* 0x18C */ fpcNm_Obj_SCannon_e, + /* 0x18D */ fpcNm_Obj_SmWStone_e, + /* 0x18E */ fpcNm_Obj_SCannonCrs_e, + /* 0x18F */ fpcNm_Tag_SnowEff_e, + /* 0x190 */ fpcNm_Tag_CstaSw_e, + /* 0x191 */ fpcNm_Tag_Lv6CstaSw_e, + /* 0x192 */ fpcNm_Obj_awaPlar_e, + /* 0x193 */ fpcNm_Obj_poTbox_e, + /* 0x194 */ fpcNm_Obj_TimeFire_e, + /* 0x195 */ fpcNm_Obj_TMoon_e, + /* 0x196 */ fpcNm_Obj_GanonWall_e, + /* 0x197 */ fpcNm_Obj_Prop_e, + /* 0x198 */ fpcNm_CSTATUE_e, + /* 0x199 */ fpcNm_Obj_SwBallA_e, + /* 0x19A */ fpcNm_Obj_SwBallB_e, + /* 0x19B */ fpcNm_Obj_SnowSoup_e, + /* 0x19C */ fpcNm_Obj_Nagaisu_e, + /* 0x19D */ fpcNm_Obj_RCircle_e, + /* 0x19E */ fpcNm_Obj_Picture_e, + /* 0x19F */ fpcNm_Tag_SetBall_e, + /* 0x1A0 */ fpcNm_Tag_SmkEmt_e, + /* 0x1A1 */ fpcNm_SwTime_e, + /* 0x1A2 */ fpcNm_Obj_HFtr_e, + /* 0x1A3 */ fpcNm_Obj_HBarrel_e, + /* 0x1A4 */ fpcNm_Obj_Crystal_e, + /* 0x1A5 */ fpcNm_Obj_SCannonTen_e, + /* 0x1A6 */ fpcNm_Obj_SwBallC_e, + /* 0x1A7 */ fpcNm_SCENE_EXIT2_e, + /* 0x1A8 */ fpcNm_Obj_Hata_e, + /* 0x1A9 */ fpcNm_Obj_ToaruMaki_e, + /* 0x1AA */ fpcNm_Tag_AttackItem_e, + /* 0x1AB */ fpcNm_Tag_RmbitSw_e, + /* 0x1AC */ fpcNm_Obj_Sword_e, + /* 0x1AD */ fpcNm_Tag_Spring_e, + /* 0x1AE */ fpcNm_Tag_Statue_e, + /* 0x1AF */ fpcNm_E_AI_e, + /* 0x1B0 */ fpcNm_E_GS_e, + /* 0x1B1 */ fpcNm_E_GOB_e, + /* 0x1B2 */ fpcNm_E_DD_e, + /* 0x1B3 */ fpcNm_E_DN_e, + /* 0x1B4 */ fpcNm_E_S1_e, + /* 0x1B5 */ fpcNm_E_MF_e, + /* 0x1B6 */ fpcNm_E_SG_e, + /* 0x1B7 */ fpcNm_E_BS_e, + /* 0x1B8 */ fpcNm_E_SF_e, + /* 0x1B9 */ fpcNm_E_SH_e, + /* 0x1BA */ fpcNm_E_DF_e, + /* 0x1BB */ fpcNm_E_GM_e, + /* 0x1BC */ fpcNm_E_MD_e, + /* 0x1BD */ fpcNm_E_SM_e, + /* 0x1BE */ fpcNm_E_SM2_e, + /* 0x1BF */ fpcNm_E_ST_e, + /* 0x1C0 */ fpcNm_E_ST_LINE_e, + /* 0x1C1 */ fpcNm_E_SB_e, + /* 0x1C2 */ fpcNm_E_TH_e, + /* 0x1C3 */ fpcNm_E_CR_e, + /* 0x1C4 */ fpcNm_E_CR_EGG_e, + /* 0x1C5 */ fpcNm_E_DB_e, + /* 0x1C6 */ fpcNm_E_DB_LEAF_e, + /* 0x1C7 */ fpcNm_E_GA_e, + /* 0x1C8 */ fpcNm_E_GB_e, + /* 0x1C9 */ fpcNm_E_HB_e, + /* 0x1CA */ fpcNm_E_HB_LEAF_e, + /* 0x1CB */ fpcNm_E_HZELDA_e, + /* 0x1CC */ fpcNm_E_YD_e, + /* 0x1CD */ fpcNm_E_YH_e, + /* 0x1CE */ fpcNm_E_YD_LEAF_e, + /* 0x1CF */ fpcNm_E_HM_e, + /* 0x1D0 */ fpcNm_E_TK_e, + /* 0x1D1 */ fpcNm_E_TK2_e, + /* 0x1D2 */ fpcNm_E_TK_BALL_e, + /* 0x1D3 */ fpcNm_E_RB_e, + /* 0x1D4 */ fpcNm_E_RD_e, + /* 0x1D5 */ fpcNm_E_RDB_e, + /* 0x1D6 */ fpcNm_E_RDY_e, + /* 0x1D7 */ fpcNm_E_FM_e, + /* 0x1D8 */ fpcNm_E_FS_e, + /* 0x1D9 */ fpcNm_E_PM_e, + /* 0x1DA */ fpcNm_E_PO_e, + /* 0x1DB */ fpcNm_E_MB_e, + /* 0x1DC */ fpcNm_E_MK_e, + /* 0x1DD */ fpcNm_E_MM_e, + /* 0x1DE */ fpcNm_E_FZ_e, + /* 0x1DF */ fpcNm_E_ZS_e, + /* 0x1E0 */ fpcNm_E_KK_e, + /* 0x1E1 */ fpcNm_E_HP_e, + /* 0x1E2 */ fpcNm_E_ZH_e, + /* 0x1E3 */ fpcNm_E_ZM_e, + /* 0x1E4 */ fpcNm_E_PZ_e, + /* 0x1E5 */ fpcNm_E_FB_e, + /* 0x1E6 */ fpcNm_E_FK_e, + /* 0x1E7 */ fpcNm_E_MS_e, + /* 0x1E8 */ fpcNm_E_NEST_e, + /* 0x1E9 */ fpcNm_E_NZ_e, + /* 0x1EA */ fpcNm_E_BA_e, + /* 0x1EB */ fpcNm_E_BU_e, + /* 0x1EC */ fpcNm_E_BUG_e, + /* 0x1ED */ fpcNm_E_BEE_e, + /* 0x1EE */ fpcNm_E_IS_e, + /* 0x1EF */ fpcNm_E_KG_e, + /* 0x1F0 */ fpcNm_E_KR_e, + /* 0x1F1 */ fpcNm_E_SW_e, + /* 0x1F2 */ fpcNm_E_GE_e, + /* 0x1F3 */ fpcNm_Tag_WatchGe_e, + /* 0x1F4 */ fpcNm_E_YM_e, + /* 0x1F5 */ fpcNm_E_YM_TAG_e, + /* 0x1F6 */ fpcNm_E_YMB_e, + /* 0x1F7 */ fpcNm_Tag_FWall_e, + /* 0x1F8 */ fpcNm_Tag_WaterFall_e, + /* 0x1F9 */ fpcNm_E_YK_e, + /* 0x1FA */ fpcNm_E_YR_e, + /* 0x1FB */ fpcNm_E_YG_e, + /* 0x1FC */ fpcNm_E_HZ_e, + /* 0x1FD */ fpcNm_E_WS_e, + /* 0x1FE */ fpcNm_E_OC_e, + /* 0x1FF */ fpcNm_E_OT_e, + /* 0x200 */ fpcNm_E_DT_e, + /* 0x201 */ fpcNm_E_BG_e, + /* 0x202 */ fpcNm_E_OctBg_e, + /* 0x203 */ fpcNm_DR_e, + /* 0x204 */ fpcNm_L7lowDr_e, + /* 0x205 */ fpcNm_L7ODR_e, + /* 0x206 */ fpcNm_E_TT_e, + /* 0x207 */ fpcNm_E_DK_e, + /* 0x208 */ fpcNm_E_VT_e, + /* 0x209 */ fpcNm_E_WW_e, + /* 0x20A */ fpcNm_E_GI_e, + /* 0x20B */ fpcNm_B_BH_e, + /* 0x20C */ fpcNm_B_BQ_e, + /* 0x20D */ fpcNm_B_GM_e, + /* 0x20E */ fpcNm_B_GND_e, + /* 0x20F */ fpcNm_B_GO_e, + /* 0x210 */ fpcNm_B_OH2_e, + /* 0x211 */ fpcNm_B_YO_e, + /* 0x212 */ fpcNm_B_YOI_e, + /* 0x213 */ fpcNm_B_TN_e, + /* 0x214 */ fpcNm_B_GG_e, + /* 0x215 */ fpcNm_B_DRE_e, + /* 0x216 */ fpcNm_B_MGN_e, + /* 0x217 */ fpcNm_E_WAP_e, + /* 0x218 */ fpcNm_ITEM_e, + /* 0x219 */ fpcNm_Obj_SmallKey_e, + /* 0x21A */ fpcNm_Obj_Kantera_e, + /* 0x21B */ fpcNm_Obj_LifeContainer_e, + /* 0x21C */ fpcNm_Obj_Shield_e, + /* 0x21D */ fpcNm_Demo_Item_e, + /* 0x21E */ fpcNm_ShopItem_e, + /* 0x21F */ fpcNm_Obj_Drop_e, + /* 0x220 */ fpcNm_OBJ_RW_e, + /* 0x221 */ fpcNm_NBOMB_e, + /* 0x222 */ fpcNm_TAG_CSW_e, + /* 0x223 */ fpcNm_TAG_QS_e, + /* 0x224 */ fpcNm_HOZELDA_e, + /* 0x225 */ fpcNm_SWC00_e, + /* 0x226 */ fpcNm_KNOB20_e, + /* 0x227 */ fpcNm_DBDOOR_e, + /* 0x228 */ fpcNm_BOSS_DOOR_e, + /* 0x229 */ fpcNm_L1BOSS_DOOR_e, + /* 0x22A */ fpcNm_L1MBOSS_DOOR_e, + /* 0x22B */ fpcNm_L5BOSS_DOOR_e, + /* 0x22C */ fpcNm_DSHUTTER_e, + /* 0x22D */ fpcNm_SPIRAL_DOOR_e, + /* 0x22E */ fpcNm_Tag_ChgRestart_e, + /* 0x22F */ fpcNm_Tag_Restart_e, + /* 0x230 */ fpcNm_ANDSW_e, + /* 0x231 */ fpcNm_ANDSW2_e, + /* 0x232 */ fpcNm_MYNA_e, + /* 0x233 */ fpcNm_NPC_GND_e, + /* 0x234 */ fpcNm_NPC_GRA_e, + /* 0x235 */ fpcNm_NPC_GRC_e, + /* 0x236 */ fpcNm_NPC_GRD_e, + /* 0x237 */ fpcNm_NPC_GRM_e, + /* 0x238 */ fpcNm_NPC_GRMC_e, + /* 0x239 */ fpcNm_NPC_GRO_e, + /* 0x23A */ fpcNm_NPC_GRR_e, + /* 0x23B */ fpcNm_NPC_GRS_e, + /* 0x23C */ fpcNm_NPC_GRZ_e, + /* 0x23D */ fpcNm_NPC_YAMID_e, + /* 0x23E */ fpcNm_NPC_YAMIT_e, + /* 0x23F */ fpcNm_NPC_YAMIS_e, + /* 0x240 */ fpcNm_NPC_BLUENS_e, + /* 0x241 */ fpcNm_NPC_KAKASHI_e, + /* 0x242 */ fpcNm_NPC_KDK_e, + /* 0x243 */ fpcNm_NPC_ARU_e, + /* 0x244 */ fpcNm_NPC_BANS_e, + /* 0x245 */ fpcNm_NPC_BESU_e, + /* 0x246 */ fpcNm_NPC_BOU_e, + /* 0x247 */ fpcNm_NPC_BOU_S_e, + /* 0x248 */ fpcNm_NPC_CLERKA_e, + /* 0x249 */ fpcNm_NPC_CLERKB_e, + /* 0x24A */ fpcNm_NPC_CLERKT_e, + /* 0x24B */ fpcNm_NPC_WRESTLER_e, + /* 0x24C */ fpcNm_Tag_Arena_e, + /* 0x24D */ fpcNm_Tag_Instruction_e, + /* 0x24E */ fpcNm_NPC_DOC_e, + /* 0x24F */ fpcNm_NPC_GWOLF_e, + /* 0x250 */ fpcNm_NPC_LEN_e, + /* 0x251 */ fpcNm_NPC_LUD_e, + /* 0x252 */ fpcNm_NPC_FAIRY_SEIREI_e, + /* 0x253 */ fpcNm_NPC_FAIRY_e, + /* 0x254 */ fpcNm_NPC_HANJO_e, + /* 0x255 */ fpcNm_NPC_HENNA_e, + /* 0x256 */ fpcNm_NPC_HENNA0_e, + /* 0x257 */ fpcNm_NPC_HOZ_e, + /* 0x258 */ fpcNm_NPC_JAGAR_e, + /* 0x259 */ fpcNm_NPC_KKRI_e, + /* 0x25A */ fpcNm_NPC_KN_e, + /* 0x25B */ fpcNm_KN_BULLET_e, + /* 0x25C */ fpcNm_NPC_KNJ_e, + /* 0x25D */ fpcNm_NPC_KOLIN_e, + /* 0x25E */ fpcNm_NPC_KOLINB_e, + /* 0x25F */ fpcNm_NPC_KYURY_e, + /* 0x260 */ fpcNm_NPC_MARO_e, + /* 0x261 */ fpcNm_NPC_MIDP_e, + /* 0x262 */ fpcNm_NPC_MOI_e, + /* 0x263 */ fpcNm_NPC_RACA_e, + /* 0x264 */ fpcNm_NPC_SARU_e, + /* 0x265 */ fpcNm_NPC_SEIB_e, + /* 0x266 */ fpcNm_NPC_SEIC_e, + /* 0x267 */ fpcNm_NPC_SEID_e, + /* 0x268 */ fpcNm_NPC_SEIRA_e, + /* 0x269 */ fpcNm_NPC_SERA2_e, + /* 0x26A */ fpcNm_NPC_SEIREI_e, + /* 0x26B */ fpcNm_NPC_SHAMAN_e, + /* 0x26C */ fpcNm_NPC_SMARO_e, + /* 0x26D */ fpcNm_NPC_SOLA_e, + /* 0x26E */ fpcNm_NPC_TARO_e, + /* 0x26F */ fpcNm_NPC_PACHI_BESU_e, + /* 0x270 */ fpcNm_NPC_PACHI_TARO_e, + /* 0x271 */ fpcNm_NPC_PACHI_MARO_e, + /* 0x272 */ fpcNm_TAG_PATI_e, + /* 0x273 */ fpcNm_NPC_THE_e, + /* 0x274 */ fpcNm_NPC_TKJ_e, + /* 0x275 */ fpcNm_NPC_TKS_e, + /* 0x276 */ fpcNm_NPC_TKC_e, + /* 0x277 */ fpcNm_OBJ_TKS_e, + /* 0x278 */ fpcNm_NPC_TOBY_e, + /* 0x279 */ fpcNm_NPC_URI_e, + /* 0x27A */ fpcNm_NPC_YELIA_e, + /* 0x27B */ fpcNm_NPC_YKM_e, + /* 0x27C */ fpcNm_NPC_YKW_e, + /* 0x27D */ fpcNm_NPC_ZANB_e, + /* 0x27E */ fpcNm_NPC_ZANT_e, + /* 0x27F */ fpcNm_NPC_ZELDA_e, + /* 0x280 */ fpcNm_NPC_ZELR_e, + /* 0x281 */ fpcNm_NPC_ZELRO_e, + /* 0x282 */ fpcNm_OBJ_ZRAFREEZE_e, + /* 0x283 */ fpcNm_NPC_ZRC_e, + /* 0x284 */ fpcNm_NPC_ZRZ_e, + /* 0x285 */ fpcNm_ZRA_MARK_e, + /* 0x286 */ fpcNm_MYNA2_e, + /* 0x287 */ fpcNm_TAG_MYNA2_e, + /* 0x288 */ fpcNm_NPC_CD3_e, + /* 0x289 */ fpcNm_Tag_Schedule_e, + /* 0x28A */ fpcNm_Tag_Escape_e, + /* 0x28B */ fpcNm_NPC_CHAT_e, + /* 0x28C */ fpcNm_NPC_SOLDIERa_e, + /* 0x28D */ fpcNm_NPC_SOLDIERb_e, + /* 0x28E */ fpcNm_PASSER_MNG_e, + /* 0x28F */ fpcNm_NPC_PASSER_e, + /* 0x290 */ fpcNm_NPC_PASSER2_e, + /* 0x291 */ fpcNm_NPC_POST_e, + /* 0x292 */ fpcNm_NPC_POUYA_e, + /* 0x293 */ fpcNm_FORMATION_MNG_e, + /* 0x294 */ fpcNm_NPC_FGUARD_e, + /* 0x295 */ fpcNm_GUARD_MNG_e, + /* 0x296 */ fpcNm_TAG_GUARD_e, + /* 0x297 */ fpcNm_NPC_GUARD_e, + /* 0x298 */ fpcNm_NPC_ASH_e, + /* 0x299 */ fpcNm_NPC_ASHB_e, + /* 0x29A */ fpcNm_NPC_SHAD_e, + /* 0x29B */ fpcNm_NPC_RAFREL_e, + /* 0x29C */ fpcNm_NPC_MOIR_e, + /* 0x29D */ fpcNm_NPC_IMPAL_e, + /* 0x29E */ fpcNm_NPC_SHOE_e, + /* 0x29F */ fpcNm_NPC_DOORBOY_e, + /* 0x2A0 */ fpcNm_NPC_PRAYER_e, + /* 0x2A1 */ fpcNm_NPC_KASIHANA_e, + /* 0x2A2 */ fpcNm_NPC_KASIKYU_e, + /* 0x2A3 */ fpcNm_NPC_KASIMICH_e, + /* 0x2A4 */ fpcNm_NPC_DRSOL_e, + /* 0x2A5 */ fpcNm_NPC_CHIN_e, + /* 0x2A6 */ fpcNm_NPC_INS_e, + /* 0x2A7 */ fpcNm_NPC_SHOP0_e, + /* 0x2A8 */ fpcNm_NPC_MK_e, + /* 0x2A9 */ fpcNm_NPC_P2_e, + /* 0x2AA */ fpcNm_KYTAG00_e, + /* 0x2AB */ fpcNm_KYTAG01_e, + /* 0x2AC */ fpcNm_KYTAG02_e, + /* 0x2AD */ fpcNm_KYTAG03_e, + /* 0x2AE */ fpcNm_KYTAG04_e, + /* 0x2AF */ fpcNm_KYTAG05_e, + /* 0x2B0 */ fpcNm_KYTAG06_e, + /* 0x2B1 */ fpcNm_KYTAG07_e, + /* 0x2B2 */ fpcNm_KYTAG08_e, + /* 0x2B3 */ fpcNm_KYTAG09_e, + /* 0x2B4 */ fpcNm_KYTAG10_e, + /* 0x2B5 */ fpcNm_KYTAG11_e, + /* 0x2B6 */ fpcNm_KYTAG12_e, + /* 0x2B7 */ fpcNm_KYTAG13_e, + /* 0x2B8 */ fpcNm_KYTAG14_e, + /* 0x2B9 */ fpcNm_KYTAG15_e, + /* 0x2BA */ fpcNm_KYTAG16_e, + /* 0x2BB */ fpcNm_KYTAG17_e, + /* 0x2BC */ fpcNm_Ykgr_e, + /* 0x2BD */ fpcNm_TALK_e, + /* 0x2BE */ fpcNm_Obj_Crope_e, + /* 0x2BF */ fpcNm_Obj_Bombf_e, + /* 0x2C0 */ fpcNm_Obj_BkLeaf_e, + /* 0x2C1 */ fpcNm_Tag_Mhint_e, + /* 0x2C2 */ fpcNm_Tag_Mmsg_e, + /* 0x2C3 */ fpcNm_Tag_Mwait_e, + /* 0x2C4 */ fpcNm_Tag_Mstop_e, + /* 0x2C5 */ fpcNm_Tag_Stream_e, + /* 0x2C6 */ fpcNm_Tag_Sppath_e, + /* 0x2C7 */ fpcNm_Tag_Wljump_e, + /* 0x2C8 */ fpcNm_Tag_TWGate_e, + /* 0x2C9 */ fpcNm_Tag_Lv6Gate_e, + /* 0x2CA */ fpcNm_Tag_Lv7Gate_e, + /* 0x2CB */ fpcNm_Tag_Lv8Gate_e, + /* 0x2CC */ fpcNm_Tag_TheBHint_e, + /* 0x2CD */ fpcNm_Tag_Assist_e, + /* 0x2CE */ fpcNm_DEMO00_e, + /* 0x2CF */ fpcNm_TAG_CAMERA_e, + /* 0x2D0 */ fpcNm_TAG_CHKPOINT_e, + /* 0x2D1 */ fpcNm_TAG_EVENT_e, + /* 0x2D2 */ fpcNm_TAG_EVT_e, + /* 0x2D3 */ fpcNm_TAG_TELOP_e, + /* 0x2D4 */ fpcNm_TAG_HOWL_e, + /* 0x2D5 */ fpcNm_TAG_MSG_e, + /* 0x2D6 */ fpcNm_TAG_LANTERN_e, + /* 0x2D7 */ fpcNm_Tag_Mist_e, + /* 0x2D8 */ fpcNm_DMIDNA_e, + /* 0x2D9 */ fpcNm_KY_THUNDER_e, + /* 0x2DA */ fpcNm_VRBOX_e, + /* 0x2DB */ fpcNm_VRBOX2_e, + /* 0x2DC */ fpcNm_BG_e, + /* 0x2DD */ fpcNm_SET_BG_OBJ_e, + /* 0x2DE */ fpcNm_BG_OBJ_e, + /* 0x2DF */ fpcNm_MIRROR_e, + /* 0x2E0 */ fpcNm_MOVIE_PLAYER_e, + /* 0x2E1 */ fpcNm_TITLE_e, + /* 0x2E2 */ fpcNm_FR_e, + /* 0x2E3 */ fpcNm_ECONT_e, + /* 0x2E4 */ fpcNm_MG_ROD_e, + /* 0x2E5 */ fpcNm_E_ARROW_e, + /* 0x2E6 */ fpcNm_BULLET_e, + /* 0x2E7 */ fpcNm_SWHIT0_e, + /* 0x2E8 */ fpcNm_E_TH_BALL_e, + /* 0x2E9 */ fpcNm_TAG_EVTAREA_e, + /* 0x2EA */ fpcNm_TAG_EVTMSG_e, + /* 0x2EB */ fpcNm_TAG_KMSG_e, + /* 0x2EC */ fpcNm_TAG_PUSH_e, + /* 0x2ED */ fpcNm_E_MK_BO_e, + /* 0x2EE */ fpcNm_E_MM_MT_e, + /* 0x2EF */ fpcNm_OBJ_KBOX_e, + /* 0x2F0 */ fpcNm_OBJ_FW_e, + /* 0x2F1 */ fpcNm_B_GOS_e, + /* 0x2F2 */ fpcNm_OBJ_YSTONE_e, + /* 0x2F3 */ fpcNm_MANT_e, + /* 0x2F4 */ fpcNm_CROD_e, + /* 0x2F5 */ fpcNm_OBJ_PLEAF_e, + /* 0x2F6 */ fpcNm_OBJ_KBACKET_e, + /* 0x2F7 */ fpcNm_OBJ_YBAG_e, + /* 0x2F8 */ fpcNm_OBJ_PUMPKIN_e, + /* 0x2F9 */ fpcNm_OBJ_AUTOMATA_e, + /* 0x2FA */ fpcNm_OBJ_GADGET_e, + /* 0x2FB */ fpcNm_OBJ_KAGO_e, + /* 0x2FC */ fpcNm_Obj_Carry_e, + /* 0x2FD */ fpcNm_Obj_Stone_e, + /* 0x2FE */ fpcNm_OBJ_HB_e, + /* 0x2FF */ fpcNm_NPC_INKO_e, + /* 0x300 */ fpcNm_BD_e, + /* 0x301 */ fpcNm_Obj_Eff_e, + /* 0x302 */ fpcNm_WPILLAR_e, + /* 0x303 */ fpcNm_WMARK_e, + /* 0x304 */ fpcNm_E_BI_e, + /* 0x305 */ fpcNm_E_BI_LEAF_e, + /* 0x306 */ fpcNm_START_AND_GOAL_e, + /* 0x307 */ fpcNm_NPC_DF_e, + /* 0x308 */ fpcNm_ARROW_e, + /* 0x309 */ fpcNm_PATH_LINE_e, + /* 0x30A */ fpcNm_TAG_ALLMATO_e, + /* 0x30B */ fpcNm_Obj_Timer_e, + /* 0x30C */ fpcNm_SCENE_EXIT_e, + /* 0x30D */ fpcNm_CAMERA_e, + /* 0x30E */ fpcNm_CAMERA2_e, + /* 0x30F */ fpcNm_SUSPEND_e, + /* 0x310 */ fpcNm_GRASS_e, + /* 0x311 */ fpcNm_KYEFF_e, + /* 0x312 */ fpcNm_KYEFF2_e, + /* 0x313 */ fpcNm_MSG_OBJECT_e, + /* 0x314 */ fpcNm_MENUWINDOW_e, + /* 0x315 */ fpcNm_TIMER_e, + /* 0x316 */ fpcNm_METER2_e, + /* 0x317 */ fpcNm_GAMEOVER_e, + + fpcNm_MAX_NUM, }; #endif diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index 3f98d76b9af..7ed781609fa 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -49,9 +49,9 @@ BOOL cDmrNowMidnaTalk() { if (dComIfGp_event_runCheck()) { fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_getTalkEventPartner(daPy_getLinkPlayerActorClass()); if (actor) { - if (fopAcM_GetName(actor) == PROC_MIDNA || fopAcM_GetName(actor) == PROC_Tag_Mhint || - fopAcM_GetName(actor) == PROC_Tag_Mstop || fopAcM_GetName(actor) == PROC_Tag_Hstop || - fopAcM_GetName(actor) == PROC_Tag_Mwait || fopAcM_GetName(actor) == PROC_Tag_Wljump) { + if (fopAcM_GetName(actor) == fpcNm_MIDNA_e || fopAcM_GetName(actor) == fpcNm_Tag_Mhint_e || + fopAcM_GetName(actor) == fpcNm_Tag_Mstop_e || fopAcM_GetName(actor) == fpcNm_Tag_Hstop_e || + fopAcM_GetName(actor) == fpcNm_Tag_Mwait_e || fopAcM_GetName(actor) == fpcNm_Tag_Wljump_e) { return 1; } } diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index a811f7fb7f5..02cbeb45e59 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -17,789 +17,789 @@ #endif static DynamicNameTableEntry const DynamicNameTable[] = { - {PROC_ALLDIE, "d_a_alldie"}, - {PROC_Obj_Swpush, "d_a_obj_swpush"}, - {PROC_Obj_Swpush2, "d_a_obj_swpush2"}, - {PROC_Obj_Swpush5, "d_a_obj_swpush5"}, - {PROC_Tag_Gstart, "d_a_tag_gstart"}, + {fpcNm_ALLDIE_e, "d_a_alldie"}, + {fpcNm_Obj_Swpush_e, "d_a_obj_swpush"}, + {fpcNm_Obj_Swpush2_e, "d_a_obj_swpush2"}, + {fpcNm_Obj_Swpush5_e, "d_a_obj_swpush5"}, + {fpcNm_Tag_Gstart_e, "d_a_tag_gstart"}, #if PLATFORM_WII || PLATFORM_SHIELD - {PROC_NO_CHG_ROOM, "d_a_no_chg_room"}, + {fpcNm_NO_CHG_ROOM_e, "d_a_no_chg_room"}, #endif - {PROC_Obj_Lv6ElevtA, "d_a_obj_lv6elevta"}, - {PROC_OBJ_SO, "d_a_obj_so"}, - {PROC_Obj_Movebox, "d_a_obj_movebox"}, - {PROC_Obj_SwTurn, "d_a_obj_swturn"}, - {PROC_Obj_Lv6SwTurn, "d_a_obj_lv6swturn"}, - {PROC_OBJ_SEKIZOA, "d_a_obj_sekizoa"}, - {PROC_OBJ_GRA, "d_a_obj_gra2"}, - {PROC_TAG_GRA, "d_a_tag_gra"}, - {PROC_TAG_YAMI, "d_a_tag_yami"}, - {PROC_Obj_Ladder, "d_a_obj_ladder"}, - {PROC_OBJ_BEF, "d_a_obj_brakeeff"}, - {PROC_OBJ_FMOBJ, "d_a_obj_fmobj"}, - {PROC_OBJ_LBOX, "d_a_obj_lbox"}, - {PROC_OBJ_WEB0, "d_a_obj_web0"}, - {PROC_OBJ_WEB1, "d_a_obj_web1"}, - {PROC_OBJ_CB, "d_a_obj_cb"}, - {PROC_OBJ_MAKI, "d_a_obj_maki"}, - {PROC_OBJ_BRG, "d_a_obj_brg"}, - {PROC_OBJ_GB, "d_a_obj_gb"}, - {PROC_OBJ_GM, "d_a_obj_gm"}, - {PROC_OBJ_TOBY, "d_a_obj_toby"}, - {PROC_OBJ_TP, "d_a_obj_tp"}, - {PROC_TREESH, "d_a_obj_treesh"}, - {PROC_Obj_ZDoor, "d_a_obj_zdoor"}, - {PROC_Obj_Pillar, "d_a_obj_pillar"}, - {PROC_Obj_Cdoor, "d_a_obj_cdoor"}, - {PROC_GRDWATER, "d_a_obj_groundwater"}, - {PROC_Obj_RotBridge, "d_a_obj_rotBridge"}, - {PROC_Obj_MagLift, "d_a_obj_magLift"}, - {PROC_Obj_MagLiftRot, "d_a_obj_magLiftRot"}, - {PROC_Obj_Lv1Cdl00, "d_a_obj_lv1Candle00"}, - {PROC_Obj_Lv1Cdl01, "d_a_obj_lv1Candle01"}, - {PROC_Obj_TvCdlst, "d_a_obj_TvCdlst"}, - {PROC_Obj_HsTarget, "d_a_obj_hsTarget"}, - {PROC_Obj_HeavySw, "d_a_obj_heavySw"}, - {PROC_Obj_GoGate, "d_a_obj_goGate"}, - {PROC_Obj_TaFence, "d_a_obj_taFence"}, - {PROC_Obj_Saidan, "d_a_obj_saidan"}, - {PROC_Obj_SpinLift, "d_a_obj_spinLift"}, - {PROC_Obj_BmWindow, "d_a_obj_bmWindow"}, - {PROC_Obj_RfHole, "d_a_obj_rfHole"}, - {PROC_Obj_WaterPillar, "d_a_obj_waterPillar"}, - {PROC_Obj_SyRock, "d_a_obj_syRock"}, - {PROC_Obj_BsGate, "d_a_obj_bsGate"}, - {PROC_Obj_AmiShutter, "d_a_obj_amiShutter"}, - {PROC_Obj_WtGate, "d_a_obj_waterGate"}, - {PROC_Obj_Lv2Candle, "d_a_obj_lv2Candle"}, - {PROC_Obj_TogeTrap, "d_a_obj_togeTrap"}, - {PROC_Obj_RotTrap, "d_a_obj_rotTrap"}, - {PROC_Obj_SwallShutter, "d_a_obj_sWallShutter"}, - {PROC_Obj_IceWall, "d_a_obj_lv5IceWall"}, - {PROC_Obj_Lv5SwIce, "d_a_obj_lv5SwIce"}, - {PROC_Obj_Lv5FBoard, "d_a_obj_lv5FloorBoard"}, - {PROC_Obj_Turara, "d_a_obj_Turara"}, - {PROC_Obj_TwGate, "d_a_obj_twGate"}, - {PROC_Obj_Digholl, "d_a_obj_digholl"}, - {PROC_Obj_Digpl, "d_a_obj_digplace"}, - {PROC_Obj_TestCube, "d_a_obj_testcube"}, - {PROC_Obj_Kshutter, "d_a_obj_kshutter"}, - {PROC_NPC_COACH, "d_a_npc_coach"}, - {PROC_NPC_THEB, "d_a_npc_theB"}, - {PROC_COACH_FIRE, "d_a_coach_fire"}, - {PROC_COACH2D, "d_a_coach_2D"}, - {PROC_BALLOON2D, "d_a_balloon_2D"}, - {PROC_SKIP2D, "d_a_skip_2D"}, - {PROC_Obj_MvStair, "d_a_obj_mvstair"}, - {PROC_Obj_Cowdoor, "d_a_obj_cowdoor"}, - {PROC_Obj_Swpropeller, "d_a_obj_swpropeller"}, - {PROC_Obj_BoomShutter, "d_a_obj_bmshutter"}, - {PROC_NPC_KS, "d_a_npc_ks"}, - {PROC_Obj_Hfuta, "d_a_obj_hfuta"}, - {PROC_Obj_BkDoor, "d_a_obj_bkdoor"}, - {PROC_Obj_Cboard, "d_a_obj_cboard"}, - {PROC_Obj_MGate, "d_a_obj_mgate"}, + {fpcNm_Obj_Lv6ElevtA_e, "d_a_obj_lv6elevta"}, + {fpcNm_OBJ_SO_e, "d_a_obj_so"}, + {fpcNm_Obj_Movebox_e, "d_a_obj_movebox"}, + {fpcNm_Obj_SwTurn_e, "d_a_obj_swturn"}, + {fpcNm_Obj_Lv6SwTurn_e, "d_a_obj_lv6swturn"}, + {fpcNm_OBJ_SEKIZOA_e, "d_a_obj_sekizoa"}, + {fpcNm_OBJ_GRA_e, "d_a_obj_gra2"}, + {fpcNm_TAG_GRA_e, "d_a_tag_gra"}, + {fpcNm_TAG_YAMI_e, "d_a_tag_yami"}, + {fpcNm_Obj_Ladder_e, "d_a_obj_ladder"}, + {fpcNm_OBJ_BEF_e, "d_a_obj_brakeeff"}, + {fpcNm_OBJ_FMOBJ_e, "d_a_obj_fmobj"}, + {fpcNm_OBJ_LBOX_e, "d_a_obj_lbox"}, + {fpcNm_OBJ_WEB0_e, "d_a_obj_web0"}, + {fpcNm_OBJ_WEB1_e, "d_a_obj_web1"}, + {fpcNm_OBJ_CB_e, "d_a_obj_cb"}, + {fpcNm_OBJ_MAKI_e, "d_a_obj_maki"}, + {fpcNm_OBJ_BRG_e, "d_a_obj_brg"}, + {fpcNm_OBJ_GB_e, "d_a_obj_gb"}, + {fpcNm_OBJ_GM_e, "d_a_obj_gm"}, + {fpcNm_OBJ_TOBY_e, "d_a_obj_toby"}, + {fpcNm_OBJ_TP_e, "d_a_obj_tp"}, + {fpcNm_TREESH_e, "d_a_obj_treesh"}, + {fpcNm_Obj_ZDoor_e, "d_a_obj_zdoor"}, + {fpcNm_Obj_Pillar_e, "d_a_obj_pillar"}, + {fpcNm_Obj_Cdoor_e, "d_a_obj_cdoor"}, + {fpcNm_GRDWATER_e, "d_a_obj_groundwater"}, + {fpcNm_Obj_RotBridge_e, "d_a_obj_rotBridge"}, + {fpcNm_Obj_MagLift_e, "d_a_obj_magLift"}, + {fpcNm_Obj_MagLiftRot_e, "d_a_obj_magLiftRot"}, + {fpcNm_Obj_Lv1Cdl00_e, "d_a_obj_lv1Candle00"}, + {fpcNm_Obj_Lv1Cdl01_e, "d_a_obj_lv1Candle01"}, + {fpcNm_Obj_TvCdlst_e, "d_a_obj_TvCdlst"}, + {fpcNm_Obj_HsTarget_e, "d_a_obj_hsTarget"}, + {fpcNm_Obj_HeavySw_e, "d_a_obj_heavySw"}, + {fpcNm_Obj_GoGate_e, "d_a_obj_goGate"}, + {fpcNm_Obj_TaFence_e, "d_a_obj_taFence"}, + {fpcNm_Obj_Saidan_e, "d_a_obj_saidan"}, + {fpcNm_Obj_SpinLift_e, "d_a_obj_spinLift"}, + {fpcNm_Obj_BmWindow_e, "d_a_obj_bmWindow"}, + {fpcNm_Obj_RfHole_e, "d_a_obj_rfHole"}, + {fpcNm_Obj_WaterPillar_e, "d_a_obj_waterPillar"}, + {fpcNm_Obj_SyRock_e, "d_a_obj_syRock"}, + {fpcNm_Obj_BsGate_e, "d_a_obj_bsGate"}, + {fpcNm_Obj_AmiShutter_e, "d_a_obj_amiShutter"}, + {fpcNm_Obj_WtGate_e, "d_a_obj_waterGate"}, + {fpcNm_Obj_Lv2Candle_e, "d_a_obj_lv2Candle"}, + {fpcNm_Obj_TogeTrap_e, "d_a_obj_togeTrap"}, + {fpcNm_Obj_RotTrap_e, "d_a_obj_rotTrap"}, + {fpcNm_Obj_SwallShutter_e, "d_a_obj_sWallShutter"}, + {fpcNm_Obj_IceWall_e, "d_a_obj_lv5IceWall"}, + {fpcNm_Obj_Lv5SwIce_e, "d_a_obj_lv5SwIce"}, + {fpcNm_Obj_Lv5FBoard_e, "d_a_obj_lv5FloorBoard"}, + {fpcNm_Obj_Turara_e, "d_a_obj_Turara"}, + {fpcNm_Obj_TwGate_e, "d_a_obj_twGate"}, + {fpcNm_Obj_Digholl_e, "d_a_obj_digholl"}, + {fpcNm_Obj_Digpl_e, "d_a_obj_digplace"}, + {fpcNm_Obj_TestCube_e, "d_a_obj_testcube"}, + {fpcNm_Obj_Kshutter_e, "d_a_obj_kshutter"}, + {fpcNm_NPC_COACH_e, "d_a_npc_coach"}, + {fpcNm_NPC_THEB_e, "d_a_npc_theB"}, + {fpcNm_COACH_FIRE_e, "d_a_coach_fire"}, + {fpcNm_COACH2D_e, "d_a_coach_2D"}, + {fpcNm_BALLOON2D_e, "d_a_balloon_2D"}, + {fpcNm_SKIP2D_e, "d_a_skip_2D"}, + {fpcNm_Obj_MvStair_e, "d_a_obj_mvstair"}, + {fpcNm_Obj_Cowdoor_e, "d_a_obj_cowdoor"}, + {fpcNm_Obj_Swpropeller_e, "d_a_obj_swpropeller"}, + {fpcNm_Obj_BoomShutter_e, "d_a_obj_bmshutter"}, + {fpcNm_NPC_KS_e, "d_a_npc_ks"}, + {fpcNm_Obj_Hfuta_e, "d_a_obj_hfuta"}, + {fpcNm_Obj_BkDoor_e, "d_a_obj_bkdoor"}, + {fpcNm_Obj_Cboard_e, "d_a_obj_cboard"}, + {fpcNm_Obj_MGate_e, "d_a_obj_mgate"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_Obj_Ikada, "d_a_obj_ikada"}, + {fpcNm_Obj_Ikada_e, "d_a_obj_ikada"}, #endif - {PROC_Obj_Ice_l, "d_a_obj_ice_l"}, - {PROC_Obj_Ice_s, "d_a_obj_ice_s"}, - {PROC_Obj_E_CREATE, "d_a_obj_enemy_create"}, - {PROC_Obj_Bhbridge, "d_a_obj_bhbridge"}, - {PROC_Obj_Kaisou, "d_a_obj_kaisou"}, - {PROC_Obj_HHASHI, "d_a_obj_hhashi"}, - {PROC_Obj_BHASHI, "d_a_obj_bhashi"}, - {PROC_OCTHASHI, "d_a_obj_octhashi"}, - {PROC_Obj_THASHI, "d_a_obj_thashi"}, - {PROC_Obj_CRVGATE, "d_a_obj_crvgate"}, - {PROC_Obj_CRVFENCE, "d_a_obj_crvfence"}, - {PROC_Obj_CRVHAHEN, "d_a_obj_crvhahen"}, - {PROC_Obj_CRVSTEEL, "d_a_obj_crvsteel"}, - {PROC_Obj_CRVLH_UP, "d_a_obj_crvlh_up"}, - {PROC_Obj_CRVLH_DW, "d_a_obj_crvlh_down"}, - {PROC_Obj_RIVERROCK, "d_a_obj_riverrock"}, - {PROC_Obj_DUST, "d_a_obj_dust"}, - {PROC_Obj_ITA, "d_a_obj_ita"}, - {PROC_Obj_Window, "d_a_obj_window"}, - {PROC_Obj_MetalBox, "d_a_obj_metalbox"}, - {PROC_Obj_BBox, "d_a_obj_bbox"}, - {PROC_OBJ_MSIMA, "d_a_obj_msima"}, - {PROC_OBJ_MYOGAN, "d_a_obj_myogan"}, - {PROC_B_ZANTS, "d_a_b_zant_sima"}, - {PROC_Obj_ChainBlock, "d_a_obj_cblock"}, - {PROC_Obj_ChainWall, "d_a_obj_cwall"}, - {PROC_Obj_KkrGate, "d_a_obj_kgate"}, - {PROC_Obj_RiderGate, "d_a_obj_rgate"}, - {PROC_Obj_Onsen, "d_a_obj_onsen"}, - {PROC_Obj_Chest, "d_a_obj_chest"}, - {PROC_Obj_Bemos, "d_a_obj_bemos"}, - {PROC_Obj_RopeBridge, "d_a_obj_rope_bridge"}, - {PROC_Obj_WellCover, "d_a_obj_well_cover"}, - {PROC_Obj_GraveStone, "d_a_obj_grave_stone"}, - {PROC_Obj_ZraRock, "d_a_obj_zra_rock"}, - {PROC_Obj_GraRock, "d_a_obj_gra_rock"}, - {PROC_Obj_GrzRock, "d_a_obj_grz_rock"}, - {PROC_GRA_WALL, "d_a_obj_graWall"}, - {PROC_OBJ_ONSEN_FIRE, "d_a_obj_onsenFire"}, - {PROC_Obj_Lv6bemos, "d_a_obj_lv6bemos"}, - {PROC_Obj_Lv6bemos2, "d_a_obj_lv6bemos2"}, - {PROC_Obj_BarDesk, "d_a_obj_barDesk"}, - {PROC_Obj_DigSnow, "d_a_obj_digsnow"}, - {PROC_Obj_Ytaihou, "d_a_obj_Y_taihou"}, - {PROC_Obj_Elevator, "d_a_obj_dmelevator"}, - {PROC_Obj_Lv6TogeRoll, "d_a_obj_lv6TogeRoll"}, - {PROC_Obj_Lv6TogeTrap, "d_a_obj_lv6TogeTrap"}, - {PROC_Obj_Lv6Tenbin, "d_a_obj_lv6Tenbin"}, - {PROC_Obj_Lv6SwGate, "d_a_obj_lv6SwGate"}, - {PROC_Obj_Lv6Lblock, "d_a_obj_lv6Lblock"}, - {PROC_Obj_Lv6ChgGate, "d_a_obj_lv6ChangeGate"}, - {PROC_Obj_Lv6FuriTrap, "d_a_obj_lv6FurikoTrap"}, - {PROC_Obj_Lv6SzGate, "d_a_obj_lv6SzGate"}, - {PROC_Obj_Lv4EdShutter, "d_a_obj_lv4EdShutter"}, - {PROC_Obj_Lv4Gate, "d_a_obj_lv4Gate"}, - {PROC_Obj_Lv4PoGate, "d_a_obj_lv4PoGate"}, - {PROC_Obj_Lv4SlideWall, "d_a_obj_lv4SlideWall"}, - {PROC_Obj_Lv4HsTarget, "d_a_obj_lv4HsTarget"}, - {PROC_Obj_Lv7PropY, "d_a_obj_lv7PropellerY"}, - {PROC_Obj_Lv7BsGate, "d_a_obj_lv7BsGate"}, - {PROC_Obj_Lv8OptiLift, "d_a_obj_lv8OptiLift"}, - {PROC_Obj_Lv8KekkaiTrap, "d_a_obj_lv8KekkaiTrap"}, - {PROC_Obj_Lv8Lift, "d_a_obj_lv8Lift"}, - {PROC_Obj_Lv8UdFloor, "d_a_obj_lv8UdFloor"}, - {PROC_Obj_Lv9SwShutter, "d_a_obj_lv9SwShutter"}, - {PROC_Obj_TobyHouse, "d_a_obj_tobyhouse"}, - {PROC_Obj_poCandle, "d_a_obj_poCandle"}, - {PROC_Obj_Lv4DigSand, "d_a_obj_lv4digsand"}, - {PROC_Obj_FallObj, "d_a_obj_fallobj"}, - {PROC_Obj_SmgDoor, "d_a_obj_smgdoor"}, - {PROC_Obj_SwLight, "d_a_obj_swLight"}, - {PROC_Obj_Avalanche, "d_a_obj_avalanche"}, - {PROC_Obj_MirrorScrew, "d_a_obj_mirror_screw"}, - {PROC_Obj_MirrorSand, "d_a_obj_mirror_sand"}, - {PROC_Obj_MirrorTable, "d_a_obj_mirror_table"}, - {PROC_Obj_MirrorChain, "d_a_obj_mirror_chain"}, - {PROC_Obj_Mirror6Pole, "d_a_obj_mirror_6pole"}, - {PROC_Obj_SwSpinner, "d_a_obj_swspinner"}, - {PROC_Obj_TDoor, "d_a_obj_thdoor"}, - {PROC_Obj_Lv7Bridge, "d_a_obj_lv7bridge"}, - {PROC_Obj_zrTurara, "d_a_obj_zrTurara"}, - {PROC_Obj_TakaraDai, "d_a_obj_takaraDai"}, - {PROC_Obj_Table, "d_a_obj_table"}, - {PROC_Obj_CatDoor, "d_a_obj_catdoor"}, - {PROC_Obj_Gake, "d_a_obj_tgake"}, - {PROC_CSTAF, "d_a_cstaF"}, - {PROC_Obj_Lv4RailWall, "d_a_obj_lv4RailWall"}, - {PROC_Obj_Lv4Sand, "d_a_obj_lv4sand"}, - {PROC_Obj_PushDoor, "d_a_obj_pdoor"}, - {PROC_PushDoor, "d_a_door_push"}, - {PROC_Obj_GanonWall2, "d_a_obj_ganonwall2"}, - {PROC_Obj_Lv4Bridge, "d_a_obj_lv4bridge"}, - {PROC_Obj_Lv4Floor, "d_a_obj_lv4floor"}, - {PROC_Tag_Spinner, "d_a_tag_spinner"}, - {PROC_Obj_SwHang, "d_a_obj_swhang"}, - {PROC_Obj_RotStair, "d_a_obj_rstair"}, - {PROC_Obj_MagneArm, "d_a_obj_magne_arm"}, - {PROC_Obj_KWheel00, "d_a_obj_kwheel00"}, - {PROC_Obj_KWheel01, "d_a_obj_kwheel01"}, - {PROC_Obj_Ychndlr, "d_a_obj_lv5ychndlr"}, - {PROC_Obj_PRElvtr, "d_a_obj_lv4prelvtr"}, - {PROC_Obj_MHasu, "d_a_obj_hasu2"}, - {PROC_Obj_YIblltray, "d_a_obj_lv5yiblltray"}, - {PROC_Obj_Lv6EGate, "d_a_obj_lv6egate"}, - {PROC_Obj_PDtile, "d_a_obj_pdtile"}, - {PROC_Obj_PDwall, "d_a_obj_pdwall"}, - {PROC_Obj_Lv4PRwall, "d_a_obj_lv4prwall"}, - {PROC_Obj_KLift00, "d_a_obj_klift00"}, - {PROC_B_OH, "d_a_b_oh"}, - {PROC_Obj_Lv4Chan, "d_a_obj_lv4chandelier"}, - {PROC_Obj_Lv3R10Saka, "d_a_obj_lv3saka00"}, - {PROC_Obj_Lv3Water, "d_a_obj_lv3Water"}, - {PROC_Obj_Lv3Water2, "d_a_obj_lv3Water2"}, - {PROC_OBJ_LV3WATERB, "d_a_obj_lv3WaterB"}, - {PROC_Obj_HBombkoya, "d_a_obj_hbombkoya"}, - {PROC_Obj_SZbridge, "d_a_obj_szbridge"}, - {PROC_Obj_KakarikoBrg, "d_a_obj_warp_kbrg"}, - {PROC_Obj_OrdinBrg, "d_a_obj_warp_obrg"}, - {PROC_Obj_BurnBox, "d_a_obj_burnbox"}, - {PROC_Obj_KJgjs, "d_a_obj_kjgjs"}, - {PROC_OBJ_IHASI, "d_a_obj_ihasi"}, - {PROC_Obj_IceBlock, "d_a_obj_iceblock"}, - {PROC_Obj_VolcanicBall, "d_a_obj_volcball"}, - {PROC_Obj_VolcanicBomb, "d_a_obj_volcbom"}, - {PROC_Obj_VolcGnd, "d_a_obj_vground"}, - {PROC_Obj_KKanban, "d_a_obj_kkanban"}, - {PROC_E_PH, "d_a_e_ph"}, - {PROC_NPC_ZRA, "d_a_npc_zra"}, - {PROC_Obj_Chandelier, "d_a_obj_chandelier"}, - {PROC_Obj_Stopper2, "d_a_obj_stopper2"}, - {PROC_DOOR20, "d_a_door_shutter"}, - {PROC_Tag_Hinit, "d_a_tag_hinit"}, - {PROC_Tag_Hjump, "d_a_tag_hjump"}, - {PROC_Tag_AJnot, "d_a_tag_ajnot"}, - {PROC_Tag_Hstop, "d_a_tag_hstop"}, - {PROC_CANOE, "d_a_canoe"}, - {PROC_HORSE, "d_a_horse"}, - {PROC_E_WB, "d_a_e_wb"}, - {PROC_OBJ_ITO, "d_a_obj_ito"}, - {PROC_OBJ_SW, "d_a_obj_sw"}, - {PROC_SPINNER, "d_a_spinner"}, - {PROC_B_OB, "d_a_b_ob"}, - {PROC_KAGO, "d_a_kago"}, - {PROC_E_YC, "d_a_e_yc"}, - {PROC_B_DS, "d_a_b_ds"}, - {PROC_B_DR, "d_a_b_dr"}, - {PROC_B_ZANTZ, "d_a_b_zant_mobile"}, - {PROC_B_ZANT, "d_a_b_zant"}, - {PROC_B_ZANTM, "d_a_b_zant_magic"}, - {PROC_TBOX, "d_a_tbox"}, - {PROC_TBOX2, "d_a_tbox2"}, - {PROC_BOOMERANG, "d_a_boomerang"}, - {PROC_MIDNA, "d_a_midna"}, - {PROC_NPC_TK, "d_a_npc_tk"}, - {PROC_NPC_WORM, "d_a_npc_worm"}, - {PROC_PPolamp, "d_a_ppolamp"}, - {PROC_BkyRock, "d_a_obj_bky_rock"}, - {PROC_HITOBJ, "d_a_hitobj"}, - {PROC_EP, "d_a_ep"}, - {PROC_COW, "d_a_cow"}, - {PROC_PERU, "d_a_peru"}, - {PROC_NI, "d_a_ni"}, - {PROC_NPC_TKJ2, "d_a_npc_tkj2"}, - {PROC_SQ, "d_a_sq"}, - {PROC_NPC_SQ, "d_a_npc_sq"}, - {PROC_DO, "d_a_do"}, - {PROC_NPC_NE, "d_a_npc_ne"}, - {PROC_NPC_TR, "d_a_npc_tr"}, - {PROC_NPC_LF, "d_a_npc_lf"}, - {PROC_OBJ_FOOD, "d_a_obj_food"}, - {PROC_OBJ_KI, "d_a_obj_ki"}, - {PROC_OBJ_KITA, "d_a_obj_kita"}, - {PROC_OBJ_KEY, "d_a_obj_key"}, - {PROC_OBJ_KEYHOLE, "d_a_obj_keyhole"}, - {PROC_Obj_Lv5Key, "d_a_obj_Lv5Key"}, - {PROC_OBJ_LP, "d_a_obj_lp"}, - {PROC_OBJ_TATIGI, "d_a_obj_tatigi"}, - {PROC_OBJ_ROCK, "d_a_obj_rock"}, - {PROC_OBJ_WFLAG, "d_a_obj_wflag"}, - {PROC_OBJ_KAGE, "d_a_obj_kage"}, - {PROC_OBJ_KANBAN2, "d_a_obj_kanban2"}, - {PROC_OBJ_BALLOON, "d_a_obj_balloon"}, - {PROC_OBJ_SUISYA, "d_a_obj_suisya"}, - {PROC_OBJ_OILTUBO, "d_a_obj_oiltubo"}, - {PROC_OBJ_ROTEN, "d_a_obj_roten"}, - {PROC_OBJ_SSDRINK, "d_a_obj_ss_drink"}, - {PROC_OBJ_SSITEM, "d_a_obj_ss_item"}, - {PROC_TAG_SSDRINK, "d_a_tag_ss_drink"}, - {PROC_TAG_BTLITM, "d_a_tag_bottle_item"}, - {PROC_TAG_LV5SOUP, "d_a_tag_lv5soup"}, - {PROC_TAG_MNLIGHT, "d_a_tag_myna_light"}, - {PROC_TAG_SHOPCAM, "d_a_tag_shop_camera"}, - {PROC_TAG_SHOPITM, "d_a_tag_shop_item"}, - {PROC_OBJ_NDOOR, "d_a_obj_ndoor"}, - {PROC_OBJ_UDOOR, "d_a_obj_udoor"}, - {PROC_OBJ_USAKU, "d_a_obj_usaku"}, - {PROC_Obj_SM_DOOR, "d_a_obj_sm_door"}, - {PROC_OBJ_BED, "d_a_obj_bed"}, - {PROC_OBJ_BOUMATO, "d_a_obj_boumato"}, - {PROC_OBJ_ITAMATO, "d_a_obj_itamato"}, - {PROC_OBJ_NOUGU, "d_a_obj_nougu"}, - {PROC_OBJ_STICK, "d_a_obj_stick"}, - {PROC_OBJ_MIE, "d_a_obj_mie"}, - {PROC_OBJ_SEKIDOOR, "d_a_obj_sekidoor"}, - {PROC_OBJ_SEKIZO, "d_a_obj_sekizo"}, - {PROC_OBJ_SMTILE, "d_a_obj_smtile"}, - {PROC_NPC_FISH, "d_a_npc_fish"}, - {PROC_MG_FISH, "d_a_mg_fish"}, - {PROC_FSHOP, "d_a_mg_fshop"}, - {PROC_NPC_DU, "d_a_npc_du"}, - {PROC_DISAPPEAR, "d_a_disappear"}, - {PROC_Obj_Mato, "d_a_obj_mato"}, - {PROC_Obj_Flag, "d_a_obj_flag"}, - {PROC_Obj_Flag2, "d_a_obj_flag2"}, - {PROC_Obj_Flag3, "d_a_obj_flag3"}, - {PROC_Obj_GOMIKABE, "d_a_obj_gomikabe"}, - {PROC_Obj_Yousei, "d_a_obj_yousei"}, - {PROC_Obj_Kabuto, "d_a_obj_kabuto"}, - {PROC_Obj_Cho, "d_a_obj_cho"}, - {PROC_Obj_Kuw, "d_a_obj_kuwagata"}, - {PROC_Obj_Nan, "d_a_obj_nan"}, - {PROC_Obj_Dan, "d_a_obj_dan"}, - {PROC_Obj_Kam, "d_a_obj_kamakiri"}, - {PROC_Obj_Ten, "d_a_obj_ten"}, - {PROC_Obj_Ari, "d_a_obj_ari"}, - {PROC_Obj_Kag, "d_a_obj_kag"}, - {PROC_Obj_Batta, "d_a_obj_batta"}, - {PROC_Obj_Tombo, "d_a_obj_tombo"}, - {PROC_Obj_Kat, "d_a_obj_katatsumuri"}, - {PROC_Obj_H_Saku, "d_a_obj_h_saku"}, - {PROC_Obj_Yobikusa, "d_a_obj_yobikusa"}, - {PROC_Obj_KazeNeko, "d_a_obj_kazeneko"}, - {PROC_Obj_KznkArm, "d_a_obj_kznkarm"}, - {PROC_Obj_NamePlate, "d_a_obj_nameplate"}, - {PROC_Obj_OnCloth, "d_a_obj_ornament_cloth"}, - {PROC_Obj_LndRope, "d_a_obj_laundry_rope"}, - {PROC_Obj_ItaRope, "d_a_obj_sakuita_rope"}, - {PROC_Obj_Sakuita, "d_a_obj_sakuita"}, - {PROC_Obj_Laundry, "d_a_obj_laundry"}, - {PROC_WarpBug, "d_a_warp_bug"}, - {PROC_Izumi_Gate, "d_a_izumi_gate"}, - {PROC_Obj_Fchain, "d_a_obj_fchain"}, - {PROC_Obj_Wchain, "d_a_obj_wchain"}, - {PROC_Tag_Attp, "d_a_tag_attention"}, - {PROC_Obj_Tornado, "d_a_obj_tornado"}, - {PROC_Obj_Tornado2, "d_a_obj_tornado2"}, - {PROC_Obj_FirePillar, "d_a_obj_firepillar"}, - {PROC_Obj_FirePillar2, "d_a_obj_firepillar2"}, - {PROC_Obj_InoBone, "d_a_obj_inobone"}, - {PROC_Obj_Stopper, "d_a_obj_stopper"}, - {PROC_Obj_MHole, "d_a_obj_mhole"}, - {PROC_Tag_Magne, "d_a_tag_magne"}, - {PROC_Obj_BossWarp, "d_a_obj_bosswarp"}, - {PROC_Obj_WoodPendulum, "d_a_obj_wood_pendulum"}, - {PROC_Obj_WdStick, "d_a_obj_wdStick"}, - {PROC_Obj_StairBlock, "d_a_obj_stairBlock"}, - {PROC_Obj_Geyser, "d_a_obj_geyser"}, - {PROC_Tag_KtOnFire, "d_a_obj_ktOnFire"}, - {PROC_Obj_FireWood, "d_a_obj_fireWood"}, - {PROC_Obj_FireWood2, "d_a_obj_fireWood2"}, - {PROC_Obj_GpTaru, "d_a_obj_gpTaru"}, - {PROC_Obj_OnsenTaru, "d_a_obj_onsenTaru"}, - {PROC_Obj_KiPot, "d_a_obj_kiPot"}, - {PROC_TBOX_SW, "d_a_tboxSw"}, - {PROC_Obj_SwChain, "d_a_obj_swchain"}, - {PROC_Obj_WoodenSword, "d_a_obj_wsword"}, - {PROC_Obj_StoneMark, "d_a_obj_stoneMark"}, - {PROC_Obj_Lv3Candle, "d_a_obj_lv3Candle"}, - {PROC_Tag_Lv4Candle, "d_a_obj_lv4CandleTag"}, - {PROC_Tag_Lv4CandleDm, "d_a_obj_lv4CandleDemoTag"}, - {PROC_Obj_DamCps, "d_a_obj_damCps"}, - {PROC_Obj_Smoke, "d_a_obj_smoke"}, - {PROC_Obj_WaterFall, "d_a_obj_waterfall"}, - {PROC_Obj_ZoraCloth, "d_a_obj_zcloth"}, - {PROC_Obj_poFire, "d_a_obj_poFire"}, - {PROC_Tag_poFire, "d_a_tag_poFire"}, - {PROC_Obj_glowSphere, "d_a_obj_glowSphere"}, - {PROC_Tag_LightBall, "d_a_tag_lightball"}, - {PROC_SwLBall, "d_a_swLBall"}, - {PROC_SwBall, "d_a_swBall"}, - {PROC_Obj_WaterEff, "d_a_obj_lv3waterEff"}, - {PROC_Tag_RiverBack, "d_a_tag_river_back"}, - {PROC_Tag_KagoFall, "d_a_tag_kago_fall"}, - {PROC_Tag_Lv2PrChk, "d_a_tag_lv2prchk"}, - {PROC_Obj_Lv4Gear, "d_a_obj_lv4gear"}, - {PROC_Obj_MasterSword, "d_a_obj_master_sword"}, - {PROC_Obj_WoodStatue, "d_a_obj_wood_statue"}, - {PROC_Obj_Fan, "d_a_obj_fan"}, - {PROC_Obj_IceLeaf, "d_a_obj_iceleaf"}, - {PROC_Obj_zrTuraraRc, "d_a_obj_zrTuraraRock"}, - {PROC_Tag_RetRoom, "d_a_tag_ret_room"}, - {PROC_Obj_WindStone, "d_a_obj_wind_stone"}, - {PROC_Tag_WaraHowl, "d_a_tag_wara_howl"}, - {PROC_Obj_SCannon, "d_a_obj_scannon"}, - {PROC_Obj_SmWStone, "d_a_obj_smw_stone"}, - {PROC_Obj_SCannonCrs, "d_a_obj_scannon_crs"}, - {PROC_Tag_SnowEff, "d_a_obj_snowEffTag"}, - {PROC_Tag_CstaSw, "d_a_tag_CstaSw"}, - {PROC_Tag_Lv6CstaSw, "d_a_tag_lv6CstaSw"}, - {PROC_Obj_awaPlar, "d_a_obj_bubblePilar"}, - {PROC_Obj_poTbox, "d_a_obj_poTbox"}, - {PROC_Obj_TimeFire, "d_a_obj_timeFire"}, - {PROC_Obj_TMoon, "d_a_obj_tmoon"}, - {PROC_Obj_GanonWall, "d_a_obj_ganonwall"}, - {PROC_Obj_Prop, "d_a_obj_prop"}, - {PROC_CSTATUE, "d_a_cstatue"}, - {PROC_Obj_SwBallA, "d_a_obj_swBallA"}, - {PROC_Obj_SwBallB, "d_a_obj_swBallB"}, - {PROC_Obj_SnowSoup, "d_a_obj_snow_soup"}, - {PROC_Obj_Nagaisu, "d_a_obj_nagaisu"}, - {PROC_Obj_RCircle, "d_a_obj_rcircle"}, - {PROC_Obj_Picture, "d_a_obj_picture"}, - {PROC_Tag_SetBall, "d_a_tag_setBall"}, - {PROC_Tag_SmkEmt, "d_a_tag_smk_emt"}, - {PROC_SwTime, "d_a_swTime"}, - {PROC_Obj_HFtr, "d_a_obj_hakai_ftr"}, - {PROC_Obj_HBarrel, "d_a_obj_hakai_brl"}, - {PROC_Obj_Crystal, "d_a_obj_crystal"}, - {PROC_Obj_SCannonTen, "d_a_obj_scannon_ten"}, - {PROC_Obj_SwBallC, "d_a_obj_swBallC"}, - {PROC_SCENE_EXIT2, "d_a_scene_exit2"}, - {PROC_Obj_Hata, "d_a_obj_hata"}, - {PROC_Obj_ToaruMaki, "d_a_obj_toaru_maki"}, - {PROC_Tag_AttackItem, "d_a_tag_attack_item"}, - {PROC_Tag_RmbitSw, "d_a_tag_rmbit_sw"}, - {PROC_Obj_Sword, "d_a_obj_sword"}, - {PROC_Tag_Spring, "d_a_tag_spring"}, - {PROC_Tag_Statue, "d_a_tag_statue_evt"}, - {PROC_E_AI, "d_a_e_ai"}, - {PROC_E_GS, "d_a_e_gs"}, - {PROC_E_GOB, "d_a_e_gob"}, - {PROC_E_DD, "d_a_e_dd"}, - {PROC_E_DN, "d_a_e_dn"}, - {PROC_E_S1, "d_a_e_s1"}, - {PROC_E_MF, "d_a_e_mf"}, - {PROC_E_SG, "d_a_e_sg"}, - {PROC_E_BS, "d_a_e_bs"}, - {PROC_E_SF, "d_a_e_sf"}, - {PROC_E_SH, "d_a_e_sh"}, - {PROC_E_DF, "d_a_e_df"}, - {PROC_E_GM, "d_a_e_gm"}, - {PROC_E_MD, "d_a_e_md"}, - {PROC_E_SM, "d_a_e_sm"}, - {PROC_E_SM2, "d_a_e_sm2"}, - {PROC_E_ST, "d_a_e_st"}, - {PROC_E_ST_LINE, "d_a_e_st_line"}, - {PROC_E_SB, "d_a_e_sb"}, - {PROC_E_TH, "d_a_e_th"}, - {PROC_E_CR, "d_a_e_cr"}, - {PROC_E_CR_EGG, "d_a_e_cr_egg"}, - {PROC_E_DB, "d_a_e_db"}, - {PROC_E_DB_LEAF, "d_a_e_db_leaf"}, - {PROC_E_GA, "d_a_e_ga"}, - {PROC_E_GB, "d_a_e_gb"}, - {PROC_E_HB, "d_a_e_hb"}, - {PROC_E_HB_LEAF, "d_a_e_hb_leaf"}, - {PROC_E_HZELDA, "d_a_e_hzelda"}, - {PROC_E_YD, "d_a_e_yd"}, - {PROC_E_YH, "d_a_e_yh"}, - {PROC_E_YD_LEAF, "d_a_e_yd_leaf"}, - {PROC_E_HM, "d_a_e_hm"}, - {PROC_E_TK, "d_a_e_tk"}, - {PROC_E_TK2, "d_a_e_tk2"}, - {PROC_E_TK_BALL, "d_a_e_tk_ball"}, - {PROC_E_RB, "d_a_e_rb"}, - {PROC_E_RD, "d_a_e_rd"}, - {PROC_E_RDB, "d_a_e_rdb"}, - {PROC_E_RDY, "d_a_e_rdy"}, - {PROC_E_FM, "d_a_e_fm"}, - {PROC_E_FS, "d_a_e_fs"}, - {PROC_E_PM, "d_a_e_pm"}, - {PROC_E_PO, "d_a_e_po"}, - {PROC_E_MB, "d_a_e_mb"}, - {PROC_E_MK, "d_a_e_mk"}, - {PROC_E_MM, "d_a_e_mm"}, - {PROC_E_FZ, "d_a_e_fz"}, - {PROC_E_ZS, "d_a_e_zs"}, - {PROC_E_KK, "d_a_e_kk"}, - {PROC_E_HP, "d_a_e_hp"}, - {PROC_E_ZH, "d_a_e_zh"}, - {PROC_E_ZM, "d_a_e_zm"}, - {PROC_E_PZ, "d_a_e_pz"}, - {PROC_E_FB, "d_a_e_fb"}, - {PROC_E_FK, "d_a_e_fk"}, - {PROC_E_MS, "d_a_e_ms"}, - {PROC_E_NEST, "d_a_e_nest"}, - {PROC_E_NZ, "d_a_e_nz"}, - {PROC_E_BA, "d_a_e_ba"}, - {PROC_E_BU, "d_a_e_bu"}, - {PROC_E_BUG, "d_a_e_bug"}, - {PROC_E_BEE, "d_a_e_bee"}, - {PROC_E_IS, "d_a_e_is"}, - {PROC_E_KG, "d_a_e_kg"}, - {PROC_E_KR, "d_a_e_kr"}, - {PROC_E_SW, "d_a_e_sw"}, - {PROC_E_GE, "d_a_e_ge"}, - {PROC_Tag_WatchGe, "d_a_tag_watchge"}, - {PROC_E_YM, "d_a_e_ym"}, - {PROC_E_YM_TAG, "d_a_e_ym_tag"}, - {PROC_E_YMB, "d_a_e_ymb"}, - {PROC_Tag_FWall, "d_a_tag_firewall"}, - {PROC_Tag_WaterFall, "d_a_tag_waterfall"}, - {PROC_E_YK, "d_a_e_yk"}, - {PROC_E_YR, "d_a_e_yr"}, - {PROC_E_YG, "d_a_e_yg"}, - {PROC_E_HZ, "d_a_e_hz"}, - {PROC_E_WS, "d_a_e_ws"}, - {PROC_E_OC, "d_a_e_oc"}, - {PROC_E_OT, "d_a_e_ot"}, - {PROC_E_DT, "d_a_e_dt"}, - {PROC_E_BG, "d_a_e_bg"}, - {PROC_E_OctBg, "d_a_e_oct_bg"}, - {PROC_DR, "d_a_L7demo_dr"}, - {PROC_L7lowDr, "d_a_L7low_dr"}, - {PROC_L7ODR, "d_a_L7op_demo_dr"}, - {PROC_E_TT, "d_a_e_tt"}, - {PROC_E_DK, "d_a_e_dk"}, - {PROC_E_VT, "d_a_e_vt"}, - {PROC_E_WW, "d_a_e_ww"}, - {PROC_E_GI, "d_a_e_gi"}, - {PROC_B_BH, "d_a_b_bh"}, - {PROC_B_BQ, "d_a_b_bq"}, - {PROC_B_GM, "d_a_b_gm"}, - {PROC_B_GND, "d_a_b_gnd"}, - {PROC_B_GO, "d_a_b_go"}, - {PROC_B_OH2, "d_a_b_oh2"}, - {PROC_B_YO, "d_a_b_yo"}, - {PROC_B_YOI, "d_a_b_yo_ice"}, - {PROC_B_TN, "d_a_b_tn"}, - {PROC_B_GG, "d_a_b_gg"}, - {PROC_B_DRE, "d_a_b_dre"}, - {PROC_B_MGN, "d_a_b_mgn"}, - {PROC_E_WAP, "d_a_e_warpappear"}, - {PROC_Obj_SmallKey, "d_a_obj_smallkey"}, - {PROC_Obj_Kantera, "d_a_obj_kantera"}, - {PROC_Obj_LifeContainer, "d_a_obj_life_container"}, - {PROC_Obj_Shield, "d_a_obj_shield"}, - {PROC_Demo_Item, "d_a_demo_item"}, + {fpcNm_Obj_Ice_l_e, "d_a_obj_ice_l"}, + {fpcNm_Obj_Ice_s_e, "d_a_obj_ice_s"}, + {fpcNm_Obj_E_CREATE_e, "d_a_obj_enemy_create"}, + {fpcNm_Obj_Bhbridge_e, "d_a_obj_bhbridge"}, + {fpcNm_Obj_Kaisou_e, "d_a_obj_kaisou"}, + {fpcNm_Obj_HHASHI_e, "d_a_obj_hhashi"}, + {fpcNm_Obj_BHASHI_e, "d_a_obj_bhashi"}, + {fpcNm_OCTHASHI_e, "d_a_obj_octhashi"}, + {fpcNm_Obj_THASHI_e, "d_a_obj_thashi"}, + {fpcNm_Obj_CRVGATE_e, "d_a_obj_crvgate"}, + {fpcNm_Obj_CRVFENCE_e, "d_a_obj_crvfence"}, + {fpcNm_Obj_CRVHAHEN_e, "d_a_obj_crvhahen"}, + {fpcNm_Obj_CRVSTEEL_e, "d_a_obj_crvsteel"}, + {fpcNm_Obj_CRVLH_UP_e, "d_a_obj_crvlh_up"}, + {fpcNm_Obj_CRVLH_DW_e, "d_a_obj_crvlh_down"}, + {fpcNm_Obj_RIVERROCK_e, "d_a_obj_riverrock"}, + {fpcNm_Obj_DUST_e, "d_a_obj_dust"}, + {fpcNm_Obj_ITA_e, "d_a_obj_ita"}, + {fpcNm_Obj_Window_e, "d_a_obj_window"}, + {fpcNm_Obj_MetalBox_e, "d_a_obj_metalbox"}, + {fpcNm_Obj_BBox_e, "d_a_obj_bbox"}, + {fpcNm_OBJ_MSIMA_e, "d_a_obj_msima"}, + {fpcNm_OBJ_MYOGAN_e, "d_a_obj_myogan"}, + {fpcNm_B_ZANTS_e, "d_a_b_zant_sima"}, + {fpcNm_Obj_ChainBlock_e, "d_a_obj_cblock"}, + {fpcNm_Obj_ChainWall_e, "d_a_obj_cwall"}, + {fpcNm_Obj_KkrGate_e, "d_a_obj_kgate"}, + {fpcNm_Obj_RiderGate_e, "d_a_obj_rgate"}, + {fpcNm_Obj_Onsen_e, "d_a_obj_onsen"}, + {fpcNm_Obj_Chest_e, "d_a_obj_chest"}, + {fpcNm_Obj_Bemos_e, "d_a_obj_bemos"}, + {fpcNm_Obj_RopeBridge_e, "d_a_obj_rope_bridge"}, + {fpcNm_Obj_WellCover_e, "d_a_obj_well_cover"}, + {fpcNm_Obj_GraveStone_e, "d_a_obj_grave_stone"}, + {fpcNm_Obj_ZraRock_e, "d_a_obj_zra_rock"}, + {fpcNm_Obj_GraRock_e, "d_a_obj_gra_rock"}, + {fpcNm_Obj_GrzRock_e, "d_a_obj_grz_rock"}, + {fpcNm_GRA_WALL_e, "d_a_obj_graWall"}, + {fpcNm_OBJ_ONSEN_FIRE_e, "d_a_obj_onsenFire"}, + {fpcNm_Obj_Lv6bemos_e, "d_a_obj_lv6bemos"}, + {fpcNm_Obj_Lv6bemos2_e, "d_a_obj_lv6bemos2"}, + {fpcNm_Obj_BarDesk_e, "d_a_obj_barDesk"}, + {fpcNm_Obj_DigSnow_e, "d_a_obj_digsnow"}, + {fpcNm_Obj_Ytaihou_e, "d_a_obj_Y_taihou"}, + {fpcNm_Obj_Elevator_e, "d_a_obj_dmelevator"}, + {fpcNm_Obj_Lv6TogeRoll_e, "d_a_obj_lv6TogeRoll"}, + {fpcNm_Obj_Lv6TogeTrap_e, "d_a_obj_lv6TogeTrap"}, + {fpcNm_Obj_Lv6Tenbin_e, "d_a_obj_lv6Tenbin"}, + {fpcNm_Obj_Lv6SwGate_e, "d_a_obj_lv6SwGate"}, + {fpcNm_Obj_Lv6Lblock_e, "d_a_obj_lv6Lblock"}, + {fpcNm_Obj_Lv6ChgGate_e, "d_a_obj_lv6ChangeGate"}, + {fpcNm_Obj_Lv6FuriTrap_e, "d_a_obj_lv6FurikoTrap"}, + {fpcNm_Obj_Lv6SzGate_e, "d_a_obj_lv6SzGate"}, + {fpcNm_Obj_Lv4EdShutter_e, "d_a_obj_lv4EdShutter"}, + {fpcNm_Obj_Lv4Gate_e, "d_a_obj_lv4Gate"}, + {fpcNm_Obj_Lv4PoGate_e, "d_a_obj_lv4PoGate"}, + {fpcNm_Obj_Lv4SlideWall_e, "d_a_obj_lv4SlideWall"}, + {fpcNm_Obj_Lv4HsTarget_e, "d_a_obj_lv4HsTarget"}, + {fpcNm_Obj_Lv7PropY_e, "d_a_obj_lv7PropellerY"}, + {fpcNm_Obj_Lv7BsGate_e, "d_a_obj_lv7BsGate"}, + {fpcNm_Obj_Lv8OptiLift_e, "d_a_obj_lv8OptiLift"}, + {fpcNm_Obj_Lv8KekkaiTrap_e, "d_a_obj_lv8KekkaiTrap"}, + {fpcNm_Obj_Lv8Lift_e, "d_a_obj_lv8Lift"}, + {fpcNm_Obj_Lv8UdFloor_e, "d_a_obj_lv8UdFloor"}, + {fpcNm_Obj_Lv9SwShutter_e, "d_a_obj_lv9SwShutter"}, + {fpcNm_Obj_TobyHouse_e, "d_a_obj_tobyhouse"}, + {fpcNm_Obj_poCandle_e, "d_a_obj_poCandle"}, + {fpcNm_Obj_Lv4DigSand_e, "d_a_obj_lv4digsand"}, + {fpcNm_Obj_FallObj_e, "d_a_obj_fallobj"}, + {fpcNm_Obj_SmgDoor_e, "d_a_obj_smgdoor"}, + {fpcNm_Obj_SwLight_e, "d_a_obj_swLight"}, + {fpcNm_Obj_Avalanche_e, "d_a_obj_avalanche"}, + {fpcNm_Obj_MirrorScrew_e, "d_a_obj_mirror_screw"}, + {fpcNm_Obj_MirrorSand_e, "d_a_obj_mirror_sand"}, + {fpcNm_Obj_MirrorTable_e, "d_a_obj_mirror_table"}, + {fpcNm_Obj_MirrorChain_e, "d_a_obj_mirror_chain"}, + {fpcNm_Obj_Mirror6Pole_e, "d_a_obj_mirror_6pole"}, + {fpcNm_Obj_SwSpinner_e, "d_a_obj_swspinner"}, + {fpcNm_Obj_TDoor_e, "d_a_obj_thdoor"}, + {fpcNm_Obj_Lv7Bridge_e, "d_a_obj_lv7bridge"}, + {fpcNm_Obj_zrTurara_e, "d_a_obj_zrTurara"}, + {fpcNm_Obj_TakaraDai_e, "d_a_obj_takaraDai"}, + {fpcNm_Obj_Table_e, "d_a_obj_table"}, + {fpcNm_Obj_CatDoor_e, "d_a_obj_catdoor"}, + {fpcNm_Obj_Gake_e, "d_a_obj_tgake"}, + {fpcNm_CSTAF_e, "d_a_cstaF"}, + {fpcNm_Obj_Lv4RailWall_e, "d_a_obj_lv4RailWall"}, + {fpcNm_Obj_Lv4Sand_e, "d_a_obj_lv4sand"}, + {fpcNm_Obj_PushDoor_e, "d_a_obj_pdoor"}, + {fpcNm_PushDoor_e, "d_a_door_push"}, + {fpcNm_Obj_GanonWall2_e, "d_a_obj_ganonwall2"}, + {fpcNm_Obj_Lv4Bridge_e, "d_a_obj_lv4bridge"}, + {fpcNm_Obj_Lv4Floor_e, "d_a_obj_lv4floor"}, + {fpcNm_Tag_Spinner_e, "d_a_tag_spinner"}, + {fpcNm_Obj_SwHang_e, "d_a_obj_swhang"}, + {fpcNm_Obj_RotStair_e, "d_a_obj_rstair"}, + {fpcNm_Obj_MagneArm_e, "d_a_obj_magne_arm"}, + {fpcNm_Obj_KWheel00_e, "d_a_obj_kwheel00"}, + {fpcNm_Obj_KWheel01_e, "d_a_obj_kwheel01"}, + {fpcNm_Obj_Ychndlr_e, "d_a_obj_lv5ychndlr"}, + {fpcNm_Obj_PRElvtr_e, "d_a_obj_lv4prelvtr"}, + {fpcNm_Obj_MHasu_e, "d_a_obj_hasu2"}, + {fpcNm_Obj_YIblltray_e, "d_a_obj_lv5yiblltray"}, + {fpcNm_Obj_Lv6EGate_e, "d_a_obj_lv6egate"}, + {fpcNm_Obj_PDtile_e, "d_a_obj_pdtile"}, + {fpcNm_Obj_PDwall_e, "d_a_obj_pdwall"}, + {fpcNm_Obj_Lv4PRwall_e, "d_a_obj_lv4prwall"}, + {fpcNm_Obj_KLift00_e, "d_a_obj_klift00"}, + {fpcNm_B_OH_e, "d_a_b_oh"}, + {fpcNm_Obj_Lv4Chan_e, "d_a_obj_lv4chandelier"}, + {fpcNm_Obj_Lv3R10Saka_e, "d_a_obj_lv3saka00"}, + {fpcNm_Obj_Lv3Water_e, "d_a_obj_lv3Water"}, + {fpcNm_Obj_Lv3Water2_e, "d_a_obj_lv3Water2"}, + {fpcNm_OBJ_LV3WATERB_e, "d_a_obj_lv3WaterB"}, + {fpcNm_Obj_HBombkoya_e, "d_a_obj_hbombkoya"}, + {fpcNm_Obj_SZbridge_e, "d_a_obj_szbridge"}, + {fpcNm_Obj_KakarikoBrg_e, "d_a_obj_warp_kbrg"}, + {fpcNm_Obj_OrdinBrg_e, "d_a_obj_warp_obrg"}, + {fpcNm_Obj_BurnBox_e, "d_a_obj_burnbox"}, + {fpcNm_Obj_KJgjs_e, "d_a_obj_kjgjs"}, + {fpcNm_OBJ_IHASI_e, "d_a_obj_ihasi"}, + {fpcNm_Obj_IceBlock_e, "d_a_obj_iceblock"}, + {fpcNm_Obj_VolcanicBall_e, "d_a_obj_volcball"}, + {fpcNm_Obj_VolcanicBomb_e, "d_a_obj_volcbom"}, + {fpcNm_Obj_VolcGnd_e, "d_a_obj_vground"}, + {fpcNm_Obj_KKanban_e, "d_a_obj_kkanban"}, + {fpcNm_E_PH_e, "d_a_e_ph"}, + {fpcNm_NPC_ZRA_e, "d_a_npc_zra"}, + {fpcNm_Obj_Chandelier_e, "d_a_obj_chandelier"}, + {fpcNm_Obj_Stopper2_e, "d_a_obj_stopper2"}, + {fpcNm_DOOR20_e, "d_a_door_shutter"}, + {fpcNm_Tag_Hinit_e, "d_a_tag_hinit"}, + {fpcNm_Tag_Hjump_e, "d_a_tag_hjump"}, + {fpcNm_Tag_AJnot_e, "d_a_tag_ajnot"}, + {fpcNm_Tag_Hstop_e, "d_a_tag_hstop"}, + {fpcNm_CANOE_e, "d_a_canoe"}, + {fpcNm_HORSE_e, "d_a_horse"}, + {fpcNm_E_WB_e, "d_a_e_wb"}, + {fpcNm_OBJ_ITO_e, "d_a_obj_ito"}, + {fpcNm_OBJ_SW_e, "d_a_obj_sw"}, + {fpcNm_SPINNER_e, "d_a_spinner"}, + {fpcNm_B_OB_e, "d_a_b_ob"}, + {fpcNm_KAGO_e, "d_a_kago"}, + {fpcNm_E_YC_e, "d_a_e_yc"}, + {fpcNm_B_DS_e, "d_a_b_ds"}, + {fpcNm_B_DR_e, "d_a_b_dr"}, + {fpcNm_B_ZANTZ_e, "d_a_b_zant_mobile"}, + {fpcNm_B_ZANT_e, "d_a_b_zant"}, + {fpcNm_B_ZANTM_e, "d_a_b_zant_magic"}, + {fpcNm_TBOX_e, "d_a_tbox"}, + {fpcNm_TBOX2_e, "d_a_tbox2"}, + {fpcNm_BOOMERANG_e, "d_a_boomerang"}, + {fpcNm_MIDNA_e, "d_a_midna"}, + {fpcNm_NPC_TK_e, "d_a_npc_tk"}, + {fpcNm_NPC_WORM_e, "d_a_npc_worm"}, + {fpcNm_PPolamp_e, "d_a_ppolamp"}, + {fpcNm_BkyRock_e, "d_a_obj_bky_rock"}, + {fpcNm_HITOBJ_e, "d_a_hitobj"}, + {fpcNm_EP_e, "d_a_ep"}, + {fpcNm_COW_e, "d_a_cow"}, + {fpcNm_PERU_e, "d_a_peru"}, + {fpcNm_NI_e, "d_a_ni"}, + {fpcNm_NPC_TKJ2_e, "d_a_npc_tkj2"}, + {fpcNm_SQ_e, "d_a_sq"}, + {fpcNm_NPC_SQ_e, "d_a_npc_sq"}, + {fpcNm_DO_e, "d_a_do"}, + {fpcNm_NPC_NE_e, "d_a_npc_ne"}, + {fpcNm_NPC_TR_e, "d_a_npc_tr"}, + {fpcNm_NPC_LF_e, "d_a_npc_lf"}, + {fpcNm_OBJ_FOOD_e, "d_a_obj_food"}, + {fpcNm_OBJ_KI_e, "d_a_obj_ki"}, + {fpcNm_OBJ_KITA_e, "d_a_obj_kita"}, + {fpcNm_OBJ_KEY_e, "d_a_obj_key"}, + {fpcNm_OBJ_KEYHOLE_e, "d_a_obj_keyhole"}, + {fpcNm_Obj_Lv5Key_e, "d_a_obj_Lv5Key"}, + {fpcNm_OBJ_LP_e, "d_a_obj_lp"}, + {fpcNm_OBJ_TATIGI_e, "d_a_obj_tatigi"}, + {fpcNm_OBJ_ROCK_e, "d_a_obj_rock"}, + {fpcNm_OBJ_WFLAG_e, "d_a_obj_wflag"}, + {fpcNm_OBJ_KAGE_e, "d_a_obj_kage"}, + {fpcNm_OBJ_KANBAN2_e, "d_a_obj_kanban2"}, + {fpcNm_OBJ_BALLOON_e, "d_a_obj_balloon"}, + {fpcNm_OBJ_SUISYA_e, "d_a_obj_suisya"}, + {fpcNm_OBJ_OILTUBO_e, "d_a_obj_oiltubo"}, + {fpcNm_OBJ_ROTEN_e, "d_a_obj_roten"}, + {fpcNm_OBJ_SSDRINK_e, "d_a_obj_ss_drink"}, + {fpcNm_OBJ_SSITEM_e, "d_a_obj_ss_item"}, + {fpcNm_TAG_SSDRINK_e, "d_a_tag_ss_drink"}, + {fpcNm_TAG_BTLITM_e, "d_a_tag_bottle_item"}, + {fpcNm_TAG_LV5SOUP_e, "d_a_tag_lv5soup"}, + {fpcNm_TAG_MNLIGHT_e, "d_a_tag_myna_light"}, + {fpcNm_TAG_SHOPCAM_e, "d_a_tag_shop_camera"}, + {fpcNm_TAG_SHOPITM_e, "d_a_tag_shop_item"}, + {fpcNm_OBJ_NDOOR_e, "d_a_obj_ndoor"}, + {fpcNm_OBJ_UDOOR_e, "d_a_obj_udoor"}, + {fpcNm_OBJ_USAKU_e, "d_a_obj_usaku"}, + {fpcNm_Obj_SM_DOOR_e, "d_a_obj_sm_door"}, + {fpcNm_OBJ_BED_e, "d_a_obj_bed"}, + {fpcNm_OBJ_BOUMATO_e, "d_a_obj_boumato"}, + {fpcNm_OBJ_ITAMATO_e, "d_a_obj_itamato"}, + {fpcNm_OBJ_NOUGU_e, "d_a_obj_nougu"}, + {fpcNm_OBJ_STICK_e, "d_a_obj_stick"}, + {fpcNm_OBJ_MIE_e, "d_a_obj_mie"}, + {fpcNm_OBJ_SEKIDOOR_e, "d_a_obj_sekidoor"}, + {fpcNm_OBJ_SEKIZO_e, "d_a_obj_sekizo"}, + {fpcNm_OBJ_SMTILE_e, "d_a_obj_smtile"}, + {fpcNm_NPC_FISH_e, "d_a_npc_fish"}, + {fpcNm_MG_FISH_e, "d_a_mg_fish"}, + {fpcNm_FSHOP_e, "d_a_mg_fshop"}, + {fpcNm_NPC_DU_e, "d_a_npc_du"}, + {fpcNm_DISAPPEAR_e, "d_a_disappear"}, + {fpcNm_Obj_Mato_e, "d_a_obj_mato"}, + {fpcNm_Obj_Flag_e, "d_a_obj_flag"}, + {fpcNm_Obj_Flag2_e, "d_a_obj_flag2"}, + {fpcNm_Obj_Flag3_e, "d_a_obj_flag3"}, + {fpcNm_Obj_GOMIKABE_e, "d_a_obj_gomikabe"}, + {fpcNm_Obj_Yousei_e, "d_a_obj_yousei"}, + {fpcNm_Obj_Kabuto_e, "d_a_obj_kabuto"}, + {fpcNm_Obj_Cho_e, "d_a_obj_cho"}, + {fpcNm_Obj_Kuw_e, "d_a_obj_kuwagata"}, + {fpcNm_Obj_Nan_e, "d_a_obj_nan"}, + {fpcNm_Obj_Dan_e, "d_a_obj_dan"}, + {fpcNm_Obj_Kam_e, "d_a_obj_kamakiri"}, + {fpcNm_Obj_Ten_e, "d_a_obj_ten"}, + {fpcNm_Obj_Ari_e, "d_a_obj_ari"}, + {fpcNm_Obj_Kag_e, "d_a_obj_kag"}, + {fpcNm_Obj_Batta_e, "d_a_obj_batta"}, + {fpcNm_Obj_Tombo_e, "d_a_obj_tombo"}, + {fpcNm_Obj_Kat_e, "d_a_obj_katatsumuri"}, + {fpcNm_Obj_H_Saku_e, "d_a_obj_h_saku"}, + {fpcNm_Obj_Yobikusa_e, "d_a_obj_yobikusa"}, + {fpcNm_Obj_KazeNeko_e, "d_a_obj_kazeneko"}, + {fpcNm_Obj_KznkArm_e, "d_a_obj_kznkarm"}, + {fpcNm_Obj_NamePlate_e, "d_a_obj_nameplate"}, + {fpcNm_Obj_OnCloth_e, "d_a_obj_ornament_cloth"}, + {fpcNm_Obj_LndRope_e, "d_a_obj_laundry_rope"}, + {fpcNm_Obj_ItaRope_e, "d_a_obj_sakuita_rope"}, + {fpcNm_Obj_Sakuita_e, "d_a_obj_sakuita"}, + {fpcNm_Obj_Laundry_e, "d_a_obj_laundry"}, + {fpcNm_WarpBug_e, "d_a_warp_bug"}, + {fpcNm_Izumi_Gate_e, "d_a_izumi_gate"}, + {fpcNm_Obj_Fchain_e, "d_a_obj_fchain"}, + {fpcNm_Obj_Wchain_e, "d_a_obj_wchain"}, + {fpcNm_Tag_Attp_e, "d_a_tag_attention"}, + {fpcNm_Obj_Tornado_e, "d_a_obj_tornado"}, + {fpcNm_Obj_Tornado2_e, "d_a_obj_tornado2"}, + {fpcNm_Obj_FirePillar_e, "d_a_obj_firepillar"}, + {fpcNm_Obj_FirePillar2_e, "d_a_obj_firepillar2"}, + {fpcNm_Obj_InoBone_e, "d_a_obj_inobone"}, + {fpcNm_Obj_Stopper_e, "d_a_obj_stopper"}, + {fpcNm_Obj_MHole_e, "d_a_obj_mhole"}, + {fpcNm_Tag_Magne_e, "d_a_tag_magne"}, + {fpcNm_Obj_BossWarp_e, "d_a_obj_bosswarp"}, + {fpcNm_Obj_WoodPendulum_e, "d_a_obj_wood_pendulum"}, + {fpcNm_Obj_WdStick_e, "d_a_obj_wdStick"}, + {fpcNm_Obj_StairBlock_e, "d_a_obj_stairBlock"}, + {fpcNm_Obj_Geyser_e, "d_a_obj_geyser"}, + {fpcNm_Tag_KtOnFire_e, "d_a_obj_ktOnFire"}, + {fpcNm_Obj_FireWood_e, "d_a_obj_fireWood"}, + {fpcNm_Obj_FireWood2_e, "d_a_obj_fireWood2"}, + {fpcNm_Obj_GpTaru_e, "d_a_obj_gpTaru"}, + {fpcNm_Obj_OnsenTaru_e, "d_a_obj_onsenTaru"}, + {fpcNm_Obj_KiPot_e, "d_a_obj_kiPot"}, + {fpcNm_TBOX_SW_e, "d_a_tboxSw"}, + {fpcNm_Obj_SwChain_e, "d_a_obj_swchain"}, + {fpcNm_Obj_WoodenSword_e, "d_a_obj_wsword"}, + {fpcNm_Obj_StoneMark_e, "d_a_obj_stoneMark"}, + {fpcNm_Obj_Lv3Candle_e, "d_a_obj_lv3Candle"}, + {fpcNm_Tag_Lv4Candle_e, "d_a_obj_lv4CandleTag"}, + {fpcNm_Tag_Lv4CandleDm_e, "d_a_obj_lv4CandleDemoTag"}, + {fpcNm_Obj_DamCps_e, "d_a_obj_damCps"}, + {fpcNm_Obj_Smoke_e, "d_a_obj_smoke"}, + {fpcNm_Obj_WaterFall_e, "d_a_obj_waterfall"}, + {fpcNm_Obj_ZoraCloth_e, "d_a_obj_zcloth"}, + {fpcNm_Obj_poFire_e, "d_a_obj_poFire"}, + {fpcNm_Tag_poFire_e, "d_a_tag_poFire"}, + {fpcNm_Obj_glowSphere_e, "d_a_obj_glowSphere"}, + {fpcNm_Tag_LightBall_e, "d_a_tag_lightball"}, + {fpcNm_SwLBall_e, "d_a_swLBall"}, + {fpcNm_SwBall_e, "d_a_swBall"}, + {fpcNm_Obj_WaterEff_e, "d_a_obj_lv3waterEff"}, + {fpcNm_Tag_RiverBack_e, "d_a_tag_river_back"}, + {fpcNm_Tag_KagoFall_e, "d_a_tag_kago_fall"}, + {fpcNm_Tag_Lv2PrChk_e, "d_a_tag_lv2prchk"}, + {fpcNm_Obj_Lv4Gear_e, "d_a_obj_lv4gear"}, + {fpcNm_Obj_MasterSword_e, "d_a_obj_master_sword"}, + {fpcNm_Obj_WoodStatue_e, "d_a_obj_wood_statue"}, + {fpcNm_Obj_Fan_e, "d_a_obj_fan"}, + {fpcNm_Obj_IceLeaf_e, "d_a_obj_iceleaf"}, + {fpcNm_Obj_zrTuraraRc_e, "d_a_obj_zrTuraraRock"}, + {fpcNm_Tag_RetRoom_e, "d_a_tag_ret_room"}, + {fpcNm_Obj_WindStone_e, "d_a_obj_wind_stone"}, + {fpcNm_Tag_WaraHowl_e, "d_a_tag_wara_howl"}, + {fpcNm_Obj_SCannon_e, "d_a_obj_scannon"}, + {fpcNm_Obj_SmWStone_e, "d_a_obj_smw_stone"}, + {fpcNm_Obj_SCannonCrs_e, "d_a_obj_scannon_crs"}, + {fpcNm_Tag_SnowEff_e, "d_a_obj_snowEffTag"}, + {fpcNm_Tag_CstaSw_e, "d_a_tag_CstaSw"}, + {fpcNm_Tag_Lv6CstaSw_e, "d_a_tag_lv6CstaSw"}, + {fpcNm_Obj_awaPlar_e, "d_a_obj_bubblePilar"}, + {fpcNm_Obj_poTbox_e, "d_a_obj_poTbox"}, + {fpcNm_Obj_TimeFire_e, "d_a_obj_timeFire"}, + {fpcNm_Obj_TMoon_e, "d_a_obj_tmoon"}, + {fpcNm_Obj_GanonWall_e, "d_a_obj_ganonwall"}, + {fpcNm_Obj_Prop_e, "d_a_obj_prop"}, + {fpcNm_CSTATUE_e, "d_a_cstatue"}, + {fpcNm_Obj_SwBallA_e, "d_a_obj_swBallA"}, + {fpcNm_Obj_SwBallB_e, "d_a_obj_swBallB"}, + {fpcNm_Obj_SnowSoup_e, "d_a_obj_snow_soup"}, + {fpcNm_Obj_Nagaisu_e, "d_a_obj_nagaisu"}, + {fpcNm_Obj_RCircle_e, "d_a_obj_rcircle"}, + {fpcNm_Obj_Picture_e, "d_a_obj_picture"}, + {fpcNm_Tag_SetBall_e, "d_a_tag_setBall"}, + {fpcNm_Tag_SmkEmt_e, "d_a_tag_smk_emt"}, + {fpcNm_SwTime_e, "d_a_swTime"}, + {fpcNm_Obj_HFtr_e, "d_a_obj_hakai_ftr"}, + {fpcNm_Obj_HBarrel_e, "d_a_obj_hakai_brl"}, + {fpcNm_Obj_Crystal_e, "d_a_obj_crystal"}, + {fpcNm_Obj_SCannonTen_e, "d_a_obj_scannon_ten"}, + {fpcNm_Obj_SwBallC_e, "d_a_obj_swBallC"}, + {fpcNm_SCENE_EXIT2_e, "d_a_scene_exit2"}, + {fpcNm_Obj_Hata_e, "d_a_obj_hata"}, + {fpcNm_Obj_ToaruMaki_e, "d_a_obj_toaru_maki"}, + {fpcNm_Tag_AttackItem_e, "d_a_tag_attack_item"}, + {fpcNm_Tag_RmbitSw_e, "d_a_tag_rmbit_sw"}, + {fpcNm_Obj_Sword_e, "d_a_obj_sword"}, + {fpcNm_Tag_Spring_e, "d_a_tag_spring"}, + {fpcNm_Tag_Statue_e, "d_a_tag_statue_evt"}, + {fpcNm_E_AI_e, "d_a_e_ai"}, + {fpcNm_E_GS_e, "d_a_e_gs"}, + {fpcNm_E_GOB_e, "d_a_e_gob"}, + {fpcNm_E_DD_e, "d_a_e_dd"}, + {fpcNm_E_DN_e, "d_a_e_dn"}, + {fpcNm_E_S1_e, "d_a_e_s1"}, + {fpcNm_E_MF_e, "d_a_e_mf"}, + {fpcNm_E_SG_e, "d_a_e_sg"}, + {fpcNm_E_BS_e, "d_a_e_bs"}, + {fpcNm_E_SF_e, "d_a_e_sf"}, + {fpcNm_E_SH_e, "d_a_e_sh"}, + {fpcNm_E_DF_e, "d_a_e_df"}, + {fpcNm_E_GM_e, "d_a_e_gm"}, + {fpcNm_E_MD_e, "d_a_e_md"}, + {fpcNm_E_SM_e, "d_a_e_sm"}, + {fpcNm_E_SM2_e, "d_a_e_sm2"}, + {fpcNm_E_ST_e, "d_a_e_st"}, + {fpcNm_E_ST_LINE_e, "d_a_e_st_line"}, + {fpcNm_E_SB_e, "d_a_e_sb"}, + {fpcNm_E_TH_e, "d_a_e_th"}, + {fpcNm_E_CR_e, "d_a_e_cr"}, + {fpcNm_E_CR_EGG_e, "d_a_e_cr_egg"}, + {fpcNm_E_DB_e, "d_a_e_db"}, + {fpcNm_E_DB_LEAF_e, "d_a_e_db_leaf"}, + {fpcNm_E_GA_e, "d_a_e_ga"}, + {fpcNm_E_GB_e, "d_a_e_gb"}, + {fpcNm_E_HB_e, "d_a_e_hb"}, + {fpcNm_E_HB_LEAF_e, "d_a_e_hb_leaf"}, + {fpcNm_E_HZELDA_e, "d_a_e_hzelda"}, + {fpcNm_E_YD_e, "d_a_e_yd"}, + {fpcNm_E_YH_e, "d_a_e_yh"}, + {fpcNm_E_YD_LEAF_e, "d_a_e_yd_leaf"}, + {fpcNm_E_HM_e, "d_a_e_hm"}, + {fpcNm_E_TK_e, "d_a_e_tk"}, + {fpcNm_E_TK2_e, "d_a_e_tk2"}, + {fpcNm_E_TK_BALL_e, "d_a_e_tk_ball"}, + {fpcNm_E_RB_e, "d_a_e_rb"}, + {fpcNm_E_RD_e, "d_a_e_rd"}, + {fpcNm_E_RDB_e, "d_a_e_rdb"}, + {fpcNm_E_RDY_e, "d_a_e_rdy"}, + {fpcNm_E_FM_e, "d_a_e_fm"}, + {fpcNm_E_FS_e, "d_a_e_fs"}, + {fpcNm_E_PM_e, "d_a_e_pm"}, + {fpcNm_E_PO_e, "d_a_e_po"}, + {fpcNm_E_MB_e, "d_a_e_mb"}, + {fpcNm_E_MK_e, "d_a_e_mk"}, + {fpcNm_E_MM_e, "d_a_e_mm"}, + {fpcNm_E_FZ_e, "d_a_e_fz"}, + {fpcNm_E_ZS_e, "d_a_e_zs"}, + {fpcNm_E_KK_e, "d_a_e_kk"}, + {fpcNm_E_HP_e, "d_a_e_hp"}, + {fpcNm_E_ZH_e, "d_a_e_zh"}, + {fpcNm_E_ZM_e, "d_a_e_zm"}, + {fpcNm_E_PZ_e, "d_a_e_pz"}, + {fpcNm_E_FB_e, "d_a_e_fb"}, + {fpcNm_E_FK_e, "d_a_e_fk"}, + {fpcNm_E_MS_e, "d_a_e_ms"}, + {fpcNm_E_NEST_e, "d_a_e_nest"}, + {fpcNm_E_NZ_e, "d_a_e_nz"}, + {fpcNm_E_BA_e, "d_a_e_ba"}, + {fpcNm_E_BU_e, "d_a_e_bu"}, + {fpcNm_E_BUG_e, "d_a_e_bug"}, + {fpcNm_E_BEE_e, "d_a_e_bee"}, + {fpcNm_E_IS_e, "d_a_e_is"}, + {fpcNm_E_KG_e, "d_a_e_kg"}, + {fpcNm_E_KR_e, "d_a_e_kr"}, + {fpcNm_E_SW_e, "d_a_e_sw"}, + {fpcNm_E_GE_e, "d_a_e_ge"}, + {fpcNm_Tag_WatchGe_e, "d_a_tag_watchge"}, + {fpcNm_E_YM_e, "d_a_e_ym"}, + {fpcNm_E_YM_TAG_e, "d_a_e_ym_tag"}, + {fpcNm_E_YMB_e, "d_a_e_ymb"}, + {fpcNm_Tag_FWall_e, "d_a_tag_firewall"}, + {fpcNm_Tag_WaterFall_e, "d_a_tag_waterfall"}, + {fpcNm_E_YK_e, "d_a_e_yk"}, + {fpcNm_E_YR_e, "d_a_e_yr"}, + {fpcNm_E_YG_e, "d_a_e_yg"}, + {fpcNm_E_HZ_e, "d_a_e_hz"}, + {fpcNm_E_WS_e, "d_a_e_ws"}, + {fpcNm_E_OC_e, "d_a_e_oc"}, + {fpcNm_E_OT_e, "d_a_e_ot"}, + {fpcNm_E_DT_e, "d_a_e_dt"}, + {fpcNm_E_BG_e, "d_a_e_bg"}, + {fpcNm_E_OctBg_e, "d_a_e_oct_bg"}, + {fpcNm_DR_e, "d_a_L7demo_dr"}, + {fpcNm_L7lowDr_e, "d_a_L7low_dr"}, + {fpcNm_L7ODR_e, "d_a_L7op_demo_dr"}, + {fpcNm_E_TT_e, "d_a_e_tt"}, + {fpcNm_E_DK_e, "d_a_e_dk"}, + {fpcNm_E_VT_e, "d_a_e_vt"}, + {fpcNm_E_WW_e, "d_a_e_ww"}, + {fpcNm_E_GI_e, "d_a_e_gi"}, + {fpcNm_B_BH_e, "d_a_b_bh"}, + {fpcNm_B_BQ_e, "d_a_b_bq"}, + {fpcNm_B_GM_e, "d_a_b_gm"}, + {fpcNm_B_GND_e, "d_a_b_gnd"}, + {fpcNm_B_GO_e, "d_a_b_go"}, + {fpcNm_B_OH2_e, "d_a_b_oh2"}, + {fpcNm_B_YO_e, "d_a_b_yo"}, + {fpcNm_B_YOI_e, "d_a_b_yo_ice"}, + {fpcNm_B_TN_e, "d_a_b_tn"}, + {fpcNm_B_GG_e, "d_a_b_gg"}, + {fpcNm_B_DRE_e, "d_a_b_dre"}, + {fpcNm_B_MGN_e, "d_a_b_mgn"}, + {fpcNm_E_WAP_e, "d_a_e_warpappear"}, + {fpcNm_Obj_SmallKey_e, "d_a_obj_smallkey"}, + {fpcNm_Obj_Kantera_e, "d_a_obj_kantera"}, + {fpcNm_Obj_LifeContainer_e, "d_a_obj_life_container"}, + {fpcNm_Obj_Shield_e, "d_a_obj_shield"}, + {fpcNm_Demo_Item_e, "d_a_demo_item"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_ShopItem, "d_a_shop_item"}, + {fpcNm_ShopItem_e, "d_a_shop_item"}, #endif - {PROC_Obj_Drop, "d_a_obj_drop"}, - {PROC_OBJ_RW, "d_a_obj_rw"}, - {PROC_NBOMB, "d_a_nbomb"}, - {PROC_TAG_CSW, "d_a_tag_csw"}, - {PROC_TAG_QS, "d_a_tag_qs"}, - {PROC_HOZELDA, "d_a_hozelda"}, + {fpcNm_Obj_Drop_e, "d_a_obj_drop"}, + {fpcNm_OBJ_RW_e, "d_a_obj_rw"}, + {fpcNm_NBOMB_e, "d_a_nbomb"}, + {fpcNm_TAG_CSW_e, "d_a_tag_csw"}, + {fpcNm_TAG_QS_e, "d_a_tag_qs"}, + {fpcNm_HOZELDA_e, "d_a_hozelda"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_SWC00, "d_a_swc00"}, + {fpcNm_SWC00_e, "d_a_swc00"}, #endif - {PROC_KNOB20, "d_a_door_knob00"}, - {PROC_DBDOOR, "d_a_door_dbdoor00"}, - {PROC_BOSS_DOOR, "d_a_door_boss"}, - {PROC_L1BOSS_DOOR, "d_a_door_bossL1"}, - {PROC_L1MBOSS_DOOR, "d_a_door_mbossL1"}, - {PROC_L5BOSS_DOOR, "d_a_door_bossL5"}, - {PROC_DSHUTTER, "d_a_dshutter"}, - {PROC_SPIRAL_DOOR, "d_a_door_spiral"}, - {PROC_Tag_ChgRestart, "d_a_tag_chgrestart"}, - {PROC_Tag_Restart, "d_a_tag_setrestart"}, - {PROC_ANDSW, "d_a_andsw"}, + {fpcNm_KNOB20_e, "d_a_door_knob00"}, + {fpcNm_DBDOOR_e, "d_a_door_dbdoor00"}, + {fpcNm_BOSS_DOOR_e, "d_a_door_boss"}, + {fpcNm_L1BOSS_DOOR_e, "d_a_door_bossL1"}, + {fpcNm_L1MBOSS_DOOR_e, "d_a_door_mbossL1"}, + {fpcNm_L5BOSS_DOOR_e, "d_a_door_bossL5"}, + {fpcNm_DSHUTTER_e, "d_a_dshutter"}, + {fpcNm_SPIRAL_DOOR_e, "d_a_door_spiral"}, + {fpcNm_Tag_ChgRestart_e, "d_a_tag_chgrestart"}, + {fpcNm_Tag_Restart_e, "d_a_tag_setrestart"}, + {fpcNm_ANDSW_e, "d_a_andsw"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_ANDSW2, "d_a_andsw2"}, + {fpcNm_ANDSW2_e, "d_a_andsw2"}, #endif - {PROC_MYNA, "d_a_myna"}, - {PROC_NPC_GND, "d_a_npc_gnd"}, - {PROC_NPC_GRA, "d_a_npc_gra"}, - {PROC_NPC_GRC, "d_a_npc_grc"}, - {PROC_NPC_GRD, "d_a_npc_grd"}, - {PROC_NPC_GRM, "d_a_npc_grm"}, - {PROC_NPC_GRMC, "d_a_npc_grmc"}, - {PROC_NPC_GRO, "d_a_npc_gro"}, - {PROC_NPC_GRR, "d_a_npc_grr"}, - {PROC_NPC_GRS, "d_a_npc_grs"}, - {PROC_NPC_GRZ, "d_a_npc_grz"}, - {PROC_NPC_YAMID, "d_a_npc_yamid"}, - {PROC_NPC_YAMIT, "d_a_npc_yamit"}, - {PROC_NPC_YAMIS, "d_a_npc_yamis"}, - {PROC_NPC_BLUENS, "d_a_npc_blue_ns"}, - {PROC_NPC_KAKASHI, "d_a_npc_kakashi"}, - {PROC_NPC_KDK, "d_a_npc_kdk"}, - {PROC_NPC_ARU, "d_a_npc_aru"}, - {PROC_NPC_BANS, "d_a_npc_bans"}, - {PROC_NPC_BESU, "d_a_npc_besu"}, - {PROC_NPC_BOU, "d_a_npc_bou"}, - {PROC_NPC_BOU_S, "d_a_npc_bouS"}, - {PROC_NPC_CLERKA, "d_a_npc_clerka"}, - {PROC_NPC_CLERKB, "d_a_npc_clerkb"}, - {PROC_NPC_CLERKT, "d_a_npc_clerkt"}, - {PROC_NPC_WRESTLER, "d_a_npc_wrestler"}, - {PROC_Tag_Arena, "d_a_tag_arena"}, - {PROC_Tag_Instruction, "d_a_tag_instruction"}, - {PROC_NPC_DOC, "d_a_npc_doc"}, - {PROC_NPC_GWOLF, "d_a_npc_gwolf"}, - {PROC_NPC_LEN, "d_a_npc_len"}, - {PROC_NPC_LUD, "d_a_npc_lud"}, - {PROC_NPC_FAIRY_SEIREI, "d_a_npc_fairy_seirei"}, - {PROC_NPC_FAIRY, "d_a_npc_fairy"}, - {PROC_NPC_HANJO, "d_a_npc_hanjo"}, - {PROC_NPC_HENNA, "d_a_npc_henna"}, - {PROC_NPC_HENNA0, "d_a_npc_henna0"}, - {PROC_NPC_HOZ, "d_a_npc_hoz"}, - {PROC_NPC_JAGAR, "d_a_npc_jagar"}, - {PROC_NPC_KKRI, "d_a_npc_kkri"}, - {PROC_NPC_KN, "d_a_npc_kn"}, - {PROC_KN_BULLET, "d_a_obj_knBullet"}, - {PROC_NPC_KNJ, "d_a_npc_knj"}, - {PROC_NPC_KOLIN, "d_a_npc_kolin"}, - {PROC_NPC_KOLINB, "d_a_npc_kolinb"}, - {PROC_NPC_KYURY, "d_a_npc_kyury"}, - {PROC_NPC_MARO, "d_a_npc_maro"}, - {PROC_NPC_MIDP, "d_a_npc_midp"}, - {PROC_NPC_MOI, "d_a_npc_moi"}, - {PROC_NPC_RACA, "d_a_npc_raca"}, - {PROC_NPC_SARU, "d_a_npc_saru"}, - {PROC_NPC_SEIB, "d_a_npc_seib"}, - {PROC_NPC_SEIC, "d_a_npc_seic"}, - {PROC_NPC_SEID, "d_a_npc_seid"}, - {PROC_NPC_SEIRA, "d_a_npc_seira"}, - {PROC_NPC_SERA2, "d_a_npc_seira2"}, - {PROC_NPC_SEIREI, "d_a_npc_seirei"}, - {PROC_NPC_SHAMAN, "d_a_npc_shaman"}, - {PROC_NPC_SMARO, "d_a_npc_shop_maro"}, - {PROC_NPC_SOLA, "d_a_npc_sola"}, - {PROC_NPC_TARO, "d_a_npc_taro"}, - {PROC_NPC_PACHI_BESU, "d_a_npc_pachi_besu"}, - {PROC_NPC_PACHI_TARO, "d_a_npc_pachi_taro"}, - {PROC_NPC_PACHI_MARO, "d_a_npc_pachi_maro"}, - {PROC_TAG_PATI, "d_a_tag_pachi"}, - {PROC_NPC_THE, "d_a_npc_the"}, - {PROC_NPC_TKJ, "d_a_npc_tkj"}, - {PROC_NPC_TKS, "d_a_npc_tks"}, - {PROC_NPC_TKC, "d_a_npc_tkc"}, - {PROC_OBJ_TKS, "d_a_obj_tks"}, - {PROC_NPC_TOBY, "d_a_npc_toby"}, - {PROC_NPC_URI, "d_a_npc_uri"}, - {PROC_NPC_YELIA, "d_a_npc_yelia"}, - {PROC_NPC_YKM, "d_a_npc_ykm"}, - {PROC_NPC_YKW, "d_a_npc_ykw"}, - {PROC_NPC_ZANB, "d_a_npc_zanb"}, - {PROC_NPC_ZANT, "d_a_npc_zant"}, - {PROC_NPC_ZELDA, "d_a_npc_zelda"}, - {PROC_NPC_ZELR, "d_a_npc_zelR"}, - {PROC_NPC_ZELRO, "d_a_npc_zelRo"}, - {PROC_OBJ_ZRAFREEZE, "d_a_obj_zra_freeze"}, - {PROC_NPC_ZRC, "d_a_npc_zrc"}, - {PROC_NPC_ZRZ, "d_a_npc_zrz"}, - {PROC_ZRA_MARK, "d_a_obj_zraMark"}, - {PROC_MYNA2, "d_a_npc_myna2"}, - {PROC_TAG_MYNA2, "d_a_tag_myna2"}, - {PROC_NPC_CD3, "d_a_npc_cdn3"}, - {PROC_Tag_Schedule, "d_a_tag_schedule"}, - {PROC_Tag_Escape, "d_a_tag_escape"}, - {PROC_NPC_CHAT, "d_a_npc_chat"}, - {PROC_NPC_SOLDIERa, "d_a_npc_soldierA"}, - {PROC_NPC_SOLDIERb, "d_a_npc_soldierB"}, - {PROC_PASSER_MNG, "d_a_passer_mng"}, - {PROC_NPC_PASSER, "d_a_npc_passer"}, - {PROC_NPC_PASSER2, "d_a_npc_passer2"}, - {PROC_NPC_POST, "d_a_npc_post"}, - {PROC_NPC_POUYA, "d_a_npc_pouya"}, - {PROC_FORMATION_MNG, "d_a_formation_mng"}, - {PROC_NPC_FGUARD, "d_a_npc_fguard"}, - {PROC_GUARD_MNG, "d_a_guard_mng"}, - {PROC_TAG_GUARD, "d_a_tag_guard"}, - {PROC_NPC_GUARD, "d_a_npc_guard"}, - {PROC_NPC_ASH, "d_a_npc_ash"}, - {PROC_NPC_ASHB, "d_a_npc_ashB"}, - {PROC_NPC_SHAD, "d_a_npc_shad"}, - {PROC_NPC_RAFREL, "d_a_npc_rafrel"}, - {PROC_NPC_MOIR, "d_a_npc_moir"}, - {PROC_NPC_IMPAL, "d_a_npc_impal"}, - {PROC_NPC_SHOE, "d_a_npc_shoe"}, - {PROC_NPC_DOORBOY, "d_a_npc_doorboy"}, - {PROC_NPC_PRAYER, "d_a_npc_prayer"}, - {PROC_NPC_KASIHANA, "d_a_npc_kasi_hana"}, - {PROC_NPC_KASIKYU, "d_a_npc_kasi_kyu"}, - {PROC_NPC_KASIMICH, "d_a_npc_kasi_mich"}, - {PROC_NPC_DRSOL, "d_a_npc_drainSol"}, - {PROC_NPC_CHIN, "d_a_npc_chin"}, - {PROC_NPC_INS, "d_a_npc_ins"}, - {PROC_NPC_SHOP0, "d_a_npc_shop0"}, + {fpcNm_MYNA_e, "d_a_myna"}, + {fpcNm_NPC_GND_e, "d_a_npc_gnd"}, + {fpcNm_NPC_GRA_e, "d_a_npc_gra"}, + {fpcNm_NPC_GRC_e, "d_a_npc_grc"}, + {fpcNm_NPC_GRD_e, "d_a_npc_grd"}, + {fpcNm_NPC_GRM_e, "d_a_npc_grm"}, + {fpcNm_NPC_GRMC_e, "d_a_npc_grmc"}, + {fpcNm_NPC_GRO_e, "d_a_npc_gro"}, + {fpcNm_NPC_GRR_e, "d_a_npc_grr"}, + {fpcNm_NPC_GRS_e, "d_a_npc_grs"}, + {fpcNm_NPC_GRZ_e, "d_a_npc_grz"}, + {fpcNm_NPC_YAMID_e, "d_a_npc_yamid"}, + {fpcNm_NPC_YAMIT_e, "d_a_npc_yamit"}, + {fpcNm_NPC_YAMIS_e, "d_a_npc_yamis"}, + {fpcNm_NPC_BLUENS_e, "d_a_npc_blue_ns"}, + {fpcNm_NPC_KAKASHI_e, "d_a_npc_kakashi"}, + {fpcNm_NPC_KDK_e, "d_a_npc_kdk"}, + {fpcNm_NPC_ARU_e, "d_a_npc_aru"}, + {fpcNm_NPC_BANS_e, "d_a_npc_bans"}, + {fpcNm_NPC_BESU_e, "d_a_npc_besu"}, + {fpcNm_NPC_BOU_e, "d_a_npc_bou"}, + {fpcNm_NPC_BOU_S_e, "d_a_npc_bouS"}, + {fpcNm_NPC_CLERKA_e, "d_a_npc_clerka"}, + {fpcNm_NPC_CLERKB_e, "d_a_npc_clerkb"}, + {fpcNm_NPC_CLERKT_e, "d_a_npc_clerkt"}, + {fpcNm_NPC_WRESTLER_e, "d_a_npc_wrestler"}, + {fpcNm_Tag_Arena_e, "d_a_tag_arena"}, + {fpcNm_Tag_Instruction_e, "d_a_tag_instruction"}, + {fpcNm_NPC_DOC_e, "d_a_npc_doc"}, + {fpcNm_NPC_GWOLF_e, "d_a_npc_gwolf"}, + {fpcNm_NPC_LEN_e, "d_a_npc_len"}, + {fpcNm_NPC_LUD_e, "d_a_npc_lud"}, + {fpcNm_NPC_FAIRY_SEIREI_e, "d_a_npc_fairy_seirei"}, + {fpcNm_NPC_FAIRY_e, "d_a_npc_fairy"}, + {fpcNm_NPC_HANJO_e, "d_a_npc_hanjo"}, + {fpcNm_NPC_HENNA_e, "d_a_npc_henna"}, + {fpcNm_NPC_HENNA0_e, "d_a_npc_henna0"}, + {fpcNm_NPC_HOZ_e, "d_a_npc_hoz"}, + {fpcNm_NPC_JAGAR_e, "d_a_npc_jagar"}, + {fpcNm_NPC_KKRI_e, "d_a_npc_kkri"}, + {fpcNm_NPC_KN_e, "d_a_npc_kn"}, + {fpcNm_KN_BULLET_e, "d_a_obj_knBullet"}, + {fpcNm_NPC_KNJ_e, "d_a_npc_knj"}, + {fpcNm_NPC_KOLIN_e, "d_a_npc_kolin"}, + {fpcNm_NPC_KOLINB_e, "d_a_npc_kolinb"}, + {fpcNm_NPC_KYURY_e, "d_a_npc_kyury"}, + {fpcNm_NPC_MARO_e, "d_a_npc_maro"}, + {fpcNm_NPC_MIDP_e, "d_a_npc_midp"}, + {fpcNm_NPC_MOI_e, "d_a_npc_moi"}, + {fpcNm_NPC_RACA_e, "d_a_npc_raca"}, + {fpcNm_NPC_SARU_e, "d_a_npc_saru"}, + {fpcNm_NPC_SEIB_e, "d_a_npc_seib"}, + {fpcNm_NPC_SEIC_e, "d_a_npc_seic"}, + {fpcNm_NPC_SEID_e, "d_a_npc_seid"}, + {fpcNm_NPC_SEIRA_e, "d_a_npc_seira"}, + {fpcNm_NPC_SERA2_e, "d_a_npc_seira2"}, + {fpcNm_NPC_SEIREI_e, "d_a_npc_seirei"}, + {fpcNm_NPC_SHAMAN_e, "d_a_npc_shaman"}, + {fpcNm_NPC_SMARO_e, "d_a_npc_shop_maro"}, + {fpcNm_NPC_SOLA_e, "d_a_npc_sola"}, + {fpcNm_NPC_TARO_e, "d_a_npc_taro"}, + {fpcNm_NPC_PACHI_BESU_e, "d_a_npc_pachi_besu"}, + {fpcNm_NPC_PACHI_TARO_e, "d_a_npc_pachi_taro"}, + {fpcNm_NPC_PACHI_MARO_e, "d_a_npc_pachi_maro"}, + {fpcNm_TAG_PATI_e, "d_a_tag_pachi"}, + {fpcNm_NPC_THE_e, "d_a_npc_the"}, + {fpcNm_NPC_TKJ_e, "d_a_npc_tkj"}, + {fpcNm_NPC_TKS_e, "d_a_npc_tks"}, + {fpcNm_NPC_TKC_e, "d_a_npc_tkc"}, + {fpcNm_OBJ_TKS_e, "d_a_obj_tks"}, + {fpcNm_NPC_TOBY_e, "d_a_npc_toby"}, + {fpcNm_NPC_URI_e, "d_a_npc_uri"}, + {fpcNm_NPC_YELIA_e, "d_a_npc_yelia"}, + {fpcNm_NPC_YKM_e, "d_a_npc_ykm"}, + {fpcNm_NPC_YKW_e, "d_a_npc_ykw"}, + {fpcNm_NPC_ZANB_e, "d_a_npc_zanb"}, + {fpcNm_NPC_ZANT_e, "d_a_npc_zant"}, + {fpcNm_NPC_ZELDA_e, "d_a_npc_zelda"}, + {fpcNm_NPC_ZELR_e, "d_a_npc_zelR"}, + {fpcNm_NPC_ZELRO_e, "d_a_npc_zelRo"}, + {fpcNm_OBJ_ZRAFREEZE_e, "d_a_obj_zra_freeze"}, + {fpcNm_NPC_ZRC_e, "d_a_npc_zrc"}, + {fpcNm_NPC_ZRZ_e, "d_a_npc_zrz"}, + {fpcNm_ZRA_MARK_e, "d_a_obj_zraMark"}, + {fpcNm_MYNA2_e, "d_a_npc_myna2"}, + {fpcNm_TAG_MYNA2_e, "d_a_tag_myna2"}, + {fpcNm_NPC_CD3_e, "d_a_npc_cdn3"}, + {fpcNm_Tag_Schedule_e, "d_a_tag_schedule"}, + {fpcNm_Tag_Escape_e, "d_a_tag_escape"}, + {fpcNm_NPC_CHAT_e, "d_a_npc_chat"}, + {fpcNm_NPC_SOLDIERa_e, "d_a_npc_soldierA"}, + {fpcNm_NPC_SOLDIERb_e, "d_a_npc_soldierB"}, + {fpcNm_PASSER_MNG_e, "d_a_passer_mng"}, + {fpcNm_NPC_PASSER_e, "d_a_npc_passer"}, + {fpcNm_NPC_PASSER2_e, "d_a_npc_passer2"}, + {fpcNm_NPC_POST_e, "d_a_npc_post"}, + {fpcNm_NPC_POUYA_e, "d_a_npc_pouya"}, + {fpcNm_FORMATION_MNG_e, "d_a_formation_mng"}, + {fpcNm_NPC_FGUARD_e, "d_a_npc_fguard"}, + {fpcNm_GUARD_MNG_e, "d_a_guard_mng"}, + {fpcNm_TAG_GUARD_e, "d_a_tag_guard"}, + {fpcNm_NPC_GUARD_e, "d_a_npc_guard"}, + {fpcNm_NPC_ASH_e, "d_a_npc_ash"}, + {fpcNm_NPC_ASHB_e, "d_a_npc_ashB"}, + {fpcNm_NPC_SHAD_e, "d_a_npc_shad"}, + {fpcNm_NPC_RAFREL_e, "d_a_npc_rafrel"}, + {fpcNm_NPC_MOIR_e, "d_a_npc_moir"}, + {fpcNm_NPC_IMPAL_e, "d_a_npc_impal"}, + {fpcNm_NPC_SHOE_e, "d_a_npc_shoe"}, + {fpcNm_NPC_DOORBOY_e, "d_a_npc_doorboy"}, + {fpcNm_NPC_PRAYER_e, "d_a_npc_prayer"}, + {fpcNm_NPC_KASIHANA_e, "d_a_npc_kasi_hana"}, + {fpcNm_NPC_KASIKYU_e, "d_a_npc_kasi_kyu"}, + {fpcNm_NPC_KASIMICH_e, "d_a_npc_kasi_mich"}, + {fpcNm_NPC_DRSOL_e, "d_a_npc_drainSol"}, + {fpcNm_NPC_CHIN_e, "d_a_npc_chin"}, + {fpcNm_NPC_INS_e, "d_a_npc_ins"}, + {fpcNm_NPC_SHOP0_e, "d_a_npc_shop0"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_NPC_MK, "d_a_npc_mk"}, + {fpcNm_NPC_MK_e, "d_a_npc_mk"}, #endif - {PROC_NPC_P2, "d_a_npc_p2"}, - {PROC_KYTAG00, "d_a_kytag00"}, + {fpcNm_NPC_P2_e, "d_a_npc_p2"}, + {fpcNm_KYTAG00_e, "d_a_kytag00"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_KYTAG01, "d_a_kytag01"}, + {fpcNm_KYTAG01_e, "d_a_kytag01"}, #endif - {PROC_KYTAG02, "d_a_kytag02"}, - {PROC_KYTAG03, "d_a_kytag03"}, - {PROC_KYTAG04, "d_a_kytag04"}, - {PROC_KYTAG05, "d_a_kytag05"}, - {PROC_KYTAG06, "d_a_kytag06"}, - {PROC_KYTAG07, "d_a_kytag07"}, - {PROC_KYTAG08, "d_a_kytag08"}, - {PROC_KYTAG09, "d_a_kytag09"}, - {PROC_KYTAG10, "d_a_kytag10"}, - {PROC_KYTAG11, "d_a_kytag11"}, - {PROC_KYTAG12, "d_a_kytag12"}, - {PROC_KYTAG13, "d_a_kytag13"}, - {PROC_KYTAG14, "d_a_kytag14"}, - {PROC_KYTAG15, "d_a_kytag15"}, - {PROC_KYTAG16, "d_a_kytag16"}, - {PROC_KYTAG17, "d_a_kytag17"}, - {PROC_Ykgr, "d_a_ykgr"}, - {PROC_TALK, "d_a_talk"}, - {PROC_Obj_Crope, "d_a_obj_crope"}, - {PROC_Obj_Bombf, "d_a_obj_bombf"}, - {PROC_Obj_BkLeaf, "d_a_obj_bk_leaf"}, - {PROC_Tag_Mhint, "d_a_tag_mhint"}, - {PROC_Tag_Mmsg, "d_a_tag_mmsg"}, - {PROC_Tag_Mwait, "d_a_tag_mwait"}, - {PROC_Tag_Mstop, "d_a_tag_mstop"}, - {PROC_Tag_Stream, "d_a_tag_stream"}, - {PROC_Tag_Sppath, "d_a_tag_sppath"}, - {PROC_Tag_Wljump, "d_a_tag_wljump"}, - {PROC_Tag_TWGate, "d_a_tag_TWgate"}, - {PROC_Tag_Lv6Gate, "d_a_tag_Lv6Gate"}, - {PROC_Tag_Lv7Gate, "d_a_tag_Lv7Gate"}, - {PROC_Tag_Lv8Gate, "d_a_tag_Lv8Gate"}, - {PROC_Tag_TheBHint, "d_a_tag_theB_hint"}, - {PROC_Tag_Assist, "d_a_tag_assistance"}, - {PROC_DEMO00, "d_a_demo00"}, - {PROC_TAG_CAMERA, "d_a_tag_camera"}, - {PROC_TAG_CHKPOINT, "d_a_tag_chkpoint"}, + {fpcNm_KYTAG02_e, "d_a_kytag02"}, + {fpcNm_KYTAG03_e, "d_a_kytag03"}, + {fpcNm_KYTAG04_e, "d_a_kytag04"}, + {fpcNm_KYTAG05_e, "d_a_kytag05"}, + {fpcNm_KYTAG06_e, "d_a_kytag06"}, + {fpcNm_KYTAG07_e, "d_a_kytag07"}, + {fpcNm_KYTAG08_e, "d_a_kytag08"}, + {fpcNm_KYTAG09_e, "d_a_kytag09"}, + {fpcNm_KYTAG10_e, "d_a_kytag10"}, + {fpcNm_KYTAG11_e, "d_a_kytag11"}, + {fpcNm_KYTAG12_e, "d_a_kytag12"}, + {fpcNm_KYTAG13_e, "d_a_kytag13"}, + {fpcNm_KYTAG14_e, "d_a_kytag14"}, + {fpcNm_KYTAG15_e, "d_a_kytag15"}, + {fpcNm_KYTAG16_e, "d_a_kytag16"}, + {fpcNm_KYTAG17_e, "d_a_kytag17"}, + {fpcNm_Ykgr_e, "d_a_ykgr"}, + {fpcNm_TALK_e, "d_a_talk"}, + {fpcNm_Obj_Crope_e, "d_a_obj_crope"}, + {fpcNm_Obj_Bombf_e, "d_a_obj_bombf"}, + {fpcNm_Obj_BkLeaf_e, "d_a_obj_bk_leaf"}, + {fpcNm_Tag_Mhint_e, "d_a_tag_mhint"}, + {fpcNm_Tag_Mmsg_e, "d_a_tag_mmsg"}, + {fpcNm_Tag_Mwait_e, "d_a_tag_mwait"}, + {fpcNm_Tag_Mstop_e, "d_a_tag_mstop"}, + {fpcNm_Tag_Stream_e, "d_a_tag_stream"}, + {fpcNm_Tag_Sppath_e, "d_a_tag_sppath"}, + {fpcNm_Tag_Wljump_e, "d_a_tag_wljump"}, + {fpcNm_Tag_TWGate_e, "d_a_tag_TWgate"}, + {fpcNm_Tag_Lv6Gate_e, "d_a_tag_Lv6Gate"}, + {fpcNm_Tag_Lv7Gate_e, "d_a_tag_Lv7Gate"}, + {fpcNm_Tag_Lv8Gate_e, "d_a_tag_Lv8Gate"}, + {fpcNm_Tag_TheBHint_e, "d_a_tag_theB_hint"}, + {fpcNm_Tag_Assist_e, "d_a_tag_assistance"}, + {fpcNm_DEMO00_e, "d_a_demo00"}, + {fpcNm_TAG_CAMERA_e, "d_a_tag_camera"}, + {fpcNm_TAG_CHKPOINT_e, "d_a_tag_chkpoint"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_TAG_EVENT, "d_a_tag_event"}, + {fpcNm_TAG_EVENT_e, "d_a_tag_event"}, #endif - {PROC_TAG_EVT, "d_a_tag_evt"}, - {PROC_TAG_TELOP, "d_a_tag_telop"}, - {PROC_TAG_HOWL, "d_a_tag_howl"}, + {fpcNm_TAG_EVT_e, "d_a_tag_evt"}, + {fpcNm_TAG_TELOP_e, "d_a_tag_telop"}, + {fpcNm_TAG_HOWL_e, "d_a_tag_howl"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_TAG_MSG, "d_a_tag_msg"}, + {fpcNm_TAG_MSG_e, "d_a_tag_msg"}, #endif - {PROC_TAG_LANTERN, "d_a_tag_lantern"}, - {PROC_Tag_Mist, "d_a_tag_mist"}, - {PROC_DMIDNA, "d_a_dmidna"}, - {PROC_VRBOX, "d_a_vrbox"}, - {PROC_VRBOX2, "d_a_vrbox2"}, - {PROC_BG, "d_a_bg"}, - {PROC_SET_BG_OBJ, "d_a_set_bgobj"}, - {PROC_BG_OBJ, "d_a_bg_obj"}, - {PROC_MIRROR, "d_a_mirror"}, - {PROC_MOVIE_PLAYER, "d_a_movie_player"}, + {fpcNm_TAG_LANTERN_e, "d_a_tag_lantern"}, + {fpcNm_Tag_Mist_e, "d_a_tag_mist"}, + {fpcNm_DMIDNA_e, "d_a_dmidna"}, + {fpcNm_VRBOX_e, "d_a_vrbox"}, + {fpcNm_VRBOX2_e, "d_a_vrbox2"}, + {fpcNm_BG_e, "d_a_bg"}, + {fpcNm_SET_BG_OBJ_e, "d_a_set_bgobj"}, + {fpcNm_BG_OBJ_e, "d_a_bg_obj"}, + {fpcNm_MIRROR_e, "d_a_mirror"}, + {fpcNm_MOVIE_PLAYER_e, "d_a_movie_player"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_TITLE, "d_a_title"}, + {fpcNm_TITLE_e, "d_a_title"}, #endif - {PROC_FR, "d_a_fr"}, - {PROC_ECONT, "d_a_econt"}, - {PROC_MG_ROD, "d_a_mg_rod"}, - {PROC_E_ARROW, "d_a_e_arrow"}, - {PROC_BULLET, "d_a_bullet"}, - {PROC_SWHIT0, "d_a_swhit0"}, - {PROC_E_TH_BALL, "d_a_e_th_ball"}, - {PROC_TAG_EVTAREA, "d_a_tag_evtarea"}, - {PROC_TAG_EVTMSG, "d_a_tag_evtmsg"}, - {PROC_TAG_KMSG, "d_a_tag_kmsg"}, - {PROC_TAG_PUSH, "d_a_tag_push"}, - {PROC_E_MK_BO, "d_a_e_mk_bo"}, - {PROC_E_MM_MT, "d_a_e_mm_mt"}, - {PROC_OBJ_KBOX, "d_a_obj_kbox"}, - {PROC_OBJ_FW, "d_a_obj_fw"}, - {PROC_B_GOS, "d_a_b_gos"}, - {PROC_OBJ_YSTONE, "d_a_obj_ystone"}, - {PROC_MANT, "d_a_mant"}, - {PROC_CROD, "d_a_crod"}, - {PROC_OBJ_PLEAF, "d_a_obj_pleaf"}, - {PROC_OBJ_KBACKET, "d_a_obj_kbacket"}, - {PROC_OBJ_YBAG, "d_a_obj_yel_bag"}, - {PROC_OBJ_PUMPKIN, "d_a_obj_pumpkin"}, - {PROC_OBJ_AUTOMATA, "d_a_obj_automata"}, - {PROC_OBJ_GADGET, "d_a_obj_gadget"}, - {PROC_OBJ_KAGO, "d_a_obj_kago"}, - {PROC_Obj_Carry, "d_a_obj_carry"}, - {PROC_Obj_Stone, "d_a_obj_stone"}, - {PROC_OBJ_HB, "d_a_obj_hb"}, - {PROC_NPC_INKO, "d_a_npc_inko"}, - {PROC_BD, "d_a_bd"}, - {PROC_Obj_Eff, "d_a_obj_eff"}, - {PROC_E_BI, "d_a_e_bi"}, - {PROC_E_BI_LEAF, "d_a_e_bi_leaf"}, - {PROC_START_AND_GOAL, "d_a_startAndGoal"}, - {PROC_NPC_DF, "d_a_npc_df"}, - {PROC_ARROW, "d_a_arrow"}, - {PROC_PATH_LINE, "d_a_path_line"}, - {PROC_TAG_ALLMATO, "d_a_tag_allmato"}, - {PROC_Obj_Timer, "d_a_obj_timer"}, - {PROC_SCENE_EXIT, "d_a_scene_exit"}, - {PROC_SUSPEND, "d_a_suspend"}, + {fpcNm_FR_e, "d_a_fr"}, + {fpcNm_ECONT_e, "d_a_econt"}, + {fpcNm_MG_ROD_e, "d_a_mg_rod"}, + {fpcNm_E_ARROW_e, "d_a_e_arrow"}, + {fpcNm_BULLET_e, "d_a_bullet"}, + {fpcNm_SWHIT0_e, "d_a_swhit0"}, + {fpcNm_E_TH_BALL_e, "d_a_e_th_ball"}, + {fpcNm_TAG_EVTAREA_e, "d_a_tag_evtarea"}, + {fpcNm_TAG_EVTMSG_e, "d_a_tag_evtmsg"}, + {fpcNm_TAG_KMSG_e, "d_a_tag_kmsg"}, + {fpcNm_TAG_PUSH_e, "d_a_tag_push"}, + {fpcNm_E_MK_BO_e, "d_a_e_mk_bo"}, + {fpcNm_E_MM_MT_e, "d_a_e_mm_mt"}, + {fpcNm_OBJ_KBOX_e, "d_a_obj_kbox"}, + {fpcNm_OBJ_FW_e, "d_a_obj_fw"}, + {fpcNm_B_GOS_e, "d_a_b_gos"}, + {fpcNm_OBJ_YSTONE_e, "d_a_obj_ystone"}, + {fpcNm_MANT_e, "d_a_mant"}, + {fpcNm_CROD_e, "d_a_crod"}, + {fpcNm_OBJ_PLEAF_e, "d_a_obj_pleaf"}, + {fpcNm_OBJ_KBACKET_e, "d_a_obj_kbacket"}, + {fpcNm_OBJ_YBAG_e, "d_a_obj_yel_bag"}, + {fpcNm_OBJ_PUMPKIN_e, "d_a_obj_pumpkin"}, + {fpcNm_OBJ_AUTOMATA_e, "d_a_obj_automata"}, + {fpcNm_OBJ_GADGET_e, "d_a_obj_gadget"}, + {fpcNm_OBJ_KAGO_e, "d_a_obj_kago"}, + {fpcNm_Obj_Carry_e, "d_a_obj_carry"}, + {fpcNm_Obj_Stone_e, "d_a_obj_stone"}, + {fpcNm_OBJ_HB_e, "d_a_obj_hb"}, + {fpcNm_NPC_INKO_e, "d_a_npc_inko"}, + {fpcNm_BD_e, "d_a_bd"}, + {fpcNm_Obj_Eff_e, "d_a_obj_eff"}, + {fpcNm_E_BI_e, "d_a_e_bi"}, + {fpcNm_E_BI_LEAF_e, "d_a_e_bi_leaf"}, + {fpcNm_START_AND_GOAL_e, "d_a_startAndGoal"}, + {fpcNm_NPC_DF_e, "d_a_npc_df"}, + {fpcNm_ARROW_e, "d_a_arrow"}, + {fpcNm_PATH_LINE_e, "d_a_path_line"}, + {fpcNm_TAG_ALLMATO_e, "d_a_tag_allmato"}, + {fpcNm_Obj_Timer_e, "d_a_obj_timer"}, + {fpcNm_SCENE_EXIT_e, "d_a_scene_exit"}, + {fpcNm_SUSPEND_e, "d_a_suspend"}, #if VERSION != VERSION_SHIELD_DEBUG - {PROC_GRASS, "d_a_grass"}, + {fpcNm_GRASS_e, "d_a_grass"}, #endif {-1, NULL}, }; -static DynamicModuleControlBase* DMC[PROC_MAX_NUM]; +static DynamicModuleControlBase* DMC[fpcNm_MAX_NUM]; static bool DMC_initialized; @@ -813,7 +813,7 @@ int cCc_Init() { #else JKRHeap* parentHeap = DynamicModuleControlBase::getHeap(); #endif - u32 dmcHeapSize = sizeof(DynamicModuleControl) * PROC_MAX_NUM; + u32 dmcHeapSize = sizeof(DynamicModuleControl) * fpcNm_MAX_NUM; JKRSolidHeap* dmcHeap = JKRCreateSolidHeap(dmcHeapSize, parentHeap, false); JKRHeap* prevHeap = JKRSetCurrentHeap(dmcHeap); @@ -972,7 +972,7 @@ static int cDyl_InitCallback(void* param_0) { dmc.link(); cDyl_Initialized = true; - fopScnM_CreateReq(PROC_LOGO_SCENE, 0x7FFF, 0, 0); + fopScnM_CreateReq(fpcNm_LOGO_SCENE_e, 0x7FFF, 0, 0); return 1; } diff --git a/src/d/actor/d_a_L7demo_dr.cpp b/src/d/actor/d_a_L7demo_dr.cpp index 046c7313e5d..b225aed2641 100644 --- a/src/d/actor/d_a_L7demo_dr.cpp +++ b/src/d/actor/d_a_L7demo_dr.cpp @@ -192,7 +192,7 @@ void daDr_c::bridge_destroy() { camera->mCamera.Set(mDemoCamCenter, mDemoCamEye); } else if (156.0f == mpModelMorf->getFrame()) { cXyz sp5C; - daObjLv7Brg_c* brg = (daObjLv7Brg_c*)fopAcM_SearchByName(PROC_Obj_Lv7Bridge); + daObjLv7Brg_c* brg = (daObjLv7Brg_c*)fopAcM_SearchByName(fpcNm_Obj_Lv7Bridge_e); if (brg != NULL) { brg->setDestroyAnmA(); } @@ -221,7 +221,7 @@ void daDr_c::bridge_destroy2() { daPy_getPlayerActorClass(); if (field_0x654 == 0) { - daObjLv7Brg_c* brg = (daObjLv7Brg_c*)fopAcM_SearchByName(PROC_Obj_Lv7Bridge); + daObjLv7Brg_c* brg = (daObjLv7Brg_c*)fopAcM_SearchByName(fpcNm_Obj_Lv7Bridge_e); if (brg != NULL) { brg->setDestroyAnmB(); } @@ -408,18 +408,18 @@ static actor_method_class l_daDr_Method = { }; actor_process_profile_definition g_profile_DR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_DR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daDr_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 206, // mPriority - &l_daDr_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DR_e, + /* Actor SubMtd */ &l_daDr_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_L7low_dr.cpp b/src/d/actor/d_a_L7low_dr.cpp index 0e546a4eab8..e2b382ce58d 100644 --- a/src/d/actor/d_a_L7low_dr.cpp +++ b/src/d/actor/d_a_L7low_dr.cpp @@ -198,18 +198,18 @@ static actor_method_class l_daL7lowDr_Method = { }; actor_process_profile_definition g_profile_L7lowDr = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_L7lowDr, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daL7lowDr_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 207, // mPriority - &l_daL7lowDr_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_L7lowDr_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daL7lowDr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_L7lowDr_e, + /* Actor SubMtd */ &l_daL7lowDr_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_L7op_demo_dr.cpp b/src/d/actor/d_a_L7op_demo_dr.cpp index e707f4d5541..3053a01d565 100644 --- a/src/d/actor/d_a_L7op_demo_dr.cpp +++ b/src/d/actor/d_a_L7op_demo_dr.cpp @@ -840,18 +840,18 @@ static actor_method_class l_daL7ODR_Method = { }; actor_process_profile_definition g_profile_L7ODR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_L7ODR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daL7ODR_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 222, // mPriority - &l_daL7ODR_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_L7ODR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daL7ODR_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_L7ODR_e, + /* Actor SubMtd */ &l_daL7ODR_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 66ffb5484d6..8d2cb7b6355 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -203,8 +203,8 @@ static f32 const l_wolfFootOnFrame[6][4] = { }; static s16 const l_insectNameList[12] = { - PROC_Obj_Kabuto, PROC_Obj_Cho, PROC_Obj_Kuw, PROC_Obj_Batta, PROC_Obj_Nan, PROC_Obj_Dan, - PROC_Obj_Kam, PROC_Obj_Ten, PROC_Obj_Kat, PROC_Obj_Tombo, PROC_Obj_Ari, PROC_Obj_Kag, + fpcNm_Obj_Kabuto_e, fpcNm_Obj_Cho_e, fpcNm_Obj_Kuw_e, fpcNm_Obj_Batta_e, fpcNm_Obj_Nan_e, fpcNm_Obj_Dan_e, + fpcNm_Obj_Kam_e, fpcNm_Obj_Ten_e, fpcNm_Obj_Kat_e, fpcNm_Obj_Tombo_e, fpcNm_Obj_Ari_e, fpcNm_Obj_Kag_e, }; #if DEBUG @@ -2068,7 +2068,7 @@ void daAlink_c::tgHitCallback(fopAc_ac_c* i_atActor, dCcD_GObjInf* i_tgObjInf, d void daAlink_c::coHitCallback(fopAc_ac_c* i_coHitActor, dCcD_GObjInf* i_coHitObj) { if (!checkWolf() && !checkNoResetFlg3(FLG3_UNK_20000000)) { if (((mProcID != PROC_CUT_HEAD && mProcID != PROC_CUT_DOWN) || i_coHitActor != field_0x280c.getActor()) - && (!checkModeFlg(0x10040) || fopAcM_GetName(i_coHitActor) == PROC_CSTAF)) + && (!checkModeFlg(0x10040) || fopAcM_GetName(i_coHitActor) == fpcNm_CSTAF_e)) { field_0x372c += *mCcStts.GetCCMoveP(); } @@ -2076,7 +2076,7 @@ void daAlink_c::coHitCallback(fopAc_ac_c* i_coHitActor, dCcD_GObjInf* i_coHitObj field_0x30fe++; } - if (fopAcM_GetName(i_coHitActor) == PROC_Obj_WaterFall) { + if (fopAcM_GetName(i_coHitActor) == fpcNm_Obj_WaterFall_e) { if (checkWolf()) { if (i_coHitObj == &mTgCyls[0]) { onEndResetFlg1(ERFLG1_WATERFALL_FRONT_HIT); @@ -2661,7 +2661,7 @@ void daAlink_c::setHatAngle() { if (!checkNoResetFlg0(FLG0_SWIM_UP)) { sp9C.y -= 2.0f; - } else if (checkMagneBootsOn() && getMoveBGActorName(mMagneLineChk, FALSE) == PROC_Obj_MagneArm) { + } else if (checkMagneBootsOn() && getMoveBGActorName(mMagneLineChk, FALSE) == fpcNm_Obj_MagneArm_e) { sp9C.y += 5.0f; } else { sp9C.y -= 5.0f; @@ -2906,7 +2906,7 @@ bool daAlink_c::checkActorPosAngle(fopAc_ac_c* i_actor, cXyz** o_ppos) { field_0x311c = 0x50; } - if (actor_name == PROC_Obj_Wchain || (actor_name == PROC_B_MGN && !((daB_MGN_c*)i_actor)->isDown())) { + if (actor_name == fpcNm_Obj_Wchain_e || (actor_name == fpcNm_B_MGN_e && !((daB_MGN_c*)i_actor)->isDown())) { onNoResetFlg1(FLG1_MIDNA_HAIR_ATN_POS); mMidnaHairAtnPos = i_actor->eyePos; } @@ -2939,22 +2939,22 @@ cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) { daMidna_c* midna = (daMidna_c*)getMidnaActor(); s16 actor_name = fopAcM_GetName(look_actor); - if (actor_name == PROC_MIDNA - || actor_name == PROC_Tag_Wljump - || (actor_name == PROC_Tag_Mhint && ((daTagMhint_c*)look_actor)->checkNoAttention()) - || (actor_name == PROC_Tag_Mstop && ((daTagMstop_c*)look_actor)->checkNoAttention()) - || (actor_name == PROC_Tag_Mwait && ((daTagMwait_c*)look_actor)->checkEndMessage())) + if (actor_name == fpcNm_MIDNA_e + || actor_name == fpcNm_Tag_Wljump_e + || (actor_name == fpcNm_Tag_Mhint_e && ((daTagMhint_c*)look_actor)->checkNoAttention()) + || (actor_name == fpcNm_Tag_Mstop_e && ((daTagMstop_c*)look_actor)->checkNoAttention()) + || (actor_name == fpcNm_Tag_Mwait_e && ((daTagMwait_c*)look_actor)->checkEndMessage())) { *param_1 = 1; return &midna->eyePos; } - if (actor_name == PROC_Tag_Mhint || actor_name == PROC_Tag_Mstop) { + if (actor_name == fpcNm_Tag_Mhint_e || actor_name == fpcNm_Tag_Mstop_e) { midna->setForceNeckAimPos(look_actor->eyePos); } } } - } else if (mProcID == PROC_BOTTLE_OPEN && mEquipItem == fpcNm_ITEM_FAIRY) { + } else if (mProcID == PROC_BOTTLE_OPEN && mEquipItem == dItemNo_FAIRY_e) { look_actor = field_0x285c.getActor(); } else if (mProcID == PROC_FISHING_CAST || mProcID == PROC_CANOE_FISHING_WAIT || mProcID == PROC_CANOE_FISHING_REEL || mProcID == PROC_CANOE_FISHING_GET) { look_actor = mItemAcKeep.getActor(); @@ -3021,13 +3021,13 @@ cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) { } if (dComIfGp_att_getLookTarget() != NULL) { - if (fopAcM_GetName(dComIfGp_att_getLookTarget()) == PROC_E_NZ) { + if (fopAcM_GetName(dComIfGp_att_getLookTarget()) == fpcNm_E_NZ_e) { *param_1 = 0; } return &dComIfGp_att_getLookTarget()->eyePos; } - if ((checkActorPosAngle(field_0x27f0, &sp1C) && (field_0x27f0 == NULL || fopAcM_GetName(field_0x27f0) != PROC_Tag_WaraHowl)) + if ((checkActorPosAngle(field_0x27f0, &sp1C) && (field_0x27f0 == NULL || fopAcM_GetName(field_0x27f0) != fpcNm_Tag_WaraHowl_e)) || checkActorPosAngle(spC, &sp1C) || checkActorPosAngle(field_0x27f8, &sp1C)) { @@ -3131,7 +3131,7 @@ cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) { || demoMode == daPy_demo_c::DEMO_UNEQUIP_e) { spC = getDemoLookActor(); - if (spC != NULL && fopAcM_GetName(spC) == PROC_MIDNA) { + if (spC != NULL && fopAcM_GetName(spC) == fpcNm_MIDNA_e) { return &spC->eyePos; } @@ -3435,7 +3435,7 @@ bool daAlink_c::commonLineCheck(cXyz* i_startPos, cXyz* i_endPos) { * * @param i_polyinf The polygon info to check * @param i_forceCheck Forces the check to happen regardless of if the poly is safe or not - * @return The actor name of the actor associated with the polygon info. defaults to PROC_ALINK + * @return The actor name of the actor associated with the polygon info. defaults to fpcNm_ALINK_e */ s16 daAlink_c::getMoveBGActorName(cBgS_PolyInfo& i_polyinf, BOOL i_forceCheck) { if ((i_forceCheck || dComIfG_Bgsp().ChkPolySafe(i_polyinf)) && @@ -3444,11 +3444,11 @@ s16 daAlink_c::getMoveBGActorName(cBgS_PolyInfo& i_polyinf, BOOL i_forceCheck) { return fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(i_polyinf)); } - return PROC_ALINK; + return fpcNm_ALINK_e; } fopAc_ac_c* daAlink_c::checkGoronRide() { - if (mLinkAcch.ChkGroundHit() && getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == PROC_OBJ_GRA) { + if (mLinkAcch.ChkGroundHit() && getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == fpcNm_OBJ_GRA_e) { return dComIfG_Bgsp().GetActorPointer(mLinkAcch.m_gnd); } @@ -4416,8 +4416,8 @@ BOOL daAlink_c::checkCanoeStart() { void daAlink_c::playerInit() { mHeavySpeedMultiplier = 1.0f; - if (!checkDungeon() && !checkBossRoom() && checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1)) { - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_TKS_LETTER); + if (!checkDungeon() && !checkBossRoom() && checkItemGet(dItemNo_DUNGEON_EXIT_e, 1)) { + dComIfGs_setItem(SLOT_18, dItemNo_TKS_LETTER_e); } u16 i; @@ -4551,7 +4551,7 @@ void daAlink_c::playerInit() { field_0x33b8 = -G_CM3D_F_INF; field_0x33bc = -G_CM3D_F_INF; - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; offSwordModel(); mAlinkStaffId = -1; @@ -4662,7 +4662,7 @@ int daAlink_c::setStartProcInit() { setFaceBasicAnime(ANM_WAIT); } else { mEquipItem = (dComIfGs_getLastSceneMode() >> 0x18) & 0xFF; - if (mEquipItem == fpcNm_ITEM_SWORD) { + if (mEquipItem == dItemNo_SWORD_e) { mEquipItem = 0x103; } else if (checkStageName("D_MN09B") && last_mode != 8 && start_mode == 2) { mEquipItem = 0x103; @@ -4675,12 +4675,12 @@ int daAlink_c::setStartProcInit() { || (isHorseStart && mEquipItem != 0x103 && !checkBowAndSlingItem(mEquipItem) - && mEquipItem != fpcNm_ITEM_BOOMERANG - && mEquipItem != fpcNm_ITEM_KANTERA + && mEquipItem != dItemNo_BOOMERANG_e + && mEquipItem != dItemNo_KANTERA_e && !checkHookshotItem(mEquipItem)) ) { - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; } else { setItemModel(); } @@ -4865,22 +4865,22 @@ int daAlink_c::create() { if (!bgWaitFlg) { #if DEBUG if (g_playerKind == 2) { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_CASUAL); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_CASUAL_e); } else if (g_playerKind == 3) { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_KOKIRI); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_KOKIRI_e); } else if (g_playerKind == 4) { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_ZORA); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_ZORA_e); } else if (g_playerKind == 5) { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_ARMOR); + dComIfGs_setSelectEquipClothes(dItemNo_ARMOR_e); } else #endif // Event Flag: Finished Sewers if (checkCasualWearFlg() && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[47])) { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_KOKIRI); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_KOKIRI_e); } if (isEnteringLV7 && checkMagicArmorHeavy()) { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_KOKIRI); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_KOKIRI_e); } dComIfGp_setPlayer(0, this); @@ -4954,10 +4954,10 @@ int daAlink_c::create() { bgWaitFlg = TRUE; if (checkCanoeStart()) { - mRideActorID = fopAcM_create(PROC_CANOE, 0, ¤t.pos, fopAcM_GetRoomNo(this), + mRideActorID = fopAcM_create(fpcNm_CANOE_e, 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } else if (sceneMode == 11) { - mRideActorID = fopAcM_create(PROC_Obj_IceLeaf, 0x1FFFF, ¤t.pos, + mRideActorID = fopAcM_create(fpcNm_Obj_IceLeaf_e, 0x1FFFF, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } else { mRideActorID = fpcM_ERROR_PROCESS_ID_e; @@ -5060,7 +5060,7 @@ int daAlink_c::create() { l_jumpTop = 0.0f; #endif - fopAcM_create(PROC_MIDNA, midna_prm, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); + fopAcM_create(fpcNm_MIDNA_e, midna_prm, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); checkSetNpcTks(¤t.pos, fopAcM_GetRoomNo(this), 1); if (startPoint == -4 && dComIfGp_TargetWarpPt_get() != 0xFF && !dComIfGp_TransportWarp_check()) { @@ -5068,8 +5068,8 @@ int daAlink_c::create() { } if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) == dStage_SaveTbl_LV2) { - if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD) && !dComIfGs_isItemFirstBit(fpcNm_ITEM_SHIELD) && - !dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD)) + if (!dComIfGs_isItemFirstBit(dItemNo_HYLIA_SHIELD_e) && !dComIfGs_isItemFirstBit(dItemNo_SHIELD_e) && + !dComIfGs_isItemFirstBit(dItemNo_WOOD_SHIELD_e)) { fopAcM_onSwitch(this, 0x6F); } else { @@ -5832,7 +5832,7 @@ void daAlink_c::setSwordPos() { if (mEquipItem == 0x10B) { mDoMtx_multVec(getCanoePaddleMatrix(), getCanoeLocalPaddleTop(), &field_0x3720); - } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + } else if (mEquipItem == dItemNo_COPY_ROD_e) { mDoMtx_multVec(mHeldItemModel->getBaseTRMtx(), ©RodTop, &field_0x3720); } else { field_0x3720 = mSwordTopPos; @@ -5874,7 +5874,7 @@ void daAlink_c::setItemMatrix(int param_0) { if (mShieldChangeWaitTimer == 0) { if (param_0 != 0 - || (checkPlayerGuardAndAttack() && mEquipItem != fpcNm_ITEM_IRONBALL && !checkModeFlg(0x400)) + || (checkPlayerGuardAndAttack() && mEquipItem != dItemNo_IRONBALL_e && !checkModeFlg(0x400)) || checkNoResetFlg0(FLG0_UNK_2) || (mProcID == PROC_TOOL_DEMO && mProcVar4.field_0x3010 != 0) || (mProcID == PROC_CUT_REVERSE && mProcVar2.field_0x300c != 0) @@ -5993,10 +5993,10 @@ void daAlink_c::setItemMatrix(int param_0) { } } else if (checkHookshotItem(mEquipItem)) { setHookshotPos(); - } else if (mEquipItem == fpcNm_ITEM_IRONBALL) { + } else if (mEquipItem == dItemNo_IRONBALL_e) { setIronBallPos(); } else { - if (mEquipItem == fpcNm_ITEM_COPY_ROD && mProcID != PROC_COPY_ROD_REVIVE) { + if (mEquipItem == dItemNo_COPY_ROD_e && mProcID != PROC_COPY_ROD_REVIVE) { if (checkCopyRodTopUse()) { field_0x0724->setFrame(field_0x0724->getFrameMax() - 0.001f); } else { @@ -6022,7 +6022,7 @@ void daAlink_c::setItemMatrix(int param_0) { simpleAnmPlay(mpKanteraGlowBtk); if (mProcID != PROC_OPEN_TREASURE && !checkEndResetFlg1(ERFLG1_UNK_4) && (mProcID != PROC_GET_ITEM || mProcVar4.field_0x3010 == 0)) { - if (mEquipItem == fpcNm_ITEM_KANTERA || checkOilBottleItemNotGet(mEquipItem)) { + if (mEquipItem == dItemNo_KANTERA_e || checkOilBottleItemNotGet(mEquipItem)) { mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(mLeftItemJntNo)); mDoMtx_stack_c::transM(-2.0f, -0.1f, -0.7f); mDoMtx_stack_c::XYZrotM(cM_deg2s(100.0f), cM_deg2s(9.3f), cM_deg2s(183.0f)); @@ -6333,7 +6333,7 @@ void daAlink_c::setAtCollision() { mAtCps[0].SetAtVec(spA4); dComIfG_Ccsp()->Set(&mAtCps[0]); } else if (mProcID == PROC_BOTTLE_OPEN) { - if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE && mProcVar4.field_0x3010 != 0) { + if (mEquipItem == dItemNo_WATER_BOTTLE_e && mProcVar4.field_0x3010 != 0) { mDoMtx_multVec(mHeldItemModel->getBaseTRMtx(), &bottleTopPos, &spC8); if (field_0x27c8.getKeepMinY() < spC8.y) { @@ -6455,7 +6455,7 @@ void daAlink_c::setAtCollision() { } else { mAtSph.ResetAtHit(); } - } else if (mEquipItem == fpcNm_ITEM_IRONBALL) { + } else if (mEquipItem == dItemNo_IRONBALL_e) { if (mItemVar0.field_0x3018 == 2 || mItemVar0.field_0x3018 == 3 || mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 7 || mItemVar0.field_0x3018 == 6) { #if DEBUG @@ -6861,7 +6861,7 @@ const daAlink_BckData* daAlink_c::getMainBckData(daAlink_c::daAlink_ANM i_anmID) {dRes_ID_ALANM_BCK_WAITHS_e, dRes_ID_ALANM_BCK_WAITHK_e}, }; - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { if (i_anmID == ANM_WAIT) { return &kandelaarAnm[0]; } @@ -6876,7 +6876,7 @@ const daAlink_BckData* daAlink_c::getMainBckData(daAlink_c::daAlink_ANM i_anmID) } if ((mEquipItem == 0x103 && i_anmID < ANM_STEP_TURN && i_anmID >= ANM_ATN_WAIT_LEFT) || - (i_anmID == ANM_SWIM_WAIT && mEquipItem != fpcNm_ITEM_NONE)) + (i_anmID == ANM_SWIM_WAIT && mEquipItem != dItemNo_NONE_e)) { return &m_mainBckSword[i_anmID - ANM_ATN_WAIT_LEFT]; } @@ -9147,7 +9147,7 @@ void daAlink_c::setSandShapeOffset() { } bool daAlink_c::checkLv2MiddleBossBgRide(s16 i_procName) { - return i_procName == PROC_OBJ_MSIMA || i_procName == PROC_B_ZANTS; + return i_procName == fpcNm_OBJ_MSIMA_e || i_procName == fpcNm_B_ZANTS_e; } bool daAlink_c::getSlidePolygon(cM3dGPla* o_tripla) { @@ -9163,7 +9163,7 @@ bool daAlink_c::getSlidePolygon(cM3dGPla* o_tripla) { s16 movebg_actorName = getMoveBGActorName(mLinkAcch.m_gnd, TRUE); if (dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, o_tripla) - && (!checkBootsOrArmorHeavy() || (movebg_actorName != PROC_Obj_RotStair && movebg_actorName != PROC_Obj_Lv3R10Saka)) + && (!checkBootsOrArmorHeavy() || (movebg_actorName != fpcNm_Obj_RotStair_e && movebg_actorName != fpcNm_Obj_Lv3R10Saka_e)) && ((mGroundCode != 8 && (mGndPolySpecialCode == 1 || (o_tripla->mNormal.y < field_0x3470 && mGndPolySpecialCode != 2))) || (mGndPolySpecialCode == 5 && !checkWolf() && (!checkInputOnR() || mProcID == PROC_SLIDE) && (o_tripla->mNormal.y < cM_scos(field_0x3122))) || (!checkEquipHeavyBoots() @@ -9627,8 +9627,8 @@ BOOL daAlink_c::checkAtnWaitAnime() { if ((mTargetedActor != NULL && (checkEnemyGroup(mTargetedActor) || checkGoatCatchActor(mTargetedActor) - || fopAcM_GetName(mTargetedActor) == PROC_CROD - || fopAcM_GetName(mTargetedActor) == PROC_BOOMERANG + || fopAcM_GetName(mTargetedActor) == fpcNm_CROD_e + || fopAcM_GetName(mTargetedActor) == fpcNm_BOOMERANG_e ) ) || (checkGrabAnimeUp() @@ -10222,7 +10222,7 @@ BOOL daAlink_c::setTalkStatus() { if (field_0x27f4->attention_info.flags & fopAc_AttnFlag_UNK_0x800000) { setDoStatus(BUTTON_STATUS_LISTEN); } else if (field_0x27f4->attention_info.flags & fopAc_AttnFlag_TALKCHECK_e) { - if (fopAcM_GetName(field_0x27f4) == PROC_OBJ_SSDRINK) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_OBJ_SSDRINK_e) { setDoStatus(BUTTON_STATUS_DRINK); } else { setDoStatus(BUTTON_STATUS_CHECK); @@ -10256,7 +10256,7 @@ void daAlink_c::decideCommonDoStatus() { if (checkRoomOnly() && !checkWolf() && !isFshopStage) { if ((checkNoUpperAnime() || checkIronBallWaitAnime()) && - (mEquipItem != fpcNm_ITEM_NONE && checkModeFlg(4) && mEquipItem != 0x102)) + (mEquipItem != dItemNo_NONE_e && checkModeFlg(4) && mEquipItem != 0x102)) { if (checkCopyRodControllAnime()) { setDoStatus(BUTTON_STATUS_QUIT); @@ -10276,7 +10276,7 @@ void daAlink_c::decideCommonDoStatus() { setDoStatusEmphasys(BUTTON_STATUS_JUMP); } else { if (mTargetedActor != NULL) { - if (fopAcM_GetName(mTargetedActor) == PROC_Tag_Wljump) { + if (fopAcM_GetName(mTargetedActor) == fpcNm_Tag_Wljump_e) { if (static_cast(mTargetedActor)->getLockPos() != NULL) { if (!getMidnaActor()->checkNoInput()) { setDoStatus(BUTTON_STATUS_UNK_147); @@ -10341,7 +10341,7 @@ void daAlink_c::decideCommonDoStatus() { } } else if (((checkNoUpperAnime()) || checkIronBallWaitAnime() || checkCopyRodControllAnime()) && - mEquipItem != fpcNm_ITEM_NONE && checkModeFlg(4) && mStickValue <= frontRollRate) + mEquipItem != dItemNo_NONE_e && checkModeFlg(4) && mStickValue <= frontRollRate) { if (mEquipItem == 0x102) { if (checkAttentionState()) { @@ -10421,34 +10421,34 @@ void daAlink_c::decideDoStatus() { (!checkWolf() || static_cast(field_0x27f4)->checkSmallTbox()))) { setDoStatus(BUTTON_STATUS_OPEN); - } else if (mAttList->mType == fopAc_attn_ETC_e && actor_name == PROC_KYTAG05) { + } else if (mAttList->mType == fopAc_attn_ETC_e && actor_name == fpcNm_KYTAG05_e) { setDoStatus(BUTTON_STATUS_UNK_137); } else if (checkWolf()) { if (mAttList->mType == fopAc_attn_CARRY_e && !fopAcM_checkCarryNow(field_0x27f4) && fopAcM_CheckCarryType(field_0x27f4, fopAcM_CARRY_LIGHT)) { - if (actor_name == PROC_B_MGN) { + if (actor_name == fpcNm_B_MGN_e) { setDoStatus(BUTTON_STATUS_UNK_145); - } else if (actor_name == PROC_Obj_Yobikusa) { + } else if (actor_name == fpcNm_Obj_Yobikusa_e) { setDoStatusEmphasys(BUTTON_STATUS_HOWL); - } else if (actor_name == PROC_Obj_Stone) { + } else if (actor_name == fpcNm_Obj_Stone_e) { setDoStatus(BUTTON_STATUS_ROLL); - } else if (actor_name == PROC_Obj_Drop || actor_name == PROC_Obj_Sword || - actor_name == PROC_Obj_SmallKey) + } else if (actor_name == fpcNm_Obj_Drop_e || actor_name == fpcNm_Obj_Sword_e || + actor_name == fpcNm_Obj_SmallKey_e) { setDoStatusEmphasys(BUTTON_STATUS_UNK_57); } else if (!checkGoatCatchActor(field_0x27f4) && !checkGrabLineCheck()) { setDoStatusEmphasys(BUTTON_STATUS_PICK_UP); } } else if (mTargetedActor != NULL && - fopAcM_GetName(mTargetedActor) == PROC_B_MGN && + fopAcM_GetName(mTargetedActor) == fpcNm_B_MGN_e && mAttention->getActionBtnB() != NULL && mAttention->getActionBtnB()->mType == fopAc_attn_CARRY_e && mAttention->getActionBtnB()->getActor() == mTargetedActor) { setDoStatus(BUTTON_STATUS_UNK_145); } else if (mTargetedActor != NULL && - fopAcM_GetName(mTargetedActor) == PROC_E_YM && + fopAcM_GetName(mTargetedActor) == fpcNm_E_YM_e && mAttention->getActionBtnB() != NULL && mAttention->getActionBtnB()->mType == fopAc_attn_ETC_e && mAttention->getActionBtnB()->getActor() == mTargetedActor) @@ -10458,25 +10458,25 @@ void daAlink_c::decideDoStatus() { setWolfDigStatus(BUTTON_STATUS_FLAG_EMPHASIS); } } else if (mAttList->mType == fopAc_attn_ETC_e && field_0x27f4 != NULL) { - if (actor_name == PROC_Obj_Digpl || actor_name == PROC_Obj_Digholl || - actor_name == PROC_Obj_DigSnow || actor_name == PROC_Obj_Lv4DigSand || - actor_name == PROC_E_YM) + if (actor_name == fpcNm_Obj_Digpl_e || actor_name == fpcNm_Obj_Digholl_e || + actor_name == fpcNm_Obj_DigSnow_e || actor_name == fpcNm_Obj_Lv4DigSand_e || + actor_name == fpcNm_E_YM_e) { onEndResetFlg1(ERFLG1_UNK_100000); if (mWolfEyeUp != 0) { setWolfDigStatus(BUTTON_STATUS_FLAG_EMPHASIS); } - } else if (actor_name == PROC_TAG_HOWL || - actor_name == PROC_Obj_WindStone || - actor_name == PROC_Obj_SmWStone || - actor_name == PROC_Tag_WaraHowl) + } else if (actor_name == fpcNm_TAG_HOWL_e || + actor_name == fpcNm_Obj_WindStone_e || + actor_name == fpcNm_Obj_SmWStone_e || + actor_name == fpcNm_Tag_WaraHowl_e) { setDoStatusEmphasys(BUTTON_STATUS_HOWL); - } else if (actor_name == PROC_KYTAG03) { + } else if (actor_name == fpcNm_KYTAG03_e) { setDoStatusEmphasys(BUTTON_STATUS_SNIFF); } } else if (mTargetedActor != NULL && field_0x27f4 == mTargetedActor && - actor_name == PROC_Obj_Wchain) + actor_name == fpcNm_Obj_Wchain_e) { setDoStatusEmphasys(BUTTON_STATUS_UNK_123); } else { @@ -10484,17 +10484,17 @@ void daAlink_c::decideDoStatus() { } } else if (mAttList->mType == fopAc_attn_ETC_e) { if ((!checkMagicArmorHeavy() && - (actor_name == PROC_HORSE || actor_name == PROC_E_WB) && + (actor_name == fpcNm_HORSE_e || actor_name == fpcNm_E_WB_e) && checkReinRideBgCheck()) || - actor_name == PROC_CANOE || actor_name == PROC_Obj_IceLeaf) + actor_name == fpcNm_CANOE_e || actor_name == fpcNm_Obj_IceLeaf_e) { setDoStatus(BUTTON_STATUS_GET_ON); - } else if (actor_name == PROC_COW) { + } else if (actor_name == fpcNm_COW_e) { setDoStatus(BUTTON_STATUS_PET); - } else if (actor_name == PROC_Obj_YIblltray) { + } else if (actor_name == fpcNm_Obj_YIblltray_e) { setDoStatusEmphasys(BUTTON_STATUS_UNK_153); - } else if (actor_name == PROC_Tag_Lv6Gate || - (actor_name == PROC_TAG_KMSG && + } else if (actor_name == fpcNm_Tag_Lv6Gate_e || + (actor_name == fpcNm_TAG_KMSG_e && static_cast(field_0x27f4)->getType() == 3)) { if (!checkEquipAnime() && checkMasterSwordEquip()) { @@ -10514,15 +10514,15 @@ void daAlink_c::decideDoStatus() { } else if (!checkMagneBootsOn()) { if (checkInsectActorName(field_0x27f4)) { setDoStatusEmphasys(BUTTON_STATUS_UNK_152); - } else if (actor_name == PROC_Obj_SmallKey) { + } else if (actor_name == fpcNm_Obj_SmallKey_e) { setDoStatusEmphasys(BUTTON_STATUS_UNK_57); } else if (!checkGrabLineCheck()) { - if (actor_name == PROC_Obj_Yobikusa) { + if (actor_name == fpcNm_Obj_Yobikusa_e) { setDoStatus(BUTTON_STATUS_PICK); } else if (fopAcM_CheckCarryType(field_0x27f4, fopAcM_CARRY_TYPE_8)) { setDoStatusEmphasys(BUTTON_STATUS_UNK_52); - } else if (actor_name != PROC_B_MGN) { + } else if (actor_name != fpcNm_B_MGN_e) { setDoStatusEmphasys(BUTTON_STATUS_UNK_31); } } @@ -10827,7 +10827,7 @@ BOOL daAlink_c::checkAutoJumpAction() { sp18 = 60.0f; } - if (dComIfGs_getLife() != 0 || dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) { + if (dComIfGs_getLife() != 0 || dComIfGs_checkBottle(dItemNo_FAIRY_e)) { if (!checkGoronSideMove() && (!checkNotAutoJumpStage() || checkWolf())) { if (field_0x3178 != 3 && !checkEndResetFlg0(ERFLG0_NOT_AUTO_JUMP)) { if (sp14 >= sp10 @@ -11059,9 +11059,9 @@ BOOL daAlink_c::checkFrontWallTypeAction() { int daAlink_c::checkItemActionInitStart() { if (checkBowAndSlingItem(mEquipItem)) { return checkNextActionBow(); - } else if (mEquipItem == fpcNm_ITEM_BOOMERANG) { + } else if (mEquipItem == dItemNo_BOOMERANG_e) { return checkNextActionBoomerang(); - } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + } else if (mEquipItem == dItemNo_COPY_ROD_e) { if (mCopyRodAcKeep.getActor() == NULL) { return checkNextActionCopyRod(); } @@ -11072,13 +11072,13 @@ int daAlink_c::checkItemActionInitStart() { } else if (checkFishingRodItem(mEquipItem)) { onResetFlg1(RFLG0_FISHINGROD_USE_START); return 1; - } else if (mEquipItem == fpcNm_ITEM_IRONBALL) { + } else if (mEquipItem == dItemNo_IRONBALL_e) { if (!checkIronBallAnime()) { return checkNextActionIronBall(); } - } else if (mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE) { + } else if (mEquipItem == dItemNo_EMPTY_BOTTLE_e) { return procBottleSwingInit(NULL, 0); - } else if (mEquipItem == fpcNm_ITEM_KANTERA) { + } else if (mEquipItem == dItemNo_KANTERA_e) { if (!checkModeFlg(0x400)) { return procKandelaarSwingInit(); } @@ -11138,7 +11138,7 @@ int daAlink_c::cancelUpperItemReadyAnime(BOOL param_0) { { seStartSystem(Z2SE_SY_ITEM_USE_CANCEL); - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { mItemVar0.field_0x3018 = 8; procIronBallReturnInit(); } else { @@ -11159,7 +11159,7 @@ BOOL daAlink_c::checkItemActorPointer() { mItemAcKeep.clearData(); resetUpperAnime(UPPER_2, -1.0f); - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; if (checkModeFlg(MODE_RIDING)) { if (checkCanoeRide()) { @@ -11205,9 +11205,9 @@ bool daAlink_c::checkSwordTwirlAction() { BOOL daAlink_c::checkUpperItemActionFly() { if (checkBowAndSlingItem(mEquipItem)) { checkUpperItemActionBowFly(); - } else if (mEquipItem == fpcNm_ITEM_BOOMERANG) { + } else if (mEquipItem == dItemNo_BOOMERANG_e) { checkUpperItemActionBoomerangFly(); - } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + } else if (mEquipItem == dItemNo_COPY_ROD_e) { checkUpperItemActionCopyRodFly(); } @@ -11215,7 +11215,7 @@ BOOL daAlink_c::checkUpperItemActionFly() { } void daAlink_c::checkItemButtonChange() { - if (mProcID != PROC_CANOE_PADDLE_PUT && mEquipItem != fpcNm_ITEM_NONE && !checkEquipAnime()) { + if (mProcID != PROC_CANOE_PADDLE_PUT && mEquipItem != dItemNo_NONE_e && !checkEquipAnime()) { u8 temp_r0; for (u8 i = 0; i < 2; i++) { temp_r0 = (i + 1) % 2; @@ -11231,9 +11231,9 @@ void daAlink_c::checkItemButtonChange() { BOOL daAlink_c::checkUpperItemAction() { if (checkNoUpperAnime()) { if (checkModeFlg(0x1000)) { - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { setIronBallWaitUpperAnime(0); - } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + } else if (mEquipItem == dItemNo_COPY_ROD_e) { setCopyRodControllAnime(); } } @@ -11345,9 +11345,9 @@ BOOL daAlink_c::checkUpperItemAction() { if (checkUpperItemActionIronBall()) { return true; } - } else if (mEquipItem == fpcNm_ITEM_IRONBALL) { + } else if (mEquipItem == dItemNo_IRONBALL_e) { setIronBallWaitUpperAnime(0); - } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + } else if (mEquipItem == dItemNo_COPY_ROD_e) { setCopyRodControllAnime(); } @@ -11407,7 +11407,7 @@ int daAlink_c::orderTalk(int i_checkZTalk) { static void* daAlink_searchBouDoor(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_NPC_BOU && ((daNpc_Bou_c*)i_actor)->speakTo()) { + if (fopAcM_GetName(i_actor) == fpcNm_NPC_BOU_e && ((daNpc_Bou_c*)i_actor)->speakTo()) { return i_actor; } @@ -11417,7 +11417,7 @@ static void* daAlink_searchBouDoor(fopAc_ac_c* i_actor, void* i_data) { static void* daAlink_searchKolin(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_NPC_KOLIN && ((daNpc_Kolin_c*)i_actor)->orderNoRideEvt()) { + if (fopAcM_GetName(i_actor) == fpcNm_NPC_KOLIN_e && ((daNpc_Kolin_c*)i_actor)->orderNoRideEvt()) { return i_actor; } @@ -11454,7 +11454,7 @@ int daAlink_c::orderZTalk() { ) { if (zhint != NULL) { - if (fopAcM_GetName(zhint) == PROC_Tag_Mhint && ((daTagMhint_c*)zhint)->checkEventID()) { + if (fopAcM_GetName(zhint) == fpcNm_Tag_Mhint_e && ((daTagMhint_c*)zhint)->checkEventID()) { fopAcM_orderOtherEventId(zhint, ((daTagMhint_c*)zhint)->getEventID(), ((daTagMhint_c*)zhint)->getToolEventID(), 0xFFFF, 0, 1); } else { fopAcM_orderTalkEvent(this, zhint, 0, 0); @@ -11523,11 +11523,11 @@ int daAlink_c::checkNormalAction() { } if (dComIfGp_getDoStatus() == BUTTON_STATUS_GET_ON) { - if (fopAcM_GetName(field_0x27f4) == PROC_Obj_IceLeaf) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_Obj_IceLeaf_e) { return procBoardRideInit(); } - if (fopAcM_GetName(field_0x27f4) == PROC_CANOE) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_CANOE_e) { if (checkModeFlg(0x40000)) { return procCanoeRideInit(); } else { @@ -11580,7 +11580,7 @@ int daAlink_c::checkNormalAction() { } if (dComIfGp_getDoStatus() == BUTTON_STATUS_STRIKE) { - if (fopAcM_GetName(field_0x27f4) == PROC_Tag_Lv6Gate) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_Tag_Lv6Gate_e) { static_cast(field_0x27f4)->stabMasterSword(); } else { static_cast(field_0x27f4)->stabMasterSword(); @@ -11657,7 +11657,7 @@ int daAlink_c::checkNormalAction() { bool daAlink_c::checkReadyItem() { #if PLATFORM_GCN - if (mEquipItem == fpcNm_ITEM_NONE) { + if (mEquipItem == dItemNo_NONE_e) { return false; } #endif @@ -11688,7 +11688,7 @@ BOOL daAlink_c::checkItemAction() { } if ((checkEndResetFlg1(ERFLG1_UNK_100000) || mTargetedActor == NULL) && wolfClawTrigger()) { - if (checkEndResetFlg1(ERFLG1_UNK_100000) && field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == PROC_Obj_Digholl) { + if (checkEndResetFlg1(ERFLG1_UNK_100000) && field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == fpcNm_Obj_Digholl_e) { return procWolfDigThroughInit(0); } @@ -11969,7 +11969,7 @@ void daAlink_c::swordUnequip() { } void daAlink_c::itemEquip(u16 i_itemID) { - if (mThrowBoomerangAcKeep.getActor() == NULL || i_itemID != fpcNm_ITEM_BOOMERANG) { + if (mThrowBoomerangAcKeep.getActor() == NULL || i_itemID != dItemNo_BOOMERANG_e) { field_0x2fde = i_itemID; dComIfGp_clearPlayerStatus0(0, 0x400000); offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); @@ -11987,8 +11987,8 @@ void daAlink_c::itemUnequip(u16 i_itemID, f32 i_playSpeed) { u16 anm_id; const daAlinkHIO_anm_c* anm_data; - if (i_itemID == fpcNm_ITEM_BOOMERANG || i_itemID == fpcNm_ITEM_COPY_ROD || i_itemID == fpcNm_ITEM_KANTERA || - i_itemID == fpcNm_ITEM_HOOKSHOT || checkBottleItem(i_itemID)) + if (i_itemID == dItemNo_BOOMERANG_e || i_itemID == dItemNo_COPY_ROD_e || i_itemID == dItemNo_KANTERA_e || + i_itemID == dItemNo_HOOKSHOT_e || checkBottleItem(i_itemID)) { anm_id = dRes_ID_ALANM_BCK_TAKEL_e; anm_data = &mpHIO->mItem.m.mOneHandEquipAnm; @@ -12025,14 +12025,14 @@ bool daAlink_c::checkFastUnequip() { void daAlink_c::allUnequip(BOOL param_0) { if (checkNoResetFlg2(FLG2_UNK_1) && param_0 && !checkCanoeRide() && - mEquipItem != fpcNm_ITEM_KANTERA) + mEquipItem != dItemNo_KANTERA_e) { for (u8 i = 0; i < 2; i++) { - if (dComIfGp_getSelectItem(i) == fpcNm_ITEM_KANTERA) { + if (dComIfGp_getSelectItem(i) == dItemNo_KANTERA_e) { mSelectItemId = i; } } - itemEquip(fpcNm_ITEM_KANTERA); + itemEquip(dItemNo_KANTERA_e); onNoResetFlg1(FLG1_UNK_40); return; } else if (mEquipItem == 0x103) { @@ -12057,7 +12057,7 @@ BOOL daAlink_c::checkItemChangeFromButton() { { if ( #if PLATFORM_GCN - dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE && + dComIfGs_getSelectEquipSword() != dItemNo_NONE_e && #endif !checkNotBattleStage() && !checkCanoeRide() @@ -12088,7 +12088,7 @@ BOOL daAlink_c::checkItemChangeFromButton() { } if (doTrigger() && dComIfGp_getDoStatus() == BUTTON_STATUS_PUT_AWAY) { - if (mEquipItem != fpcNm_ITEM_KANTERA && checkNoResetFlg2(FLG2_UNK_1)) { + if (mEquipItem != dItemNo_KANTERA_e && checkNoResetFlg2(FLG2_UNK_1)) { offKandelaarModel(); } else if (mSwordFlourishTimer != 0 && mEquipItem == 0x103 && !checkWoodSwordEquip() && !checkModeFlg(0x402)) @@ -12097,18 +12097,18 @@ BOOL daAlink_c::checkItemChangeFromButton() { } else { allUnequip(TRUE); } - } else if (mEquipItem == fpcNm_ITEM_NONE && mThrowBoomerangAcKeep.getActor() == NULL && + } else if (mEquipItem == dItemNo_NONE_e && mThrowBoomerangAcKeep.getActor() == NULL && !checkCanoeRide() && checkNoUpperAnime() && checkNoResetFlg2(FLG2_UNK_1)) { for (i = 0; i < 2; i++) { - if (dComIfGp_getSelectItem(i) == fpcNm_ITEM_KANTERA) { + if (dComIfGp_getSelectItem(i) == dItemNo_KANTERA_e) { mSelectItemId = i; } } - itemEquip(fpcNm_ITEM_KANTERA); + itemEquip(dItemNo_KANTERA_e); onNoResetFlg1(FLG1_UNK_40); - } else if (mEquipItem != 0x103 && mEquipItem != fpcNm_ITEM_NONE && mEquipItem != 0x10B && + } else if (mEquipItem != 0x103 && mEquipItem != dItemNo_NONE_e && mEquipItem != 0x10B && mEquipItem != 0x102 && (!checkCanoeRide() || !checkFisingRodLure())) { if (!checkEventRun() || strcmp(dComIfGp_getEventManager().getRunEventName(), "ANGER") != 0) { @@ -12353,11 +12353,11 @@ int daAlink_c::checkNextAction(int param_0) { } void daAlink_c::commonChangeItem() { - if (mEquipItem == fpcNm_ITEM_KANTERA && field_0x2fde == 0xFF && (mProcID != PROC_PREACTION_UNEQUIP || mProcVar4.field_0x3010 != 0)) { + if (mEquipItem == dItemNo_KANTERA_e && field_0x2fde == 0xFF && (mProcID != PROC_PREACTION_UNEQUIP || mProcVar4.field_0x3010 != 0)) { offKandelaarModel(); } - if ((mEquipItem == fpcNm_ITEM_NONE && field_0x2fde != 0x103) || (mEquipItem == 0x103 && field_0x2fde != 0xFF)) { + if ((mEquipItem == dItemNo_NONE_e && field_0x2fde != 0x103) || (mEquipItem == 0x103 && field_0x2fde != 0xFF)) { seStartOnlyReverb(Z2SE_AL_ITEM_TAKEOUT); } @@ -12375,7 +12375,7 @@ void daAlink_c::commonChangeItem() { } BOOL var_r30; - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { var_r30 = true; deleteEquipItem(TRUE, FALSE); } else { @@ -12383,7 +12383,7 @@ void daAlink_c::commonChangeItem() { } mEquipItem = field_0x2fde; - field_0x2fde = fpcNm_ITEM_NONE; + field_0x2fde = dItemNo_NONE_e; if (checkReinRide()) { field_0x2060->initOldFrameMorf(3.0f, 0, 0x23); @@ -12414,7 +12414,7 @@ void daAlink_c::commonChangeItem() { } void daAlink_c::setItemAction() { - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { checkIronBallDelete(); } @@ -13450,13 +13450,13 @@ void daAlink_c::setLastSceneMode(u32* o_mode) { *o_mode |= 0x800000; } - if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != fpcNm_ITEM_KANTERA) { + if (checkNoResetFlg2(FLG2_UNK_1) && mEquipItem != dItemNo_KANTERA_e) { *o_mode |= 0x200000; } if (mEquipItem == 0x103) { *o_mode |= 0x28000000; - } else if (mEquipItem < fpcNm_ITEM_NONE) { + } else if (mEquipItem < dItemNo_NONE_e) { *o_mode |= mEquipItem << 0x18; } @@ -13536,7 +13536,7 @@ void daAlink_c::checkRoofRestart() { && (mProcID != PROC_CRAWL_START && mProcID != PROC_CRAWL_END && !checkCoachGuardGame())) { s16 bg_actorName = getMoveBGActorName(mLinkAcch.m_roof, TRUE); - if (bg_actorName == PROC_OBJ_SO || bg_actorName == PROC_Obj_SCannon) { + if (bg_actorName == fpcNm_OBJ_SO_e || bg_actorName == fpcNm_Obj_SCannon_e) { return; } @@ -13802,7 +13802,7 @@ int daAlink_c::checkSceneChange(int i_exitID) { (int)fopAcM_GetRoomNo(this), shape_angle.y, -1); if (isScnChange) { onNoResetFlg2(FLG2_SCENE_CHANGE_START); - if (mpScnChg != NULL && fopAcM_GetName(mpScnChg) == PROC_SCENE_EXIT) { + if (mpScnChg != NULL && fopAcM_GetName(mpScnChg) == fpcNm_SCENE_EXIT_e) { mpScnChg->setSceneChangeOK(); } } @@ -13967,7 +13967,7 @@ BOOL daAlink_c::checkSightLine(f32 i_maxDist, cXyz* o_sightPos) { cXyz sp3C; cXyz sp30(mHeldItemRootPos); - if (checkHookshotItem(mEquipItem) || mEquipItem == fpcNm_ITEM_PACHINKO) { + if (checkHookshotItem(mEquipItem) || mEquipItem == dItemNo_PACHINKO_e) { line_start_pos = &sp30; } else if (checkBowItem(mEquipItem) && mItemAcKeep.getActor() != NULL) { line_start_pos = &mItemAcKeep.getActor()->current.pos; @@ -13994,12 +13994,12 @@ BOOL daAlink_c::checkSightLine(f32 i_maxDist, cXyz* o_sightPos) { } sp30 -= sp3C * 100.0f; - } else if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + } else if (mEquipItem == dItemNo_COPY_ROD_e) { return 0; } dBgS_LinChk* linechk; - if (mEquipItem == fpcNm_ITEM_BOOMERANG) { + if (mEquipItem == dItemNo_BOOMERANG_e) { linechk = &mBoomerangLinChk; } else if (mProcID == PROC_HAWK_SUBJECT) { linechk = &mLinkLinChk; @@ -14049,7 +14049,7 @@ void daAlink_c::keepItemData() { void daAlink_c::returnKeepItemData() { deleteEquipItem(FALSE, FALSE); mEquipItem = mKeepItem; - mKeepItem = fpcNm_ITEM_NONE; + mKeepItem = dItemNo_NONE_e; makeItemType(); } @@ -14059,12 +14059,12 @@ BOOL daAlink_c::setItemModel() { return 1; } - if (mEquipItem == fpcNm_ITEM_PACHINKO) { + if (mEquipItem == dItemNo_PACHINKO_e) { setSlingModel(); return 1; } - if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + if (mEquipItem == dItemNo_COPY_ROD_e) { setCopyRodModel(); if (mCopyRodAcKeep.getActor() == NULL) { return FALSE; @@ -14073,12 +14073,12 @@ BOOL daAlink_c::setItemModel() { } } - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { setKandelaarModel(); return 1; } - if (mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE) { + if (mEquipItem == dItemNo_EMPTY_BOTTLE_e) { setBottleModel(mEquipItem); return 1; } @@ -14093,7 +14093,7 @@ BOOL daAlink_c::setItemModel() { return 1; } - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { setIronBallModel(); setIronBallWaitUpperAnime(1); if (mItemAcKeep.getActor() == NULL) { @@ -14108,8 +14108,8 @@ BOOL daAlink_c::setItemModel() { BOOL daAlink_c::setItemActor() { fopAc_ac_c* actor; - if (mEquipItem == fpcNm_ITEM_BOOMERANG) { - actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOOMERANG, 0, ¤t.pos, -1, + if (mEquipItem == dItemNo_BOOMERANG_e) { + actor = (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_BOOMERANG_e, 0, ¤t.pos, -1, NULL, NULL, -1, NULL, NULL); if (actor == NULL) { deleteEquipItem(FALSE, FALSE); @@ -14121,8 +14121,8 @@ BOOL daAlink_c::setItemActor() { return 1; } - if (mEquipItem == fpcNm_ITEM_COPY_ROD) { - actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_CROD, 0, ¤t.pos, -1, NULL, + if (mEquipItem == dItemNo_COPY_ROD_e) { + actor = (fopAc_ac_c*)fopAcM_fastCreate(fpcNm_CROD_e, 0, ¤t.pos, -1, NULL, NULL, -1, NULL, NULL); if (actor == NULL) { deleteEquipItem(FALSE, FALSE); @@ -14134,7 +14134,7 @@ BOOL daAlink_c::setItemActor() { return 1; } - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { actor = daCrod_c::makeIronBallDummy(this); if (actor == NULL) { @@ -14152,7 +14152,7 @@ BOOL daAlink_c::setItemActor() { } if (checkFisingRodLure()) { - mItemAcKeep.setID(fopAcM_create(PROC_MG_ROD, 0x10D, &mLeftHandPos, -1, NULL, NULL, 0xFF)); + mItemAcKeep.setID(fopAcM_create(fpcNm_MG_ROD_e, 0x10D, &mLeftHandPos, -1, NULL, NULL, 0xFF)); initFishingRodHand(); return 1; } @@ -14170,7 +14170,7 @@ BOOL daAlink_c::setItemActor() { #endif ) { - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; return 1; } } @@ -14178,7 +14178,7 @@ BOOL daAlink_c::setItemActor() { cXyz create_pos = (mLeftHandPos + mRightHandPos) * 0.5f; if (checkReadyItem()) { fopAc_ac_c* actor; - if (mEquipItem == fpcNm_ITEM_NORMAL_BOMB) { + if (mEquipItem == dItemNo_NORMAL_BOMB_e) { actor = dBomb_c::createNormalBombPlayer(&create_pos); } else { actor = dBomb_c::createWaterBombPlayer(&create_pos); @@ -14192,7 +14192,7 @@ BOOL daAlink_c::setItemActor() { setGrabUpperAnime(mpHIO->mBasic.m.mBasicInterpolation); } } - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; return 1; } @@ -14304,7 +14304,7 @@ BOOL daAlink_c::checkGroupItem(int i_itemNo, int i_selItem) const { int daAlink_c::checkSetItemTrigger(int i_itemNo) { for (u8 i = 0; i < 2; i++) { if (checkGroupItem(i_itemNo, dComIfGp_getSelectItem(i)) && itemTriggerCheck(1 << i)) { - if (i_itemNo != fpcNm_ITEM_HVY_BOOTS) { + if (i_itemNo != dItemNo_HVY_BOOTS_e) { mSelectItemId = i; } return 1; @@ -14380,13 +14380,13 @@ bool daAlink_c::checkNotAutoJumpStage() { bool daAlink_c::checkCastleTownUseItem(u16 i_itemNo) { if (checkNotBattleStage()) { - if (i_itemNo == fpcNm_ITEM_KANTERA + if (i_itemNo == dItemNo_KANTERA_e || checkTradeItem(i_itemNo) - || (i_itemNo == fpcNm_ITEM_DUNGEON_BACK && checkLv7DungeonShop()) - || (checkRoomSpecial() && (i_itemNo == fpcNm_ITEM_EMPTY_BOTTLE || checkDungeonWarpItem(i_itemNo))) - || (checkStageName("R_SP128") && i_itemNo == fpcNm_ITEM_COPY_ROD) - || (checkLv2DungeonRoomSpecial() && i_itemNo == fpcNm_ITEM_HVY_BOOTS) - || (checkBottleItem(i_itemNo) && i_itemNo != fpcNm_ITEM_EMPTY_BOTTLE)) + || (i_itemNo == dItemNo_DUNGEON_BACK_e && checkLv7DungeonShop()) + || (checkRoomSpecial() && (i_itemNo == dItemNo_EMPTY_BOTTLE_e || checkDungeonWarpItem(i_itemNo))) + || (checkStageName("R_SP128") && i_itemNo == dItemNo_COPY_ROD_e) + || (checkLv2DungeonRoomSpecial() && i_itemNo == dItemNo_HVY_BOOTS_e) + || (checkBottleItem(i_itemNo) && i_itemNo != dItemNo_EMPTY_BOTTLE_e)) { return true; } else { @@ -14463,13 +14463,13 @@ int daAlink_c::changeItemTriggerKeepProc(u8 i_selItemIdx, int i_procType) { } else if (i_procType == ITEM_PROC_OFF_KANDELAAR) { offKandelaarModel(); } else if (i_procType == ITEM_PROC_COMMON_CHANGE_ITEM) { - field_0x2fde = fpcNm_ITEM_NONE; + field_0x2fde = dItemNo_NONE_e; itemEquip(sel_item); if (dComIfGp_checkPlayerStatus0(0, 0x2000) && ((checkBowAndSlingItem(field_0x2fde) || checkHookshotItem(field_0x2fde) || - field_0x2fde == fpcNm_ITEM_COPY_ROD) || - field_0x2fde == fpcNm_ITEM_BOOMERANG)) + field_0x2fde == dItemNo_COPY_ROD_e) || + field_0x2fde == dItemNo_BOOMERANG_e)) { commonChangeItem(); resetUpperAnime(UPPER_2, -1.0f); @@ -14490,30 +14490,30 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { u16 sel_item = dComIfGp_getSelectItem(i_selItemIdx); if (checkSpinnerRide() - || sel_item == fpcNm_ITEM_BOMB_BAG_LV1 - || ((sel_item == fpcNm_ITEM_KANTERA || checkOilBottleItem(sel_item)) && checkWaterInKandelaarOffset(mWaterY)) + || sel_item == dItemNo_BOMB_BAG_LV1_e + || ((sel_item == dItemNo_KANTERA_e || checkOilBottleItem(sel_item)) && checkWaterInKandelaarOffset(mWaterY)) || (checkCanoeRide() && checkStageName("F_SP127")) || checkCloudSea() || ((checkModeFlg(0x40000) || checkNoResetFlg0(FLG0_WATER_IN_MOVE)) && !checkAcceptUseItemInWater(sel_item)) - || (checkModeFlg(0x40000) && sel_item == fpcNm_ITEM_WATER_BOMB) + || (checkModeFlg(0x40000) && sel_item == dItemNo_WATER_BOMB_e) || !checkCastleTownUseItem(sel_item) || (checkBoardRide() && sel_item != 0x103) - || (checkModeFlg(0x400) && (sel_item == fpcNm_ITEM_EMPTY_BOTTLE || sel_item == fpcNm_ITEM_POKE_BOMB || sel_item == fpcNm_ITEM_IRONBALL || sel_item == fpcNm_ITEM_COPY_ROD || checkFishingRodItem(sel_item))) - || ((mGndPolySpecialCode == dBgW_SPCODE_HEAVY_SNOW || mGndPolyAtt1 == 1 || mGndPolyAtt1 == 2 || mWaterY - current.pos.y > (daSpinner_c::getWaterSinkLimit() - 5.0f) || (field_0x2fbc == 6 && mWaterY - current.pos.y >= 0.0f) || mGndPolyAtt1 == 3) && sel_item == fpcNm_ITEM_SPINNER) + || (checkModeFlg(0x400) && (sel_item == dItemNo_EMPTY_BOTTLE_e || sel_item == dItemNo_POKE_BOMB_e || sel_item == dItemNo_IRONBALL_e || sel_item == dItemNo_COPY_ROD_e || checkFishingRodItem(sel_item))) + || ((mGndPolySpecialCode == dBgW_SPCODE_HEAVY_SNOW || mGndPolyAtt1 == 1 || mGndPolyAtt1 == 2 || mWaterY - current.pos.y > (daSpinner_c::getWaterSinkLimit() - 5.0f) || (field_0x2fbc == 6 && mWaterY - current.pos.y >= 0.0f) || mGndPolyAtt1 == 3) && sel_item == dItemNo_SPINNER_e) || (checkBossRoom() && checkDungeonWarpItem(sel_item)) - || (sel_item == fpcNm_ITEM_DUNGEON_EXIT && (checkLv7DungeonShop() || (checkStageName("D_MN07") && fopAcM_isSwitch(this, 0x4D) && !fopAcM_isSwitch(this, 0x18)) || (checkStageName("D_MN10") && fopAcM_GetRoomNo(this) == 15))) - || (checkMagneBootsOn() && sel_item != 0x103 && !checkDrinkBottleItem(sel_item) && sel_item != fpcNm_ITEM_HVY_BOOTS && !checkBowItem(sel_item)) + || (sel_item == dItemNo_DUNGEON_EXIT_e && (checkLv7DungeonShop() || (checkStageName("D_MN07") && fopAcM_isSwitch(this, 0x4D) && !fopAcM_isSwitch(this, 0x18)) || (checkStageName("D_MN10") && fopAcM_GetRoomNo(this) == 15))) + || (checkMagneBootsOn() && sel_item != 0x103 && !checkDrinkBottleItem(sel_item) && sel_item != dItemNo_HVY_BOOTS_e && !checkBowItem(sel_item)) ) { return ITEM_PROC_NONE; - } else if (sel_item == fpcNm_ITEM_HVY_BOOTS + } else if (sel_item == dItemNo_HVY_BOOTS_e || checkDungeonWarpItem(sel_item) || checkTradeItem(sel_item) - || (checkBottleItem(sel_item) && sel_item != fpcNm_ITEM_EMPTY_BOTTLE) - || sel_item == fpcNm_ITEM_SPINNER - || sel_item == fpcNm_ITEM_POKE_BOMB - || sel_item == fpcNm_ITEM_HORSE_FLUTE - || sel_item == fpcNm_ITEM_HAWK_EYE + || (checkBottleItem(sel_item) && sel_item != dItemNo_EMPTY_BOTTLE_e) + || sel_item == dItemNo_SPINNER_e + || sel_item == dItemNo_POKE_BOMB_e + || sel_item == dItemNo_HORSE_FLUTE_e + || sel_item == dItemNo_HAWK_EYE_e ) { if (checkReinRide() || checkCanoeRide()) { @@ -14521,10 +14521,10 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { return ITEM_PROC_BOTTLE_DRINK; } - if (checkOilBottleItem(sel_item) && checkItemSetButton(fpcNm_ITEM_KANTERA) != 2) { + if (checkOilBottleItem(sel_item) && checkItemSetButton(dItemNo_KANTERA_e) != 2) { return ITEM_PROC_KANDELAAR_POUR; } - } else if (sel_item == fpcNm_ITEM_HVY_BOOTS) { + } else if (sel_item == dItemNo_HVY_BOOTS_e) { if (!checkBoardRide()) { if ((mLinkAcch.ChkGroundHit() && !checkModeFlg(0x70C52)) || (checkMagneBootsOn() && cBgW_CheckBGround(mMagneBootsTopVec.y)) || @@ -14540,7 +14540,7 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { } } else if (mLinkAcch.ChkGroundHit()) { if (!checkModeFlg(0x70C52)) { - if (sel_item == fpcNm_ITEM_SPINNER) { + if (sel_item == dItemNo_SPINNER_e) { cXyz sp38(current.pos.x, current.pos.y + l_autoUpHeight, current.pos.z); cXyz sp2C(sp38); cXyz sp20; @@ -14567,17 +14567,17 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { } else if (checkDungeonWarpItem(sel_item)) { return ITEM_PROC_DUNGEON_WARP_READY; } else if (checkItemSetButton(0x108) != 2 && - (sel_item == fpcNm_ITEM_WORM || sel_item == fpcNm_ITEM_BEE_CHILD)) + (sel_item == dItemNo_WORM_e || sel_item == dItemNo_BEE_CHILD_e)) { int itemNo = dComIfGp_getSelectItem(checkItemSetButton(0x108)); - if (itemNo == fpcNm_ITEM_WORM_ROD || itemNo == fpcNm_ITEM_JEWEL_WORM_ROD) { - if (sel_item == fpcNm_ITEM_BEE_CHILD) { + if (itemNo == dItemNo_WORM_ROD_e || itemNo == dItemNo_JEWEL_WORM_ROD_e) { + if (sel_item == dItemNo_BEE_CHILD_e) { return ITEM_PROC_BOTTLE_DRINK; } return ITEM_PROC_NONE; } - if (sel_item == fpcNm_ITEM_BEE_CHILD && - (itemNo == fpcNm_ITEM_BEE_ROD || itemNo == fpcNm_ITEM_JEWEL_BEE_ROD)) + if (sel_item == dItemNo_BEE_CHILD_e && + (itemNo == dItemNo_BEE_ROD_e || itemNo == dItemNo_JEWEL_BEE_ROD_e)) { return ITEM_PROC_BOTTLE_DRINK; } @@ -14588,15 +14588,15 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { return ITEM_PROC_BOTTLE_OPEN; } else if (checkTradeItem(sel_item)) { return ITEM_PROC_NOT_USE_ITEM; - } else if (sel_item == fpcNm_ITEM_HORSE_FLUTE) { + } else if (sel_item == dItemNo_HORSE_FLUTE_e) { return ITEM_PROC_GRASS_WHISTLE; } else if (checkOilBottleItem(sel_item) && checkItemSetButton(0x48) != 2) { return ITEM_PROC_KANDELAAR_POUR; - } else if (sel_item == fpcNm_ITEM_HAWK_EYE) { + } else if (sel_item == dItemNo_HAWK_EYE_e) { if (acceptSubjectModeChange()) { return ITEM_PROC_SUBJECTIVITY; } - } else if (sel_item == fpcNm_ITEM_POKE_BOMB && dComIfGp_getSelectItemNum(i_selItemIdx) && + } else if (sel_item == dItemNo_POKE_BOMB_e && dComIfGp_getSelectItemNum(i_selItemIdx) && field_0x2fcf < 2) { return ITEM_PROC_PICK_PUT; @@ -14605,18 +14605,18 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { (void)0; } } - } else if (sel_item != fpcNm_ITEM_NONE && mEquipItem != sel_item) { + } else if (sel_item != dItemNo_NONE_e && mEquipItem != sel_item) { if ((checkBombItem(sel_item) && !dComIfGp_getSelectItemNum(i_selItemIdx)) - || ((sel_item == fpcNm_ITEM_NORMAL_BOMB || sel_item == fpcNm_ITEM_WATER_BOMB) && mActiveBombNum >= 3) - || (sel_item == fpcNm_ITEM_IRONBALL && (!mLinkAcch.ChkGroundHit() || checkModeFlg(0x70C52))) - || (sel_item == fpcNm_ITEM_KANTERA && (checkNoResetFlg0(FLG0_WATER_IN_MOVE) || checkEndResetFlg1(ERFLG1_UNK_4) || checkModeFlg(0x40000)))) + || ((sel_item == dItemNo_NORMAL_BOMB_e || sel_item == dItemNo_WATER_BOMB_e) && mActiveBombNum >= 3) + || (sel_item == dItemNo_IRONBALL_e && (!mLinkAcch.ChkGroundHit() || checkModeFlg(0x70C52))) + || (sel_item == dItemNo_KANTERA_e && (checkNoResetFlg0(FLG0_WATER_IN_MOVE) || checkEndResetFlg1(ERFLG1_UNK_4) || checkModeFlg(0x40000)))) { return ITEM_PROC_NONE; } return ITEM_PROC_COMMON_CHANGE_ITEM; } - if (mEquipItem == sel_item && mSelectItemId != i_selItemIdx && mEquipItem == fpcNm_ITEM_EMPTY_BOTTLE) { + if (mEquipItem == sel_item && mSelectItemId != i_selItemIdx && mEquipItem == dItemNo_EMPTY_BOTTLE_e) { return ITEM_PROC_BOTTLE_SWING; } @@ -14626,11 +14626,11 @@ int daAlink_c::checkNewItemChange(u8 i_selItemIdx) { void daAlink_c::deleteEquipItem(BOOL i_isPlaySound, BOOL i_isDeleteKantera) { if (i_isDeleteKantera || mProcID == PROC_UNEQUIP) { offKandelaarModel(); - } else if (mEquipItem == fpcNm_ITEM_KANTERA && checkNoResetFlg2(FLG2_UNK_1)) { + } else if (mEquipItem == dItemNo_KANTERA_e && checkNoResetFlg2(FLG2_UNK_1)) { mZ2Link.setKanteraState(2); } - if (mEquipItem == fpcNm_ITEM_NONE || mEquipItem == 0x10B) { + if (mEquipItem == dItemNo_NONE_e || mEquipItem == 0x10B) { return; } @@ -14643,7 +14643,7 @@ void daAlink_c::deleteEquipItem(BOOL i_isPlaySound, BOOL i_isDeleteKantera) { } else { seStartOnlyReverb(Z2SE_AL_SWORD_PUTIN); } - } else if (mEquipItem < fpcNm_ITEM_NONE) { + } else if (mEquipItem < dItemNo_NONE_e) { seStartOnlyReverb(Z2SE_AL_ITEM_TAKEOUT); } } @@ -14666,16 +14666,16 @@ void daAlink_c::deleteEquipItem(BOOL i_isPlaySound, BOOL i_isDeleteKantera) { fopAcM_delete(item_actor); } - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { mZ2Link.setUsingIronBall(false); } else if (checkHookshotItem(mEquipItem)) { cancelHookshotCarry(); } - if (((mEquipItem == fpcNm_ITEM_BOOMERANG || mEquipItem == 0x102) && checkBoomerangAnime()) || - (mEquipItem == fpcNm_ITEM_COPY_ROD && checkCopyRodAnime()) || + if (((mEquipItem == dItemNo_BOOMERANG_e || mEquipItem == 0x102) && checkBoomerangAnime()) || + (mEquipItem == dItemNo_COPY_ROD_e && checkCopyRodAnime()) || (checkHookshotItem(mEquipItem) && checkHookshotAnime()) || - (mEquipItem == fpcNm_ITEM_IRONBALL && (checkIronBallAnime() || checkIronBallWaitAnime())) || + (mEquipItem == dItemNo_IRONBALL_e && (checkIronBallAnime() || checkIronBallWaitAnime())) || (checkBowAndSlingItem(mEquipItem) && checkBowAnime())) { resetUpperAnime(UPPER_2, -1.0f); @@ -14686,7 +14686,7 @@ void daAlink_c::deleteEquipItem(BOOL i_isPlaySound, BOOL i_isDeleteKantera) { } mItemAcKeep.clearData(); - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; mHeldItemModel = NULL; mpHookTipModel = NULL; field_0x0710 = NULL; @@ -15208,7 +15208,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { } if (checkBombItem(mEquipItem)) { - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; } } @@ -15306,9 +15306,9 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) { if (actor != NULL && prev_flg_20000 && !checkModeFlg(MODE_ROPE_WALK)) { field_0x280c.clearData(); - if (fopAcM_GetName(actor) == PROC_Obj_Crope) { + if (fopAcM_GetName(actor) == fpcNm_Obj_Crope_e) { static_cast(actor)->offRide(); - } else if (fopAcM_GetName(actor) == PROC_Obj_Wchain) { + } else if (fopAcM_GetName(actor) == fpcNm_Obj_Wchain_e) { static_cast(actor)->offRide(); } } @@ -15334,8 +15334,8 @@ BOOL daAlink_c::commonProcInitNotSameProc(daAlink_PROC i_procID) { field_0x280c.setData(param_1); mProcVar3.field_0x300e = 1; - if (fopAcM_GetName(param_1) == PROC_Tag_Lv8Gate) { - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (fopAcM_GetName(param_1) == fpcNm_Tag_Lv8Gate_e) { + if (mEquipItem == dItemNo_KANTERA_e) { mProcVar4.field_0x3010 = 1; } else if (checkNoResetFlg2(FLG2_UNK_1)) { offKandelaarModel(); @@ -15897,7 +15897,7 @@ int daAlink_c::procSlideInit(s16 param_0) { field_0x3090 = 8; current.angle.y = param_0; - if (getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == PROC_Obj_Lv3R10Saka) { + if (getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == fpcNm_Obj_Lv3R10Saka_e) { mProcVar3.field_0x300e = 1; } else { mProcVar3.field_0x300e = 0; @@ -16159,8 +16159,8 @@ int daAlink_c::procFrontRoll() { if (checkNoResetFlg0(FLG0_UNK_10) || (mLinkAcch.ChkWallHit() && mAcchCir[0].ChkWallHit() && - (getMoveBGActorName(mAcchCir[0], FALSE) == PROC_Obj_Pillar || - getMoveBGActorName(mAcchCir[0], FALSE) == PROC_Obj_TaFence))) + (getMoveBGActorName(mAcchCir[0], FALSE) == fpcNm_Obj_Pillar_e || + getMoveBGActorName(mAcchCir[0], FALSE) == fpcNm_Obj_TaFence_e))) { procFrontRollSuccessInit(); } else { @@ -16602,7 +16602,7 @@ int daAlink_c::procAutoJumpInit(int param_0) { deleteEquipItem(TRUE, FALSE); } - if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == PROC_CANOE) { + if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == fpcNm_CANOE_e) { return procSmallJumpInit(1); } @@ -16636,14 +16636,14 @@ int daAlink_c::procAutoJumpInit(int param_0) { if (mGrabItemAcKeep.getActor() != NULL) { grab_actor_name = fopAcM_GetName(mGrabItemAcKeep.getActor()); } else { - grab_actor_name = PROC_ALINK; + grab_actor_name = fpcNm_ALINK_e; } s16 angle = mpHIO->mAutoJump.m.mJumpAngle; BOOL isCuccoJump = false; field_0x3478 = -10.0f; - if (grab_actor_name == PROC_NI || grab_actor_name == PROC_NPC_TKJ2) { - if (grab_actor_name == PROC_NI && + if (grab_actor_name == fpcNm_NI_e || grab_actor_name == fpcNm_NPC_TKJ2_e) { + if (grab_actor_name == fpcNm_NI_e && ((ni_class*)mGrabItemAcKeep.getActor())->checkGold() == true) { mMaxSpeed = 30.0f; @@ -16702,8 +16702,8 @@ int daAlink_c::procAutoJump() { #if VERSION == VERSION_SHIELD_DEBUG if (!checkStageName("F_SP115") && mGrabItemAcKeep.getActor() != NULL) { - if ((fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_NI && ((ni_class*)mGrabItemAcKeep.getActor())->checkGold() != TRUE) || - (fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_NPC_TKJ2)) + if ((fopAcM_GetName(mGrabItemAcKeep.getActor()) == fpcNm_NI_e && ((ni_class*)mGrabItemAcKeep.getActor())->checkGold() != TRUE) || + (fopAcM_GetName(mGrabItemAcKeep.getActor()) == fpcNm_NPC_TKJ2_e)) { mMaxSpeed = mpHIO->mAutoJump.m.mCuccoJumpMaxSpeed; field_0x3478 = mpHIO->mAutoJump.m.mCuccoFallMaxSpeed; @@ -16727,7 +16727,7 @@ int daAlink_c::procAutoJump() { setLandPassiveData(); - if (!checkModeFlg(4) && checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) { + if (!checkModeFlg(4) && checkSetItemTrigger(dItemNo_HVY_BOOTS_e)) { setHeavyBoots(1); } @@ -16745,7 +16745,7 @@ int daAlink_c::procAutoJump() { for (int i = 0; i < 3; i++, cyl_p++) { hit_ac = cyl_p->GetCoHitAc(); if (cyl_p->ChkCoHit() && hit_ac != NULL) { - if (fopAcM_GetName(hit_ac) == PROC_Obj_SwHang) { + if (fopAcM_GetName(hit_ac) == fpcNm_Obj_SwHang_e) { return procRoofSwitchHangInit(hit_ac); } } @@ -17698,8 +17698,8 @@ int daAlink_c::execute() { #endif if (checkNoResetFlg2(FLG2_UNK_1) != FALSE && - mEquipItem != fpcNm_ITEM_KANTERA && - checkItemSetButton(fpcNm_ITEM_KANTERA) == 2) { + mEquipItem != dItemNo_KANTERA_e && + checkItemSetButton(dItemNo_KANTERA_e) == 2) { offKandelaarModel(); } @@ -17741,7 +17741,7 @@ int daAlink_c::execute() { dComIfG_Bgsp().MoveBgCrrPos(mMagneLineChk, true, &old.pos, NULL, NULL, false, false); - if (getMoveBGActorName(mMagneLineChk, FALSE) == PROC_Obj_MagneArm) { + if (getMoveBGActorName(mMagneLineChk, FALSE) == fpcNm_Obj_MagneArm_e) { field_0x34c8.y += current.pos.y - pos_y; } else { field_0x34c8.y += (current.pos.y - pos_y) * 0.1f; @@ -18002,7 +18002,7 @@ int daAlink_c::execute() { fopAc_ac_c* item_actor = mGrabItemAcKeep.getActor(); if (item_actor != NULL && (!fopAcM_checkCarryNow(item_actor) || (checkNoResetFlg0(FLG0_WATER_IN_MOVE) && - (checkGrabRooster() || fopAcM_GetName(item_actor) == PROC_E_NEST || + (checkGrabRooster() || fopAcM_GetName(item_actor) == fpcNm_E_NEST_e || checkGrabCarryActor())))) { freeGrabItem(); @@ -18071,7 +18071,7 @@ int daAlink_c::execute() { } if (checkEquipHeavyBoots()) { - int itemButton = checkItemSetButton(fpcNm_ITEM_HVY_BOOTS); + int itemButton = checkItemSetButton(dItemNo_HVY_BOOTS_e); if (itemButton == 2 || checkNotHeavyBootsStage()) { if (!dComIfGp_checkPlayerStatus1(0, 0x10000) || !checkHookshotRoofLv7Boss()) { setHeavyBoots(0); @@ -18122,7 +18122,7 @@ int daAlink_c::execute() { resetUpperAnime(UPPER_2, 5.0f); } - if (mEquipItem == fpcNm_ITEM_KANTERA && checkNoUpperAnime() && !checkKandelaarEquipAnime() && + if (mEquipItem == dItemNo_KANTERA_e && checkNoUpperAnime() && !checkKandelaarEquipAnime() && (checkModeFlg(MODE_UNK_1000) || mProcID == PROC_CROUCH)) { if (checkReinRide()) { @@ -18399,7 +18399,7 @@ int daAlink_c::execute() { field_0x2fcb--; if (field_0x2fcb == 0) { - dMeter2Info_setShield(fpcNm_ITEM_NONE, true); + dMeter2Info_setShield(dItemNo_NONE_e, true); stickArrowIncrement(1); setWoodShieldBurnOutEffect(); @@ -18407,7 +18407,7 @@ int daAlink_c::execute() { dMeter2Info_setFloatingMessage(2047, 90, false); if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) == dStage_SaveTbl_LV2 && - !dComIfGs_isItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD)) + !dComIfGs_isItemFirstBit(dItemNo_HYLIA_SHIELD_e)) { fopAcM_onSwitch(this, 0x6F); } @@ -18504,7 +18504,7 @@ int daAlink_c::execute() { if (!checkEventRun() && checkNoResetFlg0(FLG0_UNK_80) && (mWaterY > current.pos.y + 40.0f || checkModeFlg(MODE_SWIMMING)) && - getMoveBGActorName(mLinkAcch.m_wtr, TRUE) == PROC_Obj_Onsen) + getMoveBGActorName(mLinkAcch.m_wtr, TRUE) == fpcNm_Obj_Onsen_e) { if (mHotspringRecoverTimer != 0) { mHotspringRecoverTimer--; @@ -18588,8 +18588,8 @@ int daAlink_c::execute() { u8 tmp; for (u8 i = 0; i < 2; i++) { tmp = (i + 1) % 2; - if (dComIfGp_getSelectItem(i) == fpcNm_ITEM_EMPTY_BOTTLE && (mUseButtonFlags & (1 << i)) && - dComIfGp_getSelectItem(tmp) == fpcNm_ITEM_EMPTY_BOTTLE) + if (dComIfGp_getSelectItem(i) == dItemNo_EMPTY_BOTTLE_e && (mUseButtonFlags & (1 << i)) && + dComIfGp_getSelectItem(tmp) == dItemNo_EMPTY_BOTTLE_e) { mUseButtonFlags |= (u8)(1 << tmp); } @@ -18653,7 +18653,7 @@ int daAlink_c::execute() { if (checkWolf() || (field_0x27f4 != NULL && (field_0x27f4->speedF > 0.1f || - (checkGoatCatchActor(field_0x27f4) && fopAcM_GetName(field_0x27f4) != PROC_COW)))) + (checkGoatCatchActor(field_0x27f4) && fopAcM_GetName(field_0x27f4) != fpcNm_COW_e)))) { setDoStatusEmphasys(BUTTON_STATUS_GRAB); } else { @@ -18670,8 +18670,8 @@ int daAlink_c::execute() { { setDoStatus(BUTTON_STATUS_JUMP); } else if (dComIfGp_getDoStatus() == BUTTON_STATUS_HOWL && field_0x27f4 != NULL && - (fopAcM_GetName(field_0x27f4) == PROC_Obj_WindStone || - fopAcM_GetName(field_0x27f4) == PROC_Obj_SmWStone)) + (fopAcM_GetName(field_0x27f4) == fpcNm_Obj_WindStone_e || + fopAcM_GetName(field_0x27f4) == fpcNm_Obj_SmWStone_e)) { setDoStatusEmphasys(BUTTON_STATUS_LISTEN); } else if (dComIfGp_getDoStatus() == BUTTON_STATUS_PLACE) { @@ -18705,7 +18705,7 @@ int daAlink_c::execute() { } if (dComIfGp_att_getCatghTarget() != NULL && !checkWolf()) { - if (!checkRideOn() && checkCastleTownUseItem(fpcNm_ITEM_EMPTY_BOTTLE)) { + if (!checkRideOn() && checkCastleTownUseItem(dItemNo_EMPTY_BOTTLE_e)) { dComIfGp_setBottleStatus(BUTTON_STATUS_SCOOP, 0); } } @@ -18896,7 +18896,7 @@ bool daAlink_c::checkShieldDraw() { } bool daAlink_c::checkItemDraw() { - if (mHeldItemModel != NULL && (mEquipItem != fpcNm_ITEM_IRONBALL || !checkSwordEquipAnime())) { + if (mHeldItemModel != NULL && (mEquipItem != dItemNo_IRONBALL_e || !checkSwordEquipAnime())) { if (!checkBowAndSlingItem(mEquipItem) || checkBowGrabLeftHand() || !checkShieldGet() || field_0x2e44.checkPassNum(15)) { @@ -18931,7 +18931,7 @@ int daAlink_c::initShadowScaleLight() { BOOL var_r28; f32 var_f31; - if (talkActor != NULL && ((fopAcM_GetName(talkActor) == PROC_Tag_Mhint && !((daTagMhint_c*)talkActor)->checkNoAttention()) || (fopAcM_GetName(talkActor) == PROC_Tag_Mstop && !((daTagMstop_c*)talkActor)->checkNoAttention()))) { + if (talkActor != NULL && ((fopAcM_GetName(talkActor) == fpcNm_Tag_Mhint_e && !((daTagMhint_c*)talkActor)->checkNoAttention()) || (fopAcM_GetName(talkActor) == fpcNm_Tag_Mstop_e && !((daTagMstop_c*)talkActor)->checkNoAttention()))) { field_0x2ff8 = cLib_targetAngleY(&talkActor->eyePos, ¤t.pos); var_r28 = 1; } else { @@ -19114,12 +19114,12 @@ void daAlink_c::shadowDraw() { dComIfGd_addRealShadow(shadowID, mpDemoHRTmpModel); } - if (mEquipItem == fpcNm_ITEM_BOOMERANG) { + if (mEquipItem == dItemNo_BOOMERANG_e) { if (mItemAcKeep.getActor() != NULL) { dComIfGd_addRealShadow(shadowID, mItemAcKeep.getActor()->model); } } else if (checkItemDraw()) { - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { if (mItemVar0.field_0x3018 == 0 || mItemVar0.field_0x3018 == 8) { dComIfGd_addRealShadow(shadowID, mHeldItemModel); } else if (fopAcM_gc_c::gndCheck(&mIronBallBgChkPos)) { @@ -19138,7 +19138,7 @@ void daAlink_c::shadowDraw() { dComIfGd_addRealShadow(shadowID, mpHookTipModel); } - if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT && + if (mEquipItem == dItemNo_W_HOOKSHOT_e && !checkPlayerGuardAndAttack() && !checkNoResetFlg0(FLG0_UNK_2)) { dComIfGd_addRealShadow(shadowID, field_0x0710); @@ -19553,7 +19553,7 @@ int daAlink_c::draw() { modelDraw(mpHookTipModel, isPlayerNoDraw); } - if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT && !checkPlayerGuardAndAttack() && + if (mEquipItem == dItemNo_W_HOOKSHOT_e && !checkPlayerGuardAndAttack() && !checkNoResetFlg0(FLG0_UNK_2)) { if (field_0x0710 != NULL) { @@ -19569,7 +19569,7 @@ int daAlink_c::draw() { if (mpHookChain != NULL && !isPlayerNoDraw && ((checkHookshotItem(mEquipItem) && (mHeldItemRootPos.abs(mHookshotTopPos) > 1.0f || field_0x3810.abs(mIronBallBgChkPos) > 1.0f)) - || mEquipItem == fpcNm_ITEM_IRONBALL) + || mEquipItem == dItemNo_IRONBALL_e) ) { dComIfGd_getOpaListDark()->entryImm(mpHookChain, 0); @@ -19683,18 +19683,18 @@ static actor_method_class l_daAlink_Method = { }; actor_process_profile_definition g_profile_ALINK = { - (u32)fpcLy_CURRENT_e, - 5, - fpcPi_CURRENT_e, - PROC_ALINK, - &g_fpcLf_Method.base, - sizeof(daAlink_c), - 0, - 0, - &g_fopAc_Method.base, - 91, - &l_daAlink_Method, - 0x60400, - fopAc_PLAYER_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 5, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ALINK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAlink_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ALINK_e, + /* Actor SubMtd */ &l_daAlink_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_FREEZE_e, + /* Group */ fopAc_PLAYER_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_alink_boom.inc b/src/d/actor/d_a_alink_boom.inc index 6fb5c67051b..6750bdaa84d 100644 --- a/src/d/actor/d_a_alink_boom.inc +++ b/src/d/actor/d_a_alink_boom.inc @@ -73,7 +73,7 @@ fopAc_ac_c* daAlink_c::getBoomerangActor() { return mThrowBoomerangAcKeep.getActor(); } - if (mEquipItem == fpcNm_ITEM_BOOMERANG) { + if (mEquipItem == dItemNo_BOOMERANG_e) { return mItemAcKeep.getActor(); } @@ -130,7 +130,7 @@ BOOL daAlink_c::checkBoomerangAnime() const { } BOOL daAlink_c::checkBoomerangThrowAnime() const { - return (mEquipItem == fpcNm_ITEM_BOOMERANG || checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == 0x102) && + return (mEquipItem == dItemNo_BOOMERANG_e || checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == 0x102) && checkUpperAnime(dRes_ID_ALANM_BCK_BOOMTHROW_e); } @@ -163,7 +163,7 @@ void daAlink_c::setBoomerangCatchAnime() { setFacePriBck(dRes_ID_ALANM_BCK_FAT_e); field_0x2f97 = 254; - if (mEquipItem != fpcNm_ITEM_COPY_ROD) { + if (mEquipItem != dItemNo_COPY_ROD_e) { seStartOnlyReverb(JA_SE_LK_BOOM_CATCH); } } @@ -173,7 +173,7 @@ void daAlink_c::throwBoomerang() { onNoResetFlg1(FLG1_UNK_2); //! @bug `item` pointer is being accessed without checking if NULL first - BOOL boomerang_item = fopAcM_GetName(item) == PROC_BOOMERANG; + BOOL boomerang_item = fopAcM_GetName(item) == fpcNm_BOOMERANG_e; if (boomerang_item) { item->setThrow(); item->current.angle.y = shape_angle.y + mBodyAngle.y; @@ -197,13 +197,13 @@ void daAlink_c::throwBoomerang() { fopAcM_cancelCarryNow(item); item = NULL; - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; field_0x2f94 = 0xFF; field_0x2f96 = 0xFE; } mItemAcKeep.clearData(); - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; field_0x2f94 = 0xFF; field_0x2f96 = 0xFE; @@ -235,7 +235,7 @@ void daAlink_c::throwBoomerang() { int daAlink_c::returnBoomerang(int param_0) { dComIfGp_clearPlayerStatus0(0, 0x400000); - if (mEquipItem == fpcNm_ITEM_NONE + if (mEquipItem == dItemNo_NONE_e && !checkMagneBootsOn() && mItemAcKeep.getActor() == NULL #if !PLATFORM_SHIELD @@ -252,7 +252,7 @@ int daAlink_c::returnBoomerang(int param_0) { mItemAcKeep = mThrowBoomerangAcKeep; mThrowBoomerangAcKeep.clearData(); - mEquipItem = fpcNm_ITEM_BOOMERANG; + mEquipItem = dItemNo_BOOMERANG_e; field_0x2f94 = 2; onNoResetFlg0(FLG0_UNK_20); diff --git a/src/d/actor/d_a_alink_bottle.inc b/src/d/actor/d_a_alink_bottle.inc index b3a39c34981..65670e0fd2e 100644 --- a/src/d/actor/d_a_alink_bottle.inc +++ b/src/d/actor/d_a_alink_bottle.inc @@ -63,21 +63,21 @@ void daAlink_c::setBottleModel(u16 i_itemNo) { field_0x0718 = loadAramItemBtk(dRes_ID_ALANM_BTK_BOTTLE_YURE_e, mHeldItemModel); - if (i_itemNo == fpcNm_ITEM_FAIRY) { + if (i_itemNo == dItemNo_FAIRY_e) { J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(dRes_ID_ALANM_BCK_O_GD_NV_e, 0xC00); mpHookTipModel = initModel(loadAramBmd(dRes_ID_ALANM_BMD_O_GD_NV_e, 0x1400), 0); if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) { JUT_ASSERT(142, FALSE); } mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f); - } else if (i_itemNo == fpcNm_ITEM_WORM) { + } else if (i_itemNo == dItemNo_WORM_e) { J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(dRes_ID_ALANM_BCK_O_GD_WORM_e, 0xC00); mpHookTipModel = initModel(loadAramBmd(dRes_ID_ALANM_BMD_O_GD_WORM_e, 0x2400), 0); if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) { JUT_ASSERT(151, FALSE); } mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f); - } else if (i_itemNo == fpcNm_ITEM_BEE_CHILD) { + } else if (i_itemNo == dItemNo_BEE_CHILD_e) { mpHookTipModel = initModel(loadAramBmd(dRes_ID_ALANM_BMD_O_GD_HK_e, 0x1000), 0); } @@ -96,40 +96,40 @@ void daAlink_c::setBottleModel(u16 i_itemNo) { mItemMode = 0; } - if ((checkDrinkBottleItem(i_itemNo) && i_itemNo != fpcNm_ITEM_BEE_CHILD) || checkOilBottleItem(i_itemNo)) { + if ((checkDrinkBottleItem(i_itemNo) && i_itemNo != dItemNo_BEE_CHILD_e) || checkOilBottleItem(i_itemNo)) { item_model_data->getMaterialNodePointer(0)->getShape()->hide(); - if (i_itemNo == fpcNm_ITEM_RED_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_RED || i_itemNo == fpcNm_ITEM_RED_BOTTLE_2) { + if (i_itemNo == dItemNo_RED_BOTTLE_e || i_itemNo == dItemNo_CHUCHU_RED_e || i_itemNo == dItemNo_RED_BOTTLE_2_e) { field_0x0724->setFrame(0.0f); - } else if (i_itemNo == fpcNm_ITEM_GREEN_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_GREEN) { + } else if (i_itemNo == dItemNo_GREEN_BOTTLE_e || i_itemNo == dItemNo_CHUCHU_GREEN_e) { field_0x0724->setFrame(1.0f); - } else if (i_itemNo == fpcNm_ITEM_BLUE_BOTTLE || i_itemNo == fpcNm_ITEM_CHUCHU_BLUE) { + } else if (i_itemNo == dItemNo_BLUE_BOTTLE_e || i_itemNo == dItemNo_CHUCHU_BLUE_e) { field_0x0724->setFrame(2.0f); } else if (checkOilBottleItem(i_itemNo)) { field_0x0724->setFrame(4.0f); - } else if (i_itemNo == fpcNm_ITEM_HOT_SPRING) { + } else if (i_itemNo == dItemNo_HOT_SPRING_e) { field_0x0724->setFrame(5.0f); - } else if (i_itemNo == fpcNm_ITEM_CHUCHU_PURPLE) { + } else if (i_itemNo == dItemNo_CHUCHU_PURPLE_e) { field_0x0724->setFrame(6.0f); - } else if (i_itemNo == fpcNm_ITEM_CHUCHU_RARE) { + } else if (i_itemNo == dItemNo_CHUCHU_RARE_e) { field_0x0724->setFrame(7.0f); - } else if (i_itemNo == fpcNm_ITEM_UGLY_SOUP || i_itemNo == fpcNm_ITEM_CHUCHU_BLACK) { + } else if (i_itemNo == dItemNo_UGLY_SOUP_e || i_itemNo == dItemNo_CHUCHU_BLACK_e) { field_0x0724->setFrame(8.0f); - } else if (i_itemNo == fpcNm_ITEM_LV1_SOUP) { + } else if (i_itemNo == dItemNo_LV1_SOUP_e) { field_0x0724->setFrame(9.0f); - } else if (i_itemNo == fpcNm_ITEM_LV2_SOUP || i_itemNo == fpcNm_ITEM_LV3_SOUP) { + } else if (i_itemNo == dItemNo_LV2_SOUP_e || i_itemNo == dItemNo_LV3_SOUP_e) { field_0x0724->setFrame(10.0f); - } else if (i_itemNo == fpcNm_ITEM_FAIRY_DROP) { + } else if (i_itemNo == dItemNo_FAIRY_DROP_e) { field_0x0724->setFrame(11.0f); } else { field_0x0724->setFrame(3.0f); - if (i_itemNo == fpcNm_ITEM_HALF_MILK_BOTTLE) { + if (i_itemNo == dItemNo_HALF_MILK_BOTTLE_e) { field_0x072c->setFrame(1.0f); } } } else if (checkOpenBottleItem(i_itemNo)) { - if (i_itemNo == fpcNm_ITEM_WATER_BOTTLE) { + if (i_itemNo == dItemNo_WATER_BOTTLE_e) { field_0x0724->setFrame(5.0f); } else { field_0x072c->setFrame(2.0f); @@ -167,29 +167,29 @@ int daAlink_c::commonBottleDrink(BOOL param_0) { mItemVar0.mBottleItemHealAmount = 0; - if (mEquipItem != fpcNm_ITEM_UGLY_SOUP && mEquipItem != fpcNm_ITEM_CHUCHU_BLACK && - mEquipItem != fpcNm_ITEM_CHUCHU_PURPLE) + if (mEquipItem != dItemNo_UGLY_SOUP_e && mEquipItem != dItemNo_CHUCHU_BLACK_e && + mEquipItem != dItemNo_CHUCHU_PURPLE_e) { - if (mEquipItem == fpcNm_ITEM_LV1_SOUP) { + if (mEquipItem == dItemNo_LV1_SOUP_e) { dComIfGp_setItemLifeCount(8, 0); - } else if (mEquipItem == fpcNm_ITEM_LV2_SOUP) { + } else if (mEquipItem == dItemNo_LV2_SOUP_e) { dComIfGp_setItemLifeCount(16, 0); - } else if (mEquipItem == fpcNm_ITEM_LV3_SOUP) { + } else if (mEquipItem == dItemNo_LV3_SOUP_e) { dComIfGp_setItemLifeCount(32, 0); - } else if (mEquipItem == fpcNm_ITEM_BEE_CHILD) { + } else if (mEquipItem == dItemNo_BEE_CHILD_e) { field_0x2fd3 = 3; dComIfGp_setItemLifeCount(dComIfGp_getSelectItemNum(mSelectItemId), 0); - } else if (mEquipItem == fpcNm_ITEM_RED_BOTTLE || mEquipItem == fpcNm_ITEM_CHUCHU_RED || - mEquipItem == fpcNm_ITEM_RED_BOTTLE_2) + } else if (mEquipItem == dItemNo_RED_BOTTLE_e || mEquipItem == dItemNo_CHUCHU_RED_e || + mEquipItem == dItemNo_RED_BOTTLE_2_e) { dComIfGp_setItemLifeCount(32, 0); - } else if (mEquipItem == fpcNm_ITEM_MILK_BOTTLE || mEquipItem == fpcNm_ITEM_HALF_MILK_BOTTLE) { + } else if (mEquipItem == dItemNo_MILK_BOTTLE_e || mEquipItem == dItemNo_HALF_MILK_BOTTLE_e) { dComIfGp_setItemLifeCount(12, 0); - } else if (mEquipItem == fpcNm_ITEM_BLUE_BOTTLE || mEquipItem == fpcNm_ITEM_CHUCHU_BLUE || - mEquipItem == fpcNm_ITEM_HOT_SPRING) + } else if (mEquipItem == dItemNo_BLUE_BOTTLE_e || mEquipItem == dItemNo_CHUCHU_BLUE_e || + mEquipItem == dItemNo_HOT_SPRING_e) { dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0); - } else if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_FAIRY_DROP) { + } else if (mEquipItem == dItemNo_CHUCHU_RARE_e || mEquipItem == dItemNo_FAIRY_DROP_e) { dComIfGp_setItemLifeCount(dComIfGs_getMaxLifeGauge(), 0); } } @@ -202,7 +202,7 @@ int daAlink_c::commonBottleDrink(BOOL param_0) { if (dComIfGp_getItemNowLife() == dComIfGs_getLife()) { mpHookTipModel = NULL; - if (mEquipItem == fpcNm_ITEM_MILK_BOTTLE) { + if (mEquipItem == dItemNo_MILK_BOTTLE_e) { if (param_0) { setUpperAnimeParam(getMainBckData(ANM_BOTTLE_DRINK_END)->m_upperID, UPPER_2, &mpHIO->mItem.mBottle.m.mEndDrinkAnm); @@ -214,13 +214,13 @@ int daAlink_c::commonBottleDrink(BOOL param_0) { field_0x072c->setFrame(1.0f); if (mDemo.getDemoType() == daPy_demo_c::DEMO_TYPE_SPECIAL_e) { - dComIfGs_setEquipBottleItemIn(mSelectItemId, fpcNm_ITEM_HALF_MILK_BOTTLE); + dComIfGs_setEquipBottleItemIn(mSelectItemId, dItemNo_HALF_MILK_BOTTLE_e); } } else if (mProcVar2.field_0x300c == 0) { mProcVar2.field_0x300c = 1; mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x0720); } else if (simpleAnmPlay(field_0x0720)) { - if (mEquipItem == fpcNm_ITEM_UGLY_SOUP) { + if (mEquipItem == dItemNo_UGLY_SOUP_e) { if (dComIfGs_getLife() <= 2) { mItemVar0.mBottleItemHealAmount = dComIfGs_getMaxLifeGauge(); } else if (dComIfGs_getLife() <= 4) { @@ -230,7 +230,7 @@ int daAlink_c::commonBottleDrink(BOOL param_0) { } else { mItemVar0.mBottleItemHealAmount = 4; } - } else if (mEquipItem == fpcNm_ITEM_CHUCHU_PURPLE) { + } else if (mEquipItem == dItemNo_CHUCHU_PURPLE_e) { f32 rnd = cM_rndF(6.0f); if (rnd < 1.0f) { mItemVar0.mBottleItemHealAmount = dComIfGs_getMaxLifeGauge(); @@ -244,11 +244,11 @@ int daAlink_c::commonBottleDrink(BOOL param_0) { } else { mItemVar0.mBottleItemHealAmount = 4; } - } else if (mEquipItem == fpcNm_ITEM_CHUCHU_BLACK) { + } else if (mEquipItem == dItemNo_CHUCHU_BLACK_e) { mItemVar0.mBottleItemHealAmount = -4; } - if (mItemVar0.mBottleItemHealAmount < 0 || mEquipItem == fpcNm_ITEM_BEE_CHILD) { + if (mItemVar0.mBottleItemHealAmount < 0 || mEquipItem == dItemNo_BEE_CHILD_e) { if (param_0) { setUpperAnimeParam(getMainBckData(ANM_BOTTLE_DRINK_NASTY)->m_upperID, UPPER_2, &mpHIO->mItem.mBottle.m.mDrinkNastyAnm); @@ -271,7 +271,7 @@ int daAlink_c::commonBottleDrink(BOOL param_0) { dComIfGs_setEquipBottleItemEmpty(mSelectItemId); } - if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_FAIRY_DROP) { + if (mEquipItem == dItemNo_CHUCHU_RARE_e || mEquipItem == dItemNo_FAIRY_DROP_e) { mSwordUpTimer = 510; } } @@ -283,7 +283,7 @@ int daAlink_c::commonBottleDrink(BOOL param_0) { if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_42_e) { setSingleAnimeParam(ANM_PICK_UP, &mpHIO->mItem.mPickUp.m.mPlaceAnm); } else { - allUnequip(mKeepItem == fpcNm_ITEM_KANTERA); + allUnequip(mKeepItem == dItemNo_KANTERA_e); } } else if (frameCtrl_p->checkPass(11.0f)) { mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x0718); @@ -314,9 +314,9 @@ int daAlink_c::commonBottleDrink(BOOL param_0) { } else if (frameCtrl_p->checkPass(9.0f)) { returnKeepItemData(); } - } else if (mEquipItem == fpcNm_ITEM_NONE || mEquipItem == fpcNm_ITEM_KANTERA) { + } else if (mEquipItem == dItemNo_NONE_e || mEquipItem == dItemNo_KANTERA_e) { resetUpperAnime(UPPER_2, 3.0f); - if (mEquipItem == fpcNm_ITEM_NONE) { + if (mEquipItem == dItemNo_NONE_e) { returnKeepItemData(); } @@ -342,7 +342,7 @@ fopAc_ac_c* daAlink_c::makeFairy(cXyz* i_pos, u32 i_params) { i_pos = &fairy_pos; } - field_0x285c.setData(fopAcM_fastCreate(PROC_Obj_Yousei, i_params, i_pos, fopAcM_GetRoomNo(this), + field_0x285c.setData(fopAcM_fastCreate(fpcNm_Obj_Yousei_e, i_params, i_pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL, NULL)); onResetFlg0(RFLG0_UNK_400); @@ -414,13 +414,13 @@ int daAlink_c::procBottleOpenInit(u16 i_itemNo) { field_0x32cc = -1; mProcVar0.field_0x3008 = 1; - if (mEquipItem == fpcNm_ITEM_FAIRY) { + if (mEquipItem == dItemNo_FAIRY_e) { field_0x3194 = 3; } else { field_0x3194 = 2; - if (mEquipItem == fpcNm_ITEM_WORM) { - field_0x32cc = fopAcM_create(PROC_NPC_WORM, 2, ¤t.pos, fopAcM_GetRoomNo(this), + if (mEquipItem == dItemNo_WORM_e) { + field_0x32cc = fopAcM_create(fpcNm_NPC_WORM_e, 2, ¤t.pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); mProcVar0.field_0x3008 = 0; mProcVar1.field_0x300a = 1; @@ -434,7 +434,7 @@ int daAlink_c::procBottleOpenInit(u16 i_itemNo) { field_0x27c8.initialize(current.pos.y + mHeight); - if (i_itemNo == fpcNm_ITEM_WATER_BOTTLE) { + if (i_itemNo == dItemNo_WATER_BOTTLE_e) { setCylAtParam(AT_TYPE_LANTERN_SWING, dCcG_At_Spl_UNK_0, 0, dCcD_SE_NONE, 0, 30.0f, 30.0f); } @@ -459,12 +459,12 @@ int daAlink_c::procBottleOpen() { if (checkUnderMove0BckNoArc(ANM_BOTTLE_OPEN)) { if (checkAnmEnd(frameCtrl_p)) { - if (mEquipItem == fpcNm_ITEM_FAIRY) { + if (mEquipItem == dItemNo_FAIRY_e) { setSingleAnimeBaseMorf(ANM_BOTTLE_FAIRY, -1.0f); } else { setSingleAnimeParam(ANM_BOTTLE_POUR, &mpHIO->mItem.mBottle.m.mPourAnm); - if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE) { + if (mEquipItem == dItemNo_WATER_BOTTLE_e) { if (mWaterY > mLeftHandPos.y) { mProcVar3.field_0x300e = 0; } else { @@ -477,7 +477,7 @@ int daAlink_c::procBottleOpen() { mProcVar2.field_0x300c = 1; mHeldItemModel->getModelData()->entryTexMtxAnimator(field_0x071c); - if (mEquipItem == fpcNm_ITEM_FAIRY) { + if (mEquipItem == dItemNo_FAIRY_e) { cXyz fairyPos; mDoMtx_multVec(mHeldItemModel->getBaseTRMtx(), &bottleTop, &fairyPos); @@ -499,7 +499,7 @@ int daAlink_c::procBottleOpen() { mProcVar2.field_0x300c = 2; dComIfGs_setEquipBottleItemEmpty(mSelectItemId); - if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE && mProcVar3.field_0x300e != 0) { + if (mEquipItem == dItemNo_WATER_BOTTLE_e && mProcVar3.field_0x300e != 0) { seStartOnlyReverb(Z2SE_LK_SPRINKLE_WATER); } } else if (frameCtrl_p->getFrame() > 16.0f && frameCtrl_p->getFrame() < 31.0f) { @@ -527,11 +527,11 @@ int daAlink_c::procBottleOpen() { } int daAlink_c::procBottleSwingInit(fopAc_ac_c* i_catchActor, int param_1) { - if (i_catchActor != NULL && mEquipItem != fpcNm_ITEM_KANTERA) { + if (i_catchActor != NULL && mEquipItem != dItemNo_KANTERA_e) { return procPreActionUnequipInit(PROC_BOTTLE_SWING, NULL); } - if (i_catchActor == NULL && getReadyItem() != fpcNm_ITEM_EMPTY_BOTTLE) { + if (i_catchActor == NULL && getReadyItem() != dItemNo_EMPTY_BOTTLE_e) { return checkWaitAction(); } @@ -566,15 +566,15 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* i_catchActor, int param_1) { temp_r3 = false; } - catchActorName = PROC_ALINK; + catchActorName = fpcNm_ALINK_e; } - if (catchActorName == PROC_TAG_SSDRINK || catchActorName == PROC_OBJ_OILTUBO || - catchActorName == PROC_TAG_BTLITM || mEquipItem == fpcNm_ITEM_KANTERA) + if (catchActorName == fpcNm_TAG_SSDRINK_e || catchActorName == fpcNm_OBJ_OILTUBO_e || + catchActorName == fpcNm_TAG_BTLITM_e || mEquipItem == dItemNo_KANTERA_e) { setSingleAnimeParam(ANM_BOTTLE_SCOOP, &mpHIO->mItem.mBottle.m.mScoopAnm); - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { onNoResetFlg2(FLG2_KANDELAAR_LIGHT_OFF); JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(field_0x31c4); @@ -594,7 +594,7 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* i_catchActor, int param_1) { current.pos.z = catchActor->current.pos.z - cM_scos(shape_angle.y) * 70.0f; } - if (catchActorName == PROC_OBJ_OILTUBO) { + if (catchActorName == fpcNm_OBJ_OILTUBO_e) { onModeFlg(0x2000); } } else if (temp_r3) { @@ -636,25 +636,25 @@ int daAlink_c::procBottleSwing() { mProcVar2.field_0x300c = 1; offModeFlg(4); - if (mEquipItem != fpcNm_ITEM_KANTERA) { + if (mEquipItem != dItemNo_KANTERA_e) { u16 bottle_item = dComIfGp_event_getPreItemNo(); - if (bottle_item == fpcNm_ITEM_WATER_BOTTLE && - getMoveBGActorName(mLinkAcch.m_wtr, FALSE) == PROC_Obj_Onsen) + if (bottle_item == dItemNo_WATER_BOTTLE_e && + getMoveBGActorName(mLinkAcch.m_wtr, FALSE) == fpcNm_Obj_Onsen_e) { - bottle_item = fpcNm_ITEM_HOT_SPRING; + bottle_item = dItemNo_HOT_SPRING_e; } dComIfGs_setEquipBottleItemIn(mSelectItemId, bottle_item); - if (bottle_item == fpcNm_ITEM_BEE_CHILD) { + if (bottle_item == dItemNo_BEE_CHILD_e) { dComIfGp_setSelectItemNum(mSelectItemId, dComIfGs_getBottleMax()); - } else if (bottle_item == fpcNm_ITEM_WATER_BOTTLE) { + } else if (bottle_item == dItemNo_WATER_BOTTLE_e) { seStartOnlyReverb(Z2SE_LK_SCOOP_WATER); } else if (checkOilBottleItem(bottle_item)) { seStartOnlyReverb(Z2SE_AL_SCOOP_OIL); - } else if (bottle_item == fpcNm_ITEM_LV1_SOUP || bottle_item == fpcNm_ITEM_LV2_SOUP || - bottle_item == fpcNm_ITEM_LV3_SOUP) + } else if (bottle_item == dItemNo_LV1_SOUP_e || bottle_item == dItemNo_LV2_SOUP_e || + bottle_item == dItemNo_LV3_SOUP_e) { seStartOnlyReverb(Z2SE_AL_SCOOP_SOUP); } @@ -666,12 +666,12 @@ int daAlink_c::procBottleSwing() { mDemo.setSpecialDemoType(); } } else if (frameCtrl_p->getFrame() <= field_0x347c) { - if (getReadyItem() == fpcNm_ITEM_EMPTY_BOTTLE && + if (getReadyItem() == dItemNo_EMPTY_BOTTLE_e && (dComIfGp_att_getCatghTarget() != NULL || (field_0x2fbc != 11 && field_0x2fbc != 6 && mWaterY > current.pos.y + 10.0f))) { fopAcM_orderCatchEvent(this, dComIfGp_att_getCatghTarget(), 0, 0); - } else if (mEquipItem == fpcNm_ITEM_KANTERA) { + } else if (mEquipItem == dItemNo_KANTERA_e) { if (field_0x280c.getActor() != NULL) { fopAcM_orderCatchEvent(this, field_0x280c.getActor(), 0, 0); } @@ -698,23 +698,23 @@ int daAlink_c::procBottleGetInit(BOOL param_0) { commonProcInit(PROC_BOTTLE_GET); int var_r30; - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { setSingleAnime(ANM_BOTTLE_GET, mpHIO->mItem.mBottle.m.mGetAnm.mSpeed, 40.0f, mpHIO->mItem.mBottle.m.mGetAnm.mEndFrame, mpHIO->mItem.mBottle.m.mGetAnm.mInterpolation); mRightHandIndex = 0xFE; if (isPrevPickUp) { - execItemGet(fpcNm_ITEM_KANTERA); - var_r30 = fpcNm_ITEM_KANTERA2; + execItemGet(dItemNo_KANTERA_e); + var_r30 = dItemNo_KANTERA2_e; dComIfGp_setItemOilCount(-dComIfGs_getMaxOil()); } else { dComIfGp_setItemOilCount(dComIfGs_getMaxOil()); if (param_0) { - var_r30 = fpcNm_ITEM_CHUCHU_YELLOW2; + var_r30 = dItemNo_CHUCHU_YELLOW2_e; } else { - var_r30 = fpcNm_ITEM_OIL2; + var_r30 = dItemNo_OIL2_e; } } @@ -729,25 +729,25 @@ int daAlink_c::procBottleGetInit(BOOL param_0) { field_0x3194 = 0; field_0x32cc = var_r30 + 0x65; - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { field_0x3194 = 12; } - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { resetBasAnime(); } u32 id = fopAcM_GetID(this); dCam_getBody()->StartEventCamera(0x12, id, "Type", 1, &field_0x3194, 0); - if (mEquipItem == fpcNm_ITEM_FAIRY_DROP || mEquipItem == fpcNm_ITEM_CHUCHU_RARE || mEquipItem == fpcNm_ITEM_WORM) { + if (mEquipItem == dItemNo_FAIRY_DROP_e || mEquipItem == dItemNo_CHUCHU_RARE_e || mEquipItem == dItemNo_WORM_e) { setFaceBasicTexture(FTANM_I_BINGET); setFaceBasicBck(dRes_ID_ALANM_BCK_FI_e); - } else if (mEquipItem == fpcNm_ITEM_UGLY_SOUP) { + } else if (mEquipItem == dItemNo_UGLY_SOUP_e) { setFaceBasicBck(dRes_ID_ALANM_BCK_FJ_e); } - if (mEquipItem == fpcNm_ITEM_BEE_CHILD && dComIfGs_isEventBit(dSv_event_flag_c::F_0700)) { + if (mEquipItem == dItemNo_BEE_CHILD_e && dComIfGs_isEventBit(dSv_event_flag_c::F_0700)) { dComIfGs_onEventBit(dSv_event_flag_c::F_0618); } @@ -761,7 +761,7 @@ int daAlink_c::procBottleGet() { if (checkAnmEnd(frameCtrl) && checkEndMessage(field_0x32cc)) { resetFairyEffect(); - if (mEquipItem != fpcNm_ITEM_KANTERA) { + if (mEquipItem != dItemNo_KANTERA_e) { deleteEquipItem(FALSE, FALSE); } diff --git a/src/d/actor/d_a_alink_bow.inc b/src/d/actor/d_a_alink_bow.inc index 207f463cd7a..600dcae2f41 100644 --- a/src/d/actor/d_a_alink_bow.inc +++ b/src/d/actor/d_a_alink_bow.inc @@ -9,7 +9,7 @@ #include "d/actor/d_a_horse.h" void daAlink_c::getArrowFlyData(f32* o_distance, f32* o_speed, BOOL i_forceCharge) const { - if (mEquipItem == fpcNm_ITEM_PACHINKO) { + if (mEquipItem == dItemNo_PACHINKO_e) { *o_distance = mpHIO->mItem.mBow.m.mSlingshotDistance; *o_speed = mpHIO->mItem.mBow.m.mSlingshotSpeed; } else if (dComIfGp_checkPlayerStatus0(0, 0x200000)) { @@ -49,7 +49,7 @@ f32 daAlink_c::getArrowIncAtMax() const { } BOOL daAlink_c::checkBowAndSlingItem(int i_itemNo) { - return checkBowItem(i_itemNo) || i_itemNo == fpcNm_ITEM_PACHINKO; + return checkBowItem(i_itemNo) || i_itemNo == dItemNo_PACHINKO_e; } void daAlink_c::setSlingModel() { @@ -68,7 +68,7 @@ void daAlink_c::setSlingModel() { } cXyz* daAlink_c::checkBowCameraArrowPosP(s16* o_angleX, s16* o_angleY) { - if (!checkBowAnime() || mEquipItem == fpcNm_ITEM_PACHINKO) { + if (!checkBowAnime() || mEquipItem == dItemNo_PACHINKO_e) { return NULL; } @@ -128,7 +128,7 @@ void daAlink_c::makeArrow() { void daAlink_c::deleteArrow() { daArrow_c* arrow_p = (daArrow_c*)mItemAcKeep.getActor(); - if (arrow_p != NULL && fopAcM_GetName(arrow_p) == PROC_ARROW) { + if (arrow_p != NULL && fopAcM_GetName(arrow_p) == fpcNm_ARROW_e) { if (arrow_p->checkBombArrow() && (mDamageTimer == mpHIO->mDamage.m.mInvincibleTime || checkModeFlg(8))) { @@ -143,7 +143,7 @@ void daAlink_c::deleteArrow() { } void daAlink_c::setBowOrSlingStatus() { - if (mEquipItem == fpcNm_ITEM_PACHINKO) { + if (mEquipItem == dItemNo_PACHINKO_e) { dComIfGp_setPlayerStatus0(0, 0x40); } else { dComIfGp_setPlayerStatus0(0, 0x1000); @@ -151,10 +151,10 @@ void daAlink_c::setBowOrSlingStatus() { } void daAlink_c::changeArrowType() { - if (checkCanoeSlider() || (mEquipItem == fpcNm_ITEM_BOW && field_0x301e == 0) || - (mEquipItem == fpcNm_ITEM_BOMB_ARROW && field_0x301e == 0 && + if (checkCanoeSlider() || (mEquipItem == dItemNo_BOW_e && field_0x301e == 0) || + (mEquipItem == dItemNo_BOMB_ARROW_e && field_0x301e == 0 && dComIfGp_getSelectItemNum(mSelectItemId) == 0) || - (mEquipItem == fpcNm_ITEM_HAWK_ARROW && checkAttentionLock())) + (mEquipItem == dItemNo_HAWK_ARROW_e && checkAttentionLock())) { return; } @@ -162,7 +162,7 @@ void daAlink_c::changeArrowType() { setItemActionButtonStatus(BUTTON_STATUS_SWITCH); if (arrowChangeTrigger()) { - if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) { + if (mEquipItem == dItemNo_HAWK_ARROW_e) { if (dComIfGp_checkPlayerStatus0(0, 0x200000)) { dComIfGp_clearPlayerStatus0(0, 0x200000); seStartSystem(Z2SE_AL_HAWK_EYE_PUTOFF); @@ -203,7 +203,7 @@ BOOL daAlink_c::cancelBowMove() { void daAlink_c::setBowReadyAnime() { if (!checkBowAnime()) { - if (mEquipItem == fpcNm_ITEM_BOMB_ARROW) { + if (mEquipItem == dItemNo_BOMB_ARROW_e) { if (dComIfGp_getSelectItemNum(mSelectItemId) != 0) { field_0x301e = 1; } else { @@ -225,7 +225,7 @@ void daAlink_c::setBowReadyAnime() { field_0x2f97 = 5; field_0x2f96 = 4; - if (mEquipItem == fpcNm_ITEM_PACHINKO) { + if (mEquipItem == dItemNo_PACHINKO_e) { changeItemBck(dRes_ID_ALANM_BCK_PSHOOT_e, -1.0f); } else { changeItemBck(dRes_ID_ALANM_BCK_BASHOOT_e, -1.0f); @@ -237,7 +237,7 @@ void daAlink_c::setBowReloadAnime() { setFacePriTexture(FTANM_FINISHA); setFacePriBck(dRes_ID_ALANM_BCK_FARELORD_e); - if (mEquipItem == fpcNm_ITEM_PACHINKO) { + if (mEquipItem == dItemNo_PACHINKO_e) { changeItemBck(dRes_ID_ALANM_BCK_PRELORD_e, mpHIO->mItem.mBow.m.mLoadAnm.mStartFrame); field_0x2f97 = 5; seStartOnlyReverb(Z2SE_AL_PACHINKO_DRAW); @@ -254,7 +254,7 @@ void daAlink_c::setBowReloadAnime() { BOOL daAlink_c::checkUpperItemActionBow() { daPy_frameCtrl_c* frameCtrl_p = &mUpperFrameCtrl[2]; - if (mEquipItem == fpcNm_ITEM_PACHINKO) { + if (mEquipItem == dItemNo_PACHINKO_e) { static const Vec slingLocalPos = {10.0f, 10.0f, 0.0f}; mDoMtx_multVec(getLeftItemMatrix(), &slingLocalPos, &mHeldItemRootPos); } @@ -262,7 +262,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { if (checkBowChargeWaitAnime()) { daArrow_c* arrow_p = (daArrow_c*)mItemAcKeep.getActor(); - if (mEquipItem != fpcNm_ITEM_PACHINKO) { + if (mEquipItem != dItemNo_PACHINKO_e) { if (field_0x301c > 0) { field_0x301c--; @@ -284,7 +284,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { field_0x2f96 = 0; u16 bck_res_id; - if (mEquipItem == fpcNm_ITEM_PACHINKO) { + if (mEquipItem == dItemNo_PACHINKO_e) { bck_res_id = dRes_ID_ALANM_BCK_PSHOOT_e; if (dComIfGs_getPachinkoNum() != 0 && daArrow_c::makeSlingStone(this, &mHeldItemRootPos) != NULL) @@ -299,7 +299,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { changeItemBck(bck_res_id, mpHIO->mItem.mBow.m.mShootAnm.mStartFrame); mItemVar0.field_0x3018 = 0; - } else if (mEquipItem == fpcNm_ITEM_PACHINKO) { + } else if (mEquipItem == dItemNo_PACHINKO_e) { if (!itemButton()) { dComIfGp_getVibration().StartShock(VIBMODE_S_POWER1, 1, cXyz(0.0f, 1.0f, 0.0f)); seStartOnlyReverb(Z2SE_AL_PACHINKO_SHOT); @@ -349,7 +349,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { mItemVar0.field_0x3018 = 1; resetFacePriAnime(); - if (mEquipItem == fpcNm_ITEM_BOW) { + if (mEquipItem == dItemNo_BOW_e) { field_0x301e = 0; } (void)0; @@ -363,7 +363,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { setFacePriTexture(FTANM_ARELORD); setFacePriBck(dRes_ID_ALANM_BCK_FARELORDTAME_e); - if (mEquipItem != fpcNm_ITEM_PACHINKO) { + if (mEquipItem != dItemNo_PACHINKO_e) { changeItemBck(dRes_ID_ALANM_BCK_BARELORDTAME_e, 0.0f); dComIfGp_getVibration().StartQuake(VIBMODE_Q_POWER1, 1, cXyz(0.0f, 1.0f, 0.0f)); onNoResetFlg3(FLG3_UNK_4); @@ -384,12 +384,12 @@ BOOL daAlink_c::checkUpperItemActionBow() { { setBowReloadAnime(); - if (mEquipItem == fpcNm_ITEM_PACHINKO) { + if (mEquipItem == dItemNo_PACHINKO_e) { mItemVar0.field_0x3018 = 0; } else { makeArrow(); } - } else if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) { + } else if (mEquipItem == dItemNo_HAWK_ARROW_e) { changeArrowType(); } @@ -421,7 +421,7 @@ BOOL daAlink_c::checkUpperItemActionBow() { } } - if (checkBowWaitAnime() || (mEquipItem == fpcNm_ITEM_PACHINKO && checkBowChargeWaitAnime())) { + if (checkBowWaitAnime() || (mEquipItem == dItemNo_PACHINKO_e && checkBowChargeWaitAnime())) { field_0x33dc += mpHIO->mItem.mBow.m.mShootAnm.mSpeed; } else { field_0x33dc = mUpperFrameCtrl[2].getFrame(); @@ -457,7 +457,7 @@ int daAlink_c::checkNextActionBow() { mItemMode = 0; mItemVar0.field_0x3018 = 1; - if (mEquipItem == fpcNm_ITEM_HAWK_ARROW) { + if (mEquipItem == dItemNo_HAWK_ARROW_e) { is_hawk_arrow = true; mFastShotTime = 0; } @@ -537,7 +537,7 @@ void daAlink_c::setBowHangAnime() { void daAlink_c::setBowNormalAnime() { if (checkBowItem(mEquipItem)) { changeItemBck(dRes_ID_ALANM_BCK_BVJMPCL_e, -1.0f); - } else if (mEquipItem == fpcNm_ITEM_PACHINKO) { + } else if (mEquipItem == dItemNo_PACHINKO_e) { changeItemBck(dRes_ID_ALANM_BCK_PWAIT_e, -1.0f); } } diff --git a/src/d/actor/d_a_alink_canoe.inc b/src/d/actor/d_a_alink_canoe.inc index 92802f8075f..efe6f4551ae 100644 --- a/src/d/actor/d_a_alink_canoe.inc +++ b/src/d/actor/d_a_alink_canoe.inc @@ -55,7 +55,7 @@ cXyz* daAlink_c::getCanoeLocalPaddleTop() { static fopAc_ac_c* daAlink_searchCanoe(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_CANOE && ((daCanoe_c*)i_actor)->getModel() != NULL) { + if (fopAcM_GetName(i_actor) == fpcNm_CANOE_e && ((daCanoe_c*)i_actor)->getModel() != NULL) { return i_actor; } @@ -81,9 +81,9 @@ void daAlink_c::initFishingRodHand() { field_0x2f95 = 0x65; mItemVar0.field_0x3018 = 1; - if (mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD || mEquipItem == fpcNm_ITEM_WORM_ROD) { + if (mEquipItem == dItemNo_JEWEL_WORM_ROD_e || mEquipItem == dItemNo_WORM_ROD_e) { mItemMode = 0x74; - } else if (mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD || mEquipItem == fpcNm_ITEM_BEE_ROD) { + } else if (mEquipItem == dItemNo_JEWEL_BEE_ROD_e || mEquipItem == dItemNo_BEE_ROD_e) { mItemMode = 0x76; } else { mItemMode = 0xFF; @@ -129,7 +129,7 @@ BOOL daAlink_c::checkCanoeJumpRide() { if (speed.y < 0.0f && canoe != NULL && - fopAcM_GetName(canoe) == PROC_CANOE && + fopAcM_GetName(canoe) == fpcNm_CANOE_e && canoe->checkJumpRideFlg() && !checkDeadHP() && (mProcID != PROC_FALL || mProcVar4.field_0x3010 != 0)) @@ -592,7 +592,7 @@ int daAlink_c::procCanoeWaitInit(int param_0) { morf = 3.0f; mProcVar0.field_0x3008 = 0; - if (mEquipItem == fpcNm_ITEM_NONE || (mEquipItem != 0x10B && !checkFisingRodLure())) { + if (mEquipItem == dItemNo_NONE_e || (mEquipItem != 0x10B && !checkFisingRodLure())) { anm = ANM_WAIT_SIT; } else if (mProcVar5.field_0x3012 == 0) { anm = ANM_WAIT_CANOE_LEFT; @@ -604,7 +604,7 @@ int daAlink_c::procCanoeWaitInit(int param_0) { setSyncCanoePos(); setSingleAnimeBaseMorf(anm, morf); - if (param_0 && mEquipItem != 0x10B && mEquipItem != fpcNm_ITEM_NONE && !checkFisingRodLure()) { + if (param_0 && mEquipItem != 0x10B && mEquipItem != dItemNo_NONE_e && !checkFisingRodLure()) { allUnequip(0); } @@ -638,7 +638,7 @@ int daAlink_c::procCanoeWait() { return procCanoePaddlePutInit(1); } - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { allUnequip(0); } @@ -648,7 +648,7 @@ int daAlink_c::procCanoeWait() { if (checkFisingRodLure()) { procCanoeFishingWaitInit(); - } else if (mEquipItem == fpcNm_ITEM_NONE && ((mThrowBoomerangAcKeep.getActor() == NULL && mProcVar1.field_0x300a == 0) || checkInputOnR())) { + } else if (mEquipItem == dItemNo_NONE_e && ((mThrowBoomerangAcKeep.getActor() == NULL && mProcVar1.field_0x300a == 0) || checkInputOnR())) { field_0x2fde = 0xFF; if (mThrowBoomerangAcKeep.getActor() != NULL || mProcVar1.field_0x300a != 0) { @@ -662,7 +662,7 @@ int daAlink_c::procCanoeWait() { procCanoePaddleGrabInit(); } else if (checkInputOnR() && mEquipItem == 0x10B) { procCanoeRowInit(-1); - } else if (mEquipItem != fpcNm_ITEM_NONE && mEquipItem != 0x10B) { + } else if (mEquipItem != dItemNo_NONE_e && mEquipItem != 0x10B) { if (!checkUnderMove0BckNoArc(ANM_WAIT_SIT) && getNowAnmPackUnder(UNDER_0) != getNowAnmPackUpper(UPPER_0)) { setSingleAnimeBase(ANM_WAIT_SIT); } else if (checkInputOnR()) { @@ -939,7 +939,7 @@ int daAlink_c::procCanoePaddleShift() { int daAlink_c::procCanoePaddlePutInit(int param_0) { if (checkCanoeSlider() && mEquipItem == 0x10B) { if (checkEquipAnime() && checkBowItem(field_0x2fde)) { - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; mRightHandIndex = 0xFE; mLeftHandIndex = 0xFE; return procCanoeWaitInit(0); @@ -1006,7 +1006,7 @@ int daAlink_c::procCanoePaddlePut() { mEquipItem = 0x105; mRightHandIndex = 5; } else { - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; mRightHandIndex = 0xFE; } @@ -1077,7 +1077,7 @@ int daAlink_c::procCanoePaddleGrab() { int daAlink_c::procCanoeRodGrabInit() { commonProcInit(PROC_CANOE_ROD_GRAB); - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { allUnequip(0); mProcVar0.field_0x3008 = 1; } else { @@ -1627,7 +1627,7 @@ int daAlink_c::procCanoeKandelaarPour() { } void daAlink_c::setGroundFishingRodActor() { - mItemAcKeep.setID(fopAcM_create(PROC_MG_ROD, 0xFFFF011D, &mLeftHandPos, -1, NULL, NULL, -1)); + mItemAcKeep.setID(fopAcM_create(fpcNm_MG_ROD_e, 0xFFFF011D, &mLeftHandPos, -1, NULL, NULL, -1)); initFishingRodHand(); } @@ -1667,10 +1667,10 @@ int daAlink_c::procFishingCast() { mItemMode = 0xFF; dComIfGs_setBaitItem(0xFF); - if (mEquipItem == fpcNm_ITEM_JEWEL_WORM_ROD || mEquipItem == fpcNm_ITEM_JEWEL_BEE_ROD) { - mEquipItem = fpcNm_ITEM_JEWEL_ROD; + if (mEquipItem == dItemNo_JEWEL_WORM_ROD_e || mEquipItem == dItemNo_JEWEL_BEE_ROD_e) { + mEquipItem = dItemNo_JEWEL_ROD_e; } else { - mEquipItem = fpcNm_ITEM_FISHING_ROD_1; + mEquipItem = dItemNo_FISHING_ROD_1_e; } } @@ -1741,15 +1741,15 @@ int daAlink_c::procFishingFood() { mProcVar2.field_0x300c = 1; u16 item = dComIfGp_getSelectItem(mProcVar3.field_0x300e); - if (item == fpcNm_ITEM_WORM || dComIfGp_getSelectItemNum(mProcVar3.field_0x300e) == 1) { + if (item == dItemNo_WORM_e || dComIfGp_getSelectItemNum(mProcVar3.field_0x300e) == 1) { dComIfGs_setEquipBottleItemEmpty(mProcVar3.field_0x300e); } else { dComIfGp_addSelectItemNum(mProcVar3.field_0x300e, -1); } - if (mItemMode != fpcNm_ITEM_NONE) { + if (mItemMode != dItemNo_NONE_e) { dComIfGs_setEquipBottleItemIn(mProcVar3.field_0x300e, mItemMode); - if (mItemMode == fpcNm_ITEM_BEE_CHILD) { + if (mItemMode == dItemNo_BEE_CHILD_e) { dComIfGp_setSelectItemNum(mProcVar3.field_0x300e, 1); } } @@ -1757,16 +1757,16 @@ int daAlink_c::procFishingFood() { mItemMode = item; BOOL is_jewl = checkFisingRodJewl(); - if (item == fpcNm_ITEM_WORM) { + if (item == dItemNo_WORM_e) { if (is_jewl) { - mEquipItem = fpcNm_ITEM_JEWEL_WORM_ROD; + mEquipItem = dItemNo_JEWEL_WORM_ROD_e; } else { - mEquipItem = fpcNm_ITEM_WORM_ROD; + mEquipItem = dItemNo_WORM_ROD_e; } } else if (is_jewl) { - mEquipItem = fpcNm_ITEM_JEWEL_BEE_ROD; + mEquipItem = dItemNo_JEWEL_BEE_ROD_e; } else { - mEquipItem = fpcNm_ITEM_BEE_ROD; + mEquipItem = dItemNo_BEE_ROD_e; } dComIfGs_setBaitItem(item); diff --git a/src/d/actor/d_a_alink_copyrod.inc b/src/d/actor/d_a_alink_copyrod.inc index c268e6e6b94..45548514e2d 100644 --- a/src/d/actor/d_a_alink_copyrod.inc +++ b/src/d/actor/d_a_alink_copyrod.inc @@ -178,7 +178,7 @@ int daAlink_c::returnCopyRod() { offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); BOOL rt; - if (mEquipItem == fpcNm_ITEM_COPY_ROD) { + if (mEquipItem == dItemNo_COPY_ROD_e) { mItemAcKeep = mCopyRodAcKeep; onNoResetFlg0(FLG0_UNK_20); rt = TRUE; @@ -347,8 +347,8 @@ int daAlink_c::procCopyRodSwingInit() { daCstatue_c* statue = (daCstatue_c*)getCopyRodControllActor(); if (statue != NULL && - ((fopAcM_GetName(statue) == PROC_CSTATUE && statue->checkNotSmallType()) || - fopAcM_GetName(statue) != PROC_CSTATUE)) + ((fopAcM_GetName(statue) == fpcNm_CSTATUE_e && statue->checkNotSmallType()) || + fopAcM_GetName(statue) != fpcNm_CSTATUE_e)) { setSingleAnimeParam(ANM_COPYROD_SWING_LARGE, &mpHIO->mItem.mCopyRod.m.mBigSwingAnm); field_0x3478 = 13.0f; @@ -408,9 +408,9 @@ int daAlink_c::procCopyRodReviveInit() { } if (mDemo.getParam0() == 0) { - if (mEquipItem != fpcNm_ITEM_COPY_ROD) { + if (mEquipItem != dItemNo_COPY_ROD_e) { deleteEquipItem(FALSE, FALSE); - mEquipItem = fpcNm_ITEM_COPY_ROD; + mEquipItem = dItemNo_COPY_ROD_e; setCopyRodModel(); } field_0x0724->setFrame(0.0f); diff --git a/src/d/actor/d_a_alink_crawl.inc b/src/d/actor/d_a_alink_crawl.inc index 5f46d5e557d..59a7436b45c 100644 --- a/src/d/actor/d_a_alink_crawl.inc +++ b/src/d/actor/d_a_alink_crawl.inc @@ -476,7 +476,7 @@ void daAlink_c::setCrawlAutoMoveAimPos() { } int daAlink_c::procCrawlStartInit() { - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_CRAWL_START, NULL); } diff --git a/src/d/actor/d_a_alink_cut.inc b/src/d/actor/d_a_alink_cut.inc index 24b4f143c45..4e9dd18aee1 100644 --- a/src/d/actor/d_a_alink_cut.inc +++ b/src/d/actor/d_a_alink_cut.inc @@ -26,14 +26,14 @@ enum daAlink_CutFinishParamType { static fopAc_ac_c* daAlink_searchNightStalker(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_E_S1) { + if (fopAcM_GetName(i_actor) == fpcNm_E_S1_e) { daPy_py_c* player_p = daPy_getLinkPlayerActorClass(); if (player_p->current.pos.abs2XZ(i_actor->current.pos) < SQUARE(500.0f) && fabsf(player_p->current.pos.y - i_actor->current.pos.y) < 300.0f) { return i_actor; } - } else if (fopAcM_GetName(i_actor) == PROC_B_GND && static_cast(i_actor)->checkAttackChance()) { + } else if (fopAcM_GetName(i_actor) == fpcNm_B_GND_e && static_cast(i_actor)->checkAttackChance()) { return i_actor; } @@ -113,7 +113,7 @@ bool daAlink_c::checkCutFastReady() { fopAc_ac_c* target_p = mAttention->LockonTarget(0); - if (mEquipItem == fpcNm_ITEM_NONE && (dComIfGs_isEventBit(dSv_event_flag_c::F_0342) || checkNoResetFlg3(FLG3_TRANING_CUT_FAST))) + if (mEquipItem == dItemNo_NONE_e && (dComIfGs_isEventBit(dSv_event_flag_c::F_0342) || checkNoResetFlg3(FLG3_TRANING_CUT_FAST))) { if (checkModeFlg(1) && !checkRideOn() && checkSwordGet() && checkModeFlg(4) && !checkModeFlg(0x40000) && mTargetedActor == NULL && checkEnemyGroup(target_p)) @@ -229,7 +229,7 @@ void daAlink_c::setCylAtParam(u32 i_AtType, dCcG_At_Spl i_spl, u8 i_hitMark, u8 } else { mtrl = dCcD_MTRL_NONE; } - } else if (mEquipItem == fpcNm_ITEM_WATER_BOTTLE) { + } else if (mEquipItem == dItemNo_WATER_BOTTLE_e) { mtrl = dCcD_MTRL_UNK_6; } else { mtrl = dCcD_MTRL_NONE; @@ -309,7 +309,7 @@ void daAlink_c::setSwordAtParam(dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int BOOL daAlink_c::notSwordHitVibActor(fopAc_ac_c* i_actor) { if (i_actor != NULL && fopAcM_GetGroup(i_actor) == fopAc_NPC_e) { s16 name = fopAcM_GetName(i_actor); - if (!checkSpecialNpc(i_actor) && name != PROC_NI && name != PROC_NPC_BLUENS) { + if (!checkSpecialNpc(i_actor) && name != fpcNm_NI_e && name != fpcNm_NPC_BLUENS_e) { return true; } } @@ -365,11 +365,11 @@ BOOL daAlink_c::checkCutReverseAt(dCcD_GObjInf* i_gobj) { } BOOL daAlink_c::changeCutReverseProc(daAlink_c::daAlink_ANM i_anmID) { - if (checkCutReverseAt(&mAtCps[0]) || (mEquipItem != fpcNm_ITEM_COPY_ROD && (checkCutReverseAt(&mAtCps[1]) || checkCutReverseAt(&mAtCps[2])))) { + if (checkCutReverseAt(&mAtCps[0]) || (mEquipItem != dItemNo_COPY_ROD_e && (checkCutReverseAt(&mAtCps[1]) || checkCutReverseAt(&mAtCps[2])))) { return procCutReverseInit(i_anmID); } - if (checkNoResetFlg0(FLG0_CUT_AT_FLG) || mEquipItem == fpcNm_ITEM_COPY_ROD) { + if (checkNoResetFlg0(FLG0_CUT_AT_FLG) || mEquipItem == dItemNo_COPY_ROD_e) { cXyz sp28; Vec sp1C; @@ -793,8 +793,8 @@ BOOL daAlink_c::checkDownAttackState() { && enemy->getDownPos().abs2(current.pos) < SQUARE(800.0f) ) || (checkWolf() - && (fopAcM_GetName(mTargetedActor) == PROC_E_PO - || fopAcM_GetName(mTargetedActor) == PROC_E_HP + && (fopAcM_GetName(mTargetedActor) == fpcNm_E_PO_e + || fopAcM_GetName(mTargetedActor) == fpcNm_E_HP_e ) && enemy->getDownPos().abs2(current.pos) < SQUARE(800.0f) ) @@ -2042,7 +2042,7 @@ int daAlink_c::procCutDownInit() { sp2C = static_cast(mTargetedActor)->getDownPos(); field_0x280c.setData(mTargetedActor); - if (fopAcM_GetName(mTargetedActor) == PROC_B_GND) { + if (fopAcM_GetName(mTargetedActor) == fpcNm_B_GND_e) { mProcVar3.field_0x300e = 1; } } else { diff --git a/src/d/actor/d_a_alink_damage.inc b/src/d/actor/d_a_alink_damage.inc index 56229e2e4fc..3863551c625 100644 --- a/src/d/actor/d_a_alink_damage.inc +++ b/src/d/actor/d_a_alink_damage.inc @@ -585,7 +585,7 @@ BOOL daAlink_c::checkDamageAction() { if (tghit_ac != NULL) { tghit_ac_name = fopAcM_GetName(tghit_ac); } else { - tghit_ac_name = PROC_ALINK; + tghit_ac_name = fpcNm_ALINK_e; } dCcD_GObjInf* tghit_gobj = var_r29->GetTgHitGObj(); @@ -621,7 +621,7 @@ BOOL daAlink_c::checkDamageAction() { seStartOnlyReverb(Z2SE_AL_BURN_START); } - if ((mProcID != PROC_GUARD_ATTACK || (tghit_ac_name != PROC_E_TK_BALL && tghit_ac_name != PROC_KN_BULLET)) && !checkModeFlg(0x4000000)) { + if ((mProcID != PROC_GUARD_ATTACK || (tghit_ac_name != fpcNm_E_TK_BALL_e && tghit_ac_name != fpcNm_KN_BULLET_e)) && !checkModeFlg(0x4000000)) { if (at_spl == 10 || at_spl == 11 || at_spl == 9) { return procGuardBreakInit(); } @@ -633,7 +633,7 @@ BOOL daAlink_c::checkDamageAction() { return procHorseHangInit(var_r29, 0); } } else if (at_spl == 8 || checkModeFlg(0x70C52)) { - if (!checkModeFlg(0x400) && mEquipItem != fpcNm_ITEM_IRONBALL) { + if (!checkModeFlg(0x400) && mEquipItem != dItemNo_IRONBALL_e) { setSmallGuard(var_r29); } } else { @@ -1624,7 +1624,7 @@ int daAlink_c::procCoElecDamageInit(fopAc_ac_c* i_tgHitActor, dCcD_GObjInf* i_tg } if (i_tgHitActor != NULL) { - i_tgHitActor->actor_status |= 0x800; + i_tgHitActor->actor_status |= fopAcStts_STAFF_EXTRA_e; } commonProcInit(PROC_ELEC_DAMAGE); @@ -1634,7 +1634,7 @@ int daAlink_c::procCoElecDamageInit(fopAc_ac_c* i_tgHitActor, dCcD_GObjInf* i_tg daAlink_ANM anm; daAlink_WANM wolf_anm; if ((mLinkAcch.ChkGroundHit() && !temp_r27) || checkMagneBootsOn()) { - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { setIronBallWaitUpperAnime(1); } anm = ANM_ELEC_STUN_GND; diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc index 6ef8241974d..d913297a7e9 100644 --- a/src/d/actor/d_a_alink_demo.inc +++ b/src/d/actor/d_a_alink_demo.inc @@ -31,7 +31,7 @@ void daAlink_c::createNpcTks(cXyz* i_basePos, int i_roomNo, u32 i_parameters) { cXyz pos(i_basePos->x + cM_ssin(shape_angle.y) * 200.0f, i_basePos->y, i_basePos->z + cM_scos(shape_angle.y) * 200.0f); csXyz angle(0, shape_angle.y + 0x8000, 0); - fopAcM_create(PROC_NPC_TKS, i_parameters, &pos, i_roomNo, &angle, NULL, -1); + fopAcM_create(fpcNm_NPC_TKS_e, i_parameters, &pos, i_roomNo, &angle, NULL, -1); } bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) { @@ -41,8 +41,8 @@ bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) { if (param_2 != 0 && checkDungeon() && dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != dStage_SaveTbl_LV8 && dStage_stagInfo_GetSaveTbl(dComIfGp_getStage()->getStagInfo()) != dStage_SaveTbl_LV9 && - (checkItemGet(fpcNm_ITEM_TKS_LETTER, TRUE) || - (checkItemGet(fpcNm_ITEM_DUNGEON_BACK, TRUE) && !checkLv7DungeonShop())) && + (checkItemGet(dItemNo_TKS_LETTER_e, TRUE) || + (checkItemGet(dItemNo_DUNGEON_BACK_e, TRUE) && !checkLv7DungeonShop())) && dComIfGs_isDungeonItemWarp()) { if (!dComIfGs_isStageBossEnemy()) { @@ -152,7 +152,7 @@ int daAlink_c::checkDemoAction() { checkBoarRide() || checkCanoeRide()) { if (demoMode == daPy_demo_c::DEMO_UNK_6_e && (checkHorseRide() || checkBoarRide())) { - if (mEquipItem != fpcNm_ITEM_NONE && mEquipItem != fpcNm_ITEM_KANTERA && !checkEquipAnime()) { + if (mEquipItem != dItemNo_NONE_e && mEquipItem != dItemNo_KANTERA_e && !checkEquipAnime()) { allUnequip(1); } } @@ -208,13 +208,13 @@ int daAlink_c::checkDemoAction() { } else if (mDemo.getParam0() == 4) { if (!checkFishingRodItem(mEquipItem)) { deleteEquipItem(FALSE, TRUE); - mEquipItem = fpcNm_ITEM_FISHING_ROD_1; + mEquipItem = dItemNo_FISHING_ROD_1_e; setGroundFishingRodActor(); } } else if (mDemo.getParam0() == 3) { if (!checkCanoeRide()) { daCanoe_c* canoe_p = (daCanoe_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchCanoe, NULL); - canoe_p->onRodID(fopAcM_create(PROC_MG_ROD, 0xD, &mLeftHandPos, -1, NULL, NULL, -1)); + canoe_p->onRodID(fopAcM_create(fpcNm_MG_ROD_e, 0xD, &mLeftHandPos, -1, NULL, NULL, -1)); return procCanoeJumpRideInit(NULL); } return 1; @@ -632,7 +632,7 @@ void daAlink_c::setDemoData() { freeGrabItem(); if (dComIfGp_evmng_startCheck("R22-opening")) { - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { deleteEquipItem(FALSE, FALSE); } } else { @@ -746,7 +746,7 @@ void daAlink_c::setDemoData() { } } - if ((mEquipItem == fpcNm_ITEM_IRONBALL || checkFishingRodItem(mEquipItem)) && demo_mode != daPy_demo_c::DEMO_UNK_1_e && + if ((mEquipItem == dItemNo_IRONBALL_e || checkFishingRodItem(mEquipItem)) && demo_mode != daPy_demo_c::DEMO_UNK_1_e && demo_mode != daPy_demo_c::DEMO_UNK_31_e && (mAlinkStaffId != -1 || mDemo.getDemoType() == daPy_demo_c::DEMO_TYPE_ORIGINAL_e) && (demo_mode != daPy_demo_c::DEMO_UNK_6_e || (!var_r28 && !checkEquipAnime()))) { @@ -1004,45 +1004,45 @@ BOOL daAlink_c::checkFlyAtnWait() { } void daAlink_c::setGetItemFace(u16 i_itemNo) { - if (i_itemNo == fpcNm_ITEM_SILVER_RUPEE - || i_itemNo == fpcNm_ITEM_ORANGE_RUPEE - || i_itemNo == fpcNm_ITEM_KAKERA_HEART - || i_itemNo == fpcNm_ITEM_UTAWA_HEART - || i_itemNo == fpcNm_ITEM_WEAR_ZORA - || i_itemNo == fpcNm_ITEM_WALLET_LV3 - || (i_itemNo >= fpcNm_ITEM_BOOMERANG && i_itemNo <= fpcNm_ITEM_W_HOOKSHOT) - || i_itemNo == fpcNm_ITEM_FISHING_ROD_1 - || i_itemNo == fpcNm_ITEM_ARROW_LV3 - || i_itemNo == fpcNm_ITEM_LINKS_SAVINGS - || i_itemNo == fpcNm_ITEM_FAIRY_DROP - || i_itemNo == fpcNm_ITEM_DROP_BOTTLE - || i_itemNo == fpcNm_ITEM_ANCIENT_DOCUMENT2 - || i_itemNo == fpcNm_ITEM_DROP_CONTAINER - || i_itemNo == fpcNm_ITEM_DROP_CONTAINER02 - || i_itemNo == fpcNm_ITEM_DROP_CONTAINER03) + if (i_itemNo == dItemNo_SILVER_RUPEE_e + || i_itemNo == dItemNo_ORANGE_RUPEE_e + || i_itemNo == dItemNo_KAKERA_HEART_e + || i_itemNo == dItemNo_UTAWA_HEART_e + || i_itemNo == dItemNo_WEAR_ZORA_e + || i_itemNo == dItemNo_WALLET_LV3_e + || (i_itemNo >= dItemNo_BOOMERANG_e && i_itemNo <= dItemNo_W_HOOKSHOT_e) + || i_itemNo == dItemNo_FISHING_ROD_1_e + || i_itemNo == dItemNo_ARROW_LV3_e + || i_itemNo == dItemNo_LINKS_SAVINGS_e + || i_itemNo == dItemNo_FAIRY_DROP_e + || i_itemNo == dItemNo_DROP_BOTTLE_e + || i_itemNo == dItemNo_ANCIENT_DOCUMENT2_e + || i_itemNo == dItemNo_DROP_CONTAINER_e + || i_itemNo == dItemNo_DROP_CONTAINER02_e + || i_itemNo == dItemNo_DROP_CONTAINER03_e) { setFaceBasicBck(dRes_ID_ALANM_BCK_FI_e); - } else if (i_itemNo == fpcNm_ITEM_DUNGEON_EXIT || i_itemNo == fpcNm_ITEM_LV7_DUNGEON_EXIT) { + } else if (i_itemNo == dItemNo_DUNGEON_EXIT_e || i_itemNo == dItemNo_LV7_DUNGEON_EXIT_e) { setFaceBasicTexture(FTANM_K_A); setFaceBasicBck(dRes_ID_ALANM_BCK_FK_e); - } else if (i_itemNo == fpcNm_ITEM_TOMATO_PUREE || i_itemNo == fpcNm_ITEM_TASTE) { + } else if (i_itemNo == dItemNo_TOMATO_PUREE_e || i_itemNo == dItemNo_TASTE_e) { setFaceBasicBck(dRes_ID_ALANM_BCK_FJ_e); } } BOOL daAlink_c::checkGrabTalkActor(fopAc_ac_c* i_actor) { s16 name = fopAcM_GetName(i_actor); - return name == PROC_NPC_KYURY || name == PROC_MYNA || name == PROC_OBJ_SSITEM || - name == PROC_TAG_MSG; + return name == fpcNm_NPC_KYURY_e || name == fpcNm_MYNA_e || name == fpcNm_OBJ_SSITEM_e || + name == fpcNm_TAG_MSG_e; } int daAlink_c::setTalkStartBack(cXyz* param_0) { fopAc_ac_c* partner_p = fopAcM_getTalkEventPartner(this); if (partner_p != NULL) { s16 partner_name = fopAcM_GetName(partner_p); - if (partner_name == PROC_MIDNA || partner_name == PROC_Tag_Wljump || - partner_name == PROC_Tag_Mhint || partner_name == PROC_Tag_Mstop || - partner_name == PROC_Tag_Mwait) + if (partner_name == fpcNm_MIDNA_e || partner_name == fpcNm_Tag_Wljump_e || + partner_name == fpcNm_Tag_Mhint_e || partner_name == fpcNm_Tag_Mstop_e || + partner_name == fpcNm_Tag_Mwait_e) { return 0; } @@ -1073,14 +1073,14 @@ void daAlink_c::setShapeAngleToTalkActor() { if (partner_p != NULL) { s16 partner_name = fopAcM_GetName(partner_p); - if (partner_name != PROC_MYNA && - (partner_name != PROC_Tag_Mwait || !static_cast(partner_p)->checkEndMessage()) && - (partner_name != PROC_Tag_Mhint || !static_cast(partner_p)->checkNoAttention()) && - (partner_name != PROC_Tag_Mstop || !static_cast(partner_p)->checkNoAttention()) && - partner_name != PROC_MIDNA) + if (partner_name != fpcNm_MYNA_e && + (partner_name != fpcNm_Tag_Mwait_e || !static_cast(partner_p)->checkEndMessage()) && + (partner_name != fpcNm_Tag_Mhint_e || !static_cast(partner_p)->checkNoAttention()) && + (partner_name != fpcNm_Tag_Mstop_e || !static_cast(partner_p)->checkNoAttention()) && + partner_name != fpcNm_MIDNA_e) { s16 target; - if (partner_name == PROC_Tag_Mhint || partner_name == PROC_Tag_Mstop) { + if (partner_name == fpcNm_Tag_Mhint_e || partner_name == fpcNm_Tag_Mstop_e) { target = cLib_targetAngleY(¤t.pos, &partner_p->eyePos); } else { target = fopAcM_searchActorAngleY(this, partner_p); @@ -1092,7 +1092,7 @@ void daAlink_c::setShapeAngleToTalkActor() { } void daAlink_c::setTalkAnime() { - if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_8_e || mEquipItem == fpcNm_ITEM_KANTERA || + if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_8_e || mEquipItem == dItemNo_KANTERA_e || (checkNoResetFlg2(FLG2_UNK_1) && field_0x2fde == 0x48)) { setDoubleAnime(0.0f, mpHIO->mMove.m.mWaitAnmSpeed, @@ -1238,7 +1238,7 @@ BOOL daAlink_c::checkRestartDead(int i_dmgAmount, BOOL i_checkZoraMag) { i_dmgAmount *= (int)damageMagnification(i_checkZoraMag, 1); if (mProcID != PROC_DEAD && i_dmgAmount >= dComIfGs_getLife() && !checkMagicArmorNoDamage() && - !dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) + !dComIfGs_checkBottle(dItemNo_FAIRY_e)) { onNoResetFlg2(FLG2_FORCE_GAMEOVER); procCoDeadInit(0); @@ -1261,7 +1261,7 @@ void daAlink_c::setDeadRideSyncPos() { } BOOL daAlink_c::checkDeadHP() { - return ((dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400)) && !dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) || + return ((dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400)) && !dComIfGs_checkBottle(dItemNo_FAIRY_e)) || checkNoResetFlg2(FLG2_FORCE_GAMEOVER) || (dComIfGp_getOxygenShowFlag() && dComIfGp_getNowOxygen() == 0); } @@ -1294,9 +1294,9 @@ BOOL daAlink_c::checkDeadAction(int param_0) { return commonFallInit(1); } - } else if (dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400) && dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) { + } else if (dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400) && dComIfGs_checkBottle(dItemNo_FAIRY_e)) { makeFairy(¤t.pos, 0); - dComIfGs_setBottleItemIn(fpcNm_ITEM_FAIRY, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_FAIRY_e, dItemNo_EMPTY_BOTTLE_e); } } @@ -1707,7 +1707,7 @@ int daAlink_c::procCoTalkInit() { commonProcInit(PROC_TALK); if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_6_e) { - if (mEquipItem != fpcNm_ITEM_KANTERA && mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_KANTERA_e && mEquipItem != dItemNo_NONE_e) { allUnequip(1); } } @@ -1790,7 +1790,7 @@ int daAlink_c::procCoTalk() { mNormalSpeed = 0.0f; } } else { - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { if (mUpperAnmHeap[0].getIdx() != getMainBckData(ANM_WAIT)->m_upperID) { setSingleAnimeBaseSpeed(ANM_WAIT, mpHIO->mMove.m.mWaitAnmSpeed, 3.0f); } @@ -1896,7 +1896,7 @@ int daAlink_c::procCoUnequipInit() { setBlendMoveAnime(mpHIO->mBasic.m.mBasicInterpolation); if (mDemo.getParam1() == 0) { - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { allUnequip(0); } } else if (mDemo.getParam1() == 1) { @@ -1917,7 +1917,7 @@ int daAlink_c::procCoUnequip() { if (mProcVar2.field_0x300c != 0) { if (checkAnmEnd(mUnderFrameCtrl)) { setBlendMoveAnime(3.0f); - itemEquip(fpcNm_ITEM_COPY_ROD); + itemEquip(dItemNo_COPY_ROD_e); mUpperFrameCtrl[2].setFrame(6.0f); getNowAnmPackUpper(UPPER_2)->setFrame(6.0f); @@ -1951,265 +1951,265 @@ void daAlink_c::setGetSubBgm(int i_itemNo) { }; static const u8 getSeType[255] = { - /* fpcNm_ITEM_HEART */ SETYPE_NONE, - /* fpcNm_ITEM_GREEN_RUPEE */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_BLUE_RUPEE */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_YELLOW_RUPEE */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_RED_RUPEE */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_PURPLE_RUPEE */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_ORANGE_RUPEE */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_SILVER_RUPEE */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_S_MAGIC */ SETYPE_NONE, - /* fpcNm_ITEM_L_MAGIC */ SETYPE_NONE, - /* fpcNm_ITEM_BOMB_5 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_BOMB_10 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_BOMB_20 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_BOMB_30 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_ARROW_10 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_ARROW_20 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_ARROW_30 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_ARROW_1 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_PACHINKO_SHOT */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_NOENTRY_19 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_20 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_21 */ SETYPE_NONE, - /* fpcNm_ITEM_WATER_BOMB_5 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_WATER_BOMB_10 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_WATER_BOMB_20 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_WATER_BOMB_30 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_BOMB_INSECT_5 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_BOMB_INSECT_10 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_BOMB_INSECT_20 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_BOMB_INSECT_30 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_RECOVERY_FAILY */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_TRIPLE_HEART */ SETYPE_NONE, - /* fpcNm_ITEM_SMALL_KEY */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_KAKERA_HEART */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_UTAWA_HEART */ SETYPE_HEART, - /* fpcNm_ITEM_MAP */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_COMPUS */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_DUNGEON_EXIT */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_BOSS_KEY */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_DUNGEON_BACK */ SETYPE_NONE, - /* fpcNm_ITEM_SWORD */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_MASTER_SWORD */ SETYPE_NONE, - /* fpcNm_ITEM_WOOD_SHIELD */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_SHIELD */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_HYLIA_SHIELD */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_TKS_LETTER */ SETYPE_NONE, - /* fpcNm_ITEM_WEAR_CASUAL */ SETYPE_NONE, - /* fpcNm_ITEM_WEAR_KOKIRI */ SETYPE_NONE, - /* fpcNm_ITEM_ARMOR */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_WEAR_ZORA */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_MAGIC_LV1 */ SETYPE_NONE, - /* fpcNm_ITEM_DUNGEON_EXIT_2 */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_WALLET_LV1 */ SETYPE_NONE, - /* fpcNm_ITEM_WALLET_LV2 */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_WALLET_LV3 */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_NOENTRY_55 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_56 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_57 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_58 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_59 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_60 */ SETYPE_NONE, - /* fpcNm_ITEM_ZORAS_JEWEL */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_HAWK_EYE */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_WOOD_STICK */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_BOOMERANG */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_SPINNER */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_IRONBALL */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_BOW */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_HOOKSHOT */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_HVY_BOOTS */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_COPY_ROD */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_W_HOOKSHOT */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_KANTERA */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_LIGHT_SWORD */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_FISHING_ROD_1 */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_PACHINKO */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_COPY_ROD_2 */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_NOENTRY_77 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_78 */ SETYPE_NONE, - /* fpcNm_ITEM_BOMB_BAG_LV2 */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_BOMB_BAG_LV1 */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_BOMB_IN_BAG */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_NOENTRY_82 */ SETYPE_NONE, - /* fpcNm_ITEM_LIGHT_ARROW */ SETYPE_NONE, - /* fpcNm_ITEM_ARROW_LV1 */ SETYPE_NONE, - /* fpcNm_ITEM_ARROW_LV2 */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_ARROW_LV3 */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_NOENTRY_87 */ SETYPE_NONE, - /* fpcNm_ITEM_LURE_ROD */ SETYPE_NONE, - /* fpcNm_ITEM_BOMB_ARROW */ SETYPE_NONE, - /* fpcNm_ITEM_HAWK_ARROW */ SETYPE_NONE, - /* fpcNm_ITEM_BEE_ROD */ SETYPE_NONE, - /* fpcNm_ITEM_JEWEL_ROD */ SETYPE_NONE, - /* fpcNm_ITEM_WORM_ROD */ SETYPE_NONE, - /* fpcNm_ITEM_JEWEL_BEE_ROD */ SETYPE_NONE, - /* fpcNm_ITEM_JEWEL_WORM_ROD */ SETYPE_NONE, - /* fpcNm_ITEM_EMPTY_BOTTLE */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_RED_BOTTLE */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_GREEN_BOTTLE */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_BLUE_BOTTLE */ SETYPE_ITEM_GET_MINI, + /* dItemNo_HEART_e */ SETYPE_NONE, + /* dItemNo_GREEN_RUPEE_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_BLUE_RUPEE_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_YELLOW_RUPEE_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_RED_RUPEE_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_PURPLE_RUPEE_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_ORANGE_RUPEE_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_SILVER_RUPEE_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_S_MAGIC_e */ SETYPE_NONE, + /* dItemNo_L_MAGIC_e */ SETYPE_NONE, + /* dItemNo_BOMB_5_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_BOMB_10_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_BOMB_20_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_BOMB_30_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_ARROW_10_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_ARROW_20_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_ARROW_30_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_ARROW_1_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_PACHINKO_SHOT_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_NOENTRY_19_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_20_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_21_e */ SETYPE_NONE, + /* dItemNo_WATER_BOMB_5_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_WATER_BOMB_10_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_WATER_BOMB_20_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_WATER_BOMB_30_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_BOMB_INSECT_5_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_BOMB_INSECT_10_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_BOMB_INSECT_20_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_BOMB_INSECT_30_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_RECOVERY_FAILY_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_TRIPLE_HEART_e */ SETYPE_NONE, + /* dItemNo_SMALL_KEY_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_KAKERA_HEART_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_UTAWA_HEART_e */ SETYPE_HEART, + /* dItemNo_MAP_e */ SETYPE_ITEM_GET, + /* dItemNo_COMPUS_e */ SETYPE_ITEM_GET, + /* dItemNo_DUNGEON_EXIT_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_BOSS_KEY_e */ SETYPE_ITEM_GET, + /* dItemNo_DUNGEON_BACK_e */ SETYPE_NONE, + /* dItemNo_SWORD_e */ SETYPE_ITEM_GET, + /* dItemNo_MASTER_SWORD_e */ SETYPE_NONE, + /* dItemNo_WOOD_SHIELD_e */ SETYPE_ITEM_GET, + /* dItemNo_SHIELD_e */ SETYPE_ITEM_GET, + /* dItemNo_HYLIA_SHIELD_e */ SETYPE_ITEM_GET, + /* dItemNo_TKS_LETTER_e */ SETYPE_NONE, + /* dItemNo_WEAR_CASUAL_e */ SETYPE_NONE, + /* dItemNo_WEAR_KOKIRI_e */ SETYPE_NONE, + /* dItemNo_ARMOR_e */ SETYPE_ITEM_GET, + /* dItemNo_WEAR_ZORA_e */ SETYPE_ITEM_GET, + /* dItemNo_MAGIC_LV1_e */ SETYPE_NONE, + /* dItemNo_DUNGEON_EXIT_2_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_WALLET_LV1_e */ SETYPE_NONE, + /* dItemNo_WALLET_LV2_e */ SETYPE_ITEM_GET, + /* dItemNo_WALLET_LV3_e */ SETYPE_ITEM_GET, + /* dItemNo_NOENTRY_55_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_56_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_57_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_58_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_59_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_60_e */ SETYPE_NONE, + /* dItemNo_ZORAS_JEWEL_e */ SETYPE_ITEM_GET, + /* dItemNo_HAWK_EYE_e */ SETYPE_ITEM_GET, + /* dItemNo_WOOD_STICK_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_BOOMERANG_e */ SETYPE_ITEM_GET, + /* dItemNo_SPINNER_e */ SETYPE_ITEM_GET, + /* dItemNo_IRONBALL_e */ SETYPE_ITEM_GET, + /* dItemNo_BOW_e */ SETYPE_ITEM_GET, + /* dItemNo_HOOKSHOT_e */ SETYPE_ITEM_GET, + /* dItemNo_HVY_BOOTS_e */ SETYPE_ITEM_GET, + /* dItemNo_COPY_ROD_e */ SETYPE_ITEM_GET, + /* dItemNo_W_HOOKSHOT_e */ SETYPE_ITEM_GET, + /* dItemNo_KANTERA_e */ SETYPE_ITEM_GET, + /* dItemNo_LIGHT_SWORD_e */ SETYPE_ITEM_GET, + /* dItemNo_FISHING_ROD_1_e */ SETYPE_ITEM_GET, + /* dItemNo_PACHINKO_e */ SETYPE_ITEM_GET, + /* dItemNo_COPY_ROD_2_e */ SETYPE_ITEM_GET, + /* dItemNo_NOENTRY_77_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_78_e */ SETYPE_NONE, + /* dItemNo_BOMB_BAG_LV2_e */ SETYPE_ITEM_GET, + /* dItemNo_BOMB_BAG_LV1_e */ SETYPE_ITEM_GET, + /* dItemNo_BOMB_IN_BAG_e */ SETYPE_ITEM_GET, + /* dItemNo_NOENTRY_82_e */ SETYPE_NONE, + /* dItemNo_LIGHT_ARROW_e */ SETYPE_NONE, + /* dItemNo_ARROW_LV1_e */ SETYPE_NONE, + /* dItemNo_ARROW_LV2_e */ SETYPE_ITEM_GET, + /* dItemNo_ARROW_LV3_e */ SETYPE_ITEM_GET, + /* dItemNo_NOENTRY_87_e */ SETYPE_NONE, + /* dItemNo_LURE_ROD_e */ SETYPE_NONE, + /* dItemNo_BOMB_ARROW_e */ SETYPE_NONE, + /* dItemNo_HAWK_ARROW_e */ SETYPE_NONE, + /* dItemNo_BEE_ROD_e */ SETYPE_NONE, + /* dItemNo_JEWEL_ROD_e */ SETYPE_NONE, + /* dItemNo_WORM_ROD_e */ SETYPE_NONE, + /* dItemNo_JEWEL_BEE_ROD_e */ SETYPE_NONE, + /* dItemNo_JEWEL_WORM_ROD_e */ SETYPE_NONE, + /* dItemNo_EMPTY_BOTTLE_e */ SETYPE_ITEM_GET, + /* dItemNo_RED_BOTTLE_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_GREEN_BOTTLE_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_BLUE_BOTTLE_e */ SETYPE_ITEM_GET_MINI, #if PLATFORM_SHIELD - /* fpcNm_ITEM_MILK_BOTTLE */ SETYPE_ITEM_GET, + /* dItemNo_MILK_BOTTLE_e */ SETYPE_ITEM_GET, #else - /* fpcNm_ITEM_MILK_BOTTLE */ SETYPE_ITEM_GET_MINI, + /* dItemNo_MILK_BOTTLE_e */ SETYPE_ITEM_GET_MINI, #endif - /* fpcNm_ITEM_HALF_MILK_BOTTLE */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_OIL_BOTTLE */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_WATER_BOTTLE */ SETYPE_NONE, - /* fpcNm_ITEM_OIL_BOTTLE_2 */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_RED_BOTTLE_2 */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_UGLY_SOUP */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_HOT_SPRING */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_FAIRY */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_HOT_SPRING_2 */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_OIL2 */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_OIL */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_NORMAL_BOMB */ SETYPE_NONE, - /* fpcNm_ITEM_WATER_BOMB */ SETYPE_NONE, - /* fpcNm_ITEM_POKE_BOMB */ SETYPE_NONE, - /* fpcNm_ITEM_FAIRY_DROP */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_WORM */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_DROP_BOTTLE */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_BEE_CHILD */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_CHUCHU_RARE */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_CHUCHU_RED */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_CHUCHU_BLUE */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_CHUCHU_GREEN */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_CHUCHU_YELLOW */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_CHUCHU_PURPLE */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_LV1_SOUP */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_LV2_SOUP */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_LV3_SOUP */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_LETTER */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_BILL */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_WOOD_STATUE */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_IRIAS_PENDANT */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_HORSE_FLUTE */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_133 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_134 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_135 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_136 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_137 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_138 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_139 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_140 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_141 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_142 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_143 */ SETYPE_NONE, - /* fpcNm_ITEM_RAFRELS_MEMO */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_ASHS_SCRIBBLING */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_NOENTRY_146 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_147 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_148 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_149 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_150 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_151 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_152 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_153 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_154 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_155 */ SETYPE_NONE, - /* fpcNm_ITEM_CHUCHU_YELLOW2 */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_OIL_BOTTLE3 */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_SHOP_BEE_CHILD */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_CHUCHU_BLACK */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_LIGHT_DROP */ SETYPE_NONE, - /* fpcNm_ITEM_DROP_CONTAINER */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_DROP_CONTAINER02 */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_DROP_CONTAINER03 */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_FILLED_CONTAINER */ SETYPE_NONE, - /* fpcNm_ITEM_MIRROR_PIECE_2 */ SETYPE_NONE, - /* fpcNm_ITEM_MIRROR_PIECE_3 */ SETYPE_NONE, - /* fpcNm_ITEM_MIRROR_PIECE_4 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_168 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_169 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_170 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_171 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_172 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_173 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_174 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_175 */ SETYPE_NONE, - /* fpcNm_ITEM_SMELL_YELIA_POUCH */ SETYPE_ITEM_GET_SMELL, - /* fpcNm_ITEM_SMELL_PUMPKIN */ SETYPE_ITEM_GET_SMELL, - /* fpcNm_ITEM_SMELL_POH */ SETYPE_ITEM_GET_SMELL, - /* fpcNm_ITEM_SMELL_FISH */ SETYPE_ITEM_GET_SMELL, - /* fpcNm_ITEM_SMELL_CHILDREN */ SETYPE_ITEM_GET_SMELL, - /* fpcNm_ITEM_SMELL_MEDICINE */ SETYPE_ITEM_GET_SMELL, - /* fpcNm_ITEM_NOENTRY_182 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_183 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_184 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_185 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_186 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_187 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_188 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_189 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_190 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_191 */ SETYPE_NONE, - /* fpcNm_ITEM_M_BEETLE */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_F_BEETLE */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_M_BUTTERFLY */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_F_BUTTERFLY */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_M_STAG_BEETLE */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_F_STAG_BEETLE */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_M_GRASSHOPPER */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_F_GRASSHOPPER */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_M_NANAFUSHI */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_F_NANAFUSHI */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_M_DANGOMUSHI */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_F_DANGOMUSHI */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_M_MANTIS */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_F_MANTIS */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_M_LADYBUG */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_F_LADYBUG */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_M_SNAIL */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_F_SNAIL */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_M_DRAGONFLY */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_F_DRAGONFLY */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_M_ANT */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_F_ANT */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_M_MAYFLY */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_F_MAYFLY */ SETYPE_ITEM_GET_INSECT, - /* fpcNm_ITEM_NOENTRY_216 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_217 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_218 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_219 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_220 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_221 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_222 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_223 */ SETYPE_NONE, - /* fpcNm_ITEM_POU_SPIRIT */ SETYPE_ITEM_GET_POU, - /* fpcNm_ITEM_NOENTRY_225 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_226 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_227 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_228 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_229 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_230 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_231 */ SETYPE_NONE, - /* fpcNm_ITEM_NOENTRY_232 */ SETYPE_NONE, - /* fpcNm_ITEM_ANCIENT_DOCUMENT */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_AIR_LETTER */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_ANCIENT_DOCUMENT2 */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_LV7_DUNGEON_EXIT */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_LINKS_SAVINGS */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_SMALL_KEY2 */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_POU_FIRE1 */ SETYPE_NONE, - /* fpcNm_ITEM_POU_FIRE2 */ SETYPE_NONE, - /* fpcNm_ITEM_POU_FIRE3 */ SETYPE_NONE, - /* fpcNm_ITEM_POU_FIRE4 */ SETYPE_NONE, - /* fpcNm_ITEM_BOSSRIDER_KEY */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_TOMATO_PUREE */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_TASTE */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_LV5_BOSS_KEY */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_SURFBOARD */ SETYPE_NONE, - /* fpcNm_ITEM_KANTERA2 */ SETYPE_ITEM_GET_ME, - /* fpcNm_ITEM_L2_KEY_PIECES1 */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_L2_KEY_PIECES2 */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_L2_KEY_PIECES3 */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_KEY_OF_CARAVAN */ SETYPE_ITEM_GET_MINI, - /* fpcNm_ITEM_LV2_BOSS_KEY */ SETYPE_ITEM_GET, - /* fpcNm_ITEM_KEY_OF_FILONE */ SETYPE_ITEM_GET_MINI, + /* dItemNo_HALF_MILK_BOTTLE_e */ SETYPE_ITEM_GET, + /* dItemNo_OIL_BOTTLE_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_WATER_BOTTLE_e */ SETYPE_NONE, + /* dItemNo_OIL_BOTTLE_2_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_RED_BOTTLE_2_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_UGLY_SOUP_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_HOT_SPRING_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_FAIRY_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_HOT_SPRING_2_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_OIL2_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_OIL_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_NORMAL_BOMB_e */ SETYPE_NONE, + /* dItemNo_WATER_BOMB_e */ SETYPE_NONE, + /* dItemNo_POKE_BOMB_e */ SETYPE_NONE, + /* dItemNo_FAIRY_DROP_e */ SETYPE_ITEM_GET, + /* dItemNo_WORM_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_DROP_BOTTLE_e */ SETYPE_ITEM_GET, + /* dItemNo_BEE_CHILD_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_CHUCHU_RARE_e */ SETYPE_ITEM_GET, + /* dItemNo_CHUCHU_RED_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_CHUCHU_BLUE_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_CHUCHU_GREEN_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_CHUCHU_YELLOW_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_CHUCHU_PURPLE_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_LV1_SOUP_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_LV2_SOUP_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_LV3_SOUP_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_LETTER_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_BILL_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_WOOD_STATUE_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_IRIAS_PENDANT_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_HORSE_FLUTE_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_133_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_134_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_135_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_136_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_137_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_138_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_139_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_140_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_141_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_142_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_143_e */ SETYPE_NONE, + /* dItemNo_RAFRELS_MEMO_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_ASHS_SCRIBBLING_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_NOENTRY_146_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_147_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_148_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_149_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_150_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_151_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_152_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_153_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_154_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_155_e */ SETYPE_NONE, + /* dItemNo_CHUCHU_YELLOW2_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_OIL_BOTTLE3_e */ SETYPE_ITEM_GET, + /* dItemNo_SHOP_BEE_CHILD_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_CHUCHU_BLACK_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_LIGHT_DROP_e */ SETYPE_NONE, + /* dItemNo_DROP_CONTAINER_e */ SETYPE_ITEM_GET, + /* dItemNo_DROP_CONTAINER02_e */ SETYPE_ITEM_GET, + /* dItemNo_DROP_CONTAINER03_e */ SETYPE_ITEM_GET, + /* dItemNo_FILLED_CONTAINER_e */ SETYPE_NONE, + /* dItemNo_MIRROR_PIECE_2_e */ SETYPE_NONE, + /* dItemNo_MIRROR_PIECE_3_e */ SETYPE_NONE, + /* dItemNo_MIRROR_PIECE_4_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_168_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_169_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_170_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_171_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_172_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_173_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_174_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_175_e */ SETYPE_NONE, + /* dItemNo_SMELL_YELIA_POUCH_e */ SETYPE_ITEM_GET_SMELL, + /* dItemNo_SMELL_PUMPKIN_e */ SETYPE_ITEM_GET_SMELL, + /* dItemNo_SMELL_POH_e */ SETYPE_ITEM_GET_SMELL, + /* dItemNo_SMELL_FISH_e */ SETYPE_ITEM_GET_SMELL, + /* dItemNo_SMELL_CHILDREN_e */ SETYPE_ITEM_GET_SMELL, + /* dItemNo_SMELL_MEDICINE_e */ SETYPE_ITEM_GET_SMELL, + /* dItemNo_NOENTRY_182_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_183_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_184_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_185_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_186_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_187_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_188_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_189_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_190_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_191_e */ SETYPE_NONE, + /* dItemNo_M_BEETLE_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_F_BEETLE_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_M_BUTTERFLY_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_F_BUTTERFLY_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_M_STAG_BEETLE_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_F_STAG_BEETLE_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_M_GRASSHOPPER_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_F_GRASSHOPPER_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_M_NANAFUSHI_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_F_NANAFUSHI_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_M_DANGOMUSHI_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_F_DANGOMUSHI_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_M_MANTIS_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_F_MANTIS_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_M_LADYBUG_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_F_LADYBUG_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_M_SNAIL_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_F_SNAIL_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_M_DRAGONFLY_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_F_DRAGONFLY_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_M_ANT_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_F_ANT_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_M_MAYFLY_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_F_MAYFLY_e */ SETYPE_ITEM_GET_INSECT, + /* dItemNo_NOENTRY_216_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_217_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_218_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_219_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_220_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_221_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_222_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_223_e */ SETYPE_NONE, + /* dItemNo_POU_SPIRIT_e */ SETYPE_ITEM_GET_POU, + /* dItemNo_NOENTRY_225_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_226_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_227_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_228_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_229_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_230_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_231_e */ SETYPE_NONE, + /* dItemNo_NOENTRY_232_e */ SETYPE_NONE, + /* dItemNo_ANCIENT_DOCUMENT_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_AIR_LETTER_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_ANCIENT_DOCUMENT2_e */ SETYPE_ITEM_GET, + /* dItemNo_LV7_DUNGEON_EXIT_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_LINKS_SAVINGS_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_SMALL_KEY2_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_POU_FIRE1_e */ SETYPE_NONE, + /* dItemNo_POU_FIRE2_e */ SETYPE_NONE, + /* dItemNo_POU_FIRE3_e */ SETYPE_NONE, + /* dItemNo_POU_FIRE4_e */ SETYPE_NONE, + /* dItemNo_BOSSRIDER_KEY_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_TOMATO_PUREE_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_TASTE_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_LV5_BOSS_KEY_e */ SETYPE_ITEM_GET, + /* dItemNo_SURFBOARD_e */ SETYPE_NONE, + /* dItemNo_KANTERA2_e */ SETYPE_ITEM_GET_ME, + /* dItemNo_L2_KEY_PIECES1_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_L2_KEY_PIECES2_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_L2_KEY_PIECES3_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_KEY_OF_CARAVAN_e */ SETYPE_ITEM_GET_MINI, + /* dItemNo_LV2_BOSS_KEY_e */ SETYPE_ITEM_GET, + /* dItemNo_KEY_OF_FILONE_e */ SETYPE_ITEM_GET_MINI, }; static u32 const bgmLabel[8] = { @@ -2232,8 +2232,8 @@ void daAlink_c::setGetSubBgm(int i_itemNo) { BOOL daAlink_c::checkTreasureRupeeReturn(int i_itemNo) const { static const int dummy = 0; - if (i_itemNo == fpcNm_ITEM_LINKS_SAVINGS) { - i_itemNo = fpcNm_ITEM_PURPLE_RUPEE; + if (i_itemNo == dItemNo_LINKS_SAVINGS_e) { + i_itemNo = dItemNo_PURPLE_RUPEE_e; } i_itemNo -= 4; @@ -2264,9 +2264,9 @@ int daAlink_c::procCoGetItemInit() { mLinkAcch.ClrWallNone(); - if (!checkWolf() && mEquipItem != fpcNm_ITEM_NONE && var_r30 == 0) { + if (!checkWolf() && mEquipItem != dItemNo_NONE_e && var_r30 == 0) { if (checkModeFlg(0x400) || - (checkStageName("D_MN05B") && mEquipItem == fpcNm_ITEM_BOOMERANG && !dComIfGs_isItemFirstBit(fpcNm_ITEM_BOOMERANG))) + (checkStageName("D_MN05B") && mEquipItem == dItemNo_BOOMERANG_e && !dComIfGs_isItemFirstBit(dItemNo_BOOMERANG_e))) { deleteEquipItem(FALSE, FALSE); } else { @@ -2426,8 +2426,8 @@ int daAlink_c::procCoGetItem() { daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this); #if DEBUG - if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != PROC_ITEM && - fopAcM_GetName(item_partner_p) != PROC_Demo_Item) + if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != fpcNm_ITEM_e && + fopAcM_GetName(item_partner_p) != fpcNm_Demo_Item_e) { // "Get Item is not an item!!! %d\n" OSReport("ゲットするアイテムがアイテムじゃない！！！　%d\n", @@ -2559,7 +2559,7 @@ int daAlink_c::procCoGetItem() { if (checkWolf()) { setBlendWolfMoveAnime(mpHIO->mWolf.mWlMove.m.mNormalInterpolation); } else { - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { field_0x2f94 = 0; } @@ -2889,7 +2889,7 @@ int daAlink_c::procDemoBoomerangCatchInit() { mNormalSpeed = 0.0f; deleteEquipItem(FALSE, FALSE); - mEquipItem = fpcNm_ITEM_BOOMERANG; + mEquipItem = dItemNo_BOOMERANG_e; setItemActor(); setSingleAnimeParam(ANM_BOOMERANG_CATCH, &mpHIO->mItem.mBoomerang.m.mCatchAnm); return 1; @@ -3511,7 +3511,7 @@ int daAlink_c::procCoGetReadySitInit() { return 1; } - if (mEquipItem != fpcNm_ITEM_NONE && !checkWolf()) { + if (mEquipItem != dItemNo_NONE_e && !checkWolf()) { return procPreActionUnequipInit(PROC_GET_READY_SIT, NULL); } @@ -3795,8 +3795,8 @@ int daAlink_c::procTradeItemOut() { daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this); if (item_partner_p != NULL) { if (!fpcM_IsCreating(fpcM_GetID(item_partner_p))) { - if (fopAcM_GetName(item_partner_p) == PROC_ITEM || - fopAcM_GetName(item_partner_p) == PROC_Demo_Item) + if (fopAcM_GetName(item_partner_p) == fpcNm_ITEM_e || + fopAcM_GetName(item_partner_p) == fpcNm_Demo_Item_e) { field_0x280c.setData(item_partner_p); item_partner_p->show(); @@ -3828,8 +3828,8 @@ int daAlink_c::procTradeItemOut() { } BOOL daAlink_c::checkLetterItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_LETTER || i_itemNo == fpcNm_ITEM_BILL || i_itemNo == fpcNm_ITEM_RAFRELS_MEMO || - i_itemNo == fpcNm_ITEM_TKS_LETTER || i_itemNo == fpcNm_ITEM_ASHS_SCRIBBLING; + return i_itemNo == dItemNo_LETTER_e || i_itemNo == dItemNo_BILL_e || i_itemNo == dItemNo_RAFRELS_MEMO_e || + i_itemNo == dItemNo_TKS_LETTER_e || i_itemNo == dItemNo_ASHS_SCRIBBLING_e; } int daAlink_c::procNotUseItemInit(int i_itemNo) { @@ -3871,8 +3871,8 @@ int daAlink_c::procNotUseItem() { if (mProcVar3.field_0x300e != 0) { daItemBase_c* item_partner_p = (daItemBase_c*)fopAcM_getItemEventPartner(this); #if DEBUG - if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != PROC_ITEM && - fopAcM_GetName(item_partner_p) != PROC_Demo_Item) + if (item_partner_p != NULL && fopAcM_GetName(item_partner_p) != fpcNm_ITEM_e && + fopAcM_GetName(item_partner_p) != fpcNm_Demo_Item_e) { // "Present Item is not this Item!!! %d\n" OSReport("差し出すアイテムがアイテムじゃない！！！　%d\n", @@ -4102,11 +4102,11 @@ int daAlink_c::procDungeonWarpReadyInit() { } fpc_ProcID id; - if (checkItemSetButton(fpcNm_ITEM_DUNGEON_EXIT) != 2) { - id = fopAcM_create(PROC_OBJ_TKS, 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, + if (checkItemSetButton(dItemNo_DUNGEON_EXIT_e) != 2) { + id = fopAcM_create(fpcNm_OBJ_TKS_e, 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } else { - id = fopAcM_create(PROC_NPC_TKC, 2, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, + id = fopAcM_create(fpcNm_NPC_TKC_e, 2, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } @@ -4132,7 +4132,7 @@ int daAlink_c::procDungeonWarpReady() { if (warpActor != NULL) { field_0x280c.setData(warpActor); - if (fopAcM_GetName(warpActor) == PROC_OBJ_TKS) { + if (fopAcM_GetName(warpActor) == fpcNm_OBJ_TKS_e) { ((daObjTks_c*)warpActor)->setStart(); } else { ((daNpcTkc_c*)warpActor)->setStart(); @@ -4190,7 +4190,7 @@ int daAlink_c::procDungeonWarp() { if (scale.x < 0.01f) { onNoResetFlg0(FLG0_PLAYER_NO_DRAW); - if (checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1)) { + if (checkItemGet(dItemNo_DUNGEON_EXIT_e, 1)) { dStage_changeScene(dStage_stagInfo_GetEscapeWarp(dComIfGp_getStage()->getStagInfo()), 0.0f, 12, -1, shape_angle.y, -1); dMeter2Info_warpOutProc(); } else { @@ -4280,7 +4280,7 @@ int daAlink_c::procDungeonWarpSceneStart() { static fopAc_ac_c* daAlink_searchPortal(fopAc_ac_c* i_actor, void* i_data) { cXyz* pos = (cXyz*)i_data; - if (fopAcM_GetName(i_actor) == PROC_KYTAG04) { + if (fopAcM_GetName(i_actor) == fpcNm_KYTAG04_e) { if (i_actor->current.pos.abs2XZ(*pos) < 1.0f) { return i_actor; } @@ -4521,11 +4521,11 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) { } } - if (checkItemGet(fpcNm_ITEM_DUNGEON_EXIT, 1) || - (checkItemGet(fpcNm_ITEM_DUNGEON_BACK, 1) && + if (checkItemGet(dItemNo_DUNGEON_EXIT_e, 1) || + (checkItemGet(dItemNo_DUNGEON_BACK_e, 1) && strcmp(stageName, dComIfGs_getWarpStageName()) == 0)) { - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_NONE); + dComIfGs_setItem(SLOT_18, dItemNo_NONE_e); dComIfGs_resetLastWarpAcceptStage(); } } diff --git a/src/d/actor/d_a_alink_effect.inc b/src/d/actor/d_a_alink_effect.inc index f21068f2fa3..a5ec288db78 100644 --- a/src/d/actor/d_a_alink_effect.inc +++ b/src/d/actor/d_a_alink_effect.inc @@ -1393,7 +1393,7 @@ void daAlink_c::setWolfBarrierHitEffect(dBgS_LinChk& i_linchk) { const u16* effNames; s16 movebg_name = getMoveBGActorName(i_linchk, TRUE); - if (movebg_name == PROC_Obj_GanonWall2 || movebg_name == PROC_OBJ_GB) { + if (movebg_name == fpcNm_Obj_GanonWall2_e || movebg_name == fpcNm_OBJ_GB_e) { effNames = ganonNameID; } else { effNames = normalNameID; @@ -1664,7 +1664,7 @@ void daAlink_c::setBottleEffect() { JPABaseEmitter* emitter; - if (mEquipItem == fpcNm_ITEM_FAIRY) { + if (mEquipItem == dItemNo_FAIRY_e) { if (mpHookTipModel != NULL) { cXyz pos; mDoMtx_multVecZero(mpHookTipModel->getAnmMtx(2), &pos); @@ -1676,7 +1676,7 @@ void daAlink_c::setBottleEffect() { emitter = setEmitter(&field_0x325c, ID_ZF_J_FAIRYITEM02_STAR, &pos, NULL); } - } else if (mEquipItem == fpcNm_ITEM_CHUCHU_RARE && mProcID == PROC_BOTTLE_GET) { + } else if (mEquipItem == dItemNo_CHUCHU_RARE_e && mProcID == PROC_BOTTLE_GET) { if (field_0x072c != NULL && field_0x072c->getFrame() < 2.0f) { cXyz pos; mDoMtx_multVec(mHeldItemModel->getAnmMtx(0), &chuchuLocalOffset, &pos); @@ -1686,7 +1686,7 @@ void daAlink_c::setBottleEffect() { emitter->setGlobalScale(chuchuScale); } } - } else if (mProcID == PROC_BOTTLE_OPEN && mProcVar3.field_0x300e != 0 && mEquipItem == fpcNm_ITEM_WATER_BOTTLE) { + } else if (mProcID == PROC_BOTTLE_OPEN && mProcVar3.field_0x300e != 0 && mEquipItem == dItemNo_WATER_BOTTLE_e) { emitter = setEmitter(&field_0x325c, ID_ZI_J_LK_BINWATERN_A, ¤t.pos, NULL); if (emitter != NULL) { emitter->setGlobalRTMatrix(mHeldItemModel->getBaseTRMtx()); diff --git a/src/d/actor/d_a_alink_grab.inc b/src/d/actor/d_a_alink_grab.inc index 5f9a02e8e9b..b94f4dafbcd 100644 --- a/src/d/actor/d_a_alink_grab.inc +++ b/src/d/actor/d_a_alink_grab.inc @@ -11,7 +11,7 @@ static bool daAlink_checkLightBallA(fopAc_ac_c* i_actor) { daObjCarry_c* carry = (daObjCarry_c*)i_actor; - if (fopAcM_GetName(carry) == PROC_Obj_Carry && + if (fopAcM_GetName(carry) == fpcNm_Obj_Carry_e && carry->getType() == daObjCarry_c::TYPE_BALL_S) { return true; @@ -23,7 +23,7 @@ static bool daAlink_checkLightBallA(fopAc_ac_c* i_actor) { static bool daAlink_checkLightBallB(fopAc_ac_c* i_actor) { daObjCarry_c* carry = (daObjCarry_c*)i_actor; - if (fopAcM_GetName(carry) == PROC_Obj_Carry && + if (fopAcM_GetName(carry) == fpcNm_Obj_Carry_e && carry->getType() == daObjCarry_c::TYPE_BALL_S_2) { return true; @@ -85,7 +85,7 @@ BOOL daAlink_c::exchangeGrabActor(fopAc_ac_c* i_actor) { BOOL daAlink_c::setForceGrab(fopAc_ac_c* i_actor, BOOL param_1, BOOL param_2) { if (((param_1 || !checkEventRun()) && !checkWolf()) - && ((mEquipItem == fpcNm_ITEM_NONE || (param_2 && checkHookshotItem(mEquipItem))) + && ((mEquipItem == dItemNo_NONE_e || (param_2 && checkHookshotItem(mEquipItem))) && ((checkModeFlg(MODE_UNK_10000000) && (checkHorseNoUpperAnime() || checkHorseTurnAnime()) ) @@ -133,7 +133,7 @@ BOOL daAlink_c::checkGrabSlowMoveActor() { daObjCarry_c* carry = (daObjCarry_c*)mGrabItemAcKeep.getActor(); return carry != NULL && (fopAcM_CheckCarryType(carry, fopAcM_CARRY_HEAVY) || - (fopAcM_GetName(carry) == PROC_Obj_Carry + (fopAcM_GetName(carry) == fpcNm_Obj_Carry_e && (carry->getType() == daObjCarry_c::TYPE_OOTSUBO || carry->getType() == daObjCarry_c::TYPE_AOTSUBO || carry->getType() == daObjCarry_c::TYPE_TARU))); } @@ -177,8 +177,8 @@ void daAlink_c::setGrabUpperAnime(f32 param_0) { BOOL daAlink_c::checkGrabRooster() { if (mGrabItemAcKeep.getActor() != NULL && - (fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_NI || - fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_NPC_TKJ2)) + (fopAcM_GetName(mGrabItemAcKeep.getActor()) == fpcNm_NI_e || + fopAcM_GetName(mGrabItemAcKeep.getActor()) == fpcNm_NPC_TKJ2_e)) { return true; } @@ -200,7 +200,7 @@ void daAlink_c::setGrabItemPos() { grabActor->tevStr.room_no = roomNo; grabActor->tevStr.YukaCol = tevStr.YukaCol; fopAcM_SetRoomNo(grabActor, roomNo); - + BOOL isGrabCarryActor = checkGrabCarryActor(); s16 spE; s16 spC; @@ -211,7 +211,7 @@ void daAlink_c::setGrabItemPos() { spE = shape_angle.y; spC = (field_0x2fee + field_0x3082); } - + if (checkGrabSideThrowAnime()) { mDoMtx_multVecZero(mpLinkModel->getAnmMtx(10), &grabActor->current.pos); grabActor->shape_angle.y = spE; @@ -232,7 +232,7 @@ void daAlink_c::setGrabItemPos() { mDoMtx_stack_c::transM(78.0f, 42.0f, 0.0f); mDoMtx_stack_c::ZrotM(cM_deg2s(138.0f)); } else { - if (fopAcM_GetName(grabActor) == PROC_OBJ_FOOD) { + if (fopAcM_GetName(grabActor) == fpcNm_OBJ_FOOD_e) { mDoMtx_stack_c::transM(32.0f, 7.0f, 0.0f); } else { mDoMtx_stack_c::transM(30.0f, 12.0f, 0.0f); @@ -244,7 +244,7 @@ void daAlink_c::setGrabItemPos() { mDoMtx_stack_c::multVecZero(&grabActor->current.pos); mDoMtx_MtxToRot(mDoMtx_stack_c::get(), &grabActor->shape_angle); } else { - BOOL sp14 = fopAcM_GetName(grabActor) == PROC_NPC_TKJ2; + BOOL sp14 = fopAcM_GetName(grabActor) == fpcNm_NPC_TKJ2_e; if (mProcID == PROC_GRAB_UP) { cLib_chaseAngleS(&grabActor->shape_angle.y, spE, 0x1000); @@ -306,7 +306,7 @@ void daAlink_c::setGrabItemPos() { } mDoMtx_stack_c::multVec(&sp140, &grabActor->current.pos); - + if (checkGrabAnimeSide()) { static Vec const localSidePos = {2.3f, -15.5f, 15.6f}; mDoMtx_multVec(mpLinkModel->getAnmMtx(10), &localSidePos, &sp140); @@ -398,7 +398,7 @@ void daAlink_c::freeGrabItem() { if (grabActor != NULL) { if (dComIfGp_event_runCheck() || mDemo.getDemoType() == daPy_demo_c::DEMO_TYPE_SPECIAL_e) { - fopAcM_OnStatus(grabActor, fopAcM_STATUS_UNK_0x800); + fopAcM_OnStatus(grabActor, fopAcStts_STAFF_EXTRA_e); } fopAcM_cancelCarryNow(grabActor); @@ -474,7 +474,7 @@ void daAlink_c::setGrabUpperSpeedRate() { } cLib_chaseF(&field_0x33e8, var_f31, 0.15f); - + daPy_frameCtrl_c* framectrl = &mUpperFrameCtrl[2]; framectrl->setFrame(field_0x33e8 * framectrl->getEnd()); getNowAnmPackUpper(UPPER_2)->setFrame(framectrl->getFrame()); @@ -490,7 +490,7 @@ void daAlink_c::setCarryArmAngle(f32 param_0, f32 param_1) { field_0x312a[1].set(0, temp_r29 + (2000.0f * param_1), temp_r29 + (2000.0f * param_1)); field_0x3136[1].set(0, 0, temp_r29 - (3500.0f * param_1)); - + if (param_1 < 0.0f) { ANGLE_ADD(field_0x312a[0].z, 2500.0f * param_1); ANGLE_ADD(field_0x3136[0].y, 2000.0f * param_1); @@ -516,7 +516,7 @@ BOOL daAlink_c::checkNextActionGrab() { setCarryArmAngle(0.0f, 1.0f); - if (mTargetedActor == NULL && mAttList != NULL && mAttList->mType == fopAc_attn_DOOR_e && fopAcM_CheckStatus(grabActor, fopAcM_STATUS_UNK_0x2000000)) { + if (mTargetedActor == NULL && mAttList != NULL && mAttList->mType == fopAc_attn_DOOR_e && fopAcM_CheckStatus(grabActor, fopAcStts_UNK_0x2000000_e)) { setDoStatus(BUTTON_STATUS_OPEN); } else if ((field_0x27f4 == NULL) || !checkGrabTalkActor(field_0x27f4) || !setTalkStatus()) { if (checkModeFlg(0x400)) { @@ -539,7 +539,7 @@ BOOL daAlink_c::checkNextActionGrab() { daNbomb_c* var_r28 = (daNbomb_c*)grabActor; if (doTrigger() - || (fopAcM_GetName(grabActor) == PROC_NBOMB + || (fopAcM_GetName(grabActor) == fpcNm_NBOMB_e && var_r28->checkPlayerMake() && (checkSetItemTrigger(0x50) || (var_r28->checkWaterBomb() && checkSetItemTrigger(0x71)) || (!var_r28->checkWaterBomb() && checkSetItemTrigger(0x70))) ) @@ -688,13 +688,13 @@ void daAlink_c::setGrabItemActor(fopAc_ac_c* i_actor) { mObjGndChk.ClrLink(); s16 name = fopAcM_GetName(i_actor); - if (dBomb_c::checkBombActor(i_actor) || name == PROC_Obj_Stone) { + if (dBomb_c::checkBombActor(i_actor) || name == fpcNm_Obj_Stone_e) { mObjLinChk.SetBomb(); mObjGndChk.SetBomb(); - } else if (name == PROC_CSTATUE) { + } else if (name == fpcNm_CSTATUE_e) { mObjLinChk.SetStatue(); mObjGndChk.SetStatue(); - } else if (name == PROC_Obj_Carry && ((daObjCarry_c*)i_actor)->prm_chk_type_ironball()) { + } else if (name == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_actor)->prm_chk_type_ironball()) { mObjLinChk.SetLink(); mObjGndChk.SetLink(); } else { @@ -708,7 +708,7 @@ int daAlink_c::procGrabReadyInit() { return checkWaitAction(); } - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_GRAB_READY, field_0x27f4); } @@ -734,7 +734,7 @@ int daAlink_c::procGrabReadyInit() { field_0x347c = 1.0f / (9.0f - mpHIO->mGrab.m.mFailAnm.mStartFrame); f32 var_f31; - if (fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_DO) { + if (fopAcM_GetName(mGrabItemAcKeep.getActor()) == fpcNm_DO_e) { var_f31 = 0.93f; } else { var_f31 = 1.0f; @@ -1182,7 +1182,7 @@ int daAlink_c::procInsectCatchInit() { return checkWaitAction(); } - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_INSECT_CATCH, field_0x27f4); } @@ -1220,12 +1220,12 @@ int daAlink_c::procPickUpInit() { return checkWaitAction(); } - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_PICK_UP, field_0x27f4); } s16 temp_r3 = fopAcM_GetName(field_0x27f4); - if (temp_r3 == PROC_NPC_KS && !dComIfGp_event_compulsory(this, NULL, 0xFFFF)) { + if (temp_r3 == fpcNm_NPC_KS_e && !dComIfGp_event_compulsory(this, NULL, 0xFFFF)) { return checkWaitAction(); } @@ -1248,13 +1248,13 @@ int daAlink_c::procPickUpInit() { } BOOL var_r29; - if (temp_r3 == PROC_Obj_Kantera) { + if (temp_r3 == fpcNm_Obj_Kantera_e) { setSingleAnimeParam(ANM_BOTTLE_SWING, &mpHIO->mItem.mBottle.m.mSwingSideAnm); mProcVar3.field_0x300e = 1; field_0x3478 = 7.0f; mProcVar4.field_0x3010 = 0; var_r29 = FALSE; - } else if (temp_r3 == PROC_NPC_KS) { + } else if (temp_r3 == fpcNm_NPC_KS_e) { setSingleAnimeParam(ANM_BOTTLE_SWING_DOWN, &mpHIO->mItem.mBottle.m.mSwingDownAnm); mProcVar3.field_0x300e = 1; field_0x3478 = 7.0f; @@ -1290,7 +1290,7 @@ int daAlink_c::procPickUp() { onResetFlg0(RFLG0_GRAB_UP_START); if (mProcVar4.field_0x3010 != 0) { - mEquipItem = fpcNm_ITEM_KANTERA; + mEquipItem = dItemNo_KANTERA_e; setKandelaarModel(); } } @@ -1311,7 +1311,7 @@ int daAlink_c::procPickUp() { } int daAlink_c::procPickPutInit(int param_0) { - if (param_0 != 0 && mEquipItem != fpcNm_ITEM_NONE) { + if (param_0 != 0 && mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_PICK_PUT, NULL); } @@ -1329,7 +1329,7 @@ int daAlink_c::procPickPutInit(int param_0) { mProcVar2.field_0x300c = param_0; if (mProcVar2.field_0x300c != 0) { - mEquipItem = fpcNm_ITEM_POKE_BOMB; + mEquipItem = dItemNo_POKE_BOMB_e; } else { onResetFlg0(RFLG0_GRAB_PUT_START); } @@ -1362,7 +1362,7 @@ int daAlink_c::procPickPut() { dComIfGp_addSelectItemNum(mSelectItemId, -1); field_0x2fcf++; } - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; } else { field_0x3198 = 0; itemActor->speedF = 0.0f; @@ -1391,7 +1391,7 @@ s16 daAlink_c::getChainStickAngleY(s16 param_0) const { u8 daAlink_c::checkChainEmphasys() { fopAc_ac_c* temp_r3 = field_0x2844.getActor(); - if (temp_r3 != NULL && fopAcM_GetName(temp_r3) == PROC_Obj_SwChain && !((daObjSwChain_c*)temp_r3)->checkDispEmphasis()) { + if (temp_r3 != NULL && fopAcM_GetName(temp_r3) == fpcNm_Obj_SwChain_e && !((daObjSwChain_c*)temp_r3)->checkDispEmphasis()) { return BUTTON_STATUS_FLAG_NONE; } @@ -1435,8 +1435,8 @@ bool daAlink_c::checkChainBlockPushPull() { fopAc_ac_c* actor = field_0x2844.getActor(); if (actor != NULL) { s16 name = fopAcM_GetName(actor); - if (name == PROC_Obj_ChainBlock || name == PROC_Obj_SwChain || - name == PROC_Obj_ChainWall) + if (name == fpcNm_Obj_ChainBlock_e || name == fpcNm_Obj_SwChain_e || + name == fpcNm_Obj_ChainWall_e) { return true; } @@ -1446,7 +1446,7 @@ bool daAlink_c::checkChainBlockPushPull() { } int daAlink_c::procFmChainUpInit() { - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_CHAIN_UP, NULL); } @@ -1574,7 +1574,7 @@ int daAlink_c::setPushPullKeepData(dBgW_Base::PushPullLabel i_label, BOOL param_ BOOL daAlink_c::checkPushPullTurnBlock() { s16 name = getMoveBGActorName(mPolyInfo1, 1); - return name == PROC_Obj_SwTurn || name == PROC_Obj_Lv6SwTurn || name == PROC_Obj_PushDoor || name == PROC_PushDoor || name == PROC_Obj_Ytaihou; + return name == fpcNm_Obj_SwTurn_e || name == fpcNm_Obj_Lv6SwTurn_e || name == fpcNm_Obj_PushDoor_e || name == fpcNm_PushDoor_e || name == fpcNm_Obj_Ytaihou_e; } BOOL daAlink_c::checkPullBehindWall() { @@ -1619,12 +1619,12 @@ void daAlink_c::offGoatStopGame() { BOOL daAlink_c::checkGoatCatchActor(fopAc_ac_c* i_actor) { s16 name = fopAcM_GetName(i_actor); - return name == PROC_E_GOB || (name == PROC_OBJ_GRA && checkSpecialNpc(i_actor)) || - name == PROC_COW; + return name == fpcNm_E_GOB_e || (name == fpcNm_OBJ_GRA_e && checkSpecialNpc(i_actor)) || + name == fpcNm_COW_e; } f32 daAlink_c::getGoatCatchDistance2() { - if (fopAcM_GetName(field_0x27f4) == PROC_B_MGN) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_B_MGN_e) { return SQUARE(1000.0f); } @@ -1637,8 +1637,8 @@ int daAlink_c::endPushPull() { f32 daAlink_c::getPushPullAnimeSpeed() { f32 speed; - if ((getMoveBGActorName(mPolyInfo1, 0) == PROC_Obj_Movebox && ((daObjMovebox::Act_c*)dComIfG_Bgsp().GetActorPointer(mPolyInfo1))->getType() != 0) || - getMoveBGActorName(mPolyInfo1, 0) == PROC_Obj_Bemos) + if ((getMoveBGActorName(mPolyInfo1, 0) == fpcNm_Obj_Movebox_e && ((daObjMovebox::Act_c*)dComIfG_Bgsp().GetActorPointer(mPolyInfo1))->getType() != 0) || + getMoveBGActorName(mPolyInfo1, 0) == fpcNm_Obj_Bemos_e) { if (checkWolf()) { speed = mpHIO->mWolf.mWlPush.m.mHeavyPushAnmSpeed; @@ -1655,7 +1655,7 @@ f32 daAlink_c::getPushPullAnimeSpeed() { } int daAlink_c::procCoPushPullWaitInit(int param_0) { - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_PUSH_PULL_WAIT, NULL); } @@ -1703,7 +1703,7 @@ int daAlink_c::procCoPushPullWait() { f32 temp_f31 = cLib_addCalc(¤t.pos.x, field_0x37c8.x, 0.5f, 10.0f, 1.0f); temp_f31 += cLib_addCalc(¤t.pos.z, field_0x37c8.z, 0.5f, 10.0f, 1.0f); - + if (temp_r28 == 0 && temp_f31 < 5.0f && checkNoUpperAnime()) { current.pos.x = field_0x37c8.x; current.pos.z = field_0x37c8.z; @@ -1717,7 +1717,7 @@ int daAlink_c::procCoPushPullWait() { } else if (checkInputOnR()) { int direction = getDirectionFromShapeAngle(); if (direction == DIR_FORWARD) { - procCoPushMoveInit(0, getMoveBGActorName(mPolyInfo1, 1) == PROC_Obj_IceBlock); + procCoPushMoveInit(0, getMoveBGActorName(mPolyInfo1, 1) == fpcNm_Obj_IceBlock_e); } else if (!checkWolf() && direction == DIR_BACKWARD) { procPullMoveInit(0); } @@ -1968,7 +1968,7 @@ int daAlink_c::procPullMove() { static fopAc_ac_c* daAlink_searchGoat(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_COW) { + if (fopAcM_GetName(i_actor) == fpcNm_COW_e) { return i_actor; } @@ -1984,9 +1984,9 @@ void daAlink_c::cancelGoronThrowEvent() { void daAlink_c::setGoatStopGameFail(fopAc_ac_c* i_actor) { s16 actor_name = fopAcM_GetName(i_actor); - if (actor_name == PROC_OBJ_GRA) { + if (actor_name == fpcNm_OBJ_GRA_e) { ((daObj_GrA_c*)i_actor)->setCrazyDash(); - } else if (actor_name == PROC_COW) { + } else if (actor_name == fpcNm_COW_e) { ((daCow_c*)i_actor)->setCrazyDash(); } else { ((fopEn_enemy_c*)i_actor)->setThrowModeDash(); @@ -2004,9 +2004,9 @@ void daAlink_c::setGoatStopGameFail(fopAc_ac_c* i_actor) { if (checkGoatStopGame()) { onNoResetFlg0(FLG0_GORON_UP_STOP_CANCEL); } else { - if (!checkBootsOrArmorHeavy() && actor_name == PROC_OBJ_GRA) { + if (!checkBootsOrArmorHeavy() && actor_name == fpcNm_OBJ_GRA_e) { setDamagePointNormal(2); - } else if (actor_name != PROC_COW) { + } else if (actor_name != fpcNm_COW_e) { setDamagePointNormal(1); } @@ -2148,7 +2148,7 @@ int daAlink_c::procGoatMove() { var_f30 = 1.0f; framectrl->setLoop(framectrl->getStart()); } - + framectrl->setRate(var_f30 * (mNormalSpeed / mMaxSpeed)); initBasAnime(); } @@ -2172,15 +2172,15 @@ int daAlink_c::procGoatCatchInit(fopAc_ac_c* i_actor, f32 param_1) { setDoStatus(BUTTON_STATUS_NONE); return 0; } - + deleteEquipItem(TRUE, FALSE); if (!dComIfGp_event_compulsory(this, NULL, 0xFFEF)) { return 0; } - + mDemo.setSpecialDemoType(); - i_actor->actor_status |= 0x800; + i_actor->actor_status |= fopAcStts_STAFF_EXTRA_e; } commonProcInit(PROC_GOAT_CATCH); @@ -2215,9 +2215,9 @@ int daAlink_c::procGoatCatchInit(fopAc_ac_c* i_actor, f32 param_1) { setSingleAnimeBase(ANM_COW_CATCH_START); s16 actor_name = fopAcM_GetName(i_actor); - if (actor_name == PROC_OBJ_GRA) { + if (actor_name == fpcNm_OBJ_GRA_e) { ((daObj_GrA_c*)i_actor)->setCrazyCatch(); - } else if (actor_name == PROC_COW) { + } else if (actor_name == fpcNm_COW_e) { ((daCow_c*)i_actor)->setCrazyCatch(); } else { ((fopEn_enemy_c*)i_actor)->setThrowModeCatch(); @@ -2299,7 +2299,7 @@ int daAlink_c::procGoatCatch() { field_0x2fe4 = shape_angle.y; } - if (actor_name == PROC_OBJ_GRA) { + if (actor_name == fpcNm_OBJ_GRA_e) { field_0x2f99 = 0x30; setSingleAnimeBaseSpeed(ANM_WAIT_B, mpHIO->mMove.m.mWaitAnmSpeed, 3.0f); offModeFlg(0x8000); @@ -2351,16 +2351,16 @@ int daAlink_c::procGoatCatch() { if (checkAnmEnd(framectrl)) { setSingleAnimeBase(ANM_COW_CATCH); } - + field_0x2f9d = 0x60; - + anm = ANM_COW_CATCH; if (field_0x3198 > 0) { field_0x3198 += 1; cLib_chaseF(&mNormalSpeed, 30.0f, 1.0f); } else { f32 speed_step = 1.0f; - if ((actor_name == PROC_OBJ_GRA || actor_name == PROC_E_GOB) && !checkBootsOrArmorHeavy()) { + if ((actor_name == fpcNm_OBJ_GRA_e || actor_name == fpcNm_E_GOB_e) && !checkBootsOrArmorHeavy()) { field_0x3198++; } else if (checkInputOnR() && direction == DIR_FORWARD) { speed_step += 1.0f; @@ -2396,7 +2396,7 @@ int daAlink_c::procGoatCatch() { field_0x2f99 = 4; if (checkAnmEnd(framectrl)) { - if (actor_name == PROC_E_GOB && !checkBootsOrArmorHeavy()) { + if (actor_name == fpcNm_E_GOB_e && !checkBootsOrArmorHeavy()) { setGoatStopGameFail(temp_r3); return 1; } @@ -2406,18 +2406,18 @@ int daAlink_c::procGoatCatch() { } if (mProcVar3.field_0x300e == 2) { - if (actor_name == PROC_OBJ_GRA) { + if (actor_name == fpcNm_OBJ_GRA_e) { ((daObj_GrA_c*)temp_r3)->setCrazyThrowLeft(); - } else if (actor_name == PROC_COW) { + } else if (actor_name == fpcNm_COW_e) { ((daCow_c*)temp_r3)->setCrazyThrowLeft(); } else { ((fopEn_enemy_c*)temp_r3)->setThrowModeThrowLeft(); } anm = ANM_COW_THROW_LEFT; } else { - if (actor_name == PROC_OBJ_GRA) { + if (actor_name == fpcNm_OBJ_GRA_e) { ((daObj_GrA_c*)temp_r3)->setCrazyThrowRight(); - } else if (actor_name == PROC_COW) { + } else if (actor_name == fpcNm_COW_e) { ((daCow_c*)temp_r3)->setCrazyThrowRight(); } else { ((fopEn_enemy_c*)temp_r3)->setThrowModeThrowRight(); @@ -2436,7 +2436,7 @@ int daAlink_c::procGoatCatch() { } int daAlink_c::procGoatStrokeInit() { - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_GOAT_STROKE, field_0x27f4); } @@ -2469,7 +2469,7 @@ int daAlink_c::procGoatStroke() { } int daAlink_c::procGoronMoveInit() { - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_GORON_MOVE, NULL); } @@ -2510,7 +2510,7 @@ int daAlink_c::procGoronMove() { current.angle.y = shape_angle.y + 0x4000; } - if (checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) { + if (checkSetItemTrigger(dItemNo_HVY_BOOTS_e)) { return procBootsEquipInit(); } diff --git a/src/d/actor/d_a_alink_guard.inc b/src/d/actor/d_a_alink_guard.inc index e5bb97e7374..17bb1cde070 100644 --- a/src/d/actor/d_a_alink_guard.inc +++ b/src/d/actor/d_a_alink_guard.inc @@ -10,15 +10,15 @@ BOOL daAlink_c::checkEnemyGroup(fopAc_ac_c* i_actor) { return i_actor != NULL - && (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e || fopAcM_GetName(i_actor) == PROC_E_ZH || checkSpecialNpc(i_actor)); + && (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e || fopAcM_GetName(i_actor) == fpcNm_E_ZH_e || checkSpecialNpc(i_actor)); } BOOL daAlink_c::checkSpecialNpc(fopAc_ac_c* i_actor) { s16 name = fopAcM_GetName(i_actor); - return name == PROC_NPC_KAKASHI || - (name == PROC_NPC_KN && static_cast(i_actor)->checkBattleMode()) || - (name == PROC_OBJ_GRA && !static_cast(i_actor)->checkNpcObjGra()); + return name == fpcNm_NPC_KAKASHI_e || + (name == fpcNm_NPC_KN_e && static_cast(i_actor)->checkBattleMode()) || + (name == fpcNm_OBJ_GRA_e && !static_cast(i_actor)->checkNpcObjGra()); } BOOL daAlink_c::checkShieldAttackEmphasys() { @@ -53,15 +53,15 @@ void daAlink_c::stickArrowIncrement(int param_0) { if (arrow_num != 0) { if (checkShieldGet() #if !PLATFORM_SHIELD - && checkItemGet(fpcNm_ITEM_BOW, true) + && checkItemGet(dItemNo_BOW_e, true) #endif ) { int arrow_type; if (arrow_num == 1) { - arrow_type = fpcNm_ITEM_ARROW_1; + arrow_type = dItemNo_ARROW_1_e; } else { - arrow_type = fpcNm_ITEM_ARROW_10; + arrow_type = dItemNo_ARROW_10_e; } dComIfGp_setItemArrowNumCount(arrow_num); @@ -101,7 +101,7 @@ void daAlink_c::setArrowShieldActor(fopAc_ac_c* i_actor, int param_1) { field_0x2f7c[arrow_num] = 10; dComIfGp_setItemArrowNumCount(1); - fopAcM_createItemForSimpleDemo(¤t.pos, fpcNm_ITEM_ARROW_10, -1, NULL, NULL, 0.0f, 0.0f); + fopAcM_createItemForSimpleDemo(¤t.pos, dItemNo_ARROW_10_e, -1, NULL, NULL, 0.0f, 0.0f); } if (param_1 && field_0x2fcb == 0 && !checkMagicArmorNoDamage()) { @@ -186,7 +186,7 @@ void daAlink_c::setUpperGuardAnime(f32 param_0) { void daAlink_c::setShieldGuard() { f32 var_f31 = mNowAnmPackUpper[2].getRatio(); - if ((mProcID == PROC_GUARD_SLIP && mEquipItem != fpcNm_ITEM_IRONBALL) || checkSmallUpperGuardAnime() || + if ((mProcID == PROC_GUARD_SLIP && mEquipItem != dItemNo_IRONBALL_e) || checkSmallUpperGuardAnime() || (checkGuardAccept() && !checkGrabAnime() && !checkUpperReadyThrowAnime() && !checkDkCaught2Anime() && !checkKandelaarSwingAnime() && !checkCutDashAnime() && !checkCutDashChargeAnime() && (!checkEquipAnime() || checkUpperGuardAnime()) && @@ -255,7 +255,7 @@ int daAlink_c::procGuardSlipInit(int i_atSpl, dCcD_GObjInf* i_objinf) { const daAlinkHIO_anm_c* anmParams; daAlink_ANM anm; - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { setSingleAnimeBase(ANM_IRONBALL_DEF); setIronBallWaitUpperAnime(1); mNowAnmPackUpper[2].setRatio(0.0f); @@ -294,7 +294,7 @@ int daAlink_c::procGuardSlipInit(int i_atSpl, dCcD_GObjInf* i_objinf) { mProcVar4.field_0x3010 = 0; mProcVar5.field_0x3012 = 0; - if (i_objinf != NULL && i_objinf->GetTgHitAc() != NULL && fopAcM_GetName(i_objinf->GetTgHitAc()) == PROC_E_MM_MT && i_objinf->GetTgHitAc()->argument == 1) { + if (i_objinf != NULL && i_objinf->GetTgHitAc() != NULL && fopAcM_GetName(i_objinf->GetTgHitAc()) == fpcNm_E_MM_MT_e && i_objinf->GetTgHitAc()->argument == 1) { if (checkBootsOrArmorHeavy()) { mNormalSpeed = mpHIO->mGuard.m.mMagneHvyGuardSpeed; mProcVar5.field_0x3012 = 1; @@ -322,7 +322,7 @@ int daAlink_c::procGuardSlipInit(int i_atSpl, dCcD_GObjInf* i_objinf) { } int daAlink_c::procGuardSlip() { - if (mEquipItem != fpcNm_ITEM_IRONBALL) { + if (mEquipItem != dItemNo_IRONBALL_e) { setUpperGuardAnime(-1.0f); } @@ -356,7 +356,7 @@ int daAlink_c::procGuardSlip() { onEndResetFlg1(ERFLG1_UNK_20); } - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { mNowAnmPackUpper[2].setRatio(1.0f); } @@ -495,7 +495,7 @@ int daAlink_c::procGuardBreakInit() { commonProcInit(PROC_GUARD_BREAK); setSingleAnimeParam(ANM_GUARD_BREAK, &mpHIO->mGuard.m.mGuardBreakAnm); - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { deleteEquipItem(FALSE, FALSE); } diff --git a/src/d/actor/d_a_alink_hang.inc b/src/d/actor/d_a_alink_hang.inc index 563bb9c9056..b99fe71c855 100644 --- a/src/d/actor/d_a_alink_hang.inc +++ b/src/d/actor/d_a_alink_hang.inc @@ -776,7 +776,7 @@ int daAlink_c::procHangWallCatch() { } int daAlink_c::procHangReadyInit() { - if (field_0x2f91 == 3 && mEquipItem != fpcNm_ITEM_NONE) { + if (field_0x2f91 == 3 && mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_HANG_READY, NULL); } else if (mProcID == PROC_PREACTION_UNEQUIP) { setFrontWallType(); @@ -822,7 +822,7 @@ int daAlink_c::procHangReady() { } int daAlink_c::procHangLeverDownInit() { - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_HANG_LEVER_DOWN, field_0x27f4); } @@ -881,7 +881,7 @@ int daAlink_c::procHangLeverDown() { } void daAlink_c::changeDragonActor(fopAc_ac_c* i_actor) { - if (field_0x280c.getActor() != NULL && fopAcM_GetName(field_0x280c.getActor()) == PROC_B_DR) { + if (field_0x280c.getActor() != NULL && fopAcM_GetName(field_0x280c.getActor()) == fpcNm_B_DR_e) { field_0x280c.setData(i_actor); } } @@ -892,7 +892,7 @@ int daAlink_c::setDragonHangPos() { return 0; } - if (fopAcM_GetName(dragon) == PROC_B_DR) { + if (fopAcM_GetName(dragon) == fpcNm_B_DR_e) { mDoMtx_stack_c::copy(((daB_DR_c*)dragon)->getMtx()); } else { mDoMtx_stack_c::copy(((daB_DRE_c*)dragon)->getMtx()); @@ -936,7 +936,7 @@ int daAlink_c::setBossBodyHangPos() { int daAlink_c::procBossBodyHangInit(fopAc_ac_c* i_actor) { commonProcInit(PROC_BOSS_BODY_HANG); - if (fopAcM_GetName(i_actor) == PROC_B_DR) { + if (fopAcM_GetName(i_actor) == fpcNm_B_DR_e) { field_0x32cc = 1; setSingleAnimeBase(ANM_DRAGON_HANG); setJumpMode(); @@ -1294,7 +1294,7 @@ int daAlink_c::checkLadderFall() { } int daAlink_c::procLadderUpStartInit() { - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_LADDER_UP_START, NULL); } @@ -1400,7 +1400,7 @@ int daAlink_c::procLadderUpEnd() { int daAlink_c::procLadderDownStartInit() { onNoResetFlg3(FLG3_UNK_400000); - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_LADDER_DOWN_START, NULL); } diff --git a/src/d/actor/d_a_alink_hook.inc b/src/d/actor/d_a_alink_hook.inc index 5f609a7017c..251a2f8d02e 100644 --- a/src/d/actor/d_a_alink_hook.inc +++ b/src/d/actor/d_a_alink_hook.inc @@ -305,7 +305,7 @@ void daAlink_c::cancelHookshotCarry() { } void daAlink_c::changeHookshotDrawModel() { - if (mEquipItem == fpcNm_ITEM_HOOKSHOT && field_0x3020 == 1) { + if (mEquipItem == dItemNo_HOOKSHOT_e && field_0x3020 == 1) { J3DModel* tmp = mHeldItemModel; mHeldItemModel = field_0x0710; field_0x0710 = tmp; @@ -318,7 +318,7 @@ void daAlink_c::changeHookshotDrawModel() { BOOL daAlink_c::checkHookshotRoofLv7Boss() { return mCargoCarryAcKeep.getActor() != NULL && - fopAcM_GetName(mCargoCarryAcKeep.getActor()) == PROC_B_DR; + fopAcM_GetName(mCargoCarryAcKeep.getActor()) == fpcNm_B_DR_e; } BOOL daAlink_c::checkChaseHookshot() { @@ -335,8 +335,8 @@ BOOL daAlink_c::checkChaseHookshot() { if (mTargetedActor != NULL) { s16 actorName = fopAcM_GetName(mTargetedActor); return field_0x2804 == mTargetedActor && - (checkBossOctaIealRoom() || actorName == PROC_Obj_FallObj || - actorName == PROC_B_DR || actorName == PROC_E_PH); + (checkBossOctaIealRoom() || actorName == fpcNm_Obj_FallObj_e || + actorName == fpcNm_B_DR_e || actorName == fpcNm_E_PH_e); } return false; @@ -416,7 +416,7 @@ void daAlink_c::setHookshotModel() { resetHookshotMode(); mpHookChain->setUserArea((uintptr_t)this); field_0x2f94 = 1; - if (mEquipItem == fpcNm_ITEM_W_HOOKSHOT) { + if (mEquipItem == dItemNo_W_HOOKSHOT_e) { field_0x2f95 = 6; } @@ -462,7 +462,7 @@ void daAlink_c::setHookshotSight() { mSight.onLockFlg(); if (mHookTargetAcKeep.getActor() != NULL && - fopAcM_GetName(mHookTargetAcKeep.getActor()) == PROC_B_DR) + fopAcM_GetName(mHookTargetAcKeep.getActor()) == fpcNm_B_DR_e) { ((daB_DR_c*)mHookTargetAcKeep.getActor())->onTarget(); } @@ -757,14 +757,14 @@ int daAlink_c::setHookshotHangMoveBGCollect() { field_0x3022 = sp8.y; s16 movebg_name = getMoveBGActorName(*polyinfo, 1); - if (movebg_name == PROC_Obj_SwHang) { + if (movebg_name == fpcNm_Obj_SwHang_e) { daObjSwHang_c* swhang = (daObjSwHang_c*)dComIfG_Bgsp().GetActorPointer(*polyinfo); swhang->setHangPlayer(); f32 prev_y = mIronBallBgChkPos.y; mIronBallBgChkPos.y = swhang->getHangPos().y; current.pos.y += mIronBallBgChkPos.y - prev_y; - } else if (movebg_name == PROC_Obj_Chandelier) { + } else if (movebg_name == fpcNm_Obj_Chandelier_e) { ((daObjChandelier_c*)dComIfG_Bgsp().GetActorPointer(*polyinfo))->moveHookOn(); } } @@ -991,12 +991,12 @@ void daAlink_c::setHookshotPos() { mHookshotTopPos = field_0x381c; targetAc_p = mHookTargetAcKeep.getActor(); - if (targetAc_p != NULL && (targetAc_p->actor_status & 0x280000)) { + if (targetAc_p != NULL && (targetAc_p->actor_status & (fopAcStts_UNK_0x200000_e | fopAcStts_UNK_0x80000_e))) { mHookTargetAcKeep.setData(targetAc_p); mIronBallCenterPos = mHookshotTopPos - targetAc_p->current.pos; setHookshotCatchNow(); - if (targetAc_p->actor_status & 0x200000) { + if (targetAc_p->actor_status & fopAcStts_UNK_0x200000_e) { mItemMode = 5; field_0x316c.set(field_0x301c, field_0x301e, 0); mDoMtx_stack_c::ZrotS(-targetAc_p->shape_angle.z); @@ -1338,7 +1338,7 @@ int daAlink_c::checkLandHookshotHang() { ((mProcID != PROC_HOOKSHOT_ROOF_SHOOT && mProcID != PROC_HOOKSHOT_WALL_SHOOT) || checkHookshotWait()) && (!checkHookshotRoofLv7Boss() || !checkEquipHeavyBoots()) && - checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) + checkSetItemTrigger(dItemNo_HVY_BOOTS_e)) { if (dComIfGp_checkPlayerStatus1(0, 0x10000)) { return procHookshotRoofBootsInit(mCargoCarryAcKeep.getActor()); @@ -1522,11 +1522,11 @@ int daAlink_c::procHookshotFly() { if (targetAc_p != NULL) { targetAc_name = fopAcM_GetName(targetAc_p); } else { - targetAc_name = PROC_ALINK; + targetAc_name = fpcNm_ALINK_e; } BOOL var_r29 = FALSE; - if (targetAc_name == PROC_Obj_SwHang) { + if (targetAc_name == fpcNm_Obj_SwHang_e) { int swhang_type = static_cast(targetAc_p)->getType(); if (swhang_type == 3 || swhang_type == 4) { var_r29 = TRUE; @@ -1557,15 +1557,15 @@ int daAlink_c::procHookshotFly() { } current.pos += field_0x37d4; - if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) != 0) { + if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e) != 0) { mProcVar5.field_0x3012 = 1; } else if (mProcVar5.field_0x3012 != 0 && !itemButton()) { mProcVar5.field_0x3012 = 0; } if (mItemMode != 5 && mItemMode != HS_MODE_FLY_e) { - if (targetAc_name == PROC_B_OB || - (targetAc_name == PROC_B_DR && static_cast(targetAc_p)->isBack())) + if (targetAc_name == fpcNm_B_OB_e || + (targetAc_name == fpcNm_B_DR_e && static_cast(targetAc_p)->isBack())) { dComIfGp_getVibration().StartShock(1, 1, cXyz(0.0f, 1.0f, 0.0f)); return procBossBodyHangInit(targetAc_p); @@ -1619,7 +1619,7 @@ int daAlink_c::procHookshotFly() { } else if (is_force_fall) { procFallInit(1, 5.0f); field_0x2f99 = 0x70; - } else if (targetAc_name == PROC_E_PH || targetAc_name == PROC_B_DR || var_r29) { + } else if (targetAc_name == fpcNm_E_PH_e || targetAc_name == fpcNm_B_DR_e || var_r29) { procHookshotRoofWaitInit(1, targetAc_p, mProcVar5.field_0x3012); } else if (var_r28 && dComIfG_Bgsp().GetMonkeyBarsCode(mPolyInfo2)) { cXyz sp88; @@ -1739,7 +1739,7 @@ int daAlink_c::procHookshotRoofWait() { setShapeAngleToAtnActor(0); if (mProcVar2.field_0x300c == 0) { - if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT)) { + if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e)) { mProcVar5.field_0x3012 = 1; } else if (mProcVar5.field_0x3012 != 0 && !itemButton()) { mProcVar5.field_0x3012 = 0; @@ -1754,7 +1754,7 @@ int daAlink_c::procHookshotRoofWait() { mProcVar2.field_0x300c = 1; } } else if (!checkHookshotRoofLv7Boss()) { - if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) { + if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e) || mProcVar5.field_0x3012 != 0) { return procHookshotRoofShootInit(mCargoCarryAcKeep.getActor()); } hookshotRoofTurn(); @@ -2000,7 +2000,7 @@ int daAlink_c::procHookshotWallWait() { } if (mProcVar2.field_0x300c == 0) { - if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT)) { + if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e)) { mProcVar5.field_0x3012 = 1; } else if (mProcVar5.field_0x3012 != 0 && !itemButton()) { mProcVar5.field_0x3012 = 0; @@ -2014,7 +2014,7 @@ int daAlink_c::procHookshotWallWait() { setHookshotWallWaitAnime(); mProcVar2.field_0x300c = 1; } - } else if (checkSetItemTrigger(fpcNm_ITEM_W_HOOKSHOT) || mProcVar5.field_0x3012 != 0) { + } else if (checkSetItemTrigger(dItemNo_W_HOOKSHOT_e) || mProcVar5.field_0x3012 != 0) { return procHookshotWallShootInit(); } diff --git a/src/d/actor/d_a_alink_horse.inc b/src/d/actor/d_a_alink_horse.inc index e9ce673c989..ac8c4faed1b 100644 --- a/src/d/actor/d_a_alink_horse.inc +++ b/src/d/actor/d_a_alink_horse.inc @@ -13,7 +13,7 @@ static void* daAlink_searchBoar(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { if (((e_wb_class*)i_actor)->getModel() != NULL) { return i_actor; } @@ -25,7 +25,7 @@ static void* daAlink_searchBoar(fopAc_ac_c* i_actor, void* i_data) { static fopAc_ac_c* daAlink_searchCoach(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_NPC_COACH) { + if (fopAcM_GetName(i_actor) == fpcNm_NPC_COACH_e) { return i_actor; } @@ -64,7 +64,7 @@ BOOL daAlink_c::checkCowGame() { int daAlink_c::getReinRideDirection() { s16 angle = fopAcM_searchActorAngleY(field_0x27f4, this) - field_0x27f4->shape_angle.y; - if (fopAcM_GetName(field_0x27f4) == PROC_HORSE && abs(angle) > 0x6800) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_HORSE_e && abs(angle) > 0x6800) { return DIR_BACKWARD; } else if (angle > 0) { return DIR_LEFT; @@ -99,7 +99,7 @@ int daAlink_c::checkReinRideBgCheck() { int direction = getReinRideDirection(); const Vec* offset_p; - if (fopAcM_GetName(field_0x27f4) == PROC_HORSE) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_HORSE_e) { if (direction == DIR_BACKWARD) { offset_p = &horseLocalBack; } else if (direction == DIR_LEFT) { @@ -206,7 +206,7 @@ void daAlink_c::rideGetOff() { seStartOnlyReverb(Z2SE_AL_SPINNER_END); } else if (checkCanoeRide()) { if (mEquipItem == 0x10B) { - mEquipItem = fpcNm_ITEM_NONE; + mEquipItem = dItemNo_NONE_e; } } else if (checkBoardRide()) { static_cast(mRideAcKeep.getActor())->offRide(); @@ -1220,7 +1220,7 @@ int daAlink_c::checkHorseGetOffAndSetDoStatus() { setDoStatus(BUTTON_STATUS_UNK_140); } } else if ((checkHorseNoUpperAnime() || checkEquipAnime()) && mMidnaTalkDelayTimer == 0 && !checkInputOnR() && isGetOff) { - if (mEquipItem == fpcNm_ITEM_NONE) { + if (mEquipItem == dItemNo_NONE_e) { off_direction = checkHorseGetOffDirection(); if ((off_direction != DIR_LEFT || (checkHorseRide() && horse->checkEnemySearch())) && field_0x2fb4 == 0) { if (!checkSpecialHorseRide()) { @@ -1259,7 +1259,7 @@ int daAlink_c::setHorseGetOff(int param_0) { int daAlink_c::procHorseRideInit() { BOOL var_r25 = FALSE; - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { if (mEquipItem == 0x103) { var_r25 = 1; } @@ -1272,7 +1272,7 @@ int daAlink_c::procHorseRideInit() { MtxP rideMtx; Vec* localRidePos_p; u32 mode; - if (fopAcM_GetName(field_0x27f4) == PROC_HORSE) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_HORSE_e) { daHorse_c* horse = (daHorse_c*)field_0x27f4; horse->onRideStartFlg(); rideMtx = horse->getRootMtx(); @@ -1519,7 +1519,7 @@ int daAlink_c::procHorseGetOffInit(int param_0) { commonProcInit(PROC_HORSE_GETOFF); resetUnderAnime(UNDER_2, -1.0f); - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { allUnequip(0); } diff --git a/src/d/actor/d_a_alink_hvyboots.inc b/src/d/actor/d_a_alink_hvyboots.inc index cd069c69f31..0edee19cf28 100644 --- a/src/d/actor/d_a_alink_hvyboots.inc +++ b/src/d/actor/d_a_alink_hvyboots.inc @@ -133,7 +133,7 @@ void daAlink_c::setMagneBootsMtx(cBgS_PolyInfo* i_polyinfo, int param_1) { } } else { // D_MN54 is the E3 Goron Mines Demo map - if (checkStageName("D_MN54") && getMoveBGActorName(*i_polyinfo, TRUE) == PROC_Obj_MagneArm) { + if (checkStageName("D_MN54") && getMoveBGActorName(*i_polyinfo, TRUE) == fpcNm_Obj_MagneArm_e) { fopAcM_onSwitch(this, 0x93); } diff --git a/src/d/actor/d_a_alink_iceleaf.inc b/src/d/actor/d_a_alink_iceleaf.inc index 46d70785d33..e2c4773c9e7 100644 --- a/src/d/actor/d_a_alink_iceleaf.inc +++ b/src/d/actor/d_a_alink_iceleaf.inc @@ -10,7 +10,7 @@ static fopAc_ac_c* daAlink_searchIceLeaf(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_Obj_IceLeaf) { + if (fopAcM_GetName(i_actor) == fpcNm_Obj_IceLeaf_e) { return i_actor; } @@ -29,7 +29,7 @@ bool daAlink_c::checkSnowCodePolygon(cBgS_PolyInfo& i_polyinfo) { bool daAlink_c::checkBoardRestart() { return (mRideStatus == 0 && mRideAcKeep.getActor() != NULL) && - fopAcM_GetName(mRideAcKeep.getActor()) == PROC_Obj_IceLeaf; + fopAcM_GetName(mRideAcKeep.getActor()) == fpcNm_Obj_IceLeaf_e; } int daAlink_c::boardCommon(BOOL i_canMove) { diff --git a/src/d/actor/d_a_alink_ironball.inc b/src/d/actor/d_a_alink_ironball.inc index c0c4d6508a6..fa4d73f4b09 100644 --- a/src/d/actor/d_a_alink_ironball.inc +++ b/src/d/actor/d_a_alink_ironball.inc @@ -6,7 +6,7 @@ #include "d/actor/d_a_alink.h" cXyz* daAlink_c::getIronBallCenterPos() { - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { return &mIronBallCenterPos; } @@ -14,7 +14,7 @@ cXyz* daAlink_c::getIronBallCenterPos() { } int daAlink_c::getIronBallBgHit() const { - if (mEquipItem == fpcNm_ITEM_IRONBALL) { + if (mEquipItem == dItemNo_IRONBALL_e) { return field_0x301c; } @@ -22,21 +22,21 @@ int daAlink_c::getIronBallBgHit() const { } bool daAlink_c::checkIronBallThrowMode() const { - return mEquipItem == fpcNm_ITEM_IRONBALL && + return mEquipItem == dItemNo_IRONBALL_e && (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 || mItemVar0.field_0x3018 == 3); } bool daAlink_c::checkIronBallThrowReturnMode() const { - return mEquipItem == fpcNm_ITEM_IRONBALL && (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 || + return mEquipItem == dItemNo_IRONBALL_e && (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 || mItemVar0.field_0x3018 == 7 || mItemVar0.field_0x3018 == 3); } bool daAlink_c::checkIronBallReturn() const { - return mEquipItem == fpcNm_ITEM_IRONBALL && mItemVar0.field_0x3018 == 7; + return mEquipItem == dItemNo_IRONBALL_e && mItemVar0.field_0x3018 == 7; } bool daAlink_c::checkIronBallGroundStop() const { - return mEquipItem == fpcNm_ITEM_IRONBALL && mItemVar0.field_0x3018 != 0 && mItemVar0.field_0x3018 != 8 && field_0x301e == 0 && + return mEquipItem == dItemNo_IRONBALL_e && mItemVar0.field_0x3018 != 0 && mItemVar0.field_0x3018 != 8 && field_0x301e == 0 && field_0x301e < 10; } @@ -1003,7 +1003,7 @@ int daAlink_c::procIronBallThrowInit() { int daAlink_c::procIronBallThrow() { daPy_frameCtrl_c* framectrl = &mUnderFrameCtrl[0]; - if (mEquipItem != fpcNm_ITEM_IRONBALL) { + if (mEquipItem != dItemNo_IRONBALL_e) { return checkWaitAction(); } @@ -1061,7 +1061,7 @@ int daAlink_c::procIronBallReturnInit() { int daAlink_c::procIronBallReturn() { daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl; - if (mEquipItem != fpcNm_ITEM_IRONBALL) { + if (mEquipItem != dItemNo_IRONBALL_e) { return checkWaitAction(); } diff --git a/src/d/actor/d_a_alink_kandelaar.inc b/src/d/actor/d_a_alink_kandelaar.inc index 6eab0095946..0d72a61af98 100644 --- a/src/d/actor/d_a_alink_kandelaar.inc +++ b/src/d/actor/d_a_alink_kandelaar.inc @@ -13,7 +13,7 @@ static fopAc_ac_c* daAlink_searchTagKandelaar(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_TAG_LANTERN) { + if (fopAcM_GetName(i_actor) == fpcNm_TAG_LANTERN_e) { return i_actor; } @@ -24,7 +24,7 @@ static fopAc_ac_c* daAlink_searchTagKtOnFire(fopAc_ac_c* i_actor, void* i_data) UNUSED(i_data); daAlink_c* player_p = daAlink_getAlinkActorClass(); - if (fopAcM_GetName(i_actor) == PROC_Tag_KtOnFire && + if (fopAcM_GetName(i_actor) == fpcNm_Tag_KtOnFire_e && i_actor->current.pos.abs2(player_p->current.pos) < SQUARE(150.0f) && fopAcM_seenActorAngleY(player_p, i_actor) < 0x3000) { @@ -66,7 +66,7 @@ BOOL daAlink_c::checkWaterInKandelaarOffset(f32 param_0) { void daAlink_c::checkWaterInKandelaar(f32 param_0) { if (checkNoResetFlg2(FLG2_UNK_1) && checkWaterInKandelaarOffset(param_0)) { - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { deleteEquipItem(TRUE, TRUE); } else { offKandelaarModel(); @@ -82,7 +82,7 @@ void daAlink_c::offKandelaarModel() { bool daAlink_c::checkUseKandelaar(int param_0) { return (param_0 == 0 && checkNoResetFlg2(FLG2_UNK_1)) || - (param_0 != 0 && mEquipItem == fpcNm_ITEM_KANTERA); + (param_0 != 0 && mEquipItem == dItemNo_KANTERA_e); } bool daAlink_c::checkKandelaarSwing(int param_0) const { @@ -236,7 +236,7 @@ void daAlink_c::resetOilBottleModel() { if (mProcVar3.field_0x300e != 0) { setKandelaarModel(); - mEquipItem = fpcNm_ITEM_KANTERA; + mEquipItem = dItemNo_KANTERA_e; } returnKeepItemData(); @@ -321,7 +321,7 @@ int daAlink_c::commonKandelaarPour(int param_0) { } void daAlink_c::initKandelaarSwing() { - if (mEquipItem == fpcNm_ITEM_KANTERA) { + if (mEquipItem == dItemNo_KANTERA_e) { if (dComIfGs_getOil() != 0) { mZ2Link.getKantera().startSound(Z2SE_AL_KANTERA_SWING, 0, mVoiceReverbIntensity); } else { @@ -349,10 +349,10 @@ int daAlink_c::procKandelaarSwingInit() { fopAc_ac_c* catch_target_p = dComIfGp_att_getCatghTarget(); if (catch_target_p != NULL) { s16 name = fopAcM_GetName(catch_target_p); - BOOL is_sm2 = name == PROC_E_SM2; + BOOL is_sm2 = name == fpcNm_E_SM2_e; - if (name == PROC_OBJ_OILTUBO || - (name == PROC_TAG_SSDRINK && ((daTag_SSDrink_c*)catch_target_p)->checkShopOil()) || + if (name == fpcNm_OBJ_OILTUBO_e || + (name == fpcNm_TAG_SSDRINK_e && ((daTag_SSDrink_c*)catch_target_p)->checkShopOil()) || (is_sm2 && ((e_sm2_class*)catch_target_p)->checkYellow())) { return procBottleSwingInit(catch_target_p, is_sm2); @@ -366,7 +366,7 @@ int daAlink_c::procKandelaarSwingInit() { mNormalSpeed = 0.0f; current.angle.y = shape_angle.y; - if ((mLinkAcch.ChkGroundHit() && getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == PROC_OBJ_WEB1) || + if ((mLinkAcch.ChkGroundHit() && getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == fpcNm_OBJ_WEB1_e) || (checkStageName("F_SP108") && fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchTagKtOnFire, NULL) != NULL)) { diff --git a/src/d/actor/d_a_alink_link.inc b/src/d/actor/d_a_alink_link.inc index 7fd3b3685f5..3b61cdfd96d 100644 --- a/src/d/actor/d_a_alink_link.inc +++ b/src/d/actor/d_a_alink_link.inc @@ -130,7 +130,7 @@ BOOL daAlink_c::setBodyAngleToCamera() { } s16 var_r29; - if (!dComIfGp_checkPlayerStatus0(0, 0x202000) && mEquipItem == fpcNm_ITEM_IRONBALL) { + if (!dComIfGp_checkPlayerStatus0(0, 0x202000) && mEquipItem == dItemNo_IRONBALL_e) { var_r29 = -10000; } else { var_r29 = mpHIO->mItem.m.mItemFPUpMaxUnk; @@ -164,7 +164,7 @@ BOOL daAlink_c::subjectCancelTrigger() { BOOL daAlink_c::checkSubjectEnd(BOOL i_isPlaySe) { setDoStatus(BUTTON_STATUS_BACK); - if (checkEventRun() || checkEquipAnime() || doTrigger() || checkSetItemTrigger(fpcNm_ITEM_HAWK_EYE) || subjectCancelTrigger() || checkEndResetFlg0(ERFLG0_FORCE_SUBJECT_CANCEL) || dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x2000)) { + if (checkEventRun() || checkEquipAnime() || doTrigger() || checkSetItemTrigger(dItemNo_HAWK_EYE_e) || subjectCancelTrigger() || checkEndResetFlg0(ERFLG0_FORCE_SUBJECT_CANCEL) || dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x2000)) { if (i_isPlaySe) { seStartSystem(Z2SE_SUBJ_VIEW_OUT); } @@ -177,7 +177,7 @@ BOOL daAlink_c::checkSubjectEnd(BOOL i_isPlaySe) { } void daAlink_c::searchPeepObj(fopAc_ac_c* i_actor, void* i_data) { - if (fopAcM_GetName(i_actor) == PROC_KYTAG05) { + if (fopAcM_GetName(i_actor) == fpcNm_KYTAG05_e) { f32 var_f31 = current.pos.abs2(i_actor->current.pos); if (var_f31 < field_0x3478) { field_0x3478 = var_f31; @@ -220,7 +220,7 @@ int daAlink_c::procCoSubjectivity() { return 1; } - if (checkSubjectEnd(FALSE) || (dComIfGp_checkPlayerStatus0(0, 0x200000) && checkSetItemTrigger(fpcNm_ITEM_HAWK_EYE))) { + if (checkSubjectEnd(FALSE) || (dComIfGp_checkPlayerStatus0(0, 0x200000) && checkSetItemTrigger(dItemNo_HAWK_EYE_e))) { seStartSystem(Z2SE_SUBJ_VIEW_OUT); checkWaitAction(); } else if (!checkWolf() && (checkItemAction() || checkItemChangeFromButton())) { diff --git a/src/d/actor/d_a_alink_spinner.inc b/src/d/actor/d_a_alink_spinner.inc index d309a6ceb87..a93e712760b 100644 --- a/src/d/actor/d_a_alink_spinner.inc +++ b/src/d/actor/d_a_alink_spinner.inc @@ -96,7 +96,7 @@ void daAlink_c::setSpinnerSyncPos() { int daAlink_c::procSpinnerReadyInit() { fopAc_ac_c* spinner = (fopAc_ac_c*)fopAcM_fastCreate( - PROC_SPINNER, daSpinner_c::getWaitArg(), ¤t.pos, fopAcM_GetRoomNo(this), + fpcNm_SPINNER_e, daSpinner_c::getWaitArg(), ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL, NULL); if (spinner == NULL) { @@ -191,7 +191,7 @@ int daAlink_c::procSpinnerWait() { return procSmallJumpInit(2); } - int itemSetBtn = checkItemSetButton(fpcNm_ITEM_SPINNER); + int itemSetBtn = checkItemSetButton(dItemNo_SPINNER_e); if (mProcVar2.field_0x300c == 0) { if (!itemButton()) { mProcVar2.field_0x300c = 1; @@ -211,7 +211,7 @@ int daAlink_c::procSpinnerWait() { mProcVar3.field_0x300e = shape_angle.y; } } else { - if (checkSetItemTrigger(fpcNm_ITEM_SPINNER) || swordSwingTrigger() || itemSetBtn == 2) { + if (checkSetItemTrigger(dItemNo_SPINNER_e) || swordSwingTrigger() || itemSetBtn == 2) { if (swordSwingTrigger()) { swordEquip(0); } diff --git a/src/d/actor/d_a_alink_swim.inc b/src/d/actor/d_a_alink_swim.inc index aa7cd983505..038d710e808 100644 --- a/src/d/actor/d_a_alink_swim.inc +++ b/src/d/actor/d_a_alink_swim.inc @@ -12,7 +12,7 @@ BOOL daAlink_c::checkZoraWearMaskDraw() { } BOOL daAlink_c::checkAcceptUseItemInWater(u16 i_itemNo) const { - return i_itemNo == fpcNm_ITEM_HVY_BOOTS || i_itemNo == fpcNm_ITEM_WATER_BOMB || checkHookshotItem(i_itemNo); + return i_itemNo == dItemNo_HVY_BOOTS_e || i_itemNo == dItemNo_WATER_BOMB_e || checkHookshotItem(i_itemNo); } void daAlink_c::swimDeleteItem() { @@ -324,7 +324,7 @@ int daAlink_c::checkNextActionSwim() { } if (mAttList != NULL && mAttList->mType == fopAc_attn_ETC_e && checkNoResetFlg0(FLG0_SWIM_UP) && - fopAcM_GetName(field_0x27f4) == PROC_CANOE) + fopAcM_GetName(field_0x27f4) == fpcNm_CANOE_e) { setDoStatus(BUTTON_STATUS_GET_ON); @@ -346,7 +346,7 @@ int daAlink_c::checkNextActionSwim() { int daAlink_c::checkSwimAction(int param_0) { f32 var_f31; if (checkWolf()) { - if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == PROC_Obj_ITA) { + if (getMoveBGActorName(mLinkAcch.m_gnd, 0) == fpcNm_Obj_ITA_e) { var_f31 = 200.0f; } else { var_f31 = mpHIO->mWolf.mWlSwim.m.mStartHeight; @@ -761,7 +761,7 @@ void daAlink_c::setSwimMoveAnime() { if (checkBootsOrArmorHeavy()) { anm = ANM_SWIM_WAIT; mMaxSpeed = mpHIO->mSwim.m.mUnderwaterFallMaxSpeed; - if (mEquipItem != fpcNm_ITEM_NONE && !checkHookshotAnime()) { + if (mEquipItem != dItemNo_NONE_e && !checkHookshotAnime()) { setDoStatus(BUTTON_STATUS_PUT_AWAY); } } @@ -921,7 +921,7 @@ int daAlink_c::procSwimUp() { setNormalSpeedF(0.0f, mpHIO->mSwim.m.mDeceleration); - if (checkSetItemTrigger(fpcNm_ITEM_HVY_BOOTS)) { + if (checkSetItemTrigger(dItemNo_HVY_BOOTS_e)) { setHeavyBoots(1); } @@ -1014,7 +1014,7 @@ int daAlink_c::procSwimWait() { setSwimUpDownOffset(); - if (checkEquipHeavyBoots() && mEquipItem != fpcNm_ITEM_NONE) { + if (checkEquipHeavyBoots() && mEquipItem != dItemNo_NONE_e) { setDoStatus(BUTTON_STATUS_PUT_AWAY); } @@ -1373,7 +1373,7 @@ int daAlink_c::procSwimDamageInit(dCcD_GObjInf* i_hitObj) { BOOL bvar4 = checkNoResetFlg0(FLG0_SWIM_UP) || ((i_hitObj != NULL && i_hitObj->GetTgHitAc() != NULL) - && fopAcM_GetName(i_hitObj->GetTgHitAc()) == PROC_E_SG); + && fopAcM_GetName(i_hitObj->GetTgHitAc()) == fpcNm_E_SG_e); if (!getZoraSwim() && bvar4 && mProcID != PROC_SWIM_WAIT) { return 1; diff --git a/src/d/actor/d_a_alink_whistle.inc b/src/d/actor/d_a_alink_whistle.inc index 43780cf58ca..eabff6d4083 100644 --- a/src/d/actor/d_a_alink_whistle.inc +++ b/src/d/actor/d_a_alink_whistle.inc @@ -5,7 +5,7 @@ #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_horse.h" #include "d/actor/d_a_npc_tk.h" #include "d/actor/d_a_obj_yobikusa.h" @@ -23,7 +23,7 @@ static fopAc_ac_c* daAlink_searchWhistle(fopAc_ac_c* i_actor, void* i_data) { static fopAc_ac_c* daAlink_searchHawk(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_NPC_TK) { + if (fopAcM_GetName(i_actor) == fpcNm_NPC_TK_e) { return i_actor; } @@ -57,12 +57,12 @@ void daAlink_c::setHorseWhistleModel() { mHeldItemModel = initModel(loadAramBmd(dRes_ID_ALANM_BMD_AL_PEND_e, 0x3000), 0); mDoExt_setCurrentHeap(prev_heap); - mEquipItem = fpcNm_ITEM_HORSE_FLUTE; + mEquipItem = dItemNo_HORSE_FLUTE_e; field_0x2f94 = 2; } int daAlink_c::procGrassWhistleGetInit() { - if (mEquipItem != fpcNm_ITEM_NONE) { + if (mEquipItem != dItemNo_NONE_e) { return procPreActionUnequipInit(PROC_GRASS_WHISTLE_GET, field_0x27f4); } @@ -93,7 +93,7 @@ int daAlink_c::procGrassWhistleGet() { if (checkAnmEnd(frameCtrl_p)) { procGrassWhistleWaitInit(mProcVar2.field_0x300c, mProcVar3.field_0x300e, mProcVar4.field_0x3010, mProcVar5.field_0x3012, &field_0x37c8); - } else if (mEquipItem == fpcNm_ITEM_NONE && frameCtrl_p->getFrame() >= 9.0f) { + } else if (mEquipItem == dItemNo_NONE_e && frameCtrl_p->getFrame() >= 9.0f) { setGrassWhistleModel(mProcVar2.field_0x300c); if (field_0x280c.getActor() != NULL) { @@ -129,7 +129,7 @@ int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s field_0x32cc = 0x532; } else { setSingleAnimeBase(ANM_WAIT); - mKeepItem = fpcNm_ITEM_NONE; + mKeepItem = dItemNo_NONE_e; if (param_0 == 0) { field_0x3198 = 0x100; diff --git a/src/d/actor/d_a_alink_wolf.inc b/src/d/actor/d_a_alink_wolf.inc index bc08d640390..79df1401c0d 100644 --- a/src/d/actor/d_a_alink_wolf.inc +++ b/src/d/actor/d_a_alink_wolf.inc @@ -824,7 +824,7 @@ void daAlink_c::setSpeedAndAngleWolfAtn() { BOOL daAlink_c::checkWolfAtnWait() { if ((checkEnemyGroup(mTargetedActor) || mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_23_e) || - (mTargetedActor != NULL && fopAcM_GetName(mTargetedActor) == PROC_NPC_MOI && + (mTargetedActor != NULL && fopAcM_GetName(mTargetedActor) == fpcNm_NPC_MOI_e && ((daNpc_Moi_c*)mTargetedActor)->chkSFight())) { return true; @@ -1586,7 +1586,7 @@ BOOL daAlink_c::checkWolfBarrierWallHit(cBgS_PolyInfo& i_polyinfo) { } s16 bg_name = getMoveBGActorName(i_polyinfo, TRUE); - if (bg_name == PROC_OBJ_TP || bg_name == PROC_OBJ_GB || bg_name == PROC_Obj_GanonWall2) { + if (bg_name == fpcNm_OBJ_TP_e || bg_name == fpcNm_OBJ_GB_e || bg_name == fpcNm_Obj_GanonWall2_e) { return true; } @@ -3813,7 +3813,7 @@ int daAlink_c::procWolfSlopeStart() { static fopAc_ac_c* daAlink_searchGoldWolf(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_NPC_GWOLF) { + if (fopAcM_GetName(i_actor) == fpcNm_NPC_GWOLF_e) { return i_actor; } @@ -3825,10 +3825,10 @@ static void* daAlink_searchWolfHowl(fopAc_ac_c* i_actor, void* i_data) { fopAc_ac_c** var_r30 = (fopAc_ac_c**)i_data; daAlink_c* player_p = daAlink_getAlinkActorClass(); - if ((actor_name == PROC_KAGO && dComIfGs_isEventBit(dSv_event_flag_c::M_051)) || - (actor_name == PROC_E_PM && + if ((actor_name == fpcNm_KAGO_e && dComIfGs_isEventBit(dSv_event_flag_c::M_051)) || + (actor_name == fpcNm_E_PM_e && player_p->current.pos.abs2XZ(i_actor->current.pos) < SQUARE(3000.0f)) || - actor_name == PROC_OBJ_SEKIZOA || + actor_name == fpcNm_OBJ_SEKIZOA_e || (*var_r30 == NULL && actor_name == player_p->getGrassHowlEventActor())) { *var_r30 = i_actor; @@ -3869,10 +3869,10 @@ int daAlink_c::procWolfHowlDemoInit() { if (field_0x27f4 != NULL) { name = fopAcM_GetName(field_0x27f4); } else { - name = PROC_ALINK; + name = fpcNm_ALINK_e; } - if (name == PROC_Tag_WaraHowl) { + if (name == fpcNm_Tag_WaraHowl_e) { shape_angle.y = field_0x27f4->shape_angle.y; current.angle.y = shape_angle.y; } else { @@ -3916,8 +3916,8 @@ int daAlink_c::procWolfHowlDemoInit() { mProcVar4.field_0x3010 = 0; mProcVar0.field_0x3008 = -1; - if (name != PROC_ALINK) { - if (name == PROC_Obj_Yobikusa) { + if (name != fpcNm_ALINK_e) { + if (name == fpcNm_Obj_Yobikusa_e) { daObjYobikusa_c* yobikusa_p = (daObjYobikusa_c*)field_0x27f4; mZ2WolfHowlMgr.setCorrectCurve(yobikusa_p->getType()); @@ -3930,16 +3930,16 @@ int daAlink_c::procWolfHowlDemoInit() { } else if (yobikusa_p->getType() == 1) { field_0x3198 = 0xEE; } - } else if (name == PROC_TAG_HOWL) { + } else if (name == fpcNm_TAG_HOWL_e) { mZ2WolfHowlMgr.setCorrectCurve(static_cast(field_0x27f4)->getCurveID()); - } else if (name == PROC_Obj_WindStone) { + } else if (name == fpcNm_Obj_WindStone_e) { mZ2WolfHowlMgr.setCorrectCurve(static_cast(field_0x27f4)->getTuneId()); mProcVar0.field_0x3008 = static_cast(field_0x27f4)->getNextSceneId(); mProcVar4.field_0x3010 = 1; - } else if (name == PROC_Obj_SmWStone) { + } else if (name == fpcNm_Obj_SmWStone_e) { mZ2WolfHowlMgr.setCorrectCurve(static_cast(field_0x27f4)->getTuneId()); mProcVar4.field_0x3010 = 1; - } else if (name == PROC_Tag_WaraHowl) { + } else if (name == fpcNm_Tag_WaraHowl_e) { mZ2WolfHowlMgr.setCorrectCurve(static_cast(field_0x27f4)->getTuneId()); } else { mZ2WolfHowlMgr.setCorrectCurve(-1); @@ -4101,14 +4101,14 @@ int daAlink_c::procWolfHowlDemo() { fopAcM_OnStatus(actor_p, 0x800); s16 actorName = fopAcM_GetName(actor_p); - if (actorName == PROC_KAGO) { + if (actorName == fpcNm_KAGO_e) { static_cast(actor_p)->setEvent(); static_cast(actor_p)->setKagoPath(mProcVar5.field_0x3012); - } else if (actorName == PROC_OBJ_SEKIZOA) { + } else if (actorName == fpcNm_OBJ_SEKIZOA_e) { static_cast(actor_p)->setWolfHowling(); - } else if (actorName == PROC_E_PM) { + } else if (actorName == fpcNm_E_PM_e) { static_cast(actor_p)->AppearSet(); - } else if (actorName == PROC_HORSE) { + } else if (actorName == fpcNm_HORSE_e) { daHorse_c* horse = static_cast(actor_p); int ret = horse->callHorse(¤t.pos); if (ret == 1 || ret == 2) { @@ -4120,7 +4120,7 @@ int daAlink_c::procWolfHowlDemo() { setWolfHowlNotHappen(isSkipEdge); return 1; } - } else if (actorName == PROC_NPC_TK) { + } else if (actorName == fpcNm_NPC_TK_e) { static_cast(actor_p)->setEventWolf(); static_cast(actor_p)->setHawkPath(mProcVar5.field_0x3012); } @@ -4176,14 +4176,14 @@ int daAlink_c::procWolfHowlDemo() { BOOL daAlink_c::checkWolfRope() { return checkModeFlg(0x20000) && field_0x280c.getActor() != NULL && - fopAcM_GetName(field_0x280c.getActor()) == PROC_Obj_Crope; + fopAcM_GetName(field_0x280c.getActor()) == fpcNm_Obj_Crope_e; } fopAc_ac_c* daAlink_c::checkWolfRopeHit(dCcD_GObjInf* i_collider, cXyz const* param_1, int param_2) const { daObjCrope_c* rope_p = (daObjCrope_c*)i_collider->GetCoHitAc(); - if (i_collider->ChkCoHit() && rope_p != NULL && fopAcM_GetName(rope_p) == PROC_Obj_Crope) { + if (i_collider->ChkCoHit() && rope_p != NULL && fopAcM_GetName(rope_p) == fpcNm_Obj_Crope_e) { if (param_2) { if (rope_p->getRopeStartPos()->abs2XZ(*param_1) > SQUARE(100.0f)) { if (rope_p->getRopeEndPos()->abs2XZ(*param_1) > SQUARE(100.0f)) { @@ -4987,9 +4987,9 @@ const cXyz* daAlink_c::checkMidnaLockJumpPoint() const { if (mProcID == PROC_WOLF_TAG_JUMP && field_0x280c.getActorConst() != NULL) { wljump_p = field_0x280c.getActorConst(); - } else if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == PROC_Tag_Wljump) { + } else if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == fpcNm_Tag_Wljump_e) { wljump_p = field_0x27f4; - } else if (partner_p != NULL && fopAcM_GetName(partner_p) == PROC_Tag_Wljump) { + } else if (partner_p != NULL && fopAcM_GetName(partner_p) == fpcNm_Tag_Wljump_e) { wljump_p = partner_p; } @@ -5225,7 +5225,7 @@ int daAlink_c::procWolfTagJumpLand() { static fopAc_ac_c* daAlink_searchGiant(fopAc_ac_c* i_actor, void* i_data) { cXyz* gnd_chk_pos = static_cast(i_data); - if (fopAcM_GetName(i_actor) == PROC_OBJ_SEKIZOA && + if (fopAcM_GetName(i_actor) == fpcNm_OBJ_SEKIZOA_e && i_actor->current.pos.abs2(*gnd_chk_pos) < SQUARE(200.0f)) { return i_actor; @@ -5237,7 +5237,7 @@ static fopAc_ac_c* daAlink_searchGiant(fopAc_ac_c* i_actor, void* i_data) { static void* daAlink_searchGiantTalk(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_OBJ_SEKIZOA && + if (fopAcM_GetName(i_actor) == fpcNm_OBJ_SEKIZOA_e && static_cast(i_actor)->getType() == 0) { return i_actor; @@ -6039,8 +6039,8 @@ BOOL daAlink_c::checkWolfLieContinue(int param_0) { if ((param_0 || ((mTargetedActor != NULL && (mTargetedActor->attention_info.flags & fopAc_AttnFlag_UNK_0x800000)) && - (fopAcM_GetName(mTargetedActor) == PROC_NPC_JAGAR || - fopAcM_GetName(mTargetedActor) == PROC_NPC_BOU))) && + (fopAcM_GetName(mTargetedActor) == fpcNm_NPC_JAGAR_e || + fopAcM_GetName(mTargetedActor) == fpcNm_NPC_BOU_e))) && !getSlidePolygon(&slide_poly) && !checkWolfLieWaterIn()) { return true; @@ -6485,7 +6485,7 @@ int daAlink_c::decideDoStatusSwimWolf() { return 1; } - if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == PROC_Obj_Drop) { + if (field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == fpcNm_Obj_Drop_e) { setDoStatus(BUTTON_STATUS_UNK_57); if (doTrigger()) { fopAcM_setCarryNow(field_0x27f4, 0); @@ -7946,7 +7946,7 @@ int daAlink_c::procWolfLockAttackInit(int param_0) { commonProcInit(PROC_WOLF_LOCK_ATTACK); setSingleAnimeWolfParam(WANM_ATTACK_A_START, &mpHIO->mWolf.mWlAttack.mWlAtNjump.m.mAerialAttackAnm); - if (fopAcM_GetName(mWolfLockAcKeep[0].getActor()) == PROC_E_YMB) { + if (fopAcM_GetName(mWolfLockAcKeep[0].getActor()) == fpcNm_E_YMB_e) { mProcVar5.field_0x3012 = 1; if (param_0 == 0) { @@ -8019,7 +8019,7 @@ int daAlink_c::procWolfLockAttack() { // early return checks for colliding with at shields or if the actor hit is not freezard if (isAtShieldHit || (checkAtShieldHit(mAtCyl) && (mAtCyl.GetAtHitAc() == NULL || - fopAcM_GetName(mAtCyl.GetAtHitAc()) != PROC_E_FB))) + fopAcM_GetName(mAtCyl.GetAtHitAc()) != fpcNm_E_FB_e))) { return procCoLargeDamageInit(-4, TRUE, 0, 0, NULL, 2); } @@ -8082,7 +8082,7 @@ int daAlink_c::procWolfLockAttackTurnInit(int param_0) { } if (mWolfLockAcKeep[0].getActor() != NULL && - fopAcM_GetName(mWolfLockAcKeep[0].getActor()) == PROC_E_YMB) + fopAcM_GetName(mWolfLockAcKeep[0].getActor()) == fpcNm_E_YMB_e) { mProcVar5.field_0x3012 = 1; } else { @@ -8344,7 +8344,7 @@ int daAlink_c::procWolfGrabUpInit() { return checkNextActionWolf(0); } - if (fopAcM_GetName(field_0x27f4) == PROC_Obj_MasterSword) { + if (fopAcM_GetName(field_0x27f4) == fpcNm_Obj_MasterSword_e) { setGrabItemActor(field_0x27f4); return 1; } @@ -8371,8 +8371,8 @@ int daAlink_c::procWolfGrabUpInit() { field_0x37c8 = field_0x27f4->current.pos - field_0x3510; mProcVar3.field_0x300e = 0; - if (fopAcM_GetName(field_0x27f4) != PROC_Obj_Drop && - fopAcM_GetName(field_0x27f4) != PROC_Obj_Sword) + if (fopAcM_GetName(field_0x27f4) != fpcNm_Obj_Drop_e && + fopAcM_GetName(field_0x27f4) != fpcNm_Obj_Sword_e) { f32 prev_x = current.pos.x; f32 prev_z = current.pos.z; @@ -8577,7 +8577,7 @@ int daAlink_c::procWolfPush() { static fopAc_ac_c* daAlink_searchEnemyCargo(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_E_YC) { + if (fopAcM_GetName(i_actor) == fpcNm_E_YC_e) { return i_actor; } @@ -8699,7 +8699,7 @@ int daAlink_c::procWolfGanonCatchInit() { } mDemo.setSpecialDemoType(); - field_0x27f4->actor_status |= 0x800; + field_0x27f4->actor_status |= fopAcStts_STAFF_EXTRA_e; commonProcInit(PROC_WOLF_GANON_CATCH); field_0x280c.setData(field_0x27f4); @@ -8952,7 +8952,7 @@ int daAlink_c::procWolfChainWait() { int daAlink_c::procWolfDigInit() { BOOL var_r28 = TRUE; - if (checkEndResetFlg1(ERFLG1_UNK_100000) && field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == PROC_Obj_Digpl) { + if (checkEndResetFlg1(ERFLG1_UNK_100000) && field_0x27f4 != NULL && fopAcM_GetName(field_0x27f4) == fpcNm_Obj_Digpl_e) { int type = ((daObjDigpl_c*)field_0x27f4)->getType(); if (type == 0 || type == 2 || type == 3) { var_r28 = FALSE; @@ -8977,11 +8977,11 @@ int daAlink_c::procWolfDigInit() { if (field_0x27f4 != NULL) { mProcVar1.mDigActorName = fopAcM_GetName(field_0x27f4); } else { - mProcVar1.mDigActorName = PROC_ALINK; + mProcVar1.mDigActorName = fpcNm_ALINK_e; } fopAc_ac_c* var_r29; - if (checkEndResetFlg1(ERFLG1_UNK_100000) && mProcVar1.mDigActorName != PROC_Obj_Lv4DigSand && mProcVar1.mDigActorName != PROC_Obj_DigSnow) { + if (checkEndResetFlg1(ERFLG1_UNK_100000) && mProcVar1.mDigActorName != fpcNm_Obj_Lv4DigSand_e && mProcVar1.mDigActorName != fpcNm_Obj_DigSnow_e) { var_r29 = field_0x27f4; } else { var_r29 = NULL; @@ -8991,7 +8991,7 @@ int daAlink_c::procWolfDigInit() { mProcVar4.mDigExitID = 0; if (var_r29 != NULL) { - if (fopAcM_GetName(var_r29) == PROC_Obj_Digpl) { + if (fopAcM_GetName(var_r29) == fpcNm_Obj_Digpl_e) { mProcVar2.mDigType = ((daObjDigpl_c*)var_r29)->getType(); mProcVar4.mDigExitID = ((daObjDigpl_c*)var_r29)->getSceneNum(); field_0x280c.setData(var_r29); @@ -9015,9 +9015,9 @@ int daAlink_c::procWolfDigInit() { mProcVar2.mDigType = 4; if (checkEndResetFlg1(ERFLG1_UNK_100000)) { - if (mProcVar1.mDigActorName == PROC_Obj_DigSnow) { + if (mProcVar1.mDigActorName == fpcNm_Obj_DigSnow_e) { ((daObjDigSnow_c* )field_0x27f4)->startDig(); - } else if (mProcVar1.mDigActorName == PROC_Obj_Lv4DigSand) { + } else if (mProcVar1.mDigActorName == fpcNm_Obj_Lv4DigSand_e) { ((daObjL4DigSand_c*)field_0x27f4)->startDig(); } field_0x280c.setData(field_0x27f4); @@ -9119,9 +9119,9 @@ int daAlink_c::procWolfDig() { setWolfDigEffect(); } else { if (field_0x280c.getActor() != NULL) { - if (mProcVar1.mDigActorName == PROC_Obj_DigSnow) { + if (mProcVar1.mDigActorName == fpcNm_Obj_DigSnow_e) { ((daObjDigSnow_c*)field_0x280c.getActor())->endDig(); - } else if (mProcVar1.mDigActorName == PROC_Obj_Lv4DigSand) { + } else if (mProcVar1.mDigActorName == fpcNm_Obj_Lv4DigSand_e) { ((daObjL4DigSand_c*)field_0x280c.getActor())->endDig(); } } @@ -9284,21 +9284,21 @@ int daAlink_c::procWolfDigThrough() { } void daAlink_c::setSmellSave() { - if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_MEDICINE) { + if (dComIfGs_getCollectSmell() == dItemNo_SMELL_MEDICINE_e) { dComIfGs_offEventBit(dSv_event_flag_c::F_0387); } dMsgObject_setSmellType(mProcVar5.field_0x3012); - if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_MEDICINE) { + if (mProcVar5.field_0x3012 == dItemNo_SMELL_MEDICINE_e) { dComIfGs_onEventBit(dSv_event_flag_c::F_0387); - } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_CHILDREN) { + } else if (mProcVar5.field_0x3012 == dItemNo_SMELL_CHILDREN_e) { fopAcM_onSwitch(this, 102); - } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) { + } else if (mProcVar5.field_0x3012 == dItemNo_SMELL_YELIA_POUCH_e) { fopAcM_onSwitch(this, 103); - } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_FISH) { + } else if (mProcVar5.field_0x3012 == dItemNo_SMELL_FISH_e) { dComIfGs_onEventBit(dSv_event_flag_c::F_0801); - } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_POH) { + } else if (mProcVar5.field_0x3012 == dItemNo_SMELL_POH_e) { dComIfGs_onEventBit(dSv_event_flag_c::F_0810); } @@ -9331,7 +9331,7 @@ int daAlink_c::procWolfGetSmellInit() { dComIfGp_setPlayerStatus1(0, 0x4000000); mProcVar2.field_0x300c = 0; - if (dComIfGs_getCollectSmell() == fpcNm_ITEM_NONE) { + if (dComIfGs_getCollectSmell() == dItemNo_NONE_e) { field_0x3198 = 0xBBC; } else { field_0x3198 = 0xBBB; @@ -9339,9 +9339,9 @@ int daAlink_c::procWolfGetSmellInit() { field_0x319c = -1; - if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) { + if (mProcVar5.field_0x3012 == dItemNo_SMELL_YELIA_POUCH_e) { field_0x319c = 0x2220; - } else if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_CHILDREN) { + } else if (mProcVar5.field_0x3012 == dItemNo_SMELL_CHILDREN_e) { field_0x319c = 0x2240; } @@ -9364,7 +9364,7 @@ int daAlink_c::procWolfGetSmell() { dComIfGp_getEvent()->reset(this); dComIfGp_clearPlayerStatus1(0, 0x4000000); - if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) { + if (mProcVar5.field_0x3012 == dItemNo_SMELL_YELIA_POUCH_e) { fopAcM_orderOtherEvent(this, "SMELL_1st", 0xFFFF, 0x400, 1); } else { fopAcM_orderOtherEvent(this, "SMELL_Child", 0xFFFF, 0x400, 1); diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 376f439561d..092e86143bc 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -188,18 +188,18 @@ static actor_method_class l_daAlldie_Method = { }; actor_process_profile_definition g_profile_ALLDIE = { - fpcLy_CURRENT_e, - 2, - fpcPi_CURRENT_e, - PROC_ALLDIE, - &g_fpcLf_Method.base, - sizeof(daAlldie_c), - 0, - 0, - &g_fopAc_Method.base, - 278, - &l_daAlldie_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ALLDIE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAlldie_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ALLDIE_e, + /* Actor SubMtd */ &l_daAlldie_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp index 463f2b852c3..097d7096c5e 100644 --- a/src/d/actor/d_a_andsw.cpp +++ b/src/d/actor/d_a_andsw.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_andsw.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #if DEBUG daAndsw_HIO_c l_HIO; @@ -113,18 +113,18 @@ static actor_method_class l_daAndsw_Method = { }; actor_process_profile_definition g_profile_ANDSW = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_ANDSW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daAndsw_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 302, // mPriority - &l_daAndsw_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ANDSW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAndsw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ANDSW_e, + /* Actor SubMtd */ &l_daAndsw_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index 9ad44d48775..146dcb5929c 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_andsw2.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" u8 daAndsw2_c::getEventNo() { return home.angle.x & 0xFF; @@ -343,18 +343,18 @@ static actor_method_class l_daAndsw2_Method = { }; actor_process_profile_definition g_profile_ANDSW2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_ANDSW2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daAndsw2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 303, // mPriority - &l_daAndsw2_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ANDSW2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAndsw2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ANDSW2_e, + /* Actor SubMtd */ &l_daAndsw2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 809dadb9944..769c3273e97 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -82,7 +82,7 @@ const static dCcD_SrcSph l_coSphSrc = { void daArrow_c::atHitCallBack(dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf) { if (i_tgObjInf->ChkTgArrowThrough()) { - if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == PROC_E_PZ) { + if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == fpcNm_E_PZ_e) { ((daE_PZ_c*)i_tgActor)->onBombArrowHit(); } } else if (i_tgActor != NULL && fopAcM_IsActor(i_tgActor)) { @@ -457,7 +457,7 @@ void daArrow_c::setBombMoveEffect() { bool daArrow_c::checkReget() { if (field_0x7cc.ChkCoHit()) { dComIfGp_setItemArrowNumCount(1); - fopAcM_createItemForSimpleDemo(¤t.pos, fpcNm_ITEM_ARROW_1, -1, NULL, NULL, 0.0f, 0.0f); + fopAcM_createItemForSimpleDemo(¤t.pos, dItemNo_ARROW_1_e, -1, NULL, NULL, 0.0f, 0.0f); mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, 0, 0, 0); field_0x93f = 1; return true; @@ -632,7 +632,7 @@ int daArrow_c::procMove() { } if (mArrowType == 4) { - if (field_0x688.GetAtHitAc() != NULL && fopAcM_GetName(field_0x688.GetAtHitAc()) == PROC_E_PZ) { + if (field_0x688.GetAtHitAc() != NULL && fopAcM_GetName(field_0x688.GetAtHitAc()) == fpcNm_E_PZ_e) { iVar3 = 0; } else { procSlingHitInit(field_0x688.GetAtHitPosP(), &field_0x688); @@ -1125,7 +1125,7 @@ static int daArrow_draw(daArrow_c* i_this) { } static void* daAlink_searchHorseZelda(fopAc_ac_c* param_0, void* param_1) { - if (fopAcM_GetName(param_0) == PROC_HOZELDA) { + if (fopAcM_GetName(param_0) == fpcNm_HOZELDA_e) { return param_0; } @@ -1221,18 +1221,18 @@ static actor_method_class l_daArrowMethodTable = { }; actor_process_profile_definition g_profile_ARROW = { - fpcLy_CURRENT_e, // mLayerID - 9, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_ARROW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daArrow_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 750, // mPriority - &l_daArrowMethodTable, // sub_method - 0x00060000, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ARROW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daArrow_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ARROW_e, + /* Actor SubMtd */ &l_daArrowMethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp index 777fa09d40d..79c133c7dad 100644 --- a/src/d/actor/d_a_b_bh.cpp +++ b/src/d/actor/d_a_b_bh.cpp @@ -1577,20 +1577,20 @@ static actor_method_class l_daB_BH_Method = { }; actor_process_profile_definition g_profile_B_BH = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_BH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(b_bh_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 211, // mPriority - &l_daB_BH_Method, // sub_method - 0x00044000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_BH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_bh_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_BH_e, + /* Actor SubMtd */ &l_daB_BH_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 4b4af6a06f6..96155f18a25 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -335,7 +335,7 @@ static int daB_BQ_Draw(b_bq_class* i_this) { } static void* s_fw_sub0(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) { static_cast(i_actor)->field_0x58c = 0.0f; } @@ -345,7 +345,7 @@ static void* s_fw_sub0(void* i_actor, void* i_data) { static void* s_fw_sub1(void* i_actor, void* i_data) { fopAc_ac_c* data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) { obj_fw_class* fw = static_cast(i_actor); fw->field_0x567 = 1; @@ -382,7 +382,7 @@ static s8 data_805BAD70; static void* s_fw_sub2(void* i_actor, void* i_data) { fopAc_ac_c* data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) { obj_fw_class* fw = static_cast(i_actor); fw->field_0x567 = 2; @@ -409,7 +409,7 @@ static void* s_fw_sub2(void* i_actor, void* i_data) { } static void* s_fw_del_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -418,7 +418,7 @@ static void* s_fw_del_sub(void* i_actor, void* i_data) { static void* s_bi_del_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor) && - (fopAcM_GetName(i_actor) == PROC_E_BI || fopAcM_GetName(i_actor) == PROC_E_BI_LEAF)) + (fopAcM_GetName(i_actor) == fpcNm_E_BI_e || fopAcM_GetName(i_actor) == fpcNm_E_BI_LEAF_e)) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -1189,7 +1189,7 @@ static void fish_set(b_bq_class* i_this) { pos.y = -200.0f; pos.z = lf_pos[i].pos_z; - fopAcM_create(PROC_NPC_LF, lf_pos[i].param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); + fopAcM_create(fpcNm_NPC_LF_e, lf_pos[i].param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } } @@ -1921,7 +1921,7 @@ static void demo_camera(b_bq_class* i_this) { dComIfGp_getVibration().StartShock(5, 1, cXyz(0.0f, 1.0f, 0.0f)); cXyz sp120(1.0f, 1.0f, 1.0f); - fopAcM_createItemForBoss(&i_this->field_0x5cc, fpcNm_ITEM_UTAWA_HEART, + fopAcM_createItemForBoss(&i_this->field_0x5cc, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, &sp120, 0.0f, 0.0f, -1); @@ -2079,13 +2079,13 @@ static void demo_camera(b_bq_class* i_this) { spFC += player->current.pos; OS_REPORT("///YSTONE POS %d,%d,%d\n", (int)spFC.x, (int)spFC.y, (int)spFC.z); - fopAcM_create(PROC_OBJ_YSTONE, 0, &spFC, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &spFC, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); } if (i_this->mDemoModeTimer == 120) { i_this->field_0x1151 = 1; - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { ystone->field_0x59b = 0; } @@ -2111,7 +2111,7 @@ static void demo_camera(b_bq_class* i_this) { cLib_addCalc2(&i_this->field_0x1298, 210.0f, 0.05f, 0.5f); - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { ystone->setCurrentPos(spFC); } @@ -2378,7 +2378,7 @@ static int daB_BQ_Execute(b_bq_class* i_this) { if (i_this->field_0x1394 == 10) { fpcM_Search(s_fw_del_sub, i_this); } else if (i_this->field_0x1394 == 0) { - fopAcM_createChild(PROC_E_BI, fopAcM_GetID(a_this), 0xFFFFFF35, &a_this->current.pos, + fopAcM_createChild(fpcNm_E_BI_e, fopAcM_GetID(a_this), 0xFFFFFF35, &a_this->current.pos, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL); } } @@ -2497,7 +2497,7 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) { if (!dComIfGs_isStageLife()) { cXyz scale(1.0f, 1.0f, 1.0f); pos.set(60.0f, 0.0f, 1778.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(i_this), + fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &scale, 0.0f, 0.0f, -1); } @@ -2626,13 +2626,13 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) { tentacle_pos += i_this->current.pos; a_this->mTentacleIDs[i] = - fopAcM_createChild(PROC_B_BH, fopAcM_GetID(i_this), params | i, &tentacle_pos, + fopAcM_createChild(fpcNm_B_BH_e, fopAcM_GetID(i_this), params | i, &tentacle_pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL); offset.x *= -1.0f; } a_this->mMonkeyBombID = - fopAcM_createChild(PROC_E_MB, fopAcM_GetID(i_this), 0xFFFFFFFF, &i_this->current.pos, + fopAcM_createChild(fpcNm_E_MB_e, fopAcM_GetID(i_this), 0xFFFFFFFF, &i_this->current.pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL); if (dComIfG_play_c::getLayerNo(0) == 4) { @@ -2673,18 +2673,18 @@ static actor_method_class l_daB_BQ_Method = { }; actor_process_profile_definition g_profile_B_BQ = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_B_BQ, - &g_fpcLf_Method.base, - sizeof(b_bq_class), - 0, - 0, - &g_fopAc_Method.base, - 212, - &l_daB_BQ_Method, - 0x44000, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_BQ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_bq_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_BQ_e, + /* Actor SubMtd */ &l_daB_BQ_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index b47801849d7..7c416677f9f 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -527,18 +527,18 @@ void daB_DR_c::mStatusONOFF(int i_status) { attention_info.distances[fopAc_attn_BATTLE_e] = 0; attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e; fopAcM_OffStatus(this, 0); - fopAcM_OffStatus(this, 0x200000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); return; case 1: attention_info.distances[fopAc_attn_BATTLE_e] = 85; attention_info.flags |= fopAc_AttnFlag_BATTLE_e; fopAcM_OnStatus(this, 0); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); return; case 2: attention_info.distances[fopAc_attn_BATTLE_e] = 60; fopAcM_OnStatus(this, 0); - fopAcM_OffStatus(this, 0x200000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); attention_info.flags |= fopAc_AttnFlag_BATTLE_e; return; } @@ -842,7 +842,7 @@ void daB_DR_c::chkPartCreate(bool param_0) { prm |= (BREAK_PARTS_DT[part_no].prm << 8); size.x = size.y = size.z = BREAK_PARTS_DT[part_no].size; - fopAcM_create(PROC_B_DR, prm, &pos, fopAcM_GetRoomNo(this), &rot, &size, -1); + fopAcM_create(fpcNm_B_DR_e, prm, &pos, fopAcM_GetRoomNo(this), &rot, &size, -1); field_0x7e0++; part_no++; @@ -988,7 +988,7 @@ void daB_DR_c::tail_hit_check() { if (health > 0) { daPy_getPlayerActorClass()->onBossRoomWait(); - if (fopAcM_CheckStatus(this, 0x200000) && cLib_calcTimer(&field_0x7d0) == 0 && mActionMode != ACTION_TAIL_HIT && field_0x7d1 != 2) { + if (fopAcM_CheckStatus(this, fopAcStts_UNK_0x200000_e) && cLib_calcTimer(&field_0x7d0) == 0 && mActionMode != ACTION_TAIL_HIT && field_0x7d1 != 2) { if (mTailCc.ChkTgHit()) { speedF = 0.0f; dComIfGs_onZoneSwitch(21, fopAcM_GetRoomNo(this)); @@ -1004,7 +1004,7 @@ void daB_DR_c::week_hit_check() { if (mWeekCc.ChkTgSet()) { daPy_getPlayerActorClass()->onBossRoomWait(); - if (health > 0 && fopAcM_CheckStatus(this, 0x200000) && cLib_calcTimer(&field_0x7d0) == 0 && mActionMode != ACTION_WEEK_HIT && field_0x7d1 == 2) { + if (health > 0 && fopAcM_CheckStatus(this, fopAcStts_UNK_0x200000_e) && cLib_calcTimer(&field_0x7d0) == 0 && mActionMode != ACTION_WEEK_HIT && field_0x7d1 == 2) { if (mWeekCc.ChkTgHit() && mWeekCc.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT)) { speedF = 0.0f; Z2GetAudioMgr()->changeBgmStatus(2); @@ -1624,7 +1624,7 @@ void daB_DR_c::executeTailHit() { mMoveMode++; case 15: ato = current.pos + mBoot_c_trance; - parentActorID = fopAcM_createChild(PROC_B_DRE, fopAcM_GetID(this), 1, &ato, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_B_DRE_e, fopAcM_GetID(this), 1, &ato, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); Z2GetAudioMgr()->subBgmStart(Z2BGM_DRAGON_D02); dComIfGs_onZoneSwitch(23, fopAcM_GetRoomNo(this)); @@ -1836,7 +1836,7 @@ void daB_DR_c::executeWeekHit() { sp44.z = 0.0f; sp44.x = 0.0f; - parentActorID = fopAcM_createChild(PROC_B_DRE, fopAcM_GetID(this), 0, &sp44, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_B_DRE_e, fopAcM_GetID(this), 0, &sp44, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); mTimer[0] = BREG_S(3) + 20; mMoveMode = 1000; return; @@ -2008,7 +2008,7 @@ void daB_DR_c::mBreathSet() { sp1C.x = NREG_S(8) - 1000; mTimer[1] = 3; - fopAcM_createChild(PROC_B_DR, fopAcM_GetID(this), 10, &field_0x760, fopAcM_GetRoomNo(this), &sp1C, NULL, -1, NULL); + fopAcM_createChild(fpcNm_B_DR_e, fopAcM_GetID(this), 10, &field_0x760, fopAcM_GetRoomNo(this), &sp1C, NULL, -1, NULL); } } @@ -4085,7 +4085,7 @@ int daB_DR_c::create() { mSound.init(¤t.pos, &eyePos, 3, 1); mColliderStts.Init(0x19, 0, this); - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); if (arg0 == 0x14) { setActionMode(0xF, 0); @@ -4108,7 +4108,7 @@ int daB_DR_c::create() { angle.x = angle.y = angle.z = 0; pos.set(224.0f, 0.0f, 762.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(this), &angle, &size, 0.0f, 0.0f, -1); + fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(this), &angle, &size, 0.0f, 0.0f, -1); } dScnKy_env_light_c* kankyo = dKy_getEnvlight(); @@ -4248,10 +4248,10 @@ int daB_DR_c::create() { mTimer[0] = 2; if (BREG_S(5) == 0) { - parentActorID = fopAcM_createChild(PROC_L7ODR, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_L7ODR_e, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); mStatusONOFF(0); } else if (BREG_S(0) != 0) { - parentActorID = fopAcM_createChild(PROC_B_DRE, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_B_DRE_e, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } dScnKy_env_light_c* kankyo = dKy_getEnvlight(); @@ -4294,20 +4294,20 @@ static actor_method_class l_daB_DR_Method = { }; actor_process_profile_definition g_profile_B_DR = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_DR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_DR_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 221, // mPriority - &l_daB_DR_Method, // sub_method - 0x04040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_DR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_DR_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_DR_e, + /* Actor SubMtd */ &l_daB_DR_Method, + /* Status */ fopAcStts_BOSS_e | fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_dre.cpp b/src/d/actor/d_a_b_dre.cpp index 8701a1f2616..c052f014457 100644 --- a/src/d/actor/d_a_b_dre.cpp +++ b/src/d/actor/d_a_b_dre.cpp @@ -564,14 +564,14 @@ void daB_DRE_c::DrAction() { sp90 = current.pos; sp1C.set(0, shape_angle.y + 0x1000, 0); - fopAcM_createItemForBoss(&sp90, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(this), &sp1C, + fopAcM_createItemForBoss(&sp90, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(this), &sp1C, NULL, 6.0f + TREG_F(9), 20.0f + TREG_F(10), -1); mTimers[0] = 30; } break; case 6: fopAc_ac_c* lifecon; - fopAcM_SearchByName(PROC_Obj_LifeContainer, &lifecon); + fopAcM_SearchByName(fpcNm_Obj_LifeContainer_e, &lifecon); if (lifecon != NULL) { dComIfGp_event_setTalkPartner(lifecon); player->changeDemoMode(0x2F, 3, 0, 0); @@ -597,7 +597,7 @@ void daB_DRE_c::DrAction() { cXyz sp6C(0.0f, 0.0f, 0.0f); sp90.set(150.0f + aREG_F(0), 400.0f + XREG_F(4), 800.0f); cLib_offsetPos(&sp90, &sp90, shape_angle.y + 0x5000, &sp6C); - fopAcM_create(PROC_OBJ_YSTONE, 0, &sp90, fopAcM_GetRoomNo(this), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &sp90, fopAcM_GetRoomNo(this), NULL, NULL, -1); sp90.set(-325.0f, 0.0f, 215.0f); sp1C.set(0, 0, 0); @@ -618,7 +618,7 @@ void daB_DRE_c::DrAction() { } fopAc_ac_c* ystone; - fopAcM_SearchByName(PROC_OBJ_YSTONE, &ystone); + fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e, &ystone); if (ystone != NULL && field_0x638 == 0) { field_0x638 = 1; @@ -944,20 +944,20 @@ static actor_method_class l_daB_DRE_Method = { }; actor_process_profile_definition g_profile_B_DRE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_DRE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_DRE_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 231, // mPriority - &l_daB_DRE_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_DRE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_DRE_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_DRE_e, + /* Actor SubMtd */ &l_daB_DRE_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 4fc5d127eb7..5c3ed39b17f 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -773,7 +773,7 @@ void daB_DS_c::mCreateTrap(bool param_0) { angle.x = 0; angle.y = 0; angle.z = 0; - mTrapID[i] = fopAcM_createChild(PROC_Obj_Lv6TogeTrap, fopAcM_GetID(this), params, + mTrapID[i] = fopAcM_createChild(fpcNm_Obj_Lv6TogeTrap_e, fopAcM_GetID(this), params, ¤t.pos, fopAcM_GetRoomNo(this), &angle, &trap_scale, -1, NULL); trap_count++; @@ -810,7 +810,7 @@ void daB_DS_c::mCreateTrap(bool param_0) { } mTrapID[i] = - fopAcM_createChild(PROC_Obj_Lv6TogeTrap, fopAcM_GetID(this), 0x27104DFF, &pos, + fopAcM_createChild(fpcNm_Obj_Lv6TogeTrap_e, fopAcM_GetID(this), 0x27104DFF, &pos, fopAcM_GetRoomNo(this), &angle, &trap_scale, -1, NULL); if (mBackboneLevel == 2) { angle.y += 0x2AAA; @@ -833,7 +833,7 @@ void daB_DS_c::mCreateTrap(bool param_0) { angle.y = mBirthAngle02_dt[i] + mBirthAngle01_dt[j * 2]; pos.y = mBirthYpos02_dt[i]; mTrapID[idx] = - fopAcM_createChild(PROC_Obj_Lv6TogeTrap, fopAcM_GetID(this), params, &pos, + fopAcM_createChild(fpcNm_Obj_Lv6TogeTrap_e, fopAcM_GetID(this), params, &pos, fopAcM_GetRoomNo(this), &angle, &trap_scale, -1, NULL); } } @@ -1282,7 +1282,7 @@ void daB_DS_c::executeOpeningDemo() { dComIfGp_event_reset(); dComIfGs_onZoneSwitch(0, fopAcM_GetRoomNo(this)); - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); mMode++; // fallthrough } @@ -2062,7 +2062,7 @@ void daB_DS_c::executeDamage() { if (mStaltroopID[i] == 0) { mStaltroopID[i] = - fopAcM_createChild(PROC_E_ZS, fopAcM_GetID(this), 1, &sp1B0, + fopAcM_createChild(fpcNm_E_ZS_e, fopAcM_GetID(this), 1, &sp1B0, fopAcM_GetRoomNo(this), &angle, NULL, -1, NULL); } } @@ -2071,7 +2071,7 @@ void daB_DS_c::executeDamage() { for (int i = 0; i < 5; i++) { if (mStaltroop2ID[i] == 0) { mStaltroop2ID[i] = - fopAcM_createChild(PROC_E_ZS, fopAcM_GetID(this), 2, ¤t.pos, + fopAcM_createChild(fpcNm_E_ZS_e, fopAcM_GetID(this), 2, ¤t.pos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); } } @@ -2298,7 +2298,7 @@ void daB_DS_c::executeDamage() { p2_angle.y = 0; p2_angle.x = 0; - fopAcM_create(PROC_B_DS, param | TYPE_BATTLE_2, ¤t.pos, fopAcM_GetRoomNo(this), + fopAcM_create(fpcNm_B_DS_e, param | TYPE_BATTLE_2, ¤t.pos, fopAcM_GetRoomNo(this), &p2_angle, NULL, 0xff); mMode = 101; // fallthrough @@ -2413,7 +2413,7 @@ void daB_DS_c::breath_smokeSet() { cXyz bullet_pos = mBulletPos; - fopAcM_create(PROC_B_DS, TYPE_BULLET_A, &bullet_pos, fopAcM_GetRoomNo(this), &bullet_angle, + fopAcM_create(fpcNm_B_DS_e, TYPE_BULLET_A, &bullet_pos, fopAcM_GetRoomNo(this), &bullet_angle, NULL, 0xff); } } @@ -2919,7 +2919,7 @@ void daB_DS_c::mFuwafuwaSet(bool param_0) { } void daB_DS_c::mBattle2BreathFireSet(u32 i_params) { - fopAcM_createChild(PROC_B_DS, fopAcM_GetID(this), i_params, &mMouthPos, fopAcM_GetRoomNo(this), + fopAcM_createChild(fpcNm_B_DS_e, fopAcM_GetID(this), i_params, &mMouthPos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); mCreateFireBreath = false; } @@ -5447,7 +5447,7 @@ cPhs_Step daB_DS_c::create() { angle.x = angle.y = angle.z = 0; pos.set(-400.0f, 1775.0f, -4132.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(this), &angle, &scale, + fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(this), &angle, &scale, 0.0f, 0.0f, -1); } @@ -5492,7 +5492,7 @@ cPhs_Step daB_DS_c::create() { mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), NULL, NULL); mAcch.CrrPos(dComIfG_Bgsp()); - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } setActionMode(8, 0); @@ -5603,7 +5603,7 @@ cPhs_Step daB_DS_c::create() { fopAcM_onSwitch(this, bitSw); } - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); if (cDmr_SkipInfo == 0 && !dComIfGs_isZoneSwitch(5, fopAcM_GetRoomNo(this))) { mDrawZant = false; @@ -5687,20 +5687,20 @@ static actor_method_class l_daB_DS_Method = { }; actor_process_profile_definition g_profile_B_DS = { - fpcLy_CURRENT_e, - 4, - fpcPi_CURRENT_e, - PROC_B_DS, - &g_fpcLf_Method.base, - sizeof(daB_DS_c), - 0, - 0, - &g_fopAc_Method.base, - 0xDC, - &l_daB_DS_Method, - 0x4040000, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_DS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_DS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_DS_e, + /* Actor SubMtd */ &l_daB_DS_Method, + /* Status */ fopAcStts_BOSS_e | fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index 212225ece2d..dc14f1215cb 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -1191,8 +1191,8 @@ void daB_GG_c::Md_DemoAction() { } else if (mpModelMorf->getFrame() > 18.0f && mAnm == BCK_GGB_TAKE_OFF) { var_r29 = 1; } else if (mAnm == BCK_GGB_WAIT_B && mTimers[0] == 0) { - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); SetAnm(BCK_GGB_TAKE_OFF, 0, 5.0f, 1.0f); mSound.startCreatureVoice(Z2SE_EN_GG_V_TAKE_OFF, -1); @@ -1802,7 +1802,7 @@ void daB_GG_c::F_AttackAction() { speedF = field_0x5bc; field_0x5c0 = (100.0f + (s_LinkPos->y - current.pos.y)) / ((0.9f * var_f31) / speedF); speed.y = field_0x5c0; - fopAcM_OffStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e); } break; case 1: { @@ -1842,7 +1842,7 @@ void daB_GG_c::F_AttackAction() { } } else if (current.pos.y - field_0x648 > 500.0f || (field_0x650 == current.pos.y - field_0x648 && mAnm == BCK_GGA_ATTACK_4)) { mCcHookCyl.OnTgSetBit(); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); if (field_0x5b6 != 0) { SetAnm(BCK_GGA_ATTACK_2, 2, 5.0f, 1.0f); @@ -1887,8 +1887,8 @@ void daB_GG_c::F_AttackAction() { mCcHookCyl.OnTgSetBit(); SetAnm(BCK_GGA_PREPARATION, 2, 5.0f, 1.0f); - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); if (field_0x6ba != 0) { mTimers[0] = l_HIO.fly_attack_wait_time * 0.5f; @@ -2002,8 +2002,8 @@ void daB_GG_c::F_DamageAction() { if (mTimers[0] == 1 && mAnm == BCK_GGA_PULL) { mMode++; fopAcM_cancelHookCarryNow(this); - fopAcM_OffStatus(this, 0x80000); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); mTimers[0] = 5; } break; @@ -2031,8 +2031,8 @@ void daB_GG_c::F_DamageAction() { s_M_Action = 0; s_W_Action = 0; - fopAcM_OffStatus(this, 0x80000); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); } else { cXyz* hookshot_top = player->getHookshotTopPos(); cXyz sp24(0.0f, 0.0f, 0.0f); @@ -2046,8 +2046,8 @@ void daB_GG_c::F_DamageAction() { if (mAcch.ChkWallHit() && mTimers[0] == 0) { SetAction(ACTION_FLY, SUBACT_MOVE, 0); - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); SetAnm(BCK_GGA_WAIT, 2, 5.0f + BREG_F(12), 1.0f); @@ -2084,8 +2084,8 @@ void daB_GG_c::F_DamageAction() { } } else if (current.pos.y < (field_0x648 - 50.0f)) { SetAction(ACTION_FLY, SUBACT_MOVE, 0); - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); SetAnm(BCK_GGA_WAIT, 2, 5.0f + BREG_F(12), 1.0f); @@ -2546,8 +2546,8 @@ void daB_GG_c::G_MoveAction() { mTimers[1] = 0; gravity = 0.0f; - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); SetAnm(BCK_GGA_WAIT, 2, 5.0f, 1.0f); @@ -2576,8 +2576,8 @@ void daB_GG_c::FallChk() { if (current.pos.y < (field_0x648 - 10.0f) && field_0x5b6 != 0) { if (!mAcch.ChkGroundHit()) { SetAction(ACTION_FLY, SUBACT_MOVE, 0); - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); SetAnm(BCK_GGA_WAIT, 2, 5.0f + BREG_F(12), 1.0f); @@ -2615,8 +2615,8 @@ void daB_GG_c::FallChk() { } else if (current.pos.y < (field_0x648 - 10.0f)) { SpeedClear(); SetAction(ACTION_FLY, SUBACT_MOVE, 0); - fopAcM_OffStatus(this, 0x200000); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); SetAnm(BCK_GGA_WAIT, 2, 5.0f + BREG_F(12), 1.0f); @@ -4409,7 +4409,7 @@ int daB_GG_c::Create() { mMode = 0; SetAnm(BCK_GG_WAIT, 2, 5.0f, 1.0f); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); if (-G_CM3D_F_INF != mAcch.GetGroundH()) { current.pos.y = mAcch.GetGroundH(); @@ -4462,20 +4462,20 @@ static actor_method_class l_daB_GG_Method = { }; actor_process_profile_definition g_profile_B_GG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_GG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_GG_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 230, // mPriority - &l_daB_GG_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_GG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_GG_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_GG_e, + /* Actor SubMtd */ &l_daB_GG_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index 99a0f3bd732..5d96b965f4b 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -221,7 +221,7 @@ static int daB_GM_Draw(b_gm_class* i_this) { } static void* s_ko_del(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e && fopAcM_GetParam(i_actor) == 0) { ((daE_GM_c*)i_actor)->InstantKill(); } @@ -341,7 +341,7 @@ static BOOL bg_check(b_gm_class* i_this) { static int ko_ct; static void* s_ko_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e) { ko_ct++; } @@ -349,7 +349,7 @@ static void* s_ko_sub(void* i_actor, void* i_data) { } static void* s_ko2_move(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 3) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e && fopAcM_GetParam(i_actor) == 3) { ((daE_GM_c*)i_actor)->MoveStart(0); return i_actor; } @@ -358,7 +358,7 @@ static void* s_ko2_move(void* i_actor, void* i_data) { } static void* s_ko2_get(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 3) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e && fopAcM_GetParam(i_actor) == 3) { return i_actor; } @@ -366,7 +366,7 @@ static void* s_ko2_get(void* i_actor, void* i_data) { } static void* s_ko_move(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_GM_e && fopAcM_GetParam(i_actor) == 1) { ((daE_GM_c*)i_actor)->MoveStart(cM_rndF(15.0f)); } @@ -615,7 +615,7 @@ static void b_gm_kogoma(b_gm_class* i_this) { fpcM_Search(s_ko_sub, a_this); if (ko_ct < 100) { csXyz angle(0, a_this->shape_angle.y, 0); - fopAcM_createChild(PROC_E_GM, fopAcM_GetID(a_this), 0, &kogoma_pos, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, 0); + fopAcM_createChild(fpcNm_E_GM_e, fopAcM_GetID(a_this), 0, &kogoma_pos, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, 0); } } @@ -1343,7 +1343,7 @@ static void demo_camera(b_gm_class* i_this) { spBC += a_this->eyePos; csXyz angle(0, cM_rndF(0x10000), 0); - fopAcM_createChild(PROC_E_GM, fopAcM_GetID(a_this), params, &spBC, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_GM_e, fopAcM_GetID(a_this), params, &spBC, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL); } if (i_this->mDemoModeTimer == 90) { @@ -1447,12 +1447,12 @@ static void demo_camera(b_gm_class* i_this) { if (i_this->mDemoModeTimer == 160) { csXyz angle(0, player->shape_angle.y - 0x4000, 0); - fopAcM_createItemForBoss(&i_this->field_0x1cec, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this), &angle, NULL, 10.0f, 30.0f, -1); + fopAcM_createItemForBoss(&i_this->field_0x1cec, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(a_this), &angle, NULL, 10.0f, 30.0f, -1); } if (i_this->mDemoModeTimer == 190) { i_this->field_0x1cec.y += 600.0f; - fopAcM_create(PROC_OBJ_YSTONE, 0, &i_this->field_0x1cec, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &i_this->field_0x1cec, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); i_this->mDemoMode = 42; i_this->mDemoModeTimer = 0; } @@ -1479,7 +1479,7 @@ static void demo_camera(b_gm_class* i_this) { cLib_addCalc2(&i_this->field_0x1cec.y, 100.0f, 0.05f, 0.7f); } - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { if (i_this->mDemoModeTimer > 200) { cLib_addCalc2(&i_this->field_0x1cec.y, 100.0f, 0.05f, 1.0f); @@ -2103,7 +2103,7 @@ static int daB_GM_Create(fopAc_ac_c* i_this) { if (!dComIfGs_isStageLife()) { cXyz size(1.0f, 1.0f, 1.0f); pos.set(400.0f, 0.0f, 0.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &size, 0.0f, 0.0f, -1); + fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &size, 0.0f, 0.0f, -1); } return phase_state; @@ -2232,20 +2232,20 @@ static actor_method_class l_daB_GM_Method = { }; actor_process_profile_definition g_profile_B_GM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_GM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(b_gm_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 213, // mPriority - &l_daB_GM_Method, // sub_method - 0x00044000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_GM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_gm_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_GM_e, + /* Actor SubMtd */ &l_daB_GM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index 76cbb32249e..0dbb6fcf3dc 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -372,7 +372,7 @@ static int daB_GND_Draw(b_gnd_class* i_this) { } static void* shot_s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) { cXyz vec_to_arrow = ((fopAc_ac_c*)i_data)->current.pos - ((fopAc_ac_c*)i_actor)->current.pos; @@ -1235,7 +1235,7 @@ static void b_gnd_g_wait(b_gnd_class* i_this) { s16 angle_step = 0x400; mant_class* mant_p = (mant_class*)fopAcM_SearchByID(i_this->mMantChildID); - dmg_rod_class* mgrod_p = (dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD); + dmg_rod_class* mgrod_p = (dmg_rod_class*)fopAcM_SearchByName(fpcNm_MG_ROD_e); if (mgrod_p != NULL && mgrod_p->action != 0) { if (i_this->mMoveMode < 5 && i_this->mPlayerDistXZ < 600.0f) { @@ -2331,7 +2331,7 @@ static void eff_set(b_gnd_class* i_this) { } static void* s_fkdel_sub(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_FK) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_FK_e) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -2339,7 +2339,7 @@ static void* s_fkdel_sub(void* i_actor, void* i_data) { } static void* s_objgbdel_sub(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_GB) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_GB_e) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -3184,7 +3184,7 @@ static void demo_camera(b_gnd_class* i_this) { i_this->mDemoCamMode = 45; i_this->mDemoCamTimer = 0; sp108.set(0.0f, 1100.0f, 0.0f); - fopAcM_create(PROC_OBJ_GB, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), 0, 0, -1); + fopAcM_create(fpcNm_OBJ_GB_e, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), 0, 0, -1); } cLib_addCalc0(&a_this->speedF, 1.0f, 0.7f); @@ -3645,7 +3645,7 @@ static void demo_camera(b_gnd_class* i_this) { case 92: if (i_this->mDemoCamTimer == 1) { sp108.set(0.0f, 1100.0f, 0.0f); - fopAcM_create(PROC_OBJ_GB, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_GB_e, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); } if (i_this->mDemoCamTimer == 5) { @@ -3681,7 +3681,7 @@ static void demo_camera(b_gnd_class* i_this) { a_this->shape_angle.y = a_this->current.angle.y = 0x37FE; sp108.set(0.0f, 1100.0f, 0.0f); - fopAcM_create(PROC_OBJ_GB, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_GB_e, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); break; case 96: i_this->mDemoCamTimer++; @@ -4440,7 +4440,7 @@ static int daB_GND_Execute(b_gnd_class* i_this) { sp118 = (player->current.pos - i_this->mLightBallPos[i]); fk_angle.y = (s16)cM_atan2s(sp118.x, sp118.z); - fopAcM_create(PROC_E_FK, i | 0xFFFFFF00, &i_this->mLightBallPos[i], fopAcM_GetRoomNo(a_this), &fk_angle, NULL, -1); + fopAcM_create(fpcNm_E_FK_e, i | 0xFFFFFF00, &i_this->mLightBallPos[i], fopAcM_GetRoomNo(a_this), &fk_angle, NULL, -1); i_this->mLightBallSound[i].startSound(Z2SE_EN_GND_LIGHTBALL_SUB_HIT, 0, -1); } } else if (i_this->field_0x1e56[i] == 2) { @@ -4811,7 +4811,7 @@ static int daB_GND_Create(fopAc_ac_c* a_this) { b_path[i].z = sp30.z; } - i_this->mMantChildID = fopAcM_createChild(PROC_MANT, fopAcM_GetID(a_this), + i_this->mMantChildID = fopAcM_createChild(fpcNm_MANT_e, fopAcM_GetID(a_this), 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, 0); a_this->health = 24; i_this->field_0x560 = 24; @@ -4957,20 +4957,20 @@ static actor_method_class l_daB_GND_Method = { }; actor_process_profile_definition g_profile_B_GND = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_GND, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(b_gnd_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 214, // mPriority - &l_daB_GND_Method, // sub_method - 0x00044000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_GND_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_gnd_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_GND_e, + /* Actor SubMtd */ &l_daB_GND_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; static int unk_bss_0xF0; diff --git a/src/d/actor/d_a_b_go.cpp b/src/d/actor/d_a_b_go.cpp index 6f593b1597f..7c93315630d 100644 --- a/src/d/actor/d_a_b_go.cpp +++ b/src/d/actor/d_a_b_go.cpp @@ -274,7 +274,7 @@ static int daB_GO_Create(fopAc_ac_c* i_this) { child_angle.y = cM_rndF(0x10000); a_this->mGoronChildIDs[i] = - fopAcM_createChild(PROC_B_GOS, fopAcM_GetID(a_this), i, &child_pos, + fopAcM_createChild(fpcNm_B_GOS_e, fopAcM_GetID(a_this), i, &child_pos, fopAcM_GetRoomNo(a_this), &child_angle, NULL, -1, NULL); } } @@ -291,18 +291,18 @@ static actor_method_class l_daB_GO_Method = { }; actor_process_profile_definition g_profile_B_GO = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_B_GO, - &g_fpcLf_Method.base, - sizeof(b_go_class), - 0, - 0, - &g_fopAc_Method.base, - 215, - &l_daB_GO_Method, - 0x40100, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_GO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_go_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_GO_e, + /* Actor SubMtd */ &l_daB_GO_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_gos.cpp b/src/d/actor/d_a_b_gos.cpp index a71b100158e..14ee193fcb4 100644 --- a/src/d/actor/d_a_b_gos.cpp +++ b/src/d/actor/d_a_b_gos.cpp @@ -418,18 +418,18 @@ static actor_method_class l_daB_GOS_Method = { }; actor_process_profile_definition g_profile_B_GOS = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_B_GOS, - &g_fpcLf_Method.base, - sizeof(b_gos_class), - 0, - 0, - &g_fopAc_Method.base, - 216, - &l_daB_GOS_Method, - 0x40100, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_GOS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_gos_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_GOS_e, + /* Actor SubMtd */ &l_daB_GOS_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index a050b672cac..2fac141f1f1 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -351,7 +351,7 @@ static int daB_MGN_Draw(daB_MGN_c* i_this) { static void* s_obj_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_ARROW) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e) { if (fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data) < 1500.0f + nREG_F(9)) { if (fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) { s16 var_r29 = ((fopAc_ac_c*)i_actor)->current.angle.y; @@ -919,7 +919,7 @@ void daB_MGN_c::offBodySlideAt() { bool daB_MGN_c::checkHitSlideAt() { for (int i = 0; i < 15; i++) { if (mBodyCcSph[i].ChkAtHit() && !mBodyCcSph[i].ChkAtShieldHit()) { - if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[i].GetAtHitObj()->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[i].GetAtHitObj()->GetAc())) == fpcNm_ALINK_e) { return true; } } @@ -1526,7 +1526,7 @@ void daB_MGN_c::executeDash() { if (dComIfG_Bgsp().LineCross(&spE8)) { var_r27 = dComIfG_Bgsp().GetActorPointer(spE8); - if (!var_r27 || fopAcM_GetName(var_r27) != PROC_Obj_BHASHI) { + if (!var_r27 || fopAcM_GetName(var_r27) != fpcNm_Obj_BHASHI_e) { attention_info.flags = 0; field_0x20f4[0].OffTgSetBit(); mAtSph.OffAtSetBit(); @@ -1537,7 +1537,7 @@ void daB_MGN_c::executeDash() { } else { if (mAcch.ChkWallHit()) { var_r27 = dComIfG_Bgsp().GetActorPointer(mAcchCir); - if (!var_r27 || fopAcM_GetName(var_r27) != PROC_Obj_BHASHI) { + if (!var_r27 || fopAcM_GetName(var_r27) != fpcNm_Obj_BHASHI_e) { if (abs((s16)(mAcchCir.GetWallAngleY() - shape_angle.y)) > 0x6000) { field_0x20f4[0].OffTgSetBit(); mAtSph.OffAtSetBit(); @@ -2548,7 +2548,7 @@ void daB_MGN_c::executeOpening() { return; } - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); player->changeOriginalDemo(); player->setPlayerPosAndAngle(&pos, 0, 0); @@ -3169,7 +3169,7 @@ void daB_MGN_c::action() { if (mBodyCcSph[0].ChkAtSPrm(1) && mAcch.ChkWallHit()) { daObjBHASHI_c* pillar = (daObjBHASHI_c*)dComIfG_Bgsp().GetActorPointer(mAcchCir); - if (pillar != NULL && fopAcM_GetName(pillar) == PROC_Obj_BHASHI) { + if (pillar != NULL && fopAcM_GetName(pillar) == fpcNm_Obj_BHASHI_e) { pillar->Obj_Damage(current.pos); } } @@ -3582,18 +3582,18 @@ static actor_method_class l_daB_MGN_Method = { }; actor_process_profile_definition g_profile_B_MGN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_MGN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_MGN_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 232, // mPriority - &l_daB_MGN_Method, // sub_method - 0x00044000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_MGN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_MGN_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_MGN_e, + /* Actor SubMtd */ &l_daB_MGN_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 41c2bdddbfe..c6e7f382486 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -595,7 +595,7 @@ static void core_hand_move(b_ob_class* i_this) { static int bf_ct; static void* s_bf_sub(void* i_this, void* i_data) { - if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_OctBg) { + if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_E_OctBg_e) { bf_ct++; } @@ -603,7 +603,7 @@ static void* s_bf_sub(void* i_this, void* i_data) { } static void* s_bfdel_sub(void* i_this, void* i_data) { - if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_OctBg) { + if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_E_OctBg_e) { fopAcM_delete((fopAc_ac_c*)i_this); } @@ -611,7 +611,7 @@ static void* s_bfdel_sub(void* i_this, void* i_data) { } static void* s_kaisoudel_sub(void* i_this, void* i_data) { - if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_Obj_Kaisou) { + if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_Obj_Kaisou_e) { fopAcM_delete((fopAc_ac_c*)i_this); } @@ -647,7 +647,7 @@ static void bombfishset(b_ob_class* i_this) { csXyz angle(-0x3800, 0, 0); angle.y = cM_rndF(0x10000); - fopAcM_createChild(PROC_E_OctBg, fopAcM_GetID(a_this), 0xFFFFFFFF, &pos, + fopAcM_createChild(fpcNm_E_OctBg_e, fopAcM_GetID(a_this), 0xFFFFFFFF, &pos, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL); i_this->mOISound.startCreatureVoice(Z2SE_EN_OI_BG_APPEAR, -1); } @@ -862,7 +862,7 @@ static void core_end(b_ob_class* i_this) { for (int i = 0; i < 8; i++) { i_this->mTentacleActorIDs[i] = - fopAcM_createChild(PROC_B_OH2, fopAcM_GetID(a_this), i, &a_this->current.pos, + fopAcM_createChild(fpcNm_B_OH2_e, fopAcM_GetID(a_this), i, &a_this->current.pos, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL); } } @@ -1493,7 +1493,7 @@ static int fish_end(b_ob_class* i_this) { i_this->mDemoActionTimer = 1; obj_lv3WaterB_class* water = - (obj_lv3WaterB_class*)fopAcM_SearchByName(PROC_OBJ_LV3WATERB); + (obj_lv3WaterB_class*)fopAcM_SearchByName(fpcNm_OBJ_LV3WATERB_e); water->mAction = LV3WATERB_ACT_REMOVE; a_this->home.pos.set(0.0f, -23580.0f, 10300.0f); @@ -1986,7 +1986,7 @@ static void cam_3d_morf(b_ob_class* i_this, f32 i_scale) { } static void* s_hasidel_sub(void* i_this, void* i_data) { - if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_OCTHASHI) { + if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_OCTHASHI_e) { fopAcM_delete((fopAc_ac_c*)i_this); } @@ -2602,7 +2602,7 @@ static void demo_camera(b_ob_class* i_this) { i_this->mDemoActionTimer = 0; i_this->field_0x5dd8 = 4; - obj_lv3WaterB_class* water = (obj_lv3WaterB_class*)fopAcM_SearchByName(PROC_OBJ_LV3WATERB); + obj_lv3WaterB_class* water = (obj_lv3WaterB_class*)fopAcM_SearchByName(fpcNm_OBJ_LV3WATERB_e); water->mAction = LV3WATERB_ACT_END; water->field_0x586 = 0; var_r27 = 2; @@ -2645,7 +2645,7 @@ static void demo_camera(b_ob_class* i_this) { csXyz sp17C(player->shape_angle); sp17C.y += KREG_S(3) + -0x7060; - fopAcM_createItemForBoss(&a_this->eyePos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this), &sp17C, + fopAcM_createItemForBoss(&a_this->eyePos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(a_this), &sp17C, NULL, KREG_F(19) + 10.0f, 10.0f, -1); dComIfGp_getVibration().StartShock(5, 1, cXyz(0.0f, 1.0f, 0.0f)); } @@ -2749,11 +2749,11 @@ static void demo_camera(b_ob_class* i_this) { sp64 += player->current.pos; OS_REPORT("///YSTONE POS %d,%d,%d\n", sp64.x, sp64.y, sp64.z); - fopAcM_create(PROC_OBJ_YSTONE, 0, &sp64, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &sp64, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); } if (i_this->mDemoActionTimer == 120) { - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { ystone->field_0x59b = 0; } @@ -2782,7 +2782,7 @@ static void demo_camera(b_ob_class* i_this) { cLib_addCalc2(&i_this->field_0x5cd8, 210.0f, 0.05f, 0.5f); - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { ystone->setCurrentPos(sp64); } @@ -3494,7 +3494,7 @@ static int daB_OB_Create(fopAc_ac_c* i_this) { if (!dComIfGs_isStageLife()) { cXyz scale(1.0f, 1.0f, 1.0f); pos.set(-916.0f, -23954.0f, 8916.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(a_this), + fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, &scale, 0.0f, 0.0f, -1); } @@ -3610,7 +3610,7 @@ static int daB_OB_Create(fopAc_ac_c* i_this) { for (int i = 0; i < 8; i++) { a_this->mTentacleActorIDs[i] = - fopAcM_createChild(PROC_B_OH, fopAcM_GetID(i_this), i, &i_this->current.pos, + fopAcM_createChild(fpcNm_B_OH_e, fopAcM_GetID(i_this), i, &i_this->current.pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL); } @@ -3649,18 +3649,18 @@ static actor_method_class l_daB_OB_Method = { }; actor_process_profile_definition g_profile_B_OB = { - fpcLy_CURRENT_e, - 4, - fpcPi_CURRENT_e, - PROC_B_OB, - &g_fpcLf_Method.base, - sizeof(b_ob_class), - 0, - 0, - &g_fopAc_Method.base, - 217, - &l_daB_OB_Method, - 0xC4000, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_OB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_ob_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_OB_e, + /* Actor SubMtd */ &l_daB_OB_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_oh.cpp b/src/d/actor/d_a_b_oh.cpp index 69d2be6184c..2b3c39138be 100644 --- a/src/d/actor/d_a_b_oh.cpp +++ b/src/d/actor/d_a_b_oh.cpp @@ -263,7 +263,7 @@ static void attack(b_oh_class* i_this) { for (int i = 7; i < 15; i++) { if (i_this->mColliders[i].ChkCoHit()) { cCcD_Obj* obj_p = i_this->mColliders[i].GetCoHitObj(); - if (fopAcM_GetName(obj_p->GetAc()) == PROC_ALINK && + if (fopAcM_GetName(obj_p->GetAc()) == fpcNm_ALINK_e && !dComIfGp_event_runCheck()) { if (!player_p->checkHookshotShootReturnMode() && @@ -831,18 +831,18 @@ static actor_method_class l_daB_OH_Method = { }; actor_process_profile_definition g_profile_B_OH = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_B_OH, - &g_fpcLf_Method.base, - sizeof(b_oh_class), - 0, - 0, - &g_fopAc_Method.base, - 218, - &l_daB_OH_Method, - 0x00044000, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_OH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_oh_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_OH_e, + /* Actor SubMtd */ &l_daB_OH_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_oh2.cpp b/src/d/actor/d_a_b_oh2.cpp index b69e0cde42f..3d7b80c6d9f 100644 --- a/src/d/actor/d_a_b_oh2.cpp +++ b/src/d/actor/d_a_b_oh2.cpp @@ -10,7 +10,7 @@ #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" static int nodeCallBack(J3DJoint* i_joint, int param_1) { @@ -300,18 +300,18 @@ static actor_method_class l_daB_OH2_Method = { }; actor_process_profile_definition g_profile_B_OH2 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_B_OH2, - &g_fpcLf_Method.base, - sizeof(b_oh2_class), - 0, - 0, - &g_fopAc_Method.base, - 219, - &l_daB_OH2_Method, - 0x44000, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_OH2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(b_oh2_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_OH2_e, + /* Actor SubMtd */ &l_daB_OH2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 137195e838d..6fdefd9b2bb 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -1594,16 +1594,16 @@ static void* s_obj_sub(void* i_actor, void* i_data) { f32 mActorDistance = fopAcM_searchActorDistanceXZ((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data); if (mActorDistance < 300.0f && fopAcM_GetSpeed((fopAc_ac_c*)i_actor).y) { - if (fopAcM_GetName(i_actor) == PROC_Obj_Carry) { + if (fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) { return i_actor; } - if (fopAcM_GetName((fopAc_ac_c*)i_actor) == PROC_NBOMB) { + if (fopAcM_GetName((fopAc_ac_c*)i_actor) == fpcNm_NBOMB_e) { return i_actor; } } - if (mActorDistance < 300.0f && fopAcM_GetName(i_actor) == PROC_NBOMB) { + if (mActorDistance < 300.0f && fopAcM_GetName(i_actor) == fpcNm_NBOMB_e) { daNbomb_c* mNBomb = (daNbomb_c*)i_actor; if (mNBomb->checkInsectBombMove((fopAc_ac_c*)i_actor)) { return i_actor; @@ -1614,7 +1614,7 @@ static void* s_obj_sub(void* i_actor, void* i_data) { } } - if ((mActorDistance < 700.0f && fopAcM_GetName(i_actor) == PROC_ARROW) && + if ((mActorDistance < 700.0f && fopAcM_GetName(i_actor) == fpcNm_ARROW_e) && fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) { s16 mAngleY = ((fopAc_ac_c*)i_actor)->current.angle.y; @@ -1690,7 +1690,7 @@ void daB_TN_c::executeRoomDemo() { } mBlendStatus = 0; - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); camera->mCamera.Stop(); camera->mCamera.SetTrimSize(3); @@ -5147,7 +5147,7 @@ int daB_TN_c::create() { } } - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); setActionMode(ACT_WAITH, ACTION2_0_e); } @@ -5175,20 +5175,20 @@ static actor_method_class l_daB_TN_Method = { }; actor_process_profile_definition g_profile_B_TN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_TN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_TN_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 225, // mPriority - &l_daB_TN_Method, // sub_method - 0x00044000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_TN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_TN_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_TN_e, + /* Actor SubMtd */ &l_daB_TN_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ 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 e358f7786cf..56e6635695e 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -454,7 +454,7 @@ void daB_YO_c::damage_check() { mCcIronStts.Move(); if (mAction == ACT_CHASE && mAtCyl.ChkAtHit() - && fopAcM_GetName(mAtCyl.GetAtHitObj()->GetAc()) == PROC_ALINK) + && fopAcM_GetName(mAtCyl.GetAtHitObj()->GetAc()) == fpcNm_ALINK_e) { reflectFreeMove(); mActionTimer2 = 90; @@ -537,7 +537,7 @@ void daB_YO_c::setBreakFrizad() { angle.set(0, shape_angle.y + cM_rndFX(4000.0f), 0); pos.set(current.pos.x + cM_rndF(50.0f), current.pos.y + (cM_rndF(100.0f) + 100.0f), current.pos.z + cM_rndF(50.0f)); - fopAcM_createChild(PROC_E_FZ, fopAcM_GetID(this), mFreezardNo << 8 | 3, &pos, + fopAcM_createChild(fpcNm_E_FZ_e, fopAcM_GetID(this), mFreezardNo << 8 | 3, &pos, fopAcM_GetRoomNo(this), &angle, NULL, -1, NULL); } } @@ -715,7 +715,7 @@ void daB_YO_c::setApperEffect2() { static void* s_frizad_delete(void* param_0, void* param_1) { if (fopAcM_IsActor(param_0) && !fpcM_IsCreating(fopAcM_GetID(param_0)) - && fopAcM_GetName(param_0) == PROC_E_FZ) { + && fopAcM_GetName(param_0) == fpcNm_E_FZ_e) { static_cast(param_0)->demoDelete(); } return NULL; @@ -771,7 +771,7 @@ void daB_YO_c::executeOpening() { return; } Z2GetAudioMgr()->seStart(Z2SE_EN_YO_DEMO_OP1, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); field_0xfb5 = 3; setBck(ANM_WAIT_A, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); mMode = 1; @@ -788,7 +788,7 @@ void daB_YO_c::executeOpening() { shape_angle.y = -0x1000; setYoMessage(0x234E); ystone_pos.set(0.0f, 0.0f, 3000.0f); - mYstoneID = fopAcM_create(PROC_OBJ_YSTONE, 5, &ystone_pos, fopAcM_GetRoomNo(this), + mYstoneID = fopAcM_create(fpcNm_OBJ_YSTONE_e, 5, &ystone_pos, fopAcM_GetRoomNo(this), NULL, NULL, 0xff); Z2GetAudioMgr()->subBgmStart(Z2BGM_BOSS_SNOWWOMAN_D1); mAcch.CrrPos(dComIfG_Bgsp()); @@ -1653,7 +1653,7 @@ void daB_YO_c::executeSeriousDemo() { mIceCenterPos.y -= 100.0f; mIceAngle = 0; for (int i = 0; i < 10; i++) { - mIcicleID[i] = fopAcM_createChild(PROC_B_YOI, fopAcM_GetID(this), i, ¤t.pos, + mIcicleID[i] = fopAcM_createChild(fpcNm_B_YOI_e, fopAcM_GetID(this), i, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -1750,7 +1750,7 @@ void daB_YO_c::createIcecleRevival(u8 param_0) { } if (icicle == NULL) { if (param_0 != 0) { - mIcicleID[i] = fopAcM_createChild(PROC_B_YOI, fopAcM_GetID(this), i | 0x10000, + mIcicleID[i] = fopAcM_createChild(fpcNm_B_YOI_e, fopAcM_GetID(this), i | 0x10000, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -1985,7 +1985,7 @@ void daB_YO_c::executeAttackYose() { void daB_YO_c::checkDamageWithIceBreak() { s16 player_angle = fopAcM_searchPlayerAngleY(this); - if (mAtCyl.ChkAtHit() && fopAcM_GetName(mAtCyl.GetAtHitObj()->GetAc()) == PROC_ALINK) { + if (mAtCyl.ChkAtHit() && fopAcM_GetName(mAtCyl.GetAtHitObj()->GetAc()) == fpcNm_ALINK_e) { for (int i = 0; i < 10; i++) { s16 angle_diff = mIceAngle + 0x1999 * i - player_angle; if (abs(angle_diff) < 0xccc && mIcicleID[i] != -1) { @@ -2160,11 +2160,11 @@ void daB_YO_c::executeDemoRevival() { fopAcM_SearchByID(mIcicleID[i], (fopAc_ac_c**)&icicle); } if (icicle == NULL) { - mIcicleID[i] = fopAcM_createChild(PROC_B_YOI, fopAcM_GetID(this), i | 0x20000, + mIcicleID[i] = fopAcM_createChild(fpcNm_B_YOI_e, fopAcM_GetID(this), i | 0x20000, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } else { - fopAcM_OnStatus(icicle, 0x4000); + fopAcM_OnStatus(icicle, fopAcStts_UNK_0x4000_e); } field_0xfb0++; } @@ -2184,7 +2184,7 @@ void daB_YO_c::executeDemoRevival() { if (mIcicleID[i] != -1) { fopAcM_SearchByID(mIcicleID[i], (fopAc_ac_c**)&icicle); if (icicle != NULL) { - fopAcM_OffStatus(icicle, 0x4000); + fopAcM_OffStatus(icicle, fopAcStts_UNK_0x4000_e); } } } @@ -2292,7 +2292,7 @@ void daB_YO_c::executeDeath() { eventInfo.onCondition(dEvtCnd_CANDEMO_e); return; } - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); gravity = 0.0f; speed.y = 0.0f; camera->mCamera.Stop(); @@ -3371,7 +3371,7 @@ cPhs_Step daB_YO_c::create() { } cXyz pos(0.0f, 0.0f, 3000.0f); - mYstoneID = fopAcM_create(PROC_OBJ_YSTONE, 5, &pos, fopAcM_GetRoomNo(this), + mYstoneID = fopAcM_create(fpcNm_OBJ_YSTONE_e, 5, &pos, fopAcM_GetRoomNo(this), NULL, NULL, 0xff); mRoomType = 1; @@ -3388,7 +3388,7 @@ cPhs_Step daB_YO_c::create() { g_env_light.mColpatWeather = 2; g_env_light.wether_pat0 = 2; g_env_light.wether_pat1 = 2; - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); } else { mRoomType = 0; @@ -3435,20 +3435,20 @@ static actor_method_class l_daB_YO_Method = { }; actor_process_profile_definition g_profile_B_YO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_YO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_YO_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 223, // mPriority - &l_daB_YO_Method, // sub_method - 0x00044000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_YO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_YO_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_YO_e, + /* Actor SubMtd */ &l_daB_YO_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp index ca2c8e130bb..ee55b8c9f2c 100644 --- a/src/d/actor/d_a_b_yo_ice.cpp +++ b/src/d/actor/d_a_b_yo_ice.cpp @@ -158,7 +158,7 @@ void daB_YOI_c::damage_check() { if (pos.y < 50.0f) { pos.y = 50.0f; } - fopAcM_createItem(&pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(&pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); } } } @@ -175,7 +175,7 @@ void daB_YOI_c::setOperate(int param_0) { setActionMode(ACT_RISE_UP, 1); break; case 3: - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); setActionMode(ACT_RISE_UP, 8); break; case 4: @@ -197,7 +197,7 @@ void daB_YOI_c::setOperate(int param_0) { if (pos.y < 50.0f) { pos.y = 50.0f; } - fopAcM_createItem(&pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(&pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); } break; case 8: @@ -207,7 +207,7 @@ void daB_YOI_c::setOperate(int param_0) { setActionMode(ACT_DAMAGE, 0); break; case 10: - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); setActionMode(ACT_DEATH, 0); break; } @@ -1069,7 +1069,7 @@ cPhs_Step daB_YOI_c::create() { setActionMode(ACT_FIRST, 0); break; case 1: - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); setActionMode(ACT_RISE_UP, 9); break; case 2: @@ -1100,18 +1100,18 @@ static actor_method_class l_daB_YOI_Method = { }; actor_process_profile_definition g_profile_B_YOI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_YOI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_YOI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 224, // mPriority - &l_daB_YOI_Method, // sub_method - 0x00044000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_YOI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_YOI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_YOI_e, + /* Actor SubMtd */ &l_daB_YOI_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index 4a951541306..c72558b7016 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -379,7 +379,7 @@ void daB_ZANT_c::setDamageSe(dCcD_Sph* i_hitSph, int i_dmgAmount) { BOOL var_r29; u8 at_se = ((dCcD_GObjInf*)mAtInfo.mpCollider)->GetAtSe(); - if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) && !fopAcM_CheckStatus(this, 0x280000)) { + if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) && !fopAcM_CheckStatus(this, fopAcStts_UNK_0x200000_e | fopAcStts_UNK_0x80000_e)) { var_r29 = 1; } else { var_r29 = 0; @@ -745,20 +745,20 @@ static void* s_obj_sub(void* i_actor, void* i_data) { if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && !fopAcM_checkCarryNow((fopAc_ac_c*)i_actor)) { f32 obj_dist = fopAcM_searchActorDistanceXZ((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data); if (obj_dist < 300.0f && fopAcM_GetSpeed((fopAc_ac_c*)i_actor).y) { - if (fopAcM_GetName(i_actor) == PROC_Obj_Carry) { + if (fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) { return i_actor; } - if (fopAcM_GetName(i_actor) == PROC_NBOMB) { + if (fopAcM_GetName(i_actor) == fpcNm_NBOMB_e) { return i_actor; } } - if (obj_dist < 300.0f && fopAcM_GetName(i_actor) == PROC_NBOMB && ((daNbomb_c*)i_actor)->getExTime() < 10) { + if (obj_dist < 300.0f && fopAcM_GetName(i_actor) == fpcNm_NBOMB_e && ((daNbomb_c*)i_actor)->getExTime() < 10) { return i_actor; } - if (obj_dist < 700.0f && fopAcM_GetName(i_actor) == PROC_ARROW && fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) { + if (obj_dist < 700.0f && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) { s16 actor_angle = ((fopAc_ac_c*)i_actor)->current.angle.y; s16 angle_to_boss = fopAcM_searchActorAngleY((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data); if (abs((s16)(actor_angle - angle_to_boss)) < 0x2000) { @@ -946,7 +946,7 @@ static int target_info_count; static void* s_pillar_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_Obj_Pillar_e) { if (((daPillar_c*)i_actor)->getMdlType() != 0) { ((daB_ZANT_c*)i_data)->mPillarIDs[8] = fopAcM_GetID(i_actor); } else { @@ -1051,7 +1051,7 @@ void daB_ZANT_c::executeSmallAttack() { parameter = 6; } - fopAcM_createChild(PROC_B_ZANTM, fopAcM_GetID(this), parameter, &sp44, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_B_ZANTM_e, fopAcM_GetID(this), parameter, &sp44, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); dComIfGp_particle_set(0x886B, &sp44, &shape_angle, NULL); field_0x6fd++; @@ -1343,7 +1343,7 @@ void daB_ZANT_c::executeOpening() { } Z2GetAudioMgr()->setDemoName("force_start"); - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); sp34.set(0.0f, 0.0f, -700.0f); player->setPlayerPosAndAngle(&sp34, 0, 0); @@ -1886,7 +1886,7 @@ void daB_ZANT_c::executeHook() { setBck(BCK_ZAN_HOOK_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); } case 3: - if (!fopAcM_CheckStatus(this, 0x100000)) { + if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { setTgHitBit(TRUE); setCoHitBit(TRUE); setActionMode(ACT_SWIM, 10); @@ -4049,7 +4049,7 @@ void daB_ZANT_c::executeLastAttack() { mRollCc.ClrAtHit(); } - if (sp48 != NULL && fopAcM_GetName(dCc_GetAc(sp48->GetAc())) == PROC_ALINK) { + if (sp48 != NULL && fopAcM_GetName(dCc_GetAc(sp48->GetAc())) == fpcNm_ALINK_e) { sp3C = 1; field_0x6fd++; @@ -4335,7 +4335,7 @@ void daB_ZANT_c::executeLastDamage() { static void* s_del_tp(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_TP) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_OBJ_TP_e) { fopAcM_delete((fopAc_ac_c*)i_actor); } } @@ -4589,18 +4589,18 @@ void daB_ZANT_c::initNextRoom() { fopAcM_SearchByID(mMobileIDs[0], &pmobile); if (mFightPhase == PHASE_OI) { - fopAcM_OnStatus(this, 0x80000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); if (pmobile == NULL) { cXyz pos(0.0f, -3300.0f, 0.0f); for (int i = 0; i < 4; i++) { - mMobileIDs[i] = fopAcM_create(PROC_B_ZANTZ, i | 0xFFFFFF00, &pos, warp_next_room[mFightPhase], &shape_angle, NULL, -1); + mMobileIDs[i] = fopAcM_create(fpcNm_B_ZANTZ_e, i | 0xFFFFFF00, &pos, warp_next_room[mFightPhase], &shape_angle, NULL, -1); } mCorrectMobileNo = 0; } } else { - fopAcM_OffStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e); if (pmobile != NULL) { fopAcM_delete(pmobile); @@ -5600,20 +5600,20 @@ static actor_method_class l_daB_ZANT_Method = { }; actor_process_profile_definition g_profile_B_ZANT = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_ZANT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_ZANT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 226, // mPriority - &l_daB_ZANT_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_ZANT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_ZANT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_ZANT_e, + /* Actor SubMtd */ &l_daB_ZANT_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp index f1071874290..97eeec2c4c5 100644 --- a/src/d/actor/d_a_b_zant_magic.cpp +++ b/src/d/actor/d_a_b_zant_magic.cpp @@ -277,18 +277,18 @@ static actor_method_class l_daB_ZANTM_Method = { }; actor_process_profile_definition g_profile_B_ZANTM = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_ZANTM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_ZANTM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 227, // mPriority - &l_daB_ZANTM_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_ZANTM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_ZANTM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_ZANTM_e, + /* Actor SubMtd */ &l_daB_ZANTM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 7778dadf816..c52c48b022b 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -109,7 +109,7 @@ void daB_ZANTZ_c::calcSnortEffect() { } if (var_r28 != NULL) { - if (fopAcM_GetName(dCc_GetAc(var_r28->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(var_r28->GetAc())) == fpcNm_ALINK_e) { daPy_py_c* player = daPy_getPlayerActorClass(); s16 var_r26 = cLib_targetAngleY(¤t.pos, &player->current.pos); player->setThrowDamage(var_r26, 30.0f, 10.0f, 0, 0, 2); @@ -509,18 +509,18 @@ static actor_method_class l_daB_ZANTZ_Method = { }; actor_process_profile_definition g_profile_B_ZANTZ = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_B_ZANTZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daB_ZANTZ_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 228, // mPriority - &l_daB_ZANTZ_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_ZANTZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_ZANTZ_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_ZANTZ_e, + /* Actor SubMtd */ &l_daB_ZANTZ_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_b_zant_sima.cpp b/src/d/actor/d_a_b_zant_sima.cpp index 60639516efd..7a64ecac3cd 100644 --- a/src/d/actor/d_a_b_zant_sima.cpp +++ b/src/d/actor/d_a_b_zant_sima.cpp @@ -31,10 +31,10 @@ static int daB_ZANTS_Draw(daB_ZANTS_c* i_this) { } static void zants_ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_target) { - if (fopAcM_GetName(i_target) == PROC_ALINK) { + if (fopAcM_GetName(i_target) == fpcNm_ALINK_e) { ((daB_ZANTS_c*)i_this)->mPlayerID = fopAcM_GetID(i_target); ((daB_ZANTS_c*)i_this)->mSinkTimers[TIMER_PLAYER] = 3; - } else if (fopAcM_GetName(i_target) == PROC_B_ZANT) { + } else if (fopAcM_GetName(i_target) == fpcNm_B_ZANT_e) { ((daB_ZANTS_c*)i_this)->mBossID = fopAcM_GetID(i_target); ((daB_ZANTS_c*)i_this)->mSinkTimers[TIMER_ZANT] = 3; } @@ -228,18 +228,18 @@ static actor_method_class l_daB_ZANTS_Method = { }; actor_process_profile_definition g_profile_B_ZANTS = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_B_ZANTS, - &g_fpcLf_Method.base, - sizeof(daB_ZANTS_c), - 0, - 0, - &g_fopAc_Method.base, - 229, - &l_daB_ZANTS_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_B_ZANTS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daB_ZANTS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_B_ZANTS_e, + /* Actor SubMtd */ &l_daB_ZANTS_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp index 76b9ce8b3f2..d47c8763b54 100644 --- a/src/d/actor/d_a_balloon_2D.cpp +++ b/src/d/actor/d_a_balloon_2D.cpp @@ -671,18 +671,18 @@ static actor_method_class daBalloon2D_METHODS = { }; actor_process_profile_definition g_profile_BALLOON2D = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_BALLOON2D, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBalloon2D_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 765, // mPriority - &daBalloon2D_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BALLOON2D_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBalloon2D_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BALLOON2D_e, + /* Actor SubMtd */ &daBalloon2D_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, +}; diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index 31260589357..d579c98c865 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -130,8 +130,8 @@ static void* s_a_sub(void* i_target, void* i_bird) { fopEn_enemy_c* a_bird = (fopEn_enemy_c*)i_bird; if ((fopAcM_IsActor(i_target) && fopAcM_GetGroup(a_target) == fopAc_ENEMY_e) || - fopAcM_GetGroup(a_target) == fopAc_NPC_e || fopAcM_GetName(i_target) == PROC_OBJ_KANBAN2 || - fopAcM_GetName(i_target) == PROC_OBJ_FOOD) + fopAcM_GetGroup(a_target) == fopAc_NPC_e || fopAcM_GetName(i_target) == fpcNm_OBJ_KANBAN2_e || + fopAcM_GetName(i_target) == fpcNm_OBJ_FOOD_e) { cXyz distance = a_bird->current.pos - a_target->current.pos; if (distance.abs() < l_HIO.mLinkDetectRange + 10.0f * fabsf(a_target->speedF)) { @@ -862,7 +862,7 @@ static int daBd_Execute(bd_class* i_this) { i_this->field_0x642--; } - fopAcM_SearchByName(PROC_NPC_KKRI, (fopAc_ac_c**)&kkri); + fopAcM_SearchByName(fpcNm_NPC_KKRI_e, (fopAc_ac_c**)&kkri); if (kkri != NULL && i_this->field_0x642 == 0) { if (i_this->field_0x5B6 == 1) { MTXCopy(kkri->getBd1Mtx(), *calc_mtx); @@ -908,7 +908,7 @@ static int daBd_Execute(bd_class* i_this) { i_this->mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this))); if (i_this->field_0x656 == 0 && dComIfGp_event_runCheck()) { - cow = (daCow_c*)fopAcM_SearchByName(PROC_COW); + cow = (daCow_c*)fopAcM_SearchByName(fpcNm_COW_e); if (cow != NULL && cow->speedF > 1.0f) { i_this->field_0x656 = 1; i_this->mActionID = ACT_GROUND; @@ -1038,7 +1038,7 @@ static int daBd_Create(fopAc_ac_c* i_act_this) { if (i_this->field_0x5B4 != 0xFF && i_this->field_0x5B4 != 0 && i_this->field_0x5B4 != 1) { for (int i = 0; i < i_this->field_0x5B4 - 1; i++) { fopAcM_createChild( - PROC_BD, fopAcM_GetID(i_act_this), fopAcM_GetParam(i_act_this) & 0xFFFFFF00, + fpcNm_BD_e, fopAcM_GetID(i_act_this), fopAcM_GetParam(i_act_this) & 0xFFFFFF00, &i_act_this->current.pos, fopAcM_GetRoomNo(i_act_this), &sp1C, NULL, -1, NULL); } } @@ -1053,20 +1053,20 @@ static actor_method_class l_daBd_Method = { }; actor_process_profile_definition g_profile_BD = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_BD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(bd_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 718, // mPriority - &l_daBd_Method, // sub_method - 0x000C4100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(bd_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BD_e, + /* Actor SubMtd */ &l_daBd_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index ddc1184212e..6f7c8ed2d66 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -626,19 +626,19 @@ static actor_method_class l_daBg_Method = { }; actor_process_profile_definition2 g_profile_BG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_BG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 753, // mPriority - &l_daBg_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType - 0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BG_e, + /* Actor SubMtd */ &l_daBg_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, + /* Unknown */ 0, }; diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 062aaa975ea..dbab04fa6ee 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -317,7 +317,7 @@ void daBgObj_c::initAtt() { (ce5_val << 2) | (cd3_val); - fopAc_ac_c* actor = fopAcM_fastCreate(PROC_Tag_Attp, actor_params, ¤t.pos, fopAcM_GetRoomNo(this), + fopAc_ac_c* actor = fopAcM_fastCreate(fpcNm_Tag_Attp_e, actor_params, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, &scale, -1, NULL, NULL); if (actor != NULL) { @@ -1363,18 +1363,18 @@ static actor_method_class daBgObj_METHODS = { }; actor_process_profile_definition g_profile_BG_OBJ = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_BG_OBJ, - &g_fpcLf_Method.base, - sizeof(daBgObj_c), - 0, - 0, - &g_fopAc_Method.base, - 752, - &daBgObj_METHODS, - 0x10044100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BG_OBJ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBgObj_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BG_OBJ_e, + /* Actor SubMtd */ &daBgObj_METHODS, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 7d05a714ae9..f5e96de9a2d 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -495,8 +495,8 @@ static int daBoomerang_Draw(daBoomerang_c* i_this) { } void daBoomerang_c::lockLineCallback(fopAc_ac_c* i_actor) { - if (i_actor != NULL && fopAcM_GetName(i_actor) != PROC_Obj_glowSphere && - fopAcM_GetName(i_actor) != PROC_E_VT && fopAcM_GetName(i_actor) != PROC_OBJ_BRG) + if (i_actor != NULL && fopAcM_GetName(i_actor) != fpcNm_Obj_glowSphere_e && + fopAcM_GetName(i_actor) != fpcNm_E_VT_e && fopAcM_GetName(i_actor) != fpcNm_OBJ_BRG_e) { setLockActor(i_actor, TRUE); } @@ -1498,20 +1498,20 @@ static actor_method_class l_daBoomerang_Method = { }; actor_process_profile_definition g_profile_BOOMERANG = { - fpcLy_CURRENT_e, // mLayerID - 6, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_BOOMERANG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBoomerang_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 686, // mPriority - &l_daBoomerang_Method, // sub_method - 0x00060000, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 6, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BOOMERANG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBoomerang_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BOOMERANG_e, + /* Actor SubMtd */ &l_daBoomerang_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_bullet.cpp b/src/d/actor/d_a_bullet.cpp index ecce710fcac..cac505a0bb4 100644 --- a/src/d/actor/d_a_bullet.cpp +++ b/src/d/actor/d_a_bullet.cpp @@ -276,18 +276,18 @@ static actor_method_class daBullet_MethodTable = { }; actor_process_profile_definition g_profile_BULLET = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_BULLET, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBullet_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 751, // mPriority - &daBullet_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BULLET_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBullet_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BULLET_e, + /* Actor SubMtd */ &daBullet_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index 7a0e4706e62..7f393263f71 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -21,7 +21,7 @@ static BOOL l_debugMode; #endif static BOOL daCanoe_searchTagWaterFall(fopAc_ac_c* i_actor, void* i_data) { - if (fopAcM_GetName(i_actor) == PROC_Tag_WaterFall) { + if (fopAcM_GetName(i_actor) == fpcNm_Tag_WaterFall_e) { if (((daTagWaterFall_c*)i_actor)->checkHitWaterFall(*(cXyz*)i_data)) { daAlink_getAlinkActorClass()->onWaterFallFrontHit(); } @@ -328,7 +328,7 @@ void daCanoe_c::posMove() { } void daCanoe_c::checkGomikabe(cBgS_PolyInfo& i_polyinfo) { - if (daAlink_c::getMoveBGActorName(i_polyinfo, 1) == PROC_Obj_GOMIKABE) { + if (daAlink_c::getMoveBGActorName(i_polyinfo, 1) == fpcNm_Obj_GOMIKABE_e) { ((daObjGOMIKABE_c*)dComIfG_Bgsp().GetActorPointer(i_polyinfo))->BreakSet(); } } @@ -918,20 +918,20 @@ static actor_method_class l_daCanoe_Method = { }; actor_process_profile_definition g_profile_CANOE = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_CANOE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daCanoe_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 724, // mPriority - &l_daCanoe_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_CANOE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCanoe_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_CANOE_e, + /* Actor SubMtd */ &l_daCanoe_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index 2a457132c94..d1d01ed2f1a 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -356,18 +356,18 @@ static actor_method_class daCoach2D_METHODS = { }; actor_process_profile_definition g_profile_COACH2D = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_COACH2D, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daCoach2D_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 764, // mPriority - &daCoach2D_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_COACH2D_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCoach2D_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_COACH2D_e, + /* Actor SubMtd */ &daCoach2D_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_coach_fire.cpp b/src/d/actor/d_a_coach_fire.cpp index f2f46b9eab7..43cb89bb426 100644 --- a/src/d/actor/d_a_coach_fire.cpp +++ b/src/d/actor/d_a_coach_fire.cpp @@ -164,18 +164,18 @@ static actor_method_class l_daCoachFire_Method = { }; actor_process_profile_definition g_profile_COACH_FIRE = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_COACH_FIRE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daCoachFire_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 332, // mPriority - &l_daCoachFire_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_COACH_FIRE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCoachFire_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_COACH_FIRE_e, + /* Actor SubMtd */ &l_daCoachFire_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index 1830791f66f..32261351da3 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -445,7 +445,7 @@ static s16 m_view_angle_wide; static s16 m_view_angle; -#define IS_COW(actor) (fopAcM_GetName((actor)) == PROC_COW) +#define IS_COW(actor) (fopAcM_GetName((actor)) == fpcNm_COW_e) #define IS_VALID_COW_INTERACTION(cow_1, actor) \ (fopAcM_IsActor((cow_1)) && !fpcM_IsCreating(fopAcM_GetID((cow_1))) && IS_COW((cow_1)) && \ (cow_1) != (actor)) @@ -965,7 +965,7 @@ void daCow_c::checkBeforeBg() { if (cLib_calcTimer(&mTimer6)) { return; } - + s16 sVar2; if (planeTri[1] && planeTri[2]) { switch (mAction) { @@ -1458,7 +1458,7 @@ void daCow_c::action_enter() { mEnterTimerDone) { daNpc_Aru_c* aru; - fopAcM_SearchByName(PROC_NPC_ARU, (fopAc_ac_c**)&aru); + fopAcM_SearchByName(fpcNm_NPC_ARU_e, (fopAc_ac_c**)&aru); if (aru) { aru->setLastIn(); } @@ -1660,7 +1660,7 @@ void daCow_c::action_angry() { if (!mDealDamageTimer) { if (!player->checkHorseRide() && mSph[0].ChkCoHit()) { fopAc_ac_c* a = dCc_GetAc(mSph[0].GetCoHitObj()->GetAc()); - if (fopAcM_GetName(a) == PROC_ALINK) { + if (fopAcM_GetName(a) == fpcNm_ALINK_e) { // if touched link who is not on a horse s16 sangle = shape_angle.y; cXyz pos = daPy_getPlayerActorClass()->current.pos; @@ -1893,7 +1893,7 @@ void daCow_c::executeCrazyWait() { mAcchCir.SetWall(100.0f, 110.0f); mTimer1 = 30; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } } @@ -2392,7 +2392,7 @@ void daCow_c::executeCrazyBack() { } break; case daCow_c::Action_4: - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(this, fopAcStts_CULL_e); if (fopAcM_CheckCondition(this, fopAcCnd_NODRAW_e)) { fopAcM_delete(this); } @@ -2464,19 +2464,19 @@ void daCow_c::action_crazy() { dComIfGoat_SetThrow(this); mMode = daCow_c::Mode_1; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(this, fopAcStts_CULL_e); break; case daCow_c::Mode_1: TICK_TIMER(mForgetCowPTimer); TICK_TIMER(mTimer1); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); if (dComIfGp_event_runCheck() && strcmp(dComIfGp_getEventManager().getRunEventName(), "WILDGOAT") && strcmp(dComIfGp_getEventManager().getRunEventName(), "WILDGOAT_SUCCESS") && strcmp(dComIfGp_getEventManager().getRunEventName(), "WILDGOAT_FAILURE")) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); } switch (mCrazy) { @@ -2648,7 +2648,7 @@ bool daCow_c::checkWolfBusters() { } daNpc_Aru_c* aru; - fopAcM_SearchByName(PROC_NPC_ARU, (fopAc_ac_c**)&aru); + fopAcM_SearchByName(fpcNm_NPC_ARU_e, (fopAc_ac_c**)&aru); if (!aru) { return false; } @@ -2675,7 +2675,7 @@ void daCow_c::action_wolf() { daPy_py_c* player = daPy_getPlayerActorClass(); daNpc_Aru_c* aru; - fopAcM_SearchByName(PROC_NPC_ARU, (fopAc_ac_c**)&aru); + fopAcM_SearchByName(fpcNm_NPC_ARU_e, (fopAc_ac_c**)&aru); if (!aru) { return; } @@ -2684,7 +2684,7 @@ void daCow_c::action_wolf() { s16 aruAngle = cLib_targetAngleY(¤t.pos, &aru->current.pos); s16 sp14; s16 ang2; - + switch (mMode) { case daCow_c::Mode_0: mMode = daCow_c::Mode_1; @@ -2693,7 +2693,7 @@ void daCow_c::action_wolf() { attention_info.flags |= fopAc_AttnFlag_LOCK_e; mSound.startCreatureVoice(Z2SE_GOAT_V_ANGRY, -1); mTimer10 = cM_rndF(90.0f) + 90.0f; - + break; case daCow_c::Mode_1: sp14 = 0; @@ -2807,7 +2807,7 @@ void daCow_c::action_damage() { mChangeRedTev = 0; speedF = 0.0f; break; - + case daCow_c::Mode_1: setRedTev(); if (mpMorf->isStop()) { @@ -3030,7 +3030,7 @@ bool daCow_c::initialize() { } fopAcM_setCullSizeBox(this, -100.0f, -100.0f, -200.0f, 100.0f, 250.0f, 200.0f); - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mAcch.CrrPos(dComIfG_Bgsp()); @@ -3050,7 +3050,7 @@ bool daCow_c::initialize() { mPrm0 = 4; setCowInCage(); } - + u8 prm1; switch (mPrm0) { case 3: { @@ -3288,20 +3288,20 @@ static actor_method_class daCow_MethodTable = { }; actor_process_profile_definition g_profile_COW = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_COW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daCow_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 692, // mPriority - &daCow_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_COW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCow_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_COW_e, + /* Actor SubMtd */ &daCow_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_crod.cpp b/src/d/actor/d_a_crod.cpp index 25f41b77148..0aecb4ab0e8 100644 --- a/src/d/actor/d_a_crod.cpp +++ b/src/d/actor/d_a_crod.cpp @@ -221,15 +221,15 @@ int daCrod_c::execute() { fopAc_ac_c* hit_ac = mAtCps.GetAtHitAc(); if (player->checkCopyRodEquip() && hit_ac != NULL && - (fopAcM_GetName(hit_ac) == PROC_CSTATUE || - fopAcM_GetName(hit_ac) == PROC_CSTAF)) + (fopAcM_GetName(hit_ac) == fpcNm_CSTATUE_e || + fopAcM_GetName(hit_ac) == fpcNm_CSTAF_e)) { fopAcM_SetParam(this, 4); mControllActorKeep.setData(hit_ac); mCameraActorKeep.setData(hit_ac); u16 anm_id; - if (fopAcM_GetName(hit_ac) == PROC_CSTATUE && + if (fopAcM_GetName(hit_ac) == fpcNm_CSTATUE_e && static_cast(hit_ac)->checkBossType()) { anm_id = ANM_WAIT_C; @@ -322,7 +322,7 @@ int daCrod_c::execute() { if (fopAcM_GetParam(this) == 4) { fopAc_ac_c* control_actor = mControllActorKeep.getActor(); - if (fopAcM_GetName(control_actor) == PROC_CSTATUE) { + if (fopAcM_GetName(control_actor) == fpcNm_CSTATUE_e) { current.pos = static_cast(control_actor)->getBallPos(); } else { current.pos = static_cast(control_actor)->getBallPos(); @@ -383,18 +383,18 @@ static actor_method_class l_daCrod_Method = { }; actor_process_profile_definition g_profile_CROD = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_CROD, - &g_fpcLf_Method.base, - sizeof(daCrod_c), - 0, - 0, - &g_fopAc_Method.base, - 688, - &l_daCrod_Method, - 0x60000, - 5, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_CROD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCrod_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_CROD_e, + /* Actor SubMtd */ &l_daCrod_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index f680728f54d..d61afc50d19 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -580,18 +580,18 @@ static actor_method_class l_daCstaF_Method = { }; actor_process_profile_definition g_profile_CSTAF = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_CSTAF, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x00000B38, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 272, // mPriority - &l_daCstaF_Method, // sub_method - 0x00040520, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_CSTAF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x00000B38, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_CSTAF_e, + /* Actor SubMtd */ &l_daCstaF_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 812d52c878f..e9050c7a7eb 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -122,7 +122,7 @@ static dCcD_SrcSph l_sphSrc = { }; void daCstatue_c::atHitCallback(fopAc_ac_c* actor) { - if (fopAcM_GetName(actor) == PROC_B_GM) { + if (fopAcM_GetName(actor) == fpcNm_B_GM_e) { onStateFlg0(daCstatue_FLG0_100); } } @@ -358,7 +358,7 @@ int daCstatue_c::create() { mControlDistanceOffset = JMAFastSqrt(4825.0f); mTargetFrame = 21.0f; } else { - fopAcM_OffStatus(this, 0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); mCyl1.SetR(300.0f); mCyl1.SetH(600.0f); mAcchCir[0].SetWall(30.01f, 300.0f); @@ -1156,10 +1156,10 @@ int daCstatue_c::execute() { fopAcM_GetRoomNo(this), 1.0f, speedF); if (fopAcM_checkCarryNow(this)) { onStateFlg0(daCstatue_FLG0_2); - fopAcM_OffStatus(this, 0x400); + fopAcM_OffStatus(this, fopAcStts_FREEZE_e); } else { offStateFlg0(daCstatue_FLG0_2); - fopAcM_OnStatus(this, 0x400); + fopAcM_OnStatus(this, fopAcStts_FREEZE_e); } if (mParam2 != 0x3f) { dTres_c::setIconPositionOfCstatue(mParam2, ¤t.pos); @@ -1215,20 +1215,20 @@ static actor_method_class l_daCstatue_Method = { }; actor_process_profile_definition g_profile_CSTATUE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_CSTATUE, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x00000B2C, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 271, // mPriority - &l_daCstatue_Method, // sub_method - 0x00060520, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_CSTATUE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x00000B2C, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_CSTATUE_e, + /* Actor SubMtd */ &l_daCstatue_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index f4b3b1de5ce..7b9165bbe45 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -1096,7 +1096,7 @@ inline int daDemo00_c::execute() { case 2: { u16 sp0A = sp0E & 0x3FFF; if ((sp0E & 0xC000) == 0) { - fopAcM_create(PROC_MOVIE_PLAYER, sp0A, NULL, fopAcM_GetRoomNo(this), NULL, NULL, 0xFF); + fopAcM_create(fpcNm_MOVIE_PLAYER_e, sp0A, NULL, fopAcM_GetRoomNo(this), NULL, NULL, 0xFF); mDoGph_gInf_c::fadeOut(1.0f); } else { switch (sp0A) { @@ -1896,18 +1896,18 @@ static actor_method_class l_daDemo00_Method = { }; actor_process_profile_definition g_profile_DEMO00 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_DEMO00, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daDemo00_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 685, // mPriority - &l_daDemo00_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DEMO00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDemo00_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DEMO00_e, + /* Actor SubMtd */ &l_daDemo00_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 0c69f34b52b..6168a6b7e8e 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -113,11 +113,11 @@ void daDitem_c::actionStart() { OS_REPORT("ゲットアイテム：エフェクトライトセット＆表示スタート！\n"); } - if (m_itemNo == fpcNm_ITEM_DUNGEON_EXIT || m_itemNo == fpcNm_ITEM_DUNGEON_EXIT_2) { + if (m_itemNo == dItemNo_DUNGEON_EXIT_e || m_itemNo == dItemNo_DUNGEON_EXIT_2_e) { current.angle.y = dComIfGp_getPlayer(0)->shape_angle.y; } - if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) { + if (m_itemNo == dItemNo_UTAWA_HEART_e || m_itemNo == dItemNo_KAKERA_HEART_e) { JPABaseEmitter* emitter = field_0x96c.getEmitter(); if (emitter == NULL) { dComIfGp_particle_set(0x8DE, ¤t.pos, NULL, NULL, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); @@ -131,22 +131,22 @@ void daDitem_c::actionStart() { mParticleAlpha = 0xFF; } - if ((m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) && field_0x96c.getEmitter() == NULL) { + if ((m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) && field_0x96c.getEmitter() == NULL) { cXyz scale(0.55f, 0.55f, 0.55f); dComIfGp_particle_set(0xC14, &field_0x99c, NULL, &scale, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); } - if (m_itemNo == fpcNm_ITEM_WALLET_LV3 && field_0x96c.getEmitter() == NULL) { + if (m_itemNo == dItemNo_WALLET_LV3_e && field_0x96c.getEmitter() == NULL) { cXyz scale(1.2f, 1.2f, 1.2f); dComIfGp_particle_set(0xC14, &field_0x99c, NULL, &scale, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); } - if (m_itemNo == fpcNm_ITEM_CHUCHU_RARE && field_0x96c.getEmitter() == NULL) { + if (m_itemNo == dItemNo_CHUCHU_RARE_e && field_0x96c.getEmitter() == NULL) { cXyz scale(0.8f, 0.8f, 0.8f); dComIfGp_particle_set(0xC14, &field_0x99c, NULL, &scale, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); } - if ((m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE) && field_0x96c.getEmitter() == NULL) { + if ((m_itemNo == dItemNo_FAIRY_DROP_e || m_itemNo == dItemNo_DROP_BOTTLE_e) && field_0x96c.getEmitter() == NULL) { dComIfGp_particle_set(0x8C15, &field_0x99c, NULL, NULL, 0xFF, &field_0x96c, -1, NULL, NULL, NULL); } @@ -164,7 +164,7 @@ void daDitem_c::actionEvent() { cLib_addCalc2(&mLight.mPow, mLightStrength, 0.1f, 1.0f); } - if (m_itemNo == fpcNm_ITEM_POU_SPIRIT) { + if (m_itemNo == dItemNo_POU_SPIRIT_e) { mSound.startLevelSound(Z2SE_EN_PO_SOUL, 0, -1); } @@ -173,7 +173,7 @@ void daDitem_c::actionEvent() { execItemGet(m_itemNo); } - if (m_itemNo == fpcNm_ITEM_KAKERA_HEART) { + if (m_itemNo == dItemNo_KAKERA_HEART_e) { int room_no = dComIfGp_roomControl_getStayNo(); if (strcmp(dComIfGp_getStartStageName(), "F_SP116") == 0 && room_no == 2) { @@ -266,7 +266,7 @@ void daDitem_c::actionEvent() { void daDitem_c::actionWaitLightEnd() { BOOL particle_hidden = TRUE; - if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) { + if (m_itemNo == dItemNo_UTAWA_HEART_e || m_itemNo == dItemNo_KAKERA_HEART_e) { particle_hidden = cLib_chaseUC(&mParticleAlpha, 0, 26); JPABaseEmitter* emitter = field_0x96c.getEmitter(); @@ -403,7 +403,7 @@ void daDitem_c::settingEffectLight() { void daDitem_c::set_mtx() { mpModel->setBaseScale(scale); - if (m_itemNo != fpcNm_ITEM_DUNGEON_EXIT && m_itemNo != fpcNm_ITEM_DUNGEON_BACK && m_itemNo != fpcNm_ITEM_LV7_DUNGEON_EXIT && m_itemNo != fpcNm_ITEM_DUNGEON_EXIT_2) { + if (m_itemNo != dItemNo_DUNGEON_EXIT_e && m_itemNo != dItemNo_DUNGEON_BACK_e && m_itemNo != dItemNo_LV7_DUNGEON_EXIT_e && m_itemNo != dItemNo_DUNGEON_EXIT_2_e) { s16 var_r28 = 0xFFFF / 250; fopAcM_addAngleY(this, current.angle.y + var_r28, var_r28); } @@ -438,12 +438,12 @@ int daDitem_c::Delete() { dKy_efplight_cut(&mLight); } - if (m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) { + if (m_itemNo == dItemNo_UTAWA_HEART_e || m_itemNo == dItemNo_KAKERA_HEART_e) { field_0x96c.remove(); field_0x980.remove(); } - if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE || m_itemNo == fpcNm_ITEM_WALLET_LV3 || m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE || m_itemNo == fpcNm_ITEM_CHUCHU_RARE) { + if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e || m_itemNo == dItemNo_WALLET_LV3_e || m_itemNo == dItemNo_FAIRY_DROP_e || m_itemNo == dItemNo_DROP_BOTTLE_e || m_itemNo == dItemNo_CHUCHU_RARE_e) { field_0x96c.remove(); } @@ -475,7 +475,7 @@ int daDitem_c::create() { OS_REPORT_ERROR("ゲット用モデルのアーカイブ名がありません！[%d]\n", m_itemNo); } - m_itemNo = fpcNm_ITEM_GREEN_RUPEE; + m_itemNo = dItemNo_GREEN_RUPEE_e; } int phase_state = dComIfG_resLoad(&mPhase, dItem_data::getArcName(m_itemNo)); @@ -519,13 +519,13 @@ int daDitem_c::execute() { eyePos = current.pos; eyePos.y += mpModel->getModelData()->getJointNodePointer(0)->getMax()->y * 0.5f; - if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) { + if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) { field_0x99c = current.pos; field_0x99c.y += 10.0f; - } else if (m_itemNo == fpcNm_ITEM_WALLET_LV3 || m_itemNo == fpcNm_ITEM_CHUCHU_RARE) { + } else if (m_itemNo == dItemNo_WALLET_LV3_e || m_itemNo == dItemNo_CHUCHU_RARE_e) { field_0x99c = current.pos; field_0x99c.y += 15.0f; - } else if (m_itemNo == fpcNm_ITEM_FAIRY_DROP || m_itemNo == fpcNm_ITEM_DROP_BOTTLE) { + } else if (m_itemNo == dItemNo_FAIRY_DROP_e || m_itemNo == dItemNo_DROP_BOTTLE_e) { field_0x99c = current.pos; } @@ -539,7 +539,7 @@ static int daDitem_Execute(daDitem_c* i_this) { int daDitem_c::draw() { switch (m_itemNo) { - case fpcNm_ITEM_WOOD_STICK: + case dItemNo_WOOD_STICK_e: draw_WOOD_STICK(); break; } @@ -561,20 +561,20 @@ static actor_method_class l_daDitem_Method = { }; actor_process_profile_definition g_profile_Demo_Item = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Demo_Item, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daDitem_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 241, // mPriority - &l_daDitem_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Demo_Item_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDitem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Demo_Item_e, + /* Actor SubMtd */ &l_daDitem_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 48efd5a3ce7..2aec26258f3 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_disappear.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daDisappear_Draw(disappear_class* i_this) { return 1; @@ -16,7 +16,7 @@ static int daDisappear_Draw(disappear_class* i_this) { static void* s_ks_sub(void* i_actor, void*) { fopAc_ac_c* actor_p = (fopAc_ac_c*)i_actor; - if (fopAcM_IsActor(actor_p) && fopAcM_GetName(actor_p) == PROC_NPC_KS) { + if (fopAcM_IsActor(actor_p) && fopAcM_GetName(actor_p) == fpcNm_NPC_KS_e) { actor_p->health = 1; } @@ -123,18 +123,18 @@ static actor_method_class l_daDisappear_Method = { }; actor_process_profile_definition g_profile_DISAPPEAR = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_DISAPPEAR, - &g_fpcLf_Method.base, - sizeof(disappear_class), - 0, - 0, - &g_fopAc_Method.base, - 725, - &l_daDisappear_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DISAPPEAR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(disappear_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DISAPPEAR_e, + /* Actor SubMtd */ &l_daDisappear_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_dmidna.cpp b/src/d/actor/d_a_dmidna.cpp index dbe02cdf858..2f46e00a8b8 100644 --- a/src/d/actor/d_a_dmidna.cpp +++ b/src/d/actor/d_a_dmidna.cpp @@ -89,18 +89,18 @@ static actor_method_class l_daDmidna_Method = { }; actor_process_profile_definition g_profile_DMIDNA = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_DMIDNA, - &g_fpcLf_Method.base, - sizeof(daDmidna_c), - 0, - 0, - &g_fopAc_Method.base, - 93, - &l_daDmidna_Method, - 0x60000, - fopAc_ENV_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DMIDNA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDmidna_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DMIDNA_e, + /* Actor SubMtd */ &l_daDmidna_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index 6a6dee60675..9d522565d3a 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -152,7 +152,7 @@ static BOOL target_bgc[5]; static void* s_w_sub(void* i_proc, void* i_this) { if (fopAcM_IsActor(i_proc) && - (fopAcM_GetName(i_proc) == PROC_OBJ_FOOD || fopAcM_GetName(i_proc) == PROC_OBJ_KANBAN2) && + (fopAcM_GetName(i_proc) == fpcNm_OBJ_FOOD_e || fopAcM_GetName(i_proc) == fpcNm_OBJ_KANBAN2_e) && fopAcM_checkCarryNow(static_cast(i_proc)) && target_info_count < 5) { target_info[target_info_count] = static_cast(i_proc); @@ -978,7 +978,7 @@ static s16 hang_set(do_class* i_this) { cXyz vec1, vec2, vec3[2]; vec1 = _this->old.pos - _this->current.pos; cMtx_YrotS(*calc_mtx, cM_atan2s(vec1.x, vec1.z)); - + vec1.x = 0.0f; vec1.y = 0.0f; vec1.z = -100.0f; @@ -1198,7 +1198,7 @@ static void do_food(do_class* i_this) { i_this->mpMorf->setPlaySpeed(i_this->mAnmSpeed); cLib_addCalc2(&i_this->speedF, i_this->mAnmSpeed * l_HIO.mRunSpeed, 1.0f, 0.2f * l_HIO.mRunSpeed); - + vec = food->current.pos - i_this->current.pos; angle_step = 0x1000; if (vec.abs() < 120.0f * i_this->mScale.z) { @@ -1235,15 +1235,15 @@ static void do_food(do_class* i_this) { if (get_item) { int item_no; if (dComIfGs_getLife() <= 4) { - item_no = fpcNm_ITEM_HEART; + item_no = dItemNo_HEART_e; } else { int rnd = cM_rndF(11.0f); if (rnd <= 5) { - item_no = fpcNm_ITEM_HEART; + item_no = dItemNo_HEART_e; } else if (rnd <= 9) { - item_no = fpcNm_ITEM_GREEN_RUPEE; + item_no = dItemNo_GREEN_RUPEE_e; } else { - item_no = fpcNm_ITEM_BLUE_RUPEE; + item_no = dItemNo_BLUE_RUPEE_e; } } @@ -1342,7 +1342,7 @@ static void do_swim(do_class* i_this) { } static void* s_c_sub(void* param_0, void* param_1) { - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_CANOE) { + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_CANOE_e) { return param_0; } return 0; @@ -1412,7 +1412,7 @@ static void do_help(do_class* i_this) { } cLib_addCalc2(&i_this->speedF, target_speed, 1.0f, 2.0f); - + if (!daPy_getLinkPlayerActorClass()->checkCanoeRide() && i_this->mDistFromPlayer < 200.0f) { i_this->mAction = ACT_WAIT_1; i_this->mMode = 0; @@ -1492,7 +1492,7 @@ static s8 do_boat(do_class* i_this) { fabsf(i_this->field_0x698.x) + 2.0f); cLib_addCalc2(&i_this->current.pos.z, i_this->field_0x68c.z, 1.0f, fabsf(i_this->field_0x698.z) + 2.0f); - + if (_this->speed.y <= -80.0f) { _this->speed.y = -80.0f; } @@ -1699,7 +1699,7 @@ static s8 do_carry(do_class* i_this) { i_this->mCcDisableTimer = 5; _this->speed.y = 0.0f; _this->speedF = 0.0f; - + switch (i_this->mMode) { case 0: anm_init(i_this, ANM_TO_CARRY_B, 1.0f, 0, @@ -1726,7 +1726,7 @@ static s8 do_carry(do_class* i_this) { if (!fopAcM_checkCarryNow(_this)) { i_this->mAction = ACT_WAIT_1; i_this->mMode = 0; - + dBgS_GndChk gnd_chk; cXyz vec = _this->current.pos; vec.y += 50.0f; @@ -2266,7 +2266,7 @@ static int daDo_Execute(do_class* i_this) { MtxPosition(&vec, &i_this->eyePos); i_this->attention_info.position = i_this->eyePos; i_this->attention_info.position.y += i_this->mScale.y * 16.0f; - + vec.set(-15.0f, -15.0f, 0.0f); MtxPosition(&vec, ¢er); if (i_this->mCcDisableTimer != 0) { @@ -2300,7 +2300,7 @@ static int daDo_Execute(do_class* i_this) { MtxTrans(20.0f, -24.0f, 0.0f, 1); vec.set(0.0f, 0.0f, 0.0f); MtxPosition(&vec, &item->current.pos); - + item->shape_angle = i_this->shape_angle; item->current.angle = item->shape_angle; item->speed.zero(); @@ -2312,7 +2312,7 @@ static int daDo_Execute(do_class* i_this) { obj_food_class* food = static_cast(fopAcM_SearchByID(i_this->mFoodActorID)); if (food != NULL) { - if (fopAcM_GetName(food) == PROC_OBJ_FOOD) { + if (fopAcM_GetName(food) == fpcNm_OBJ_FOOD_e) { MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(10), *calc_mtx); cMtx_YrotM(*calc_mtx, 0x4000); MtxTrans(0.0f, -7.0f, 25.0f, 1); @@ -2482,7 +2482,7 @@ static cPhs_Step daDo_Create(fopAc_ac_c* i_this) { noFallCheck = true; _this->mParam2 = 200; } - + _this->mItemActorID = -1; daDo_Execute(_this); } @@ -2501,18 +2501,18 @@ static actor_method_class l_daDo_Method = { }; actor_process_profile_definition g_profile_DO = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_DO, - &g_fpcLf_Method.base, - sizeof(do_class), - 0, - 0, - &g_fopAc_Method.base, - 0x2BB, - &l_daDo_Method, - 0x8044000, - fopAc_NPC_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(do_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DO_e, + /* Actor SubMtd */ &l_daDo_Method, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_door_boss.cpp b/src/d/actor/d_a_door_boss.cpp index 1b124f12bff..ce6e662229f 100644 --- a/src/d/actor/d_a_door_boss.cpp +++ b/src/d/actor/d_a_door_boss.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_door_boss.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_door_param2.h" #include "SSystem/SComponent/c_math.h" @@ -338,7 +338,7 @@ int daBdoor_c::execute() { &daBdoor_c::actionOpen, &daBdoor_c::actionEnd, }; - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { mStaffID = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); } else { @@ -417,18 +417,18 @@ static actor_method_class l_daBdoor_Method = { }; actor_process_profile_definition g_profile_BOSS_DOOR = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_BOSS_DOOR, - &g_fpcLf_Method.base, - sizeof(daBdoor_c), - 0, - 0, - &g_fopAc_Method.base, - 0x129, - &l_daBdoor_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BOSS_DOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBdoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BOSS_DOOR_e, + /* Actor SubMtd */ &l_daBdoor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_door_bossL1.cpp b/src/d/actor/d_a_door_bossL1.cpp index 8a5fd0c752b..5f64e88534b 100644 --- a/src/d/actor/d_a_door_bossL1.cpp +++ b/src/d/actor/d_a_door_bossL1.cpp @@ -775,7 +775,7 @@ int daBdoorL1_c::createKey() { int actorParams = getNowLevel(); int flags = ~0xFF; flags |= actorParams; - mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), flags, + mKeyHoleId = fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), flags, &cStack_30, fopAcM_GetRoomNo(this), 0, &scale, -1, 0); current.pos = cStack_24; @@ -907,7 +907,7 @@ int daBdoorL1_c::actionEnd() { int daBdoorL1_c::execute() { static actionFunc l_action[4] = {&daBdoorL1_c::actionWait, &daBdoorL1_c::actionCloseWait, &daBdoorL1_c::actionOpen, &daBdoorL1_c::actionEnd}; - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { field_0x5a0 = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); dMeter2Info_onGameStatus(2); demoProc(); @@ -977,18 +977,18 @@ static actor_method_class l_daBdoorL1_Method = { }; actor_process_profile_definition g_profile_L1BOSS_DOOR = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_L1BOSS_DOOR, - &g_fpcLf_Method.base, - sizeof(daBdoorL1_c), - 0, - 0, - &g_fopAc_Method.base, - 0x12A, - &l_daBdoorL1_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_L1BOSS_DOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBdoorL1_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_L1BOSS_DOOR_e, + /* Actor SubMtd */ &l_daBdoorL1_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_door_bossL5.cpp b/src/d/actor/d_a_door_bossL5.cpp index e78bc00e7bd..864a5052e94 100644 --- a/src/d/actor/d_a_door_bossL5.cpp +++ b/src/d/actor/d_a_door_bossL5.cpp @@ -325,7 +325,7 @@ int daBdoorL5_c::createKey() { cXyz prevPos(current.pos); current.pos = home.pos; cXyz pos(0.0f, 0.0f, 50.0f); - mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffff05, + mKeyHoleId = fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), 0xffffff05, &pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, 0); current.pos = prevPos; @@ -443,7 +443,7 @@ int daBdoorL5_c::actionEnd() { int daBdoorL5_c::execute() { static actionFunc l_action[4] = {&daBdoorL5_c::actionWait, &daBdoorL5_c::actionCloseWait, &daBdoorL5_c::actionOpen, &daBdoorL5_c::actionEnd}; field_0x59c = -1; - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { field_0x59c = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); dMeter2Info_onGameStatus(2); demoProc(); @@ -503,18 +503,18 @@ static actor_method_class l_daBdoorL5_Method = { }; actor_process_profile_definition g_profile_L5BOSS_DOOR = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_L5BOSS_DOOR, - &g_fpcLf_Method.base, - sizeof(daBdoorL5_c), - 0, - 0, - &g_fopAc_Method.base, - 0x12C, - &l_daBdoorL5_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_L5BOSS_DOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBdoorL5_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_L5BOSS_DOOR_e, + /* Actor SubMtd */ &l_daBdoorL5_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_door_dbdoor00.cpp b/src/d/actor/d_a_door_dbdoor00.cpp index 0f0f827d0c4..510a06eab20 100644 --- a/src/d/actor/d_a_door_dbdoor00.cpp +++ b/src/d/actor/d_a_door_dbdoor00.cpp @@ -415,18 +415,18 @@ static actor_method_class l_daDbdoor00_Method = { }; actor_process_profile_definition g_profile_DBDOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_DBDOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daDbDoor00_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 295, // mPriority - &l_daDbdoor00_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DBDOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDbDoor00_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DBDOOR_e, + /* Actor SubMtd */ &l_daDbdoor00_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index 68872b4bbe9..9c327be935a 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -646,7 +646,7 @@ int daKnob20_c::execute() { setActionFromFlow(); field_0x60f = frontCheck(); - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { startDemoProc(); demoProc(); dMeter2Info_onGameStatus(2); @@ -701,18 +701,18 @@ static actor_method_class l_daKnob20_Method = { }; actor_process_profile_definition g_profile_KNOB20 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KNOB20, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daKnob20_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 293, // mPriority - &l_daKnob20_Method, // sub_method - 0x44100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KNOB20_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daKnob20_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KNOB20_e, + /* Actor SubMtd */ &l_daKnob20_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_door_mbossL1.cpp b/src/d/actor/d_a_door_mbossL1.cpp index d752b14ba32..027677f7eca 100644 --- a/src/d/actor/d_a_door_mbossL1.cpp +++ b/src/d/actor/d_a_door_mbossL1.cpp @@ -21,7 +21,7 @@ static int getNowLevel(fopAc_ac_c* i_this) { static void* searchStop(void* param_1, void* param_2) { if (param_1 != NULL && fopAcM_IsActor(param_1) && - fopAcM_GetProfName(param_1) == PROC_Obj_Stopper) + fopAcM_GetProfName(param_1) == fpcNm_Obj_Stopper_e) { return param_1; } @@ -414,7 +414,7 @@ int daMBdoorL1_c::createKey() { cStack_30.y = 0; unaff_r29 = (u8)door_param2_c::getFRoomNo(this); } - mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffffff, + mKeyHoleId = fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), 0xffffffff, &cStack_28, unaff_r29, &cStack_30, &scale, -1, NULL); current.pos = cStack_1c; @@ -953,7 +953,7 @@ int daMBdoorL1_c::openInit() { } } } - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { fopAcM_onSwitch(this, swBit3); } field_0x5e1 = 1; @@ -1598,7 +1598,7 @@ int daMBdoorL1_c::actionOpen() { } int daMBdoorL1_c::actionInit() { - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { setAction(ACTION_START_DEMO); actionStartDemo(); } else { @@ -1623,7 +1623,7 @@ int daMBdoorL1_c::actionInit() { int daMBdoorL1_c::actionStartDemo() { field_0x5e8 = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); demoProc(); - if (!fopAcM_CheckStatus(this, 0x1000)) { + if (!fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { setAction(ACTION_CLOSE_WAIT); } return 1; @@ -1728,18 +1728,18 @@ static actor_method_class l_daMBdoorL1_Method = { }; actor_process_profile_definition g_profile_L1MBOSS_DOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_L1MBOSS_DOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daMBdoorL1_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 299, // mPriority - &l_daMBdoorL1_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_L1MBOSS_DOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMBdoorL1_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_L1MBOSS_DOOR_e, + /* Actor SubMtd */ &l_daMBdoorL1_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_door_push.cpp b/src/d/actor/d_a_door_push.cpp index 29f6e6f18eb..07074c2ff77 100644 --- a/src/d/actor/d_a_door_push.cpp +++ b/src/d/actor/d_a_door_push.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_door_push.h" #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" static void PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2, @@ -367,18 +367,18 @@ static actor_method_class daDoorPush_METHODS = { }; actor_process_profile_definition g_profile_PushDoor = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_PushDoor, - &g_fpcLf_Method.base, - sizeof(daDoorPush_c), - 0, - 0, - &g_fopAc_Method.base, - 578, - &daDoorPush_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PushDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDoorPush_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_PushDoor_e, + /* Actor SubMtd */ &daDoorPush_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 59ef62eea2d..c0428a4808a 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -1379,7 +1379,7 @@ int daDoor20_c::createKey() { roomNo = door_param2_c::getBRoomNo(this); } field_0x5ec = - fopAcM_createChildFromOffset(PROC_Obj_Lv5Key, fopAcM_GetID(this), 0xffffffff, + fopAcM_createChildFromOffset(fpcNm_Obj_Lv5Key_e, fopAcM_GetID(this), 0xffffffff, &cStack_28, roomNo, &cStack_30, &scale, -1, 0); break; default: @@ -1398,7 +1398,7 @@ int daDoor20_c::createKey() { } } field_0x5ec = - fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), 0xffffffff, + fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), 0xffffffff, &cStack_28, roomNo, &cStack_30, &scale, -1, 0); } @@ -1492,7 +1492,7 @@ int daDoor20_c::drawCheck(int param_1) { int daDoor20_c::checkExecute() { field_0x68c = frontCheck(); - if (fopAcM_CheckStatus(this, 0x1000)) { + if (fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e)) { return 1; } if (eventInfo.checkCommandDemoAccrpt() || eventInfo.checkCommandDoor()) { @@ -2147,18 +2147,18 @@ static actor_method_class l_daDoor20_Method = { }; actor_process_profile_definition g_profile_DOOR20 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_DOOR20, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daDoor20_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 294, // mPriority - &l_daDoor20_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DOOR20_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDoor20_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DOOR20_e, + /* Actor SubMtd */ &l_daDoor20_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_door_spiral.cpp b/src/d/actor/d_a_door_spiral.cpp index b8830575ce0..f49ffca58ce 100644 --- a/src/d/actor/d_a_door_spiral.cpp +++ b/src/d/actor/d_a_door_spiral.cpp @@ -47,7 +47,7 @@ void* searchSpiralSub(void* i_actor, void* i_data) { fopAc_ac_c* other = (fopAc_ac_c*)i_data; if (actor != NULL && fopAcM_IsActor(actor)) { - if (fopAcM_GetProfName(actor) == PROC_SPIRAL_DOOR && actor != other) { + if (fopAcM_GetProfName(actor) == fpcNm_SPIRAL_DOOR_e && actor != other) { if (door_param2_c::getBRoomNo(actor) == door_param2_c::getBRoomNo(other)) { return actor; } @@ -637,7 +637,7 @@ void daSpiral_c::setPartner() { JUT_ASSERT(1065, actor); dComIfGp_event_setDoorPartner(actor); - fopAcM_OnStatus(actor, 0x8000); + fopAcM_OnStatus(actor, fopAcStts_STAFF_PRIMARY_e); } void daSpiral_c::clrPartner() { @@ -1193,18 +1193,18 @@ static actor_method_class l_daSpiral_Method = { #endif actor_process_profile_definition g_profile_SPIRAL_DOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SPIRAL_DOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSpiral_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 301, // mPriority - DASPIRAL_METHODS, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SPIRAL_DOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSpiral_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SPIRAL_DOOR_e, + /* Actor SubMtd */ DASPIRAL_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_dshutter.cpp b/src/d/actor/d_a_dshutter.cpp index 78d5ca6f0d9..4a0cf397f48 100644 --- a/src/d/actor/d_a_dshutter.cpp +++ b/src/d/actor/d_a_dshutter.cpp @@ -246,21 +246,19 @@ static actor_method_class l_daDsh_Method = { }; actor_process_profile_definition2 g_profile_DSHUTTER = { - { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_DSHUTTER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daDsh_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 296, // mPriority - &l_daDsh_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType - }, - 0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_DSHUTTER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daDsh_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_DSHUTTER_e, + /* Actor SubMtd */ &l_daDsh_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, + /* Unknown */ 0, }; diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp index a35bee546a4..442e7728a29 100644 --- a/src/d/actor/d_a_e_ai.cpp +++ b/src/d/actor/d_a_e_ai.cpp @@ -951,18 +951,18 @@ static actor_method_class l_daE_AI_Method = { }; actor_process_profile_definition g_profile_E_AI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_AI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_ai_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 112, // mPriority - &l_daE_AI_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_AI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_ai_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_AI_e, + /* Actor SubMtd */ &l_daE_AI_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp index a972d172324..54435631fde 100644 --- a/src/d/actor/d_a_e_arrow.cpp +++ b/src/d/actor/d_a_e_arrow.cpp @@ -161,7 +161,7 @@ static void hit_check(e_arrow_class* i_this) { dComIfG_Ccsp()->Set(&i_this->mCcTgSph); if (i_this->mCcAtSph.ChkAtShieldHit() && i_this->mCcAtSph.GetAtHitAc() != NULL && - fopAcM_GetName(i_this->mCcAtSph.GetAtHitAc()) == PROC_ALINK && + fopAcM_GetName(i_this->mCcAtSph.GetAtHitAc()) == fpcNm_ALINK_e && daAlink_getAlinkActorClass()->checkWoodShieldEquipNotIronBall()) { i_this->mAction = ACTION_ARROW_SHIELD; @@ -253,7 +253,7 @@ static void e_arrow_shot(e_arrow_class* i_this) { } case 1: if (i_this->mFlags & 0x20) { - fopAc_ac_c* coach_p = fopAcM_SearchByName(PROC_NPC_COACH); + fopAc_ac_c* coach_p = fopAcM_SearchByName(fpcNm_NPC_COACH_e); if (coach_p != NULL) { cXyz sp30; @@ -291,9 +291,9 @@ static void e_arrow_bg(e_arrow_class* i_this) { i_this->mMode = 1; i_this->mTimers[0] = 100; case 1: - if (checkItemGet(fpcNm_ITEM_BOW, 1) && fopAcM_searchPlayerDistance(i_this) < 30.0f) { + if (checkItemGet(dItemNo_BOW_e, 1) && fopAcM_searchPlayerDistance(i_this) < 30.0f) { dComIfGp_setItemArrowNumCount(1); - fopAcM_createItemForSimpleDemo(&i_this->current.pos, fpcNm_ITEM_ARROW_1, -1, NULL, NULL, 0.0f, + fopAcM_createItemForSimpleDemo(&i_this->current.pos, dItemNo_ARROW_1_e, -1, NULL, NULL, 0.0f, 0.0f); mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, NULL, 0, 0); @@ -331,7 +331,7 @@ static void e_arrow_spin(e_arrow_class* i_this) { static void* s_limit_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor) != FALSE && i_actor != i_data && - fopAcM_GetName(i_actor) == PROC_E_ARROW && + fopAcM_GetName(i_actor) == fpcNm_E_ARROW_e && static_cast(i_actor)->mAction == ACTION_ARROW_FIRE && fabsf(static_cast(i_actor)->field_0xa00.z - static_cast(i_data)->field_0xa00.z) < 300.0f) @@ -429,7 +429,7 @@ static void e_arrow_demo_fire(e_arrow_class* i_this) { static void atHit_CB(fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf) { - if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == PROC_ALINK) { + if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == fpcNm_ALINK_e) { if (daAlink_getAlinkActorClass()->checkWoodShieldEquipNotIronBall()) { daAlink_getAlinkActorClass()->getArrowShieldOffset( &i_atActor->current.pos, &i_atActor->shape_angle, @@ -754,20 +754,20 @@ static actor_method_class l_daE_ARROW_Method = { }; actor_process_profile_definition g_profile_E_ARROW = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_E_ARROW, - &g_fpcLf_Method.base, - sizeof(e_arrow_class), - 0, - 0, - &g_fopAc_Method.base, - 163, - &l_daE_ARROW_Method, - 0x44100, - fopAc_ENEMY_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_ARROW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_arrow_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_ARROW_e, + /* Actor SubMtd */ &l_daE_ARROW_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp index f1271aa873a..25a329df7af 100644 --- a/src/d/actor/d_a_e_ba.cpp +++ b/src/d/actor/d_a_e_ba.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_enemy.h" class daE_BA_HIO_c { @@ -67,7 +67,7 @@ static int daE_BA_Draw(e_ba_class* i_this) { } static void* shot_b_sub(void* i_proc, void* i_this) { - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_BOOMERANG + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_BOOMERANG_e && !dComIfGp_checkPlayerStatus0(0, 0x80000) && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_proc) == 1) { @@ -818,7 +818,7 @@ static void action(e_ba_class* i_this) { if (i_this->mKnockbackSpeed <= 1.0f || i_this->mAcch.ChkWallHit()) { fopAcM_delete(a_this); if (i_this->mHomeType == e_ba_class::HOME_APPEAR) { - // should be fpcNm_ITEM_HEART : fpcNm_ITEM_ARROW_10 but that gives incorrect code + // should be dItemNo_HEART_e : dItemNo_ARROW_10_e but that gives incorrect code int item_no = dComIfGs_getLife() <= 4 ? 0 : 0xE; fopAcM_createItem(&a_this->current.pos, item_no, -1, -1, NULL, NULL, 0); fopAcM_createDisappear(a_this, &a_this->current.pos, 6, 0, 0xff); @@ -1032,7 +1032,7 @@ static cPhs_Step daE_BA_Create(fopAc_ac_c* i_this) { } _this->mFightFlyDistance = (f32)_this->mDistanceParam * 100.0f; - if (fopAcM_SearchByName(PROC_E_PZ) != NULL) { + if (fopAcM_SearchByName(fpcNm_E_PZ_e) != NULL) { _this->mFightFlyDistance = 100000.0f; } @@ -1105,18 +1105,18 @@ static actor_method_class l_daE_BA_Method = { }; actor_process_profile_definition g_profile_E_BA = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_BA, - &g_fpcLf_Method.base, - sizeof(e_ba_class), - 0, - 0, - &g_fopAc_Method.base, - 0xB4, - &l_daE_BA_Method, - 0x10050100, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_ba_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BA_e, + /* Actor SubMtd */ &l_daE_BA_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index 947767da630..d3d308c4183 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_e_nest.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" #include "f_op/f_op_camera_mng.h" #include "SSystem/SComponent/c_math.h" @@ -135,12 +135,12 @@ static int bee_fly_action(e_bee_class* i_this, bee_s* i_bee) { i_bee->mTarget.z = cM_rndFX(100.0f); i_bee->mSpeedF = cM_rndF(5.0f) + 17.0f; } - if (fopAcM_GetName(hit_actor) != PROC_ALINK) { + if (fopAcM_GetName(hit_actor) != fpcNm_ALINK_e) { vec = hit_actor->current.pos - i_bee->mPos; vec.y += 125.0f; vec += i_bee->mTarget; if (i_bee->mHomeTimer == 0) { - if (fopAcM_GetName(hit_actor) == PROC_NPC_TK) { + if (fopAcM_GetName(hit_actor) == fpcNm_NPC_TK_e) { i_bee->mAction = bee_s::ACT_DEAD; } else { i_bee->mAction = bee_s::ACT_FLY_HOME_A; @@ -616,7 +616,7 @@ static void bee_control(e_bee_class* i_this) { if (i_this->mCcSph.ChkAtHit()) { cCcD_Obj* hitObj = i_this->mCcSph.GetAtHitObj(); fopAc_ac_c* hit_actor = dCc_GetAc(hitObj->GetAc()); - if (hit_actor != NULL && fopAcM_GetName(hit_actor) == PROC_ALINK) { + if (hit_actor != NULL && fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } } @@ -816,20 +816,20 @@ static actor_method_class l_daE_Bee_Method = { }; actor_process_profile_definition g_profile_E_BEE = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_BEE, - &g_fpcLf_Method.base, - sizeof(e_bee_class), - 0, - 0, - &g_fopAc_Method.base, - 0xB7, - &l_daE_Bee_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BEE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_bee_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BEE_e, + /* Actor SubMtd */ &l_daE_Bee_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index dbce499069f..be38c9c527d 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_bg.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -227,7 +227,7 @@ void daE_BG_c::setSparkEffect() { } fopAc_ac_c* daE_BG_c::search_esa() { - dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD); + dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(fpcNm_MG_ROD_e); if (rod != NULL && rod->kind == 1 && rod->action != 5 && rod->is_hook_in_water != 0 && rod->actor.current.pos.y < rod->water_surface_y - 20.0f) { return &rod->actor; @@ -286,7 +286,7 @@ void daE_BG_c::executeBorn() { } if (field_0x68f == 0) { - mBgId = fopAcM_createChild(PROC_E_BG, fopAcM_GetID(this), 0xffffff02, ¤t.pos, + mBgId = fopAcM_createChild(fpcNm_E_BG_e, fopAcM_GetID(this), 0xffffff02, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); mMoveMode = 3; } @@ -328,7 +328,7 @@ void daE_BG_c::executeSwim() { setActionMode(2, 0); return; } - } else if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) { + } else if (dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) { setActionMode(2, 0); return; } @@ -446,7 +446,7 @@ void daE_BG_c::executeAttack() { return; } } else { - if (!dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (!dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) { setActionMode(1, 0); return; } @@ -471,7 +471,7 @@ void daE_BG_c::executeAttack() { cLib_chaseF(&speedF, l_HIO.mTrackingSpeed * cM_scos(shape_angle.x), 1.0f); cLib_chaseF(&speed.y, l_HIO.mTrackingSpeed * cM_ssin(shape_angle.x), 1.0f); - if (!dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (!dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) { if (daPy_getPlayerActorClass()->checkEquipHeavyBoots()) { mMoveMode = 1; field_0x69a = cM_rndFX(8192.0f); @@ -480,7 +480,7 @@ void daE_BG_c::executeAttack() { if (mAtSphere.ChkAtHit()) { fopAc_ac_c* hitActor = dCc_GetAc(mAtSphere.GetAtHitObj()->GetAc()); - if (fopAcM_GetName(hitActor) == PROC_ALINK) { + if (fopAcM_GetName(hitActor) == fpcNm_ALINK_e) { mMoveMode = 10; field_0x68f = 30; speedF = cM_rndFX(1.0f) + -5.0f; @@ -542,7 +542,7 @@ void daE_BG_c::executeAttack() { field_0x6ae = 0; } - if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) { mMoveMode = 0; break; } @@ -583,7 +583,7 @@ void daE_BG_c::executeAttack() { cLib_chaseF(&speedF, 0.0f, 1.0f); cLib_chaseF(&speed.y, 0.0f, 1.0f); - if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e)) { mMoveMode = 0; } else { if (field_0x68f == 0) { @@ -635,7 +635,7 @@ void daE_BG_c::executeAttack() { if (mAtSphere.ChkAtHit()) { fopAc_ac_c* hitActor = dCc_GetAc(mAtSphere.GetAtHitObj()->GetAc()); - if (fopAcM_GetName(hitActor) == PROC_ALINK) { + if (fopAcM_GetName(hitActor) == fpcNm_ALINK_e) { mMoveMode = 5; field_0x68f = 30; @@ -1420,18 +1420,18 @@ static actor_method_class l_daE_BG_Method = { }; actor_process_profile_definition g_profile_E_BG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_BG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_BG_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 204, // mPriority - &l_daE_BG_Method, // sub_method - 0x000D0100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_BG_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BG_e, + /* Actor SubMtd */ &l_daE_BG_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index 8be64c55a87..c0a72abf1be 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_bi.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -76,7 +76,7 @@ static int daE_BI_Draw(e_bi_class* i_this) { if (i_this->ride_time == 0) { return 1; } - + g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr); J3DModel* model = i_this->anm_p->getModel(); g_env_light.setLightTevColorType_MAJI(model, &actor->tevStr); @@ -403,7 +403,7 @@ static void e_bi_ex(e_bi_class* i_this) { i_this->ex_eff[i] = dComIfGp_particle_set(i_this->ex_eff[i], ex_eff_id[i], &actor->current.pos, &actor->tevStr, &actor->shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->ex_eff[i]); - + if (emitter != NULL) { MTXCopy(i_this->anm_p->getModel()->getAnmMtx(0), *calc_mtx); emitter->setGlobalRTMatrix(*calc_mtx); @@ -646,7 +646,7 @@ static void action(e_bi_class* i_this) { } static void* s_fw_sub(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FW_e) { cXyz sp28 = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos; if (sp28.abs() < XREG_F(18) + 500.0f) { return i_actor; @@ -705,7 +705,7 @@ static int daE_BI_Execute(e_bi_class* i_this) { } cXyz mae, ato; - + i_this->counter++; for (int i = 0; i < 3; i++) { @@ -787,7 +787,7 @@ static int daE_BI_Execute(e_bi_class* i_this) { actor->attention_info.position.y += KREG_F(3) + 45.0f; f32 center = 0.0f; - if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_UNK_0x80000)) { + if (dComIfGp_checkPlayerStatus0(0, fopAcStts_UNK_0x80000_e)) { center = 100.0f; } @@ -838,9 +838,9 @@ static int daE_BI_IsDelete(e_bi_class* i_this) { static int daE_BI_Delete(e_bi_class* i_this) { fopAc_ac_c* actor = &i_this->actor; - + dComIfG_resDelete(&i_this->phase, "E_BI"); - + if (i_this->hio_init != 0) { hio_set = 0; } @@ -881,7 +881,7 @@ static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) { if (!fopAcM_entrySolidHeap(actor, useHeapInit, 0x27A0)) { OS_REPORT("//////////////E_BI SET NON !!\n"); - + return cPhs_ERROR_e; } @@ -950,7 +950,7 @@ static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) { i_this->at_info.mpSound = &i_this->sound; i_this->at_info.mPowerType = 1; i_this->sound.setEnemyName("E_bi"); - + i_this->counter = cM_rndF(65535.0f); actor->attention_info.distances[fopAc_attn_CARRY_e] = 42; @@ -967,7 +967,7 @@ static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) { } } - i_this->child_no = fopAcM_createChild(PROC_E_BI_LEAF, fopAcM_GetID(actor), i_this->arg1, &actor->current.pos, + i_this->child_no = fopAcM_createChild(fpcNm_E_BI_LEAF_e, fopAcM_GetID(actor), i_this->arg1, &actor->current.pos, fopAcM_GetRoomNo(actor), &actor->shape_angle, NULL, -1, NULL); } else { i_this->mode = -2; @@ -996,18 +996,18 @@ static actor_method_class l_daE_BI_Method = { }; actor_process_profile_definition g_profile_E_BI = { - fpcLy_CURRENT_e, // mLayerID - 9, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_BI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_bi_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 147, // mPriority - &l_daE_BI_Method, // sub_method - 0x100D0100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_bi_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BI_e, + /* Actor SubMtd */ &l_daE_BI_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_bi_leaf.cpp b/src/d/actor/d_a_e_bi_leaf.cpp index c273b36b42f..ed2000b3c5c 100644 --- a/src/d/actor/d_a_e_bi_leaf.cpp +++ b/src/d/actor/d_a_e_bi_leaf.cpp @@ -42,7 +42,7 @@ static void action(e_bi_leaf_class* i_this) { i_this->action = 0; i_this->parentActorID = - fopAcM_createChild(PROC_E_BI, fopAcM_GetID(i_this), (i_this->type << 8) | 1, + fopAcM_createChild(fpcNm_E_BI_e, fopAcM_GetID(i_this), (i_this->type << 8) | 1, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->current.angle, NULL, -1, NULL); i_this->timer = 20; @@ -123,18 +123,18 @@ static actor_method_class l_daE_BI_LEAF_Method = { }; actor_process_profile_definition g_profile_E_BI_LEAF = { - fpcLy_CURRENT_e, - 9, - fpcPi_CURRENT_e, - PROC_E_BI_LEAF, - &g_fpcLf_Method.base, - sizeof(e_bi_leaf_class), - 0, - 0, - &g_fopAc_Method.base, - 148, - &l_daE_BI_LEAF_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BI_LEAF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_bi_leaf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BI_LEAF_e, + /* Actor SubMtd */ &l_daE_BI_LEAF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp index 3f2cfdef584..ef0de93cf12 100644 --- a/src/d/actor/d_a_e_bs.cpp +++ b/src/d/actor/d_a_e_bs.cpp @@ -403,7 +403,7 @@ static void e_bs_attack(e_bs_class* i_this) { if (i_this->is_wep_attack) { fopAc_ac_c* at_hit_actor = at_hit_check(i_this); - if (at_hit_actor != NULL && fopAcM_GetName(at_hit_actor) == PROC_ALINK && daPy_getPlayerActorClass()->checkPlayerGuard()) { + if (at_hit_actor != NULL && fopAcM_GetName(at_hit_actor) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->modelMorf->setPlaySpeed(0.0f); i_this->action = ACTION_FIGHT_RUN; i_this->mode = 0; @@ -929,18 +929,18 @@ static actor_method_class l_daE_BS_Method = { }; actor_process_profile_definition g_profile_E_BS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_BS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_bs_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 124, // mPriority - &l_daE_BS_Method, // sub_method - 0x10040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_bs_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BS_e, + /* Actor SubMtd */ &l_daE_BS_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp index 4809b36b200..f3d76bddad7 100644 --- a/src/d/actor/d_a_e_bu.cpp +++ b/src/d/actor/d_a_e_bu.cpp @@ -1137,18 +1137,18 @@ static actor_method_class l_daE_BU_Method = { }; actor_process_profile_definition g_profile_E_BU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_BU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_bu_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 181, // mPriority - &l_daE_BU_Method, // sub_method - 0x100C0120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_bu_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BU_e, + /* Actor SubMtd */ &l_daE_BU_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_bug.cpp b/src/d/actor/d_a_e_bug.cpp index ec098f20b4b..e9ad4ab32c3 100644 --- a/src/d/actor/d_a_e_bug.cpp +++ b/src/d/actor/d_a_e_bug.cpp @@ -686,7 +686,7 @@ static void bug_control(e_bug_class* a_this) { } static void* s_boom_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { data_80697E8D = 1; at_pos = ((fopAc_ac_c*)i_actor)->current.pos; return i_actor; @@ -902,18 +902,18 @@ static actor_method_class l_daE_Bug_Method = { }; actor_process_profile_definition g_profile_E_BUG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_BUG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_bug_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 182, // mPriority - &l_daE_Bug_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_BUG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_bug_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_BUG_e, + /* Actor SubMtd */ &l_daE_Bug_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp index 4c360fdece8..54bbb2f9c76 100644 --- a/src/d/actor/d_a_e_cr.cpp +++ b/src/d/actor/d_a_e_cr.cpp @@ -228,7 +228,7 @@ static void e_cr_move(e_cr_class* a_this) { cXyz egg_pos(actor->current.pos); egg_pos.y += 35.0f * l_HIO.base_size; - fopAcM_createChild(PROC_E_CR_EGG, fopAcM_GetID(actor), 0, &egg_pos, fopAcM_GetRoomNo(actor), &actor->shape_angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_CR_EGG_e, fopAcM_GetID(actor), 0, &egg_pos, fopAcM_GetRoomNo(actor), &actor->shape_angle, NULL, -1, NULL); a_this->sound.startCreatureSound(Z2SE_EN_CR_LAYEGG, 0, -1); } break; @@ -309,7 +309,7 @@ static void e_cr_damage(e_cr_class* a_this) { if (a_this->timers[0] == 0) { fopAcM_createDisappear(actor, &actor->eyePos, 6, 0, 0xFF); - fopAcM_create(PROC_NPC_WORM, 0xFFFFFF01, &actor->eyePos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); + fopAcM_create(fpcNm_NPC_WORM_e, 0xFFFFFF01, &actor->eyePos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); fopAcM_delete(actor); } } @@ -546,18 +546,18 @@ static actor_method_class l_daE_CR_Method = { }; actor_process_profile_definition g_profile_E_CR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_CR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_cr_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 113, // mPriority - &l_daE_CR_Method, // sub_method - 0x10040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_CR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_cr_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_CR_e, + /* Actor SubMtd */ &l_daE_CR_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_cr_egg.cpp b/src/d/actor/d_a_e_cr_egg.cpp index 1ef1231f629..fa3c60f2700 100644 --- a/src/d/actor/d_a_e_cr_egg.cpp +++ b/src/d/actor/d_a_e_cr_egg.cpp @@ -224,18 +224,18 @@ static actor_method_class l_daE_CR_EGG_Method = { }; actor_process_profile_definition g_profile_E_CR_EGG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_CR_EGG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_cr_egg_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 114, // mPriority - &l_daE_CR_EGG_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_CR_EGG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_cr_egg_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_CR_EGG_e, + /* Actor SubMtd */ &l_daE_CR_EGG_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_db.cpp b/src/d/actor/d_a_e_db.cpp index bb037456170..f393fab3bac 100644 --- a/src/d/actor/d_a_e_db.cpp +++ b/src/d/actor/d_a_e_db.cpp @@ -1752,7 +1752,7 @@ static void action(e_db_class* i_this) { spA = TRUE; actor->field_0x566 = 1; sound_pl_search = TRUE; - fopAcM_OffStatus(actor, 0x10000); + fopAcM_OffStatus(actor, fopAcStts_UNK_0x10000_e); break; case ACTION_E_DEAD: e_db_e_dead(i_this); @@ -2190,7 +2190,7 @@ static int daE_DB_Create(fopAc_ac_c* i_this) { a_this->field_0x850 = 1; } - a_this->leaf_actor_id = fopAcM_createChild(PROC_E_DB_LEAF, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL); + a_this->leaf_actor_id = fopAcM_createChild(fpcNm_E_DB_LEAF_e, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL); daE_DB_Execute(a_this); } @@ -2206,18 +2206,18 @@ static actor_method_class l_daE_DB_Method = { }; actor_process_profile_definition g_profile_E_DB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_DB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_db_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 136, // mPriority - &l_daE_DB_Method, // sub_method - 0x10050120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_DB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_db_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DB_e, + /* Actor SubMtd */ &l_daE_DB_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_db_leaf.cpp b/src/d/actor/d_a_e_db_leaf.cpp index 0fe9346bf5b..54f82bb9c44 100644 --- a/src/d/actor/d_a_e_db_leaf.cpp +++ b/src/d/actor/d_a_e_db_leaf.cpp @@ -3,7 +3,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_db_leaf.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daE_DB_LEAF_Draw(e_db_leaf_class* i_this) { g_env_light.settingTevStruct(0,&i_this->current.pos,&i_this->tevStr); @@ -68,18 +68,18 @@ static actor_method_class l_daE_DB_LEAF_Method = { }; actor_process_profile_definition g_profile_E_DB_LEAF = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_DB_LEAF, - &g_fpcLf_Method.base, - sizeof(e_db_leaf_class), - 0, - 0, - &g_fopAc_Method.base, - 137, - &l_daE_DB_LEAF_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_DB_LEAF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_db_leaf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DB_LEAF_e, + /* Actor SubMtd */ &l_daE_DB_LEAF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp index e0de6cb03fa..720b587af74 100644 --- a/src/d/actor/d_a_e_dd.cpp +++ b/src/d/actor/d_a_e_dd.cpp @@ -1784,18 +1784,18 @@ actor_method_class l_daE_DD_Method = { }; actor_process_profile_definition g_profile_E_DD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_DD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_dd_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 117, // mPriority - &l_daE_DD_Method, // sub_method - 0x10040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_DD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_dd_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DD_e, + /* Actor SubMtd */ &l_daE_DD_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index ccd68a90832..0f0a14a7e2c 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -492,7 +492,7 @@ void daE_DF_c::SearchAction() { daObjCarry_c* obj_carry = (daObjCarry_c*)fpcM_Search(s_obj_sub, this); if (obj_carry != NULL) { - if (fopAcM_GetName(obj_carry) == PROC_Obj_Carry) { + if (fopAcM_GetName(obj_carry) == fpcNm_Obj_Carry_e) { mEatObjType = EAT_TYPE_OBJ; mCarryType = obj_carry->getType(); fopAcM_delete(obj_carry); @@ -500,14 +500,14 @@ void daE_DF_c::SearchAction() { Set_Angle(obj_pos); mAction = ACT_EAT; - } else if (fopAcM_GetName(obj_carry) == PROC_ALINK && mTimer == 0) { + } else if (fopAcM_GetName(obj_carry) == fpcNm_ALINK_e && mTimer == 0) { mEatObjType = EAT_TYPE_LINK; Set_Angle(player_pos); mTargetAngle = cLib_targetAngleY(¤t.pos, player_pos); mAction = ACT_EAT; dComIfGp_getVibration().StartShock(5, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - } else if (fopAcM_GetName(obj_carry) == PROC_NBOMB) { + } else if (fopAcM_GetName(obj_carry) == fpcNm_NBOMB_e) { cXyz* obj_pos = &fopAcM_GetPosition(obj_carry); Set_Angle(obj_pos); mEatObjType = EAT_TYPE_BOMB; @@ -697,7 +697,7 @@ int daE_DF_c::Create() { } } - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); daE_DF_Execute(this); } @@ -717,18 +717,18 @@ static actor_method_class l_daE_DF_Method = { }; actor_process_profile_definition g_profile_E_DF = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_DF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_DF_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 130, // mPriority - &l_daE_DF_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_DF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_DF_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DF_e, + /* Actor SubMtd */ &l_daE_DF_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index 6efac3410ba..71b64949db2 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -550,7 +550,7 @@ void daE_DK_c::executeAttack() { mCoreSphere.SetTgSpl(1); setElectricEffect(); field_0x6a3 = 1; - fopAcM_OffStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e); if (mMoveMode == 2) { if (field_0x698 == 0) { field_0x69c = 150; @@ -652,7 +652,7 @@ void daE_DK_c::executeDeath() { mSphere.OffCoSetBit(); mSphere.OffTgSetBit(); mCoreSphere.OffTgSetBit(); - fopAcM_OffStatus(this, 0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); field_0x68e = 0; @@ -697,7 +697,7 @@ void daE_DK_c::executeDeath() { BodyDeathMove(); - if (fopAcM_CheckStatus(this, 0x100000) == 0) { + if (fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e) == 0) { mMoveMode = 3; mpMorfSO->setPlaySpeed(1.0f); @@ -764,7 +764,7 @@ void daE_DK_c::action() { damage_check(); - fopAcM_OnStatus(this, 0x80000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); if (fopAcM_searchPlayerDistance(this) > l_HIO.first_attack_range) { field_0x690 = 0x0; @@ -1082,18 +1082,18 @@ static actor_method_class l_daE_DK_Method = { }; actor_process_profile_definition g_profile_E_DK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_DK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_DK_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 755, // mPriority - &l_daE_DK_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_DK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_DK_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DK_e, + /* Actor SubMtd */ &l_daE_DK_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp index 728f9787e55..40fb56c9054 100644 --- a/src/d/actor/d_a_e_dn.cpp +++ b/src/d/actor/d_a_e_dn.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_dn.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -305,16 +305,16 @@ static int daE_DN_Draw(e_dn_class* i_this) { cXyz shadow_pos; shadow_pos.set(actor->current.pos.x, actor->current.pos.y + 50.0f + BREG_F(18), actor->current.pos.z); - i_this->shadow_key = dComIfGd_setShadow(i_this->shadow_key, 1, model, &shadow_pos, BREG_F(19) + 950.0f, 0.0f, - actor->current.pos.y, i_this->objacch.GetGroundH(), - i_this->objacch.m_gnd, &i_this->actor.tevStr, 0, 1.0f, + i_this->shadow_key = dComIfGd_setShadow(i_this->shadow_key, 1, model, &shadow_pos, BREG_F(19) + 950.0f, 0.0f, + actor->current.pos.y, i_this->objacch.GetGroundH(), + i_this->objacch.m_gnd, &i_this->actor.tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); dComIfGd_addRealShadow(i_this->shadow_key, i_this->knife_model); if (i_this->skull_model != NULL) { dComIfGd_addRealShadow(i_this->shadow_key, i_this->skull_model); } dComIfGd_addRealShadow(i_this->shadow_key, i_this->tate_model); - + return 1; } @@ -436,7 +436,7 @@ static dBomb_c* search_bomb(e_dn_class* i_this, int param_2) { } else { return NULL; } - + return NULL; } @@ -475,7 +475,7 @@ static int pl_check(e_dn_class* i_this, f32 search_area, s16 search_angle) { return 1; } } - + for (int i = 0; i <= 2; i++) { if (i_this->cc_sph[i].ChkCoHit() != 0) { if (player == dCc_GetAc(i_this->cc_sph[i].GetCoHitObj()->GetAc())) { @@ -483,7 +483,7 @@ static int pl_check(e_dn_class* i_this, f32 search_area, s16 search_angle) { } } } - + return 0; } @@ -763,7 +763,7 @@ static void e_dn_bomb_action(e_dn_class* i_this) { i_this->mode = 5; anm_init(i_this, ANM_WAIT_01, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); } - + break; case 5: @@ -887,7 +887,7 @@ static void e_dn_normal(e_dn_class* i_this) { cLib_addCalcAngleS2(&i_this->jnt_tail_y_rot_offset, angle, 2, 0x400); - if (i_this->timer[0] == 0 || + if (i_this->timer[0] == 0 || (i_this->timer[1] == 0 && (fopAcM_wayBgCheck(actor, 200.0f, 50.0f) || move_gake_check(i_this, 200.0f, 0)))) { i_this->mode = 2; i_this->timer[0] = cM_rndF(100.0f) + 50.0f; @@ -1034,7 +1034,7 @@ int learn_check; static void* shot_s_sub(void* i_actor, void* i_data) { e_dn_class* i_this = (e_dn_class*)i_data; fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; - if ((fopAcM_IsActor(i_actor) && (learn_check & 0x80000000) != 0 && fopAcM_GetName(i_actor) == PROC_ARROW && (fopAcM_GetParam(i_actor) == 1 || + if ((fopAcM_IsActor(i_actor) && (learn_check & 0x80000000) != 0 && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2))) { cXyz sp28(actor->current.pos - ((fopAc_ac_c*)i_actor)->current.pos); if (sp28.abs() < 1000.0f) { @@ -1199,7 +1199,7 @@ static void e_dn_fight_run(e_dn_class* i_this) { return; } } else if ( - dComIfGp_checkPlayerStatus1(0, 0x2000000) != 0 || + dComIfGp_checkPlayerStatus1(0, 0x2000000) != 0 || (((i_this->search_angle_x < 0x1000 && i_this->search_angle_x > -0x1000) || def != 0) && player_way_check(i_this)) ) { if ( @@ -1282,7 +1282,7 @@ static void e_dn_fight_run(e_dn_class* i_this) { static void e_dn_jump(e_dn_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; - + i_this->field_0x6f4 = 1; switch (i_this->mode) { case 0: @@ -1442,11 +1442,11 @@ static void e_dn_gakejump(e_dn_class* i_this) { static fopAc_ac_c* at_hit_check(e_dn_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; fopAc_ac_c* player = dComIfGp_getPlayer(0); - + if (i_this->mode >= 10) { return NULL; } - + if (i_this->at_sph.ChkAtHit() != 0) { return dCc_GetAc(i_this->at_sph.GetAtHitObj()->GetAc()); } @@ -1482,7 +1482,7 @@ static void e_dn_attack_0(e_dn_class* i_this) { if (i_this->at_chk_flag != 0) { fopAc_ac_c* actor_p = at_hit_check(i_this); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK && daPy_getPlayerActorClass()->checkPlayerGuard()) { + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->checkPlayerGuard()) { dComIfGp_getVibration().StartShock(3, 31, cXyz(0.0f, 1.0f, 0.0f)); } } @@ -1541,7 +1541,7 @@ static void e_dn_attack(e_dn_class* i_this) { cLib_addCalc0(&actor->speedF, 1.0f, 5.0f); if (i_this->at_chk_flag != 0) { fopAc_ac_c* actor_p = at_hit_check(i_this); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK && daPy_getPlayerActorClass()->checkPlayerGuard()) { + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->anm_p->setPlaySpeed(0.0f); i_this->action = ACTION_FIGHT_RUN; i_this->mode = 0; @@ -1958,7 +1958,7 @@ static void e_dn_damage(e_dn_class* i_this) { MTXCopy(i_this->anm_p->getModel()->getAnmMtx(JNT_BACKBONE02), *calc_mtx); sp34.set(0.0f, 0.0f, 0.0f); MtxPosition(&sp34, &sp40); - + s8 unused = 0; dn_disappear(i_this); @@ -2167,7 +2167,7 @@ static void e_dn_reg(e_dn_class* i_this) { cXyz sp34, sp40; f32 dash_speed = 0.0f; int frame = i_this->anm_p->getFrame(); - + i_this->field_0x6f2 = 0; i_this->invulnerability_timer = 10; @@ -2698,7 +2698,7 @@ static void action(e_dn_class* i_this) { work.z = 15000.0f; } MtxPosition(&work, &sp24c); - + i_this->field_0x7a4[0].y = sp24c.x; i_this->field_0x7a4[0].x = sp24c.z; i_this->field_0x7a4[1].y = sp24c.x; @@ -2761,7 +2761,7 @@ static void action(e_dn_class* i_this) { MtxPosition(&work, &sp24c); i_this->field_0x836.y = -sp24c.x; i_this->field_0x836.x = -sp24c.z * 1.3f; - + if (i_this->field_0x836.x > (s16)(BREG_S(6) + 10000)) { i_this->field_0x836.x = BREG_S(6) + 10000; } @@ -2986,7 +2986,7 @@ static int daE_DN_Execute(e_dn_class* i_this) { return 1; } - if (c_start == 0 && dComIfGp_event_runCheck() && + if (c_start == 0 && dComIfGp_event_runCheck() && (fopAcM_getTalkEventPartner((fopAc_ac_c*)daPy_getLinkPlayerActorClass()) == daPy_py_c::getMidnaActor() || daPy_getPlayerActorClass()->eventInfo.checkCommandDoor())) { return 1; } @@ -3109,7 +3109,7 @@ static int daE_DN_Execute(e_dn_class* i_this) { } else { i_this->cc_sph[0].SetR(50.0f); } - + actor->attention_info.position = actor->eyePos; actor->attention_info.position.y += 70.0f + BREG_F(7); @@ -3175,7 +3175,7 @@ static int daE_DN_Execute(e_dn_class* i_this) { i_this->skull_model->setBaseTRMtx(mDoMtx_stack_c::get()); } - + MTXCopy(i_this->anm_p->getModel()->getAnmMtx(JNT_ARML2), *calc_mtx); i_this->tate_model->setBaseTRMtx(*calc_mtx); @@ -3402,7 +3402,7 @@ static cPhs_Step daE_DN_Create(fopAc_ac_c* actor) { l_HIO.no = mDoHIO_CREATE_CHILD("リザードマン", &l_HIO); } - fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(actor, fopAcStts_CULL_e); actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e; fopAcM_SetMtx(actor, i_this->anm_p->getModel()->getBaseTRMtx()); fopAcM_SetMin(actor, -200.0f, -200.0f, -200.0f); @@ -3472,7 +3472,7 @@ static cPhs_Step daE_DN_Create(fopAc_ac_c* actor) { if ((i_this->arg0 == 13 || i_this->arg0 == 14) || (i_this->arg0 == 15 || i_this->arg0 == 16)) { i_this->status = 1; i_this->action = ACTION_REG; - fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(actor, fopAcStts_UNK_0x4000_e); i_this->acchcir.SetWall(80.0f, 2.0f); } @@ -3501,18 +3501,18 @@ static actor_method_class l_daE_DN_Method = { }; actor_process_profile_definition g_profile_E_DN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_DN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_dn_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 118, // mPriority - &l_daE_DN_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_DN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_dn_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DN_e, + /* Actor SubMtd */ &l_daE_DN_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index a5a0014a3e6..1341e9a9cbb 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -706,7 +706,7 @@ int E_DT_n::mDt_OtamaNo[20]; static void* s_otama_todo(void* i_proc, void* i_this) { if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc)) - && fopAcM_GetName(i_proc) == PROC_E_OT) + && fopAcM_GetName(i_proc) == fpcNm_E_OT_e) { daE_OT_c* otama = static_cast(i_proc); E_DT_n::mDt_OtamaNum++; @@ -730,7 +730,7 @@ int E_DT_n::m_fall_no; static void* s_fall_otama(void* i_proc, void* i_this) { if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc)) - && fopAcM_GetName(i_proc) == PROC_E_OT) + && fopAcM_GetName(i_proc) == fpcNm_E_OT_e) { daE_OT_c* otama = static_cast(i_proc); if (E_DT_n::m_fall_no == otama->getChildNo() @@ -764,10 +764,10 @@ void daE_DT_c::setStayOtamaDelete() { static void* s_demo_otama(void* i_proc, void* i_this) { if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc)) - && fopAcM_GetName(i_proc) == PROC_E_OT) + && fopAcM_GetName(i_proc) == fpcNm_E_OT_e) { daE_OT_c* otama = static_cast(i_proc); - fopAcM_OffStatus(otama, 0x8000); + fopAcM_OffStatus(otama, fopAcStts_STAFF_PRIMARY_e); } return NULL; } @@ -799,7 +799,7 @@ bool daE_DT_c::checkBombEat() { bool daE_DT_c::isShutterOpen() { daAmiShutter_c* shutter; - fopAcM_SearchByName(PROC_Obj_AmiShutter, (fopAc_ac_c**)&shutter); + fopAcM_SearchByName(fpcNm_Obj_AmiShutter_e, (fopAc_ac_c**)&shutter); if (shutter != NULL && shutter->isShutterOpen()) { return true; } else { @@ -884,7 +884,7 @@ void daE_DT_c::executeCry() { getNumberOfOtama(); for (int i = 0; i < 20; i++) { if (E_DT_n::mDt_OtamaNo[i] == 0) { - fopAcM_create(PROC_E_OT, i, ¤t.pos, fopAcM_GetRoomNo(this), + fopAcM_create(fpcNm_E_OT_e, i, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, 0xff); } } @@ -1145,14 +1145,14 @@ void daE_DT_c::executeJump() { switch (field_0x704) { case 0: if (mBodyCcSph[0].ChkCoHit()) { - if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[0].GetCoHitObj()->GetAc())) == PROC_ALINK) + if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[0].GetCoHitObj()->GetAc())) == fpcNm_ALINK_e) { field_0x704 = 2; mLinkPressed = true; } } if (mBodyCcSph[1].ChkCoHit()) { - if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[1].GetCoHitObj()->GetAc())) == PROC_ALINK) + if (fopAcM_GetName(dCc_GetAc(mBodyCcSph[1].GetCoHitObj()->GetAc())) == fpcNm_ALINK_e) { field_0x704 = 2; mLinkPressed = true; @@ -1602,7 +1602,7 @@ void daE_DT_c::executeOpening() { attention_info.flags = 0; if (getNumberOfOtama() == 0) { for (i = 0; i < 20; i++) { - fopAcM_create(PROC_E_OT, i | 0xff030000, ¤t.pos, fopAcM_GetRoomNo(this), + fopAcM_create(fpcNm_E_OT_e, i | 0xff030000, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, 0xff); } } @@ -1656,7 +1656,7 @@ void daE_DT_c::executeOpening() { } if (create_otama) { vec1.set(0.0f, 2000.0f, 0.0f); - fopAcM_create(PROC_E_OT, 0xff01ffff, &vec1, fopAcM_GetRoomNo(this), + fopAcM_create(fpcNm_E_OT_e, 0xff01ffff, &vec1, fopAcM_GetRoomNo(this), &shape_angle, NULL, 0xff); } if (mpMorf->isStop() && getNumberOfOtama() <= 20) { @@ -1846,7 +1846,7 @@ void daE_DT_c::executeOpening() { getNumberOfOtama(); for (int i = 0; i < 20; i++) { if (E_DT_n::mDt_OtamaNo[i] == 0) { - mDemoID = fopAcM_create(PROC_E_OT, i | 0xff030000, ¤t.pos, + mDemoID = fopAcM_create(fpcNm_E_OT_e, i | 0xff030000, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, 0xff); } } @@ -2561,20 +2561,20 @@ static actor_method_class l_daE_DT_Method = { }; actor_process_profile_definition g_profile_E_DT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_DT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_DT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 202, // mPriority - &l_daE_DT_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_DT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_DT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_DT_e, + /* Actor SubMtd */ &l_daE_DT_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ 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 6f5c2343df4..c36b6056174 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -473,7 +473,7 @@ void daE_FB_c::executeAttack() { child_type = 11; } - fopAcM_createChild(PROC_E_FB, fopAcM_GetID(this), child_type, &child_pos, + fopAcM_createChild(fpcNm_E_FB_e, fopAcM_GetID(this), child_type, &child_pos, fopAcM_GetRoomNo(this), &sp_0x28, NULL, -1, NULL); } } @@ -590,7 +590,7 @@ void daE_FB_c::executeDamage() { mini_pos.x += cM_rndF(50.0f); mini_pos.y += cM_rndF(100.0f) + 100.0f; mini_pos.z += cM_rndF(50.0f); - fopAcM_create(PROC_E_FZ, 1, &mini_pos, fopAcM_GetRoomNo(this), &mini_angle, NULL, -1); + fopAcM_create(fpcNm_E_FZ_e, 1, &mini_pos, fopAcM_GetRoomNo(this), &mini_angle, NULL, -1); } dead_eff_set(); @@ -1002,20 +1002,20 @@ static actor_method_class l_daE_FB_Method = { }; actor_process_profile_definition g_profile_E_FB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_FB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_FB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 176, // mPriority - &l_daE_FB_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_FB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_FB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_FB_e, + /* Actor SubMtd */ &l_daE_FB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp index 9c28c359c6a..a9b41d30320 100644 --- a/src/d/actor/d_a_e_fk.cpp +++ b/src/d/actor/d_a_e_fk.cpp @@ -812,18 +812,18 @@ static actor_method_class l_daE_FK_Method = { }; actor_process_profile_definition g_profile_E_FK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_FK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_FK_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 159, // mPriority - &l_daE_FK_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_FK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_FK_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_FK_e, + /* Actor SubMtd */ &l_daE_FK_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index ca5a982bfaa..2bb1cf1ff59 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -227,7 +227,7 @@ daE_FM_HIO_c::daE_FM_HIO_c() { } static void* s_fmobj_del(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FMOBJ) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_FMOBJ_e) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -247,7 +247,7 @@ static f32 h_power; static s8 h_unk; static void* s_hasira_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_HHASHI) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_HHASHI_e) { ((daObjHHASHI_c*)i_actor)->Rolling(&h_pos, h_range, h_power, h_unk); } @@ -255,7 +255,7 @@ static void* s_hasira_sub(void* i_actor, void* i_data) { } static void* s_hasira_poscheck(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_HHASHI) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_HHASHI_e) { f32 x = ((fopAc_ac_c*)i_actor)->current.pos.x - ((fopAc_ac_c*)i_data)->current.pos.x; f32 z = ((fopAc_ac_c*)i_actor)->current.pos.z - ((fopAc_ac_c*)i_data)->current.pos.z; if (JMAFastSqrt((x * x) + (z * z)) < 500.0f) { @@ -272,7 +272,7 @@ static void* s_hasira_poscheck(void* i_actor, void* i_data) { static f32 fire_range; static void* s_hasira_eff_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_HHASHI) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_HHASHI_e) { daObjHHASHI_c* a_actor = (daObjHHASHI_c*)i_actor; for (int i = 0; i < 10; i++) { if (((e_fm_class*)i_data)->mHashiraActors[i] == a_actor) { @@ -1697,11 +1697,11 @@ static void demo_camera(e_fm_class* i_this) { spE0 += player->current.pos; OS_REPORT("///YSTONE POS %d,%d,%d\n", (int)spE0.x, (int)spE0.y, (int)spE0.z); - fopAcM_create(PROC_OBJ_YSTONE, 0, &spE0, fopAcM_GetRoomNo(actor), NULL, NULL, -1); + fopAcM_create(fpcNm_OBJ_YSTONE_e, 0, &spE0, fopAcM_GetRoomNo(actor), NULL, NULL, -1); } if (i_this->mDemoCamTimer == VREG_S(1) + 120) { - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { ystone->field_0x59b = 0; } @@ -1733,7 +1733,7 @@ static void demo_camera(e_fm_class* i_this) { cLib_addCalc2(&i_this->field_0x1b05c, 210.0f, 0.05f, 0.5f); - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); if (ystone != NULL) { ystone->setCurrentPos(spE0); } @@ -1744,7 +1744,7 @@ static void demo_camera(e_fm_class* i_this) { fopAcM_createWarpHole(&warp_pos, &warp_rot, fopAcM_GetRoomNo(actor), 0, 1, 0xFF); spEC = actor->current.pos; - fopAcM_create(PROC_NPC_GRZ, 0xFFFFFF01, &spEC, fopAcM_GetRoomNo(actor), &actor->shape_angle, NULL, -1); + fopAcM_create(fpcNm_NPC_GRZ_e, 0xFFFFFF01, &spEC, fopAcM_GetRoomNo(actor), &actor->shape_angle, NULL, -1); i_this->mDrawDemoModel = FALSE; } @@ -2565,7 +2565,7 @@ static void chain_control3(e_fm_class* i_this, chain_s* i_chain_s, int param_2) static int ba_count; static void* s_ba_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_BA) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_BA_e) { ba_count++; } @@ -2755,7 +2755,7 @@ static void action(e_fm_class* i_this) { rot.x = JREG_S(8); for (int i = 0; i < create_num; i++) { - fopAcM_createChild(PROC_E_BA, fopAcM_GetID(actor), 0xFFFF1F02, &actor->eyePos, fopAcM_GetRoomNo(actor), &rot, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_BA_e, fopAcM_GetID(actor), 0xFFFF1F02, &actor->eyePos, fopAcM_GetRoomNo(actor), &rot, NULL, -1, NULL); ANGLE_ADD(rot.y, 0x10000 / create_num); } } @@ -3345,7 +3345,7 @@ static int daE_FM_Execute(e_fm_class* i_this) { csXyz rot(actor->shape_angle); rot.y += 0x800; - fopAcM_createItemForBoss(&actor->eyePos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(actor), &rot, NULL, 10.0f + KREG_F(19), 30.0f, -1); + fopAcM_createItemForBoss(&actor->eyePos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(actor), &rot, NULL, 10.0f + KREG_F(19), 30.0f, -1); } if (i_this->field_0x182c == 3) { @@ -3740,7 +3740,7 @@ static int daE_FM_Create(fopAc_ac_c* i_this) { if (!dComIfGs_isStageLife()) { cXyz size(1.0f, 1.0f, 1.0f); pos.set(209.0f, 0.0f, 861.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_UTAWA_HEART, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &size, 0.0f, 0.0f, -1); + fopAcM_createItemForBoss(&pos, dItemNo_UTAWA_HEART_e, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, &size, 0.0f, 0.0f, -1); } g_env_light.mColpatWeather = 2; @@ -3880,20 +3880,20 @@ static actor_method_class l_daE_FM_Method = { }; actor_process_profile_definition g_profile_E_FM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_FM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_fm_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 158, // mPriority - &l_daE_FM_Method, // sub_method - 0x00044000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_FM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_fm_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_FM_e, + /* Actor SubMtd */ &l_daE_FM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index 2014c21ebc4..fde24a91872 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -474,7 +474,7 @@ static bool checkViewArea(cXyz* i_pos) { static void e_fs_demowait(e_fs_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy; cXyz delta; - npc_ks_class* monkey = (npc_ks_class*)fopAcM_SearchByName(PROC_NPC_KS); + npc_ks_class* monkey = (npc_ks_class*)fopAcM_SearchByName(fpcNm_NPC_KS_e); switch (i_this->mMode) { case 0: @@ -853,18 +853,18 @@ static actor_method_class l_daE_Fs_Method = { }; actor_process_profile_definition g_profile_E_FS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_FS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_fs_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 160, // mPriority - &l_daE_Fs_Method, // sub_method - 0x00040120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_FS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_fs_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_FS_e, + /* Actor SubMtd */ &l_daE_Fs_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_fz.cpp b/src/d/actor/d_a_e_fz.cpp index ad11594686f..cefe6237cd5 100644 --- a/src/d/actor/d_a_e_fz.cpp +++ b/src/d/actor/d_a_e_fz.cpp @@ -84,7 +84,7 @@ daE_FZ_HIO_c::daE_FZ_HIO_c() { } s32 daE_FZ_c::draw() { - if (field_0x714 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL,1)) { + if (field_0x714 == 2 && !checkItemGet(dItemNo_IRONBALL_e,1)) { return 1; } @@ -180,11 +180,11 @@ void daE_FZ_c::damage_check() { if (field_0x712 == 0) { pos.set(dComIfGp_getPlayer(0)->current.pos); mStts.Move(); - + if (field_0x714 == 3) { if (mTgCoSph.ChkTgHit()) { mAtInfo.mpCollider = mTgCoSph.GetTgHitObj(); - + if (mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_IRON_BALL)) { deadnextSet(false); } @@ -192,7 +192,7 @@ void daE_FZ_c::damage_check() { } else { if (mTgCoSph.ChkTgHit()) { mAtInfo.mpCollider = mTgCoSph.GetTgHitObj(); - + if (mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_40) || mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_BOOMERANG)) { current.angle.y = fopAcM_searchPlayerAngleY(this) + 32768; f32 tmp_l_hio = l_HIO.field_0x28; @@ -205,7 +205,7 @@ void daE_FZ_c::damage_check() { pos2 = current.pos - *mTgCoSph.GetTgHitPosP(); pos3.set(*mTgCoSph.GetTgHitPosP()); - + s_pos.x = 0; s_pos.y = pos2.atan2sX_Z(); s_pos.z = 0; @@ -223,13 +223,13 @@ void daE_FZ_c::damage_check() { cXyz cStack_54(l_HIO.field_0x0c, l_HIO.field_0x0c, l_HIO.field_0x0c); dComIfGp_particle_set(0x85ba, ¤t.pos, &shape_angle, &cStack_54); - + if (mTgCoSph.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT)) { health -= 20; if (1 < health) { current.angle.y = fopAcM_searchPlayerAngleY(this) + 32768; - + f32 tmp_l_hio = l_HIO.field_0x28; speedF = tmp_l_hio; field_0x6fc = tmp_l_hio; @@ -278,12 +278,12 @@ void daE_FZ_c::damage_check() { } deadnextSet(true); - return; - } else { + return; + } else { if (mObjAcch.ChkGroundHit() && mTgCoSph.ChkCoHit()) { fopAc_ac_c* co_hit_actor = mTgCoSph.GetCoHitAc(); - if (fopAcM_IsActor(co_hit_actor) && fopAcM_GetName(co_hit_actor) == PROC_E_FZ) { + if (fopAcM_IsActor(co_hit_actor) && fopAcM_GetName(co_hit_actor) == fpcNm_E_FZ_e) { pos = current.pos - mTgCoSph.GetCoHitAc()->current.pos; mTgCoSph.ClrCoHit(); f32 co_hit_actor_speed = co_hit_actor->speedF; @@ -310,7 +310,7 @@ void daE_FZ_c::damage_check() { } } } - + if (mAtSph.ChkAtHit()) { fopAc_ac_c* player = dComIfGp_getPlayer(0); fopAc_ac_c* at_hit_actor = mAtSph.GetAtHitAc(); @@ -325,7 +325,7 @@ void daE_FZ_c::damage_check() { speedF = l_hio_28; field_0x6fc = l_hio_28; setActionMode(ACT_DAMAGE,1); - + } else { if (mActionMode != ACT_DAMAGE) { field_0x712 = 10; @@ -345,7 +345,7 @@ void daE_FZ_c::damage_check() { bool daE_FZ_c::way_gake_check() { cXyz pos; dBgS_GndChk gnd_chk; - + if (mObjAcch.ChkWallHit()) { return false; } @@ -361,7 +361,7 @@ bool daE_FZ_c::way_gake_check() { field_0x6dc += current.pos; field_0x6e8.set(field_0x6dc); gnd_chk.SetPos(&field_0x6e8); - + field_0x6e8.y = dComIfG_Bgsp().GroundCross(&gnd_chk); if (field_0x6e8.y == -G_CM3D_F_INF) { field_0x6e8.y = current.pos.y; @@ -378,19 +378,19 @@ void daE_FZ_c::executeWait() { cXyz pos2; s16 angle; f32 tmp = l_HIO.field_0x14; - + switch (mActionPhase) { case 0: if (fopAcM_wayBgCheck(this,200.0f,50.0f)) { angle = cM_rndFX(10000.0f) + 32768.0f; } else { - + pos2.x = home.pos.x + cM_rndFX(l_HIO.field_0x10); pos2.y = home.pos.y; pos2.z = home.pos.z + cM_rndFX(l_HIO.field_0x10); - + pos = pos2 - current.pos; - + angle = pos.atan2sX_Z() - current.angle.y; if (angle > 12288) { @@ -424,21 +424,21 @@ void daE_FZ_c::executeWait() { if (mObjAcch.ChkGroundHit() && dComIfG_Bgsp().GetPolyAtt0(mObjAcch.m_gnd) == 8) { angle = shape_angle.y - mAngleFromPlayer; - + if (abs(angle) < 512 && field_0x710 == 0) { cLib_addCalc0(&speedF, 0.1f, 0.1f); - } + } } else { cLib_addCalc0(&speedF,0.1f,l_HIO.field_0x2c); } - + if (field_0x710 == 0 && speedF < 0.2f) { angle = shape_angle.y - mAngleFromPlayer; if (abs(angle) < 512) { current.angle.y = shape_angle.y; setActionMode(ACT_MOVE,0); - } + } } } @@ -456,11 +456,11 @@ void daE_FZ_c::executeMove() { switch (mActionPhase) { case 0: field_0x710 = l_HIO.field_0x08 + cM_rndFX(l_HIO.field_0x34); - mActionPhase = 1; + mActionPhase = 1; case 1: cLib_addCalcAngleS2(¤t.angle.y,mAngleFromPlayer,8,256); cLib_addCalc2(&speedF,l_HIO.field_0x1c,1.0f,3.0f); - + if (fopAcM_wayBgCheck(this, 200.0f,50.0f) != 0 || field_0x710 == 0) { setActionMode(ACT_WAIT,0); } @@ -470,7 +470,7 @@ void daE_FZ_c::executeMove() { setActionMode(ACT_WAIT,0); } else { shape_angle.y = current.angle.y; - + if (fopAcM_searchPlayerDistance(this) <= l_HIO.field_0x14) { setActionMode(ACT_ATTACK,0); } @@ -520,7 +520,7 @@ void daE_FZ_c::executeDamage() { fopAcM_delete(this); break; case 1: - tmp = l_HIO.field_0x28; + tmp = l_HIO.field_0x28; speedF = tmp; field_0x6fc = tmp; case 5: @@ -577,10 +577,10 @@ void daE_FZ_c::executeDamage() { s16 value = 4096.0f - (4096.0f / field_0x6fc) * (field_0x6fc - speedF); shape_angle.y += value; } - + cLib_addCalcAngleS2(¤t.angle.y,mAngleFromPlayer,1,512); cLib_addCalc0(&speedF,0.1f,0.1f); - + if (mObjAcch.ChkWallHit()) { mLastWallHitAngle = mAcchCir.GetWallAngleY(); setReflectAngle(); @@ -603,7 +603,7 @@ void daE_FZ_c::executeDamage() { void daE_FZ_c::executeRollMove() { if (fopAcM_SearchByID(fopAcM_GetLinkId(this),&mpBlizzetaActor) == 0 || !mpBlizzetaActor) return; u32 model_no = static_cast(mpBlizzetaActor)->getModelNo(); - + if (model_no < 4 || 6 < model_no) { fopAcM_delete(this); return; @@ -645,7 +645,7 @@ void daE_FZ_c::executeRollMove() { case 2: cLib_chaseF(&mRadiusBase,1.0,0.1); cLib_chaseAngleS(&field_0x704,512,16); - + if (mObjAcch.ChkWallHit() || !mObjAcch.ChkGroundHit()) { setActionMode(ACT_DAMAGE,0); mCreature.startCreatureSound(Z2SE_EN_FZ_DEATH,0,-1); @@ -654,7 +654,7 @@ void daE_FZ_c::executeRollMove() { if (mAtSph.ChkAtHit()) { fopAc_ac_c* at_hit_actor = mAtSph.GetAtHitAc(); - if ((fopAcM_GetName(at_hit_actor) == PROC_ALINK) || mAtSph.ChkAtShieldHit()) { + if ((fopAcM_GetName(at_hit_actor) == fpcNm_ALINK_e) || mAtSph.ChkAtShieldHit()) { setActionMode(ACT_DAMAGE,0); return; } @@ -669,7 +669,7 @@ void daE_FZ_c::action() { int i; if (field_0x714 == 1 && mObjAcch.ChkGroundHit()) { - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); field_0x714 = 0; } @@ -733,7 +733,7 @@ void daE_FZ_c::action() { } if (1 < health && mAcchCir.ChkWallHit()) { - if (fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(mAcchCir)) != PROC_BG) { + if (fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(mAcchCir)) != fpcNm_BG_e) { dBgS_LinChk lin_chk; dBgS_LinChk lin_chk2; @@ -812,7 +812,7 @@ void daE_FZ_c::cc_set() { mTgCoSph.SetR(mRadiusBase * 60.0f); dComIfG_Ccsp()->Set(&mTgCoSph); - + mDoMtx_stack_c::copy(mpModel->getBaseTRMtx()); pos.set(0.0f,25.0f,0.0f); @@ -826,7 +826,7 @@ void daE_FZ_c::cc_set() { s32 daE_FZ_c::execute() { if (field_0x714 == 2) { - if (checkItemGet(fpcNm_ITEM_IRONBALL,1) == 0) { + if (checkItemGet(dItemNo_IRONBALL_e,1) == 0) { return 1; } @@ -940,7 +940,7 @@ s32 daE_FZ_c::create() { attention_info.flags = fopAc_AttnFlag_BATTLE_e; attention_info.distances[fopAc_attn_BATTLE_e] = 69; - + fopAcM_SetMtx(this,mpModel->getBaseTRMtx()); fopAcM_SetMin(this,-200.0f,-200.0f,-200.0f); fopAcM_SetMax(this,200.0f,200.0f,200.0f); @@ -951,22 +951,22 @@ s32 daE_FZ_c::create() { field_0x714 = fopAcM_GetParam(this); field_0x715 = fopAcM_GetParam(this) >> 8; - + if (field_0x714 == 255) field_0x714 = 0; - + if (field_0x714 == 1 || field_0x714 == 3) { speed.y = cM_rndFX(10.0f) + 30.0f; f32 rng = cM_rndFX(1.0f); speedF = rng + 4.0f; field_0x6fc = rng + 4.0f; if (field_0x714 == 1) { - fopAcM_OnStatus(this,fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this,fopAcStts_UNK_0x4000_e); } } mObjAcch.Set(fopAcM_GetPosition_p(this),fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), 0, 0); - + if (field_0x714 == 3) { mAcchCir.SetWall(35.0f,70.0f); } @@ -992,18 +992,18 @@ s32 daE_FZ_c::create() { shape_angle.z = 0; shape_angle.x = 0; - + s16 random = cM_rndFX(10000.0f); shape_angle.y = random; current.angle.y = random; field_0x670.set(current.pos); - + for (int i = 0; i < 4; i++) { field_0x67c[i].set(current.pos); } - if (field_0x714 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL,1)) { + if (field_0x714 == 2 && !checkItemGet(dItemNo_IRONBALL_e,1)) { attention_info.distances[fopAc_attn_BATTLE_e] = 0; fopAcM_SetGroup(this,0); fopAcM_OffStatus(this,0); @@ -1041,18 +1041,18 @@ static actor_method_class l_daE_FZ_Method = { }; actor_process_profile_definition g_profile_E_FZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_FZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_FZ_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 169, // mPriority - &l_daE_FZ_Method, // sub_method - 0x00040120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_FZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_FZ_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_FZ_e, + /* Actor SubMtd */ &l_daE_FZ_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_ga.cpp b/src/d/actor/d_a_e_ga.cpp index 84d4a1f1559..f5405f6a6b3 100644 --- a/src/d/actor/d_a_e_ga.cpp +++ b/src/d/actor/d_a_e_ga.cpp @@ -265,18 +265,18 @@ static actor_method_class l_daE_Ga_Method = { }; actor_process_profile_definition g_profile_E_GA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_ga_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 138, // mPriority - &l_daE_Ga_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_GA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_ga_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GA_e, + /* Actor SubMtd */ &l_daE_Ga_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index a1995a663bf..c601737512b 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -1006,7 +1006,7 @@ static void e_gf_end(e_gb_class* i_this) { } if (i_this->timer[0] == 0) { - daKey_c* key_p = (daKey_c*)fopAcM_SearchByName(PROC_Obj_SmallKey); + daKey_c* key_p = (daKey_c*)fopAcM_SearchByName(fpcNm_Obj_SmallKey_e); cXyz pos(actor->home.pos); pos.z += YREG_F(12); if (key_p != NULL) { @@ -1080,7 +1080,7 @@ static void action2(e_gb_class* i_this) { } if (i_this->keyStatus != 0) { - daKey_c* key_p = (daKey_c*)fopAcM_SearchByName(PROC_Obj_SmallKey); + daKey_c* key_p = (daKey_c*)fopAcM_SearchByName(fpcNm_Obj_SmallKey_e); if (key_p != NULL) { key_p->seStartTwinkle(Z2SE_OBJ_KEY_TWINKLE, &i_this->keyPos); } @@ -1729,18 +1729,18 @@ static actor_method_class l_daE_GB_Method = { }; actor_process_profile_definition g_profile_E_GB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_gb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 139, // mPriority - &l_daE_GB_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_GB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_gb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GB_e, + /* Actor SubMtd */ &l_daE_GB_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index 4221e24b56c..6a543af30e7 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -117,7 +117,7 @@ bool daE_GE_c::checkBeforeBg(int param_0, f32 param_1) { static void* s_arrow_sub(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_ARROW) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e) { if (fopAcM_GetSpeedF((fopAc_ac_c*)i_actor) && fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data) < l_HIO.arrow_recognition_distance) @@ -131,7 +131,7 @@ static void* s_arrow_sub(void* i_actor, void* i_data) { static void* s_ge_surprise(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GE) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_GE_e) { if (fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data) < l_HIO.peer_recognition_distance && static_cast(i_actor)->getSurpriseTime() == 0) @@ -145,7 +145,7 @@ static void* s_ge_surprise(void* i_actor, void* i_data) { static void* s_ge_caw(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GE) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_GE_e) { if (i_actor != i_data && fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data) < l_HIO.peer_recognition_distance) @@ -161,7 +161,7 @@ static s32 target_count; static void* s_ge_attack(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GE) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_GE_e) { if (static_cast(i_actor)->getActionMode() == 2) { target_count++; } @@ -172,7 +172,7 @@ static void* s_ge_attack(void* i_actor, void* i_data) { static void* s_ge_attack2(void* i_actor, void* i_data) { if (fopAcM_IsActor(i_actor)) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GE) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_GE_e) { if (static_cast(i_actor)->checkOtherAttacker()) { target_count++; return NULL; @@ -800,7 +800,7 @@ void daE_GE_c::executeDown() { mSphere.OffTgSetBit(); mSphere2.OffTgSetBit(); #endif - fopAcM_OffStatus(this, 0x20); + fopAcM_OffStatus(this, fopAcStts_UNK_0x20_e); field_0xb9e = 0; attention_info.flags = 0; bckSet(4, 3.0f, 2, 1.0f); @@ -1377,18 +1377,18 @@ static actor_method_class l_daE_GE_Method = { }; actor_process_profile_definition g_profile_E_GE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_GE_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 192, // mPriority - &l_daE_GE_Method, // sub_method - 0x00050120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_GE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_GE_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GE_e, + /* Actor SubMtd */ &l_daE_GE_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index 387e8619b30..a22ddfc73af 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -353,7 +353,7 @@ void daE_GI_c::setDamageEffect() { } static void* s_other_gi(void* i_actor, void* i_other) { - if (i_actor != i_other && fopAcM_IsActor(i_actor) && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GI && + if (i_actor != i_other && fopAcM_IsActor(i_actor) && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_GI_e && fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_other) < 1000.0f) { return i_actor; @@ -363,7 +363,7 @@ static void* s_other_gi(void* i_actor, void* i_other) { } static void* s_battle_gi(void* i_actor, void* i_other) { - if (i_actor != i_other && fopAcM_IsActor(i_actor) && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GI && + if (i_actor != i_other && fopAcM_IsActor(i_actor) && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_GI_e && ((daE_GI_c*)i_actor)->isBattleOn() && fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_other) < 500.0f) { return i_actor; @@ -1112,18 +1112,18 @@ static actor_method_class l_daE_GI_Method = { }; actor_process_profile_definition g_profile_E_GI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_GI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 210, // mPriority - &l_daE_GI_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_GI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_GI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GI_e, + /* Actor SubMtd */ &l_daE_GI_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_gm.cpp b/src/d/actor/d_a_e_gm.cpp index eef5561904e..563cf860ac0 100644 --- a/src/d/actor/d_a_e_gm.cpp +++ b/src/d/actor/d_a_e_gm.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_gm.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -172,7 +172,7 @@ void daE_GM_c::action() { } static void* s_obj_sub2(void* i_actor, void* i_data) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_CSTATUE && + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_CSTATUE_e && fopAcM_searchActorDistanceXZ((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data) < 4000.0f && ((daCstatue_c*)i_actor)->checkBossAtGroundHit()) { return i_actor; } @@ -260,7 +260,7 @@ void daE_GM_c::egg_wait() { return; } } - + if (mType == TYPE_1) { cLib_addCalcAngleS(&field_0xa5c, 0, 8, 0x100, 4); current.angle.x += field_0xa5c; @@ -407,12 +407,12 @@ void daE_GM_c::create_item() { switch ((int)cM_rndF(fVar1)) { case 0: - fopAcM_createItem(¤t.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(¤t.pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); break; case 1: case 2: - fopAcM_createItem(¤t.pos, fpcNm_ITEM_ARROW_1, -1, -1, NULL, NULL, 0); + fopAcM_createItem(¤t.pos, dItemNo_ARROW_1_e, -1, -1, NULL, NULL, 0); break; } } @@ -475,7 +475,7 @@ void daE_GM_c::wait() { if (fopAcM_SearchByID(fopAcM_GetLinkId(this), (fopAc_ac_c**)&actor_p) == 0 || actor_p == NULL) { return; } - + if (actor_p->mDemoMode != 0x15) { setAction(&daE_GM_c::walk); } @@ -828,7 +828,7 @@ void daE_GM_c::hook() { } else if (mMode == -1) { field_0xa72 = 10; mSph.SetTgType(0xD8FBFDFF); - } else if (!fopAcM_CheckStatus(this, fopAcM_STATUS_HOOK_CARRY_NOW)) { + } else if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { setAction(&daE_GM_c::core_escape); } } @@ -974,7 +974,7 @@ void daE_GM_c::walk2() { speedF = l_coreSpeedF + field_0xa40; mpModelMorf->setPlaySpeed(speedF / 9.0f); field_0xa6e += (int)(speedF / 9.0f); - + if (field_0xa6e >= 4) { field_0xa6e = 0; mSound.startCreatureSound(Z2SE_EN_GBA_FOOTNOTE, 0, -1); @@ -1037,7 +1037,7 @@ void daE_GM_c::core_wait() { field_0xa71 = false; current.angle.y = cLib_targetAngleY(&player->current.pos, ¤t.pos); fopAcM_SetCullSize(this, 7); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x80000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); mSph.SetTgType(0xD8FBFDFF); mMode++; } else if (mMode != -1) { @@ -1777,8 +1777,8 @@ cPhs_Step daE_GM_c::create() { if (mType == TYPE_NORMAL) { mSound.init(¤t.pos, NULL, 2, 1); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x10000); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x10000_e); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); setAction(&daE_GM_c::normal_wait); } else if (mType == TYPE_GOMA) { mSound.init(¤t.pos, &eyePos, 3, 1); @@ -1794,7 +1794,7 @@ cPhs_Step daE_GM_c::create() { setAction(&daE_GM_c::core_wait); } else { mSound.init(¤t.pos, NULL, 2, 1); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x10000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x10000_e); field_0xa50 = hREG_F(7) + 0.1f; field_0xa66 = cM_rndFX(100.0f) + 1000.0f; field_0xa64 = field_0xa66; @@ -1824,18 +1824,18 @@ static actor_method_class l_daE_GM_Method = { }; actor_process_profile_definition g_profile_E_GM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_GM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 119, // mPriority - &l_daE_GM_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_GM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_GM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GM_e, + /* Actor SubMtd */ &l_daE_GM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp index ac352decea5..c1ab609a7de 100644 --- a/src/d/actor/d_a_e_gob.cpp +++ b/src/d/actor/d_a_e_gob.cpp @@ -2013,8 +2013,8 @@ static int daE_GOB_Execute(e_gob_class* i_this) { cXyz sp48; cXyz sp3C; - ms = (obj_msima_class*)fopAcM_SearchByName(PROC_OBJ_MSIMA); - my = (obj_myogan_class*)fopAcM_SearchByName(PROC_OBJ_MYOGAN); + ms = (obj_msima_class*)fopAcM_SearchByName(fpcNm_OBJ_MSIMA_e); + my = (obj_myogan_class*)fopAcM_SearchByName(fpcNm_OBJ_MYOGAN_e); i_this->mCounter++; for (int i = 0; i < 5; i++) { @@ -2403,20 +2403,20 @@ static actor_method_class l_daE_GOB_Method = { }; actor_process_profile_definition g_profile_E_GOB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GOB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_gob_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 116, // mPriority - &l_daE_GOB_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_GOB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_gob_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GOB_e, + /* Actor SubMtd */ &l_daE_GOB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_e_gs.cpp b/src/d/actor/d_a_e_gs.cpp index a9683523e68..87c4d42ae03 100644 --- a/src/d/actor/d_a_e_gs.cpp +++ b/src/d/actor/d_a_e_gs.cpp @@ -233,18 +233,18 @@ static actor_method_class l_daE_GS_Method = { }; actor_process_profile_definition g_profile_E_GS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_GS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_gs_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 115, // mPriority - &l_daE_GS_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_GS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_gs_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_GS_e, + /* Actor SubMtd */ &l_daE_GS_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_hb.cpp b/src/d/actor/d_a_e_hb.cpp index 46d1cd96458..8658533a130 100644 --- a/src/d/actor/d_a_e_hb.cpp +++ b/src/d/actor/d_a_e_hb.cpp @@ -1492,7 +1492,7 @@ static int daE_HB_Create(fopAc_ac_c* i_this) { a_this->field_0x851 = 1; } - a_this->leaf_actor_id = fopAcM_createChild(PROC_E_HB_LEAF, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL); + a_this->leaf_actor_id = fopAcM_createChild(fpcNm_E_HB_LEAF_e, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL); i_this->field_0x565 = (fopAcM_GetParam(i_this) & 0xFF0000) >> 0x10; i_this->field_0x564 = (fopAcM_GetParam(i_this) & 0xFF000000) >> 0x18; @@ -1511,18 +1511,18 @@ static actor_method_class l_daE_HB_Method = { }; actor_process_profile_definition g_profile_E_HB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_HB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_hb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 140, // mPriority - &l_daE_HB_Method, // sub_method - 0x10050100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_HB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_hb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_HB_e, + /* Actor SubMtd */ &l_daE_HB_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_hb_leaf.cpp b/src/d/actor/d_a_e_hb_leaf.cpp index 4a28434d3c1..466501bc36c 100644 --- a/src/d/actor/d_a_e_hb_leaf.cpp +++ b/src/d/actor/d_a_e_hb_leaf.cpp @@ -87,18 +87,18 @@ static actor_method_class l_daE_HB_LEAF_Method = { }; actor_process_profile_definition g_profile_E_HB_LEAF = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_HB_LEAF, - &g_fpcLf_Method.base, - sizeof(e_hb_leaf_class), - 0, - 0, - &g_fopAc_Method.base, - 141, - &l_daE_HB_LEAF_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_HB_LEAF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_hb_leaf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_HB_LEAF_e, + /* Actor SubMtd */ &l_daE_HB_LEAF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp index 11eacb6b34d..f1d0ea03607 100644 --- a/src/d/actor/d_a_e_hm.cpp +++ b/src/d/actor/d_a_e_hm.cpp @@ -497,7 +497,7 @@ void daE_HM_c::CreateExecute() { field_0x5b8 = 300; } if (field_0x5c4 == fpcM_ERROR_PROCESS_ID_e && field_0x5b8 == 0) { - field_0x5c4 = fopAcM_createChild(PROC_E_HM, fopAcM_GetID(this), 0xfffff05, ¤t.pos, + field_0x5c4 = fopAcM_createChild(fpcNm_E_HM_e, fopAcM_GetID(this), 0xfffff05, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } } @@ -1603,18 +1603,18 @@ static actor_method_class l_daE_HM_Method = { }; actor_process_profile_definition g_profile_E_HM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_HM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_HM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 146, // mPriority - &l_daE_HM_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_HM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_HM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_HM_e, + /* Actor SubMtd */ &l_daE_HM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index cdb00ae7b7e..12782f91d40 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -756,7 +756,7 @@ void daE_HP_c::executeDead() { fopAcM_delete(this); } else { if (field_0x784 == -1) { - field_0x784 = fopAcM_createItemForPresentDemo(¤t.pos, fpcNm_ITEM_POU_SPIRIT, 0, -1, + field_0x784 = fopAcM_createItemForPresentDemo(¤t.pos, dItemNo_POU_SPIRIT_e, 0, -1, -1, 0, 0); } @@ -1318,18 +1318,18 @@ static actor_method_class l_daE_HP_Method = { }; actor_process_profile_definition g_profile_E_HP = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_HP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_HP_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 172, // mPriority - &l_daE_HP_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_HP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_HP_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_HP_e, + /* Actor SubMtd */ &l_daE_HP_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index 8b680502352..df760a4f7d9 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -181,19 +181,19 @@ static void* s_obj_sub(void* i_actor, void* i_data) { if (actor_dist < 100.0f && !fopAcM_GetSpeedF((fopAc_ac_c*)i_actor) && !fopAcM_GetSpeed((fopAc_ac_c*)i_actor).y) { - if (fopAcM_GetName(i_actor) == PROC_Obj_Carry) { + if (fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) { m_near_carry = (fopAc_ac_c*)i_actor; - } else if (fopAcM_GetName(i_actor) == PROC_NBOMB) { + } else if (fopAcM_GetName(i_actor) == fpcNm_NBOMB_e) { m_near_bomb = (fopAc_ac_c*)i_actor; } } - if (actor_dist < 500.0f && (fopAcM_GetName(i_actor) == PROC_BOOMERANG || - fopAcM_GetName(i_actor) == PROC_NBOMB)) + if (actor_dist < 500.0f && (fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e || + fopAcM_GetName(i_actor) == fpcNm_NBOMB_e)) { m_near_weapon = static_cast(i_actor); } - if (actor_dist < 700.0f && fopAcM_GetName(i_actor) == PROC_ARROW && + if (actor_dist < 700.0f && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && fopAcM_GetSpeedF((fopAc_ac_c*)i_actor)) { m_near_weapon = static_cast(i_actor); @@ -2105,20 +2105,20 @@ static actor_method_class l_daE_HZ_Method = { }; actor_process_profile_definition g_profile_E_HZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_HZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_HZ_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 199, // mPriority - &l_daE_HZ_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_HZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_HZ_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_HZ_e, + /* Actor SubMtd */ &l_daE_HZ_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp index 6ecd3313e79..8944f2bde53 100644 --- a/src/d/actor/d_a_e_hzelda.cpp +++ b/src/d/actor/d_a_e_hzelda.cpp @@ -181,7 +181,7 @@ static int daE_HZELDA_Draw(e_hzelda_class* i_this) { } static void* shot_s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) { cXyz vec = ((fopAc_ac_c*)i_data)->current.pos - ((fopAc_ac_c*)i_actor)->current.pos; if (vec.abs() < 1000.0f) { return i_actor; @@ -1078,7 +1078,7 @@ static int daE_HZELDA_Execute(e_hzelda_class* i_this) { cCcD_Obj* hitobj = i_this->mBallSphAt.GetAtHitObj(); fopAc_ac_c* hit_actor = dCc_GetAc(hitobj->GetAc()); - if (fopAcM_GetName(hit_actor) == PROC_ALINK) { + if (fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { if (!daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->mSound.startCreatureVoice(Z2SE_EN_HZE_V_LAUGH, -1); sp64 = 1; @@ -1535,18 +1535,18 @@ static actor_method_class l_daE_HZELDA_Method = { }; actor_process_profile_definition g_profile_E_HZELDA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_HZELDA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_hzelda_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 142, // mPriority - &l_daE_HZELDA_Method, // sub_method - 0x00044000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_HZELDA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_hzelda_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_HZELDA_e, + /* Actor SubMtd */ &l_daE_HZELDA_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp index 1379fbf62ec..8517d46fe7c 100644 --- a/src/d/actor/d_a_e_is.cpp +++ b/src/d/actor/d_a_e_is.cpp @@ -87,7 +87,7 @@ static BOOL pl_check(e_is_class* a_this, f32 i_srchRange, s16 i_srchAngle) { } static void* s_stop_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_IS && i_data != i_actor && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_IS_e && i_data != i_actor && ((e_is_class*)i_actor)->action == ACTION_POWEROFF && ((e_is_class*)i_actor)->mode == 10) { ((e_is_class*)i_actor)->action = ACTION_BREAK; @@ -755,18 +755,18 @@ static actor_method_class l_daE_IS_Method = { }; actor_process_profile_definition g_profile_E_IS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_IS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_is_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 184, // mPriority - &l_daE_IS_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_IS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_is_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_IS_e, + /* Actor SubMtd */ &l_daE_IS_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_kg.cpp b/src/d/actor/d_a_e_kg.cpp index 570944ff21b..706c46cad71 100644 --- a/src/d/actor/d_a_e_kg.cpp +++ b/src/d/actor/d_a_e_kg.cpp @@ -744,18 +744,18 @@ static actor_method_class l_daE_KG_Method = { }; actor_process_profile_definition g_profile_E_KG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_KG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_kg_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 185, // mPriority - &l_daE_KG_Method, // sub_method - 0x100C0120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_KG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_kg_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_KG_e, + /* Actor SubMtd */ &l_daE_KG_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp index 8038ca13653..363c24b3d39 100644 --- a/src/d/actor/d_a_e_kk.cpp +++ b/src/d/actor/d_a_e_kk.cpp @@ -111,7 +111,7 @@ int daE_KK_c::JointCallBack(J3DJoint* i_joint, int param_1) { } int daE_KK_c::draw() { - if (field_0x679 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL, 1)) { + if (field_0x679 == 2 && !checkItemGet(dItemNo_IRONBALL_e, 1)) { return 1; } else { cXyz position; @@ -465,7 +465,7 @@ void daE_KK_c::executeIcicleWait() { field_0x67d = 0; field_0x76c = 0; nextActionCheck(); - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); } } } @@ -567,7 +567,7 @@ void daE_KK_c::executeSpearThrow() { } } if ((s32)mpMorfSO->getFrame() == 0x17) { - fopAcM_createChild(PROC_E_KK, fopAcM_GetID(this), 0xFF0001, &field_0x698, + fopAcM_createChild(fpcNm_E_KK_e, fopAcM_GetID(this), 0xFF0001, &field_0x698, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); field_0x67d = 1; mCyl.OffTgNoHitMark(); @@ -1262,7 +1262,7 @@ void daE_KK_c::cc_set() { int daE_KK_c::execute() { if (field_0x679 == 2) { - if (!checkItemGet(fpcNm_ITEM_IRONBALL, 1)) { + if (!checkItemGet(dItemNo_IRONBALL_e, 1)) { return 1; } @@ -1448,7 +1448,7 @@ int daE_KK_c::create() { if (field_0x679 != 3) { setActionMode(0, 0); } else { - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); field_0x67d = 1; s16 player_angle = fopAcM_searchPlayerAngleY(this); shape_angle.y = player_angle; @@ -1460,7 +1460,7 @@ int daE_KK_c::create() { fopAcM_SetMin(this, -600.0f, -600.0f, -600.0f); fopAcM_SetMax(this, 600.0f, 600.0f, 600.0f); - if (field_0x679 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL, 1)) { + if (field_0x679 == 2 && !checkItemGet(dItemNo_IRONBALL_e, 1)) { attention_info.distances[fopAc_attn_BATTLE_e] = 0; fopAcM_SetGroup(this, 0); fopAcM_OffStatus(this, 0); @@ -1493,18 +1493,18 @@ static actor_method_class l_daE_KK_Method = { }; actor_process_profile_definition g_profile_E_KK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_KK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_KK_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 171, // mPriority - &l_daE_KK_Method, // sub_method - 0x00040120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_KK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_KK_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_KK_e, + /* Actor SubMtd */ &l_daE_KK_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp index c32921568b0..5b6e472f0d6 100644 --- a/src/d/actor/d_a_e_kr.cpp +++ b/src/d/actor/d_a_e_kr.cpp @@ -393,7 +393,7 @@ static void e_kr_ground_pos_move(e_kr_class* i_this) { } static BOOL coach_path_check(e_kr_class* i_this) { - fopAc_ac_c* coach = fopAcM_SearchByName(PROC_NPC_COACH); + fopAc_ac_c* coach = fopAcM_SearchByName(fpcNm_NPC_COACH_e); if (coach == NULL) { return FALSE; } @@ -2391,18 +2391,18 @@ static actor_method_class l_daE_Kr_Method = { }; actor_process_profile_definition g_profile_E_KR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_KR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_kr_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 186, // mPriority - &l_daE_Kr_Method, // sub_method - 0x10040120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_KR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_kr_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_KR_e, + /* Actor SubMtd */ &l_daE_Kr_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp index b750c328fd0..09f0038fd06 100644 --- a/src/d/actor/d_a_e_mb.cpp +++ b/src/d/actor/d_a_e_mb.cpp @@ -743,20 +743,20 @@ static actor_method_class l_daE_MB_Method = { }; actor_process_profile_definition g_profile_E_MB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_mb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 164, // mPriority - &l_daE_MB_Method, // sub_method - 0x00044000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_MB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_mb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MB_e, + /* Actor SubMtd */ &l_daE_MB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index 30e5b5422b9..4c813dab165 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -154,7 +154,7 @@ void daE_MD_c::CheckHit() { UNUSED(hit_obj); UNUSED(hit_actor); - if ((hit_obj->ChkAtType(AT_TYPE_IRON_BALL) || fopAcM_GetName(hit_actor) == PROC_E_TH_BALL || fopAcM_GetName(hit_actor) == PROC_B_TN) && (mType == TYPE_DUMMY || mType == TYPE_LV9)) { + if ((hit_obj->ChkAtType(AT_TYPE_IRON_BALL) || fopAcM_GetName(hit_actor) == fpcNm_E_TH_BALL_e || fopAcM_GetName(hit_actor) == fpcNm_B_TN_e) && (mType == TYPE_DUMMY || mType == TYPE_LV9)) { if (mAction == ACTION_WAIT) { mCyl.OffTgIronBallRebound(); mAction = ACTION_HALF_BREAK; @@ -173,7 +173,7 @@ void daE_MD_c::CheckHit() { u32 bu_params = (mSwbit << 0x18) | 0xFF2FFF; if (mCanCreateBu && mType == TYPE_DUMMY) { - fopAcM_create(PROC_E_BU, bu_params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); + fopAcM_create(fpcNm_E_BU_e, bu_params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1); } } else if (mAction == ACTION_HALF_BREAK) { mCyl.OffTgSetBit(); @@ -464,18 +464,18 @@ static actor_method_class l_daE_MD_Method = { }; actor_process_profile_definition g_profile_E_MD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_MD_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 132, // mPriority - &l_daE_MD_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_MD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_MD_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MD_e, + /* Actor SubMtd */ &l_daE_MD_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp index 8477c6d3513..bc9ae08de85 100644 --- a/src/d/actor/d_a_e_mf.cpp +++ b/src/d/actor/d_a_e_mf.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_mf.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -243,13 +243,13 @@ static int daE_MF_Draw(e_mf_class* i_this) { cXyz sp50; sp50.set(a_this->current.pos.x, a_this->current.pos.y + 50.0f, a_this->current.pos.z); - i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &sp50, 1150.0f, 0.0f, - a_this->current.pos.y, i_this->mObjAcch.GetGroundH(), - i_this->mObjAcch.m_gnd, &a_this->tevStr, 0, 1.0f, + i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &sp50, 1150.0f, 0.0f, + a_this->current.pos.y, i_this->mObjAcch.GetGroundH(), + i_this->mObjAcch.m_gnd, &a_this->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); dComIfGd_addRealShadow(i_this->mShadowKey, i_this->mpAxeModel); dComIfGd_addRealShadow(i_this->mShadowKey, i_this->mpShieldModel); - + return 1; } @@ -402,7 +402,7 @@ static int pl_check(e_mf_class* i_this, f32 param_2, s16 param_3) { return 1; } } - + for (int i = 0; i <= 2; i++) { if (i_this->field_0xa7c[i].ChkCoHit() != 0) { if (player == dCc_GetAc(i_this->field_0xa7c[i].GetCoHitObj()->GetAc())) { @@ -410,7 +410,7 @@ static int pl_check(e_mf_class* i_this, f32 param_2, s16 param_3) { } } } - + return 0; } @@ -690,7 +690,7 @@ static void e_mf_bomb_action(e_mf_class* i_this) { i_this->field_0x5b4 = 5; anm_init(i_this, ANM_WAIT_01, 5.0f, 2, 1.0f); } - + break; case 5: @@ -807,7 +807,7 @@ static void e_mf_normal(e_mf_class* i_this) { cLib_addCalcAngleS2(&i_this->field_0x806, sVar2, 2, 0x400); - if (i_this->field_0x6c0[0] == 0 || + if (i_this->field_0x6c0[0] == 0 || (i_this->field_0x6c0[1] == 0 && (fopAcM_wayBgCheck(a_this, 200.0f, 50.0f) || move_gake_check(i_this, 200.0f, 0)))) { i_this->field_0x5b4 = 2; i_this->field_0x6c0[0] = cM_rndF(100.0f) + 50.0f; @@ -960,8 +960,8 @@ static int way_check(e_mf_class* i_this) { static void* shot_s_sub(void* i_actor, void* i_data) { e_mf_class* i_this = (e_mf_class*)i_data; fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) || - fopAcM_GetName(i_actor) == PROC_BOOMERANG && dComIfGp_checkPlayerStatus0(0, 0x80000) == 0 && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) || + fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e && dComIfGp_checkPlayerStatus0(0, 0x80000) == 0 && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { cXyz sp28(a_this->current.pos - ((fopAc_ac_c*)i_actor)->current.pos); if (sp28.abs() < 1000.0f) { return i_actor; @@ -1132,8 +1132,8 @@ static void e_mf_fight_run(e_mf_class* i_this) { } } else { if ((sVar3 == 2 || dComIfGp_checkPlayerStatus1(0, 0x2000000) != 0) || (((i_this->mXAngleToPlayer < 0x1000 && i_this->mXAngleToPlayer > -0x1000) || sVar3 != 0) && player_way_check(i_this))) { - if ((sVar3 != 0 || (i_this->mPlayerDistance < l_HIO.battle_init_range && - ((daPy_getPlayerActorClass()->getCutAtFlg() != 0 || daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_JUMP) || + if ((sVar3 != 0 || (i_this->mPlayerDistance < l_HIO.battle_init_range && + ((daPy_getPlayerActorClass()->getCutAtFlg() != 0 || daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_JUMP) || ((i_this->field_0x6ac & 48) != 0 && daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_GUARD_ATTACK)))) && i_this->field_0x72c < 1.0f) { i_this->mAction = 7; if (cc_pl_cut_bit_get() == 0x100) { @@ -1199,7 +1199,7 @@ static void e_mf_fight_run(e_mf_class* i_this) { static void e_mf_jump(e_mf_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; - + i_this->field_0x6d4 = 1; switch (i_this->field_0x5b4) { case 0: @@ -1358,7 +1358,7 @@ static fopAc_ac_c* at_hit_check(e_mf_class* i_this) { if (i_this->field_0x5b4 >= 10) { return NULL; } - + if (i_this->field_0xe24.ChkAtHit() != 0) { return dCc_GetAc(i_this->field_0xe24.GetAtHitObj()->GetAc()); } @@ -1422,7 +1422,7 @@ static void e_mf_attack(e_mf_class* i_this) { cLib_addCalc0(&a_this->speedF, 1.0f, 5.0f); if (i_this->field_0x6cf != 0) { fopAc_ac_c* actor_p = at_hit_check(i_this); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK && daPy_getPlayerActorClass()->checkPlayerGuard()) { + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->mpModelMorf->setPlaySpeed(0.0f); i_this->mAction = 3; i_this->field_0x5b4 = 0; @@ -2501,7 +2501,7 @@ static void action(e_mf_class* i_this) { sp240.z = 15000.0f; } MtxPosition(&sp240, &sp24c); - + i_this->field_0x784[0].y = sp24c.x; i_this->field_0x784[0].x = sp24c.z; i_this->field_0x784[1].y = sp24c.x; @@ -2564,7 +2564,7 @@ static void action(e_mf_class* i_this) { MtxPosition(&sp240, &sp24c); i_this->field_0x816.y = -sp24c.x; i_this->field_0x816.x = -sp24c.z * 1.3f; - + if (i_this->field_0x816.x > 10000) { i_this->field_0x816.x = 10000; } @@ -2779,12 +2779,12 @@ int c_start; static int daE_MF_Execute(e_mf_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor; f32 fVar1 = 0.0f; - + if (i_this->field_0x728 != 0) { return 1; } - if (c_start == 0 && dComIfGp_event_runCheck() && + if (c_start == 0 && dComIfGp_event_runCheck() && (fopAcM_getTalkEventPartner((fopAc_ac_c*)daPy_getLinkPlayerActorClass()) == daPy_py_c::getMidnaActor() || daPy_getPlayerActorClass()->eventInfo.checkCommandDoor())) { return 1; } @@ -2908,7 +2908,7 @@ static int daE_MF_Execute(e_mf_class* i_this) { } else { i_this->field_0xa7c[0].SetR(50.0f); } - + a_this->attention_info.position = a_this->eyePos; a_this->attention_info.position.y += 70.0f; @@ -2959,7 +2959,7 @@ static int daE_MF_Execute(e_mf_class* i_this) { i_this->field_0xe24.SetAtSpl((dCcG_At_Spl)0); } } - + MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(12), *calc_mtx); i_this->mpShieldModel->setBaseTRMtx(*calc_mtx); @@ -3181,7 +3181,7 @@ static cPhs_Step daE_MF_Create(fopAc_ac_c* a_this) { l_HIO.field_0x4 = -1; } - fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(a_this, fopAcStts_CULL_e); a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e; fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx()); fopAcM_SetMin(a_this, -200.0f, -200.0f, -200.0f); @@ -3249,7 +3249,7 @@ static cPhs_Step daE_MF_Create(fopAc_ac_c* a_this) { i_this->mAtInfo.mpSound = &i_this->mSound; if (strcmp(dComIfGp_getStartStageName(), "D_MN09") == 0) { - fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(a_this, fopAcStts_UNK_0x4000_e); } c_start = 1; @@ -3273,18 +3273,18 @@ actor_method_class l_daE_MF_Method = { }; actor_process_profile_definition g_profile_E_MF = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_mf_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 120, // mPriority - &l_daE_MF_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_MF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_mf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MF_e, + /* Actor SubMtd */ &l_daE_MF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 9fc1c620d43..67a3350fcf7 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -117,10 +117,10 @@ static void* s_obj_delete(void* i_actor, void* i_data) { UNUSED(i_data); if (fopAcM_IsActor(i_actor)) { - if (fopAcM_GetName(i_actor) == PROC_E_DB) { + if (fopAcM_GetName(i_actor) == fpcNm_E_DB_e) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; actor->health = 1000; - } else if (fopAcM_GetName(i_actor) == PROC_E_DB_LEAF) { + } else if (fopAcM_GetName(i_actor) == fpcNm_E_DB_LEAF_e) { fopAcM_delete((fopAc_ac_c*)i_actor); } } @@ -149,7 +149,7 @@ static int target_info_count; static void* s_h_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) && target_info_count < 20) { + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Pillar_e) && target_info_count < 20) { target_info[target_info_count] = (daPillar_c*)i_actor; target_info_count++; } @@ -217,7 +217,7 @@ static daPillar_c* search_hasira(e_mk_class* i_this) { static void* s_d_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DB)) { + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_DB_e)) { e_db_class* actor = (e_db_class*)i_actor; if (actor->action == 10) { if (actor->mode >= 1 && target_info_count < 20) { @@ -1521,7 +1521,7 @@ static void demo_camera_start(e_mk_class* i_this) { i_this->camCenter = player->current.pos; i_this->camCenter.y += 100.0f; i_this->demoMode = e_mk_class::DEMO_MODE_FINISH; - fopAcM_OffStatus(actor, 0x4000); + fopAcM_OffStatus(actor, fopAcStts_UNK_0x4000_e); Z2GetAudioMgr()->subBgmStart(Z2BGM_BOOMERAMG_MONKEY); } @@ -1936,7 +1936,7 @@ static void demo_camera_end(e_mk_class* i_this) { static void* s_ks_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) && static_cast(i_actor)->set_id == 0) { + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) && static_cast(i_actor)->set_id == 0) { return i_actor; } @@ -1946,7 +1946,7 @@ static void* s_ks_sub(void* i_actor, void* i_data) { static void* s_brg_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_BRG) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_BRG_e) { static_cast(i_actor)->field_0xaef4 = VREG_F(11) + 500.0f; static_cast(i_actor)->mType |= (u8)4; } @@ -1957,7 +1957,7 @@ static void* s_brg_sub(void* i_actor, void* i_data) { static void* s_brg_sub2(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_BRG) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_BRG_e) { #if PLATFORM_SHIELD static_cast(i_actor)->mType &= (u8)~4u; #else @@ -2711,7 +2711,7 @@ static int daE_MK_Execute(e_mk_class* i_this) { parameters = 1; } - i_this->boomerangId = fopAcM_createChild(PROC_E_MK_BO, fopAcM_GetID(actor), parameters, + i_this->boomerangId = fopAcM_createChild(fpcNm_E_MK_BO_e, fopAcM_GetID(actor), parameters, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); i_this->unkFlag4 = 0; @@ -2917,12 +2917,12 @@ static int daE_MK_Create(fopAc_ac_c* i_actor) { mk->action = e_mk_class::ACT_S_DEMO; u32 i_parameters = fopAcM_GetParam(i_actor) & 0xFF000000 | 0xFFFF01; cXyz sp30(-21.0f, 5114.0f, -4941.0f); - mk->dbId1 = fopAcM_createChild(PROC_E_DB, fopAcM_GetID(i_actor), i_parameters, + mk->dbId1 = fopAcM_createChild(fpcNm_E_DB_e, fopAcM_GetID(i_actor), i_parameters, &sp30, fopAcM_GetRoomNo(i_actor), NULL, NULL, -1, NULL); sp30.set(-10.0f, 5114.0f, -4401.0f); - mk->dbId2 = fopAcM_createChild(PROC_E_DB, fopAcM_GetID(i_actor), i_parameters, + mk->dbId2 = fopAcM_createChild(fpcNm_E_DB_e, fopAcM_GetID(i_actor), i_parameters, &sp30, fopAcM_GetRoomNo(i_actor), NULL, NULL, -1, NULL); @@ -2949,18 +2949,18 @@ static actor_method_class l_daE_MK_Method = { }; actor_process_profile_definition g_profile_E_MK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_mk_class), // size - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 165, // mPriority - &l_daE_MK_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_MK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_mk_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MK_e, + /* Actor SubMtd */ &l_daE_MK_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_mk_bo.cpp b/src/d/actor/d_a_e_mk_bo.cpp index 8cd027d63b3..f3bbea4c95d 100644 --- a/src/d/actor/d_a_e_mk_bo.cpp +++ b/src/d/actor/d_a_e_mk_bo.cpp @@ -57,7 +57,7 @@ static void hit_check(e_mk_bo_class* i_this) { if (i_this->ccAtSph.ChkAtHit()) { cCcD_Obj* at_hit_obj = i_this->ccAtSph.GetAtHitObj(); fopAc_ac_c* at_hit_actor = dCc_GetAc(at_hit_obj->GetAc()); - if (at_hit_actor != NULL && fopAcM_GetName(at_hit_actor) == PROC_ALINK && daPy_getPlayerActorClass()->checkPlayerGuard()) { + if (at_hit_actor != NULL && fopAcM_GetName(at_hit_actor) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->checkPlayerGuard()) { dComIfGp_getVibration().StartShock(4, 0x1F, cXyz(0.0f, 1.0f, 0.0f)); } } @@ -168,7 +168,7 @@ static s8 e_mk_bo_shot(e_mk_bo_class* i_this) { OS_REPORT("E_MK_BO ANY HIT !!!!\n"); cCcD_Obj* at_hit_obj = i_this->ccAtSph.GetAtHitObj(); - if (fopAcM_GetName(dCc_GetAc(at_hit_obj->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(at_hit_obj->GetAc())) == fpcNm_ALINK_e) { OS_REPORT("E_MK_BO PL HIT !!!!\n"); e_mk->unkFlag4 = 5; i_this->field_0x5f8 = 10; @@ -813,20 +813,20 @@ static actor_method_class l_daE_MK_BO_Method = { }; actor_process_profile_definition g_profile_E_MK_BO = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MK_BO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_mk_bo_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 166, // mPriority - &l_daE_MK_BO_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_MK_BO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_mk_bo_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MK_BO_e, + /* Actor SubMtd */ &l_daE_MK_BO_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_e_mm.cpp b/src/d/actor/d_a_e_mm.cpp index dcca0564614..40e7f76d750 100644 --- a/src/d/actor/d_a_e_mm.cpp +++ b/src/d/actor/d_a_e_mm.cpp @@ -1122,7 +1122,7 @@ static int daE_MM_Create(fopAc_ac_c* actor) { actor->scale.set(l_HIO.base_size, l_HIO.base_size, l_HIO.base_size); } - i_this->armorChildId = fopAcM_createChild(PROC_E_MM_MT, fopAcM_GetID(actor), 0, &actor->current.pos, fopAcM_GetRoomNo(actor), &actor->shape_angle, &actor->scale, actor->argument, NULL); + i_this->armorChildId = fopAcM_createChild(fpcNm_E_MM_MT_e, fopAcM_GetID(actor), 0, &actor->current.pos, fopAcM_GetRoomNo(actor), &actor->shape_angle, &actor->scale, actor->argument, NULL); i_this->field_0x672 = 1; daE_MM_Execute(i_this); @@ -1140,18 +1140,18 @@ static actor_method_class l_daE_MM_Method = { }; actor_process_profile_definition g_profile_E_MM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_mm_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 167, // mPriority - &l_daE_MM_Method, // sub_method - 0x00040120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_MM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_mm_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MM_e, + /* Actor SubMtd */ &l_daE_MM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_mm_mt.cpp b/src/d/actor/d_a_e_mm_mt.cpp index cec4a232a30..b745fa31c99 100644 --- a/src/d/actor/d_a_e_mm_mt.cpp +++ b/src/d/actor/d_a_e_mm_mt.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_mm_mt.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -16,10 +16,10 @@ static int daE_MM_MT_Draw(e_mm_mt_class* i_this) { g_env_light.setLightTevColorType_MAJI(i_this->mp_model, &i_this->enemy.tevStr); mDoExt_modelUpdateDL(i_this->mp_model); - + cXyz local_18(i_this->enemy.current.pos.x, i_this->enemy.current.pos.y + 100, i_this->enemy.current.pos.z); - if (!fopAcM_CheckStatus(actor, fopAcM_STATUS_CARRY_NOW)) { + if (!fopAcM_CheckStatus(actor, fopAcStts_CARRY_NOW_e)) { i_this->m_shadowKey = dComIfGd_setShadow( i_this->m_shadowKey, 1, i_this->mp_model, &local_18, 700.0f, 0.0f, i_this->enemy.current.pos.y, i_this->m_acch.GetGroundH(), i_this->m_acch.m_gnd, @@ -42,9 +42,9 @@ static bool e_mm_hookCheck(e_mm_mt_class* i_this) { return false; } - if (i_this->m_sphere.ChkTgHit() + if (i_this->m_sphere.ChkTgHit() && i_this->m_sphere.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT) - || fopAcM_CheckStatus(actor, 0x100000)) { + || fopAcM_CheckStatus(actor, fopAcStts_HOOK_CARRY_NOW_e)) { i_this->field_0x69C = 0.0f; i_this->field_0x68A[0] = true; cXyz local_24 = i_this->enemy.current.pos; @@ -62,7 +62,7 @@ static bool e_mm_hookCheck(e_mm_mt_class* i_this) { pdVar3->setHookshotCarryOffset(fopAcM_GetID(i_this), &VStack_18); return 1; } - + if (i_this->field_0x68A[0]) { if (daPy_getPlayerActorClass()->setForceGrab(actor, 0, 1)) { @@ -89,8 +89,8 @@ static void e_mm_mt_normal(e_mm_mt_class* i_this) { fopAc_ac_c* helmasaurActor; fopAc_ac_c* actor = (fopAc_ac_c*)i_this; fopAc_ac_c* player = (fopAc_ac_c*) dComIfGp_getPlayer(0); - - + + if (fopAcM_SearchByID(actor->parentActorID, &helmasaurActor)) { actor->scale.x = helmasaurActor->scale.x; e_mm_class* helmasaur = (e_mm_class*)helmasaurActor; @@ -108,16 +108,16 @@ static void e_mm_mt_normal(e_mm_mt_class* i_this) { if (i_this->m_sphere.ChkAtShieldHit()) { i_this->m_invulnerabilityTimer = 15; helmasaur->field_0xb99 |= 1; - i_this->m_atInfo.mpCollider = i_this->m_sphere.GetAtHitObj(); + i_this->m_atInfo.mpCollider = i_this->m_sphere.GetAtHitObj(); i_this->m_sphere.SetAtSe(9); } } else { i_this->m_sphere.OffAtSetBit(); } - if (actor->argument != 1 - && ((i_this->m_sphere.ChkTgHit() - && i_this->m_sphere.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT)) - || fopAcM_CheckStatus(actor, 0x100000))) { + if (actor->argument != 1 + && ((i_this->m_sphere.ChkTgHit() + && i_this->m_sphere.GetTgHitObj()->ChkAtType(AT_TYPE_HOOKSHOT)) + || fopAcM_CheckStatus(actor, fopAcStts_HOOK_CARRY_NOW_e))) { helmasaur->field_0xb99 |= 4; } if (!helmasaur->field_0x672) { @@ -135,7 +135,7 @@ static void e_mm_mt_normal(e_mm_mt_class* i_this) { fopAcM_OffStatus(actor, 0); actor->attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e; actor->attention_info.distances[fopAc_attn_BATTLE_e] = 0; - fopAcM_OnStatus(actor, 0x400); + fopAcM_OnStatus(actor, fopAcStts_FREEZE_e); s16 actor_angle = player->shape_angle.y + 0x4000; s16 angle = actor->shape_angle.y - actor_angle; if (angle > 0x4000 || angle < -0x4000) { @@ -164,7 +164,7 @@ static void e_mm_mt_hagare(e_mm_mt_class* i_this) { int arg = i_this->m_mode; switch (arg) { case -10: - cLib_addCalc2(&i_this->enemy.speedF, 3.0f, 1.0f, 0.15f); + cLib_addCalc2(&i_this->enemy.speedF, 3.0f, 1.0f, 0.15f); cLib_addCalc2(&i_this->field_0x69C, 2000.0f, 0.1f, 200.0f); if (i_this->enemy.speedF >= 2.95f) { i_this->m_mode = 0; @@ -187,7 +187,7 @@ static void e_mm_mt_hagare(e_mm_mt_class* i_this) { sVar6 = 0x4000; } - cLib_addCalcAngleS2(&i_this->enemy.shape_angle.y, + cLib_addCalcAngleS2(&i_this->enemy.shape_angle.y, player->shape_angle.y + 0x4000 + i_this->m_carryAngle, 4, spA + 0x100); @@ -268,7 +268,7 @@ static s16 wall_angle_get(e_mm_mt_class* i_this) { cMtx_YrotS(*calc_mtx, a_this->current.angle.y); vec1.x = 0.0f; vec1.y = 0.0f; - vec1.z = -50.0f; + vec1.z = -50.0f; MtxPosition(&vec1, &vec2); vec2 += a_this->current.pos; vec1.x = 5.0f; @@ -287,7 +287,7 @@ static s16 wall_angle_get(e_mm_mt_class* i_this) { } } - vec1 = vec3[1] - vec3[0]; + vec1 = vec3[1] - vec3[0]; return vec1.atan2sX_Z() + 0x4000; } @@ -311,7 +311,7 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { if (!i_this->m_timer[0] && i_this->m_acch.ChkWallHit()) { s16 wall_angle = wall_angle_get(i_this); if (wall_angle != 0x23) { - wall_angle = i_this->enemy.current.angle.y - wall_angle; + wall_angle = i_this->enemy.current.angle.y - wall_angle; i_this->m_spin = wall_angle * (TREG_F(6) + -0.3f); ANGLE_ADD(i_this->enemy.current.angle.y, 0x8000 - (wall_angle << 1)); if (i_this->m_acch.ChkWaterHit()) { @@ -336,8 +336,8 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { mDoAud_seStart(Z2SE_EN_MM_MET_BOUND_LND, &i_this->enemy.current.pos, (u32)(i_this->enemy.speed.y), 0); } i_this->field_0x69C = NREG_F(0) + 3500.0f; - cXyz local_40 = i_this->enemy.current.pos; - cXyz local_4c(1.5f, 1.5f, 1.5f); + cXyz local_40 = i_this->enemy.current.pos; + cXyz local_4c(1.5f, 1.5f, 1.5f); if (!i_this->m_spin ) { i_this->m_spin = cM_rndFX(1300.0f); } @@ -347,7 +347,7 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { mDoAud_seStart(Z2SE_EN_MM_MET_BOUND_WTR, &i_this->enemy.current.pos, 0, 0); } else { mDoAud_seStart(Z2SE_EN_MM_MET_BOUND_LND, &i_this->enemy.current.pos, 0, 0); - } + } } } break; @@ -356,11 +356,11 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { break; } cMtx_YrotS(*calc_mtx, i_this->enemy.current.angle.y); - + local_28.x = 0.0f; - local_28.y = 0.0f; + local_28.y = 0.0f; local_28.z = i_this->enemy.speedF; - + MtxPosition(&local_28, &local_34); i_this->enemy.speed.x = local_34.x; i_this->enemy.speed.z = local_34.z; @@ -386,7 +386,7 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { } else { i_this->m_sphere.OffAtSetBit(); } - if (fopAcM_checkCarryNow(actor)) { + if (fopAcM_checkCarryNow(actor)) { i_this->m_action = 2; i_this->m_mode = 0; i_this->m_carryAngleSpeed = \ @@ -398,8 +398,8 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { } i_this->m_sphere.OffAtSetBit(); return; - } - if (fopAcM_CheckStatus(actor, 0x200) && !i_this->m_invulnerabilityTimer) { + } + if (fopAcM_CheckStatus(actor, fopAcStts_UNK_0x200_e) && !i_this->m_invulnerabilityTimer) { i_this->m_action = 1; i_this->m_mode = -10; i_this->field_0x68A[0] = false; @@ -412,7 +412,7 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) { if (sVar1 > 0x4000 || sVar1 < -0x4000) { i_this-> m_carryAngle = -0x8000; return; - } + } i_this->m_carryAngle = 0; } } @@ -713,7 +713,7 @@ static int daE_MM_MT_Execute(e_mm_mt_class* i_this) { i_this->m_invulnerabilityTimer--; } action(i_this); - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x200); + fopAcM_OffStatus(actor, fopAcStts_UNK_0x200_e); i_this->m_sound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); return true; } @@ -753,7 +753,7 @@ static int daE_MM_MT_Create(fopAc_ac_c* i_this) { cPhs_Step cVar1; bool bVar2; f32 fVar3; - + e_mm_mt_class* helmasaurShell = (e_mm_mt_class*) i_this; fopAc_ac_c* actor = (fopAc_ac_c*) i_this; @@ -764,7 +764,7 @@ static int daE_MM_MT_Create(fopAc_ac_c* i_this) { OS_REPORT("E_MM_MT PARAM %x\n", fopAcM_GetParam(i_this)); helmasaurShell->parameters = fopAcM_GetParam(i_this); OS_REPORT("E_MM_MT//////////////E_MM_MT SET 1 !!\n"); - + if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x850)) { OS_REPORT("//////////////E_MM_MT SET NON !!\n"); @@ -786,7 +786,7 @@ static int daE_MM_MT_Create(fopAc_ac_c* i_this) { i_this->field_0x560 = 2000; static dCcD_SrcSph cc_sph_src = { { - {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj + {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj {dCcD_SE_METAL, 0x0, 0x1, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x2, 0x0, 0x0, 0x407}, // mGObjTg {0x0}, // mGObjCo @@ -813,14 +813,14 @@ static int daE_MM_MT_Create(fopAc_ac_c* i_this) { } else { static dCcD_SrcSph hk_sph_src = { { - {0x0, {{0x0, 0x0, 0x0}, {0x4080, 0x3}, 0x0}}, // mObj + {0x0, {{0x0, 0x0, 0x0}, {0x4080, 0x3}, 0x0}}, // mObj {dCcD_SE_13, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x406}, // mGObjTg {0x0}, // mGObjCo }, // mObjInf { {{0.0f, 0.0f, 0.0f}, 40.0f} // m_sphere - } + } }; helmasaurShell->m_stts.SetWeight(200); helmasaurShell->m_sph.Set(hk_sph_src); @@ -836,7 +836,7 @@ static int daE_MM_MT_Create(fopAc_ac_c* i_this) { i_this->attention_info.distances[fopAc_attn_CARRY_e] = 7; helmasaurShell->m_lifetime = cM_rndF(65535.0f); daE_MM_MT_Execute(helmasaurShell); - } + } return phase; } @@ -849,18 +849,18 @@ static actor_method_class l_daE_MM_MT_Method = { }; actor_process_profile_definition g_profile_E_MM_MT = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MM_MT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_mm_mt_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 168, // mPriority - &l_daE_MM_MT_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_MM_MT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_mm_mt_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MM_MT_e, + /* Actor SubMtd */ &l_daE_MM_MT_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index 61690490abc..bfec4a614a8 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -119,7 +119,7 @@ static int target_info_count; static void* s_d_sub(void* param_1, void* param_2) { daObjCarry_c* i_this = (daObjCarry_c*)param_1; - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && i_this->getType() == daObjCarry_c::TYPE_DOKURO && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Carry_e && i_this->getType() == daObjCarry_c::TYPE_DOKURO && target_info_count < 20) { target_info[target_info_count] = (fopAc_ac_c*)param_1; @@ -1063,20 +1063,20 @@ static actor_method_class l_daE_MS_Method = { }; actor_process_profile_definition g_profile_E_MS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_MS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_ms_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 177, // mPriority - &l_daE_MS_Method, // sub_method - 0x00050100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_MS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_ms_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_MS_e, + /* Actor SubMtd */ &l_daE_MS_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index d3988cec467..25055c4bd6b 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -4,7 +4,7 @@ */ #include "d/dolzel_rel.h" // IWYU pragma: keep - + #include "d/d_s_play.h" #include "d/actor/d_a_e_nest.h" #include "d/actor/d_a_npc_tk.h" @@ -12,7 +12,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/d_bomb.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" #include @@ -57,7 +57,7 @@ static void hahen_normal(e_nest_class* i_this, nest_hahen_s* i_debris) { fopAc_ac_c* a_this = static_cast(i_this); dBgS_LinChk lin_chk; dBgS_ObjGndChk_Spl gnd_chk; - + i_debris->mCounter++; if (i_debris->mTimer != 0) { i_debris->mTimer--; @@ -189,7 +189,7 @@ static int daE_Nest_Draw(e_nest_class* i_this) { cXyz vec; f32 scale = l_HIO.mScale * i_this->scale.x; vec.set(i_this->current.pos.x, i_this->current.pos.y + 50.0f, i_this->current.pos.z); - i_this->mShadowKey = + i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, i_this->mpModel, &vec, scale * 500.0f, 0.0f, i_this->current.pos.y, i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, &i_this->tevStr, 0, 1.0f, @@ -315,7 +315,7 @@ static void e_nest_normal(e_nest_class* i_this) { i_this->mHitActorID = fopAcM_GetID(daPy_getPlayerActorClass()); /* dSv_event_flag_c::F_0073 - Ordon Village - Attacked after charging at large beehive */ dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[172]); - } else if (fopAcM_GetName(actor) == PROC_NPC_TK) { + } else if (fopAcM_GetName(actor) == fpcNm_NPC_TK_e) { daNPC_TK_c* hawk = static_cast(actor); hawk->setBump(); i_this->mHitActorID = fopAcM_GetID(hawk); @@ -437,7 +437,7 @@ static s8 e_nest_carry(e_nest_class* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); a_this->speed.y = 0.0f; s8 ret = true; - + switch (i_this->mMode) { case 0: { cLib_offBit(a_this->attention_info.flags, fopAc_AttnFlag_CARRY_e); @@ -538,7 +538,7 @@ static void e_nest_float(e_nest_class* i_this) { if (i_this->current.pos.y + 60.0f > vec.y) { fopAcM_effHamonSet(&i_this->mRippleKey, &vec, i_this->scale.x, 0.05f); } - + cLib_addCalc2(&i_this->current.pos.y, i_this->mWaterHeight - 40.0f + i_this->mBob * 0.004f * cM_ssin(i_this->mFrame * 900), 0.1f, 10.0f); i_this->mRotation.x = i_this->mBob * cM_ssin(i_this->mFrame * 1000); @@ -776,7 +776,7 @@ static void bee_nest_action(e_nest_class* i_this) { static void* shot_b_sub(void* i_actor, void* i_data) { daPy_py_c* player = static_cast(dComIfGp_getPlayer(0)); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e && !dComIfGp_checkPlayerStatus0(0, 0x80000) && player->checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { return i_actor; @@ -787,7 +787,7 @@ static void* shot_b_sub(void* i_actor, void* i_data) { static void demo_camera(e_nest_class* i_this) { camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s8 end_demo = false; - + switch (i_this->mDemoStage) { case 0: break; @@ -923,7 +923,7 @@ static int daE_Nest_IsDelete(e_nest_class* param_0) { static int daE_Nest_Delete(e_nest_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_nest"); - + if (i_this->mHIOInit) { hio_set = false; } @@ -956,7 +956,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { _this->mSound.init(&_this->current.pos, 1); _this->mBeeSound.init(&_this->current.pos, 2); - + return 1; } @@ -995,7 +995,7 @@ static cPhs_Step daE_Nest_Create(fopAc_ac_c* i_this) { _this->mParamScale = 10; } _this->scale.x = _this->mParamScale * 0.1f; - + _this->mRotation.y = _this->current.angle.y; if (_this->mBrokenSwitch != 0xff @@ -1047,7 +1047,7 @@ static cPhs_Step daE_Nest_Create(fopAc_ac_c* i_this) { _this->mCcCyl.SetStts(&_this->mCcStts); if (_this->mParamType == e_nest_class::TYPE_BEE) { - fopAcM_createChild(PROC_E_BEE, fopAcM_GetID(_this), + fopAcM_createChild(fpcNm_E_BEE_e, fopAcM_GetID(_this), _this->mParamScale << 16 | 0x100 | _this->mParam1, &_this->current.pos, fopAcM_GetRoomNo(_this), NULL, NULL, -1, NULL); @@ -1055,11 +1055,11 @@ static cPhs_Step daE_Nest_Create(fopAc_ac_c* i_this) { &_this->mAcchCir, &_this->speed, NULL, NULL); _this->mAcchCir.SetWall(_this->scale.x * 50.0f, _this->scale.x * 50.0f); } else if (_this->mParamType == e_nest_class::TYPE_BUG) { - fopAcM_createChild(PROC_E_BUG, fopAcM_GetID(_this), + fopAcM_createChild(fpcNm_E_BUG_e, fopAcM_GetID(_this), _this->mParam1 | 0xff000000, &_this->current.pos, fopAcM_GetRoomNo(_this), NULL, NULL, -1, NULL); } - + mtx_cc_set(_this); _this->mHitActorID = -1; } @@ -1075,18 +1075,18 @@ static actor_method_class l_daE_Nest_Method = { }; actor_process_profile_definition g_profile_E_NEST = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_NEST, - &g_fpcLf_Method.base, - sizeof(e_nest_class), - 0, - 0, - &g_fopAc_Method.base, - 0xB2, - &l_daE_Nest_Method, - 0xD4100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_NEST_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_nest_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_NEST_e, + /* Actor SubMtd */ &l_daE_Nest_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index 738d01b3bfb..d68b3a8cb92 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -744,18 +744,18 @@ static actor_method_class l_daE_NZ_Method = { }; actor_process_profile_definition g_profile_E_NZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_NZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_nz_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 179, // mPriority - &l_daE_NZ_Method, // sub_method - 0x10044120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_NZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_nz_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_NZ_e, + /* Actor SubMtd */ &l_daE_NZ_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index 3f7d418ee64..54abe314ce9 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -208,7 +208,7 @@ static daE_OC_HIO_c l_HIO; static void* s_other_oc(void* arg_lhs, void* arg_rhs) { f32 dist; if (arg_lhs != arg_rhs && fopAcM_IsActor(arg_lhs)) { - if (fpcM_IsCreating(fopAcM_GetID(arg_lhs)) == 0 && fopAcM_GetName(arg_lhs) == PROC_E_OC) { + if (fpcM_IsCreating(fopAcM_GetID(arg_lhs)) == 0 && fopAcM_GetName(arg_lhs) == fpcNm_E_OC_e) { if (((daE_OC_c*) arg_lhs)->isBattleOn()) { dist = fopAcM_searchActorDistance((fopAc_ac_c*) arg_lhs, (fopAc_ac_c*) arg_rhs); if (dist < l_HIO.battle_participation_radius) { @@ -331,7 +331,7 @@ bool daE_OC_c::searchPlayer() { static void* s_obj_sub(void* arg_lhs, void* arg_rhs) { if (fopAcM_IsActor(arg_lhs)) { - if (fpcM_IsCreating(fopAcM_GetID(arg_lhs)) == 0 && fopAcM_GetName(arg_lhs) == PROC_Obj_RotBridge) { + if (fpcM_IsCreating(fopAcM_GetID(arg_lhs)) == 0 && fopAcM_GetName(arg_lhs) == fpcNm_Obj_RotBridge_e) { if (fopAcM_GetRoomNo((fopAc_ac_c*) arg_lhs) == fopAcM_GetRoomNo((fopAc_ac_c*) arg_rhs)) { return arg_lhs; } @@ -429,7 +429,7 @@ bool daE_OC_c::searchSound() { static void* s_demo_oc(void* arg_lhs, void* arg_rhs) { (void) arg_rhs; if (fopAcM_IsActor(arg_lhs)) { - if (fpcM_IsCreating(fopAcM_GetID(arg_lhs)) == 0 && fopAcM_GetName(arg_lhs) == PROC_E_OC + if (fpcM_IsCreating(fopAcM_GetID(arg_lhs)) == 0 && fopAcM_GetName(arg_lhs) == fpcNm_E_OC_e && (fopAcM_GetParam(arg_lhs) & 0xFF) == 4) { return arg_lhs; } @@ -1129,7 +1129,7 @@ void daE_OC_c::executeFind() { f32 pl_dist = fopAcM_searchPlayerDistance(this); if (mOcState < 3 || !setWatchMode()) { if (field_0x6b4 == 2 && !dComIfGp_event_runCheck()) { - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); field_0x6b4 = 0; } @@ -1286,7 +1286,7 @@ void daE_OC_c::executeFind() { // Forest Temple - Entrance fopAc_ac_c* ks_actor; // Caged girl monkey in 1st room: - fopAcM_SearchByName(PROC_NPC_KS, &ks_actor); + fopAcM_SearchByName(fpcNm_NPC_KS_e, &ks_actor); if (ks_actor) { mWatchPos = ks_actor->current.pos; mWatchPos.y += 100.0f; @@ -1448,14 +1448,14 @@ void daE_OC_c::executeAttack() { fopAc_ac_c* hit_actor; if (mSphs_at[0].ChkAtHit()) { hit_actor = dCc_GetAc(mSphs_at[0].GetAtHitObj()->GetAc()); - if (fopAcM_GetName(hit_actor) == PROC_ALINK) { + if (fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { my_bool = 1; } } if (mSphs_at[1].ChkAtHit()) { hit_actor = dCc_GetAc(mSphs_at[1].GetAtHitObj()->GetAc()); - if (fopAcM_GetName(hit_actor) == PROC_ALINK) { + if (fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { my_bool = 1; } } @@ -2593,7 +2593,7 @@ int daE_OC_c::execute() { camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); dComIfGp_event_reset(); - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); fopAc_ac_c* search_actor = (fopAc_ac_c*)fpcM_Search(s_demo_oc, this); if (search_actor) { fopAcM_OffStatus(search_actor, 0x4000); @@ -2758,7 +2758,7 @@ cPhs_Step daE_OC_c::create() { if (mName == "E_OC") { mSphs_at[0].SetAtAtp(1); mSphs_at[1].SetAtAtp(1); - fopAcM_OnStatus(this, 0x10000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x10000_e); } else { mSphs_at[0].SetAtAtp(2); mSphs_at[1].SetAtAtp(2); @@ -2785,7 +2785,7 @@ cPhs_Step daE_OC_c::create() { setActionMode(E_OC_ACTION_DEMO_CHILD, 0); break; default: - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); break; } @@ -2809,20 +2809,20 @@ static actor_method_class l_daE_OC_Method = { }; actor_process_profile_definition g_profile_E_OC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_OC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_OC_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 201, // mPriority - &l_daE_OC_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_OC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_OC_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_OC_e, + /* Actor SubMtd */ &l_daE_OC_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index da094293f16..be5eabc27f5 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -352,7 +352,7 @@ bool daE_OctBg_c::checkCoreFishAttack() { if (fopAcM_SearchByID(fopAcM_GetLinkId(this), &actor) == 0 || actor == NULL) { return false; } - if (fopAcM_CheckStatus(actor, 0x100000) == 0) { + if (fopAcM_CheckStatus(actor, fopAcStts_HOOK_CARRY_NOW_e) == 0) { return false; } return true; @@ -887,20 +887,20 @@ static actor_method_class l_daE_OctBg_Method = { }; actor_process_profile_definition g_profile_E_OctBg = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_OctBg, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_OctBg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0xCD, // mPriority - &l_daE_OctBg_Method, // sub_method - 0xC4100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_OctBg_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_OctBg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_OctBg_e, + /* Actor SubMtd */ &l_daE_OctBg_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_ot.cpp b/src/d/actor/d_a_e_ot.cpp index 0da17665533..4c1adfd880c 100644 --- a/src/d/actor/d_a_e_ot.cpp +++ b/src/d/actor/d_a_e_ot.cpp @@ -161,7 +161,7 @@ void daE_OT_c::damage_check() { if (mCcSph.ChkCoHit()) { fopAc_ac_c* hit_actor = dCc_GetAc(mCcSph.GetCoHitObj()->GetAc()); - if (fopAcM_GetName(dCc_GetAc(hit_actor)) == PROC_E_DT + if (fopAcM_GetName(dCc_GetAc(hit_actor)) == fpcNm_E_DT_e && static_cast(hit_actor)->isFlyingAttack()) { setActionMode(ACT_DAMAGE, 10); @@ -530,7 +530,7 @@ void daE_OT_c::executeDamage() { } fopAcM_delete(this); if (cM_rnd() < l_HIO.mHeartDropRate) { - fopAcM_createItem(¤t.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(¤t.pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); } } break; @@ -567,14 +567,14 @@ void daE_OT_c::executeDamage() { } fopAcM_delete(this); if (cM_rnd() < l_HIO.mHeartDropRate) { - fopAcM_createItem(¤t.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(¤t.pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); } break; } } void daE_OT_c::action() { - fopAcM_SearchByName(PROC_E_DT, (fopAc_ac_c**)&mpToadActor); + fopAcM_SearchByName(fpcNm_E_DT_e, (fopAc_ac_c**)&mpToadActor); if (mpToadActor == NULL || fpcM_IsCreating(fopAcM_GetID(mpToadActor)) || mpToadActor->isDead() == 2) @@ -777,7 +777,7 @@ cPhs_Step daE_OT_c::create() { mAtInfo.mpSound = &mSound; mAtInfo.mPowerType = 1; gravity = 0.0f; - fopAcM_SearchByName(PROC_E_DT, (fopAc_ac_c**)&mpToadActor); + fopAcM_SearchByName(fpcNm_E_DT_e, (fopAc_ac_c**)&mpToadActor); mChildNo = fopAcM_GetParam(this) & 0xffff; mDemoMode = (fopAcM_GetParam(this) >> 0x10) & 0xff; @@ -787,7 +787,7 @@ cPhs_Step daE_OT_c::create() { switch (mDemoMode) { case 3: - fopAcM_OnStatus(this, 0x8000); + fopAcM_OnStatus(this, fopAcStts_STAFF_PRIMARY_e); // fallthrough case 0: @@ -838,20 +838,20 @@ static actor_method_class l_daE_OT_Method = { }; actor_process_profile_definition g_profile_E_OT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_OT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_OT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 203, // mPriority - &l_daE_OT_Method, // sub_method - 0x00050100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_OT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_OT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_OT_e, + /* Actor SubMtd */ &l_daE_OT_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index 01440f62abb..3565810f37b 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -1280,7 +1280,7 @@ int daE_PH_c::create() { l_HIO.mSpeed = mMoveSpeed; mCamAction = 0; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); daE_PH_Execute(this); } @@ -1298,18 +1298,18 @@ static actor_method_class l_daE_PH_Method = { }; actor_process_profile_definition g_profile_E_PH = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_E_PH, - &g_fpcLf_Method.base, - sizeof(daE_PH_c), - 0, - 0, - &g_fopAc_Method.base, - 131, - &l_daE_PH_Method, - 0x244100, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_PH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_PH_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_PH_e, + /* Actor SubMtd */ &l_daE_PH_Method, + /* Status */ fopAcStts_UNK_0x200000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index 4d3cae2e62f..37de17833bd 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -222,7 +222,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } static void* s_pm_sub(void* i_proc, void* i_data) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_PM + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_PM_e && static_cast(i_proc)->SwitchChk() == 1) { return i_proc; } @@ -504,7 +504,7 @@ void daE_PM_c::Ap_StartAction() { break; case Mode1: - if (fopAcM_SearchByName(PROC_Obj_SmWStone, (fopAc_ac_c**)&stone) && stone != NULL) { + if (fopAcM_SearchByName(fpcNm_Obj_SmWStone_e, (fopAc_ac_c**)&stone) && stone != NULL) { stone->deleteStone(); } @@ -547,16 +547,16 @@ void daE_PM_c::Ap_StartAction() { mParticleKey = dComIfGp_particle_set(mParticleKey, 0x880C, ¤t.pos, &tevStr, ¤t.angle, &scale, 0xff, NULL, -1, NULL, NULL, NULL); - + if (mAnm == ANM_APPEAR02 && mpMorf->isStop()) { SetAnm(ANM_WAIT01, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f); mCreatureSound.startCreatureVoice(Z2SE_EN_PM_V_LAUGH, -1); } - + if (mCamCenter.y >= current.pos.y) { mCamCenterTarget.y = current.pos.y; } - + if (mAcch.ChkGroundHit() && mTimer[0] == 0) { SetAnm(ANM_APPEAR02, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f); mTargetHeadAngleX = 0x2000; @@ -572,7 +572,7 @@ void daE_PM_c::Ap_StartAction() { cLib_offsetPos(&mCamEyeTarget, &eye, shape_angle.y, &offset); mCamCenterTarget.y = current.pos.y + 100.0f; } - + if (mCamCenterTarget.y <= mAcch.GetGroundH() + 100.0f) { mCamCenterTarget.y = mAcch.GetGroundH() + 100.0f; } @@ -592,7 +592,7 @@ void daE_PM_c::Ap_StartAction() { static void* s_obj_sub(void* i_proc, void* i_data) { for (int i = 0; i < 5; i++) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_PM && i_proc != NULL + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_PM_e && i_proc != NULL && static_cast(i_proc)->SwitchChk() == 0) { return i_proc; } @@ -626,7 +626,7 @@ void daE_PM_c::Ap_CreateAction() { case 1: mCreatureSound.startCreatureSoundLevel(Z2SE_EN_PM_TRUMPET, 0, -1); - + if (mTimer[0] == 2 && mAnm == ANM_FOGBLOW_LP) { vec2.set(500.0f, 150.0f, 0.0f); mCamCenter.set(-11239.0f, 1850.0f, 16932.0f); @@ -644,7 +644,7 @@ void daE_PM_c::Ap_CreateAction() { for (int i = 0; i < 2; i++) { vec5.set(i * 100.0f + 500.0f, 150.0f, -(i * 100.0f)); cLib_offsetPos(&vec2, ¤t.pos, shape_angle.y, &vec5); - mPuppetID[i] = fopAcM_createChild(PROC_E_FS, fopAcM_GetID(this), 0, &vec2, + mPuppetID[i] = fopAcM_createChild(fpcNm_E_FS_e, fopAcM_GetID(this), 0, &vec2, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -674,7 +674,7 @@ void daE_PM_c::Ap_CreateAction() { for (int i = 2; i < 4; i++) { vec5.set(-500.0f - (i - 2) * 100.0f, 150.0f, -((i - 2) * 100.0f)); cLib_offsetPos(&vec2, ¤t.pos, shape_angle.y, &vec5); - mPuppetID[i] = fopAcM_createChild(PROC_E_FS, fopAcM_GetID(this), 0, &vec2, + mPuppetID[i] = fopAcM_createChild(fpcNm_E_FS_e, fopAcM_GetID(this), 0, &vec2, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -720,13 +720,13 @@ void daE_PM_c::Ap_EscapeAction() { mBossLightOn = true; mTargetHeadAngleX = s_TargetAngle; cLib_addCalcAngleS2(&mHeadAngleZ, -0x500, 4, 0x600); - + if (mTimer[0] == 0) { SetAnm(ANM_RUN, J3DFrameCtrl::EMode_LOOP, 5.0f, 1.0f); mMode++; mTargetSpeed = 13.0f; } - + mDoorAction = 0; break; @@ -736,11 +736,11 @@ void daE_PM_c::Ap_EscapeAction() { } else { mCreatureSound.startCreatureSound(Z2SE_EN_PM_FN_R, 0, -1); } - + point.set(mPoint.x, mPoint.y, mPoint.z); mTargetAngleY = cLib_targetAngleY(¤t.pos, &point); cLib_addCalc2(&speedF, mTargetSpeed, 0.05f, 10.0f); - + if (mPointIndex == 7 && mDoorAction == 0) { mCamCenter = *s_LinkPos; mCamCenter.y += 200.0f; @@ -865,7 +865,7 @@ void daE_PM_c::DemoBeforeEscape() { MtxPosition(&vec2, &vec2); mParticleKey = dComIfGp_particle_set(mParticleKey, 0x880C, &vec2, &tevStr, ¤t.angle, &scale, 0xff, NULL, -1, NULL, NULL, NULL); - + if (mpMorf->isStop()) { if (mSwBit != 0xff && !dComIfGs_isSwitch(mSwBit, fopAcM_GetRoomNo(this))) { dComIfGs_onSwitch(mSwBit, fopAcM_GetRoomNo(this)); @@ -1294,7 +1294,7 @@ void daE_PM_c::DemoBossStart2() { vec1.set(current.pos.x, 1900.0f, current.pos.z); SetStopCam(vec1, 500.0f, 0.0f, s_TargetAngle); mCamEye.set(mCamEyeTarget); - actor_status &= ~0x100; + actor_status &= ~fopAcStts_CULL_e; } if (mSecondEncounter) { player->mDemo.setDemoType(daPy_demo_c::DEMO_TYPE_ORIGINAL_e); @@ -1699,7 +1699,7 @@ static void* s_boss_sub(void* i_actor, void* param_1) { fopAc_ac_c* actor = static_cast(i_actor); cXyz& actor_pos = fopAcM_GetPosition(actor); cXyz& player_pos = fopAcM_GetPosition(player); - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_SM_DOOR) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_SM_DOOR_e) { u8 prm = (fopAcM_GetParam(actor) & 0xF0) >> 4; if (player_pos.absXZ(actor_pos) < 16000.0f && prm == 1) { return i_actor; @@ -2070,7 +2070,7 @@ int daE_PM_c::Execute() { } Yazirushi(); - + if (mStage == 4) { BossAction(); } else if (mStage == 0) { @@ -2145,7 +2145,7 @@ void daE_PM_c::StartAction() { mMode++; mTimer[0] = 240; } - + } else if (mStage == 4) { SearchNearP(); mCcStts.Init(0xFA, 0xFF, this); @@ -2276,7 +2276,7 @@ void daE_PM_c::GakkiLoopAction(cXyz param_0, f32 param_1) { s16 angle = shape_angle.y + step * i; cLib_offsetPos(&vec1, ¶m_0, angle, &vec2); if (!way_bg_check2(this, vec3, vec1) || mStage == 4) { - mPuppetID[i] = fopAcM_createChild(PROC_E_FS, fopAcM_GetID(this), 0xFFFFFFF, + mPuppetID[i] = fopAcM_createChild(fpcNm_E_FS_e, fopAcM_GetID(this), 0xFFFFFFF, &vec1, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -2624,7 +2624,7 @@ int daE_PM_c::Draw() { int daE_PM_c::Delete() { dComIfG_resDelete(&mPhase, "E_PM"); - + if (mHIOInit) { hio_set = false; } @@ -2716,7 +2716,7 @@ void daE_PM_c::SkipChk() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::multVec(&vec1, &vec1); - mPuppetID[i] = fopAcM_createChild(PROC_E_FS, fopAcM_GetID(this), 0, &vec1, + mPuppetID[i] = fopAcM_createChild(fpcNm_E_FS_e, fopAcM_GetID(this), 0, &vec1, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -2728,7 +2728,7 @@ void daE_PM_c::SkipChk() { mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::multVec(&vec1, &vec1); - mPuppetID[i] = fopAcM_createChild(PROC_E_FS, fopAcM_GetID(this), 0, &vec1, + mPuppetID[i] = fopAcM_createChild(fpcNm_E_FS_e, fopAcM_GetID(this), 0, &vec1, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -2870,18 +2870,18 @@ static actor_method_class l_daE_PM_Method = { }; actor_process_profile_definition g_profile_E_PM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_PM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_PM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 161, // mPriority - &l_daE_PM_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_PM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_PM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_PM_e, + /* Actor SubMtd */ &l_daE_PM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index c4790c355ea..03097844ebd 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -1115,7 +1115,7 @@ static void e_po_dead(e_po_class* i_this) { if (var_r0) { u32 param = 0xFFFFF000; param |= i_this->mArg0; - i_this->field_0x5B8 = fopAcM_create(PROC_Obj_poFire, param, &i_this->field_0x788, + i_this->field_0x5B8 = fopAcM_create(fpcNm_Obj_poFire_e, param, &i_this->field_0x788, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); i_this->mType = 7; i_this->field_0x74A[1] = 50; @@ -1187,7 +1187,7 @@ static void e_po_dead(e_po_class* i_this) { return; } scale.x = 6.0f; - fopAcM_create(PROC_KYTAG03, 0x10000B2, &i_this->field_0x7B8, fopAcM_GetRoomNo(a_this), + fopAcM_create(fpcNm_KYTAG03_e, 0x10000B2, &i_this->field_0x7B8, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, &scale, -1); i_this->mType = 10; @@ -1472,7 +1472,7 @@ static void e_po_limbering(e_po_class* i_this) { param |= i_this->BitSW << 8; param |= mRollCount << 16; param |= i_this->BitSW3 << 24; - fopAcM_create(PROC_E_PO, param, &a_this->current.pos, fopAcM_GetRoomNo(a_this), + fopAcM_create(fpcNm_E_PO_e, param, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, NULL, -1); i_this->field_0x7E2 += 1; } @@ -1484,7 +1484,7 @@ static void e_po_limbering(e_po_class* i_this) { param |= i_this->BitSW << 8; param |= (mRollCount + (i + 1) * 0x3F) << 16; param |= i_this->BitSW3 << 24; - fopAcM_create(PROC_E_PO, param, &a_this->current.pos, fopAcM_GetRoomNo(a_this), + fopAcM_create(fpcNm_E_PO_e, param, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, NULL, -1); } mRollPlus = 0; @@ -1514,7 +1514,7 @@ static void e_po_limbering(e_po_class* i_this) { dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); mRollDemoFlag = 2; - fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(a_this, fopAcStts_UNK_0x4000_e); i_this->field_0x74A[2] = 0; i_this->mActionID = ACT_ROLL_MOVE; i_this->mType = 0; @@ -1570,7 +1570,7 @@ static void e_po_roll_move(e_po_class* i_this) { if (mRollDemoFlag != 0) { anm_init(i_this, ANM_WAIT02, 10.0f, 2, 1.0f); i_this->field_0x74A[1] = 2; - fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(a_this, fopAcStts_UNK_0x4000_e); } else { anm_init(i_this, ANM_RUN_AFTER2, 10.0f, 2, 1.0f); i_this->field_0x74A[1] = 20; @@ -1601,7 +1601,7 @@ static void e_po_roll_move(e_po_class* i_this) { if (mRollPlus != 0) { if (i_this->mAnmID == ANM_AWAKE) { anm_init(i_this, ANM_WAIT02, 10.0f, 2, 1.0f); - fopAcM_OffStatus(a_this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(a_this, fopAcStts_UNK_0x4000_e); } i_this->field_0x7D4 = 0.0f; i_this->mType = 2; @@ -1828,7 +1828,7 @@ static void e_po_holl_demo(e_po_class* i_this) { a_this->current.pos.set(mKPosInit_dt[0]); for (int i = 1; i < 4; i++) { param = i - 0xFFF9; - fopAcM_create(PROC_E_PO, param, &a_this->current.pos, fopAcM_GetRoomNo(a_this), + fopAcM_create(fpcNm_E_PO_e, param, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, NULL, -1); } a_this->health = 2; @@ -2225,7 +2225,7 @@ static void e_po_holl_demo(e_po_class* i_this) { i_this->field_0x838.set(mKeyeInit_dt[i + 10]); i_this->field_0x7E2 ^= local_100; i_this->field_0x7DE += 1; - fopAcM_createChild(PROC_E_PO, fopAcM_GetID(a_this), param, + fopAcM_createChild(fpcNm_E_PO_e, fopAcM_GetID(a_this), param, &mKPosInit_dt[i + 14], fopAcM_GetRoomNo(a_this), &a_this->shape_angle, NULL, -1, NULL); if (i == 0) { @@ -3164,20 +3164,20 @@ static actor_method_class l_daE_PO_Method = { }; actor_process_profile_definition g_profile_E_PO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_PO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_po_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 162, // mPriority - &l_daE_PO_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_PO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_po_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_PO_e, + /* Actor SubMtd */ &l_daE_PO_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index 3801be9c803..b46ca3e4679 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -220,7 +220,7 @@ void daE_PZ_c::mEnemyScaleSet() { for (int i = 0; i < 25; i++) { fopAc_ac_c* spC; if (field_0x7dc[i] != 0 && fopAcM_SearchByID(field_0x7dc[i], &spC) && spC != NULL) { - fopAcM_OnStatus(spC, 0x4000); + fopAcM_OnStatus(spC, fopAcStts_UNK_0x4000_e); if (field_0x7d8 == 2 && field_0x843 == 0) { Z2GetAudioMgr()->seStart(Z2SE_EN_PZ_DKBB_VANISH, &spC->current.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -381,7 +381,7 @@ void daE_PZ_c::damage_check() { } static void* s_PointSearch(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_PZ && ((daE_PZ_c*)i_actor)->arg0 == 10) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_PZ_e && ((daE_PZ_c*)i_actor)->arg0 == 10) { ((daE_PZ_c*)i_data)->mPointPos[((daE_PZ_c*)i_data)->mPointNum].set(((daE_PZ_c*)i_actor)->current.pos); ((daE_PZ_c*)i_data)->field_0x780[((daE_PZ_c*)i_data)->mPointNum] = (fopAcM_GetParam(i_actor) & 0xFF00) >> 8; @@ -629,7 +629,7 @@ void daE_PZ_c::executeOpeningDemo() { if (mAnm != 0xD) { setBck(0xD, 2, 3.0f, 1.0f); // fakematch, fpcM_GetID should be fopAcM_GetID - parentActorID = fopAcM_createChild(PROC_E_PZ, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_E_PZ_e, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } lbl_222_bss_71 = field_0x7d8 = 0; @@ -783,7 +783,7 @@ void daE_PZ_c::executeOpeningDemo() { for (int i = 0; i < 25; i++) { if (field_0x7dc[i] != 0 && fopAcM_SearchByID(field_0x7dc[i], &parent) && parent != NULL) { - fopAcM_OnStatus(parent, 0x4000); + fopAcM_OnStatus(parent, fopAcStts_UNK_0x4000_e); } } @@ -829,7 +829,7 @@ void daE_PZ_c::executeOpeningDemo() { for (int i = 0; i < 25; i++) { if (field_0x7dc[i] != 0 && fopAcM_SearchByID(field_0x7dc[i], &parent) && parent != NULL) { - fopAcM_OnStatus(parent, 0x4000); + fopAcM_OnStatus(parent, fopAcStts_UNK_0x4000_e); } } @@ -854,7 +854,7 @@ void daE_PZ_c::executeOpeningDemo() { for (int i = 0; i < 25; i++) { if (field_0x7dc[i] != 0 && fopAcM_SearchByID(field_0x7dc[i], &parent) && parent != NULL) { - fopAcM_OffStatus(parent, 0x4000); + fopAcM_OffStatus(parent, fopAcStts_UNK_0x4000_e); } } @@ -985,7 +985,7 @@ void daE_PZ_c::executeOpeningDemo() { if (mAnm == 0xB && mpModelMorf->isStop()) { setBck(0xD, 2, 3.0f, 1.0f); // fakematch, fpcM_GetID should be fopAcM_GetID - parentActorID = fopAcM_createChild(PROC_E_PZ, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_E_PZ_e, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); lbl_222_bss_71 = field_0x7d8 = 2; } @@ -1138,7 +1138,7 @@ void daE_PZ_c::executeOpeningDemo() { mDemoCameraEye.set(mPzEyeInit_dt[4]); // fakematch, fpcM_GetID should be fopAcM_GetID - parentActorID = fopAcM_createChild(PROC_E_PZ, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_E_PZ_e, fpcM_GetID(this), sp28 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); setBck(0xC, 0, 10.0f, 1.0f); daPy_getPlayerActorClass()->changeDemoMode(0x10, 0, 0, 0); @@ -1407,7 +1407,7 @@ void daE_PZ_c::executeAttack() { break; case 1: if (mpModelMorf->isStop()) { - parentActorID = fopAcM_createChild(PROC_E_PZ, fopAcM_GetID(this), sp20 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_E_PZ_e, fopAcM_GetID(this), sp20 + arg0, &field_0x7a8, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); if (mAnm == 0xB) { setBck(0xC, 0, 3.0f, 1.0f); @@ -1662,7 +1662,7 @@ void daE_PZ_c::executeDead() { sp68.set(current.pos); sp68.y = mAcch.GetGroundH(); - fopAcM_create(PROC_KYTAG12, 1, &sp68, fopAcM_GetRoomNo(this), NULL, NULL, -1); + fopAcM_create(fpcNm_KYTAG12_e, 1, &sp68, fopAcM_GetRoomNo(this), NULL, NULL, -1); field_0x7c4 = 0.0f; field_0x7d0 = 140; @@ -1758,12 +1758,12 @@ static const struct { u32 parameters; int unk_0x8; } BIRTH_DT[] = { - {PROC_E_YK, 0xFFFFFF01, 20}, - {PROC_E_YG, 0xFFFFFF00, 20}, - {PROC_E_PZ, 0xFFFF001E, 12}, - {PROC_E_S1, 0xFFFFEF00, 8}, - {PROC_E_YH, 0xFF1FFF00, 12}, - {PROC_E_PZ, 0xFFFFFF28, 3}, + {fpcNm_E_YK_e, 0xFFFFFF01, 20}, + {fpcNm_E_YG_e, 0xFFFFFF00, 20}, + {fpcNm_E_PZ_e, 0xFFFF001E, 12}, + {fpcNm_E_S1_e, 0xFFFFEF00, 8}, + {fpcNm_E_YH_e, 0xFF1FFF00, 12}, + {fpcNm_E_PZ_e, 0xFFFFFF28, 3}, }; static const s16 mDBaBa_birthAngle_dt[] = { @@ -2507,7 +2507,7 @@ int daE_PZ_c::create() { } else { if ((arg0 == 0 || arg0 == 1) && bitSw != 0xFF && fopAcM_isSwitch( this, bitSw)) { cXyz pos(0.0f, 0.0f, -1300.0f); - fopAcM_create(PROC_KYTAG12, 1, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); + fopAcM_create(fpcNm_KYTAG12_e, 1, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); return cPhs_ERROR_e; } @@ -2619,7 +2619,7 @@ int daE_PZ_c::create() { } else if (arg0 != 30 && arg0 != 40) { if (arg0 == 22 || arg0 == 23) { arg0 -= 2; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } field_0x7c8 = 1.0f; setActionMode(6, 0); @@ -2657,20 +2657,20 @@ static actor_method_class l_daE_PZ_Method = { }; actor_process_profile_definition g_profile_E_PZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_PZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_PZ_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 175, // mPriority - &l_daE_PZ_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_PZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_PZ_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_PZ_e, + /* Actor SubMtd */ &l_daE_PZ_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_rb.cpp b/src/d/actor/d_a_e_rb.cpp index c34dddbd434..be48abd49a9 100644 --- a/src/d/actor/d_a_e_rb.cpp +++ b/src/d/actor/d_a_e_rb.cpp @@ -508,7 +508,7 @@ static int target_info_count; static void* s_s_sub(void* i_actor, void* i_data) { fopAc_ac_c* parent; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RB && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RB_e && fopAcM_SearchByID(((fopAc_ac_c*)i_actor)->parentActorID, &parent) && parent != NULL && (fopAc_ac_c*)i_data == parent && target_info_count < 10) { @@ -644,7 +644,7 @@ static void e_rb_base_1(e_rb_class* i_this) { i_this->mode = 0; for (int i = 0; i < i_this->childNum; i++) { - fopAcM_createChild(PROC_E_RB, fopAcM_GetID(enemy), 1, &enemy->current.pos, fopAcM_GetRoomNo(enemy), NULL, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_RB_e, fopAcM_GetID(enemy), 1, &enemy->current.pos, fopAcM_GetRoomNo(enemy), NULL, NULL, -1, NULL); } } } @@ -793,7 +793,7 @@ static int daE_RB_Create(fopAc_ac_c* i_this) { } for (int i = 0; i < a_this->childNum; i++) { - fopAcM_createChild(PROC_E_RB, fopAcM_GetID(i_this), 1, &i_this->current.pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_RB_e, fopAcM_GetID(i_this), 1, &i_this->current.pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1, NULL); } a_this->appearRange = (fopAcM_GetParam(i_this) & 0xFF0000) >> 0x10; @@ -870,18 +870,18 @@ static actor_method_class l_daE_RB_Method = { }; actor_process_profile_definition g_profile_E_RB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_RB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_rb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 153, // mPriority - &l_daE_RB_Method, // sub_method - 0x10040120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_RB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_rb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_RB_e, + /* Actor SubMtd */ &l_daE_RB_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index 257067c169c..d470e2ac20d 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_rd.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -284,7 +284,7 @@ void daE_RD_HIO_c::genMessage(JORMContext* ctext) { static fopAc_ac_c* get_pla(fopAc_ac_c* actor) { fopAc_ac_c* pla = dComIfGp_getPlayer(0); // "coach" refers to the Ilia/Telma transport wagon: - fopAc_ac_c* coach = fopAcM_SearchByName(PROC_NPC_COACH); + fopAc_ac_c* coach = fopAcM_SearchByName(fpcNm_NPC_COACH_e); if (coach == NULL) { return dComIfGp_getPlayer(0); @@ -657,7 +657,7 @@ static s8 data_80519230; static void* s_b_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && + if (fopAcM_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && !((dBomb_c*)i_actor)->checkStateExplode() && target_info_count < 10) { target_info[target_info_count] = (fopAc_ac_c*)i_actor; target_info_count++; @@ -811,7 +811,7 @@ static void ride_off(e_rd_class* i_this) { } static void* s_wb_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { e_wb_class* boar = (e_wb_class*) i_actor; e_rd_class* i_this = (e_rd_class*)i_data; if (boar->mActionID != ACTION_DROP && boar->mActionID != ACTION_DAMAGE @@ -1514,7 +1514,7 @@ static void e_rd_fight(e_rd_class* i_this) { cLib_addCalc0(&enemy->speedF, 1.0f, 3.0f); if (i_this->field_0x9ab != 0) { fopAc_ac_c* actor = at_hit_check(i_this); - if (actor != NULL && fopAcM_GetName(actor) == PROC_ALINK) { + if (actor != NULL && fopAcM_GetName(actor) == fpcNm_ALINK_e) { if (daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->anm_p->setPlaySpeed(-1.0f); dComIfGp_getVibration().StartShock(4, 31, cXyz(0.0f, 1.0f, 0.0f)); @@ -1705,7 +1705,7 @@ static void e_rd_bow(e_rd_class* i_this) { } static void* s_command3_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data && ((e_rd_class*)i_actor)->action == ACTION_COMMANDER) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && i_actor != i_data && ((e_rd_class*)i_actor)->action == ACTION_COMMANDER) { return i_actor; } @@ -1931,7 +1931,7 @@ static void e_rd_wb_search(e_rd_class* i_this) { if (i_this->cc_sph[i].ChkCoHit()) { cCcD_Obj* co_hit_obj_p = i_this->cc_sph[i].GetCoHitObj(); fopAc_ac_c* hit_actor = dCc_GetAc(co_hit_obj_p->GetAc()); - if (hit_actor != NULL && hit_actor != actor && fopAcM_GetName(hit_actor) == PROC_E_WB) { + if (hit_actor != NULL && hit_actor != actor && fopAcM_GetName(hit_actor) == fpcNm_E_WB_e) { bVar1 = 1; } } @@ -2425,7 +2425,7 @@ static void e_rd_wb_run(e_rd_class* i_this) { } static void* s_wbrun_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { e_wb_class* boar = (e_wb_class*)i_actor; fopAc_ac_c* actor = (fopAc_ac_c*)i_data; if (boar->field_0x79d == 0) { @@ -2762,7 +2762,7 @@ static void rd_disappear(e_rd_class* i_this) { MtxPosition(&mae, &ato); u8 type = 0; - if (fopAcM_SearchByName(PROC_NPC_COACH) != NULL) { + if (fopAcM_SearchByName(fpcNm_NPC_COACH_e) != NULL) { fopAcM_createDisappear(enemy, &ato, 10, type, 51); } else { fopAcM_createDisappear(enemy, &ato, 10, type, 11); @@ -3171,7 +3171,7 @@ static s16 gake_check(e_rd_class* i_this, f32 param_2) { } static void* s_bikkuri_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && i_actor != i_data) { if (((e_rd_class*)i_actor)->action == ACTION_BOW3 && ((e_rd_class*)i_actor)->mode <= 2) { cXyz sp28 = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos; if (sp28.abs() < KREG_F(11) + 350.0f) { @@ -3186,7 +3186,7 @@ static void* s_bikkuri_sub(void* i_actor, void* i_data) { } static void* s_saku_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_H_Saku) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_H_Saku_e) { cXyz sp14 = ((daObjH_Saku_c*)i_actor)->field_0x5e0 - ((fopAc_ac_c*)i_data)->current.pos; if (sp14.abs() < 200.0f) { return i_actor; @@ -3503,7 +3503,7 @@ static s8 e_rd_bow3(e_rd_class* i_this) { static void* s_command2_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && ((e_rd_class*)i_actor)->action == ACTION_BOW3 && ((e_rd_class*)i_actor)->mode < 10) { ((e_rd_class*)i_actor)->timer[0] = cM_rndF(10.0f) + 10.0f; ((e_rd_class*)i_actor)->mode = 10; @@ -3513,7 +3513,7 @@ static void* s_command2_sub(void* i_actor, void* i_data) { } static void* s_command4_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data && ((e_rd_class*)i_actor)->action == ACTION_BOW3) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && i_actor != i_data && ((e_rd_class*)i_actor)->action == ACTION_BOW3) { return i_actor; } @@ -3797,7 +3797,7 @@ static void e_rd_ikki2_start(e_rd_class* i_this) { anm_init(i_this, e_rdb_class::BCK_RB_ROP_DEMO2_WAIT, 1.0f, 2, 1.0f); i_this->mode++; break; - + case 2: anm_init(i_this, e_rdb_class::BCK_RB_ROP_DEMO2_EXCITE, 5.0f, 0, 1.0f); i_this->sound.startCreatureVoice(Z2SE_EN_RDB_V_DEMO_EXCITE, -1); @@ -3999,7 +3999,7 @@ static void e_rd_ikki2_end(e_rd_class* i_this) { static void* s_rdb_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RDB) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RDB_e) { return i_actor; } @@ -4062,7 +4062,7 @@ static void e_rd_lv9_end(e_rd_class* i_this) { static void* s_boom_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e) { e_rd_class* i_this = (e_rd_class*) i_actor; if (i_this->field_0x99a != 0) { return i_this; @@ -4120,7 +4120,7 @@ static void big_damage(e_rd_class* i_this) { if (i_this->ride_mode != 0) { i_this->field_0x9f6 = cM_rndFX(3000.0f); } else { - if (fopAcM_GetName(i_this->AtInfo.mpActor) == PROC_E_WB) { + if (fopAcM_GetName(i_this->AtInfo.mpActor) == fpcNm_E_WB_e) { i_this->field_0x9f6 = cM_rndFX(8000.0f); enemy->speed.y = cM_rndF(15.0f) + (35.0f + TREG_F(17)); i_this->jump_z = -(i_this->AtInfo.mpActor->speedF * 0.5f); @@ -4467,7 +4467,7 @@ static void damage_check(e_rd_class* i_this) { i_this->action = ACTION_WB_RUN; i_this->mode = 0; } - break; + break; } if (i_this->ride_mode != 0 && i_this->AtInfo.mpCollider->ChkAtType(AT_TYPE_BOOMERANG)) { @@ -4508,7 +4508,7 @@ static void damage_check(e_rd_class* i_this) { static void* s_other_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->arg1 != 6) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && ((e_rd_class*)i_actor)->arg1 != 6) { return i_actor; } @@ -4518,8 +4518,8 @@ static void* s_other_sub(void* i_actor, void* i_data) { static void* s_ep_sub(void* i_actor, void* i_data) { UNUSED(i_data); fopAc_ac_c* player = dComIfGp_getPlayer(0); - - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Lv1Cdl00) { + + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Lv1Cdl00_e) { if (!fopAcM_isSwitch((fopAc_ac_c*)i_actor, fopAcM_GetParam(i_actor) & 0xFF)) { f32 x, z; x = ((fopAc_ac_c*)i_actor)->current.pos.x - player->current.pos.x; @@ -4902,7 +4902,7 @@ static int rd_count; static void* s_tag_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->field_0x5ba != 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && ((e_rd_class*)i_actor)->field_0x5ba != 0) { rd_count++; } @@ -4939,7 +4939,7 @@ static void e_rd_tag(e_rd_class* i_this) { } else { parameter = 0xFF011123; } - fopAcM_createChild(PROC_E_RD, fopAcM_GetID(enemy), parameter, &pos, fopAcM_GetRoomNo(enemy), &angl, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_RD_e, fopAcM_GetID(enemy), parameter, &pos, fopAcM_GetRoomNo(enemy), &angl, NULL, -1, NULL); } } } @@ -5275,7 +5275,7 @@ static void action(e_rd_class* i_this) { } cLib_addCalc0(&i_this->field_0x9c0, 1.0f, 3.0f); - + if (i_this->field_0x9f0 > 0.1f) { mae.x = 0.0f; mae.y = 0.0f; @@ -5707,7 +5707,7 @@ static void fire_eff_set(e_rd_class* i_this) { } static void* s_wb_sub2(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { e_wb_class* boar = (e_wb_class*) i_actor; fopAc_ac_c* actor = (fopAc_ac_c*) i_data; if (target_info_count < 2) { @@ -5721,7 +5721,7 @@ static void* s_wb_sub2(void* i_actor, void* i_data) { static void* s_lv9dn_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DN && ((e_dn_class*)i_actor)->status != 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_DN_e && ((e_dn_class*)i_actor)->status != 0) { ((e_dn_class*)i_actor)->status = 0; return i_actor; } @@ -5731,17 +5731,17 @@ static void* s_lv9dn_sub(void* i_actor, void* i_data) { static void* s_lv9dn_sub2(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DN && ((e_dn_class*)i_actor)->status == 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_DN_e && ((e_dn_class*)i_actor)->status == 0) { ((e_dn_class*)i_actor)->status = 1; ((e_dn_class*)i_actor)->mode = 0; } - + return NULL; } static void* s_lv9dn_sub3(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DN) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_DN_e) { ((e_dn_class*)i_actor)->mode = 2; } @@ -5750,7 +5750,7 @@ static void* s_lv9dn_sub3(void* i_actor, void* i_data) { static void* s_lv9rd_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->field_0xafb != 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && ((e_rd_class*)i_actor)->field_0xafb != 0) { ((e_rd_class*)i_actor)->field_0xafb = 0; } @@ -5761,7 +5761,7 @@ static u8 data_80519338; static void* s_lv9rd_sub2(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && ((e_rd_class*)i_actor)->arg1 == data_80519338 && ((e_rd_class*)i_actor)->action != ACTION_DROP) { ((e_rd_class*)i_actor)->action = ACTION_DROP; ((e_rd_class*)i_actor)->mode = 2; @@ -5778,7 +5778,7 @@ static void* s_lv9rd_sub2(void* i_actor, void* i_data) { static void* s_lv9rd_sub3(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e && (((e_rd_class*)i_actor)->arg1 == 13 || ((e_rd_class*)i_actor)->arg1 == 14)) { ((e_rd_class*)i_actor)->field_0x9a4 = 1; ((e_rd_class*)i_actor)->attack_range = 50000.0f; @@ -5789,7 +5789,7 @@ static void* s_lv9rd_sub3(void* i_actor, void* i_data) { static void* s_lv9arrow_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_ARROW) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_ARROW_e) { ((e_arrow_class*)i_actor)->field_0xa14 = 1; } @@ -5798,7 +5798,7 @@ static void* s_lv9arrow_sub(void* i_actor, void* i_data) { static void* s_lv9arrow_sub2(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_ARROW) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_ARROW_e) { ((e_arrow_class*)i_actor)->field_0xa14 = 0; ((e_arrow_class*)i_actor)->mAction = ACTION_BOW_RUN; ((e_arrow_class*)i_actor)->mMode = 0; @@ -5831,7 +5831,7 @@ static void demo_camera(e_rd_class* i_this) { daPy_py_c* pla = (daPy_py_c*)dComIfGp_getPlayer(0); camera_process_class* camera = (camera_process_class*) dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_class* camera0 = (camera_class*) dComIfGp_getCamera(0); - daNPC_TK_c* taka = (daNPC_TK_c*) fopAcM_SearchByName(PROC_NPC_TK); + daNPC_TK_c* taka = (daNPC_TK_c*) fopAcM_SearchByName(fpcNm_NPC_TK_e); fopAc_ac_c* actor = taka; cXyz mae, ato, sp50, target; bool sp_0x9 = true; // unused @@ -6567,7 +6567,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->field_0x6d0 = 1.0f; MTXCopy(model->getAnmMtx(13), *calc_mtx); camera_class* camera = (camera_class*) dComIfGp_getCamera(0); - + static f32 time_scale[25] = { 1.2f, 1.2f, 1.1f, 1.0f, 0.8f, 0.6f, 0.4f, 0.2f, @@ -6876,7 +6876,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { parameter |= 16; } - fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(enemy), parameter, &ato, fopAcM_GetRoomNo(enemy), &angl, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_ARROW_e, fopAcM_GetID(enemy), parameter, &ato, fopAcM_GetRoomNo(enemy), &angl, NULL, -1, NULL); i_this->arrow_flag = 0; i_this->bow_shake_timer = TREG_S(8) + 15; } @@ -7101,7 +7101,7 @@ static void ride_game_actor_set(e_rd_class* i_this) { parameter = (i << 8 | 0x80000006); } - fopAcM_create(PROC_E_WB, parameter, &ato, fopAcM_GetRoomNo(a_this), &angl, NULL, -1); + fopAcM_create(fpcNm_E_WB_e, parameter, &ato, fopAcM_GetRoomNo(a_this), &angl, NULL, -1); } } @@ -7124,7 +7124,7 @@ static void coach_game_actor_set(e_rd_class* i_this) { angl.y = pla->shape_angle.y; for (int i = 0; i < NREG_S(7) + 3; i++) { - fopAcM_create(PROC_E_WB, (i + 1) * 0x100 | 0x8000000a, &set_pos[i], fopAcM_GetRoomNo(enemy), &angl, NULL, -1); + fopAcM_create(fpcNm_E_WB_e, (i + 1) * 0x100 | 0x8000000a, &set_pos[i], fopAcM_GetRoomNo(enemy), &angl, NULL, -1); } } @@ -7161,12 +7161,12 @@ static int useHeapInit(fopAc_ac_c* a_this) { } static int boss_part_bmd[14] = { - e_rdb_class::BMDR_SHOULDERL_ARMOR, e_rdb_class::BMDR_LEGR_ARMOR, - e_rdb_class::BMDR_SHOULDERR_ARMOR, e_rdb_class::BMDR_LEGL_ARMOR, - e_rdb_class::BMDR_MUNE2_ARMOR, e_rdb_class::BMDR_SENA2_ARMOR, - e_rdb_class::BMDR_ARML_ARMOR, e_rdb_class::BMDR_ARML2_ARMOR, - e_rdb_class::BMDR_FACE_ARMOR, e_rdb_class::BMDR_ARMR_ARMOR, - e_rdb_class::BMDR_ARMR2_ARMOR, e_rdb_class::BMDR_SENA_ARMOR, + e_rdb_class::BMDR_SHOULDERL_ARMOR, e_rdb_class::BMDR_LEGR_ARMOR, + e_rdb_class::BMDR_SHOULDERR_ARMOR, e_rdb_class::BMDR_LEGL_ARMOR, + e_rdb_class::BMDR_MUNE2_ARMOR, e_rdb_class::BMDR_SENA2_ARMOR, + e_rdb_class::BMDR_ARML_ARMOR, e_rdb_class::BMDR_ARML2_ARMOR, + e_rdb_class::BMDR_FACE_ARMOR, e_rdb_class::BMDR_ARMR_ARMOR, + e_rdb_class::BMDR_ARMR2_ARMOR, e_rdb_class::BMDR_SENA_ARMOR, e_rdb_class::BMDR_HEAD_ARMOR, e_rdb_class::BMDR_MUNE_ARMOR, }; static int ikki2_boss_part_bmd[2] = { @@ -7384,7 +7384,7 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { i_this->action = ACTION_BOW_IKKI; i_this->timer[0] = 142 + XREG_S(2); } else if (i_this->arg2 == 11) { - fopAcM_create(PROC_E_RDY, fopAcM_GetParam(actor), &actor->home.pos, + fopAcM_create(fpcNm_E_RDY_e, fopAcM_GetParam(actor), &actor->home.pos, fopAcM_GetRoomNo(actor), &actor->home.angle, NULL, -1); } @@ -7400,7 +7400,7 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { i_this->sw = 0; } - fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(actor, fopAcStts_CULL_e); actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e; if (i_this->arg0 == 6) { @@ -7450,7 +7450,7 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { i_this->action = ACTION_REG; i_this->mode = 0; i_this->field_0xafb = 1; - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(actor, fopAcStts_CULL_e); } if (i_this->arg0 > 2) { @@ -7559,10 +7559,10 @@ static cPhs_Step daE_RD_Create(fopAc_ac_c* actor) { if (desert_substage != 0 || strcmp(dComIfGp_getStartStageName(), "F_SP115") == 0 || (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0 && fopAcM_GetRoomNo(actor) == 0)) { // Lake Hylia or Hyrule Field - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(actor, fopAcStts_UNK_0x4000_e); } } else if (i_this->actor_set != 4) { - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(actor, fopAcStts_UNK_0x4000_e); } if (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0 && fopAcM_GetRoomNo(actor) == 0) { @@ -7598,18 +7598,18 @@ static actor_method_class l_daE_RD_Method = { }; actor_process_profile_definition g_profile_E_RD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_RD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_rd_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 154, // mPriority - &l_daE_RD_Method, // sub_method - 0x00044000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_RD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_rd_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_RD_e, + /* Actor SubMtd */ &l_daE_RD_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index 48a0872833a..f9a019e4171 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -521,7 +521,7 @@ static void e_rdb_damage(e_rdb_class* i_this) { static void e_rdb_end(e_rdb_class* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - e_wb_class* actor = (e_wb_class*)fopAcM_SearchByName(PROC_E_WB); + e_wb_class* actor = (e_wb_class*)fopAcM_SearchByName(fpcNm_E_WB_e); int frame = i_this->mpModelMorf->getFrame(); cXyz sp40; f32 fVar1 = 0.0f; @@ -864,7 +864,7 @@ static void damage_check(e_rdb_class* i_this) { } static void* shot_s_sub(void* i_actor, void* i_data) { - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW) && + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e) && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) { cXyz sp28 = static_cast(i_data)->current.pos - @@ -1285,7 +1285,7 @@ static void demo_camera(e_rdb_class* i_this) { csXyz i_angle(0, cM_atan2s(sp28.x, sp28.z), 0); sp58 = a_this->current.pos; sp58.y += 2000.0f; - fopAcM_create(PROC_E_RD, 12, &sp58, fopAcM_GetRoomNo(a_this), &i_angle, NULL, -1); + fopAcM_create(fpcNm_E_RD_e, 12, &sp58, fopAcM_GetRoomNo(a_this), &i_angle, NULL, -1); sp34.set(-7530.0f, 50.0f, -5451.0f); player->setPlayerPosAndAngle(&sp34, -0x5F3B, 0); i_this->mDemoCamCenter.set(-7661.0f, 323.0f, -5684.0f); @@ -1295,7 +1295,7 @@ static void demo_camera(e_rdb_class* i_this) { } if (i_this->field_0x10aa >= 40) { - e_rd_class* bulblin_p = (e_rd_class*)fopAcM_SearchByName(PROC_E_RD); + e_rd_class* bulblin_p = (e_rd_class*)fopAcM_SearchByName(fpcNm_E_RD_e); if (bulblin_p != NULL) { a_this->current.pos = bulblin_p->enemy.current.pos; a_this->eyePos = bulblin_p->enemy.eyePos; @@ -1342,8 +1342,8 @@ static void demo_camera(e_rdb_class* i_this) { if (i_this->field_0x10aa == 180) { sVar1 = 1; fopAcM_delete(a_this); - fopAcM_delete(fopAcM_SearchByName(PROC_E_RD)); - fopAcM_delete(fopAcM_SearchByName(PROC_E_WB)); + fopAcM_delete(fopAcM_SearchByName(fpcNm_E_RD_e)); + fopAcM_delete(fopAcM_SearchByName(fpcNm_E_WB_e)); dComIfGs_onStageMiddleBoss(); int swBit = fopAcM_GetParam(a_this) >> 24; if (swBit != 0xFF) { @@ -1921,18 +1921,18 @@ static actor_method_class l_daE_RDB_Method = { }; actor_process_profile_definition g_profile_E_RDB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_RDB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_rdb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 156, // mPriority - &l_daE_RDB_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_RDB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_rdb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_RDB_e, + /* Actor SubMtd */ &l_daE_RDB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index 3f37e1c1193..5f9b8b5fd44 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_rdy.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -154,7 +154,7 @@ enum Animation { /* 0x4C */ ANM_WAIT01, /* 0x4D */ ANM_WALK, }; - + enum Joint { /* 0x00 */ JNT_KOSI, /* 0x01 */ JNT_HIP1, @@ -383,7 +383,7 @@ static int daE_RDY_Draw(e_rdy_class* i_this) { && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[239])) { return 1; } - + if (i_this->mKargarokDeleteTimer != 0) { return 1; } @@ -522,7 +522,7 @@ static dBomb_c* search_bomb(e_rdy_class* i_this, BOOL param_1) { vec2.z = bomb->current.pos.z - a_this->current.pos.z; f32 dist1 = JMAFastSqrt(vec1.x * vec1.x + vec1.z * vec1.z); f32 dist2 = JMAFastSqrt(vec2.x * vec2.x + vec2.z * vec2.z); - + if (dist1 < threshold && !(dist2 > i_this->mPlayerDist + 30.0f) && (!other_bg_check(i_this, bomb) || !param_1)) { @@ -530,7 +530,7 @@ static dBomb_c* search_bomb(e_rdy_class* i_this, BOOL param_1) { f32 abs_res = fabsf(50.0f + bomb->current.pos.y - a_this->eyePos.y); if (abs_res <= 300.0f) { s16 ang_y = a_this->shape_angle.y - cM_atan2s(vec1.x, vec1.z); - + if (ang_y < 0) { ang_y = (-1 * ang_y); } @@ -1104,7 +1104,7 @@ static void e_rdy_fight(e_rdy_class* i_this) { if (i_this->field_0xa7b != 0) { fopAc_ac_c* hit_actor = at_hit_check(i_this); - if (hit_actor != NULL && fopAcM_GetName(hit_actor) == PROC_ALINK + if (hit_actor != NULL && fopAcM_GetName(hit_actor) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->mpMorf->setPlaySpeed(-1.0f); @@ -1293,7 +1293,7 @@ static void e_rdy_bow(e_rdy_class* i_this) { } static void* s_command3_sub(void* i_proc, void* i_this) { - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_RDY_e) { if (i_proc != i_this && ((e_rdy_class*)i_proc)->mAction == ACT_COMMANDER) { return i_proc; } @@ -1550,7 +1550,7 @@ static void e_rdy_avoid(e_rdy_class* i_this) { } static void* s_kusa_sub(void* i_proc, void* i_this) { - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_Yobikusa) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_Obj_Yobikusa_e) { cXyz delta = ((fopAc_ac_c*)i_proc)->current.pos - ((fopAc_ac_c*)i_this)->current.pos; if (delta.abs() < 1000.0f) { return i_proc; @@ -1566,7 +1566,7 @@ static void e_rdy_tkusa(e_rdy_class* i_this) { i_this->mIFrameTimer = 20; if (i_this->mKargarokID == fpcM_ERROR_PROCESS_ID_e) { - i_this->mKargarokID = fopAcM_GetID(fopAcM_SearchByName(PROC_E_YC)); + i_this->mKargarokID = fopAcM_GetID(fopAcM_SearchByName(fpcNm_E_YC_e)); } fopAc_ac_c* a_karg = (fopAc_ac_c*) fopAcM_SearchByID(i_this->mKargarokID); @@ -1788,10 +1788,10 @@ static void e_rdy_yc_ride(e_rdy_class* i_this) { i_this->mIFrameTimer = 20; if (kargarok2 == NULL) { - i_this->mKargarokID = fopAcM_GetID((e_yc_class*)fopAcM_SearchByName(PROC_E_YC)); + i_this->mKargarokID = fopAcM_GetID((e_yc_class*)fopAcM_SearchByName(fpcNm_E_YC_e)); return; } - + if (i_this->field_0xa6e != 0) { return; } @@ -2029,7 +2029,7 @@ static void e_rdy_s_damage(e_rdy_class* i_this) { i_this->mMode = 0; } } - + cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f); } @@ -2039,7 +2039,7 @@ static int kado_check(e_rdy_class* i_this) { cXyz vec1, vec2, vec3; int ret = 0; cMtx_YrotS(*calc_mtx, i_this->field_0xadc.y); - + static int kado_bit[2] = {1, 2}; static f32 kado_check_x[2] = {80.0f, -80.0f}; @@ -2057,7 +2057,7 @@ static int kado_check(e_rdy_class* i_this) { vec1.x = kado_check_x[i] * (1.0f + JREG_F(6)); MtxPosition(&vec1, &vec3); vec3 += vec2; - + lin_chk.Set(&vec2, &vec3, _this); if (dComIfG_Bgsp().LineCross(&lin_chk)) { ret |= kado_bit[i]; @@ -2423,7 +2423,7 @@ static s16 gake_check(e_rdy_class* i_this, f32 i_dist) { } static void* s_bikkuri_sub(void* i_proc, void* i_this) { - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_RDY_e) { if (i_proc != i_this && ((e_rdy_class*)i_proc)->mAction == ACT_BOW3 && ((e_rdy_class*)i_proc)->mMode <= 2) { cXyz delta = ((fopAc_ac_c*)i_proc)->current.pos - ((fopAc_ac_c*)i_this)->current.pos; if (delta.abs() < 350.0f + KREG_F(11)) { @@ -2680,7 +2680,7 @@ static s8 e_rdy_bow3(e_rdy_class* i_this) { static void* s_command2_sub(void* i_proc, void* i_this) { UNUSED(i_this); - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_RDY_e) { if (((e_rdy_class*)i_proc)->mAction == ACT_BOW3 && ((e_rdy_class*)i_proc)->mMode < 10) { ((e_rdy_class*)i_proc)->mTimer[0] = cM_rndF(10.0f) + 10.0f; ((e_rdy_class*)i_proc)->mMode = 10; @@ -2690,7 +2690,7 @@ static void* s_command2_sub(void* i_proc, void* i_this) { } static void* s_command4_sub(void* i_proc, void* i_this) { - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_RDY_e) { if (((e_rdy_class*)i_proc) != i_this && ((e_rdy_class*)i_proc)->mAction == ACT_BOW3) { return i_proc; } @@ -2912,7 +2912,7 @@ static void e_rdy_jyunkai(e_rdy_class* i_this) { case 0: { anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); i_this->mMode = 1; - + dPnt* point = i_this->mpPath->m_points; point += i_this->mPathIndex; @@ -3048,7 +3048,7 @@ static void big_damage(e_rdy_class* i_this) { i_this->field_0xac6 = -(cM_rndFX(2000.0f) + 4000.0f); } else if (i_this->mRideState != 0) { i_this->field_0xac6 = cM_rndFX(3000.0f); - } else if (fopAcM_GetName(i_this->mAtInfo.mpActor) == PROC_E_WB) { + } else if (fopAcM_GetName(i_this->mAtInfo.mpActor) == fpcNm_E_WB_e) { i_this->field_0xac6 = cM_rndFX(8000.0f); a_this->speed.y = cM_rndF(15.0f) + (35.0f + TREG_F(17)); i_this->field_0xabc = -(i_this->mAtInfo.mpActor->speedF * 0.5f); @@ -3784,7 +3784,7 @@ static void cam_3d_morf(e_rdy_class* i_this, f32 i_scale) { static void* s_adel_sub(void* i_proc, void* i_this) { UNUSED(i_this); - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_ARROW) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_E_ARROW_e) { fopAcM_delete((fopAc_ac_c*)i_proc); } return NULL; @@ -4186,7 +4186,7 @@ static void demo_camera(e_rdy_class* i_this) { i_this->mDemoTimer = 0; i_this->mMode = 4; i_this->mCamDist = 0.0f; - e_arrow_class* arrow = (e_arrow_class*)fopAcM_SearchByName(PROC_E_ARROW); + e_arrow_class* arrow = (e_arrow_class*)fopAcM_SearchByName(fpcNm_E_ARROW_e); arrow->field_0xa00.z = 30000.0f + AREG_F(18); cVar12 = 0; } @@ -4238,7 +4238,7 @@ static void demo_camera(e_rdy_class* i_this) { } if (cVar12 != 0) { - fopAc_ac_c* a_arr = (fopAc_ac_c*) fopAcM_SearchByName(PROC_E_ARROW); + fopAc_ac_c* a_arr = (fopAc_ac_c*) fopAcM_SearchByName(fpcNm_E_ARROW_e); if (a_arr != NULL) { e_arrow_class* arrow = (e_arrow_class*) a_arr; if (cVar12 == 3) { @@ -4292,10 +4292,10 @@ static void demo_camera(e_rdy_class* i_this) { u32 child_params = 0x80000011; csXyz angle(0, 0x4000, 0); vec2.set(-93652.0f, -5875.0f, 46674.0f); - fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(a_this), child_params, &vec2, + fopAcM_createChild(fpcNm_E_ARROW_e, fopAcM_GetID(a_this), child_params, &vec2, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL); vec2.set(-93659.0f, -5875.0f, 32500.0f); - fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(a_this), child_params, &vec2, + fopAcM_createChild(fpcNm_E_ARROW_e, fopAcM_GetID(a_this), child_params, &vec2, fopAcM_GetRoomNo(a_this), &angle, NULL, -1, NULL); Z2GetAudioMgr()->bgmStop(30, 0); mDoGph_gInf_c::fadeOut(1.0f, g_blackColor); @@ -4353,7 +4353,7 @@ static int daE_RDY_Execute(e_rdy_class* i_this) { if (i_this->mKargarokDeleteTimer != 0) { i_this->mKargarokDeleteTimer--; if (i_this->mKargarokDeleteTimer == 0) { - daKago_c* kago = (daKago_c*)fopAcM_SearchByName(PROC_KAGO); + daKago_c* kago = (daKago_c*)fopAcM_SearchByName(fpcNm_KAGO_e); kago->setEvent2(); fopAcM_delete(a_this); fopAcM_delete(fopAcM_SearchByID(i_this->mKargarokID)); @@ -4702,7 +4702,7 @@ static int daE_RDY_Execute(e_rdy_class* i_this) { if (i_this->field_0x5b8 == 11) { params |= 0x10; } - fopAcM_createChild(PROC_E_ARROW, fopAcM_GetID(a_this), params, &vec2, + fopAcM_createChild(fpcNm_E_ARROW_e, fopAcM_GetID(a_this), params, &vec2, fopAcM_GetRoomNo(a_this), &arrow_angle, NULL, -1, NULL); i_this->mArrowFired = false; i_this->mBowRotationTimer = 15 + TREG_S(8); @@ -4795,7 +4795,7 @@ static dJntColData_c jc_data[11] = { static int useHeapInit(fopAc_ac_c* i_this) { e_rdy_class* _this = (e_rdy_class*)i_this; - + _this->mpMorf = new mDoExt_McaMorfSO( (J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 81), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(_this->mpArcName, 76), @@ -4943,7 +4943,7 @@ static cPhs_Step daE_RDY_Create(fopAc_ac_c* i_this) { pos.y += 5000.0f + YREG_F(0); } _this->mKargarokID = fpcM_ERROR_PROCESS_ID_e; - fopAcM_create(PROC_E_YC, 0xffffff00, &pos, fopAcM_GetRoomNo(i_this), + fopAcM_create(fpcNm_E_YC_e, 0xffffff00, &pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, 0xff); } @@ -5078,18 +5078,18 @@ static actor_method_class l_daE_RDY_Method = { }; actor_process_profile_definition g_profile_E_RDY = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_RDY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_rdy_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 157, // mPriority - &l_daE_RDY_Method, // sub_method - 0x00044000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_RDY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_rdy_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_RDY_e, + /* Actor SubMtd */ &l_daE_RDY_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index 0d28f23cdae..2c67faa9c2b 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -268,7 +268,7 @@ static void* s_last_sub(void* i_actor, void* i_data) { fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* a_data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) { + if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) { e_s1_class* e_data = (e_s1_class*)a_data; e_s1_class* e_actor = (e_s1_class*)a_actor; @@ -781,7 +781,7 @@ static void* s_down_sub(void* i_actor, void* i_data) { fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* a_data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) { + if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) { e_s1_class* e_data = (e_s1_class*)a_data; e_s1_class* e_actor = (e_s1_class*)a_actor; @@ -805,7 +805,7 @@ static void* s_fail_sub(void* i_actor, void* i_data) { fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* a_data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) { + if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) { e_s1_class* e_data = (e_s1_class*)a_data; e_s1_class* e_actor = (e_s1_class*)a_actor; @@ -835,7 +835,7 @@ static void* s_allfail_sub(void* i_actor, void* i_data) { fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* a_data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) { + if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) { e_s1_class* e_data = (e_s1_class*)a_data; e_s1_class* e_actor = (e_s1_class*)a_actor; @@ -857,7 +857,7 @@ static void* s_allwakeup_sub(void* i_actor, void* i_data) { fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* a_data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) { + if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) { e_s1_class* e_data = (e_s1_class*)a_data; e_s1_class* e_actor = (e_s1_class*)a_actor; @@ -888,7 +888,7 @@ static void* s_posrevise_sub(void* i_actor, void* i_data) { fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* a_data = (fopAc_ac_c*)i_data; - if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == PROC_E_S1) { + if (fopAcM_IsActor(a_actor) && fopAcM_GetName(a_actor) == fpcNm_E_S1_e) { e_s1_class* e_data = (e_s1_class*)a_data; e_s1_class* e_actor = (e_s1_class*)a_actor; @@ -2250,20 +2250,20 @@ static actor_method_class l_daE_S1_Method = { }; actor_process_profile_definition g_profile_E_S1 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_S1, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_s1_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 121, // mPriority - &l_daE_S1_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_S1_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_s1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_S1_e, + /* Actor SubMtd */ &l_daE_S1_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp index d8769931915..257c7eb288e 100644 --- a/src/d/actor/d_a_e_sb.cpp +++ b/src/d/actor/d_a_e_sb.cpp @@ -207,7 +207,7 @@ static void* s_obj_sub(void* arg0, void* arg1) { return arg0; } - } else if (fopAcM_GetName(arg0) == PROC_E_BG) { + } else if (fopAcM_GetName(arg0) == fpcNm_E_BG_e) { // bomb fish: if (arg0 != NULL && ((daE_BG_c*) arg0)->isBomb()) { if (arg1 != NULL) { @@ -217,7 +217,7 @@ static void* s_obj_sub(void* arg0, void* arg1) { return arg0; } - } else if (fopAcM_GetName(arg0) == PROC_NBOMB) { + } else if (fopAcM_GetName(arg0) == fpcNm_NBOMB_e) { // generic bomb: if (arg1 != NULL) { ((daE_SB_c*) arg1)->field_0x5f0 = fopAcM_searchActorDistanceXZ((fopAc_ac_c*) arg0, (fopAc_ac_c*) arg1); @@ -231,7 +231,7 @@ static void* s_obj_sub(void* arg0, void* arg1) { } static void* s_bomb_sub(void* arg0, void* arg1) { - if (fopAcM_GetName(arg0) == PROC_E_BG) { + if (fopAcM_GetName(arg0) == fpcNm_E_BG_e) { // bomb fish: if (arg0 != NULL && ((daE_BG_c*) arg0)->isBomb()) { if (arg1 != NULL) { @@ -241,7 +241,7 @@ static void* s_bomb_sub(void* arg0, void* arg1) { return arg0; } - } else if (fopAcM_GetName(arg0) == PROC_NBOMB) { + } else if (fopAcM_GetName(arg0) == fpcNm_NBOMB_e) { // generic bomb: if (arg1 != NULL) { ((daE_SB_c*) arg1)->field_0x5f0 = fopAcM_searchActorDistanceXZ((fopAc_ac_c*) arg0, (fopAc_ac_c*) arg1); @@ -1169,20 +1169,20 @@ static actor_method_class l_daE_SB_Method = { }; actor_process_profile_definition g_profile_E_SB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_SB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 125, // mPriority - &l_daE_SB_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_SB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_SB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SB_e, + /* Actor SubMtd */ &l_daE_SB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index a989779dfbc..1636299e110 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_sf.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -369,7 +369,7 @@ static void e_sf_normal(e_sf_class* i_this) { angle = 0x7000; } break; - + case NORMAL_PHASE_WAIT: target = l_HIO.move_spd; cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mAngleYOffset, 8, 0x400); @@ -410,7 +410,7 @@ static void e_sf_drawback(e_sf_class* i_this) { i_this->mSound.startCreatureVoice(Z2SE_EN_SF_V_DRAWBACK, -1); i_this->mAngleYOffset = player->shape_angle.y + 0x8000; break; - + case DRAWBACK_PHASE_END: a_this->onHeadLockFlg(); cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mAngleYOffset, 4, 0x400); @@ -448,7 +448,7 @@ static void e_sf_fight_run(e_sf_class* i_this) { i_this->mActionPhase = FIGHT_RUN_PHASE_0; } break; - + case FIGHT_RUN_PHASE_0: if (i_this->mType == 0) { anm_init(i_this, BCK_SF_WALK02, 5.0f, J3DFrameCtrl::EMode_LOOP, cM_rndFX(0.05f) + 1.0f); @@ -577,7 +577,7 @@ static void e_sf_attack_0(e_sf_class* i_this) { if (i_this->mHitCheckFlag) { fopAc_ac_c* actor_p = at_hit_check(i_this); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK) { + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e) { if (daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->mpModelMorf->setPlaySpeed(0.0f); i_this->mAction = ACTION_FIGHT_RUN; @@ -630,7 +630,7 @@ static void e_sf_attack(e_sf_class* i_this) { if (i_this->mHitCheckFlag) { fopAc_ac_c* actor_p = at_hit_check(i_this); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK) { + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e) { if (daPy_getPlayerActorClass()->checkPlayerGuard()) { i_this->mpModelMorf->setPlaySpeed(0.0f); i_this->mAction = ACTION_FIGHT_RUN; @@ -672,7 +672,7 @@ static int e_sf_guard(e_sf_class* i_this) { cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngleY, 2, 0x800); break; - + case GUARD_PHASE_RECOVER: if (cc_pl_cut_bit_get() == 0x100 || cc_pl_cut_bit_get() == 0x80 || cc_pl_cut_bit_get() == 0x400) { i_this->mTimers[0] = KREG_S(0) + 20; @@ -709,7 +709,7 @@ static void e_sf_s_damage(e_sf_class* i_this) { i_this->mSound.startCreatureVoice(Z2SE_EN_SF_V_DAMAGE, -1); i_this->mSound.startCreatureSound(Z2SE_EN_SF_SHAKE_BONES, 0, -1); break; - + case S_DAMAGE_PHASE_END: if (i_this->mpModelMorf->isStop()) { if (i_this->mTimers[1] != 0) { @@ -753,7 +753,7 @@ static void e_sf_crash(e_sf_class* i_this) { a_this->attention_info.flags = 0; cXyz scale(l_HIO.basic_size, l_HIO.basic_size, l_HIO.basic_size); dComIfGp_particle_set(dPa_RM(ID_ZI_S_SF_BARASMOKE_A), &a_this->current.pos, &a_this->shape_angle, &scale); - + if (dComIfG_Bgsp().GetPolyAtt0(i_this->mBgc.m_gnd) == 4) { dComIfGp_particle_set(dPa_RM(ID_ZI_S_SF_BARAKUSA_A), &a_this->current.pos, &a_this->shape_angle, &scale); } @@ -762,7 +762,7 @@ static void e_sf_crash(e_sf_class* i_this) { i_this->mSound.startCreatureSound(Z2SE_EN_SF_BREAK_DOWN, 0, -1); break; } - + case CRASH_PHASE_WAIT: if (i_this->mpModelMorf->isStop()) { i_this->mTimers[0] = cM_rndF(50.0f) + 300.0f; @@ -781,7 +781,7 @@ static void e_sf_crash(e_sf_class* i_this) { if (i_this->mTimers[0] == 0) { i_this->mAction = ACTION_GETUP; i_this->mActionPhase = PHASE_INIT; - + ret_ct++; if (ret_ct >= 3) { dComIfGs_onOneZoneSwitch(5, -1); @@ -843,7 +843,7 @@ static s16 e_sf_sitwait(e_sf_class* i_this) { i_this->mDemoMode = 1; } break; - + case SITWAIT_PHASE_END: rv = 0xFF; i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_SF_V_FIRST_DEMO, -1); @@ -891,7 +891,7 @@ static s16 e_sf_getup(e_sf_class* i_this) { i_this->mSound.startCreatureSound(Z2SE_EN_SF_BUILD_UP, 0, -1); } break; - + case GETUP_PHASE_WAIT: if (i_this->mpModelMorf->isStop()) { if (i_this->mType == 0) { @@ -1078,7 +1078,7 @@ static void action(e_sf_class* i_this) { if (e_sf_guard(i_this) != 0) { unkFlag1 = 1; } - + isLinkSearch = 1; break; @@ -1190,7 +1190,7 @@ static void action(e_sf_class* i_this) { a_this->current.pos += spd8; cLib_addCalc0(&i_this->field_0x6c4, 1.0f, TREG_F(12) + 7.0f); } - + i_this->mBgc.CrrPos(dComIfG_Bgsp()); if (i_this->field_0x6ae > 0) { @@ -1372,7 +1372,7 @@ static void demo_camera(e_sf_class* i_this) { switch (i_this->mDemoMode) { case 0: break; - + case 1: if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0); @@ -1411,7 +1411,7 @@ static void demo_camera(e_sf_class* i_this) { cLib_addCalc2(&i_this->mDemoCamFovy, 55.0f, 0.05f, 0.25f); } break; - + case 10: if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0); @@ -1557,7 +1557,7 @@ static int daE_SF_Execute(e_sf_class* i_this) { MtxPosition(&sp2c, &sp38); i_this->mCcSphs[1].SetC(sp38 + sp50); i_this->mCcSphs[1].SetR(l_HIO.basic_size * 35.0f); - + MTXCopy(model->getAnmMtx(JNT_WAIST), *calc_mtx); sp2c.set(BREG_F(14) + 30.0f, BREG_F(15), BREG_F(16)); MtxPosition(&sp2c, &sp38); @@ -1608,7 +1608,7 @@ static int daE_SF_Execute(e_sf_class* i_this) { } else { i_this->mHitCheckFlag = 0; } - + dComIfG_Ccsp()->Set(&i_this->mAtSph); if (i_this->field_0x6ab != 0) { @@ -1719,7 +1719,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_sf", wepon_data[i_this->mType]); JUT_ASSERT(2752, modelData != NULL); - + i_this->mSwordModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mSwordModel == NULL) { return 0; @@ -1793,9 +1793,9 @@ static cPhs_Step daE_SF_Create(fopAc_ac_c* a_this) { l_HIO.id = -1; } - fopAcM_OnStatus(a_this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(a_this, fopAcStts_CULL_e); a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e; - + fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx()); fopAcM_SetMin(a_this, -200.0f, -200.0f, -200.0f); fopAcM_SetMax(a_this, 200.0f, 200.0f, 200.0f); @@ -1885,18 +1885,18 @@ static actor_method_class l_daE_SF_Method = { }; actor_process_profile_definition g_profile_E_SF = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_sf_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 123, // mPriority - &l_daE_SF_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_SF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_sf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SF_e, + /* Actor SubMtd */ &l_daE_SF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_sg.cpp b/src/d/actor/d_a_e_sg.cpp index 36f1953709a..b4f7f94f6ea 100644 --- a/src/d/actor/d_a_e_sg.cpp +++ b/src/d/actor/d_a_e_sg.cpp @@ -156,7 +156,7 @@ static cXyz bg_cross[10]; static int target_info_count; static void* s_box_sub(void* i_ac, void*) { - if (fopAcM_IsActor(i_ac) && fopAcM_GetName(i_ac) == PROC_OBJ_KBOX && target_info_count < 10) { + if (fopAcM_IsActor(i_ac) && fopAcM_GetName(i_ac) == fpcNm_OBJ_KBOX_e && target_info_count < 10) { target_info[target_info_count] = (obj_kbox_class*)i_ac; target_info_count++; } @@ -213,7 +213,7 @@ static obj_kbox_class* search_box(e_sg_class* i_this) { } static dmg_rod_class* search_esa(e_sg_class* i_this) { - dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD); + dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(fpcNm_MG_ROD_e); if (rod != NULL && rod->kind == 1 && rod->action != 5 && rod->is_hook_in_water != 0 && rod->actor.current.pos.y < rod->water_surface_y - 20.0f) @@ -736,7 +736,7 @@ static void e_sg_drop(e_sg_class* i_this) { local_48.x += i_this->current.pos.x; local_48.z += i_this->current.pos.z; local_48.y = i_this->mGroundY + 10.0f; - fopAcM_createItem(&local_48, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(&local_48, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); } } } @@ -1224,7 +1224,7 @@ static int daE_SG_Create(fopAc_ac_c* i_this) { child_angle.y = cM_rndF(65536.0f); - fopAcM_createChild(PROC_E_SG, fopAcM_GetID(i_this), parameters, &child_pos, + fopAcM_createChild(fpcNm_E_SG_e, fopAcM_GetID(i_this), parameters, &child_pos, fopAcM_GetRoomNo(i_this), &child_angle, 0, -1, 0); } a_this->mArg0 = false; @@ -1253,18 +1253,18 @@ static actor_method_class l_daE_SG_Method = { }; actor_process_profile_definition g_profile_E_SG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_sg_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 122, // mPriority - &l_daE_SG_Method, // sub_method - 0x000D0100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_SG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_sg_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SG_e, + /* Actor SubMtd */ &l_daE_SG_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index 397f067d201..d9cad9bbe7d 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -1263,18 +1263,18 @@ static actor_method_class l_daE_SH_Method = { }; actor_process_profile_definition g_profile_E_SH = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_sh_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 126, // mPriority - &l_daE_SH_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_SH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_sh_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SH_e, + /* Actor SubMtd */ &l_daE_SH_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index 3e05e7ad619..8e126f296ee 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_sm.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -77,7 +77,7 @@ class daE_Sm_HIO_c : public JORReflexible { /* スライム - Slime */ /* 0x04 */ s8 field_0x4; /* 0x08 */ f32 basic_size; // 基本大きさ - Basic Size - /* 0x0C */ f32 pl_notice_dist; // PL認識距離 - PL Notice Distance + /* 0x0C */ f32 pl_notice_dist; // PL認識距離 - PL Notice Distance /* 0x10 */ f32 core_size; // コア大きさ - Core Size }; @@ -186,7 +186,7 @@ static BOOL pl_check(daE_SM_c* i_this, f32 param_2) { static void move_check(daE_SM_c* i_this, int* param_2) { *param_2 = -1; - + if (pl_check(i_this, i_this->field_0x970)) { *param_2 = 0; } @@ -199,7 +199,7 @@ void daE_SM_c::Particle_Set(u16 i_resID, cXyz i_scale, cXyz i_pos, csXyz i_rotat void daE_SM_c::ArrowCheck() { cXyz* tgHitPosP = mCoSm.GetTgHitPosP(); field_0x6d4 = 10; - + if (((daArrow_c*)mAtInfo.mpActor)->changeActorControll()) { field_0x6f9[field_0x6f8] = 1; daArrow_c* arrow_p; @@ -347,7 +347,7 @@ void daE_SM_c::SmDamageCheck() { mSound.startCreatureVoice(Z2SE_EN_SC_V_WHISTLE, -1); } } - + field_0x6be = 0; field_0x6c0[0] = 50; field_0x685 = false; @@ -433,7 +433,7 @@ void daE_SM_c::SmDamageCheck() { cXyz sp34(field_0x990); sp34.y += 100.0f; - + if (!(sp34.abs(*hookshotTopPos) < field_0x6f0 * 100.0f)) { return; } @@ -493,7 +493,7 @@ void daE_SM_c::E_SM_Normal() { if (field_0xa10) { field_0x9b0.y = s_TargetAngle; - + if (way_bg_check(this, scale.x * 100.0f, field_0x990, field_0x9b0.y)) { field_0x9b0.y += 0x100; } @@ -647,7 +647,7 @@ void daE_SM_c::E_SM_Attack() { field_0x6dc = 0.041f; } break; - + case 1: if (field_0x6dc > 0.041f) { field_0x6dc = 0.041f; @@ -698,7 +698,7 @@ void daE_SM_c::Action() { case ACTION_NORMAL: E_SM_Normal(); break; - + case ACTION_MOVE: E_SM_Move(); break; @@ -741,7 +741,7 @@ void daE_SM_c::Action() { field_0x9b8.z = sp38.z; field_0x990 += field_0x9b8; field_0x9b8.y -= 5.0f; - + cXyz* ccMoveP = field_0xe8c.GetCCMoveP(); if (ccMoveP != NULL) { field_0x990 += *ccMoveP; @@ -781,7 +781,7 @@ void daE_SM_c::E_SM_C_Near_Escape() { field_0x6d8 = s_TargetAngle + 0x8000; } break; - + case 0: field_0x6b6 = 3; cLib_chaseAngleS(¤t.angle.y, field_0x6d8, 0x2000); @@ -1054,7 +1054,7 @@ void daE_SM_c::E_SM_C_Escape() { case 0: E_SM_C_Near_Escape(); break; - + case 1: E_SM_C_Far_Escape(); break; @@ -1108,7 +1108,7 @@ void daE_SM_c::E_SM_C_Free() { field_0x6d8 = s_TargetAngle + 0x8000; } break; - + case 1: E_SM_C_Escape(); break; @@ -1143,7 +1143,7 @@ void daE_SM_c::E_SM_C_Death() { speed.set(0.0f, 0.0f, 0.0f); } break; - + case 2: speedF = 0.0f; @@ -1445,7 +1445,7 @@ void daE_SM_c::DemoStart() { field_0xe8c.SetWeight(254); } break; - + case 1: if (field_0x6c0[0] == 0) { mDemoMode++; @@ -1480,7 +1480,7 @@ void daE_SM_c::DemoMid() { SetStopingCam(); mDemoMode++; break; - + case 1: sp1c = current.pos; sp1c.y += 80.0f; @@ -1530,7 +1530,7 @@ void daE_SM_c::E_SM_C_Demo() { case 0: DemoStart(); break; - + case 1: DemoMid(); break; @@ -1603,7 +1603,7 @@ void daE_SM_c::CoreAction() { } field_0xa60.CrrPos(dComIfG_Bgsp()); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } } @@ -1674,7 +1674,7 @@ int daE_SM_c::Execute() { field_0x6d6--; } - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(this, fopAcStts_CULL_e); Action(); CoreAction(); cXyz i_effSize(1.0f, 1.0f, 1.0f); @@ -2018,18 +2018,18 @@ static actor_method_class l_daE_SM_Method = { }; actor_process_profile_definition g_profile_E_SM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_SM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 127, // mPriority - &l_daE_SM_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_SM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_SM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SM_e, + /* Actor SubMtd */ &l_daE_SM_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index c81be26d70e..1563e7cde22 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_sm2.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -56,7 +56,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { int jnt_no = i_joint->getJntNo(); J3DModel* model = j3dSys.getModel(); e_sm2_class* a_this = (e_sm2_class*)model->getUserArea(); - + if (a_this != NULL && jnt_no >= 1) { MtxTrans(a_this->jnt_pos[jnt_no].x, a_this->jnt_pos[jnt_no].y, a_this->jnt_pos[jnt_no].z, 0); cMtx_YrotM(*calc_mtx, a_this->field_0x7f8[jnt_no].y); @@ -95,7 +95,7 @@ static int daE_SM2_Draw(e_sm2_class* i_this) { if (i_this->shadowId != 353535) { cXyz pos; pos.set(actor->current.pos.x, 50.0f + actor->current.pos.y + BREG_F(18), actor->current.pos.z); - + f32 var_f31 = i_this->size * (2500.0f + BREG_F(19)) * i_this->field_0x830; if (var_f31 < 700.0f) { var_f31 = 700.0f; @@ -136,7 +136,7 @@ static void sm2_delete(e_sm2_class* i_this) { if (!i_this->is_roof) { fopAcM_delete(actor); - + int swbit = (fopAcM_GetParam(actor) & 0xFF000000) >> 0x18; if (swbit != 0xFF) { dComIfGs_onSwitch(swbit, fopAcM_GetRoomNo(actor)); @@ -186,7 +186,7 @@ static void cc_stts_init(e_sm2_class* i_this) { static void* s_s_sub(void* i_actor, void* i_data) { cXyz pos_delta; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_SM2) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_SM2_e) { e_sm2_class* pother = (e_sm2_class*)i_data; e_sm2_class* pactor = (e_sm2_class*)i_actor; @@ -668,22 +668,22 @@ static void fail(e_sm2_class* i_this) { i_this->timers[0] = KREG_S(7) + 9; } else { static u8 item_no[] = { - fpcNm_ITEM_CHUCHU_GREEN, - fpcNm_ITEM_CHUCHU_RED, - fpcNm_ITEM_CHUCHU_BLUE, - fpcNm_ITEM_CHUCHU_YELLOW, - fpcNm_ITEM_CHUCHU_PURPLE, - fpcNm_ITEM_CHUCHU_RARE, - fpcNm_ITEM_CHUCHU_BLACK, + dItemNo_CHUCHU_GREEN_e, + dItemNo_CHUCHU_RED_e, + dItemNo_CHUCHU_BLUE_e, + dItemNo_CHUCHU_YELLOW_e, + dItemNo_CHUCHU_PURPLE_e, + dItemNo_CHUCHU_RARE_e, + dItemNo_CHUCHU_BLACK_e, }; dComIfGp_att_CatchRequest(actor, item_no[i_this->type], 100.0f, 50.0f, -150.0f, 0x5000, 1); actor->eventInfo.onCondition(0x40); } - + return; } - + if (i_this->mode == 2 && i_this->timers[0] == 1) { MTXCopy(daPy_getPlayerActorClass()->getLeftItemMatrix(), *calc_mtx); work.set(0.0f, 0.0f, 0.0f); @@ -909,7 +909,7 @@ static void damage_check(e_sm2_class* i_this) { pos = i_this->field_0x708[j_d[j]]; pos.y += cM_rndF(y_ad[i_this->sizetype]); - fopAcM_createChild(PROC_E_SM2, fopAcM_GetID(actor), 0xFFFFFF00 | (i_this->type << 4) | 0xB, &pos, fopAcM_GetRoomNo(actor), &rotation, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_SM2_e, fopAcM_GetID(actor), 0xFFFFFF00 | (i_this->type << 4) | 0xB, &pos, fopAcM_GetRoomNo(actor), &rotation, NULL, -1, NULL); } i_this->field_0xfd4 = 1; @@ -944,7 +944,7 @@ static void damage_check(e_sm2_class* i_this) { pos = work; } - fopAcM_createChild(PROC_E_SM2, fopAcM_GetID(actor), parameters, &pos, fopAcM_GetRoomNo(actor), &rotation, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_SM2_e, fopAcM_GetID(actor), parameters, &pos, fopAcM_GetRoomNo(actor), &rotation, NULL, -1, NULL); } i_this->sound.startCreatureSound(Z2SE_EN_SM_HIT2, 0, -1); @@ -957,7 +957,7 @@ static void damage_check(e_sm2_class* i_this) { i_this->isPiece = TRUE; actor->speed.y = 20.0f + BREG_F(6); i_this->field_0xfd4 = 1; - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(actor, fopAcStts_CULL_e); } return; } @@ -1385,7 +1385,7 @@ static int daE_SM2_Execute(e_sm2_class* i_this) { if (actor->home.pos.y - actor->current.pos.y > 5000.0f) { fopAcM_delete(actor); - + int bitsw = (fopAcM_GetParam(actor) & 0xFF000000) >> 0x18; if (bitsw != 0xFF) { dComIfGs_onSwitch(bitsw, fopAcM_GetRoomNo(actor)); @@ -1406,7 +1406,7 @@ static int daE_SM2_Delete(e_sm2_class* i_this) { #if DEBUG l_HIO.removeHIO(i_this->enemy); #endif - + dComIfG_resDelete(&i_this->phase, "E_sm2"); if (actor->heap != NULL) { @@ -1471,27 +1471,27 @@ static int daE_SM2_Create(fopAc_ac_c* i_this) { if (swbit != 0xFF && dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(i_this))) { return cPhs_ERROR_e; } - + a_this->field_0x5b4 = fopAcM_GetParam(i_this) & 0xF; if (a_this->field_0x5b4 == 0xF) { a_this->field_0x5b4 = 0; } - + a_this->type = (fopAcM_GetParam(i_this) & 0xF0) >> 4; if (a_this->type == 0xF) { a_this->type = TYPE_GREEN; } - - if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_ARMOR) && a_this->type == TYPE_GREEN) { + + if (!dComIfGs_isItemFirstBit(dItemNo_ARMOR_e) && a_this->type == TYPE_GREEN) { return cPhs_ERROR_e; } - + if (a_this->field_0x5b4 < 10) { if (strcmp(dComIfGp_getStartStageName(), "T_ENEMY") == 0) { a_this->type = cM_rndF(6.999f); } } - + if (a_this->type == TYPE_RANDOM) { int num = (g_Counter.mCounter0 & 7); if (num == 0) { @@ -1502,15 +1502,15 @@ static int daE_SM2_Create(fopAc_ac_c* i_this) { a_this->type = TYPE_BLUE; } } - - if (a_this->type == TYPE_RARE && checkItemGet(fpcNm_ITEM_CHUCHU_RARE, 1)) { + + if (a_this->type == TYPE_RARE && checkItemGet(dItemNo_CHUCHU_RARE_e, 1)) { if (cM_rndF(1.0f) <= 0.5f) { a_this->type = TYPE_RED; } else { a_this->type = TYPE_BLUE; } } - + col_set(a_this, 1); a_this->sizetype = (fopAcM_GetParam(i_this) & 0xFF00) >> 8; @@ -1529,14 +1529,14 @@ static int daE_SM2_Create(fopAc_ac_c* i_this) { a_this->field_0x5b8 = i_this->home.angle.z & 0xFF; i_this->current.angle.z = i_this->shape_angle.z = 0; a_this->size = size_get(a_this->sizetype); - + OS_REPORT("E_SM2//////////////E_SM2 SET 1 !!\n"); if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x20D0)) { OS_REPORT("//////////////E_SM2 SET NON !!\n"); return cPhs_ERROR_e; } - + OS_REPORT("//////////////E_SM2 SET 2 !!\n"); a_this->sound.init(&i_this->current.pos, &i_this->current.pos, 3, 1); @@ -1552,7 +1552,7 @@ static int daE_SM2_Create(fopAc_ac_c* i_this) { a_this->jnt_pos[i] = i_this->current.pos; a_this->field_0x6c8[i] = 1.0f; } - + #if DEBUG l_HIO.entryHIO("スライム(豪華）"); #endif @@ -1637,20 +1637,20 @@ static actor_method_class l_daE_SM2_Method = { }; actor_process_profile_definition g_profile_E_SM2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SM2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_sm2_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 128, // mPriority - &l_daE_SM2_Method, // sub_method - 0x00040120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_SM2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_sm2_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SM2_e, + /* Actor SubMtd */ &l_daE_SM2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index 8a7392d32ce..557f9e26321 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -863,7 +863,7 @@ static void e_st_shoot(e_st_class* i_this) { if (frame >= 0x1E && frame <= 0x2A) { for (int i = 0; i < TREG_S(2) + 5; i++) { - fopAcM_createChild(PROC_E_ST_LINE, fopAcM_GetID(a_this), i_this->mParameters, + fopAcM_createChild(fpcNm_E_ST_LINE_e, fopAcM_GetID(a_this), i_this->mParameters, &i_this->field_0x704, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL); i_this->mParameters++; } @@ -1249,7 +1249,7 @@ static void e_st_hang_shoot(e_st_class* i_this) { if (frame >= 0x1E && frame <= 0x2A) { for (int i = 0; i < TREG_S(2) + 5; i++) { - fopAcM_createChild(PROC_E_ST_LINE, fopAcM_GetID(a_this), i_this->mParameters, + fopAcM_createChild(fpcNm_E_ST_LINE_e, fopAcM_GetID(a_this), i_this->mParameters, &i_this->field_0x704, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL); i_this->mParameters++; } @@ -1490,7 +1490,7 @@ static void e_st_hang_2_shoot(e_st_class* i_this) { if (frame >= 0x1E && frame <= 0x2A) { for (int i = 0; i < TREG_S(2) + 5; i++) { - fopAcM_createChild(PROC_E_ST_LINE, fopAcM_GetID(a_this), i_this->mParameters, + fopAcM_createChild(fpcNm_E_ST_LINE_e, fopAcM_GetID(a_this), i_this->mParameters, &i_this->field_0x704, fopAcM_GetRoomNo(a_this), NULL, NULL, -1, NULL); i_this->mParameters++; } @@ -1924,7 +1924,7 @@ static s8 e_st_g_fight(e_st_class* i_this) { if (i_this->mAtSph.ChkAtHit()) { cCcD_Obj* at_hit_obj_p = i_this->mAtSph.GetAtHitObj(); fopAc_ac_c* actor_p = dCc_GetAc(at_hit_obj_p->GetAc()); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK) { + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e) { dComIfGp_getVibration().StartShock(VIBMODE_S_POWER4, 31, cXyz(0.0f, 1.0f, 0.0f)); } } @@ -3207,18 +3207,18 @@ static actor_method_class l_daE_ST_Method = { }; actor_process_profile_definition g_profile_E_ST = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_ST, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_st_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 129, // mPriority - &l_daE_ST_Method, // sub_method - 0x10040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_ST_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_st_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_ST_e, + /* Actor SubMtd */ &l_daE_ST_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_st_line.cpp b/src/d/actor/d_a_e_st_line.cpp index bc832b7a574..eaed9eb2596 100644 --- a/src/d/actor/d_a_e_st_line.cpp +++ b/src/d/actor/d_a_e_st_line.cpp @@ -123,18 +123,18 @@ static actor_method_class l_daE_ST_LINE_Method = { }; actor_process_profile_definition g_profile_E_ST_LINE = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_ST_LINE, - &g_fpcLf_Method.base, - sizeof(e_st_line_class), - 0, - 0, - &g_fopAc_Method.base, - 133, - &l_daE_ST_LINE_Method, - 0x44000, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_ST_LINE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_st_line_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_ST_LINE_e, + /* Actor SubMtd */ &l_daE_ST_LINE_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index b1b861e86a6..59466f82586 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_sw.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -136,8 +136,8 @@ int daE_SW_c::draw() { if (field_0x6e4 == 0) { cXyz i_pos; i_pos.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); - mShadowKey = dComIfGd_setShadow(mShadowKey, 1, model, &i_pos, 700.0f, 0.0f, current.pos.y, - mBgc.GetGroundH(), mBgc.m_gnd, &tevStr, 0, 1.0f, + mShadowKey = dComIfGd_setShadow(mShadowKey, 1, model, &i_pos, 700.0f, 0.0f, current.pos.y, + mBgc.GetGroundH(), mBgc.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); } @@ -210,7 +210,7 @@ void daE_SW_c::setActionMode(s16 i_actionMode, s16 i_moveMode) { } static void* s_b_sub(void* i_actor, void* i_data) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NBOMB && + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NBOMB_e && !fopAcM_checkCarryNow((fopAc_ac_c*)i_actor) && !((dBomb_c*)i_actor)->checkStateExplode()) { f32 fVar1 = fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data); if (fVar1 < target_dist) { @@ -275,7 +275,7 @@ void daE_SW_c::checkFall() { f32 fVar1 = dComIfG_Bgsp().GroundCross(&gnd_chk); if (speed.y < 0.0f) { - if (fVar1 == -G_CM3D_F_INF || std::abs(fVar1 - current.pos.y) > 1000.0f || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || + if (fVar1 == -G_CM3D_F_INF || std::abs(fVar1 - current.pos.y) > 1000.0f || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 10 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 5) { setActionMode(13, 0); } @@ -385,7 +385,7 @@ void daE_SW_c::executeChaseSlow() { if (fVar1 < 15.0f) { fVar1 = 15.0f; } - + if (fVar1 > 70.0f) { fVar1 = 70.0f; } @@ -451,7 +451,7 @@ void daE_SW_c::executeChaseSlow() { bVar1 = 1; } } - + if (((s16)cLib_distanceAngleS(fopCamM_GetAngleY(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))), field_0x6cc) > 0x6000 || bVar1) && data_807B0200 == 0) { field_0x6ea = 60; data_807B0200 = 1; @@ -695,7 +695,7 @@ void daE_SW_c::executeAttack() { s16 sVar1; f32 fVar1; cXyz sp54, sp60; - + switch (mMoveMode) { case 0: field_0x98c.SetTgType(0xd8fbfdff); @@ -769,7 +769,7 @@ void daE_SW_c::executeAttack() { mMoveMode = 2; } break; - + case 2: setJumpEffect(); cLib_chaseAngleS(&shape_angle.x, 0x4000, 0x400); @@ -889,7 +889,7 @@ void daE_SW_c::executeHook() { cLib_addCalcAngleS(&shape_angle.y, (s16)(field_0x6cc + field_0x6a4), 4, 0x1000, 0x100); current.angle.y = shape_angle.y; - if (!fopAcM_CheckStatus(this, 0x100000)) { + if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { setActionMode(7, 10); } break; @@ -961,7 +961,7 @@ void daE_SW_c::executeChance() { // fallthrough case 2: if ((field_0x6bc & 1) != 0 && mBgc.ChkGroundHit()) { - field_0xae8 = dComIfGp_particle_set(field_0xae8, ZLM_SAND00_IA_6, &field_0x674, &tevStr, &shape_angle, NULL, + field_0xae8 = dComIfGp_particle_set(field_0xae8, ZLM_SAND00_IA_6, &field_0x674, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); } @@ -1148,7 +1148,7 @@ void daE_SW_c::executeDie() { } static void* s_child_sub(void* i_actor, void* i_data) { - if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_SW) { + if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_SW_e) { if (fopAcM_GetLinkId((fopAc_ac_c*)i_actor) == fopAcM_GetID(i_data)) { data_807B0201++; } @@ -1160,7 +1160,7 @@ static void* s_child_sub(void* i_actor, void* i_data) { void daE_SW_c::executeMaster() { camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); attention_info.flags = 0; field_0x98c.OffTgSetBit(); field_0x98c.OffCoSetBit(); @@ -1169,7 +1169,7 @@ void daE_SW_c::executeMaster() { field_0x6ea = 30; if ((field_0x684 == 0 || !(field_0x6c8 < 1000.0f)) && !(field_0x6c8 > 10000.0f)) { int iVar1 = abs((s16)(fopCamM_GetAngleY(camera) - (fopAcM_searchPlayerAngleY(this) + 0x8000))); - + if (iVar1 < 0x2000) { data_807B0201 = 0; fpcM_Search(s_child_sub, this); @@ -1184,7 +1184,7 @@ void daE_SW_c::executeMaster() { } u32 param = (iVar1 << 24) | ((fopAcM_GetParam(this) & 0xFFF) | 0x3000); - fopAcM_createChild(PROC_E_SW, fopAcM_GetID(this), param, + fopAcM_createChild(fpcNm_E_SW_e, fopAcM_GetID(this), param, &home.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } } @@ -1362,7 +1362,7 @@ void daE_SW_c::action() { case ACTION_EXECUTE_DIE: executeDie(); break; - + case ACTION_EXECUTE_MASTER: executeMaster(); break; @@ -1389,7 +1389,7 @@ void daE_SW_c::mtx_set() { mDoMtx_stack_c::ZXYrotM(shape_angle); f32 fVar1 = field_0x6dc; - + if (l_HIO.basic_size != 1.0f) { fVar1 = l_HIO.basic_size; } @@ -1403,7 +1403,7 @@ void daE_SW_c::mtx_set() { void daE_SW_c::cc_set() { if (mpModelMorf != NULL) { J3DModel* model = mpModelMorf->getModel(); - + if (field_0x694 != 1) { MTXCopy(model->getAnmMtx(1), mDoMtx_stack_c::get()); mDoMtx_stack_c::multVecZero(&eyePos); @@ -1451,7 +1451,7 @@ void daE_SW_c::damage_check() { if (field_0x98c.ChkAtShieldHit()) { field_0x98c.OffAtShieldHit(); - + if (daPy_getPlayerActorClass()->checkPlayerGuard()) { setActionMode(ACTION_EXECUTE_CHANCE, 0); cc_at_check(this, &mAtInfo); @@ -1668,7 +1668,7 @@ cPhs_Step daE_SW_c::create() { uVar2 = 0; } field_0x6e8 = uVar2; - + field_0xaf8 = 0; if (field_0x694 == 0) { @@ -1803,20 +1803,20 @@ static actor_method_class l_daE_SW_Method = { }; actor_process_profile_definition g_profile_E_SW = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_SW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_SW_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 191, // mPriority - &l_daE_SW_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_SW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_SW_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_SW_e, + /* Actor SubMtd */ &l_daE_SW_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; void daE_SW_c::d_checkFall() { @@ -1835,7 +1835,7 @@ void daE_SW_c::d_checkFall() { f32 fVar1 = dComIfG_Bgsp().GroundCross(&gnd_chk); if (speed.y < 0.0f) { - if ((fVar1 == -G_CM3D_F_INF || std::abs(fVar1 - current.pos.y) > 1000.0f) || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || + if ((fVar1 == -G_CM3D_F_INF || std::abs(fVar1 - current.pos.y) > 1000.0f) || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 10 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 5) { d_setAction(&daE_SW_c::d_fall); } @@ -2109,7 +2109,7 @@ bool daE_SW_c::d_chaseCheck() { camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); s16 sVar1 = cLib_distanceAngleS(fopCamM_GetAngleY(camera), field_0x6cc); - if (bVar1 || (sVar1 > 0x6000 && (abs((s16)(current.angle.y - field_0x6cc)) < 0x2000 || + if (bVar1 || (sVar1 > 0x6000 && (abs((s16)(current.angle.y - field_0x6cc)) < 0x2000 || fVar1 < l_HIO.human_attack_init_range))) { return true; } @@ -2142,12 +2142,12 @@ void daE_SW_c::d_chase() { d_setAction(&daE_SW_c::d_wait); return; } - + if (player->current.pos.absXZ(current.pos) < l_HIO.human_attack_init_range) { d_setAction(&daE_SW_c::d_attk); return; } - + if (field_0x6ec == 0) { if (mBgc.ChkWallHit()) { if (field_0x6f8[0].ChkWallHit()) { @@ -2164,7 +2164,7 @@ void daE_SW_c::d_chase() { field_0x69e = field_0x6cc; } } - + cLib_addCalcAngleS2(¤t.angle.y, field_0x69e, 8, 0x400); cLib_chaseF(&speedF, 15.0f, 1.0f); break; @@ -2172,7 +2172,7 @@ void daE_SW_c::d_chase() { default: return; } - + shape_angle.y = current.angle.y; if (field_0x6ea != 0) { @@ -2257,7 +2257,7 @@ void daE_SW_c::d_attk() { field_0x6e5 = 1; shape_angle.x = 0; f32 fVar1; - + if (player->checkHorseRide() == 0) { fVar1 = 19.0f; } else { @@ -2292,7 +2292,7 @@ void daE_SW_c::d_attk() { fopAcM_delete(this); return; } - + current.pos.y = fopAcM_gc_c::getGroundY(); } // fallthrough @@ -2461,7 +2461,7 @@ void daE_SW_c::d_damage() { if (mBgc.ChkGroundHit()) { speed.y = cM_rndF(3.0f) + 28.0f; speedF = cM_rndF(3.0f) + 8.0f; - mMoveMode++; + mMoveMode++; } shape_angle.x = (int)shape_angle.x - 1500.0f; @@ -2471,7 +2471,7 @@ void daE_SW_c::d_damage() { field_0xae8 = dComIfGp_particle_set(field_0xae8, ZLM_SAND00_IA_6, &field_0x674, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); cLib_addCalcAngleS(&shape_angle.z, 0, 8, 0x800, 0x10); - + if (!mBgc.ChkGroundHit()) { break; } @@ -2498,7 +2498,7 @@ void daE_SW_c::d_damage() { if (mBgc.ChkWallHit()) { speedF = 0.0f; - + if (speed.y > 0.0f) { speed.y *= 0.5f; } @@ -2599,8 +2599,8 @@ void daE_SW_c::d_hook() { case 1: cLib_addCalcAngleS(&shape_angle.y, (s16)(field_0x6cc + field_0x6a4), 4, 0x1000, 0x100); current.angle.y = shape_angle.y; - - if (!fopAcM_CheckStatus(this, 0x100000)) { + + if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { speed.y = 20.0f; speedF = -10.0f; gravity = -5.0f; @@ -2666,11 +2666,11 @@ int daE_SW_c::d_execute() { if (field_0x6ee != 0) { field_0x6ee--; } - + if (field_0x6f0 != 0) { field_0x6f0--; } - + if (field_0x6f2 != 0) { field_0x6f2--; } diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index d030dd75652..d50bf944ea7 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -46,7 +46,7 @@ daE_TH_HIO_c::daE_TH_HIO_c() { } static void* s_md_sub1(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_MD && (fopAcM_GetParam(i_actor) & 0xFF00) == 0xFF00 && ((fopAc_ac_c*)i_actor)->current.pos.z == 560.0f) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_MD_e && (fopAcM_GetParam(i_actor) & 0xFF00) == 0xFF00 && ((fopAc_ac_c*)i_actor)->current.pos.z == 560.0f) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -54,7 +54,7 @@ static void* s_md_sub1(void* i_actor, void* i_data) { } static void* s_md_sub2(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_MD && (fopAcM_GetParam(i_actor) & 0xFF00) != 0xFF00 && ((fopAc_ac_c*)i_actor)->current.pos.z == -950.0f) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_MD_e && (fopAcM_GetParam(i_actor) & 0xFF00) != 0xFF00 && ((fopAc_ac_c*)i_actor)->current.pos.z == -950.0f) { fopAcM_delete((fopAc_ac_c*)i_actor); } @@ -1203,7 +1203,7 @@ static int daE_TH_Create(fopAc_ac_c* a_this) { OS_REPORT("E_th PARAM %x\n", fopAcM_GetParam(a_this)); i_this->field_0x5b6 = fopAcM_GetParam(a_this); - if (i_this->field_0x5b6 == 2 && dComIfGs_isStageMiddleBoss() && checkItemGet(fpcNm_ITEM_IRONBALL, TRUE)) { + if (i_this->field_0x5b6 == 2 && dComIfGs_isStageMiddleBoss() && checkItemGet(dItemNo_IRONBALL_e, TRUE)) { return cPhs_ERROR_e; } @@ -1267,7 +1267,7 @@ static int daE_TH_Create(fopAc_ac_c* a_this) { i_this->mSound.init(&i_this->current.pos, &i_this->eyePos, 3, 1); i_this->mAtInfo.mpSound = &i_this->mSound; - i_this->mBallID = fopAcM_createChild(PROC_E_TH_BALL, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL); + i_this->mBallID = fopAcM_createChild(fpcNm_E_TH_BALL_e, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, -1, NULL); if (i_this->field_0x5b6 == 2 && dComIfGs_isStageMiddleBoss()) { i_this->mAction = ACTION_END; @@ -1308,18 +1308,18 @@ static actor_method_class l_daE_TH_Method = { }; actor_process_profile_definition g_profile_E_TH = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_TH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_th_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 134, // mPriority - &l_daE_TH_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_TH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_th_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_TH_e, + /* Actor SubMtd */ &l_daE_TH_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_th_ball.cpp b/src/d/actor/d_a_e_th_ball.cpp index c2995c2030c..8e6c24f09cd 100644 --- a/src/d/actor/d_a_e_th_ball.cpp +++ b/src/d/actor/d_a_e_th_ball.cpp @@ -114,7 +114,7 @@ static void chain_control_01(e_th_ball_class* i_this) { dBgS_GndChk gndchk; th_chain_s* chain_s = &i_this->field_0x65c; - if (master != NULL && fopAcM_GetName(master) == PROC_E_TH && master->mNoDraw == 0) { + if (master != NULL && fopAcM_GetName(master) == fpcNm_E_TH_e && master->mNoDraw == 0) { chain_s->m_pos[0] = master->mHandR_Pos1; } @@ -895,7 +895,7 @@ static void action(e_th_ball_class* i_this) { fopAc_ac_c* at_hit_actor = dCc_GetAc(at_hit_obj->GetAc()); if (i_this->mAction == ACTION_SPIN) { - if (fopAcM_GetName(at_hit_actor) == PROC_Obj_THASHI) { + if (fopAcM_GetName(at_hit_actor) == fpcNm_Obj_THASHI_e) { i_this->speedF = 30.0f + TREG_F(18); cXyz sp20 = i_this->current.pos - master->current.pos; @@ -910,7 +910,7 @@ static void action(e_th_ball_class* i_this) { master->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_th", 0x1B), 2, 10.0f, 1.0f, 0.0f, -1.0f); master->mAnm = 0x1B; } - } else if (i_this->mAction == ACTION_SHOT && i_this->speedF > 0.0f && fopAcM_GetName(at_hit_actor) == PROC_E_MD) { + } else if (i_this->mAction == ACTION_SHOT && i_this->speedF > 0.0f && fopAcM_GetName(at_hit_actor) == fpcNm_E_MD_e) { i_this->current.angle.y -= 0x8000; i_this->speedF *= 0.3f + AREG_F(14); i_this->mAction = ACTION_RETURN; @@ -931,7 +931,7 @@ static void get_demo(e_th_ball_class* i_this) { case 0: break; case 1: - demo_id = fopAcM_createItemForTrBoxDemo(&i_this->current.pos, fpcNm_ITEM_IRONBALL, -1, fopAcM_GetRoomNo(i_this), NULL, NULL); + demo_id = fopAcM_createItemForTrBoxDemo(&i_this->current.pos, dItemNo_IRONBALL_e, -1, fopAcM_GetRoomNo(i_this), NULL, NULL); JUT_ASSERT(1670, demo_id != fpcM_ERROR_PROCESS_ID_e); i_this->mDemoMode = 2; break; @@ -1124,18 +1124,18 @@ static actor_method_class l_daE_TH_BALL_Method = { }; actor_process_profile_definition g_profile_E_TH_BALL = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_TH_BALL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_th_ball_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 135, // mPriority - &l_daE_TH_BALL_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_TH_BALL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_th_ball_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_TH_BALL_e, + /* Actor SubMtd */ &l_daE_TH_BALL_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_tk.cpp b/src/d/actor/d_a_e_tk.cpp index ca9a5445e41..0d48d7c86e6 100644 --- a/src/d/actor/d_a_e_tk.cpp +++ b/src/d/actor/d_a_e_tk.cpp @@ -375,7 +375,7 @@ static void e_tk_attack(e_tk_class* i_this) { if (pl_y_check(i_this)) { if ((int)i_this->mpMorf->getFrame() == 24) { i_this->mBallID = - fopAcM_createChild(PROC_E_TK_BALL, fopAcM_GetID(actor), 0, &actor->eyePos, + fopAcM_createChild(fpcNm_E_TK_BALL_e, fopAcM_GetID(actor), 0, &actor->eyePos, fopAcM_GetRoomNo(actor), &actor->shape_angle, 0, -1, 0); } if ((int)i_this->mpMorf->getFrame() == 28) { @@ -813,18 +813,18 @@ static actor_method_class l_daE_TK_Method = { }; actor_process_profile_definition g_profile_E_TK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_TK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_tk_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 149, // mPriority - &l_daE_TK_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_TK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_tk_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_TK_e, + /* Actor SubMtd */ &l_daE_TK_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_tk2.cpp b/src/d/actor/d_a_e_tk2.cpp index b28faa1b9b3..336f011f3a9 100644 --- a/src/d/actor/d_a_e_tk2.cpp +++ b/src/d/actor/d_a_e_tk2.cpp @@ -289,7 +289,7 @@ static void e_tk2_attack(e_tk2_class* i_this) { case MODE_TK2_APPEAR: if ((int)i_this->mpMorf->getFrame() == 0x18) { i_this->mBallID = - fopAcM_createChild(PROC_E_TK_BALL, fopAcM_GetID(actor), 1, &actor->eyePos, + fopAcM_createChild(fpcNm_E_TK_BALL_e, fopAcM_GetID(actor), 1, &actor->eyePos, fopAcM_GetRoomNo(actor), &actor->shape_angle, 0, -1, 0); } if ((int)i_this->mpMorf->getFrame() == 0x1c) { @@ -615,18 +615,18 @@ static actor_method_class l_daE_TK2_Method = { }; actor_process_profile_definition g_profile_E_TK2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_TK2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_tk2_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 150, // mPriority - &l_daE_TK2_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_TK2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_tk2_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_TK2_e, + /* Actor SubMtd */ &l_daE_TK2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_tk_ball.cpp b/src/d/actor/d_a_e_tk_ball.cpp index fb719a4240b..1ed6a0db0c3 100644 --- a/src/d/actor/d_a_e_tk_ball.cpp +++ b/src/d/actor/d_a_e_tk_ball.cpp @@ -477,18 +477,18 @@ static actor_method_class l_daE_TK_BALL_Method = { }; actor_process_profile_definition g_profile_E_TK_BALL = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_TK_BALL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_tk_ball_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 151, // mPriority - &l_daE_TK_BALL_Method, // sub_method - 0x00040120, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_TK_BALL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_tk_ball_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_TK_BALL_e, + /* Actor SubMtd */ &l_daE_TK_BALL_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index 1c26e5c7212..806c599146c 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -1320,20 +1320,20 @@ static actor_method_class l_daE_TT_Method = { }; actor_process_profile_definition g_profile_E_TT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_TT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_TT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 208, // mPriority - &l_daE_TT_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_TT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_TT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_TT_e, + /* Actor SubMtd */ &l_daE_TT_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index a660d5bead4..a52b02e5989 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -3903,20 +3903,20 @@ static actor_method_class l_daE_VA_Method = { }; actor_process_profile_definition g_profile_E_VT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_VT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_VA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 756, // mPriority - &l_daE_VA_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_VT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_VA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_VT_e, + /* Actor SubMtd */ &l_daE_VA_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index e0111012824..ddd6d59b33e 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -33,7 +33,7 @@ static e_s1_class* master_ns[3]; static void* s_s1_sub(void* i_actor, void* i_data) { e_s1_class* ns = (e_s1_class*)i_actor; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) { ns->mAction = 20; ns->mMode = 0; @@ -68,7 +68,7 @@ static void* s_s1_sub(void* i_actor, void* i_data) { static void* s_s1drop_sub(void* i_actor, void* i_data) { e_s1_class* ns = (e_s1_class*)i_actor; fopAc_ac_c* actor = (fopAc_ac_c*)i_data; - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) && + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) && ns->mMode != 2) { ns->current.pos = actor->current.pos; @@ -82,7 +82,7 @@ static void* s_s1drop_sub(void* i_actor, void* i_data) { } static void* s_s1riv_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) { e_s1_class* ns = (e_s1_class*)i_actor; ns->current.pos = master_ns[0]->home.pos; ns->old = ns->current; @@ -103,7 +103,7 @@ static void* s_s1riv_sub(void* i_actor, void* i_data) { } static void* s_s1fight_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) { e_s1_class* ns = (e_s1_class*)i_actor; ns->mMode = 20; } @@ -114,7 +114,7 @@ static void* s_s1fight_sub(void* i_actor, void* i_data) { static int entry_no; static void* s_s1entry_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) { e_s1_class* ns = (e_s1_class*)i_actor; e_warpappear_class* i_this = (e_warpappear_class*)i_data; @@ -138,7 +138,7 @@ static void* s_s1drop2_sub(void* i_actor, void* i_data) { e_s1_class* ns = (e_s1_class*)i_actor; e_warpappear_class* i_this = (e_warpappear_class*)i_data; - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) && + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) && i_this->target_info_count == ns->mEntryNo) { ns->current.pos = i_this->current.pos; @@ -160,7 +160,7 @@ static void* s_s1Yangset_sub(void* i_actor, void* i_data) { e_s1_class* ns = (e_s1_class*)i_actor; e_warpappear_class* i_this = (e_warpappear_class*)i_data; - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) && + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) && i_this->target_info_count == ns->mEntryNo) { ns->shape_angle.y = ns->current.angle.y = ew_s1angy; @@ -172,7 +172,7 @@ static void* s_s1Yangset_sub(void* i_actor, void* i_data) { } static void* s_s1start_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_S1_e) { e_s1_class* ns = (e_s1_class*)i_actor; fopAc_ac_c* actor = (fopAc_ac_c*)i_data; @@ -666,7 +666,7 @@ static void demo_camera(e_warpappear_class* i_this) { } if (i_this->demo_timer >= 180) { - obj_ihasi_class* ihasi = (obj_ihasi_class*)fopAcM_SearchByName(PROC_OBJ_IHASI); + obj_ihasi_class* ihasi = (obj_ihasi_class*)fopAcM_SearchByName(fpcNm_OBJ_IHASI_e); sp54.set(34800.0f, i_this->field_0x5ec + -300.0f, -26735.0f); ihasi->mParticleKey = @@ -914,18 +914,18 @@ static actor_method_class l_daE_Warpappear_Method = { }; actor_process_profile_definition g_profile_E_WAP = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_WAP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_warpappear_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 233, // mPriority - &l_daE_Warpappear_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_WAP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_warpappear_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_WAP_e, + /* Actor SubMtd */ &l_daE_Warpappear_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index bf0ea1ddaad..6b16502e2c2 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -332,7 +332,7 @@ static int e_wb_lr_wall_check(e_wb_class* i_this) { fopAc_ac_c* r30; if (dComIfG_Bgsp().LineCross(&linChk)) { r30 = dComIfG_Bgsp().GetActorPointer(linChk); - if (fopAcM_GetName(r30) == PROC_BG) { + if (fopAcM_GetName(r30) == fpcNm_BG_e) { return -1; } } @@ -343,7 +343,7 @@ static int e_wb_lr_wall_check(e_wb_class* i_this) { if (dComIfG_Bgsp().LineCross(&linChk)) { r30 = dComIfG_Bgsp().GetActorPointer(linChk); - if (fopAcM_GetName(r30) == PROC_BG) { + if (fopAcM_GetName(r30) == fpcNm_BG_e) { return 1; } } @@ -520,7 +520,7 @@ static s16 e_wb_wall_check(e_wb_class* i_this) { linChk.Set(&cStack_ac, &cStack_b8, a_this); if (dComIfG_Bgsp().LineCross(&linChk)) { fopAc_ac_c* uVar3 = dComIfG_Bgsp().GetActorPointer(linChk); - if (fopAcM_GetName(uVar3) != PROC_BG) { + if (fopAcM_GetName(uVar3) != fpcNm_BG_e) { return 0; } cXyz cStack_c4(linChk.GetCross()); @@ -1260,7 +1260,7 @@ static void e_wb_f_run(e_wb_class* i_this) { static void* s_wbstart_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { e_wb_class* wb = static_cast(i_actor); if (wb->field_0x79d == 0) { wb->field_0x7a6 = 1; @@ -1766,7 +1766,7 @@ static void arrow_rd_set(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; static cXyz arrow_rd_pos[1] = {cXyz(36460.0f, 1040.0f, -17020.0f)}; for (int i = 0; i < 1; i++) { - fopAcM_create(PROC_E_RD, 0xff00a3ff, &arrow_rd_pos[i], fopAcM_GetRoomNo(a_this), 0, 0, -1); + fopAcM_create(fpcNm_E_RD_e, 0xff00a3ff, &arrow_rd_pos[i], fopAcM_GetRoomNo(a_this), 0, 0, -1); } } @@ -2778,7 +2778,7 @@ static void damage_check(e_wb_class* i_this) { if (!daAlink_getAlinkActorClass()->checkBoarRideOwn(a_this) && i_this->field_0x6a0 == 0 && a_this->speedF < 1.0f && - fopAcM_GetName(hit_actor) == PROC_ALINK) { + fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { ANGLE_ADD(i_this->field_0x6ba, 2); if (i_this->field_0x6ba >= 150) { i_this->field_0x692 = i_this->mActionID; @@ -2790,7 +2790,7 @@ static void damage_check(e_wb_class* i_this) { } if ((lbl_244_bss_47 != 0 || lbl_244_bss_45 != 0) && - fopAcM_GetName(hit_actor) == PROC_E_WB) + fopAcM_GetName(hit_actor) == fpcNm_E_WB_e) { e_wb_class* wb = (e_wb_class*)hit_actor; if (i_this->field_0x6a0 == 0) { @@ -3079,11 +3079,11 @@ static void wb_rd_reset(e_wb_class* i_this) { cXyz pos = a_this->current.pos; if (i_this->mParam2 == 1 || i_this->mParam2 == 2) { - fopAcM_create(PROC_E_RD, 0xff010301, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); - fopAcM_create(PROC_E_RD, 0xff010302, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); + fopAcM_create(fpcNm_E_RD_e, 0xff010301, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); + fopAcM_create(fpcNm_E_RD_e, 0xff010302, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); } else if (i_this->mParam2 >= 3) { - fopAcM_create(PROC_E_RD, 0xff010101, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); - fopAcM_create(PROC_E_RD, 0xff010102, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); + fopAcM_create(fpcNm_E_RD_e, 0xff010101, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); + fopAcM_create(fpcNm_E_RD_e, 0xff010102, &pos, fopAcM_GetRoomNo(a_this), &player->shape_angle, 0, -1); } } @@ -3095,13 +3095,13 @@ static void wb_c_rd_reset(e_wb_class* i_this) { param = 0xff020300; } cXyz pos = a_this->current.pos; - fopAcM_create(PROC_E_RD, param | 1, &pos, fopAcM_GetRoomNo(a_this), 0, 0, -1); - fopAcM_create(PROC_E_RD, param | 2, &pos, fopAcM_GetRoomNo(a_this), 0, 0, -1); + fopAcM_create(fpcNm_E_RD_e, param | 1, &pos, fopAcM_GetRoomNo(a_this), 0, 0, -1); + fopAcM_create(fpcNm_E_RD_e, param | 2, &pos, fopAcM_GetRoomNo(a_this), 0, 0, -1); } static void* s_rddel_sub(void* param_0, void* param_1) { UNUSED(param_1); - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_E_RD) { + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_E_RD_e) { e_rd_class* rd = (e_rd_class*)param_0; if (rd->actor_set == 0) { fopAcM_delete((fopAc_ac_c*)param_0); @@ -3114,7 +3114,7 @@ static int rd_count; static void* s_rdcount_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e) { if (((e_rd_class*)i_actor)->actor_set == 0 && (((e_rd_class*)i_actor)->arg1 == 1 || ((e_rd_class*)i_actor)->arg1 == 2)) { @@ -3126,7 +3126,7 @@ static void* s_rdcount_sub(void* i_actor, void* i_data) { static void* s_rddel2_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e) { e_rd_class* rd = ((e_rd_class*)i_actor); fopAc_ac_c* r28 = fopAcM_SearchByID(rd->boar_id); if (r28 == i_data) { @@ -3140,7 +3140,7 @@ static void e_wb_crv_wait(e_wb_class* i_this) { fopEn_enemy_c* a_this = &i_this->mEnemy; cXyz unused, unused2; fopAc_ac_c* player = dComIfGp_getPlayer(0); - fopAc_ac_c* king_bulblin = fopAcM_SearchByName(PROC_E_RDB); + fopAc_ac_c* king_bulblin = fopAcM_SearchByName(fpcNm_E_RDB_e); i_this->field_0x6a0 = 0x14; switch (i_this->mActionMode) { @@ -3170,7 +3170,7 @@ static void e_wb_crv_wait(e_wb_class* i_this) { static s8 e_wb_c_run(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; fopAc_ac_c* player = dComIfGp_getPlayer(0); - fopAc_ac_c* coach_ = fopAcM_SearchByName(PROC_NPC_COACH); + fopAc_ac_c* coach_ = fopAcM_SearchByName(fpcNm_NPC_COACH_e); fopAc_ac_c* coach = coach_; e_rd_class* rider = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); @@ -3643,7 +3643,7 @@ static void action(e_wb_class* i_this) { static void* s_wbZrevise_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { e_wb_class* a_this = static_cast(i_actor); if (a_this->field_0x79d == 0) { a_this->mEnemy.current.pos = a_this->mEnemy.home.pos; @@ -3655,7 +3655,7 @@ static void* s_wbZrevise_sub(void* i_actor, void* i_data) { static void* s_spd0_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { e_wb_class* a_this = static_cast(i_actor); if (a_this->field_0x79d == 0) { a_this->mEnemy.speedF = 0.0f; @@ -3667,7 +3667,7 @@ static void* s_spd0_sub(void* i_actor, void* i_data) { static void* s_wbdel_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { e_wb_class* a_this = static_cast(i_actor); if (a_this->field_0x79d == 0) { fopAcM_delete((fopAc_ac_c*)i_actor); @@ -3679,7 +3679,7 @@ static void* s_wbdel_sub(void* i_actor, void* i_data) { static void* s_rdArrowWait_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_RD_e) { e_rd_class* a_this = static_cast(i_actor); if (a_this->weapon_type == 2 || a_this->weapon_type == 3) { a_this->timer[1] = cM_rndF(20.0) + 3.0f; @@ -3715,7 +3715,7 @@ static void demo_camera(e_wb_class* i_this) { if (i_this->field_0x169e != 0) { horse = (daHorse_c*)dComIfGp_getHorseActor(); local_194 = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); - rdb = (e_rdb_class*)fopAcM_SearchByName(PROC_E_RDB); + rdb = (e_rdb_class*)fopAcM_SearchByName(fpcNm_E_RDB_e); } cXyz local_3c, cStack_48, cStack_54, cStack_60; @@ -4566,7 +4566,7 @@ static void demo_camera(e_wb_class* i_this) { } } break; case 0x3e: { - daObjCRVSTEEL_c* crvSteel = (daObjCRVSTEEL_c*)fopAcM_SearchByName(PROC_Obj_CRVSTEEL); + daObjCRVSTEEL_c* crvSteel = (daObjCRVSTEEL_c*)fopAcM_SearchByName(fpcNm_Obj_CRVSTEEL_e); if (i_this->field_0x16a0 == (s16)(20 + AREG_S(4))) { crvSteel->OpenSet(20.0f + AREG_F(3), 350.0f + AREG_F(4)); Z2GetAudioMgr()->seStart(Z2SE_OBJ_CRVN_URA_GATE, &crvSteel->current.pos, 0, 0, 1.0f, @@ -4681,7 +4681,7 @@ static void demo_camera(e_wb_class* i_this) { cStack_48.set(1800.0f, player->current.pos.y, -192.0f); player->setPlayerPosAndAngle(&cStack_48, 0, 0); if (i_this->field_0x16a0 == (s16)(2 + VREG_S(1))) { - daObjCRVGATE_c* crvGate = (daObjCRVGATE_c*)fopAcM_SearchByName(PROC_Obj_CRVGATE); + daObjCRVGATE_c* crvGate = (daObjCRVGATE_c*)fopAcM_SearchByName(fpcNm_Obj_CRVGATE_e); crvGate->SetB_Close(); } @@ -4913,7 +4913,7 @@ static void demo_camera(e_wb_class* i_this) { } break; case 0x60: { if (i_this->field_0x16a0 >= 100) { - fopAc_ac_c* local_1b0 = fopAcM_SearchByName(PROC_NPC_COACH); + fopAc_ac_c* local_1b0 = fopAcM_SearchByName(fpcNm_NPC_COACH_e); a_this->current.pos = local_1b0->eyePos; a_this->current.pos.z = a_this->current.pos.z - VREG_F(17); } @@ -4923,7 +4923,7 @@ static void demo_camera(e_wb_class* i_this) { } } break; case 0x61: { - fopAc_ac_c* local_1b4 = fopAcM_SearchByName(PROC_NPC_COACH); + fopAc_ac_c* local_1b4 = fopAcM_SearchByName(fpcNm_NPC_COACH_e); a_this->current.pos = local_1b4->eyePos; a_this->current.pos.z = a_this->current.pos.z - VREG_F(17); if (i_this->field_0x16a0 == 120) { @@ -5371,9 +5371,9 @@ static int daE_WB_Execute(e_wb_class* i_this) { fopAc_ac_c* hit_actor = dCc_GetAc(hit_obj->GetAc()); if (hit_actor != NULL) { - if (fopAcM_GetName(hit_actor) == PROC_E_RD) { + if (fopAcM_GetName(hit_actor) == fpcNm_E_RD_e) { i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_RUNDOWN, 0, -1); - } else if (fopAcM_GetName(hit_actor) == PROC_ALINK) { + } else if (fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { if (daPy_getPlayerActorClass()->checkPlayerGuard()) { dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } @@ -5640,7 +5640,7 @@ static int daE_WB_Create(fopAc_ac_c* i_this) { } if (a_this->field_0x79d == 1 || a_this->field_0x79d == 2) { - fopAcM_createChild(PROC_OBJ_WFLAG, fopAcM_GetID(i_this), 0, &i_this->current.pos, + fopAcM_createChild(fpcNm_OBJ_WFLAG_e, fopAcM_GetID(i_this), 0, &i_this->current.pos, fopAcM_GetRoomNo(i_this), 0, 0, -1, 0); } @@ -5799,20 +5799,20 @@ static actor_method_class l_daE_WB_Method = { }; actor_process_profile_definition g_profile_E_WB = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_WB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_wb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 152, // mPriority - &l_daE_WB_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_WB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_wb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_WB_e, + /* Actor SubMtd */ &l_daE_WB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index 4c4d80c2486..a5fe07f24b2 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -358,7 +358,7 @@ void daE_WS_c::executeAttack() { } if (mCcSph.ChkAtHit()) { cCcD_Obj* r27 = mCcSph.GetAtHitObj(); - if (fopAcM_GetName(dCc_GetAc(r27->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(r27->GetAc())) == fpcNm_ALINK_e) { r28 = true; } } @@ -596,7 +596,7 @@ void daE_WS_c::damage_check() { mSound.startCreatureSound(Z2SE_EN_ST_SHELL_BREAK, 0, -1); } else if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_THROW_OBJ)) { fopAc_ac_c* throwobj_p = dCc_GetAc(mAtInfo.mpCollider->GetAc()); - if (fopAcM_GetName(throwobj_p) == PROC_Obj_Carry && ((daObjCarry_c*)throwobj_p)->getType() == daObjCarry_c::TYPE_BOKKURI) { + if (fopAcM_GetName(throwobj_p) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)throwobj_p)->getType() == daObjCarry_c::TYPE_BOKKURI) { mSound.startCreatureSound(Z2SE_EN_ST_SHELL_BREAK, 0, -1); } } @@ -985,18 +985,18 @@ static actor_method_class l_daE_WS_Method = { }; actor_process_profile_definition g_profile_E_WS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_WS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_WS_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 200, // mPriority - &l_daE_WS_Method, // sub_method - 0x00050100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_WS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_WS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_WS_e, + /* Actor SubMtd */ &l_daE_WS_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index 2ca44c2c193..987eb0d2ae3 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_ww.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -108,7 +108,7 @@ class daE_WW_HIO_c : public JORReflexible { /* ホワイトウルフォス - White Werewolf */ /* 0x04 */ s8 field_0x04; - /* 0x08 */ f32 model_size; // モデルサイズ - Model Size + /* 0x08 */ f32 model_size; // モデルサイズ - Model Size /* 0x0C */ f32 attack_interval; // 攻撃間隔 - Attack Interval /* 0x10 */ f32 run_anm; // 走りアニメーション - Run Animation /* 0x14 */ f32 walk_anm; // 歩きアニメーション - Walk Animation @@ -130,7 +130,7 @@ namespace { {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph } // mSphAttr }; - + dCcD_SrcSph cc_ww_tg_src = { { {0x0, {{0x0, 0x1, 0x0}, {0xD8FBFDFF, 0x43}, 0x0}}, // mObj @@ -260,7 +260,7 @@ int daE_WW_c::draw() { #endif return 1; } - + J3DModel* model_p = mpModelMorf->getModel(); g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(model_p, &tevStr); @@ -320,7 +320,7 @@ void daE_WW_c::damage_check() { if (var_r29 != NULL) { mAtInfo.mpCollider = var_r29; if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_IRON_BALL) != 0) { - if (fopAcM_GetName(dCc_GetAc(mAtInfo.mpCollider->GetAc())) == PROC_Obj_Carry) { + if (fopAcM_GetName(dCc_GetAc(mAtInfo.mpCollider->GetAc())) == fpcNm_Obj_Carry_e) { S16_ADD(health, 150); } else if (dComIfGp_checkPlayerStatus0(0, 0x400) != 0) { S16_ADD(health, 180); @@ -410,7 +410,7 @@ void daE_WW_c::setGroundAngle() { sp14.y = mObjAcch.GetGroundH(); dBgS_GndChk gnd_chk; Vec gnd_pos; - + if (field_0x75c == 0) { gnd_pos.x = sp14.x + 100.0f * cM_ssin(shape_angle.y); gnd_pos.y = 150.0f + sp14.y; @@ -528,7 +528,7 @@ void daE_WW_c::setAppearEffect() { static void* s_child_ww(void* i_actor, void* i_data) { if (i_actor != i_data && fopAcM_IsActor(i_actor) - && fopAcM_GetName(i_actor) == PROC_E_WW && !fpcM_IsCreating(fopAcM_GetID(i_actor))) { + && fopAcM_GetName(i_actor) == fpcNm_E_WW_e && !fpcM_IsCreating(fopAcM_GetID(i_actor))) { if (fopAcM_GetLinkId((fopAc_ac_c*)i_actor) == fopAcM_GetID(i_data)) { lbl_237_bss_30++; } @@ -545,22 +545,22 @@ static void* s_obj_sub(void* i_proc, void* i_data) { if (fVar2 == fVar3) { f32 fVar4 = fopAcM_GetSpeed((fopAc_ac_c *) i_proc).y; if (fVar4 == fVar3) { - if (fopAcM_GetName(i_proc) == PROC_Obj_Carry) { + if (fopAcM_GetName(i_proc) == fpcNm_Obj_Carry_e) { return i_proc; } - if (fopAcM_GetName(i_proc) == PROC_NBOMB) { + if (fopAcM_GetName(i_proc) == fpcNm_NBOMB_e) { return i_proc; } } } } - if (dist < 500.0f && (fopAcM_GetName(i_proc) == PROC_BOOMERANG || fopAcM_GetName(i_proc) == PROC_NBOMB)) { + if (dist < 500.0f && (fopAcM_GetName(i_proc) == fpcNm_BOOMERANG_e || fopAcM_GetName(i_proc) == fpcNm_NBOMB_e)) { return i_proc; } - - if (dist < 700.0f && fopAcM_GetName(i_proc) == PROC_ARROW) { + + if (dist < 700.0f && fopAcM_GetName(i_proc) == fpcNm_ARROW_e) { f32 fVar5 = fopAcM_GetSpeedF((fopAc_ac_c *) i_proc); f32 fVar6 = 0.0f; if (fVar5 != fVar6) { @@ -603,7 +603,7 @@ bool daE_WW_c::checkSideStep() { } static void* s_attack_ww(void* i_actor, void* i_data) { - if (i_actor != i_data && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WW && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && ((daE_WW_c*)i_actor)->isAttack() != 0) { + if (i_actor != i_data && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_WW_e && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && ((daE_WW_c*)i_actor)->isAttack() != 0) { return i_actor; } @@ -628,7 +628,7 @@ void daE_WW_c::createWolf(cXyz param_0, u8 param_1) { var_r28 = 1; } - mChildID[var_r29] = fopAcM_createChild(PROC_E_WW, var_r30, (var_r28 << 24) | (field_0x6b4 | (0xF0FF0000 | 0xF000) | (temp_r27 * 0x10)), ¶m_0, fopAcM_GetRoomNo(this), &sp14, NULL, -1, NULL); + mChildID[var_r29] = fopAcM_createChild(fpcNm_E_WW_e, var_r30, (var_r28 << 24) | (field_0x6b4 | (0xF0FF0000 | 0xF000) | (temp_r27 * 0x10)), ¶m_0, fopAcM_GetRoomNo(this), &sp14, NULL, -1, NULL); } static cXyz create_pos[15] = { @@ -655,7 +655,7 @@ void daE_WW_c::executeMaster() { f32 temp_f30 = sp48.absXZ(current.pos); cXyz sp3C; cXyz sp30; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); field_0x724 = 10; switch (mActionMode) { case ACTION_MODE_0: @@ -786,7 +786,7 @@ void daE_WW_c::executeMaster() { void daE_WW_c::executeWait() { switch (mActionMode) { case ACTION_MODE_0: - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); setBck(BCK_WW_APPEAR, J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f); mActionMode = ACTION_MODE_1; break; @@ -806,7 +806,7 @@ void daE_WW_c::executeWait() { mActionMode = ACTION_MODE_10; return; } - + setBck(BCK_WW_WAIT, J3DFrameCtrl::EMode_LOOP, 3.0f, 1.0f); return; } @@ -826,7 +826,7 @@ void daE_WW_c::executeWait() { } } - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); if (var_r28) { setActionMode(ACTION_ATTACK, ACTION_MODE_0); field_0x756 = 1; @@ -871,7 +871,7 @@ int daE_WW_c::calcJumpSpeed() { void daE_WW_c::executeAttack() { daPy_py_c* player_p = daPy_getPlayerActorClass(); - + switch (mActionMode) { case ACTION_MODE_0: setBck(BCK_WW_RUN, J3DFrameCtrl::EMode_LOOP, 3.0f, l_HIO.run_anm); // Change BCK index to enum ? @@ -913,7 +913,7 @@ void daE_WW_c::executeAttack() { return; } break; - + case ACTION_MODE_10: field_0x6cc = fopAcM_searchPlayerAngleY(this); shape_angle.y = field_0x6cc; @@ -951,7 +951,7 @@ void daE_WW_c::executeAttack() { if (player_p->getSpeedF() >= 18.0f) { var_f31 = 1000.0f + nREG_F(18) + mDistCheckModifier; } - + if (fopAcM_searchPlayerDistance(this) < var_f31 && checkAttackWall() != 0) { mActionMode = ACTION_MODE_20; setBck(BCK_WW_JUMPATTACKA, J3DFrameCtrl::EMode_NONE, 3.0f, 1.0f); // Change to ANM_JUMP ? @@ -1090,7 +1090,7 @@ void daE_WW_c::executeChase() { s16 sp8; cXyz sp28 = daPy_getPlayerActorClass()->current.pos; f32 temp_f31 = sp28.absXZ(current.pos); - + switch (mActionMode) { case ACTION_MODE_5: if (temp_f31 > 1500.0f + nREG_F(18) + mDistCheckModifier) { @@ -1171,7 +1171,7 @@ void daE_WW_c::executeChase() { field_0x75a = 1; cLib_addCalcAngleS(&shape_angle.y, getNearPlayerAngle(), 4, 0x800, 0x100); current.angle.y = shape_angle.y; - + f32 fVar5 = daPy_getPlayerActorClass()->speedF; f32 fVar6 = 0.0f; if (fVar5 != fVar6) { @@ -1476,7 +1476,7 @@ void daE_WW_c::executeMoveOut() { mActionMode = ACTION_MODE_11; } } else if (fVar1 > nREG_F(18) + 3000.0f + mDistCheckModifier) { - if (fopAcM_CheckCondition(this, fopAcM_STATUS_UNK_0x4)) { + if (fopAcM_CheckCondition(this, fopAcStts_UNK_0x4_e)) { fopAcM_delete(this); break; } @@ -1538,7 +1538,7 @@ void daE_WW_c::executeMoveOut() { speedF = l_HIO.run_speed; mActionMode = ACTION_MODE_16; field_0x728 = 60; - + if ((s16)(cLib_targetAngleY(¤t.pos, &field_0x668) - fopAcM_searchPlayerAngleY(this)) < 0) { field_0x6cc = 0x2000; } else { @@ -1656,7 +1656,7 @@ bool daE_WW_c::checkWalkStart() { u8 uVar1 = 0; spdc.set(0.0f, 100.0f, nREG_F(18) + 1500.0f + 100.0f); cLib_offsetPos(&spd0, &spe8, (s16)(angleY + 0x1400 + cM_rndFX(1024.0f)), &spdc); - + f32 fVar1 = checkCreateBg(spd0); if (fVar1 != -G_CM3D_F_INF) { uVar1 = 1; @@ -1756,7 +1756,7 @@ void daE_WW_c::executeWalk() { if (checkMoveOut()) return; break; } - + case ACTION_MODE_10: setBck(BCK_WW_RUN, J3DFrameCtrl::EMode_LOOP, 3.0f, l_HIO.run_anm); mActionMode = ACTION_MODE_11; @@ -1908,7 +1908,7 @@ void daE_WW_c::mtx_set() { mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::XrotM(field_0x6ce); mDoMtx_stack_c::scaleM(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size); - + mpModelMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); mpModelMorf->modelCalc(); } @@ -1930,7 +1930,7 @@ void daE_WW_c::cc_set() { mSph2[0].SetC(sp8); mSph2[0].SetR(70.0f + nREG_F(17)); dComIfG_Ccsp()->Set(&mSph2[0]); - mDoMtx_stack_c::copy(model_p->getAnmMtx(JNT_HEAD)), + mDoMtx_stack_c::copy(model_p->getAnmMtx(JNT_HEAD)), mDoMtx_stack_c::transM(-10.0f, -20.0f, 0.0f); mDoMtx_stack_c::multVecZero(&sp8); mSph1[1].SetC(sp8); @@ -2138,7 +2138,7 @@ int daE_WW_c::_delete() { if (heap != 0) { mSound.deleteObject(); } - + return 1; } @@ -2184,7 +2184,7 @@ int daE_WW_c::create() { if (field_0x6b4 == 0xF) { field_0x6b4 = 0; } - + u8 var_r26 = fopAcM_GetParam(this) >> 4; // Arg1 ? if (var_r26 == 0xFF || var_r26 == 0) { var_r26 = 30; @@ -2224,7 +2224,7 @@ int daE_WW_c::create() { var_r27 = 10; } } - + field_0x6ac = 100.0f * var_r27; shape_angle.x = 0; current.angle.x = 0; @@ -2256,7 +2256,7 @@ int daE_WW_c::create() { health = 100; field_0x560 = 100; } - + mCcStts.Init(0xFE, 0, this); field_0x75d = 1; attention_info.flags = fopAc_AttnFlag_BATTLE_e; @@ -2306,20 +2306,20 @@ static actor_method_class l_daE_WW_Method = { }; actor_process_profile_definition g_profile_E_WW = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_WW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_WW_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 209, // mPriority - &l_daE_WW_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_WW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_WW_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_WW_e, + /* Actor SubMtd */ &l_daE_WW_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_e_yc.cpp b/src/d/actor/d_a_e_yc.cpp index f6b975f4e9e..042bcbcfc59 100644 --- a/src/d/actor/d_a_e_yc.cpp +++ b/src/d/actor/d_a_e_yc.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_e_rdy.h" static f32 S_area_dis; @@ -835,18 +835,18 @@ static actor_method_class l_daE_YC_Method = { }; actor_process_profile_definition g_profile_E_YC = { - fpcLy_CURRENT_e, - 4, - fpcPi_CURRENT_e, - PROC_E_YC, - &g_fpcLf_Method.base, - sizeof(e_yc_class), - 0, - 0, - &g_fopAc_Method.base, - 0xBB, - &l_daE_YC_Method, - 0x40100, - fopAc_ENEMY_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yc_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YC_e, + /* Actor SubMtd */ &l_daE_YC_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp index 3146abf0189..63d773fe2ea 100644 --- a/src/d/actor/d_a_e_yd.cpp +++ b/src/d/actor/d_a_e_yd.cpp @@ -1472,7 +1472,7 @@ static int daE_YD_Create(fopAc_ac_c* i_this) { leafRoomNo = fopAcM_GetRoomNo(i_this); - a_this->mLeafId = fopAcM_createChild(PROC_E_YD_LEAF, fopAcM_GetID(i_this), 0, + a_this->mLeafId = fopAcM_createChild(fpcNm_E_YD_LEAF_e, fopAcM_GetID(i_this), 0, &i_this->current.pos, leafRoomNo, &i_this->shape_angle, NULL, -1, NULL); i_this->field_0x565 = fopAcM_GetParam(i_this) >> 16; @@ -1493,18 +1493,18 @@ static actor_method_class l_daE_YD_Method = { }; actor_process_profile_definition g_profile_E_YD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_yd_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 143, // mPriority - &l_daE_YD_Method, // sub_method - 0x10050100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yd_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YD_e, + /* Actor SubMtd */ &l_daE_YD_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_yd_leaf.cpp b/src/d/actor/d_a_e_yd_leaf.cpp index dbcc9a2f934..fc14b235068 100644 --- a/src/d/actor/d_a_e_yd_leaf.cpp +++ b/src/d/actor/d_a_e_yd_leaf.cpp @@ -95,18 +95,18 @@ static actor_method_class l_daE_YD_LEAF_Method = { }; actor_process_profile_definition g_profile_E_YD_LEAF = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_E_YD_LEAF, - &g_fpcLf_Method.base, - sizeof(e_yd_leaf_class), - 0, - 0, - &g_fopAc_Method.base, - 145, - &l_daE_YD_LEAF_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YD_LEAF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yd_leaf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YD_LEAF_e, + /* Actor SubMtd */ &l_daE_YD_LEAF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_yg.cpp b/src/d/actor/d_a_e_yg.cpp index d5d0e538684..af5c540e6bb 100644 --- a/src/d/actor/d_a_e_yg.cpp +++ b/src/d/actor/d_a_e_yg.cpp @@ -246,7 +246,7 @@ static int target_info_count; static void* s_d_sub(void* i_actor, void* i_data) { daObjCarry_c* actor = (daObjCarry_c*)i_actor; - if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == PROC_Obj_Carry && actor->getType() == 5 && target_info_count < 20) { + if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_Obj_Carry_e && actor->getType() == 5 && target_info_count < 20) { target_info[target_info_count] = actor; target_info_count++; } @@ -441,7 +441,7 @@ static s8 e_yg_attack(e_yg_class* i_this) { if (i_this->mPlayerDist < TREG_F(4) + 300.0f) { /* If Phantom Zant actor exists */ - if (fopAcM_SearchByName(PROC_E_PZ) != NULL) { + if (fopAcM_SearchByName(fpcNm_E_PZ_e) != NULL) { i_this->mTimers[0] = fopAcM_GetID(actor) & 0x1F; i_this->mActionMode = ATTACK_MODE_23; anm_init(i_this, BCK_YG_WAIT, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); @@ -1425,7 +1425,7 @@ static cPhs_Step daE_YG_Create(fopAc_ac_c* actor) { i_this->mDistance = l_HIO.pl_recognition_dist; /* If Phantom Zant actor exists */ - if (fopAcM_SearchByName(PROC_E_PZ) != 0) { + if (fopAcM_SearchByName(fpcNm_E_PZ_e) != 0) { i_this->mDistance = 10000.0f; i_this->mUnkFlag2 = 1; } @@ -1447,18 +1447,18 @@ static actor_method_class l_daE_YG_Method = { }; actor_process_profile_definition g_profile_E_YG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_yg_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 190, // mPriority - &l_daE_YG_Method, // sub_method - 0x00050120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yg_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YG_e, + /* Actor SubMtd */ &l_daE_YG_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index 369b19b2161..6f462b2cdcb 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -2236,7 +2236,7 @@ static int daE_YH_Create(fopAc_ac_c* a_this) { } i_this->mChildID = - fopAcM_createChild(PROC_E_YD_LEAF, fopAcM_GetID(a_this), 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this), + fopAcM_createChild(fpcNm_E_YD_LEAF_e, fopAcM_GetID(a_this), 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, 0, -1, 0); daE_YH_Execute(i_this); } @@ -2253,18 +2253,18 @@ static actor_method_class l_daE_YH_Method = { }; actor_process_profile_definition g_profile_E_YH = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_yh_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 144, // mPriority - &l_daE_YH_Method, // sub_method - 0x10050120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yh_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YH_e, + /* Actor SubMtd */ &l_daE_YH_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index b9dcff3ff88..d91d79b53a9 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -150,7 +150,7 @@ static int daE_YK_Draw(e_yk_class* i_this) { * * Checks if the given actor is: * - A valid actor - * - A boomerang (PROC_BOOMERANG) + * - A boomerang (fpcNm_BOOMERANG_e) * - Player is not in a certain state (0x80000) * - Boomerang is charged * - Boomerang parameter is 1 @@ -159,7 +159,7 @@ static int daE_YK_Draw(e_yk_class* i_this) { * by a charged boomerang's wind effect. */ static void* shot_b_sub(void* i_actor, void* param_1) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e && !dComIfGp_checkPlayerStatus0(0,0x80000) && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { @@ -1473,7 +1473,7 @@ static int daE_YK_Create(fopAc_ac_c* i_this) { yk->mPlayerTrigger = 100.0f * yk->mPlayerTriggerBase; - if (fopAcM_SearchByName(PROC_E_PZ)) { + if (fopAcM_SearchByName(fpcNm_E_PZ_e)) { // For phantom zant fights. Used in pl_check above yk->mPlayerTrigger = 100000.0f; } @@ -1558,18 +1558,18 @@ static actor_method_class l_daE_YK_Method = { }; actor_process_profile_definition g_profile_E_YK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_yk_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 188, // mPriority - &l_daE_YK_Method, // sub_method - 0x10050100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yk_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YK_e, + /* Actor SubMtd */ &l_daE_YK_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x10000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index e77595aae99..fe4f12bcbd8 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -206,7 +206,7 @@ static f32 m_obj_dist; static void* s_obj_sub(void* param_0, void* param_1) { f32 obj_dist, abs_dist_to_player; - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_Obj_Carry) { + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_Obj_Carry_e) { if (!fpcM_IsCreating(fopAcM_GetID(param_0))) { obj_dist = fopAcM_searchActorDistanceXZ((fopAc_ac_c*)param_0, (fopAc_ac_c*)param_1); @@ -498,7 +498,7 @@ bool daE_YM_c::checkSurpriseNear() { if (mDistToPlayer < my_val) { if (mSphCc.ChkCoHit()) { cCcD_Obj* hit_obj = mSphCc.GetCoHitObj(); - if (fopAcM_GetName(dCc_GetAc(hit_obj->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(hit_obj->GetAc())) == fpcNm_ALINK_e) { if (mType == 4) { return checkRailSurprise(); } @@ -711,7 +711,7 @@ void daE_YM_c::executeWait() { field_0x6f0 = 0x14; mMode = 3; field_0x6a6 = 0; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } } } @@ -857,7 +857,7 @@ void daE_YM_c::executeEscape() { } } if (!dComIfGp_event_runCheck()) { - fopAcM_OffStatus(this, 0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); } switch (mMode) { case 0: @@ -1681,7 +1681,7 @@ bool daE_YM_c::setAttackMotion() { if (mSphCc.ChkAtHit()) { cCcD_Obj* at_hit_obj = mSphCc.GetAtHitObj(); - if (fopAcM_GetName(dCc_GetAc(at_hit_obj->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(at_hit_obj->GetAc())) == fpcNm_ALINK_e) { if (mAction != ACT_ATTACK_WALL) { setActionMode(ACT_ATTACK_WALL); } else if (mMode == 4) { @@ -2156,7 +2156,7 @@ void daE_YM_c::executeFlyAttack() { cLib_chaseF(&speedF, l_HIO.mFlyAttackSpeed * cM_ssin(tan_val), 3.0f); if (mSphCc.ChkAtHit()) { fopAc_ac_c* hit_actor = dCc_GetAc(mSphCc.GetAtHitObj()->GetAc()); - if (fopAcM_GetName(hit_actor) == PROC_ALINK) { + if (fopAcM_GetName(hit_actor) == fpcNm_ALINK_e) { bckSetFly(7, 0, 0.0f, 1.0f); speedF = speed.y = 0.0f; mMode = 4; @@ -2245,7 +2245,7 @@ bool daE_YM_c::checkRailDig() { field_0x6f0 = 0x14; mMode = 3; mAcchCir.SetWall(40.0f, 60.0f); - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); return true; } } @@ -2923,7 +2923,7 @@ void daE_YM_c::executeRiver() { mSound.startCreatureSoundLevel(Z2SE_EN_YM_FLY, 0, -1); if (mSphCc.ChkTgHit()) { cCcD_Obj * tg_hit_obj = mSphCc.GetTgHitObj(); - if (fopAcM_GetName(dCc_GetAc(tg_hit_obj->GetAc())) == PROC_KAGO) { + if (fopAcM_GetName(dCc_GetAc(tg_hit_obj->GetAc())) == fpcNm_KAGO_e) { if (mpKago == tg_hit_obj->GetAc()) { if (mpKago->getLockActor() == this) { mpKago->setLockActor(NULL); @@ -2968,7 +2968,7 @@ void daE_YM_c::executeRiver() { } static void* s_ym_sub(void* main_p, void* other_p) { - if (fopAcM_IsActor(main_p) && fopAcM_GetName(main_p) == PROC_E_YM) { + if (fopAcM_IsActor(main_p) && fopAcM_GetName(main_p) == fpcNm_E_YM_e) { if (!fpcM_IsCreating(fopAcM_GetID(main_p)) && main_p != other_p && ((daE_YM_c*)main_p)->current.pos == ((daE_YM_c*)other_p)->current.pos) { @@ -3721,18 +3721,18 @@ static actor_method_class l_daE_YM_Method = { }; actor_process_profile_definition g_profile_E_YM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_YM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 194, // mPriority - &l_daE_YM_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_YM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YM_e, + /* Actor SubMtd */ &l_daE_YM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_ym_tag.cpp b/src/d/actor/d_a_e_ym_tag.cpp index fd607a778ee..501c80bd3b6 100644 --- a/src/d/actor/d_a_e_ym_tag.cpp +++ b/src/d/actor/d_a_e_ym_tag.cpp @@ -13,7 +13,7 @@ static int daE_YM_TAG_Draw(daE_YM_TAG_c* i_this) { } static void* s_e_ym(void* i_actorP1, void* i_actorP2) { - if (fopAcM_IsActor(i_actorP1) && fopAcM_GetName(i_actorP1) == PROC_E_YM) { + if (fopAcM_IsActor(i_actorP1) && fopAcM_GetName(i_actorP1) == fpcNm_E_YM_e) { if (fpcM_IsCreating(fopAcM_GetID(i_actorP1)) == 0) { if (static_cast(i_actorP1)->getTagNo() == (u8)fopAcM_GetParam(i_actorP2)) { return i_actorP1; @@ -69,18 +69,18 @@ static actor_method_class l_daE_YM_TAG_Method = { }; actor_process_profile_definition g_profile_E_YM_TAG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YM_TAG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_YM_TAG_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 195, // mPriority - &l_daE_YM_TAG_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YM_TAG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_YM_TAG_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YM_TAG_e, + /* Actor SubMtd */ &l_daE_YM_TAG_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index 74c4743c4f4..c4015e3f2ac 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_ymb.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -301,7 +301,7 @@ int daE_YMB_c::JointCallBack(J3DJoint* i_joint, int param_2) { } static void rideCallBack(dBgW* param_1, fopAc_ac_c* aActor_p, fopAc_ac_c* param_3) { - if (fopAcM_GetName(param_3) == PROC_ALINK) { + if (fopAcM_GetName(param_3) == fpcNm_ALINK_e) { ((daE_YMB_c*)aActor_p)->field_0x724 = 20; } } @@ -362,8 +362,8 @@ int daE_YMB_c::draw() { cXyz sp58; sp58.set(current.pos.x, current.pos.y + 100.0f, current.pos.z); tevStr.field_0x344 = (tevStr.field_0x344 * field_0x6d8) / 255.0f; - mShadowKey = dComIfGd_setShadow(mShadowKey, 0, model, &sp58, 2500.0f, 0.0f, - current.pos.y, field_0x6d4, mGndChk, &tevStr, 0, + mShadowKey = dComIfGd_setShadow(mShadowKey, 0, model, &sp58, 2500.0f, 0.0f, + current.pos.y, field_0x6d4, mGndChk, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); return 1; @@ -762,7 +762,7 @@ void daE_YMB_c::setDeathEffect() { } static void* search_drop(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Drop) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Drop_e) { if (!fpcM_IsCreating(fopAcM_GetID(i_actor))) { u8 switchBit = ((daE_YMB_c*)i_data)->getSwitchBit(); if (switchBit == 0xFF) { @@ -1075,7 +1075,7 @@ void daE_YMB_c::executeFlyAttack() { if (field_0x1324.ChkAtHit()) { actor = dCc_GetAc(field_0x1324.GetAtHitObj()->GetAc()); - if (fopAcM_GetName(actor) == PROC_ALINK) { + if (fopAcM_GetName(actor) == fpcNm_ALINK_e) { field_0x6fc = 30; speed.y = 0.0f; speedF = 0.0f; @@ -1595,7 +1595,7 @@ void daE_YMB_c::executeWaterJump() { case 5: mSound.startCreatureSoundLevel(Z2SE_EN_YB_FLY, 0, -1); - + if (field_0x6fc == 0 && cLib_chaseF(&speed.y, 0.0f, 3.0f) != 0 && mpModelMorf->isStop()) { setActionMode(1, 1); } @@ -1694,7 +1694,7 @@ void daE_YMB_c::executeDamage() { if (!(u8)checkBck(BCK_YB_FLY_WAIT)) { cLib_addCalcAngleS(&shape_angle.y, cLib_targetAngleY(¤t.pos, &YMB_DOWN_POS[field_0x711]) + 0x8000, 8, 0x200, 0x80); } - + if (field_0x6fc == 0) { cLib_chaseF(&speed.y, 0.0f, 5.0f); } @@ -2055,7 +2055,7 @@ void daE_YMB_c::setCreateDrop() { mDoMtx_stack_c::multVecZero(&sp1c); drop->setPos(sp1c); drop->setAppear(); - fopAcM_OnStatus(drop, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(drop, fopAcStts_UNK_0x4000_e); } field_0x721 = 1; @@ -2155,7 +2155,7 @@ void daE_YMB_c::executeDeath() { case 4: cLib_chaseF(&field_0x75c, -5.0f, 1.0f); mDemoCamCenter.y += field_0x75c; - + camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); if (field_0x6fc == 0) { @@ -2475,7 +2475,7 @@ void daE_YMB_c::executeStartDemo() { if (field_0x6fc >= 95) { setBoilEffect(1); - + if (field_0x6fc == 95) { dComIfGp_getVibration().StopQuake(31); } @@ -2940,7 +2940,7 @@ void daE_YMB_c::setAttentionPos() { if (field_0x6f4 == 0) { mDoMtx_stack_c::copy(model->getAnmMtx(1)); - + if (daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_WOLF_JUMP || mAction == 7) { mDoMtx_stack_c::transM(200.0f, 50.0f, 0.0f); } else { @@ -2981,7 +2981,7 @@ void daE_YMB_c::setAttentionPos() { void daE_YMB_c::cc_set() { cXyz sp28; J3DModel* model = mpModelMorf->getModel(); - + setAttentionPos(); mDoMtx_stack_c::copy(model->getAnmMtx(1)); mDoMtx_stack_c::multVecZero(&sp28); @@ -3147,7 +3147,7 @@ int daE_YMB_c::CreateHeap() { } mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical); - + return 1; } @@ -3246,18 +3246,18 @@ static actor_method_class l_daE_YMB_Method = { }; actor_process_profile_definition g_profile_E_YMB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YMB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_YMB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 196, // mPriority - &l_daE_YMB_Method, // sub_method - 0x00044000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YMB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_YMB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YMB_e, + /* Actor SubMtd */ &l_daE_YMB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_yr.cpp b/src/d/actor/d_a_e_yr.cpp index 61132a0de8f..d1851d303a8 100644 --- a/src/d/actor/d_a_e_yr.cpp +++ b/src/d/actor/d_a_e_yr.cpp @@ -2553,20 +2553,20 @@ static actor_method_class l_daE_Yr_Method = { }; actor_process_profile_definition g_profile_E_YR = { - (u32)fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_YR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(e_yr_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 189, // mPriority - &l_daE_Yr_Method, // sub_method - 0x10040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ (u32)fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_YR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(e_yr_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_YR_e, + /* Actor SubMtd */ &l_daE_Yr_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; e_yr_class::e_yr_class() { diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index ea976762440..5bba783e045 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -1,6 +1,6 @@ /** * @file d_a_e_zh.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -231,7 +231,7 @@ int daE_ZH_c::draw() { #if DEBUG mBgc.DrawWall(dComIfG_Bgsp()); #endif - + if (arg0 == 1) { g_env_light.settingTevStruct(8, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mEntranceModel, &tevStr); @@ -256,7 +256,7 @@ int daE_ZH_c::draw() { } J3DModel* model = mpModelMorf->getModel(); - + g_env_light.settingTevStruct(8, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(model, &tevStr); @@ -288,7 +288,7 @@ static int daE_ZH_Draw(daE_ZH_c* i_this) { } void daE_ZH_c::setBck(int i_anm, u8 i_attr, f32 i_morf, f32 i_rate) { - mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_ZH", i_anm), i_attr, i_morf, + mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_ZH", i_anm), i_attr, i_morf, i_rate, 0.0f, -1.0f); mAnm = i_anm; } @@ -299,7 +299,7 @@ void daE_ZH_c::setActionMode(int i_action, int i_mode) { } static void* s_BallSearch(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry && ((daObjCarry_c*)i_actor)->prm_chk_type_lightball() && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_actor)->prm_chk_type_lightball() && ((((daE_ZH_c*)i_data)->bitSw == 16 && ((daObjCarry_c*)i_actor)->getType() == 8) || (((daE_ZH_c*)i_data)->bitSw == 17 && ((daObjCarry_c*)i_actor)->getType() == 9))) { return i_actor; } @@ -308,7 +308,7 @@ static void* s_BallSearch(void* i_actor, void* i_data) { } static void* s_BallSearch_Tag(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry && ((daObjCarry_c*)i_actor)->prm_chk_type_lightball()) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_actor)->prm_chk_type_lightball()) { return i_actor; } @@ -638,7 +638,7 @@ struct eff_dt { void daE_ZH_c::mStartParticleSet() { static eff_dt const START_EFF_DT[11] = { {ZL2_HAHEN_1, 0, 7}, {ZL2_SMOKE00_1, 0, 7}, {ZL2_HAHEN_2, 0, 9}, {ZL2_SMOKE00_2, 0, 9}, - {ZL2_HAHEN_3, 0, 16}, {ZL2_SMOKE00_3, 0, 16}, {ZL2_HAHEN_4, 0, 4}, {ZL2_SMOKE00_4, 0, 4}, + {ZL2_HAHEN_3, 0, 16}, {ZL2_SMOKE00_3, 0, 16}, {ZL2_HAHEN_4, 0, 4}, {ZL2_SMOKE00_4, 0, 4}, {ZL2_SMOKE00_5, 0, 5}, {ZL2_HAHEN_5, 0, 5}, {ZL2_SMOKE00_6, 0, 5}, }; @@ -699,7 +699,7 @@ void daE_ZH_c::damage_check() { local_28.y = sp20.atan2sX_Z(); local_28.z = 0; - if (mActionMode != ACTION_EXECUTE_DEAD_STOP && mActionMode != ACTION_EXECUTE_DAMAGE && mActionMode != ACTION_EXECUTE_OPEN_START && + if (mActionMode != ACTION_EXECUTE_DEAD_STOP && mActionMode != ACTION_EXECUTE_DAMAGE && mActionMode != ACTION_EXECUTE_OPEN_START && !mAtInfo.mpCollider->ChkAtType(AT_TYPE_SLINGSHOT) && mAnm != BCK_ZH_OPEN && mAnm != BCK_ZH_START) { dComIfGp_setHitMark(1, this, &sp20, &local_28, NULL, 0); cc_at_check(this, &mAtInfo); @@ -773,7 +773,7 @@ void daE_ZH_c::executeStartDemo() { fVar1 = cLib_addCalcPos(&mDemoCamCenter, sp48, 0.7f, ZREG_F(10) + 10.0f, ZREG_F(11) + 2.0f); sp48.set(-15.0f, 350.0f, -3620.0f); fVar2 = cLib_addCalcPos(&mDemoCamEye, sp48, 0.7f, ZREG_F(10) + 10.0f, ZREG_F(11) + 2.0f); - + if (fVar1 > 4.0f || fVar2 > 4.0f) { break; } @@ -790,7 +790,7 @@ void daE_ZH_c::executeStartDemo() { camera->mCamera.SetTrimSize(0); dComIfGp_event_reset(); fopAcM_onSwitch(this, 0x12); - fopAcM_OffStatus(this , fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(this , fopAcStts_UNK_0x4000_e); setActionMode(ACTION_EXECUTE_WAIT, 1); } break; @@ -982,7 +982,7 @@ void daE_ZH_c::executeOpenStart() { setActionMode(ACTION_EXECUTE_FLY_DELETE, 0); break; } - + field_0x794[0] = BREG_S(8) + 6 & 0xFF; mMoveMode = 1; break; @@ -1123,7 +1123,7 @@ void daE_ZH_c::executeSearchMove() { cXyz ato; ato.y = mS_Ball->current.pos.y + 600.0f; - + if (mBgc.GetGroundH() != -G_CM3D_F_INF && mBgc.GetGroundH() + 500.0f > ato.y) { ato.y = mBgc.GetGroundH() + 500.0f; } @@ -1322,7 +1322,7 @@ void daE_ZH_c::executeCatchMove() { field_0xddc[i] = dComIfGp_particle_set(field_0xddc[i], effId[i], &field_0x668, NULL, NULL); } - field_0xde8 = dComIfGp_particle_setPolyColor(field_0xde8, effId[3], mBgc.m_gnd, &field_0x668, &tevStr, + field_0xde8 = dComIfGp_particle_setPolyColor(field_0xde8, effId[3], mBgc.m_gnd, &field_0x668, &tevStr, &shape_angle, &sp54, 0, NULL, -1, NULL); if (mAnm == BCK_ZH_CATCH02) { @@ -1493,7 +1493,7 @@ void daE_ZH_c::executeCatchFlyMove() { case 5: if (!mColorSet(false, 5.0f, 5.0f)) break; - + setActionMode(ACTION_EXECUTE_WAIT, 0); // fallthrough case 12: @@ -1933,7 +1933,7 @@ void daE_ZH_c::action() { if (mActionMode != ACTION_EXECUTE_SEARCH_MOVE && mActionMode != ACTION_EXECUTE_CATCH_MOVE && mActionMode != ACTION_EXECUTE_CATCH_FLY_MOVE) { Z2GetAudioMgr()->changeBgmStatus(99); } - + if (NREG_S(0) != 0) { OS_REPORT("\n\n\n"); OS_REPORT("mActionMode %d\n", mActionMode); @@ -2131,7 +2131,7 @@ int daE_ZH_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_ZH", BMDV_ZH); JUT_ASSERT(3305, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_ZH", BCK_ZH_WAIT01), + mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_ZH", BCK_ZH_WAIT01), 2, 1.0f, 0, -1, &mSound, 0, 0x31000284); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; @@ -2142,8 +2142,8 @@ int daE_ZH_c::CreateHeap() { return 0; } - if (!mpBtkAnm->init(mpModelMorf->getModel()->getModelData(), - (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("E_ZH", BTK_ZH_LOOP), 1, 2, + if (!mpBtkAnm->init(mpModelMorf->getModel()->getModelData(), + (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("E_ZH", BTK_ZH_LOOP), 1, 2, 1.0f, 0, -1)) { return 0; } @@ -2289,7 +2289,7 @@ cPhs_Step daE_ZH_c::create() { attention_info.flags &= ~fopAc_AttnFlag_BATTLE_e; if (fopAcM_GetRoomNo(this) == 0x33 && !fopAcM_isSwitch(this, 18)) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); setActionMode(ACTION_EXECUTE_START_DEMO, 0); } else { setActionMode(ACTION_EXECUTE_WAIT, 1); @@ -2336,18 +2336,18 @@ static actor_method_class l_daE_ZH_Method = { }; actor_process_profile_definition g_profile_E_ZH = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_ZH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_ZH_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 173, // mPriority - &l_daE_ZH_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_ZH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_ZH_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_ZH_e, + /* Actor SubMtd */ &l_daE_ZH_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index 25a3dceaca6..44e69609a76 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -294,7 +294,7 @@ bool daE_ZM_c::mCutTypeCheck() { } static void* s_PointSearch(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_ZM && ((daE_ZM_c*)i_actor)->arg0 == 10 && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_ZM_e && ((daE_ZM_c*)i_actor)->arg0 == 10 && ((daE_ZM_c*)i_data)->arg2 == ((daE_ZM_c*)i_actor)->arg2) { ((daE_ZM_c*)i_data)->field_0x66c[((daE_ZM_c*)i_data)->field_0x6e5] = ((daE_ZM_c*)i_actor)->current.pos; ((daE_ZM_c*)i_data)->field_0x6e5++; @@ -473,7 +473,7 @@ void daE_ZM_c::executeAttack() { sp50 -= sp44; angle.x = sp50.atan2sY_XZ(); - parentActorID = fopAcM_createChild(PROC_E_ZM, fopAcM_GetID(this), 20, &sp44, fopAcM_GetRoomNo(this), &angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_E_ZM_e, fopAcM_GetID(this), 20, &sp44, fopAcM_GetRoomNo(this), &angle, NULL, -1, NULL); dComIfGp_particle_set(dPa_RM(ID_ZI_S_ZM_HASSYA_A), &sp44, &shape_angle, &i_scale); mSound.startCreatureSound(Z2SE_EN_ZM_BALL_OUT, 0, -1); setBck(BCK_ZM_MOUTHOPEN, J3DFrameCtrl::EMode_NONE, 3.0f, -1.0f); @@ -1033,18 +1033,18 @@ static actor_method_class l_daE_ZM_Method = { }; actor_process_profile_definition g_profile_E_ZM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_ZM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_ZM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 174, // mPriority - &l_daE_ZM_Method, // sub_method - 0x00040120, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_ZM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_ZM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_ZM_e, + /* Actor SubMtd */ &l_daE_ZM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_e_zs.cpp b/src/d/actor/d_a_e_zs.cpp index 1a2e827453e..fea09e166a2 100644 --- a/src/d/actor/d_a_e_zs.cpp +++ b/src/d/actor/d_a_e_zs.cpp @@ -221,13 +221,13 @@ void daE_ZS_c::executeAppear() { if (field_0x65c > -2.0f) { field_0x65c = 0.0f; offWolfNoLock(); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); setActionMode(1, 0); } } else { if (mpMorf->isStop()) { offWolfNoLock(); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); setActionMode(1, 0); } } @@ -348,7 +348,7 @@ void daE_ZS_c::executeDrive() { } onWolfNoLock(); - fopAcM_OffStatus(this, 0x200000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x200000_e); mSound.startCreatureSound(Z2SE_EN_ZS_DISAPPEAR, 0, -1); field_0x673 = 1; mCyl.OffTgSetBit(); @@ -570,18 +570,18 @@ static actor_method_class l_daE_ZS_Method = { }; actor_process_profile_definition g_profile_E_ZS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_E_ZS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daE_ZS_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 170, // mPriority - &l_daE_ZS_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_E_ZS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daE_ZS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_E_ZS_e, + /* Actor SubMtd */ &l_daE_ZS_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_econt.cpp b/src/d/actor/d_a_econt.cpp index 1e0b69a82d9..ea976d6ee90 100644 --- a/src/d/actor/d_a_econt.cpp +++ b/src/d/actor/d_a_econt.cpp @@ -17,7 +17,7 @@ static int daEcont_Draw(econt_class* i_this) { } static void* s_rd_sub(void* i_this, void* param_1) { - if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_RD) { + if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == fpcNm_E_RD_e) { data_805197E0[0]++; } return 0; @@ -80,18 +80,18 @@ static actor_method_class l_daEcont_Method = { }; actor_process_profile_definition g_profile_ECONT = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_ECONT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(econt_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 155, // mPriority - &l_daEcont_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ECONT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(econt_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ECONT_e, + /* Actor SubMtd */ &l_daEcont_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index 7b86e201a81..312bd08ea4f 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -957,18 +957,18 @@ static actor_method_class l_daEp_Method = { }; actor_process_profile_definition g_profile_EP = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_EP, - &g_fpcLf_Method.base, - sizeof(ep_class), - 0, - 0, - &g_fopAc_Method.base, - 691, - &l_daEp_Method, - 0x10244000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_EP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(ep_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_EP_e, + /* Actor SubMtd */ &l_daEp_Method, + /* Status */ fopAcStts_UNK_0x10000000_e | fopAcStts_UNK_0x200000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_formation_mng.cpp b/src/d/actor/d_a_formation_mng.cpp index 70535c25ff0..b98a387ebe0 100644 --- a/src/d/actor/d_a_formation_mng.cpp +++ b/src/d/actor/d_a_formation_mng.cpp @@ -395,18 +395,18 @@ static actor_method_class l_daFmtMng_Method = { }; actor_process_profile_definition g_profile_FORMATION_MNG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_FORMATION_MNG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daFmtMng_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 410, // mPriority - &l_daFmtMng_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_FORMATION_MNG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daFmtMng_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_FORMATION_MNG_e, + /* Actor SubMtd */ &l_daFmtMng_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp index 4daceb2679a..66427aadda0 100644 --- a/src/d/actor/d_a_fr.cpp +++ b/src/d/actor/d_a_fr.cpp @@ -85,7 +85,7 @@ static void sibuki_set(fr_class* i_this) { static void* s_wd_sub(void* param_1, void* param_2) { UNUSED(param_2); - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_LP) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_OBJ_LP_e) { return param_1; } @@ -741,18 +741,18 @@ static actor_method_class l_daFr_Method = { }; actor_process_profile_definition g_profile_FR = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_FR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(fr_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 235, // mPriority - &l_daFr_Method, // sub_method - 0x08040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_FR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(fr_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_FR_e, + /* Actor SubMtd */ &l_daFr_Method, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index c0cedf9e78c..a965fe92936 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -311,7 +311,7 @@ int daGrass_c::create() { (num >= 16 && num <= 21 && i >= 16) || (num >= 4 && num <= 7 && i >= 4)) { - newGrassData(pos, fopAcM_GetRoomNo(this), fpcNm_ITEM_NONE, 0xFF, add_col, temp_r26); + newGrassData(pos, fopAcM_GetRoomNo(this), dItemNo_NONE_e, 0xFF, add_col, temp_r26); } else { newGrassData(pos, fopAcM_GetRoomNo(this), itemNo, itemBitNo, add_col, temp_r26); } @@ -401,20 +401,20 @@ static actor_method_class daGrass_METHODS = { }; actor_process_profile_definition g_profile_GRASS = { - fpcLy_CURRENT_e, // mLayerID - 11, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_GRASS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daGrass_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 8, // mPriority - &daGrass_METHODS, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 11, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GRASS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGrass_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_GRASS_e, + /* Actor SubMtd */ &daGrass_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_guard_mng.cpp b/src/d/actor/d_a_guard_mng.cpp index e70f82388f5..141b390c38c 100644 --- a/src/d/actor/d_a_guard_mng.cpp +++ b/src/d/actor/d_a_guard_mng.cpp @@ -10,10 +10,10 @@ static void* s_sub(void* i_actorP, void* i_this) { if (fopAcM_IsActor(i_actorP)) { - if (fopAcM_GetName(i_actorP) == PROC_NPC_CD3 || fopAcM_GetName(i_actorP) == PROC_NPC_PASSER || fopAcM_GetName(i_actorP) == PROC_NPC_FGUARD) { + if (fopAcM_GetName(i_actorP) == fpcNm_NPC_CD3_e || fopAcM_GetName(i_actorP) == fpcNm_NPC_PASSER_e || fopAcM_GetName(i_actorP) == fpcNm_NPC_FGUARD_e) { static_cast(i_this)->countMerchantNum(); } else { - if (fopAcM_GetName(i_actorP) == PROC_TAG_GUARD) { + if (fopAcM_GetName(i_actorP) == fpcNm_TAG_GUARD_e) { static_cast(i_this)->checkAppearTag((daTagGuard_c *)i_actorP); } } @@ -67,18 +67,18 @@ static actor_method_class l_daGuardMng_Method = { }; actor_process_profile_definition g_profile_GUARD_MNG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_GUARD_MNG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daGuardMng_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 407, // mPriority - &l_daGuardMng_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GUARD_MNG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGuardMng_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_GUARD_MNG_e, + /* Actor SubMtd */ &l_daGuardMng_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index 1e39edf37f0..d8f3aae581e 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -74,18 +74,18 @@ static actor_method_class l_daHitobj_Method = { }; actor_process_profile_definition g_profile_HITOBJ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_HITOBJ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(hitobj_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 690, // mPriority - &l_daHitobj_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_HITOBJ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(hitobj_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_HITOBJ_e, + /* Actor SubMtd */ &l_daHitobj_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index fd6f20f3eb2..bfe09545b1b 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -246,7 +246,7 @@ static dCcD_SrcSph l_sphSrc = { void daHorse_c::coHitCallbackBoarJump(fopAc_ac_c* i_hitActor) { if (!dComIfGp_event_runCheck() && !checkEndResetStateFlg0(daHorse_ERFLG0(ERFLG0_UNK_4 | ERFLG0_UNK_2 | ERFLG0_UNK_1)) && - fopAcM_GetName(i_hitActor) == PROC_E_WB && + fopAcM_GetName(i_hitActor) == fpcNm_E_WB_e && ((fopEn_enemy_c*)i_hitActor)->checkDownFlg()) { f32 sin_y = cM_ssin(current.angle.y); @@ -303,7 +303,7 @@ void daHorse_c::coHitCallbackBoarHit(fopAc_ac_c* i_hitActor, dCcD_GObjInf* i_hit if (!dComIfGp_event_runCheck() && ((m_procID == PROC_MOVE_e && speedF > 5.0f) || checkStateFlg0(daHorse_FLG0(FLG0_UNK_200000 | FLG0_UNK_100000))) && checkStateFlg0(FLG0_UNK_1) && - fopAcM_GetName(i_hitActor) == PROC_E_WB && + fopAcM_GetName(i_hitActor) == fpcNm_E_WB_e && !((fopEn_enemy_c*)i_hitActor)->checkDownFlg()) { if (checkStateFlg0(daHorse_FLG0(FLG0_UNK_200000 | FLG0_UNK_100000))) { @@ -332,7 +332,7 @@ void daHorse_c::coHitCallbackBoarHit(fopAc_ac_c* i_hitActor, dCcD_GObjInf* i_hit } void daHorse_c::coHitCallbackCowHit(fopAc_ac_c* i_hitActor) { - if ((fopAcM_GetName(i_hitActor) == PROC_COW) && ((daCow_c*)i_hitActor)->isAngry()) { + if ((fopAcM_GetName(i_hitActor) == fpcNm_COW_e) && ((daCow_c*)i_hitActor)->isAngry()) { ((daCow_c*)i_hitActor)->setAngryHit(); if (!dComIfGp_event_runCheck() && checkStateFlg0(FLG0_UNK_1)) { @@ -345,7 +345,7 @@ void daHorse_c::coHitCallbackCowHit(fopAc_ac_c* i_hitActor) { m_cowHit = 5; } - } else if (fopAcM_GetName(i_hitActor) == PROC_ALINK) { + } else if (fopAcM_GetName(i_hitActor) == fpcNm_ALINK_e) { if (daAlink_getAlinkActorClass()->checkSlideMode()) { onEndResetStateFlg0(ERFLG0_UNK_800); } @@ -380,7 +380,7 @@ static void* daHorse_searchEnemy(fopAc_ac_c* i_actor, void* i_data) { daHorse_c* horse_p = dComIfGp_getHorseActor(); f32 search_dist = *(f32*)i_data; - if (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e && fopAcM_GetName(i_actor) != PROC_E_WS && horse_p->current.pos.abs2XZ(i_actor->current.pos) < search_dist * search_dist) { + if (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e && fopAcM_GetName(i_actor) != fpcNm_E_WS_e && horse_p->current.pos.abs2XZ(i_actor->current.pos) < search_dist * search_dist) { return i_actor; } @@ -479,7 +479,7 @@ static int daHorse_modelCallBack(J3DJoint* i_joint, int param_1) { } static void* daHorse_searchSingleBoar(fopAc_ac_c* i_actor, void* i_data) { - if (fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { fopAc_ac_c** ppActor = (fopAc_ac_c**)i_data; *ppActor = i_actor; } @@ -1644,7 +1644,7 @@ int daHorse_c::checkHorseNoMove(int param_0) { } s16 spA; - if (daAlink_c::getMoveBGActorName(m_acch.m_gnd, 0) == PROC_OBJ_BRG) { + if (daAlink_c::getMoveBGActorName(m_acch.m_gnd, 0) == fpcNm_OBJ_BRG_e) { spA = 0; } else if (m_procID == PROC_TURN_e && dComIfG_Bgsp().ChkPolySafe(m_acch.m_gnd)) { spA = fopAcM_getPolygonAngle(m_acch.m_gnd, shape_angle.y); @@ -1687,7 +1687,7 @@ int daHorse_c::checkHorseNoMove(int param_0) { daAlink_c* player = daAlink_getAlinkActorClass(); cXyz start(current.pos.x, current.pos.y + m_acchcir[0].GetWallH(), current.pos.z); - if (daAlink_c::getMoveBGActorName(m_acch.m_gnd, 0) == PROC_OBJ_BRG) { + if (daAlink_c::getMoveBGActorName(m_acch.m_gnd, 0) == fpcNm_OBJ_BRG_e) { start.y = 200.0f + current.pos.y; } @@ -1768,7 +1768,7 @@ int daHorse_c::checkHorseNoMove(int param_0) { if (fopAcM_gc_c::getHorseNoEntry() || (!checkStateFlg0(FLG0_UNK_1) && dComIfG_Bgsp().GetExitId(*fopAcM_gc_c::getGroundCheck()) != 0x3F) || - (sp8 > sp14 && daAlink_c::getMoveBGActorName(*fopAcM_gc_c::getGroundCheck(), 1) != PROC_OBJ_BRG && dComIfG_Bgsp().GetSpecialCode(*fopAcM_gc_c::getGroundCheck()) != 2)) + (sp8 > sp14 && daAlink_c::getMoveBGActorName(*fopAcM_gc_c::getGroundCheck(), 1) != fpcNm_OBJ_BRG_e && dComIfG_Bgsp().GetSpecialCode(*fopAcM_gc_c::getGroundCheck()) != 2)) { if (var_f30 <= 101.0f) { if (sp8 > sp14 && param_0 != 0) { @@ -4206,7 +4206,7 @@ int daHorse_c::procToolDemo() { } void daHorse_c::searchSceneChangeArea(fopAc_ac_c* i_scnChg) { - if (fopAcM_GetName(i_scnChg) == PROC_SCENE_EXIT) { + if (fopAcM_GetName(i_scnChg) == fpcNm_SCENE_EXIT_e) { if (m_scnChg_num == 50) { // "Exceeded buffer!!!!!\n" OS_PANIC(0x1CD6, "バッファ越え！！！！！\n"); @@ -4549,20 +4549,20 @@ static actor_method_class l_daHorse_Method = { }; actor_process_profile_definition g_profile_HORSE = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_HORSE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daHorse_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 90, // mPriority - &l_daHorse_Method, // sub_method - 0x00060000, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_HORSE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daHorse_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_HORSE_e, + /* Actor SubMtd */ &l_daHorse_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_hozelda.cpp b/src/d/actor/d_a_hozelda.cpp index fea51232d9b..44ba1aa79f3 100644 --- a/src/d/actor/d_a_hozelda.cpp +++ b/src/d/actor/d_a_hozelda.cpp @@ -24,7 +24,7 @@ void daHoZelda_hio_c::genMessage(JORMContext* context) { static void* daHoZelda_searchGanon(fopAc_ac_c* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_GetName(i_actor) == PROC_B_GND) { + if (fopAcM_GetName(i_actor) == fpcNm_B_GND_e) { return i_actor; } @@ -939,18 +939,18 @@ static actor_method_class l_daHoZelda_Method = { }; actor_process_profile_definition g_profile_HOZELDA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_HOZELDA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daHoZelda_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 275, // mPriority - &l_daHoZelda_Method, // sub_method - 0x00060000, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_HOZELDA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daHoZelda_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_HOZELDA_e, + /* Actor SubMtd */ &l_daHoZelda_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_izumi_gate.cpp b/src/d/actor/d_a_izumi_gate.cpp index a7b79021df3..d9e8b2a0dcc 100644 --- a/src/d/actor/d_a_izumi_gate.cpp +++ b/src/d/actor/d_a_izumi_gate.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_izumi_gate.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daIzumiGate_c::initBaseMtx() { setBaseMtx(); @@ -93,18 +93,18 @@ static actor_method_class l_daIzumiGate_Method = { }; actor_process_profile_definition g_profile_Izumi_Gate = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Izumi_Gate, - &g_fpcLf_Method.base, - sizeof(daIzumiGate_c), - 0, - 0, - &g_fopAc_Method.base, - 38, - &l_daIzumiGate_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Izumi_Gate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daIzumiGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Izumi_Gate_e, + /* Actor SubMtd */ &l_daIzumiGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 0fe3243d046..29d063e09c1 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -417,7 +417,7 @@ f32 daKago_c::checkRoofHeight(cXyz i_pos) { if (std::abs(current.pos.y - roof_height) < 310.0f) { fopAc_ac_c* actor = dComIfG_Bgsp().GetActorPointer(roofChk); - if (actor != NULL && fopAcM_GetName(actor) == PROC_Obj_RIVERROCK) { + if (actor != NULL && fopAcM_GetName(actor) == fpcNm_Obj_RIVERROCK_e) { if (((daObjRIVERROCK_c*)actor)->mBreakSubAction == daObjRIVERROCK_c::BREAK_MOVE) { field_0x6e5 = 1; } @@ -697,7 +697,7 @@ int daKago_c::setSceneChange(int i_mode) { void daKago_c::createBalloonScore() { if (mType != TYPE_TWILIGHT && mBalloon2DId == fpcM_ERROR_PROCESS_ID_e) { - mBalloon2DId = fopAcM_create(PROC_BALLOON2D, 0, NULL, -1, NULL, NULL, -1); + mBalloon2DId = fopAcM_create(fpcNm_BALLOON2D_e, 0, NULL, -1, NULL, NULL, -1); field_0x6e9 = 1; } } @@ -724,7 +724,7 @@ void daKago_c::endBalloonScore() { ((daBalloon2D_c*)balloon2D)->hide(); } - fopAcM_SearchByName(PROC_OBJ_BALLOON, &balloonObj); + fopAcM_SearchByName(fpcNm_OBJ_BALLOON_e, &balloonObj); if (balloonObj != NULL) { ((daObj_Balloon_c*)balloonObj)->saveBestScore(); } @@ -1575,7 +1575,7 @@ void daKago_c::executeAttack() { mpLockActor = NULL; if (dComIfGp_getAttention()->LockonTruth()) { fopAc_ac_c* ym = dComIfGp_getAttention()->LockonTarget(0); - if (fopAcM_GetName(ym) != PROC_E_YM) { + if (fopAcM_GetName(ym) != fpcNm_E_YM_e) { break; } @@ -3445,7 +3445,7 @@ void daKago_c::setWaterFallEffect() { } static void* s_waterfall(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Tag_WaterFall) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Tag_WaterFall_e) { if (!fpcM_IsCreating(fopAcM_GetID(i_actor))) { if (((daTagWaterFall_c*)i_actor)->checkHitWaterFall(((fopAc_ac_c*)i_data)->current.pos)) { @@ -3888,18 +3888,18 @@ static actor_method_class l_daKago_Method = { }; actor_process_profile_definition g_profile_KAGO = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KAGO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daKago_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 693, // mPriority - &l_daKago_Method, // sub_method - 0x00044000, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KAGO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daKago_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KAGO_e, + /* Actor SubMtd */ &l_daKago_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index 1bebf6216cf..31c21d28b2d 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -466,18 +466,18 @@ static actor_method_class l_daKytag00_Method = { }; actor_process_profile_definition g_profile_KYTAG00 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG00, - &g_fpcLf_Method.base, - sizeof(kytag00_class), - 0, - 0, - &g_fopAc_Method.base, - 94, - &l_daKytag00_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag00_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG00_e, + /* Actor SubMtd */ &l_daKytag00_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index 05f55eb5c5c..33c14c373f5 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -222,18 +222,18 @@ static actor_method_class l_daKytag01_Method = { }; actor_process_profile_definition g_profile_KYTAG01 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG01, - &g_fpcLf_Method.base, - sizeof(kytag01_class), - 0, - 0, - &g_fopAc_Method.base, - 95, - &l_daKytag01_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG01_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag01_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG01_e, + /* Actor SubMtd */ &l_daKytag01_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp index c8df0868b64..cb2b05cf014 100644 --- a/src/d/actor/d_a_kytag02.cpp +++ b/src/d/actor/d_a_kytag02.cpp @@ -137,18 +137,18 @@ static actor_method_class l_daKytag02_Method = { }; actor_process_profile_definition g_profile_KYTAG02 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG02, - &g_fpcLf_Method.base, - sizeof(kytag02_class), - 0, - 0, - &g_fopAc_Method.base, - 96, - &l_daKytag02_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG02_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag02_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG02_e, + /* Actor SubMtd */ &l_daKytag02_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index 9c07bf12396..33e63f67c8f 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -296,7 +296,7 @@ static int daKytag03_Execute(kytag03_class* i_this) { cLib_addCalc(&i_this->field_0x578, 1.0f, 0.1f, 0.025f, 0.000001f); if (i_this->field_0x585 == 0xB5) { - fopAc_ac_c* actor = (fopAc_ac_c*)fpcM_SearchByName(PROC_Obj_Movebox); + fopAc_ac_c* actor = (fopAc_ac_c*)fpcM_SearchByName(fpcNm_Obj_Movebox_e); if (actor != NULL && actor->current.pos.x < 7425.0f) { i_this->field_0x578 = 0.0f; var_r28 = true; @@ -457,18 +457,18 @@ static actor_method_class l_daKytag03_Method = { }; actor_process_profile_definition g_profile_KYTAG03 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG03, - &g_fpcLf_Method.base, - sizeof(kytag03_class), - 0, - 0, - &g_fopAc_Method.base, - 97, - &l_daKytag03_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG03_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag03_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG03_e, + /* Actor SubMtd */ &l_daKytag03_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index b246ce93e55..21f6d85b932 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -361,18 +361,18 @@ static actor_method_class l_daKytag04_Method = { }; actor_process_profile_definition g_profile_KYTAG04 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG04, - &g_fpcLf_Method.base, - sizeof(kytag04_class), - 0, - 0, - &g_fopAc_Method.base, - 98, - &l_daKytag04_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG04_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag04_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG04_e, + /* Actor SubMtd */ &l_daKytag04_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index fe66630bddf..13220570758 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -47,18 +47,18 @@ static actor_method_class l_daKytag05_Method = { }; actor_process_profile_definition g_profile_KYTAG05 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG05, - &g_fpcLf_Method.base, - sizeof(kytag05_class), - 0, - 0, - &g_fopAc_Method.base, - 99, - &l_daKytag05_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG05_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag05_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG05_e, + /* Actor SubMtd */ &l_daKytag05_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 45b52b99997..bc7510c9d4c 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" #include "Z2AudioLib/Z2Instances.h" #include @@ -1195,20 +1195,20 @@ static actor_method_class l_daKytag06_Method = { }; actor_process_profile_definition g_profile_KYTAG06 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG06, - &g_fpcLf_Method.base, - sizeof(kytag06_class), - 0, - 0, - &g_fopAc_Method.base, - 100, - &l_daKytag06_Method, - 0x60000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG06_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag06_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG06_e, + /* Actor SubMtd */ &l_daKytag06_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index aa98dea0571..28959639941 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -68,18 +68,18 @@ static actor_method_class l_daKytag07_Method = { (process_method_func)daKytag07_Draw}; actor_process_profile_definition g_profile_KYTAG07 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KYTAG07, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(kytag07_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 101, // mPriority - &l_daKytag07_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG07_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag07_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG07_e, + /* Actor SubMtd */ &l_daKytag07_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag08.cpp b/src/d/actor/d_a_kytag08.cpp index 3343b08c7eb..44f4bf5f9ab 100644 --- a/src/d/actor/d_a_kytag08.cpp +++ b/src/d/actor/d_a_kytag08.cpp @@ -274,18 +274,18 @@ static actor_method_class l_daKytag08_Method = { }; actor_process_profile_definition g_profile_KYTAG08 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG08, - &g_fpcLf_Method.base, - sizeof(kytag08_class), - 0, - 0, - &g_fopAc_Method.base, - 102, - &l_daKytag08_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG08_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag08_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG08_e, + /* Actor SubMtd */ &l_daKytag08_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag09.cpp b/src/d/actor/d_a_kytag09.cpp index 39a6edbed7f..2b2218e8ee8 100644 --- a/src/d/actor/d_a_kytag09.cpp +++ b/src/d/actor/d_a_kytag09.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_kytag09.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daKytag09_Draw(kytag09_class* i_this) { J3DModelData* modelData = i_this->mpModel->getModelData(); @@ -145,18 +145,18 @@ static actor_method_class l_daKytag09_Method = { }; actor_process_profile_definition g_profile_KYTAG09 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG09, - &g_fpcLf_Method.base, - sizeof(kytag09_class), - 0, - 0, - &g_fopAc_Method.base, - 103, - &l_daKytag09_Method, - 0x60000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG09_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag09_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG09_e, + /* Actor SubMtd */ &l_daKytag09_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag10.cpp b/src/d/actor/d_a_kytag10.cpp index b0d7d550238..a63ff88c529 100644 --- a/src/d/actor/d_a_kytag10.cpp +++ b/src/d/actor/d_a_kytag10.cpp @@ -207,18 +207,18 @@ static actor_method_class l_daKytag10_Method = { }; actor_process_profile_definition g_profile_KYTAG10 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG10, - &g_fpcLf_Method.base, - sizeof(kytag10_class), - 0, - 0, - &g_fopAc_Method.base, - 104, - &l_daKytag10_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG10_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag10_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG10_e, + /* Actor SubMtd */ &l_daKytag10_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag11.cpp b/src/d/actor/d_a_kytag11.cpp index baa47764853..b6b1d3fc63e 100644 --- a/src/d/actor/d_a_kytag11.cpp +++ b/src/d/actor/d_a_kytag11.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag11.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_kankyo_static.h" static int daKytag11_Draw(kytag11_class* i_this) { @@ -114,18 +114,18 @@ static actor_method_class l_daKytag11_Method = { }; actor_process_profile_definition g_profile_KYTAG11 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG11, - &g_fpcLf_Method.base, - sizeof(kytag11_class), - 0, - 0, - &g_fopAc_Method.base, - 105, - &l_daKytag11_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG11_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag11_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG11_e, + /* Actor SubMtd */ &l_daKytag11_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag12.cpp b/src/d/actor/d_a_kytag12.cpp index b19ee7a35a9..87b9d0de9ce 100644 --- a/src/d/actor/d_a_kytag12.cpp +++ b/src/d/actor/d_a_kytag12.cpp @@ -46,7 +46,7 @@ static int daKytag12_Draw(kytag12_class* param_0) { static void daKytag12_light_swprd_proc(kytag12_class* i_this) { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - if (dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD) { + if (dComIfGs_getSelectEquipSword() == dItemNo_LIGHT_SWORD_e) { if (player->getCutType() != daPy_py_c::CUT_TYPE_NONE) { if (i_this->field_0x576 == 0) { cXyz sp28(player->current.pos); @@ -865,7 +865,7 @@ static int daKytag12_Execute_R00(kytag12_class* i_this) { sp80.y = player->current.pos.y; if (player->current.pos.abs(sp80) < 600.0f && - dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD && player->getCutType() != daPy_py_c::CUT_TYPE_NONE && + dComIfGs_getSelectEquipSword() == dItemNo_LIGHT_SWORD_e && player->getCutType() != daPy_py_c::CUT_TYPE_NONE && d_kytag12_cut_turn_check()) { i_this->field_0x575 = 1; @@ -1028,18 +1028,18 @@ static actor_method_class l_daKytag12_Method = { }; actor_process_profile_definition g_profile_KYTAG12 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KYTAG12, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(kytag12_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 106, // mPriority - &l_daKytag12_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG12_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag12_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG12_e, + /* Actor SubMtd */ &l_daKytag12_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag13.cpp b/src/d/actor/d_a_kytag13.cpp index d6e90889b79..d54932c0fb3 100644 --- a/src/d/actor/d_a_kytag13.cpp +++ b/src/d/actor/d_a_kytag13.cpp @@ -389,18 +389,18 @@ static actor_method_class l_daKytag13_Method = { }; actor_process_profile_definition g_profile_KYTAG13 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KYTAG13, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(kytag13_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 107, // mPriority - &l_daKytag13_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG13_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag13_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG13_e, + /* Actor SubMtd */ &l_daKytag13_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag14.cpp b/src/d/actor/d_a_kytag14.cpp index 66343d26566..e179da4523d 100644 --- a/src/d/actor/d_a_kytag14.cpp +++ b/src/d/actor/d_a_kytag14.cpp @@ -109,18 +109,18 @@ static actor_method_class l_daKytag14_Method = { }; actor_process_profile_definition g_profile_KYTAG14 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG14, - &g_fpcLf_Method.base, - sizeof(kytag14_class), - 0, - 0, - &g_fopAc_Method.base, - 108, - &l_daKytag14_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG14_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag14_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG14_e, + /* Actor SubMtd */ &l_daKytag14_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag15.cpp b/src/d/actor/d_a_kytag15.cpp index 4483f376b93..3287f45a6a8 100644 --- a/src/d/actor/d_a_kytag15.cpp +++ b/src/d/actor/d_a_kytag15.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_kytag15.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static int daKytag15_Draw(kytag15_class* i_this) { @@ -130,18 +130,18 @@ static actor_method_class l_daKytag15_Method = { }; actor_process_profile_definition g_profile_KYTAG15 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG15, - &g_fpcLf_Method.base, - sizeof(kytag15_class), - 0, - 0, - &g_fopAc_Method.base, - 109, - &l_daKytag15_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG15_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag15_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG15_e, + /* Actor SubMtd */ &l_daKytag15_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag16.cpp b/src/d/actor/d_a_kytag16.cpp index 0216dc67b5b..addbc046fae 100644 --- a/src/d/actor/d_a_kytag16.cpp +++ b/src/d/actor/d_a_kytag16.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static int daKytag16_Draw(kytag16_class* i_this) { @@ -167,18 +167,18 @@ static actor_method_class l_daKytag16_Method = { }; actor_process_profile_definition g_profile_KYTAG16 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KYTAG16, - &g_fpcLf_Method.base, - sizeof(kytag16_class), - 0, - 0, - &g_fopAc_Method.base, - 110, - &l_daKytag16_Method, - 0x60000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG16_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag16_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG16_e, + /* Actor SubMtd */ &l_daKytag16_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_kytag17.cpp b/src/d/actor/d_a_kytag17.cpp index 128763f2c2c..6f8eaabccc8 100644 --- a/src/d/actor/d_a_kytag17.cpp +++ b/src/d/actor/d_a_kytag17.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag17.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daKytag17_Draw(kytag17_class* i_this) { return 1; @@ -40,18 +40,18 @@ static actor_method_class l_daKytag17_Method = { (process_method_func)daKytag17_Draw}; actor_process_profile_definition g_profile_KYTAG17 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KYTAG17, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(kytag17_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 111, // mPriority - &l_daKytag17_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYTAG17_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(kytag17_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KYTAG17_e, + /* Actor SubMtd */ &l_daKytag17_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index 12d4db275f1..13a7bf148bb 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -810,18 +810,18 @@ static actor_method_class l_daMant_Method = { }; actor_process_profile_definition g_profile_MANT = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MANT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(mant_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 234, // mPriority - &l_daMant_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MANT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(mant_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MANT_e, + /* Actor SubMtd */ &l_daMant_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index 04ed18875ef..9161e2aded4 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -119,7 +119,7 @@ static f32 dummy_3759() { static void* s_hitfish_sub(void* a, void* b) { if (fopAc_IsActor(a)) { mg_fish_class* fish = (mg_fish_class*)a; - if (fopAcM_GetName(fish) == PROC_MG_FISH && fish->mCurAction == ACTION_MG_FISH_MF_HIT) { + if (fopAcM_GetName(fish) == fpcNm_MG_FISH_e && fish->mCurAction == ACTION_MG_FISH_MF_HIT) { return &fish->actor.base; } } @@ -171,7 +171,7 @@ static void mouth_close(mg_fish_class* i_this) { static void* s_lure_sub(void* a, void* b) { if (fopAc_IsActor(a)) { - if (fopAcM_GetName(a) == PROC_MG_ROD) { + if (fopAcM_GetName(a) == fpcNm_MG_ROD_e) { dmg_rod_class* rod = (dmg_rod_class*)a; if (rod->kind == 0 && rod->action == 4 && @@ -186,7 +186,7 @@ static void* s_lure_sub(void* a, void* b) { static void* s_esa_sub(void* a, void* b) { if (fopAc_IsActor(a)) { - if (fopAcM_GetName(a) == PROC_MG_ROD) { + if (fopAcM_GetName(a) == fpcNm_MG_ROD_e) { dmg_rod_class* rod = (dmg_rod_class*)a; if (rod->kind == 1 && rod->action != 5 && @@ -201,7 +201,7 @@ static void* s_esa_sub(void* a, void* b) { static void* s_bait_sub(void* a, void* b) { if (fopAc_IsActor(a)) { - if (fopAcM_GetName(a) == PROC_FR) { + if (fopAcM_GetName(a) == fpcNm_FR_e) { fr_class* fr = (fr_class*)a; if (fr->field_0x5ec != 0 && fr->speedF > 1.0f) { @@ -219,7 +219,7 @@ static daMg_Fish_HIO_c l_HIO; static s32 s_fish_ct; static void* s_other_search_sub(void* a, void* b) { - if (fopAc_IsActor(a) && b != a && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && b != a && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mCurAction == ACTION_MG_FISH_MF_LURE_SEARCH) { s_fish_ct += 1; @@ -341,7 +341,7 @@ static PathNode swim_path[43] = { }; static void* s_other_bait_sub(void* a, void* b) { - if (fopAc_IsActor(a) && b != a && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && b != a && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mCurAction == ACTION_MG_FISH_MF_BAIT_SEARCH && fish->mBaitId == ((mg_fish_class*)b)->mBaitId) { @@ -494,7 +494,7 @@ static int nodeCallBackBB(J3DJoint* joint, int param_1) { } static void* s_bt_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_BT) { return fish; @@ -504,7 +504,7 @@ static void* s_bt_sub(void* a, void* b) { } static void* s_sp_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_SP) { return fish; @@ -514,7 +514,7 @@ static void* s_sp_sub(void* a, void* b) { } static void* s_lh_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_LH) { fish->field_0x74c = ((mg_fish_class*)b)->field_0x74c; @@ -525,7 +525,7 @@ static void* s_lh_sub(void* a, void* b) { } static void* s_bin_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_O_GD_BOTT) { return fish; @@ -535,7 +535,7 @@ static void* s_bin_sub(void* a, void* b) { } static void* s_kn_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_KN) { return fish; @@ -545,7 +545,7 @@ static void* s_kn_sub(void* a, void* b) { } static void* s_ed_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_ED) { return fish; @@ -555,7 +555,7 @@ static void* s_ed_sub(void* a, void* b) { } static void* s_sy_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_SY) { return fish; @@ -565,7 +565,7 @@ static void* s_sy_sub(void* a, void* b) { } static void* s_bb_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)a; if (fish->mGedouKind == GEDOU_KIND_BB) { return fish; @@ -575,14 +575,14 @@ static void* s_bb_sub(void* a, void* b) { } static void* s_bb2_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_E_BG) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_E_BG_e) { return a; } return NULL; } static void* s_sg_sub(void* a, void* b) { - if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_E_SG) { + if (fopAc_IsActor(a) && fopAcM_GetName(a) == fpcNm_E_SG_e) { return a; } return NULL; @@ -936,7 +936,7 @@ static void mf_swim_s(mg_fish_class* i_this) { fpcEx_Search(s_bb2_sub, i_this) != NULL) { if (fpcEx_Search(s_bb2_sub, i_this) != NULL && fpcEx_Search(s_bb_sub, i_this) == NULL) { - fopAcM_create(PROC_MG_FISH, 0x17, &i_this->actor.current.pos, + fopAcM_create(fpcNm_MG_FISH_e, 0x17, &i_this->actor.current.pos, fopAcM_GetRoomNo(&i_this->actor), NULL, NULL, -1); } } else { @@ -1962,7 +1962,7 @@ static void mf_jump(mg_fish_class* i_this) { } case 10: { if (i_this->mGedouKind == GEDOU_KIND_KS_2) { - i_this->mBaitId = fopAcM_createChild(PROC_KYTAG03, fopAcM_GetID(i_this), 0x10000b3, + i_this->mBaitId = fopAcM_createChild(fpcNm_KYTAG03_e, fopAcM_GetID(i_this), 0x10000b3, &commonXyz2, fopAcM_GetRoomNo(&i_this->actor), NULL, NULL, -1, 0); } i_this->mActionPhase = 0xb; @@ -3120,7 +3120,7 @@ static void action(mg_fish_class* i_this) { i_this->mActionPhase = 0; i_this->field_0x624[1] = cM_rndF(30.0f) + 50.0f; - fopAc_ac_c* henna = fopAcM_SearchByName(PROC_NPC_HENNA); + fopAc_ac_c* henna = fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL) { ((npc_henna_class*)henna)->field_0x7b5 = 20; } @@ -4061,20 +4061,20 @@ static actor_method_class l_daMg_Fish_Method = { }; actor_process_profile_definition g_profile_MG_FISH = { - (uint)fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MG_FISH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(mg_fish_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 720, // mPriority - &l_daMg_Fish_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ (uint)fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MG_FISH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(mg_fish_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MG_FISH_e, + /* Actor SubMtd */ &l_daMg_Fish_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index 02801d4b98a..5656ae831ce 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -506,7 +506,7 @@ static void rod_set(fshop_class* i_this) { static void* s_fish_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_MG_FISH_e) { if (((mg_fish_class*)i_actor)->actor.speedF > 0.1f) { fs_weed_s* weed = (fs_weed_s*)i_data; f32 x_dist = ((mg_fish_class*)i_actor)->actor.current.pos.x - weed->field_0x00[0].x; @@ -550,7 +550,7 @@ static void tsubo_set(fshop_class* i_this) { pTsubo->field_0x20 = cM_rndF(65536.0f); pTsubo->field_0x22 = cM_rndF(65536.0f); - npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL) { henna->field_0x7b5 = 60; } @@ -682,7 +682,7 @@ static void koro2_mtx_set(fshop_class* i_this) { static void* s_sel_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_FSHOP) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_FSHOP_e) { if (((fshop_class*)i_actor)->field_0x400e == (u8)((((fshop_class*)i_data)->field_0x400c & 7) + 1)) { return i_actor; } @@ -693,7 +693,7 @@ static void* s_sel_sub(void* i_actor, void* i_data) { static void* s_ball_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_FSHOP && (fopAcM_GetParam(i_actor) & 0xFF) == 0x23) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_FSHOP_e && (fopAcM_GetParam(i_actor) & 0xFF) == 0x23) { return i_actor; } @@ -915,7 +915,7 @@ static int daFshop_Execute(fshop_class* i_this) { actor->field_0x567 = 1; } - npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL && henna->field_0x7b9 != 0 && (actor->field_0x567 == 1 || dTimer_getRestTimeMs() == 0)) { BOOL bVar5 = FALSE; for (int i = 0; i < 100; i++) { @@ -945,7 +945,7 @@ static int daFshop_Execute(fshop_class* i_this) { || mDoCPd_c::getTrigZ(PAD_1) #endif ) { - npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL) { BOOL bVar5 = FALSE; for (int i = 0; i < 100; i++) { @@ -1696,10 +1696,10 @@ static int daFshop_Create(fopAc_ac_c* actor) { i_this->field_0x6b7c = 1; for (int i = 0; i < 8; i++) { - fopAcM_createChild(PROC_FSHOP, fopAcM_GetID(actor), i - 155, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); + fopAcM_createChild(fpcNm_FSHOP_e, fopAcM_GetID(actor), i - 155, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); } - fopAcM_createChild(PROC_FSHOP, fopAcM_GetID(actor), 0xFFFFFF23, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); + fopAcM_createChild(fpcNm_FSHOP_e, fopAcM_GetID(actor), 0xFFFFFF23, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); u8 sp10; #if VERSION == VERSION_GCN_PAL || VERSION == VERSION_WII_PAL @@ -1740,24 +1740,24 @@ static int daFshop_Create(fopAc_ac_c* actor) { if (sp24 >= 10) { parameters = (sp24 << 8) | 0xFFFF0000 | i; - fopAcM_create(PROC_MG_FISH, parameters, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); + fopAcM_create(fpcNm_MG_FISH_e, parameters, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); } } cXyz work_pos(-648.0f + YREG_F(7), 215.0f + YREG_F(8), 380.0f + YREG_F(9)); csXyz work_angle(0, 0, 0); - fopAcM_create(PROC_OBJ_KAGE, 0xFFFFFF01, &work_pos, fopAcM_GetRoomNo(actor), &work_angle, NULL, -1); + fopAcM_create(fpcNm_OBJ_KAGE_e, 0xFFFFFF01, &work_pos, fopAcM_GetRoomNo(actor), &work_angle, NULL, -1); for (int i = 0; i < 8; i++) { - fopAcM_create(PROC_MG_FISH, 0xFFFF2005, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); + fopAcM_create(fpcNm_MG_FISH_e, 0xFFFF2005, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); } work_pos.set(-131.0f, 3000.0f + nREG_F(7), -4500.0f); - fopAcM_create(PROC_NPC_TK, -1, &work_pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); + fopAcM_create(fpcNm_NPC_TK_e, -1, &work_pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); for (int i = 0; i < 5; i++) { work_pos.set(-450.0f, 0.0f, -878.0f); - fopAcM_create(PROC_BD, 0xFFFFFFFF, &work_pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); + fopAcM_create(fpcNm_BD_e, 0xFFFFFFFF, &work_pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1); } } @@ -1773,20 +1773,20 @@ static actor_method_class l_daFshop_Method = { }; actor_process_profile_definition g_profile_FSHOP = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_FSHOP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(fshop_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 721, // mPriority - &l_daFshop_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_FSHOP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(fshop_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_FSHOP_e, + /* Actor SubMtd */ &l_daFshop_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index 830f5a9553f..e44cdfeeff8 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -1036,7 +1036,7 @@ static void sibuki_set(dmg_rod_class* i_this, f32 i_size, cXyz* i_pos, BOOL para } static void* s_boat_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_CANOE) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_CANOE_e) { cXyz spC = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos; return i_actor; } @@ -1491,7 +1491,7 @@ static int simple_bg_check(dmg_rod_class* i_this, f32 param_1) { static void* s_wd_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_LP) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_LP_e) { return i_actor; } @@ -2833,7 +2833,7 @@ static void lure_heart(dmg_rod_class* i_this) { sp8.y = 0; sp8.z = i_this->field_0x10b0; - fopAc_ac_c* obj_life = (fopAc_ac_c*)fopAcM_SearchByName(PROC_Obj_LifeContainer); + fopAc_ac_c* obj_life = (fopAc_ac_c*)fopAcM_SearchByName(fpcNm_Obj_LifeContainer_e); if (obj_life != NULL) { fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); cXyz sp10; @@ -2900,7 +2900,7 @@ static void lure_heart(dmg_rod_class* i_this) { if (obj_life != NULL) { fopAcM_delete(obj_life); fopAcM_onItem(obj_life, 0x80); - execItemGet(fpcNm_ITEM_KAKERA_HEART); + execItemGet(dItemNo_KAKERA_HEART_e); u8 eventReg = dComIfGs_getEventReg(0xECFF); eventReg |= (u8)0x40; dComIfGs_setEventReg(0xECFF, eventReg); @@ -3912,11 +3912,11 @@ static int bb_get(dmg_rod_class* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)i_this; for (int i = 0; i < 3; i++) { u8 itemno = dComIfGs_getItem(i + 15, false); - if (itemno != fpcNm_ITEM_NONE) { - if (itemno == fpcNm_ITEM_BOMB_BAG_LV1) { - dComIfGs_setEmptyBombBagItemIn(fpcNm_ITEM_WATER_BOMB, 1, true); + if (itemno != dItemNo_NONE_e) { + if (itemno == dItemNo_BOMB_BAG_LV1_e) { + dComIfGs_setEmptyBombBagItemIn(dItemNo_WATER_BOMB_e, 1, true); return 1; - } else if (itemno == fpcNm_ITEM_WATER_BOMB) { + } else if (itemno == dItemNo_WATER_BOMB_e) { if (dComIfGs_getBombNum(i) < dComIfGs_getBombMax(itemno)) { dComIfGp_setItemBombNumCount(i, 1); return 1; @@ -4124,7 +4124,7 @@ static void uki_catch(dmg_rod_class* i_this) { static void* s_sg_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_SG && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_SG_e && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) { return i_actor; } @@ -4132,7 +4132,7 @@ static void* s_sg_sub(void* i_actor, void* i_data) { } static void* s_bb_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_BG && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_BG_e && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) { return i_actor; } @@ -4141,7 +4141,7 @@ static void* s_bb_sub(void* i_actor, void* i_data) { static void* s_lh_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)i_actor; if (fish->mGedouKind == 21) { if ((fish->actor.current.pos - ((fopAc_ac_c*)i_data)->current.pos).abs() < fish->mJointScale) { @@ -4155,7 +4155,7 @@ static void* s_lh_sub(void* i_actor, void* i_data) { static void* s_bt_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)i_actor; if (fish->mGedouKind == 20) { if ((fish->actor.current.pos - ((fopAc_ac_c*)i_data)->current.pos).abs() < fish->mJointScale) { @@ -5759,7 +5759,7 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0 && i_this->kind == 0) { } - henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + henna = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL && henna->field_0x734 != 0) { henna = NULL; } @@ -5986,7 +5986,7 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { i_this->field_0x1406 = i_this->play_cam_fovy; if (i_this->kind == MG_ROD_KIND_LURE) { - daObjLife_c* obj_life = (daObjLife_c*)fopAcM_SearchByName(PROC_Obj_LifeContainer); + daObjLife_c* obj_life = (daObjLife_c*)fopAcM_SearchByName(fpcNm_Obj_LifeContainer_e); if (obj_life != NULL) { if (i_this->field_0x10a9 != 0) { if (i_this->field_0x10a9 == 2) { @@ -6412,20 +6412,20 @@ static actor_method_class l_dmg_rod_Method = { }; actor_process_profile_definition g_profile_MG_ROD = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MG_ROD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(dmg_rod_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 438, // mPriority - &l_dmg_rod_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MG_ROD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dmg_rod_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MG_ROD_e, + /* Actor SubMtd */ &l_dmg_rod_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index 5f199789291..19cdab361f2 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -3170,8 +3170,8 @@ int daMidna_c::execute() { if ( checkStateFlg0(FLG0_NO_DRAW) && (eventInfo.checkCommandTalk() || checkStateFlg0(FLG0_WOLF_NO_POS) || mDemoMode == 2 || (dComIfGp_event_runCheck() && talk_partner != NULL && (checkStateFlg0(FLG0_UNK_2000000) || - fopAcM_GetName(talk_partner) == PROC_Tag_Mhint || fopAcM_GetName(talk_partner) == PROC_Tag_Mstop || - fopAcM_GetName(talk_partner) == PROC_Tag_Mwait))) + fopAcM_GetName(talk_partner) == fpcNm_Tag_Mhint_e || fopAcM_GetName(talk_partner) == fpcNm_Tag_Mstop_e || + fopAcM_GetName(talk_partner) == fpcNm_Tag_Mwait_e))) ) { if ( mDemoMode == 3 || mDemoMode == 0x10 || mDemoMode == 4 || mDemoMode == 6 || @@ -3598,18 +3598,18 @@ static actor_method_class l_daMidna_Method = { }; actor_process_profile_definition g_profile_MIDNA = { - fpcLy_CURRENT_e, - 6, - fpcPi_CURRENT_e, - PROC_MIDNA, - &g_fpcLf_Method.base, - sizeof(daMidna_c), - 0, - 0, - &g_fopAc_Method.base, - 0x5C, - &l_daMidna_Method, - 0x60000, - fopAc_ENV_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 6, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MIDNA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMidna_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MIDNA_e, + /* Actor SubMtd */ &l_daMidna_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index 13b86985229..43b1f922f18 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -618,18 +618,18 @@ static actor_method_class daMirror_METHODS = { }; actor_process_profile_definition g_profile_MIRROR = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_MIRROR, - &g_fpcLf_Method.base, - sizeof(daMirror_c), - 0, - 0, - &g_fopAc_Method.base, - 757, - &daMirror_METHODS, - 0x60000, - fopAc_UNK_GROUP_5_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MIRROR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMirror_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MIRROR_e, + /* Actor SubMtd */ &daMirror_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 8b90726ad19..55cb7525b72 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -4197,20 +4197,20 @@ static actor_method_class daMP_METHODS = { }; actor_process_profile_definition g_profile_MOVIE_PLAYER = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MOVIE_PLAYER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daMP_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 9, // mPriority - &daMP_METHODS, // sub_method - 0x0006C000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MOVIE_PLAYER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMP_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MOVIE_PLAYER_e, + /* Actor SubMtd */ &daMP_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_STAFF_PRIMARY_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp index 73eaf967c64..064096cd1b3 100644 --- a/src/d/actor/d_a_myna.cpp +++ b/src/d/actor/d_a_myna.cpp @@ -200,15 +200,15 @@ static daTag_MynaLight_c* daMyna_LightActor; static int daMyna_actor_count; static void* daMyna_searchSSItem(void* param_0, void* param_1) { - if (fopAcM_IsActor(param_0) && (fopAcM_GetName(param_0) == PROC_OBJ_SSITEM || - fopAcM_GetName(param_0) == PROC_OBJ_SSDRINK || - fopAcM_GetName(param_0) == PROC_TAG_SSDRINK)) + if (fopAcM_IsActor(param_0) && (fopAcM_GetName(param_0) == fpcNm_OBJ_SSITEM_e || + fopAcM_GetName(param_0) == fpcNm_OBJ_SSDRINK_e || + fopAcM_GetName(param_0) == fpcNm_TAG_SSDRINK_e)) { if ((fopAcM_GetParam(param_1) & 0xF0000000) == (fopAcM_GetParam(param_0) & 0xF0000000) && daMyna_actor_count < 10) { fopAc_ac_c* pfVar4 = static_cast(param_0); - if (fopAcM_GetName(param_0) == PROC_OBJ_SSITEM) { + if (fopAcM_GetName(param_0) == fpcNm_OBJ_SSITEM_e) { pfVar4 = static_cast(param_0)->getExchangeItemPtr(); } if (pfVar4 != NULL) { @@ -223,7 +223,7 @@ static void* daMyna_searchSSItem(void* param_0, void* param_1) { static void* daMyna_searchLight(void* i_mynaLightTagActor, void* param_1) { if (fopAcM_IsActor(i_mynaLightTagActor) && - fopAcM_GetName(i_mynaLightTagActor) == PROC_TAG_MNLIGHT) + fopAcM_GetName(i_mynaLightTagActor) == fpcNm_TAG_MNLIGHT_e) { if ((fopAcM_GetParam(param_1) & 0xF0000000) == (fopAcM_GetParam(i_mynaLightTagActor) & 0xF0000000)) @@ -239,7 +239,7 @@ static fopAc_ac_c* daMyna_evtTagActor0; static fopAc_ac_c* daMyna_evtTagActor1; static void* daMyna_searchEvtTag(void* i_evtTagActor, void* param_1) { - if (fopAcM_IsActor(i_evtTagActor) && fopAcM_GetName(i_evtTagActor) == PROC_TAG_EVT) { + if (fopAcM_IsActor(i_evtTagActor) && fopAcM_GetName(i_evtTagActor) == fpcNm_TAG_EVT_e) { if (((fopAcM_GetParam(i_evtTagActor) & 0xF000000) >> 24) == 0) { // Event range tag 0 search daMyna_evtTagActor0 = static_cast(i_evtTagActor); @@ -1519,7 +1519,7 @@ u8 daMyna_c::getItemType(void* param_0) { u8 itemType = 0xF; u8 uVar1 = fopAcM_GetParam(param_0) & 0xFF; - if (fopAcM_GetName(param_0) == PROC_OBJ_SSITEM) { + if (fopAcM_GetName(param_0) == fpcNm_OBJ_SSITEM_e) { switch (uVar1) { case 0: itemType = 1; @@ -1531,7 +1531,7 @@ u8 daMyna_c::getItemType(void* param_0) { itemType = 0; break; } - } else if (fopAcM_GetName(param_0) == PROC_OBJ_SSDRINK) { + } else if (fopAcM_GetName(param_0) == fpcNm_OBJ_SSDRINK_e) { switch (uVar1) { case 0: itemType = 3; @@ -1552,7 +1552,7 @@ u8 daMyna_c::getItemType(void* param_0) { itemType = 8; break; } - } else if (fopAcM_GetName(param_0) == PROC_TAG_SSDRINK) { + } else if (fopAcM_GetName(param_0) == fpcNm_TAG_SSDRINK_e) { switch (uVar1) { case 0: itemType = 9; @@ -1815,20 +1815,20 @@ static actor_method_class daMyna_MethodTable = { }; actor_process_profile_definition g_profile_MYNA = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_MYNA, - &g_fpcLf_Method.base, - sizeof(daMyna_c), - 0, - 0, - &g_fopAc_Method.base, - 0x0130, - &daMyna_MethodTable, - 0x40000, - 0, - fopAc_CULLBOX_0_e + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MYNA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMyna_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MYNA_e, + /* Actor SubMtd */ &daMyna_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 10c0fe849af..1d09b39bfdb 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -49,7 +49,7 @@ void daNbomb_c::tgHitCallback(dCcD_GObjInf* i_hitObj) { { procBoomerangMoveInit(i_hitObj); } - } else if (i_hitObj->ChkAtType(AT_TYPE_HOOKSHOT) && fopAcM_CheckStatus(this, 0x80000)) { + } else if (i_hitObj->ChkAtType(AT_TYPE_HOOKSHOT) && fopAcM_CheckStatus(this, fopAcStts_UNK_0x80000_e)) { if (fopAcM_checkCarryNow(this)) { fopAcM_cancelCarryNow(this); } @@ -350,7 +350,7 @@ int daNbomb_c::create() { mDoMtx_stack_c::transS(current.pos); if (!checkStateFlg0(FLG0_INSECT_BOMB)) { - fopAcM_OnStatus(this, 0x80000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); } mDoMtx_stack_c::ZXYrotM(0, shape_angle.y, shape_angle.z); @@ -607,7 +607,7 @@ void daNbomb_c::setHitPolygon(BOOL param_0) { } BOOL daNbomb_c::procExplodeInit() { - fopAcM_OnStatus(this, 0x20000); + fopAcM_OnStatus(this, fopAcStts_NOPAUSE_e); daAlink_c* player = daAlink_getAlinkActorClass(); scale.x = player->getBombEffScale(); @@ -1685,18 +1685,18 @@ static actor_method_class l_daNbombMethod = { }; actor_process_profile_definition g_profile_NBOMB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NBOMB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNbomb_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 270, // mPriority - &l_daNbombMethod, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NBOMB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNbomb_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NBOMB_e, + /* Actor SubMtd */ &l_daNbombMethod, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp index 720f86b6c99..10dc3d8a030 100644 --- a/src/d/actor/d_a_ni.cpp +++ b/src/d/actor/d_a_ni.cpp @@ -138,7 +138,7 @@ static int daNi_Draw(ni_class* i_this) { } static void* s_play_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NI) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NI_e) { ni_class* a_actor = (ni_class*)i_actor; if (a_actor->mAction == ACTION_PLAY_e) { @@ -212,7 +212,7 @@ static fopAc_ac_c* target_info[10]; static int target_info_count; static void* s_t_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_NE && target_info_count < 10) + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_NE_e && target_info_count < 10) { target_info[target_info_count] = (fopAc_ac_c*)i_actor; target_info_count++; @@ -378,7 +378,7 @@ static void ni_normal(ni_class* i_this) { } } - fopAc_ac_c* cow = fopAcM_SearchByName(PROC_COW); + fopAc_ac_c* cow = fopAcM_SearchByName(fpcNm_COW_e); if (cow != NULL && cow->speedF > 1.0f) { sp50 = cow->current.pos - a_this->current.pos; f32 var_f30 = sp50.abs(); @@ -755,7 +755,7 @@ static void ni_damage(ni_class* i_this) { static void* s_b_sub(void* i_actor, void* i_data) { fopAc_ac_c* player = dComIfGp_getPlayer(0); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) { return i_actor; @@ -807,7 +807,7 @@ static void ni_windspin(ni_class* i_this) { static int ni_demo0(ni_class* i_this) { cXyz sp28; cXyz sp34; - daNpcMoiR_c* moi = (daNpcMoiR_c*)fopAcM_SearchByName(PROC_NPC_MOIR); + daNpcMoiR_c* moi = (daNpcMoiR_c*)fopAcM_SearchByName(fpcNm_NPC_MOIR_e); if (i_this->mTimers[0] == 0 && moi != NULL) { mDoMtx_stack_c::copy(moi->getHandRMtx()); @@ -1998,18 +1998,18 @@ static actor_method_class l_daNi_Method = { }; actor_process_profile_definition g_profile_NI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(ni_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 695, // mPriority - &l_daNi_Method, // sub_method - 0x80c4000, // mStatus - fopAc_NPC_e, // mActorType - fopAc_ACTOR_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(ni_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NI_e, + /* Actor SubMtd */ &l_daNi_Method, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_ACTOR_e, }; diff --git a/src/d/actor/d_a_no_chg_room.cpp b/src/d/actor/d_a_no_chg_room.cpp index f2ec6e4b820..3a2e788a96f 100644 --- a/src/d/actor/d_a_no_chg_room.cpp +++ b/src/d/actor/d_a_no_chg_room.cpp @@ -157,18 +157,18 @@ static actor_method_class daNocrm_METHODS = { }; actor_process_profile_definition g_profile_NO_CHG_ROOM = { - fpcLy_CURRENT_e, - 2, - fpcPi_CURRENT_e, - PROC_NO_CHG_ROOM, - &g_fpcLf_Method.base, - sizeof(daNocrm_c), - 0, - 0, - &g_fopAc_Method.base, - 762, - &daNocrm_METHODS, - 0x60000, - fopAc_UNK_GROUP_5_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NO_CHG_ROOM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNocrm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NO_CHG_ROOM_e, + /* Actor SubMtd */ &daNocrm_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index de72aae604a..123bf668004 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -1242,7 +1242,7 @@ void daNpcT_c::tgHitCallBack(fopAc_ac_c* i_actor1, dCcD_GObjInf* i_obj1, fopAc_a fopAc_ac_c* actor1 = i_actor1; u8 cut_type = 0; if (i_actor2 != NULL) { - if (fopAcM_GetProfName(i_actor2) == PROC_ALINK) { + if (fopAcM_GetProfName(i_actor2) == fpcNm_ALINK_e) { cut_type = static_cast(i_actor2)->getCutType(); } else { cut_type = daPy_py_c::CUT_TYPE_NM_VERTICAL; @@ -2235,7 +2235,7 @@ fopAc_ac_c* daNpcT_c::hitChk(dCcD_GObjInf* i_objInf, u32 param_1) { if (mDamageTimer == 0) { hit_actor_p = i_objInf->GetTgHitAc(); if (hit_actor_p != NULL) { - if (fopAcM_GetName(hit_actor_p) == PROC_NPC_TK && (param_1 & 1)) { + if (fopAcM_GetName(hit_actor_p) == fpcNm_NPC_TK_e && (param_1 & 1)) { ((daNPC_TK_c*)hit_actor_p)->setBump(); return hit_actor_p; } @@ -2403,7 +2403,7 @@ BOOL daNpcT_c::srchPlayerActor() { cXyz daNpcT_c::getAttnPos(fopAc_ac_c* i_actor) { cXyz attn_pos = i_actor->attention_info.position; - if (fopAcM_GetName(i_actor) == PROC_ALINK) { + if (fopAcM_GetName(i_actor) == fpcNm_ALINK_e) { attn_pos.y -= daPy_py_c::getAttentionOffsetY(); if (daPy_py_c::checkNowWolf()) { attn_pos = i_actor->current.pos; @@ -2610,7 +2610,7 @@ fopAc_ac_c* daNpcT_c::getEvtAreaTagP(int i_type, int i_no) { f32 var_f31 = G_CM3D_F_INF; mFindCount = 0; - mSrchName = PROC_TAG_EVTAREA; + mSrchName = fpcNm_TAG_EVTAREA_e; fpcM_Search(srchActor, this); for (int i = 0; i < mFindCount; i++) { @@ -2625,7 +2625,7 @@ fopAc_ac_c* daNpcT_c::getEvtAreaTagP(int i_type, int i_no) { fopAc_ac_c* daNpcT_c::getShopItemTagP() { int unusedInt1 = 0; mFindCount = 0; - mSrchName = PROC_TAG_SHOPITM; + mSrchName = fpcNm_TAG_SHOPITM_e; fpcM_Search(srchActor, this); for (s32 i = 0; i < mFindCount; i++) { diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index 535355d091c..2f38e436083 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -697,7 +697,7 @@ int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, _GXColorS10* void daNpcF_c::tgHitCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_1, fopAc_ac_c* i_actor, dCcD_GObjInf* param_3) { - if (i_actor != NULL && fopAcM_GetProfName(i_actor) == PROC_ALINK) { + if (i_actor != NULL && fopAcM_GetProfName(i_actor) == fpcNm_ALINK_e) { daNpcF_c* npc = static_cast(i_this); if (daPy_getPlayerActorClass() == i_actor) { npc->setCutType(static_cast(i_actor)->getCutType()); @@ -735,9 +735,9 @@ void* daNpcF_c::srchAttnActor1(void* i_proc, void* param_1) { void* param_1_copy = param_1; fopAc_ac_c* actor = NULL; if (mFindCount < 100 && fopAcM_IsActor(i_proc) - && (fopAcM_GetName(i_proc) == PROC_NI || fopAcM_GetName(i_proc) == PROC_COW - || fopAcM_GetName(i_proc) == PROC_NPC_NE || fopAcM_GetName(i_proc) == PROC_DO - || fopAcM_GetName(i_proc) == PROC_SQ || fopAcM_GetName(i_proc) == PROC_BD)) + && (fopAcM_GetName(i_proc) == fpcNm_NI_e || fopAcM_GetName(i_proc) == fpcNm_COW_e + || fopAcM_GetName(i_proc) == fpcNm_NPC_NE_e || fopAcM_GetName(i_proc) == fpcNm_DO_e + || fopAcM_GetName(i_proc) == fpcNm_SQ_e || fopAcM_GetName(i_proc) == fpcNm_BD_e)) { actor = static_cast(i_proc); mFindActorPList[mFindCount] = actor; @@ -1196,7 +1196,7 @@ BOOL daNpcF_c::hitChk2(dCcD_Cyl* i_ccCyl, BOOL param_1, BOOL param_2) { if (hit_actor != NULL) { actorAngleY = fopAcM_searchActorAngleY(this, hit_actor); field_0x990 = actorAngleY - mCurAngle.y; - if (fopAcM_GetName(hit_actor) == PROC_NPC_TK) { + if (fopAcM_GetName(hit_actor) == fpcNm_NPC_TK_e) { if (param_1) { static_cast(hit_actor)->setBump(); return true; @@ -1508,7 +1508,7 @@ fopAc_ac_c* daNpcF_c::getEvtAreaTagP(int i_type, int i_no) { int r29 = 0; f32 f31 = G_CM3D_F_INF; mFindCount = 0; - mSrchActorName = PROC_TAG_EVTAREA; + mSrchActorName = fpcNm_TAG_EVTAREA_e; fpcM_Search(this->srchActor, this); for (int i = 0; i < mFindCount; i++) { @@ -1657,7 +1657,7 @@ BOOL daNpcF_c::chkPointInArea(cXyz i_point, cXyz i_center, cXyz i_bounds, s16 i_ cXyz daNpcF_c::getAttentionPos(fopAc_ac_c* i_actor_p) { cXyz pos = i_actor_p->attention_info.position; - if (fopAcM_GetName(i_actor_p) == PROC_ALINK) { + if (fopAcM_GetName(i_actor_p) == fpcNm_ALINK_e) { pos.y -= daPy_py_c::getAttentionOffsetY(); } diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index 9dc918bc66a..2c8705ab0d5 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_aru.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -531,7 +531,7 @@ void* daNpc_Aru_c::srchCow(void* i_actor, void* i_data) { if (mFindCount < 50) { fopAc_ac_c* actor_p = (fopAc_ac_c*) i_actor; if (actor_p != NULL && actor_p != data_p) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor_p)) && fopAcM_GetName(actor_p) == PROC_COW && !((daCow_c*)actor_p)->isGuardFad()) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor_p)) && fopAcM_GetName(actor_p) == fpcNm_COW_e && !((daCow_c*)actor_p)->isGuardFad()) { mFindActorPtrs[mFindCount] = actor_p; mFindCount++; } @@ -546,7 +546,7 @@ void* daNpc_Aru_c::srchUDoor(void* i_actor, void* i_data) { if (mFindCount < 50) { fopAc_ac_c* actor_p = (fopAc_ac_c*) i_actor; if (actor_p != NULL && actor_p != data_p) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor_p)) && fopAcM_GetName(actor_p) == PROC_OBJ_UDOOR) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor_p)) && fopAcM_GetName(actor_p) == fpcNm_OBJ_UDOOR_e) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*) actor_p; mFindCount++; } @@ -574,7 +574,7 @@ BOOL daNpc_Aru_c::chkThrust(fopAc_ac_c* actor_p) { } } - if (fopAcM_GetName(actor_p) == PROC_ALINK && daPy_py_c::checkNowWolf() && actorDistance < mpHIO->m.warning_range) { + if (fopAcM_GetName(actor_p) == fpcNm_ALINK_e && daPy_py_c::checkNowWolf() && actorDistance < mpHIO->m.warning_range) { return TRUE; } } @@ -621,7 +621,7 @@ fopAc_ac_c* daNpc_Aru_c::getCowP(int param_1) { fopAc_ac_c* daNpc_Aru_c::getUDoor_l_P() { fopAc_ac_c* rv = NULL; f32 fVar1 = G_CM3D_F_INF; - + mFindCount = 0; fopAcM_Search(srchUDoor, this); @@ -638,7 +638,7 @@ fopAc_ac_c* daNpc_Aru_c::getUDoor_l_P() { fopAc_ac_c* daNpc_Aru_c::getUDoor_r_P() { fopAc_ac_c* rv = NULL; f32 fVar1 = G_CM3D_F_INF; - + mFindCount = 0; fopAcM_Search(srchUDoor, this); @@ -683,7 +683,7 @@ BOOL daNpc_Aru_c::isDelete() { case TYPE_1: return FALSE; - + case TYPE_2: /* dSv_event_flag_c::M_013 - Misc. - First heard about Twilight gate from Midna */ return daNpcT_chkEvtBit(45) == FALSE; @@ -724,7 +724,7 @@ void daNpc_Aru_c::reset() { mPlayerActorMngr.entry(daPy_getPlayerActorClass()); mEventTimer = 30; break; - + case TYPE_2: mTimerID = fpcM_ERROR_PROCESS_ID_e; mPlayerActorMngr.entry(daPy_getPlayerActorClass()); @@ -739,7 +739,7 @@ void daNpc_Aru_c::reset() { } } break; - + case TYPE_4: mTimerID = fpcM_ERROR_PROCESS_ID_e; mEventTimer = 30; @@ -869,7 +869,7 @@ void daNpc_Aru_c::setAfterTalkMotion() { case FACE_WORRY: i_index = FACE_H_WORRY; break; - + case FACE_BITTERSMILE: i_index = FACE_H_BITTERSMILE; break; @@ -901,7 +901,7 @@ void daNpc_Aru_c::srchActors() { mActorMngrs[1].entry(getUDoor_r_P()); } break; - + case TYPE_2: if (chkBullRunningStage() && mTimerID == fpcM_ERROR_PROCESS_ID_e) { mTimerID = dTimer_createTimer(2, 0x989298, 3, 0, 210.0f, 410.0f, 32.0f, 419.0f); @@ -996,10 +996,10 @@ void daNpc_Aru_c::action() { } void daNpc_Aru_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -1021,7 +1021,7 @@ void daNpc_Aru_c::setAttnPos() { mpHIO->m.common.head_angleY_min, mpHIO->m.common.head_angleY_max, mpHIO->m.common.neck_rotation_ratio, rad, &sp4c); mJntAnm.calcJntRad(0.2f, 1.0f, rad); - + setMtx(); mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(getHeadJointNo())); mDoMtx_stack_c::multVec(&sp40, &eyePos); @@ -1504,7 +1504,7 @@ int daNpc_Aru_c::cutRideOnHorse(int i_staffID) { step(mPlayerAngle, 12, 11, 15, 0); } break; - + case 1: if (talkProc(NULL, FALSE, NULL, FALSE) && mFlow.checkEndFlow()) { rv = 1; @@ -1714,7 +1714,7 @@ int daNpc_Aru_c::cutSpeakTo(int i_staffID) { mStepMode = 0; } break; - + case 1: mFaceMotionSeqMngr.setNo(FACE_NONE, -1.0f, FALSE, 0); mMotionSeqMngr.setNo(MOT_WAIT_A, -1.0f, FALSE, 0); @@ -1733,7 +1733,7 @@ int daNpc_Aru_c::cutSpeakTo(int i_staffID) { step(mPlayerAngle, 12, 11, 15, 0); } break; - + case 1: if (talkProc(NULL, FALSE, NULL, FALSE)) { int itemNo; @@ -2063,7 +2063,7 @@ int daNpc_Aru_c::skipFence(void* param_1) { field_0xe33 = true; } break; - + case TYPE_4: if (daNpcT_chkTmpBit(177) && // dSv_event_tmp_flag_c::T_0177 - Ordon Ranch - 1st day: Asked to jump gate by Fado !daNpcT_chkTmpBit(178)) { // dSv_event_tmp_flag_c::T_0178 - Ordon Ranch - 1st day: Spoke with Fado while jumping over gate @@ -2121,7 +2121,7 @@ int daNpc_Aru_c::talk(void*) { evtChange(); } break; - + case 23: if (mType == TYPE_0) { dStage_changeScene(9, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); @@ -2214,18 +2214,18 @@ static actor_method_class daNpc_Aru_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ARU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ARU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Aru_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 321, // mPriority - &daNpc_Aru_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ARU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Aru_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ARU_e, + /* Actor SubMtd */ &daNpc_Aru_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp index 0e3c0028ea0..f3311c7bd65 100644 --- a/src/d/actor/d_a_npc_ash.cpp +++ b/src/d/actor/d_a_npc_ash.cpp @@ -69,16 +69,16 @@ void daNpcAsh_c::setLookMode(int i_lookMode, fopAc_ac_c* i_talkPartner) { void daNpcAsh_c::searchActors() { if (!mActorMngr[1].getActorP()) { - mActorMngr[1].entry(fopAcM_SearchByName(PROC_NPC_SHAD)); + mActorMngr[1].entry(fopAcM_SearchByName(fpcNm_NPC_SHAD_e)); } if (!mActorMngr[2].getActorP()) { - mActorMngr[2].entry(fopAcM_SearchByName(PROC_NPC_RAFREL)); + mActorMngr[2].entry(fopAcM_SearchByName(fpcNm_NPC_RAFREL_e)); } if (!mActorMngr[3].getActorP()) { - mActorMngr[3].entry(fopAcM_SearchByName(PROC_NPC_MOIR)); + mActorMngr[3].entry(fopAcM_SearchByName(fpcNm_NPC_MOIR_e)); } if (isMap() && !mActorMngr[4].getActorP()) { - mActorMngr[4].entry(fopAcM_SearchByName(PROC_Obj_Table)); + mActorMngr[4].entry(fopAcM_SearchByName(fpcNm_Obj_Table_e)); } if (!mActorMngr[5].getActorP()) { mActorMngr[5].entry(getEvtAreaTagP(17, 0)); @@ -240,7 +240,7 @@ cPhs_Step daNpcAsh_c::Create() { if (dComIfGs_isSaveSwitch(0x14)) { return cPhs_ERROR_e; } - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mType = TYPE_CASTLE; } @@ -592,7 +592,7 @@ void daNpcAsh_c::reset() { } if (isSneaking()) { - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } if (mType == TYPE_BAR) { @@ -1336,18 +1336,18 @@ static actor_method_class daNpcAsh_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ASH = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_NPC_ASH, - &g_fpcLf_Method.base, - sizeof(daNpcAsh_c), - 0, - 0, - &g_fopAc_Method.base, - 411, - &daNpcAsh_MethodTable, - 0x40100, - fopAc_NPC_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ASH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcAsh_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ASH_e, + /* Actor SubMtd */ &daNpcAsh_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 6f2c60dc2c2..65ab33607e1 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -760,7 +760,7 @@ bool daNpcAshB_c::wait(void* param_0) { return true; } else { u8 preitemno = dComIfGp_event_getPreItemNo(); - if (preitemno == fpcNm_ITEM_ASHS_SCRIBBLING) { + if (preitemno == dItemNo_ASHS_SCRIBBLING_e) { mFlowID = 504; setAction(&daNpcAshB_c::talk); } else { @@ -1194,18 +1194,18 @@ static actor_method_class daNpcAshB_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ASHB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ASHB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcAshB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 412, // mPriority - &daNpcAshB_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ASHB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcAshB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ASHB_e, + /* Actor SubMtd */ &daNpcAshB_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index 98fec991305..722a95a7ea3 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_bans.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -574,7 +574,7 @@ u8 daNpc_Bans_c::getType() { case 1: return TYPE_TWILIGHT; // Eldin Twilight - + case 2: return TYPE_COLIN_KIDNAPPED; // After Colin kidnapped but before horseback battle cleared @@ -604,7 +604,7 @@ BOOL daNpc_Bans_c::isDelete() { Do not delete if TYPE_TWILIGHT */ return FALSE; - + case TYPE_COLIN_KIDNAPPED: /* Delete if TYPE_COLIN_KIDNAPPED and: @@ -639,7 +639,7 @@ void daNpc_Bans_c::reset() { if (mpMatAnm[0] != NULL) { mpMatAnm[0]->initialize(); } - + initialize(); for (int i = 0; i < 8; i++) { @@ -789,7 +789,7 @@ void daNpc_Bans_c::srchActors() { } } break; - + case TYPE_TWILIGHT: for (int i = 0; i < 2; i++) { if (mActorMngrs[i + 5].getActorP() == NULL) { @@ -798,7 +798,7 @@ void daNpc_Bans_c::srchActors() { } if (mActorMngrs[3].getActorP() == NULL) { - mActorMngrs[3].entry(getNearestActorP(PROC_NPC_LEN)); + mActorMngrs[3].entry(getNearestActorP(fpcNm_NPC_LEN_e)); } break; @@ -894,10 +894,10 @@ void daNpc_Bans_c::action() { } void daNpc_Bans_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkPlayerIn2ndFloorOfBombShop()) { @@ -1062,7 +1062,7 @@ int daNpc_Bans_c::drawDbgInfo() { dDbVw_drawSphereXlu(attention_info.position, 9.0f, (GXColor){0x80, 0x80, 0x80, 0xA0}, 1); } #endif - + return 0; } @@ -1146,12 +1146,12 @@ BOOL daNpc_Bans_c::selectAction() { return TRUE; } #endif - + switch (mType) { case TYPE_SHOP: mNextAction = &daNpc_Bans_c::tend; break; - + default: mNextAction = &daNpc_Bans_c::wait; break; @@ -1205,7 +1205,7 @@ fopAc_ac_c* daNpc_Bans_c::getKMsgTagP() { int reg_r29 = 0; // unused f32 fVar1 = G_CM3D_F_INF; mFindCount = 0; - mSrchName = PROC_TAG_KMSG; + mSrchName = fpcNm_TAG_KMSG_e; fopAcM_Search(srchActor, this); for (int i = 0; i < mFindCount; i++) { @@ -1254,7 +1254,7 @@ int daNpc_Bans_c::cutAnger(int i_staffId) { initTalk(12, NULL); break; - + case 2: if (mType == TYPE_MAKING_BOMBS) { mFaceMotionSeqMngr.setNo(FACE_BLINK, -1.0f, FALSE, 0); @@ -1272,7 +1272,7 @@ int daNpc_Bans_c::cutAnger(int i_staffId) { mEventTimer = timer; mDropWaterTimer = 20; break; - + case 4: mEventTimer = timer; break; @@ -1281,7 +1281,7 @@ int daNpc_Bans_c::cutAnger(int i_staffId) { mFaceMotionSeqMngr.setNo(FACE_BLINK, -1.0f, FALSE, 0); mMotionSeqMngr.setNo(MOT_ANGRY_C, -1.0f, FALSE, 0); break; - + case 6: mFaceMotionSeqMngr.setNo(FACE_TALK_A, -1.0f, FALSE, 0); mMotionSeqMngr.setNo(MOT_REST, -1.0f, FALSE, 0); @@ -1303,7 +1303,7 @@ int daNpc_Bans_c::cutAnger(int i_staffId) { step(mPlayerAngle, -1, -1, 15, 0); } break; - + case 2: if (mMotionSeqMngr.getNo() == MOT_ANGRY_A || mMotionSeqMngr.getNo() == MOT_ANGRY_C) { if (mMotionSeqMngr.checkEndSequence()) { @@ -1347,7 +1347,7 @@ int daNpc_Bans_c::cutAnger(int i_staffId) { rv = 1; } break; - + case 4: action(); if (cLib_calcTimer(&mEventTimer) == 0) { @@ -1490,7 +1490,7 @@ int daNpc_Bans_c::wait(void*) { mFaceMotionSeqMngr.setNo(FACE_NONE, -1.0f, FALSE, 0); mMotionSeqMngr.setNo(MOT_WAIT_TW, -1.0f, FALSE, 0); break; - + case TYPE_COLIN_KIDNAPPED: mFaceMotionSeqMngr.setNo(FACE_BLINK, -1.0f, FALSE, 0); mMotionSeqMngr.setNo(MOT_FAINT, -1.0f, FALSE, 0); @@ -1523,7 +1523,7 @@ int daNpc_Bans_c::wait(void*) { daNpcT_chkEvtBit(60) && // dSv_event_flag_c::M_027 - Cutscene - [cutscene: 13] kids in the church (beast eyes) !dComIfGp_event_runCheck() ) { - mDemo13Flag = 0; + mDemo13Flag = 0; } } @@ -1654,7 +1654,7 @@ int daNpc_Bans_c::tend(void*) { if (actor_p != NULL) { cXyz attnPos = getAttnPos(daPy_getPlayerActorClass()); BOOL bVar2 = NULL != mPlayerActorMngr.getActorP(); - + int i_no = actor_p->attention_info.distances[fopAc_attn_SPEAK_e]; f32 dist_max = dComIfGp_getAttention()->getDistTable(i_no).mDistMax; f32 neg_lower_y = dComIfGp_getAttention()->getDistTable(i_no).mLowerY * -1.0f; @@ -1810,7 +1810,7 @@ int daNpc_Bans_c::shop(void*) { int daNpc_Bans_c::test(void*) { int rv = 0; - + switch (mMode) { case 0: case 1: @@ -1861,18 +1861,18 @@ static actor_method_class daNpc_Bans_MethodTable = { }; actor_process_profile_definition g_profile_NPC_BANS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_BANS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Bans_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 322, // mPriority - &daNpc_Bans_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BANS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Bans_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_BANS_e, + /* Actor SubMtd */ &daNpc_Bans_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index 6a586c0eaec..d8b6964b28d 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -1195,65 +1195,65 @@ void daNpc_Besu_c::srchActors() { switch (mType) { case 0: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_MARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_MARO_e)); return; } break; case 2: if (mActorMngr[3].getActorP() == NULL) { // LEN is Renaldo - mActorMngr[3].entry(getNearestActorP(PROC_NPC_LEN)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_LEN_e)); return; } break; case 11: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_MARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_MARO_e)); return; } break; case 12: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_MARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_MARO_e)); return; } break; case 13: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_KOLIN)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_KOLIN_e)); } if (mActorMngr[4].getActorP() == NULL) { - mActorMngr[4].entry(getNearestActorP(PROC_NPC_SARU)); + mActorMngr[4].entry(getNearestActorP(fpcNm_NPC_SARU_e)); return; } break; case 14: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_MARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_MARO_e)); return; } break; case 17: if (mActorMngr[5].getActorP() == NULL) { - mActorMngr[5].entry(getNearestActorP(PROC_NPC_HANJO)); + mActorMngr[5].entry(getNearestActorP(fpcNm_NPC_HANJO_e)); } if (mActorMngr[6].getActorP() == NULL) { - mActorMngr[6].entry(getNearestActorP(PROC_NPC_SEIRA)); + mActorMngr[6].entry(getNearestActorP(fpcNm_NPC_SEIRA_e)); } break; } @@ -1329,9 +1329,9 @@ void daNpc_Besu_c::action() { } void daNpc_Besu_c::beforeMove() { - fopAcM_OffStatus(this, 0x08000000U); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x08000000U); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -3069,18 +3069,18 @@ static actor_method_class daNpc_Besu_MethodTable = { }; actor_process_profile_definition g_profile_NPC_BESU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_BESU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Besu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 323, // mPriority - &daNpc_Besu_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BESU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Besu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_BESU_e, + /* Actor SubMtd */ &daNpc_Besu_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index 220c64af3fc..ed8d41275b4 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -305,9 +305,9 @@ void daNpcBlueNS_c::callEvt_changeYami() { fpc_ProcID daNpcBlueNS_c::create_Yamijin(int param_0) { static const s16 sNameYami[] = { - PROC_NPC_YAMIS, - PROC_NPC_YAMID, - PROC_NPC_YAMIT, + fpcNm_NPC_YAMIS_e, + fpcNm_NPC_YAMID_e, + fpcNm_NPC_YAMIT_e, }; int var_r30 = mType / 3; @@ -509,7 +509,7 @@ void* daNpcBlueNS_c::_search_Tag(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) == PROC_TAG_YAMI && ((daNpcBlueNS_c*)i_data)->_chk_TagPrm((fopAc_ac_c*)i_actor)) { + if (fopAcM_GetName(i_actor) == fpcNm_TAG_YAMI_e && ((daNpcBlueNS_c*)i_data)->_chk_TagPrm((fopAc_ac_c*)i_actor)) { return i_actor; } @@ -525,7 +525,7 @@ void* daNpcBlueNS_c::_search_HollyBall_Y(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) != PROC_Obj_Carry) { + if (fopAcM_GetName(i_actor) != fpcNm_Obj_Carry_e) { return NULL; } @@ -549,7 +549,7 @@ void* daNpcBlueNS_c::_search_HollyBall_G(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) != PROC_Obj_Carry) { + if (fopAcM_GetName(i_actor) != fpcNm_Obj_Carry_e) { return NULL; } @@ -1428,18 +1428,18 @@ static actor_method_class daNpcBlueNS_MethodTable = { }; actor_process_profile_definition g_profile_NPC_BLUENS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_BLUENS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcBlueNS_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 318, // mPriority - &daNpcBlueNS_MethodTable, // sub_method - 0x08044180, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BLUENS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcBlueNS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_BLUENS_e, + /* Actor SubMtd */ &daNpcBlueNS_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp index 7bf2689db12..10139191f33 100644 --- a/src/d/actor/d_a_npc_bou.cpp +++ b/src/d/actor/d_a_npc_bou.cpp @@ -314,7 +314,7 @@ int daNpc_Bou_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) { void* daNpc_Bou_c::srchCow(void* arg0, void* arg1) { if (mFindCount < 50 && arg0 != NULL && arg0 != arg1) { - if (fopAcM_IsExecuting(fopAcM_GetID(arg0)) && fopAcM_GetName(arg0) == PROC_COW) { + if (fopAcM_IsExecuting(fopAcM_GetID(arg0)) && fopAcM_GetName(arg0) == fpcNm_COW_e) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*)arg0; mFindCount++; } @@ -652,9 +652,9 @@ void daNpc_Bou_c::action() { } void daNpc_Bou_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -1674,18 +1674,18 @@ static actor_method_class daNpc_Bou_MethodTable = { }; actor_process_profile_definition g_profile_NPC_BOU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_BOU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Bou_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 324, // mPriority - &daNpc_Bou_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BOU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Bou_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_BOU_e, + /* Actor SubMtd */ &daNpc_Bou_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index 6d807edacd5..d6beddc88ba 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -673,7 +673,7 @@ BOOL daNpcBouS_c::setAction(actionFunc action) { static void* s_sub(void* i_actor, void* i_data) { if ( - fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Tag_Instruction && + fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Tag_Instruction_e && ((daNpcBouS_c*)i_data)->checkInstructionTag((fopAc_ac_c*)i_actor) ) { return i_actor; @@ -1035,7 +1035,7 @@ bool daNpcBouS_c::wait(void* param_1) { } } - if (!checkItemGet(fpcNm_ITEM_HVY_BOOTS, 1) && dComIfGs_isTbox(2)) { + if (!checkItemGet(dItemNo_HVY_BOOTS_e, 1) && dComIfGs_isTbox(2)) { mForcibleTalk = 1; } @@ -1143,7 +1143,7 @@ bool daNpcBouS_c::talk(void* param_1) { if (itemNo == 1) { setAction(&daNpcBouS_c::instruction); } else { - parentActorID = fopAcM_createChild(PROC_NPC_WRESTLER, fopAcM_GetID(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_WRESTLER_e, fopAcM_GetID(this), (itemNo << 24) | (getArenaNo() | 0x700), &l_createPos, fopAcM_GetRoomNo(this), NULL, NULL, getType(), NULL); setAngle(home.angle.y); @@ -1291,7 +1291,7 @@ bool daNpcBouS_c::instruction(void* param_1) { case 2: if (talkProc(NULL, TRUE, NULL)) { mActorMngrs[0].entry(daPy_getPlayerActorClass()); - parentActorID = fopAcM_createChild(PROC_NPC_WRESTLER, fopAcM_GetID(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_WRESTLER_e, fopAcM_GetID(this), getArenaNo() | 0x700 | 0x2000000, &l_createPos, fopAcM_GetRoomNo(this), NULL, NULL, getType(), NULL); mInstructionMode++; @@ -1556,7 +1556,7 @@ int daNpcBouS_c::EvCut_BousIntroSumo3(int i_staffId) { if (itemNo == 1) { setAction((&daNpcBouS_c::instruction)); } else { - parentActorID = fopAcM_createChild(PROC_NPC_WRESTLER, fopAcM_GetID(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_WRESTLER_e, fopAcM_GetID(this), (itemNo << 24) | (getArenaNo() | 0x700), &l_createPos, fopAcM_GetRoomNo(this), NULL, NULL, getType(), NULL); setAngle(home.angle.y); @@ -1625,18 +1625,18 @@ static actor_method_class daNpcBouS_MethodTable = { }; actor_process_profile_definition g_profile_NPC_BOU_S = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_BOU_S, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcBouS_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 325, // mPriority - &daNpcBouS_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_BOU_S_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcBouS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_BOU_S_e, + /* Actor SubMtd */ &daNpcBouS_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index 503bff2d3fb..427e35a7dff 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -1083,12 +1083,12 @@ int PathTrace_c::decIndex(int param_1) { static void* s_sub(void* param_1, void* param_2) { if (fopAcM_IsActor(param_1) && - ((fopAcM_GetName(param_1) == PROC_ALINK && !dKy_darkworld_check()) || - fopAcM_GetName(param_1) == PROC_NPC_CD3 || fopAcM_GetName(param_1) == PROC_NPC_PASSER || - fopAcM_GetName(param_1) == PROC_NPC_GUARD || fopAcM_GetName(param_1) == PROC_NPC_FGUARD || - fopAcM_GetName(param_1) == PROC_NPC_SHOE || fopAcM_GetName(param_1) == PROC_NPC_KASIHANA || - fopAcM_GetName(param_1) == PROC_NPC_KASIKYU || - fopAcM_GetName(param_1) == PROC_NPC_KASIMICH)) + ((fopAcM_GetName(param_1) == fpcNm_ALINK_e && !dKy_darkworld_check()) || + fopAcM_GetName(param_1) == fpcNm_NPC_CD3_e || fopAcM_GetName(param_1) == fpcNm_NPC_PASSER_e || + fopAcM_GetName(param_1) == fpcNm_NPC_GUARD_e || fopAcM_GetName(param_1) == fpcNm_NPC_FGUARD_e || + fopAcM_GetName(param_1) == fpcNm_NPC_SHOE_e || fopAcM_GetName(param_1) == fpcNm_NPC_KASIHANA_e || + fopAcM_GetName(param_1) == fpcNm_NPC_KASIKYU_e || + fopAcM_GetName(param_1) == fpcNm_NPC_KASIMICH_e)) { static_cast(param_2)->checkObstacleSub((fopAc_ac_c*)param_1); } diff --git a/src/d/actor/d_a_npc_cdn3.cpp b/src/d/actor/d_a_npc_cdn3.cpp index ff0e484c8d9..a309d97c7c1 100644 --- a/src/d/actor/d_a_npc_cdn3.cpp +++ b/src/d/actor/d_a_npc_cdn3.cpp @@ -834,7 +834,7 @@ int daNpcCdn3_c::ctrlMsgAnm() { } static void* s_sub1(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Tag_Schedule && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Tag_Schedule_e && static_cast(param_2)->searchNextScheduleTagSub( static_cast(param_1))) { @@ -872,7 +872,7 @@ bool daNpcCdn3_c::searchNextScheduleTagSub(fopAc_ac_c* param_1) { } static void* s_sub2(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Tag_Schedule && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Tag_Schedule_e && static_cast(param_2)->searchFirstScheduleTagSub( static_cast(param_1))) { @@ -1510,7 +1510,7 @@ void daNpcCdn3_c::create_init() { } if (isInShop()) { - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } if (m_path.setPath(getPathID(), fopAcM_GetRoomNo(this), 1, ¤t.pos, false)) { @@ -1589,9 +1589,9 @@ int daNpcCdn3_c::execute() { mAcchCir.SetWallR(Cd2_HIO_chkWallR(m_type)); checkTimeSchedule(); if (field_0xb95 != 0) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } else { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); } if (field_0xb95 != 0) { if (!mIsDarkWorld && daPy_py_c::checkNowWolf()) { @@ -1741,18 +1741,18 @@ static actor_method_class daNpcCdn3_METHODS = { }; actor_process_profile_definition g_profile_NPC_CD3 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_CD3, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcCdn3_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 395, // mPriority - &daNpcCdn3_METHODS, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CD3_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcCdn3_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_CD3_e, + /* Actor SubMtd */ &daNpcCdn3_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index 2099c572f1b..3b6ac5279fc 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_chat.cpp - * + * */ #include "d/dolzel_rel.h" @@ -1408,7 +1408,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, -0.3f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, -0x0014, 0, 0, @@ -1430,7 +1430,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, -0x000A, 0xB, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1452,7 +1452,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1474,7 +1474,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1496,7 +1496,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1518,7 +1518,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1540,7 +1540,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1562,7 +1562,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1584,7 +1584,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, -0.3f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, -0x0014, 0, 0, @@ -1606,7 +1606,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, -0x000A, 0xB, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1628,7 +1628,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1650,7 +1650,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1672,7 +1672,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1826,7 +1826,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1850,7 +1850,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1874,7 +1874,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, -0.3f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, -0x0014, 0, 0, @@ -1898,7 +1898,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1922,7 +1922,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1946,7 +1946,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1970,7 +1970,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1994,7 +1994,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -2018,7 +2018,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -2042,7 +2042,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, -0.3f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, -0x0014, 0, 0, @@ -2066,7 +2066,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -2090,7 +2090,7 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, - + { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -2464,7 +2464,7 @@ J3DModel* daNpcChat_c::ObjCreate(int param_1) { J3DModel* daNpcChat_c::ChairCreate(f32 i_scale) { const char* i_arcName = mTwilight ? "objectTW" : "object"; int i_index = isM_() ? ((mTwilight != 0) ? 4 : 4) : ((mTwilight != 0) ? 5 : 5); - + J3DModelData* a_mdlData_p = (J3DModelData*)dComIfG_getObjectRes(i_arcName, i_index); if (a_mdlData_p != NULL) { J3DModel* model = mDoExt_J3DModel__create(a_mdlData_p, 0x80000, 0x11000084); @@ -2480,7 +2480,7 @@ J3DModel* daNpcChat_c::ChairCreate(f32 i_scale) { return model; } - + return NULL; } @@ -2512,7 +2512,7 @@ cPhs_Step daNpcChat_c::loadResrc(int idx, int param_2) { if (rv != cPhs_COMPLEATE_e) { return rv; } - + if (param_2 != 0 || field_0xe51 == 1) { rv = dComIfG_resLoad(&mPhase3, l_resNameTbl[idx][3]); if (rv != cPhs_COMPLEATE_e) { @@ -2929,7 +2929,7 @@ int daNpcChat_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { } static void* s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_CHAT) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_CHAT_e) { ((daNpcChat_c*)i_data)->setTalkMember((daNpcChat_c*)i_actor); } @@ -2941,7 +2941,7 @@ BOOL daNpcChat_c::searchGroup() { case 0: field_0xe38 = 1; return FALSE; - + case 1: fpcM_Search(s_sub, this); int iVar1 = 0; @@ -3036,7 +3036,7 @@ BOOL daNpcChat_c::appearCheck() { if (iVar1 == mTalkMemberNum) { for (int i = 0; i < mTalkMemberNum; i++) { mTalkMembers[i]->offHide(); - fopAcM_OffStatus(mTalkMembers[i], fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(mTalkMembers[i], fopAcStts_UNK_0x8000000_e); } } } @@ -3053,7 +3053,7 @@ BOOL daNpcChat_c::appearCheck() { if (iVar2 == mTalkMemberNum) { for (int i = 0; i < mTalkMemberNum; i++) { mTalkMembers[i]->onHide(); - fopAcM_OnStatus(mTalkMembers[i], fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(mTalkMembers[i], fopAcStts_UNK_0x8000000_e); } } } @@ -3386,7 +3386,7 @@ void daNpcChat_c::setMotionAnm(int i_index, f32 i_morf) { case OBJ_KAGOM: case OBJ_KAGOW: break; - + case OBJ_GUITAR: case OBJ_FLUTE: index = ANM_PLAYM; @@ -3430,7 +3430,7 @@ void daNpcChat_c::setMotionAnm(int i_index, f32 i_morf) { case ANM_2LADYTALK_B: mSound.playVoice(4); break; - + case ANM_SURPRISE: mSound.playVoice(1); break; @@ -3588,7 +3588,7 @@ void daNpcChat_c::reset() { mHide = false; } else { mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } setAction(&daNpcChat_c::wait); @@ -3928,7 +3928,7 @@ bool daNpcChat_c::wait(void* param_1) { setMotion(mTalkMotionNo, -1.0f, 1); mTurnMode = 0; } - + orderEvent(mOrderSpeakEvt, l_evtNames[mOrderEvtNo], 0xFFFF, 0x28, 0xFF, 1); } } @@ -3953,7 +3953,7 @@ bool daNpcChat_c::fear(void* param_1) { dComIfGs_onSaveDunSwitch(60); mMode = 2; break; - + case 2: if (mMotionAnm == ANM_SURPRISE) { if (mAnm_p->isStop()) { @@ -4002,7 +4002,7 @@ bool daNpcChat_c::talk(void* param_1) { mMode = 2; break; - + case 2: if (mLookPlayerCheck == 1) { if (mCurAngle.y == fopAcM_searchPlayerAngleY(this)) { @@ -4012,7 +4012,7 @@ bool daNpcChat_c::talk(void* param_1) { } else { int msgTimer, i_expression, i_motion; msgTimer = mMsgTimer; - + if (ctrlMsgAnm(i_expression, i_motion, this, FALSE) != 0) { setMotion(i_motion, -1.0f, 0); } @@ -4076,7 +4076,7 @@ bool daNpcChat_c::demo(void* param_1) { case 0: mMode = 2; break; - + case 2: if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk() == false) { @@ -4144,18 +4144,18 @@ static actor_method_class daNpcChat_MethodTable = { }; actor_process_profile_definition g_profile_NPC_CHAT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_CHAT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcChat_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 398, // mPriority - &daNpcChat_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CHAT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcChat_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_CHAT_e, + /* Actor SubMtd */ &daNpcChat_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index 6fc9002f1ab..c362c718ea7 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -2116,18 +2116,18 @@ static actor_method_class daNpcChin_MethodTable = { }; actor_process_profile_definition g_profile_NPC_CHIN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_CHIN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcChin_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 424, // mPriority - &daNpcChin_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CHIN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcChin_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_CHIN_e, + /* Actor SubMtd */ &daNpcChin_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp index e6f6404cbba..dedde871a58 100644 --- a/src/d/actor/d_a_npc_clerka.cpp +++ b/src/d/actor/d_a_npc_clerka.cpp @@ -790,18 +790,18 @@ static actor_method_class daNpc_clerkA_MethodTable = { }; actor_process_profile_definition g_profile_NPC_CLERKA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_CLERKA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_clerkA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 326, // mPriority - &daNpc_clerkA_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CLERKA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_clerkA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_CLERKA_e, + /* Actor SubMtd */ &daNpc_clerkA_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp index 39e08d5a277..c3250f0abcb 100644 --- a/src/d/actor/d_a_npc_clerkb.cpp +++ b/src/d/actor/d_a_npc_clerkb.cpp @@ -942,18 +942,18 @@ static actor_method_class daNpc_clerkB_MethodTable = { }; actor_process_profile_definition g_profile_NPC_CLERKB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_CLERKB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_clerkB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 327, // mPriority - &daNpc_clerkB_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CLERKB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_clerkB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_CLERKB_e, + /* Actor SubMtd */ &daNpc_clerkB_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp index 2e47b5f836a..ab0afbd9dc0 100644 --- a/src/d/actor/d_a_npc_clerkt.cpp +++ b/src/d/actor/d_a_npc_clerkt.cpp @@ -703,18 +703,18 @@ static actor_method_class daNpcClerkt_MethodTable = { }; actor_process_profile_definition g_profile_NPC_CLERKT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_CLERKT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcClerkT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 328, // mPriority - &daNpcClerkt_MethodTable, // sub_method - 0x08044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_CLERKT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcClerkT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_CLERKT_e, + /* Actor SubMtd */ &daNpcClerkt_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index 1ae9adda9fc..1c315d63324 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_coach.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -275,7 +275,7 @@ static int jointCoachCallBack(J3DJoint* i_joint, int param_2) { } static void arrowStickCallBack(dBgW* i_bgw, fopAc_ac_c* a_this, fopAc_ac_c* i_actor, cXyz& i_pos) { - if (fopAcM_GetName(i_actor) == PROC_E_ARROW) { + if (fopAcM_GetName(i_actor) == fpcNm_E_ARROW_e) { if (!daPy_getPlayerActorClass()->checkBoarSingleBattleSecond()) { ((daNpcCoach_c*)a_this)->hitFireArrow(i_pos); fopAcM_delete(i_actor); @@ -294,7 +294,7 @@ void daNpcCoach_c::hitFireArrow(cXyz i_pos) { cXyz work; mDoMtx_stack_c::copy(mChCoach.field_0x598); mDoMtx_stack_c::multVec(&i_pos, &work); - field_0x247c[i] = fopAcM_createChild(PROC_COACH_FIRE, fopAcM_GetID(this), + field_0x247c[i] = fopAcM_createChild(fpcNm_COACH_FIRE_e, fopAcM_GetID(this), 0, &work, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); mChCoach.mSound.startSound(Z2SE_COACH_HIT_ARROW, 0, -1); @@ -410,12 +410,12 @@ void daNpcCoach_c::initCoachPosition(Vec& i_pos, SVec& i_angle) { work.set(mChCoach.field_0x5e0.x, mChCoach.field_0x5e0.y + 500.0f, mChCoach.field_0x5e0.z); if (fopAcM_gc_c::gndCheck(&work)) { - mChCoach.field_0x5e0.y = fopAcM_gc_c::getGroundY(); + mChCoach.field_0x5e0.y = fopAcM_gc_c::getGroundY(); } } static void* s_sub(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_KR && ((e_kr_class*)i_actor)->getId() >= 0) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_KR_e && ((e_kr_class*)i_actor)->getId() >= 0) { return i_actor; } @@ -749,7 +749,7 @@ int daNpcCoach_c::createHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_HARNESS); - + JUT_ASSERT(2762, modelData != NULL); mChHarness.mHarnessModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -775,9 +775,9 @@ int daNpcCoach_c::createHeap() { JUT_ASSERT(2782, FALSE); } - + modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_COACH); - + JUT_ASSERT(2787, modelData != NULL); mChCoach.mCoachModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -807,7 +807,7 @@ int daNpcCoach_c::createHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_YELIA); - + JUT_ASSERT(2816, modelData != NULL); mChYelia.mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, BCK_YELIA_WAIT), @@ -948,7 +948,7 @@ void daNpcCoach_c::checkCoachDamage() { ((daCoach2D_c*)fpcM_SearchByID(field_0x2554))->setHitCount((mTotalDmgRecv / (attr().damage_durability / 20))); if (mTotalDmgRecv >= attr().damage_durability) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mChHorse.field_0x784 = 0.0f; daNpcTheB_c* telmaB_p = (daNpcTheB_c*)fpcM_SearchByID(parentActorID); @@ -1472,7 +1472,7 @@ void daNpcCoach_c::calcHarnessMotion() { void daNpcCoach_c::calcFrontWheelRotate() { if (speedF != 0.0f) { f32 fVar1 = mChHarness.field_0x6ec.absXZ(mChHarness.field_0x6e0); - int dist_ang = cLib_distanceAngleS(mChHarness.field_0x700.y, + int dist_ang = cLib_distanceAngleS(mChHarness.field_0x700.y, cLib_targetAngleY(&mChHarness.field_0x6ec, &mChHarness.field_0x6e0)); f32 fVar2 = (dist_ang < 0x4000) ? fVar1 / 345.5751953125f : -(fVar1 / 345.5751953125f); @@ -1612,9 +1612,9 @@ void daNpcCoach_c::setHorseAnm(int i_index) { if (mChHorse.field_0x788 != i_index) { mChHorse.field_0x788 = i_index; - J3DAnmTransform* anm = (J3DAnmTransform*)(l_horseAnmParam[i_index].field_0x0 >= 0 ? + J3DAnmTransform* anm = (J3DAnmTransform*)(l_horseAnmParam[i_index].field_0x0 >= 0 ? dComIfG_getObjectRes(l_arcName, l_horseAnmParam[i_index].field_0x0) : NULL); - J3DAnmTransform* anm_2 = l_horseAnmParam[i_index].field_0xc >= 0 ? + J3DAnmTransform* anm_2 = l_horseAnmParam[i_index].field_0xc >= 0 ? (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_horseAnmParam[i_index].field_0xc) : NULL; f32 frame = mChHorse.mpModelMorf->getFrame(); @@ -2027,7 +2027,7 @@ cPhs_Step daNpcCoach_c::create() { void daNpcCoach_c::create_init() { if (strcmp(dComIfGp_getStartStageName(), "F_SP123") == 0) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } fopAcM_setStageLayer(this); @@ -2099,8 +2099,8 @@ void daNpcCoach_c::create_init() { mDoMtx_stack_c::multVecZero(&i_pos); mDoMtx_MtxToRot(mDoMtx_stack_c::get(), &i_angle); int msg_no = getMessageNo(); - parentActorID = fopAcM_createChild(PROC_NPC_THEB, fopAcM_GetID(this), msg_no, &i_pos, fopAcM_GetRoomNo(this), &i_angle, NULL, -1, NULL); - field_0x2554 = fopAcM_createChild(PROC_COACH2D, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_NPC_THEB_e, fopAcM_GetID(this), msg_no, &i_pos, fopAcM_GetRoomNo(this), &i_angle, NULL, -1, NULL); + field_0x2554 = fopAcM_createChild(fpcNm_COACH2D_e, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); field_0x2558 = 0; field_0x2559 = 0; @@ -2177,18 +2177,18 @@ static actor_method_class l_daNpcCoach_Method = { }; actor_process_profile_definition g_profile_NPC_COACH = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_COACH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcCoach_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 330, // mPriority - &l_daNpcCoach_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_COACH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcCoach_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_COACH_e, + /* Actor SubMtd */ &l_daNpcCoach_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_df.cpp b/src/d/actor/d_a_npc_df.cpp index daba4eb8df6..545cb04ff11 100644 --- a/src/d/actor/d_a_npc_df.cpp +++ b/src/d/actor/d_a_npc_df.cpp @@ -250,7 +250,7 @@ static void df_rod(npc_df_class* i_this, df_s* df_p) { cLib_addCalc2(&df_p->field_0x5c, df_p->field_0x60, 0.8f, 0.1f); - npc_henna_class* henna_p = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + npc_henna_class* henna_p = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna_p != NULL) { henna_p->field_0x7b8 = 10; } @@ -305,7 +305,7 @@ static void df_control(npc_df_class* i_this) { } static void* s_rod_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_ROD) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_MG_ROD_e) { return i_actor; } @@ -422,18 +422,18 @@ static actor_method_class l_daNpc_Df_Method = { }; actor_process_profile_definition g_profile_NPC_DF = { - fpcLy_CURRENT_e, // mLayerID - 9, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_DF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_df_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 439, // mPriority - &l_daNpc_Df_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_DF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_df_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_DF_e, + /* Actor SubMtd */ &l_daNpc_Df_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index bffee6496bc..5d5093b373e 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_doc.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -193,7 +193,7 @@ int daNpc_Doc_c::create() { #endif reset(); - + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); mCcStts.Init(mpHIO->m.common.weight, 0, this); @@ -385,7 +385,7 @@ void daNpc_Doc_c::setParam() { if (daPy_py_c::checkNowWolf()) { attn_flags |= fopAc_AttnFlag_UNK_0x800000; } - + attention_info.flags = attn_flags; scale.set(mpHIO->m.common.scale, mpHIO->m.common.scale, mpHIO->m.common.scale); @@ -409,11 +409,11 @@ BOOL daNpc_Doc_c::checkChangeEvt() { if (dComIfGp_evmng_ChkPresentEnd()) { mPreItemNo = dComIfGp_event_getPreItemNo(); if (mType == 1) { - if (mPreItemNo == fpcNm_ITEM_WOOD_STATUE) { + if (mPreItemNo == dItemNo_WOOD_STATUE_e) { return 0; } - if (!daNpcT_chkEvtBit(0x141) && mPreItemNo == fpcNm_ITEM_BILL) { + if (!daNpcT_chkEvtBit(0x141) && mPreItemNo == dItemNo_BILL_e) { return 0; } } @@ -508,10 +508,10 @@ void daNpc_Doc_c::beforeMove() { } } - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -524,7 +524,7 @@ void daNpc_Doc_c::setAttnPos() { mStagger.calc(FALSE); f32 rad = cM_s2rad((s16)(mCurAngle.y - field_0xd7e.y)); - + mJntAnm.setParam(this, mpMorf[0]->getModel(), &pos, getBackboneJointNo(), getNeckJointNo(), getHeadJointNo(), mpHIO->m.common.body_angleX_min, mpHIO->m.common.body_angleX_max, mpHIO->m.common.body_angleY_min, mpHIO->m.common.body_angleY_max, mpHIO->m.common.head_angleX_min, mpHIO->m.common.head_angleX_max, mpHIO->m.common.head_angleY_min, mpHIO->m.common.head_angleY_max, @@ -756,9 +756,9 @@ int daNpc_Doc_c::talk(void* param_0) { case MODE_ENTER: case MODE_INIT: if (!mStagger.checkStagger()) { - if (mPreItemNo == fpcNm_ITEM_BILL) { + if (mPreItemNo == dItemNo_BILL_e) { initTalk(0x43F, NULL); - } else if (mPreItemNo == fpcNm_ITEM_WOOD_STATUE) { + } else if (mPreItemNo == dItemNo_WOOD_STATUE_e) { initTalk(0x447, NULL); } else { initTalk(mFlowNodeNo, NULL); @@ -786,9 +786,9 @@ int daNpc_Doc_c::talk(void* param_0) { if (mMotionSeqMngr.getNo() != 10 || mMotionSeqMngr.checkEndSequence()) { int sp8[] = {-1, -1}; - if (mPreItemNo == fpcNm_ITEM_BILL) { + if (mPreItemNo == dItemNo_BILL_e) { sp8[0] = 0x1457; - } else if (mPreItemNo == fpcNm_ITEM_WOOD_STATUE) { + } else if (mPreItemNo == dItemNo_WOOD_STATUE_e) { sp8[0] = 0x146E; if (daNpcT_chkEvtBit(0x163)) { sp8[0] = 0x1472; @@ -874,20 +874,20 @@ static actor_method_class daNpc_Doc_MethodTable = { }; actor_process_profile_definition g_profile_NPC_DOC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_DOC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Doc_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 335, // mPriority - &daNpc_Doc_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_DOC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Doc_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_DOC_e, + /* Actor SubMtd */ &daNpc_Doc_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp index edd785c7812..9a2caa36c4c 100644 --- a/src/d/actor/d_a_npc_doorboy.cpp +++ b/src/d/actor/d_a_npc_doorboy.cpp @@ -886,18 +886,18 @@ static actor_method_class daNpcDoorBoy_MethodTable = { }; actor_process_profile_definition g_profile_NPC_DOORBOY = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_DOORBOY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcDoorBoy_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 418, // mPriority - &daNpcDoorBoy_MethodTable, // sub_method - 0x00044187, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_DOORBOY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcDoorBoy_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_DOORBOY_e, + /* Actor SubMtd */ &daNpcDoorBoy_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_drainSol.cpp b/src/d/actor/d_a_npc_drainSol.cpp index 0b4e8250f35..b5e826e513c 100644 --- a/src/d/actor/d_a_npc_drainSol.cpp +++ b/src/d/actor/d_a_npc_drainSol.cpp @@ -466,18 +466,18 @@ static actor_method_class daNpcDrSol_MethodTable = { }; actor_process_profile_definition g_profile_NPC_DRSOL = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_DRSOL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcDrSol_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 423, // mPriority - &daNpcDrSol_MethodTable, // sub_method - 0x00044187, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_DRSOL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcDrSol_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_DRSOL_e, + /* Actor SubMtd */ &daNpcDrSol_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp index 9443a720ed3..5a605916f66 100644 --- a/src/d/actor/d_a_npc_du.cpp +++ b/src/d/actor/d_a_npc_du.cpp @@ -703,18 +703,18 @@ static actor_method_class l_daNpc_Du_Method = { }; actor_process_profile_definition g_profile_NPC_DU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_DU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_du_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 722, // mPriority - &l_daNpc_Du_Method, // sub_method - 0x08044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_DU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_du_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_DU_e, + /* Actor SubMtd */ &l_daNpc_Du_Method, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index f579985d22b..c47dfa742d7 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -3060,18 +3060,18 @@ static actor_method_class daNpc_Fairy_MethodTable = { }; actor_process_profile_definition g_profile_NPC_FAIRY = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_FAIRY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Fairy_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 340, // mPriority - &daNpc_Fairy_MethodTable, // sub_method - 0x08044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_FAIRY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Fairy_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_FAIRY_e, + /* Actor SubMtd */ &daNpc_Fairy_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_fairy_seirei.cpp b/src/d/actor/d_a_npc_fairy_seirei.cpp index df6fc76ebba..f6c91551dd4 100644 --- a/src/d/actor/d_a_npc_fairy_seirei.cpp +++ b/src/d/actor/d_a_npc_fairy_seirei.cpp @@ -418,18 +418,18 @@ static actor_method_class daNpc_FairySeirei_MethodTable = { }; actor_process_profile_definition g_profile_NPC_FAIRY_SEIREI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_FAIRY_SEIREI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_FairySeirei_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 339, // mPriority - &daNpc_FairySeirei_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_FAIRY_SEIREI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_FairySeirei_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_FAIRY_SEIREI_e, + /* Actor SubMtd */ &daNpc_FairySeirei_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_fguard.cpp b/src/d/actor/d_a_npc_fguard.cpp index 228cf38b7da..5b75b2a91c5 100644 --- a/src/d/actor/d_a_npc_fguard.cpp +++ b/src/d/actor/d_a_npc_fguard.cpp @@ -162,9 +162,9 @@ int daNpcFgd_c::execute() { mAcchCir.SetWallR(Cd2_HIO_chkWallR(m_type)); if (mFlag) { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); } else { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); return 1; } @@ -209,18 +209,18 @@ static actor_method_class daNpcFgd_METHODS = { }; actor_process_profile_definition g_profile_NPC_FGUARD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_FGUARD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcFgd_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 409, // mPriority - &daNpcFgd_METHODS, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_FGUARD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcFgd_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_FGUARD_e, + /* Actor SubMtd */ &daNpcFgd_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e // cullType, }; diff --git a/src/d/actor/d_a_npc_fish.cpp b/src/d/actor/d_a_npc_fish.cpp index 8e023bd44a3..4113fd32899 100644 --- a/src/d/actor/d_a_npc_fish.cpp +++ b/src/d/actor/d_a_npc_fish.cpp @@ -36,7 +36,7 @@ static void fish_set(fopAc_ac_c* i_this, fish_data_s* data) { param = 2; } param |= data->field_0x10 << 8; - fopAcM_create(PROC_MG_FISH, param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); + fopAcM_create(fpcNm_MG_FISH_e, param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } } @@ -120,7 +120,7 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) { } if (param != 0) { pos.set(-3382.0f, 0.0f, -7473.0f); - fopAcM_create(PROC_OBJ_LP, 0xFF010E00 | param, &pos, fopAcM_GetRoomNo(i_this), NULL, + fopAcM_create(fpcNm_OBJ_LP_e, 0xFF010E00 | param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } } @@ -128,7 +128,7 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) { for (int i = 0; i < 4; i++) { pos.set(cM_rndFX(700.0f) + -2936.0f, 0.0f, cM_rndFX(700.0f) + -7865.0f); csXyz angle(0, 0, -1); - fopAcM_create(PROC_FR, 0, &pos, fopAcM_GetRoomNo(i_this), &angle, NULL, -1); + fopAcM_create(fpcNm_FR_e, 0, &pos, fopAcM_GetRoomNo(i_this), &angle, NULL, -1); } } @@ -139,7 +139,7 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) { fish_set(i_this, fish_d127_S); for (int i = 0; i < 12; i++) { pos.set(lf_pos[i].pos_x, -180.0f, lf_pos[i].pos_z); - fopAcM_create(PROC_NPC_LF, lf_pos[i].param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, + fopAcM_create(fpcNm_NPC_LF_e, lf_pos[i].param, &pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } } @@ -153,18 +153,18 @@ static actor_method_class l_daNpc_Fish_Method = { }; actor_process_profile_definition g_profile_NPC_FISH = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_NPC_FISH, - &g_fpcLf_Method.base, - sizeof(npc_fish_class), - 0, - 0, - &g_fopAc_Method.base, - 719, - &l_daNpc_Fish_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_FISH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_fish_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_FISH_e, + /* Actor SubMtd */ &l_daNpc_Fish_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp index a1bfe2dd16d..4983a61bb92 100644 --- a/src/d/actor/d_a_npc_gnd.cpp +++ b/src/d/actor/d_a_npc_gnd.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_gnd.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -39,9 +39,9 @@ static daNpcT_motionAnmData_c l_motionAnmData[1] = { }; static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = { - {0, -1, 0}, - {-1, 0, 0}, - {-1, 0, 0}, + {0, -1, 0}, + {-1, 0, 0}, + {-1, 0, 0}, {-1, 0, 0}, }; @@ -139,7 +139,7 @@ int daNpc_Gnd_c::create() { J3DModelData* modelData = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); #if DEBUG mpHIO = &l_HIO; @@ -514,7 +514,7 @@ bool daNpc_Gnd_c::afterSetMotionAnm(int param_0, int param_1, f32 param_2, int p } bpkAnmData[] = { {0x0E, 1}, }; - + J3DAnmTevRegKey* brk = NULL; J3DAnmColor* bpk = NULL; @@ -685,18 +685,18 @@ static actor_method_class daNpc_Gnd_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GND = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GND, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Gnd_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 305, // mPriority - &daNpc_Gnd_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GND_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Gnd_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GND_e, + /* Actor SubMtd */ &daNpc_Gnd_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index c4865729327..9f303d8f3f4 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -592,7 +592,7 @@ BOOL daNpc_grA_c::setHomeJump() { static void* s_sub(void* i_actor, void* i_this) { // a bit ugly, but the debug version can't have any local variables - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_GRA_e) { if (((daNpc_grA_c*)i_this)->checkTagGraSub((fopAc_ac_c*)i_actor)) { return i_actor; } @@ -613,7 +613,7 @@ bool daNpc_grA_c::checkTagGraSub(fopAc_ac_c* i_this) { static void* s_sub2(void* i_actor, void* i_this) { // a bit ugly, but the debug version can't have any local variables - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_GRA_e) { if (((daNpc_grA_c*)i_this)->checkTagGraSub2((fopAc_ac_c*)i_actor)) { return i_actor; } @@ -634,7 +634,7 @@ bool daNpc_grA_c::checkTagGraSub2(fopAc_ac_c* i_this) { static void* s_subShop(void* i_actor, void* i_this) { UNUSED(i_this); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRM) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_GRM_e) { return i_actor; } return NULL; @@ -642,7 +642,7 @@ static void* s_subShop(void* i_actor, void* i_this) { static void* s_subGRD(void* i_actor, void* i_this) { UNUSED(i_this); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_WRESTLER) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_WRESTLER_e) { return i_actor; } return NULL; @@ -650,7 +650,7 @@ static void* s_subGRD(void* i_actor, void* i_this) { static void *s_subOnsenTaru(void* i_actor, void* i_this) { UNUSED(i_this); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_OnsenTaru && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_OnsenTaru_e && !fpcM_IsCreating(fopAcM_GetID((i_actor)))) { return i_actor; @@ -659,14 +659,14 @@ static void *s_subOnsenTaru(void* i_actor, void* i_this) { } static void *s_subCarry(void* i_actor, void* i_this) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) { ((daNpc_grA_c*)i_this)->addCarryNum(); } return NULL; } static void *s_subCrashed(void* i_actor, void* i_this) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_GRA_e && ((daNpc_grA_c*)i_this)->checkTagGraSubCrashed((fopAc_ac_c*)i_actor)) { return i_actor; @@ -3631,7 +3631,7 @@ BOOL daNpc_grA_c::waitSpaWater(void*) { if (field_0xC98.ChkTgHit()) { daOnsTaru_c* hit = (daOnsTaru_c*)field_0xC98.GetTgHitAc(); if (fopAcM_GetName(hit) == 0x16c) { - fopAcM_OnStatus(hit, 0x4000); + fopAcM_OnStatus(hit, fopAcStts_UNK_0x4000_e); if (hit->getTempStat()) { mOrderEvtNo = 7; } else { @@ -4107,20 +4107,20 @@ static actor_method_class daNpc_grA_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 306, // mPriority - &daNpc_grA_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRA_e, + /* Actor SubMtd */ &daNpc_grA_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index c19b264a19c..e3f3949a558 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -1574,18 +1574,18 @@ static actor_method_class daNpc_grC_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grC_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 307, // mPriority - &daNpc_grC_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grC_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRC_e, + /* Actor SubMtd */ &daNpc_grC_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_grd.cpp b/src/d/actor/d_a_npc_grd.cpp index 351e05b4431..a5630c17dfb 100644 --- a/src/d/actor/d_a_npc_grd.cpp +++ b/src/d/actor/d_a_npc_grd.cpp @@ -1106,7 +1106,7 @@ int daNpc_Grd_c::test(void* param_1) { } static void* s_sub1(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRZ) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_GRZ_e) { return i_actor; } @@ -1114,7 +1114,7 @@ static void* s_sub1(void* i_actor, void* i_data) { } static void* s_sub2(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_YELIA) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_YELIA_e) { return i_actor; } @@ -1249,20 +1249,20 @@ static actor_method_class daNpc_Grd_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Grd_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 308, // mPriority - &daNpc_Grd_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Grd_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRD_e, + /* Actor SubMtd */ &daNpc_Grd_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index c530f869f99..6b4241523fb 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -819,18 +819,18 @@ static actor_method_class daNpc_grM_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 309, // mPriority - &daNpc_grM_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRM_e, + /* Actor SubMtd */ &daNpc_grM_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index 0f61ac33d0d..8b9a261d766 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -811,18 +811,18 @@ static actor_method_class daNpc_grMC_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRMC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRMC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grMC_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 310, // mPriority - &daNpc_grMC_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRMC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grMC_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRMC_e, + /* Actor SubMtd */ &daNpc_grMC_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index e76709c58c5..20b432c1b04 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -1722,7 +1722,7 @@ int daNpc_grO_c::talk(void* param_1) { } static void* s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_MARO) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_MARO_e) { return i_actor; } @@ -1913,18 +1913,18 @@ static actor_method_class daNpc_grO_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grO_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 311, // mPriority - &daNpc_grO_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grO_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRO_e, + /* Actor SubMtd */ &daNpc_grO_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index 5af37cf19ad..0ba9b44d646 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -1440,18 +1440,18 @@ static actor_method_class daNpc_grR_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grR_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 312, // mPriority - &daNpc_grR_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grR_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRR_e, + /* Actor SubMtd */ &daNpc_grR_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index ba99deac5d0..05d1356a479 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -1300,20 +1300,20 @@ static actor_method_class daNpc_grS_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_grS_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 313, // mPriority - &daNpc_grS_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_grS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRS_e, + /* Actor SubMtd */ &daNpc_grS_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index 7aade0ff2e6..40558fee1b8 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -1791,7 +1791,7 @@ int daNpc_Grz_c::wait(void* param_1) { } static void* s_sub(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_GrzRock) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_GrzRock_e) { return i_actor; } @@ -1799,7 +1799,7 @@ static void* s_sub(void* i_actor, void* i_data) { } static void* s_sub2(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_YELIA) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_YELIA_e) { return i_actor; } @@ -1807,7 +1807,7 @@ static void* s_sub2(void* i_actor, void* i_data) { } static void* s_sub3(void* i_actor, void* i_data) { - if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRD) { + if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_GRD_e) { return i_actor; } @@ -2537,18 +2537,18 @@ static actor_method_class daNpc_Grz_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GRZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GRZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Grz_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 314, // mPriority - &daNpc_Grz_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GRZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Grz_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GRZ_e, + /* Actor SubMtd */ &daNpc_Grz_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_guard.cpp b/src/d/actor/d_a_npc_guard.cpp index ab82f88ee9e..60c6597cd99 100644 --- a/src/d/actor/d_a_npc_guard.cpp +++ b/src/d/actor/d_a_npc_guard.cpp @@ -610,18 +610,18 @@ static actor_method_class daNpcGuard_METHODS = { }; actor_process_profile_definition g_profile_NPC_GUARD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GUARD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcGuard_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 406, // mPriority - &daNpcGuard_METHODS, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GUARD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcGuard_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GUARD_e, + /* Actor SubMtd */ &daNpcGuard_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp index 75a68afda67..64d376705d3 100644 --- a/src/d/actor/d_a_npc_gwolf.cpp +++ b/src/d/actor/d_a_npc_gwolf.cpp @@ -1922,18 +1922,18 @@ static actor_method_class daNpc_GWolf_MethodTable = { }; actor_process_profile_definition g_profile_NPC_GWOLF = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_GWOLF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_GWolf_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 336, // mPriority - &daNpc_GWolf_MethodTable, // sub_method - 0x08044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_GWOLF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_GWolf_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_GWOLF_e, + /* Actor SubMtd */ &daNpc_GWolf_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index e80428e355b..7de114a8316 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -610,7 +610,7 @@ void daNpc_Hanjo_c::action() { fopAc_ac_c* hitActor = hitChk(&mCyl1, 0xffffffff); if (hitActor != NULL) { cCcD_Obj* hitObj = mCyl1.GetTgHitObj(); - if (hitObj->ChkAtType(AT_TYPE_THROW_OBJ) && (fopAcM_GetName(hitActor) != PROC_NPC_TK || mType != TYPE_1)) + if (hitObj->ChkAtType(AT_TYPE_THROW_OBJ) && (fopAcM_GetName(hitActor) != fpcNm_NPC_TK_e || mType != TYPE_1)) { mStagger.setParam(this, hitActor, mCurAngle.y); @@ -638,9 +638,9 @@ void daNpc_Hanjo_c::action() { void daNpc_Hanjo_c::beforeMove() { cXyz oldPos; cXyz pos; - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { attention_info.flags = 0; @@ -1248,7 +1248,7 @@ int daNpc_Hanjo_c::cutPursuitBee(int param_1) { if (mStones[i].getSphP()->ChkCoHit()) { fopAc_ac_c* hitActor = mStones[i].getSphP()->GetCoHitObj()->GetAc(); fopAc_ac_c* hitActor2 = dCc_GetAc(hitActor); - if (hitActor2 != NULL && fopAcM_GetName(hitActor2) == PROC_E_NEST) { + if (hitActor2 != NULL && fopAcM_GetName(hitActor2) == fpcNm_E_NEST_e) { mEventTimer = mpHIO->m.field_0xb0; } mStones[i].initialize(); @@ -1960,18 +1960,18 @@ static actor_method_class daNpc_Hanjo_MethodTable = { }; actor_process_profile_definition g_profile_NPC_HANJO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_HANJO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Hanjo_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 341, // mPriority - &daNpc_Hanjo_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_HANJO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Hanjo_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_HANJO_e, + /* Actor SubMtd */ &daNpc_Hanjo_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 55a35befc27..c1e59580f7c 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -218,7 +218,7 @@ static void dummy_dt_cm3dgpla() { static void* s_npc_sub(void* param_0, void* param_1) { if (fopAcM_IsActor(param_0) && - (fopAcM_GetName(param_0) == PROC_NPC_NE || fopAcM_GetName(param_0) == PROC_NPC_DU)) + (fopAcM_GetName(param_0) == fpcNm_NPC_NE_e || fopAcM_GetName(param_0) == fpcNm_NPC_DU_e)) { cXyz unkXyz1 = ((fopAc_ac_c*)param_0)->current.pos - ((npc_henna_class*)param_1)->actor.current.pos; @@ -231,14 +231,14 @@ static void* s_npc_sub(void* param_0, void* param_1) { static void* s_piro_sub(void* param_0, void* param_1) { UNUSED(param_1); - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_NPC_INKO) { + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_NPC_INKO_e) { return param_0; } return NULL; } static void* s_du_sub(void* param_0, void* param_1) { - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_NPC_DU && + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_NPC_DU_e && ((npc_du_class*)param_0)->mPlayerDist < 300.0f) { ((npc_henna_class*)param_1)->field_0x7d5 = 70; @@ -249,7 +249,7 @@ static void* s_du_sub(void* param_0, void* param_1) { static void* s_shop_sub(void* param_0, void* param_1) { UNUSED(param_1); - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_FSHOP && + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_FSHOP_e && (s32)(fopAcM_GetParam(param_0) & 0xff) < 35) { return param_0; @@ -260,7 +260,7 @@ static void* s_shop_sub(void* param_0, void* param_1) { static void* s_koro2ball_sub(void* param_0, void* param_1) { UNUSED(param_1); if (fopAcM_IsActor(param_0)) { - if (fopAcM_GetName(param_0) == PROC_FSHOP && (fopAcM_GetParam(param_0) & 0xff) == 35) { + if (fopAcM_GetName(param_0) == fpcNm_FSHOP_e && (fopAcM_GetParam(param_0) & 0xff) == 35) { return param_0; } } @@ -413,7 +413,7 @@ static void henna_shop(npc_henna_class* i_this) { static void* s_rod_sub(void* param_0, void* param_1) { UNUSED(param_1); - if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_MG_ROD) { + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_MG_ROD_e) { return param_0; } return NULL; @@ -422,7 +422,7 @@ static void* s_rod_sub(void* param_0, void* param_1) { static void* s_fish_sub(void* param_0, void* param_1) { (void) param_1; if (fopAcM_IsActor(param_0)) { - if (fopAcM_GetName(param_0) == PROC_NPC_DU || fopAcM_GetName(param_0) == PROC_MG_FISH) { + if (fopAcM_GetName(param_0) == fpcNm_NPC_DU_e || fopAcM_GetName(param_0) == fpcNm_MG_FISH_e) { cXyz offset = ((fopAc_ac_c*)param_0)->current.pos - ((fopAc_ac_c*)param_1)->current.pos; if (offset.abs() < 500.0f + TREG_F(12)) { return param_0; @@ -2259,7 +2259,7 @@ static void message_guide(npc_henna_class* i_this) { static void* s_boat_sub(void* param_0, void* param_1) { UNUSED(param_1); if (fopAcM_IsActor(param_0)) { - if (fopAcM_GetName(param_0) == PROC_CANOE) { + if (fopAcM_GetName(param_0) == fpcNm_CANOE_e) { return param_0; } } @@ -2746,7 +2746,7 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) { a_this->field_0x618 = i_this->shape_angle.y = i_this->current.angle.y = newAngle; lbl_82_bss_91 = dComIfGs_getEventReg(0xf63f); daNpc_Henna_Execute(a_this); - fopAcM_create(PROC_FSHOP, -1, &i_this->current.pos, fopAcM_GetRoomNo(i_this), NULL, + fopAcM_create(fpcNm_FSHOP_e, -1, &i_this->current.pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); return loadResult; } else { @@ -2760,7 +2760,7 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) { fopAc_ac_c* player = dComIfGp_getPlayer(0); npcDfPos.set(player->current.pos.x, player->current.pos.y + 700.0f, player->current.pos.z); - fopAcM_create(PROC_NPC_DF, WREG_S(3) - 0xf4, &npcDfPos, + fopAcM_create(fpcNm_NPC_DF_e, WREG_S(3) - 0xf4, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } f32 rnd = cM_rndF(1.0f); @@ -2771,19 +2771,19 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) { } else { npcDfPos.set(2249.0f, 50.0f, -2218.0f); } - fopAcM_create(PROC_NPC_DU, 0xffffff00, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, + fopAcM_create(fpcNm_NPC_DU_e, 0xffffff00, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); npcDfPos.x -= 300.0f; npcDfPos.z += 100.0f; - fopAcM_create(PROC_NPC_DU, 0xffffff01, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, + fopAcM_create(fpcNm_NPC_DU_e, 0xffffff01, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); for (s32 i = 0; i < 5; i++) { npcDfPos.set(0.0f, 45.0f, 8000.0f); - fopAcM_create(PROC_BD, 0xffffffff, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, + fopAcM_create(fpcNm_BD_e, 0xffffffff, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } npcDfPos.set(-1500.0f, 3000.0f + nREG_F(7), 3000.0f); - fopAcM_create(PROC_NPC_TK, 0xffffffff, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, + fopAcM_create(fpcNm_NPC_TK_e, 0xffffffff, &npcDfPos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); data_80450C99 = 0; /* dSv_event_flag_c::F_0463 - Fishing Pond - Reserved for fishing */ @@ -2812,10 +2812,10 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) { ato.z = cM_rndF(2300.0f); MtxPosition(&ato, &mae); angl.y = cM_rndF(65536.0f); - fopAcM_create(PROC_MG_FISH, sp_0x18, &mae, fopAcM_GetRoomNo(i_this), + fopAcM_create(fpcNm_MG_FISH_e, sp_0x18, &mae, fopAcM_GetRoomNo(i_this), &angl, NULL, -1); } - fopAcM_create(PROC_NPC_NE, 0xffffff01, &i_this->home.pos, fopAcM_GetRoomNo(i_this), + fopAcM_create(fpcNm_NPC_NE_e, 0xffffff01, &i_this->home.pos, fopAcM_GetRoomNo(i_this), NULL, NULL, -1); } @@ -2845,20 +2845,20 @@ static actor_method_class l_daNpc_Henna_Method = { }; actor_process_profile_definition g_profile_NPC_HENNA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_HENNA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_henna_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 342, // mPriority - &l_daNpc_Henna_Method, // sub_method - 0x00044000, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_HENNA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_henna_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_HENNA_e, + /* Actor SubMtd */ &l_daNpc_Henna_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_npc_henna0.cpp b/src/d/actor/d_a_npc_henna0.cpp index 78b2dae1508..2c9b53fe3fd 100644 --- a/src/d/actor/d_a_npc_henna0.cpp +++ b/src/d/actor/d_a_npc_henna0.cpp @@ -7,18 +7,18 @@ #include "d/actor/d_a_npc_henna0.h" actor_process_profile_definition g_profile_NPC_HENNA0 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_HENNA0, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(d_a_npc_henna0), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 343, // mPriority - NULL, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_HENNA0_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(d_a_npc_henna0), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_HENNA0_e, + /* Actor SubMtd */ NULL, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index bf45bcd0821..ea8253323b6 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -446,7 +446,7 @@ int daNpc_Hoz_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { } static void* s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_START_AND_GOAL) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_START_AND_GOAL_e) { return i_actor; } @@ -454,7 +454,7 @@ static void* s_sub(void* i_actor, void* i_data) { } static void* s_subCanoe(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_CANOE) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_CANOE_e) { return i_actor; } @@ -524,7 +524,7 @@ void daNpc_Hoz_c::reset() { } static void* s_subBomb(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW && ((daArrow_c*)i_actor)->checkBombArrow()) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e && ((daArrow_c*)i_actor)->checkBombArrow()) { return i_actor; } @@ -1695,18 +1695,18 @@ static actor_method_class daNpc_Hoz_MethodTable = { }; actor_process_profile_definition g_profile_NPC_HOZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_HOZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Hoz_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 344, // mPriority - &daNpc_Hoz_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_HOZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Hoz_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_HOZ_e, + /* Actor SubMtd */ &daNpc_Hoz_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index db4505f9eb2..fc889fe2c48 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -637,7 +637,7 @@ void daNpcImpal_c::lookat() { } static void* s_sub1(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e && ((fopAc_ac_c*)i_actor)->current.pos.absXZ(((fopAc_ac_c*)i_data)->current.pos) < 1000.0f) { fopAcM_delete((fopAc_ac_c*)i_actor); @@ -735,7 +735,7 @@ bool daNpcImpal_c::wait(void* param_0) { return true; } u8 preitemno = dComIfGp_event_getPreItemNo(); - if (preitemno == fpcNm_ITEM_ANCIENT_DOCUMENT) { + if (preitemno == dItemNo_ANCIENT_DOCUMENT_e) { mFlowID = 5; setAction(&daNpcImpal_c::talk); } else { @@ -1238,18 +1238,18 @@ static actor_method_class daNpcImpal_MethodTable = { }; actor_process_profile_definition g_profile_NPC_IMPAL = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_IMPAL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcImpal_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 416, // mPriority - &daNpcImpal_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_IMPAL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcImpal_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_IMPAL_e, + /* Actor SubMtd */ &daNpcImpal_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_inko.cpp b/src/d/actor/d_a_npc_inko.cpp index c977ba8b74b..ec4b9f7ef7e 100644 --- a/src/d/actor/d_a_npc_inko.cpp +++ b/src/d/actor/d_a_npc_inko.cpp @@ -325,7 +325,7 @@ static int daNpc_Inko_Execute(npc_inko_class* i_this) { if (daPy_getPlayerActorClass()->checkFrontRollCrash() && temp_f1 < 200.0f) { i_this->field_0x59c[2] = 0; - npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL) { henna->field_0x7b5 = 40; data_80450C9D |= (u8)0x40; @@ -346,7 +346,7 @@ static int daNpc_Inko_Execute(npc_inko_class* i_this) { int flowId; if (cM_rndF(1.0f) < 0.1f) { flowId = 0x361; - npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); + npc_henna_class* henna = (npc_henna_class*)fopAcM_SearchByName(fpcNm_NPC_HENNA_e); if (henna != NULL) { henna->field_0x7ba = 2; } @@ -489,18 +489,18 @@ static actor_method_class l_daNpc_Inko_Method = { }; actor_process_profile_definition g_profile_NPC_INKO = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_INKO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_inko_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 704, // mPriority - &l_daNpc_Inko_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_INKO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_inko_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_INKO_e, + /* Actor SubMtd */ &l_daNpc_Inko_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp index 865c12ea59b..71f99e23566 100644 --- a/src/d/actor/d_a_npc_ins.cpp +++ b/src/d/actor/d_a_npc_ins.cpp @@ -1246,7 +1246,7 @@ int daNpcIns_c::waitPresent(void* param_1) { checkPlayerSearch(); u8 type = dMeter2Info_getInsectSelectType(); - if (type != fpcNm_ITEM_NONE) { + if (type != dItemNo_NONE_e) { if (type != 0 && !isInsect(type)) { break; } @@ -1605,99 +1605,99 @@ bool daNpcIns_c::isInsectComplete() { const insect_param_data& daNpcIns_c::getInsectParamData(int i_index) { switch (i_index) { - case fpcNm_ITEM_M_BEETLE: + case dItemNo_M_BEETLE_e: i_index = INSECT_M_BEETLE; break; - case fpcNm_ITEM_F_BEETLE: + case dItemNo_F_BEETLE_e: i_index = INSECT_F_BEETLE; break; - case fpcNm_ITEM_M_BUTTERFLY: + case dItemNo_M_BUTTERFLY_e: i_index = INSECT_M_BUTTERFLY; break; - case fpcNm_ITEM_F_BUTTERFLY: + case dItemNo_F_BUTTERFLY_e: i_index = INSECT_F_BUTTERFLY; break; - case fpcNm_ITEM_M_STAG_BEETLE: + case dItemNo_M_STAG_BEETLE_e: i_index = INSECT_M_STAG_BEETLE; break; - case fpcNm_ITEM_F_STAG_BEETLE: + case dItemNo_F_STAG_BEETLE_e: i_index = INSECT_F_STAG_BEETLE; break; - case fpcNm_ITEM_M_GRASSHOPPER: + case dItemNo_M_GRASSHOPPER_e: i_index = INSECT_M_GRASSHOPPER; break; - case fpcNm_ITEM_F_GRASSHOPPER: + case dItemNo_F_GRASSHOPPER_e: i_index = INSECT_F_GRASSHOPPER; break; - case fpcNm_ITEM_M_NANAFUSHI: + case dItemNo_M_NANAFUSHI_e: i_index = INSECT_M_NANAFUSHI; break; - case fpcNm_ITEM_F_NANAFUSHI: + case dItemNo_F_NANAFUSHI_e: i_index = INSECT_F_NANAFUSHI; break; - case fpcNm_ITEM_M_DANGOMUSHI: + case dItemNo_M_DANGOMUSHI_e: i_index = INSECT_M_DANGOMUSHI; break; - case fpcNm_ITEM_F_DANGOMUSHI: + case dItemNo_F_DANGOMUSHI_e: i_index = INSECT_F_DANGOMUSHI; break; - case fpcNm_ITEM_M_MANTIS: + case dItemNo_M_MANTIS_e: i_index = INSECT_M_MANTIS; break; - case fpcNm_ITEM_F_MANTIS: + case dItemNo_F_MANTIS_e: i_index = INSECT_F_MANTIS; break; - case fpcNm_ITEM_M_LADYBUG: + case dItemNo_M_LADYBUG_e: i_index = INSECT_M_LADYBUG; break; - case fpcNm_ITEM_F_LADYBUG: + case dItemNo_F_LADYBUG_e: i_index = INSECT_F_LADYBUG; break; - case fpcNm_ITEM_M_SNAIL: + case dItemNo_M_SNAIL_e: i_index = INSECT_M_SNAIL; break; - case fpcNm_ITEM_F_SNAIL: + case dItemNo_F_SNAIL_e: i_index = INSECT_F_SNAIL; break; - case fpcNm_ITEM_M_DRAGONFLY: + case dItemNo_M_DRAGONFLY_e: i_index = INSECT_M_DRAGONFLY; break; - case fpcNm_ITEM_F_DRAGONFLY: + case dItemNo_F_DRAGONFLY_e: i_index = INSECT_F_DRAGONFLY; break; - case fpcNm_ITEM_M_ANT: + case dItemNo_M_ANT_e: i_index = INSECT_M_ANT; break; - case fpcNm_ITEM_F_ANT: + case dItemNo_F_ANT_e: i_index = INSECT_F_ANT; break; - case fpcNm_ITEM_M_MAYFLY: + case dItemNo_M_MAYFLY_e: i_index = INSECT_M_MAYFLY; break; - case fpcNm_ITEM_F_MAYFLY: + case dItemNo_F_MAYFLY_e: i_index = INSECT_F_MAYFLY; break; @@ -1812,18 +1812,18 @@ static actor_method_class daNpcIns_MethodTable = { }; actor_process_profile_definition g_profile_NPC_INS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_INS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcIns_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 425, // mPriority - &daNpcIns_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_INS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcIns_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_INS_e, + /* Actor SubMtd */ &daNpcIns_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index 118f536b5c2..6469b93b966 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -761,9 +761,9 @@ void daNpc_Jagar_c::action() { } void daNpc_Jagar_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -1792,20 +1792,20 @@ static actor_method_class daNpc_Jagar_MethodTable = { }; actor_process_profile_definition g_profile_NPC_JAGAR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_JAGAR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Jagar_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 345, // mPriority - &daNpc_Jagar_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_JAGAR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Jagar_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_JAGAR_e, + /* Actor SubMtd */ &daNpc_Jagar_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_kakashi.cpp b/src/d/actor/d_a_npc_kakashi.cpp index 3da4a5eea57..80fdabdbb95 100644 --- a/src/d/actor/d_a_npc_kakashi.cpp +++ b/src/d/actor/d_a_npc_kakashi.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kakashi.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -197,8 +197,8 @@ int daNpc_Kakashi_c::create() { J3DModelData* modelData = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); - + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); + mSound.init(¤t.pos, 3); #if DEBUG @@ -209,7 +209,7 @@ int daNpc_Kakashi_c::create() { reset(); mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); - + mCcStts.Init(mpHIO->m.common.weight, 0, this); for (int i = 0; i < 3; i++) { mCcSph[i].Set(mCcDSph); @@ -463,7 +463,7 @@ BOOL daNpc_Kakashi_c::checkChangeEvt() { case 3: case 4: break; - } + } } return 0; @@ -867,8 +867,8 @@ void daNpc_Kakashi_c::setStaggerParam(fopAc_ac_c* i_hitActor) { setPrtcls(0); sp14.y = fopAcM_searchPlayerAngleY(this); - fopAcM_createChild(PROC_OBJ_KBACKET, fopAcM_GetID(this), 0x80000000, &pos, fopAcM_GetRoomNo(this), &sp14, NULL, -1, NULL); - fopAcM_createChild(PROC_OBJ_KBACKET, fopAcM_GetID(this), 0x80000001, &pos, fopAcM_GetRoomNo(this), &sp14, NULL, -1, NULL); + fopAcM_createChild(fpcNm_OBJ_KBACKET_e, fopAcM_GetID(this), 0x80000000, &pos, fopAcM_GetRoomNo(this), &sp14, NULL, -1, NULL); + fopAcM_createChild(fpcNm_OBJ_KBACKET_e, fopAcM_GetID(this), 0x80000001, &pos, fopAcM_GetRoomNo(this), &sp14, NULL, -1, NULL); if (field_0x1393 == 0) { break; @@ -1172,20 +1172,20 @@ static actor_method_class daNpc_Kakashi_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KAKASHI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KAKASHI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Kakashi_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 319, // mPriority - &daNpc_Kakashi_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KAKASHI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Kakashi_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KAKASHI_e, + /* Actor SubMtd */ &daNpc_Kakashi_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index e9544a9a529..d988fef9fc4 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kasi_hana.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -170,7 +170,7 @@ BOOL daNpcKasi_Mng_c::calcCenterPos() { if (hana_p == NULL || kyu_p == NULL || mich_p == NULL) { return FALSE; } - + cXyz hana_pos(*fopAcM_GetPosition_p(hana_p)); cXyz kyu_pos(*fopAcM_GetPosition_p(kyu_p)); cXyz mich_pos(*fopAcM_GetPosition_p(mich_p)); @@ -378,11 +378,11 @@ BOOL daNpcKasi_Mng_c::createHearts() { i_pos.y += 115.0f; fopAc_ac_c* heart_p = NULL; csXyz i_angle(0, cLib_getRndValue(0, 7) << 13, 0); - heart_p = fopAcM_fastCreateItem(&i_pos, fpcNm_ITEM_HEART, fopAcM_GetRoomNo(actor_p), &i_angle, + heart_p = fopAcM_fastCreateItem(&i_pos, dItemNo_HEART_e, fopAcM_GetRoomNo(actor_p), &i_angle, &i_scale, &i_speedF, &i_speedY, -1, 0, NULL); if (heart_p != NULL) { Z2GetAudioMgr()->seStart(Z2SE_GIRLS_HEART, &i_pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - fopAcM_OnStatus(heart_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(heart_p, fopAcStts_UNK_0x4000_e); } } } @@ -393,34 +393,34 @@ BOOL daNpcKasi_Mng_c::createHearts() { void daNpcKasi_Mng_c::allDemoMove() { daNpcKasiHana_c* hana_p = (daNpcKasiHana_c*)mHanaActorMngr.getActorP(); if (hana_p != NULL) { - fopAcM_OnStatus(hana_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(hana_p, fopAcStts_UNK_0x4000_e); } daNpcKasiKyu_c* kyu_p = (daNpcKasiKyu_c*)mKyuActorMngr.getActorP(); if (kyu_p != NULL) { - fopAcM_OnStatus(kyu_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(kyu_p, fopAcStts_UNK_0x4000_e); } daNpcKasiMich_c* mich_p = (daNpcKasiMich_c*)mMichActorMngr.getActorP(); if (mich_p != NULL) { - fopAcM_OnStatus(mich_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(mich_p, fopAcStts_UNK_0x4000_e); } } void daNpcKasi_Mng_c::allDemoNotMove() { daNpcKasiHana_c* hana_p = (daNpcKasiHana_c*)mHanaActorMngr.getActorP(); if (hana_p != NULL) { - fopAcM_OffStatus(hana_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(hana_p, fopAcStts_UNK_0x4000_e); } daNpcKasiKyu_c* kyu_p = (daNpcKasiKyu_c*)mKyuActorMngr.getActorP(); if (kyu_p != NULL) { - fopAcM_OffStatus(kyu_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(kyu_p, fopAcStts_UNK_0x4000_e); } daNpcKasiMich_c* mich_p = (daNpcKasiMich_c*)mMichActorMngr.getActorP(); if (mich_p != NULL) { - fopAcM_OffStatus(mich_p, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(mich_p, fopAcStts_UNK_0x4000_e); } } @@ -438,7 +438,7 @@ BOOL daNpcKasi_Mng_c::isMiniGamePlaying() { void daNpcKasi_Mng_c::schMemberActor() { if (mKyuActorMngr.getPId() == fpcM_ERROR_PROCESS_ID_e) { fopAc_ac_c* kyu_p = NULL; - if (fopAcM_SearchByName(PROC_NPC_KASIKYU, (fopAc_ac_c**)&kyu_p) != 0) { + if (fopAcM_SearchByName(fpcNm_NPC_KASIKYU_e, (fopAc_ac_c**)&kyu_p) != 0) { setKyuActor(kyu_p); } } @@ -446,7 +446,7 @@ void daNpcKasi_Mng_c::schMemberActor() { if (mMichActorMngr.getPId() == fpcM_ERROR_PROCESS_ID_e) { fopAc_ac_c* mich_p = NULL; - if (fopAcM_SearchByName(PROC_NPC_KASIMICH, (fopAc_ac_c**)&mich_p) != 0) { + if (fopAcM_SearchByName(fpcNm_NPC_KASIMICH_e, (fopAc_ac_c**)&mich_p) != 0) { setMichActor(mich_p); } } @@ -456,7 +456,7 @@ void daNpcKasi_Mng_c::schDanchoActor() { if (mDanchoActorMngr.getPId() == fpcM_ERROR_PROCESS_ID_e) { fopAc_ac_c* dancho_p = NULL; - if (fopAcM_SearchByName(PROC_NPC_CHIN, (fopAc_ac_c**)&dancho_p) != 0) { + if (fopAcM_SearchByName(fpcNm_NPC_CHIN_e, (fopAc_ac_c**)&dancho_p) != 0) { setDanchoActor(dancho_p); } } @@ -519,7 +519,7 @@ void daNpcKasi_Mng_c::chgWeightLight() { } static daNpc_GetParam2 l_bckGetParamList[15] = { - {BCK_MICH_IYAN_WAIT, J3DFrameCtrl::EMode_LOOP, GIRLS}, + {BCK_MICH_IYAN_WAIT, J3DFrameCtrl::EMode_LOOP, GIRLS}, {BCK_MICH_KYA_TALK, J3DFrameCtrl::EMode_LOOP, GIRLS}, {BCK_MICH_OUEN_WAIT_A, J3DFrameCtrl::EMode_LOOP, GIRLS}, {BCK_MICH_OUEN_WAIT_B, J3DFrameCtrl::EMode_LOOP, GIRLS}, @@ -626,7 +626,7 @@ daNpcKasiHana_c::~daNpcKasiHana_c() { for (int i = 0; i < 3; i++) { dComIfG_resDelete(&mPhases[i], l_arcNames[i]); } - + if (heap != NULL) { mAnm_p->stopZelAnime(); } @@ -938,7 +938,7 @@ void daNpcKasiHana_c::reset() { mPath.setPathInfo(getRailNo(), fopAcM_GetRoomNo(this), 0); mPath.setIdx(6); } else if (mType == TYPE_CHEER) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } field_0x1441 = 0; @@ -1140,8 +1140,8 @@ void daNpcKasiHana_c::lookat() { } else { mLookat.setAttnPos(NULL); } - - mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, + + mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, head_angleX_min, head_angleX_max, head_angleY_min, head_angleY_max, mCurAngle.y, lookatPos); mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE); } @@ -1382,7 +1382,7 @@ cXyz daNpcKasiHana_c::getChacePos() { cXyz sp3c; mPath.getDstPos(current.pos, sp3c); - + return sp3c; } @@ -1449,7 +1449,7 @@ int daNpcKasiHana_c::fear(int param_1) { case 4: { cXyz sp28; mAnm_p->setPlaySpeed(1.5f); - + if (mPath.getDstPos(current.pos, sp28)) { mEscape = true; mMode = 5; @@ -1486,8 +1486,8 @@ void* daNpcKasiHana_c::_srch_escape_tag(void* i_actor, void* i_data) { if (!fopAcM_IsActor(i_actor)) { return NULL; } - - if (fopAcM_GetName(i_actor) != PROC_Tag_Escape) { + + if (fopAcM_GetName(i_actor) != fpcNm_Tag_Escape_e) { return NULL; } @@ -1498,7 +1498,7 @@ void* daNpcKasiHana_c::_srch_escape_tag(void* i_actor, void* i_data) { mTargetTag = (daTagEscape_c*)i_actor; return NULL; } - + if (iVar1 > 0x4000) { f32 fVar1 = fopAcM_searchActorDistanceXZ2((fopAc_ac_c*)i_data, (fopAc_ac_c*)i_actor); if (fVar1 < mTargetTagDist) { @@ -1784,13 +1784,13 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Appear(int i_index) { } else { return TRUE; } - + if (eventManager.getIsAddvance(i_index)) { _Evt_Kasi_Appear_CutInit(i_cutIndex); } return _Evt_Kasi_Appear_CutMain(i_cutIndex); - + } BOOL daNpcKasiHana_c::_Evt_Kasi_Appear_CutInit(int const& i_cutIndex) { @@ -1800,7 +1800,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Appear_CutInit(int const& i_cutIndex) { setMotion(MOT_W_WAIT_A, -1.0f, 0); field_0x1430 = 20; break; - + case 20: mKasiMng.onSygnal(0x400); setMotion(MOT_MICH_KYA_TALK, -1.0f, 0); @@ -1829,13 +1829,13 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Appear_CutMain(int const& i_cutIndex) { rv = TRUE; } break; - + case 20: if (talkProc(NULL, TRUE, NULL)) { rv = TRUE; } break; - + case 21: if (mMotion == MOT_MICH_KYA_TALK && (mAnm_p->getFrame() == 19.0f || mAnm_p->getFrame() == 1.0f)) { setMotion(MOT_W_WAIT_A, -1.0f, 0); @@ -1874,7 +1874,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk(int i_index) { /* dSv_event_flag_c::F_289 - Castle Town - Heard conversation about entering Star Game 1 */ if (daNpcF_chkEvtBit(289)) { - mesNo = dComIfGp_evmng_getMyIntegerP(i_index, "mesNo2"); + mesNo = dComIfGp_evmng_getMyIntegerP(i_index, "mesNo2"); } else { mesNo = dComIfGp_evmng_getMyIntegerP(i_index, "mesNo1"); } @@ -1895,7 +1895,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutInit(int const& i_cutIndex) { setMotion(MOT_MICH_KYA_TALK, -1.0f, 0); initTalk(mMessageNo, actors); break; - + case 20: mKasiMng.onSygnal(0x20000); break; @@ -1903,7 +1903,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutInit(int const& i_cutIndex) { case 30: mKasiMng.onSygnal(0x40000); break; - + case 31: mKasiMng.onSygnal(0x1000); break; @@ -1925,7 +1925,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutMain(int const& i_cutIndex, int param_2) rv = TRUE; } break; - + case 20: if (mMotion == MOT_MICH_KYA_TALK && (mAnm_p->getFrame() == 19.0f || mAnm_p->getFrame() == 1.0f)) { setMotion(MOT_W_WAIT_A, -1.0f, 0); @@ -1943,7 +1943,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutMain(int const& i_cutIndex, int param_2) rv = TRUE; } break; - + case 31: rv = TRUE; break; @@ -1985,7 +1985,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_CutInit(int const& i_cutIndex) { mKasiMng.onSygnal(0x400); initTalk(mMessageNo, NULL); break; - + case 21: mKasiMng.onSygnal(0x1000); field_0x1430 = 24; @@ -2036,7 +2036,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_CutMain(int const& i_cutIndex) { case 30: { cXyz sp38(mKasiMng.getCenterPos()); - + if (_turn_pos(sp38, 0xA00)) { rv = TRUE; } @@ -2064,7 +2064,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer(int i_index) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); int i_cutIndex = -1; - + int* cutId = dComIfGp_evmng_getMyIntegerP(i_index, "cutId"); if (cutId != NULL) { i_cutIndex = *cutId; @@ -2136,7 +2136,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer_CutMain(int const& i_cutIndex, int param_2 rv = TRUE; } break; - + case 20: if (field_0x1430 > 0) { field_0x1430--; @@ -2210,7 +2210,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer2_CutInit(int const& i_cutIndex) { field_0x1430 = 86; initTalk(mMessageNo, actors); break; - + case 20: mKasiMng.onSygnal(0x2000); break; @@ -2243,7 +2243,7 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer2_CutMain(int const& i_cutIndex, int param_ rv = TRUE; } break; - + case 20: if (field_0x1430 > 0) { field_0x1430--; @@ -2310,18 +2310,18 @@ static actor_method_class daNpcKasiHana_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KASIHANA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KASIHANA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcKasiHana_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 420, // mPriority - &daNpcKasiHana_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KASIHANA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcKasiHana_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KASIHANA_e, + /* Actor SubMtd */ &daNpcKasiHana_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index 8f3f9464cf6..55a828122bc 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kasi_kyu.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -12,7 +12,7 @@ enum kasi_kyu_RES_File_ID { /* BMDR */ /* 0x4 */ BMDR_KYU = 0x4, - + /* BTP */ /* 0x7 */ BTP_KYU = 0x7, }; @@ -483,7 +483,7 @@ void daNpcKasiKyu_c::reset() { mPath.setPathInfo(getRailNo(), fopAcM_GetRoomNo(this), 0); mPath.setIdx(6); } else if (mType == 1) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } field_0x1430 = 0; @@ -689,8 +689,8 @@ void daNpcKasiKyu_c::lookat() { } else { mLookat.setAttnPos(NULL); } - - mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, + + mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, head_angleX_min, head_angleX_max, head_angleY_min, head_angleY_max, mCurAngle.y, lookatPos); mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE); } @@ -863,7 +863,7 @@ int daNpcKasiKyu_c::fear(int param_1) { case 4: { cXyz sp28; mAnm_p->setPlaySpeed(1.5f); - + if (mPath.getDstPos(current.pos, sp28)) { mEscape = true; mMode = -1; @@ -888,8 +888,8 @@ void* daNpcKasiKyu_c::_srch_escape_tag(void* i_actor, void* i_data) { if (!fopAcM_IsActor(i_actor)) { return NULL; } - - if (fopAcM_GetName(i_actor) != PROC_Tag_Escape) { + + if (fopAcM_GetName(i_actor) != fpcNm_Tag_Escape_e) { return NULL; } @@ -900,7 +900,7 @@ void* daNpcKasiKyu_c::_srch_escape_tag(void* i_actor, void* i_data) { mTargetTag = (daTagEscape_c*)i_actor; return NULL; } - + if (iVar1 > 0x4000) { f32 fVar1 = fopAcM_searchActorDistanceXZ2((fopAc_ac_c*)i_data, (fopAc_ac_c*)i_actor); if (fVar1 < mTargetTagDist) { @@ -1026,7 +1026,7 @@ cXyz daNpcKasiKyu_c::getChacePos() { cXyz chacePos; mPath.getDstPos(current.pos, chacePos); - + return chacePos; } @@ -1170,7 +1170,7 @@ int daNpcKasiKyu_c::kya_stop(int param_1) { switch (mMode) { case -1: break; - + case 0: if (mMotion != MOT_MICH_KYA_TALK) { setAction(&daNpcKasiKyu_c::wait); @@ -1235,14 +1235,14 @@ int daNpcKasiKyu_c::turn_hana(int param_1) { switch (mMode) { case -1: break; - + case 0: setMotion(MOT_W_WAIT_A, -1.0f, 0); speedF = 0.0f; setLookMode(LOOK_NONE); mMode = 1; break; - + case 1: { cXyz pos(-3200.0f, 0.0f, 1500.0f); if (_turn_pos(pos, 0x800)) { @@ -1425,18 +1425,18 @@ static actor_method_class daNpcKasiKyu_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KASIKYU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KASIKYU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcKasiKyu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 421, // mPriority - &daNpcKasiKyu_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KASIKYU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcKasiKyu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KASIKYU_e, + /* Actor SubMtd */ &daNpcKasiKyu_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index 791cecafb03..91c65701cc8 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kasi_mich.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -483,7 +483,7 @@ void daNpcKasiMich_c::reset() { mPath.setPathInfo(getRailNo(), fopAcM_GetRoomNo(this), 0); mPath.setIdx(6); } else if (mType == 1) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } field_0x1430 = 0; @@ -689,8 +689,8 @@ void daNpcKasiMich_c::lookat() { } else { mLookat.setAttnPos(NULL); } - - mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, + + mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, head_angleX_min, head_angleX_max, head_angleY_min, head_angleY_max, mCurAngle.y, lookatPos); mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE); } @@ -862,7 +862,7 @@ int daNpcKasiMich_c::fear(int param_1) { case 4: { cXyz sp28; mAnm_p->setPlaySpeed(1.5f); - + if (mPath.getDstPos(current.pos, sp28)) { mEscape = true; mMode = -1; @@ -887,8 +887,8 @@ void* daNpcKasiMich_c::_srch_escape_tag(void* i_actor, void* i_data) { if (!fopAcM_IsActor(i_actor)) { return NULL; } - - if (fopAcM_GetName(i_actor) != PROC_Tag_Escape) { + + if (fopAcM_GetName(i_actor) != fpcNm_Tag_Escape_e) { return NULL; } @@ -899,7 +899,7 @@ void* daNpcKasiMich_c::_srch_escape_tag(void* i_actor, void* i_data) { mTargetTag = (daTagEscape_c*)i_actor; return NULL; } - + if (iVar1 > 0x4000) { f32 fVar1 = fopAcM_searchActorDistanceXZ2((fopAc_ac_c*)i_data, (fopAc_ac_c*)i_actor); if (fVar1 < mTargetTagDist) { @@ -1021,7 +1021,7 @@ cXyz daNpcKasiMich_c::getChacePos() { cXyz chacePos; mPath.getDstPos(current.pos, chacePos); - + return chacePos; } @@ -1165,7 +1165,7 @@ int daNpcKasiMich_c::kya_stop(int param_1) { switch (mMode) { case -1: break; - + case 0: if (mMotion != MOT_MICH_KYA_TALK) { setAction(&daNpcKasiMich_c::wait); @@ -1350,7 +1350,7 @@ int daNpcKasiMich_c::cheer(int param_1) { BOOL daNpcKasiMich_c::_turn_to_link(s16 param_1) { cXyz pos(*fopAcM_GetPosition_p(daPy_getPlayerActorClass())); return _turn_pos(pos, param_1); - + } BOOL daNpcKasiMich_c::_turn_pos(cXyz const& param_1, s16 param_2) { @@ -1412,18 +1412,18 @@ static actor_method_class daNpcKasiMich_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KASIMICH = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KASIMICH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcKasiMich_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 422, // mPriority - &daNpcKasiMich_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KASIMICH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcKasiMich_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KASIMICH_e, + /* Actor SubMtd */ &daNpcKasiMich_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kdk.cpp b/src/d/actor/d_a_npc_kdk.cpp index 1522311e8bc..0cbae54ae3a 100644 --- a/src/d/actor/d_a_npc_kdk.cpp +++ b/src/d/actor/d_a_npc_kdk.cpp @@ -8,18 +8,18 @@ #include "d/actor/d_a_npc_kdk.h" actor_process_profile_definition g_profile_NPC_KDK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KDK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcKdk_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 320, // mPriority - NULL, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KDK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcKdk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KDK_e, + /* Actor SubMtd */ NULL, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index 1a086a2c6fb..a0657d37b87 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kkri.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -300,7 +300,7 @@ daNpc_Kkri_c::~daNpc_Kkri_c() { if (mpMorf[0] != NULL) { mpMorf[0]->stopZelAnime(); } - + #if DEBUG if (mpHIO != NULL) { mpHIO->removeHIO(); @@ -468,7 +468,7 @@ int daNpc_Kkri_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { void* daNpc_Kkri_c::srchYm(void* i_actor, void* i_data) { if (mFindCount < 50) { daE_YM_c* ym_p = (daE_YM_c*)i_actor; - if (ym_p != NULL && ym_p != i_data && fopAcM_IsExecuting(fopAcM_GetID(ym_p)) && fopAcM_GetName(ym_p) == PROC_E_YM && !ym_p->isHide()) { + if (ym_p != NULL && ym_p != i_data && fopAcM_IsExecuting(fopAcM_GetID(ym_p)) && fopAcM_GetName(ym_p) == fpcNm_E_YM_e && !ym_p->isHide()) { mFindActorPtrs[mFindCount] = ym_p; mFindCount++; } @@ -626,7 +626,7 @@ void daNpc_Kkri_c::srchActors() { switch (mType) { case 0: if (mActorMng[0].getActorP() == NULL) { - mActorMng[0].entry(getNearestActorP(PROC_Tag_KtOnFire)); + mActorMng[0].entry(getNearestActorP(fpcNm_Tag_KtOnFire_e)); } /* fallthrough */ case 1: @@ -677,10 +677,10 @@ void daNpc_Kkri_c::action() { } void daNpc_Kkri_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -1107,7 +1107,7 @@ int daNpc_Kkri_c::fearWait(void*) { } else { mFindCount = 0; fopAcM_Search(srchYm, this); - + int alive_ym_cnt = 0; for (int i = 0; i < mFindCount; i++) { if (mFindActorPtrs[i]->health > 0) { @@ -1246,18 +1246,18 @@ static actor_method_class daNpc_Kkri_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KKRI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KKRI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Kkri_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 346, // mPriority - &daNpc_Kkri_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KKRI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Kkri_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KKRI_e, + /* Actor SubMtd */ &daNpc_Kkri_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index 1197e744cee..c8b374a3b12 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -564,7 +564,7 @@ int daNpc_Kn_c::create() { J3DModelData* model_data = mpModelMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpModelMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); dKy_tevstr_init(&mTevStr, fopAcM_GetRoomNo(this), 0xFF); @@ -869,7 +869,7 @@ void daNpc_Kn_c::reset() { if (mType <= 6 && (mDivideNo == 0 || mDivideNo > 2)) { field_0xe2c = 1; parentActorID = - fopAcM_createChild(PROC_NPC_GWOLF, fopAcM_GetID(this), 0xFFFFFF02, ¤t.pos, + fopAcM_createChild(fpcNm_NPC_GWOLF_e, fopAcM_GetID(this), 0xFFFFFF02, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, 0, -1, 0); } @@ -2361,7 +2361,7 @@ int daNpc_Kn_c::teach05_surpriseAttackWait(void* param_0) { } static void* s_sub6(void* i_actor, void* i_other) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KN_e && i_actor != i_other) { ((daNpc_Kn_c*)i_actor)->setActionMode(18); } @@ -2369,7 +2369,7 @@ static void* s_sub6(void* i_actor, void* i_other) { } static void* s_subEnd6(void* i_actor, void* i_other) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KN_e && i_actor != i_other && ((daNpc_Kn_c*)i_actor)->getActionMode() != 17) { ((daNpc_Kn_c*)i_actor)->setActionMode(17); @@ -2617,7 +2617,7 @@ int daNpc_Kn_c::teach06_superJumpWaitDivide(void* param_0) { if (mCylCc.ChkTgHit()) { if (cut_type == daPy_py_c::CUT_TYPE_LARGE_JUMP || cut_type == daPy_py_c::CUT_TYPE_LARGE_JUMP_FINISH) { mActionMode = 16; - + daNpc_Kn_c* parent_p = (daNpc_Kn_c*)fpcM_SearchByID(parentActorID); if (parent_p != NULL) { parent_p->setTalkFlag(2); @@ -2771,7 +2771,7 @@ int daNpc_Kn_c::teach06_warpDelete(void* param_0) { } static void* s_sub7(void* i_actor, void* i_other) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KN_e && i_actor != i_other) { ((daNpc_Kn_c*)i_actor)->setActionMode(24); } @@ -2779,7 +2779,7 @@ static void* s_sub7(void* i_actor, void* i_other) { } static void* s_subEnd7(void* i_actor, void* i_other) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KN_e && i_actor != i_other && ((daNpc_Kn_c*)i_actor)->getActionMode() != 23) { ((daNpc_Kn_c*)i_actor)->setActionMode(23); @@ -2996,7 +2996,7 @@ int daNpc_Kn_c::teach07_superTurnAttackWaitDivide(void* param_0) { if (mCylCc.ChkTgHit()) { if (cut_type == daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT || cut_type == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT) { mActionMode = 22; - + daNpc_Kn_c* parent_p = (daNpc_Kn_c*)fpcM_SearchByID(parentActorID); if (parent_p != NULL) { parent_p->setTalkFlag(2); @@ -3137,7 +3137,7 @@ int daNpc_Kn_c::ECut_secondEncount(int i_idx) { break; case 2: { gwolf_p = (daNpc_GWolf_c*)fpcM_SearchByID(parentActorID); - if (fopAcM_GetName(gwolf_p) == PROC_NPC_GWOLF) { + if (fopAcM_GetName(gwolf_p) == fpcNm_NPC_GWOLF_e) { gwolf_p->setMotion(4, -1.0f, FALSE); } break; @@ -3473,11 +3473,11 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) { if (event_manager->getIsAddvance(i_idx)) { switch (prm) { - case 0: + case 0: daNpcT_offTmpBit(0xB); daNpcT_offTmpBit(0xC); break; - case 4: + case 4: mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0); if (mMotionSeqMngr.getNo() == 0x13) { mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0); @@ -3485,7 +3485,7 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) { mMotionSeqMngr.setNo(0x10, -1.0f, 0, 0); } break; - case 6: + case 6: mJntAnm.lookNone(0); break; case 10: { @@ -3522,7 +3522,7 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) { } } switch (prm) { - case 0: + case 0: if (speed.y <= 0.0f && mAcch.ChkGroundHit()) { speedF = 0.0f; speed.zero(); @@ -3538,7 +3538,7 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) { rt = 1; } break; - case 2: + case 2: if (mMotionSeqMngr.getNo() == 0x13 || mMotionSeqMngr.getNo() == 0xF) { if (mMotionSeqMngr.getStepNo() > 0) { rt = 1; @@ -3547,12 +3547,12 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) { } } break; - case 4: + case 4: if ((mMotionSeqMngr.getNo() == 0x16 || mMotionSeqMngr.getNo() == 0x10) && mMotionSeqMngr.getStepNo() > 0) { rt = 1; } break; - case 6: + case 6: if (mCurAngle.y != fopAcM_searchPlayerAngleY(this)) { if (step(fopAcM_searchPlayerAngleY(this), 1, 0x20, 20, 0)) { rt = 1; @@ -3609,10 +3609,10 @@ int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) { if (event_manager->getIsAddvance(i_idx)) { switch (prm) { - case 0: + case 0: mActionMode = 9; break; - case 4: + case 4: mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0); if (mMotionSeqMngr.getNo() == 0x13) { mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0); @@ -3620,10 +3620,10 @@ int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) { mMotionSeqMngr.setNo(16, -1.0f, 0, 0); } break; - case 6: + case 6: mJntAnm.lookPlayer(0); break; - case 10: + case 10: mStepMode = 2; initTalk(0x2EF, NULL); break; @@ -3633,7 +3633,7 @@ int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) { case 65: { setPos(home.pos); setAngle(home.angle.y); - + cXyz sp64(-10.0f, 0.0f, 375.0f); mDoMtx_stack_c::transS(home.pos); mDoMtx_stack_c::YrotM(home.angle.y); @@ -3786,7 +3786,7 @@ int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) { rt = 1; } break; - default: + default: rt = 1; break; } @@ -3948,7 +3948,7 @@ int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) { switch (prm) { case 0: break; - case 4: + case 4: mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0); if (mMotionSeqMngr.getNo() == 0x13) { mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0); @@ -3956,10 +3956,10 @@ int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) { mMotionSeqMngr.setNo(16, -1.0f, 0, 0); } break; - case 6: + case 6: mJntAnm.lookPlayer(0); break; - case 10: + case 10: mStepMode = 2; initTalk(0x2E7, NULL); break; @@ -3978,7 +3978,7 @@ int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) { setPos(home.pos); setAngle(home.angle.y); - + cXyz sp64(0.0f, 0.0f, 375.0f); mDoMtx_stack_c::transS(home.pos); mDoMtx_stack_c::YrotM(home.angle.y); @@ -4120,7 +4120,7 @@ int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) { mActionMode = 12; } break; - default: + default: rt = 1; break; } @@ -4282,7 +4282,7 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) { switch (prm) { case 0: break; - case 4: + case 4: mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0); if (mMotionSeqMngr.getNo() == 0x13) { mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0); @@ -4290,10 +4290,10 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) { mMotionSeqMngr.setNo(16, -1.0f, 0, 0); } break; - case 6: + case 6: mJntAnm.lookPlayer(0); break; - case 10: + case 10: mStepMode = 2; initTalk(0x2F8, NULL); break; @@ -4303,7 +4303,7 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) { case 65: { setPos(home.pos); setAngle(home.angle.y); - + cXyz sp64(0.0f, 0.0f, 375.0f); mDoMtx_stack_c::transS(home.pos); mDoMtx_stack_c::YrotM(home.angle.y); @@ -4444,7 +4444,7 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) { if (mMotionSeqMngr.getNo() == 0x18 && mMotionSeqMngr.getStepNo() > 0) { rt = 1; for (int i = 0; i < 2; i++) { - fopAcM_createChild(PROC_NPC_KN, fopAcM_GetID(this), ((i + 1) << 8) + 6, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_NPC_KN_e, fopAcM_GetID(this), ((i + 1) << 8) + 6, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); } } break; @@ -4454,7 +4454,7 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) { mActionMode = 13; } break; - default: + default: rt = 1; break; } @@ -4620,7 +4620,7 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) { switch (prm) { case 0: break; - case 4: + case 4: mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0); if (mMotionSeqMngr.getNo() == 0x13) { mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0); @@ -4628,10 +4628,10 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) { mMotionSeqMngr.setNo(16, -1.0f, 0, 0); } break; - case 6: + case 6: mJntAnm.lookPlayer(0); break; - case 10: + case 10: mStepMode = 2; initTalk(0x300, NULL); break; @@ -4640,7 +4640,7 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) { setPos(home.pos); setAngle(home.angle.y); - + cXyz sp64(0.0f, 0.0f, 375.0f); mDoMtx_stack_c::transS(home.pos); mDoMtx_stack_c::YrotM(home.angle.y); @@ -4776,7 +4776,7 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) { if (mMotionSeqMngr.getNo() == 0x18 && mMotionSeqMngr.getStepNo() > 0) { rt = 1; for (int i = 0; i < 2; i++) { - fopAcM_createChild(PROC_NPC_KN, fopAcM_GetID(this), ((i + 1) << 8) + 7, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_NPC_KN_e, fopAcM_GetID(this), ((i + 1) << 8) + 7, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); } } break; @@ -4786,7 +4786,7 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) { mActionMode = 19; } break; - default: + default: rt = 1; break; } @@ -5018,7 +5018,7 @@ void daNpc_Kn_c::calcMagicBallPos() { fopAc_ac_c* actor; if (mType == 1 && fopAcM_SearchByID(parentActorID, &actor) && actor && - fopAcM_GetName(actor) == PROC_KN_BULLET && ((daObjKnBullet_c*)actor)->getActionMode() == 0) + fopAcM_GetName(actor) == fpcNm_KN_BULLET_e && ((daObjKnBullet_c*)actor)->getActionMode() == 0) { cXyz pos(150.0f, 0.0f, 0.0f); mDoMtx_stack_c::copy(mpModelMorf[0]->getModel()->getAnmMtx(13)); @@ -5265,20 +5265,20 @@ static actor_method_class daNpc_Kn_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Kn_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 347, // mPriority - &daNpc_Kn_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Kn_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KN_e, + /* Actor SubMtd */ &daNpc_Kn_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_kn_base.inc b/src/d/actor/d_a_npc_kn_base.inc index 547a8877e3a..79e8349c3be 100644 --- a/src/d/actor/d_a_npc_kn_base.inc +++ b/src/d/actor/d_a_npc_kn_base.inc @@ -8,7 +8,7 @@ void daNpc_Kn_c::tgHitCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf, daNpc_Kn_c* kn_actor = (daNpc_Kn_c*)i_tgActor; u8 cut_type = 0; if (i_atActor != NULL) { - if (fopAcM_GetProfName(i_atActor) == PROC_ALINK) { + if (fopAcM_GetProfName(i_atActor) == fpcNm_ALINK_e) { cut_type = ((daPy_py_c*)i_atActor)->getCutType(); } else { cut_type = 1; @@ -1005,7 +1005,7 @@ BOOL daNpc_Kn_c::srchPlayerActor() { cXyz daNpc_Kn_c::getAttnPos(fopAc_ac_c* i_actor) { cXyz attn_pos(i_actor->attention_info.position); - if (fopAcM_GetName(i_actor) == PROC_ALINK) { + if (fopAcM_GetName(i_actor) == fpcNm_ALINK_e) { attn_pos.y -= static_cast(i_actor)->getAttentionOffsetY(); } diff --git a/src/d/actor/d_a_npc_kn_teach02.inc b/src/d/actor/d_a_npc_kn_teach02.inc index e5cd876767d..2a51383cc73 100644 --- a/src/d/actor/d_a_npc_kn_teach02.inc +++ b/src/d/actor/d_a_npc_kn_teach02.inc @@ -249,7 +249,7 @@ int daNpc_Kn_c::teach02_shieldReflectWait(void* param_0) { cXyz sp20(150.0f, 0.0f, 0.0f); mDoMtx_stack_c::copy(mpModelMorf[0]->getModel()->getAnmMtx(0xD)); mDoMtx_stack_c::multVec(&sp20, &sp20); - parentActorID = fopAcM_createChild(PROC_KN_BULLET, fopAcM_GetID(this), 0, &sp20, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_KN_BULLET_e, fopAcM_GetID(this), 0, &sp20, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); } } else { mMotionSeqMngr.setNo(0x19, -1.0f, 1, 0); @@ -257,7 +257,7 @@ int daNpc_Kn_c::teach02_shieldReflectWait(void* param_0) { } } else { fopAc_ac_c* parent_p; - if (fopAcM_SearchByID(parentActorID, &parent_p) && parent_p != NULL && fopAcM_GetName(parent_p) == PROC_KN_BULLET && ((daObjKnBullet_c*)parent_p)->getActionMode() == 0) { + if (fopAcM_SearchByID(parentActorID, &parent_p) && parent_p != NULL && fopAcM_GetName(parent_p) == fpcNm_KN_BULLET_e && ((daObjKnBullet_c*)parent_p)->getActionMode() == 0) { if (mpModelMorf[0]->getFrame() >= 34.0f && mpModelMorf[0]->getFrame() < 35.0f) { ((daObjKnBullet_c*)parent_p)->setActionMode(1); parent_p->current.angle.y = mCurAngle.y; @@ -270,7 +270,7 @@ int daNpc_Kn_c::teach02_shieldReflectWait(void* param_0) { fopAc_ac_c* aTgHitActor_p = mCylCc.GetTgHitAc(); JUT_ASSERT(437, NULL != aTgHitActor_p); - if (fopAcM_GetName(aTgHitActor_p) == PROC_KN_BULLET) { + if (fopAcM_GetName(aTgHitActor_p) == fpcNm_KN_BULLET_e) { mEvtNo = 0xB; s16 var_r27 = cLib_targetAngleY(&aTgHitActor_p->current.pos, ¤t.pos); diff --git a/src/d/actor/d_a_npc_knj.cpp b/src/d/actor/d_a_npc_knj.cpp index 31bdb993a9b..714f3f26637 100644 --- a/src/d/actor/d_a_npc_knj.cpp +++ b/src/d/actor/d_a_npc_knj.cpp @@ -534,18 +534,18 @@ static actor_method_class daNpc_Knj_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KNJ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KNJ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Knj_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 349, // mPriority - &daNpc_Knj_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KNJ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Knj_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KNJ_e, + /* Actor SubMtd */ &daNpc_Knj_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index a68846b7eb2..a7c1fe41a6e 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kolin.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -49,7 +49,7 @@ enum Kolin_TW_RES_File_ID { }; enum Kolin1_RES_File_ID { - /* BCK */ + /* BCK */ /* 0x06 */ BCK_KOLIN_CLUP = 0x6, /* 0x07 */ BCK_KOLIN_F_CLUP, /* 0x08 */ BCK_KOLIN_F_HAPPY_TALK, @@ -80,7 +80,7 @@ enum Kolin1_RES_File_ID { /* 0x21 */ BTK_KOLIN_NOZOKU, /* 0x22 */ BTK_KOLIN_STONE, /* 0x23 */ BTK_KOLIN_WALK_A, - + /* BTP */ /* 0x26 */ BTP_KOLIN_F_CLUP = 0x26, /* 0x27 */ BTP_KOLIN_F_KIZUKU, @@ -431,7 +431,7 @@ cPhs_Step daNpc_Kolin_c::create() { if (phase == cPhs_COMPLEATE_e) { OS_REPORT("\t(%s:%d) flowNo:%d, PathID:%02x, BitSW:%02x<%08x> ", fopAcM_getProcNameString(this), mType, mFlowNodeNo, (getPathID() >> 32) & 0xFF, getBitSW() & 0xFF, fopAcM_GetParam(this)); - + if (isDelete()) { OS_REPORT("===>isDelete:TRUE\n"); return cPhs_ERROR_e; @@ -725,7 +725,7 @@ void daNpc_Kolin_c::reset() { case 10: field_0x1017 = 1; break; - + case 9: case 11: default: @@ -740,7 +740,7 @@ void daNpc_Kolin_c::reset() { /* dSv_event_flag_c::F_0016 - Ordon Village - On 3rd day, start following Colin who is blocking path */ !daNpcT_chkEvtBit(20))) { /* dSv_event_tmp_flag_c::T_0021 - Ordon Village - Colin follows to Link's house */ - daNpcT_offTmpBit(22); + daNpcT_offTmpBit(22); } field_0x1010 = cM_rnd(); @@ -795,7 +795,7 @@ void daNpc_Kolin_c::setParam() { attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e; if (mType == 4) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } scale.set(mpHIO->m.common.scale, mpHIO->m.common.scale, mpHIO->m.common.scale); @@ -832,7 +832,7 @@ BOOL daNpc_Kolin_c::checkChangeEvt() { switch (mType) { case 2: break; - + case 3: /* dSv_event_flag_c::F_0019 - Ordon Woods - Spoke with Ilia (Colin is there too) at the spring */ if (daNpcT_chkEvtBit(23)) { @@ -859,7 +859,7 @@ BOOL daNpc_Kolin_c::checkChangeEvt() { void daNpc_Kolin_c::setAfterTalkMotion() { int i_index = FACE_NONE; - + switch (mFaceMotionSeqMngr.getNo()) { case FACE_NORMAL_TALK: i_index = FACE_H_NORMAL_TALK; @@ -894,19 +894,19 @@ void daNpc_Kolin_c::srchActors() { } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_Obj_Hfuta)); + mActorMngr[2].entry(getNearestActorP(fpcNm_Obj_Hfuta_e)); } break; case 3: if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(getNearestActorP(PROC_NPC_YELIA)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_YELIA_e)); } break; case 4: if (mActorMngr[4].getActorP() == NULL) { - mActorMngr[4].entry(getNearestActorP(PROC_NPC_LEN)); + mActorMngr[4].entry(getNearestActorP(fpcNm_NPC_LEN_e)); } break; @@ -973,10 +973,10 @@ void daNpc_Kolin_c::action() { } void daNpc_Kolin_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -1000,7 +1000,7 @@ void daNpc_Kolin_c::setAttnPos() { mpHIO->m.common.head_angleY_min, mpHIO->m.common.head_angleY_max, mpHIO->m.common.neck_rotation_ratio, rad_val, NULL); mJntAnm.calcJntRad(0.2f, 1.0f, rad_val); - + setMtx(); mDoMtx_stack_c::copy(mpMorf[0]->getModel()->getAnmMtx(getHeadJointNo())); mDoMtx_stack_c::multVec(&sp3c, &eyePos); @@ -1131,7 +1131,7 @@ int daNpc_Kolin_c::selectAction() { mNextAction = &daNpc_Kolin_c::follow; } break; - + case 10: mNextAction = &daNpc_Kolin_c::clothWait; break; @@ -1386,7 +1386,7 @@ int daNpc_Kolin_c::cutHail(int i_cutIndex) { } iVar1[0] = msgNo; - + if (talkProc(iVar1, FALSE, NULL, FALSE)) { if (msgNo == 0) { if (mFlow.checkEndFlow()) { @@ -1727,7 +1727,7 @@ int daNpc_Kolin_c::cutCacaricoConversation(int i_cutIndex) { rv = 1; } break; - + case 1: mJntAnm.lookPlayer(0); rv = 1; @@ -1803,7 +1803,7 @@ int daNpc_Kolin_c::cutClothTry(int i_cutIndex) { rv = 1; } break; - + case 1: rv = 1; break; @@ -1893,7 +1893,7 @@ int daNpc_Kolin_c::wait(void* param_1) { if (!mStagger.checkStagger()) { if (mType == 4) { mJntAnm.lookNone(0); - + if (getBitSW() != 0xFF) { if (dComIfGs_isSwitch(getBitSW(), fopAcM_GetRoomNo(this)) && mMotionSeqMngr.getNo() != MOT_DEMO_FEAR) { mMode = 1; @@ -1925,7 +1925,7 @@ int daNpc_Kolin_c::wait(void* param_1) { if (!chkActorInSight(mPlayerActorMngr.getActorP(), mAttnFovY, mCurAngle.y)) { mJntAnm.lookNone(0); - + if (mType == 11) { field_0x1018 = 1; } @@ -1964,7 +1964,7 @@ int daNpc_Kolin_c::wait(void* param_1) { switch (mType) { case 3: actor_p = mActorMngr[3].getActorP(); - + if (actor_p != NULL) { mJntAnm.lookActor(actor_p, 0.0f, 0); } @@ -1979,7 +1979,7 @@ int daNpc_Kolin_c::wait(void* param_1) { case 11: daHorse_c* horse_actor = dComIfGp_getHorseActor(); - + if (horse_actor != NULL) { mJntAnm.lookActor(horse_actor, 60.0f, 0); } @@ -2252,18 +2252,18 @@ static actor_method_class daNpc_Kolin_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KOLIN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KOLIN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Kolin_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 350, // mPriority - &daNpc_Kolin_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KOLIN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Kolin_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KOLIN_e, + /* Actor SubMtd */ &daNpc_Kolin_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index 32d72973821..eb4ac333514 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_kolinb.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -322,11 +322,11 @@ cPhs_Step daNpc_Kolinb_c::create() { mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); mCcStts.Init(mpHIO->m.common.weight, 0, this); - + field_0xe44.Set(mCcDCyl); field_0xe44.SetStts(&mCcStts); field_0xe44.SetTgHitCallback(tgHitCallBack); - + mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); @@ -432,7 +432,7 @@ u8 daNpc_Kolinb_c::getType() { switch (fopAcM_GetParam(this) & 0xFF) { case 0: return 0; - + case 1: return 1; @@ -573,10 +573,10 @@ void daNpc_Kolinb_c::action() { } void daNpc_Kolinb_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -636,7 +636,7 @@ BOOL daNpc_Kolinb_c::chkAction(actionFunc action) { int daNpc_Kolinb_c::setAction(actionFunc action) { mMode = 3; - + if (mAction) { (this->*mAction)(NULL); } @@ -944,18 +944,18 @@ static actor_method_class daNpc_Kolinb_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KOLINB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KOLINB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Kolinb_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 351, // mPriority - &daNpc_Kolinb_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KOLINB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Kolinb_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KOLINB_e, + /* Actor SubMtd */ &daNpc_Kolinb_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 3630f58d8cd..8b0abd9fb78 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -289,7 +289,7 @@ static int daNpc_Ks_Draw(npc_ks_class* i_this) { static void* s_resq_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) { ((npc_ks_class*)i_actor)->anm_time = cM_rndF(50.0f) + 220.0f; } return NULL; @@ -528,7 +528,7 @@ static fopAc_ac_c* en_search_test(npc_ks_class* i_this) { static void* s_ori_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_SO) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_SO_e) { return i_actor; } return NULL; @@ -741,7 +741,7 @@ static int npc_ks_ori(npc_ks_class* i_this) { static void* shot_bo_sub(void* i_actor, void* i_data) { (void) i_data; fopAc_ac_c* player = dComIfGp_getPlayer(0); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_BOOMERANG_e && dComIfGp_checkPlayerStatus0(0, 0x80000) == 0 && fopAcM_GetParam(i_actor) == 1) { cXyz ato(((daBoomerang_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos); if (ato.abs() < 1000.0f) { @@ -1053,7 +1053,7 @@ static void npc_ks_home(npc_ks_class* i_this) { } static void* s_sw_sub(void* i_actor, void* i_data) { - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_SW)) { + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_SW_e)) { if (fopAcM_GetRoomNo((fopAc_ac_c*)i_data) == 0) { if (((npc_ks_class*)i_data)->set_id == ((obj_sw_class*)i_actor)->field_0x570) { return i_actor; @@ -1067,7 +1067,7 @@ static void* s_sw_sub(void* i_actor, void* i_data) { static void* s_ha_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Pillar_e) { return i_actor; } return NULL; @@ -1075,7 +1075,7 @@ static void* s_ha_sub(void* i_actor, void* i_data) { static void* s_01_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS && ((npc_ks_class*)i_actor)->action == 4) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e && ((npc_ks_class*)i_actor)->action == 4) { return i_actor; } return NULL; @@ -1097,7 +1097,7 @@ static int npc_ks_demo_02(npc_ks_class* i_this) { int rv = 1; int iVar1 = 0; - obj_so_class* cage_p = (obj_so_class*)fopAcM_SearchByName(PROC_OBJ_SO); + obj_so_class* cage_p = (obj_so_class*)fopAcM_SearchByName(fpcNm_OBJ_SO_e); if (cage_p == NULL) { return 0; } @@ -1388,7 +1388,7 @@ static int npc_ks_demo_02(npc_ks_class* i_this) { static void* s_dn_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_OC) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_OC_e) { return i_actor; } return NULL; @@ -1740,7 +1740,7 @@ static void npc_ks_to_hang(npc_ks_class* i_this) { } static void* s_next_do_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) { npc_ks_class* mon_data = (npc_ks_class*) i_data; npc_ks_class* monkey_actor = (npc_ks_class*) i_actor; if (monkey_actor->field_0x5b5 != 0 && mon_data->order == (monkey_actor->order - 1 & 0xFF)) { @@ -1753,7 +1753,7 @@ static void* s_next_do_sub(void* i_actor, void* i_data) { } static void* s_next_get_sub(void* actor, void* i_data) { - if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == PROC_NPC_KS) { + if (fopAcM_IsActor(actor) && fopAcM_GetName(actor) == fpcNm_NPC_KS_e) { npc_ks_class* mon_data = (npc_ks_class*) i_data; npc_ks_class* monkey_actor = (npc_ks_class*) actor; if (monkey_actor->field_0x5b5 != 0 && @@ -2518,7 +2518,7 @@ static void cam_3d_morf(npc_ks_class* i_this, f32 param_2) { static void* s_fs_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_FS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_FS_e) { ((e_fs_class*)i_actor)->mAction = 10; ((e_fs_class*)i_actor)->mMode = 0; } @@ -2527,7 +2527,7 @@ static void* s_fs_sub(void* i_actor, void* i_data) { static void* s_fsdown_sub(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_FS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_FS_e) { ((e_fs_class*)i_actor)->mTimer[0] = (fopAcM_GetID(i_actor) & 0x3) << 3; ((e_fs_class*)i_actor)->mMode++; } @@ -5974,7 +5974,7 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) { } } - if ((i_this->mode == 40 || i_this->mode == 41) && fopAcM_SearchByName(PROC_E_FS) == NULL && i_this->demo_mode == 0) { + if ((i_this->mode == 40 || i_this->mode == 41) && fopAcM_SearchByName(fpcNm_E_FS_e) == NULL && i_this->demo_mode == 0) { i_this->mode = 42; i_this->timer[1] = 30; } @@ -6592,7 +6592,7 @@ static void action(npc_ks_class* i_this) { static void* s_kago_sub(void* i_actor, void* i_data) { UNUSED(i_data); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_KAGO) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_KAGO_e) { if (((daObj_Kago_c*)i_actor)->getType() == 0) { return i_actor; } @@ -7243,7 +7243,7 @@ static BOOL start_check(npc_ks_class* i_this) { break; case 20: - fopAcM_OnStatus(actor, 0x20000); + fopAcM_OnStatus(actor, fopAcStts_NOPAUSE_e); i_this->action = 300; i_this->field_0xc17 = 1; iVar2 = 1; @@ -7299,7 +7299,7 @@ static BOOL start_check(npc_ks_class* i_this) { } static void* s_check_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) { if (fopAcM_GetID(i_actor) != fopAcM_GetID(i_data) && ((npc_ks_class*)i_actor)->set_id == ((npc_ks_class*)i_data)->set_id) { return i_actor; } @@ -7458,18 +7458,18 @@ static actor_method_class l_daNpc_Ks_Method = { }; actor_process_profile_definition g_profile_NPC_KS = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_ks_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 701, // mPriority - &l_daNpc_Ks_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_ks_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KS_e, + /* Actor SubMtd */ &l_daNpc_Ks_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp index 8c103bde0c4..bac102531f3 100644 --- a/src/d/actor/d_a_npc_kyury.cpp +++ b/src/d/actor/d_a_npc_kyury.cpp @@ -503,9 +503,9 @@ void daNpc_Kyury_c::action() { } void daNpc_Kyury_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -891,18 +891,18 @@ static actor_method_class daNpc_Kyury_MethodTable = { }; actor_process_profile_definition g_profile_NPC_KYURY = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_KYURY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Kyury_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 352, // mPriority - &daNpc_Kyury_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_KYURY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Kyury_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_KYURY_e, + /* Actor SubMtd */ &daNpc_Kyury_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index b8cc97f1abb..803207d2578 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -550,18 +550,18 @@ void daNpc_Len_c::srchActors() { break; case TYPE_4: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_KOLINB)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_KOLINB_e)); } break; case TYPE_8: if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_YELIA)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_YELIA_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_GRD)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_GRD_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(getNearestActorP(PROC_NPC_GRZ)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_GRZ_e)); } break; } @@ -643,9 +643,9 @@ void daNpc_Len_c::action() { } void daNpc_Len_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -1213,7 +1213,7 @@ int daNpc_Len_c::talk(void* param_0) { * control) A */ daNpcT_offTmpBit(0xB); } - if (mPreItemNo == fpcNm_ITEM_WOOD_STATUE) { + if (mPreItemNo == dItemNo_WOOD_STATUE_e) { initTalk(0x28, NULL); } else { initTalk(mFlowNodeNo, NULL); @@ -1297,18 +1297,18 @@ static actor_method_class daNpc_Len_MethodTable = { }; actor_process_profile_definition g_profile_NPC_LEN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_LEN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Len_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 337, // mPriority - &daNpc_Len_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_LEN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Len_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_LEN_e, + /* Actor SubMtd */ &daNpc_Len_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp index 06b44c70bb3..68f93eda3d1 100644 --- a/src/d/actor/d_a_npc_lf.cpp +++ b/src/d/actor/d_a_npc_lf.cpp @@ -333,18 +333,18 @@ static actor_method_class l_daNPC_LF_Method = { }; actor_process_profile_definition g_profile_NPC_LF = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_LF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_lf_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 702, // mPriority - &l_daNPC_LF_Method, // sub_method - 0x00040000, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_LF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_lf_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_LF_e, + /* Actor SubMtd */ &l_daNPC_LF_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp index 265901426dc..c954e6c2e4a 100644 --- a/src/d/actor/d_a_npc_lud.cpp +++ b/src/d/actor/d_a_npc_lud.cpp @@ -611,15 +611,15 @@ void daNpc_Lud_c::srchActors() { switch (mType) { case TYPE_1: if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_LEN)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_LEN_e)); } break; case TYPE_5: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_BESU)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_BESU_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_KOLINB)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_KOLINB_e)); } break; } @@ -684,9 +684,9 @@ void daNpc_Lud_c::action() { } void daNpc_Lud_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -1513,18 +1513,18 @@ static actor_method_class daNpc_Lud_MethodTable = { }; actor_process_profile_definition g_profile_NPC_LUD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_LUD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Lud_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 338, // mPriority - &daNpc_Lud_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_LUD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Lud_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_LUD_e, + /* Actor SubMtd */ &daNpc_Lud_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index fbb6ebcad98..2384a380aae 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_maro.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -429,7 +429,7 @@ void* daNpc_Maro_c::srchArrow(void* arg0, void* arg1) { if (mFindCount < 50) { fopAc_ac_c* fop0 = (fopAc_ac_c*) arg0; if (fop0 != NULL && fop0 != fop1) { - if (fopAcM_IsExecuting(fopAcM_GetID(fop0)) && fopAcM_GetName(fop0) == PROC_ARROW) { + if (fopAcM_IsExecuting(fopAcM_GetID(fop0)) && fopAcM_GetName(fop0) == fpcNm_ARROW_e) { mFindActorPtrs[mFindCount] = fop0; mFindCount++; } @@ -459,7 +459,7 @@ void* daNpc_Maro_c::srchItaMato(void* arg0, void* arg1) { if (mFindCount < 50) { fopAc_ac_c* fop0 = (fopAc_ac_c*) arg0; if (fop0 != NULL && fop0 != fop1) { - if (fopAcM_IsExecuting(fopAcM_GetID(fop0)) && fopAcM_GetName(fop0) == PROC_OBJ_ITAMATO) { + if (fopAcM_IsExecuting(fopAcM_GetID(fop0)) && fopAcM_GetName(fop0) == fpcNm_OBJ_ITAMATO_e) { mFindActorPtrs[mFindCount] = fop0; mFindCount++; } @@ -826,37 +826,37 @@ void daNpc_Maro_c::srchActors() { switch (mType) { case TYPE_0: { if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_KAKASHI)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_KAKASHI_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_BESU)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_BESU_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(getNearestActorP(PROC_NPC_KOLIN)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_KOLIN_e)); } break; } case TYPE_1: { if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_KAKASHI)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_KAKASHI_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } break; } case TYPE_3: { if (mActorMngr[8].getActorP() == NULL) { - mActorMngr[8].entry(getNearestActorP(PROC_NPC_LEN)); + mActorMngr[8].entry(getNearestActorP(fpcNm_NPC_LEN_e)); } break; @@ -866,7 +866,7 @@ void daNpc_Maro_c::srchActors() { case TYPE_7: { if (&daNpc_Maro_c::arrowTutorial == field_0x110c) { if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[6].getActorP() == NULL) { @@ -883,7 +883,7 @@ void daNpc_Maro_c::srchActors() { case TYPE_10: { if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_BESU)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_BESU_e)); } break; @@ -891,34 +891,34 @@ void daNpc_Maro_c::srchActors() { case TYPE_12: { if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(getNearestActorP(PROC_NPC_KOLIN)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_KOLIN_e)); } if (mActorMngr[7].getActorP() == NULL) { - mActorMngr[7].entry(getNearestActorP(PROC_NPC_SARU)); + mActorMngr[7].entry(getNearestActorP(fpcNm_NPC_SARU_e)); } break; } case TYPE_13: { if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_KAKASHI)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_KAKASHI_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_TARO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_TARO_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_BESU)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_BESU_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(getNearestActorP(PROC_NPC_KOLIN)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_KOLIN_e)); } break; } @@ -1032,9 +1032,9 @@ void daNpc_Maro_c::action() { } void daNpc_Maro_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { attention_info.flags = 0; @@ -2632,7 +2632,7 @@ int daNpc_Maro_c::cutMarosWhisper(int arg0) { actor_p = mActorMngr[0].getActorP(); JUT_ASSERT(4088, NULL != actor_p); angle_y = fopAcM_searchActorAngleY(daPy_getPlayerActorClass(), actor_p); - daPy_getPlayerActorClass()->setPlayerPosAndAngle(&daPy_getPlayerActorClass()->current.pos, + daPy_getPlayerActorClass()->setPlayerPosAndAngle(&daPy_getPlayerActorClass()->current.pos, angle_y, 0); break; } @@ -3516,18 +3516,18 @@ static actor_method_class daNpc_Maro_MethodTable = { }; actor_process_profile_definition g_profile_NPC_MARO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_MARO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Maro_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 353, // mPriority - &daNpc_Maro_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MARO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Maro_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_MARO_e, + /* Actor SubMtd */ &daNpc_Maro_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp index 8593541b7c0..e30b8547663 100644 --- a/src/d/actor/d_a_npc_midp.cpp +++ b/src/d/actor/d_a_npc_midp.cpp @@ -167,7 +167,7 @@ int daNpc_midP_c::create() { J3DModelData* modelData = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -647,18 +647,18 @@ static actor_method_class daNpc_midP_MethodTable = { }; actor_process_profile_definition g_profile_NPC_MIDP = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_MIDP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_midP_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 354, // mPriority - &daNpc_midP_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MIDP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_midP_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_MIDP_e, + /* Actor SubMtd */ &daNpc_midP_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index d9775816f82..b05b45a3206 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -36,18 +36,18 @@ static actor_method_class daNpc_Mk_MethodTable = { }; actor_process_profile_definition g_profile_NPC_MK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_MK, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x00000001, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 427, // mPriority - &daNpc_Mk_MethodTable, // sub_method - 0x020C4407, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x00000001, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_MK_e, + /* Actor SubMtd */ &daNpc_Mk_MethodTable, + /* Status */ fopAcStts_UNK_0x2000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_FREEZE_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index 5bd49a1db5a..5fe0466f38a 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -622,7 +622,7 @@ void daNpc_Moi_c::setParam() { attention_info.distances[fopAc_attn_SPEAK_e] = daNpcT_getDistTableIdx(talk_distance, talk_angle); attention_info.flags = 0; - fopAcM_OffStatus(this, 0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } else { attention_info.distances[fopAc_attn_LOCK_e] = daNpcT_getDistTableIdx(attention_distance, attention_angle); @@ -781,7 +781,7 @@ void daNpc_Moi_c::action() { } } - if (mSph.ChkAtHit() && fopAcM_GetProfName(mSph.GetAtHitAc()) == PROC_ALINK) { + if (mSph.ChkAtHit() && fopAcM_GetProfName(mSph.GetAtHitAc()) == fpcNm_ALINK_e) { /* dSv_event_tmp_flag_c::T_0047 - Ordon Village - Right after wrestling with Bo (Used to connect with conversation after wearing clothes) */ @@ -790,9 +790,9 @@ void daNpc_Moi_c::action() { } void daNpc_Moi_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -1059,7 +1059,7 @@ int daNpc_Moi_c::setAction(int (daNpc_Moi_c::*param_0)(void*)) { } BOOL daNpc_Moi_c::chkPlayerGetWoodShield() { - return (u8)(dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD) ? 1 : 0); + return (u8)(dComIfGs_isItemFirstBit(dItemNo_WOOD_SHIELD_e) ? 1 : 0); } void daNpc_Moi_c::setSSlash(int param_1) { @@ -1146,7 +1146,7 @@ void daNpc_Moi_c::torch() { if (actor == NULL && field_0x166f == 0) { if (field_0x15c0 == 0xFFFFFFFF) { field_0x15c0 = - fopAcM_createChild(PROC_EP, fopAcM_GetID(this), -247, &field_0x1628, + fopAcM_createChild(fpcNm_EP_e, fopAcM_GetID(this), -247, &field_0x1628, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); } if (fopAcM_SearchByID(field_0x15c0, &actor) && actor != NULL) { @@ -1991,20 +1991,20 @@ static actor_method_class daNpc_Moi_MethodTable = { }; actor_process_profile_definition g_profile_NPC_MOI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_MOI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Moi_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 355, // mPriority - &daNpc_Moi_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MOI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Moi_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_MOI_e, + /* Actor SubMtd */ &daNpc_Moi_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index 963c646ea8f..7786371ccaa 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_moir.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -43,7 +43,7 @@ enum MoiR1_RES_File_ID { }; enum MoiR2_RES_File_ID { - /* BCK */ + /* BCK */ /* 0x04 */ BCK_MOIR_DRIVEAWAY = 0x4, /* 0x05 */ BCK_MOIR_F_DRIVEAWAY, /* 0x06 */ BCK_MOIR_F_FUE, @@ -311,7 +311,7 @@ cPhs_Step daNpcMoiR_c::Create() { return cPhs_ERROR_e; } - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mMode = MODE_2; } @@ -521,15 +521,15 @@ int daNpcMoiR_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { void daNpcMoiR_c::searchActors() { if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(fopAcM_SearchByName(PROC_NPC_ASH)); + mActorMngr[1].entry(fopAcM_SearchByName(fpcNm_NPC_ASH_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(fopAcM_SearchByName(PROC_NPC_SHAD)); + mActorMngr[2].entry(fopAcM_SearchByName(fpcNm_NPC_SHAD_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(fopAcM_SearchByName(PROC_NPC_RAFREL)); + mActorMngr[3].entry(fopAcM_SearchByName(fpcNm_NPC_RAFREL_e)); } } @@ -941,7 +941,7 @@ void daNpcMoiR_c::lookat() { switch (mLookMode) { case LOOK_NONE: break; - + case LOOK_RESET: bVar1 = TRUE; break; @@ -982,7 +982,7 @@ void daNpcMoiR_c::lookat() { mLookat.setAttnPos(0); } - mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, + mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, head_angleX_min, head_angleX_max, head_angleY_min, head_angleY_max, mCurAngle.y, spd0); mLookat.calc(this, model->getBaseTRMtx(), local_dc, bVar1, sVar1, FALSE); } @@ -1567,7 +1567,7 @@ bool daNpcMoiR_c::leave(void* param_1) { setMotion(MOT_RUN, -1.0f, 0); mTurnMode = 0; speedF = 0.0f; - fopAcM_SearchByName(PROC_NPC_TK, (fopAc_ac_c**)&actor_p); + fopAcM_SearchByName(fpcNm_NPC_TK_e, (fopAc_ac_c**)&actor_p); if (actor_p != NULL) { actor_p->setAway(); @@ -1721,7 +1721,7 @@ BOOL daNpcMoiR_c::EvCut_Appear2(int i_cutIndex) { setExpression(EXPR_NONE, -1.0f); setMotion(MOT_TAKAJO_NI, -1.0f, 0); mTurnMode = 0; - ni_class* actor_p = (ni_class*)fopAcM_SearchByName(PROC_NI); + ni_class* actor_p = (ni_class*)fopAcM_SearchByName(fpcNm_NI_e); if (actor_p != NULL) { actor_p->changeMode(); @@ -1791,7 +1791,7 @@ BOOL daNpcMoiR_c::EvCut_Appear2(int i_cutIndex) { case '0005': if (talkProc(NULL, TRUE, NULL)) { - ni_class* actor_p = (ni_class*)fopAcM_SearchByName(PROC_NI); + ni_class* actor_p = (ni_class*)fopAcM_SearchByName(fpcNm_NI_e); if (actor_p != NULL) { actor_p->changeMode(); @@ -1986,7 +1986,7 @@ void daNpcMoiR_c::setAttnPos() { sp58.y = current.pos.y; field_0xca0.SetC(sp58); field_0xca0.SetH(mpHIO->m.common.height); - + f32 fVar1; if (mMode == MODE_SIT) { fVar1 = 40.0f; @@ -2020,18 +2020,18 @@ static actor_method_class daNpcMoiR_MethodTable = { }; actor_process_profile_definition g_profile_NPC_MOIR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_MOIR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcMoiR_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 415, // mPriority - &daNpcMoiR_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_MOIR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcMoiR_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_MOIR_e, + /* Actor SubMtd */ &daNpcMoiR_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index 8c2aa84525f..2d55cbf8369 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -853,7 +853,7 @@ int daNpc_myna2_c::waitHovering(void* param_0) { } static void* s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MYNA2 && ((daNpc_myna2_c*)i_actor)->getType() == 1) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_MYNA2_e && ((daNpc_myna2_c*)i_actor)->getType() == 1) { return i_actor; } @@ -1362,20 +1362,20 @@ static actor_method_class daNpc_myna2_MethodTable = { }; actor_process_profile_definition g_profile_MYNA2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MYNA2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_myna2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 393, // mPriority - &daNpc_myna2_MethodTable, // sub_method - 0x08044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MYNA2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_myna2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_MYNA2_e, + /* Actor SubMtd */ &daNpc_myna2_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index a4242188411..7144e77fe84 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_counter.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_mg_rod.h" #include "d/actor/d_a_mg_fish.h" #include "SSystem/SComponent/c_math.h" @@ -133,7 +133,7 @@ static int daNpc_Ne_Draw(npc_ne_class* i_this) { if (daPy_py_c::linkGrabSubjectNoDraw(i_this)) { return 1; } - + J3DModel* model = i_this->mpMorf->getModel(); if (i_this->mResName == "Npc_net") { if (!dComIfGs_wolfeye_effect_check()) { @@ -219,7 +219,7 @@ static int way_bg_check(npc_ne_class* i_this, s16 i_angle) { return 1; } } - + mDoMtx_YrotS(*calc_mtx, _this->current.angle.y + i_angle); vec3.set(0.0f, 150.0f, 150.0f); MtxPosition(&vec3, &vec2); @@ -313,7 +313,7 @@ static int target_info_count; static void* s_bl_sub(void* i_proc, void* i_this) { if (fopAc_IsActor(i_proc) - && (fopAcM_GetName(i_proc) == PROC_OBJ_FOOD || fopAcM_GetName(i_proc) == PROC_BD) + && (fopAcM_GetName(i_proc) == fpcNm_OBJ_FOOD_e || fopAcM_GetName(i_proc) == fpcNm_BD_e) && target_info_count < 5) { target_info[target_info_count] = static_cast(i_proc); @@ -324,7 +324,7 @@ static void* s_bl_sub(void* i_proc, void* i_this) { static void* s_ss_sub(void* i_proc, void* i_this) { if (fopAc_IsActor(i_proc) - && (fopAcM_GetName(i_proc) == PROC_NI || fopAcM_GetName(i_proc) == PROC_BD) + && (fopAcM_GetName(i_proc) == fpcNm_NI_e || fopAcM_GetName(i_proc) == fpcNm_BD_e) && target_info_count < 5) { target_info[target_info_count] = static_cast(i_proc); @@ -373,7 +373,7 @@ static fopAc_ac_c* search_bird(npc_ne_class* i_this) { } } } - + i++; if (i == target_info_count) { i = 0; @@ -645,7 +645,7 @@ static void npc_ne_away(npc_ne_class* i_this) { } i_this->mBackboneTargetAngleY = ang_y; } - + i_this->mpMorf->setPlaySpeed(i_this->mAnmSpeed); } @@ -690,7 +690,7 @@ static cXyz ground_search(npc_ne_class* i_this) { static void* s_fish_sub(void* i_proc, void* i_this) { npc_ne_class* _this = static_cast(i_this); - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_MG_FISH) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_MG_FISH_e) { mg_fish_class* fish = (mg_fish_class*)i_proc; if (fish->mCurAction == 0x35 && fish->mActionPhase >= 10) { _this->mFishID = fopAcM_GetID(fish); @@ -825,7 +825,7 @@ static void npc_ne_tame(npc_ne_class* i_this) { i_this->mMode++; i_this->mSound.startSound(Z2SE_CAT_CRY_FAMILIER, 0, -1); // fallthrough - + case 6: i_this->mTargetAngleY = i_this->mAngleToPlayer; angle_max_step = 0xa00; @@ -839,7 +839,7 @@ static void npc_ne_tame(npc_ne_class* i_this) { i_this->mMode = 1; } break; - + case 7: i_this->mAnmSpeed = 1.0f; anm_init(i_this, npc_ne_class::ANM_RUN, 3.0f, 2, i_this->mAnmSpeed); @@ -853,7 +853,7 @@ static void npc_ne_tame(npc_ne_class* i_this) { cLib_addCalc2(&i_this->mAnmSpeed, 1.5f, 1.0f, 0.1f); cLib_addCalc2(&_this->speedF, i_this->mAnmSpeed * l_HIO.mRunSpeed, 1.0f, 0.5f * l_HIO.mRunSpeed); - + if (i_this->mCounter & 1) { ivar7 = way_bg_check(i_this, 0); } @@ -861,7 +861,7 @@ static void npc_ne_tame(npc_ne_class* i_this) { { i_this->mTargetAngleY = i_this->mAngleToPlayer + 0x8000 + (s16)cM_rndFX(4000.0f); - way_check(i_this, i_this->mTargetAngleY); + way_check(i_this, i_this->mTargetAngleY); } if (i_this->mDistToTarget > dist3 + 40.0f) { @@ -870,13 +870,13 @@ static void npc_ne_tame(npc_ne_class* i_this) { i_this->mMode = 1; } break; - + case 10: case 11: i_this->mTargetAngleY = i_this->mAngleToPlayer; cLib_addCalc0(&_this->speedF, 1.0f, 3.0f); angle_diff = _this->current.angle.y - i_this->mTargetAngleY; - + if (i_this->mMode == 10) { if (angle_diff > 0x400 || angle_diff < -0x400) { i_this->mAnmSpeed = 1.0f; @@ -1003,7 +1003,7 @@ static void npc_ne_bird(npc_ne_class* i_this) { i_this->mMode++; i_this->mDistScale = cM_rndFX(0.2f) + 1.0f; // fallthrough - + case 1: max_angle_step = 0x400; i_this->mTailTargetAngle = -15000; @@ -1635,7 +1635,7 @@ static BOOL npc_ne_home(npc_ne_class* i_this) { s16 prev_ang_y = i_this->current.angle.y; cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mTargetAngleY, 2, i_this->mAngleYStep); cLib_addCalc2(&i_this->mAngleYStep, 5000.0f, 1.0f, 200.0f); - + f32 ang_z = i_this->speedF * (i_this->current.angle.y - prev_ang_y) * -0.5f; if (ang_z > 4000.0f) { ang_z = 4000.0f; @@ -1643,7 +1643,7 @@ static BOOL npc_ne_home(npc_ne_class* i_this) { ang_z = -4000.0f; } i_this->current.angle.z = ang_z; - + if (i_this->mAngleYStep > 1000.0f) { f32 ang_y = i_this->speedF * (i_this->current.angle.y - prev_ang_y) * 0.1f; if (ang_y > 5000.0f) { @@ -2309,7 +2309,7 @@ static void action(npc_ne_class* i_this) { if (bird_check && !i_this->mWantsFish) { fopAc_ac_c* bird_or_ball = search_bird(i_this); if (bird_or_ball != NULL) { - if (fopAcM_GetName(bird_or_ball) == PROC_OBJ_FOOD) { + if (fopAcM_GetName(bird_or_ball) == fpcNm_OBJ_FOOD_e) { i_this->mAction = npc_ne_class::ACT_BALL; i_this->mMode = 0; carry_check = true; @@ -2335,7 +2335,7 @@ static void action(npc_ne_class* i_this) { cXyz vec1, vec2; if (i_this->mWantsFish && i_this->mAction != npc_ne_class::ACT_SANBASI && player->current.pos.z > -2800.0f) { - dmg_rod_class* rod = ((dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD)); + dmg_rod_class* rod = ((dmg_rod_class*)fopAcM_SearchByName(fpcNm_MG_ROD_e)); if (rod != NULL && rod->kind == 1 && rod->action != 5 && rod->play_cam_mode != 0 && !i_this->mNoFollow) { if (i_this->mDistToTarget > 500.0f) { @@ -2638,7 +2638,7 @@ static void demo_camera(npc_ne_class* i_this) { case 2: daPy_getPlayerActorClass()->setPlayerPosAndAngle(&player->current.pos, i_this->mAngleToPlayer + 0x8000, 0); - + center = _this->current.pos; eye = _this->current.pos; eye.y += 200.0f; @@ -2664,7 +2664,7 @@ static void demo_camera(npc_ne_class* i_this) { } if (i_this->mDemoCounter == 12) { - fopAc_ac_c* door = fopAcM_SearchByName(PROC_OBJ_NDOOR); + fopAc_ac_c* door = fopAcM_SearchByName(fpcNm_OBJ_NDOOR_e); if (door != NULL) { door->field_0x567 = 10; Z2GetAudioMgr()->seStart(Z2SE_OBJ_CAT_DOOR, &door->current.pos, @@ -2702,7 +2702,7 @@ static void demo_camera(npc_ne_class* i_this) { case 11: daPy_getPlayerActorClass()->setPlayerPosAndAngle(&player->current.pos, i_this->mAngleToPlayer + 0x8000, 0); - + mDoMtx_YrotS(*calc_mtx, _this->current.angle.y); if (i_this->mMode >= 13) { @@ -2838,7 +2838,7 @@ static void demo_camera(npc_ne_class* i_this) { } i_this->mDemoCounter++; - + if (i_this->mDemoMode < 10 && i_this->mAction != npc_ne_class::ACT_HOME) { i_this->mDemoMode = 100; } @@ -2857,7 +2857,7 @@ static int message(npc_ne_class* i_this) { i_this->mIsTalking = 0; if (i_this->mIsGengle == 1 && (i_this->mMsgFlow.getNowMsgNo() == 0x18a1 || i_this->mMsgFlow.getNowMsgNo() == 0x18a2)) { - fopAcM_createItem(&dComIfGp_getPlayer(0)->eyePos, fpcNm_ITEM_SILVER_RUPEE, -1, + fopAcM_createItem(&dComIfGp_getPlayer(0)->eyePos, dItemNo_SILVER_RUPEE_e, -1, fopAcM_GetRoomNo(i_this), NULL, NULL, 3); } } @@ -2897,7 +2897,7 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) { /* dSv_event_flag_c::F_0470 - Fishing Pond - Reserved for fishing */ if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[470]) && i_this->mDistToTarget < 1500.0f) { - if (fopAcM_SearchByName(PROC_MG_ROD) != NULL) { + if (fopAcM_SearchByName(fpcNm_MG_ROD_e) != NULL) { i_this->mNoFollow = false; } else { i_this->mNoFollow = true; @@ -3114,7 +3114,7 @@ static cPhs_Step daNpc_Ne_Create(fopAc_ac_c* i_this) { _this->mPathIndex = (u8)(fopAcM_GetParam(_this) >> 0x10); _this->mIsGengle = (u8)(fopAcM_GetParam(_this) >> 0x18); - if (_this->mIsGengle == 1 + if (_this->mIsGengle == 1 /* dSv_event_flag_c::F_0457 - Castle Town - Revived cat */ && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[457])) { return cPhs_ERROR_e; @@ -3256,20 +3256,20 @@ static actor_method_class l_daNpc_Ne_Method = { }; actor_process_profile_definition g_profile_NPC_NE = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_NPC_NE, - &g_fpcLf_Method.base, - sizeof(npc_ne_class), - 0, - 0, - &g_fopAc_Method.base, - 0x2BC, - &l_daNpc_Ne_Method, - 0x8044000, - fopAc_NPC_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_NE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_ne_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_NE_e, + /* Actor SubMtd */ &l_daNpc_Ne_Method, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index 181cf352b00..3c3e5f9b590 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -36,18 +36,18 @@ static actor_method_class daNpc_P2MethodTable = { }; actor_process_profile_definition g_profile_NPC_P2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_P2, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x00000001, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 428, // mPriority - &daNpc_P2MethodTable, // sub_method - 0x020C4407, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_P2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x00000001, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_P2_e, + /* Actor SubMtd */ &daNpc_P2MethodTable, + /* Status */ fopAcStts_UNK_0x2000000_e | fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_FREEZE_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index e8f8cb604fa..da18a2a89a1 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -831,12 +831,12 @@ void daNpc_Pachi_Besu_c::srchActors() { case TYPE_0: fopAc_ac_c* actor_p = mActorMngrs[0].getActorP(); if (actor_p == NULL) { - mActorMngrs[0].entry(getNearestActorP(PROC_NPC_PACHI_TARO)); + mActorMngrs[0].entry(getNearestActorP(fpcNm_NPC_PACHI_TARO_e)); } actor_p = mActorMngrs[1].getActorP(); if (actor_p == NULL) { - mActorMngrs[1].entry(getNearestActorP(PROC_NPC_PACHI_MARO)); + mActorMngrs[1].entry(getNearestActorP(fpcNm_NPC_PACHI_MARO_e)); } break; } @@ -1563,18 +1563,18 @@ static actor_method_class daNpc_Pachi_Besu_MethodTable = { }; actor_process_profile_definition g_profile_NPC_PACHI_BESU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_PACHI_BESU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Pachi_Besu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 368, // mPriority - &daNpc_Pachi_Besu_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PACHI_BESU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Pachi_Besu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_PACHI_BESU_e, + /* Actor SubMtd */ &daNpc_Pachi_Besu_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index 8566c2b03c8..6c9b34d5c7a 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -809,11 +809,11 @@ void daNpc_Pachi_Maro_c::srchActors() { switch (mType) { case TYPE_0: if (mActorMngrs[0].getActorP() == NULL) { - mActorMngrs[0].entry(getNearestActorP(PROC_NPC_PACHI_TARO)); + mActorMngrs[0].entry(getNearestActorP(fpcNm_NPC_PACHI_TARO_e)); } if (mActorMngrs[1].getActorP() == NULL) { - mActorMngrs[1].entry(getNearestActorP(PROC_NPC_PACHI_BESU)); + mActorMngrs[1].entry(getNearestActorP(fpcNm_NPC_PACHI_BESU_e)); } break; } @@ -1677,18 +1677,18 @@ static actor_method_class daNpc_Pachi_Maro_MethodTable = { }; actor_process_profile_definition g_profile_NPC_PACHI_MARO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_PACHI_MARO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Pachi_Maro_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 370, // mPriority - &daNpc_Pachi_Maro_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PACHI_MARO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Pachi_Maro_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_PACHI_MARO_e, + /* Actor SubMtd */ &daNpc_Pachi_Maro_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index 04740912c54..e54dba6fecc 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -1089,11 +1089,11 @@ void daNpc_Pachi_Taro_c::srchActors() { switch (mType) { case TYPE_0: if (mActorMngrs[0].getActorP() == NULL) { - mActorMngrs[0].entry(getNearestActorP(PROC_NPC_PACHI_MARO)); + mActorMngrs[0].entry(getNearestActorP(fpcNm_NPC_PACHI_MARO_e)); } if (mActorMngrs[1].getActorP() == NULL) { - mActorMngrs[1].entry(getNearestActorP(PROC_NPC_PACHI_BESU)); + mActorMngrs[1].entry(getNearestActorP(fpcNm_NPC_PACHI_BESU_e)); } if (mActorMngrs[2].getActorP() == NULL) { @@ -1126,7 +1126,7 @@ void* daNpc_Pachi_Taro_c::_srch_DistTag1_main(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) != PROC_TAG_PATI) { + if (fopAcM_GetName(i_actor) != fpcNm_TAG_PATI_e) { return NULL; } @@ -1148,7 +1148,7 @@ void* daNpc_Pachi_Taro_c::_srch_DistTag2_main(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) != PROC_TAG_PATI) { + if (fopAcM_GetName(i_actor) != fpcNm_TAG_PATI_e) { return NULL; } @@ -1170,7 +1170,7 @@ void* daNpc_Pachi_Taro_c::_srch_EscapeTag1_main(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) != PROC_TAG_PATI) { + if (fopAcM_GetName(i_actor) != fpcNm_TAG_PATI_e) { return NULL; } @@ -1192,7 +1192,7 @@ void* daNpc_Pachi_Taro_c::_srch_EscapeTag2_main(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) != PROC_TAG_PATI) { + if (fopAcM_GetName(i_actor) != fpcNm_TAG_PATI_e) { return NULL; } @@ -2559,18 +2559,18 @@ static actor_method_class daNpc_Pachi_Taro_MethodTable = { }; actor_process_profile_definition g_profile_NPC_PACHI_TARO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_PACHI_TARO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Pachi_Taro_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 369, // mPriority - &daNpc_Pachi_Taro_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PACHI_TARO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Pachi_Taro_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_PACHI_TARO_e, + /* Actor SubMtd */ &daNpc_Pachi_Taro_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_passer.cpp b/src/d/actor/d_a_npc_passer.cpp index 4f4462ef829..b7df633f4ff 100644 --- a/src/d/actor/d_a_npc_passer.cpp +++ b/src/d/actor/d_a_npc_passer.cpp @@ -1160,18 +1160,18 @@ static actor_method_class daNpcPasser_METHODS = { }; actor_process_profile_definition g_profile_NPC_PASSER = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_PASSER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcPasser_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 401, // mPriority - &daNpcPasser_METHODS, // sub_method - 0x02040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PASSER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcPasser_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_PASSER_e, + /* Actor SubMtd */ &daNpcPasser_METHODS, + /* Status */ fopAcStts_UNK_0x2000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_passer2.cpp b/src/d/actor/d_a_npc_passer2.cpp index 47f9dded361..ea4aae6db5b 100644 --- a/src/d/actor/d_a_npc_passer2.cpp +++ b/src/d/actor/d_a_npc_passer2.cpp @@ -379,18 +379,18 @@ static actor_method_class daNpcPasser2_METHODS = { }; actor_process_profile_definition g_profile_NPC_PASSER2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_PASSER2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcPasser2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 402, // mPriority - &daNpcPasser2_METHODS, // sub_method - 0x02040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PASSER2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcPasser2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_PASSER2_e, + /* Actor SubMtd */ &daNpcPasser2_METHODS, + /* Status */ fopAcStts_UNK_0x2000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp index b7bfe440423..52a392bafd9 100644 --- a/src/d/actor/d_a_npc_post.cpp +++ b/src/d/actor/d_a_npc_post.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_post.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -61,7 +61,7 @@ enum post1_RES_File_ID { /* 0x17 */ BCK_POST_HELLO, /* 0x18 */ BCK_POST_REGRET, /* 0x19 */ BCK_POST_RUN, - + /* BTK */ /* 0x1C */ BTK_POST_HAND = 0x1C, /* 0x1D */ BTK_POST_RUN, @@ -223,7 +223,7 @@ void daNpc_Post_HIO_c::listenPropertyEvent(const JORPropertyEvent* evt) { memset(&buffer, 0, sizeof(buffer)); len = 0; daNpcT_cmnListenPropertyEvent(buffer, &len, &m.common); - + sprintf(buffer + len, "%.3ff,\t// 走り速度\n", m.run_spd); len = strlen(buffer); sprintf(buffer + len, "%d, \t// 頷き間隔\n", m.nod_interval); @@ -405,7 +405,7 @@ cPhs_Step daNpc_Post_c::create() { } OS_REPORT("\n"); - + static int const heapSize[4] = { 0x0, 0x5060, 0x4EC0, 0x0, }; @@ -569,7 +569,7 @@ u8 daNpc_Post_c::getType() { switch (param) { case 0: return TYPE_0; - + case 1: return TYPE_DELIVER; @@ -623,7 +623,7 @@ void daNpc_Post_c::reset() { switch (mType) { case TYPE_0: break; - + case TYPE_DELIVER: mHide = true; break; @@ -709,7 +709,7 @@ void daNpc_Post_c::setAfterTalkMotion() { case FACE_MOT_REGRET: idx = FACE_MOT_H_REGRET; break; - + case FACE_MOT_HAPPY: idx = FACE_MOT_H_HAPPY; break; @@ -717,7 +717,7 @@ void daNpc_Post_c::setAfterTalkMotion() { case FACE_MOT_SAD: idx = FACE_MOT_H_SAD; break; - + case FACE_MOT_ANGRY: idx = FACE_MOT_H_ANGRY; break; @@ -730,7 +730,7 @@ void daNpc_Post_c::srchActors() { switch (mType) { case TYPE_0: break; - + case TYPE_DELIVER: for (int i = 0; i < 4; i++) { if (mActorMngrs[i].getActorP() == NULL) { @@ -812,10 +812,10 @@ void daNpc_Post_c::action() { } void daNpc_Post_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -856,7 +856,7 @@ void daNpc_Post_c::setAttnPos() { mHIO->m.common.head_angleY_min, mHIO->m.common.head_angleY_max, mHIO->m.common.neck_rotation_ratio, rad_val, &sp7c); mJntAnm.calcJntRad(0.2f, 1.0f, rad_val); - + setMtx(); if (mpFlagModelMorf != NULL) { @@ -949,7 +949,7 @@ int daNpc_Post_c::drawDbgInfo() { dDbVw_drawSphereXlu(attention_info.position, 9.0f, (GXColor){0x80, 0x80, 0x80, 0xA0}, 1); } #endif - + return 0; } @@ -1110,7 +1110,7 @@ int daNpc_Post_c::cutDeliver(int i_staffId) { int* piVar1 = NULL; int prm = -1; int timer = 0; - + piVar1 = dComIfGp_evmng_getMyIntegerP(i_staffId, "prm"); if (piVar1 != NULL) { prm = *piVar1; @@ -1130,7 +1130,7 @@ int daNpc_Post_c::cutDeliver(int i_staffId) { current.pos.x = work.x; current.pos.z = work.z; work.y = dComIfG_Bgsp().GroundCross(&mGndChk); - + if (work.y != -1e9f) { current.pos.y = work.y; } @@ -1404,7 +1404,7 @@ int daNpc_Post_c::wait(void* param_1) { actor_p->noEffect(); } else if (daPy_getPlayerActorClass()->eventInfo.chkCondition(1) != FALSE && dMeter2Info_getNewLetterNum()) { mActorPos = actor_p->current.pos; - + f32 fVar2 = player->current.pos.absXZ(actor_p->current.pos); f32 adjustedScale = actor_p->scale.x - 700.0f; if (adjustedScale <= fVar2) { @@ -1430,7 +1430,7 @@ int daNpc_Post_c::wait(void* param_1) { if (mPlayerActorMngr.getActorP() != NULL && !mTwilight) { mJntAnm.lookPlayer(0); - + if (!chkActorInSight(mPlayerActorMngr.getActorP(), mAttnFovY, mCurAngle.y)) { mJntAnm.lookNone(0); } @@ -1507,7 +1507,7 @@ int daNpc_Post_c::talk(void* param_1) { } break; - case MODE_EXIT: + case MODE_EXIT: break; } @@ -1567,18 +1567,18 @@ static actor_method_class daNpc_Post_MethodTable = { }; actor_process_profile_definition g_profile_NPC_POST = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_POST, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Post_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 403, // mPriority - &daNpc_Post_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_POST_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Post_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_POST_e, + /* Actor SubMtd */ &daNpc_Post_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp index 5190ccd5c26..40fb220574d 100644 --- a/src/d/actor/d_a_npc_pouya.cpp +++ b/src/d/actor/d_a_npc_pouya.cpp @@ -668,9 +668,9 @@ void daNpc_Pouya_c::action() { } void daNpc_Pouya_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { attention_info.flags = 0; @@ -1199,18 +1199,18 @@ static actor_method_class daNpc_Pouya_MethodTable = { }; actor_process_profile_definition g_profile_NPC_POUYA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_POUYA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Pouya_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 404, // mPriority - &daNpc_Pouya_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_POUYA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Pouya_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_POUYA_e, + /* Actor SubMtd */ &daNpc_Pouya_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index 4974fad7986..256856554f6 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -720,7 +720,7 @@ fpc_ProcID daNpcPray_c::createHeart() { mDoMtx_stack_c::ZXYrotS(rot); mDoMtx_stack_c::multVec(&offset, &offset); pos += offset; - return fopAcM_createItemForBoss(&pos, fpcNm_ITEM_KAKERA_HEART, fopAcM_GetRoomNo(this), &rot, &size, 0.0f, 0.0f, 0); + return fopAcM_createItemForBoss(&pos, dItemNo_KAKERA_HEART_e, fopAcM_GetRoomNo(this), &rot, &size, 0.0f, 0.0f, 0); } BOOL daNpcPray_c::_Evt_GetHeart(int i_staffID) { @@ -846,18 +846,18 @@ static actor_method_class daNpcPray_MethodTable = { }; actor_process_profile_definition g_profile_NPC_PRAYER = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_PRAYER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcPray_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 419, // mPriority - &daNpcPray_MethodTable, // sub_method - 0x00044187, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_PRAYER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcPray_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_PRAYER_e, + /* Actor SubMtd */ &daNpcPray_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index 75293bd87a9..4aa9ab47c16 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -365,7 +365,7 @@ int daNpc_Raca_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { } void* daNpc_Raca_c::srchNi(void* i_actor, void* i_data) { - if (mFindCount < 50 && fopAcM_IsActor(i_actor) && i_actor != (daNpc_Raca_c*)i_data && fopAcM_GetName(i_actor) == PROC_NI) { + if (mFindCount < 50 && fopAcM_IsActor(i_actor) && i_actor != (daNpc_Raca_c*)i_data && fopAcM_GetName(i_actor) == fpcNm_NI_e) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*)i_actor; mFindCount++; } @@ -852,18 +852,18 @@ static actor_method_class daNpc_Raca_MethodTable = { }; actor_process_profile_definition g_profile_NPC_RACA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_RACA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Raca_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 356, // mPriority - &daNpc_Raca_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_RACA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Raca_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_RACA_e, + /* Actor SubMtd */ &daNpc_Raca_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index cc9b2382d91..c976d55e537 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_rafrel.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -64,7 +64,7 @@ static int l_loadRes_RAFREL0[] = { static int l_loadRes_RAFREL1[] = { 0, - 1, + 1, -1, }; @@ -204,7 +204,7 @@ int daNpcRafrel_c::Create() { return cPhs_ERROR_e; } - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mType = 2; } @@ -312,7 +312,7 @@ int daNpcRafrel_c::CreateHeap() { if (mType == 1) { mdlData_p = dComIfG_getObjectRes(l_arcNames[1], 0x15); JUT_ASSERT(438, mdlData_p != NULL); - + mpItemModel = mDoExt_J3DModel__create((J3DModelData*)mdlData_p, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS); if (mpItemModel == NULL) { return 0; @@ -368,7 +368,7 @@ int daNpcRafrel_c::Draw() { if (mpItemModel != NULL) { enum { JNT_19 = 19, JNT_20 = 20}; int item_jnt_no = mType == 1 ? JNT_20 : JNT_19; - + g_env_light.setLightTevColorType_MAJI(mpItemModel, &tevStr); mpItemModel->setBaseTRMtx(mAnm_p->getModel()->getAnmMtx(item_jnt_no)); mDoExt_modelUpdateDL(mpItemModel); @@ -617,7 +617,7 @@ void daNpcRafrel_c::reset() { } if (isSneaking()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } setWaitAction(); @@ -640,7 +640,7 @@ void daNpcRafrel_c::setParam() { attention_info.distances[fopAc_attn_LOCK_e] = getDistTableIdx(mpHIO->m.common.attention_distance, mpHIO->m.common.attention_angle); attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e]; attention_info.distances[fopAc_attn_SPEAK_e] = getDistTableIdx(mpHIO->m.common.talk_distance, mpHIO->m.common.talk_angle); - + if (mType == 1 && field_0xe15 != 0 && field_0xe16 == 0) { Vec sp8 = {current.pos.x + 150.0f, current.pos.y, current.pos.z - 100.0f}; if (fopAcM_GetPosition(daPy_getPlayerActorClass()).abs(sp8) > 160.0f) { @@ -678,7 +678,7 @@ BOOL daNpcRafrel_c::drawDbgInfo() { if (!mpHIO->m.common.debug_info_ON) { return false; } - + f32 distMax1 = dComIfGp_getAttention() ->getDistTable(attention_info.distances[fopAc_attn_SPEAK_e]) .mDistMax; @@ -769,7 +769,7 @@ void daNpcRafrel_c::playExpression() { void daNpcRafrel_c::playMotion() { daNpcF_anmPlayData anm0_phase1 = {8, mpHIO->m.common.morf_frame, 0}; daNpcF_anmPlayData* anm0[] = {&anm0_phase1}; - + daNpcF_anmPlayData anm1_phase1 = {9, mpHIO->m.common.morf_frame, 0}; daNpcF_anmPlayData* anm1[] = {&anm1_phase1}; @@ -1000,7 +1000,7 @@ bool daNpcRafrel_c::step(s16 i_angY, int param_1, f32 param_2) { setExpression(7, -1.0f); setMotion(param_1, -1.0f, false); } - + mTurnTargetAngle = i_angY; mTurnAmount = 0; @@ -1028,15 +1028,15 @@ bool daNpcRafrel_c::step(s16 i_angY, int param_1, f32 param_2) { void daNpcRafrel_c::searchActors() { if (field_0xc7c[1].getActorP() == NULL) { - field_0xc7c[1].entry(fopAcM_SearchByName(PROC_NPC_ASH)); + field_0xc7c[1].entry(fopAcM_SearchByName(fpcNm_NPC_ASH_e)); } if (field_0xc7c[2].getActorP() == NULL) { - field_0xc7c[2].entry(fopAcM_SearchByName(PROC_NPC_SHAD)); + field_0xc7c[2].entry(fopAcM_SearchByName(fpcNm_NPC_SHAD_e)); } if (field_0xc7c[3].getActorP() == NULL) { - field_0xc7c[3].entry(fopAcM_SearchByName(PROC_NPC_MOIR)); + field_0xc7c[3].entry(fopAcM_SearchByName(fpcNm_NPC_MOIR_e)); } } @@ -1227,7 +1227,7 @@ bool daNpcRafrel_c::wait_type2(void* param_0) { setLookMode(LOOK_NONE, NULL); field_0xe10 = 2; break; - + case 2: switch (field_0xe08) { case 0: @@ -1365,11 +1365,11 @@ bool daNpcRafrel_c::demo(void* param_0) { case 2: if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { evtmgr = &dComIfGp_getEventManager(); - + const int staffId = evtmgr->getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { mStaffID = staffId; - + int actIdx = evtmgr->getMyActIdx(staffId, l_evtNames, ARRAY_SIZE(l_evtNames), 0, 0); if (actIdx > 0 && actIdx < 7) { mOrderEvtNo = actIdx; @@ -1449,7 +1449,7 @@ bool daNpcRafrel_c::leave(void* param_0) { int daNpcRafrel_c::EvCut_Introduction(int i_staffId) { dEvent_manager_c* evtmgr = &dComIfGp_getEventManager(); - + int* idata = dComIfGp_evmng_getMyIntegerP(i_staffId, "prm"); if (idata == NULL) { return 0; @@ -1475,7 +1475,7 @@ int daNpcRafrel_c::EvCut_Introduction(int i_staffId) { int daNpcRafrel_c::EvCut_Meeting(int i_staffId) { dEvent_manager_c* evtmgr = &dComIfGp_getEventManager(); - + int* idata = dComIfGp_evmng_getMyIntegerP(i_staffId, "prm"); if (idata == NULL) { return 0; @@ -1686,7 +1686,7 @@ int daNpcRafrel_c::EvCut_WiretapSponsor(int i_staffId) { int daNpcRafrel_c::EvCut_WiretapEntrant(int i_staffId) { dEvent_manager_c& evtmgr = dComIfGp_getEventManager(); - + int* idata = dComIfGp_evmng_getMyIntegerP(i_staffId, "prm"); if (idata == NULL) { return 0; @@ -1758,18 +1758,18 @@ static actor_method_class daNpcRafrel_MethodTable = { }; actor_process_profile_definition g_profile_NPC_RAFREL = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_RAFREL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcRafrel_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 414, // mPriority - &daNpcRafrel_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_RAFREL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcRafrel_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_RAFREL_e, + /* Actor SubMtd */ &daNpcRafrel_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index af50f2f7695..671acb7e4df 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -436,7 +436,7 @@ int daNpc_Saru_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { void* daNpc_Saru_c::srchYm(void* i_actor, void* i_data) { if (mFindCount < 50 && i_actor != NULL && i_actor != i_data) { - if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_YM && ((daE_YM_c*)i_actor)->isHide() == 0) { + if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_E_YM_e && ((daE_YM_c*)i_actor)->isHide() == 0) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*)i_actor; mFindCount++; } @@ -647,10 +647,10 @@ void daNpc_Saru_c::action() { } void daNpc_Saru_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if ((checkHide() || mNoDraw != 0) && mSpeakEvent == false) { @@ -1232,18 +1232,18 @@ static actor_method_class daNpc_Saru_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SARU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SARU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Saru_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 357, // mPriority - &daNpc_Saru_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SARU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Saru_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SARU_e, + /* Actor SubMtd */ &daNpc_Saru_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp index 382a5350f59..4cab9125e5a 100644 --- a/src/d/actor/d_a_npc_seib.cpp +++ b/src/d/actor/d_a_npc_seib.cpp @@ -565,18 +565,18 @@ static actor_method_class daNpc_seiB_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SEIB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SEIB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_seiB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 358, // mPriority - &daNpc_seiB_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SEIB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_seiB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SEIB_e, + /* Actor SubMtd */ &daNpc_seiB_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index b3a688f7218..c64002c716e 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -508,18 +508,18 @@ static actor_method_class daNpc_seiC_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SEIC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SEIC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_seiC_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 359, // mPriority - &daNpc_seiC_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SEIC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_seiC_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SEIC_e, + /* Actor SubMtd */ &daNpc_seiC_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index ba0e82bd491..3fc7564f0d6 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -506,18 +506,18 @@ static actor_method_class daNpc_seiD_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SEID = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SEID, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_seiD_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 360, // mPriority - &daNpc_seiD_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SEID_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_seiD_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SEID_e, + /* Actor SubMtd */ &daNpc_seiD_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp index 6969645ed10..a0f212e0096 100644 --- a/src/d/actor/d_a_npc_seira.cpp +++ b/src/d/actor/d_a_npc_seira.cpp @@ -560,7 +560,7 @@ void daNpc_Seira_c::srchActors() { case 2: { if (mActorMngr[0].getActorP() == NULL) { // NE means Neko, which means Cat in Japanese: - mActorMngr[0].entry(getNearestActorP(PROC_NPC_NE)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_NE_e)); } break; @@ -569,11 +569,11 @@ void daNpc_Seira_c::srchActors() { case 5: { // The beginning of the game when outside with Beth and Hanch: if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_HANJO)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_HANJO_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_BESU)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_BESU_e)); } break; @@ -1410,18 +1410,18 @@ static actor_method_class daNpc_Seira_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SEIRA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SEIRA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Seira_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 361, // mPriority - &daNpc_Seira_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SEIRA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Seira_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SEIRA_e, + /* Actor SubMtd */ &daNpc_Seira_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp index ed9e2ea3c9d..6978f2a0d46 100644 --- a/src/d/actor/d_a_npc_seira2.cpp +++ b/src/d/actor/d_a_npc_seira2.cpp @@ -486,7 +486,7 @@ void daNpc_Seira2_c::srchActors() { case 2: { if (mActorMngr[0].getActorP() == NULL) { // NE means Neko, which means Cat in Japanese: - mActorMngr[0].entry(getNearestActorP(PROC_NPC_NE)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_NE_e)); } break; @@ -1125,18 +1125,18 @@ static actor_method_class daNpc_Seira2_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SERA2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SERA2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Seira2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 362, // mPriority - &daNpc_Seira2_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SERA2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Seira2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SERA2_e, + /* Actor SubMtd */ &daNpc_Seira2_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_seirei.cpp b/src/d/actor/d_a_npc_seirei.cpp index 87216b3ee14..89a39f8a807 100644 --- a/src/d/actor/d_a_npc_seirei.cpp +++ b/src/d/actor/d_a_npc_seirei.cpp @@ -824,18 +824,18 @@ static actor_method_class daNpc_Seirei_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SEIREI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SEIREI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Seirei_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 363, // mPriority - &daNpc_Seirei_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SEIREI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Seirei_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SEIREI_e, + /* Actor SubMtd */ &daNpc_Seirei_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index 15f99d924c8..6a95fc93e17 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_shad.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -13,16 +13,16 @@ #include const daNpcShad_HIOParam daNpcShad_Param_c::m = { - 35.0f, // attention_offset + 35.0f, // attention_offset -3.0f, // gravity - 1.0f, // scale + 1.0f, // scale 400.0f, // real_shadow_size 255.0f, // weight 200.0f, // height 35.0f, // knee_length 30.0f, // width - 0.0f, // body_angleX_max - 0.0f, // body_angleX_min + 0.0f, // body_angleX_max + 0.0f, // body_angleX_min 45.0f, // body_angleY_max -45.0f, // body_angleY_min 30.0f, // head_angleX_max @@ -390,7 +390,7 @@ cPhs_Step daNpcShad_c::Create() { return cPhs_ERROR_e; } - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mMode = 2; } } @@ -626,7 +626,7 @@ int daNpcShad_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { if (param_2 == 0) { J3DModel* model = j3dSys.getModel(); daNpcShad_c* i_this = (daNpcShad_c*)model->getUserArea(); - + if (i_this != NULL) { i_this->ctrlJoint(i_joint, model); } @@ -739,7 +739,7 @@ bool daNpcShad_c::setExpressionBtp(int i_idx) { if (i_idx == 0) { mAnmFlags |= ANM_FLAG_800; } - + return true; } @@ -834,7 +834,7 @@ void daNpcShad_c::reset() { mMotionMorfOverride = 0.0f; if (isSneaking()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } setWaitAction(); @@ -1055,7 +1055,7 @@ inline void daNpcShad_c::lookat() { mLookat.setAttnPos(NULL); } - mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, head_angleX_min, head_angleX_max, + mLookat.setParam(body_angleX_min, body_angleX_max, body_angleY_min, body_angleY_max, 0.0f, 0.0f, 0.0f, 0.0f, head_angleX_min, head_angleX_max, head_angleY_min, head_angleY_max, mCurAngle.y, spf0); mLookat.calc(this, model->getBaseTRMtx(), (csXyz**)local_fc, iVar1, sVar1, FALSE); } @@ -1533,7 +1533,7 @@ bool daNpcShad_c::talk(void* param_1) { JUT_ASSERT(2042, FALSE); break; } - + return rv; } @@ -1855,9 +1855,9 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) { mTurnMode = 0; actor = NULL; - fopAcM_SearchByName(PROC_CSTAF, (fopAc_ac_c**)&actor); + fopAcM_SearchByName(fpcNm_CSTAF_e, (fopAc_ac_c**)&actor); if (actor != NULL) { - fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x800); + fopAcM_OnStatus(actor, fopAcStts_STAFF_EXTRA_e); } dComIfGp_getEvent()->startCheckSkipEdge(this); @@ -1902,7 +1902,7 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) { case '0010': statue = NULL; - fopAcM_SearchByName(PROC_CSTAF, (fopAc_ac_c**)&statue); + fopAcM_SearchByName(fpcNm_CSTAF_e, (fopAc_ac_c**)&statue); if (statue != NULL) { statue->onCoverVanishFlg(); } @@ -1993,7 +1993,7 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) { case '0010': return TRUE; - + default: JUT_ASSERT(2540, FALSE); break; @@ -2303,7 +2303,7 @@ BOOL daNpcShad_c::EvCut_Disappear(int i_cutIndex) { if (pos2 != NULL) { step(cLib_targetAngleY(¤t.pos, pos2), -1, 15.0f); - + if (pos2->x > current.pos.x) { speedF = 0.0f; setMotion(MOT_WAIT_A, -1.0f, FALSE); @@ -2617,7 +2617,7 @@ inline void daNpcShad_c::setAttnPos() { mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_BACKBONE2)); mDoMtx_stack_c::multVecZero(&sp58); sp58.y = current.pos.y; - + field_0xcb0.SetC(sp58); field_0xcb0.SetH(mpHIO->m.common.height); @@ -2647,18 +2647,18 @@ static actor_method_class daNpcShad_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SHAD = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SHAD, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcShad_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 413, // mPriority - &daNpcShad_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SHAD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcShad_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SHAD_e, + /* Actor SubMtd */ &daNpcShad_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp index d1c31ea12e3..bc50e41166a 100644 --- a/src/d/actor/d_a_npc_shaman.cpp +++ b/src/d/actor/d_a_npc_shaman.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_shaman.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -18,7 +18,7 @@ void daNpc_Sha_HIO_c::listenPropertyEvent(const JORPropertyEvent* event) { char buffer[2000]; JORReflexible::listenPropertyEvent(event); - + JORFile jorFile; int len; @@ -255,7 +255,7 @@ cPhs_Step daNpc_Sha_c::create() { } OS_REPORT("\n"); - + static int const heapSize[3] = { 0x3AF0, 0x3AF0, 0x3AF0, }; @@ -274,7 +274,7 @@ cPhs_Step daNpc_Sha_c::create() { #endif reset(); - + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); mCcStts.Init(mpHIO->m.common.weight, 0, this); @@ -369,7 +369,7 @@ u8 daNpc_Sha_c::getType() { switch (param) { case 0: return 0; - + case 1: return 1; @@ -476,7 +476,7 @@ BOOL daNpc_Sha_c::checkChangeEvt() { switch (mType) { case 0: break; - + case 1: if (field_0xfa0 == 0) { mEvtNo = 2; @@ -504,7 +504,7 @@ void daNpc_Sha_c::setAfterTalkMotion() { case 2: idx = 8; break; - + case 3: idx = 5; break; @@ -593,10 +593,10 @@ void daNpc_Sha_c::action() { } void daNpc_Sha_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -610,7 +610,7 @@ void daNpc_Sha_c::setAttnPos() { mStagger.calc(FALSE); f32 rad = cM_s2rad((s16)(mCurAngle.y - field_0xd7e.y)); - + mJntAnm.setParam(this, mpMorf[0]->getModel(), &pos, getBackboneJointNo(), getNeckJointNo(), getHeadJointNo(), mpHIO->m.common.body_angleX_min, mpHIO->m.common.body_angleX_max, mpHIO->m.common.body_angleY_min, mpHIO->m.common.body_angleY_max, mpHIO->m.common.head_angleX_min, mpHIO->m.common.head_angleX_max, mpHIO->m.common.head_angleY_min, mpHIO->m.common.head_angleY_max, @@ -897,7 +897,7 @@ int daNpc_Sha_c::cutPerformAugury(int i_staffId) { dComIfGp_event_offHindFlag(128); initTalk(0x772, NULL); break; - + case 5: dComIfGp_event_offHindFlag(128); initTalk(0x773, NULL); @@ -955,7 +955,7 @@ int daNpc_Sha_c::cutPerformAugury(int i_staffId) { setTempBit(mSceneChangeNoTableIx); } } - + if (mSceneChangeNoTableIx == -2) { mEvtNo = 3; evtChange(); @@ -979,7 +979,7 @@ int daNpc_Sha_c::cutPerformAugury(int i_staffId) { } } break; - + case 2: case 6: case 7: @@ -1251,18 +1251,18 @@ static actor_method_class daNpc_Sha_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SHAMAN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SHAMAN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Sha_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 364, // mPriority - &daNpc_Sha_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SHAMAN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Sha_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SHAMAN_e, + /* Actor SubMtd */ &daNpc_Sha_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp index 1639f2ee86f..904bb850d8e 100644 --- a/src/d/actor/d_a_npc_shoe.cpp +++ b/src/d/actor/d_a_npc_shoe.cpp @@ -227,9 +227,9 @@ int daNpcShoe_c::Delete() { int daNpcShoe_c::Execute() { if (field_0xe1b != 0) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } else { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); } if (fopAcM_CheckCondition(this, fopAcCnd_NODRAW_e)) { @@ -743,18 +743,18 @@ static actor_method_class daNpcShoe_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SHOE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SHOE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcShoe_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 417, // mPriority - &daNpcShoe_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SHOE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcShoe_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SHOE_e, + /* Actor SubMtd */ &daNpcShoe_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index 1c6d3d1c36e..a25361564bf 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -351,18 +351,18 @@ static actor_method_class daNpc_Shop0_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SHOP0 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SHOP0, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Shop0_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 426, // mPriority - &daNpc_Shop0_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SHOP0_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Shop0_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SHOP0_e, + /* Actor SubMtd */ &daNpc_Shop0_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_shop_maro.cpp b/src/d/actor/d_a_npc_shop_maro.cpp index 13133a13559..368e73bfe9c 100644 --- a/src/d/actor/d_a_npc_shop_maro.cpp +++ b/src/d/actor/d_a_npc_shop_maro.cpp @@ -42,18 +42,18 @@ static actor_method_class daNpc_shopMaro_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SMARO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SMARO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_shopMaro_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 365, // mPriority - &daNpc_shopMaro_MethodTable, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SMARO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_shopMaro_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SMARO_e, + /* Actor SubMtd */ &daNpc_shopMaro_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, +}; diff --git a/src/d/actor/d_a_npc_sola.cpp b/src/d/actor/d_a_npc_sola.cpp index cf026eb2435..a70746c4f1f 100644 --- a/src/d/actor/d_a_npc_sola.cpp +++ b/src/d/actor/d_a_npc_sola.cpp @@ -496,18 +496,18 @@ static actor_method_class daNpc_solA_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SOLA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SOLA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_solA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 366, // mPriority - &daNpc_solA_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SOLA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_solA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SOLA_e, + /* Actor SubMtd */ &daNpc_solA_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_soldierA.cpp b/src/d/actor/d_a_npc_soldierA.cpp index 439ae1f11fb..1d5d1ecfe5b 100644 --- a/src/d/actor/d_a_npc_soldierA.cpp +++ b/src/d/actor/d_a_npc_soldierA.cpp @@ -1150,18 +1150,18 @@ static actor_method_class daNpc_SoldierA_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SOLDIERa = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SOLDIERa, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_SoldierA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 399, // mPriority - &daNpc_SoldierA_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SOLDIERa_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_SoldierA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SOLDIERa_e, + /* Actor SubMtd */ &daNpc_SoldierA_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp index 74d68caa569..7d42e522aba 100644 --- a/src/d/actor/d_a_npc_soldierB.cpp +++ b/src/d/actor/d_a_npc_soldierB.cpp @@ -786,7 +786,7 @@ void daNpc_SoldierB_c::lookat() { } static void* s_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_SOLDIERa && + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_SOLDIERa_e && ((daNpc_SoldierA_c*)i_actor)->getType() == 0) { return i_actor; @@ -978,20 +978,20 @@ static actor_method_class daNpc_SoldierB_MethodTable = { }; actor_process_profile_definition g_profile_NPC_SOLDIERb = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_SOLDIERb, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_SoldierB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 400, // mPriority - &daNpc_SoldierB_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SOLDIERb_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_SoldierB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SOLDIERb_e, + /* Actor SubMtd */ &daNpc_SoldierB_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp index 4f0ba6b40b2..b88f8ce70b4 100644 --- a/src/d/actor/d_a_npc_sq.cpp +++ b/src/d/actor/d_a_npc_sq.cpp @@ -12,7 +12,7 @@ #include "f_op/f_op_camera_mng.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static bool hio_set; @@ -390,18 +390,18 @@ static actor_method_class l_daNpc_Sq_Method = { }; actor_process_profile_definition g_profile_NPC_SQ = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_NPC_SQ, - &g_fpcLf_Method.base, - sizeof(npc_sq_class), - 0, - 0, - &g_fopAc_Method.base, - 0x2BA, - &l_daNpc_Sq_Method, - 0xC0000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_SQ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_sq_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_SQ_e, + /* Actor SubMtd */ &l_daNpc_Sq_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index ed8e4d98034..9d9c54133d3 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_taro.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -463,7 +463,7 @@ int daNpc_Taro_c::createHeapCallBack(fopAc_ac_c* i_this) { void* daNpc_Taro_c::srchArrow(void* param_1, void* param_2) { if (mFindCount < 50 && param_1 != NULL && param_1 != param_2) { - if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && fopAcM_GetName(param_1) == PROC_ARROW) { + if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && fopAcM_GetName(param_1) == fpcNm_ARROW_e) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*)param_1; mFindCount++; } @@ -473,9 +473,9 @@ void* daNpc_Taro_c::srchArrow(void* param_1, void* param_2) { void* daNpc_Taro_c::srchNpc(void* param_1, void* param_2) { if (mFindCount < 50 && param_1 != NULL && param_1 != param_2) { - if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && - (fopAcM_GetGroup((fopAc_ac_c*)param_1) == 4 || - (fopAcM_GetName(param_1) == PROC_TAG_EVTAREA && ((daTag_EvtArea_c*)param_1)->getType() == 15))) { + if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && + (fopAcM_GetGroup((fopAc_ac_c*)param_1) == 4 || + (fopAcM_GetName(param_1) == fpcNm_TAG_EVTAREA_e && ((daTag_EvtArea_c*)param_1)->getType() == 15))) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*)param_1; mFindCount++; } @@ -944,7 +944,7 @@ void daNpc_Taro_c::action() { setAction(mAction); } } - + daTag_Push_c* pushTag = (daTag_Push_c*)field_0xba0.getActorP(); if (pushTag != NULL) { switch (pushTag->getId()) { @@ -959,9 +959,9 @@ void daNpc_Taro_c::action() { } void daNpc_Taro_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { attention_info.flags = 0; @@ -1116,7 +1116,7 @@ BOOL daNpc_Taro_c::selectAction() { mAction = &daNpc_Taro_c::nurse; break; case TYPE_15: - // daNpcKakashi_chkSwdTutorialStage itself doesn't match when it returns bool + // daNpcKakashi_chkSwdTutorialStage itself doesn't match when it returns bool if ((u8)daNpcKakashi_chkSwdTutorialStage()) { mAction = &daNpc_Taro_c::swdTutorial; } else { @@ -1915,10 +1915,10 @@ int daNpc_Taro_c::cutGiveMeWoodSwd(int param_1) { case 4: case 5: case 6: - case 8: + case 8: { switch(prm) { - case 5: + case 5: case 8: { fopAc_ac_c* actor_p = mActors[2].getActorP(); JUT_ASSERT(4405, NULL != actor_p); @@ -1993,7 +1993,7 @@ int daNpc_Taro_c::cutGetWoodSwd(int param_1) { if (pTimer != NULL) { timer = *pTimer; } - + int* pSend = dComIfGp_evmng_getMyIntegerP(param_1, "send"); if (pSend != NULL) { send = *pSend; @@ -2272,7 +2272,7 @@ int daNpc_Taro_c::cutCacaricoConversation(int param_1) { } int msgNos[2] = {-1, -1}; - + switch (prm) { case 0: mJntAnm.lookPlayer(0); @@ -2512,7 +2512,7 @@ int daNpc_Taro_c::cutCaution(int param_1) { } break; } - + return rv; } @@ -3261,7 +3261,7 @@ int daNpc_Taro_c::practice(void* param_0) { break; } - + return 1; } @@ -3398,18 +3398,18 @@ static actor_method_class daNpc_Taro_MethodTable = { }; actor_process_profile_definition g_profile_NPC_TARO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TARO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Taro_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 367, // mPriority - &daNpc_Taro_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TARO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Taro_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TARO_e, + /* Actor SubMtd */ &daNpc_Taro_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 06b9686bc71..bb15ad788a2 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -602,7 +602,7 @@ void daNpcThe_c::lookat() { actor = daPy_getPlayerActorClass(); break; case LOOK_ACTOR: - actor = fopAcM_SearchByName(PROC_NPC_ZRC); + actor = fopAcM_SearchByName(fpcNm_NPC_ZRC_e); break; case LOOK_ATTN: break; @@ -1343,18 +1343,18 @@ static actor_method_class daNpcThe_MethodTable = { }; actor_process_profile_definition g_profile_NPC_THE = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_NPC_THE, - &g_fpcLf_Method.base, - sizeof(daNpcThe_c), - 0, - 0, - &g_fopAc_Method.base, - 0x174, - &daNpcThe_MethodTable, - 0x44108, - fopAc_NPC_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_THE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcThe_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_THE_e, + /* Actor SubMtd */ &daNpcThe_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp index 5cde34a6328..645c86aaf4d 100644 --- a/src/d/actor/d_a_npc_theB.cpp +++ b/src/d/actor/d_a_npc_theB.cpp @@ -146,7 +146,7 @@ daNpcTheB_HIO_c::daNpcTheB_HIO_c() { void daNpcTheB_HIO_c::listenPropertyEvent(const JORPropertyEvent* event) { char buffer[2000]; - + JORReflexible::listenPropertyEvent(event); JORFile jorFile; @@ -283,7 +283,7 @@ cPhs_Step daNpcTheB_c::create() { } return phase; - + } int daNpcTheB_c::CreateHeap() { @@ -614,7 +614,7 @@ bool daNpcTheB_c::setExpressionAnm(int i_idx, bool i_modify) { } bool res = false; - + switch (i_idx) { case ANM_NONE: res = setExpressionBtp(EXPR_BTP_THEB); @@ -730,11 +730,11 @@ void daNpcTheB_c::setMotionAnm(int i_idx, f32 i_morf) { case ANM_WHIP: case ANM_WHIP_B: break; - + case ANM_SIT_B: setExpressionAnm(ANM_FH_TALK_B, true); break; - + case ANM_BEND_WAIT: setExpressionAnm(ANM_FH_BEND_WAIT, true); break; @@ -774,7 +774,7 @@ void daNpcTheB_c::reset() { initialize(); if (strcmp(dComIfGp_getStartStageName(), "F_SP123") == 0) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } mpMatAnm->initialize(); @@ -880,7 +880,7 @@ BOOL daNpcTheB_c::doEvent() { e_wb_class* wb_p; BOOL rv = FALSE; s32 staffId; - + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (chkAction(&daNpcTheB_c::talk)) { @@ -890,7 +890,7 @@ BOOL daNpcTheB_c::doEvent() { fopAc_ac_c* actor_p = fopAcM_SearchByID(parentActorID); if (actor_p != NULL) { - fopAcM_OnStatus(actor_p, fopAcM_STATUS_UNK_0x800); + fopAcM_OnStatus(actor_p, fopAcStts_STAFF_EXTRA_e); } } @@ -901,10 +901,10 @@ BOOL daNpcTheB_c::doEvent() { if (staffId != -1) { mStaffID = staffId; JUT_ASSERT(1357, NULL != mEvtSeqList[mOrderEvtNo]); - + actor_p = fopAcM_SearchByID(parentActorID); if (actor_p != NULL) { - fopAcM_OnStatus(actor_p, fopAcM_STATUS_UNK_0x800); + fopAcM_OnStatus(actor_p, fopAcStts_STAFF_EXTRA_e); } if ((this->*mEvtSeqList[mOrderEvtNo])(staffId)) { @@ -917,7 +917,7 @@ BOOL daNpcTheB_c::doEvent() { EvCut_PersonalCombatAfter(); rv = TRUE; } else { - wb_p = (e_wb_class*)fopAcM_SearchByName(PROC_E_WB); + wb_p = (e_wb_class*)fopAcM_SearchByName(fpcNm_E_WB_e); if (wb_p->field_0x169e == 0x60 && wb_p->field_0x16a0 == 1) { mPersonalCombatAfterFlag = 1; EvCut_PersonalCombatAfter(); @@ -931,7 +931,7 @@ BOOL daNpcTheB_c::doEvent() { default: break; } - + dComIfGp_event_reset(); mOrderEvtNo = EVT_NONE; mEventIdx = -1; @@ -970,7 +970,7 @@ void daNpcTheB_c::lookat() { switch (mLookMode) { case LOOK_NONE: break; - + case LOOK_RESET: case LOOK_PLAYER: player = daPy_getPlayerActorClass(); @@ -1054,7 +1054,7 @@ int daNpcTheB_c::wait(void* param_1) { mTurnMode = 0; mMode = 2; break; - + case 2: { bool bVar1 = mActorMngrs[0].getActorP() != NULL; @@ -1138,11 +1138,11 @@ int daNpcTheB_c::talk(void* param_1) { mTurnMode = 0; mMode = 2; break; - + case 2: if (talkProc(NULL, TRUE, NULL)) { field_0x9ec = false; - + if (!field_0x9ec) { dComIfGp_event_reset(); } @@ -1402,7 +1402,7 @@ void daNpcTheB_c::EvCut_PersonalCombatAfter() { int daNpcTheB_c::EvCut_AnnulationFieldRace(int i_staffId) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); - daStartAndGoal_c* startAndGoal_p = (daStartAndGoal_c*)fpcM_SearchByName(PROC_START_AND_GOAL); + daStartAndGoal_c* startAndGoal_p = (daStartAndGoal_c*)fpcM_SearchByName(fpcNm_START_AND_GOAL_e); if (startAndGoal_p == NULL) { return 0; @@ -1517,7 +1517,7 @@ int daNpcTheB_c::EvCut_CoachGuardGameOver(int i_staffId) { } case '0003': - ((daCoach2D_c*)fpcM_SearchByName(PROC_COACH2D))->hide(); + ((daCoach2D_c*)fpcM_SearchByName(fpcNm_COACH2D_e))->hide(); break; case '0004': @@ -1576,18 +1576,18 @@ static actor_method_class daNpcTheB_MethodTable = { }; actor_process_profile_definition g_profile_NPC_THEB = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_THEB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcTheB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 331, // mPriority - &daNpcTheB_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_THEB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcTheB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_THEB_e, + /* Actor SubMtd */ &daNpcTheB_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index 4d5440d21ff..adf3a00575b 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -171,7 +171,7 @@ void daNPC_TK_c::setActionMode(int param_0) { field_0x694 = 0; field_0x6c5 = 0; current.angle.y = shape_angle.y; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } } @@ -311,7 +311,7 @@ static s32 checkRangeOfTake(fopAc_ac_c* param_0, fopAc_ac_c* param_1) { static void* s_obj_sub(void* param_0, void* param_1) { if (fopAcM_IsActor(param_0) != 0 && - (fopAcM_GetName(param_0) == PROC_NI || + (fopAcM_GetName(param_0) == fpcNm_NI_e || fopAcM_CheckCarryType((fopAc_ac_c*)param_0, fopAcM_CARRY_CHICKEN) != 0)) { checkRangeOfTake((fopAc_ac_c*)param_1, (fopAc_ac_c*)param_0); @@ -321,7 +321,7 @@ static void* s_obj_sub(void* param_0, void* param_1) { static void* s_hanjo(void* param_0, void* param_1) { UNUSED(param_1); - if (fopAcM_IsActor(param_0) != 0 && fopAcM_GetName(param_0) == PROC_NPC_HANJO) { + if (fopAcM_IsActor(param_0) != 0 && fopAcM_GetName(param_0) == fpcNm_NPC_HANJO_e) { return param_0; } else { return 0; @@ -567,7 +567,7 @@ bool daNPC_TK_c::executePerchDemo(int param_0) { } current.pos.y = current.pos.y + field_0x67c; - + dPnt* pnt = dPath_GetPnt(mpPath1, mPathStep2); pathPos = pnt->m_position; cLib_addCalcAngleS(¤t.angle.y, cLib_targetAngleY(¤t.pos, &pathPos), 0x20, @@ -947,8 +947,8 @@ void daNPC_TK_c::executeAttack() { if (mSphere.ChkAtHit() != 0) { fopAc_ac_c* local_118 = dCc_GetAc(mSphere.GetAtHitObj()->GetAc()); - if (fopAcM_GetName(local_118) != PROC_ALINK && - fopAcM_GetName(local_118) != PROC_E_ARROW) + if (fopAcM_GetName(local_118) != fpcNm_ALINK_e && + fopAcM_GetName(local_118) != fpcNm_E_ARROW_e) { setAwayAction(0); @@ -979,11 +979,11 @@ void daNPC_TK_c::executeAttack() { field_0x634 = m_near_actor; if (field_0x634 != 0 && current.pos.abs(field_0x634->current.pos) < l_HIO.field_0x34) { - if (fopAcM_GetName(field_0x634) == PROC_NI) { + if (fopAcM_GetName(field_0x634) == fpcNm_NI_e) { mCarryType = 0; - } else if (fopAcM_GetName(field_0x634) == PROC_OBJ_KAGO) { + } else if (fopAcM_GetName(field_0x634) == fpcNm_OBJ_KAGO_e) { mCarryType = 2; - } else if (fopAcM_GetName(field_0x634) == PROC_OBJ_PUMPKIN) { + } else if (fopAcM_GetName(field_0x634) == fpcNm_OBJ_PUMPKIN_e) { mCarryType = 1; } @@ -1287,11 +1287,11 @@ void daNPC_TK_c::executeBack() { fopAcM_setHawkCarryNow(field_0x634); - if (fopAcM_GetName(field_0x634) == PROC_NI) { + if (fopAcM_GetName(field_0x634) == fpcNm_NI_e) { fopAcM_setCarryNow(field_0x634, 0); } - if (fopAcM_GetName(field_0x634) == PROC_OBJ_KAGO && + if (fopAcM_GetName(field_0x634) == fpcNm_OBJ_KAGO_e && /* dSv_event_flag_c::F_0577 - Ordon Village - 2nd Day - Retrieved basket from monkey (hit hawk) */ !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x241])) { @@ -1395,7 +1395,7 @@ void daNPC_TK_c::executeBack() { if (field_0x694 == 10) { if (current.pos.absXZ(playerPos) < 200.0f) { field_0x6b4 = 0; - if (fopAcM_GetName(field_0x634) == PROC_OBJ_KAGO && + if (fopAcM_GetName(field_0x634) == fpcNm_OBJ_KAGO_e && /* dSv_event_flag_c::F_0577 - Ordon Village - 2nd Day - Retrieved basket from monkey (hit hawk) */ !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x241])) { @@ -1436,7 +1436,7 @@ void daNPC_TK_c::executeBack() { field_0x6c3 = 0; fopAcM_cancelHawkCarryNow(field_0x634); - if (fopAcM_GetName(field_0x634) == PROC_NI) { + if (fopAcM_GetName(field_0x634) == fpcNm_NI_e) { fopAcM_cancelCarryNow(field_0x634); } field_0x634 = NULL; @@ -1536,7 +1536,7 @@ void daNPC_TK_c::executeAttackLink() { field_0x694 = 1; setBck(8, 2, 10.0f, 1.0f); mSound.startCreatureVoice(Z2SE_HAWK_V_TAKE_OFF, -1); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); field_0x6b4 = 0x1e; break; } @@ -1566,12 +1566,12 @@ void daNPC_TK_c::executeAttackLink() { cLib_chaseF(&speed.y, cM_scos(pitch) * (40.0f + nREG_F(5)), 3.0f); cLib_chaseF(&speedF, cM_ssin(pitch) * (40.0f + nREG_F(5)), 3.0f); if (mSphere.ChkAtHit()) { - if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) != PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) != fpcNm_ALINK_e) { if (daPy_getPlayerActorClass()->getDamageWaitTimer() == 0) { break; } } - if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) == fpcNm_ALINK_e) { field_0x6c7++; mSphere.ClrAtHit(); } @@ -1603,7 +1603,7 @@ void daNPC_TK_c::executeAttackLink() { mSphere.OnAtSetBit(); field_0x6ae = 1; if (mSphere.ChkAtHit() != 0) { - if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) == fpcNm_ALINK_e) { field_0x6c7++; mSphere.ClrAtHit(); field_0x694 = 4; @@ -1641,8 +1641,8 @@ void daNPC_TK_c::executeAttackLink() { cLib_chaseF(&speed.y, targetSpeedY, 1.0f); cLib_chaseF(&speedF, 30.0f, 3.0f); if (field_0x6b0 == 0) { - if (dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_HOOK_CARRY_NOW) || - dComIfGp_checkPlayerStatus0(0, fopAcM_STATUS_UNK_0x100) || + if (dComIfGp_checkPlayerStatus0(0, fopAcStts_HOOK_CARRY_NOW_e) || + dComIfGp_checkPlayerStatus0(0, fopAcStts_CULL_e) || daPy_getPlayerActorClass()->checkWolfTagLockJumpReady()) { field_0x6b0 = 10; @@ -1804,7 +1804,7 @@ void daNPC_TK_c::executeAttackDemo() { cLib_chaseF(&speedF, (50.0f + nREG_F(4)) * cM_ssin(pitch), 10.0f); if (mSphere.ChkAtHit()) { - if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) != PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) != fpcNm_ALINK_e) { if (daPy_getPlayerActorClass()->getDamageWaitTimer() == 0) { return; } @@ -1815,7 +1815,7 @@ void daNPC_TK_c::executeAttackDemo() { field_0x694 = 2; field_0x6b0 = 0xf; - if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(mSphere.GetAtHitObj()->GetAc())) == fpcNm_ALINK_e) { field_0x6c7++; mSphere.ClrAtHit(); } @@ -2456,7 +2456,7 @@ void daNPC_TK_c::executeWolfPerch() { void daNPC_TK_c::executeResistanceDemo() { daNpcMoiR_c* npcMoiR; - if (fopAcM_SearchByName(PROC_NPC_MOIR, (fopAc_ac_c**)&npcMoiR) == 0 || npcMoiR == NULL) { + if (fopAcM_SearchByName(fpcNm_NPC_MOIR_e, (fopAc_ac_c**)&npcMoiR) == 0 || npcMoiR == NULL) { return; } @@ -3303,20 +3303,20 @@ static actor_method_class l_daNPC_TK_Method = { }; actor_process_profile_definition g_profile_NPC_TK = { - fpcLy_CURRENT_e, // mLayerID - 6, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNPC_TK_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 703, // mPriority - &l_daNPC_TK_Method, // sub_method - 0x08044000, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 6, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNPC_TK_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TK_e, + /* Actor SubMtd */ &l_daNPC_TK_Method, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp index a0a89a007d2..7483efbaa1a 100644 --- a/src/d/actor/d_a_npc_tkc.cpp +++ b/src/d/actor/d_a_npc_tkc.cpp @@ -1389,18 +1389,18 @@ static actor_method_class daNpcTkc_MethodTable = { }; actor_process_profile_definition g_profile_NPC_TKC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TKC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcTkc_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 375, // mPriority - &daNpcTkc_MethodTable, // sub_method - 0x08044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TKC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcTkc_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TKC_e, + /* Actor SubMtd */ &daNpcTkc_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp index 74589199c97..ac21301169c 100644 --- a/src/d/actor/d_a_npc_tkj.cpp +++ b/src/d/actor/d_a_npc_tkj.cpp @@ -480,7 +480,7 @@ int daNpcTkj_c::wait(void*) { mJntAnm.lookNone(0); } - if (mItemNo == fpcNm_ITEM_DUNGEON_EXIT_2 && mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) { + if (mItemNo == dItemNo_DUNGEON_EXIT_2_e && mItemPartnerId == fpcM_ERROR_PROCESS_ID_e) { dComIfGs_onDungeonItemWarp(); fopAcM_delete(this); } @@ -691,18 +691,18 @@ static actor_method_class daNpc_Tkj_MethodTable = { }; actor_process_profile_definition g_profile_NPC_TKJ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TKJ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcTkj_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 373, // mPriority - &daNpc_Tkj_MethodTable, // sub_method - 0x08044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TKJ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcTkj_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TKJ_e, + /* Actor SubMtd */ &daNpc_Tkj_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index d364c06cc19..de47bdd01ab 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_tkj2.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -207,7 +207,7 @@ static void CheckRoof(npc_tkj2_class* i_this) { for (int i = 0; i < 4; i++) { cLib_offsetPos(&end, &a_this->current.pos, a_this->shape_angle.y + i * 0x4000, &spc8); lin_chk.Set(&a_this->current.pos, &end, NULL); - + if (dComIfG_Bgsp().LineCross(&lin_chk)) { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(lin_chk, &plane); @@ -361,7 +361,7 @@ static void npc_tkj2_normal(npc_tkj2_class* i_this) { case 10: fVar1 = 5.0f; sp50.set(0.0f, 100.0f, 100.0f); - + if (GndCheck(i_this, sp50)) { i_this->field_0x60a = 1; i_this->field_0x610[0] = 0; @@ -488,7 +488,7 @@ static s8 npc_tkj2_carry(npc_tkj2_class* i_this) { a_this->home.pos = return_pos_get(i_this); } - + if (fopAcM_checkCarryNow(a_this)) { if (daPy_getLinkPlayerActorClass()->checkAutoJump()) { if (strcmp(dComIfGp_getStartStageName(), "D_MN07") == 0 && fopAcM_GetRoomNo(a_this) == 1) { @@ -496,7 +496,7 @@ static s8 npc_tkj2_carry(npc_tkj2_class* i_this) { } } } - + return rv; } @@ -513,7 +513,7 @@ static void npc_tkj2_fly(npc_tkj2_class* i_this) { fVar1 = 1.0f; i_this->field_0x5b8 = a_this->home.pos; break; - + case 1: fVar1 = 0.3f; break; @@ -567,7 +567,7 @@ static void npc_tkj2_drop(npc_tkj2_class* i_this) { i_this->field_0x60a = 0; a_this->home.pos = a_this->current.pos; } - + cLib_addCalc2(&a_this->speedF, 20.0f, 0.5f, 10.0f); } static void npc_tkj2_return(npc_tkj2_class* i_this) { @@ -644,7 +644,7 @@ static void npc_tkj2_return(npc_tkj2_class* i_this) { static void ObjHit(npc_tkj2_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; - + i_this->field_0x620--; if (i_this->field_0x620 <= 0) { i_this->field_0x620 = 0; @@ -777,7 +777,7 @@ static void action(npc_tkj2_class* i_this) { i_this->field_0xa8c = 1; } - if (fopAcM_CheckStatus(a_this, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (fopAcM_CheckStatus(a_this, fopAcStts_HOOK_CARRY_NOW_e)) { i_this->field_0x5ea = 1; } else if (i_this->field_0x5ea != 0) { i_this->field_0x5ea = 0; @@ -840,7 +840,7 @@ static void action(npc_tkj2_class* i_this) { if (!fopAcM_checkCarryNow(a_this)) { cXyz* ccMoveP = i_this->mStts.GetCCMoveP(); - + if (ccMoveP != NULL) { a_this->current.pos.x += ccMoveP->x; a_this->current.pos.y += ccMoveP->y; @@ -881,7 +881,7 @@ static void action(npc_tkj2_class* i_this) { if (sVar7 < 0x4000 && sVar7 > -0x4000) { sVar3 = cM_atan2s(sp38.x, sp38.z) - a_this->shape_angle.y; sVar4 = (s16)cM_atan2s(sp38.y, JMAFastSqrt(sp38.x * sp38.x + sp38.z * sp38.z)); - + if (sVar3 > sVar6) { sVar3 = sVar6; } else if (sVar3 < -sVar6) { @@ -986,7 +986,7 @@ static int daNpc_Tkj2_Execute(npc_tkj2_class* i_this) { mDoMtx_stack_c::ZXYrotM(a_this->shape_angle); mDoMtx_stack_c::scaleM(l_HIO.basic_size, l_HIO.basic_size, l_HIO.basic_size); - + J3DModel* model = i_this->mpModelMorf->getModel(); model->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mpModelMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this))); @@ -1158,18 +1158,18 @@ static actor_method_class l_daNpc_Tkj2_Method = { }; actor_process_profile_definition g_profile_NPC_TKJ2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TKJ2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_tkj2_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 696, // mPriority - &l_daNpc_Tkj2_Method, // sub_method - 0x000C4000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TKJ2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_tkj2_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TKJ2_e, + /* Actor SubMtd */ &l_daNpc_Tkj2_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index ef740d3c265..af79537cb42 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -669,7 +669,7 @@ void daNpcTks_c::reset() { setAction(&daNpcTks_c::demo_scannon); cXyz i_pos(current.pos); i_pos.y += 60.0f; - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 3, &i_pos, fopAcM_GetRoomNo(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 3, &i_pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); break; } @@ -680,7 +680,7 @@ void daNpcTks_c::reset() { setAction(&daNpcTks_c::demo_Lv6Gate); cXyz i_pos(current.pos); i_pos.y += 60.0f; - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 3, &i_pos, fopAcM_GetRoomNo(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 3, &i_pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); break; } @@ -693,7 +693,7 @@ void daNpcTks_c::reset() { cXyz i_pos(current.pos); csXyz i_angle(0, fopAcM_searchPlayerAngleY(this), 0); i_pos.y += 60.0f; - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 4, &i_pos, fopAcM_GetRoomNo(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 4, &i_pos, fopAcM_GetRoomNo(this), &i_angle, NULL, -1, NULL); break; } @@ -731,7 +731,7 @@ void daNpcTks_c::reset() { setAction(&daNpcTks_c::waitLv6); cXyz i_pos(current.pos); i_pos.y += 60.0f; - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 4, &i_pos, fopAcM_GetRoomNo(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 4, &i_pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); break; } @@ -2334,7 +2334,7 @@ void daNpcTks_c::demo_Lv7Start() { current.pos.set(120.0f, 3000.0f, 5500.0f); old.pos = current.pos; setAngle(fopAcM_searchPlayerAngleY(this)); - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 3, ¤t.pos, fopAcM_GetRoomNo(this), + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 3, ¤t.pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); dComIfGp_event_setTalkPartner(this); field_0x138b = false; @@ -2528,7 +2528,7 @@ void daNpcTks_c::demo_Lv7Start() { int iVar1[2] = {0x2520, -1}; if (talkProc(iVar1, TRUE, NULL)) { if (!mFlow.checkEndFlow()) { - fopAc_ac_c* actor_p = fopAcM_SearchByName(PROC_Tag_Lv7Gate); + fopAc_ac_c* actor_p = fopAcM_SearchByName(fpcNm_Tag_Lv7Gate_e); if (actor_p != NULL) { setLookMode(LOOK_ACTOR, actor_p); } @@ -3046,18 +3046,18 @@ static actor_method_class daNpcTks_MethodTable = { }; actor_process_profile_definition g_profile_NPC_TKS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TKS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcTks_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 374, // mPriority - &daNpcTks_MethodTable, // sub_method - 0x08044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TKS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcTks_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TKS_e, + /* Actor SubMtd */ &daNpcTks_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index bbd636138b1..db423a1d135 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_toby.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -441,7 +441,7 @@ void* daNpc_Toby_c::srchToby(void* i_actor, void* i_data) { if (mFindCount < 50) { fopAc_ac_c* actor_p = (fopAc_ac_c*)i_actor; if (actor_p != NULL && actor_p != o_actor) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor_p)) && fopAcM_GetName(actor_p) == PROC_NPC_TOBY) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor_p)) && fopAcM_GetName(actor_p) == fpcNm_NPC_TOBY_e) { mFindActorPtrs[mFindCount] = actor_p; mFindCount++; } @@ -615,7 +615,7 @@ int daNpc_Toby_c::checkChangeEvt() { if (dComIfGp_event_chkTalkXY()) { if (dComIfGp_evmng_ChkPresentEnd()) { mPreItemNo = dComIfGp_event_getPreItemNo(); - if (mPreItemNo == fpcNm_ITEM_RAFRELS_MEMO) { + if (mPreItemNo == dItemNo_RAFRELS_MEMO_e) { return FALSE; } @@ -702,16 +702,16 @@ void daNpc_Toby_c::srchActors() { switch (mType) { case 0: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_Obj_TobyHouse)); + mActorMngr[0].entry(getNearestActorP(fpcNm_Obj_TobyHouse_e)); } if (mActorMngr[1].getActorP() == NULL) { // Fyer's music box that he plays when Link gets shot from the cannon. - mActorMngr[1].entry(getNearestActorP(PROC_OBJ_AUTOMATA)); + mActorMngr[1].entry(getNearestActorP(fpcNm_OBJ_AUTOMATA_e)); } if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_Obj_SCannon)); + mActorMngr[2].entry(getNearestActorP(fpcNm_Obj_SCannon_e)); } break; @@ -719,7 +719,7 @@ void daNpc_Toby_c::srchActors() { case 1: if (mActorMngr[3].getActorP() == NULL) { // Shadow Bulbin (drained Lake Hylia Kargorok fight): - mActorMngr[3].entry(getNearestActorP(PROC_E_RDY)); + mActorMngr[3].entry(getNearestActorP(fpcNm_E_RDY_e)); } break; @@ -729,7 +729,7 @@ void daNpc_Toby_c::srchActors() { case 3: if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_Obj_SCannon)); + mActorMngr[2].entry(getNearestActorP(fpcNm_Obj_SCannon_e)); } break; @@ -760,7 +760,7 @@ int daNpc_Toby_c::evtCutProc() { } return TRUE; - } + } return FALSE; } @@ -797,9 +797,9 @@ void daNpc_Toby_c::action() { } void daNpc_Toby_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -1072,7 +1072,7 @@ int daNpc_Toby_c::cutTobyHouseFire(int arg0) { retval = 1; break; - case 3: + case 3: if (mMotionSeqMngr.getNo() != 19) { mpMorf[0]->setPlaySpeed(mPlaySpeed); mBckAnm.setPlaySpeed(mPlaySpeed); @@ -1084,7 +1084,7 @@ int daNpc_Toby_c::cutTobyHouseFire(int arg0) { action(); break; - case 4: + case 4: if (cLib_calcTimer(&mEventTimer) == 0) { retval = 1; } @@ -1381,15 +1381,15 @@ int daNpc_Toby_c::cutRepairSCannon(int arg0) { mHide = 0; mMotionSeqMngr.setNo(0x15, 0.0f, 0, 0); break; - case 1: + case 1: mHide = 0; mMotionSeqMngr.setNo(0x16, 0.0f, 0, 0); break; - case 2: + case 2: mHide = 0; mMotionSeqMngr.setNo(0x17, 0.0f, 0, 0); break; - default: + default: mHide = 1; break; } @@ -2098,7 +2098,7 @@ int daNpc_Toby_c::talk(void*) { } #endif - if (mPreItemNo == fpcNm_ITEM_RAFRELS_MEMO) { + if (mPreItemNo == dItemNo_RAFRELS_MEMO_e) { initTalk(2, NULL); } else { initTalk(mFlowNodeNo, NULL); @@ -2112,7 +2112,7 @@ int daNpc_Toby_c::talk(void*) { if (mStagger.checkStagger() == 0) { if (mTwilight || mPlayerAngle == mCurAngle.y) { int spC[3] = {-1, -1, -1}; - if (mPreItemNo == fpcNm_ITEM_RAFRELS_MEMO) { + if (mPreItemNo == dItemNo_RAFRELS_MEMO_e) { spC[0] = 0x1420; spC[1] = 0x142D; } @@ -2206,20 +2206,20 @@ static actor_method_class daNpc_Toby_MethodTable = { }; actor_process_profile_definition g_profile_NPC_TOBY = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TOBY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Toby_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 377, // mPriority - &daNpc_Toby_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TOBY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Toby_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TOBY_e, + /* Actor SubMtd */ &daNpc_Toby_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_tr.cpp b/src/d/actor/d_a_npc_tr.cpp index cc30258dcda..cb0ae2e9422 100644 --- a/src/d/actor/d_a_npc_tr.cpp +++ b/src/d/actor/d_a_npc_tr.cpp @@ -254,18 +254,18 @@ static actor_method_class l_daNPC_TR_Method = { }; actor_process_profile_definition g_profile_NPC_TR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_TR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_tr_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 723, // mPriority - &l_daNPC_TR_Method, // sub_method - 0x40100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_TR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_tr_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_TR_e, + /* Actor SubMtd */ &l_daNPC_TR_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index 093423cc663..3516b4c1404 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -712,9 +712,9 @@ void daNpc_Uri_c::action() { } void daNpc_Uri_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { @@ -952,7 +952,7 @@ BOOL daNpc_Uri_c::chkPlayerCarryBasket() { fopAc_ac_c* actor = NULL; daPy_py_c* player = daPy_getPlayerActorClass(); if (fopAcM_SearchByID(player->getGrabActorID(), &actor) && actor != NULL && - fopAcM_GetName(actor) == PROC_OBJ_KAGO) + fopAcM_GetName(actor) == fpcNm_OBJ_KAGO_e) { return TRUE; } @@ -1920,20 +1920,20 @@ static actor_method_class daNpc_Uri_MethodTable = { }; actor_process_profile_definition g_profile_NPC_URI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_URI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Uri_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 378, // mPriority - &daNpc_Uri_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_URI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Uri_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_URI_e, + /* Actor SubMtd */ &daNpc_Uri_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_npc_worm.cpp b/src/d/actor/d_a_npc_worm.cpp index 50789f2e801..4c8e31d56c4 100644 --- a/src/d/actor/d_a_npc_worm.cpp +++ b/src/d/actor/d_a_npc_worm.cpp @@ -401,18 +401,18 @@ static actor_method_class l_daNPC_WORM_Method = { }; actor_process_profile_definition g_profile_NPC_WORM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_WORM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(npc_worm_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 429, // mPriority - &l_daNPC_WORM_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_WORM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(npc_worm_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_WORM_e, + /* Actor SubMtd */ &l_daNPC_WORM_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index f57c4c34a7a..1d3ae764042 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -1299,7 +1299,7 @@ int daNpcWrestler_c::setAction(actionFunc action) { } static void* s_sub1(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Tag_Arena + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Tag_Arena_e && ((daNpcWrestler_c*)i_data)->checkArenaSub((daNpcWrestler_c*)i_actor)) { return i_actor; } @@ -1333,7 +1333,7 @@ bool daNpcWrestler_c::checkArenaSub(fopAc_ac_c* actor) { static void* s_sub2(void* i_actor, void* i_data) { (void) i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRA) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_GRA_e) { daNpc_grA_c* goron = (daNpc_grA_c*)i_actor; if (goron->getType() == 3) { goron->setTagJump(); @@ -5221,18 +5221,18 @@ static actor_method_class daNpcWrestler_MethodTable = { }; actor_process_profile_definition g_profile_NPC_WRESTLER = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_WRESTLER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpcWrestler_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 329, // mPriority - &daNpcWrestler_MethodTable, // sub_method - 0x00044007, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_WRESTLER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpcWrestler_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_WRESTLER_e, + /* Actor SubMtd */ &daNpcWrestler_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp index f55f755e044..c9e9e642800 100644 --- a/src/d/actor/d_a_npc_yamid.cpp +++ b/src/d/actor/d_a_npc_yamid.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_yamid.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -195,7 +195,7 @@ cPhs_Step daNpc_yamiD_c::create() { daNpcT_ct(this, daNpc_yamiD_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList); - + mType = getType(); mFlowNodeNo = getFlowNodeNo(); mTwilight = false; @@ -220,7 +220,7 @@ cPhs_Step daNpc_yamiD_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeFar(this, 3.0f); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); #if DEBUG @@ -232,7 +232,7 @@ cPhs_Step daNpc_yamiD_c::create() { mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); mCcStts.Init(mpHIO->m.common.weight, 0, this); - + field_0xe44.Set(mCcDCyl); field_0xe44.SetStts(&mCcStts); field_0xe44.SetTgHitCallback(tgHitCallBack); @@ -329,7 +329,7 @@ int daNpc_yamiD_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) { if (param_2 == 0) { J3DModel* model = j3dSys.getModel(); daNpc_yamiD_c* i_this = (daNpc_yamiD_c*)model->getUserArea(); - + if (i_this != NULL) { i_this->ctrlJoint(i_joint, model); } @@ -394,7 +394,7 @@ void daNpc_yamiD_c::reset() { if (mpMatAnm[0] != NULL) { mpMatAnm[0]->initialize(); } - + if (getPathID() != 0xFF) { mPath.initialize(); mPath.setPathInfo(getPathID(), fopAcM_GetRoomNo(this), 0); @@ -533,7 +533,7 @@ void daNpc_yamiD_c::setAttnPos() { mDoMtx_stack_c::multVec(&work, &eyePos); mJntAnm.setEyeAngleX(eyePos, 1.0f, 0); mJntAnm.setEyeAngleY(eyePos, mCurAngle.y, TRUE, 1.0f, 0); - + attention_info.position = current.pos; attention_info.position.y += mpHIO->m.common.attention_offset; } @@ -558,7 +558,7 @@ void daNpc_yamiD_c::setCollision() { f32 cyl_h = mCylH; f32 wall_r = mWallR; work = current.pos; - + field_0xe44.SetCoSPrm(0x79); field_0xe44.SetTgType(tgType); field_0xe44.SetTgSPrm(tgSPrm); @@ -629,7 +629,7 @@ int daNpc_yamiD_c::wait(void* param_1) { if (chkActorInSight(mPlayerActorMngr.getActorP(), mAttnFovY, mCurAngle.y)) { mJntAnm.lookPlayer(0); - + if (field_0xf82 == 0 && !is_vanish()) { cXyz pos(current.pos); Z2GetAudioMgr()->seStart(Z2SE_YAMI_MURMUR_T, &pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -796,18 +796,18 @@ static actor_method_class daNpc_yamiD_MethodTable = { }; actor_process_profile_definition g_profile_NPC_YAMID = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_YAMID, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_yamiD_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 315, // mPriority - &daNpc_yamiD_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YAMID_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_yamiD_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_YAMID_e, + /* Actor SubMtd */ &daNpc_yamiD_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp index 6db606a991e..0c418b1730a 100644 --- a/src/d/actor/d_a_npc_yamis.cpp +++ b/src/d/actor/d_a_npc_yamis.cpp @@ -162,7 +162,7 @@ cPhs_Step daNpc_yamiS_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeFar(this, 3.0f); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -727,18 +727,18 @@ static actor_method_class daNpc_yamiS_MethodTable = { }; actor_process_profile_definition g_profile_NPC_YAMIS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_YAMIS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_yamiS_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 317, // mPriority - &daNpc_yamiS_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YAMIS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_yamiS_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_YAMIS_e, + /* Actor SubMtd */ &daNpc_yamiS_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp index fb74a15e521..f5faefdf975 100644 --- a/src/d/actor/d_a_npc_yamit.cpp +++ b/src/d/actor/d_a_npc_yamit.cpp @@ -165,7 +165,7 @@ cPhs_Step daNpc_yamiT_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeFar(this, 3.0f); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -250,7 +250,7 @@ void* daNpc_yamiT_c::_search_Tag(void* i_actor, void* i_data) { return NULL; } - if (fopAcM_GetName(i_actor) == PROC_TAG_YAMI && + if (fopAcM_GetName(i_actor) == fpcNm_TAG_YAMI_e && ((daNpc_yamiT_c*)i_data)->_chk_TagPrm((fopAc_ac_c*)i_actor)) { return i_actor; @@ -756,18 +756,18 @@ static actor_method_class daNpc_yamiT_MethodTable = { }; actor_process_profile_definition g_profile_NPC_YAMIT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_YAMIT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_yamiT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 316, // mPriority - &daNpc_yamiT_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YAMIT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_yamiT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_YAMIT_e, + /* Actor SubMtd */ &daNpc_yamiT_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index d26b030a49b..d690db95e20 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -642,7 +642,7 @@ BOOL daNpc_Yelia_c::checkChangeEvt() { if (dComIfGp_evmng_ChkPresentEnd()) { mPreItemNo = dComIfGp_event_getPreItemNo(); if (mType == TYPE_WOOD_STATUE && daNpcT_chkEvtBit(0x11f) - && mPreItemNo == fpcNm_ITEM_IRIAS_PENDANT) + && mPreItemNo == dItemNo_IRIAS_PENDANT_e) { if (mPendantTimer >= 70) { dStage_changeScene(10, 0.0f, 0, fopAcM_GetRoomNo(this), 0, @@ -663,7 +663,7 @@ BOOL daNpc_Yelia_c::checkChangeEvt() { mPendantTimer++; } else if (mType == TYPE_KAKARIKO && !daNpcT_chkEvtBit(0x11f) - && mPreItemNo == fpcNm_ITEM_WOOD_STATUE) + && mPreItemNo == dItemNo_WOOD_STATUE_e) { mEvtNo = EVENT_TAKE_WOODSTATUE; evtChange(); @@ -749,23 +749,23 @@ void daNpc_Yelia_c::srchActors() { switch (mType) { case TYPE_KAKARIKO: if (mActorMngr[2].getActorP() == NULL) { - mActorMngr[2].entry(getNearestActorP(PROC_NPC_GRD)); + mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_GRD_e)); } if (mActorMngr[3].getActorP() == NULL) { - mActorMngr[3].entry(getNearestActorP(PROC_NPC_GRZ)); + mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_GRZ_e)); } break; case TYPE_TWILIGHT: if (mActorMngr[0].getActorP() == NULL) { - mActorMngr[0].entry(getNearestActorP(PROC_NPC_THE)); + mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_THE_e)); } if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_ZRC)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_ZRC_e)); } break; case TYPE_AFTER_ESCORT: if (mActorMngr[1].getActorP() == NULL) { - mActorMngr[1].entry(getNearestActorP(PROC_NPC_KOLINB)); + mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_KOLINB_e)); } break; case TYPE_HORSE: @@ -817,9 +817,9 @@ void daNpc_Yelia_c::action() { } void daNpc_Yelia_c::beforeMove() { - fopAcM_OffStatus(this, 0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { attention_info.flags = 0; @@ -1193,7 +1193,7 @@ BOOL daNpc_Yelia_c::cutTakeWoodStatue(int i_staffId) { if (prm == 13) { if (mItemId == fpcM_ERROR_PROCESS_ID_e) { mItemId = fopAcM_createItemForPresentDemo(¤t.pos, - fpcNm_ITEM_WOOD_STATUE, 9, -1, fopAcM_GetRoomNo(this), &mCurAngle, &scale); + dItemNo_WOOD_STATUE_e, 9, -1, fopAcM_GetRoomNo(this), &mCurAngle, &scale); } if (fopAcM_SearchByID(mItemId, (fopAc_ac_c**)&item) && item != NULL && fopAc_IsActor(item)) { @@ -1589,18 +1589,18 @@ static actor_method_class daNpc_Yelia_MethodTable = { }; actor_process_profile_definition g_profile_NPC_YELIA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_YELIA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Yelia_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 379, // mPriority - &daNpc_Yelia_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YELIA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Yelia_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_YELIA_e, + /* Actor SubMtd */ &daNpc_Yelia_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 1cae05166ab..ce9efbe8d5d 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_ykm.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -803,7 +803,7 @@ void* daNpc_ykM_c::srchGadget(void* i_actor, void* i_data) { if (mFindCount < 50) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(actor) == PROC_OBJ_GADGET) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(actor) == fpcNm_OBJ_GADGET_e) { mFindActorPtrs[mFindCount] = actor; mFindCount++; } @@ -852,7 +852,7 @@ void* daNpc_ykM_c::srchYkm(void* i_actor, void* i_data) { if (mFindCount < 50) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(actor) == PROC_NPC_YKM) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(actor) == fpcNm_NPC_YKM_e) { mFindActorPtrs[mFindCount] = actor; mFindCount++; } @@ -885,7 +885,7 @@ void* daNpc_ykM_c::srchYkw(void* i_actor, void* i_data) { if (mFindCount < 50) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(actor) == PROC_NPC_YKW) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(actor) == fpcNm_NPC_YKW_e) { mFindActorPtrs[mFindCount] = actor; mFindCount++; } @@ -1008,7 +1008,7 @@ void daNpc_ykM_c::reset() { case TYPE_3: mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); break; case TYPE_4: @@ -1017,13 +1017,13 @@ void daNpc_ykM_c::reset() { case TYPE_5: mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); eventInfo.setIdx(1); break; case TYPE_6: mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); eventInfo.setIdx(2); break; } @@ -1095,15 +1095,15 @@ void daNpc_ykM_c::setParam() { mAcchCir.SetWallR(mWallR); mAcchCir.SetWallH(mpHIO->m.common.knee_length); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(this, fopAcStts_CULL_e); mRealShadowSize = mpHIO->m.common.real_shadow_size; if (field_0x157b != 0) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } if (mType == TYPE_3) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); mRealShadowSize = 1800.0f; } @@ -1134,14 +1134,14 @@ BOOL daNpc_ykM_c::checkChangeEvt() { case TYPE_COOK: if (!daNpcT_chkEvtBit(4) /* dSv_event_flag_c::TEST_004 - Snowpeak Ruins - Handed over secret ingredient */ - && checkItemGet(fpcNm_ITEM_TASTE, 1)) { + && checkItemGet(dItemNo_TASTE_e, 1)) { mEvtNo = EVENT_GET_TASTE; evtChange(); return TRUE; } - if (!daNpcT_chkEvtBit(3) /* dSv_event_flag_c::TEST_003 - Snowpeak Ruins - Handed over tomato puree */ - && checkItemGet(fpcNm_ITEM_TOMATO_PUREE, 1)) { + if (!daNpcT_chkEvtBit(3) /* dSv_event_flag_c::TEST_003 - Snowpeak Ruins - Handed over tomato puree */ + && checkItemGet(dItemNo_TOMATO_PUREE_e, 1)) { mEvtNo = EVENT_GET_TOMATOPUREE; evtChange(); return TRUE; @@ -1219,7 +1219,7 @@ void daNpc_ykM_c::srchActors() { case TYPE_3: if (mActorMngr[5].getActorP() == NULL) { - mActorMngr[5].entry(getNearestActorP(PROC_NPC_YKW)); + mActorMngr[5].entry(getNearestActorP(fpcNm_NPC_YKW_e)); } break; @@ -1320,10 +1320,10 @@ void daNpc_ykM_c::action() { } void daNpc_ykM_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw) { @@ -1802,7 +1802,7 @@ BOOL daNpc_ykM_c::chkTouchPlayer() { if (field_0xf94[i].ChkCoHit()) { actor = field_0xf94[i].GetCoHitAc(); - if (actor != NULL && fopAcM_GetName(actor) == PROC_ALINK) { + if (actor != NULL && fopAcM_GetName(actor) == fpcNm_ALINK_e) { return TRUE; } } @@ -1811,7 +1811,7 @@ BOOL daNpc_ykM_c::chkTouchPlayer() { if (field_0xe58.ChkCoHit()) { actor = field_0xe58.GetCoHitAc(); - if (actor != NULL && fopAcM_GetName(actor) == PROC_ALINK) { + if (actor != NULL && fopAcM_GetName(actor) == fpcNm_ALINK_e) { return TRUE; } } @@ -1990,7 +1990,7 @@ int daNpc_ykM_c::cutMeetingAgain(int i_cutIndex) { int prm = -1; int timer = 0; int unusedInt1 = 0; - + piVar1 = dComIfGp_evmng_getMyIntegerP(i_cutIndex, "prm"); if (piVar1 != NULL) { prm = *piVar1; @@ -2533,7 +2533,7 @@ int daNpc_ykM_c::cutLv5DungeonClear(int i_cutIndex) { mMotionSeqMngr.setNo(MOTION_WAIT_X, 0.0f, FALSE, 0); mJntAnm.lookNone(1); mHide = false; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); break; case 1: @@ -2667,7 +2667,7 @@ int daNpc_ykM_c::cutLv5DungeonClear(int i_cutIndex) { } } } - + if (rv == 0 && field_0xe58.ChkCoHit()) { if (daPy_getPlayerActorClass() == field_0xe58.GetCoHitAc()) { rv = 1; @@ -3086,7 +3086,7 @@ int daNpc_ykM_c::cutHug(int i_cutIndex) { void daNpc_ykM_c::setDialogueMotion() { int uVar1 = field_0x154c; uVar1 >>= 1; - + if (0.5f < cM_rnd()) { int dummy; // force r31 to be used for stack pointer instead of r1 if (cM_rnd() - 0.5f < 0.0f) { @@ -3349,7 +3349,7 @@ BOOL daNpc_ykM_c::cook(void* param_1) { } // fallthrough case 2: { - if (!daPy_py_c::checkNowWolf() && !checkItemGet(fpcNm_ITEM_TOMATO_PUREE, 1) && !checkItemGet(fpcNm_ITEM_TASTE, 1) && + if (!daPy_py_c::checkNowWolf() && !checkItemGet(dItemNo_TOMATO_PUREE_e, 1) && !checkItemGet(dItemNo_TASTE_e, 1) && !daNpcT_chkEvtBit(10) /* dSv_event_flag_c::F_0006 - Snowpeak Ruins - First conversation with Yeto in kitchen */) { actor_p = mActorMngr[6].getActorP(); if (actor_p != NULL && @@ -3629,7 +3629,7 @@ BOOL daNpc_ykM_c::talk(void* param_1) { mFaceMotionSeqMngr.setNo(FACE_NONE, -1.0f, FALSE, 0); mMotionSeqMngr.setNo(MOTION_WAIT_A, -1.0f, FALSE, 0); - if (daNpcT_chkEvtBit(10) /* dSv_event_flag_c::F_0006 - Snowpeak Ruins - First conversation with Yeto in kitchen */ + if (daNpcT_chkEvtBit(10) /* dSv_event_flag_c::F_0006 - Snowpeak Ruins - First conversation with Yeto in kitchen */ && !chkContinueAttnPlayer()) { field_0x157f = 1; } @@ -3736,18 +3736,18 @@ static actor_method_class daNpc_ykM_MethodTable = { }; actor_process_profile_definition g_profile_NPC_YKM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_YKM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_ykM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 380, // mPriority - &daNpc_ykM_MethodTable, // sub_method - 0x00040107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YKM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_ykM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_YKM_e, + /* Actor SubMtd */ &daNpc_ykM_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index 25b3df0e8fe..5a25135f094 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_ykw.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -479,7 +479,7 @@ void* daNpc_ykW_c::srchItemHeart(void* param_0, void* param_1) { fopAc_ac_c* item = (fopAc_ac_c*)param_0; if (item != NULL && item != npc && fopAcM_IsActor(item)) { - if (fopAcM_IsExecuting(fopAcM_GetID(item)) && fopAcM_GetName(item) == PROC_ITEM && + if (fopAcM_IsExecuting(fopAcM_GetID(item)) && fopAcM_GetName(item) == fpcNm_ITEM_e && ((daItemBase_c*)item)->getItemNo() == 0) { npc->mFindActorPtrs[mFindCount] = item; @@ -494,7 +494,7 @@ void* daNpc_ykW_c::srchYkw(void* param_0, void* param_1) { fopAc_ac_c* actor1 = (fopAc_ac_c*)param_0; fopAc_ac_c* actor2 = (fopAc_ac_c*)param_1; if (mFindCount < 50 && param_0 != NULL && actor1 != actor2) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor1)) && fopAcM_GetName(actor1) == PROC_NPC_YKW) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor1)) && fopAcM_GetName(actor1) == fpcNm_NPC_YKW_e) { mFindActorPtrs[mFindCount] = actor1; mFindCount++; } @@ -523,7 +523,7 @@ void* daNpc_ykW_c::srchYkm(void* param_0, void* param_1) { fopAc_ac_c* actor1 = (fopAc_ac_c*)param_0; fopAc_ac_c* actor2 = (fopAc_ac_c*)param_1; if (mFindCount < 50 && param_0 != NULL && actor1 != actor2) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor1)) && fopAcM_GetName(actor1) == PROC_NPC_YKM) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor1)) && fopAcM_GetName(actor1) == fpcNm_NPC_YKM_e) { mFindActorPtrs[mFindCount] = actor1; mFindCount++; } @@ -653,14 +653,14 @@ void daNpc_ykW_c::reset() { } mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); break; case 5: case 6: eventInfo.setIdx(1); mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); break; default: @@ -737,7 +737,7 @@ void daNpc_ykW_c::setParam() { mRealShadowSize = mpHIO->m.common.real_shadow_size; if (field_0xf80 == 4) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); mRealShadowSize = 1500.0f; } @@ -878,9 +878,9 @@ void daNpc_ykW_c::action() { } void daNpc_ykW_c::beforeMove() { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); if (checkHide()) { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } if (checkHide() || mNoDraw != 0) { attention_info.flags = 0; @@ -1586,7 +1586,7 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) { mHide = false; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e); newPlayerPos.setall(0.0f); @@ -1784,7 +1784,7 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) { mFindCount = 0; fpcM_Search(srchItemHeart, this); for (unkInt1 = 0; unkInt1 < mFindCount; unkInt1++) { - fopAcM_OffStatus(mFindActorPtrs[unkInt1], fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(mFindActorPtrs[unkInt1], fopAcStts_UNK_0x4000_e); } } } @@ -1825,7 +1825,7 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) { &unkXyz1, &unkFloat2, &unkFloat3, -1, 0, NULL); if (unkActor1 != NULL) { mDoAud_seStart(Z2SE_OBJ_YO_HEART_S, &itemPos, 0, 0); - fopAcM_OnStatus(unkActor1, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(unkActor1, fopAcStts_UNK_0x4000_e); } mEventTimer = (int)(unkFloat1 * 1.8000001f) + 6; field_0x1038++; @@ -2296,7 +2296,7 @@ int daNpc_ykW_c::cutHug(int param_0) { &heartScale, &heartSpeed, &heartSpeedY, -1, 0, 0); if (itemActor != NULL) { mDoAud_seStart(Z2SE_OBJ_YO_HEART_S, &heartPos, 0, 0); - fopAcM_OnStatus(itemActor, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(itemActor, fopAcStts_UNK_0x4000_e); } mEventTimer = timer; @@ -2401,7 +2401,7 @@ int daNpc_ykW_c::wait(void* param_0) { case 2: if (field_0x106f != 0) { mHide = true; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); if (putUtuwaHeart(0, 0.0f, 0.0f, 0x5000, 0)) { fopAcM_delete(this); } @@ -3028,18 +3028,18 @@ static actor_method_class daNpc_ykW_MethodTable = { }; actor_process_profile_definition g_profile_NPC_YKW = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_YKW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_ykW_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 381, // mPriority - &daNpc_ykW_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_YKW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_ykW_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_YKW_e, + /* Actor SubMtd */ &daNpc_ykW_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index 296e81c21b1..85847e0451a 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_zanb.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -170,7 +170,7 @@ cPhs_Step daNpc_zanB_c::create() { J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); #if DEBUG @@ -192,7 +192,7 @@ cPhs_Step daNpc_zanB_c::create() { mAcch.SetGrndNone(); mAcch.SetWallNone(); } - + mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); @@ -706,18 +706,18 @@ static actor_method_class daNpc_zanB_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZANB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZANB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_zanB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 382, // mPriority - &daNpc_zanB_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZANB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_zanB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZANB_e, + /* Actor SubMtd */ &daNpc_zanB_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp index 3fdcf6d84c0..1553ef50ef8 100644 --- a/src/d/actor/d_a_npc_zant.cpp +++ b/src/d/actor/d_a_npc_zant.cpp @@ -114,7 +114,7 @@ int daNpc_Zant_c::create() { } else { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -560,18 +560,18 @@ static actor_method_class daNpc_Zant_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZANT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZANT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Zant_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 383, // mPriority - &daNpc_Zant_MethodTable, // sub_method - 0x00044107, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZANT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Zant_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZANT_e, + /* Actor SubMtd */ &daNpc_Zant_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp index dee038bd59e..bd59d22cdfd 100644 --- a/src/d/actor/d_a_npc_zelR.cpp +++ b/src/d/actor/d_a_npc_zelR.cpp @@ -163,7 +163,7 @@ int daNpc_ZelR_c::create() { J3DModelData* modelData = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -632,18 +632,18 @@ static actor_method_class daNpc_ZelR_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZELR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZELR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_ZelR_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 385, // mPriority - &daNpc_ZelR_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZELR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_ZelR_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZELR_e, + /* Actor SubMtd */ &daNpc_ZelR_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index 7d8c74cad59..8eeabe0d670 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_zelRo.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -178,7 +178,7 @@ cPhs_Step daNpc_ZelRo_c::create() { OS_REPORT("\t(%s:%d) flowNo:%d, PathNo:%02x<%08x> ", fopAcM_getProcNameString(this), mType, mFlowNodeNo, (getPath() >> 32) & 0xFF, fopAcM_GetParam(this)); - + if (isDelete()) { OS_REPORT("===>isDelete:TRUE\n"); return cPhs_ERROR_e; @@ -189,7 +189,7 @@ cPhs_Step daNpc_ZelRo_c::create() { fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); @@ -269,7 +269,7 @@ int daNpc_ZelRo_c::Execute() { int daNpc_ZelRo_c::Draw() { J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData(); - + if (mpMatAnm[0] != NULL) { mdlData_p->getMaterialNodePointer(getEyeballLMaterialNo())->setMaterialAnm(mpMatAnm[0]); } @@ -498,7 +498,7 @@ void daNpc_ZelRo_c::beforeMove() { void daNpc_ZelRo_c::setAttnPos() { cXyz sp48(10.0f, -30.0f, 0.0f); - + mStagger.calc(FALSE); mJntAnm.setParam(this, mpMorf[0]->getModel(), &sp48, getBackboneJointNo(), getNeckJointNo(), getHeadJointNo(), mpHIO->m.common.body_angleX_min, mpHIO->m.common.body_angleX_max, @@ -633,7 +633,7 @@ int daNpc_ZelRo_c::talk(void* param_1) { bVar1 = true; } } - + if (bVar1 && talkProc(NULL, FALSE, NULL, FALSE)) { mPlayerActorMngr.entry(daPy_getPlayerActorClass()); dComIfGp_event_reset(); @@ -682,18 +682,18 @@ static actor_method_class daNpc_ZelRo_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZELRO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZELRO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_ZelRo_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 386, // mPriority - &daNpc_ZelRo_MethodTable, // sub_method - 0x00044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZELRO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_ZelRo_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZELRO_e, + /* Actor SubMtd */ &daNpc_ZelRo_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index 42dc79070a2..913a96d5d74 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -1,6 +1,6 @@ /** * @file d_a_npc_zelda.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -188,7 +188,7 @@ int daNpc_Zelda_c::create() { J3DModelData* unusedModelData = mpMorf[0]->getModel()->getModelData(); fopAcM_SetMtx(this, mpMorf[0]->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -200.0f, -100.0f, -200.0f, 200.0f, 300.0f, 200.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); mSound.init(¤t.pos, &eyePos, 3, 1); #if DEBUG @@ -787,18 +787,18 @@ static actor_method_class daNpc_Zelda_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZELDA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZELDA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_Zelda_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 384, // mPriority - &daNpc_Zelda_MethodTable, // sub_method - 0x00040108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZELDA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_Zelda_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZELDA_e, + /* Actor SubMtd */ &daNpc_Zelda_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp index 4386b54190c..8e0ec2415f5 100644 --- a/src/d/actor/d_a_npc_zra.cpp +++ b/src/d/actor/d_a_npc_zra.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_canoe.h" #include "d/actor/d_a_npc_hoz.h" #include "d/actor/d_a_obj_zraMark.h" @@ -1665,7 +1665,7 @@ void daNpc_zrA_c::reset() { speed.setall(0.0f); if ((mType == TYPE_SWIM && mPath.getPathInfo() != NULL) || mType == TYPE_WATERFALL) { - fopAcM_OnStatus(this, 0x8000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e); } mBtkID = 0; @@ -2337,18 +2337,18 @@ static actor_method_class daNpc_zrA_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZRA = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_NPC_ZRA, - &g_fpcLf_Method.base, - sizeof(daNpc_zrA_c), - 0, - 0, - &g_fopAc_Method.base, - 0x183, - &daNpc_zrA_MethodTable, - 0x44100, - fopAc_NPC_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZRA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_zrA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZRA_e, + /* Actor SubMtd */ &daNpc_zrA_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zra.inc b/src/d/actor/d_a_npc_zra.inc index 8bca2ba0be9..2ada4601c84 100644 --- a/src/d/actor/d_a_npc_zra.inc +++ b/src/d/actor/d_a_npc_zra.inc @@ -303,7 +303,7 @@ BOOL daNpc_zrA_c::talk(void* param_0) { } static void* s_subMulti(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_NPC_ZRA) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_NPC_ZRA_e) { daNpc_zrA_c* _this = static_cast(i_this); daNpc_zrA_c* other = static_cast(i_proc); if (other != _this && other->getType() == daNpc_zrA_c::TYPE_WAIT @@ -1643,14 +1643,14 @@ BOOL daNpc_zrA_c::diveCalc(s16 i_angleStep, s16 i_angleScale, BOOL param_2) { } static void* s_subHoz(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_NPC_HOZ) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_NPC_HOZ_e) { return i_proc; } return NULL; } static void* s_sub(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_CANOE) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_CANOE_e) { return i_proc; } return NULL; @@ -2353,9 +2353,9 @@ void daNpc_zrA_c::moveRiverPosCalc(cXyz& o_pos) { void daNpc_zrA_c::createRuppi() { int item; if (cLib_getRndValue(0, 5) < 4) { - item = fpcNm_ITEM_GREEN_RUPEE; + item = dItemNo_GREEN_RUPEE_e; } else { - item = fpcNm_ITEM_BLUE_RUPEE; + item = dItemNo_BLUE_RUPEE_e; } cXyz pos(0.0f, 0.0f, -100.0f); mDoMtx_stack_c::transS(current.pos); @@ -2550,7 +2550,7 @@ BOOL daNpc_zrA_c::ECut_thanksBlast(int i_staffID) { case 1: if (mActorMngr[2].getActorP() != NULL - && fopAcM_GetName(mActorMngr[2].getActorP()) == PROC_CANOE) + && fopAcM_GetName(mActorMngr[2].getActorP()) == fpcNm_CANOE_e) { static_cast(mActorMngr[2].getActorP())->setWaterFallDownSe(); } @@ -2883,7 +2883,7 @@ BOOL daNpc_zrA_c::ECut_resultAnnounce(int i_staffID) { case 1: if (mActorMngr[2].getActorP() != NULL - && fopAcM_GetName(mActorMngr[2].getActorP()) == PROC_CANOE) + && fopAcM_GetName(mActorMngr[2].getActorP()) == fpcNm_CANOE_e) { static_cast(mActorMngr[2].getActorP())->setWaterFallDownSe(); } @@ -3217,7 +3217,7 @@ void daNpc_zrA_c::calcCanoeMove(BOOL param_0) { } static void* s_subMark(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_ZRA_MARK) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_ZRA_MARK_e) { daObjZraMark_c* zra_mark = static_cast(i_proc); daNpc_zrA_c* _this = static_cast(i_this); if (zra_mark->getMarkNo() == _this->getNoFromParam()) { @@ -3534,7 +3534,7 @@ BOOL daNpc_zrA_c::tobiEnd(void* param_0) { } static void* s_subSP(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_NPC_ZRA) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_NPC_ZRA_e) { daNpc_zrA_c* other = static_cast(i_proc); daNpc_zrA_c* _this = static_cast(i_this); if (other->getType() == _this->getType() diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index 2745b04d8ff..83345259012 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -913,7 +913,7 @@ void daNpc_zrC_c::reset() { speed.setall(0.0f); setLookMode(LOOK_NONE); if (mType == 1) { - fopAcM_OffStatus(this, 0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } else if (mType == 2) { setExpression(EXPR_PRAY, -1.0f); setMotion(2, -1.0f, FALSE); @@ -1138,7 +1138,7 @@ BOOL daNpc_zrC_c::doEvent() { (this->*mpActionFn)(NULL); } else if (dComIfGp_event_chkTalkXY()) { if (dComIfGp_evmng_ChkPresentEnd()) { - if (mType == 2 && dComIfGp_event_getPreItemNo() == fpcNm_ITEM_ASHS_SCRIBBLING) { + if (mType == 2 && dComIfGp_event_getPreItemNo() == dItemNo_ASHS_SCRIBBLING_e) { mFlowID = 0x35; mOrderEvtNo = EVT_EARRING_GET; changeEvent(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx], @@ -1797,18 +1797,18 @@ static actor_method_class daNpc_zrC_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZRC = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZRC, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_zrC_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 389, // mPriority - &daNpc_zrC_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZRC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_zrC_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZRC_e, + /* Actor SubMtd */ &daNpc_zrC_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index 6adc1e99d73..b0c9c204dc7 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -490,21 +490,21 @@ int daNpc_zrZ_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) { } static void* s_sub(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_GraveStone) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_Obj_GraveStone_e) { return i_proc; } return NULL; } static void* s_subCloth(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_ZoraCloth) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_Obj_ZoraCloth_e) { return i_proc; } return NULL; } static void* s_subRock(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_ZraRock) { + if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_Obj_ZraRock_e) { return i_proc; } return NULL; @@ -2452,18 +2452,18 @@ static actor_method_class daNpc_zrZ_MethodTable = { }; actor_process_profile_definition g_profile_NPC_ZRZ = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_NPC_ZRZ, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daNpc_zrZ_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 390, // mPriority - &daNpc_zrZ_MethodTable, // sub_method - 0x08044100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NPC_ZRZ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daNpc_zrZ_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_NPC_ZRZ_e, + /* Actor SubMtd */ &daNpc_zrZ_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_Lv5Key.cpp b/src/d/actor/d_a_obj_Lv5Key.cpp index f6251271d45..9c3b5c0e4cf 100644 --- a/src/d/actor/d_a_obj_Lv5Key.cpp +++ b/src/d/actor/d_a_obj_Lv5Key.cpp @@ -340,18 +340,18 @@ static actor_method_class l_daObjLv5Key_Method = { }; actor_process_profile_definition g_profile_Obj_Lv5Key = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv5Key, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv5Key_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 46, // mPriority - &l_daObjLv5Key_Method, // sub_method - 0x00044180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv5Key_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv5Key_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv5Key_e, + /* Actor SubMtd */ &l_daObjLv5Key_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index 35711715ede..e7fd208a654 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -353,7 +353,7 @@ void daTurara_c::init_modeDropEnd2() { current.pos.y -= 100.0f; cXyz first_vec(current.pos); first_vec.y += 100.0f; - mEmID = fopAcM_create(PROC_E_KK, getSwBit1() << 0x10 | 3, &first_vec, fopAcM_GetRoomNo(this), 0, 0, -1); + mEmID = fopAcM_create(fpcNm_E_KK_e, getSwBit1() << 0x10 | 3, &first_vec, fopAcM_GetRoomNo(this), 0, 0, -1); JUT_ASSERT(770, mEmID != fpcM_ERROR_PROCESS_ID_e); cXyz second_vec(0.7f, 0.7f, 0.7f); dComIfGp_particle_set(0x8a8f, &first_vec, NULL, &second_vec); @@ -419,18 +419,18 @@ static actor_method_class l_daTurara_Method = { }; actor_process_profile_definition g_profile_Obj_Turara = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Turara, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTurara_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 545, // mPriority - &l_daTurara_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Turara_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTurara_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Turara_e, + /* Actor SubMtd */ &l_daTurara_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_TvCdlst.cpp b/src/d/actor/d_a_obj_TvCdlst.cpp index fd365f58f83..9df06beddf4 100644 --- a/src/d/actor/d_a_obj_TvCdlst.cpp +++ b/src/d/actor/d_a_obj_TvCdlst.cpp @@ -223,18 +223,18 @@ static actor_method_class l_daTvCdlst_Method = { }; actor_process_profile_definition g_profile_Obj_TvCdlst = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TvCdlst, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTvCdlst_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 496, // mPriority - &l_daTvCdlst_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TvCdlst_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTvCdlst_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TvCdlst_e, + /* Actor SubMtd */ &l_daTvCdlst_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp index b2dd4bfd059..ab9d2bf4cf8 100644 --- a/src/d/actor/d_a_obj_Y_taihou.cpp +++ b/src/d/actor/d_a_obj_Y_taihou.cpp @@ -60,7 +60,7 @@ static fopAc_ac_c* pushPullcallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_1, s1 static void* searchIronBallCallback(void* i_actor, void* i_data) { daObjYtaihou_c* taihou_rhs = (daObjYtaihou_c*)i_data; - if (fopAcM_GetProfName(i_actor) == PROC_Obj_Carry) { + if (fopAcM_GetProfName(i_actor) == fpcNm_Obj_Carry_e) { daObjCarry_c* pCarry = ((daObjCarry_c*)i_actor); if ( ((daObjCarry_c*)i_actor)->getType() == daObjCarry_c::TYPE_IRON_BALL) { if ( pCarry->isDraw() == 0 @@ -382,20 +382,20 @@ static actor_method_class daObjYtaihou_METHODS = { }; actor_process_profile_definition g_profile_Obj_Ytaihou = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ytaihou, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjYtaihou_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 635, // mPriority - &daObjYtaihou_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ytaihou_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjYtaihou_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ytaihou_e, + /* Actor SubMtd */ &daObjYtaihou_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp index cdd4e2a69ae..2150ea48ac6 100644 --- a/src/d/actor/d_a_obj_amiShutter.cpp +++ b/src/d/actor/d_a_obj_amiShutter.cpp @@ -294,18 +294,18 @@ actor_method_class l_daAmiShutter_Method = { actor_process_profile_definition g_profile_Obj_AmiShutter = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_AmiShutter, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daAmiShutter_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 521, // mPriority - &l_daAmiShutter_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_AmiShutter_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAmiShutter_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_AmiShutter_e, + /* Actor SubMtd */ &l_daAmiShutter_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index 27382c969a7..ef488421397 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -10,7 +10,7 @@ #include "m_Do/m_Do_lib.h" #include "d/d_com_inf_game.h" #include "d/d_menu_insect.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" #include @@ -24,7 +24,7 @@ daObj_AriHIO_c::daObj_AriHIO_c() { mScaleFemale = 2.0f; } -static u8 const l_ari_itemno[2] = {fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT}; +static u8 const l_ari_itemno[2] = {dItemNo_M_ANT_e, dItemNo_F_ANT_e}; void daObjARI_c::InitCcSph() { const static dCcD_SrcSph ccSphSrc = { @@ -615,7 +615,7 @@ cPhs_Step daObjARI_c::create() { if (mLocation == LOC_UNK_2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; } @@ -740,18 +740,18 @@ static actor_method_class l_daObjARI_Method = { }; actor_process_profile_definition g_profile_Obj_Ari = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_Ari, - &g_fpcLf_Method.base, - sizeof(daObjARI_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1E4, - &l_daObjARI_Method, - 0xC0100, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ari_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjARI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ari_e, + /* Actor SubMtd */ &l_daObjARI_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_automata.cpp b/src/d/actor/d_a_obj_automata.cpp index 7a54a16fcea..50bd9240f11 100644 --- a/src/d/actor/d_a_obj_automata.cpp +++ b/src/d/actor/d_a_obj_automata.cpp @@ -211,7 +211,7 @@ int daObj_AutoMata_c::createHeapCallBack(fopAc_ac_c* i_this) { } void* daObj_AutoMata_c::srchTHouse(fopAc_ac_c* actor, void* param_1) { - if (fopAcM_GetName(actor) == PROC_Obj_TobyHouse) { + if (fopAcM_GetName(actor) == fpcNm_Obj_TobyHouse_e) { if (fopAcM_IsExecuting(fopAcM_GetID(actor))) { return actor; } @@ -339,18 +339,18 @@ static actor_method_class daObj_AutoMata_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_AUTOMATA = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_AUTOMATA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_AutoMata_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 81, // mPriority - &daObj_AutoMata_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_AUTOMATA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_AutoMata_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_AUTOMATA_e, + /* Actor SubMtd */ &daObj_AutoMata_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp index 795b9ff45f4..d746d267d00 100644 --- a/src/d/actor/d_a_obj_avalanche.cpp +++ b/src/d/actor/d_a_obj_avalanche.cpp @@ -299,18 +299,18 @@ static actor_method_class daObjAvalanche_METHODS = { }; actor_process_profile_definition g_profile_Obj_Avalanche = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Avalanche, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjAvalanche_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 655, // mPriority - &daObjAvalanche_METHODS, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Avalanche_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjAvalanche_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Avalanche_e, + /* Actor SubMtd */ &daObjAvalanche_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_balloon.cpp b/src/d/actor/d_a_obj_balloon.cpp index 94e24bf3dca..41430f97f08 100644 --- a/src/d/actor/d_a_obj_balloon.cpp +++ b/src/d/actor/d_a_obj_balloon.cpp @@ -124,7 +124,7 @@ void daObj_Balloon_c::action() { if (mSph.ChkTgHit()) { cCcD_Obj* hit_obj = mSph.GetTgHitObj(); - if (fopAcM_GetName(dCc_GetAc(hit_obj->GetAc())) == PROC_KAGO) { + if (fopAcM_GetName(dCc_GetAc(hit_obj->GetAc())) == fpcNm_KAGO_e) { cXyz eff_scale(kago_effect_scale[mType], kago_effect_scale[mType], kago_effect_scale[mType]); for (int i = 0; i < 2; i++) { @@ -152,7 +152,7 @@ void daObj_Balloon_c::action() { 1.0f, -1.0f, -1.0f, 0); m_balloon_score += add_score; - daBalloon2D_c* balloon_2d = (daBalloon2D_c*)fopAcM_SearchByName(PROC_BALLOON2D); + daBalloon2D_c* balloon_2d = (daBalloon2D_c*)fopAcM_SearchByName(fpcNm_BALLOON2D_e); if (balloon_2d != NULL) { u8 balloon_size; if (mType == SIZE_SMALL_e) { @@ -296,20 +296,20 @@ static actor_method_class l_daObj_Balloon_Method = { }; actor_process_profile_definition g_profile_OBJ_BALLOON = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_BALLOON, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Balloon_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 64, // mPriority - &l_daObj_Balloon_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_BALLOON_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Balloon_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_BALLOON_e, + /* Actor SubMtd */ &l_daObj_Balloon_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp index 9e0b3a4a8f7..8de65413bac 100644 --- a/src/d/actor/d_a_obj_barDesk.cpp +++ b/src/d/actor/d_a_obj_barDesk.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_barDesk.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" @@ -161,18 +161,18 @@ static actor_method_class l_daBarDesk_Method = { }; actor_process_profile_definition g_profile_Obj_BarDesk = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_BarDesk, - &g_fpcLf_Method.base, - sizeof(daBarDesk_c), - 0, - 0, - &g_fopAc_Method.base, - 0x279, - &l_daBarDesk_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BarDesk_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBarDesk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BarDesk_e, + /* Actor SubMtd */ &l_daBarDesk_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index eb187f1ac01..7a01921530c 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_batta.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -11,7 +11,7 @@ #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" #include "d/d_menu_insect.h" -#include "f_pc/f_pc_name.h" +#include "d/d_item_data.h" #include class daObj_BattaHIO_c : public JORReflexible { @@ -316,7 +316,7 @@ void daObjBATTA_c::bin_wait() { if (field_0x9e8 == 0) { J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Bat", 8); mpMorf->setAnm(anm, 2, 4.0f, 1.0f, 0.0f, -1.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mDraw = false; gravity = 0.0f; maxFallSpeed = 0.0f; @@ -386,7 +386,7 @@ void daObjBATTA_c::hook() { batta_setParticle(); } - if (!fopAcM_CheckStatus(this, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { setAction(&daObjBATTA_c::wait); } } @@ -476,7 +476,7 @@ void daObjBATTA_c::action() { void daObjBATTA_c::hit_check() { dCcU_AtInfo info; mStts.Move(); - + if (mSph.ChkTgHit()) { info.mpCollider = mSph.GetTgHitObj(); if (info.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT)) { @@ -487,7 +487,7 @@ void daObjBATTA_c::hit_check() { } } -static u8 const l_batta_sex[2] = {fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER}; +static u8 const l_batta_sex[2] = {dItemNo_M_GRASSHOPPER_e, dItemNo_F_GRASSHOPPER_e}; int daObjBATTA_c::execute() { if ( ChkGetDemo()) { @@ -497,7 +497,7 @@ int daObjBATTA_c::execute() { batta_setParticle(); return 1; } - + if (field_0x9f2 != 0) { field_0x9f2--; } @@ -592,21 +592,21 @@ int daObjBATTA_c::create() { if (field_0x9f0 == 3) { field_0x9f0 = 0; } - + mSex = (fopAcM_GetParam(this) & 0x10) >> 4; if (mSex != 0) { scale.setall(l_HIO.mModelScaleFemale); } else { scale.setall(l_HIO.mModelScaleMale); } - + if (uVar9 == 15) { uVar9 = 0; } - + setItemNo(l_batta_sex[mSex]); setSaveBitNo(l_musiya_num[mSex]); - + if (field_0x9f0 != 2) { if (uVar9 != 0) { if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_MALE]]) || !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[SEX_FEMALE]])) { @@ -629,9 +629,9 @@ int daObjBATTA_c::create() { } } } - + mParticleScale = 0.0f; - + OS_REPORT("/////////////////// BATTA ////////////////////////\n"); if (!fopAcM_entrySolidHeap(this, useHeapInit, 0xb00)) { @@ -639,32 +639,32 @@ int daObjBATTA_c::create() { } OS_REPORT("/////////////////// BATTA SET OK /////////////////\n"); - + if (!hio_set) { hio_set = true; mIsHIOOwner = true; // Golden Bugs l_HIO.mId = mDoHIO_CREATE_CHILD("黄金蟲(バッタ)", &l_HIO); } - + J3DModel* model = mpMorf->getModel(); fopAcM_SetMtx(this, model->getBaseTRMtx()); fopAcM_SetMin(this, -50.0f, -50.0f, -50.0f); fopAcM_SetMax(this, 50.0f, 50.0f, 50.0f); - + attention_info.flags = 0; health = 10; field_0x560 = 10; - + mCreature.init(¤t.pos, &eyePos, 3, 1); - + if (field_0x9f0 == 0) { attention_info.distances[fopAc_attn_CARRY_e] = 0x5d; mStts.Init(100, 0, this); mSph.Set(cc_sph_src); mSph.SetStts(&mStts); } - + if (field_0x9f0 == 2) { setAction(&daObjBATTA_c::bin_wait); } else { @@ -676,7 +676,7 @@ int daObjBATTA_c::create() { current.angle.y = cM_rndFX(32768.0f); setAction(&daObjBATTA_c::wait); } - + daObjBATTA_Execute(this); } return rv; @@ -695,18 +695,18 @@ static actor_method_class l_daObjBATTA_Method = { }; actor_process_profile_definition g_profile_Obj_Batta = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Batta, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBATTA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 486, // mPriority - &l_daObjBATTA_Method, // sub_method - 0x000C0120, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Batta_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBATTA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Batta_e, + /* Actor SubMtd */ &l_daObjBATTA_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bbox.cpp b/src/d/actor/d_a_obj_bbox.cpp index 2a645ae5578..210932589ad 100644 --- a/src/d/actor/d_a_obj_bbox.cpp +++ b/src/d/actor/d_a_obj_bbox.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_bbox.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" const static dCcD_SrcCyl l_cyl_src = { { @@ -136,18 +136,18 @@ static actor_method_class daObjBBox_METHODS = { }; actor_process_profile_definition g_profile_Obj_BBox = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_BBox, - &g_fpcLf_Method.base, - sizeof(daObjBBox_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1F3, - &daObjBBox_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BBox_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBBox_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BBox_e, + /* Actor SubMtd */ &daObjBBox_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bed.cpp b/src/d/actor/d_a_obj_bed.cpp index 06c2eb71dae..027cd6c5254 100644 --- a/src/d/actor/d_a_obj_bed.cpp +++ b/src/d/actor/d_a_obj_bed.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "m_Do/m_Do_ext.h" #include "d/actor/d_a_npc.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_resName = "KH_Bed"; @@ -208,18 +208,18 @@ static actor_method_class daObj_Bed_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_BED = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_BED, - &g_fpcLf_Method.base, - sizeof(daObj_Bed_c), - 0, - 0, - &g_fopAc_Method.base, - 0x4F, - &daObj_Bed_MethodTable, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_BED_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Bed_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_BED_e, + /* Actor SubMtd */ &daObj_Bed_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 3db66c6352d..b670843403c 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -1950,20 +1950,20 @@ static actor_method_class daObjBm_METHODS = { }; actor_process_profile_definition g_profile_Obj_Bemos = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Bemos, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 604, // mPriority - &daObjBm_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Bemos_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Bemos_e, + /* Actor SubMtd */ &daObjBm_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_bhashi.cpp b/src/d/actor/d_a_obj_bhashi.cpp index 42b29b43ae6..00a35bc158b 100644 --- a/src/d/actor/d_a_obj_bhashi.cpp +++ b/src/d/actor/d_a_obj_bhashi.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_bhashi.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -158,12 +158,12 @@ void daObjBHASHI_c::Obj_Damage() { fopAc_ac_c* tg_hit_obj = dCc_GetAc(mCcCyl.GetTgHitObj()->GetAc()); cXyz* tg_hit_pos = mCcCyl.GetTgHitPosP(); s16 rot_y = cLib_targetAngleY(¤t.pos, tg_hit_pos); - if (fopAcM_GetName(tg_hit_obj) == PROC_B_MGN) { + if (fopAcM_GetName(tg_hit_obj) == fpcNm_B_MGN_e) { field_0x5a8++; - + fpc_ProcID tg_hit_id = fopAcM_GetID(tg_hit_obj); fopAc_ac_c* mgn_p; - if (fopAcM_SearchByName(PROC_B_MGN, &mgn_p) && mgn_p != NULL) { + if (fopAcM_SearchByName(fpcNm_B_MGN_e, &mgn_p) && mgn_p != NULL) { field_0x11dc = cLib_targetAngleY(&fopAcM_GetPosition(mgn_p), ¤t.pos); } @@ -184,7 +184,7 @@ void daObjBHASHI_c::Obj_Damage() { } mCcCyl.ResetTgHit(); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } } } @@ -207,7 +207,7 @@ void daObjBHASHI_c::Obj_Damage(cXyz param_0) { dComIfGp_particle_set(dPa_RM(ID_ZI_S_LV9PILLAR_BREAK_C), &eff_pos, &tevStr, &eff_rot, NULL); dComIfGp_particle_set(dPa_RM(ID_ZI_S_LV9PILLAR_BREAK_D), &eff_pos, &tevStr, &eff_rot, NULL); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } Hahen_c::Hahen_c() { @@ -308,7 +308,7 @@ void Hahen_c::Roll_Set(cXyz* i_pos, f32 param_1, s16 i_no) { f32 speed_x = (-1.0f + nREG_F(12)) * param_1 * cM_ssin(angle); f32 temp_f31 = scale.abs(); temp_f31 = 3.0f / temp_f31; - + f32 speed_y = temp_f30 - 9.0f; f32 speed_z = (-1.0f + nREG_F(13)) * param_1 * cM_scos(angle); @@ -443,7 +443,7 @@ int daObjBHASHI_c::Execute(Mtx** param_0) { } fopAc_ac_c* mgn_p; - if (fopAcM_SearchByName(PROC_B_MGN, &mgn_p) && mgn_p != NULL && ((daB_MGN_c*)mgn_p)->isAppear()) { + if (fopAcM_SearchByName(fpcNm_B_MGN_e, &mgn_p) && mgn_p != NULL && ((daB_MGN_c*)mgn_p)->isAppear()) { Rolling(&fopAcM_GetPosition(mgn_p), 400.0f, 90.0f + yREG_F(0)); } } @@ -503,18 +503,18 @@ static actor_method_class l_daObjBHASHI_Method = { }; actor_process_profile_definition g_profile_Obj_BHASHI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_BHASHI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBHASHI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 463, // mPriority - &l_daObjBHASHI_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BHASHI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBHASHI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BHASHI_e, + /* Actor SubMtd */ &l_daObjBHASHI_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index 9ada8dfdc75..f690ff10878 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -199,18 +199,18 @@ static actor_method_class l_daObjBhbridge_Method = { }; actor_process_profile_definition g_profile_Obj_Bhbridge = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Bhbridge, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBhbridge_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 459, // mPriority - &l_daObjBhbridge_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Bhbridge_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBhbridge_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Bhbridge_e, + /* Actor SubMtd */ &l_daObjBhbridge_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bk_leaf.cpp b/src/d/actor/d_a_obj_bk_leaf.cpp index e5f6a56994a..e698ae06832 100644 --- a/src/d/actor/d_a_obj_bk_leaf.cpp +++ b/src/d/actor/d_a_obj_bk_leaf.cpp @@ -17,7 +17,7 @@ void daBkLeaf_c::setBokkuri() { u32 sp10 = 0; csXyz currentAngle(current.angle); daObjCarry_c::make_prm(&sp10, ¤tAngle, 6, getItem(), getItemBit(), 1, 2); - field_0x578 = fopAcM_createChild(PROC_Obj_Carry, fopAcM_GetID(this), 0, ¤t.pos, + field_0x578 = fopAcM_createChild(fpcNm_Obj_Carry_e, fopAcM_GetID(this), 0, ¤t.pos, fopAcM_GetRoomNo(this), ¤tAngle, &scale, -1, 0); } @@ -159,17 +159,19 @@ static actor_method_class l_daBkLeaf_Method = { (process_method_func)daBkLeaf_Draw, }; -actor_process_profile_definition g_profile_Obj_BkLeaf = {fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_BkLeaf, - &g_fpcLf_Method.base, - sizeof(daBkLeaf_c), - 0, - 0, - &g_fopAc_Method.base, - 0xFC, - &l_daBkLeaf_Method, - 0x40100, - 0, - fopAc_CULLBOX_CUSTOM_e}; +actor_process_profile_definition g_profile_Obj_BkLeaf = { + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BkLeaf_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBkLeaf_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BkLeaf_e, + /* Actor SubMtd */ &l_daBkLeaf_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_obj_bkdoor.cpp b/src/d/actor/d_a_obj_bkdoor.cpp index 8ed051902d1..3a4501d971c 100644 --- a/src/d/actor/d_a_obj_bkdoor.cpp +++ b/src/d/actor/d_a_obj_bkdoor.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_actor_mng.h" static void* search_door(void* i_actor, void* i_this) { - if (i_actor != NULL && fopAcM_GetProfName(i_actor) == PROC_Obj_BkDoor && + if (i_actor != NULL && fopAcM_GetProfName(i_actor) == fpcNm_Obj_BkDoor_e && fopAcM_GetParamBit(i_this, 0, 1) != fopAcM_GetParamBit(i_actor, 0, 1)) { return i_actor; @@ -205,18 +205,18 @@ static actor_method_class daObjBkDoor_METHODS = { }; actor_process_profile_definition g_profile_Obj_BkDoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_BkDoor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBkDoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 451, // mPriority - &daObjBkDoor_METHODS, // sub_method - 0x40100, // mStatus - 0, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BkDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBkDoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BkDoor_e, + /* Actor SubMtd */ &daObjBkDoor_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index 08fc622c8c6..6945bd671a4 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -425,18 +425,18 @@ static actor_method_class daBkyRock_METHODS = { }; actor_process_profile_definition g_profile_BkyRock = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_BkyRock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBkyRock_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 728, // mPriority - &daBkyRock_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_BkyRock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBkyRock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_BkyRock_e, + /* Actor SubMtd */ &daBkyRock_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index e16f6a753a6..80130e8ccb2 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -333,18 +333,18 @@ static actor_method_class l_daBmWindow_Method = { }; actor_process_profile_definition g_profile_Obj_BmWindow = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_BmWindow, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBmWindow_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 513, // mPriority - &l_daBmWindow_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BmWindow_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBmWindow_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BmWindow_e, + /* Actor SubMtd */ &l_daBmWindow_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bmshutter.cpp b/src/d/actor/d_a_obj_bmshutter.cpp index ace4baefe34..3ab56169feb 100644 --- a/src/d/actor/d_a_obj_bmshutter.cpp +++ b/src/d/actor/d_a_obj_bmshutter.cpp @@ -297,18 +297,18 @@ static actor_method_class l_daObjBmSh_Method = { }; actor_process_profile_definition g_profile_Obj_BoomShutter = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_BoomShutter, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBmSh_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 449, // mPriority - &l_daObjBmSh_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BoomShutter_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBmSh_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BoomShutter_e, + /* Actor SubMtd */ &l_daObjBmSh_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bombf.cpp b/src/d/actor/d_a_obj_bombf.cpp index 6e837134bc9..bba146781f1 100644 --- a/src/d/actor/d_a_obj_bombf.cpp +++ b/src/d/actor/d_a_obj_bombf.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bombf.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static const char l_arcName[] = "Bombf"; @@ -114,18 +114,18 @@ static actor_method_class l_daObjBombf_Method = { }; actor_process_profile_definition g_profile_Obj_Bombf = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Bombf, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBombf_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 251, // mPriority - &l_daObjBombf_Method, // sub_method - 0x40100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Bombf_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBombf_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Bombf_e, + /* Actor SubMtd */ &l_daObjBombf_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp index 19fe7f3a415..d2e49facd58 100644 --- a/src/d/actor/d_a_obj_bosswarp.cpp +++ b/src/d/actor/d_a_obj_bosswarp.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_midna.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_obj_life_container.h" #include "d/actor/d_a_obj_ystone.h" #include @@ -243,7 +243,7 @@ int daObjBossWarp_c::execute() { if (field_0x595 && midna != NULL) { midna->onTagWaitPos(&field_0x620); } - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); int level = getNowLevel(); if (ystone != NULL && midna != NULL) { @@ -314,7 +314,7 @@ void daObjBossWarp_c::actionWait() { void daObjBossWarp_c::actionOrderEvent() { if (eventInfo.checkCommandDemoAccrpt()) { - dComIfGp_event_setTalkPartner(fopAcM_SearchByName(PROC_OBJ_YSTONE)); + dComIfGp_event_setTalkPartner(fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e)); setAction(ACT_EVENT); mStaffId = dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0); demoProc(); @@ -446,10 +446,10 @@ int daObjBossWarp_c::demoProc() { }; daPy_py_c* player = daPy_getPlayerActorClass(); - obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(PROC_OBJ_YSTONE); + obj_ystone_class* ystone = (obj_ystone_class*)fopAcM_SearchByName(fpcNm_OBJ_YSTONE_e); cXyz unused(100000.0f, 0.0f, 0.0f); daMidna_c* midna = (daMidna_c*)daPy_py_c::getMidnaActor(); - daObjLife_c* life_container = (daObjLife_c*)fopAcM_SearchByName(PROC_Obj_LifeContainer); + daObjLife_c* life_container = (daObjLife_c*)fopAcM_SearchByName(fpcNm_Obj_LifeContainer_e); cXyz life_pos(900.0f, 0.0f, 0.0f); int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 15, 0, 0); @@ -671,18 +671,18 @@ static actor_method_class l_daObjBossWarp_Method = { }; actor_process_profile_definition g_profile_Obj_BossWarp = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_BossWarp, - &g_fpcLf_Method.base, - sizeof(daObjBossWarp_c), - 0, - 0, - &g_fopAc_Method.base, - 0x2DA, - &l_daObjBossWarp_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BossWarp_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBossWarp_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BossWarp_e, + /* Actor SubMtd */ &l_daObjBossWarp_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index 85a81d4e399..34677f41128 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -246,7 +246,7 @@ void daObj_BouMato_c::tgHitCallBack(fopAc_ac_c* param_1, dCcD_GObjInf* param_2, fopAc_ac_c* param_3, dCcD_GObjInf* param_4) { u8 cutType = 0; if (param_3 != NULL) { - if (fopAcM_GetProfName(param_3) == PROC_ALINK) { + if (fopAcM_GetProfName(param_3) == fpcNm_ALINK_e) { cutType = static_cast(param_3)->getCutType(); } else { cutType = daPy_py_c::CUT_TYPE_NM_VERTICAL; @@ -257,7 +257,7 @@ void daObj_BouMato_c::tgHitCallBack(fopAc_ac_c* param_1, dCcD_GObjInf* param_2, void* daObj_BouMato_c::srchArrow(void* param_1, void* param_2) { if (l_findCount < 100 && param_1 != NULL && param_1 != param_2) { - if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && fopAcM_GetName(param_1) == PROC_ARROW && + if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && fopAcM_GetName(param_1) == fpcNm_ARROW_e && static_cast(param_1)->getHitAcID() != -1) { l_findActorPtrs[l_findCount] = (daArrow_c*)param_1; @@ -288,7 +288,7 @@ void daObj_BouMato_c::setSwayParam(fopAc_ac_c* param_1) { field_0xa2a = (fopAcM_searchActorAngleY(this, param_1) - shape_angle.y) + 0x8000; field_0xa10 = 8; mIsCurTurnRight = false; - if (fopAcM_GetProfName(param_1) == PROC_ALINK) { + if (fopAcM_GetProfName(param_1) == fpcNm_ALINK_e) { switch (mCutType) { case daPy_py_c::CUT_TYPE_NM_RIGHT: case daPy_py_c::CUT_TYPE_NM_LEFT: @@ -368,18 +368,18 @@ static actor_method_class daObj_BouMato_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_BOUMATO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_BOUMATO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_BouMato_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 80, // mPriority - &daObj_BouMato_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_BOUMATO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_BouMato_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_BOUMATO_e, + /* Actor SubMtd */ &daObj_BouMato_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_brakeeff.cpp b/src/d/actor/d_a_obj_brakeeff.cpp index d9299694f9a..2ed6e76e418 100644 --- a/src/d/actor/d_a_obj_brakeeff.cpp +++ b/src/d/actor/d_a_obj_brakeeff.cpp @@ -236,18 +236,18 @@ actor_method_class l_daObj_Brakeeff_Method = { }; actor_process_profile_definition g_profile_OBJ_BEF = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_BEF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_brakeeff_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 39, // mPriority - &l_daObj_Brakeeff_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_7_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_BEF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_brakeeff_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_BEF_e, + /* Actor SubMtd */ &l_daObj_Brakeeff_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_7_e, }; diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index c66a45b20f1..6257f1740f9 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -53,11 +53,11 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rid i_rideActor->speed.y = -5.0f; f32 var_f29; - if (fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { var_f29 = 100.0f; br_p->field_0x0e4 = -31.0f; a_this->field_0xb1ef = 5; - } else if (fopAcM_GetName(i_rideActor) == PROC_NPC_KS) { + } else if (fopAcM_GetName(i_rideActor) == fpcNm_NPC_KS_e) { var_f29 = 70.0f; br_p->field_0x0e4 = -20.0f; i_rideActor->speed.y = -20.0f; @@ -1831,18 +1831,18 @@ static actor_method_class l_daObj_Brg_Method = { }; actor_process_profile_definition g_profile_OBJ_BRG = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_BRG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_brg_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 54, // mPriority - &l_daObj_Brg_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_BRG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_brg_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_BRG_e, + /* Actor SubMtd */ &l_daObj_Brg_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bsGate.cpp b/src/d/actor/d_a_obj_bsGate.cpp index 3092b78e94d..694ea3c2cee 100644 --- a/src/d/actor/d_a_obj_bsGate.cpp +++ b/src/d/actor/d_a_obj_bsGate.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_bsGate.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daBsGate_HIO_c : public mDoHIO_entry_c { public: @@ -236,18 +236,18 @@ static actor_method_class l_daBsGate_Method = { }; actor_process_profile_definition g_profile_Obj_BsGate = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_BsGate, - &g_fpcLf_Method.base, - sizeof(daBsGate_c), - 0, - 0, - &g_fopAc_Method.base, - 0x206, - &l_daBsGate_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BsGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBsGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BsGate_e, + /* Actor SubMtd */ &l_daBsGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_bubblePilar.cpp b/src/d/actor/d_a_obj_bubblePilar.cpp index 7fcf42ae803..a496f253c38 100644 --- a/src/d/actor/d_a_obj_bubblePilar.cpp +++ b/src/d/actor/d_a_obj_bubblePilar.cpp @@ -227,18 +227,18 @@ static actor_method_class l_daBubbPilar_Method = { }; actor_process_profile_definition g_profile_Obj_awaPlar = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_awaPlar, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daBubbPilar_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 659, // mPriority - &l_daBubbPilar_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_awaPlar_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daBubbPilar_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_awaPlar_e, + /* Actor SubMtd */ &l_daBubbPilar_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_burnbox.cpp b/src/d/actor/d_a_obj_burnbox.cpp index b7b47b53573..133420a965e 100644 --- a/src/d/actor/d_a_obj_burnbox.cpp +++ b/src/d/actor/d_a_obj_burnbox.cpp @@ -193,18 +193,18 @@ actor_method_class daObjBurnBox_METHODS = { }; actor_process_profile_definition g_profile_Obj_BurnBox = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_BurnBox, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjBurnBox_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 532, // mPriority - &daObjBurnBox_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_BurnBox_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBurnBox_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_BurnBox_e, + /* Actor SubMtd */ &daObjBurnBox_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index 41787639656..062e5f3c812 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -766,7 +766,7 @@ static void TgHitCallBackBokkuri(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf) { daObjCarry_c* objCarry = (daObjCarry_c*)i_tgActor; if (objCarry != NULL && i_atActor != NULL && i_atObjInf->ChkAtType(AT_TYPE_SHIELD_ATTACK) && - fopAcM_IsActor(i_atActor) && fopAcM_GetName(i_atActor) == PROC_ALINK) + fopAcM_IsActor(i_atActor) && fopAcM_GetName(i_atActor) == fpcNm_ALINK_e) { objCarry->field_0xd5c = 6000.0f + cM_rndF(2000.0f); objCarry->field_0xd60 = 4000.0f + cM_rndF(1500.0f); @@ -801,7 +801,7 @@ static void* s_swA_sub(void* i_actor, void* i_data) { daObjSwBallA_c* swball = (daObjSwBallA_c*)i_actor; daObjCarry_c* objCarry = (daObjCarry_c*)i_data; - if (fopAcM_IsActor(swball) && fopAcM_GetName(swball) == PROC_Obj_SwBallA && swball != NULL && + if (fopAcM_IsActor(swball) && fopAcM_GetName(swball) == fpcNm_Obj_SwBallA_e && swball != NULL && objCarry != NULL) { if (swball->getSwbit() == objCarry->getSwbit2()) { @@ -817,7 +817,7 @@ static int l_sw_id; static void* s_sw_sub(void* i_actor, void* i_data) { daObjSwBallB_c* swball = (daObjSwBallB_c*)i_actor; - if (fopAcM_IsActor(swball) && fopAcM_GetName(swball) == PROC_Obj_SwBallB && swball != NULL && + if (fopAcM_IsActor(swball) && fopAcM_GetName(swball) == fpcNm_Obj_SwBallB_e && swball != NULL && swball->getID() == l_sw_id) { return i_actor; @@ -829,7 +829,7 @@ static void* s_sw_sub(void* i_actor, void* i_data) { static void* s_setA_sub(void* i_actor, void* i_data) { daTagSetBall_c* tagball = (daTagSetBall_c*)i_actor; - if (fopAcM_IsActor(tagball) && fopAcM_GetName(tagball) == PROC_Tag_SetBall && tagball && + if (fopAcM_IsActor(tagball) && fopAcM_GetName(tagball) == fpcNm_Tag_SetBall_e && tagball && i_data != NULL && tagball->getType() == 0xF) { return i_actor; @@ -841,7 +841,7 @@ static void* s_setA_sub(void* i_actor, void* i_data) { static void* s_setB_sub(void* i_actor, void* i_data) { daTagSetBall_c* tagball = (daTagSetBall_c*)i_actor; - if (fopAcM_IsActor(tagball) && fopAcM_GetName(tagball) == PROC_Tag_SetBall && tagball && + if (fopAcM_IsActor(tagball) && fopAcM_GetName(tagball) == fpcNm_Tag_SetBall_e && tagball && i_data != NULL && tagball->getType() == 0) { return i_actor; @@ -1069,7 +1069,7 @@ int daObjCarry_c::Create() { } if (checkCarryHookshot()) { - fopAcM_OnStatus(this, 0x80000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x80000_e); mCyl.SetTgType(mCyl.GetTgType() | 0x4000); } @@ -1238,7 +1238,7 @@ int daObjCarry_c::CreateInit_LightBall() { mSound.init(¤t.pos, 1); if (dComIfGp_roomControl_getStayNo()) { - fopAcM_OnStatus(this, 0x2000000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x2000000_e); } mDalkmistInf.mPos = current.pos; @@ -1246,7 +1246,7 @@ int daObjCarry_c::CreateInit_LightBall() { dKy_dalkmist_inf_set(&mDalkmistInf); field_0xe0c = 1; - fopAcM_OnStatus(this, 0x20000); + fopAcM_OnStatus(this, fopAcStts_NOPAUSE_e); mCyl.SetTgSe(9); mCyl.SetTgHitMark(CcG_Tg_UNK_MARK_2); @@ -1766,7 +1766,7 @@ int daObjCarry_c::execute() { mode_init_walk(0); } - if (mpCannonActor != NULL && fopAcM_IsActor(mpCannonActor) && fopAcM_GetProfName(mpCannonActor) == PROC_Obj_Ytaihou) { + if (mpCannonActor != NULL && fopAcM_IsActor(mpCannonActor) && fopAcM_GetProfName(mpCannonActor) == fpcNm_Obj_Ytaihou_e) { mStts.ClrCcMove(); mCyl.SetAtAtp(100); mAcch.SetIronBall(); @@ -1868,9 +1868,9 @@ int daObjCarry_c::execute() { field_0xdec = current.pos; if (fopAcM_checkCarryNow(this)) { - fopAcM_OffStatus(this, 0x400); + fopAcM_OffStatus(this, fopAcStts_FREEZE_e); } else { - fopAcM_OnStatus(this, 0x400); + fopAcM_OnStatus(this, fopAcStts_FREEZE_e); } return 1; @@ -3058,7 +3058,7 @@ void daObjCarry_c::mode_init_fit() { mCyl.OnCoSPrmBit(0x10); cLib_offBit(attention_info.flags, fopAc_AttnFlag_CARRY_e); - fopAcM_OffStatus(this, 0x80000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x80000_e); field_0xda8 = 0; speedF = 0.0f; @@ -3529,7 +3529,7 @@ bool daObjCarry_c::cc_damage_proc_kibako() { if (mAcch.ChkGroundHit()) { u32 params; daObjBurnBox_c::make_prm_burnBox(¶ms, 0); - fopAcM_createChild(PROC_Obj_BurnBox, fopAcM_GetID(this), params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, NULL); + fopAcM_createChild(fpcNm_Obj_BurnBox_e, fopAcM_GetID(this), params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, NULL); break_obj = true; do_break_eff = false; @@ -3565,7 +3565,7 @@ bool daObjCarry_c::cc_damage_proc_ironball() { if (mAcch.ChkGroundHit() && dComIfG_Bgsp().ChkPolySafe(mAcch.m_gnd) && dComIfG_Bgsp().ChkMoveBG_NoDABg(mAcch.m_gnd) && dComIfG_Bgsp().GetActorPointer(mAcch.m_gnd)) { s16 name = fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(mAcch.m_gnd)); - if (name == PROC_Obj_YIblltray) { + if (name == fpcNm_Obj_YIblltray_e) { var_r27 = false; mStts.ClrCcMove(); } @@ -3602,7 +3602,7 @@ bool daObjCarry_c::cc_damage_proc_taru() { if (mAcch.ChkGroundHit()) { u32 params; daObjBurnBox_c::make_prm_burnBox(¶ms, 2); - fopAcM_createChild(PROC_Obj_BurnBox, fopAcM_GetID(this), params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, NULL); + fopAcM_createChild(fpcNm_Obj_BurnBox_e, fopAcM_GetID(this), params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, NULL); break_obj = true; do_break_eff = false; @@ -4306,18 +4306,18 @@ static actor_method_class l_daObjCarry_Method = { (process_method_func)daObjCarry_Draw}; actor_process_profile_definition g_profile_Obj_Carry = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Carry, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCarry_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 244, // mPriority - &l_daObjCarry_Method, // sub_method - 0x40500, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Carry_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCarry_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Carry_e, + /* Actor SubMtd */ &l_daObjCarry_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_catdoor.cpp b/src/d/actor/d_a_obj_catdoor.cpp index d60831b6d29..b513e700508 100644 --- a/src/d/actor/d_a_obj_catdoor.cpp +++ b/src/d/actor/d_a_obj_catdoor.cpp @@ -182,18 +182,18 @@ static actor_method_class l_daObjCatDoor_Method = { }; actor_process_profile_definition g_profile_Obj_CatDoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CatDoor, // mProcName - &g_fpcLf_Method.base, // mSubMtd - sizeof(daObjCatDoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // mSubMtd - 684, // mPriority - &l_daObjCatDoor_Method, // mSubMtd - 0x44100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // mCullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CatDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCatDoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CatDoor_e, + /* Actor SubMtd */ &l_daObjCatDoor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_cb.cpp b/src/d/actor/d_a_obj_cb.cpp index 9744a71b1ea..e1f980b5080 100644 --- a/src/d/actor/d_a_obj_cb.cpp +++ b/src/d/actor/d_a_obj_cb.cpp @@ -234,18 +234,18 @@ static actor_method_class l_daObj_Cb_Method = { }; actor_process_profile_definition g_profile_OBJ_CB = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_CB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_cb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 49, // mPriority - &l_daObj_Cb_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_CB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_cb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_CB_e, + /* Actor SubMtd */ &l_daObj_Cb_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp index 870dd108d81..3725b3f35d1 100644 --- a/src/d/actor/d_a_obj_cblock.cpp +++ b/src/d/actor/d_a_obj_cblock.cpp @@ -403,18 +403,18 @@ static actor_method_class l_daObjCBlk_Method = { }; actor_process_profile_definition g_profile_Obj_ChainBlock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_ChainBlock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCBlk_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 597, // mPriority - &l_daObjCBlk_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ChainBlock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCBlk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ChainBlock_e, + /* Actor SubMtd */ &l_daObjCBlk_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_cboard.cpp b/src/d/actor/d_a_obj_cboard.cpp index a918613f4a6..2fb01212bca 100644 --- a/src/d/actor/d_a_obj_cboard.cpp +++ b/src/d/actor/d_a_obj_cboard.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_cboard.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daObjBoard_c::initBaseMtx() { setBaseMtx(); @@ -157,18 +157,18 @@ static actor_method_class daObjBoard_METHODS = { }; actor_process_profile_definition g_profile_Obj_Cboard = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Cboard, - &g_fpcLf_Method.base, - sizeof(daObjBoard_c), - 0, - 0, - &g_fopAc_Method.base, - 453, - &daObjBoard_METHODS, - 0x40000, - fopAc_CULLBOX_0_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Cboard_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjBoard_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Cboard_e, + /* Actor SubMtd */ &daObjBoard_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_CULLBOX_0_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_cdoor.cpp b/src/d/actor/d_a_obj_cdoor.cpp index fe483fec3fb..d1f539a339c 100644 --- a/src/d/actor/d_a_obj_cdoor.cpp +++ b/src/d/actor/d_a_obj_cdoor.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_obj_wchain.h" #include "d/d_camera.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName[2] = { "Cdoor", @@ -42,7 +42,7 @@ int daObjCdoor_c::CreateHeap() { static void* daObjCdoor_searchChain(fopAc_ac_c* i_actor, void* i_this) { daObjCdoor_c* _this = static_cast(i_this); - if (fopAcM_GetName(i_actor) == PROC_Obj_Wchain) { + if (fopAcM_GetName(i_actor) == fpcNm_Obj_Wchain_e) { daObjWchain_c* chain = static_cast(i_actor); if (chain->getSwitchNum() == _this->getSwitchNum()) { _this->setChainID(fopAcM_GetID(chain)); @@ -297,18 +297,18 @@ static actor_method_class l_daObjCdoor_Method = { }; actor_process_profile_definition g_profile_Obj_Cdoor = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Cdoor, - &g_fpcLf_Method.base, - sizeof(daObjCdoor_c), - 0, - 0, - &g_fopAc_Method.base, - 0xF5, - &l_daObjCdoor_Method, - 0x40100, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Cdoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCdoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Cdoor_e, + /* Actor SubMtd */ &l_daObjCdoor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_chandelier.cpp b/src/d/actor/d_a_obj_chandelier.cpp index ff512a87eb5..46b1d5b748c 100644 --- a/src/d/actor/d_a_obj_chandelier.cpp +++ b/src/d/actor/d_a_obj_chandelier.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_chandelier.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName = "L9Chand"; @@ -257,18 +257,18 @@ static actor_method_class daObjChandelier_METHODS = { }; actor_process_profile_definition g_profile_Obj_Chandelier = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Chandelier, - &g_fpcLf_Method.base, - sizeof(daObjChandelier_c), - 0, - 0, - &g_fopAc_Method.base, - 0x2E5, - &daObjChandelier_METHODS, - 0x40080, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Chandelier_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjChandelier_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Chandelier_e, + /* Actor SubMtd */ &daObjChandelier_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_chest.cpp b/src/d/actor/d_a_obj_chest.cpp index 1e904f28a04..9d5d222d730 100644 --- a/src/d/actor/d_a_obj_chest.cpp +++ b/src/d/actor/d_a_obj_chest.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_player.h" #include "d/d_bg_s.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_obj_eff.h" void daObjChest_c::initBaseMtx() { @@ -249,18 +249,18 @@ static actor_method_class l_daObjChest_Method = { }; actor_process_profile_definition g_profile_Obj_Chest = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Chest, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjChest_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 603, // mPriority - &l_daObjChest_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Chest_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjChest_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Chest_e, + /* Actor SubMtd */ &l_daObjChest_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index d40992d89c7..f5d82e35b5d 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -10,7 +10,7 @@ #include "m_Do/m_Do_lib.h" #include "d/d_com_inf_game.h" #include "d/d_menu_insect.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" #include @@ -277,7 +277,7 @@ void daObjCHO_c::Insect_Release() { mAction = ACT_MOVE; } -static u8 const l_cho_itemno[2] = {fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY}; +static u8 const l_cho_itemno[2] = {dItemNo_M_BUTTERFLY_e, dItemNo_F_BUTTERFLY_e}; // Some unused function went here. // This fake function is here in its place to make the literals match @@ -538,7 +538,7 @@ cPhs_Step daObjCHO_c::create() { if (mLocation == LOC_UNK_2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mTargetSpeedY = -2.0f; mTimers[1] = 20; mTimers[2] = 100; @@ -607,18 +607,18 @@ static actor_method_class l_daObjCHO_Method = { }; actor_process_profile_definition g_profile_Obj_Cho = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_Cho, - &g_fpcLf_Method.base, - sizeof(daObjCHO_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1DE, - &l_daObjCHO_Method, - 0xC0120, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Cho_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCHO_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Cho_e, + /* Actor SubMtd */ &l_daObjCHO_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_cowdoor.cpp b/src/d/actor/d_a_obj_cowdoor.cpp index fe01cc25ed4..56c644b247e 100644 --- a/src/d/actor/d_a_obj_cowdoor.cpp +++ b/src/d/actor/d_a_obj_cowdoor.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_cowdoor.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daCowdoor_c::setBaseMtx() { mDoMtx_stack_c::transS( current.pos.x, current.pos.y, current.pos.z); @@ -100,18 +100,18 @@ static actor_method_class l_daCowdoor_Method = { }; actor_process_profile_definition g_profile_Obj_Cowdoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Cowdoor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daCowdoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 447, // mPriority - &l_daCowdoor_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Cowdoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daCowdoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Cowdoor_e, + /* Actor SubMtd */ &l_daCowdoor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crope.cpp b/src/d/actor/d_a_obj_crope.cpp index 17f9676e98b..c28ee05ca35 100644 --- a/src/d/actor/d_a_obj_crope.cpp +++ b/src/d/actor/d_a_obj_crope.cpp @@ -380,18 +380,18 @@ static actor_method_class l_daObjCrope_Method = { }; actor_process_profile_definition g_profile_Obj_Crope = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Crope, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCrope_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 248, // mPriority - &l_daObjCrope_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Crope_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCrope_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Crope_e, + /* Actor SubMtd */ &l_daObjCrope_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crvfence.cpp b/src/d/actor/d_a_obj_crvfence.cpp index 675647133c7..396eb5df1f7 100644 --- a/src/d/actor/d_a_obj_crvfence.cpp +++ b/src/d/actor/d_a_obj_crvfence.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_crvfence.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -139,7 +139,7 @@ void daObjCRVFENCE_c::BrokenAction() { field_0x5a0 = 1; break; - + case 1: if (field_0x5ee == 0) { FenceMove(field_0x5ee, &field_0x5dc, &field_0x5e8, &field_0x5d0, field_0x5f0); @@ -162,7 +162,7 @@ void daObjCRVFENCE_c::BrokenAction() { } static void* s_obj_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_searchActorDistance((fopAc_ac_c*)i_data, (fopAc_ac_c*)i_actor) < 600.0f && fopAcM_GetName(i_actor) == PROC_E_WB) { + if (fopAcM_IsActor(i_actor) && fopAcM_searchActorDistance((fopAc_ac_c*)i_data, (fopAc_ac_c*)i_actor) < 600.0f && fopAcM_GetName(i_actor) == fpcNm_E_WB_e) { return i_actor; } @@ -173,7 +173,7 @@ void daObjCRVFENCE_c::NormalAction() { if (!field_0x5f4) { e_wb_class* wb_p = (e_wb_class*)fpcM_Search(s_obj_sub, this); if (wb_p != NULL && wb_p->mActionID == ACT_PL_RIDE2) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); fopAcM_seStartCurrent(this, Z2SE_OBJ_SAKU_BREAK, 0); cXyz sp5c(fopAcM_GetPosition(&wb_p->mEnemy)); Mtx mtx; @@ -275,7 +275,7 @@ void daObjCRVFENCE_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(field_0x5c4); mDoMtx_stack_c::scaleM(1.0f, 1.2f, 1.0f); field_0x660->setBaseTRMtx(mDoMtx_stack_c::get()); - + mDoMtx_stack_c::transS(field_0x5d0); mDoMtx_stack_c::YrotM(shape_angle.y); mDoMtx_stack_c::ZXYrotM(field_0x5e8); @@ -424,18 +424,18 @@ static actor_method_class l_daObjCRVFENCE_Method = { }; actor_process_profile_definition g_profile_Obj_CRVFENCE = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CRVFENCE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCRVFENCE_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 467, // mPriority - &l_daObjCRVFENCE_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CRVFENCE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCRVFENCE_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CRVFENCE_e, + /* Actor SubMtd */ &l_daObjCRVFENCE_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crvgate.cpp b/src/d/actor/d_a_obj_crvgate.cpp index a69083ff06d..f0c24eb22b4 100644 --- a/src/d/actor/d_a_obj_crvgate.cpp +++ b/src/d/actor/d_a_obj_crvgate.cpp @@ -133,7 +133,7 @@ void daObjCRVGATE_c::actionWaitEvent() { Z2GetAudioMgr()->seStart(Z2SE_OBJ_CRVN_GATE_OPEN, &mPos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - fopAcM_OffStatus(this, 0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } else { if (checkOpen() != 0) { eventInfo.onCondition(4); @@ -344,8 +344,8 @@ void daObjCRVGATE_c::CloseAction() { fopAc_ac_c* hitObj = dCc_GetAc(mSph[i].GetCoHitObj()->GetAc()); fopAc_ac_c* boar_ac; - if (fopAcM_GetName(hitObj) == PROC_E_WB && player->checkBoarRun() != 0 && - fopAcM_SearchByName(PROC_E_WB, &boar_ac) != 0) + if (fopAcM_GetName(hitObj) == fpcNm_E_WB_e && player->checkBoarRun() != 0 && + fopAcM_SearchByName(fpcNm_E_WB_e, &boar_ac) != 0) { cXyz* boar_speed = &fopAcM_GetSpeed(boar_ac); daPy_py_c* player = daPy_getPlayerActorClass(); @@ -419,7 +419,7 @@ void daObjCRVGATE_c::OpenAction() { if (mSph[i].ChkCoHit() != 0) { local_3c++; fopAc_ac_c* hitObj = dCc_GetAc(mSph[i].GetCoHitObj()->GetAc()); - if (fopAcM_GetName(hitObj) == PROC_E_WB) { + if (fopAcM_GetName(hitObj) == fpcNm_E_WB_e) { if (mKeyParam == 0xff) { Z2GetAudioMgr()->seStart(Z2SE_OBJ_CRVN_GATE_BREAK, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -483,7 +483,7 @@ void daObjCRVGATE_c::OpenAction() { if (mSph[i].ChkCoHit() != 0) { local_3c++; fopAc_ac_c* hitObj = dCc_GetAc(mSph[i].GetCoHitObj()->GetAc()); - if (fopAcM_GetName(hitObj) == PROC_E_WB) { + if (fopAcM_GetName(hitObj) == fpcNm_E_WB_e) { daPy_py_c* player = daPy_getPlayerActorClass(); mDoorSwingTargetAngle = mDoorAngle - fopAcM_GetSpeedF(player) * 288.0f; @@ -704,7 +704,7 @@ void daObjCRVGATE_c::SetDoor() { mKeyParam = 0x01; // Create the second (identical) part of the door (swinging gate). - mDoorPairProcID = fopAcM_createChild(PROC_Obj_CRVGATE, fopAcM_GetID(this), 1, &child_pos, + mDoorPairProcID = fopAcM_createChild(fpcNm_Obj_CRVGATE_e, fopAcM_GetID(this), 1, &child_pos, fopAcM_GetRoomNo(this), &child_angle, NULL, -1, 0); mDoorY = shape_angle.y; } else { @@ -834,18 +834,18 @@ static actor_method_class l_daObjCRVGATE_Method = { }; actor_process_profile_definition g_profile_Obj_CRVGATE = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CRVGATE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCRVGATE_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 466, // mPriority - &l_daObjCRVGATE_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CRVGATE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCRVGATE_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CRVGATE_e, + /* Actor SubMtd */ &l_daObjCRVGATE_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crvhahen.cpp b/src/d/actor/d_a_obj_crvhahen.cpp index fc5b5ee82bc..52d180f5478 100644 --- a/src/d/actor/d_a_obj_crvhahen.cpp +++ b/src/d/actor/d_a_obj_crvhahen.cpp @@ -242,18 +242,18 @@ static actor_method_class l_daObjCRVHAHEN_Method = { }; actor_process_profile_definition g_profile_Obj_CRVHAHEN = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CRVHAHEN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCRVHAHEN_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 468, // mPriority - &l_daObjCRVHAHEN_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CRVHAHEN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCRVHAHEN_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CRVHAHEN_e, + /* Actor SubMtd */ &l_daObjCRVHAHEN_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crvlh_down.cpp b/src/d/actor/d_a_obj_crvlh_down.cpp index bc66b5cf50c..996584a48c3 100644 --- a/src/d/actor/d_a_obj_crvlh_down.cpp +++ b/src/d/actor/d_a_obj_crvlh_down.cpp @@ -78,7 +78,7 @@ void daObjCRVLH_DW_c::Break() { dComIfGp_particle_set(dPa_RM(ID_ZF_S_CRVYAGURA03_SAND), ¤t.pos, &tevStr, &shape_angle, 0); dComIfGp_particle_set(dPa_RM(ID_ZF_S_CRVYAGURA04_SMK), ¤t.pos, &tevStr, &shape_angle, 0); dComIfGp_getVibration().StartShock(VIBMODE_S_POWER5, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); - field_0x5a4 = fopAcM_createChild(PROC_Obj_CRVHAHEN, fopAcM_GetID(this), 1, ¤t.pos, + field_0x5a4 = fopAcM_createChild(fpcNm_Obj_CRVHAHEN_e, fopAcM_GetID(this), 1, ¤t.pos, fopAcM_GetRoomNo(this), &cStack_2c, NULL, -1, NULL); if (fopAcM_SearchByID(field_0x5a0, &local_30) && local_30 != NULL) { @@ -96,7 +96,7 @@ void daObjCRVLH_DW_c::Obj_Hit() { if (field_0x5b8 == 0) { if (mCyl.ChkCoHit() != 0) { fopAc_ac_c* actor = mCyl.GetCoHitObj()->GetAc(); - if (fopAcM_GetName(dCc_GetAc(actor)) == PROC_E_WB && + if (fopAcM_GetName(dCc_GetAc(actor)) == fpcNm_E_WB_e && ((e_wb_class*)actor)->mActionID == ACT_PL_RIDE2) { Break(); @@ -176,7 +176,7 @@ int daObjCRVLH_DW_c::create() { fopAcM_setCullSizeFar(this, 100.0f); fopAcM_setCullSizeBox(this, -500.0f, -500.0f, -500.0f, 500.0f, 1000.0f, 500.0f); daObjCRVLH_DW_Execute(this); - field_0x5a0 = fopAcM_createChild(PROC_Obj_CRVLH_UP, fopAcM_GetID(this), 1, ¤t.pos, + field_0x5a0 = fopAcM_createChild(fpcNm_Obj_CRVLH_UP_e, fopAcM_GetID(this), 1, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, NULL, -1, NULL); } @@ -240,18 +240,18 @@ static actor_method_class l_daObjCRVLH_DW_Method = { }; actor_process_profile_definition g_profile_Obj_CRVLH_DW = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CRVLH_DW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCRVLH_DW_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 471, // mPriority - &l_daObjCRVLH_DW_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CRVLH_DW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCRVLH_DW_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CRVLH_DW_e, + /* Actor SubMtd */ &l_daObjCRVLH_DW_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crvlh_up.cpp b/src/d/actor/d_a_obj_crvlh_up.cpp index 3facb4d6961..ce796b4150e 100644 --- a/src/d/actor/d_a_obj_crvlh_up.cpp +++ b/src/d/actor/d_a_obj_crvlh_up.cpp @@ -54,9 +54,9 @@ void daObjCRVLH_UP_c::Hakai() { mDoMtx_stack_c::multVec(&field_0x5ac[i], &field_0x5ac[i]); } - field_0x5a4 = fopAcM_create(PROC_Obj_CRVHAHEN, 1, &field_0x5ac[0], fopAcM_GetRoomNo(this), + field_0x5a4 = fopAcM_create(fpcNm_Obj_CRVHAHEN_e, 1, &field_0x5ac[0], fopAcM_GetRoomNo(this), &cStack_30, 0, -1); - field_0x5a8 = fopAcM_create(PROC_Obj_CRVHAHEN, 1, &field_0x5ac[1], fopAcM_GetRoomNo(this), + field_0x5a8 = fopAcM_create(fpcNm_Obj_CRVHAHEN_e, 1, &field_0x5ac[1], fopAcM_GetRoomNo(this), &cStack_30, 0, -1); dComIfGp_particle_set(dPa_RM(ID_ZF_S_CRVYAGURA05_SMK), &field_0x5ac[1], &tevStr, &cStack_30, 0); @@ -199,18 +199,18 @@ static actor_method_class l_daObjCRVLH_UP_Method = { }; actor_process_profile_definition g_profile_Obj_CRVLH_UP = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CRVLH_UP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCRVLH_UP_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 470, // mPriority - &l_daObjCRVLH_UP_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CRVLH_UP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCRVLH_UP_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CRVLH_UP_e, + /* Actor SubMtd */ &l_daObjCRVLH_UP_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crvsteel.cpp b/src/d/actor/d_a_obj_crvsteel.cpp index 5e5e4216a53..0dc774ef126 100644 --- a/src/d/actor/d_a_obj_crvsteel.cpp +++ b/src/d/actor/d_a_obj_crvsteel.cpp @@ -149,18 +149,18 @@ static actor_method_class l_daObjCRVSTEEL_Method = { }; actor_process_profile_definition g_profile_Obj_CRVSTEEL = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_CRVSTEEL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCRVSTEEL_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 469, // mPriority - &l_daObjCRVSTEEL_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_CRVSTEEL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCRVSTEEL_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_CRVSTEEL_e, + /* Actor SubMtd */ &l_daObjCRVSTEEL_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_crystal.cpp b/src/d/actor/d_a_obj_crystal.cpp index 0c490dca022..f3d43478d13 100644 --- a/src/d/actor/d_a_obj_crystal.cpp +++ b/src/d/actor/d_a_obj_crystal.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_crystal.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static int CheckCreateHeap(fopAc_ac_c* i_this) { @@ -138,18 +138,18 @@ static actor_method_class l_daObjCrystal_Method = { }; actor_process_profile_definition g_profile_Obj_Crystal = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_Crystal, - &g_fpcLf_Method.base, - sizeof(daObjCrystal_c), - 0, - 0, - &g_fopAc_Method.base, - 579, - &l_daObjCrystal_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Crystal_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCrystal_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Crystal_e, + /* Actor SubMtd */ &l_daObjCrystal_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index b7805ef4acf..600f433c1a5 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -835,20 +835,20 @@ static actor_method_class daObjCwall_METHODS = { }; actor_process_profile_definition g_profile_Obj_ChainWall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_ChainWall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCwall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 598, // mPriority - &daObjCwall_METHODS, // sub_method - 0x000C0000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ChainWall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCwall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ChainWall_e, + /* Actor SubMtd */ &daObjCwall_METHODS, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_damCps.cpp b/src/d/actor/d_a_obj_damCps.cpp index 65b5036b390..5e234a7342f 100644 --- a/src/d/actor/d_a_obj_damCps.cpp +++ b/src/d/actor/d_a_obj_damCps.cpp @@ -201,22 +201,22 @@ static actor_method_class l_daObjDamCps_Method = { #endif actor_process_profile_definition g_profile_Obj_DamCps = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_DamCps, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjDamCps_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 629, // mPriority + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_DamCps_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDamCps_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Priority */ fpcDwPi_Obj_DamCps_e, #if DEBUG - &l_daObjDamCps_Method, // sub_method + /* Actor SubMtd */ &l_daObjDamCps_Method, #else - NULL, // sub_method + /* Actor SubMtd */ NULL, #endif - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index 5cdba0081f0..0862e009bb8 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -10,7 +10,7 @@ #include "m_Do/m_Do_lib.h" #include "d/d_com_inf_game.h" #include "d/d_menu_insect.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" #include @@ -261,7 +261,7 @@ void daObjDAN_c::Insect_Release() { mAction = ACT_MOVE; } -static u8 const l_dan_itemno[2] = {fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI}; +static u8 const l_dan_itemno[2] = {dItemNo_M_DANGOMUSHI_e, dItemNo_F_DANGOMUSHI_e}; void daObjDAN_c::Z_BufferChk() { cXyz vec2, vec1; @@ -515,7 +515,7 @@ cPhs_Step daObjDAN_c::create() { if (mLocation == LOC_UNK_2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; } @@ -603,18 +603,18 @@ static actor_method_class l_daObjDAN_Method = { }; actor_process_profile_definition g_profile_Obj_Dan = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_Dan, - &g_fpcLf_Method.base, - sizeof(daObjDAN_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1E1, - &l_daObjDAN_Method, - 0xC0120, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Dan_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDAN_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Dan_e, + /* Actor SubMtd */ &l_daObjDAN_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_digholl.cpp b/src/d/actor/d_a_obj_digholl.cpp index d9fa7f35283..b9bfcdca8ad 100644 --- a/src/d/actor/d_a_obj_digholl.cpp +++ b/src/d/actor/d_a_obj_digholl.cpp @@ -102,18 +102,18 @@ static actor_method_class l_daObjDigholl_Method = { }; actor_process_profile_definition g_profile_Obj_Digholl = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Digholl, - &g_fpcLf_Method.base, - sizeof(daObjDigholl_c), - 0, - 0, - &g_fopAc_Method.base, - 249, - &l_daObjDigholl_Method, - 0x44100, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Digholl_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDigholl_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Digholl_e, + /* Actor SubMtd */ &l_daObjDigholl_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_digplace.cpp b/src/d/actor/d_a_obj_digplace.cpp index 8e3eee9fe34..16fa4380127 100644 --- a/src/d/actor/d_a_obj_digplace.cpp +++ b/src/d/actor/d_a_obj_digplace.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_digplace.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daObjDigpl_c::create() { fopAcM_ct(this, daObjDigpl_c); @@ -17,7 +17,7 @@ int daObjDigpl_c::create() { mSwitch = fopAcM_GetParam(this) & 0xFF; if (mType == 5) { - fopAcM_OffStatus(this, 0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); mpDigPoints = dPath_GetRoomPath((fopAcM_GetParam(this) >> 0x14) & 0xFF, fopAcM_GetRoomNo(this)); } @@ -176,18 +176,18 @@ static actor_method_class l_daObjDigpl_Method = { }; actor_process_profile_definition g_profile_Obj_Digpl = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Digpl, - &g_fpcLf_Method.base, - sizeof(daObjDigpl_c), - 0, - 0, - &g_fopAc_Method.base, - 250, - &l_daObjDigpl_Method, - 0x44080, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Digpl_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDigpl_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Digpl_e, + /* Actor SubMtd */ &l_daObjDigpl_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 7eca2582c9e..1d74f34e052 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -180,18 +180,18 @@ static actor_method_class daObjDigSnow_METHODS = { }; actor_process_profile_definition g_profile_Obj_DigSnow = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_DigSnow, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjDigSnow_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 634, // mPriority - &daObjDigSnow_METHODS, // sub_method - 0x44100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_DigSnow_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDigSnow_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_DigSnow_e, + /* Actor SubMtd */ &daObjDigSnow_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index 2e89ee2f859..af3615b246e 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -506,7 +506,7 @@ void daObjDmElevator_c::actionEvent() { } void daObjDmElevator_c::actionStartEvent() { - if ( fopAcM_CheckStatus(this, 0x1000) != 0) { + if ( fopAcM_CheckStatus(this, fopAcStts_STAFF_SHUTTER_e) != 0) { demoProc(); } else { mAction = 0; @@ -682,20 +682,20 @@ static actor_method_class daObjDmElevator_METHODS = { }; actor_process_profile_definition g_profile_Obj_Elevator = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Elevator, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjDmElevator_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 542, // mPriority - &daObjDmElevator_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Elevator_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDmElevator_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Elevator_e, + /* Actor SubMtd */ &daObjDmElevator_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index 3dbd1123ed7..f6ff9bdf369 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -29,13 +29,13 @@ static void* searchParentSub(void* pproc, void* pdata) { fopAc_ac_c* pym = (fopAc_ac_c*)pproc; if (pym != NULL && fopAcM_IsActor(pym)) { - if (fopAcM_GetProfName(pym) == PROC_E_YM) { + if (fopAcM_GetProfName(pym) == fpcNm_E_YM_e) { u8 swbit = ((daE_YM_c*)pym)->getSwitchBit(); if (swbit != 0xFF && swbit == pdrop->getYmSwbit()) { pdrop->field_0x6b7 = 1; return pym; } - } else if (fopAcM_GetProfName(pym) == PROC_E_YMB) { + } else if (fopAcM_GetProfName(pym) == fpcNm_E_YMB_e) { u8 swbit = ((daE_YMB_c*)pym)->getSwitchBit(); if (swbit != 0xFF && swbit == pdrop->getYmSwbit()) { pdrop->field_0x6b7 = 2; @@ -111,7 +111,7 @@ void daObjDrop_c::dropGet() { s8 area = dComIfGp_getStartStageDarkArea(); // "Drop of Light No%d<%d/%d> Get Area<%d>!\n" OS_REPORT("光の雫No%d<%d/%d>ゲットArea<%d>！\n", getSave(), num + 1, need_num, area); - execItemGet(fpcNm_ITEM_HEART); + execItemGet(dItemNo_HEART_e); mSetCollectDrop = false; } } @@ -231,12 +231,12 @@ int daObjDrop_c::modeNoParent() { int daObjDrop_c::modeParentWait() { fopAc_ac_c* pparent = fopAcM_SearchByID(parentActorID); if (pparent != NULL) { - if (fopAcM_GetProfName(pparent) == PROC_E_YM) { + if (fopAcM_GetProfName(pparent) == fpcNm_E_YM_e) { current.pos = pparent->current.pos; return 1; } - if (fopAcM_GetProfName(pparent) == PROC_E_YMB && !mAppear) { + if (fopAcM_GetProfName(pparent) == fpcNm_E_YMB_e && !mAppear) { return 1; } } @@ -489,7 +489,7 @@ int daObjDrop_c::actionCompleateDemo() { u8 need_num = dComIfGp_getNeedLightDropNum(); u8 num = dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea()); if (need_num == num) { - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); dComIfGs_onSaveSwitch(13); } } else if (timer == 1) { @@ -585,18 +585,18 @@ static actor_method_class l_daObjDrop_Method = { }; actor_process_profile_definition g_profile_Obj_Drop = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Drop, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjDrop_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 243, // mPriority - &l_daObjDrop_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Drop_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDrop_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Drop_e, + /* Actor SubMtd */ &l_daObjDrop_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_dust.cpp b/src/d/actor/d_a_obj_dust.cpp index 58429b97748..bd851109fd1 100644 --- a/src/d/actor/d_a_obj_dust.cpp +++ b/src/d/actor/d_a_obj_dust.cpp @@ -195,7 +195,7 @@ int daObjDust_c::Execute(Mtx** i_mtx) { cXyz& player_pos = fopAcM_GetPosition(player); cXyz& player_speed = fopAcM_GetSpeed(player); - if (fopAcM_SearchByName(PROC_E_YMB, &e_ymb) && e_ymb != NULL) { + if (fopAcM_SearchByName(fpcNm_E_YMB_e, &e_ymb) && e_ymb != NULL) { e_ymb_Pos = &fopAcM_GetPosition(e_ymb); } @@ -253,18 +253,18 @@ static actor_method_class l_daObjDust_Method = { actor_process_profile_definition g_profile_Obj_DUST = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_DUST, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjDust_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 473, // mPriority - &l_daObjDust_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_DUST_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjDust_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_DUST_e, + /* Actor SubMtd */ &l_daObjDust_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp index 8284980e8f9..21c34b7eb20 100644 --- a/src/d/actor/d_a_obj_eff.cpp +++ b/src/d/actor/d_a_obj_eff.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_eff.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daObjEff::Act_c::_create() { @@ -56,18 +56,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjEff actor_process_profile_definition g_profile_Obj_Eff = { - fpcLy_CURRENT_e, - 9, - fpcPi_CURRENT_e, - PROC_Obj_Eff, - &g_fpcLf_Method.base, - sizeof(daObjEff::Act_c), - 0, - 0, - &g_fopAc_Method.base, - 267, - &daObjEff::Mthd_Table, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Eff_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjEff::Act_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Eff_e, + /* Actor SubMtd */ &daObjEff::Mthd_Table, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_enemy_create.cpp b/src/d/actor/d_a_obj_enemy_create.cpp index c85d1c8f947..5f26675ef0f 100644 --- a/src/d/actor/d_a_obj_enemy_create.cpp +++ b/src/d/actor/d_a_obj_enemy_create.cpp @@ -159,34 +159,34 @@ void daObjE_CREATE_c::NameChk() { case ENEMY_NONE: break; case ENEMY_KEESE: - mEnemyProcName = PROC_E_BA; + mEnemyProcName = fpcNm_E_BA_e; break; case ENEMY_RAT: - mEnemyProcName = PROC_E_MS; + mEnemyProcName = fpcNm_E_MS_e; break; case ENEMY_CHU: - mEnemyProcName = PROC_E_SM2; + mEnemyProcName = fpcNm_E_SM2_e; mEnemyParams = 0xFFFFFF1F; break; case ENEMY_CHU2: - mEnemyProcName = PROC_E_SM2; + mEnemyProcName = fpcNm_E_SM2_e; mEnemyParams = 0xFFFFFF3F; break; case ENEMY_BABY_GOHMA: - mEnemyProcName = PROC_E_GM; + mEnemyProcName = fpcNm_E_GM_e; mEnemyParams = 0x000AFF02; break; case ENEMY_BUBBLE: - mEnemyProcName = PROC_E_BU; + mEnemyProcName = fpcNm_E_BU_e; break; case ENEMY_BOKOBLIN: - mEnemyProcName = PROC_E_OC; + mEnemyProcName = fpcNm_E_OC_e; break; case ENEMY_LIZALFOS: - mEnemyProcName = PROC_E_DN; + mEnemyProcName = fpcNm_E_DN_e; break; case ENEMY_SHADOW_BEAST: - mEnemyProcName = PROC_E_S1; + mEnemyProcName = fpcNm_E_S1_e; if (mEnemyNum == 1) { mEnemyParams = 0xFFFFFEF0; @@ -195,15 +195,15 @@ void daObjE_CREATE_c::NameChk() { } break; case ENEMY_SHADOW_VERMIN: - mEnemyProcName = PROC_E_YG; + mEnemyProcName = fpcNm_E_YG_e; mEnemyParams = 0xFFFFFF00; break; case ENEMY_SHADOW_KEESE: - mEnemyProcName = PROC_E_YK; + mEnemyProcName = fpcNm_E_YK_e; mEnemyParams = 0xFFFFFF01; break; case ENEMY_BOKOBLIN2: - mEnemyProcName = PROC_E_OC; + mEnemyProcName = fpcNm_E_OC_e; mEnemyParams = 0xFFFF01FF; mEnemyAngle.set(0x100, shape_angle.y, shape_angle.z); break; @@ -254,18 +254,18 @@ static actor_method_class l_daObjE_CREATE_Method = { }; actor_process_profile_definition g_profile_Obj_E_CREATE = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_E_CREATE, - &g_fpcLf_Method.base, - sizeof(daObjE_CREATE_c), - 0, - 0, - &g_fopAc_Method.base, - 458, - &l_daObjE_CREATE_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_E_CREATE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjE_CREATE_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_E_CREATE_e, + /* Actor SubMtd */ &l_daObjE_CREATE_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index f386a649cca..e310a7925f2 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/d_bg_w.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" @@ -66,7 +66,7 @@ int daObjFallObj_c::Create() { cXyz acStack_30(0.0f, -300.0f, 0.0f); u32 params = uVar1 | (getTime() << 8); mChildId = fopAcM_createChildFromOffset( - PROC_Obj_FallObj, fopAcM_GetID(this), params, &acStack_30, fopAcM_GetRoomNo(this), &shape_angle, + fpcNm_Obj_FallObj_e, fopAcM_GetID(this), params, &acStack_30, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, 0); } else { mChildId = fpcM_ERROR_PROCESS_ID_e; @@ -449,18 +449,18 @@ static actor_method_class daObjFallObj_METHODS = { }; actor_process_profile_definition g_profile_Obj_FallObj = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_FallObj, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFallObj_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 552, // mPriority - &daObjFallObj_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_FallObj_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFallObj_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_FallObj_e, + /* Actor SubMtd */ &daObjFallObj_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_fan.cpp b/src/d/actor/d_a_obj_fan.cpp index 52f864d1507..40d196706e9 100644 --- a/src/d/actor/d_a_obj_fan.cpp +++ b/src/d/actor/d_a_obj_fan.cpp @@ -336,18 +336,18 @@ static actor_method_class daObjFan_METHODS = { }; actor_process_profile_definition g_profile_Obj_Fan = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Fan, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFan_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0x235, // mPriority - &daObjFan_METHODS, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Fan_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFan_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Fan_e, + /* Actor SubMtd */ &daObjFan_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_fchain.cpp b/src/d/actor/d_a_obj_fchain.cpp index 0dc8a9c3008..4df69e058f2 100644 --- a/src/d/actor/d_a_obj_fchain.cpp +++ b/src/d/actor/d_a_obj_fchain.cpp @@ -311,18 +311,18 @@ static actor_method_class l_daObjFchain_Method = { }; actor_process_profile_definition g_profile_Obj_Fchain = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Fchain, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFchain_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 246, // mPriority - &l_daObjFchain_Method, // sub_method - 0x00060000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Fchain_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFchain_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Fchain_e, + /* Actor SubMtd */ &l_daObjFchain_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_fireWood.cpp b/src/d/actor/d_a_obj_fireWood.cpp index 7fe9d9c9fa3..dd314ed908a 100644 --- a/src/d/actor/d_a_obj_fireWood.cpp +++ b/src/d/actor/d_a_obj_fireWood.cpp @@ -191,18 +191,18 @@ static actor_method_class l_daFireWood_Method = { }; actor_process_profile_definition g_profile_Obj_FireWood = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_FireWood, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daFireWood_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 506, // mPriority - &l_daFireWood_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_FireWood_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daFireWood_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_FireWood_e, + /* Actor SubMtd */ &l_daFireWood_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_fireWood2.cpp b/src/d/actor/d_a_obj_fireWood2.cpp index a1d04e396e0..1bcc04777b4 100644 --- a/src/d/actor/d_a_obj_fireWood2.cpp +++ b/src/d/actor/d_a_obj_fireWood2.cpp @@ -275,18 +275,18 @@ static actor_method_class l_daFireWood2_Method = { }; actor_process_profile_definition g_profile_Obj_FireWood2 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv1Cdl00, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daFireWood2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 494, // mPriority - &l_daFireWood2_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv1Cdl00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daFireWood2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv1Cdl00_e, + /* Actor SubMtd */ &l_daFireWood2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_firepillar.cpp b/src/d/actor/d_a_obj_firepillar.cpp index 6e84d021071..986762a1fe2 100644 --- a/src/d/actor/d_a_obj_firepillar.cpp +++ b/src/d/actor/d_a_obj_firepillar.cpp @@ -222,18 +222,18 @@ static actor_method_class l_daObjFPillar_Method = { }; actor_process_profile_definition g_profile_Obj_FirePillar = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_FirePillar, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFPillar_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 446, // mPriority - &l_daObjFPillar_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_FirePillar_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFPillar_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_FirePillar_e, + /* Actor SubMtd */ &l_daObjFPillar_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_firepillar2.cpp b/src/d/actor/d_a_obj_firepillar2.cpp index a61b60bf5be..fde54cef666 100644 --- a/src/d/actor/d_a_obj_firepillar2.cpp +++ b/src/d/actor/d_a_obj_firepillar2.cpp @@ -504,18 +504,18 @@ static actor_method_class l_daObjFPillar2_Method = { }; actor_process_profile_definition g_profile_Obj_FirePillar2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_FirePillar2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFPillar2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 529, // mPriority - &l_daObjFPillar2_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_FirePillar2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFPillar2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_FirePillar2_e, + /* Actor SubMtd */ &l_daObjFPillar2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_flag.cpp b/src/d/actor/d_a_obj_flag.cpp index 9e2e11bdafc..b3a19f8d106 100644 --- a/src/d/actor/d_a_obj_flag.cpp +++ b/src/d/actor/d_a_obj_flag.cpp @@ -306,18 +306,18 @@ static actor_method_class l_daObjFlag_Method = { }; actor_process_profile_definition g_profile_Obj_Flag = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Flag, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFlag_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 26, // mPriority - &l_daObjFlag_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Flag_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFlag_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Flag_e, + /* Actor SubMtd */ &l_daObjFlag_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp index f63ab38d345..3d844fc5f62 100644 --- a/src/d/actor/d_a_obj_flag2.cpp +++ b/src/d/actor/d_a_obj_flag2.cpp @@ -507,18 +507,18 @@ static actor_method_class l_daObjFlag2_Method = { }; actor_process_profile_definition g_profile_Obj_Flag2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Flag2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFlag2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 27, // mPriority - &l_daObjFlag2_Method, // sub_method - 0x00044180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Flag2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFlag2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Flag2_e, + /* Actor SubMtd */ &l_daObjFlag2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_flag3.cpp b/src/d/actor/d_a_obj_flag3.cpp index 41d3a555e1c..79860012df3 100644 --- a/src/d/actor/d_a_obj_flag3.cpp +++ b/src/d/actor/d_a_obj_flag3.cpp @@ -512,18 +512,18 @@ static actor_method_class l_daObjFlag3_Method = { }; actor_process_profile_definition g_profile_Obj_Flag3 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Flag3, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFlag3_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 28, // mPriority - &l_daObjFlag3_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Flag3_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFlag3_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Flag3_e, + /* Actor SubMtd */ &l_daObjFlag3_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_fmobj.cpp b/src/d/actor/d_a_obj_fmobj.cpp index e3de14f9b4b..13be0c840ec 100644 --- a/src/d/actor/d_a_obj_fmobj.cpp +++ b/src/d/actor/d_a_obj_fmobj.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_fmobj.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_math.h" #include "f_op/f_op_actor_mng.h" @@ -119,18 +119,18 @@ static actor_method_class l_daObj_Fmobj_Method = { }; actor_process_profile_definition g_profile_OBJ_FMOBJ = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_FMOBJ, - &g_fpcLf_Method.base, - sizeof(obj_fmobj_class), - 0, - 0, - &g_fopAc_Method.base, - 40, - &l_daObj_Fmobj_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_7_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_FMOBJ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_fmobj_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_FMOBJ_e, + /* Actor SubMtd */ &l_daObj_Fmobj_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_7_e, }; diff --git a/src/d/actor/d_a_obj_food.cpp b/src/d/actor/d_a_obj_food.cpp index 54e30faf14a..bbc9ac14b6a 100644 --- a/src/d/actor/d_a_obj_food.cpp +++ b/src/d/actor/d_a_obj_food.cpp @@ -12,7 +12,7 @@ #include "d/d_cc_uty.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static bool hio_set; @@ -502,18 +502,18 @@ static actor_method_class l_daObj_Food_Method = { }; actor_process_profile_definition g_profile_OBJ_FOOD = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_FOOD, - &g_fpcLf_Method.base, - sizeof(obj_food_class), - 0, - 0, - &g_fopAc_Method.base, - 0x2C8, - &l_daObj_Food_Method, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_FOOD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_food_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_FOOD_e, + /* Actor SubMtd */ &l_daObj_Food_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_fw.cpp b/src/d/actor/d_a_obj_fw.cpp index 48f11e1c1db..34633e40be5 100644 --- a/src/d/actor/d_a_obj_fw.cpp +++ b/src/d/actor/d_a_obj_fw.cpp @@ -34,7 +34,7 @@ static u8 hio_set; static daObj_Fw_HIO_c l_HIO; static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* a_this, fopAc_ac_c* param_3) { - if (fopAcM_GetName(param_3) == PROC_ALINK) { + if (fopAcM_GetName(param_3) == fpcNm_ALINK_e) { obj_fw_class* i_this = (obj_fw_class*)a_this; if (i_this->field_0x592 == 0) { @@ -306,18 +306,18 @@ static actor_method_class l_daObj_Fw_Method = { }; actor_process_profile_definition g_profile_OBJ_FW = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_FW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_fw_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 42, // mPriority - &l_daObj_Fw_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_FW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_fw_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_FW_e, + /* Actor SubMtd */ &l_daObj_Fw_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp index 73bcda8a77a..1a7c4fed054 100644 --- a/src/d/actor/d_a_obj_gadget.cpp +++ b/src/d/actor/d_a_obj_gadget.cpp @@ -610,18 +610,18 @@ static actor_method_class daObj_Gadget_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_GADGET = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_GADGET, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Gadget_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 82, // mPriority - &daObj_Gadget_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_GADGET_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Gadget_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_GADGET_e, + /* Actor SubMtd */ &daObj_Gadget_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ganonwall.cpp b/src/d/actor/d_a_obj_ganonwall.cpp index 71c103bc2ce..6f2acb2fb74 100644 --- a/src/d/actor/d_a_obj_ganonwall.cpp +++ b/src/d/actor/d_a_obj_ganonwall.cpp @@ -189,18 +189,18 @@ static actor_method_class l_daObjGWall_Method = { }; actor_process_profile_definition g_profile_Obj_GanonWall = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GanonWall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjGWall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 570, // mPriority - &l_daObjGWall_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GanonWall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGWall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GanonWall_e, + /* Actor SubMtd */ &l_daObjGWall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ganonwall2.cpp b/src/d/actor/d_a_obj_ganonwall2.cpp index 2663d8fc6d8..f4252aab0f1 100644 --- a/src/d/actor/d_a_obj_ganonwall2.cpp +++ b/src/d/actor/d_a_obj_ganonwall2.cpp @@ -175,18 +175,18 @@ static actor_method_class daObjGWall2_METHODS = { }; actor_process_profile_definition g_profile_Obj_GanonWall2 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GanonWall2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjGWall2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 580, // mPriority - &daObjGWall2_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GanonWall2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGWall2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GanonWall2_e, + /* Actor SubMtd */ &daObjGWall2_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp index 55e2bd5ecfb..d5bd1d6c25f 100644 --- a/src/d/actor/d_a_obj_gb.cpp +++ b/src/d/actor/d_a_obj_gb.cpp @@ -230,18 +230,18 @@ static actor_method_class l_daObj_Gb_Method = { }; actor_process_profile_definition g_profile_OBJ_GB = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_GB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_gb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 56, // mPriority - &l_daObj_Gb_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_GB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_gb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_GB_e, + /* Actor SubMtd */ &l_daObj_Gb_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_geyser.cpp b/src/d/actor/d_a_obj_geyser.cpp index 465ce1807ae..0f34360a334 100644 --- a/src/d/actor/d_a_obj_geyser.cpp +++ b/src/d/actor/d_a_obj_geyser.cpp @@ -690,18 +690,18 @@ static actor_method_class daObjGeyser_METHODS = { }; actor_process_profile_definition g_profile_Obj_Geyser = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Geyser, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjGeyser_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 596, // mPriority - &daObjGeyser_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Geyser_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGeyser_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Geyser_e, + /* Actor SubMtd */ &daObjGeyser_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_glowSphere.cpp b/src/d/actor/d_a_obj_glowSphere.cpp index 045d5ec7849..b60a1c9aa09 100644 --- a/src/d/actor/d_a_obj_glowSphere.cpp +++ b/src/d/actor/d_a_obj_glowSphere.cpp @@ -463,20 +463,20 @@ static actor_method_class l_daGlwSph_Method = { }; actor_process_profile_definition g_profile_Obj_glowSphere = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_glowSphere, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daGlwSph_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 651, // mPriority - &l_daGlwSph_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_glowSphere_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGlwSph_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_glowSphere_e, + /* Actor SubMtd */ &l_daGlwSph_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_gm.cpp b/src/d/actor/d_a_obj_gm.cpp index 1b334ac4b34..89419b1e490 100644 --- a/src/d/actor/d_a_obj_gm.cpp +++ b/src/d/actor/d_a_obj_gm.cpp @@ -508,7 +508,7 @@ static void action(obj_gm_class* i_this) { } fopAc_ac_c* actor_p = dCc_GetAc(i_this->mSph.GetTgHitObj()->GetAc()); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_OBJ_GM) { + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_OBJ_GM_e) { i_this->field_0xae4 |= 2; } } @@ -518,7 +518,7 @@ static void action(obj_gm_class* i_this) { } static void* s_tbox_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TBOX) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TBOX_e) { f32 fVar1 = ((fopAc_ac_c*)i_actor)->current.pos.x - ((fopAc_ac_c*)i_data)->current.pos.x; f32 fVar2 = ((fopAc_ac_c*)i_actor)->current.pos.z - ((fopAc_ac_c*)i_data)->current.pos.z; if (fVar1 * fVar1 + fVar2 * fVar2 < 40000.0f) { @@ -530,7 +530,7 @@ static void* s_tbox_sub(void* i_actor, void* i_data) { } static void* s_so_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_SO) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_SO_e) { return i_actor; } @@ -575,7 +575,7 @@ static int daObj_Gm_Execute(obj_gm_class* i_this) { i_this->mSound.startCreatureSound(JA_SE_OBJ_BREAK_CHINA_S, 0, -1); if ((fopAcM_GetParam(a_this) & 0xFF) == 32) { - fopAcM_createItemForMidBoss(&a_this->current.pos, fpcNm_ITEM_SMALL_KEY, fopAcM_GetRoomNo(a_this), NULL, NULL, 0, fopAcM_GetParam(a_this) >> 24); + fopAcM_createItemForMidBoss(&a_this->current.pos, dItemNo_SMALL_KEY_e, fopAcM_GetRoomNo(a_this), NULL, NULL, 0, fopAcM_GetParam(a_this) >> 24); } } else if (i_this->mType == 1) { daObj::make_eff_break_gm_ootubo(a_this); @@ -705,11 +705,11 @@ static cPhs_Step daObj_Gm_Create(fopAc_ac_c* a_this) { daObj_Gm_Execute(i_this); - fopAcM_createChild(PROC_OBJ_ITO, fopAcM_GetID(a_this), i_this->mType << 1, &a_this->current.pos, + fopAcM_createChild(fpcNm_OBJ_ITO_e, fopAcM_GetID(a_this), i_this->mType << 1, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->current.angle, NULL, -1, NULL); if (i_this->field_0x571 == 1) { - fopAcM_createChild(PROC_OBJ_ITO, fopAcM_GetID(a_this), (i_this->mType << 1) | 1, &a_this->current.pos, + fopAcM_createChild(fpcNm_OBJ_ITO_e, fopAcM_GetID(a_this), (i_this->mType << 1) | 1, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->current.angle, NULL, -1, NULL); } else { a_this->current.angle.x = 0; @@ -728,18 +728,18 @@ static actor_method_class l_daObj_Gm_Method = { }; actor_process_profile_definition g_profile_OBJ_GM = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_GM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_gm_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 57, // mPriority - &l_daObj_Gm_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_GM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_gm_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_GM_e, + /* Actor SubMtd */ &l_daObj_Gm_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_goGate.cpp b/src/d/actor/d_a_obj_goGate.cpp index f8b85aded14..fc0fef5ba5d 100644 --- a/src/d/actor/d_a_obj_goGate.cpp +++ b/src/d/actor/d_a_obj_goGate.cpp @@ -177,18 +177,18 @@ static actor_method_class l_daGoGate_Method = { }; actor_process_profile_definition g_profile_Obj_GoGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GoGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daGoGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 504, // mPriority - &l_daGoGate_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GoGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGoGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GoGate_e, + /* Actor SubMtd */ &l_daGoGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index c274b737cf7..66963f0efd2 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_gomikabe.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -123,7 +123,7 @@ void daObjGOMIKABE_c::BreakSet() { field_0x5a2++; mAction++; Z2GetAudioMgr()->seStart(Z2SE_OBJ_G_KABE_BRK, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); if (mpBgW != NULL && mpBgW->ChkUsed()) { dComIfG_Bgsp().Release(mpBgW); } @@ -135,7 +135,7 @@ void daObjGOMIKABE_c::getWaterStream(cXyz& param_1, cXyz& param_2, f32 i_scale) int local_58 = 0; s32 res = fopAcM_getWaterStream(¶m_1, mGndChk, &local_48, &local_58, 0); cXyz local_54(local_58 * local_48.x, local_58 * local_48.y, local_58 * local_48.z); - + if (res != 0) { cLib_addCalc2(¶m_2.x, local_54.x * 0.7f, 0.5f, i_scale); cLib_addCalc2(¶m_2.z, local_54.z * 0.7f, 0.5f, i_scale); @@ -394,18 +394,18 @@ static actor_method_class l_daObjGOMIKABE_Method = { }; actor_process_profile_definition g_profile_Obj_GOMIKABE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GOMIKABE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjGOMIKABE_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 519, // mPriority - &l_daObjGOMIKABE_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GOMIKABE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGOMIKABE_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GOMIKABE_e, + /* Actor SubMtd */ &l_daObjGOMIKABE_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gpTaru.cpp b/src/d/actor/d_a_obj_gpTaru.cpp index 5e01a5bf176..74b0f8cfdf8 100644 --- a/src/d/actor/d_a_obj_gpTaru.cpp +++ b/src/d/actor/d_a_obj_gpTaru.cpp @@ -271,7 +271,7 @@ int daGpTaru_c::Execute() { } } else { fopAc_ac_c* tg_hit_actor = dCc_GetAc(mCcCyl.GetTgHitObj()->GetAc()); - if (tg_hit_actor != NULL && fopAcM_GetName(tg_hit_actor) == PROC_E_WB) { + if (tg_hit_actor != NULL && fopAcM_GetName(tg_hit_actor) == fpcNm_E_WB_e) { mode_init_explosion(); } } @@ -279,7 +279,7 @@ int daGpTaru_c::Execute() { if (mCcCyl.ChkCoHit()) { fopAc_ac_c* co_hit_actor = dCc_GetAc(mCcCyl.GetCoHitObj()->GetAc()); - if (co_hit_actor != NULL && fopAcM_GetName(co_hit_actor) == PROC_E_WB) { + if (co_hit_actor != NULL && fopAcM_GetName(co_hit_actor) == fpcNm_E_WB_e) { if (co_hit_actor->speedF >= 7.0f) { mode_init_explosion(); } @@ -590,18 +590,18 @@ static actor_method_class l_daGpTaru_Method = { }; actor_process_profile_definition g_profile_Obj_GpTaru = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GpTaru, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daGpTaru_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 509, // mPriority - &l_daGpTaru_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GpTaru_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGpTaru_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GpTaru_e, + /* Actor SubMtd */ &l_daGpTaru_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index 7a883902692..a5d3c5fb699 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_gra2.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -222,7 +222,7 @@ static int jointCtrlCallBack(J3DJoint* i_joint, int param_2) { void daObj_GrA_c::rideCallBack(dBgW* param_1, fopAc_ac_c* actor_p, fopAc_ac_c* param_3) { daObj_GrA_c* aActor_p = (daObj_GrA_c*) actor_p; JUT_ASSERT(684, NULL != aActor_p); - aActor_p->field_0x10c4 = fopAcM_GetProfName(param_3) == PROC_ALINK; + aActor_p->field_0x10c4 = fopAcM_GetProfName(param_3) == fpcNm_ALINK_e; } daObj_GrA_c::daObj_GrA_c() {} @@ -397,7 +397,7 @@ int daObj_GrA_c::CreateHeap() { field_0x83c = l_entryJntNoList; setFaceAnm(22, false, 0.0f); setBaseAnm(17, 0.0f); - + return 1; } @@ -487,7 +487,7 @@ int daObj_GrA_c::jointCtrl(J3DJoint* i_joint, J3DModel* param_2) { switch (jointNo) { case 1: break; - + case 3: mDoMtx_stack_c::ZXYrotM(field_0x9bc); break; @@ -667,7 +667,7 @@ int daObj_GrA_c::init() { attention_info.distances[fopAc_attn_CARRY_e] = 40; attention_info.distances[fopAc_attn_BATTLE_e] = 22; mAcchCir.SetWall(mpHIO->m.mWallH, mpHIO->m.mWallR); - mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this), fopAcM_GetAngle_p(this), fopAcM_GetShapeAngle_p(this)); mCcStts.Init(mpHIO->m.mWeight, 0, this); field_0xf50.Set(mCcDCyl); @@ -704,7 +704,7 @@ int daObj_GrA_c::init() { setRoomNo(); if (mMode == 2) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OffStatus(this, fopAcStts_UNK_0x4000_e); } field_0x1528.setPathInfo(getPathNo(), fopAcM_GetRoomNo(this), 1); @@ -1019,7 +1019,7 @@ void daObj_GrA_c::mainProc() { if (mMode == 0) { if ((home.pos - current.pos).absXZ() > getSrchCircleR()) { cXyz sp3c(0.0f, 0.0f, getSrchCircleR()); - cLib_offsetPos(¤t.pos, &home.pos, + cLib_offsetPos(¤t.pos, &home.pos, cLib_targetAngleY(&home.pos, ¤t.pos), &sp3c); } } @@ -1453,7 +1453,7 @@ int daObj_GrA_c::talk(void* param_1) { setBaseMotion(0, mpHIO->m.field_0x0c); setFaceMotion(0, -1.0f); } - + return 0; } @@ -1542,7 +1542,7 @@ int daObj_GrA_c::ctrlMsgAnm(int& param_1, int& param_2, fopAc_ac_c* param_3) { static void* s_sub(void* i_actor, void* i_data) { daObj_GrA_c* i_this = (daObj_GrA_c*)i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA && i_this->checkTagGraSub((fopAc_ac_c*)i_actor)) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_GRA_e && i_this->checkTagGraSub((fopAc_ac_c*)i_actor)) { return i_actor; } return NULL; @@ -1642,10 +1642,10 @@ int daObj_GrA_c::setPrtcl() { for (int i = 0; i < 3; i++) { if (i == 0) { - field_0x2020[i] = dComIfGp_particle_set(field_0x2020[i], l_prticles_id[i], &sp28, &tevStr, ¤t.angle, + field_0x2020[i] = dComIfGp_particle_set(field_0x2020[i], l_prticles_id[i], &sp28, &tevStr, ¤t.angle, &sp34, 0xFF, NULL, -1, NULL, NULL, NULL); } else { - field_0x2020[i] = dComIfGp_particle_setPolyColor(field_0x2020[i], l_prticles_id[i], mAcch.m_gnd, &sp28, + field_0x2020[i] = dComIfGp_particle_setPolyColor(field_0x2020[i], l_prticles_id[i], mAcch.m_gnd, &sp28, &tevStr, ¤t.angle, &sp34, 0, NULL, -1, NULL); } @@ -1783,7 +1783,7 @@ int daObj_GrA_c::base013(int param_1) { } else if (field_0x201c < 10) { field_0x201c++; } - + if (field_0x2010 != field_0x842 && field_0x201c < 10) { mSound.startCreatureSound(Z2SE_GORON_ROLLING, cLib_minMaxLimit(fabsf(mpModelMorf->getPlaySpeed()) * 20.0f, 1.0f, 127.0f), -1); field_0x2010 = field_0x842; @@ -2130,18 +2130,18 @@ static actor_method_class daObj_GrA_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_GRA = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_GRA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_GrA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 19, // mPriority - &daObj_GrA_MethodTable, // sub_method - 0x00040100, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_GRA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_GrA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_GRA_e, + /* Actor SubMtd */ &daObj_GrA_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gra2_base.inc b/src/d/actor/d_a_obj_gra2_base.inc index b99ee70315c..e646bcded99 100644 --- a/src/d/actor/d_a_obj_gra2_base.inc +++ b/src/d/actor/d_a_obj_gra2_base.inc @@ -4,7 +4,7 @@ static void* s_sub2(void* i_actor, void* i_data) { daObj_GrA_c* i_this = (daObj_GrA_c*)i_data; - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_GRA && (u8)i_this->checkGraSub((fopAc_ac_c*)i_actor)) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_GRA_e && (u8)i_this->checkGraSub((fopAc_ac_c*)i_actor)) { return i_actor; } return NULL; @@ -64,9 +64,9 @@ int daObj_GrA_c::waitDemo(void* param_1) { } else { #if DEBUG if (mpHIO->m.field_0x8a) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } else { - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(this, fopAcStts_CULL_e); } #endif @@ -80,7 +80,7 @@ int daObj_GrA_c::waitDemo(void* param_1) { case 2: #if DEBUG - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OnStatus(this, fopAcStts_CULL_e); #endif break; } @@ -150,7 +150,7 @@ int daObj_GrA_c::startDemo(void* param_1) { player->changeOriginalDemo(); gra_p->field_0x204c.entry(this); gra_p->setProcess(&daObj_GrA_c::soldierDemo); - fopAcM_OnStatus(gra_p, fopAcM_STATUS_UNK_0x8000); + fopAcM_OnStatus(gra_p, fopAcStts_STAFF_PRIMARY_e); field_0x2056 = 0; dComIfGp_getEvent()->setSkipProc(this, skipCallBack, 0); dComIfGp_getEvent()->onSkipFade(); @@ -408,7 +408,7 @@ int daObj_GrA_c::startDemo(void* param_1) { } else if (mAcch.ChkGroundHit()) { cXyz spd8(-1482.0f, 3650.0f, -4459.0f); if ((current.pos - spd8).absXZ() > 50.0f) { - cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &spd8), + cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &spd8), 24, mpHIO->m.field_0x88); shape_angle.y = current.angle.y; field_0x91a.y = current.angle.y; @@ -575,7 +575,7 @@ BOOL daObj_GrA_c::chkPointInArea(cXyz param_1, cXyz param_2, f32 param_3, f32 pa sp74.y += var_f31; sp74.y += sp68.y; - return chkPointInArea(param_1, sp74, sp68, param_6); + return chkPointInArea(param_1, sp74, sp68, param_6); } BOOL daObj_GrA_c::chkPointInArea(cXyz param_1, cXyz param_2, cXyz param_3, s16 param_4) { @@ -602,7 +602,7 @@ BOOL daObj_GrA_c::chkActorInSight2(fopAc_ac_c* actor, f32 param_2, s16 param_3) cXyz daObj_GrA_c::getAttentionPos(fopAc_ac_c* i_actor_p) { cXyz pos = i_actor_p->attention_info.position; - if (fopAcM_GetName(i_actor_p) == PROC_ALINK) { + if (fopAcM_GetName(i_actor_p) == fpcNm_ALINK_e) { pos.y -= daPy_py_c::getAttentionOffsetY(); } diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index f1f496ce8b0..5bb137c1674 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -319,7 +319,7 @@ int daObj_GrA_c::toStone(void* param_1) { } field_0x10c4 = 0; - + return 1; } @@ -954,7 +954,7 @@ int daObj_GrA_c::rollAttack(void* param_1) { cLib_chaseF(&speedF, getSpeed(), mpHIO->m.field_0xa8); if (field_0x201c < 10) { - cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &sp6c), + cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &sp6c), 1, mpHIO->m.field_0x88); shape_angle.y = current.angle.y; field_0x91a.y = current.angle.y; @@ -1053,7 +1053,7 @@ int daObj_GrA_c::rollAttack(void* param_1) { if (field_0x1fe9 == 0 && field_0xf50.ChkCoHit() != 0) { fopAc_ac_c* hitobj_p = dCc_GetAc(field_0xf50.GetCoHitObj()->GetAc()); - if (fopAcM_GetName(hitobj_p) == PROC_ALINK) { + if (fopAcM_GetName(hitobj_p) == fpcNm_ALINK_e) { field_0x1fe9 = 1; player->offGoronSideMove(); player->offGoronUpStopCancel(); @@ -1230,7 +1230,7 @@ int daObj_GrA_c::rollAttacked(void* param_1) { cXyz sp3c = field_0x1528.getPntPos(field_0x1528.getIdx() & 0xFFFF); sVar1 = current.angle.y; cLib_chaseF(&speedF, getSpeed(), mpHIO->m.field_0xa8); - cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &sp3c), + cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &sp3c), 8, field_0x1528.field_0xa14); field_0x1528.field_0xa14 = abs(current.angle.y - sVar1); cLib_addCalcAngleS2(&field_0x1528.field_0xa14, mpHIO->m.field_0x88, @@ -1300,7 +1300,7 @@ int daObj_GrA_c::rollEscape(void* param_1) { } } - if (field_0x2030 == 1 && field_0x2005 == 0 && + if (field_0x2030 == 1 && field_0x2005 == 0 && (fopAcM_otherBgCheck(this, dComIfGp_getPlayer(0)) || fopAcM_CheckCondition(this, 4) != 0)) { if (dComIfGp_getVibration().CheckQuake()) { dComIfGp_getVibration().StopQuake(31); @@ -1329,7 +1329,7 @@ int daObj_GrA_c::rollEscape(void* param_1) { cXyz vec_0x48 = field_0x1528.getPntPos(field_0x1528.getIdx() & 0xFFFF); sVar1 = current.angle.y; cLib_chaseF(&speedF, getSpeed(), mpHIO->m.field_0xa8); - cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &vec_0x48), + cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &vec_0x48), 8, field_0x1528.field_0xa14); field_0x1528.field_0xa14 = abs(current.angle.y - sVar1); cLib_addCalcAngleS2(&field_0x1528.field_0xa14, mpHIO->m.field_0x88, 8, 0x40); @@ -1397,7 +1397,7 @@ int daObj_GrA_c::thrown(void* param_1) { switch (field_0xa7c) { case 0: - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); field_0x1ff0 = 1; mDemoCamMode = 0; field_0x209c = 1; diff --git a/src/d/actor/d_a_obj_graWall.cpp b/src/d/actor/d_a_obj_graWall.cpp index 44b6b034c0e..3bff2a8ae20 100644 --- a/src/d/actor/d_a_obj_graWall.cpp +++ b/src/d/actor/d_a_obj_graWall.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_graWall.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daObjGraWall_c::Create() { fopAcM_ct(this, daObjGraWall_c); @@ -104,18 +104,18 @@ static actor_method_class l_daObjGraWall_Method = { }; actor_process_profile_definition g_profile_GRA_WALL = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_GRA_WALL, - &g_fpcLf_Method.base, - sizeof(daObjGraWall_c), - 0, - 0, - &g_fopAc_Method.base, - 611, - &l_daObjGraWall_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GRA_WALL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGraWall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_GRA_WALL_e, + /* Actor SubMtd */ &l_daObjGraWall_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_gra_rock.cpp b/src/d/actor/d_a_obj_gra_rock.cpp index 8dc96aa378c..e2b1a06f063 100644 --- a/src/d/actor/d_a_obj_gra_rock.cpp +++ b/src/d/actor/d_a_obj_gra_rock.cpp @@ -117,7 +117,7 @@ void daObjGraRock_c::col_set() { dComIfGs_onSwitch(field_0x9c8, fopAcM_GetRoomNo(this)); csXyz local_34(current.angle); local_34.x = 2; - fopAcM_create(PROC_NPC_GRA, 0x5fffff00, &acStack_2c, fopAcM_GetRoomNo(this), &local_34, 0, + fopAcM_create(fpcNm_NPC_GRA_e, 0x5fffff00, &acStack_2c, fopAcM_GetRoomNo(this), &local_34, 0, -1); Z2GetAudioMgr()->seStart(Z2SE_OBJ_ZR_GRN_ROCK_BRK, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -307,18 +307,18 @@ static actor_method_class l_daObjGraRock_Method = { }; actor_process_profile_definition g_profile_Obj_GraRock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GraRock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjGraRock_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 609, // mPriority - &l_daObjGraRock_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GraRock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGraRock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GraRock_e, + /* Actor SubMtd */ &l_daObjGraRock_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_grave_stone.cpp b/src/d/actor/d_a_obj_grave_stone.cpp index 6dcb0389c0d..771635d5898 100644 --- a/src/d/actor/d_a_obj_grave_stone.cpp +++ b/src/d/actor/d_a_obj_grave_stone.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_grave_stone.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" @@ -224,18 +224,18 @@ static actor_method_class l_daGraveStone_Method = { }; actor_process_profile_definition g_profile_Obj_GraveStone = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_GraveStone, - &g_fpcLf_Method.base, - sizeof(daGraveStone_c), - 0, - 0, - &g_fopAc_Method.base, - 0x25F, - &l_daGraveStone_Method, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GraveStone_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGraveStone_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GraveStone_e, + /* Actor SubMtd */ &l_daGraveStone_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_groundwater.cpp b/src/d/actor/d_a_obj_groundwater.cpp index 918d1794443..2d3d05a36cb 100644 --- a/src/d/actor/d_a_obj_groundwater.cpp +++ b/src/d/actor/d_a_obj_groundwater.cpp @@ -344,18 +344,18 @@ static actor_method_class l_daGrdWater_Method = { }; actor_process_profile_definition g_profile_GRDWATER = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_GRDWATER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daGrdWater_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 489, // mPriority - &l_daGrdWater_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GRDWATER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daGrdWater_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_GRDWATER_e, + /* Actor SubMtd */ &l_daGrdWater_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_grz_rock.cpp b/src/d/actor/d_a_obj_grz_rock.cpp index 5bd93e131b9..772f7a8cff3 100644 --- a/src/d/actor/d_a_obj_grz_rock.cpp +++ b/src/d/actor/d_a_obj_grz_rock.cpp @@ -162,18 +162,18 @@ static actor_method_class l_daObjGrzRock_Method = { }; actor_process_profile_definition g_profile_Obj_GrzRock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_GrzRock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjGrzRock_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 610, // mPriority - &l_daObjGrzRock_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_GrzRock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGrzRock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_GrzRock_e, + /* Actor SubMtd */ &l_daObjGrzRock_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_h_saku.cpp b/src/d/actor/d_a_obj_h_saku.cpp index dc814a0fa57..1349e377ea7 100644 --- a/src/d/actor/d_a_obj_h_saku.cpp +++ b/src/d/actor/d_a_obj_h_saku.cpp @@ -303,18 +303,18 @@ static actor_method_class l_daObjH_Saku_Method = { }; actor_process_profile_definition g_profile_Obj_H_Saku = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_H_Saku, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjH_Saku_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 464, // mPriority - &l_daObjH_Saku_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_H_Saku_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjH_Saku_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_H_Saku_e, + /* Actor SubMtd */ &l_daObjH_Saku_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hakai_brl.cpp b/src/d/actor/d_a_obj_hakai_brl.cpp index 1b71ca265c1..ea157e4822b 100644 --- a/src/d/actor/d_a_obj_hakai_brl.cpp +++ b/src/d/actor/d_a_obj_hakai_brl.cpp @@ -198,18 +198,18 @@ static actor_method_class daObjHBarrel_METHODS = { }; actor_process_profile_definition g_profile_Obj_HBarrel = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_HBarrel, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjHBarrel_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 745, // mPriority - &daObjHBarrel_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_HBarrel_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjHBarrel_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_HBarrel_e, + /* Actor SubMtd */ &daObjHBarrel_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hakai_ftr.cpp b/src/d/actor/d_a_obj_hakai_ftr.cpp index e1f42e611b8..82f1cb8b723 100644 --- a/src/d/actor/d_a_obj_hakai_ftr.cpp +++ b/src/d/actor/d_a_obj_hakai_ftr.cpp @@ -208,18 +208,18 @@ static actor_method_class daObjHFtr_METHODS = { }; actor_process_profile_definition g_profile_Obj_HFtr = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_HFtr, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjHFtr_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 744, // mPriority - &daObjHFtr_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_HFtr_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjHFtr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_HFtr_e, + /* Actor SubMtd */ &daObjHFtr_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hasu2.cpp b/src/d/actor/d_a_obj_hasu2.cpp index f67a777e9f5..139dfc9bf64 100644 --- a/src/d/actor/d_a_obj_hasu2.cpp +++ b/src/d/actor/d_a_obj_hasu2.cpp @@ -9,7 +9,7 @@ static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { UNUSED(param_0); - if (fopAcM_GetName(param_2) == PROC_ALINK) { + if (fopAcM_GetName(param_2) == fpcNm_ALINK_e) { nObjMHasu::daObjMHasu_c* hasu = (nObjMHasu::daObjMHasu_c*)(param_1); hasu->setRideFlag(true); hasu->setHasuCount(param_2->speedF); @@ -185,18 +185,18 @@ actor_method_class daObjMHasu_METHODS = { }; actor_process_profile_definition g_profile_Obj_MHasu = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MHasu, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(nObjMHasu::daObjMHasu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 666, // mPriority - &daObjMHasu_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MHasu_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(nObjMHasu::daObjMHasu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MHasu_e, + /* Actor SubMtd */ &daObjMHasu_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hata.cpp b/src/d/actor/d_a_obj_hata.cpp index 58fcc3dddbc..fd4d30cbca9 100644 --- a/src/d/actor/d_a_obj_hata.cpp +++ b/src/d/actor/d_a_obj_hata.cpp @@ -181,18 +181,18 @@ static actor_method_class daObjHata_METHODS = { }; actor_process_profile_definition g_profile_Obj_Hata = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Hata, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjHata_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 747, // mPriority - &daObjHata_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Hata_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjHata_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Hata_e, + /* Actor SubMtd */ &daObjHata_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hb.cpp b/src/d/actor/d_a_obj_hb.cpp index de047bb066a..76fee9ab7be 100644 --- a/src/d/actor/d_a_obj_hb.cpp +++ b/src/d/actor/d_a_obj_hb.cpp @@ -697,7 +697,7 @@ static cPhs_Step daOBJ_HB_Create(fopAc_ac_c* a_this) { i_this->mMode = 0; a_this->scale.x = 1.0f; i_this->mChildPlaySpeed = 0.0f; - i_this->mChildActorID = fopAcM_createChild(PROC_E_HB_LEAF, fopAcM_GetID(a_this), 0, &a_this->current.pos, + i_this->mChildActorID = fopAcM_createChild(fpcNm_E_HB_LEAF_e, fopAcM_GetID(a_this), 0, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->shape_angle, NULL, -1, NULL); i_this->field_0x6b0 = 1; } @@ -719,18 +719,18 @@ static actor_method_class l_daOBJ_HB_Method = { }; actor_process_profile_definition g_profile_OBJ_HB = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_HB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_hb_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 705, // mPriority - &l_daOBJ_HB_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_HB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_hb_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_HB_e, + /* Actor SubMtd */ &l_daOBJ_HB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_hbombkoya.cpp b/src/d/actor/d_a_obj_hbombkoya.cpp index c701ffbf0e9..bfc7608bcf6 100644 --- a/src/d/actor/d_a_obj_hbombkoya.cpp +++ b/src/d/actor/d_a_obj_hbombkoya.cpp @@ -273,18 +273,18 @@ static actor_method_class daObjHBombkoya_METHODS = { }; actor_process_profile_definition g_profile_Obj_HBombkoya = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_HBombkoya, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x000007C0, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 675, // mPriority - &daObjHBombkoya_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_HBombkoya_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x000007C0, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_HBombkoya_e, + /* Actor SubMtd */ &daObjHBombkoya_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_heavySw.cpp b/src/d/actor/d_a_obj_heavySw.cpp index a6c4dfd7d13..bcfe282ed53 100644 --- a/src/d/actor/d_a_obj_heavySw.cpp +++ b/src/d/actor/d_a_obj_heavySw.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_heavySw.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daHeavySw_HIO_c::daHeavySw_HIO_c() { field_0x04 = 150.0f; @@ -81,7 +81,7 @@ int daHeavySw_c::create() { } void daHeavySw_c::rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - if (fopAcM_GetName(param_2) == PROC_ALINK) { + if (fopAcM_GetName(param_2) == fpcNm_ALINK_e) { daHeavySw_c* heavySw = static_cast(param_1); heavySw->field_0x5d8 = 1; heavySw->field_0x5dc = @@ -290,18 +290,18 @@ static actor_method_class l_daHeavySw_Method = { }; actor_process_profile_definition g_profile_Obj_HeavySw = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_HeavySw, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daHeavySw_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 503, // mPriority - &l_daHeavySw_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_HeavySw_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daHeavySw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_HeavySw_e, + /* Actor SubMtd */ &l_daHeavySw_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hfuta.cpp b/src/d/actor/d_a_obj_hfuta.cpp index b3b2edf4e76..d79a74459af 100644 --- a/src/d/actor/d_a_obj_hfuta.cpp +++ b/src/d/actor/d_a_obj_hfuta.cpp @@ -197,20 +197,20 @@ static actor_method_class daObjFuta_METHODS = { }; actor_process_profile_definition g_profile_Obj_Hfuta = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Hfuta, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjFuta_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 450, // mPriority - &daObjFuta_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Hfuta_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjFuta_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Hfuta_e, + /* Actor SubMtd */ &daObjFuta_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index 1868121f5ff..d5ab5558b04 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -126,7 +126,7 @@ void daObjHHASHI_c::Obj_Damage() { e_fm_class* tgActor = (e_fm_class*)dCc_GetAc(mCyl.GetTgHitObj()->GetAc()); cXyz* tgHitPos = mCyl.GetTgHitPosP(); cLib_targetAngleY(¤t.pos, tgHitPos); - if (fopAcM_GetName(tgActor) == PROC_E_FM) { + if (fopAcM_GetName(tgActor) == fpcNm_E_FM_e) { field_0x5aa++; e_fm_class* fm = (e_fm_class*)fopAcM_SearchByID(fopAcM_GetID(tgActor)); if (fm != NULL) { @@ -382,18 +382,18 @@ static actor_method_class l_daObjHHASHI_Method = { }; actor_process_profile_definition g_profile_Obj_HHASHI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_HHASHI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjHHASHI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 462, // mPriority - &l_daObjHHASHI_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_HHASHI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjHHASHI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_HHASHI_e, + /* Actor SubMtd */ &l_daObjHHASHI_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_hsTarget.cpp b/src/d/actor/d_a_obj_hsTarget.cpp index 4ee973f8f3b..ba686bbc342 100644 --- a/src/d/actor/d_a_obj_hsTarget.cpp +++ b/src/d/actor/d_a_obj_hsTarget.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_hsTarget.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static const char* l_resNameIdx[2] = {"hsMato", "L7HsMato"}; @@ -95,18 +95,18 @@ static actor_method_class l_daHsTarget_Method = { }; actor_process_profile_definition g_profile_Obj_HsTarget = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_HsTarget, - &g_fpcLf_Method.base, - sizeof(daHsTarget_c), - 0, - 0, - &g_fopAc_Method.base, - 501, - &l_daHsTarget_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_HsTarget_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daHsTarget_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_HsTarget_e, + /* Actor SubMtd */ &l_daHsTarget_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index 34d489308c4..e6ef2935f69 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -10,7 +10,7 @@ #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" #include @@ -74,7 +74,7 @@ static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2 cXyz& player_pos = fopAcM_GetPosition(player_p); //!@bug Missing parentheses causes this comparison to always evaluate to false - if (!fopAcM_GetName(param_2) == PROC_ALINK) { + if (!fopAcM_GetName(param_2) == fpcNm_ALINK_e) { ice_p->field_0x5f4 = 0x100; ice_p->field_0x5a4 = -1.0f; ice_p->field_0x5ac = 0x500; @@ -98,7 +98,7 @@ static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2 ice_p->Check_RideOn(player_pos); } - if (ice_p->field_0x5b1 == 0xFF && fopAcM_GetName(param_2) == PROC_ALINK) { + if (ice_p->field_0x5b1 == 0xFF && fopAcM_GetName(param_2) == fpcNm_ALINK_e) { ice_p->field_0x5f4 = 0x300; ice_p->field_0x5a4 = -6.0f; ice_p->field_0x5ac = 0x1000; @@ -149,7 +149,7 @@ int daObjIce_l_c::create() { } if (field_0x5b0 != 0) { - if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_FISH) { + if (dComIfGs_getCollectSmell() == dItemNo_SMELL_FISH_e) { field_0x5b1 = 1; } else { field_0x5b1 = 0xFF; @@ -256,18 +256,18 @@ static actor_method_class l_daObjIce_l_Method = { }; actor_process_profile_definition g_profile_Obj_Ice_l = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ice_l, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x00000640, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 456, // mPriority - &l_daObjIce_l_Method, // sub_method - 0x00044180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ice_l_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x00000640, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ice_l_e, + /* Actor SubMtd */ &l_daObjIce_l_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index 83bd1b70c8a..7387bea34f0 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -123,7 +123,7 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3 cXyz* pBallCenter = player->getIronBallCenterPos(); // !@bug misplaced ! operator. This condition is probably always false - if (!fopAcM_GetName(param_3) == PROC_ALINK) { + if (!fopAcM_GetName(param_3) == fpcNm_ALINK_e) { ice->field_0x5d8 = 0x100; ice->field_0x5a4 = -1.0f; ice->field_0x5ac = 0x500; @@ -147,7 +147,7 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3 ice->field_0x5ac = 0x1000; ice->Check_RideOn(*playerPos); } - if (ice->field_0x5c5 == 0xff && fopAcM_GetName(param_3) == PROC_ALINK) { + if (ice->field_0x5c5 == 0xff && fopAcM_GetName(param_3) == fpcNm_ALINK_e) { ice->field_0x5d8 = 0x300; ice->field_0x5a4 = -11.0f; ice->field_0x5ac = 0x1000; @@ -201,7 +201,7 @@ int daObjIce_s_c::create() { field_0x5c4 = 1; } if (field_0x5c4 != 0) { - if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_FISH) { + if (dComIfGs_getCollectSmell() == dItemNo_SMELL_FISH_e) { field_0x5c5 = 1; } else { field_0x5c5 = 0xff; @@ -301,18 +301,18 @@ static actor_method_class l_daObjIce_s_Method = { }; actor_process_profile_definition g_profile_Obj_Ice_s = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ice_s, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjIce_s_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 457, // mPriority - &l_daObjIce_s_Method, // sub_method - 0x00044180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ice_s_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjIce_s_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ice_s_e, + /* Actor SubMtd */ &l_daObjIce_s_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 3c6fdd1ae24..439864dc8e2 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -57,7 +57,7 @@ void daObjIceBlk_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_pushActor, s } static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) { - if (fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { ((daObjIceBlk_c*)i_bgActor)->mIsPlayerRide = true; } } @@ -836,18 +836,18 @@ static actor_method_class daObjIceBlk_METHODS = { }; actor_process_profile_definition g_profile_Obj_IceBlock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_IceBlock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjIceBlk_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 535, // mPriority - &daObjIceBlk_METHODS, // sub_method - 0x00040500, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_IceBlock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjIceBlk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_IceBlock_e, + /* Actor SubMtd */ &daObjIceBlk_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_iceleaf.cpp b/src/d/actor/d_a_obj_iceleaf.cpp index f146c0da913..ed2c6d9444d 100644 --- a/src/d/actor/d_a_obj_iceleaf.cpp +++ b/src/d/actor/d_a_obj_iceleaf.cpp @@ -412,18 +412,18 @@ static actor_method_class l_daObjIceLeaf_Method = { }; actor_process_profile_definition g_profile_Obj_IceLeaf = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_IceLeaf, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjIceLeaf_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 567, // mPriority - &l_daObjIceLeaf_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_IceLeaf_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjIceLeaf_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_IceLeaf_e, + /* Actor SubMtd */ &l_daObjIceLeaf_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ihasi.cpp b/src/d/actor/d_a_obj_ihasi.cpp index b5e62fb9d0b..9d332f60e2d 100644 --- a/src/d/actor/d_a_obj_ihasi.cpp +++ b/src/d/actor/d_a_obj_ihasi.cpp @@ -168,15 +168,15 @@ static int daObj_Ihasi_Create(fopAc_ac_c* i_actor) { pos.set(34750.0f, -300.0f, -44000.0f); param1 = fopAcM_GetParam(i_actor) & 0xff000000 | 0xfffe00; - fopAcM_create(PROC_E_S1, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); + fopAcM_create(fpcNm_E_S1_e, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); pos.set(35250.0f, -300.0f, -43500.0f); ANGLE_ADD(angle.y, 0x5555); - fopAcM_create(PROC_E_S1, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); + fopAcM_create(fpcNm_E_S1_e, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); pos.set(34250.0f, -300.0f, -43500.0f); ANGLE_ADD(angle.y, 0x5555); - fopAcM_create(PROC_E_S1, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); + fopAcM_create(fpcNm_E_S1_e, param1, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); return cPhs_ERROR_e; } @@ -196,18 +196,18 @@ static int daObj_Ihasi_Create(fopAc_ac_c* i_actor) { if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") && fopAcM_GetRoomNo(i_actor) == 0) { pos.set(34800.0f, 5700.0f, -26735.0f); - fopAcM_create(PROC_E_WAP, 0xffffff35, &pos, fopAcM_GetRoomNo(i_actor), NULL, NULL, -1); + fopAcM_create(fpcNm_E_WAP_e, 0xffffff35, &pos, fopAcM_GetRoomNo(i_actor), NULL, NULL, -1); angle.set(0x0, -0x8000, 0x0); pos.set(34800.0f, -300.0f, -30340.0f); param2 = fopAcM_GetParam(i_actor) & 0xff000000 | 0xfffe00; - fopAcM_create(PROC_E_S1, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); + fopAcM_create(fpcNm_E_S1_e, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); pos.set(35087.0f, -300.0f, -29879.0f); - fopAcM_create(PROC_E_S1, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); + fopAcM_create(fpcNm_E_S1_e, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); pos.set(34500.0f, -300.0f, -29879.0f); - fopAcM_create(PROC_E_S1, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); + fopAcM_create(fpcNm_E_S1_e, param2, &pos, fopAcM_GetRoomNo(i_actor), &angle, NULL, -1); } daObj_Ihasi_Execute(i_this); @@ -223,18 +223,18 @@ static actor_method_class l_daObj_Ihasi_Method = { }; actor_process_profile_definition g_profile_OBJ_IHASI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_IHASI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_ihasi_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 533, // mPriority - &l_daObj_Ihasi_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_IHASI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_ihasi_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_IHASI_e, + /* Actor SubMtd */ &l_daObj_Ihasi_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index ef1f729c09c..eb94d61272f 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -205,18 +205,18 @@ static actor_method_class l_daObjIkada_Method = { }; actor_process_profile_definition g_profile_Obj_Ikada = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ikada, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjIkada_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 455, // mPriority - &l_daObjIkada_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ikada_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjIkada_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ikada_e, + /* Actor SubMtd */ &l_daObjIkada_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_inobone.cpp b/src/d/actor/d_a_obj_inobone.cpp index 64ab3375947..d73c5e5f9fe 100644 --- a/src/d/actor/d_a_obj_inobone.cpp +++ b/src/d/actor/d_a_obj_inobone.cpp @@ -32,7 +32,7 @@ static void bornCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, daObjIBone_c* a_coActorA = (daObjIBone_c*)i_coActorA; if (i_coActorA != NULL && i_coActorB != NULL && - fopAcM_GetName(i_coActorB) == PROC_HORSE && + fopAcM_GetName(i_coActorB) == fpcNm_HORSE_e && daPy_getPlayerActorClass()->checkHorseRide()) { a_coActorA->field_0x828 = 1; @@ -76,7 +76,7 @@ static void* s_boar_sub(void* i_actor, void* i_data) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; fopAc_ac_c* data = (fopAc_ac_c*)i_data; - if (fopAcM_GetName(actor) == PROC_E_WB) { + if (fopAcM_GetName(actor) == fpcNm_E_WB_e) { f32 xz_dist = fopAcM_searchActorDistanceXZ(data, actor); f32 y_dist = fopAcM_searchActorDistanceY(data, actor); @@ -180,7 +180,7 @@ int daObjIBone_c::execute() { break; case 1: - fopAcM_createItemForDirectGet(¤t.pos, fpcNm_ITEM_HEART, + fopAcM_createItemForDirectGet(¤t.pos, dItemNo_HEART_e, fopAcM_GetRoomNo(this), NULL, NULL, 0.0f, 0.0f); setBreakEffect(); fopAcM_delete(this); @@ -190,7 +190,7 @@ int daObjIBone_c::execute() { case 3: { csXyz angle(0, home.angle.y, 0); - fopAcM_createItem(¤t.pos, fpcNm_ITEM_HEART, -1, + fopAcM_createItem(¤t.pos, dItemNo_HEART_e, -1, fopAcM_GetHomeRoomNo(this), &angle, NULL, 0); setBreakEffect(); fopAcM_delete(this); @@ -286,18 +286,18 @@ static actor_method_class l_daObjIBone_Method = { }; actor_process_profile_definition g_profile_Obj_InoBone = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_InoBone, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjIBone_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 729, // mPriority - &l_daObjIBone_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_InoBone_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjIBone_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_InoBone_e, + /* Actor SubMtd */ &l_daObjIBone_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ita.cpp b/src/d/actor/d_a_obj_ita.cpp index a1dd15fe681..31e696eee4a 100644 --- a/src/d/actor/d_a_obj_ita.cpp +++ b/src/d/actor/d_a_obj_ita.cpp @@ -140,7 +140,7 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* a_this, fopAc_ac_c* i_player (void) a_this; // it is used, but this is needed for dbg matching daObjIta_c* i_this = (daObjIta_c*)a_this; - if (fopAcM_GetName(i_player) == PROC_ALINK) { + if (fopAcM_GetName(i_player) == fpcNm_ALINK_e) { daPy_py_c* player = daPy_getPlayerActorClass(); if (i_this->field_0x5ac < 0.0f) { i_this->field_0x5a8 = (0.8f + HREG_F(2)) * i_this->field_0x5ac; @@ -232,7 +232,7 @@ int daObjIta_c::Execute(Mtx** mtx) { cXyz& unused_pos = fopAcM_GetPosition(player); cXyz& playerSpeed = fopAcM_GetSpeed(player); - if (fopAcM_SearchByName(PROC_E_YMB, (fopAc_ac_c**)&e_ymb) != 0 && e_ymb != NULL) { + if (fopAcM_SearchByName(fpcNm_E_YMB_e, (fopAc_ac_c**)&e_ymb) != 0 && e_ymb != NULL) { e_ymb_Pos = &fopAcM_GetPosition(e_ymb); } @@ -297,18 +297,18 @@ static actor_method_class l_daObjIta_Method = { }; actor_process_profile_definition g_profile_Obj_ITA = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_ITA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjIta_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 474, // mPriority - &l_daObjIta_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ITA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjIta_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ITA_e, + /* Actor SubMtd */ &l_daObjIta_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp index 35f846698ea..0538d7c7830 100644 --- a/src/d/actor/d_a_obj_itamato.cpp +++ b/src/d/actor/d_a_obj_itamato.cpp @@ -353,7 +353,7 @@ void daObj_ItaMato_c::tgHitCallBack(fopAc_ac_c* param_1, dCcD_GObjInf* param_2, u8 cutType = 0; if (param_3 != NULL) { - if (fopAcM_GetProfName(param_3) == PROC_ALINK) { + if (fopAcM_GetProfName(param_3) == fpcNm_ALINK_e) { cutType = ((daPy_py_c*)param_3)->getCutType(); } else { cutType = daPy_py_c::CUT_TYPE_NM_VERTICAL; @@ -375,7 +375,7 @@ void daObj_ItaMato_c::setSwayParam(fopAc_ac_c* i_actor) { field_0x9e8 = 8; field_0xa17 = 0; - if (fopAcM_GetProfName(i_actor) == PROC_ALINK) { + if (fopAcM_GetProfName(i_actor) == fpcNm_ALINK_e) { switch (mCutType) { case 3: case 4: @@ -474,18 +474,18 @@ static actor_method_class daObj_ItaMato_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_ITAMATO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_ITAMATO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_ItaMato_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 83, // mPriority - &daObj_ItaMato_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_ITAMATO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_ItaMato_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_ITAMATO_e, + /* Actor SubMtd */ &daObj_ItaMato_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index 97f8029d4bb..0db3ac3a554 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -47,13 +47,13 @@ void daItem_c::setBaseMtx() { mpModel->setBaseScale(scale); switch (m_itemNo) { - case fpcNm_ITEM_GREEN_RUPEE: - case fpcNm_ITEM_BLUE_RUPEE: - case fpcNm_ITEM_YELLOW_RUPEE: - case fpcNm_ITEM_RED_RUPEE: - case fpcNm_ITEM_PURPLE_RUPEE: - case fpcNm_ITEM_ORANGE_RUPEE: - case fpcNm_ITEM_SILVER_RUPEE: + case dItemNo_GREEN_RUPEE_e: + case dItemNo_BLUE_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: + case dItemNo_RED_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: + case dItemNo_SILVER_RUPEE_e: setBaseMtx_1(); break; default: @@ -88,10 +88,10 @@ static void itemGetCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, if (a_coActorA != NULL) { if (a_coActorA->checkPlayerGet() && i_coActorB != NULL) { if (fopAcM_GetName(i_coActorB) == fopAcM_GetName(dComIfGp_getLinkPlayer()) || - fopAcM_GetName(i_coActorB) == PROC_NPC_P2 || - (fopAcM_GetName(i_coActorB) == PROC_CANOE && + fopAcM_GetName(i_coActorB) == fpcNm_NPC_P2_e || + (fopAcM_GetName(i_coActorB) == fpcNm_CANOE_e && daPy_getPlayerActorClass()->checkCanoeRide()) || - (fopAcM_GetName(i_coActorB) == PROC_HORSE && + (fopAcM_GetName(i_coActorB) == fpcNm_HORSE_e && daPy_getPlayerActorClass()->checkHorseRide())) { a_coActorA->itemGetNextExecute(); @@ -181,9 +181,9 @@ void daItem_c::CreateInit() { initBaseMtx(); animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f); - if (m_itemNo == fpcNm_ITEM_BOOMERANG) { + if (m_itemNo == dItemNo_BOOMERANG_e) { itemGetNextExecute(); - } else if ((m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) && + } else if ((m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) && mSparkleEmtr.getEmitter() == NULL) { dComIfGp_particle_set(0x0C14, &mSparklePos, NULL, NULL, -1, &mSparkleEmtr, -1, NULL, NULL, @@ -252,15 +252,15 @@ int daItem_c::_daItem_create() { return cPhs_ERROR_e; } - if (m_itemNo == fpcNm_ITEM_SMALL_KEY || m_itemNo == fpcNm_ITEM_KANTERA || m_itemNo == fpcNm_ITEM_LIGHT_DROP || - m_itemNo == fpcNm_ITEM_UTAWA_HEART || m_itemNo == fpcNm_ITEM_KAKERA_HEART) + if (m_itemNo == dItemNo_SMALL_KEY_e || m_itemNo == dItemNo_KANTERA_e || m_itemNo == dItemNo_LIGHT_DROP_e || + m_itemNo == dItemNo_UTAWA_HEART_e || m_itemNo == dItemNo_KAKERA_HEART_e) { - // "fpcNm_ITEM_(ITEM) is an unhandled item<%d>\n" + // "Item is not handled by fpcNm_(ITEM): <%d>\n" OS_REPORT_ERROR("fpcNm_(ITEM)では扱わないアイテムです<%d>\n", m_itemNo); JUT_ASSERT(0, FALSE); return cPhs_ERROR_e; - } else if (m_itemNo == fpcNm_ITEM_BOMB_5 || m_itemNo == fpcNm_ITEM_BOMB_10 || m_itemNo == fpcNm_ITEM_BOMB_20 || - m_itemNo == fpcNm_ITEM_BOMB_30) + } else if (m_itemNo == dItemNo_BOMB_5_e || m_itemNo == dItemNo_BOMB_10_e || m_itemNo == dItemNo_BOMB_20_e || + m_itemNo == dItemNo_BOMB_30_e) { // "Bomb Replenish Items are no longer in use!\n" OS_REPORT_ERROR("補給アイテムの爆弾は使用不可になりました！\n"); @@ -340,7 +340,7 @@ int daItem_c::_daItem_execute() { mLastPos = current.pos; field_0x95f = (fopAcM_checkHookCarryNow(this) >> 0x14) & 1; - if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) { + if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) { mSparklePos = current.pos; mSparklePos.y += 18.0f; } @@ -363,7 +363,7 @@ int daItem_c::_daItem_draw() { int daItem_c::_daItem_delete() { mSound.deleteObject(); - if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) { + if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) { mSparkleEmtr.remove(); } @@ -459,7 +459,7 @@ void daItem_c::procMainSimpleGetDemo() { void daItem_c::procInitGetDemoEvent() { hide(); - if (m_itemNo == fpcNm_ITEM_ORANGE_RUPEE || m_itemNo == fpcNm_ITEM_SILVER_RUPEE) { + if (m_itemNo == dItemNo_ORANGE_RUPEE_e || m_itemNo == dItemNo_SILVER_RUPEE_e) { mSparkleEmtr.remove(); } @@ -481,7 +481,7 @@ void daItem_c::procWaitGetDemoEvent() { dComIfGp_event_setItemPartnerId(m_item_id); } } else { - if (m_itemNo == fpcNm_ITEM_BOOMERANG) { + if (m_itemNo == dItemNo_BOOMERANG_e) { fopAcM_orderItemEvent(this, 0, 0); eventInfo.onCondition(dEvtCnd_CANGETITEM_e); return; @@ -704,27 +704,27 @@ void daItem_c::mode_wait() { } switch (m_itemNo) { - case fpcNm_ITEM_HEART: + case dItemNo_HEART_e: itemActionForHeart(); break; - case fpcNm_ITEM_ARROW_10: - case fpcNm_ITEM_ARROW_20: - case fpcNm_ITEM_ARROW_30: - case fpcNm_ITEM_ARROW_1: - case fpcNm_ITEM_PACHINKO_SHOT: - case fpcNm_ITEM_LIGHT_ARROW: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: + case dItemNo_ARROW_1_e: + case dItemNo_PACHINKO_SHOT_e: + case dItemNo_LIGHT_ARROW_e: itemActionForArrow(); break; - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: itemActionForBoomerang(); break; - case fpcNm_ITEM_GREEN_RUPEE: - case fpcNm_ITEM_BLUE_RUPEE: - case fpcNm_ITEM_YELLOW_RUPEE: - case fpcNm_ITEM_RED_RUPEE: - case fpcNm_ITEM_PURPLE_RUPEE: - case fpcNm_ITEM_ORANGE_RUPEE: - case fpcNm_ITEM_SILVER_RUPEE: + case dItemNo_GREEN_RUPEE_e: + case dItemNo_BLUE_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: + case dItemNo_RED_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: + case dItemNo_SILVER_RUPEE_e: default: itemActionForRupee(); break; @@ -748,24 +748,24 @@ void daItem_c::mode_water() { f32 scale = 1.0f; switch (m_itemNo) { - case fpcNm_ITEM_HEART: + case dItemNo_HEART_e: scale = 0.5f; break; - case fpcNm_ITEM_GREEN_RUPEE: - case fpcNm_ITEM_BLUE_RUPEE: - case fpcNm_ITEM_YELLOW_RUPEE: - case fpcNm_ITEM_RED_RUPEE: - case fpcNm_ITEM_PURPLE_RUPEE: - case fpcNm_ITEM_ORANGE_RUPEE: + case dItemNo_GREEN_RUPEE_e: + case dItemNo_BLUE_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: + case dItemNo_RED_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: scale = 1.0f; break; - case fpcNm_ITEM_ARROW_10: - case fpcNm_ITEM_ARROW_20: - case fpcNm_ITEM_ARROW_30: - case fpcNm_ITEM_ARROW_1: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: + case dItemNo_ARROW_1_e: scale = 1.0f; break; - case fpcNm_ITEM_PACHINKO_SHOT: + case dItemNo_PACHINKO_SHOT_e: scale = 1.0f; break; } @@ -785,22 +785,22 @@ void daItem_c::itemGetNextExecute() { BOOL haveItem = false; switch (m_itemNo) { - case fpcNm_ITEM_HEART: - case fpcNm_ITEM_GREEN_RUPEE: - case fpcNm_ITEM_ARROW_10: - case fpcNm_ITEM_ARROW_20: - case fpcNm_ITEM_ARROW_30: - case fpcNm_ITEM_ARROW_1: + case dItemNo_HEART_e: + case dItemNo_GREEN_RUPEE_e: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: + case dItemNo_ARROW_1_e: procInitSimpleGetDemo(); itemGet(); break; - case fpcNm_ITEM_BLUE_RUPEE: - case fpcNm_ITEM_YELLOW_RUPEE: - case fpcNm_ITEM_RED_RUPEE: - case fpcNm_ITEM_PURPLE_RUPEE: - case fpcNm_ITEM_ORANGE_RUPEE: - case fpcNm_ITEM_SILVER_RUPEE: - case fpcNm_ITEM_PACHINKO_SHOT: + case dItemNo_BLUE_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: + case dItemNo_RED_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: + case dItemNo_SILVER_RUPEE_e: + case dItemNo_PACHINKO_SHOT_e: if (daPy_getPlayerActorClass()->checkCanoeRide() || daPy_getPlayerActorClass()->checkHorseRide()) { @@ -820,7 +820,7 @@ void daItem_c::itemGetNextExecute() { itemGet(); } break; - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: procInitGetDemoEvent(); break; default: @@ -838,45 +838,45 @@ void daItem_c::itemGetNextExecute() { void daItem_c::itemGet() { switch (m_itemNo) { - case fpcNm_ITEM_HEART: + case dItemNo_HEART_e: mDoAud_seStart(Z2SE_HEART_PIECE_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_GREEN_RUPEE: + case dItemNo_GREEN_RUPEE_e: mDoAud_seStart(Z2SE_GREEN_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_BLUE_RUPEE: + case dItemNo_BLUE_RUPEE_e: mDoAud_seStart(Z2SE_BLUE_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_YELLOW_RUPEE: + case dItemNo_YELLOW_RUPEE_e: mDoAud_seStart(Z2SE_BLUE_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_RED_RUPEE: + case dItemNo_RED_RUPEE_e: mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_PURPLE_RUPEE: + case dItemNo_PURPLE_RUPEE_e: mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_ORANGE_RUPEE: + case dItemNo_ORANGE_RUPEE_e: mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_SILVER_RUPEE: + case dItemNo_SILVER_RUPEE_e: mDoAud_seStart(Z2SE_RED_LUPY_GET, NULL, 0, 0); execItemGet(m_itemNo); break; - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: break; - case fpcNm_ITEM_ARROW_10: - case fpcNm_ITEM_ARROW_20: - case fpcNm_ITEM_ARROW_30: - case fpcNm_ITEM_ARROW_1: - case fpcNm_ITEM_PACHINKO_SHOT: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: + case dItemNo_ARROW_1_e: + case dItemNo_PACHINKO_SHOT_e: mDoAud_seStart(Z2SE_CONSUMP_ITEM_GET, NULL, 0, 0); execItemGet(m_itemNo); default: @@ -1028,19 +1028,19 @@ void daItem_c::set_bound_se() { } switch (m_itemNo) { - case fpcNm_ITEM_GREEN_RUPEE: - case fpcNm_ITEM_BLUE_RUPEE: - case fpcNm_ITEM_YELLOW_RUPEE: - case fpcNm_ITEM_RED_RUPEE: - case fpcNm_ITEM_PURPLE_RUPEE: - case fpcNm_ITEM_ORANGE_RUPEE: + case dItemNo_GREEN_RUPEE_e: + case dItemNo_BLUE_RUPEE_e: + case dItemNo_YELLOW_RUPEE_e: + case dItemNo_RED_RUPEE_e: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_ORANGE_RUPEE_e: fopAcM_seStart(this, Z2SE_OBJ_LUPY_BOUND, var_r31); break; - case fpcNm_ITEM_ARROW_10: - case fpcNm_ITEM_ARROW_20: - case fpcNm_ITEM_ARROW_30: - case fpcNm_ITEM_ARROW_1: - case fpcNm_ITEM_LIGHT_ARROW: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: + case dItemNo_ARROW_1_e: + case dItemNo_LIGHT_ARROW_e: fopAcM_seStart(this, Z2SE_OBJ_ARROW_BOUND, var_r31); break; } @@ -1183,7 +1183,7 @@ void daItem_c::initSpeed(BOOL i_noTypeChk) { u8 type = daItem_prm::getType(this); if (!i_noTypeChk) { - if (type == TYPE_WAIT_e || type == TYPE_BOOM_HIT_e || m_itemNo == fpcNm_ITEM_BOOMERANG) { + if (type == TYPE_WAIT_e || type == TYPE_BOOM_HIT_e || m_itemNo == dItemNo_BOOMERANG_e) { y_speed = 0.0f; speedf = 0.0f; } else if (type == TYPE_LAUNCH_NO_RND_e || type == TYPE_FIXED_PLACE_e) { @@ -1240,18 +1240,18 @@ static actor_method_class l_daItem_Method = { }; actor_process_profile_definition g_profile_ITEM = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_ITEM, - &g_fpcLf_Method.base, - sizeof(daItem_c), - 0, - 0, - &g_fopAc_Method.base, - 236, - &l_daItem_Method, - 0xC0100, - fopAc_ACTOR_e, - fopAc_CULLSPHERE_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ITEM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daItem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ITEM_e, + /* Actor SubMtd */ &l_daItem_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLSPHERE_0_e, }; diff --git a/src/d/actor/d_a_obj_ito.cpp b/src/d/actor/d_a_obj_ito.cpp index 967b00815a0..02601f7e318 100644 --- a/src/d/actor/d_a_obj_ito.cpp +++ b/src/d/actor/d_a_obj_ito.cpp @@ -690,18 +690,18 @@ static actor_method_class l_daObj_Ito_Method = { }; actor_process_profile_definition g_profile_OBJ_ITO = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_ITO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_ito_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 61, // mPriority - &l_daObj_Ito_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_ITO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_ito_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_ITO_e, + /* Actor SubMtd */ &l_daObj_Ito_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index 7cc28ed5cf9..9df274adf37 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -10,7 +10,7 @@ #include "m_Do/m_Do_lib.h" #include "d/d_com_inf_game.h" #include "d/d_menu_insect.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" #include @@ -494,7 +494,7 @@ void daObjKABUTO_c::Insect_Release() { mMode = 0; } -static u8 const l_kab_itemno[2] = {fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE}; +static u8 const l_kab_itemno[2] = {dItemNo_M_BEETLE_e, dItemNo_F_BEETLE_e}; // Some unused function went here. // This fake function is here in its place to make the literals match @@ -733,7 +733,7 @@ cPhs_Step daObjKABUTO_c::create() { if (mLocation == LOC_UNK_2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; attention_info.distances[fopAc_attn_CARRY_e] = 0x5D; @@ -864,18 +864,18 @@ static actor_method_class l_daObjKABUTO_Method = { }; actor_process_profile_definition g_profile_Obj_Kabuto = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_Kabuto, - &g_fpcLf_Method.base, - sizeof(daObjKABUTO_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1DD, - &l_daObjKABUTO_Method, - 0xC0120, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kabuto_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKABUTO_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kabuto_e, + /* Actor SubMtd */ &l_daObjKABUTO_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kag.cpp b/src/d/actor/d_a_obj_kag.cpp index 0b6f0dfcc35..b55baa12819 100644 --- a/src/d/actor/d_a_obj_kag.cpp +++ b/src/d/actor/d_a_obj_kag.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_kag.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -223,7 +223,7 @@ void daObjKAG_c::fly() { if (field_0x85a == 0) { if (flamePos != NULL && current.pos.absXZ(*flamePos) < 1800.0f) { field_0x84e = cLib_targetAngleY(¤t.pos, flamePos) + cM_rndFX(8192.0f); - + if (current.pos.absXZ(*flamePos) < 200.0f) { field_0x85a = cM_rndF(4.0f) + 4.0f; } else { @@ -381,7 +381,7 @@ void daObjKAG_c::walk() { void daObjKAG_c::bin_wait() { if (field_0x83c == 0) { mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("I_Kag", BCK_KAG_FLY), J3DFrameCtrl::EMode_LOOP, 5.0f, 0.0f, 0.0f, -1.0f); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mDraw = false; gravity = 0.0f; maxFallSpeed = 0.0f; @@ -448,7 +448,7 @@ void daObjKAG_c::hook() { kag_setParticle(); } - if (!fopAcM_CheckStatus(this, fopAcM_STATUS_HOOK_CARRY_NOW)) { + if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { setAction(&daObjKAG_c::fly); } @@ -459,7 +459,7 @@ void daObjKAG_c::hook() { if (dComIfG_Bgsp().LineCross(&lin_chk)) { cM3dGPla plane; cXyz spbc; - + dComIfG_Bgsp().GetTriPla(lin_chk, &plane); cXyz* pcVar1 = plane.GetNP(); spbc = lin_chk.GetCross(); @@ -648,7 +648,7 @@ cPhs_Step daObjKAG_c::create() { cPhs_Step phase = dComIfG_resLoad(&mPhase, "I_Kag"); if (phase == cPhs_COMPLEATE_e) { OS_REPORT("KAG PARAM %x\n", fopAcM_GetParam(this)); - + field_0x85e = fopAcM_GetParam(this) & 3; if (field_0x85e == 3) { field_0x85e = 0; @@ -769,18 +769,18 @@ static actor_method_class l_daObjKAG_Method = { }; actor_process_profile_definition g_profile_Obj_Kag = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kag, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKAG_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 485, // mPriority - &l_daObjKAG_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kag_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKAG_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kag_e, + /* Actor SubMtd */ &l_daObjKAG_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kage.cpp b/src/d/actor/d_a_obj_kage.cpp index b7b794a2be8..768ea5f61d7 100644 --- a/src/d/actor/d_a_obj_kage.cpp +++ b/src/d/actor/d_a_obj_kage.cpp @@ -113,7 +113,7 @@ static int daObj_Kage_Create(fopAc_ac_c* actor) { fopAcM_SetMin(actor, -200.0f, -200.0f, -200.0f); fopAcM_SetMax(actor, 200.0f, 200.0f, 200.0f); - i_this->inko_child_id = fopAcM_createChild(PROC_NPC_INKO, fopAcM_GetID(actor), 0, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); + i_this->inko_child_id = fopAcM_createChild(fpcNm_NPC_INKO_e, fopAcM_GetID(actor), 0, &actor->current.pos, fopAcM_GetRoomNo(actor), NULL, NULL, -1, NULL); daObj_Kage_Execute(i_this); } @@ -130,18 +130,18 @@ static actor_method_class l_daObj_Kage_Method = { }; actor_process_profile_definition g_profile_OBJ_KAGE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KAGE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_kage_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 62, // mPriority - &l_daObj_Kage_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KAGE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_kage_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KAGE_e, + /* Actor SubMtd */ &l_daObj_Kage_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp index 904166228e5..dc15a059073 100644 --- a/src/d/actor/d_a_obj_kago.cpp +++ b/src/d/actor/d_a_obj_kago.cpp @@ -407,7 +407,7 @@ int daObj_Kago_c::Execute() { for (int i = 0; i < 2; i++) { if (field_0x808[i].ChkCoHit() != 0) { actor_p = field_0x808[i].GetCoHitAc(); - if (actor_p != NULL && fopAcM_GetName(actor_p) == PROC_ALINK) break; + if (actor_p != NULL && fopAcM_GetName(actor_p) == fpcNm_ALINK_e) break; actor_p = NULL; } } @@ -685,18 +685,18 @@ static actor_method_class daObj_Kago_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_KAGO = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KAGO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Kago_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 717, // mPriority - &daObj_Kago_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KAGO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Kago_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KAGO_e, + /* Actor SubMtd */ &daObj_Kago_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kaisou.cpp b/src/d/actor/d_a_obj_kaisou.cpp index 7899d06e9cc..fe2204d8ca3 100644 --- a/src/d/actor/d_a_obj_kaisou.cpp +++ b/src/d/actor/d_a_obj_kaisou.cpp @@ -304,18 +304,18 @@ static actor_method_class l_daObjKaisou_Method = { }; actor_process_profile_definition g_profile_Obj_Kaisou = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kaisou, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKaisou_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 460, // mPriority - &l_daObjKaisou_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kaisou_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKaisou_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kaisou_e, + /* Actor SubMtd */ &l_daObjKaisou_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index a03409ef012..1e9f7d53889 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -506,7 +506,7 @@ void daObjKAM_c::Insect_Release() { field_0x980 = 1; } -static u8 const l_kam_itemno[2] = {fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS}; +static u8 const l_kam_itemno[2] = {dItemNo_M_MANTIS_e, dItemNo_F_MANTIS_e}; f32 floatDummy() { return -9.0f; @@ -775,7 +775,7 @@ int daObjKAM_c::create() { if (field_0x9c0 == 2) { field_0x56c = 0; ANGLE_SUB(shape_angle.x, 0x2000); - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; } @@ -905,18 +905,18 @@ static actor_method_class l_daObjKAM_Method = { }; actor_process_profile_definition g_profile_Obj_Kam = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kam, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKAM_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 482, // mPriority - &l_daObjKAM_Method, // sub_method - 0x000C0120, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kam_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKAM_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kam_e, + /* Actor SubMtd */ &l_daObjKAM_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index 867152267b4..8c1f501755f 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -271,7 +271,7 @@ void daObj_Kanban2_c::setKanbanSE(int i_se) { } void daObj_Kanban2_c::createBreakParts(u32 i_parameters, csXyz i_rot) { - fopAcM_create(PROC_OBJ_KANBAN2, i_parameters, ¤t.pos, fopAcM_GetRoomNo(this), &i_rot, NULL, -1); + fopAcM_create(fpcNm_OBJ_KANBAN2_e, i_parameters, ¤t.pos, fopAcM_GetRoomNo(this), &i_rot, NULL, -1); } void daObj_Kanban2_c::createWallHitBreak() { @@ -432,7 +432,7 @@ void daObj_Kanban2_c::damage_check() { } else if (hit_obj->ChkAtType(AT_TYPE_SHIELD_ATTACK) || hit_obj->ChkAtType(AT_TYPE_BOOMERANG) || hit_obj->ChkAtType(AT_TYPE_COPY_ROD) || hit_obj->ChkAtType(AT_TYPE_1000000) || hit_obj->ChkAtType(AT_TYPE_20000)) { damage_type = DAMAGE_SHAKE; } else if (hit_obj->ChkAtType(AT_TYPE_THROW_OBJ)) { - if (fopAcM_GetName(hit_actor) == PROC_NPC_TK) { + if (fopAcM_GetName(hit_actor) == fpcNm_NPC_TK_e) { ((daNPC_TK_c*)hit_actor)->setBump(); damage_type = DAMAGE_PIECES; } else { @@ -808,7 +808,7 @@ void daObj_Kanban2_c::calcNormalSwing() { if ((mPartFlags & 0xFF) != 0 && mCcSph.ChkCoHit()) { fopAc_ac_c* hit_actor = dCc_GetAc(mCcSph.GetCoHitObj()->GetAc()); - if (fopAcM_GetName(hit_actor) == PROC_HORSE) { + if (fopAcM_GetName(hit_actor) == fpcNm_HORSE_e) { cXyz sp28(current.pos); if (mPartFlags & PARTS_TOP_HALF) { sp28.y += 100.0f; @@ -1444,7 +1444,7 @@ void daObj_Kanban2_c::executeFloat() { if (field_0x62a == 0 && mCcSph.ChkCoHit()) { cCcD_Obj* hit_obj = mCcSph.GetCoHitObj(); - if (fopAcM_GetName(dCc_GetAc(hit_obj->GetAc())) == PROC_ALINK && daPy_getPlayerActorClass()->speedF > 1.0f) { + if (fopAcM_GetName(dCc_GetAc(hit_obj->GetAc())) == fpcNm_ALINK_e && daPy_getPlayerActorClass()->speedF > 1.0f) { field_0x5e8.y = 0x100; field_0x62a = 10; } @@ -1779,20 +1779,20 @@ static actor_method_class l_daObj_Kanban2_Method = { }; actor_process_profile_definition g_profile_OBJ_KANBAN2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KANBAN2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Kanban2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 63, // mPriority - &l_daObj_Kanban2_Method, // sub_method - 0x00044100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KANBAN2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Kanban2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KANBAN2_e, + /* Actor SubMtd */ &l_daObj_Kanban2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_kantera.cpp b/src/d/actor/d_a_obj_kantera.cpp index 93240748bdd..3d38a949af9 100644 --- a/src/d/actor/d_a_obj_kantera.cpp +++ b/src/d/actor/d_a_obj_kantera.cpp @@ -12,7 +12,7 @@ #include "d/d_com_inf_game.h" #include "d/d_item.h" #include "d/d_item_data.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" const static dCcD_SrcCyl l_cyl_src = { @@ -263,18 +263,18 @@ static actor_method_class l_daItemKantera_Method = { }; actor_process_profile_definition g_profile_Obj_Kantera = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kantera, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daItemKantera_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 238, // mPriority - &l_daItemKantera_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kantera_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daItemKantera_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kantera_e, + /* Actor SubMtd */ &l_daItemKantera_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index f4bedd7f150..9687a098aa6 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -49,8 +49,8 @@ void daObj_KatHIO_c::genMessage(JORMContext* ctx) { #endif static u8 const l_kat_itemno[2] = { - fpcNm_ITEM_M_SNAIL, - fpcNm_ITEM_F_SNAIL, + dItemNo_M_SNAIL_e, + dItemNo_F_SNAIL_e, }; void daObjKAT_c::InitCcSph() { @@ -727,7 +727,7 @@ inline int daObjKAT_c::create() { if (field_0x808 == 2) { field_0x56c = 0; ANGLE_ADD(shape_angle.x, -0x2000); - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; } @@ -880,18 +880,18 @@ static actor_method_class l_daObjKAT_Method = { }; actor_process_profile_definition g_profile_Obj_Kat = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kat, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKAT_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 488, // mPriority - &l_daObjKAT_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kat_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKAT_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kat_e, + /* Actor SubMtd */ &l_daObjKAT_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kazeneko.cpp b/src/d/actor/d_a_obj_kazeneko.cpp index f758d2ffeda..e686683f278 100644 --- a/src/d/actor/d_a_obj_kazeneko.cpp +++ b/src/d/actor/d_a_obj_kazeneko.cpp @@ -162,7 +162,7 @@ inline int daObjKazeNeko_c::execute() { } if (mCyl.ChkTgHit() != 0) { daNPC_TK_c* tk = (daNPC_TK_c*)mCyl.GetTgHitAc(); - if (fopAcM_GetName(tk) == PROC_NPC_TK) { + if (fopAcM_GetName(tk) == fpcNm_NPC_TK_e) { field_0x740 = attr().field_0x0c; tk->setBump(); } @@ -170,7 +170,7 @@ inline int daObjKazeNeko_c::execute() { swingHead(); if (field_0x750 > 0) { if (--field_0x750 <= 0) { - daNPC_TK_c* tk = (daNPC_TK_c*)fopAcM_SearchByName(PROC_NPC_TK); + daNPC_TK_c* tk = (daNPC_TK_c*)fopAcM_SearchByName(fpcNm_NPC_TK_e); if (tk != NULL) { tk->endHawkCamera(); field_0x752 = 1; @@ -228,18 +228,18 @@ static actor_method_class l_daObjKazeNeko_Method = { }; actor_process_profile_definition g_profile_Obj_KazeNeko = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KazeNeko, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKazeNeko_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 30, // mPriority - &l_daObjKazeNeko_Method, // sub_method - 0x00044180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KazeNeko_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKazeNeko_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KazeNeko_e, + /* Actor SubMtd */ &l_daObjKazeNeko_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index 5333f8f912e..e6bcdb061fc 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -694,18 +694,18 @@ static actor_method_class daObj_KBacket_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_KBACKET = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KBACKET, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_KBacket_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 714, // mPriority - &daObj_KBacket_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KBACKET_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_KBacket_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KBACKET_e, + /* Actor SubMtd */ &daObj_KBacket_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index 8f85615ea90..6c52930bdec 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -29,7 +29,7 @@ static bool hio_set; static daObj_Kbox_HIO_c l_HIO; static void ride_call_back(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) { - if (fopAcM_GetName(param_3) == PROC_ALINK) { + if (fopAcM_GetName(param_3) == fpcNm_ALINK_e) { obj_kbox_class* i_this = (obj_kbox_class*) param_2; if (i_this->field_0x5a0 == 0) { i_this->field_0x5a8 = -50.0f; @@ -529,20 +529,20 @@ static actor_method_class l_daObj_Kbox_Method = { }; actor_process_profile_definition g_profile_OBJ_KBOX = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KBOX, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_kbox_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 43, // mPriority - &l_daObj_Kbox_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KBOX_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_kbox_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KBOX_e, + /* Actor SubMtd */ &l_daObj_Kbox_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp index c0bcfdaeda4..b7814189ede 100644 --- a/src/d/actor/d_a_obj_key.cpp +++ b/src/d/actor/d_a_obj_key.cpp @@ -58,7 +58,7 @@ static daObj_Key_HIO_c l_HIO; static s16 target_info_count; static void* s_count_sub(void* i_actor, void* i_other) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_KEY && ((fopAc_ac_c*)i_actor)->field_0x560 != 0) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_OBJ_KEY_e && ((fopAc_ac_c*)i_actor)->field_0x560 != 0) { ((fopAc_ac_c*)i_actor)->health = target_info_count; target_info_count++; } @@ -67,13 +67,13 @@ static void* s_count_sub(void* i_actor, void* i_other) { } static void* s_master_sub(void* i_actor, void* i_other) { - if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DN) || - fopAcM_GetName(i_actor) == PROC_E_RD || - fopAcM_GetName(i_actor) == PROC_E_RDB || - fopAcM_GetName(i_actor) == PROC_E_DB || - fopAcM_GetName(i_actor) == PROC_E_HB || - fopAcM_GetName(i_actor) == PROC_E_OC || - fopAcM_GetName(i_actor) == PROC_ALINK) + if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_DN_e) || + fopAcM_GetName(i_actor) == fpcNm_E_RD_e || + fopAcM_GetName(i_actor) == fpcNm_E_RDB_e || + fopAcM_GetName(i_actor) == fpcNm_E_DB_e || + fopAcM_GetName(i_actor) == fpcNm_E_HB_e || + fopAcM_GetName(i_actor) == fpcNm_E_OC_e || + fopAcM_GetName(i_actor) == fpcNm_ALINK_e) { f32 x_dist = ((fopAc_ac_c*)i_actor)->current.pos.x - ((fopAc_ac_c*)i_other)->current.pos.x; f32 z_dist = ((fopAc_ac_c*)i_actor)->current.pos.z - ((fopAc_ac_c*)i_other)->current.pos.z; @@ -89,7 +89,7 @@ static void* s_master_sub(void* i_actor, void* i_other) { static void masterkey_check(obj_key_class* i_this) { fopAc_ac_c* actor = &i_this->actor; - daKey_c* pkey = (daKey_c*)fopAcM_SearchByName(PROC_Obj_SmallKey); + daKey_c* pkey = (daKey_c*)fopAcM_SearchByName(fpcNm_Obj_SmallKey_e); if (pkey != NULL) { f32 x_dist = actor->current.pos.x - pkey->current.pos.x; f32 z_dist = actor->current.pos.z - pkey->current.pos.z; @@ -278,14 +278,14 @@ static void chain_control_01(obj_key_class* i_this) { u8 sp8 = 0; J3DModel* parent_model; - if (fopAcM_GetName(pparent) == PROC_E_DN) { + if (fopAcM_GetName(pparent) == fpcNm_E_DN_e) { e_dn_class* dn = (e_dn_class*)pparent; parent_model = dn->anm_p->getModel(); MTXCopy(parent_model->getAnmMtx(1), *calc_mtx); spC4.set(5.0f + KREG_F(0), 30.0f + KREG_F(1), 20.0f + KREG_F(2)); MtxPosition(&spC4, &spB8); - } else if (fopAcM_GetName(pparent) == PROC_E_RD) { + } else if (fopAcM_GetName(pparent) == fpcNm_E_RD_e) { e_rd_class* rd = (e_rd_class*)pparent; parent_model = rd->anm_p->getModel(); @@ -293,7 +293,7 @@ static void chain_control_01(obj_key_class* i_this) { spC4.set(12.0f + VREG_F(0), -5.0f + VREG_F(1), VREG_F(2)); MtxPosition(&spC4, &spB8); rd->enemy.field_0x567 = 1; - } else if (fopAcM_GetName(pparent) == PROC_E_RDB) { + } else if (fopAcM_GetName(pparent) == fpcNm_E_RDB_e) { e_rdb_class* rdb = (e_rdb_class*)pparent; parent_model = rdb->mpModelMorf->getModel(); @@ -311,7 +311,7 @@ static void chain_control_01(obj_key_class* i_this) { fopAcM_delete(pkey); fopAcM_delete(actor); } - } else if (fopAcM_GetName(pparent) == PROC_E_OC) { + } else if (fopAcM_GetName(pparent) == fpcNm_E_OC_e) { daE_OC_c* oc = (daE_OC_c*)pparent; parent_model = oc->getOcModel(); @@ -319,7 +319,7 @@ static void chain_control_01(obj_key_class* i_this) { spC4.set(5.0f + nREG_F(0), nREG_F(1), nREG_F(2)); MtxPosition(&spC4, &spB8); sp8 = 1; - } else if (fopAcM_GetName(pparent) == PROC_E_DB || fopAcM_GetName(pparent) == PROC_E_HB) { + } else if (fopAcM_GetName(pparent) == fpcNm_E_DB_e || fopAcM_GetName(pparent) == fpcNm_E_HB_e) { e_db_class* db = (e_db_class*)pparent; if (db->action == 20) { @@ -437,7 +437,7 @@ static void chain_control_01(obj_key_class* i_this) { } s16 spA; - if (fopAcM_GetName(pparent) == PROC_E_RDB) { + if (fopAcM_GetName(pparent) == fpcNm_E_RDB_e) { e_rdb_class* rdb = (e_rdb_class*)pparent; if (rdb->field_0x1104 != 0) { spA = -(pparent->shape_angle.y + TREG_S(7) + 0x4000); @@ -650,18 +650,18 @@ static actor_method_class l_daObj_Key_Method = { }; actor_process_profile_definition g_profile_OBJ_KEY = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KEY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_key_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 44, // mPriority - &l_daObj_Key_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KEY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_key_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KEY_e, + /* Actor SubMtd */ &l_daObj_Key_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_keyhole.cpp b/src/d/actor/d_a_obj_keyhole.cpp index e3562dd4d11..616450f0d8f 100644 --- a/src/d/actor/d_a_obj_keyhole.cpp +++ b/src/d/actor/d_a_obj_keyhole.cpp @@ -842,20 +842,20 @@ static actor_method_class l_daObj_Keyhole_Method = { }; actor_process_profile_definition g_profile_OBJ_KEYHOLE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KEYHOLE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_keyhole_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 45, // mPriority - &l_daObj_Keyhole_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KEYHOLE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_keyhole_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KEYHOLE_e, + /* Actor SubMtd */ &l_daObj_Keyhole_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index 8866ac7a4c7..dd740fd9e6d 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -32,7 +32,7 @@ enum { }; static void* search_coach(void* i_actor, void* i_data) { - if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == PROC_NPC_COACH) + if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == fpcNm_NPC_COACH_e) { return i_actor; } @@ -988,18 +988,18 @@ static actor_method_class daObjKGate_METHODS = { }; actor_process_profile_definition g_profile_Obj_KkrGate = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_KkrGate, - &g_fpcLf_Method.base, - sizeof(daObjKGate_c), - 0, - 0, - &g_fopAc_Method.base, - 599, - &daObjKGate_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KkrGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KkrGate_e, + /* Actor SubMtd */ &daObjKGate_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ki.cpp b/src/d/actor/d_a_obj_ki.cpp index cec0fa740c6..4561d62dbc5 100644 --- a/src/d/actor/d_a_obj_ki.cpp +++ b/src/d/actor/d_a_obj_ki.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_ki.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int ki_bmd[2] = {9, 10}; @@ -225,18 +225,18 @@ static actor_method_class l_daObj_Ki_Method = { }; actor_process_profile_definition g_profile_OBJ_KI = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_KI, - &g_fpcLf_Method.base, - sizeof(obj_ki_class), - 0, - 0, - &g_fopAc_Method.base, - 0x2C2, - &l_daObj_Ki_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_7_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_ki_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KI_e, + /* Actor SubMtd */ &l_daObj_Ki_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_7_e, }; diff --git a/src/d/actor/d_a_obj_kiPot.cpp b/src/d/actor/d_a_obj_kiPot.cpp index eb0ddc56a09..54e01c5a121 100644 --- a/src/d/actor/d_a_obj_kiPot.cpp +++ b/src/d/actor/d_a_obj_kiPot.cpp @@ -66,7 +66,7 @@ void daKiPot_c::init_modeWait() { void daKiPot_c::modeWait() { if (chkEvent() && eventInfo.checkCommandCatch() == 0) { - dComIfGp_att_CatchRequest(this, fpcNm_ITEM_UGLY_SOUP, 100.0f, 50.0f, -50.0f, 0x2000, 1); + dComIfGp_att_CatchRequest(this, dItemNo_UGLY_SOUP_e, 100.0f, 50.0f, -50.0f, 0x2000, 1); eventInfo.onCondition(dEvtCnd_40_e); } } @@ -115,18 +115,18 @@ static actor_method_class l_daKiPot_Method = { }; actor_process_profile_definition g_profile_Obj_KiPot = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KiPot, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daKiPot_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 517, // mPriority - &l_daKiPot_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KiPot_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daKiPot_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KiPot_e, + /* Actor SubMtd */ &l_daKiPot_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index cedff61cf8a..dc7bf2efc6d 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -263,18 +263,18 @@ static actor_method_class l_daObj_Kita_Method = { }; actor_process_profile_definition g_profile_OBJ_KITA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_KITA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_kita_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 707, // mPriority - &l_daObj_Kita_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_KITA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_kita_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_KITA_e, + /* Actor SubMtd */ &l_daObj_Kita_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kjgjs.cpp b/src/d/actor/d_a_obj_kjgjs.cpp index 40e8514875e..2a174669d51 100644 --- a/src/d/actor/d_a_obj_kjgjs.cpp +++ b/src/d/actor/d_a_obj_kjgjs.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_kjgjs.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static const u32 l_dzbidx[2] = {8, 9}; static const char* l_arcName = "K_jgjs"; @@ -113,18 +113,18 @@ static actor_method_class daObjKJgjs_METHODS = { }; actor_process_profile_definition g_profile_Obj_KJgjs = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_KJgjs, - &g_fpcLf_Method.base, - sizeof(daObjKJgjs_c), - 0, - 0, - &g_fopAc_Method.base, - 677, - &daObjKJgjs_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KJgjs_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKJgjs_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KJgjs_e, + /* Actor SubMtd */ &daObjKJgjs_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kkanban.cpp b/src/d/actor/d_a_obj_kkanban.cpp index ccfc068e3d9..661b26d1bea 100644 --- a/src/d/actor/d_a_obj_kkanban.cpp +++ b/src/d/actor/d_a_obj_kkanban.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_kkanban.h" #include "SSystem/SComponent/c_math.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static int nodeCallBack(J3DJoint* i_joint, int param_1) { @@ -156,18 +156,18 @@ static actor_method_class daObjKKanban_METHODS = { }; actor_process_profile_definition g_profile_Obj_KKanban = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KKanban, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKKanban_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 548, // mPriority - &daObjKKanban_METHODS, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KKanban_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKKanban_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KKanban_e, + /* Actor SubMtd */ &daObjKKanban_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index cc5ee259d79..c259df8086a 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -496,18 +496,18 @@ static actor_method_class daObjKLift00_METHODS = { }; actor_process_profile_definition g_profile_Obj_KLift00 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KLift00, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKLift00_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 673, // mPriority - &daObjKLift00_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KLift00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKLift00_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KLift00_e, + /* Actor SubMtd */ &daObjKLift00_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_obj_knBullet.cpp b/src/d/actor/d_a_obj_knBullet.cpp index 88ebf332400..c4eabe796a4 100644 --- a/src/d/actor/d_a_obj_knBullet.cpp +++ b/src/d/actor/d_a_obj_knBullet.cpp @@ -203,18 +203,18 @@ static actor_method_class l_daObjKnBullet_Method = { }; actor_process_profile_definition g_profile_KN_BULLET = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_KN_BULLET, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKnBullet_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 348, // mPriority - &l_daObjKnBullet_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KN_BULLET_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKnBullet_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_KN_BULLET_e, + /* Actor SubMtd */ &l_daObjKnBullet_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp index a484837a787..09f18f6e81a 100644 --- a/src/d/actor/d_a_obj_kshutter.cpp +++ b/src/d/actor/d_a_obj_kshutter.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_kshutter.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -204,7 +204,7 @@ int daObjKshtr_c::Create() { } if (mType == TYPE_V_SHUTTER) { - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100); + fopAcM_OffStatus(this, fopAcStts_CULL_e); } initBaseMtx(); @@ -299,7 +299,7 @@ void daObjKshtr_c::initKey() { uVar1 = 0xFFFFFFFF; } - mKeyHoleId = fopAcM_createChildFromOffset(PROC_OBJ_KEYHOLE, fopAcM_GetID(this), uVar1, &sp20, fopAcM_GetRoomNo(this), NULL, &scale, -1, NULL); + mKeyHoleId = fopAcM_createChildFromOffset(fpcNm_OBJ_KEYHOLE_e, fopAcM_GetID(this), uVar1, &sp20, fopAcM_GetRoomNo(this), NULL, &scale, -1, NULL); } } } @@ -633,7 +633,7 @@ BOOL daObjKshtr_c::openProc() { default: return openProc_type2(); - + case TYPE_L3BOSS: return openProc_typeL3Boss(); @@ -734,7 +734,7 @@ BOOL daObjKshtr_c::demoJail1() { mDemoMode = 2; } break; - + case 2: anmInit(); mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLOPEN2, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); @@ -750,7 +750,7 @@ BOOL daObjKshtr_c::demoJail1() { mDemoMode = 4; } break; - + case 4: break; } @@ -776,7 +776,7 @@ BOOL daObjKshtr_c::demoJail2() { mDemoMode = 2; } break; - + case 2: speedF = 0.0f; mDemoMode = 3; @@ -804,7 +804,7 @@ BOOL daObjKshtr_c::demoJail11() { mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLOPEN2, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); offDzb(); break; - + case 1: if (mpBckAnm->play()) { mDemoMode = 2; @@ -972,18 +972,18 @@ static actor_method_class daObjKshtr_METHODS = { }; actor_process_profile_definition g_profile_Obj_Kshutter = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kshutter, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKshtr_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 443, // mPriority - &daObjKshtr_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kshutter_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKshtr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kshutter_e, + /* Actor SubMtd */ &daObjKshtr_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ktOnFire.cpp b/src/d/actor/d_a_obj_ktOnFire.cpp index b866dc08119..b11a22c7cff 100644 --- a/src/d/actor/d_a_obj_ktOnFire.cpp +++ b/src/d/actor/d_a_obj_ktOnFire.cpp @@ -203,18 +203,18 @@ static actor_method_class l_daKtOnFire_Method = { }; actor_process_profile_definition g_profile_Tag_KtOnFire = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_KtOnFire, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daKtOnFire_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 502, // mPriority - &l_daKtOnFire_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_KtOnFire_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daKtOnFire_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_KtOnFire_e, + /* Actor SubMtd */ &l_daKtOnFire_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index f5d27fa4aec..97dcdea6e88 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_kuwagata.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -10,7 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/d_cc_d.h" #include "d/d_menu_insect.h" -#include "f_pc/f_pc_name.h" +#include "d/d_item_data.h" #include class daObj_KuwHIO_c : public JORReflexible{ @@ -72,7 +72,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { int daObjKUW_c::CreateHeap() { J3DModelData* modelData; - + if (mSex == SEX_FEMALE) { modelData = (J3DModelData*)dComIfG_getObjectRes("I_Kuw", 10); JUT_ASSERT(255, modelData != NULL); @@ -80,19 +80,19 @@ int daObjKUW_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes("I_Kuw", 11); JUT_ASSERT(259, modelData != NULL); } - + mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("I_Kuw", 7), 2, 1.0f, 0, -1, &mSound, 0, 0x11000284); - + if (mpMorf == NULL || mpMorf->getModel() == NULL) { return 0; } - + J3DModel* model = mpMorf->getModel(); mpBrkAnm = new mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } - + J3DAnmTevRegKey* brkRes; if (mSex == SEX_FEMALE) { brkRes = (J3DAnmTevRegKey*)dComIfG_getObjectRes("I_Kuw", 14); @@ -105,12 +105,12 @@ int daObjKUW_c::CreateHeap() { return 0; } } - + mpBtkAnm = new mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return 0; } - + J3DAnmTextureSRTKey* btkRes; if (mSex == SEX_FEMALE) { btkRes = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("I_Kuw", 18); @@ -123,7 +123,7 @@ int daObjKUW_c::CreateHeap() { return 0; } } - + return 1; } @@ -182,7 +182,7 @@ void daObjKUW_c::WaitAction() { if (mTimers[0] <= 0) { mTimers[0] = 0; } - + if (mTimers[0] == 0) { int randVal = cM_rndF(100.0f); if (randVal < 40) { @@ -203,21 +203,21 @@ void daObjKUW_c::WaitAction() { BOOL daObjKUW_c::WallCheck() { dBgS_LinChk linChk; linChk.SetObj(); - + linChk.Set(&old.pos, ¤t.pos, NULL); - + if (dComIfG_Bgsp().LineCross(&linChk)) { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(linChk, &plane); cXyz* normal = plane.GetNP(); current.pos = linChk.GetCross(); - + cXyz temp1(0.0f, 0.0f, 0.0f); cXyz temp2(0.0f, normal->y, normal->z); field_0x99a.z = -cM_atan2s(normal->x, temp1.abs(temp2)); field_0x99a.x = cM_atan2s(normal->z, normal->y); field_0x9a2 = cM_atan2s(normal->x, normal->z); - + return TRUE; } @@ -228,15 +228,15 @@ void daObjKUW_c::SpeedSet() { speed.y += gravity; cXyz cStack_1c(0.0f, speed.y, speedF); cXyz local_28(0.0f, 0.0f, 0.0f); - + mDoMtx_stack_c::ZXYrotS(field_0x99a); mDoMtx_stack_c::YrotM(current.angle.y); mDoMtx_stack_c::multVec(&cStack_1c, &local_28); - + current.pos.x += local_28.x; current.pos.y += local_28.y; current.pos.z += local_28.z; - + cLib_addCalc2(&speedF, mSpeedFTarget, 0.4f, 10.0f); cLib_addCalc2(&speed.y, mSpeedYTarget, 0.1f, 0.5f); cLib_addCalcAngleS2(¤t.angle.y, mAngleTarget, 0x10, 0x100); @@ -248,36 +248,36 @@ void daObjKUW_c::WallWalk() { cXyz cStack_148(0.0f, 40.0f, 0.0f); cXyz cStack_154(0.0f, 20.0f, 100.0f); cXyz cStack_160; - + dBgS_LinChk linChk; dBgS_LinChk linChk2; - + linChk.SetObj(); linChk2.SetObj(); - + mDoMtx_stack_c::transS(current.pos); mDoMtx_stack_c::ZXYrotM(field_0x99a); mDoMtx_stack_c::YrotM(current.angle.y); mDoMtx_stack_c::multVec(&cStack_13c, &cStack_13c); mDoMtx_stack_c::multVec(&cStack_148, &cStack_148); - + linChk.Set(&cStack_148, &cStack_13c, NULL); - + if (dComIfG_Bgsp().LineCross(&linChk)) { speedF = 0.3f; - + cM3dGPla plane; dComIfG_Bgsp().GetTriPla(linChk, &plane); cXyz* normal = plane.GetNP(); - + s16 angleZ = cM_atan2s(normal->x, normal->z); - + cXyz temp1(0.0f, 0.0f, 0.0f); cXyz temp2(0.0f, normal->y, normal->z); f32 normalLen = temp1.abs(temp2); - + cStack_160 = linChk.GetCross(); - + int angleDiff = angleZ - field_0x9a2; if (angleDiff < 0x1000 && angleDiff > -0x1000 && cStack_160.abs(old.pos) < speedF * 3.0f) { @@ -303,7 +303,7 @@ void daObjKUW_c::WalkAction() { mTimers[i] = 0; } } - + switch (mSubAction) { case 0: mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("I_Kuw", 7), 2, 5.0f, 1.0f, 0.0f, -1.0f); @@ -319,10 +319,10 @@ void daObjKUW_c::WalkAction() { mAngleTarget = cM_atan2s(targetDir.x, targetDir.z); mTimers[0] = cM_rndF(50.0f) + 50.0f; } - + if (mTimers[1] == 0) { int randVal = cM_rndF(100.0f); - + if (randVal < 30) { mAction = ACTION_MOVE; mSubAction = 0; @@ -334,7 +334,7 @@ void daObjKUW_c::WalkAction() { } } } - + WallWalk(); } @@ -345,7 +345,7 @@ void daObjKUW_c::MoveAction() { mTimers[i] = 0; } } - + cXyz cStack_ac; cXyz cStack_b8(0.0f, 1.0f, 0.0f); dBgS_LinChk linChk; @@ -353,7 +353,7 @@ void daObjKUW_c::MoveAction() { linChk.SetObj(); cXyz local_c4; cXyz cStack_d0; - + switch (mSubAction) { case 0: mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("I_Kuw", 6), 2, 5.0f, 0.0f, 0.0f, -1.0f); @@ -369,30 +369,30 @@ void daObjKUW_c::MoveAction() { mDoMtx_stack_c::ZXYrotS(field_0x99a); mDoMtx_stack_c::multVec(&cStack_b8, &cStack_b8); mTimers[0] = cM_rndF(30.0f) + 10.0f; - + if (field_0x9c0 == 0) { mTimers[1] = cM_rndF(80.0f) + 80.0f; } else { mTimers[1] = cM_rndF(50.0f) + 50.0f; } - + mSpeedFTarget = cM_rndF(5.0f) + 8.0f; mAngleTarget = field_0x9a2; mSpeedYTarget = 3.0f; speed.y = 5.0f; } - break; + break; case 2: cXyz* flamePos = playerActor->getKandelaarFlamePos(); if (flamePos != NULL) { mAngleTarget = cLib_targetAngleY(¤t.pos, flamePos); - + if (flamePos->abs(current.pos) < 200.0f && speed.y < 0.0f) { cLib_addCalcAngleS2(¤t.angle.y, mAngleTarget, 2, 0x500); } else { cLib_addCalcAngleS2(¤t.angle.y, mAngleTarget, 0x10, 0x200); } - + if (flamePos->abs(current.pos) < 11.0f && fopAcM_GetSpeedF(playerActor) < 1.0f) { local_c4.set(0.0f, 0.0f, 10.0f); if (field_0x9c2 == 0) { @@ -425,7 +425,7 @@ void daObjKUW_c::MoveAction() { } } } - + if (mTimers[0] == 0) { if (flamePos == NULL) { local_c4 = home.pos - current.pos; @@ -436,15 +436,15 @@ void daObjKUW_c::MoveAction() { mTimers[0] = cM_rndF(20.0f) + 20.0f; mSpeedFTarget = cM_rndF(5.0f) + 8.0f; } - + if (mTimers[1] == 0) { mSpeedYTarget = -cM_rndF(3.0f); mTimers[1] = cM_rndF(20.0f) + 20.0f; } - + mpMorf->getFrame(); SpeedSet(); - + if (field_0x9c0 == 0) { cLib_addCalcAngleS2(&field_0x99a.x, 0, 0x10, 0x1000); cLib_addCalcAngleS2(&field_0x99a.z, 0, 0x10, 0x1000); @@ -452,7 +452,7 @@ void daObjKUW_c::MoveAction() { cLib_addCalcAngleS2(&field_0x99a.x, 0, 0x10, 0x100); cLib_addCalcAngleS2(&field_0x99a.z, 0, 0x10, 0x100); } - + if (WallCheck()) { mAction = ACTION_WAIT; mSubAction = 0; @@ -461,17 +461,17 @@ void daObjKUW_c::MoveAction() { shape_angle.x = 0; shape_angle.z = 0; } - + if (field_0x9c0 == 1) { cLib_addCalcAngleS2(¤t.angle.y, mAngleTarget, 0x10, 0x100); } - + if (field_0x9c2 == 0) { cLib_chaseAngleS(&shape_angle.x, 0, 0x400); } break; } - + if (mpMorf->getPlaySpeed() == 1.0f) { mSound.startCreatureSoundLevel(Z2SE_INSCT_BTBT, 0, -1); } @@ -517,7 +517,7 @@ void daObjKUW_c::Insect_Release() { } static u8 const l_kuw_itemno[2] = { - fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, + dItemNo_M_STAG_BEETLE_e, dItemNo_F_STAG_BEETLE_e, }; static f32 dummyFloat() { return -9.0f; } @@ -525,7 +525,7 @@ static f32 dummyFloat() { return -9.0f; } void daObjKUW_c::Z_BufferChk() { cXyz local_5c; cXyz cStack_68; - + cStack_68 = current.pos; cStack_68.y += 20.0f; mDoLib_project(&cStack_68, &local_5c); @@ -537,22 +537,22 @@ void daObjKUW_c::Z_BufferChk() { } else { trimHeight = 0.0f; } - - if (local_5c.x > 0.0f && local_5c.x < FB_WIDTH && + + if (local_5c.x > 0.0f && local_5c.x < FB_WIDTH && local_5c.y > trimHeight && local_5c.y < FB_HEIGHT - trimHeight) { dComIfGd_peekZ(local_5c.x, local_5c.y, &field_0x9bc); } - + view_class* view = dComIfGd_getView(); f32 nearPlane = view->near; f32 farPlane = view->far; - + mDoLib_pos2camera(&cStack_68, &local_5c); local_5c.z += 50.0f; if (local_5c.z > 0.0f) { local_5c.z = 0.0f; } - + field_0x9b8 = ((nearPlane + ((farPlane * nearPlane) / local_5c.z)) / (farPlane - nearPlane) + 1.0f) * 16777215.0f; } @@ -580,7 +580,7 @@ void daObjKUW_c::BoomChk() { home.pos = current.pos; cXyz targetPos = *playerPos; targetPos.y += 100.0f; - + if (mBoomerangMove.posMove(¤t.pos, &shape_angle.y, NULL, 0x1c00)) { mBoomerangMove.bgCheckAfterOffset(¤t.pos); current.pos.y += 0.5f; @@ -588,7 +588,7 @@ void daObjKUW_c::BoomChk() { dBgS_LinChk linChk; linChk.SetObj(); linChk.Set(&targetPos, ¤t.pos, NULL); - + if (dComIfG_Bgsp().LineCross(&linChk)) { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(linChk, &plane); @@ -662,7 +662,7 @@ int daObjKUW_c::Execute() { attention_info.position = current.pos; eyePos = current.pos; eyePos.y += 10.0f; - + switch (field_0x9c0) { case 0: if (!fopAcM_checkHookCarryNow(this)) { @@ -670,7 +670,7 @@ int daObjKUW_c::Execute() { } else { home.pos = current.pos; } - + mParticleKey2 = dComIfGp_particle_set(mParticleKey2, 0xa1c, ¤t.pos, &tevStr, &shape_angle, 0, 0xff, 0, -1, 0, 0, 0); SetCcSph(); ObjHit(); @@ -685,11 +685,11 @@ int daObjKUW_c::Execute() { ShopAction(); break; } - + if (mAction == ACTION_MOVE && mSubAction == 2 && speed.y < 0.0f) { mAcch.CrrPos(dComIfG_Bgsp()); } - + mpBrkAnm->play(); mpBtkAnm->play(); mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); @@ -754,7 +754,7 @@ bool daObjKUW_c::CreateChk() { if (type == 0xf) { type = 0; } - + if (field_0x9c0 != 2) { if (type != 0) { if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[0]]) || !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[1]])) { @@ -785,7 +785,7 @@ int daObjKUW_c::create() { if (field_0x9c0 == 2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = 1; } @@ -901,18 +901,18 @@ static actor_method_class l_daObjKUW_Method = { }; actor_process_profile_definition g_profile_Obj_Kuw = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Kuw, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKUW_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 479, // mPriority - &l_daObjKUW_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Kuw_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKUW_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Kuw_e, + /* Actor SubMtd */ &l_daObjKUW_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_kwheel00.cpp b/src/d/actor/d_a_obj_kwheel00.cpp index ad63eb22344..5ec012478d4 100644 --- a/src/d/actor/d_a_obj_kwheel00.cpp +++ b/src/d/actor/d_a_obj_kwheel00.cpp @@ -67,7 +67,7 @@ static void* searchLv3Water(void* param_0, void* i_this) { daLv3Water_c* const lv3Water = static_cast(param_0); daObjKWheel00_c* const kWheel00 = static_cast(i_this); - if(lv3Water && fopAcM_IsActor(lv3Water) && fopAcM_GetProfName(lv3Water) == PROC_Obj_Lv3Water) { + if(lv3Water && fopAcM_IsActor(lv3Water) && fopAcM_GetProfName(lv3Water) == fpcNm_Obj_Lv3Water_e) { if( (fopAcM_GetRoomNo(kWheel00) == 7 && lv3Water->getType() == 8) || (fopAcM_GetRoomNo(kWheel00) == 11 && lv3Water->getType() == 14) || @@ -356,20 +356,20 @@ static actor_method_class daObjKWheel00_METHODS = { }; actor_process_profile_definition g_profile_Obj_KWheel00 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KWheel00, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKWheel00_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 662, // mPriority - &daObjKWheel00_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KWheel00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKWheel00_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KWheel00_e, + /* Actor SubMtd */ &daObjKWheel00_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; static int daObjKWheel00_create1st(daObjKWheel00_c* i_this) { diff --git a/src/d/actor/d_a_obj_kwheel01.cpp b/src/d/actor/d_a_obj_kwheel01.cpp index f75d7398c4b..c2c26f21a6f 100644 --- a/src/d/actor/d_a_obj_kwheel01.cpp +++ b/src/d/actor/d_a_obj_kwheel01.cpp @@ -69,7 +69,7 @@ cPhs_Step daObjKWheel01_c::create1st() { if (CHECK_KLIFT_EXISTS(i)) { cXyz kLiftPos; MTXMultVec(mNewBgMtx, &l_pos[i], &kLiftPos); - m_klift_pid[i] = fopAcM_create(PROC_Obj_KLift00, createLiftParameters, &kLiftPos, fopAcM_GetHomeRoomNo(this), 0, 0, -1); + m_klift_pid[i] = fopAcM_create(fpcNm_Obj_KLift00_e, createLiftParameters, &kLiftPos, fopAcM_GetHomeRoomNo(this), 0, 0, -1); JUT_ASSERT(146, m_klift_pid[i] != fpcM_ERROR_PROCESS_ID_e); mCreatedKLifts = true; @@ -192,7 +192,7 @@ int daObjKWheel01_c::Create() { static void* searchKWheel00(void* param_0, void* i_this) { UNUSED(i_this); - if (param_0 && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == PROC_Obj_KWheel00) { + if (param_0 && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == fpcNm_Obj_KWheel00_e) { daObjKWheel00_c* const kWheel00 = static_cast(param_0); if (kWheel00->getType() == daObjKWheel00_c::TYPE_LARGE_GOLD) { return param_0; @@ -348,20 +348,20 @@ static actor_method_class daObjKWheel01_METHODS = { }; actor_process_profile_definition g_profile_Obj_KWheel01 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KWheel01, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKWheel01_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 663, // mPriority - &daObjKWheel01_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KWheel01_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKWheel01_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KWheel01_e, + /* Actor SubMtd */ &daObjKWheel01_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; static int daObjKWheel01_create1st(daObjKWheel01_c* i_this) { diff --git a/src/d/actor/d_a_obj_kznkarm.cpp b/src/d/actor/d_a_obj_kznkarm.cpp index ef8f97e5bce..2b8828ce03c 100644 --- a/src/d/actor/d_a_obj_kznkarm.cpp +++ b/src/d/actor/d_a_obj_kznkarm.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_kznkarm.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -20,8 +20,8 @@ class daObjKznkarm_Hio_c : public JORReflexible { void ct(); void dt(); - /* 0x04 */ int mCount; - /* 0x04 */ daObjKznkarm_Attr_c mAttr; + /* 0x04 */ int mCount; + /* 0x04 */ daObjKznkarm_Attr_c mAttr; }; static daObjKznkarm_Hio_c M_hio; @@ -76,7 +76,7 @@ void daObjKznkarm_Hio_c::genMessage(JORMContext* ctx) { daObjKznkarm_Attr_c const daObjKznkarm_c::M_attr = { -5.0f, -30.0f, 0.6f, 0.94f, 40.0f, 40.0f, -60.0f, - -6.0f, -6.0f, -60.0f, 0.0f, + -6.0f, -6.0f, -60.0f, 0.0f, 12.0f, 0, 0x1000, 0, -0x2000, }; @@ -113,13 +113,13 @@ inline daObjKznkarm_Attr_c* daObjKznkarm_c::attr() const { #if DEBUG return &M_hio.mAttr; #else - return (daObjKznkarm_Attr_c*)&M_attr; + return (daObjKznkarm_Attr_c*)&M_attr; #endif } void daObjKznkarm_c::initBroken() { mMode = MODE_BROKEN_e; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); daObjKazeNeko_c* kazeNeko = (daObjKazeNeko_c*)fpcM_SearchByID(parentActorID); if (kazeNeko != NULL) { kazeNeko->getFirstVec(&speed, fopAcM_GetParam(this)); @@ -148,7 +148,7 @@ void daObjKznkarm_c::executeBroken() { speed *= attr()->bounce_coeff; current.pos.y = gndH; } - + if (speed.abs() < fabsf(gravity)) { speed.zero(); field_0x7a8 = 0; @@ -170,7 +170,7 @@ void daObjKznkarm_c::executeBroken() { void daObjKznkarm_c::initCarry() { mMode = MODE_CARRY_e; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); cLib_offBit(attention_info.flags, fopAc_AttnFlag_CARRY_e); field_0x7ae = 0; field_0x7af = 0; @@ -203,7 +203,7 @@ void daObjKznkarm_c::executeCarry() { void daObjKznkarm_c::initThrow() { mMode = MODE_THROW_e; - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); speed.zero(); if (speedF > 1.0f) { daPy_py_c* player = daPy_getPlayerActorClass(); @@ -227,12 +227,12 @@ void daObjKznkarm_c::executeThrow() { speed.y = maxFallSpeed; } } - + f32 savedSpeedY = speed.y; fopAcM_posMove(this, 0); mAcch.CrrPos(dComIfG_Bgsp()); speed.y = savedSpeedY; - + if (mAcch.ChkGroundLanding()) { f32 speedAbs = speed.abs(); cM3dGPla groundPla; @@ -249,7 +249,7 @@ void daObjKznkarm_c::executeThrow() { speed.zero(); setAction(MODE_STAY_e); } - + if (mAcch.ChkWallHit()) { f32 speedAbs = speed.abs(); cM3dGPla wallPla; @@ -264,7 +264,7 @@ void daObjKznkarm_c::executeThrow() { } field_0x7ac *= -1; } - + if (field_0x7ae == 0) { if (mAcch.ChkWaterIn()) { cXyz effectPos = current.pos; @@ -280,12 +280,12 @@ void daObjKznkarm_c::executeThrow() { field_0x7ae = 1; } } - + if (field_0x7ae != 0) { speed.x *= attr()->water_drag; speed.z *= attr()->water_drag; } - + f32 fVar1 = (speed.absXZ() / attr()->initial_throwing_force); int angleOffset = (f32)field_0x7ac * fVar1; shape_angle.z += angleOffset; @@ -294,7 +294,7 @@ void daObjKznkarm_c::executeThrow() { void daObjKznkarm_c::initStay() { mMode = MODE_STAY_e; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OnStatus(this, fopAcStts_NOEXEC_e); cLib_onBit(attention_info.flags, fopAc_AttnFlag_CARRY_e); speedF = 0.0f; field_0x7a8 = getGroundSlope(shape_angle.y) - 0x4000; @@ -377,7 +377,7 @@ inline int daObjKznkarm_c::draw() { dComIfGd_setListBG(); mDoExt_modelUpdateDL(mpModel); dComIfGd_setList(); - + cXyz shadowPos = cXyz(current.pos.x, current.pos.y + 50.0f, current.pos.z); mShadowId = dComIfGd_setShadow(mShadowId, 1, mpModel, &shadowPos, 600.0f, 0.0f, current.pos.y, mAcch.GetGroundH(), mAcch.m_gnd, &tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); @@ -446,18 +446,18 @@ static actor_method_class l_daObjKznkarm_Method = { }; actor_process_profile_definition g_profile_Obj_KznkArm = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KznkArm, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjKznkarm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 31, // mPriority - &l_daObjKznkarm_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KznkArm_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjKznkarm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KznkArm_e, + /* Actor SubMtd */ &l_daObjKznkarm_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index 52310f15e04..903fb97e115 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -417,18 +417,18 @@ namespace { } actor_process_profile_definition g_profile_Obj_Ladder = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ladder, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLadder::Act_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 23, // mPriority - &daObjLadder::Mthd_Table, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ladder_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLadder::Act_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ladder_e, + /* Actor SubMtd */ &daObjLadder::Mthd_Table, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_laundry.cpp b/src/d/actor/d_a_obj_laundry.cpp index e5a69237935..2e05ec02c91 100644 --- a/src/d/actor/d_a_obj_laundry.cpp +++ b/src/d/actor/d_a_obj_laundry.cpp @@ -102,7 +102,7 @@ void daObjLdy_c::setNormalClothPos() { } } else { if (mCyl.ChkCoHit() != 0) { - if (fopAcM_GetName(mCyl.GetCoHitAc()) == PROC_NPC_TK) { + if (fopAcM_GetName(mCyl.GetCoHitAc()) == fpcNm_NPC_TK_e) { cXyz position = fopAcM_GetPosition(dComIfGp_getPlayer(0)) - mJoints[1].mPos1; position.normalizeZP(); position *= 100.0f; @@ -284,18 +284,18 @@ static actor_method_class l_daObjLdy_Method = { }; actor_process_profile_definition g_profile_Obj_Laundry = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Laundry, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLdy_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 37, // mPriority - &l_daObjLdy_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Laundry_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLdy_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Laundry_e, + /* Actor SubMtd */ &l_daObjLdy_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_laundry_rope.cpp b/src/d/actor/d_a_obj_laundry_rope.cpp index 080f45915b8..f5c172db67e 100644 --- a/src/d/actor/d_a_obj_laundry_rope.cpp +++ b/src/d/actor/d_a_obj_laundry_rope.cpp @@ -76,7 +76,7 @@ void daObjLndRope_c::create_init() { csXyz childAngle(0, cLib_targetAngleY(ropePosition, ropePosition + 1) + 0x4000, -cLib_targetAngleX(ropePosition, ropePosition + 1)); *procId = - fopAcM_createChild(PROC_Obj_Laundry, fopAcM_GetID(this), *laundryEntry, + fopAcM_createChild(fpcNm_Obj_Laundry_e, fopAcM_GetID(this), *laundryEntry, ropePosition, fopAcM_GetRoomNo(this), &childAngle, NULL, -1, 0); } @@ -289,18 +289,18 @@ static actor_method_class l_daObjLndRope_Method = { }; actor_process_profile_definition g_profile_Obj_LndRope = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_LndRope, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLndRope_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 34, // mPriority - &l_daObjLndRope_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_LndRope_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLndRope_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_LndRope_e, + /* Actor SubMtd */ &l_daObjLndRope_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lbox.cpp b/src/d/actor/d_a_obj_lbox.cpp index 2928266677e..557cc69b7c5 100644 --- a/src/d/actor/d_a_obj_lbox.cpp +++ b/src/d/actor/d_a_obj_lbox.cpp @@ -196,18 +196,18 @@ static actor_method_class l_daObj_Lbox_Method = { (process_method_func)daObj_Lbox_Draw}; actor_process_profile_definition g_profile_OBJ_LBOX = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_LBOX, - &g_fpcLf_Method.base, - sizeof(obj_lbox_class), - 0, - 0, - &g_fopAc_Method.base, - 0x29, - &l_daObj_Lbox_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_LBOX_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_lbox_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_LBOX_e, + /* Actor SubMtd */ &l_daObj_Lbox_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp index 8365818ea33..221f106d675 100644 --- a/src/d/actor/d_a_obj_life_container.cpp +++ b/src/d/actor/d_a_obj_life_container.cpp @@ -144,7 +144,7 @@ int daObjLife_c::create() { } m_itemNo = getItemNo(); - if (m_itemNo != fpcNm_ITEM_KAKERA_HEART && m_itemNo != fpcNm_ITEM_UTAWA_HEART) { + if (m_itemNo != dItemNo_KAKERA_HEART_e && m_itemNo != dItemNo_UTAWA_HEART_e) { // "Heart Container: Item No is incorrect!<%d>\n" OS_REPORT_ERROR("ハートの器：アイテム番号が不正です！<%d>\n", m_itemNo); } @@ -153,7 +153,7 @@ int daObjLife_c::create() { return cPhs_ERROR_e; } - if (m_itemNo == fpcNm_ITEM_UTAWA_HEART && dComIfGs_isStageLife()) { + if (m_itemNo == dItemNo_UTAWA_HEART_e && dComIfGs_isStageLife()) { return cPhs_ERROR_e; } @@ -328,7 +328,7 @@ int daObjLife_c::actionGetDemo() { fopAcM_onItem(this, savebit); } - if (m_itemNo == fpcNm_ITEM_KAKERA_HEART) { + if (m_itemNo == dItemNo_KAKERA_HEART_e) { if (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0) { if (fopAcM_GetRoomNo(this) == 0) { if (savebit == 128) { @@ -372,7 +372,7 @@ int daObjLife_c::actionInitBoomerangCarry() { } int daObjLife_c::actionBoomerangCarry() { - fopAc_ac_c* boomerang = fopAcM_SearchByName(PROC_BOOMERANG); + fopAc_ac_c* boomerang = fopAcM_SearchByName(fpcNm_BOOMERANG_e); if (boomerang != NULL) { current.pos = boomerang->current.pos; } else { @@ -511,18 +511,18 @@ static actor_method_class l_daObjLife_Method = { }; actor_process_profile_definition g_profile_Obj_LifeContainer = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_LifeContainer, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLife_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 239, // mPriority - &l_daObjLife_Method, // sub_method - 0x000C4100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_LifeContainer_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLife_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_LifeContainer_e, + /* Actor SubMtd */ &l_daObjLife_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index 9352de063fa..eec6b8400c5 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -495,20 +495,20 @@ static actor_method_class l_daObj_Lp_Method = { }; actor_process_profile_definition g_profile_OBJ_LP = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_LP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_lp_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 708, // mPriority - &l_daObj_Lp_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_LP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_lp_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_LP_e, + /* Actor SubMtd */ &l_daObj_Lp_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_lv1Candle00.cpp b/src/d/actor/d_a_obj_lv1Candle00.cpp index 40394300a3a..12582c32af7 100644 --- a/src/d/actor/d_a_obj_lv1Candle00.cpp +++ b/src/d/actor/d_a_obj_lv1Candle00.cpp @@ -6,7 +6,7 @@ #include "d/actor/d_a_obj_lv1Candle00.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static daLv1Cdl00_HIO_c l_HIO; @@ -210,7 +210,7 @@ int daLv1Cdl00_c::Execute() { cCcD_Obj* obj = mCyl.GetTgHitObj(); if (obj != NULL) { bool bvar1 = true; - if (fopAcM_GetName(obj->GetAc()) == PROC_ALINK) { + if (fopAcM_GetName(obj->GetAc()) == fpcNm_ALINK_e) { if (mCyl.GetTgHitGObj()->ChkAtType(AT_TYPE_NORMAL_SWORD) && mTgHit) { bvar1 = false; } @@ -276,18 +276,18 @@ static actor_method_class l_daLv1Cdl00_Method = { }; actor_process_profile_definition g_profile_Obj_Lv1Cdl00 = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv1Cdl00, - &g_fpcLf_Method.base, - sizeof(daLv1Cdl00_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1EE, - &l_daLv1Cdl00_Method, - 0x60000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv1Cdl00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv1Cdl00_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv1Cdl00_e, + /* Actor SubMtd */ &l_daLv1Cdl00_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv1Candle01.cpp b/src/d/actor/d_a_obj_lv1Candle01.cpp index 135f74f7424..9e1cabfebb8 100644 --- a/src/d/actor/d_a_obj_lv1Candle01.cpp +++ b/src/d/actor/d_a_obj_lv1Candle01.cpp @@ -6,7 +6,7 @@ #include "d/actor/d_a_obj_lv1Candle01.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static daLv1Cdl01_HIO_c l_HIO; @@ -164,7 +164,7 @@ int daLv1Cdl01_c::Execute(Mtx** param_0) { cCcD_Obj* obj = mCyl.GetTgHitObj(); if (obj != NULL) { bool bvar1 = true; - if (fopAcM_GetName(obj->GetAc()) == PROC_ALINK) { + if (fopAcM_GetName(obj->GetAc()) == fpcNm_ALINK_e) { if (mCyl.GetTgHitGObj()->ChkAtType(AT_TYPE_NORMAL_SWORD) && mTgHit) { bvar1 = false; } @@ -230,18 +230,18 @@ static actor_method_class l_daLv1Cdl01_Method = { }; actor_process_profile_definition g_profile_Obj_Lv1Cdl01 = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv1Cdl01, - &g_fpcLf_Method.base, - sizeof(daLv1Cdl01_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1EF, - &l_daLv1Cdl01_Method, - 0x60000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv1Cdl01_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv1Cdl01_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv1Cdl01_e, + /* Actor SubMtd */ &l_daLv1Cdl01_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv2Candle.cpp b/src/d/actor/d_a_obj_lv2Candle.cpp index f8c7dc7ab07..e93a4d05edf 100644 --- a/src/d/actor/d_a_obj_lv2Candle.cpp +++ b/src/d/actor/d_a_obj_lv2Candle.cpp @@ -150,7 +150,7 @@ int daLv2Candle_c::createHeapCallBack(fopAc_ac_c* i_this) { void* daLv2Candle_c::searchDemoTagAct(void* i_actor, void* param_1) { if (i_actor != NULL && fopAc_IsActor(i_actor) && - fopAcM_GetProfName(i_actor) == PROC_Tag_Lv4Candle) { + fopAcM_GetProfName(i_actor) == fpcNm_Tag_Lv4Candle_e) { return i_actor; } return NULL; @@ -316,13 +316,13 @@ int daLv2Candle_c::Execute() { fopAc_ac_c* actor = obj->GetAc(); bool bvar1 = true; if (actor != NULL) { - if (fopAcM_GetName(actor) == PROC_E_HP && mTgHit) { + if (fopAcM_GetName(actor) == fpcNm_E_HP_e && mTgHit) { bvar1 = false; } - if (fopAcM_GetName(actor) == PROC_E_DD) { + if (fopAcM_GetName(actor) == fpcNm_E_DD_e) { bvar1 = false; } - if (fopAcM_GetName(actor) == PROC_ALINK) { + if (fopAcM_GetName(actor) == fpcNm_ALINK_e) { if (mCyl.GetTgHitGObj()->ChkAtType(AT_TYPE_NORMAL_SWORD) && mTgHit) { bvar1 = false; } @@ -395,18 +395,18 @@ static actor_method_class l_daLv2Candle_Method = { }; actor_process_profile_definition g_profile_Obj_Lv2Candle = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv2Candle, - &g_fpcLf_Method.base, - sizeof(daLv2Candle_c), - 0, - 0, - &g_fopAc_Method.base, - 0x20B, - &l_daLv2Candle_Method, - 0x60000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv2Candle_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv2Candle_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv2Candle_e, + /* Actor SubMtd */ &l_daLv2Candle_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv3Candle.cpp b/src/d/actor/d_a_obj_lv3Candle.cpp index 708ac0045bc..784af3210b7 100644 --- a/src/d/actor/d_a_obj_lv3Candle.cpp +++ b/src/d/actor/d_a_obj_lv3Candle.cpp @@ -162,7 +162,7 @@ int daLv3Candle_c::Execute() { if (obj != NULL) { u8 play_sound = true; fopAc_ac_c* actor = dCc_GetAc(obj->GetAc()); - if (fopAcM_GetName(actor) == PROC_ALINK) { + if (fopAcM_GetName(actor) == fpcNm_ALINK_e) { dCcD_GObjInf* gobj = mSph.GetTgHitGObj(); if (gobj->GetAtType() & AT_TYPE_NORMAL_SWORD && mTgHit != 0) { play_sound = false; @@ -245,18 +245,18 @@ static actor_method_class l_daLv3Candle_Method = { }; actor_process_profile_definition g_profile_Obj_Lv3Candle = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv3Candle, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv3Candle_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 620, // mPriority - &l_daLv3Candle_Method, // sub_method - 0x60000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv3Candle_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv3Candle_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv3Candle_e, + /* Actor SubMtd */ &l_daLv3Candle_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv3Water.cpp b/src/d/actor/d_a_obj_lv3Water.cpp index e9b17c3ad6b..a228b2cbc8e 100644 --- a/src/d/actor/d_a_obj_lv3Water.cpp +++ b/src/d/actor/d_a_obj_lv3Water.cpp @@ -9,7 +9,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_msg_mng.h" @@ -460,18 +460,18 @@ static actor_method_class l_daLv3Water_Method = { }; actor_process_profile_definition g_profile_Obj_Lv3Water = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv3Water, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv3Water_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 616, // mPriority - &l_daLv3Water_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv3Water_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv3Water_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv3Water_e, + /* Actor SubMtd */ &l_daLv3Water_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv3Water2.cpp b/src/d/actor/d_a_obj_lv3Water2.cpp index 098b585aa01..b6814875ccc 100644 --- a/src/d/actor/d_a_obj_lv3Water2.cpp +++ b/src/d/actor/d_a_obj_lv3Water2.cpp @@ -293,18 +293,18 @@ static actor_method_class l_daLv3Water2_Method = { }; actor_process_profile_definition g_profile_Obj_Lv3Water2 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv3Water2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv3Water2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 617, // mPriority - &l_daLv3Water2_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv3Water2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv3Water2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv3Water2_e, + /* Actor SubMtd */ &l_daLv3Water2_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv3WaterB.cpp b/src/d/actor/d_a_obj_lv3WaterB.cpp index ab842c6748d..373ce390f50 100644 --- a/src/d/actor/d_a_obj_lv3WaterB.cpp +++ b/src/d/actor/d_a_obj_lv3WaterB.cpp @@ -220,18 +220,18 @@ static actor_method_class l_daObj_Lv3waterB_Method = { }; actor_process_profile_definition g_profile_OBJ_LV3WATERB = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_LV3WATERB, - &g_fpcLf_Method.base, - sizeof(obj_lv3WaterB_class), - 0, - 0, - &g_fopAc_Method.base, - 618, - &l_daObj_Lv3waterB_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_LV3WATERB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_lv3WaterB_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_LV3WATERB_e, + /* Actor SubMtd */ &l_daObj_Lv3waterB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv3saka00.cpp b/src/d/actor/d_a_obj_lv3saka00.cpp index 0a32b9739d2..7717a23e1f1 100644 --- a/src/d/actor/d_a_obj_lv3saka00.cpp +++ b/src/d/actor/d_a_obj_lv3saka00.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_lv3saka00.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "m_Do/m_Do_mtx.h" static char* l_arcName[] = {"Obj_saka", "Obj_saka2"}; @@ -184,18 +184,18 @@ static actor_method_class daObjLv3saka_METHODS = { (process_method_func)daObjLv3saka_MoveBGDraw}; actor_process_profile_definition g_profile_Obj_Lv3R10Saka = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv3R10Saka, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv3saka_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 528, // mPriority - &daObjLv3saka_METHODS, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv3R10Saka_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv3saka_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv3R10Saka_e, + /* Actor SubMtd */ &daObjLv3saka_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv3waterEff.cpp b/src/d/actor/d_a_obj_lv3waterEff.cpp index 28a43141a68..07b3dfb7bcf 100644 --- a/src/d/actor/d_a_obj_lv3waterEff.cpp +++ b/src/d/actor/d_a_obj_lv3waterEff.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_lv3waterEff.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" static u16 const l_eff_id[] = { @@ -101,18 +101,18 @@ static actor_method_class l_daObjWaterEff_Method = { }; actor_process_profile_definition g_profile_Obj_WaterEff = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_WaterEff, - &g_fpcLf_Method.base, - sizeof(daObjWaterEff_c), - 0, - 0, - &g_fopAc_Method.base, - 555, - &l_daObjWaterEff_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WaterEff_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWaterEff_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WaterEff_e, + /* Actor SubMtd */ &l_daObjWaterEff_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp index ea74e61b267..7212b0f4920 100644 --- a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp @@ -115,7 +115,7 @@ void dalv4CandleDemoTag_c::init_modeEnemyCreate() { pos.y = pnt->m_position.y; pos.z = pnt->m_position.z; - fopAcM_create(PROC_E_BS, 0xFFFFFEFF, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); + fopAcM_create(fpcNm_E_BS_e, 0xFFFFFEFF, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); } mMode = 1; @@ -154,7 +154,7 @@ bool dalv4CandleDemoTag_c::eventStart() { void* dalv4CandleDemoTag_c::searchShutterAct(void* param_0, void* param_1) { if (param_0 != NULL && fopAcM_IsActor(param_0) && - fopAcM_GetProfName(param_0) == PROC_Obj_Lv4EdShutter) + fopAcM_GetProfName(param_0) == fpcNm_Obj_Lv4EdShutter_e) { return param_0; } @@ -195,18 +195,18 @@ static actor_method_class l_dalv4CandleDemoTag_Method = { }; actor_process_profile_definition g_profile_Tag_Lv4CandleDm = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Lv4CandleDm, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(dalv4CandleDemoTag_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 541, // mPriority - &l_dalv4CandleDemoTag_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv4CandleDm_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dalv4CandleDemoTag_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv4CandleDm_e, + /* Actor SubMtd */ &l_dalv4CandleDemoTag_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4CandleTag.cpp b/src/d/actor/d_a_obj_lv4CandleTag.cpp index 8f924aa1861..e25c5f1cd10 100644 --- a/src/d/actor/d_a_obj_lv4CandleTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleTag.cpp @@ -149,18 +149,18 @@ static actor_method_class l_dalv4CandleTag_Method = { }; actor_process_profile_definition g_profile_Tag_Lv4Candle = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Lv4Candle, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(dalv4CandleTag_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 540, // mPriority - &l_dalv4CandleTag_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv4Candle_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dalv4CandleTag_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv4Candle_e, + /* Actor SubMtd */ &l_dalv4CandleTag_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4EdShutter.cpp b/src/d/actor/d_a_obj_lv4EdShutter.cpp index edc31c86417..64868f15b2f 100644 --- a/src/d/actor/d_a_obj_lv4EdShutter.cpp +++ b/src/d/actor/d_a_obj_lv4EdShutter.cpp @@ -223,18 +223,18 @@ static actor_method_class l_daLv4EdShutter_Method = { }; actor_process_profile_definition g_profile_Obj_Lv4EdShutter = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4EdShutter, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv4EdShutter_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 636, // mPriority - &l_daLv4EdShutter_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4EdShutter_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv4EdShutter_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4EdShutter_e, + /* Actor SubMtd */ &l_daLv4EdShutter_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4Gate.cpp b/src/d/actor/d_a_obj_lv4Gate.cpp index 82e53002257..3d1ff0a730c 100644 --- a/src/d/actor/d_a_obj_lv4Gate.cpp +++ b/src/d/actor/d_a_obj_lv4Gate.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_lv4Gate.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static daLv4Gate_HIO_c l_HIO; @@ -180,18 +180,18 @@ static actor_method_class l_daLv4Gate_Method = { }; actor_process_profile_definition g_profile_Obj_Lv4Gate = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv4Gate, - &g_fpcLf_Method.base, - sizeof(daLv4Gate_c), - 0, - 0, - &g_fopAc_Method.base, - 637, - &l_daLv4Gate_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4Gate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv4Gate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4Gate_e, + /* Actor SubMtd */ &l_daLv4Gate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4HsTarget.cpp b/src/d/actor/d_a_obj_lv4HsTarget.cpp index 320b6e4d490..ed66cdddb41 100644 --- a/src/d/actor/d_a_obj_lv4HsTarget.cpp +++ b/src/d/actor/d_a_obj_lv4HsTarget.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_lv4HsTarget.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daLv4HsTarget_HIO_c::daLv4HsTarget_HIO_c() {} @@ -91,18 +91,18 @@ static actor_method_class l_daLv4HsTarget_Method = { }; actor_process_profile_definition g_profile_Obj_Lv4HsTarget = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv4HsTarget, - &g_fpcLf_Method.base, - sizeof(daLv4HsTarget_c), - 0, - 0, - &g_fopAc_Method.base, - 640, - &l_daLv4HsTarget_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4HsTarget_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv4HsTarget_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4HsTarget_e, + /* Actor SubMtd */ &l_daLv4HsTarget_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4PoGate.cpp b/src/d/actor/d_a_obj_lv4PoGate.cpp index 4c9a72d40e9..eb0b5442ecf 100644 --- a/src/d/actor/d_a_obj_lv4PoGate.cpp +++ b/src/d/actor/d_a_obj_lv4PoGate.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_lv4PoGate.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daLv4PoGate_HIO_c::daLv4PoGate_HIO_c() { mOpenSpeed = 10.0f; @@ -260,18 +260,18 @@ static actor_method_class l_daLv4PoGate_Method = { }; actor_process_profile_definition g_profile_Obj_Lv4PoGate = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv4PoGate, - &g_fpcLf_Method.base, - sizeof(daLv4PoGate_c), - 0, - 0, - &g_fopAc_Method.base, - 638, - &l_daLv4PoGate_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4PoGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv4PoGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4PoGate_e, + /* Actor SubMtd */ &l_daLv4PoGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4RailWall.cpp b/src/d/actor/d_a_obj_lv4RailWall.cpp index 7df09f85b3a..9128376496e 100644 --- a/src/d/actor/d_a_obj_lv4RailWall.cpp +++ b/src/d/actor/d_a_obj_lv4RailWall.cpp @@ -13,7 +13,7 @@ static char* l_arcName = "P_L4Rwall"; static void* s_BossSearch(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_B_DS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_B_DS_e) { return i_actor; } @@ -49,7 +49,7 @@ int daObjLv4Wall_c::Create() { cXyz swpos(current.pos); swpos.y -= 1700.0f; - fopAcM_createChild(PROC_Obj_SwSpinner, fopAcM_GetID(this), getSwbit() << 8, &swpos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); + fopAcM_createChild(fpcNm_Obj_SwSpinner_e, fopAcM_GetID(this), getSwbit() << 8, &swpos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); mpSwSpinner = NULL; return 1; } @@ -79,7 +79,7 @@ int daObjLv4Wall_c::create1st() { int daObjLv4Wall_c::Execute(Mtx** param_0) { if (mpSwSpinner == NULL) { - mpSwSpinner = (daObjSwSpinner_c*)fopAcM_SearchByName(PROC_Obj_SwSpinner); + mpSwSpinner = (daObjSwSpinner_c*)fopAcM_SearchByName(fpcNm_Obj_SwSpinner_e); } if (mpSwSpinner == NULL) { @@ -250,18 +250,18 @@ static actor_method_class daObjLv4Wall_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4RailWall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4RailWall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv4Wall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 574, // mPriority - &daObjLv4Wall_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4RailWall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4Wall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4RailWall_e, + /* Actor SubMtd */ &daObjLv4Wall_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4SlideWall.cpp b/src/d/actor/d_a_obj_lv4SlideWall.cpp index 26efe7a77e3..27423394871 100644 --- a/src/d/actor/d_a_obj_lv4SlideWall.cpp +++ b/src/d/actor/d_a_obj_lv4SlideWall.cpp @@ -176,18 +176,18 @@ static actor_method_class l_daSldWall_Method = { }; actor_process_profile_definition g_profile_Obj_Lv4SlideWall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4SlideWall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSldWall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 639, // mPriority - &l_daSldWall_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4SlideWall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSldWall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4SlideWall_e, + /* Actor SubMtd */ &l_daSldWall_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4bridge.cpp b/src/d/actor/d_a_obj_lv4bridge.cpp index 3a1e293dd1c..b11fa22d558 100644 --- a/src/d/actor/d_a_obj_lv4bridge.cpp +++ b/src/d/actor/d_a_obj_lv4bridge.cpp @@ -171,18 +171,18 @@ static actor_method_class daObjLv4Brg_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4Bridge = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4Bridge, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv4Brg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 581, // mPriority - &daObjLv4Brg_METHODS, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4Bridge_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4Brg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4Bridge_e, + /* Actor SubMtd */ &daObjLv4Brg_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index 07b2b907753..1294cd4e5f6 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -247,7 +247,7 @@ int daObjLv4Chan_c::CreateHeap() { static void* searchSwChain(void* i_actor, void* i_this) { if (i_actor != NULL && fopAcM_IsActor(i_actor) && - fopAcM_GetProfName(i_actor) == PROC_Obj_SwChain) + fopAcM_GetProfName(i_actor) == fpcNm_Obj_SwChain_e) { if (((daObjSwChain_c*)i_actor)->getChainID() == ((daObjLv4Chan_c*)i_this)->getArg0()) { return i_actor; @@ -874,18 +874,18 @@ static actor_method_class daObjLv4Chan_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4Chan = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4Chan, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv4Chan_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 674, // mPriority - &daObjLv4Chan_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4Chan_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4Chan_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4Chan_e, + /* Actor SubMtd */ &daObjLv4Chan_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index 2cda594ce71..c067b004f85 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -64,7 +64,7 @@ int daObjL4DigSand_c::create1st() { } int daObjL4DigSand_c::Execute(Mtx** param_0) { - if (daPy_py_c::checkNowWolf() && checkItemGet(fpcNm_ITEM_SMELL_POH, 1)) { + if (daPy_py_c::checkNowWolf() && checkItemGet(dItemNo_SMELL_POH_e, 1)) { attention_info.flags = fopAc_AttnFlag_ETC_e; } else { attention_info.flags = 0; @@ -180,18 +180,18 @@ static actor_method_class daObjL4DigSand_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4DigSand = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4DigSand, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjL4DigSand_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 551, // mPriority - &daObjL4DigSand_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4DigSand_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjL4DigSand_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4DigSand_e, + /* Actor SubMtd */ &daObjL4DigSand_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4floor.cpp b/src/d/actor/d_a_obj_lv4floor.cpp index b4122862b86..ab04768a0a1 100644 --- a/src/d/actor/d_a_obj_lv4floor.cpp +++ b/src/d/actor/d_a_obj_lv4floor.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_lv4floor.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daObjLv4Floor_c::initBaseMtx() { mpModel->setBaseScale(scale); @@ -141,18 +141,18 @@ static actor_method_class daObjLv4Floor_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4Floor = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Lv4Floor, - &g_fpcLf_Method.base, - sizeof(daObjLv4Floor_c), - 0, - 0, - &g_fopAc_Method.base, - 584, - &daObjLv4Floor_METHODS, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4Floor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4Floor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4Floor_e, + /* Actor SubMtd */ &daObjLv4Floor_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4gear.cpp b/src/d/actor/d_a_obj_lv4gear.cpp index 75f19496a4e..02ea392cb9c 100644 --- a/src/d/actor/d_a_obj_lv4gear.cpp +++ b/src/d/actor/d_a_obj_lv4gear.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4gear.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int CheckCreateHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->CreateHeap(); @@ -16,7 +16,7 @@ static void* searchSwSpinSub(void* i_actor, void* i_data) { daObjSwSpinner_c* sw = (daObjSwSpinner_c*)i_actor; daObjLv4Gear_c* gear = (daObjLv4Gear_c*)i_data; - if (sw != NULL && fopAc_IsActor(sw) && fpcM_GetProfName(sw) == PROC_Obj_SwSpinner) { + if (sw != NULL && fopAc_IsActor(sw) && fpcM_GetProfName(sw) == fpcNm_Obj_SwSpinner_e) { u8 sw_bit = sw->getSwbit(); if (sw_bit != 0xFF && sw_bit == gear->getSwBit()) { return sw; @@ -161,18 +161,18 @@ static actor_method_class l_daObjLv4Gear_Method = { }; actor_process_profile_definition g_profile_Obj_Lv4Gear = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4Gear, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv4Gear_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 561, // mPriority - &l_daObjLv4Gear_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4Gear_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4Gear_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4Gear_e, + /* Actor SubMtd */ &l_daObjLv4Gear_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4prelvtr.cpp b/src/d/actor/d_a_obj_lv4prelvtr.cpp index 5cbc543dd6b..a8f9a9061a6 100644 --- a/src/d/actor/d_a_obj_lv4prelvtr.cpp +++ b/src/d/actor/d_a_obj_lv4prelvtr.cpp @@ -50,7 +50,7 @@ int daObjPRElvtr_c::Create() { static fopAc_ac_c* searchObjSwTurn(void* i_actor1, void* i_actor2) { if (i_actor1 != NULL && fopAcM_IsActor(i_actor1) && - fopAcM_GetProfName(i_actor1) == PROC_Obj_SwTurn) + fopAcM_GetProfName(i_actor1) == fpcNm_Obj_SwTurn_e) { if (((daObjSwTurn_c*)i_actor1)->getSwNo() == ((daObjPRElvtr_c*)i_actor2)->getSwNo()) { return (fopAc_ac_c*)i_actor1; @@ -116,18 +116,18 @@ static actor_method_class daObjPRElvtr_METHODS = { }; actor_process_profile_definition g_profile_Obj_PRElvtr = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_PRElvtr, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjPRElvtr_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 665, // mPriority - &daObjPRElvtr_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_PRElvtr_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjPRElvtr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_PRElvtr_e, + /* Actor SubMtd */ &daObjPRElvtr_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4prwall.cpp b/src/d/actor/d_a_obj_lv4prwall.cpp index d904dc57718..76e24dd16f2 100644 --- a/src/d/actor/d_a_obj_lv4prwall.cpp +++ b/src/d/actor/d_a_obj_lv4prwall.cpp @@ -119,7 +119,7 @@ int daObjLv4PRwall_c::Create() { static void* searchObjSwTurn(void* i_actor, void* i_data) { daObjSwTurn_c* swturn = (daObjSwTurn_c*)i_actor; daObjLv4PRwall_c* prwall = (daObjLv4PRwall_c*)i_data; - if (swturn != NULL && fopAcM_IsActor(swturn) && fopAcM_GetProfName(swturn) == PROC_Obj_SwTurn) { + if (swturn != NULL && fopAcM_IsActor(swturn) && fopAcM_GetProfName(swturn) == fpcNm_Obj_SwTurn_e) { if (swturn->getSwNo() == prwall->getSwNo()) { return i_actor; } @@ -303,18 +303,18 @@ static actor_method_class daObjLv4PRwall_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4PRwall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4PRwall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv4PRwall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 672, // mPriority - &daObjLv4PRwall_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4PRwall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4PRwall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4PRwall_e, + /* Actor SubMtd */ &daObjLv4PRwall_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv4sand.cpp b/src/d/actor/d_a_obj_lv4sand.cpp index 6552b647594..c4264f7ba62 100644 --- a/src/d/actor/d_a_obj_lv4sand.cpp +++ b/src/d/actor/d_a_obj_lv4sand.cpp @@ -171,18 +171,18 @@ static actor_method_class daObjLv4Sand_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv4Sand = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv4Sand, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv4Sand_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 573, // mPriority - &daObjLv4Sand_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv4Sand_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv4Sand_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv4Sand_e, + /* Actor SubMtd */ &daObjLv4Sand_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv5FloorBoard.cpp b/src/d/actor/d_a_obj_lv5FloorBoard.cpp index 74206ac37b4..fc3819cf085 100644 --- a/src/d/actor/d_a_obj_lv5FloorBoard.cpp +++ b/src/d/actor/d_a_obj_lv5FloorBoard.cpp @@ -190,18 +190,18 @@ static actor_method_class l_daFlorBoad_Method = { }; actor_process_profile_definition g_profile_Obj_Lv5FBoard = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv5FBoard, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daFlorBoad_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 538, // mPriority - &l_daFlorBoad_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv5FBoard_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daFlorBoad_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv5FBoard_e, + /* Actor SubMtd */ &l_daFlorBoad_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv5IceWall.cpp b/src/d/actor/d_a_obj_lv5IceWall.cpp index 7eedee6c613..dc178453315 100644 --- a/src/d/actor/d_a_obj_lv5IceWall.cpp +++ b/src/d/actor/d_a_obj_lv5IceWall.cpp @@ -296,18 +296,18 @@ static actor_method_class l_daIceWall_Method = { }; actor_process_profile_definition g_profile_Obj_IceWall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_IceWall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daIceWall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 536, // mPriority - &l_daIceWall_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_IceWall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daIceWall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_IceWall_e, + /* Actor SubMtd */ &l_daIceWall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv5SwIce.cpp b/src/d/actor/d_a_obj_lv5SwIce.cpp index e4a644a5fe1..2ff52396c06 100644 --- a/src/d/actor/d_a_obj_lv5SwIce.cpp +++ b/src/d/actor/d_a_obj_lv5SwIce.cpp @@ -200,18 +200,18 @@ static actor_method_class l_daLv5SwIce_Method = { }; actor_process_profile_definition g_profile_Obj_Lv5SwIce = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv5SwIce, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv5SwIce_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 537, // mPriority - &l_daLv5SwIce_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv5SwIce_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv5SwIce_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv5SwIce_e, + /* Actor SubMtd */ &l_daLv5SwIce_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv5ychndlr.cpp b/src/d/actor/d_a_obj_lv5ychndlr.cpp index 0bd3dcdb97a..22eaac0e154 100644 --- a/src/d/actor/d_a_obj_lv5ychndlr.cpp +++ b/src/d/actor/d_a_obj_lv5ychndlr.cpp @@ -361,18 +361,18 @@ static actor_method_class daObjYchndlr_METHODS = { }; actor_process_profile_definition g_profile_Obj_Ychndlr = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ychndlr, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjYchndlr_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 664, // mPriority - &daObjYchndlr_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ychndlr_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjYchndlr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ychndlr_e, + /* Actor SubMtd */ &daObjYchndlr_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv5yiblltray.cpp b/src/d/actor/d_a_obj_lv5yiblltray.cpp index 29af54398d4..7a9aa47e221 100644 --- a/src/d/actor/d_a_obj_lv5yiblltray.cpp +++ b/src/d/actor/d_a_obj_lv5yiblltray.cpp @@ -179,7 +179,7 @@ int daObjYIblltray_c::Create() { } void daObjYIblltray_c::rideActor(fopAc_ac_c* i_actor) { - if (mBallID == fpcM_ERROR_PROCESS_ID_e && fopAcM_GetProfName(i_actor) == PROC_Obj_Carry && + if (mBallID == fpcM_ERROR_PROCESS_ID_e && fopAcM_GetProfName(i_actor) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_actor)->getType() == daObjCarry_c::TYPE_IRON_BALL) { mBallID = fopAcM_GetID(i_actor); @@ -201,7 +201,7 @@ void daObjYIblltray_c::sendBall(fpc_ProcID i_ID) { static fopAc_ac_c* searchObjYIblltray(void* i_trayB, void* i_trayA) { if (i_trayB != NULL && fopAcM_IsActor(i_trayB) && - fopAcM_GetProfName(i_trayB) == PROC_Obj_YIblltray && i_trayB != i_trayA) + fopAcM_GetProfName(i_trayB) == fpcNm_Obj_YIblltray_e && i_trayB != i_trayA) { if (((daObjYIblltray_c*)i_trayA)->getSwNo() == ((daObjYIblltray_c*)i_trayB)->getSwNo()) { return (fopAc_ac_c*)i_trayB; @@ -212,7 +212,7 @@ static fopAc_ac_c* searchObjYIblltray(void* i_trayB, void* i_trayA) { } static fopAc_ac_c* searchNearIronball(void* i_ball, void* i_tray) { - if (i_ball != NULL && fopAcM_IsActor(i_ball) && fopAcM_GetProfName(i_ball) == PROC_Obj_Carry && + if (i_ball != NULL && fopAcM_IsActor(i_ball) && fopAcM_GetProfName(i_ball) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_ball)->getType() == daObjCarry_c::TYPE_IRON_BALL && VECSquareDistance(&((daObjCarry_c*)i_ball)->current.pos, &((daObjYIblltray_c*)i_tray)->mInBallPos) < 900.0f) @@ -224,7 +224,7 @@ static fopAc_ac_c* searchNearIronball(void* i_ball, void* i_tray) { } static fopAc_ac_c* searchNearBackTrayIronball(void* i_ball, void* i_tray) { - if (i_ball != NULL && fopAcM_IsActor(i_ball) && fopAcM_GetProfName(i_ball) == PROC_Obj_Carry && + if (i_ball != NULL && fopAcM_IsActor(i_ball) && fopAcM_GetProfName(i_ball) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_ball)->getType() == daObjCarry_c::TYPE_IRON_BALL && VECSquareDistance(&((daObjCarry_c*)i_ball)->current.pos, &((daObjYIblltray_c*)i_tray)->mBackPos) < 900.0f) @@ -581,18 +581,18 @@ static actor_method_class daObjYIblltray_METHODS = { }; actor_process_profile_definition g_profile_Obj_YIblltray = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_YIblltray, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjYIblltray_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 667, // mPriority - &daObjYIblltray_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_YIblltray_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjYIblltray_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_YIblltray_e, + /* Actor SubMtd */ &daObjYIblltray_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp index da9f2efe235..a725b4bdf82 100644 --- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp +++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp @@ -311,18 +311,18 @@ static actor_method_class l_daLv6ChangeGate_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6ChgGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6ChgGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6ChangeGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 626, // mPriority - &l_daLv6ChangeGate_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6ChgGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6ChangeGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6ChgGate_e, + /* Actor SubMtd */ &l_daLv6ChangeGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp index bb3c4cf0151..ae0828e2481 100644 --- a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp +++ b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp @@ -194,18 +194,18 @@ static actor_method_class l_daLv6FurikoTrap_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6FuriTrap = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6FuriTrap, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6FurikoTrap_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 627, // mPriority - &l_daLv6FurikoTrap_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6FuriTrap_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6FurikoTrap_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6FuriTrap_e, + /* Actor SubMtd */ &l_daLv6FurikoTrap_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6Lblock.cpp b/src/d/actor/d_a_obj_lv6Lblock.cpp index 7d18d28af3e..dbb701b0b1c 100644 --- a/src/d/actor/d_a_obj_lv6Lblock.cpp +++ b/src/d/actor/d_a_obj_lv6Lblock.cpp @@ -180,18 +180,18 @@ static actor_method_class l_daLv6Lblock_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6Lblock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6Lblock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6Lblock_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 625, // mPriority - &l_daLv6Lblock_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6Lblock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6Lblock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6Lblock_e, + /* Actor SubMtd */ &l_daLv6Lblock_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index c90472918bc..e269bf8763f 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -323,18 +323,18 @@ static actor_method_class l_daLv6SwGate_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6SwGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6SwGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6SwGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 624, // mPriority - &l_daLv6SwGate_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6SwGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6SwGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6SwGate_e, + /* Actor SubMtd */ &l_daLv6SwGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6SzGate.cpp b/src/d/actor/d_a_obj_lv6SzGate.cpp index 2ac61affec7..256fa3f800a 100644 --- a/src/d/actor/d_a_obj_lv6SzGate.cpp +++ b/src/d/actor/d_a_obj_lv6SzGate.cpp @@ -257,18 +257,18 @@ static actor_method_class l_daLv6SzGate_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6SzGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6SzGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6SzGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 628, // mPriority - &l_daLv6SzGate_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6SzGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6SzGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6SzGate_e, + /* Actor SubMtd */ &l_daLv6SzGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6Tenbin.cpp b/src/d/actor/d_a_obj_lv6Tenbin.cpp index 0e04c362bfa..54f8036183b 100644 --- a/src/d/actor/d_a_obj_lv6Tenbin.cpp +++ b/src/d/actor/d_a_obj_lv6Tenbin.cpp @@ -157,25 +157,25 @@ void daTenbin_c::rideCallBackRight(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* UNUSED(i_dBgW); daTenbin_c* i_tenbin = (daTenbin_c*)i_act1; daPy_py_c* player = dComIfGp_getLinkPlayer(); - if (fopAcM_GetName(i_act2) == PROC_SPINNER) { + if (fopAcM_GetName(i_act2) == fpcNm_SPINNER_e) { if (player->checkSpinnerRide()) { i_tenbin->field_0x5B2 += (u16)2; } } - if (fopAcM_GetName(i_act2) == PROC_ALINK && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) { + if (fopAcM_GetName(i_act2) == fpcNm_ALINK_e && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) { i_tenbin->field_0x5B2 += (u16)2; if (player->checkBootsOrArmorHeavy()) { i_tenbin->field_0x5B2 += (u16)60000; } if (player->getGrabActorID() != -1) { fopAc_ac_c* found = fopAcM_SearchByID(player->getGrabActorID()); - if (fopAcM_GetName(found) == PROC_CSTATUE) { + if (fopAcM_GetName(found) == fpcNm_CSTATUE_e) { i_tenbin->field_0x5B2++; i_tenbin->field_0x650 = fopAcM_GetID(found); } } } - if (fopAcM_GetName(i_act2) == PROC_CSTATUE) { + if (fopAcM_GetName(i_act2) == fpcNm_CSTATUE_e) { daCstatue_c* i_statue = (daCstatue_c*)i_act2; if (i_statue->checkNormalType()) { i_tenbin->field_0x5B2 += (u16)4; @@ -189,25 +189,25 @@ void daTenbin_c::rideCallBackLeft(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* UNUSED(i_dBgW); daTenbin_c* i_tenbin = (daTenbin_c*)i_act1; daPy_py_c* player = dComIfGp_getLinkPlayer(); - if (fopAcM_GetName(i_act2) == PROC_SPINNER) { + if (fopAcM_GetName(i_act2) == fpcNm_SPINNER_e) { if (player->checkSpinnerRide()) { i_tenbin->field_0x5B4 += (u16)2; } } - if (fopAcM_GetName(i_act2) == PROC_ALINK && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) { + if (fopAcM_GetName(i_act2) == fpcNm_ALINK_e && dComIfGp_checkPlayerStatus0(0, 0x100) == 0) { i_tenbin->field_0x5B4 += (u16)2; if (player->checkEquipHeavyBoots()) { i_tenbin->field_0x5B4 += (u16)60000; } if (player->getGrabActorID() != -1) { fopAc_ac_c* found = fopAcM_SearchByID(player->getGrabActorID()); - if (fopAcM_GetName(found) == PROC_CSTATUE) { + if (fopAcM_GetName(found) == fpcNm_CSTATUE_e) { i_tenbin->field_0x5B4++; i_tenbin->field_0x650 = fopAcM_GetID(found); } } } - if (fopAcM_GetName(i_act2) == PROC_CSTATUE) { + if (fopAcM_GetName(i_act2) == fpcNm_CSTATUE_e) { daCstatue_c* i_statue = (daCstatue_c*)i_act2; if (i_statue->checkNormalType()) { i_tenbin->field_0x5B4 += (u16)4; @@ -355,18 +355,18 @@ static actor_method_class l_daTenbin_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6Tenbin = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6Tenbin, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTenbin_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 623, // mPriority - &l_daTenbin_Method, // sub_method - 0x00060100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6Tenbin_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTenbin_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6Tenbin_e, + /* Actor SubMtd */ &l_daTenbin_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6TogeRoll.cpp b/src/d/actor/d_a_obj_lv6TogeRoll.cpp index 2ee3dbd3340..386a9e5ea0a 100644 --- a/src/d/actor/d_a_obj_lv6TogeRoll.cpp +++ b/src/d/actor/d_a_obj_lv6TogeRoll.cpp @@ -152,7 +152,7 @@ int daTogeRoll_c::Execute(Mtx** i_mtx) { bool bVar1 = true; if (hit_actor != NULL) { - if (fopAcM_GetName(hit_actor) == PROC_ALINK && gobj->GetAtType() & 2 && field_0x1158) { + if (fopAcM_GetName(hit_actor) == fpcNm_ALINK_e && gobj->GetAtType() & 2 && field_0x1158) { bVar1 = false; } if (bVar1) { @@ -210,7 +210,7 @@ void daTogeRoll_c::moveTogeRoll() { for (int i = 0; i < 8; i++) { if (mSph[i].ChkCoHit()) { fopAc_ac_c* hit_actor = dCc_GetAc(mSph[i].GetCoHitObj()->GetAc()); - if (hit_actor != NULL && fopAcM_GetName(hit_actor) == PROC_CSTATUE) { + if (hit_actor != NULL && fopAcM_GetName(hit_actor) == fpcNm_CSTATUE_e) { field_0x5e0 = hit_actor->current.pos; cXyz pos1 = current.pos - hit_actor->current.pos; cXyz pos2 = current.pos - field_0x5b0; @@ -439,18 +439,18 @@ static actor_method_class l_daTogeRoll_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6TogeRoll = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6TogeRoll, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTogeRoll_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 621, // mPriority - &l_daTogeRoll_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6TogeRoll_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTogeRoll_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6TogeRoll_e, + /* Actor SubMtd */ &l_daTogeRoll_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6TogeTrap.cpp b/src/d/actor/d_a_obj_lv6TogeTrap.cpp index 9cd5e04f809..24e41124bf7 100644 --- a/src/d/actor/d_a_obj_lv6TogeTrap.cpp +++ b/src/d/actor/d_a_obj_lv6TogeTrap.cpp @@ -253,7 +253,7 @@ int daLv6TogeTrap_c::create() { } void* daLv6TogeTrap_c::searchSekizoAct(void* i_actor, void* i_data) { - if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == PROC_CSTATUE) { + if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == fpcNm_CSTATUE_e) { return i_actor; } @@ -270,7 +270,7 @@ int daLv6TogeTrap_c::Execute(Mtx** param_0) { u8 var_r26 = TRUE; if (hitactor != NULL) { - if (fopAcM_GetName(hitactor) == PROC_ALINK && (mCcSph.GetTgHitGObj()->GetAtType() & AT_TYPE_NORMAL_SWORD) && field_0x8d0 != 0) { + if (fopAcM_GetName(hitactor) == fpcNm_ALINK_e && (mCcSph.GetTgHitGObj()->GetAtType() & AT_TYPE_NORMAL_SWORD) && field_0x8d0 != 0) { var_r26 = FALSE; } @@ -357,7 +357,7 @@ void daLv6TogeTrap_c::moveLift() { void daLv6TogeTrap_c::executeType1() { if (field_0x60b == 0 && mCcSph.ChkCoHit()) { fopAc_ac_c* co_hitactor = mCcSph.GetCoHitAc(); - if (co_hitactor != NULL && fopAcM_GetProfName(co_hitactor) == PROC_CSTATUE) { + if (co_hitactor != NULL && fopAcM_GetProfName(co_hitactor) == fpcNm_CSTATUE_e) { cXyz sp14 = current.pos - co_hitactor->current.pos; cXyz sp8 = current.pos - field_0x5b0; @@ -515,7 +515,7 @@ void daLv6TogeTrap_c::executeType2() { if (mCcSph.ChkCoHit()) { fopAc_ac_c* co_hitactor = mCcSph.GetCoHitAc(); - if (co_hitactor != NULL && fopAcM_GetProfName(co_hitactor) == PROC_CSTATUE) { + if (co_hitactor != NULL && fopAcM_GetProfName(co_hitactor) == fpcNm_CSTATUE_e) { cXyz sp28 = current.pos - co_hitactor->current.pos; cXyz sp1C = current.pos - field_0x5b0; @@ -642,7 +642,7 @@ void daLv6TogeTrap_c::init_modeRotate() { void daLv6TogeTrap_c::modeRotate() { if (mCcSph.ChkCoHit()) { fopAc_ac_c* co_hitactor = mCcSph.GetCoHitAc(); - if (co_hitactor != NULL && fopAcM_GetProfName(co_hitactor) == PROC_CSTATUE) { + if (co_hitactor != NULL && fopAcM_GetProfName(co_hitactor) == fpcNm_CSTATUE_e) { mRotateDirection *= -1; } } @@ -773,18 +773,18 @@ static actor_method_class l_daLv6TogeTrap_Method = { }; actor_process_profile_definition g_profile_Obj_Lv6TogeTrap = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6TogeTrap, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6TogeTrap_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 622, // mPriority - &l_daLv6TogeTrap_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6TogeTrap_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6TogeTrap_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6TogeTrap_e, + /* Actor SubMtd */ &l_daLv6TogeTrap_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp index 2945ce8fcea..8bb62525cb4 100644 --- a/src/d/actor/d_a_obj_lv6bemos.cpp +++ b/src/d/actor/d_a_obj_lv6bemos.cpp @@ -416,18 +416,18 @@ static actor_method_class daObjL6Bm_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv6bemos = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6bemos, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjL6Bm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 630, // mPriority - &daObjL6Bm_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6bemos_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjL6Bm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6bemos_e, + /* Actor SubMtd */ &daObjL6Bm_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index 134c3fa0424..40c7dce59bc 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -400,7 +400,7 @@ void daObjLv6Bm_c::action() { if (field_0x87c.ChkTgHit()) { hitObj = field_0x87c.GetTgHitObj(); if (hitObj != NULL && hitObj->ChkAtType(AT_TYPE_CSTATUE_SWING)) { - if (fopAcM_GetName(field_0x87c.GetTgHitAc()) == PROC_CSTATUE) { + if (fopAcM_GetName(field_0x87c.GetTgHitAc()) == fpcNm_CSTATUE_e) { for (int i = 0; i < 3; i++) { dComIfGp_particle_set(l_particle_id[i], ¤t.pos, NULL, &scale, 0xFF, NULL, -1, NULL, NULL, NULL); } @@ -1176,18 +1176,18 @@ static actor_method_class daObjLv6Bm_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv6bemos2 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6bemos2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv6Bm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 631, // mPriority - &daObjLv6Bm_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6bemos2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv6Bm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6bemos2_e, + /* Actor SubMtd */ &daObjLv6Bm_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp index c123578767b..1d81549d6af 100644 --- a/src/d/actor/d_a_obj_lv6egate.cpp +++ b/src/d/actor/d_a_obj_lv6egate.cpp @@ -235,18 +235,18 @@ static actor_method_class daObjLv6EGate_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv6EGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6EGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv6EGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 668, // mPriority - &daObjLv6EGate_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6EGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv6EGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6EGate_e, + /* Actor SubMtd */ &daObjLv6EGate_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6elevta.cpp b/src/d/actor/d_a_obj_lv6elevta.cpp index 97495730e09..a4126f02132 100644 --- a/src/d/actor/d_a_obj_lv6elevta.cpp +++ b/src/d/actor/d_a_obj_lv6elevta.cpp @@ -87,7 +87,7 @@ int daObjLv6ElevtA_c::Create() { static void* searchObjLv6SwTurn(void* i_turn, void* i_elevta) { if (i_turn != NULL && fopAcM_IsActor(i_turn) && - fopAcM_GetProfName(i_turn) == PROC_Obj_Lv6SwTurn) + fopAcM_GetProfName(i_turn) == fpcNm_Obj_Lv6SwTurn_e) { daObjLv6SwTurn_c* this_turn = (daObjLv6SwTurn_c*)i_turn; daObjLv6ElevtA_c* this_elevta = (daObjLv6ElevtA_c*)i_elevta; @@ -272,18 +272,18 @@ static actor_method_class daObjLv6ElevtA_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv6ElevtA = { - fpcLy_CURRENT_e, // mLayerID - 2, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6ElevtA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv6ElevtA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 669, // mPriority - &daObjLv6ElevtA_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6ElevtA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv6ElevtA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6ElevtA_e, + /* Actor SubMtd */ &daObjLv6ElevtA_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index c3fec295ae5..d512118bb56 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -344,18 +344,18 @@ static actor_method_class daObjLv6SwTurn_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv6SwTurn = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6SwTurn, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv6SwTurn_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 15, // mPriority - &daObjLv6SwTurn_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv6SwTurn_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv6SwTurn_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv6SwTurn_e, + /* Actor SubMtd */ &daObjLv6SwTurn_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv7BsGate.cpp b/src/d/actor/d_a_obj_lv7BsGate.cpp index a3335f2bd18..811b301f819 100644 --- a/src/d/actor/d_a_obj_lv7BsGate.cpp +++ b/src/d/actor/d_a_obj_lv7BsGate.cpp @@ -208,18 +208,18 @@ static actor_method_class l_daLv7BsGate_Method = { }; actor_process_profile_definition g_profile_Obj_Lv7BsGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv7BsGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv7BsGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 642, // mPriority - &l_daLv7BsGate_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv7BsGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv7BsGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv7BsGate_e, + /* Actor SubMtd */ &l_daLv7BsGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv7PropellerY.cpp b/src/d/actor/d_a_obj_lv7PropellerY.cpp index c1458bb9e05..f7933b263b6 100644 --- a/src/d/actor/d_a_obj_lv7PropellerY.cpp +++ b/src/d/actor/d_a_obj_lv7PropellerY.cpp @@ -298,18 +298,18 @@ static actor_method_class l_daPropY_Method = { }; actor_process_profile_definition g_profile_Obj_Lv7PropY = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv7PropY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPropY_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 641, // mPriority - &l_daPropY_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv7PropY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPropY_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv7PropY_e, + /* Actor SubMtd */ &l_daPropY_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp index 6d4b35cec5b..7c84bd1d0a7 100644 --- a/src/d/actor/d_a_obj_lv7bridge.cpp +++ b/src/d/actor/d_a_obj_lv7bridge.cpp @@ -36,7 +36,7 @@ static void* searchSwSpinner(void* i_actor, void* i_data) { fopAc_ac_c* swspinner = (fopAc_ac_c*)i_actor; fopAc_ac_c* brg = (fopAc_ac_c*)i_data; - if (swspinner != NULL && fopAcM_IsActor(swspinner) && fopAcM_GetProfName(swspinner) == PROC_Obj_SwSpinner) { + if (swspinner != NULL && fopAcM_IsActor(swspinner) && fopAcM_GetProfName(swspinner) == fpcNm_Obj_SwSpinner_e) { if (((daObjLv7Brg_c*)brg)->getSwbit() == ((daObjSwSpinner_c*)swspinner)->getSwbit()) { return swspinner; } @@ -474,18 +474,18 @@ static actor_method_class daObjLv7Brg_METHODS = { }; actor_process_profile_definition g_profile_Obj_Lv7Bridge = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv7Bridge, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjLv7Brg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 566, // mPriority - &daObjLv7Brg_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv7Bridge_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjLv7Brg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv7Bridge_e, + /* Actor SubMtd */ &daObjLv7Brg_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp index f74ca42dc20..557a39aa322 100644 --- a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp +++ b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp @@ -212,18 +212,18 @@ static actor_method_class l_daKekaiTrap_Method = { }; actor_process_profile_definition g_profile_Obj_Lv8KekkaiTrap = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv8KekkaiTrap, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daKekaiTrap_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 644, // mPriority - &l_daKekaiTrap_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv8KekkaiTrap_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daKekaiTrap_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv8KekkaiTrap_e, + /* Actor SubMtd */ &l_daKekaiTrap_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv8Lift.cpp b/src/d/actor/d_a_obj_lv8Lift.cpp index 4542c6f41e2..4f475a626cd 100644 --- a/src/d/actor/d_a_obj_lv8Lift.cpp +++ b/src/d/actor/d_a_obj_lv8Lift.cpp @@ -129,7 +129,7 @@ void daL8Lift_c::lightSet() { } void daL8Lift_c::rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) { - if (fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { ((daL8Lift_c*)i_this)->mPlayerRide = true; } } @@ -445,18 +445,18 @@ static actor_method_class l_daL8Lift_Method = { }; actor_process_profile_definition g_profile_Obj_Lv8Lift = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv8Lift, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daL8Lift_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 645, // mPriority - &l_daL8Lift_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv8Lift_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daL8Lift_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv8Lift_e, + /* Actor SubMtd */ &l_daL8Lift_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv8OptiLift.cpp b/src/d/actor/d_a_obj_lv8OptiLift.cpp index b8a040c6150..a8610989a7f 100644 --- a/src/d/actor/d_a_obj_lv8OptiLift.cpp +++ b/src/d/actor/d_a_obj_lv8OptiLift.cpp @@ -124,7 +124,7 @@ void daOptiLift_c::lightSet() { } void daOptiLift_c::rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) { - if (fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { ((daOptiLift_c*)i_this)->mPlayerRide = true; } } @@ -477,18 +477,18 @@ static actor_method_class l_daOptiLift_Method = { }; actor_process_profile_definition g_profile_Obj_Lv8OptiLift = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv8OptiLift, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daOptiLift_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 643, // mPriority - &l_daOptiLift_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv8OptiLift_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daOptiLift_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv8OptiLift_e, + /* Actor SubMtd */ &l_daOptiLift_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv8UdFloor.cpp b/src/d/actor/d_a_obj_lv8UdFloor.cpp index 3015e52846b..920ff92fa42 100644 --- a/src/d/actor/d_a_obj_lv8UdFloor.cpp +++ b/src/d/actor/d_a_obj_lv8UdFloor.cpp @@ -288,18 +288,18 @@ static actor_method_class l_daUdFloor_Method = { }; actor_process_profile_definition g_profile_Obj_Lv8UdFloor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv8UdFloor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daUdFloor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 646, // mPriority - &l_daUdFloor_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv8UdFloor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daUdFloor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv8UdFloor_e, + /* Actor SubMtd */ &l_daUdFloor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_lv9SwShutter.cpp b/src/d/actor/d_a_obj_lv9SwShutter.cpp index 9f49edaa40d..0a034ea6bd3 100644 --- a/src/d/actor/d_a_obj_lv9SwShutter.cpp +++ b/src/d/actor/d_a_obj_lv9SwShutter.cpp @@ -194,18 +194,18 @@ static actor_method_class l_daLv9SwShutter_Method = { }; actor_process_profile_definition g_profile_Obj_Lv9SwShutter = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv9SwShutter, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv9SwShutter_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 647, // mPriority - &l_daLv9SwShutter_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Lv9SwShutter_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv9SwShutter_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Lv9SwShutter_e, + /* Actor SubMtd */ &l_daLv9SwShutter_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_magLift.cpp b/src/d/actor/d_a_obj_magLift.cpp index 9f82a8f8c4d..6e677b5f342 100644 --- a/src/d/actor/d_a_obj_magLift.cpp +++ b/src/d/actor/d_a_obj_magLift.cpp @@ -243,18 +243,18 @@ static actor_method_class l_daMagLift_Method = { }; actor_process_profile_definition g_profile_Obj_MagLift = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MagLift, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daMagLift_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 492, // mPriority - &l_daMagLift_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MagLift_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daMagLift_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MagLift_e, + /* Actor SubMtd */ &l_daMagLift_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_magLiftRot.cpp b/src/d/actor/d_a_obj_magLiftRot.cpp index ce64f16e907..199e1e811a0 100644 --- a/src/d/actor/d_a_obj_magLiftRot.cpp +++ b/src/d/actor/d_a_obj_magLiftRot.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_magLiftRot.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #if DEBUG #include "m_Do/m_Do_hostIO.h" #endif @@ -363,18 +363,18 @@ static actor_method_class l_daMagLiftRot_Method = { }; actor_process_profile_definition g_profile_Obj_MagLiftRot = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MagLiftRot, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x00000634, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 493, // mPriority - &l_daMagLiftRot_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MagLiftRot_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x00000634, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MagLiftRot_e, + /* Actor SubMtd */ &l_daMagLiftRot_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_magne_arm.cpp b/src/d/actor/d_a_obj_magne_arm.cpp index 049323dace9..422ee5d6a4e 100644 --- a/src/d/actor/d_a_obj_magne_arm.cpp +++ b/src/d/actor/d_a_obj_magne_arm.cpp @@ -136,7 +136,7 @@ void daObjMarm_c::setBaseMtx() { } void rideCallBack(dBgW* param_0, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) { - if (fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { static_cast(i_this)->mPlayerRide = TRUE; } } @@ -347,7 +347,7 @@ cPhs_Step daObjMarm_c::phase_0() { cPhs_Step daObjMarm_c::phase_1() { cXyz scale(1.0f, 1.0f, 1.0f); - mID = fopAcM_create(PROC_Obj_MHole, 0x12FF, ¤t.pos, fopAcM_GetRoomNo(this), + mID = fopAcM_create(fpcNm_Obj_MHole_e, 0x12FF, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, &scale, -1); if (mID == fpcM_ERROR_PROCESS_ID_e) { @@ -1099,20 +1099,20 @@ static actor_method_class daObjMarm_METHODS = { }; actor_process_profile_definition g_profile_Obj_MagneArm = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MagneArm, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjMarm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 614, // mPriority - &daObjMarm_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MagneArm_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMarm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MagneArm_e, + /* Actor SubMtd */ &daObjMarm_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index d646637bbfa..faadc8953a7 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -244,18 +244,18 @@ actor_method_class l_daObj_Maki_Method = { }; actor_process_profile_definition g_profile_OBJ_MAKI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_MAKI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_maki_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 50, // mPriority - &l_daObj_Maki_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_MAKI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_maki_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_MAKI_e, + /* Actor SubMtd */ &l_daObj_Maki_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index 9c8082bb8ff..cc00bc91f4a 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -45,7 +45,7 @@ void daObjMasterSword_c::executeWait() { } if (fopAcM_checkCarryNow(this)) { - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false); + dMeter2Info_setCloth(dItemNo_WEAR_KOKIRI_e, false); fopAcM_orderMapToolEvent(this, getEventID(), 0xFF, 0xFFFF, 1, 0); } } @@ -186,9 +186,9 @@ int daObjMasterSword_c::execute() { mBrk.play(); if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[73])) { - dComIfGs_onItemFirstBit(fpcNm_ITEM_MASTER_SWORD); - dMeter2Info_setSword(fpcNm_ITEM_MASTER_SWORD, false); - dComIfGs_setSelectEquipSword(fpcNm_ITEM_MASTER_SWORD); + dComIfGs_onItemFirstBit(dItemNo_MASTER_SWORD_e); + dMeter2Info_setSword(dItemNo_MASTER_SWORD_e, false); + dComIfGs_setSelectEquipSword(dItemNo_MASTER_SWORD_e); dComIfGp_setItemLifeCount(dComIfGs_getMaxLife(), 0); dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[getFlagNo()]); @@ -245,18 +245,18 @@ static actor_method_class l_daObjMasterSword_Method = { }; actor_process_profile_definition g_profile_Obj_MasterSword = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MasterSword, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjMasterSword_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 562, // mPriority - &l_daObjMasterSword_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MasterSword_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMasterSword_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MasterSword_e, + /* Actor SubMtd */ &l_daObjMasterSword_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mato.cpp b/src/d/actor/d_a_obj_mato.cpp index 91788372f40..f45df055702 100644 --- a/src/d/actor/d_a_obj_mato.cpp +++ b/src/d/actor/d_a_obj_mato.cpp @@ -102,7 +102,7 @@ void daObjMATO_c::hit_check() { mData[i].ccStts.Move(); if (mData[i].ccCyl.ChkCoHit()) { fopAc_ac_c* a_pCoHitAc = dCc_GetAc(mData[i].ccCyl.GetCoHitObj()->GetAc()); - if (fopAcM_GetName(a_pCoHitAc) == PROC_ALINK) { + if (fopAcM_GetName(a_pCoHitAc) == fpcNm_ALINK_e) { mData[i].is_hit = TRUE; getRupee(i); setAction(&daObjMATO_c::disappear, i); @@ -139,13 +139,13 @@ void daObjMATO_c::wait(int i_no) { } static const int l_rupee_itemno_table[] = { - fpcNm_ITEM_GREEN_RUPEE, - fpcNm_ITEM_BLUE_RUPEE, - fpcNm_ITEM_YELLOW_RUPEE, - fpcNm_ITEM_RED_RUPEE, - fpcNm_ITEM_PURPLE_RUPEE, - fpcNm_ITEM_ORANGE_RUPEE, - fpcNm_ITEM_SILVER_RUPEE, + dItemNo_GREEN_RUPEE_e, + dItemNo_BLUE_RUPEE_e, + dItemNo_YELLOW_RUPEE_e, + dItemNo_RED_RUPEE_e, + dItemNo_PURPLE_RUPEE_e, + dItemNo_ORANGE_RUPEE_e, + dItemNo_SILVER_RUPEE_e, }; static const u8 l_rupee_count_table[] = { @@ -374,18 +374,18 @@ static actor_method_class l_daObjMATO_Method = { }; actor_process_profile_definition g_profile_Obj_Mato = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Mato, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjMATO_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 441, // mPriority - &l_daObjMATO_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Mato_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMATO_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Mato_e, + /* Actor SubMtd */ &l_daObjMATO_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_metalbox.cpp b/src/d/actor/d_a_obj_metalbox.cpp index c769c8af8e0..41ca6664741 100644 --- a/src/d/actor/d_a_obj_metalbox.cpp +++ b/src/d/actor/d_a_obj_metalbox.cpp @@ -107,18 +107,18 @@ static actor_method_class l_daObjMBox_Method = { }; actor_process_profile_definition g_profile_Obj_MetalBox = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MetalBox, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjMBox_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 498, // mPriority - &l_daObjMBox_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MetalBox_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMBox_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MetalBox_e, + /* Actor SubMtd */ &l_daObjMBox_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mgate.cpp b/src/d/actor/d_a_obj_mgate.cpp index e8a56dff01b..8a09785678e 100644 --- a/src/d/actor/d_a_obj_mgate.cpp +++ b/src/d/actor/d_a_obj_mgate.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" #include "d/d_lib.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static Vec const l_key_offset[2] = { {205.0f, 180.0f, 0.0f}, @@ -242,18 +242,18 @@ static actor_method_class daObjMGate_METHODS = { }; actor_process_profile_definition g_profile_Obj_MGate = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_MGate, - &g_fpcLf_Method.base, - sizeof(daObjMGate_c), - 0, - 0, - &g_fopAc_Method.base, - 452, - &daObjMGate_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MGate_e, + /* Actor SubMtd */ &daObjMGate_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp index 7c7a1a15b48..353f829a52a 100644 --- a/src/d/actor/d_a_obj_mhole.cpp +++ b/src/d/actor/d_a_obj_mhole.cpp @@ -67,7 +67,7 @@ static void* searchParentSub(void* i_magLift, void* i_mhole) { fopAc_ac_c* mag_lift = (fopAc_ac_c*)i_magLift; if (mag_lift != NULL && fopAcM_IsActor(mag_lift) && - fopAcM_GetProfName(mag_lift) == PROC_Obj_MagLift && + fopAcM_GetProfName(mag_lift) == fpcNm_Obj_MagLift_e && mag_lift->home.pos.abs(mhole->home.pos) < 10.0f) { return mag_lift; @@ -384,18 +384,18 @@ static actor_method_class l_daObjMHole_Method = { }; actor_process_profile_definition g_profile_Obj_MHole = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MHole, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjMHole_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 589, // mPriority - &l_daObjMHole_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MHole_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMHole_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MHole_e, + /* Actor SubMtd */ &l_daObjMHole_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mie.cpp b/src/d/actor/d_a_obj_mie.cpp index fb41e1edb8b..dc55c589e8f 100644 --- a/src/d/actor/d_a_obj_mie.cpp +++ b/src/d/actor/d_a_obj_mie.cpp @@ -380,7 +380,7 @@ int daObj_Mie_c::createHeapCallBack(fopAc_ac_c* a_this) { void* daObj_Mie_c::srchPouyaa(void* param_1, void* param_2) { if (fopAcM_IsActor(param_1) && param_1 != param_2 && - fopAcM_GetName(param_1) == PROC_NPC_POUYA && + fopAcM_GetName(param_1) == fpcNm_NPC_POUYA_e && static_cast(param_1)->getType() == 1) { return param_1; @@ -521,18 +521,18 @@ static actor_method_class daObj_Mie_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_MIE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_MIE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Mie_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 86, // mPriority - &daObj_Mie_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_MIE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Mie_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_MIE_e, + /* Actor SubMtd */ &daObj_Mie_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp index 91076e19a72..9c17d8a94c9 100644 --- a/src/d/actor/d_a_obj_mirror_6pole.cpp +++ b/src/d/actor/d_a_obj_mirror_6pole.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mirror_6pole.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" static char* l_arcName = "MR-6Pole"; @@ -174,18 +174,18 @@ static actor_method_class l_daObjMirror6Pole_Method = { }; actor_process_profile_definition g_profile_Obj_Mirror6Pole = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Mirror6Pole, - &g_fpcLf_Method.base, - sizeof(daObjMirror6Pole_c), - 0, - 0, - &g_fopAc_Method.base, - 682, - &l_daObjMirror6Pole_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Mirror6Pole_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMirror6Pole_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Mirror6Pole_e, + /* Actor SubMtd */ &l_daObjMirror6Pole_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mirror_chain.cpp b/src/d/actor/d_a_obj_mirror_chain.cpp index 83285c0c804..cd35f7450cd 100644 --- a/src/d/actor/d_a_obj_mirror_chain.cpp +++ b/src/d/actor/d_a_obj_mirror_chain.cpp @@ -505,18 +505,18 @@ static actor_method_class l_daObjMirrorChain_Method = { }; actor_process_profile_definition g_profile_Obj_MirrorChain = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_MirrorChain, - &g_fpcLf_Method.base, - sizeof(daObjMirrorChain_c), - 0, - 0, - &g_fopAc_Method.base, - 0x2A9, - &l_daObjMirrorChain_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MirrorChain_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMirrorChain_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MirrorChain_e, + /* Actor SubMtd */ &l_daObjMirrorChain_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mirror_sand.cpp b/src/d/actor/d_a_obj_mirror_sand.cpp index 112d2f69c0c..d8b21299c61 100644 --- a/src/d/actor/d_a_obj_mirror_sand.cpp +++ b/src/d/actor/d_a_obj_mirror_sand.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mirror_sand.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName = "MR-Sand"; @@ -170,18 +170,18 @@ static actor_method_class l_daObjMirrorSand_Method = { }; actor_process_profile_definition g_profile_Obj_MirrorSand = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_MirrorSand, - &g_fpcLf_Method.base, - sizeof(daObjMirrorSand_c), - 0, - 0, - &g_fopAc_Method.base, - 679, - &l_daObjMirrorSand_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MirrorSand_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMirrorSand_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MirrorSand_e, + /* Actor SubMtd */ &l_daObjMirrorSand_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mirror_screw.cpp b/src/d/actor/d_a_obj_mirror_screw.cpp index eafd4740e24..4d8432f1c4c 100644 --- a/src/d/actor/d_a_obj_mirror_screw.cpp +++ b/src/d/actor/d_a_obj_mirror_screw.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_mirror_screw.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char const* l_arcName = "MR-Screw"; @@ -192,7 +192,7 @@ int daObjMirrorScrew_c::Create() { initBaseMtx(); cXyz sw_pos(current.pos.x, current.pos.y + 2636.121f, current.pos.z); - fopAcM_createChild(PROC_Obj_SwSpinner, fopAcM_GetID(this), getSwitchNo() << 8, &sw_pos, + fopAcM_createChild(fpcNm_Obj_SwSpinner_e, fopAcM_GetID(this), getSwitchNo() << 8, &sw_pos, fopAcM_GetRoomNo(this), NULL, NULL, -1, NULL); mpSwSpinner = NULL; @@ -208,27 +208,27 @@ int daObjMirrorScrew_c::Create() { int daObjMirrorScrew_c::Execute(Mtx** i_mtxP) { if (mpSwSpinner == NULL) { - mpSwSpinner = static_cast(fopAcM_SearchByName(PROC_Obj_SwSpinner)); + mpSwSpinner = static_cast(fopAcM_SearchByName(fpcNm_Obj_SwSpinner_e)); } if (mpSpPath == NULL) { - mpSpPath = static_cast(fopAcM_SearchByName(PROC_Tag_Sppath)); + mpSpPath = static_cast(fopAcM_SearchByName(fpcNm_Tag_Sppath_e)); } if (mpChain == NULL) { - mpChain = static_cast(fopAcM_SearchByName(PROC_Obj_MirrorChain)); + mpChain = static_cast(fopAcM_SearchByName(fpcNm_Obj_MirrorChain_e)); } if (mpTable == NULL) { - mpTable = static_cast(fopAcM_SearchByName(PROC_Obj_MirrorTable)); + mpTable = static_cast(fopAcM_SearchByName(fpcNm_Obj_MirrorTable_e)); } if (mp6Pole == NULL) { - mp6Pole = static_cast(fopAcM_SearchByName(PROC_Obj_Mirror6Pole)); + mp6Pole = static_cast(fopAcM_SearchByName(fpcNm_Obj_Mirror6Pole_e)); } if (mpSand == NULL) { - mpSand = static_cast(fopAcM_SearchByName(PROC_Obj_MirrorSand)); + mpSand = static_cast(fopAcM_SearchByName(fpcNm_Obj_MirrorSand_e)); } callExecute(); @@ -259,18 +259,18 @@ static actor_method_class l_daObjMirrorScrew_Method = { }; actor_process_profile_definition g_profile_Obj_MirrorScrew = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_MirrorScrew, - &g_fpcLf_Method.base, - sizeof(daObjMirrorScrew_c), - 0, - 0, - &g_fopAc_Method.base, - 0x2A6, - &l_daObjMirrorScrew_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MirrorScrew_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMirrorScrew_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MirrorScrew_e, + /* Actor SubMtd */ &l_daObjMirrorScrew_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp index 2ccb112a266..257a9c8b18e 100644 --- a/src/d/actor/d_a_obj_mirror_table.cpp +++ b/src/d/actor/d_a_obj_mirror_table.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_mirror.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static char const* l_arcName = "MR-Table"; @@ -202,13 +202,13 @@ void daObjMirrorTable_c::checkOnPanel() { } static void rideCallBack1(dBgW* i_bgW, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) { - if (fopAcM_GetName(i_actor) == PROC_ALINK) { + if (fopAcM_GetName(i_actor) == fpcNm_ALINK_e) { static_cast(i_this)->checkOnPanel(); } } static void rideCallBack2(dBgW* i_bgW, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) { - if (fopAcM_GetName(i_actor) == PROC_ALINK) { + if (fopAcM_GetName(i_actor) == fpcNm_ALINK_e) { static_cast(i_this)->field_0x875 = 15; } } @@ -443,7 +443,7 @@ void daObjMirrorTable_c::create_init() { cXyz pos(1760.0f, 4714.3f, -20624.0f); csXyz angle(0, 0x8000, 0); cXyz scale(1.35f, 1.35f, 1.0f); - fopAcM_create(PROC_MIRROR, daMirror_c::getMirrorRoomPrm(), + fopAcM_create(fpcNm_MIRROR_e, daMirror_c::getMirrorRoomPrm(), &pos, current.roomNo, &angle, &scale, 0xff); } } @@ -463,18 +463,18 @@ static actor_method_class l_daObjMirrorTable_Method = { }; actor_process_profile_definition g_profile_Obj_MirrorTable = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_MirrorTable, - &g_fpcLf_Method.base, - sizeof(daObjMirrorTable_c), - 0, - 0, - &g_fopAc_Method.base, - 0x2A8, - &l_daObjMirrorTable_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MirrorTable_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMirrorTable_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MirrorTable_e, + /* Actor SubMtd */ &l_daObjMirrorTable_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 2c19743070d..a63568b768e 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -162,7 +162,7 @@ void daObjMovebox::Bgc_c::gnd_pos(const daObjMovebox::Act_c* i_actor, #endif if (field_0x0[i] > var_f31) { fopAc_ac_c* bg_actor = dComIfG_Bgsp().GetActorPointer(M_gnd_work[i]); - if (bg_actor == NULL || fopAcM_GetName(bg_actor) != PROC_Obj_Movebox || + if (bg_actor == NULL || fopAcM_GetName(bg_actor) != fpcNm_Obj_Movebox_e || ((daObjMovebox::Act_c*)bg_actor)->field_0x5ac != 2) { var_f31 = field_0x0[i]; @@ -660,7 +660,7 @@ void daObjMovebox::Act_c::RideCallBack(dBgW* i_bgw, fopAc_ac_c* i_actor, fopAc_a var_f29 = i_rideActor->current.pos.x - a_this->current.pos.x; var_f28 = i_rideActor->current.pos.z - a_this->current.pos.z; - if (fopAcM_GetProfName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetProfName(i_rideActor) == fpcNm_ALINK_e) { var_f30 = a_this->attr().mPlayerGravity; var_f27 = a_this->attr().field_0x74 * a_this->attr().mPlayerTiltPower; } else { @@ -684,7 +684,7 @@ void daObjMovebox::Act_c::RideCallBack(dBgW* i_bgw, fopAc_ac_c* i_actor, fopAc_a a_this->field_0x8c0 += var_f27 * var_f29; a_this->field_0x8c4 += var_f27 * var_f28; - } else if (fopAcM_GetProfName(i_rideActor) == PROC_Obj_Movebox) { + } else if (fopAcM_GetProfName(i_rideActor) == fpcNm_Obj_Movebox_e) { cLib_onBit(a_this->mBgc.mState, daObjMovebox::Bgc_c::STATE_40_e); } @@ -1203,12 +1203,12 @@ int daObjMovebox::Act_c::Execute(Mtx** param_0) { u32 params; daObjBurnBox_c::make_prm_burnBox(¶ms, 1); - fopAcM_createChild(PROC_Obj_BurnBox, fopAcM_GetID(this), params, ¤t.pos, + fopAcM_createChild(fpcNm_Obj_BurnBox_e, fopAcM_GetID(this), params, ¤t.pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, NULL); field_0x908 = 5; } else if (hit_obj->ChkAtType(AT_TYPE_BOMB) || hit_obj->ChkAtType(AT_TYPE_IRON_BALL)) { fopAc_ac_c* hit_ac = mCcCyl.GetTgHitAc(); - if (hit_ac != NULL && fopAcM_GetProfName(hit_ac) != PROC_Obj_Carry) { + if (hit_ac != NULL && fopAcM_GetProfName(hit_ac) != fpcNm_Obj_Carry_e) { cXyz sp48(current.pos); J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd"); @@ -1413,18 +1413,18 @@ static actor_method_class Mthd_Table = { }; // namespace daObjMovebox actor_process_profile_definition g_profile_Obj_Movebox = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Movebox, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjMovebox::Act_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 17, // mPriority - &daObjMovebox::Mthd_Table, // sub_method - 0x00040504, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Movebox_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjMovebox::Act_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Movebox_e, + /* Actor SubMtd */ &daObjMovebox::Mthd_Table, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_FREEZE_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index d6ffe7692a3..7514f4cc02c 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -38,11 +38,11 @@ void daObj_Msima_HIO_c::genMessage(JORMContext* context) { #endif static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* a_this, fopAc_ac_c* param_3) { - if (fopAcM_GetName(param_3) == PROC_ALINK || fopAcM_GetName(param_3) == PROC_E_GOB || - fopAcM_GetName(param_3) == PROC_B_ZANT) + if (fopAcM_GetName(param_3) == fpcNm_ALINK_e || fopAcM_GetName(param_3) == fpcNm_E_GOB_e || + fopAcM_GetName(param_3) == fpcNm_B_ZANT_e) { int idx = 0; - if (fopAcM_GetName(param_3) != PROC_ALINK) { + if (fopAcM_GetName(param_3) != fpcNm_ALINK_e) { idx = 1; } @@ -487,7 +487,7 @@ static int daObj_Msima_Create(fopAc_ac_c* a_this) { a_this->shape_angle.y = 0x2000; daObj_Msima_Execute(i_this); cXyz cStack_2c(0.0f, 0.0f, 0.0f); - fopAcM_createChild(PROC_OBJ_MYOGAN, fopAcM_GetID(a_this), 0, &cStack_2c, + fopAcM_createChild(fpcNm_OBJ_MYOGAN_e, fopAcM_GetID(a_this), 0, &cStack_2c, fopAcM_GetRoomNo(a_this), 0, 0, -1, 0); } else { for (int i = 0; i < 4; i++) { @@ -509,20 +509,20 @@ static actor_method_class l_daObj_Msima_Method = { }; actor_process_profile_definition g_profile_OBJ_MSIMA = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_MSIMA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_msima_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 51, // mPriority - &l_daObj_Msima_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_MSIMA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_msima_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_MSIMA_e, + /* Actor SubMtd */ &l_daObj_Msima_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_mvstair.cpp b/src/d/actor/d_a_obj_mvstair.cpp index e2525d22a77..330695d16fa 100644 --- a/src/d/actor/d_a_obj_mvstair.cpp +++ b/src/d/actor/d_a_obj_mvstair.cpp @@ -463,18 +463,18 @@ static actor_method_class daObjStair_METHODS = { }; actor_process_profile_definition g_profile_Obj_MvStair = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_MvStair, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjStair_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 25, // mPriority - &daObjStair_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_MvStair_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjStair_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_MvStair_e, + /* Actor SubMtd */ &daObjStair_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_myogan.cpp b/src/d/actor/d_a_obj_myogan.cpp index 2c7e7ee1919..3a460369ea4 100644 --- a/src/d/actor/d_a_obj_myogan.cpp +++ b/src/d/actor/d_a_obj_myogan.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daObj_Myogan_HIO_c::daObj_Myogan_HIO_c() { field_0x4 = -1; @@ -168,18 +168,18 @@ static actor_method_class l_daObj_Myogan_Method = { }; actor_process_profile_definition g_profile_OBJ_MYOGAN = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_MYOGAN, - &g_fpcLf_Method.base, - sizeof(obj_myogan_class), - 0, - 0, - &g_fopAc_Method.base, - 52, - &l_daObj_Myogan_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_MYOGAN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_myogan_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_MYOGAN_e, + /* Actor SubMtd */ &l_daObj_Myogan_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_nagaisu.cpp b/src/d/actor/d_a_obj_nagaisu.cpp index 0537544cf52..4adc674ad6a 100644 --- a/src/d/actor/d_a_obj_nagaisu.cpp +++ b/src/d/actor/d_a_obj_nagaisu.cpp @@ -321,18 +321,18 @@ static actor_method_class daObjNagaisu_METHODS = { }; actor_process_profile_definition g_profile_Obj_Nagaisu = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Nagaisu, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjNagaisu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 739, // mPriority - &daObjNagaisu_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Nagaisu_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjNagaisu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Nagaisu_e, + /* Actor SubMtd */ &daObjNagaisu_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_nameplate.cpp b/src/d/actor/d_a_obj_nameplate.cpp index 586d6451a1b..e72cc6553c4 100644 --- a/src/d/actor/d_a_obj_nameplate.cpp +++ b/src/d/actor/d_a_obj_nameplate.cpp @@ -307,18 +307,18 @@ static actor_method_class l_daObjNameplate_Method = { }; actor_process_profile_definition g_profile_Obj_NamePlate = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_NamePlate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjNameplate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 32, // mPriority - &l_daObjNameplate_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_NamePlate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjNameplate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_NamePlate_e, + /* Actor SubMtd */ &l_daObjNameplate_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp index 26e2ede5f1b..a8dc4c4271c 100644 --- a/src/d/actor/d_a_obj_nan.cpp +++ b/src/d/actor/d_a_obj_nan.cpp @@ -313,7 +313,7 @@ void daObjNAN_c::walk() { void daObjNAN_c::bin_wait() { if (field_0x7d0 == 0) { - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); mDraw = false; field_0x7d0++; } else if (field_0x7d0 != -1 && field_0x56c != 0) { @@ -406,7 +406,7 @@ void daObjNAN_c::hook() { if (mDraw) { nan_setParticle(); } - if (!fopAcM_CheckStatus(this, 0x100000)) { + if (!fopAcM_CheckStatus(this, fopAcStts_HOOK_CARRY_NOW_e)) { setAction(&daObjNAN_c::drop); } dBgS_LinChk linkChk; @@ -538,7 +538,7 @@ void daObjNAN_c::action() { } static u8 const l_nan_itemno[2] = { - fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, + dItemNo_M_NANAFUSHI_e, dItemNo_F_NANAFUSHI_e, }; int daObjNAN_c::execute() { @@ -729,18 +729,18 @@ static actor_method_class l_daObjNAN_Method = { }; actor_process_profile_definition g_profile_Obj_Nan = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Nan, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjNAN_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 480, // mPriority - &l_daObjNAN_Method, // sub_method - 0x000C0120, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Nan_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjNAN_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Nan_e, + /* Actor SubMtd */ &l_daObjNAN_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ndoor.cpp b/src/d/actor/d_a_obj_ndoor.cpp index 053488884b2..c57cb162a78 100644 --- a/src/d/actor/d_a_obj_ndoor.cpp +++ b/src/d/actor/d_a_obj_ndoor.cpp @@ -132,18 +132,18 @@ static actor_method_class l_daObj_Ndoor_Method = { }; actor_process_profile_definition g_profile_OBJ_NDOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_NDOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_ndoor_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 76, // mPriority - &l_daObj_Ndoor_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_NDOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_ndoor_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_NDOOR_e, + /* Actor SubMtd */ &l_daObj_Ndoor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_nougu.cpp b/src/d/actor/d_a_obj_nougu.cpp index f7fcddf3d5a..ae3ee5bba9d 100644 --- a/src/d/actor/d_a_obj_nougu.cpp +++ b/src/d/actor/d_a_obj_nougu.cpp @@ -236,18 +236,18 @@ static actor_method_class daObj_Nougu_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_NOUGU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_NOUGU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Nougu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 84, // mPriority - &daObj_Nougu_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_NOUGU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Nougu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_NOUGU_e, + /* Actor SubMtd */ &daObj_Nougu_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index 7dc32dbb152..cf71f15d440 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -385,18 +385,18 @@ static actor_method_class l_daObjOCTHASHI_Method = { }; actor_process_profile_definition g_profile_OCTHASHI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OCTHASHI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjOCTHASHI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 465, // mPriority - &l_daObjOCTHASHI_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OCTHASHI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjOCTHASHI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OCTHASHI_e, + /* Actor SubMtd */ &l_daObjOCTHASHI_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp index b21f980affd..a2110168f42 100644 --- a/src/d/actor/d_a_obj_oiltubo.cpp +++ b/src/d/actor/d_a_obj_oiltubo.cpp @@ -252,7 +252,7 @@ int daObj_Oiltubo_c::wait(void* unused) { switch (mMode) { case 1: if (!eventInfo.checkCommandCatch()) { - dComIfGp_att_CatchRequest(this, fpcNm_ITEM_OIL_BOTTLE_2, 100.0f, 50.0f, -50.0f, 0x2000, 1); + dComIfGp_att_CatchRequest(this, dItemNo_OIL_BOTTLE_2_e, 100.0f, 50.0f, -50.0f, 0x2000, 1); eventInfo.onCondition(dEvtCnd_40_e); } break; @@ -291,18 +291,18 @@ static actor_method_class daObj_Oiltubo_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_OILTUBO = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_OILTUBO, - &g_fpcLf_Method.base, - sizeof(daObj_Oiltubo_c), - 0, - 0, - &g_fopAc_Method.base, - 66, - &daObj_Oiltubo_MethodTable, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_OILTUBO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Oiltubo_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_OILTUBO_e, + /* Actor SubMtd */ &daObj_Oiltubo_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_onsen.cpp b/src/d/actor/d_a_obj_onsen.cpp index ac339bb52fb..4f42e8c8da6 100644 --- a/src/d/actor/d_a_obj_onsen.cpp +++ b/src/d/actor/d_a_obj_onsen.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_onsen.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daObjOnsen_c::initBaseMtx() { mpModel[0]->setBaseScale(scale); @@ -128,18 +128,18 @@ static actor_method_class daObjOnsen_METHODS = { }; actor_process_profile_definition g_profile_Obj_Onsen = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Onsen, - &g_fpcLf_Method.base, - sizeof(daObjOnsen_c), - 0, - 0, - &g_fopAc_Method.base, - 602, - &daObjOnsen_METHODS, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Onsen_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjOnsen_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Onsen_e, + /* Actor SubMtd */ &daObjOnsen_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_onsenFire.cpp b/src/d/actor/d_a_obj_onsenFire.cpp index 44e0937896d..9adfca491d5 100644 --- a/src/d/actor/d_a_obj_onsenFire.cpp +++ b/src/d/actor/d_a_obj_onsenFire.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_onsenFire.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daObjOnsenFire_c::create() { fopAcM_ct(this, daObjOnsenFire_c); @@ -45,18 +45,18 @@ static actor_method_class l_daObjOnsenFire_Method = { }; actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_ONSEN_FIRE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjOnsenFire_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 612, // mPriority - &l_daObjOnsenFire_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_ONSEN_FIRE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjOnsenFire_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_ONSEN_FIRE_e, + /* Actor SubMtd */ &l_daObjOnsenFire_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_onsenTaru.cpp b/src/d/actor/d_a_obj_onsenTaru.cpp index cc6f4dd16ba..c83aa24b0d6 100644 --- a/src/d/actor/d_a_obj_onsenTaru.cpp +++ b/src/d/actor/d_a_obj_onsenTaru.cpp @@ -386,18 +386,18 @@ static actor_method_class l_daOnsTaru_Method = { }; actor_process_profile_definition g_profile_Obj_OnsenTaru = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_OnsenTaru, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daOnsTaru_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 510, // mPriority - &l_daOnsTaru_Method, // sub_method - 0x00040020, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_OnsenTaru_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daOnsTaru_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_OnsenTaru_e, + /* Actor SubMtd */ &l_daOnsTaru_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ornament_cloth.cpp b/src/d/actor/d_a_obj_ornament_cloth.cpp index 07c94fcd168..ef69c8f5971 100644 --- a/src/d/actor/d_a_obj_ornament_cloth.cpp +++ b/src/d/actor/d_a_obj_ornament_cloth.cpp @@ -320,18 +320,18 @@ static actor_method_class l_daObjOnCloth_Method = { }; actor_process_profile_definition g_profile_Obj_OnCloth = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_OnCloth, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjOnCloth_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 33, // mPriority - &l_daObjOnCloth_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_OnCloth_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjOnCloth_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_OnCloth_e, + /* Actor SubMtd */ &l_daObjOnCloth_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index ba07ba88dca..cffabcd90e3 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -279,18 +279,18 @@ static actor_method_class daObjPDoor_METHODS = { }; actor_process_profile_definition g_profile_Obj_PushDoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_PushDoor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjPDoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 577, // mPriority - &daObjPDoor_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_PushDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjPDoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_PushDoor_e, + /* Actor SubMtd */ &daObjPDoor_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pdtile.cpp b/src/d/actor/d_a_obj_pdtile.cpp index dde20c199ec..ee40ff31d7a 100644 --- a/src/d/actor/d_a_obj_pdtile.cpp +++ b/src/d/actor/d_a_obj_pdtile.cpp @@ -125,7 +125,7 @@ void daObjPDtile_c::setMtx() { void daObjPDtile_c::rideActor(fopAc_ac_c* param_1) { if (param_1 == daPy_getLinkPlayerActorClass() || - fopAcM_GetProfName(param_1) == PROC_B_GG) + fopAcM_GetProfName(param_1) == fpcNm_B_GG_e) { if (mType == TYPE_0) { field_0x7b0 = 200; @@ -315,7 +315,7 @@ int daObjPDtile_c::Execute(Mtx** param_1) { } if (mType == TYPE_2 || mType == TYPE_4) { field_0x610 = 4; - fopAcM_OnStatus(this, 0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } } else { field_0x7b8 = 0; @@ -523,18 +523,18 @@ static actor_method_class daObjPDtile_METHODS = { }; actor_process_profile_definition g_profile_Obj_PDtile = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_PDtile, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjPDtile_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 670, // mPriority - &daObjPDtile_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_PDtile_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjPDtile_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_PDtile_e, + /* Actor SubMtd */ &daObjPDtile_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pdwall.cpp b/src/d/actor/d_a_obj_pdwall.cpp index 444b1e0f1d1..e98db4a80cf 100644 --- a/src/d/actor/d_a_obj_pdwall.cpp +++ b/src/d/actor/d_a_obj_pdwall.cpp @@ -201,18 +201,18 @@ static actor_method_class daObjPDwall_METHODS = { }; actor_process_profile_definition g_profile_Obj_PDwall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_PDwall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjPDwall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 671, // mPriority - &daObjPDwall_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_PDwall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjPDwall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_PDwall_e, + /* Actor SubMtd */ &daObjPDwall_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index 12d8f54e3cf..762d546bc1b 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -557,18 +557,18 @@ static actor_method_class daObjPicture_METHODS = { }; actor_process_profile_definition g_profile_Obj_Picture = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Picture, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjPicture_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 742, // mPriority - &daObjPicture_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Picture_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjPicture_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Picture_e, + /* Actor SubMtd */ &daObjPicture_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp index 4640d5693cc..965b93fc4db 100644 --- a/src/d/actor/d_a_obj_pillar.cpp +++ b/src/d/actor/d_a_obj_pillar.cpp @@ -76,7 +76,7 @@ daPillar_HIO_c::daPillar_HIO_c() { static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) { daPy_py_c* player = dComIfGp_getLinkPlayer(); - if (((daPillar_c*)i_this)->mIsRollAttack && fopAcM_GetName(i_rideActor) == PROC_Obj_Carry) { + if (((daPillar_c*)i_this)->mIsRollAttack && fopAcM_GetName(i_rideActor) == fpcNm_Obj_Carry_e) { s16 var_r28 = cM_rndF(1300.0f) + 8192.0f; if (cM_rndFX(1.0f) < 0.0f) { var_r28 = -var_r28; @@ -488,18 +488,18 @@ static actor_method_class daPillar_METHODS = { }; actor_process_profile_definition g_profile_Obj_Pillar = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Pillar, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPillar_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 432, // mPriority - &daPillar_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Pillar_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPillar_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Pillar_e, + /* Actor SubMtd */ &daPillar_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pleaf.cpp b/src/d/actor/d_a_obj_pleaf.cpp index ad6f39ab2cc..b714bbd8704 100644 --- a/src/d/actor/d_a_obj_pleaf.cpp +++ b/src/d/actor/d_a_obj_pleaf.cpp @@ -179,18 +179,18 @@ static actor_method_class daObj_Pleaf_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_PLEAF = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_PLEAF, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Pleaf_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 713, // mPriority - &daObj_Pleaf_MethodTable, // sub_method - 0x44100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_PLEAF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Pleaf_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_PLEAF_e, + /* Actor SubMtd */ &daObj_Pleaf_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_poCandle.cpp b/src/d/actor/d_a_obj_poCandle.cpp index 0b477c49b03..70f914bb253 100644 --- a/src/d/actor/d_a_obj_poCandle.cpp +++ b/src/d/actor/d_a_obj_poCandle.cpp @@ -250,18 +250,18 @@ static actor_method_class l_daPoCandle_Method = { }; actor_process_profile_definition g_profile_Obj_poCandle = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_poCandle, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPoCandle_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 650, // mPriority - &l_daPoCandle_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_poCandle_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPoCandle_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_poCandle_e, + /* Actor SubMtd */ &l_daPoCandle_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp index c4ad41b2fd0..4c2f9d9ac0c 100644 --- a/src/d/actor/d_a_obj_poFire.cpp +++ b/src/d/actor/d_a_obj_poFire.cpp @@ -73,8 +73,8 @@ void daPoFire_c::setBaseMtx() { } -static u8 const itemNo[4] = {fpcNm_ITEM_POU_FIRE1, fpcNm_ITEM_POU_FIRE2, fpcNm_ITEM_POU_FIRE3, - fpcNm_ITEM_POU_FIRE4}; +static u8 const itemNo[4] = {dItemNo_POU_FIRE1_e, dItemNo_POU_FIRE2_e, dItemNo_POU_FIRE3_e, + dItemNo_POU_FIRE4_e}; int daPoFire_c::create() { fopAcM_ct(this, daPoFire_c); @@ -157,7 +157,7 @@ void* daPoFire_c::searchCandle(void* i_actor, void* i_this) { daPoFire_c* _this = static_cast(i_this); daPoCandle_c* _actor = static_cast(i_actor); if (_actor != NULL && fopAcM_IsActor(_actor) && - fopAcM_GetProfName(_actor) == PROC_Obj_poCandle && + fopAcM_GetProfName(_actor) == fpcNm_Obj_poCandle_e && _this->mActorID == ((daPoCandle_c*)_actor)->getIDNum()) { return _actor; @@ -168,7 +168,7 @@ void* daPoFire_c::searchCandle(void* i_actor, void* i_this) { void* daPoFire_c::searchFireTag(void* i_actor, void* i_this) { daPoFire_c* _this = static_cast(i_this); daTagPoFire_c* _actor = static_cast(i_actor); - if (_actor != NULL && fopAcM_IsActor(_actor) && fopAcM_GetProfName(_actor) == PROC_Tag_poFire) { + if (_actor != NULL && fopAcM_IsActor(_actor) && fopAcM_GetProfName(_actor) == fpcNm_Tag_poFire_e) { return _actor; } return NULL; @@ -438,18 +438,18 @@ static actor_method_class l_daPoFire_Method = { }; actor_process_profile_definition g_profile_Obj_poFire = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Lv4Candle, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPoFire_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 540, // mPriority - &l_daPoFire_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv4Candle_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPoFire_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv4Candle_e, + /* Actor SubMtd */ &l_daPoFire_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_poTbox.cpp b/src/d/actor/d_a_obj_poTbox.cpp index 74a4f89de37..47e63bf4b92 100644 --- a/src/d/actor/d_a_obj_poTbox.cpp +++ b/src/d/actor/d_a_obj_poTbox.cpp @@ -304,18 +304,18 @@ static actor_method_class l_daPoTbox_Method = { }; actor_process_profile_definition g_profile_Obj_poTbox = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_poTbox, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPoTbox_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 660, // mPriority - &l_daPoTbox_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_poTbox_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPoTbox_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_poTbox_e, + /* Actor SubMtd */ &l_daPoTbox_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_prop.cpp b/src/d/actor/d_a_obj_prop.cpp index 273e03b5f1c..393bd02c7e5 100644 --- a/src/d/actor/d_a_obj_prop.cpp +++ b/src/d/actor/d_a_obj_prop.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_prop.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static bool daObjProp_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); @@ -100,18 +100,18 @@ static actor_method_class daObjProp_METHODS = { }; actor_process_profile_definition g_profile_Obj_Prop = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_Prop, - &g_fpcLf_Method.base, - sizeof(daObjProp_c), - 0, - 0, - &g_fopAc_Method.base, - 737, - &daObjProp_METHODS, - 0x40000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Prop_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjProp_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Prop_e, + /* Actor SubMtd */ &daObjProp_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index 2d77fbaa4d6..ff90ed6a740 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -347,7 +347,7 @@ int daObj_Pumpkin_c::Execute() { } } else if (field_0xBAD && cM3d_IsZero(speedF) == 0 && mCyl0.ChkCoHit()) { fopAc_ac_c* actor_p = dCc_GetAc(mCyl0.GetCoHitObj()->GetAc()); - if (fopAcM_GetName(actor_p) != PROC_ALINK) { + if (fopAcM_GetName(actor_p) != fpcNm_ALINK_e) { sp_0x28 = 1; } } @@ -841,7 +841,7 @@ void daObj_Pumpkin_c::setHamonPrtcl() { void daObj_Pumpkin_c::crash() { fopAc_ac_c* actor_p = NULL; s32 reg_r30 = 0; - reg_r30 = fopAcM_SearchByName(PROC_NPC_JAGAR, &actor_p); + reg_r30 = fopAcM_SearchByName(fpcNm_NPC_JAGAR_e, &actor_p); if (reg_r30 && actor_p != NULL) { ((daNpc_Jagar_c*)actor_p)->crashPumpkin(this); } @@ -891,18 +891,18 @@ static actor_method_class daObj_Pumpkin_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_PUMPKIN = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_PUMPKIN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Pumpkin_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 716, // mPriority - &daObj_Pumpkin_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_PUMPKIN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Pumpkin_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_PUMPKIN_e, + /* Actor SubMtd */ &daObj_Pumpkin_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rcircle.cpp b/src/d/actor/d_a_obj_rcircle.cpp index 9da3f620f75..6beb12110cf 100644 --- a/src/d/actor/d_a_obj_rcircle.cpp +++ b/src/d/actor/d_a_obj_rcircle.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rcircle.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daObjRCircle_c_createHeap(fopAc_ac_c* i_this) { return static_cast(i_this)->createHeap(); @@ -123,18 +123,18 @@ static actor_method_class daObjRCircle_METHODS = { }; actor_process_profile_definition g_profile_Obj_RCircle = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_RCircle, - &g_fpcLf_Method.base, - sizeof(daObjRCircle_c), - 0, - 0, - &g_fopAc_Method.base, - 740, - &daObjRCircle_METHODS, - 0x44180, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RCircle_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjRCircle_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RCircle_e, + /* Actor SubMtd */ &daObjRCircle_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rfHole.cpp b/src/d/actor/d_a_obj_rfHole.cpp index 6433549b881..7cec9644c10 100644 --- a/src/d/actor/d_a_obj_rfHole.cpp +++ b/src/d/actor/d_a_obj_rfHole.cpp @@ -60,7 +60,7 @@ int daRfHole_c::create() { } void daRfHole_c::rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) { - if (fopAcM_GetName(param_3) == PROC_ALINK && static_cast(param_2)->playerAreaCheck()) { + if (fopAcM_GetName(param_3) == fpcNm_ALINK_e && static_cast(param_2)->playerAreaCheck()) { static_cast(param_2)->field_0x5ae = 1; } } @@ -202,18 +202,18 @@ static actor_method_class l_daRfHole_Method = { }; actor_process_profile_definition g_profile_Obj_RfHole = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_RfHole, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daRfHole_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 514, // mPriority - &l_daRfHole_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RfHole_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daRfHole_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RfHole_e, + /* Actor SubMtd */ &l_daRfHole_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index 024b545284e..f04de83044c 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -35,7 +35,7 @@ enum { }; static void* search_coach(void* i_actor, void* i_data) { - if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == PROC_NPC_COACH) + if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == fpcNm_NPC_COACH_e) { return i_actor; } @@ -879,18 +879,18 @@ static actor_method_class daObjRgate_METHODS = { }; actor_process_profile_definition g_profile_Obj_RiderGate = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_RiderGate, - &g_fpcLf_Method.base, - sizeof(daObjRgate_c), - 0, - 0, - &g_fopAc_Method.base, - 600, - &daObjRgate_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RiderGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjRgate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RiderGate_e, + /* Actor SubMtd */ &daObjRgate_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_riverrock.cpp b/src/d/actor/d_a_obj_riverrock.cpp index 23df94e9901..4b530882a11 100644 --- a/src/d/actor/d_a_obj_riverrock.cpp +++ b/src/d/actor/d_a_obj_riverrock.cpp @@ -321,18 +321,18 @@ static actor_method_class l_daObjRIVERROCK_Method = { }; actor_process_profile_definition g_profile_Obj_RIVERROCK = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_RIVERROCK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjRIVERROCK_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 472, // mPriority - &l_daObjRIVERROCK_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RIVERROCK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjRIVERROCK_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RIVERROCK_e, + /* Actor SubMtd */ &l_daObjRIVERROCK_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rock.cpp b/src/d/actor/d_a_obj_rock.cpp index 2494a2f534a..a3d16653817 100644 --- a/src/d/actor/d_a_obj_rock.cpp +++ b/src/d/actor/d_a_obj_rock.cpp @@ -201,18 +201,18 @@ static actor_method_class l_daObj_Rock_Method = { (process_method_func)daObj_Rock_Draw}; actor_process_profile_definition g_profile_OBJ_ROCK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_ROCK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_rock_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 710, // mPriority - &l_daObj_Rock_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_ROCK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_rock_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_ROCK_e, + /* Actor SubMtd */ &l_daObj_Rock_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp index 402ca74b463..17bcac9df58 100644 --- a/src/d/actor/d_a_obj_rope_bridge.cpp +++ b/src/d/actor/d_a_obj_rope_bridge.cpp @@ -638,18 +638,18 @@ static actor_method_class daObjRBridge_METHODS = { }; actor_process_profile_definition g_profile_Obj_RopeBridge = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_RopeBridge, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjRBridge_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 16, // mPriority - &daObjRBridge_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RopeBridge_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjRBridge_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RopeBridge_e, + /* Actor SubMtd */ &daObjRBridge_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rotBridge.cpp b/src/d/actor/d_a_obj_rotBridge.cpp index bee843be0fa..fb23f9f71f8 100644 --- a/src/d/actor/d_a_obj_rotBridge.cpp +++ b/src/d/actor/d_a_obj_rotBridge.cpp @@ -133,7 +133,7 @@ int daRotBridge_c::create() { } void daRotBridge_c::rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) { - if (fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { ((daRotBridge_c*)i_bgActor)->mIsPlayerRide = TRUE; } } @@ -261,18 +261,18 @@ static actor_method_class l_daRotBridge_Method = { }; actor_process_profile_definition g_profile_Obj_RotBridge = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_RotBridge, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daRotBridge_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 490, // mPriority - &l_daRotBridge_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RotBridge_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daRotBridge_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RotBridge_e, + /* Actor SubMtd */ &l_daRotBridge_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp index 72f7217102d..d74e84c3c4e 100644 --- a/src/d/actor/d_a_obj_rotTrap.cpp +++ b/src/d/actor/d_a_obj_rotTrap.cpp @@ -320,18 +320,18 @@ static actor_method_class l_daRotTrap_Method = { }; actor_process_profile_definition g_profile_Obj_RotTrap = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_RotTrap, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daRotTrap_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 525, // mPriority - &l_daRotTrap_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RotTrap_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daRotTrap_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RotTrap_e, + /* Actor SubMtd */ &l_daRotTrap_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index 1e5d6ebc698..dbbe609654e 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -178,18 +178,18 @@ static actor_method_class daObj_Roten_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_ROTEN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_ROTEN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Roten_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 67, // mPriority - &daObj_Roten_MethodTable, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_ROTEN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Roten_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_ROTEN_e, + /* Actor SubMtd */ &daObj_Roten_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rstair.cpp b/src/d/actor/d_a_obj_rstair.cpp index 32112c31352..32e217aa283 100644 --- a/src/d/actor/d_a_obj_rstair.cpp +++ b/src/d/actor/d_a_obj_rstair.cpp @@ -363,18 +363,18 @@ static actor_method_class daObjRotStair_METHODS = { }; actor_process_profile_definition g_profile_Obj_RotStair = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_RotStair, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjRotStair_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 613, // mPriority - &daObjRotStair_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_RotStair_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjRotStair_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_RotStair_e, + /* Actor SubMtd */ &daObjRotStair_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp index 52eb092e248..94ea6350c4a 100644 --- a/src/d/actor/d_a_obj_rw.cpp +++ b/src/d/actor/d_a_obj_rw.cpp @@ -110,7 +110,7 @@ static void damage_check(obj_rw_class* i_this) { sp2C.z = 0.0f; MtxPosition(&sp2C, &pos); pos += actor->current.pos; - fopAcM_createItem(&pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(&pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); } i_this->field_0x674 = 15; @@ -122,7 +122,7 @@ static void damage_check(obj_rw_class* i_this) { fopAcM_createDisappear(actor, &pos, 20, 0, actor->field_0x564); cXyz scale(1.0f, 1.0f, 1.0f); - fopAcM_createItemForBoss(&pos, fpcNm_ITEM_KAKERA_HEART, fopAcM_GetRoomNo(actor), &actor->shape_angle, &scale, 0.0f, 0.0f, actor->field_0x564); + fopAcM_createItemForBoss(&pos, dItemNo_KAKERA_HEART_e, fopAcM_GetRoomNo(actor), &actor->shape_angle, &scale, 0.0f, 0.0f, actor->field_0x564); int swbit = (fopAcM_GetParam(actor) & 0xFF000000) >> 0x18; if (swbit != 0xFF) { @@ -373,9 +373,9 @@ static int daOBJ_RW_Create(fopAc_ac_c* actor) { if (swbit != 0xFF && dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(actor))) { i_this->field_0xe38 = 1; cXyz scale(1.0f, 1.0f, 1.0f); - fopAcM_createItemForBoss(&actor->current.pos, fpcNm_ITEM_KAKERA_HEART, fopAcM_GetRoomNo(actor), &actor->shape_angle, &scale, 0.0f, 0.0f, actor->field_0x564); + fopAcM_createItemForBoss(&actor->current.pos, dItemNo_KAKERA_HEART_e, fopAcM_GetRoomNo(actor), &actor->shape_angle, &scale, 0.0f, 0.0f, actor->field_0x564); } else { - fopAcM_createChild(PROC_OBJ_MAKI, fopAcM_GetID(actor), 0xFFFFFF01, &actor->home.pos, fopAcM_GetRoomNo(actor), &actor->home.angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_OBJ_MAKI_e, fopAcM_GetID(actor), 0xFFFFFF01, &actor->home.pos, fopAcM_GetRoomNo(actor), &actor->home.angle, NULL, -1, NULL); fopAcM_OnStatus(actor, 0); actor->attention_info.flags = fopAc_AttnFlag_BATTLE_e; } @@ -395,18 +395,18 @@ static actor_method_class l_daOBJ_RW_Method = { }; actor_process_profile_definition g_profile_OBJ_RW = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_RW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_rw_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 711, // mPriority - &l_daOBJ_RW_Method, // sub_method - 0x00040100, // mStatus - fopAc_ENEMY_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_RW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_rw_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_RW_e, + /* Actor SubMtd */ &l_daOBJ_RW_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENEMY_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sWallShutter.cpp b/src/d/actor/d_a_obj_sWallShutter.cpp index 6f54f9ee57a..7c7f2b0c63c 100644 --- a/src/d/actor/d_a_obj_sWallShutter.cpp +++ b/src/d/actor/d_a_obj_sWallShutter.cpp @@ -238,18 +238,18 @@ static actor_method_class l_daSwShutter_Method = { }; actor_process_profile_definition g_profile_Obj_SwallShutter = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwallShutter, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSwShutter_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 619, // mPriority - &l_daSwShutter_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwallShutter_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSwShutter_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwallShutter_e, + /* Actor SubMtd */ &l_daSwShutter_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_saidan.cpp b/src/d/actor/d_a_obj_saidan.cpp index 05c64f23ba7..ed4818e0f51 100644 --- a/src/d/actor/d_a_obj_saidan.cpp +++ b/src/d/actor/d_a_obj_saidan.cpp @@ -155,18 +155,18 @@ static actor_method_class l_daSaidan_Method = { }; actor_process_profile_definition g_profile_Obj_Saidan = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Saidan, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSaidan_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 508, // mPriority - &l_daSaidan_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Saidan_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSaidan_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Saidan_e, + /* Actor SubMtd */ &l_daSaidan_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sakuita.cpp b/src/d/actor/d_a_obj_sakuita.cpp index 0f828d4d73f..74cfa45dc9b 100644 --- a/src/d/actor/d_a_obj_sakuita.cpp +++ b/src/d/actor/d_a_obj_sakuita.cpp @@ -214,18 +214,18 @@ static actor_method_class l_daObjSakuita_Method = { }; actor_process_profile_definition g_profile_Obj_Sakuita = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Sakuita, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSakuita_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 36, // mPriority - &l_daObjSakuita_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Sakuita_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSakuita_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Sakuita_e, + /* Actor SubMtd */ &l_daObjSakuita_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp index d0fbc480afb..11f81559e18 100644 --- a/src/d/actor/d_a_obj_sakuita_rope.cpp +++ b/src/d/actor/d_a_obj_sakuita_rope.cpp @@ -385,18 +385,18 @@ static actor_method_class l_daObjItaRope_Method = { }; actor_process_profile_definition g_profile_Obj_ItaRope = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_ItaRope, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjItaRope_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 35, // mPriority - &l_daObjItaRope_Method, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ItaRope_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjItaRope_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ItaRope_e, + /* Actor SubMtd */ &l_daObjItaRope_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index 3dcc1837dee..5e43ffa66d2 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_scannon.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -393,7 +393,7 @@ void daSCannon_c::exeModeWait() { mMode = MODE_ORDER_EVT; if (!fopAcM_isSwitch(this, getSw2())) { cXyz pos(TKS_SET_POS); - fopAcM_create(PROC_NPC_TKS, 1, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); + fopAcM_create(fpcNm_NPC_TKS_e, 1, &pos, fopAcM_GetRoomNo(this), NULL, NULL, -1); } } break; @@ -626,7 +626,7 @@ void daSCannon_c::demoInitFinish() { #endif fopAcM_seStartCurrent(this, Z2SE_OBJ_BOMB_EXPLODE, 0); - fopAcM_OffStatus(this, 0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); dComIfGp_getVibration().StopQuake(0x1F); dComIfGp_getVibration().StartShock(8, 0x1F, cXyz(0.0f, 1.0f, 0.0f)); @@ -665,7 +665,7 @@ void daSCannon_c::demoInitWarpEndWait() { } mpPtlBtk->setPlaySpeed(1.0f); - + daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0); if (player_p != NULL) { cXyz pos(-101987.7f, -18470.0f, 55863.813f); @@ -709,7 +709,7 @@ void daSCannon_c::changeScene() { dComIfGp_getVibration().StopQuake(0x1F); } - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OnStatus(this, fopAcStts_NOEXEC_e); if (field_0x619 == 0) { field_0x619 = 1; @@ -851,18 +851,18 @@ static actor_method_class daSCannon_METHODS = { }; actor_process_profile_definition g_profile_Obj_SCannon = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SCannon, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSCannon_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 734, // mPriority - &daSCannon_METHODS, // sub_method - 0x00044180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SCannon_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSCannon_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SCannon_e, + /* Actor SubMtd */ &daSCannon_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_scannon_crs.cpp b/src/d/actor/d_a_obj_scannon_crs.cpp index e911437d427..43d0cc1e843 100644 --- a/src/d/actor/d_a_obj_scannon_crs.cpp +++ b/src/d/actor/d_a_obj_scannon_crs.cpp @@ -518,18 +518,18 @@ static actor_method_class daSCannonCrs_METHODS = { }; actor_process_profile_definition g_profile_Obj_SCannonCrs = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SCannonCrs, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSCannonCrs_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 736, // mPriority - &daSCannonCrs_METHODS, // sub_method - 0x00044180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SCannonCrs_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSCannonCrs_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SCannonCrs_e, + /* Actor SubMtd */ &daSCannonCrs_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index e425d3b490c..15acddecbc2 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_scannon_ten.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -225,7 +225,7 @@ void daObjSCannonTen_c::demoExe() { "FIRE_END", "FINISH", }; - + int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, CUT_TYPE_TABLE_FIRE_SECOND, ARRAY_SIZE(CUT_TYPE_TABLE_FIRE_SECOND), 0, 0); if (act_idx != -1) { if (dComIfGp_evmng_getIsAddvance(mStaffId)) { @@ -330,7 +330,7 @@ void daObjSCannonTen_c::demoInitFinish() { mDoAud_seStart(Z2SE_AL_V_CANON_JUMP, NULL, 0, 0); initEmtLine(); - fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); int* timer_p = dComIfGp_evmng_getMyIntegerP(mStaffId, "Timer"); if (timer_p != NULL) { @@ -367,7 +367,7 @@ void daObjSCannonTen_c::changeScene() { dComIfGp_getVibration().StopQuake(0x1F); } - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x80); + fopAcM_OnStatus(this, fopAcStts_NOEXEC_e); const int a_exit_id = 1; dStage_changeScene(a_exit_id, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); @@ -469,18 +469,18 @@ static actor_method_class daObjSCannonTen_METHODS = { }; actor_process_profile_definition g_profile_Obj_SCannonTen = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SCannonTen, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSCannonTen_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 746, // mPriority - &daObjSCannonTen_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SCannonTen_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSCannonTen_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SCannonTen_e, + /* Actor SubMtd */ &daObjSCannonTen_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sekidoor.cpp b/src/d/actor/d_a_obj_sekidoor.cpp index c12f4782c63..7be65ab45b4 100644 --- a/src/d/actor/d_a_obj_sekidoor.cpp +++ b/src/d/actor/d_a_obj_sekidoor.cpp @@ -276,18 +276,18 @@ static actor_method_class daObj_SekiDoor_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_SEKIDOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SEKIDOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_SekiDoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 87, // mPriority - &daObj_SekiDoor_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType - }; + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SEKIDOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_SekiDoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SEKIDOOR_e, + /* Actor SubMtd */ &daObj_SekiDoor_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, +}; diff --git a/src/d/actor/d_a_obj_sekizo.cpp b/src/d/actor/d_a_obj_sekizo.cpp index cfc74ef9491..6c730252570 100644 --- a/src/d/actor/d_a_obj_sekizo.cpp +++ b/src/d/actor/d_a_obj_sekizo.cpp @@ -155,18 +155,18 @@ static actor_method_class daObj_Sekizo_MethodTable = { (process_method_func)daObj_Sekizo_Draw}; actor_process_profile_definition g_profile_OBJ_SEKIZO = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SEKIZO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Sekizo_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // mSubMtd - 88, // mPriority - &daObj_Sekizo_MethodTable, // mSubMtd - 0x44000, // status - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SEKIZO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Sekizo_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SEKIZO_e, + /* Actor SubMtd */ &daObj_Sekizo_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index b29714116e1..57be8845a9c 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -345,7 +345,7 @@ int daObj_Sekizoa_c::createHeapCallBack(fopAc_ac_c* i_this) { void* daObj_Sekizoa_c::srchSekizoa(void* i_actor, void* i_this) { if (mFindCount < 50 && i_actor != NULL && i_actor != i_this) { - if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_SEKIZOA) { + if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == fpcNm_OBJ_SEKIZOA_e) { mFindActorPtrs[mFindCount] = (fopAc_ac_c*)i_actor; mFindCount++; } @@ -2447,20 +2447,20 @@ static actor_method_class daObj_Sekizoa_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_SEKIZOA = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SEKIZOA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Sekizoa_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0x12, // mPriority - &daObj_Sekizoa_MethodTable, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SEKIZOA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Sekizoa_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SEKIZOA_e, + /* Actor SubMtd */ &daObj_Sekizoa_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index 26e74a6e661..953c578888c 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -108,7 +108,7 @@ int daItemShield_c::__CreateHeap() { int daItemShield_c::create() { fopAcM_ct(this, daItemShield_c); - m_itemNo = fpcNm_ITEM_WOOD_SHIELD; + m_itemNo = dItemNo_WOOD_SHIELD_e; if (fopAcM_isSwitch(this, getSwBit2())) { OS_REPORT("木の盾：もう取ったので出ません\n"); return cPhs_ERROR_e; @@ -370,18 +370,18 @@ static actor_method_class l_daItemShield_Method = { }; actor_process_profile_definition g_profile_Obj_Shield = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Shield, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daItemShield_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 240, // mPriority - &l_daItemShield_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Shield_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daItemShield_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Shield_e, + /* Actor SubMtd */ &l_daItemShield_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sm_door.cpp b/src/d/actor/d_a_obj_sm_door.cpp index b1d032b50aa..e1d490d10c3 100644 --- a/src/d/actor/d_a_obj_sm_door.cpp +++ b/src/d/actor/d_a_obj_sm_door.cpp @@ -28,7 +28,7 @@ static void* s_obj_sub(void* i_actor, void* i_this) { fopAc_ac_c* _this = static_cast(i_this); cXyz& actor_pos = fopAcM_GetPosition(actor); cXyz& pos = fopAcM_GetPosition(_this); - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_PM + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_PM_e && actor_pos.absXZ(pos) < 800.0f) { return i_actor; @@ -293,18 +293,18 @@ static actor_method_class l_daObjSM_DOOR_Method = { }; actor_process_profile_definition g_profile_Obj_SM_DOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SM_DOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSM_DOOR_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 476, // mPriority - &l_daObjSM_DOOR_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SM_DOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSM_DOOR_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SM_DOOR_e, + /* Actor SubMtd */ &l_daObjSM_DOOR_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index 01319f599d6..e5d31c214c2 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -34,18 +34,18 @@ static void* searchParentSub(void* i_actor, void* i_data) { fopAc_ac_c* a_other = (fopAc_ac_c*)i_data; if (a_actor != NULL && fopAcM_IsActor(a_actor)) { - if (fopAcM_GetProfName(a_actor) == PROC_OBJ_GM) { + if (fopAcM_GetProfName(a_actor) == fpcNm_OBJ_GM_e) { if (a_other->home.pos.abs(a_actor->home.pos) < 1.0f) { return a_actor; } - } else if (fopAcM_GetProfName(a_actor) == PROC_E_GB) { + } else if (fopAcM_GetProfName(a_actor) == fpcNm_E_GB_e) { if (a_other->home.pos.abs(a_actor->home.pos) < 50.0f) { return a_actor; } // “Small Key: position isn't synced with Big Baba!\n” OS_REPORT("\x1b[43;30m小さい鍵：デカババと位置がずれています！\n\x1b[m"); - } else if (fopAcM_GetProfName(a_actor) == PROC_E_ZM) { + } else if (fopAcM_GetProfName(a_actor) == fpcNm_E_ZM_e) { f32 other_dist = a_other->home.pos.abs(a_actor->home.pos); u8 temp_r27 = fopAcM_GetParamBit(a_actor, 0, 8); if (other_dist < 10.0f && temp_r27 < 10) { @@ -155,7 +155,7 @@ int daKey_c::create() { mIsPrmInit = TRUE; } - m_itemNo = fpcNm_ITEM_SMALL_KEY; + m_itemNo = dItemNo_SMALL_KEY_e; if (strcmp(dComIfGp_getStartStageName(), "F_SP118") == 0) { OS_REPORT(" SMKEY 0\n"); @@ -222,10 +222,10 @@ int daKey_c::actionInit() { void* pparent = fpcM_Search(searchParentSub, this); if (pparent != NULL) { parentActorID = fopAcM_GetID(pparent); - if (fopAcM_GetProfName(pparent) == PROC_OBJ_GM || fopAcM_GetProfName(pparent) == PROC_E_ZM) { + if (fopAcM_GetProfName(pparent) == fpcNm_OBJ_GM_e || fopAcM_GetProfName(pparent) == fpcNm_E_ZM_e) { hide(); actionParentWaitInit(); - } else if (fopAcM_GetProfName(pparent) == PROC_E_GB) { + } else if (fopAcM_GetProfName(pparent) == fpcNm_E_GB_e) { show(); actionInitE_GB(); } @@ -250,7 +250,7 @@ int daKey_c::actionParentWait() { if (pparent == NULL) { show(); actionWaitInit(); - } else if (fopAcM_GetProfName(pparent) == PROC_E_ZM) { + } else if (fopAcM_GetProfName(pparent) == fpcNm_E_ZM_e) { current.pos = pparent->home.pos; } else { current.pos = pparent->current.pos; @@ -399,7 +399,7 @@ int daKey_c::actionInitBoomerangCarry() { } int daKey_c::actionBoomerangCarry() { - fopAc_ac_c* pboomerang = fopAcM_SearchByName(PROC_BOOMERANG); + fopAc_ac_c* pboomerang = fopAcM_SearchByName(fpcNm_BOOMERANG_e); if (pboomerang != NULL) { current.pos = pboomerang->current.pos; } else { @@ -559,18 +559,18 @@ static actor_method_class l_daKey_Method = { }; actor_process_profile_definition g_profile_Obj_SmallKey = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SmallKey, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daKey_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 237, // mPriority - &l_daKey_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SmallKey_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daKey_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SmallKey_e, + /* Actor SubMtd */ &l_daKey_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp index e380b3dc122..42777605fbf 100644 --- a/src/d/actor/d_a_obj_smgdoor.cpp +++ b/src/d/actor/d_a_obj_smgdoor.cpp @@ -426,18 +426,18 @@ static actor_method_class daObjSmgDoor_METHODS = { }; actor_process_profile_definition g_profile_Obj_SmgDoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SmgDoor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSmgDoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 553, // mPriority - &daObjSmgDoor_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SmgDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSmgDoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SmgDoor_e, + /* Actor SubMtd */ &daObjSmgDoor_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_smoke.cpp b/src/d/actor/d_a_obj_smoke.cpp index 7edb5fe4c87..18631fd32a6 100644 --- a/src/d/actor/d_a_obj_smoke.cpp +++ b/src/d/actor/d_a_obj_smoke.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_smoke.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daObjSmoke_c::initBaseMtx() { setBaseMtx(); @@ -73,18 +73,18 @@ static actor_method_class l_daObjSmoke_Method = { }; actor_process_profile_definition g_profile_Obj_Smoke = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Smoke, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSmoke_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 632, // mPriority - &l_daObjSmoke_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Smoke_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSmoke_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Smoke_e, + /* Actor SubMtd */ &l_daObjSmoke_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_smtile.cpp b/src/d/actor/d_a_obj_smtile.cpp index ebe2baaffa8..faeb8be4fb8 100644 --- a/src/d/actor/d_a_obj_smtile.cpp +++ b/src/d/actor/d_a_obj_smtile.cpp @@ -349,18 +349,18 @@ static actor_method_class daObj_SMTile_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_SMTILE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SMTILE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_SMTile_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 89, // mPriority - &daObj_SMTile_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SMTILE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_SMTile_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SMTILE_e, + /* Actor SubMtd */ &daObj_SMTile_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_smw_stone.cpp b/src/d/actor/d_a_obj_smw_stone.cpp index 1eab4fb32c2..e964a957293 100644 --- a/src/d/actor/d_a_obj_smw_stone.cpp +++ b/src/d/actor/d_a_obj_smw_stone.cpp @@ -196,18 +196,18 @@ static actor_method_class daSmWStone_METHODS = { }; actor_process_profile_definition g_profile_Obj_SmWStone = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SmWStone, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSmWStone_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 735, // mPriority - &daSmWStone_METHODS, // sub_method - 0x00044100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SmWStone_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSmWStone_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SmWStone_e, + /* Actor SubMtd */ &daSmWStone_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_snowEffTag.cpp b/src/d/actor/d_a_obj_snowEffTag.cpp index eef00f6a5e0..09287aeddb8 100644 --- a/src/d/actor/d_a_obj_snowEffTag.cpp +++ b/src/d/actor/d_a_obj_snowEffTag.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daSnowEffTag_HIO_c::daSnowEffTag_HIO_c() { field_0x4 = 20; @@ -131,18 +131,18 @@ static actor_method_class l_daSnowEffTag_Method = { }; actor_process_profile_definition g_profile_Tag_SnowEff = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_SnowEff, - &g_fpcLf_Method.base, - sizeof(daSnowEffTag_c), - 0, - 0, - &g_fopAc_Method.base, - 656, - &l_daSnowEffTag_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_SnowEff_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSnowEffTag_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_SnowEff_e, + /* Actor SubMtd */ &l_daSnowEffTag_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_snow_soup.cpp b/src/d/actor/d_a_obj_snow_soup.cpp index 7a2d491b63d..027d0bd8c8e 100644 --- a/src/d/actor/d_a_obj_snow_soup.cpp +++ b/src/d/actor/d_a_obj_snow_soup.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_snow_soup.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static int daObjSnowSoup_c_createHeap(fopAc_ac_c* i_this) { @@ -194,18 +194,18 @@ static actor_method_class daObjSnowSoup_METHODS = { }; actor_process_profile_definition g_profile_Obj_SnowSoup = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_SnowSoup, - &g_fpcLf_Method.base, - sizeof(daObjSnowSoup_c), - 0, - 0, - &g_fopAc_Method.base, - 0x2E2, - &daObjSnowSoup_METHODS, - 0x44100, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SnowSoup_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSnowSoup_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SnowSoup_e, + /* Actor SubMtd */ &daObjSnowSoup_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index d3e41127843..2116ab4d16b 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -65,7 +65,7 @@ static void ride_call_back_1(dBgW* i_BgW, fopAc_ac_c* a_this, fopAc_ac_c* param_ static void so_hasira(obj_so_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; - daPillar_c* pillar_p = (daPillar_c*)fopAcM_SearchByName(PROC_Obj_Pillar); + daPillar_c* pillar_p = (daPillar_c*)fopAcM_SearchByName(fpcNm_Obj_Pillar_e); if (pillar_p != NULL) { mDoMtx_stack_c::transS(pillar_p->current.pos.x, pillar_p->current.pos.y, pillar_p->current.pos.z); mDoMtx_stack_c::YrotM(pillar_p->mRotY); @@ -849,10 +849,10 @@ static void demo_camera(obj_so_class* i_this) { cXyz sp48(-4264.0f, 302.0f, -2330.0f); cXyz sp54(16400.0f, 3529.0f, 8385.0f); sp54 += sp48; - fpc_ProcID i_parentID = fopAcM_create(PROC_E_OC, 0xFFFF0103, &sp54, fopAcM_GetRoomNo(a_this), &i_angle, 0, -1); + fpc_ProcID i_parentID = fopAcM_create(fpcNm_E_OC_e, 0xFFFF0103, &sp54, fopAcM_GetRoomNo(a_this), &i_angle, 0, -1); sp54.set(16200.0f, 3481.0f, 8418.0f); sp54 += sp48; - fopAcM_createChild(PROC_E_OC, i_parentID, 0xFFFF0104, &sp54, fopAcM_GetRoomNo(a_this), &i_angle, NULL, -1, NULL); + fopAcM_createChild(fpcNm_E_OC_e, i_parentID, 0xFFFF0104, &sp54, fopAcM_GetRoomNo(a_this), &i_angle, NULL, -1, NULL); } else if (i_this->field_0x1ba2 == 125) { i_this->mDemoMode = 100; } @@ -1063,7 +1063,7 @@ static int daObj_So_Create(fopAc_ac_c* a_this) { i_this->field_0xdae = 3; if (fopAcM_GetRoomNo(a_this) == 4) { cXyz sp2c(-5374.0f, 4280.0f, -2342.0f); - i_this->field_0x1b94 = fopAcM_create(PROC_OBJ_GM, 0x600, &sp2c, fopAcM_GetRoomNo(a_this), + i_this->field_0x1b94 = fopAcM_create(fpcNm_OBJ_GM_e, 0x600, &sp2c, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); } } @@ -1089,18 +1089,18 @@ static actor_method_class l_daObj_So_Method = { }; actor_process_profile_definition g_profile_OBJ_SO = { - fpcLy_CURRENT_e, // mLayerID - 2, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_so_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 55, // mPriority - &l_daObj_So_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_so_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SO_e, + /* Actor SubMtd */ &l_daObj_So_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp index 5802b0b8d6b..9c59768e26c 100644 --- a/src/d/actor/d_a_obj_spinLift.cpp +++ b/src/d/actor/d_a_obj_spinLift.cpp @@ -279,18 +279,18 @@ static actor_method_class l_daSpinLift_Method = { }; actor_process_profile_definition g_profile_Obj_SpinLift = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SpinLift, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSpinLift_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 512, // mPriority - &l_daSpinLift_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SpinLift_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSpinLift_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SpinLift_e, + /* Actor SubMtd */ &l_daSpinLift_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp index bc9deedc788..50d4fcd4cba 100644 --- a/src/d/actor/d_a_obj_ss_drink.cpp +++ b/src/d/actor/d_a_obj_ss_drink.cpp @@ -485,18 +485,18 @@ static actor_method_class daObj_SSDrink_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_SSDRINK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SSDRINK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_SSDrink_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 68, // mPriority - &daObj_SSDrink_MethodTable, // sub_method - 0x00064100, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SSDRINK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_SSDrink_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SSDRINK_e, + /* Actor SubMtd */ &daObj_SSDrink_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ss_item.cpp b/src/d/actor/d_a_obj_ss_item.cpp index d395c234bb0..4c354878aec 100644 --- a/src/d/actor/d_a_obj_ss_item.cpp +++ b/src/d/actor/d_a_obj_ss_item.cpp @@ -48,7 +48,7 @@ int daObj_SSItem_c::create() { field_0xB04 = -1; if (field_0xB0E == 2) { - field_0xB04 = fopAcM_create(PROC_OBJ_PUMPKIN, 0x10000319, ¤t.pos, + field_0xB04 = fopAcM_create(fpcNm_OBJ_PUMPKIN_e, 0x10000319, ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1); return cPhs_COMPLEATE_e; } else { @@ -372,18 +372,18 @@ static actor_method_class daObj_SSItem_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_SSITEM = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_SSITEM, - &g_fpcLf_Method.base, - sizeof(daObj_SSItem_c), - 0, - 0, - &g_fopAc_Method.base, - 0x45, - &daObj_SSItem_MethodTable, - 0x44100, - 0, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SSITEM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_SSItem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SSITEM_e, + /* Actor SubMtd */ &daObj_SSItem_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_stairBlock.cpp b/src/d/actor/d_a_obj_stairBlock.cpp index 377d3438b85..9ca15c84770 100644 --- a/src/d/actor/d_a_obj_stairBlock.cpp +++ b/src/d/actor/d_a_obj_stairBlock.cpp @@ -175,18 +175,18 @@ static actor_method_class l_daStairBlock_Method = { }; actor_process_profile_definition g_profile_Obj_StairBlock = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_StairBlock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daStairBlock_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 500, // mPriority - &l_daStairBlock_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_StairBlock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daStairBlock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_StairBlock_e, + /* Actor SubMtd */ &l_daStairBlock_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_stick.cpp b/src/d/actor/d_a_obj_stick.cpp index 2569f2f4b95..69878c10c52 100644 --- a/src/d/actor/d_a_obj_stick.cpp +++ b/src/d/actor/d_a_obj_stick.cpp @@ -227,18 +227,18 @@ static actor_method_class daObj_Stick_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_STICK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_STICK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_Stick_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 85, // mPriority - &daObj_Stick_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_STICK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Stick_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_STICK_e, + /* Actor SubMtd */ &daObj_Stick_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index 1d7c35e86d1..432b96bb703 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -212,7 +212,7 @@ int daObjStone_c::Create() { pos.y += 1.0f; // Create the mark actor that goes under the stone - fopAcM_createChild(PROC_Obj_StoneMark, fopAcM_GetID(this), stoneType, &pos, + fopAcM_createChild(fpcNm_Obj_StoneMark_e, fopAcM_GetID(this), stoneType, &pos, fopAcM_GetRoomNo(this), &shape_angle, &scale, -1, 0); mSound.init(¤t.pos, 1); @@ -299,7 +299,7 @@ void daObjStone_c::mode_proc_call() { cCcD_Obj* tgHitObj = mCollider.GetTgHitObj(); if (tgHitObj != NULL) { fopAc_ac_c* tgHitActor = mCollider.GetTgHitAc(); - if (fopAcM_GetName(tgHitActor) == PROC_OBJ_GRA) { + if (fopAcM_GetName(tgHitActor) == fpcNm_OBJ_GRA_e) { init_modeBreak(); } else { if (tgHitObj->ChkAtType(AT_TYPE_BOMB)) { @@ -308,7 +308,7 @@ void daObjStone_c::mode_proc_call() { if (tgHitObj->ChkAtType(AT_TYPE_IRON_BALL) && tgHitObj->GetAtAtp() != 1) { init_modeBreak(); } else if (tgHitObj->ChkAtType(AT_TYPE_CSTATUE_SWING) && - (fopAcM_GetName(tgHitActor) == PROC_Obj_VolcanicBomb)) + (fopAcM_GetName(tgHitActor) == fpcNm_Obj_VolcanicBomb_e)) { init_modeBreak(); } @@ -1022,18 +1022,18 @@ static actor_method_class l_daObjStone_Method = { }; actor_process_profile_definition g_profile_Obj_Stone = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Stone, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjStone_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 511, // mPriority - &l_daObjStone_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLSPHERE_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Stone_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjStone_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Stone_e, + /* Actor SubMtd */ &l_daObjStone_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_stoneMark.cpp b/src/d/actor/d_a_obj_stoneMark.cpp index e8f08bc5f9d..9c4e3a063e2 100644 --- a/src/d/actor/d_a_obj_stoneMark.cpp +++ b/src/d/actor/d_a_obj_stoneMark.cpp @@ -84,18 +84,18 @@ static actor_method_class l_daObjSMark_Method = { }; actor_process_profile_definition g_profile_Obj_StoneMark = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_StoneMark, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSMark_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 534, // mPriority - &l_daObjSMark_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLSPHERE_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_StoneMark_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSMark_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_StoneMark_e, + /* Actor SubMtd */ &l_daObjSMark_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLSPHERE_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_stopper.cpp b/src/d/actor/d_a_obj_stopper.cpp index 97f978f6a02..75ef504d63c 100644 --- a/src/d/actor/d_a_obj_stopper.cpp +++ b/src/d/actor/d_a_obj_stopper.cpp @@ -515,20 +515,20 @@ static actor_method_class l_daObjStopper_Method = { }; actor_process_profile_definition g_profile_Obj_Stopper = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Stopper, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjStopper_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 454, // mPriority - &l_daObjStopper_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Stopper_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjStopper_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Stopper_e, + /* Actor SubMtd */ &l_daObjStopper_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_stopper2.cpp b/src/d/actor/d_a_obj_stopper2.cpp index 5375998958f..a65969bc228 100644 --- a/src/d/actor/d_a_obj_stopper2.cpp +++ b/src/d/actor/d_a_obj_stopper2.cpp @@ -308,18 +308,18 @@ static actor_method_class l_daObjStopper2_Method = { }; actor_process_profile_definition g_profile_Obj_Stopper2 = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Stopper2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjStopper2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 564, // mPriority - &l_daObjStopper2_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Stopper2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjStopper2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Stopper2_e, + /* Actor SubMtd */ &l_daObjStopper2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_suisya.cpp b/src/d/actor/d_a_obj_suisya.cpp index ee3a3fa56b3..f14ff36706e 100644 --- a/src/d/actor/d_a_obj_suisya.cpp +++ b/src/d/actor/d_a_obj_suisya.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_suisya.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daObj_Suisya_c::draw() { g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); @@ -105,18 +105,18 @@ static actor_method_class l_daObj_Suisya_Method = { }; actor_process_profile_definition g_profile_OBJ_SUISYA = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_SUISYA, - &g_fpcLf_Method.base, - sizeof(daObj_Suisya_c), - 0, - 0, - &g_fopAc_Method.base, - 65, - &l_daObj_Suisya_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SUISYA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_Suisya_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SUISYA_e, + /* Actor SubMtd */ &l_daObj_Suisya_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp index a3673ea61f0..bbfe0bdf666 100644 --- a/src/d/actor/d_a_obj_sw.cpp +++ b/src/d/actor/d_a_obj_sw.cpp @@ -52,7 +52,7 @@ static int daObj_Sw_Draw(obj_sw_class* i_this) { static int saru_ct; static void* s_ks_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) { int swBit = fopAcM_GetParam(i_actor) >> 24; if (swBit != 0xFF) { if (dComIfGs_isSwitch(swBit, fopAcM_GetRoomNo((fopAc_ac_c*)i_actor))) { @@ -91,7 +91,7 @@ static path sc_path[17] = { }; static void* s_ksdel_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KS_e) { fopAcM_delete((fopAc_ac_c*)i_actor); ((obj_sw_class*)i_data)->field_0x5a8[saru_ct].field_0x4.x = sc_path[7 - saru_ct].field_0x4; @@ -794,14 +794,14 @@ static int daObj_Sw_Create(fopAc_ac_c* a_this) { i_this->field_0xd8c = (i_this->field_0x91c * 63) / 8; if (fopAcM_GetRoomNo(a_this) == 2 || fopAcM_GetRoomNo(a_this) == 4) { - fopAcM_createChild(PROC_OBJ_BRG, fopAcM_GetID(a_this), swBit << 24 | 0xFFFFFF, + fopAcM_createChild(fpcNm_OBJ_BRG_e, fopAcM_GetID(a_this), swBit << 24 | 0xFFFFFF, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->current.angle, NULL, -1, NULL); } if (fopAcM_GetRoomNo(a_this) == 4 && swBit != 0xFF) { if (!dComIfGs_isSwitch(swBit, fopAcM_GetRoomNo(a_this))) { - fopAcM_createChild(PROC_E_MK, fopAcM_GetID(a_this), swBit << 16 | 1, + fopAcM_createChild(fpcNm_E_MK_e, fopAcM_GetID(a_this), swBit << 16 | 1, &a_this->current.pos, fopAcM_GetRoomNo(a_this), &a_this->current.angle, NULL, -1, NULL); return cPhs_ERROR_e; @@ -819,18 +819,18 @@ static actor_method_class l_daObj_Sw_Method = { }; actor_process_profile_definition g_profile_OBJ_SW = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SW, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_sw_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 60, // mPriority - &l_daObj_Sw_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_SW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_sw_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_SW_e, + /* Actor SubMtd */ &l_daObj_Sw_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_swBallA.cpp b/src/d/actor/d_a_obj_swBallA.cpp index ffed7cbaa2f..e3599abb089 100644 --- a/src/d/actor/d_a_obj_swBallA.cpp +++ b/src/d/actor/d_a_obj_swBallA.cpp @@ -17,7 +17,7 @@ static daObjCarry_c* l_target_info[8]; static int l_target_info_count; static void* s_ball_sub(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)param_1)->getType() == daObjCarry_c::TYPE_LV8_BALL) { if (l_target_info_count < 8) { @@ -228,7 +228,7 @@ void daObjSwBallA_c::PutCrrPos() { daObjCarry_c* carryObj = (daObjCarry_c*)fopAcM_SearchByID(player->getGrabActorID()); if (carryObj != NULL && fopAcM_IsActor(carryObj) - && fopAcM_GetName(carryObj) == PROC_Obj_Carry && + && fopAcM_GetName(carryObj) == fpcNm_Obj_Carry_e && carryObj->getType() == daObjCarry_c::TYPE_LV8_BALL) { player->setForcePutPos(current.pos); @@ -348,18 +348,18 @@ static actor_method_class l_daObjSwBallA_Method = { }; actor_process_profile_definition g_profile_Obj_SwBallA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwBallA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwBallA_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 571, // mPriority - &l_daObjSwBallA_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwBallA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwBallA_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwBallA_e, + /* Actor SubMtd */ &l_daObjSwBallA_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swBallB.cpp b/src/d/actor/d_a_obj_swBallB.cpp index 94c837e9868..54c4acd5c6b 100644 --- a/src/d/actor/d_a_obj_swBallB.cpp +++ b/src/d/actor/d_a_obj_swBallB.cpp @@ -17,7 +17,7 @@ static daObjCarry_c* l_target_info[2]; static int l_target_info_count; static void* s_ball_sub(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)param_1)->prm_chk_type_lightball()) { if (l_target_info_count < 2) { @@ -293,7 +293,7 @@ void daObjSwBallB_c::PutCrrPos() { if (fopAcM_searchPlayerDistanceXZ(this) < 150.0f && sVar5 < 0x4000 && sVar5 > -0x4000) { daObjCarry_c* carryObj = (daObjCarry_c*)fopAcM_SearchByID(player->getGrabActorID()); if (carryObj != NULL && fopAcM_IsActor(carryObj) && - fopAcM_GetName(carryObj) == PROC_Obj_Carry && carryObj->prm_chk_type_lightball()) + fopAcM_GetName(carryObj) == fpcNm_Obj_Carry_e && carryObj->prm_chk_type_lightball()) { player->setForcePutPos(current.pos); if (!dComIfGp_event_runCheck()) { @@ -411,18 +411,18 @@ static actor_method_class l_daObjSwBallB_Method = { }; actor_process_profile_definition g_profile_Obj_SwBallB = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwBallB, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwBallB_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 572, // mPriority - &l_daObjSwBallB_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwBallB_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwBallB_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwBallB_e, + /* Actor SubMtd */ &l_daObjSwBallB_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swBallC.cpp b/src/d/actor/d_a_obj_swBallC.cpp index 7461739c8ed..4c3dbbc96e3 100644 --- a/src/d/actor/d_a_obj_swBallC.cpp +++ b/src/d/actor/d_a_obj_swBallC.cpp @@ -20,7 +20,7 @@ static int CheckCreateHeap(fopAc_ac_c* param_0) { } static void* s_swb_sub(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_SwBallB && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_SwBallB_e && (u32)((daObjSwBallB_c*)param_1)->getID() == ((daObjSwBallC_c*)param_2)->field_0x582) { return param_1; @@ -29,7 +29,7 @@ static void* s_swb_sub(void* param_1, void* param_2) { } static void* s_ballA_sub(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)param_1)->getType() == daObjCarry_c::TYPE_BALL_S) { return param_1; @@ -38,7 +38,7 @@ static void* s_ballA_sub(void* param_1, void* param_2) { } static void* s_ballB_sub(void* param_1, void* param_2) { - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)param_1)->getType() == daObjCarry_c::TYPE_BALL_S_2) { return param_1; @@ -237,7 +237,7 @@ int daObjSwBallC_c::demoProc() { break; case 10: field_0x584 = 1; - execItemGet(fpcNm_ITEM_LIGHT_SWORD); + execItemGet(dItemNo_LIGHT_SWORD_e); break; } } @@ -344,14 +344,14 @@ int daObjSwBallC_c::calcLightBallScale() { int uVar3 = 0; fopAc_ac_c* ball = (fopAc_ac_c*)fpcM_Search(s_ballA_sub, this); if (ball != NULL) { - fopAcM_OnStatus(ball, 0x800); + fopAcM_OnStatus(ball, fopAcStts_STAFF_EXTRA_e); uVar3 = cLib_chaseF(&ball->scale.x, 0.0f, 0.05f); ball->scale.y = ball->scale.x; ball->scale.z = ball->scale.x; } ball = (fopAc_ac_c*)fpcM_Search(s_ballB_sub, this); if (ball != NULL) { - fopAcM_OnStatus(ball, 0x800); + fopAcM_OnStatus(ball, fopAcStts_STAFF_EXTRA_e); uVar3 &= cLib_chaseF(&ball->scale.x, 0.0f, 0.05f); ball->scale.y = ball->scale.x; ball->scale.z = ball->scale.x; @@ -411,18 +411,18 @@ static actor_method_class l_daObjSwBallC_Method = { }; actor_process_profile_definition g_profile_Obj_SwBallC = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_SwBallC, - &g_fpcLf_Method.base, - sizeof(daObjSwBallC_c), - 0, - 0, - &g_fopAc_Method.base, - 0x246, - &l_daObjSwBallC_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwBallC_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwBallC_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwBallC_e, + /* Actor SubMtd */ &l_daObjSwBallC_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index c127fffa5fd..6883fe8ba81 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -477,18 +477,18 @@ static actor_method_class daObjSwLight_METHODS = { }; actor_process_profile_definition g_profile_Obj_SwLight = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwLight, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwLight_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 554, // mPriority - &daObjSwLight_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwLight_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwLight_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwLight_e, + /* Actor SubMtd */ &daObjSwLight_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp index 207d28671b9..8dee5d6f3a4 100644 --- a/src/d/actor/d_a_obj_swchain.cpp +++ b/src/d/actor/d_a_obj_swchain.cpp @@ -118,7 +118,7 @@ static s16 GetActorName(cBgS_PolyInfo& param_0) { } } - return PROC_Obj_SwChain; + return fpcNm_Obj_SwChain_e; } static char* l_arcName = "P_Chain"; @@ -494,7 +494,7 @@ void daObjSwChain_c::chain_control() { pos.y += 100.0f; chains_p1->field_0x4c = 0; - if (fopAcM_gc_c::gndCheck(&pos) && GetActorName(*fopAcM_gc_c::getGroundCheck()) != PROC_Obj_Lv4DigSand) { + if (fopAcM_gc_c::gndCheck(&pos) && GetActorName(*fopAcM_gc_c::getGroundCheck()) != fpcNm_Obj_Lv4DigSand_e) { fVar1 = fopAcM_gc_c::getGroundY() + 15.0f; if (fVar1 > pcVar2->y) { pcVar2->y = fVar1; @@ -650,7 +650,7 @@ void daObjSwChain_c::chain_control2() { cXyz spc0(*pcVar2); spc0.y += 100.0f; - if (fopAcM_gc_c::gndCheck(&spc0) && GetActorName(*fopAcM_gc_c::getGroundCheck()) != PROC_Obj_Lv4DigSand) { + if (fopAcM_gc_c::gndCheck(&spc0) && GetActorName(*fopAcM_gc_c::getGroundCheck()) != fpcNm_Obj_Lv4DigSand_e) { f32 fVar2 = fopAcM_gc_c::getGroundY() + 15.0f; if (fVar2 > pcVar2->y) { pcVar2->y = fVar2; @@ -1190,18 +1190,18 @@ static actor_method_class l_daObjSwChain_Method = { }; actor_process_profile_definition g_profile_Obj_SwChain = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwChain, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwChain_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 615, // mPriority - &l_daObjSwChain_Method, // sub_method - 0x000C0000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwChain_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwChain_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwChain_e, + /* Actor SubMtd */ &l_daObjSwChain_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp index d6834c37044..07f1e61d9fb 100644 --- a/src/d/actor/d_a_obj_swhang.cpp +++ b/src/d/actor/d_a_obj_swhang.cpp @@ -134,7 +134,7 @@ int daObjSwHang_c::Create() { case TYPE_3: case TYPE_4: mCcSph.Set(l_sph_src2); - fopAcM_OnStatus(this, 0x200000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x200000_e); break; } mCcSph.SetStts(&mCcStts); @@ -502,18 +502,18 @@ static actor_method_class daObjSwHang_METHODS = { }; actor_process_profile_definition g_profile_Obj_SwHang = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwHang, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwHang_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 516, // mPriority - &daObjSwHang_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwHang_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwHang_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwHang_e, + /* Actor SubMtd */ &daObjSwHang_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_sword.cpp b/src/d/actor/d_a_obj_sword.cpp index e9141a3998d..bb34eb6d8d9 100644 --- a/src/d/actor/d_a_obj_sword.cpp +++ b/src/d/actor/d_a_obj_sword.cpp @@ -147,18 +147,18 @@ static actor_method_class l_daObjSword_Method = { }; actor_process_profile_definition g_profile_Obj_Sword = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Sword, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSword_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 586, // mPriority - &l_daObjSword_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Sword_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSword_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Sword_e, + /* Actor SubMtd */ &l_daObjSword_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp index 4dfa1888622..f43d1dd5168 100644 --- a/src/d/actor/d_a_obj_swpropeller.cpp +++ b/src/d/actor/d_a_obj_swpropeller.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_swpropeller.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include #define MODEL_K_PURO 0 @@ -332,18 +332,18 @@ static actor_method_class l_daObjSwPr_Method = { }; actor_process_profile_definition g_profile_Obj_Swpropeller = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Swpropeller, - &g_fpcLf_Method.base, - sizeof(daObjSwPr_c), - 0, - 0, - &g_fopAc_Method.base, - 448, - &l_daObjSwPr_Method, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Swpropeller_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwPr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Swpropeller_e, + /* Actor SubMtd */ &l_daObjSwPr_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index 5b8f23d3b61..8eede8f5477 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_swpush.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -264,7 +264,7 @@ cPhs_Step daObjSwpush::Act_c::Mthd_Create() { field_0x5e4 = 0; field_0x5f2 = 0; field_0x5f3 = 0; - + set_btp_frame(); bool is_toggle = cLib_checkBit(attr().flags, FLAG_IS_TOGGLE); @@ -272,7 +272,7 @@ cPhs_Step daObjSwpush::Act_c::Mthd_Create() { bool flg20 = cLib_checkBit(attr().flags, FLAG_UNK20); bool is_sw = is_switch(); bool is_sw2 = is_switch2(); - + if ((is_toggle || (!is_sw && !on_is_up) || (is_sw && on_is_up)) && (!flg20 || !is_sw2)) { mTargetHFrac = 1.0f; mCurHFrac = 1.0f; @@ -384,18 +384,18 @@ void daObjSwpush::Act_c::rideCB(dBgW* i_bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) i_this->mRidingMode = 1; } - bool is_player = fopAcM_GetProfName(i_pt) == PROC_ALINK; + bool is_player = fopAcM_GetProfName(i_pt) == fpcNm_ALINK_e; if (is_player) { i_this->mVibTimer = 4; } - + if (is_player) { if (((daPy_py_c*)i_pt)->checkEquipHeavyBoots()) { i_this->mHeavyRiding = true; } } - if (fopAcM_GetProfName(i_pt) == PROC_E_MM_MT) { + if (fopAcM_GetProfName(i_pt) == fpcNm_E_MM_MT_e) { i_this->field_0x5c5 = 1; break; } @@ -442,7 +442,7 @@ void daObjSwpush::Act_c::calc_top_pos() { } else { field_0x5e8 = field_0x5dc; } - + mTopPos = (1.0f - field_0x5e8) * -35.5f; if (mTopPos < field_0x5d8) { @@ -659,7 +659,7 @@ void daObjSwpush::Act_c::mode_l_u() { } else if (strcmp(dComIfGp_getStartStageName(), "D_MN11") == 0 || strcmp(dComIfGp_getStartStageName(), "D_MN06") == 0) { fopAcM_seStart(this, Z2SE_OBJ_LV3_FLR_SW_OFF, 0); } - + mode_upper_init(); } } @@ -744,9 +744,9 @@ void daObjSwpush::Act_c::demo_runSw() { } bool daObjSwpush::Act_c::check_ride_couple(s16 param_1) { - if (param_1 == PROC_ALINK) { + if (param_1 == fpcNm_ALINK_e) { field_0x5f2 |= 1; - } else if (param_1 == PROC_NPC_P2) { + } else if (param_1 == fpcNm_NPC_P2_e) { field_0x5f2 |= 2; } @@ -799,7 +799,7 @@ int daObjSwpush::Act_c::Mthd_Execute() { mpBgW->CopyBackVtx(); cBgD_Vtx_t* vtx_tbl = mpBgW->GetVtxTbl(); int i_max = mpBgW->GetVtxNum(); - + for (int i = 0; i < 4; i++) { JUT_ASSERT(1552, M_op_vtx[i] < i_max); @@ -852,11 +852,11 @@ namespace { int Mthd_IsDelete(void* i_this) { return 1; } - + static actor_method_class Mthd_Table = { - (process_method_func)Mthd_Create, - (process_method_func)Mthd_Delete, - (process_method_func)Mthd_Execute, + (process_method_func)Mthd_Create, + (process_method_func)Mthd_Delete, + (process_method_func)Mthd_Execute, (process_method_func)Mthd_IsDelete, (process_method_func)Mthd_Draw, }; @@ -866,18 +866,18 @@ namespace { AUDIO_INSTANCES; actor_process_profile_definition g_profile_Obj_Swpush = { - fpcLy_CURRENT_e, // mLayerID - 2, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Swpush, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwpush::Act_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 11, // mPriority - &daObjSwpush::Mthd_Table, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Swpush_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwpush::Act_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Swpush_e, + /* Actor SubMtd */ &daObjSwpush::Mthd_Table, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swpush2.cpp b/src/d/actor/d_a_obj_swpush2.cpp index 58a3286517f..02a21303760 100644 --- a/src/d/actor/d_a_obj_swpush2.cpp +++ b/src/d/actor/d_a_obj_swpush2.cpp @@ -361,7 +361,7 @@ void daObjSwpush2::Act_c::rideCB(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_ a_this->mRideType = 1; } - bool is_player_ride = fopAcM_GetProfName(i_rideActor) == PROC_ALINK; + bool is_player_ride = fopAcM_GetProfName(i_rideActor) == fpcNm_ALINK_e; if (is_player_ride) { a_this->mShockTimer = 4; } @@ -715,18 +715,18 @@ actor_method_class Mthd_Table = { } actor_process_profile_definition g_profile_Obj_Swpush2 = { - fpcLy_CURRENT_e, // mLayerID - 2, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Swpush2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwpush2::Act_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 12, // mPriority - &daObjSwpush2::Mthd_Table, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Swpush2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwpush2::Act_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Swpush2_e, + /* Actor SubMtd */ &daObjSwpush2::Mthd_Table, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swpush5.cpp b/src/d/actor/d_a_obj_swpush5.cpp index b3b5fad08f9..8d66f389bd8 100644 --- a/src/d/actor/d_a_obj_swpush5.cpp +++ b/src/d/actor/d_a_obj_swpush5.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_swpush5.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -16,7 +16,7 @@ static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideA daObjSw5_c* i_this = (daObjSw5_c*)i_bgActor; daPy_py_c* player_p = daPy_getPlayerActorClass(); - if (i_this->checkPushable() && fopAcM_CheckStatus(i_rideActor, fopAcM_STATUS_UNK_0x400) && fopAcM_GetName(i_rideActor) == PROC_ALINK) { + if (i_this->checkPushable() && fopAcM_CheckStatus(i_rideActor, fopAcStts_FREEZE_e) && fopAcM_GetName(i_rideActor) == fpcNm_ALINK_e) { static cXyz l_push_check_pos[4] = { cXyz(-50.0f, 0.0f, -50.0f), cXyz(50.0f, 0.0f, -50.0f), @@ -298,7 +298,7 @@ void daObjSw5_c::modeWaitLower() { bool var_r30 = false; bool do_pause = false; daPy_py_c* player = daPy_getPlayerActorClass(); - + if (field_0x5b1 != 0) { var_r30 = true; } @@ -418,20 +418,20 @@ static actor_method_class l_daObjSw5_Method = { }; actor_process_profile_definition g_profile_Obj_Swpush5 = { - fpcLy_CURRENT_e, // mLayerID - 2, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Swpush5, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSw5_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 13, // mPriority - &l_daObjSw5_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Swpush5_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSw5_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Swpush5_e, + /* Actor SubMtd */ &l_daObjSw5_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_swspinner.cpp b/src/d/actor/d_a_obj_swspinner.cpp index bb72938ba98..71b63e77b77 100644 --- a/src/d/actor/d_a_obj_swspinner.cpp +++ b/src/d/actor/d_a_obj_swspinner.cpp @@ -6,13 +6,13 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swspinner.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static void* search_spinner_sub(void* i_actor, void* i_data) { daSpinner_c* spinner = (daSpinner_c*)i_actor; daObjSwSpinner_c* sw = (daObjSwSpinner_c*)i_data; - if (spinner != NULL && fopAc_IsActor(spinner) && fpcM_GetProfName(spinner) == PROC_SPINNER) { + if (spinner != NULL && fopAc_IsActor(spinner) && fpcM_GetProfName(spinner) == fpcNm_SPINNER_e) { if (spinner->current.pos.absXZ(sw->current.pos) < sw->GetR()) { if (!sw->mSpinnerIn) { sw->mSpinnerIn = true; @@ -225,18 +225,18 @@ static actor_method_class daObjSwSpinner_METHODS = { }; actor_process_profile_definition g_profile_Obj_SwSpinner = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwSpinner, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwSpinner_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 559, // mPriority - &daObjSwSpinner_METHODS, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwSpinner_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwSpinner_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwSpinner_e, + /* Actor SubMtd */ &daObjSwSpinner_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index 4acb54bf034..6db58daf070 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -437,18 +437,18 @@ static actor_method_class daObjSwTurn_METHODS = { }; actor_process_profile_definition g_profile_Obj_SwTurn = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SwTurn, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSwTurn_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 14, // mPriority - &daObjSwTurn_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SwTurn_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSwTurn_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SwTurn_e, + /* Actor SubMtd */ &daObjSwTurn_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_syRock.cpp b/src/d/actor/d_a_obj_syRock.cpp index 296ebc42d14..a628afeaf29 100644 --- a/src/d/actor/d_a_obj_syRock.cpp +++ b/src/d/actor/d_a_obj_syRock.cpp @@ -378,7 +378,7 @@ void* daSyRock_c::searchWaterPillar(void* i_proc, void* i_this) { daSyRock_c* const syRock = static_cast(i_this); daWtPillar_c* const wtPillar = static_cast(i_proc); - if (wtPillar && fopAcM_IsActor(wtPillar) && fopAcM_GetProfName(wtPillar) == PROC_Obj_WaterPillar) { + if (wtPillar && fopAcM_IsActor(wtPillar) && fopAcM_GetProfName(wtPillar) == fpcNm_Obj_WaterPillar_e) { const cXyz vectorFromWaterPillar = syRock->current.pos - wtPillar->current.pos; const f32 horizontalDistanceToWaterPillar = vectorFromWaterPillar.absXZ(); @@ -616,18 +616,18 @@ static actor_method_class l_daSyRock_Method = { }; actor_process_profile_definition g_profile_Obj_SyRock = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SyRock, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSyRock_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 515, // mPriority - &l_daSyRock_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SyRock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSyRock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SyRock_e, + /* Actor SubMtd */ &l_daSyRock_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_szbridge.cpp b/src/d/actor/d_a_obj_szbridge.cpp index d12efae3244..385b564c2e4 100644 --- a/src/d/actor/d_a_obj_szbridge.cpp +++ b/src/d/actor/d_a_obj_szbridge.cpp @@ -173,18 +173,18 @@ static actor_method_class daObjSZbridge_METHODS = { }; actor_process_profile_definition g_profile_Obj_SZbridge = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_SZbridge, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjSZbridge_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 676, // mPriority - &daObjSZbridge_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_SZbridge_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjSZbridge_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_SZbridge_e, + /* Actor SubMtd */ &daObjSZbridge_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_taFence.cpp b/src/d/actor/d_a_obj_taFence.cpp index ff6823ff436..42d436bddd7 100644 --- a/src/d/actor/d_a_obj_taFence.cpp +++ b/src/d/actor/d_a_obj_taFence.cpp @@ -416,18 +416,18 @@ static actor_method_class l_daTaFence_Method = { }; actor_process_profile_definition g_profile_Obj_TaFence = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TaFence, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTaFence_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 505, // mPriority - &l_daTaFence_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TaFence_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTaFence_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TaFence_e, + /* Actor SubMtd */ &l_daTaFence_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index 6ebb9f556d2..eb6b0e5896a 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -9,7 +9,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_meter2_info.h" #include "d/d_msg_object.h" @@ -198,18 +198,18 @@ static actor_method_class l_daObjTable_Method = { }; actor_process_profile_definition g_profile_Obj_Table = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Table, - &g_fpcLf_Method.base, - sizeof(daObjTable_c), - 0, - 0, - &g_fopAc_Method.base, - 0x02AB, - &l_daObjTable_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Table_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTable_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Table_e, + /* Actor SubMtd */ &l_daObjTable_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_takaraDai.cpp b/src/d/actor/d_a_obj_takaraDai.cpp index e8a1e919f20..04a6951a825 100644 --- a/src/d/actor/d_a_obj_takaraDai.cpp +++ b/src/d/actor/d_a_obj_takaraDai.cpp @@ -203,18 +203,18 @@ static actor_method_class l_daTkraDai_Method = { }; actor_process_profile_definition g_profile_Obj_TakaraDai = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TakaraDai, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTkraDai_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 654, // mPriority - &l_daTkraDai_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TakaraDai_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTkraDai_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TakaraDai_e, + /* Actor SubMtd */ &l_daTkraDai_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tatigi.cpp b/src/d/actor/d_a_obj_tatigi.cpp index 5d91ed7e537..93c07f409a7 100644 --- a/src/d/actor/d_a_obj_tatigi.cpp +++ b/src/d/actor/d_a_obj_tatigi.cpp @@ -215,18 +215,18 @@ static actor_method_class l_daObj_Tatigi_Method = { }; actor_process_profile_definition g_profile_OBJ_TATIGI = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_TATIGI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_tatigi_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 709, // mPriority - &l_daObj_Tatigi_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_TATIGI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_tatigi_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_TATIGI_e, + /* Actor SubMtd */ &l_daObj_Tatigi_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index a391ee007d0..1dece25b62d 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_ten.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -270,9 +270,9 @@ void daObjTEN_c::MoveAction() { linkchk.SetObj(); cXyz cStack_c8; cXyz cStack_d4; - + switch (field_0x5e9) { - case 0: + case 0: { J3DAnmTransform* anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("I_Ten", 6); mMorf->setAnm(anmTransform, 2, 5.0f, 0.0f, 0.0f, -1.0f); @@ -300,7 +300,7 @@ void daObjTEN_c::MoveAction() { speed.y = 5.0f; } break; - case 2: + case 2: { cXyz local_e0; cXyz* flamePos = player->getKandelaarFlamePos(); @@ -703,7 +703,7 @@ int daObjTEN_c::create() { if (field_0x624 == 2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; } @@ -810,18 +810,18 @@ static actor_method_class l_daObjTEN_Method = { }; actor_process_profile_definition g_profile_Obj_Ten = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Ten, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTEN_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 483, // mPriority - &l_daObjTEN_Method, // sub_method - 0x000C0120, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Ten_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTEN_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Ten_e, + /* Actor SubMtd */ &l_daObjTEN_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x20_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_testcube.cpp b/src/d/actor/d_a_obj_testcube.cpp index 0a1a41ec365..a9469551b48 100644 --- a/src/d/actor/d_a_obj_testcube.cpp +++ b/src/d/actor/d_a_obj_testcube.cpp @@ -367,18 +367,18 @@ static actor_method_class l_daObjCube_Method = { #endif actor_process_profile_definition g_profile_Obj_TestCube = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TestCube, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjCube_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 442, // mPriority - OBJCUBE_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TestCube_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjCube_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TestCube_e, + /* Actor SubMtd */ OBJCUBE_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tgake.cpp b/src/d/actor/d_a_obj_tgake.cpp index 4e2074b56b5..18ca94f97bc 100644 --- a/src/d/actor/d_a_obj_tgake.cpp +++ b/src/d/actor/d_a_obj_tgake.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_tgake.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daObjGake_c::initBaseMtx() { mpModel->setBaseScale(scale); @@ -132,18 +132,18 @@ static actor_method_class daObjGake_METHODS = { }; actor_process_profile_definition g_profile_Obj_Gake = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Gake, - &g_fpcLf_Method.base, - sizeof(daObjGake_c), - 0, - 0, - &g_fopAc_Method.base, - 568, - &daObjGake_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Gake_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjGake_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Gake_e, + /* Actor SubMtd */ &daObjGake_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp index a702266dd45..024a6aa57b6 100644 --- a/src/d/actor/d_a_obj_thashi.cpp +++ b/src/d/actor/d_a_obj_thashi.cpp @@ -248,20 +248,20 @@ static actor_method_class l_daObjTHASHI_Method = { }; actor_process_profile_definition g_profile_Obj_THASHI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_THASHI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTHASHI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 461, // mPriority - &l_daObjTHASHI_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_THASHI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTHASHI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_THASHI_e, + /* Actor SubMtd */ &l_daObjTHASHI_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; int daObjTHASHI_c::Create() { diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index 4eaf0e247d0..3a84a59cb8d 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -364,18 +364,18 @@ static actor_method_class daObjThDoor_METHODS = { }; actor_process_profile_definition g_profile_Obj_TDoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TDoor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjThDoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 560, // mPriority - &daObjThDoor_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjThDoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TDoor_e, + /* Actor SubMtd */ &daObjThDoor_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_timeFire.cpp b/src/d/actor/d_a_obj_timeFire.cpp index e86e092cdda..8b7b2ba7308 100644 --- a/src/d/actor/d_a_obj_timeFire.cpp +++ b/src/d/actor/d_a_obj_timeFire.cpp @@ -155,18 +155,18 @@ static actor_method_class l_daTimeFire_Method = { }; actor_process_profile_definition g_profile_Obj_TimeFire = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TimeFire, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTimeFire_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 661, // mPriority - &l_daTimeFire_Method, // sub_method - 0x00060000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TimeFire_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTimeFire_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TimeFire_e, + /* Actor SubMtd */ &l_daTimeFire_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp index 3f5bd30269c..0bdb9f769b0 100644 --- a/src/d/actor/d_a_obj_timer.cpp +++ b/src/d/actor/d_a_obj_timer.cpp @@ -132,18 +132,18 @@ namespace { }; // namespace daObjTimer actor_process_profile_definition g_profile_Obj_Timer = { - fpcLy_CURRENT_e, // mLayerID - 10, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Timer, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTimer::Act_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 22, // mPriority - &daObjTimer::l_daTimer_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 10, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Timer_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTimer::Act_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Timer_e, + /* Actor SubMtd */ &daObjTimer::l_daTimer_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp index f7693409763..5dc0878350d 100644 --- a/src/d/actor/d_a_obj_tks.cpp +++ b/src/d/actor/d_a_obj_tks.cpp @@ -555,7 +555,7 @@ void daObjTks_c::talk() { if (field_0xde1 != 0 && parentActorID == fpcM_ERROR_PROCESS_ID_e && daNpcF_chkEvtBit(0x147)) { cXyz pos(current.pos); pos.y += 30.0f; - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 1, &pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 1, &pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); } if (talkProc(NULL, TRUE, NULL)) { @@ -629,7 +629,7 @@ void daObjTks_c::demo() { case '0002': cXyz pos(current.pos); pos.y += 30.0f; - parentActorID = fopAcM_createChild(PROC_NPC_TKC, fopAcM_GetID(this), 0, &pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); + parentActorID = fopAcM_createChild(fpcNm_NPC_TKC_e, fopAcM_GetID(this), 0, &pos, fopAcM_GetRoomNo(this), &mCurAngle, NULL, -1, NULL); Z2GetAudioMgr()->subBgmStart(Z2BGM_OBACHAN); Z2GetAudioMgr()->bgmAllUnMute(0); @@ -905,18 +905,18 @@ static actor_method_class daObjTks_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_TKS = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_TKS, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTks_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 376, // mPriority - &daObjTks_MethodTable, // sub_method - 0x08044008, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_TKS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTks_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_TKS_e, + /* Actor SubMtd */ &daObjTks_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tmoon.cpp b/src/d/actor/d_a_obj_tmoon.cpp index d7ffe9fbdb8..58b9a5b4c7f 100644 --- a/src/d/actor/d_a_obj_tmoon.cpp +++ b/src/d/actor/d_a_obj_tmoon.cpp @@ -102,18 +102,18 @@ static actor_method_class l_daObjTMoon_Method = { }; actor_process_profile_definition g_profile_Obj_TMoon = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TMoon, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTMoon_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 569, // mPriority - &l_daObjTMoon_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TMoon_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTMoon_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TMoon_e, + /* Actor SubMtd */ &l_daObjTMoon_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_toaru_maki.cpp b/src/d/actor/d_a_obj_toaru_maki.cpp index 17ee50cfccd..df2e7932937 100644 --- a/src/d/actor/d_a_obj_toaru_maki.cpp +++ b/src/d/actor/d_a_obj_toaru_maki.cpp @@ -129,18 +129,18 @@ static actor_method_class daObjToaruMaki_METHODS = { }; actor_process_profile_definition g_profile_Obj_ToaruMaki = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_ToaruMaki, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjToaruMaki_c),// mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 749, // mPriority - &daObjToaruMaki_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ToaruMaki_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjToaruMaki_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ToaruMaki_e, + /* Actor SubMtd */ &daObjToaruMaki_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index 0ea49a1a085..81cbae20ee9 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -126,12 +126,12 @@ static void* s_bomb_sub(void* param_1, void* param_2) { static void* shot_b_sub(void* param_1, void* param_2) { fopAc_ac_c* player = dComIfGp_getPlayer(0); if (fopAcM_IsActor(param_1)) { - if (fopAcM_GetName(param_1) == PROC_BOOMERANG && daPy_py_c::checkBoomerangCharge() && + if (fopAcM_GetName(param_1) == fpcNm_BOOMERANG_e && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(param_1) == 1) { return param_1; } - if (fopAcM_GetName(param_1) == PROC_E_MK_BO && (((fopAc_ac_c*)param_1)->field_0x560 != 0)) + if (fopAcM_GetName(param_1) == fpcNm_E_MK_BO_e && (((fopAc_ac_c*)param_1)->field_0x560 != 0)) { return param_1; } @@ -149,7 +149,7 @@ static f32 hz_check_pos_z; static void* s_hz_sub(void* param_1, void* param_2) { if (fopAcM_IsActor(param_1)) { - if (fopAcM_GetName(param_1) == PROC_E_HZ) { + if (fopAcM_GetName(param_1) == fpcNm_E_HZ_e) { daE_HZ_c* hz = (daE_HZ_c*)param_1; if (hz->isWait() == true) { f32 xDiff = hz_check_pos_x - hz->current.pos.x; @@ -705,18 +705,18 @@ static actor_method_class l_daObj_Toby_Method = { }; actor_process_profile_definition g_profile_OBJ_TOBY = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_TOBY, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_toby_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 58, // mPriority - &l_daObj_Toby_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_TOBY_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_toby_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_TOBY_e, + /* Actor SubMtd */ &l_daObj_Toby_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index d9b890b65d4..29da8a95300 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -64,7 +64,7 @@ static void* s_b_sub(void* i_actor, void* i_data) { bomb->deleteBombAndEffect(); } } else { - if (fopAcM_GetName(i_actor) == PROC_Obj_Carry) { + if (fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e) { daObjCarry_c* carry = (daObjCarry_c*)i_actor; if (carry != NULL && data != NULL && carry->getType() == 2 && carry->current.pos.absXZ(data->current.pos) < 1000.0f) @@ -326,7 +326,7 @@ void daObjTobyHouse_c::demoProc() { static Vec l_shotSmokeOffset = {0.0f, 2500.0f, -600.0f}; cXyz cStack_24; csXyz cStack_98; - fopAcM_SearchByName(PROC_NPC_TOBY); + fopAcM_SearchByName(fpcNm_NPC_TOBY_e); cXyz cStack_30(-600.0f, 70.0f, 380.0f); camera_process_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); cXyz* pCamEye = fopCamM_GetEye_p(camera); @@ -601,20 +601,20 @@ static actor_method_class daObjTobyHouse_METHODS = { }; actor_process_profile_definition g_profile_Obj_TobyHouse = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TobyHouse, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTobyHouse_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 546, // mPriority - &daObjTobyHouse_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TobyHouse_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTobyHouse_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TobyHouse_e, + /* Actor SubMtd */ &daObjTobyHouse_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index fb3b0503641..c1aec26441a 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -106,7 +106,7 @@ int daTogeTrap_c::create() { } void daTogeTrap_c::rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) { - if (fopAcM_GetName(param_3) == PROC_Obj_Movebox) { + if (fopAcM_GetName(param_3) == fpcNm_Obj_Movebox_e) { ((daTogeTrap_c*)param_2)->field_0xadd = 1; } } @@ -302,18 +302,18 @@ static actor_method_class l_daTogeTrap_Method = { }; actor_process_profile_definition g_profile_Obj_TogeTrap = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TogeTrap, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTogeTrap_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 524, // mPriority - &l_daTogeTrap_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TogeTrap_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTogeTrap_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TogeTrap_e, + /* Actor SubMtd */ &l_daTogeTrap_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 82c77154766..27d22b2bfcd 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -1,6 +1,6 @@ /** * @file d_a_obj_tombo.cpp - * + * */ #include "d/dolzel_rel.h" // IWYU pragma: keep @@ -11,7 +11,7 @@ #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_camera_mng.h" -#include "f_pc/f_pc_name.h" +#include "d/d_item_data.h" #include "m_Do/m_Do_lib.h" #include @@ -47,7 +47,7 @@ daObj_TomHIO_c::daObj_TomHIO_c() { } static u8 const l_tom_itemno[2] = { - fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, + dItemNo_M_DRAGONFLY_e, dItemNo_F_DRAGONFLY_e, }; void daObjTOMBO_c::InitCcSph() { @@ -595,7 +595,7 @@ bool daObjTOMBO_c::CreateChk() { if (dMenu_Insect_c::isCatchNotGiveInsect(l_tom_itemno[mSex])) { return 0; } - + if ((mSex == SEX_MALE && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[l_musiya_num[mSex]])) || (mSex == SEX_FEMALE && @@ -617,7 +617,7 @@ int daObjTOMBO_c::create() { if (field_0x75c == 2) { field_0x56c = 0; shape_angle.x -= 0x2000; - fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000); + fopAcM_OnStatus(this, fopAcStts_UNK_0x4000_e); } else { mDraw = true; } @@ -682,18 +682,18 @@ static actor_method_class l_daObjTOMBO_Method = { }; actor_process_profile_definition g_profile_Obj_Tombo = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Tombo, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTOMBO_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 487, // mPriority - &l_daObjTOMBO_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Tombo_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTOMBO_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Tombo_e, + /* Actor SubMtd */ &l_daObjTOMBO_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tornado.cpp b/src/d/actor/d_a_obj_tornado.cpp index 3b6c837f734..fe6592d6441 100644 --- a/src/d/actor/d_a_obj_tornado.cpp +++ b/src/d/actor/d_a_obj_tornado.cpp @@ -227,18 +227,18 @@ static actor_method_class l_daObjTrnd_Method = { }; actor_process_profile_definition g_profile_Obj_Tornado = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Tornado, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x00000770, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 444, // mPriority - &l_daObjTrnd_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Tornado_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x00000770, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Tornado_e, + /* Actor SubMtd */ &l_daObjTrnd_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tornado2.cpp b/src/d/actor/d_a_obj_tornado2.cpp index 460459fa328..4b9a8fe38e0 100644 --- a/src/d/actor/d_a_obj_tornado2.cpp +++ b/src/d/actor/d_a_obj_tornado2.cpp @@ -399,18 +399,18 @@ static actor_method_class l_daObjTrnd2_Method = { }; actor_process_profile_definition g_profile_Obj_Tornado2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Tornado2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjTrnd2_c), // mDefaultRadius - 0, // mDefaultRadiusOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0x1BD, // mPriority - &l_daObjTrnd2_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Tornado2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjTrnd2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Tornado2_e, + /* Actor SubMtd */ &l_daObjTrnd2_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp index 4a8eccd9da0..8c31997e20e 100644 --- a/src/d/actor/d_a_obj_tp.cpp +++ b/src/d/actor/d_a_obj_tp.cpp @@ -72,7 +72,7 @@ static void anm_init(obj_tp_class* i_this, int param_2, f32 param_3, u8 param_4, } static void* s_tp_sub(void* param_1, void* param_2) { - if ((fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_TP) && + if ((fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_OBJ_TP_e) && ((fopAc_ac_c*)param_1)->parentActorID == ((fopAc_ac_c*)param_2)->parentActorID && ((obj_tp_class*)param_2)->field_0x5a0 == ((obj_tp_class*)param_1)->field_0x59c) { @@ -449,7 +449,7 @@ static int daObj_Tp_Create(fopAc_ac_c* i_this) { } else { parameters |= (i + 1) << 4; } - fopAcM_createChild(PROC_OBJ_TP, fopAcM_GetID(tp), parameters, &cStack_28, + fopAcM_createChild(fpcNm_OBJ_TP_e, fopAcM_GetID(tp), parameters, &cStack_28, fopAcM_GetRoomNo(tp), &cStack_30, 0, -1, 0); } tp->field_0x5a4 = 1; @@ -491,18 +491,18 @@ static actor_method_class l_daObj_Tp_Method = { }; actor_process_profile_definition g_profile_OBJ_TP = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_TP, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_tp_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 59, // mPriority - &l_daObj_Tp_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_TP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_tp_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_TP_e, + /* Actor SubMtd */ &l_daObj_Tp_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_treesh.cpp b/src/d/actor/d_a_obj_treesh.cpp index 29cd0a83afa..dea5b1ed780 100644 --- a/src/d/actor/d_a_obj_treesh.cpp +++ b/src/d/actor/d_a_obj_treesh.cpp @@ -160,18 +160,18 @@ static actor_method_class daTreeSh_METHODS = { }; actor_process_profile_definition g_profile_TREESH = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TREESH, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTreeSh_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 431, // mPriority - &daTreeSh_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TREESH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTreeSh_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TREESH_e, + /* Actor SubMtd */ &daTreeSh_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index 11eeecaccc8..1003f97a7e9 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -231,18 +231,18 @@ static actor_method_class l_daTwGate_Method = { }; actor_process_profile_definition g_profile_Obj_TwGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_TwGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTwGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 539, // mPriority - &l_daTwGate_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_TwGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTwGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_TwGate_e, + /* Actor SubMtd */ &l_daTwGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_udoor.cpp b/src/d/actor/d_a_obj_udoor.cpp index 43cd6e35b9f..1af70ccdbc2 100644 --- a/src/d/actor/d_a_obj_udoor.cpp +++ b/src/d/actor/d_a_obj_udoor.cpp @@ -165,18 +165,18 @@ static actor_method_class l_daObj_Udoor_Method = { }; actor_process_profile_definition g_profile_OBJ_UDOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_UDOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_udoor_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 77, // mPriority - &l_daObj_Udoor_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_UDOOR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_udoor_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_UDOOR_e, + /* Actor SubMtd */ &l_daObj_Udoor_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_usaku.cpp b/src/d/actor/d_a_obj_usaku.cpp index acf8b1c5abe..f6d0609e053 100644 --- a/src/d/actor/d_a_obj_usaku.cpp +++ b/src/d/actor/d_a_obj_usaku.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_usaku.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daObj_Usaku_Draw(obj_usaku_class* i_this) { fopAc_ac_c* a_this = static_cast(i_this); @@ -117,18 +117,18 @@ static actor_method_class l_daObj_Usaku_Method = { }; actor_process_profile_definition g_profile_OBJ_USAKU = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_USAKU, - &g_fpcLf_Method.base, - sizeof(obj_usaku_class), - 0, - 0, - &g_fopAc_Method.base, - 78, - &l_daObj_Usaku_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_USAKU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_usaku_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_USAKU_e, + /* Actor SubMtd */ &l_daObj_Usaku_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_vground.cpp b/src/d/actor/d_a_obj_vground.cpp index 3af6e0c5e71..674af3e1a42 100644 --- a/src/d/actor/d_a_obj_vground.cpp +++ b/src/d/actor/d_a_obj_vground.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vground.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int CheckCreateHeap(fopAc_ac_c* a_this) { daObjVGnd_c* i_this = static_cast(a_this); @@ -137,18 +137,18 @@ static actor_method_class l_daObjVGnd_Method = { }; actor_process_profile_definition g_profile_Obj_VolcGnd = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_VolcGnd, - &g_fpcLf_Method.base, - sizeof(daObjVGnd_c), - 0, - 0, - &g_fopAc_Method.base, - 595, - &l_daObjVGnd_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_VolcGnd_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjVGnd_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_VolcGnd_e, + /* Actor SubMtd */ &l_daObjVGnd_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_volcball.cpp b/src/d/actor/d_a_obj_volcball.cpp index 6c02a2311ba..0997d36900a 100644 --- a/src/d/actor/d_a_obj_volcball.cpp +++ b/src/d/actor/d_a_obj_volcball.cpp @@ -36,7 +36,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { static void* search_big_volc(void* i_actor, void*) { if (i_actor != NULL && fopAcM_IsActor(i_actor) && - fopAcM_GetProfName(i_actor) == PROC_Obj_VolcanicBomb) + fopAcM_GetProfName(i_actor) == fpcNm_Obj_VolcanicBomb_e) { return i_actor; } @@ -613,18 +613,18 @@ static actor_method_class l_daObjVolcBall_Method = { }; actor_process_profile_definition g_profile_Obj_VolcanicBall = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_VolcanicBall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjVolcBall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 593, // mPriority - &l_daObjVolcBall_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_VolcanicBall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjVolcBall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_VolcanicBall_e, + /* Actor SubMtd */ &l_daObjVolcBall_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 8e2d138d59e..eea03f267d2 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -884,18 +884,18 @@ static actor_method_class daObjVolcBom_METHODS = { }; actor_process_profile_definition g_profile_Obj_VolcanicBomb = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_VolcanicBomb, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjVolcBom_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 594, // mPriority - &daObjVolcBom_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_VolcanicBomb_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjVolcBom_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_VolcanicBomb_e, + /* Actor SubMtd */ &daObjVolcBom_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index 367144686c1..95767ed5241 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -824,18 +824,18 @@ static actor_method_class daObjWarpKBrg_METHODS = { }; actor_process_profile_definition g_profile_Obj_KakarikoBrg = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_KakarikoBrg, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjWarpKBrg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 530, // mPriority - &daObjWarpKBrg_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_KakarikoBrg_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWarpKBrg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_KakarikoBrg_e, + /* Actor SubMtd */ &daObjWarpKBrg_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp index e974f99f9b8..ac792c80280 100644 --- a/src/d/actor/d_a_obj_warp_obrg.cpp +++ b/src/d/actor/d_a_obj_warp_obrg.cpp @@ -600,18 +600,18 @@ static actor_method_class daObjWarpOBrg_METHODS = { }; actor_process_profile_definition g_profile_Obj_OrdinBrg = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_OrdinBrg, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjWarpOBrg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 531, // mPriority - &daObjWarpOBrg_METHODS, // sub_method - 0x00040000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_OrdinBrg_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWarpOBrg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_OrdinBrg_e, + /* Actor SubMtd */ &daObjWarpOBrg_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_waterGate.cpp b/src/d/actor/d_a_obj_waterGate.cpp index e20204e9372..2f2b623dd10 100644 --- a/src/d/actor/d_a_obj_waterGate.cpp +++ b/src/d/actor/d_a_obj_waterGate.cpp @@ -215,18 +215,18 @@ static actor_method_class l_daWtGate_Method = { }; actor_process_profile_definition g_profile_Obj_WtGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WtGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daWtGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 522, // mPriority - &l_daWtGate_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WtGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daWtGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WtGate_e, + /* Actor SubMtd */ &l_daWtGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_waterPillar.cpp b/src/d/actor/d_a_obj_waterPillar.cpp index 73099dbf6bc..fdef04b5543 100644 --- a/src/d/actor/d_a_obj_waterPillar.cpp +++ b/src/d/actor/d_a_obj_waterPillar.cpp @@ -703,18 +703,18 @@ actor_method_class l_daWtPillar_Method = { }; actor_process_profile_definition g_profile_Obj_WaterPillar = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WaterPillar, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daWtPillar_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 520, // mPriority - &l_daWtPillar_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WaterPillar_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daWtPillar_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WaterPillar_e, + /* Actor SubMtd */ &l_daWtPillar_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_waterfall.cpp b/src/d/actor/d_a_obj_waterfall.cpp index b91a03311e9..851e95080f8 100644 --- a/src/d/actor/d_a_obj_waterfall.cpp +++ b/src/d/actor/d_a_obj_waterfall.cpp @@ -116,7 +116,7 @@ static void* s_b_sub(void* param_0, void* unused) { static void* s_a_sub(void* param_0, void* unused) { UNUSED(unused); - if(fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_ARROW) { + if(fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == fpcNm_ARROW_e) { if(target_info_count < MAX_TARGET_INFO_COUNT) { target_info[target_info_count] = static_cast(param_0); target_info_count++; @@ -400,18 +400,18 @@ static actor_method_class l_daObjWaterFall_Method = { }; actor_process_profile_definition g_profile_Obj_WaterFall = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WaterFall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjWaterFall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 543, // mPriority - &l_daObjWaterFall_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WaterFall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWaterFall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WaterFall_e, + /* Actor SubMtd */ &l_daObjWaterFall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wchain.cpp b/src/d/actor/d_a_obj_wchain.cpp index d812cc0040c..ec4f3e0bbc4 100644 --- a/src/d/actor/d_a_obj_wchain.cpp +++ b/src/d/actor/d_a_obj_wchain.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_wchain.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "SSystem/SComponent/c_math.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" @@ -384,18 +384,18 @@ static actor_method_class l_daObjWchain_Method = { }; actor_process_profile_definition g_profile_Obj_Wchain = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Wchain, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x000007BC, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 247, // mPriority - &l_daObjWchain_Method, // sub_method - 0x00060100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Wchain_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x000007BC, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Wchain_e, + /* Actor SubMtd */ &l_daObjWchain_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index d7e52754600..66391bbb8e0 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -508,18 +508,18 @@ static actor_method_class l_daWdStick_Method = { }; actor_process_profile_definition g_profile_Obj_WdStick = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WdStick, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daWdStick_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 497, // mPriority - &l_daWdStick_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WdStick_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daWdStick_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WdStick_e, + /* Actor SubMtd */ &l_daWdStick_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_web0.cpp b/src/d/actor/d_a_obj_web0.cpp index b848781a4ca..518c4d51c90 100644 --- a/src/d/actor/d_a_obj_web0.cpp +++ b/src/d/actor/d_a_obj_web0.cpp @@ -287,18 +287,18 @@ static actor_method_class l_daObj_Web0_Method = { }; actor_process_profile_definition g_profile_OBJ_WEB0 = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_WEB0, - &g_fpcLf_Method.base, - sizeof(obj_web0_class), - 0, - 0, - &g_fopAc_Method.base, - 47, - &l_daObj_Web0_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_WEB0_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_web0_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_WEB0_e, + /* Actor SubMtd */ &l_daObj_Web0_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_web1.cpp b/src/d/actor/d_a_obj_web1.cpp index 23586b88256..4c5a4c52c3e 100644 --- a/src/d/actor/d_a_obj_web1.cpp +++ b/src/d/actor/d_a_obj_web1.cpp @@ -9,7 +9,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" daObj_Web1_HIO_c::daObj_Web1_HIO_c() { @@ -33,7 +33,7 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) _this->mDistToActor = JMAFastSqrt((x_diff * x_diff) + (z_diff * z_diff)); if (_this->mDistToActor < 140.0f) { - if (fopAcM_GetName(i_actor) == PROC_ALINK || fopAcM_GetName(i_actor) == PROC_ALINK) { + if (fopAcM_GetName(i_actor) == fpcNm_ALINK_e || fopAcM_GetName(i_actor) == fpcNm_ALINK_e) { if (_this->field_0x5aa == 0) { _this->mReboundTimer = 60; } @@ -43,7 +43,7 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) } else { _this->field_0x5aa = 6; } - } else if (fopAcM_GetName(i_actor) == PROC_OBJ_GM) { + } else if (fopAcM_GetName(i_actor) == fpcNm_OBJ_GM_e) { _this->field_0x5aa = 120; } else { _this->field_0x5aa = 3; @@ -316,18 +316,18 @@ static actor_method_class l_daObj_Web1_Method = { }; actor_process_profile_definition g_profile_OBJ_WEB1 = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_OBJ_WEB1, - &g_fpcLf_Method.base, - sizeof(obj_web1_class), - 0, - 0, - &g_fopAc_Method.base, - 48, - &l_daObj_Web1_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_WEB1_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_web1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_WEB1_e, + /* Actor SubMtd */ &l_daObj_Web1_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_well_cover.cpp b/src/d/actor/d_a_obj_well_cover.cpp index a39b7d73f3c..34b52539782 100644 --- a/src/d/actor/d_a_obj_well_cover.cpp +++ b/src/d/actor/d_a_obj_well_cover.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_well_cover.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_player.h" void daObjWCover_c::initBaseMtx() { @@ -147,18 +147,18 @@ static actor_method_class l_daObjWCover_Method = { }; actor_process_profile_definition g_profile_Obj_WellCover = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WellCover, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjWCover_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0x25E, // mPriority - &l_daObjWCover_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WellCover_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWCover_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WellCover_e, + /* Actor SubMtd */ &l_daObjWCover_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp index 7fea4e50dfc..0005a95c3fa 100644 --- a/src/d/actor/d_a_obj_wflag.cpp +++ b/src/d/actor/d_a_obj_wflag.cpp @@ -215,18 +215,18 @@ static actor_method_class l_daObj_Wflag_Method = { }; actor_process_profile_definition g_profile_OBJ_WFLAG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_WFLAG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(obj_wflag_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 53, // mPriority - &l_daObj_Wflag_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_WFLAG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_wflag_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_WFLAG_e, + /* Actor SubMtd */ &l_daObj_Wflag_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp index bdbd66e1980..e75e0d9b387 100644 --- a/src/d/actor/d_a_obj_wind_stone.cpp +++ b/src/d/actor/d_a_obj_wind_stone.cpp @@ -248,18 +248,18 @@ static actor_method_class daWindStone_METHODS = { }; actor_process_profile_definition g_profile_Obj_WindStone = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WindStone, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daWindStone_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 732, // mPriority - &daWindStone_METHODS, // sub_method - 0x40100, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WindStone_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daWindStone_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WindStone_e, + /* Actor SubMtd */ &daWindStone_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_window.cpp b/src/d/actor/d_a_obj_window.cpp index fe74f440deb..dc5dd84860c 100644 --- a/src/d/actor/d_a_obj_window.cpp +++ b/src/d/actor/d_a_obj_window.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_window.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName = "J_KazeD"; @@ -178,18 +178,18 @@ static actor_method_class daObjWindow_METHODS = { }; actor_process_profile_definition g_profile_Obj_Window = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_Window, - &g_fpcLf_Method.base, - sizeof(daObjWindow_c), - 0, - 0, - &g_fopAc_Method.base, - 0x1EB, - &daObjWindow_METHODS, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Window_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWindow_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Window_e, + /* Actor SubMtd */ &daObjWindow_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wood_pendulum.cpp b/src/d/actor/d_a_obj_wood_pendulum.cpp index b762f6d1ce9..b01504b4808 100644 --- a/src/d/actor/d_a_obj_wood_pendulum.cpp +++ b/src/d/actor/d_a_obj_wood_pendulum.cpp @@ -169,18 +169,18 @@ static actor_method_class l_daObjWPndlm_Method = { }; actor_process_profile_definition g_profile_Obj_WoodPendulum = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WoodPendulum, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjWPndlm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 253, // mPriority - &l_daObjWPndlm_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WoodPendulum_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWPndlm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WoodPendulum_e, + /* Actor SubMtd */ &l_daObjWPndlm_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index 23bcad36f76..208ccd27295 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -103,7 +103,7 @@ static void lifeGetCoCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_2, fopAc_a static void* s_sh_sub(void* param_1, void* param_2) { UNUSED(param_2); - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_E_SH) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_E_SH_e) { return param_1; } return NULL; @@ -158,7 +158,7 @@ int daObjWStatue_c::__CreateHeap() { int daObjWStatue_c::create() { fopAcM_ct(this, daObjWStatue_c); - m_itemNo = fpcNm_ITEM_WOOD_STATUE; + m_itemNo = dItemNo_WOOD_STATUE_e; if (fopAcM_isSwitch(this, getSwbit2())) { return cPhs_ERROR_e; } @@ -338,7 +338,7 @@ int daObjWStatue_c::actionInitBoomerangCarry() { } int daObjWStatue_c::actionBoomerangCarry() { - fopAc_ac_c* boomerang = fopAcM_SearchByName(PROC_BOOMERANG); + fopAc_ac_c* boomerang = fopAcM_SearchByName(fpcNm_BOOMERANG_e); if (boomerang != NULL) { current.pos = boomerang->current.pos; } else { @@ -485,18 +485,18 @@ static actor_method_class l_daObjWStatue_Method = { }; actor_process_profile_definition g_profile_Obj_WoodStatue = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_WoodStatue, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjWStatue_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 563, // mPriority - &l_daObjWStatue_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WoodStatue_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWStatue_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WoodStatue_e, + /* Actor SubMtd */ &l_daObjWStatue_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_wsword.cpp b/src/d/actor/d_a_obj_wsword.cpp index 97f9272470e..8598371674e 100644 --- a/src/d/actor/d_a_obj_wsword.cpp +++ b/src/d/actor/d_a_obj_wsword.cpp @@ -115,18 +115,18 @@ static actor_method_class l_daObjWSword_Method = { }; actor_process_profile_definition g_profile_Obj_WoodenSword = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_WoodenSword, - &g_fpcLf_Method.base, - sizeof(daObjWSword_c), - 0, - 0, - &g_fopAc_Method.base, - 0x20F, - &l_daObjWSword_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_WoodenSword_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjWSword_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_WoodenSword_e, + /* Actor SubMtd */ &l_daObjWSword_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_yel_bag.cpp b/src/d/actor/d_a_obj_yel_bag.cpp index 7978853190c..a4ddd1ee608 100644 --- a/src/d/actor/d_a_obj_yel_bag.cpp +++ b/src/d/actor/d_a_obj_yel_bag.cpp @@ -543,20 +543,20 @@ static actor_method_class daObj_YBag_MethodTable = { }; actor_process_profile_definition g_profile_OBJ_YBAG = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_YBAG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_YBag_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 715, // mPriority - &daObj_YBag_MethodTable, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_YBAG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObj_YBag_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_YBAG_e, + /* Actor SubMtd */ &daObj_YBag_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_obj_yobikusa.cpp b/src/d/actor/d_a_obj_yobikusa.cpp index ad24f8ddf38..4a37113376e 100644 --- a/src/d/actor/d_a_obj_yobikusa.cpp +++ b/src/d/actor/d_a_obj_yobikusa.cpp @@ -335,7 +335,7 @@ int daObjYobikusa_c::execute() { (!dComIfGp_event_runCheck() || eventInfo.checkCommandTalk()))) { mpActiveModel = mpModelTypeA; - fopAcM_OnStatus(this, 0x80); + fopAcM_OnStatus(this, fopAcStts_NOEXEC_e); } else { return TRUE; } @@ -344,7 +344,7 @@ int daObjYobikusa_c::execute() { if (mCcCyl.ChkTgHit()) { mpActiveModel = mpModelTypeB; - fopAcM_OffStatus(this, 0x80); + fopAcM_OffStatus(this, fopAcStts_NOEXEC_e); cLib_offBit(attention_info.flags, fopAc_AttnFlag_CARRY_e); if (getType() == CALL_TYPE_FLY) { @@ -419,18 +419,18 @@ static actor_method_class l_daObjYobikusa_Method = { }; actor_process_profile_definition g_profile_Obj_Yobikusa = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Yobikusa, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjYobikusa_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 29, // mPriority - &l_daObjYobikusa_Method, // sub_method - 0x40180, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Yobikusa_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjYobikusa_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Yobikusa_e, + /* Actor SubMtd */ &l_daObjYobikusa_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_yousei.cpp b/src/d/actor/d_a_obj_yousei.cpp index 20555536f15..ca482a44430 100644 --- a/src/d/actor/d_a_obj_yousei.cpp +++ b/src/d/actor/d_a_obj_yousei.cpp @@ -93,7 +93,7 @@ void daObjYOUSEI_c::MoveAction() { break; case 1: if (field_0x5d6 == 100 && mPrm != 0) { - execItemGet(fpcNm_ITEM_RECOVERY_FAILY); + execItemGet(dItemNo_RECOVERY_FAILY_e); } f32 var_f31 = (25.0f + yREG_F(16)) / field_0x5d6; @@ -372,7 +372,7 @@ void daObjYOUSEI_c::WaitAction() { data_804D1830 = 0; fopAcM_delete(this); } else { - dComIfGp_att_CatchRequest(this, fpcNm_ITEM_FAIRY, 150.0f, 50.0f, -100.0f, 0x5000, 1); + dComIfGp_att_CatchRequest(this, dItemNo_FAIRY_e, 150.0f, 50.0f, -100.0f, 0x5000, 1); eventInfo.onCondition(0x40); } @@ -530,7 +530,7 @@ void daObjYOUSEI_c::LinkAction() { data_804D1830 = 0; fopAcM_delete(this); } else { - dComIfGp_att_CatchRequest(this, fpcNm_ITEM_FAIRY, 150.0f, 50.0f, -100.0f, 0x5000, 1); + dComIfGp_att_CatchRequest(this, dItemNo_FAIRY_e, 150.0f, 50.0f, -100.0f, 0x5000, 1); eventInfo.onCondition(0x40); } @@ -833,7 +833,7 @@ int daObjYOUSEI_c::create() { mSound.init(¤t.pos, &eyePos, 3, 1); if (mPrm == 0) { - execItemGet(fpcNm_ITEM_RECOVERY_FAILY); + execItemGet(dItemNo_RECOVERY_FAILY_e); CareAction(); scale.set(0.2f, 0.2f, 0.2f); } else { @@ -860,20 +860,20 @@ static actor_method_class l_daObjYOUSEI_Method = { }; actor_process_profile_definition g_profile_Obj_Yousei = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Yousei, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjYOUSEI_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 475, // mPriority - &l_daObjYOUSEI_Method, // sub_method - 0x000C0100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_Yousei_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjYOUSEI_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_Yousei_e, + /* Actor SubMtd */ &l_daObjYOUSEI_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_obj_ystone.cpp b/src/d/actor/d_a_obj_ystone.cpp index 9d8efbff089..81868d2a6bf 100644 --- a/src/d/actor/d_a_obj_ystone.cpp +++ b/src/d/actor/d_a_obj_ystone.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_ystone.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static char const* l_arcName[7] = { @@ -295,18 +295,18 @@ static actor_method_class l_daObj_Ystone_Method = { }; actor_process_profile_definition g_profile_OBJ_YSTONE = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_OBJ_YSTONE, - &g_fpcLf_Method.base, - sizeof(obj_ystone_class), - 0, - 0, - &g_fopAc_Method.base, - 0x259, - &l_daObj_Ystone_Method, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_YSTONE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(obj_ystone_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_YSTONE_e, + /* Actor SubMtd */ &l_daObj_Ystone_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_obj_zcloth.cpp b/src/d/actor/d_a_obj_zcloth.cpp index 363ebe28ab7..c2eb40be00f 100644 --- a/src/d/actor/d_a_obj_zcloth.cpp +++ b/src/d/actor/d_a_obj_zcloth.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_item_data.h" #include "d/d_a_itembase_static.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daObjZCloth_c::initBaseMtx() { mpModel->setBaseScale(scale); @@ -87,18 +87,18 @@ static actor_method_class l_daObjZCloth_Method = { }; actor_process_profile_definition g_profile_Obj_ZoraCloth = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_ZoraCloth, - &g_fpcLf_Method.base, - sizeof(daObjZCloth_c), - 0, - 0, - &g_fopAc_Method.base, - 0x220, - &l_daObjZCloth_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ZoraCloth_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjZCloth_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ZoraCloth_e, + /* Actor SubMtd */ &l_daObjZCloth_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_zdoor.cpp b/src/d/actor/d_a_obj_zdoor.cpp index 9c57124ecaf..5787a6f7b8e 100644 --- a/src/d/actor/d_a_obj_zdoor.cpp +++ b/src/d/actor/d_a_obj_zdoor.cpp @@ -386,18 +386,18 @@ static actor_method_class daZdoor_METHODS = { }; actor_process_profile_definition g_profile_Obj_ZDoor = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_ZDoor, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daZdoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 24, // mPriority - &daZdoor_METHODS, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ZDoor_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daZdoor_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ZDoor_e, + /* Actor SubMtd */ &daZdoor_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_zrTurara.cpp b/src/d/actor/d_a_obj_zrTurara.cpp index 9e9767db06f..cf1e786b41f 100644 --- a/src/d/actor/d_a_obj_zrTurara.cpp +++ b/src/d/actor/d_a_obj_zrTurara.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_zrTurara.h" #include "d/d_bg_w.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "SSystem/SComponent/c_math.h" daZrTurara_HIO_c::daZrTurara_HIO_c() { @@ -193,7 +193,7 @@ void daZrTurara_c::modeBreak() { pos.y -= 200.0f; pos.x += l_HIO.mDebrisRange * cM_rndFX(1.0f); pos.y += l_HIO.mDebrisRange * cM_rndFX(1.0f); - fopAcM_create(PROC_Obj_zrTuraraRc, getScale(), &pos, + fopAcM_create(fpcNm_Obj_zrTuraraRc_e, getScale(), &pos, fopAcM_GetRoomNo(this), NULL, NULL, 0xff); mDebrisCount++; mBreakTimer = cM_rndF(1.0f) * 20.0f; @@ -261,18 +261,18 @@ static actor_method_class l_daZrTurara_Method = { }; actor_process_profile_definition g_profile_Obj_zrTurara = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_zrTurara, - &g_fpcLf_Method.base, - sizeof(daZrTurara_c), - 0, - 0, - &g_fopAc_Method.base, - 0x28C, - &l_daZrTurara_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_zrTurara_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daZrTurara_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_zrTurara_e, + /* Actor SubMtd */ &l_daZrTurara_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_zrTuraraRock.cpp b/src/d/actor/d_a_obj_zrTuraraRock.cpp index b4706929dad..cf004c73391 100644 --- a/src/d/actor/d_a_obj_zrTuraraRock.cpp +++ b/src/d/actor/d_a_obj_zrTuraraRock.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_zrTuraraRock.h" #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static daZrTuraRc_HIO_c l_HIO; @@ -178,18 +178,18 @@ static actor_method_class l_daZrTuraRc_Method = { }; actor_process_profile_definition g_profile_Obj_zrTuraraRc = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Obj_zrTuraraRc, - &g_fpcLf_Method.base, - sizeof(daZrTuraRc_c), - 0, - 0, - &g_fopAc_Method.base, - 0x28D, - &l_daZrTuraRc_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_zrTuraraRc_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daZrTuraRc_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_zrTuraraRc_e, + /* Actor SubMtd */ &l_daZrTuraRc_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_zraMark.cpp b/src/d/actor/d_a_obj_zraMark.cpp index 15193802765..81332dad8c9 100644 --- a/src/d/actor/d_a_obj_zraMark.cpp +++ b/src/d/actor/d_a_obj_zraMark.cpp @@ -300,7 +300,7 @@ void daObjZraMark_c::col_set() { daNpc_Hoz_c* daObjZraMark_c::schHoz() { fopAc_ac_c* hoz = NULL; - if (fopAcM_SearchByName(PROC_NPC_HOZ, &hoz) && hoz != NULL) { + if (fopAcM_SearchByName(fpcNm_NPC_HOZ_e, &hoz) && hoz != NULL) { return (daNpc_Hoz_c*)hoz; } @@ -321,7 +321,7 @@ void daObjZraMark_c::informBlast() { if (field_0x72c != 0) { for (int i = 0; i < field_0x72c; i++) { fopAc_ac_c* actorp = mActorMngr[i].getActorP(); - if (actorp != NULL && fopAcM_GetName(actorp) == PROC_NPC_ZRA) { + if (actorp != NULL && fopAcM_GetName(actorp) == fpcNm_NPC_ZRA_e) { ((daNpc_zrA_c*)actorp)->setBlastFlag(1); } } @@ -538,18 +538,18 @@ static actor_method_class l_daObjZraMark_Method = { }; actor_process_profile_definition g_profile_ZRA_MARK = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_ZRA_MARK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObjZraMark_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 392, // mPriority - &l_daObjZraMark_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ZRA_MARK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjZraMark_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ZRA_MARK_e, + /* Actor SubMtd */ &l_daObjZraMark_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_zra_freeze.cpp b/src/d/actor/d_a_obj_zra_freeze.cpp index 9c0ed17e93f..1525bdb572a 100644 --- a/src/d/actor/d_a_obj_zra_freeze.cpp +++ b/src/d/actor/d_a_obj_zra_freeze.cpp @@ -10,7 +10,7 @@ #include "m_Do/m_Do_lib.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName = "zrF"; @@ -200,18 +200,18 @@ static actor_method_class l_daZraFreeze_Method = { }; actor_process_profile_definition g_profile_OBJ_ZRAFREEZE = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_OBJ_ZRAFREEZE, - &g_fpcLf_Method.base, - sizeof(daZraFreeze_c), - 0, - 0, - &g_fopAc_Method.base, - 0x184, - &l_daZraFreeze_Method, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OBJ_ZRAFREEZE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daZraFreeze_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_OBJ_ZRAFREEZE_e, + /* Actor SubMtd */ &l_daZraFreeze_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_obj_zra_rock.cpp b/src/d/actor/d_a_obj_zra_rock.cpp index 91eea51192b..df8b9333a75 100644 --- a/src/d/actor/d_a_obj_zra_rock.cpp +++ b/src/d/actor/d_a_obj_zra_rock.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_zra_rock.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char const* l_arcName = "H_ZraRock"; @@ -150,18 +150,18 @@ static actor_method_class l_daObjZraRock_Method = { }; actor_process_profile_definition g_profile_Obj_ZraRock = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Obj_ZraRock, - &g_fpcLf_Method.base, - sizeof(daObjZraRock_c), - 0, - 0, - &g_fopAc_Method.base, - 0x260, - &l_daObjZraRock_Method, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Obj_ZraRock_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daObjZraRock_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Obj_ZraRock_e, + /* Actor SubMtd */ &l_daObjZraRock_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index ea584d91581..b83c96a319e 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -518,7 +518,7 @@ int daPasserMng_c::create() { } void daPasserMng_c::create_init() { - npcId = getDetailLevel() == 0 ? PROC_NPC_PASSER : PROC_NPC_PASSER2; + npcId = getDetailLevel() == 0 ? fpcNm_NPC_PASSER_e : fpcNm_NPC_PASSER2_e; mPath = dPath_GetRoomPath(getPathID(), fopAcM_GetHomeRoomNo(this)); JUT_ASSERT(542, mPath != NULL); dPnt* pnt0 = dPath_GetPnt(mPath, 0); @@ -602,18 +602,18 @@ static actor_method_class l_daPasserMng_Method = { }; actor_process_profile_definition g_profile_PASSER_MNG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_PASSER_MNG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPasserMng_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 405, // mPriority - &l_daPasserMng_Method, // sub_method - 0x00040100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PASSER_MNG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPasserMng_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_PASSER_MNG_e, + /* Actor SubMtd */ &l_daPasserMng_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_path_line.cpp b/src/d/actor/d_a_path_line.cpp index 3a4cc4ef60d..23048b4e87b 100644 --- a/src/d/actor/d_a_path_line.cpp +++ b/src/d/actor/d_a_path_line.cpp @@ -9,19 +9,19 @@ #include "f_op/f_op_actor_mng.h" actor_process_profile_definition2 g_profile_PATH_LINE = { - fpcLy_CURRENT_e, // mLayerID - 9, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_PATH_LINE, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x00000574, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 758, // mPriority - NULL, // sub_method - 0x00060000, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_0_e, // cullType - 0 // field_0x30 + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PATH_LINE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x00000574, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_PATH_LINE_e, + /* Actor SubMtd */ NULL, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, + /* Unknown */ 0 // field_0x30, }; diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp index fd4e5716bf0..51a1c7ba75c 100644 --- a/src/d/actor/d_a_peru.cpp +++ b/src/d/actor/d_a_peru.cpp @@ -402,7 +402,7 @@ void daPeru_c::srchActors() { if (mActors[1].getActorP() == NULL) { fopAc_ac_c* local_18 = NULL; - if (fopAcM_SearchByName(PROC_Obj_CatDoor, &local_18) != 0) { + if (fopAcM_SearchByName(fpcNm_Obj_CatDoor_e, &local_18) != 0) { mActors[1].entry(local_18); } } @@ -984,7 +984,7 @@ int daPeru_c::_cutAppear_Init(int const& param_1) { { mFaceMotionSeqMngr.setNo(2, -1.0f, 0, 0); fopAc_ac_c* midna = NULL; - if (fopAcM_SearchByName(PROC_MIDNA, &midna) != 0) { + if (fopAcM_SearchByName(fpcNm_MIDNA_e, &midna) != 0) { if (midna == NULL) { OS_REPORT("---- there is no midna!!\n"); JUT_ASSERT(2446, FALSE); @@ -1245,18 +1245,18 @@ static actor_method_class daPeru_MethodTable = { }; actor_process_profile_definition g_profile_PERU = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_PERU, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPeru_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 694, // mPriority - &daPeru_MethodTable, // sub_method - 0x08044108, // mStatus - fopAc_NPC_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PERU_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPeru_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_PERU_e, + /* Actor SubMtd */ &daPeru_MethodTable, + /* Status */ fopAcStts_UNK_0x8000000_e | fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e, + /* Group */ fopAc_NPC_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp index 0b6dd246ffa..881dfcb46ad 100644 --- a/src/d/actor/d_a_player.cpp +++ b/src/d/actor/d_a_player.cpp @@ -133,61 +133,61 @@ u32 daPy_py_c::setParamData(int i_roomNo, int i_mode, int param_2, int param_3) } BOOL daPy_py_c::checkFishingRodItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_FISHING_ROD_1 || (i_itemNo >= fpcNm_ITEM_BEE_ROD && i_itemNo <= fpcNm_ITEM_JEWEL_WORM_ROD); + return i_itemNo == dItemNo_FISHING_ROD_1_e || (i_itemNo >= dItemNo_BEE_ROD_e && i_itemNo <= dItemNo_JEWEL_WORM_ROD_e); } BOOL daPy_py_c::checkBombItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_NORMAL_BOMB || i_itemNo == fpcNm_ITEM_WATER_BOMB || i_itemNo == fpcNm_ITEM_POKE_BOMB; + return i_itemNo == dItemNo_NORMAL_BOMB_e || i_itemNo == dItemNo_WATER_BOMB_e || i_itemNo == dItemNo_POKE_BOMB_e; } BOOL daPy_py_c::checkBottleItem(int i_itemNo) { - return (i_itemNo >= fpcNm_ITEM_EMPTY_BOTTLE && i_itemNo <= fpcNm_ITEM_FAIRY) - || i_itemNo == fpcNm_ITEM_BEE_CHILD - || i_itemNo == fpcNm_ITEM_WORM - || i_itemNo == fpcNm_ITEM_FAIRY_DROP - || i_itemNo == fpcNm_ITEM_CHUCHU_BLACK - || (i_itemNo >= fpcNm_ITEM_CHUCHU_RARE && i_itemNo <= fpcNm_ITEM_LV3_SOUP); + return (i_itemNo >= dItemNo_EMPTY_BOTTLE_e && i_itemNo <= dItemNo_FAIRY_e) + || i_itemNo == dItemNo_BEE_CHILD_e + || i_itemNo == dItemNo_WORM_e + || i_itemNo == dItemNo_FAIRY_DROP_e + || i_itemNo == dItemNo_CHUCHU_BLACK_e + || (i_itemNo >= dItemNo_CHUCHU_RARE_e && i_itemNo <= dItemNo_LV3_SOUP_e); } BOOL daPy_py_c::checkDrinkBottleItem(int i_itemNo) { - return (i_itemNo >= fpcNm_ITEM_RED_BOTTLE && i_itemNo <= fpcNm_ITEM_HALF_MILK_BOTTLE) - || i_itemNo == fpcNm_ITEM_RED_BOTTLE_2 - || i_itemNo == fpcNm_ITEM_UGLY_SOUP - || i_itemNo == fpcNm_ITEM_HOT_SPRING - || i_itemNo == fpcNm_ITEM_BEE_CHILD - || i_itemNo == fpcNm_ITEM_CHUCHU_BLACK - || i_itemNo == fpcNm_ITEM_FAIRY_DROP - || (i_itemNo >= fpcNm_ITEM_CHUCHU_RARE && i_itemNo != fpcNm_ITEM_CHUCHU_YELLOW && i_itemNo <= fpcNm_ITEM_LV3_SOUP); + return (i_itemNo >= dItemNo_RED_BOTTLE_e && i_itemNo <= dItemNo_HALF_MILK_BOTTLE_e) + || i_itemNo == dItemNo_RED_BOTTLE_2_e + || i_itemNo == dItemNo_UGLY_SOUP_e + || i_itemNo == dItemNo_HOT_SPRING_e + || i_itemNo == dItemNo_BEE_CHILD_e + || i_itemNo == dItemNo_CHUCHU_BLACK_e + || i_itemNo == dItemNo_FAIRY_DROP_e + || (i_itemNo >= dItemNo_CHUCHU_RARE_e && i_itemNo != dItemNo_CHUCHU_YELLOW_e && i_itemNo <= dItemNo_LV3_SOUP_e); } BOOL daPy_py_c::checkOilBottleItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_CHUCHU_YELLOW || i_itemNo == fpcNm_ITEM_OIL_BOTTLE_2 || i_itemNo == fpcNm_ITEM_OIL_BOTTLE; + return i_itemNo == dItemNo_CHUCHU_YELLOW_e || i_itemNo == dItemNo_OIL_BOTTLE_2_e || i_itemNo == dItemNo_OIL_BOTTLE_e; } BOOL daPy_py_c::checkOpenBottleItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_WATER_BOTTLE || i_itemNo == fpcNm_ITEM_WORM || i_itemNo == fpcNm_ITEM_FAIRY; + return i_itemNo == dItemNo_WATER_BOTTLE_e || i_itemNo == dItemNo_WORM_e || i_itemNo == dItemNo_FAIRY_e; } BOOL daPy_py_c::checkBowItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_BOW || i_itemNo == fpcNm_ITEM_BOMB_ARROW || i_itemNo == fpcNm_ITEM_HAWK_ARROW; + return i_itemNo == dItemNo_BOW_e || i_itemNo == dItemNo_BOMB_ARROW_e || i_itemNo == dItemNo_HAWK_ARROW_e; } BOOL daPy_py_c::checkHookshotItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_HOOKSHOT || i_itemNo == fpcNm_ITEM_W_HOOKSHOT; + return i_itemNo == dItemNo_HOOKSHOT_e || i_itemNo == dItemNo_W_HOOKSHOT_e; } BOOL daPy_py_c::checkTradeItem(int i_itemNo) { - return (i_itemNo >= fpcNm_ITEM_LETTER && i_itemNo <= fpcNm_ITEM_IRIAS_PENDANT) - || i_itemNo == fpcNm_ITEM_ANCIENT_DOCUMENT - || i_itemNo == fpcNm_ITEM_AIR_LETTER - || i_itemNo == fpcNm_ITEM_ANCIENT_DOCUMENT2 - || i_itemNo == fpcNm_ITEM_RAFRELS_MEMO - || i_itemNo == fpcNm_ITEM_TKS_LETTER - || i_itemNo == fpcNm_ITEM_ASHS_SCRIBBLING; + return (i_itemNo >= dItemNo_LETTER_e && i_itemNo <= dItemNo_IRIAS_PENDANT_e) + || i_itemNo == dItemNo_ANCIENT_DOCUMENT_e + || i_itemNo == dItemNo_AIR_LETTER_e + || i_itemNo == dItemNo_ANCIENT_DOCUMENT2_e + || i_itemNo == dItemNo_RAFRELS_MEMO_e + || i_itemNo == dItemNo_TKS_LETTER_e + || i_itemNo == dItemNo_ASHS_SCRIBBLING_e; } BOOL daPy_py_c::checkDungeonWarpItem(int i_itemNo) { - return i_itemNo == fpcNm_ITEM_DUNGEON_EXIT || i_itemNo == fpcNm_ITEM_DUNGEON_BACK; + return i_itemNo == dItemNo_DUNGEON_EXIT_e || i_itemNo == dItemNo_DUNGEON_BACK_e; } void daPy_actorKeep_c::setActor() { @@ -410,12 +410,12 @@ void daPy_sightPacket_c::setSightImage(ResTIMG* i_img) { BOOL daPy_py_c::checkMasterSwordEquip() { u16 equipSword = dComIfGs_getSelectEquipSword(); - return equipSword == fpcNm_ITEM_MASTER_SWORD || equipSword == fpcNm_ITEM_LIGHT_SWORD; + return equipSword == dItemNo_MASTER_SWORD_e || equipSword == dItemNo_LIGHT_SWORD_e; } BOOL daPy_py_c::checkWoodShieldEquip() { u16 equipShield = dComIfGs_getSelectEquipShield(); - return equipShield == fpcNm_ITEM_WOOD_SHIELD || equipShield == fpcNm_ITEM_SHIELD; + return equipShield == dItemNo_WOOD_SHIELD_e || equipShield == dItemNo_SHIELD_e; } f32 daPy_py_c::getAttentionOffsetY() { diff --git a/src/d/actor/d_a_ppolamp.cpp b/src/d/actor/d_a_ppolamp.cpp index 036f5b66a0e..32adaac799f 100644 --- a/src/d/actor/d_a_ppolamp.cpp +++ b/src/d/actor/d_a_ppolamp.cpp @@ -178,20 +178,20 @@ static actor_method_class daPPolamp_METHODS = { }; actor_process_profile_definition g_profile_PPolamp = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_PPolamp, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daPPolamp_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 727, // mPriority - &daPPolamp_METHODS, // sub_method - 0x00040180, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_12_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PPolamp_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daPPolamp_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_PPolamp_e, + /* Actor SubMtd */ &daPPolamp_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_NOEXEC_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_12_e, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_a_scene_exit.cpp b/src/d/actor/d_a_scene_exit.cpp index 846b833faaa..88286a89c80 100644 --- a/src/d/actor/d_a_scene_exit.cpp +++ b/src/d/actor/d_a_scene_exit.cpp @@ -105,19 +105,19 @@ static actor_method_class l_daScex_Method = { }; actor_process_profile_definition2 g_profile_SCENE_EXIT = { - fpcLy_CURRENT_e, // mLayerID - 10, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SCENE_EXIT, // mProcName - &g_fpcLf_Method.base, // sub_method - 0x0000059C, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 761, // mPriority - &l_daScex_Method, // sub_method - 0x00060000, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_0_e, // cullType - 0 // field_0x30 + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 10, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SCENE_EXIT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ 0x0000059C, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SCENE_EXIT_e, + /* Actor SubMtd */ &l_daScex_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, + /* Unknown */ 0 // field_0x30, }; diff --git a/src/d/actor/d_a_scene_exit2.cpp b/src/d/actor/d_a_scene_exit2.cpp index a9defc65918..5e9032d9b65 100644 --- a/src/d/actor/d_a_scene_exit2.cpp +++ b/src/d/actor/d_a_scene_exit2.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_scene_exit2.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daScExit_c::initBaseMtx() { setBaseMtx(); @@ -173,18 +173,18 @@ static actor_method_class l_daScExit_Method = { }; actor_process_profile_definition g_profile_SCENE_EXIT2 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_SCENE_EXIT2, - &g_fpcLf_Method.base, - sizeof(daScExit_c), - 0, - 0, - &g_fopAc_Method.base, - 583, - &l_daScExit_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SCENE_EXIT2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daScExit_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SCENE_EXIT2_e, + /* Actor SubMtd */ &l_daScExit_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp index 6beae751cd1..796c31a4ea0 100644 --- a/src/d/actor/d_a_set_bgobj.cpp +++ b/src/d/actor/d_a_set_bgobj.cpp @@ -13,7 +13,7 @@ static const char l_specName[] = "spec.dat"; int daSetBgObj_c::CreateInit() { static s16 l_bg_profName[5] = { - PROC_BG_OBJ, PROC_BG_OBJ, PROC_BG_OBJ, PROC_Obj_Flag2, PROC_Obj_Flag3, + fpcNm_BG_OBJ_e, fpcNm_BG_OBJ_e, fpcNm_BG_OBJ_e, fpcNm_Obj_Flag2_e, fpcNm_Obj_Flag3_e, }; u16* spec_data_p = (u16*)dComIfG_getObjectRes(mArcName, l_specName); @@ -56,18 +56,18 @@ static actor_method_class l_daSetBgObj_Method = { }; actor_process_profile_definition g_profile_SET_BG_OBJ = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_SET_BG_OBJ, - &g_fpcLf_Method.base, - sizeof(daSetBgObj_c), - 0, - 0, - &g_fopAc_Method.base, - 754, - &l_daSetBgObj_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SET_BG_OBJ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSetBgObj_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SET_BG_OBJ_e, + /* Actor SubMtd */ &l_daSetBgObj_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 09ef16cb701..09f99c1ca7c 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -13,75 +13,75 @@ const char* daShopItem_c::getShopArcname() { switch (m_itemNo) { - case fpcNm_ITEM_NONE: + case dItemNo_NONE_e: if (strcmp("R_SP160", dComIfGp_getStartStageName()) == 0) { mShopItemID = SHOP_ITEMNO_ARMOR_SOLD; } else { mShopItemID = SHOP_ITEMNO_SOLD; } break; - case fpcNm_ITEM_OIL_BOTTLE: + case dItemNo_OIL_BOTTLE_e: mShopItemID = SHOP_ITEMNO_OIL; break; - case fpcNm_ITEM_MILK_BOTTLE: + case dItemNo_MILK_BOTTLE_e: mShopItemID = SHOP_ITEMNO_MILK; break; - case fpcNm_ITEM_HALF_MILK_BOTTLE: + case dItemNo_HALF_MILK_BOTTLE_e: mShopItemID = SHOP_ITEMNO_HALF_MILK; break; - case fpcNm_ITEM_RED_BOTTLE: + case dItemNo_RED_BOTTLE_e: mShopItemID = SHOP_ITEMNO_RED; break; - case fpcNm_ITEM_GREEN_BOTTLE: + case dItemNo_GREEN_BOTTLE_e: mShopItemID = SHOP_ITEMNO_GREEN; break; - case fpcNm_ITEM_BLUE_BOTTLE: + case dItemNo_BLUE_BOTTLE_e: mShopItemID = SHOP_ITEMNO_BLUE; break; - case fpcNm_ITEM_DROP_BOTTLE: + case dItemNo_DROP_BOTTLE_e: mShopItemID = SHOP_ITEMNO_DROP; break; - case fpcNm_ITEM_ARROW_10: - case fpcNm_ITEM_ARROW_20: - case fpcNm_ITEM_ARROW_30: + case dItemNo_ARROW_10_e: + case dItemNo_ARROW_20_e: + case dItemNo_ARROW_30_e: mShopItemID = SHOP_ITEMNO_ARROW; break; - case fpcNm_ITEM_SHIELD: + case dItemNo_SHIELD_e: mShopItemID = SHOP_ITEMNO_SHIELD_B; break; - case fpcNm_ITEM_HYLIA_SHIELD: + case dItemNo_HYLIA_SHIELD_e: mShopItemID = SHOP_ITEMNO_SHIELD_A; break; - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_BOMB_5: - case fpcNm_ITEM_BOMB_10: - case fpcNm_ITEM_BOMB_20: - case fpcNm_ITEM_BOMB_30: + case dItemNo_NORMAL_BOMB_e: + case dItemNo_BOMB_5_e: + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: mShopItemID = SHOP_ITEMNO_BOMB; break; - case fpcNm_ITEM_WATER_BOMB: + case dItemNo_WATER_BOMB_e: mShopItemID = SHOP_ITEMNO_WATER_BOMB; break; - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_POKE_BOMB_e: mShopItemID = SHOP_ITEMNO_POKE_BOMB; break; - case fpcNm_ITEM_BOMB_BAG_LV1: - case fpcNm_ITEM_BOMB_IN_BAG: + case dItemNo_BOMB_BAG_LV1_e: + case dItemNo_BOMB_IN_BAG_e: mShopItemID = SHOP_ITEMNO_BOMB_BAG; break; - case fpcNm_ITEM_BOMB_BAG_LV2: + case dItemNo_BOMB_BAG_LV2_e: mShopItemID = SHOP_ITEMNO_BOMB_BAG_LV2; break; - case fpcNm_ITEM_BEE_CHILD: + case dItemNo_BEE_CHILD_e: mShopItemID = SHOP_ITEMNO_BEE_CHILD; break; - case fpcNm_ITEM_PACHINKO: + case dItemNo_PACHINKO_e: mShopItemID = SHOP_ITEMNO_PACHINKO; break; - case fpcNm_ITEM_HAWK_EYE: + case dItemNo_HAWK_EYE_e: mShopItemID = SHOP_ITEMNO_HAWKEYE; break; - case fpcNm_ITEM_ARMOR: + case dItemNo_ARMOR_e: mShopItemID = SHOP_ITEMNO_ARMOR; break; default: @@ -180,7 +180,7 @@ bool daShopItem_c::_draw() { void daShopItem_c::setListStart() {} void daShopItem_c::setShadow() { - if (m_itemNo != fpcNm_ITEM_NONE) { + if (m_itemNo != dItemNo_NONE_e) { daItemBase_c::setShadow(); } else { mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mpModel, ¤t.pos, 80.0f, 0.0f, @@ -223,7 +223,7 @@ int daShopItem_c::_create() { if (getShopArcname() == NULL) { // "Display model archive name doesn't exist![%d]\n" OS_REPORT("陳列用モデルのアーカイブ名がありません！[%d]\n", m_itemNo); - m_itemNo = fpcNm_ITEM_NONE; + m_itemNo = dItemNo_NONE_e; } int phase_state = dComIfG_resLoad(&mPhase, getShopArcname()); @@ -276,18 +276,18 @@ static actor_method_class daShopItemMethodTable = { }; actor_process_profile_definition g_profile_ShopItem = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_ShopItem, - &g_fpcLf_Method.base, - sizeof(daShopItem_c), - 0, - 0, - &g_fopAc_Method.base, - 242, - &daShopItemMethodTable, - 0x60100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ShopItem_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daShopItem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_ShopItem_e, + /* Actor SubMtd */ &daShopItemMethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_skip_2D.cpp b/src/d/actor/d_a_skip_2D.cpp index d1e91a366f6..c95ea2694d5 100644 --- a/src/d/actor/d_a_skip_2D.cpp +++ b/src/d/actor/d_a_skip_2D.cpp @@ -79,18 +79,18 @@ static actor_method_class daSkip2D_MethodTable = { }; actor_process_profile_definition g_profile_SKIP2D = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_SKIP2D, - &g_fpcLf_Method.base, - sizeof(daSkip2D_c), - 0, - 0, - &g_fopAc_Method.base, - 772, - &daSkip2D_MethodTable, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SKIP2D_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSkip2D_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SKIP2D_e, + /* Actor SubMtd */ &daSkip2D_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_spinner.cpp b/src/d/actor/d_a_spinner.cpp index 497f8a75d51..1bcf1f1e0e4 100644 --- a/src/d/actor/d_a_spinner.cpp +++ b/src/d/actor/d_a_spinner.cpp @@ -478,7 +478,7 @@ int daSpinner_c::checkPathMove() { daTagSppath_c* sppath_tag = (daTagSppath_c*)mCyl.GetAtHitAc(); - if (mCyl.ChkAtHit() && mSpinnerTag == TAG_NONE && sppath_tag != NULL && fopAcM_GetName(sppath_tag) == PROC_Tag_Sppath) { + if (mCyl.ChkAtHit() && mSpinnerTag == TAG_NONE && sppath_tag != NULL && fopAcM_GetName(sppath_tag) == fpcNm_Tag_Sppath_e) { if (sppath_tag->getKeepPath() == field_0xa68) { return 0; } @@ -672,7 +672,7 @@ int daSpinner_c::execute() { move_angle = (mDoCPd_c::getStickAngle3D(PAD_1) + 0x10000 + dCam_getControledAngleY(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)))) - 0x8000; #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG - if (dComIfG_getTrigB(PAD_1) && dComIfGp_getSelectItem(3) == fpcNm_ITEM_SPINNER) { + if (dComIfG_getTrigB(PAD_1) && dComIfGp_getSelectItem(3) == dItemNo_SPINNER_e) { #else if (dComIfG_getTrigA(PAD_1)) { #endif @@ -937,20 +937,20 @@ static actor_method_class l_daSpinner_Method = { }; actor_process_profile_definition g_profile_SPINNER = { - fpcLy_CURRENT_e, // mLayerID - 4, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SPINNER, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSpinner_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 687, // mPriority - &l_daSpinner_Method, // sub_method - 0x00060000, // mStatus - fopAc_UNK_GROUP_5_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SPINNER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSpinner_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SPINNER_e, + /* Actor SubMtd */ &l_daSpinner_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_sq.cpp b/src/d/actor/d_a_sq.cpp index a8abcd01347..699be626ed6 100644 --- a/src/d/actor/d_a_sq.cpp +++ b/src/d/actor/d_a_sq.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_player.h" #include "f_op/f_op_actor_mng.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static bool hio_set; @@ -498,7 +498,7 @@ static cPhs_Step daSq_Create(fopAc_ac_c* i_this) { if (step == cPhs_COMPLEATE_e) { _this->mParam0 = fopAcM_GetParam(_this) & 0xff; if (_this->mParam0 == 1) { - fopAcM_create(PROC_NPC_SQ, fopAcM_GetParam(_this), &_this->home.pos, + fopAcM_create(fpcNm_NPC_SQ_e, fopAcM_GetParam(_this), &_this->home.pos, fopAcM_GetRoomNo(_this), &_this->home.angle, NULL, 0xff); return cPhs_ERROR_e; } @@ -586,18 +586,18 @@ static actor_method_class l_daSq_Method = { }; actor_process_profile_definition g_profile_SQ = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_SQ, - &g_fpcLf_Method.base, - sizeof(sq_class), - 0, - 0, - &g_fopAc_Method.base, - 0x2B9, - &l_daSq_Method, - 0xC0000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SQ_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(sq_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SQ_e, + /* Actor SubMtd */ &l_daSq_Method, + /* Status */ fopAcStts_UNK_0x80000_e | fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_startAndGoal.cpp b/src/d/actor/d_a_startAndGoal.cpp index 66ef5a6de65..53d5a3f007b 100644 --- a/src/d/actor/d_a_startAndGoal.cpp +++ b/src/d/actor/d_a_startAndGoal.cpp @@ -189,18 +189,18 @@ static actor_method_class l_daStartAndGoal_Method = { }; actor_process_profile_definition g_profile_START_AND_GOAL = { - fpcLy_CURRENT_e, - 9, - fpcPi_CURRENT_e, - PROC_START_AND_GOAL, - &g_fpcLf_Method.base, - sizeof(daStartAndGoal_c), - 0, - 0, - &g_fopAc_Method.base, - 391, - &l_daStartAndGoal_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_START_AND_GOAL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daStartAndGoal_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_START_AND_GOAL_e, + /* Actor SubMtd */ &l_daStartAndGoal_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_suspend.cpp b/src/d/actor/d_a_suspend.cpp index 3c4a01a3180..25e7a3934a2 100644 --- a/src/d/actor/d_a_suspend.cpp +++ b/src/d/actor/d_a_suspend.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_suspend.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daSus_c::create() { s8 roomNo = fopAcM_GetRoomNo(this); @@ -43,18 +43,18 @@ static actor_method_class daSus_METHODS = { }; actor_process_profile_definition g_profile_SUSPEND = { - fpcLy_CURRENT_e, - 11, - fpcPi_CURRENT_e, - PROC_SUSPEND, - &g_fpcLf_Method.base, - sizeof(daSus_c), - 0, - 0, - &g_fopAc_Method.base, - 763, - &daSus_METHODS, - 0x60000, - 5, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 11, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SUSPEND_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSus_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SUSPEND_e, + /* Actor SubMtd */ &daSus_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_swBall.cpp b/src/d/actor/d_a_swBall.cpp index f12c06a2f75..02580416cbb 100644 --- a/src/d/actor/d_a_swBall.cpp +++ b/src/d/actor/d_a_swBall.cpp @@ -16,7 +16,7 @@ static fopAc_ac_c* l_target_info[8]; static int l_target_info_count; static void* s_ball_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry && ((daObjCarry_c*)i_actor)->getType() == daObjCarry_c::TYPE_LV8_BALL) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_Obj_Carry_e && ((daObjCarry_c*)i_actor)->getType() == daObjCarry_c::TYPE_LV8_BALL) { if (l_target_info_count < 8) { l_target_info[l_target_info_count] = (fopAc_ac_c*)i_actor; l_target_info_count++; @@ -203,7 +203,7 @@ void daSwBall_c::PutCrrPos() { if (fopAcM_searchPlayerDistanceXZ(this) < 300.0f + KREG_F(0) && spA < 0x4000) { fopAc_ac_c* grab_actor = fopAcM_SearchByID(player->getGrabActorID()); - if (grab_actor != NULL && fopAcM_IsActor(grab_actor) && fopAcM_GetName(grab_actor) == PROC_Obj_Carry) { + if (grab_actor != NULL && fopAcM_IsActor(grab_actor) && fopAcM_GetName(grab_actor) == fpcNm_Obj_Carry_e) { daObjCarry_c* carry_obj = (daObjCarry_c*)grab_actor; if (carry_obj->getType() == daObjCarry_c::TYPE_LV8_BALL) { player->setForcePutPos(current.pos); @@ -277,18 +277,18 @@ static actor_method_class l_daSwBall_Method = { }; actor_process_profile_definition g_profile_SwBall = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SwBall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSwBall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 550, // mPriority - &l_daSwBall_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SwBall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSwBall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SwBall_e, + /* Actor SubMtd */ &l_daSwBall_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_swLBall.cpp b/src/d/actor/d_a_swLBall.cpp index a2b3cb55f1c..12fe142cefc 100644 --- a/src/d/actor/d_a_swLBall.cpp +++ b/src/d/actor/d_a_swLBall.cpp @@ -18,7 +18,7 @@ static daObjCarry_c* l_target_info[2]; static int l_target_info_count; static void* s_lb_sub(void* param_1, void* param_2) { - if ((fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry) && + if ((fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_Obj_Carry_e) && static_cast(param_1)->prm_chk_type_lightball()) { if (l_target_info_count < 2) { @@ -190,7 +190,7 @@ void daSwLBall_c::PutCrrPos() { if (fopAcM_searchPlayerDistanceXZ(this) < 300.0f && angleDiff < 0x4000) { fopAc_ac_c* carryObj = (fopAc_ac_c*)fopAcM_SearchByID(player->getGrabActorID()); if (carryObj != NULL && fopAcM_IsActor(carryObj) && - fopAcM_GetName(carryObj) == PROC_Obj_Carry && + fopAcM_GetName(carryObj) == fpcNm_Obj_Carry_e && static_cast(carryObj)->prm_chk_type_lightball()) { player->setForcePutPos(current.pos); @@ -255,18 +255,18 @@ static actor_method_class l_daSwLBall_Method = { }; actor_process_profile_definition g_profile_SwLBall = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SwLBall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSwLBall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 549, // mPriority - &l_daSwLBall_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SwLBall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSwLBall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SwLBall_e, + /* Actor SubMtd */ &l_daSwLBall_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_swTime.cpp b/src/d/actor/d_a_swTime.cpp index 949c60b2391..2d867109d48 100644 --- a/src/d/actor/d_a_swTime.cpp +++ b/src/d/actor/d_a_swTime.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_swTime.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daSwTime_c::Create() { @@ -59,18 +59,18 @@ static actor_method_class l_daSwTime_Method = { }; actor_process_profile_definition g_profile_SwTime = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SwTime, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSwTime_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 576, // mPriority - &l_daSwTime_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SwTime_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSwTime_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SwTime_e, + /* Actor SubMtd */ &l_daSwTime_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 35b4cb9f50c..0925ae08291 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -337,18 +337,18 @@ static actor_method_class l_daSwc00_Method = { }; actor_process_profile_definition g_profile_SWC00 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SWC00, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSwc00_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 277, // mPriority - &l_daSwc00_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SWC00_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSwc00_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SWC00_e, + /* Actor SubMtd */ &l_daSwc00_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 43c72561765..416a635c7fc 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -478,18 +478,18 @@ static actor_method_class l_daSwhit0_Method = { }; actor_process_profile_definition g_profile_SWHIT0 = { - fpcLy_CURRENT_e, // mLayerID - 8, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_SWHIT0, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daSwhit0_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 276, // mPriority - &l_daSwhit0_Method, // sub_method - 0x00044100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_SWHIT0_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daSwhit0_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_SWHIT0_e, + /* Actor SubMtd */ &l_daSwhit0_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_CstaSw.cpp b/src/d/actor/d_a_tag_CstaSw.cpp index 6974c3d5d36..35fe0c095e2 100644 --- a/src/d/actor/d_a_tag_CstaSw.cpp +++ b/src/d/actor/d_a_tag_CstaSw.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_CstaSw.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daTagCstaSw_HIO_c l_HIO; @@ -44,7 +44,7 @@ int daTagCstaSw_c::create() { fopAc_ac_c* daTagCstaSw_c::searchSekizoAct(void* i_actor, void* param_1) { fopAc_ac_c* actor2 = (fopAc_ac_c*)param_1; fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; - if (actor && fopAcM_IsActor(actor) && fopAcM_GetProfName(actor) == PROC_CSTAF) { + if (actor && fopAcM_IsActor(actor) && fopAcM_GetProfName(actor) == fpcNm_CSTAF_e) { return actor; } return NULL; @@ -128,18 +128,18 @@ static actor_method_class l_daTagCstaSw_Method = { }; actor_process_profile_definition g_profile_Tag_CstaSw = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_CstaSw, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagCstaSw_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 657, // mPriority - &l_daTagCstaSw_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_CstaSw_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagCstaSw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_CstaSw_e, + /* Actor SubMtd */ &l_daTagCstaSw_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_Lv6Gate.cpp b/src/d/actor/d_a_tag_Lv6Gate.cpp index caad0162a21..b6a90577386 100644 --- a/src/d/actor/d_a_tag_Lv6Gate.cpp +++ b/src/d/actor/d_a_tag_Lv6Gate.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_Lv6Gate.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static f32 const l_minRelative[] = {-700.0f, -300.0f, -2000.0f}; @@ -106,7 +106,7 @@ inline bool daTagLv6Gate_c::checkOpenArea() { for (int i = 0; i < 2; i++) { actor = - (i == 0) ? daPy_getPlayerActorClass() : fopAcM_SearchByName(PROC_NPC_TKS); + (i == 0) ? daPy_getPlayerActorClass() : fopAcM_SearchByName(fpcNm_NPC_TKS_e); if (actor != NULL) { mDoMtx_stack_c::push(); mDoMtx_stack_c::multVec(fopAcM_GetPosition_p(actor), &pos); @@ -172,7 +172,7 @@ inline int daTagLv6Gate_c::execute() { #if PLATFORM_GCN actor2 = NULL; - fopAcM_SearchByName(PROC_NPC_TKC, &actor2); + fopAcM_SearchByName(fpcNm_NPC_TKC_e, &actor2); if (actor2 == NULL) { break; @@ -295,7 +295,7 @@ void daTagLv6Gate_c::create_init() { if (!fopAcM_isSwitch(this, getSwitchNo1())) { cXyz i_pos(-13.272481f, 2887.0f, -10373.718f); csXyz i_angle(0, 0x7FFF, 0); - parentActorID = fopAcM_create(PROC_NPC_TKS, 2, &i_pos, + parentActorID = fopAcM_create(fpcNm_NPC_TKS_e, 2, &i_pos, fopAcM_GetRoomNo(this), &i_angle, NULL, -1); } } @@ -379,18 +379,18 @@ static actor_method_class l_daTagLv6Gate_Method = { }; actor_process_profile_definition g_profile_Tag_Lv6Gate = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Lv6Gate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagLv6Gate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 262, // mPriority - &l_daTagLv6Gate_Method, // sub_method - 0x40000, // mStatus - 0, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv6Gate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagLv6Gate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv6Gate_e, + /* Actor SubMtd */ &l_daTagLv6Gate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_Lv7Gate.cpp b/src/d/actor/d_a_tag_Lv7Gate.cpp index 7571fd2caed..6d149066ca3 100644 --- a/src/d/actor/d_a_tag_Lv7Gate.cpp +++ b/src/d/actor/d_a_tag_Lv7Gate.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_Lv7Gate.h" #include "d/actor/d_a_player.h" #include "d/d_path.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName = "Lv7Gate"; @@ -147,13 +147,13 @@ void daTagLv7Gate_c::create_init() { csXyz local_54(getFlowNodeNo(), -0x4000, 0); - fopAcM_create(PROC_NPC_TKS, 7, &pos, fopAcM_GetRoomNo(this), &local_54, NULL, -1); + fopAcM_create(fpcNm_NPC_TKS_e, 7, &pos, fopAcM_GetRoomNo(this), &local_54, NULL, -1); pos.set(2603.315f, -200.0f, 5485.9224f); local_54.set(0, -0x4000, 0); - fopAcM_create(PROC_NPC_TKJ, 0, &pos, fopAcM_GetRoomNo(this), &local_54, NULL, -1); + fopAcM_create(fpcNm_NPC_TKJ_e, 0, &pos, fopAcM_GetRoomNo(this), &local_54, NULL, -1); } } eventInfo.setArchiveName(l_arcName); @@ -360,18 +360,18 @@ static actor_method_class l_daTagLv7Gate_Method = { }; actor_process_profile_definition g_profile_Tag_Lv7Gate = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Lv7Gate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagLv7Gate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 263, // mPriority - &l_daTagLv7Gate_Method, // sub_method - 0x40000, // mStatus - 0, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv7Gate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagLv7Gate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv7Gate_e, + /* Actor SubMtd */ &l_daTagLv7Gate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_Lv8Gate.cpp b/src/d/actor/d_a_tag_Lv8Gate.cpp index 6927449e869..ae87241f2ce 100644 --- a/src/d/actor/d_a_tag_Lv8Gate.cpp +++ b/src/d/actor/d_a_tag_Lv8Gate.cpp @@ -5,7 +5,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_obj_mirror_table.h" #include @@ -136,7 +136,7 @@ int daTagLv8Gate_c::execute() { daPy_getPlayerActorClass()->setPlayerPosAndAngle(¤t.pos, shape_angle.y, 0); - fopAc_ac_c* mirror_table = fopAcM_SearchByName(PROC_Obj_MirrorTable); + fopAc_ac_c* mirror_table = fopAcM_SearchByName(fpcNm_Obj_MirrorTable_e); if (mirror_table != NULL) { static_cast(mirror_table)->setEffect(); } @@ -235,18 +235,18 @@ static actor_method_class l_daTagLv8Gate_Method = { }; actor_process_profile_definition g_profile_Tag_Lv8Gate = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Lv8Gate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagLv8Gate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0x108, // mPriority - &l_daTagLv8Gate_Method, // sub_method - 0x40000, // mStatus - 0, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv8Gate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagLv8Gate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv8Gate_e, + /* Actor SubMtd */ &l_daTagLv8Gate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_TWgate.cpp b/src/d/actor/d_a_tag_TWgate.cpp index eadfb3342bd..e5bfac29e1c 100644 --- a/src/d/actor/d_a_tag_TWgate.cpp +++ b/src/d/actor/d_a_tag_TWgate.cpp @@ -1177,18 +1177,18 @@ static actor_method_class l_daTagTWGate_Method = { }; actor_process_profile_definition g_profile_Tag_TWGate = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_TWGate, - &g_fpcLf_Method.base, - sizeof(daTagTWGate_c), - 0, - 0, - &g_fopAc_Method.base, - 0x105, - &l_daTagTWGate_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_TWGate_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagTWGate_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_TWGate_e, + /* Actor SubMtd */ &l_daTagTWGate_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_ajnot.cpp b/src/d/actor/d_a_tag_ajnot.cpp index 988af1ff42b..6634e7c3340 100644 --- a/src/d/actor/d_a_tag_ajnot.cpp +++ b/src/d/actor/d_a_tag_ajnot.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tag_ajnot.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTagAJnot_c::create() { fopAcM_ct(this, daTagAJnot_c); @@ -66,18 +66,18 @@ static actor_method_class l_daTagAJnot_Method = { }; actor_process_profile_definition g_profile_Tag_AJnot = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Tag_AJnot, - &g_fpcLf_Method.base, - sizeof(daTagAJnot_c), - 0, - 0, - &g_fopAc_Method.base, - 436, - &l_daTagAJnot_Method, - 0x44000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_AJnot_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagAJnot_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_AJnot_e, + /* Actor SubMtd */ &l_daTagAJnot_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_allmato.cpp b/src/d/actor/d_a_tag_allmato.cpp index 2a2c94acfb4..c9414bf7555 100644 --- a/src/d/actor/d_a_tag_allmato.cpp +++ b/src/d/actor/d_a_tag_allmato.cpp @@ -273,7 +273,7 @@ void* daTag_AllMato_c::srchBouMato(void* i_actor, void* i_data) { if (l_findCount < 100) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_BOUMATO) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == fpcNm_OBJ_BOUMATO_e) { l_findActorPtrs[l_findCount] = actor; l_findCount++; } @@ -288,7 +288,7 @@ void* daTag_AllMato_c::srchItaMato(void* i_actor, void* i_data) { if (l_findCount < 100) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_ITAMATO) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == fpcNm_OBJ_ITAMATO_e) { l_findActorPtrs[l_findCount] = actor; l_findCount++; } @@ -303,7 +303,7 @@ void* daTag_AllMato_c::srchTaro(void* i_actor, void* i_data) { if (l_findCount < 100) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == PROC_NPC_TARO) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == fpcNm_NPC_TARO_e) { l_findActorPtrs[l_findCount] = actor; l_findCount++; } @@ -318,7 +318,7 @@ void* daTag_AllMato_c::srchArrow(void* i_actor, void* i_data) { if (l_findCount < 100) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; if (actor != NULL && actor != data) { - if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == PROC_ARROW) { + if (fopAcM_IsExecuting(fopAcM_GetID(actor)) && fopAcM_GetName(i_actor) == fpcNm_ARROW_e) { l_findActorPtrs[l_findCount] = actor; l_findCount++; } @@ -593,18 +593,18 @@ static actor_method_class daTag_AllMato_MethodTable = { }; actor_process_profile_definition g_profile_TAG_ALLMATO = { - fpcLy_CURRENT_e, // mLayerID - 10, // mListID - fpcPi_CURRENT_e, // mListPri - PROC_TAG_ALLMATO, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_AllMato_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 288, // mPriority - &daTag_AllMato_MethodTable, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 10, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_ALLMATO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_AllMato_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_ALLMATO_e, + /* Actor SubMtd */ &daTag_AllMato_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_arena.cpp b/src/d/actor/d_a_tag_arena.cpp index 24ba2b1c86d..f8eaef153cf 100644 --- a/src/d/actor/d_a_tag_arena.cpp +++ b/src/d/actor/d_a_tag_arena.cpp @@ -25,18 +25,18 @@ static actor_method_class l_daTagArena_Method = { }; actor_process_profile_definition g_profile_Tag_Arena = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Arena, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagArena_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 333, // mPriority - &l_daTagArena_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Arena_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagArena_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Arena_e, + /* Actor SubMtd */ &l_daTagArena_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_assistance.cpp b/src/d/actor/d_a_tag_assistance.cpp index 62fdc624f96..a78a43f264d 100644 --- a/src/d/actor/d_a_tag_assistance.cpp +++ b/src/d/actor/d_a_tag_assistance.cpp @@ -53,18 +53,18 @@ static actor_method_class l_daTagAssist_Method = { }; actor_process_profile_definition g_profile_Tag_Assist = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Assist, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagAssist_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 266, // mPriority - &l_daTagAssist_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Assist_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagAssist_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Assist_e, + /* Actor SubMtd */ &l_daTagAssist_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_attack_item.cpp b/src/d/actor/d_a_tag_attack_item.cpp index b0efb7fa6ff..d07d511934f 100644 --- a/src/d/actor/d_a_tag_attack_item.cpp +++ b/src/d/actor/d_a_tag_attack_item.cpp @@ -208,18 +208,18 @@ static actor_method_class l_daTagAtkItem_Method = { }; actor_process_profile_definition g_profile_Tag_AttackItem = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_AttackItem, - &g_fpcLf_Method.base, - sizeof(daTagAtkItem_c), - 0, - 0, - &g_fopAc_Method.base, - 585, - &l_daTagAtkItem_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_AttackItem_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagAtkItem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_AttackItem_e, + /* Actor SubMtd */ &l_daTagAtkItem_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp index 270fc030a87..339818c7728 100644 --- a/src/d/actor/d_a_tag_attention.cpp +++ b/src/d/actor/d_a_tag_attention.cpp @@ -290,18 +290,18 @@ static actor_method_class l_daAttp_Method = { }; actor_process_profile_definition g_profile_Tag_Attp = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Attp, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daAttp_c), // mSize - 0, // mSizeOther - 0, // mParameter - &g_fopAc_Method.base, // sub_method - 440, // mPriority - &l_daAttp_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Attp_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daAttp_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Attp_e, + /* Actor SubMtd */ &l_daAttp_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_bottle_item.cpp b/src/d/actor/d_a_tag_bottle_item.cpp index 77128dee7b9..1cfd2447a84 100644 --- a/src/d/actor/d_a_tag_bottle_item.cpp +++ b/src/d/actor/d_a_tag_bottle_item.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_tag_bottle_item.h" #include "d/d_item.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" int daTag_BottleItem_c::create() { @@ -113,15 +113,15 @@ int daTag_BottleItem_c::chkEvent() { int daTag_BottleItem_c::orderEvent() { makeSoup(); - if (!daPy_py_c::checkNowWolf() && mBottleItemType != fpcNm_ITEM_EMPTY_BOTTLE) { + if (!daPy_py_c::checkNowWolf() && mBottleItemType != dItemNo_EMPTY_BOTTLE_e) { attention_info.flags = (fopAc_AttnFlag_TALKCHECK_e | fopAc_AttnFlag_SPEAK_e); } else { attention_info.flags = 0; } if (attention_info.flags == (fopAc_AttnFlag_TALKCHECK_e | fopAc_AttnFlag_SPEAK_e)) { - attention_info.distances[fopAc_attn_TALK_e] = fpcNm_ITEM_EMPTY_BOTTLE; - attention_info.distances[fopAc_attn_SPEAK_e] = fpcNm_ITEM_EMPTY_BOTTLE; + attention_info.distances[fopAc_attn_TALK_e] = dItemNo_EMPTY_BOTTLE_e; + attention_info.distances[fopAc_attn_SPEAK_e] = dItemNo_EMPTY_BOTTLE_e; eventInfo.onCondition(dEvtCnd_CANTALK_e); } @@ -129,16 +129,16 @@ int daTag_BottleItem_c::orderEvent() { } void daTag_BottleItem_c::makeSoup() { - if (mBottleItemType == fpcNm_ITEM_LV1_SOUP + if (mBottleItemType == dItemNo_LV1_SOUP_e /* dSv_event_flag_c::F_0003 - Snowpeak Ruins - Handed over tomato puree and left room */ && dComIfGs_isEventBit(2)) { - mBottleItemType = fpcNm_ITEM_LV2_SOUP; + mBottleItemType = dItemNo_LV2_SOUP_e; } - if (mBottleItemType == fpcNm_ITEM_LV2_SOUP + if (mBottleItemType == dItemNo_LV2_SOUP_e /* dSv_event_flag_c::F_0004 - Snowpeak Ruins - Handed over secret ingredient and left room */ && dComIfGs_isEventBit(1)) { - mBottleItemType = fpcNm_ITEM_LV3_SOUP; + mBottleItemType = dItemNo_LV3_SOUP_e; } } @@ -192,18 +192,18 @@ static actor_method_class daTag_BottleItem_MethodTable = { }; actor_process_profile_definition g_profile_TAG_BTLITM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPri - PROC_TAG_SSDRINK, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_BottleItem_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 70, // mPriority - &daTag_BottleItem_MethodTable, // sub_method - 0x64100, // mStatus - 5, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_SSDRINK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_BottleItem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_SSDRINK_e, + /* Actor SubMtd */ &daTag_BottleItem_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp index 5378ff11828..a25e1a942fb 100644 --- a/src/d/actor/d_a_tag_camera.cpp +++ b/src/d/actor/d_a_tag_camera.cpp @@ -331,18 +331,18 @@ static actor_method_class l_daTag_Cam_Method = { }; actor_process_profile_definition g_profile_TAG_CAMERA = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_CAMERA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_Cam_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 279, // mPriority - &l_daTag_Cam_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_CAMERA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Cam_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_CAMERA_e, + /* Actor SubMtd */ &l_daTag_Cam_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_chgrestart.cpp b/src/d/actor/d_a_tag_chgrestart.cpp index 626f268847c..352341051e6 100644 --- a/src/d/actor/d_a_tag_chgrestart.cpp +++ b/src/d/actor/d_a_tag_chgrestart.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_chgrestart.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daTagChgRestart_HIO_c : public mDoHIO_entry_c { public: @@ -188,18 +188,18 @@ static actor_method_class l_daTagChgRestart_Method = { }; actor_process_profile_definition g_profile_Tag_ChgRestart = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_ChgRestart, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagChgRestart_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 591, // mPriority - &l_daTagChgRestart_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_ChgRestart_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagChgRestart_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_ChgRestart_e, + /* Actor SubMtd */ &l_daTagChgRestart_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp index 6b79abf81af..56df12bd532 100644 --- a/src/d/actor/d_a_tag_chkpoint.cpp +++ b/src/d/actor/d_a_tag_chkpoint.cpp @@ -135,18 +135,18 @@ static actor_method_class l_daTag_Chk_Method = { (process_method_func)daTag_Chk_Draw}; actor_process_profile_definition g_profile_TAG_CHKPOINT = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_CHKPOINT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_Chk_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 280, // mPriority - &l_daTag_Chk_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_6_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_CHKPOINT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Chk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_CHKPOINT_e, + /* Actor SubMtd */ &l_daTag_Chk_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_csw.cpp b/src/d/actor/d_a_tag_csw.cpp index f8638cde951..8e778acf67b 100644 --- a/src/d/actor/d_a_tag_csw.cpp +++ b/src/d/actor/d_a_tag_csw.cpp @@ -248,7 +248,7 @@ int daTagCsw_c::create() { static void* searchTagCswOut(void* param_0, void* param_1) { UNUSED(param_1); - if (param_0 != NULL && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == PROC_TAG_CSW) { + if (param_0 != NULL && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == fpcNm_TAG_CSW_e) { daTagCsw_c* csw1 = static_cast(param_0); daTagCsw_c* csw2 = static_cast(param_1); if (csw1->getType() == 1) { @@ -262,7 +262,7 @@ static void* searchTagCswOut(void* param_0, void* param_1) { static void* searchCStatue(void* param_0, void* param_1) { UNUSED(param_1); - if (param_0 != NULL && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == PROC_CSTATUE) { + if (param_0 != NULL && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == fpcNm_CSTATUE_e) { daCstatue_c* cstatue = static_cast(param_0); if (cstatue->checkNormalType()) { return param_0; @@ -550,18 +550,18 @@ static actor_method_class l_daTagCsw_Method = { }; actor_process_profile_definition g_profile_TAG_CSW = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_CSW, - &g_fpcLf_Method.base, - sizeof(daTagCsw_c), - 0, - 0, - &g_fopAc_Method.base, - 0x111, - &l_daTagCsw_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_CSW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagCsw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_CSW_e, + /* Actor SubMtd */ &l_daTagCsw_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_escape.cpp b/src/d/actor/d_a_tag_escape.cpp index 7b18f747d16..7300968c4db 100644 --- a/src/d/actor/d_a_tag_escape.cpp +++ b/src/d/actor/d_a_tag_escape.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_escape.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTagEscape_c::create() { fopAcM_ct(this, daTagEscape_c); @@ -34,18 +34,18 @@ static actor_method_class l_daTagEscape_Method = { }; actor_process_profile_definition g_profile_Tag_Escape = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Escape, - &g_fpcLf_Method.base, - sizeof(daTagEscape_c), - 0, - 0, - &g_fopAc_Method.base, - 397, - &l_daTagEscape_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Escape_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagEscape_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Escape_e, + /* Actor SubMtd */ &l_daTagEscape_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index f772ebc349b..adcef6c6117 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -370,18 +370,18 @@ static actor_method_class l_daTag_Event_Method = { }; actor_process_profile_definition g_profile_TAG_EVENT = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_EVENT, - &g_fpcLf_Method.base, - sizeof(daTag_Event_c), - 0, - 0, - &g_fopAc_Method.base, - 281, - &l_daTag_Event_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_EVENT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Event_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_EVENT_e, + /* Actor SubMtd */ &l_daTag_Event_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp index 47606b7e02d..2552f59e24b 100644 --- a/src/d/actor/d_a_tag_evt.cpp +++ b/src/d/actor/d_a_tag_evt.cpp @@ -242,18 +242,18 @@ static actor_method_class daTag_Evt_MethodTable = { }; actor_process_profile_definition g_profile_TAG_EVT = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_EVT, - &g_fpcLf_Method.base, - sizeof(daTag_Evt_c), - 0, - 0, - &g_fopAc_Method.base, - 0x011C, - &daTag_Evt_MethodTable, - 0x40000, - 0, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_EVT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Evt_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_EVT_e, + /* Actor SubMtd */ &daTag_Evt_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_evtarea.cpp b/src/d/actor/d_a_tag_evtarea.cpp index 1a60b4f8673..a3f403eb948 100644 --- a/src/d/actor/d_a_tag_evtarea.cpp +++ b/src/d/actor/d_a_tag_evtarea.cpp @@ -6,7 +6,7 @@ #include "d/actor/d_a_tag_evtarea.h" #include "d/actor/d_a_npc.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" cPhs_Step daTag_EvtArea_c::create() { int var_r28 = 0; @@ -232,18 +232,18 @@ static actor_method_class daTag_EvtArea_MethodTable = { }; actor_process_profile_definition g_profile_TAG_EVTAREA = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_TAG_EVTAREA, - &g_fpcLf_Method.base, - sizeof(daTag_EvtArea_c), - 0, - 0, - &g_fopAc_Method.base, - 287, - &daTag_EvtArea_MethodTable, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_EVTAREA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_EvtArea_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_EVTAREA_e, + /* Actor SubMtd */ &daTag_EvtArea_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_evtmsg.cpp b/src/d/actor/d_a_tag_evtmsg.cpp index 26d64f664b9..8a2035f147b 100644 --- a/src/d/actor/d_a_tag_evtmsg.cpp +++ b/src/d/actor/d_a_tag_evtmsg.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_evtmsg.h" #include "d/actor/d_a_npc4.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" enum evt_cut_e { EVT_CUT_NONE_e, @@ -242,18 +242,18 @@ static actor_method_class daTag_EvtMsg_MethodTable = { }; actor_process_profile_definition g_profile_TAG_EVTMSG = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_MSG, - &g_fpcLf_Method.base, - sizeof(daTag_EvtMsg_c), - 0, - 0, - &g_fopAc_Method.base, - 285, - &daTag_EvtMsg_MethodTable, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_MSG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_EvtMsg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_MSG_e, + /* Actor SubMtd */ &daTag_EvtMsg_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp index 29212c89c06..34264045bb0 100644 --- a/src/d/actor/d_a_tag_firewall.cpp +++ b/src/d/actor/d_a_tag_firewall.cpp @@ -219,18 +219,18 @@ static actor_method_class l_daTag_FWall_Method = { }; actor_process_profile_definition g_profile_Tag_FWall = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_FWall, - &g_fpcLf_Method.base, - sizeof(daTag_FWall_c), - 0, - 0, - &g_fopAc_Method.base, - 197, - &l_daTag_FWall_Method, - 0x60100, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_FWall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_FWall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_FWall_e, + /* Actor SubMtd */ &l_daTag_FWall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_gra.cpp b/src/d/actor/d_a_tag_gra.cpp index fe5b3dd91d8..d42cfdd26ee 100644 --- a/src/d/actor/d_a_tag_gra.cpp +++ b/src/d/actor/d_a_tag_gra.cpp @@ -25,18 +25,18 @@ static actor_method_class l_daTagGra_Method = { }; actor_process_profile_definition g_profile_TAG_GRA = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_GRA, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagGra_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 20, // mPriority - &l_daTagGra_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_GRA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagGra_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_GRA_e, + /* Actor SubMtd */ &l_daTagGra_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_gstart.cpp b/src/d/actor/d_a_tag_gstart.cpp index dbf64577b6e..d982cb1c517 100644 --- a/src/d/actor/d_a_tag_gstart.cpp +++ b/src/d/actor/d_a_tag_gstart.cpp @@ -62,18 +62,18 @@ static actor_method_class l_daTagGstart_Method = { }; actor_process_profile_definition g_profile_Tag_Gstart = { - fpcLy_CURRENT_e, - 2, - fpcPi_CURRENT_e, - PROC_Tag_Gstart, - &g_fpcLf_Method.base, - sizeof(daTagGstart_c), - 0, - 0, - &g_fopAc_Method.base, - 437, - &l_daTagGstart_Method, - 0x60000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Gstart_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagGstart_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Gstart_e, + /* Actor SubMtd */ &l_daTagGstart_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_guard.cpp b/src/d/actor/d_a_tag_guard.cpp index 661a907e70f..5f3a62613a4 100644 --- a/src/d/actor/d_a_tag_guard.cpp +++ b/src/d/actor/d_a_tag_guard.cpp @@ -27,7 +27,7 @@ void daTagGuard_c::createGuard(u32 i_parameters) { i_parameters |= getPathID() << 0x10; } - fopAcM_createChild(PROC_NPC_GUARD, fopAcM_GetID(this), i_parameters, &pos, + fopAcM_createChild(fpcNm_NPC_GUARD_e, fopAcM_GetID(this), i_parameters, &pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1, NULL); } @@ -75,18 +75,18 @@ static actor_method_class l_daTagGuard_Method = { }; actor_process_profile_definition g_profile_TAG_GUARD = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_GUARD, - &g_fpcLf_Method.base, - sizeof(daTagGuard_c), - 0, - 0, - &g_fopAc_Method.base, - 408, - &l_daTagGuard_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_GUARD_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagGuard_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_GUARD_e, + /* Actor SubMtd */ &l_daTagGuard_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_hinit.cpp b/src/d/actor/d_a_tag_hinit.cpp index 6f9207cf07d..80f598515e6 100644 --- a/src/d/actor/d_a_tag_hinit.cpp +++ b/src/d/actor/d_a_tag_hinit.cpp @@ -74,18 +74,18 @@ static actor_method_class l_daTagHinit_Method = { }; actor_process_profile_definition g_profile_Tag_Hinit = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Tag_Hinit, - &g_fpcLf_Method.base, - sizeof(daTagHinit_c), - 0, - 0, - &g_fopAc_Method.base, - 433, - &l_daTagHinit_Method, - 0x60000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Hinit_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagHinit_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Hinit_e, + /* Actor SubMtd */ &l_daTagHinit_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_hjump.cpp b/src/d/actor/d_a_tag_hjump.cpp index 0692347e800..7f57cbcf441 100644 --- a/src/d/actor/d_a_tag_hjump.cpp +++ b/src/d/actor/d_a_tag_hjump.cpp @@ -229,18 +229,18 @@ static actor_method_class l_daTagHjump_Method = { }; actor_process_profile_definition g_profile_Tag_Hjump = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Tag_Hjump, - &g_fpcLf_Method.base, - sizeof(daTagHjump_c), - 0, - 0, - &g_fopAc_Method.base, - 434, - &l_daTagHjump_Method, - 0x44100, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Hjump_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagHjump_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Hjump_e, + /* Actor SubMtd */ &l_daTagHjump_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_howl.cpp b/src/d/actor/d_a_tag_howl.cpp index a93a9584f99..ea1e2b013ef 100644 --- a/src/d/actor/d_a_tag_howl.cpp +++ b/src/d/actor/d_a_tag_howl.cpp @@ -99,18 +99,18 @@ static actor_method_class daTag_Howl_MethodTable = { }; actor_process_profile_definition g_profile_TAG_HOWL = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_HOWL, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_Howl_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 283, // mPriority - &daTag_Howl_MethodTable, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_HOWL_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Howl_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_HOWL_e, + /* Actor SubMtd */ &daTag_Howl_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_hstop.cpp b/src/d/actor/d_a_tag_hstop.cpp index 54b5d4a3dd7..589fb71b29f 100644 --- a/src/d/actor/d_a_tag_hstop.cpp +++ b/src/d/actor/d_a_tag_hstop.cpp @@ -206,18 +206,18 @@ static actor_method_class l_daTagHstop_Method = { }; actor_process_profile_definition g_profile_Tag_Hstop = { - fpcLy_CURRENT_e, - 3, - fpcPi_CURRENT_e, - PROC_Tag_Hstop, - &g_fpcLf_Method.base, - sizeof(daTagHstop_c), - 0, - 0, - &g_fopAc_Method.base, - 435, - &l_daTagHstop_Method, - 0x40000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Hstop_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagHstop_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Hstop_e, + /* Actor SubMtd */ &l_daTagHstop_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_instruction.cpp b/src/d/actor/d_a_tag_instruction.cpp index cfee3518c02..e59488c37b1 100644 --- a/src/d/actor/d_a_tag_instruction.cpp +++ b/src/d/actor/d_a_tag_instruction.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_instruction.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static int daTagInst_Create(fopAc_ac_c* i_this) { int id = fopAcM_GetID(i_this); @@ -29,18 +29,18 @@ static actor_method_class l_daTagInst_Method = { }; actor_process_profile_definition g_profile_Tag_Instruction = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Instruction, - &g_fpcLf_Method.base, - sizeof(daTagInst_c), - 0, - 0, - &g_fopAc_Method.base, - 334, - &l_daTagInst_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Instruction_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagInst_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Instruction_e, + /* Actor SubMtd */ &l_daTagInst_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_kago_fall.cpp b/src/d/actor/d_a_tag_kago_fall.cpp index 369ff1aba51..2ce69dabf91 100644 --- a/src/d/actor/d_a_tag_kago_fall.cpp +++ b/src/d/actor/d_a_tag_kago_fall.cpp @@ -6,7 +6,7 @@ #include "d/d_camera.h" #include "d/d_com_inf_game.h" #include "d/d_msg_object.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_graphic.h" @@ -275,18 +275,18 @@ static actor_method_class l_daTagKagoFall_Method = { }; actor_process_profile_definition g_profile_Tag_KagoFall = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_KagoFall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagKagoFall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 557, // mPriority - &l_daTagKagoFall_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_KagoFall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagKagoFall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_KagoFall_e, + /* Actor SubMtd */ &l_daTagKagoFall_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_kmsg.cpp b/src/d/actor/d_a_tag_kmsg.cpp index 8c2d036149f..760884bc3a1 100644 --- a/src/d/actor/d_a_tag_kmsg.cpp +++ b/src/d/actor/d_a_tag_kmsg.cpp @@ -270,18 +270,18 @@ static actor_method_class daTag_KMsg_MethodTable = { }; actor_process_profile_definition g_profile_TAG_KMSG = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_TAG_KMSG, - &g_fpcLf_Method.base, - sizeof(daTag_KMsg_c), - 0, - 0, - &g_fopAc_Method.base, - 0x122, - &daTag_KMsg_MethodTable, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_KMSG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_KMsg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_KMSG_e, + /* Actor SubMtd */ &daTag_KMsg_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_lantern.cpp b/src/d/actor/d_a_tag_lantern.cpp index 7475077177e..264a0c19874 100644 --- a/src/d/actor/d_a_tag_lantern.cpp +++ b/src/d/actor/d_a_tag_lantern.cpp @@ -9,7 +9,7 @@ #include "JSystem/JHostIO/JORFile.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include static TAG_LANTERN_HIO_CLASS l_HIO; @@ -169,18 +169,18 @@ static actor_method_class daTag_Lantern_MethodTable = { }; actor_process_profile_definition g_profile_TAG_LANTERN = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_LANTERN, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_Lantern_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 286, // mPriority - &daTag_Lantern_MethodTable, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_LANTERN_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Lantern_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_LANTERN_e, + /* Actor SubMtd */ &daTag_Lantern_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_lightball.cpp b/src/d/actor/d_a_tag_lightball.cpp index e26b245b02f..e6bc73ed78d 100644 --- a/src/d/actor/d_a_tag_lightball.cpp +++ b/src/d/actor/d_a_tag_lightball.cpp @@ -4,7 +4,7 @@ #include "d/actor/d_a_tag_lightball.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daTagLightBall_c::initBaseMtx() { setBaseMtx(); @@ -119,18 +119,18 @@ static actor_method_class l_daTagLightBall_Method = { }; actor_process_profile_definition g_profile_Tag_LightBall = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_LightBall, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagLightBall_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 547, // mPriority - &l_daTagLightBall_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_LightBall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagLightBall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_LightBall_e, + /* Actor SubMtd */ &l_daTagLightBall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_lv2prchk.cpp b/src/d/actor/d_a_tag_lv2prchk.cpp index 8b074baa8ac..dbea932afd0 100644 --- a/src/d/actor/d_a_tag_lv2prchk.cpp +++ b/src/d/actor/d_a_tag_lv2prchk.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tag_lv2prchk.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTagLv2PrChk_c::Create() { mSwbit2 = getSwbit2(); @@ -189,18 +189,18 @@ static actor_method_class l_daTagLv2PrChk_Method = { }; actor_process_profile_definition g_profile_Tag_Lv2PrChk = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Lv2PrChk, - &g_fpcLf_Method.base, - sizeof(daTagLv2PrChk_c), - 0, - 0, - &g_fopAc_Method.base, - 558, - &l_daTagLv2PrChk_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv2PrChk_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagLv2PrChk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv2PrChk_e, + /* Actor SubMtd */ &l_daTagLv2PrChk_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_lv5soup.cpp b/src/d/actor/d_a_tag_lv5soup.cpp index dfd532d615a..6039804791a 100644 --- a/src/d/actor/d_a_tag_lv5soup.cpp +++ b/src/d/actor/d_a_tag_lv5soup.cpp @@ -83,18 +83,18 @@ static actor_method_class daTag_Lv5Soup_MethodTable = { }; actor_process_profile_definition g_profile_TAG_LV5SOUP = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - 0x122, - &g_fpcLf_Method.base, - sizeof(daTag_Lv5Soup_c), - 0, - 0, - &g_fopAc_Method.base, - 70, - &daTag_Lv5Soup_MethodTable, - 0x64100, - 5, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_SSDRINK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Lv5Soup_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_SSDRINK_e, + /* Actor SubMtd */ &daTag_Lv5Soup_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_lv6CstaSw.cpp b/src/d/actor/d_a_tag_lv6CstaSw.cpp index 14150299eba..843bc682941 100644 --- a/src/d/actor/d_a_tag_lv6CstaSw.cpp +++ b/src/d/actor/d_a_tag_lv6CstaSw.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_lv6CstaSw.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static daLv6CstaSw_HIO_c l_HIO; @@ -43,7 +43,7 @@ int daLv6CstaSw_c::create() { fopAc_ac_c* daLv6CstaSw_c::searchSekizoAct(void* i_actor, void* param_1) { fopAc_ac_c* actor2 = (fopAc_ac_c*)param_1; fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; - if (actor != NULL && fopAcM_IsActor(actor) && fopAcM_GetProfName(actor) == PROC_CSTATUE) { + if (actor != NULL && fopAcM_IsActor(actor) && fopAcM_GetProfName(actor) == fpcNm_CSTATUE_e) { return actor; } @@ -128,18 +128,18 @@ static actor_method_class l_daLv6CstaSw_Method = { }; actor_process_profile_definition g_profile_Tag_Lv6CstaSw = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Lv6CstaSw, - &g_fpcLf_Method.base, - sizeof(daLv6CstaSw_c), - 0, - 0, - &g_fopAc_Method.base, - 658, - &l_daLv6CstaSw_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Lv6CstaSw_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daLv6CstaSw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Lv6CstaSw_e, + /* Actor SubMtd */ &l_daLv6CstaSw_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_magne.cpp b/src/d/actor/d_a_tag_magne.cpp index 0ade82b3e48..8b47511eeb3 100644 --- a/src/d/actor/d_a_tag_magne.cpp +++ b/src/d/actor/d_a_tag_magne.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_magne.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTagMagne_c::Create() { if (mTagMagne != NULL) { @@ -64,18 +64,18 @@ static actor_method_class l_daTagMagne_Method = { }; actor_process_profile_definition g_profile_Tag_Magne = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Magne, - &g_fpcLf_Method.base, - sizeof(daTagMagne_c), - 0, - 0, - &g_fopAc_Method.base, - 590, - &l_daTagMagne_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Magne_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMagne_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Magne_e, + /* Actor SubMtd */ &l_daTagMagne_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_mhint.cpp b/src/d/actor/d_a_tag_mhint.cpp index d1ac38d8ad2..c1afbde4e48 100644 --- a/src/d/actor/d_a_tag_mhint.cpp +++ b/src/d/actor/d_a_tag_mhint.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_midna.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_meter2_info.h" #include @@ -240,18 +240,18 @@ static actor_method_class l_daTagMhint_Method = { }; actor_process_profile_definition g_profile_Tag_Mhint = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Mhint, - &g_fpcLf_Method.base, - sizeof(daTagMhint_c), - 0, - 0, - &g_fopAc_Method.base, - 254, - &l_daTagMhint_Method, - 0x44000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Mhint_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMhint_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Mhint_e, + /* Actor SubMtd */ &l_daTagMhint_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_mist.cpp b/src/d/actor/d_a_tag_mist.cpp index 5b55240b58a..de8756a971f 100644 --- a/src/d/actor/d_a_tag_mist.cpp +++ b/src/d/actor/d_a_tag_mist.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_mist.h" #include "d/d_com_inf_game.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daTagMist_HIO_c : public mDoHIO_entry_c { public: @@ -211,18 +211,18 @@ static actor_method_class l_daTagMist_Method = { }; actor_process_profile_definition g_profile_Tag_Mist = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Mist, - &g_fpcLf_Method.base, - sizeof(daTagMist_c), - 0, - 0, - &g_fopAc_Method.base, - 292, - &l_daTagMist_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Mist_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMist_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Mist_e, + /* Actor SubMtd */ &l_daTagMist_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_mmsg.cpp b/src/d/actor/d_a_tag_mmsg.cpp index 11bf28eb00a..f5da6c8ab0f 100644 --- a/src/d/actor/d_a_tag_mmsg.cpp +++ b/src/d/actor/d_a_tag_mmsg.cpp @@ -99,18 +99,18 @@ static actor_method_class l_daTagMmsg_Method = { }; actor_process_profile_definition g_profile_Tag_Mmsg = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Mmsg, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagMmsg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 255, // mPriority - &l_daTagMmsg_Method, // sub_method - 0x44000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Mmsg_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMmsg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Mmsg_e, + /* Actor SubMtd */ &l_daTagMmsg_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index ececc7926ef..b244ce837cb 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -276,18 +276,18 @@ static actor_method_class daTag_Msg_MethodTable = { }; actor_process_profile_definition g_profile_TAG_MSG = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_MSG, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_Msg_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 285, // mPriority - &daTag_Msg_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_MSG_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Msg_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_MSG_e, + /* Actor SubMtd */ &daTag_Msg_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_mstop.cpp b/src/d/actor/d_a_tag_mstop.cpp index 5094221a066..d3fecddebf5 100644 --- a/src/d/actor/d_a_tag_mstop.cpp +++ b/src/d/actor/d_a_tag_mstop.cpp @@ -173,18 +173,18 @@ static actor_method_class l_daTagMstop_Method = { (process_method_func)daTagMstop_Execute, NULL, (process_method_func)daTagMstop_Draw}; actor_process_profile_definition g_profile_Tag_Mstop = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Mstop, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagMstop_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 257 , // mPriority - &l_daTagMstop_Method, // sub_method - 0x44000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Mstop_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMstop_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Mstop_e, + /* Actor SubMtd */ &l_daTagMstop_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_mwait.cpp b/src/d/actor/d_a_tag_mwait.cpp index 198c2e9fdb2..c8ea32413b5 100644 --- a/src/d/actor/d_a_tag_mwait.cpp +++ b/src/d/actor/d_a_tag_mwait.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tag_mwait.h" #include "d/actor/d_a_midna.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTagMwait_c::create() { fopAcM_ct(this, daTagMwait_c); @@ -159,18 +159,18 @@ static actor_method_class l_daTagMwait_Method = { }; actor_process_profile_definition g_profile_Tag_Mwait = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Mwait, - &g_fpcLf_Method.base, - sizeof(daTagMwait_c), - 0, - 0, - &g_fopAc_Method.base, - 256, - &l_daTagMwait_Method, - 0x44000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Mwait_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMwait_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Mwait_e, + /* Actor SubMtd */ &l_daTagMwait_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_myna2.cpp b/src/d/actor/d_a_tag_myna2.cpp index 1c048d20afa..ec518c48ea2 100644 --- a/src/d/actor/d_a_tag_myna2.cpp +++ b/src/d/actor/d_a_tag_myna2.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_player.h" #include "d/actor/d_a_tag_myna2.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" s32 daTagMyna2_c::create() { fopAcM_ct(this, daTagMyna2_c); @@ -33,7 +33,7 @@ s32 daTagMyna2_c::execute() { u32 var_r29 = 0xffff0001; if (mTimer == 0) { - if (fopAcM_create(PROC_MYNA2, var_r29 | mSwitchNo << 8, &actor_pos, + if (fopAcM_create(fpcNm_MYNA2_e, var_r29 | mSwitchNo << 8, &actor_pos, fopAcM_GetRoomNo(this), &actor_angle, 0, -1) != fpcM_ERROR_PROCESS_ID_e) { dComIfGs_onSwitch(mSwitchNo,fopAcM_GetRoomNo(this)); @@ -73,18 +73,18 @@ static actor_method_class l_daTagMyna2_Method = { }; actor_process_profile_definition g_profile_TAG_MYNA2 = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_MYNA2, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagMyna2_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 394, // mPriority - &l_daTagMyna2_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_MYNA2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagMyna2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_MYNA2_e, + /* Actor SubMtd */ &l_daTagMyna2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_myna_light.cpp b/src/d/actor/d_a_tag_myna_light.cpp index e4748364f9b..84dd0da3169 100644 --- a/src/d/actor/d_a_tag_myna_light.cpp +++ b/src/d/actor/d_a_tag_myna_light.cpp @@ -159,18 +159,18 @@ static actor_method_class daTag_MynaLight_MethodTable = { }; actor_process_profile_definition g_profile_TAG_MNLIGHT = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_MNLIGHT, - &g_fpcLf_Method.base, - sizeof(daTag_MynaLight_c), - 0, - 0, - &g_fopAc_Method.base, - 0x49, - &daTag_MynaLight_MethodTable, - 0x64100, - 0x05, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_MNLIGHT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_MynaLight_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_MNLIGHT_e, + /* Actor SubMtd */ &daTag_MynaLight_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_pachi.cpp b/src/d/actor/d_a_tag_pachi.cpp index 949ffd69025..cb7c3b33998 100644 --- a/src/d/actor/d_a_tag_pachi.cpp +++ b/src/d/actor/d_a_tag_pachi.cpp @@ -2,7 +2,7 @@ #include "d/actor/d_a_tag_pachi.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" daTagPati_c::~daTagPati_c() {} @@ -87,18 +87,18 @@ static actor_method_class l_daTagPati_Method = { }; actor_process_profile_definition g_profile_TAG_PATI = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_PATI, - &g_fpcLf_Method.base, - sizeof(daTagPati_c), - 0, - 0, - &g_fopAc_Method.base, - 0x173, - &l_daTagPati_Method, - 0x40000, - 0, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_PATI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagPati_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_PATI_e, + /* Actor SubMtd */ &l_daTagPati_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_poFire.cpp b/src/d/actor/d_a_tag_poFire.cpp index 6c1d8cdc05c..a8012095789 100644 --- a/src/d/actor/d_a_tag_poFire.cpp +++ b/src/d/actor/d_a_tag_poFire.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_poFire.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daTagPoFire_HIO_c::daTagPoFire_HIO_c() { unk_0x4 = 0x14; @@ -77,18 +77,18 @@ static actor_method_class l_daTagPoFire_Method = { }; actor_process_profile_definition g_profile_Tag_poFire = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_poFire, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagPoFire_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 649, // mPriority - &l_daTagPoFire_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_poFire_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagPoFire_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_poFire_e, + /* Actor SubMtd */ &l_daTagPoFire_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_push.cpp b/src/d/actor/d_a_tag_push.cpp index 10530f1da67..336477613b9 100644 --- a/src/d/actor/d_a_tag_push.cpp +++ b/src/d/actor/d_a_tag_push.cpp @@ -2,7 +2,7 @@ #include "d/actor/d_a_tag_push.h" #include "d/actor/d_a_npc4.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void* daTag_Push_c::srchActor(void* param_0, void* param_1) { daTag_Push_c* push = (daTag_Push_c*)param_0; @@ -12,31 +12,31 @@ void* daTag_Push_c::srchActor(void* param_0, void* param_1) { int id = ((daTag_Push_c*)param_1)->getId(); switch (id) { case 1: - bVar1 = fopAcM_GetName(push) == PROC_NPC_TARO; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_TARO_e; break; case 2: - bVar1 = fopAcM_GetName(push) == PROC_NPC_JAGAR; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_JAGAR_e; break; case 3: - bVar1 = fopAcM_GetName(push) == PROC_NPC_LEN; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_LEN_e; break; case 4: - bVar1 = fopAcM_GetName(push) == PROC_NPC_TARO; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_TARO_e; break; case 5: - bVar1 = fopAcM_GetName(push) == PROC_NPC_MARO; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_MARO_e; break; case 6: - bVar1 = fopAcM_GetName(push) == PROC_NPC_BESU; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_BESU_e; break; case 7: - bVar1 = fopAcM_GetName(push) == PROC_NPC_BOU; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_BOU_e; break; case 8: - bVar1 = fopAcM_GetName(push) == PROC_NPC_GRS; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_GRS_e; break; case 9: - bVar1 = fopAcM_GetName(push) == PROC_NPC_GRO; + bVar1 = fopAcM_GetName(push) == fpcNm_NPC_GRO_e; break; } } @@ -74,8 +74,8 @@ int daTag_Push_c::Execute() { if (home.roomNo == dComIfGp_roomControl_getStayNo()) { fopAc_ac_c* actor = mActorMngr.getActorP(); if (isDelete()) { - if (actor != NULL && fopAcM_GetName(actor) != PROC_NPC_JAGAR && - fopAcM_GetName(actor) != PROC_NPC_GRS && fopAcM_GetName(actor) != PROC_NPC_GRO) + if (actor != NULL && fopAcM_GetName(actor) != fpcNm_NPC_JAGAR_e && + fopAcM_GetName(actor) != fpcNm_NPC_GRS_e && fopAcM_GetName(actor) != fpcNm_NPC_GRO_e) { static_cast(actor)->setCommander(NULL); } @@ -93,8 +93,8 @@ int daTag_Push_c::Execute() { daPy_getPlayerActorClass()->eventInfo.chkCondition(dEvtCnd_CANTALK_e) != false) { if (chkPointInArea(cXyz(daPy_getPlayerActorClass()->current.pos))) { - if (fopAcM_GetName(actor) == PROC_NPC_GRS || - fopAcM_GetName(actor) == PROC_NPC_GRO) + if (fopAcM_GetName(actor) == fpcNm_NPC_GRS_e || + fopAcM_GetName(actor) == fpcNm_NPC_GRO_e) { static_cast(actor)->setIntDemander(this); static_cast(actor)->setIntFlowNodeNo(getFlowNodeNo()); @@ -165,18 +165,18 @@ static actor_method_class daTag_Push_MethodTable = { }; actor_process_profile_definition g_profile_TAG_PUSH = { - fpcLy_CURRENT_e, - 8, - fpcPi_CURRENT_e, - PROC_TAG_PUSH, - &g_fpcLf_Method.base, - sizeof(daTag_Push_c), - 0, - 0, - &g_fopAc_Method.base, - 0x123, - &daTag_Push_MethodTable, - 0x44000, - 0, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 8, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_PUSH_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Push_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_PUSH_e, + /* Actor SubMtd */ &daTag_Push_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_qs.cpp b/src/d/actor/d_a_tag_qs.cpp index b1e8204bdf8..76a5dec8b9a 100644 --- a/src/d/actor/d_a_tag_qs.cpp +++ b/src/d/actor/d_a_tag_qs.cpp @@ -282,7 +282,7 @@ static void* search(void* param_1, void* param_2) { return NULL; } - if (fopAcM_GetProfName(param_1) == PROC_ITEM) { + if (fopAcM_GetProfName(param_1) == fpcNm_ITEM_e) { daItem_c* item = (daItem_c*)target; // somehow this condition is supposed to produce a double `li r0, 0x1` instruction, // this only produces one and is likely a fakematch anyway @@ -298,7 +298,7 @@ static void* search(void* param_1, void* param_2) { return NULL; } - if (fopAcM_GetProfName(param_1) == PROC_Obj_Carry) { + if (fopAcM_GetProfName(param_1) == fpcNm_Obj_Carry_e) { daObjCarry_c* carry = (daObjCarry_c*)target; if (carry->getType() == 7 || carry->getType() == 1 || carry->getType() == 5) { int sp10 = hikiyose(&qs->current.pos, &carry->current.pos, &carry->old.pos, @@ -410,18 +410,18 @@ static actor_method_class l_daTagQs_Method = { }; actor_process_profile_definition g_profile_TAG_QS = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_QS, - &g_fpcLf_Method.base, - sizeof(daTagQs_c), - 0, - 0, - &g_fopAc_Method.base, - 274, - &l_daTagQs_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_QS_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagQs_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_QS_e, + /* Actor SubMtd */ &l_daTagQs_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_ret_room.cpp b/src/d/actor/d_a_tag_ret_room.cpp index 7e7a411236f..382476b96a3 100644 --- a/src/d/actor/d_a_tag_ret_room.cpp +++ b/src/d/actor/d_a_tag_ret_room.cpp @@ -165,18 +165,18 @@ static actor_method_class daTagRetRm_METHODS = { }; actor_process_profile_definition g_profile_Tag_RetRoom = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_RetRoom, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagRetRm_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 731, // mPriority - &daTagRetRm_METHODS, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_RetRoom_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagRetRm_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_RetRoom_e, + /* Actor SubMtd */ &daTagRetRm_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_river_back.cpp b/src/d/actor/d_a_tag_river_back.cpp index d8c15ae5275..3a31d7f505f 100644 --- a/src/d/actor/d_a_tag_river_back.cpp +++ b/src/d/actor/d_a_tag_river_back.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_river_back.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" static char* l_arcName = "RvBack"; @@ -158,18 +158,18 @@ static actor_method_class l_daTagRiverBack_Method = {(process_method_func)daTagR (process_method_func)daTagRiverBack_Execute}; actor_process_profile_definition g_profile_Tag_RiverBack = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_RiverBack, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagRiverBack_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 556, // mPriority - &l_daTagRiverBack_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_RiverBack_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagRiverBack_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_RiverBack_e, + /* Actor SubMtd */ &l_daTagRiverBack_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_rmbit_sw.cpp b/src/d/actor/d_a_tag_rmbit_sw.cpp index e3def0a3330..43106c773d4 100644 --- a/src/d/actor/d_a_tag_rmbit_sw.cpp +++ b/src/d/actor/d_a_tag_rmbit_sw.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_rmbit_sw.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daTagRmbitSw_HIO_c : public mDoHIO_entry_c { public: @@ -204,18 +204,18 @@ static actor_method_class daTagRmbitSw_METHODS = { }; actor_process_profile_definition g_profile_Tag_RmbitSw = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_RmbitSw, - &g_fpcLf_Method.base, - sizeof(daTagRmbitSw_c), - 0, - 0, - &g_fopAc_Method.base, - 748, - &daTagRmbitSw_METHODS, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_RmbitSw_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagRmbitSw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_RmbitSw_e, + /* Actor SubMtd */ &daTagRmbitSw_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_schedule.cpp b/src/d/actor/d_a_tag_schedule.cpp index 5e567a56f4c..b1efb05c108 100644 --- a/src/d/actor/d_a_tag_schedule.cpp +++ b/src/d/actor/d_a_tag_schedule.cpp @@ -25,18 +25,18 @@ static actor_method_class l_daTagSchedule_Method = { }; actor_process_profile_definition g_profile_Tag_Schedule = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Schedule, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagSchedule_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 396, // mPriority - &l_daTagSchedule_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Schedule_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagSchedule_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Schedule_e, + /* Actor SubMtd */ &l_daTagSchedule_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_setBall.cpp b/src/d/actor/d_a_tag_setBall.cpp index 75ef80c1bef..bffd6bfdc80 100644 --- a/src/d/actor/d_a_tag_setBall.cpp +++ b/src/d/actor/d_a_tag_setBall.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_setBall.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daTagSetBall_c::initBaseMtx() { setBaseMtx(); @@ -61,18 +61,18 @@ static actor_method_class l_daTagSetBall_Method = { }; actor_process_profile_definition g_profile_Tag_SetBall = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_SetBall, - &g_fpcLf_Method.base, - sizeof(daTagSetBall_c), - 0, - 0, - &g_fopAc_Method.base, - 575, - &l_daTagSetBall_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_SetBall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagSetBall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_SetBall_e, + /* Actor SubMtd */ &l_daTagSetBall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_setrestart.cpp b/src/d/actor/d_a_tag_setrestart.cpp index e76afad4eda..c7134fbae44 100644 --- a/src/d/actor/d_a_tag_setrestart.cpp +++ b/src/d/actor/d_a_tag_setrestart.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_tag_setrestart.h" #include "d/d_com_inf_game.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daTagRestart_HIO_c : public mDoHIO_entry_c { public: @@ -186,18 +186,18 @@ static actor_method_class l_daTagRestart_Method = { }; actor_process_profile_definition g_profile_Tag_Restart = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Restart, - &g_fpcLf_Method.base, - sizeof(daTagRestart_c), - 0, - 0, - &g_fopAc_Method.base, - 592, - &l_daTagRestart_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Restart_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagRestart_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Restart_e, + /* Actor SubMtd */ &l_daTagRestart_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_shop_camera.cpp b/src/d/actor/d_a_tag_shop_camera.cpp index 07c8d931bac..021ac7f2760 100644 --- a/src/d/actor/d_a_tag_shop_camera.cpp +++ b/src/d/actor/d_a_tag_shop_camera.cpp @@ -61,18 +61,18 @@ static actor_method_class daTag_ShopCamera_MethodTable = { }; actor_process_profile_definition g_profile_TAG_SHOPCAM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_SHOPCAM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_ShopCamera_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 74, // mPriority - &daTag_ShopCamera_MethodTable, // sub_method - 0x64100, // mStatus - 5, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_SHOPCAM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_ShopCamera_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_SHOPCAM_e, + /* Actor SubMtd */ &daTag_ShopCamera_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_shop_item.cpp b/src/d/actor/d_a_tag_shop_item.cpp index d4c9a9cad11..302b6d15037 100644 --- a/src/d/actor/d_a_tag_shop_item.cpp +++ b/src/d/actor/d_a_tag_shop_item.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_shop_item.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include int daTag_ShopItem_c::create() { @@ -80,7 +80,7 @@ int daTag_ShopItem_c::Execute() { if (mProcessID == fpcM_ERROR_PROCESS_ID_e) { if (mCreateTimer == 0) { mProcessID = - fopAcM_create(PROC_ShopItem, getType() | (getGroupID() << 28), + fopAcM_create(fpcNm_ShopItem_e, getType() | (getGroupID() << 28), ¤t.pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1); } else { @@ -185,18 +185,18 @@ static actor_method_class daTag_ShopItem_MethodTable = { }; actor_process_profile_definition g_profile_TAG_SHOPITM = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_SHOPITM, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTag_ShopItem_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 75, // mPriority - &daTag_ShopItem_MethodTable, // sub_method - 0x64100, // mStatus - 5, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_SHOPITM_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_ShopItem_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_SHOPITM_e, + /* Actor SubMtd */ &daTag_ShopItem_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_smk_emt.cpp b/src/d/actor/d_a_tag_smk_emt.cpp index 865474bc18f..262804610e2 100644 --- a/src/d/actor/d_a_tag_smk_emt.cpp +++ b/src/d/actor/d_a_tag_smk_emt.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_smk_emt.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include daTagSmkEmt_c::daTagSmkEmt_c() { @@ -85,18 +85,18 @@ static actor_method_class daTagSmkEmt_METHODS = { }; actor_process_profile_definition g_profile_Tag_SmkEmt = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_SmkEmt, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagSmkEmt_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 743, // mPriority - &daTagSmkEmt_METHODS, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_SmkEmt_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagSmkEmt_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_SmkEmt_e, + /* Actor SubMtd */ &daTagSmkEmt_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_spinner.cpp b/src/d/actor/d_a_tag_spinner.cpp index 8a95bd49554..a19a08cfb6a 100644 --- a/src/d/actor/d_a_tag_spinner.cpp +++ b/src/d/actor/d_a_tag_spinner.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_spinner.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daTagSpinner_HIO_c : public mDoHIO_entry_c { public: @@ -45,7 +45,7 @@ static void* search_spinner_sub(void* tag_0, void* tag_1) { if (actor != NULL && fopAcM_IsActor(actor) != NULL && - fopAcM_GetProfName(actor) == PROC_SPINNER) { + fopAcM_GetProfName(actor) == fpcNm_SPINNER_e) { f32 latDist = actor->current.pos.absXZ(actor2->current.pos); if (latDist < actor2->GetR()) { return actor; @@ -164,18 +164,18 @@ static actor_method_class l_daTagSpinner_Method = { }; actor_process_profile_definition g_profile_Tag_Spinner = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Spinner, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagSpinner_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 605, // mPriority - &l_daTagSpinner_Method, // sub_method - 0x40100, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Spinner_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagSpinner_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Spinner_e, + /* Actor SubMtd */ &l_daTagSpinner_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index f1d2cb6a1a3..b40908b3877 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -220,18 +220,18 @@ static actor_method_class l_daTagSppath_Method = { }; actor_process_profile_definition g_profile_Tag_Sppath = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Sppath, // mProcName, - &g_fpcLf_Method.base, // sub_method - sizeof(daTagSppath_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 258, // mPriority - &l_daTagSppath_Method, // sub_method - 0x44000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Sppath_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagSppath_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Sppath_e, + /* Actor SubMtd */ &l_daTagSppath_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_spring.cpp b/src/d/actor/d_a_tag_spring.cpp index 4eabdf3db2c..f7aa3b26baa 100644 --- a/src/d/actor/d_a_tag_spring.cpp +++ b/src/d/actor/d_a_tag_spring.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" class daTagSpring_HIO_c : public mDoHIO_entry_c { public: @@ -163,18 +163,18 @@ static actor_method_class l_daTagSpring_Method = { }; actor_process_profile_definition g_profile_Tag_Spring = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Spring, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagSpring_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 587, // mPriority - &l_daTagSpring_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Spring_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagSpring_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Spring_e, + /* Actor SubMtd */ &l_daTagSpring_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_ss_drink.cpp b/src/d/actor/d_a_tag_ss_drink.cpp index bca1da5abcb..645fc16a503 100644 --- a/src/d/actor/d_a_tag_ss_drink.cpp +++ b/src/d/actor/d_a_tag_ss_drink.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tag_ss_drink.h" #include "d/actor/d_a_player.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_msg_object.h" #include "d/actor/d_a_myna.h" @@ -257,18 +257,18 @@ static actor_method_class daTag_SSDrink_MethodTable = { }; actor_process_profile_definition g_profile_TAG_SSDRINK = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_SSDRINK, - &g_fpcLf_Method.base, - sizeof(daTag_SSDrink_c), - 0, - 0, - &g_fopAc_Method.base, - 0x46, - &daTag_SSDrink_MethodTable, - 0x64100, - 5, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_SSDRINK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_SSDrink_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_SSDRINK_e, + /* Actor SubMtd */ &daTag_SSDrink_MethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_NOPAUSE_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_UNK_GROUP_5_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp index eb7d3752eb7..4adeda93b72 100644 --- a/src/d/actor/d_a_tag_statue_evt.cpp +++ b/src/d/actor/d_a_tag_statue_evt.cpp @@ -33,7 +33,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { // Returns ID of Owl Statue corresponding to tag static void* s_s_sub(void* i_proc, void* param_1) { UNUSED(param_1); - if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_CSTAF) { + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == fpcNm_CSTAF_e) { return i_proc; } @@ -355,11 +355,11 @@ int daTagStatue_c::demoProc() { // If the player already has 5 Sky Characters, reward them with the completed // Ancient Sky Book, otherwise, reward another character if (getLetterCount() == 5) { - item = fpcNm_ITEM_ANCIENT_DOCUMENT2; + item = dItemNo_ANCIENT_DOCUMENT2_e; /* Sky character - Sky character 6 */ dComIfGs_onEventBit(dSv_event_flag_c::F_0796); } else { - item = fpcNm_ITEM_AIR_LETTER; + item = dItemNo_AIR_LETTER_e; } mItemId = @@ -538,18 +538,18 @@ reinterpret_cast(daTagStatue_Draw), }; actor_process_profile_definition g_profile_Tag_Statue = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Statue, - &g_fpcLf_Method.base, - sizeof(daTagStatue_c), - 0, - 0, - &g_fopAc_Method.base, - 588, - &l_daTagStatue_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Statue_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagStatue_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Statue_e, + /* Actor SubMtd */ &l_daTagStatue_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_stream.cpp b/src/d/actor/d_a_tag_stream.cpp index 60dd5fcba2f..40e2dad4156 100644 --- a/src/d/actor/d_a_tag_stream.cpp +++ b/src/d/actor/d_a_tag_stream.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_tag_stream.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_s_play.h" int daTagStream_c::create() { @@ -141,18 +141,18 @@ static actor_method_class l_daTagStream_Method = { }; actor_process_profile_definition g_profile_Tag_Stream = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_Stream, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagStream_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 259, // mPriority - &l_daTagStream_Method, // sub_method - 0x44000, // mStatus - fopAc_ENV_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Stream_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagStream_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Stream_e, + /* Actor SubMtd */ &l_daTagStream_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_telop.cpp b/src/d/actor/d_a_tag_telop.cpp index 782a5978437..a46102cbf2c 100644 --- a/src/d/actor/d_a_tag_telop.cpp +++ b/src/d/actor/d_a_tag_telop.cpp @@ -70,18 +70,18 @@ static actor_method_class l_daTag_Telop_Method = { }; actor_process_profile_definition g_profile_TAG_TELOP = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TAG_TELOP, - &g_fpcLf_Method.base, - sizeof(daTag_Telop_c), - 0, - 0, - &g_fopAc_Method.base, - 282, - &l_daTag_Telop_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_TELOP_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTag_Telop_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_TELOP_e, + /* Actor SubMtd */ &l_daTag_Telop_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tag_theB_hint.cpp b/src/d/actor/d_a_tag_theB_hint.cpp index 3c1274ae5af..d368d726df7 100644 --- a/src/d/actor/d_a_tag_theB_hint.cpp +++ b/src/d/actor/d_a_tag_theB_hint.cpp @@ -21,7 +21,7 @@ int daTagTheBHint_c::execute() { } if (fopAcM_searchPlayerDistanceXZ2(this) < field_0x568) { - daNpcTheB_c* the_b = (daNpcTheB_c*)fpcM_SearchByName(PROC_NPC_THEB); + daNpcTheB_c* the_b = (daNpcTheB_c*)fpcM_SearchByName(fpcNm_NPC_THEB_e); if (the_b) { int roomNo = getRoomNo() == 0xff ? fopAcM_GetRoomNo(this) : getRoomNo(); @@ -55,18 +55,18 @@ static actor_method_class l_daTagTheBHint_Method = { }; actor_process_profile_definition g_profile_Tag_TheBHint = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_TheBHint, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagTheBHint_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 265, // mPriority - &l_daTagTheBHint_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_TheBHint_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagTheBHint_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_TheBHint_e, + /* Actor SubMtd */ &l_daTagTheBHint_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_wara_howl.cpp b/src/d/actor/d_a_tag_wara_howl.cpp index fc55700edf9..1a15938c4d5 100644 --- a/src/d/actor/d_a_tag_wara_howl.cpp +++ b/src/d/actor/d_a_tag_wara_howl.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_wara_howl.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" daTagWrHowl_c::daTagWrHowl_c() {} @@ -84,18 +84,18 @@ static actor_method_class daTagWrHowl_METHODS = { }; actor_process_profile_definition g_profile_Tag_WaraHowl = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_WaraHowl, - &g_fpcLf_Method.base, - sizeof(daTagWrHowl_c), - 0, - 0, - &g_fopAc_Method.base, - 733, - &daTagWrHowl_METHODS, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_WaraHowl_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagWrHowl_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_WaraHowl_e, + /* Actor SubMtd */ &daTagWrHowl_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_watchge.cpp b/src/d/actor/d_a_tag_watchge.cpp index aeacc17e88b..2b87c74d73e 100644 --- a/src/d/actor/d_a_tag_watchge.cpp +++ b/src/d/actor/d_a_tag_watchge.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_watchge.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTagWatchGe_c::draw() { return 1; @@ -20,7 +20,7 @@ static s32 m_group_count; static void* s_watchge(void* i_guayP, void* i_this) { u8 group_no = static_cast(i_this)->getGroupNo(); - if (fopAcM_GetName(i_guayP) == PROC_E_GE) { + if (fopAcM_GetName(i_guayP) == fpcNm_E_GE_e) { if (static_cast(i_guayP)->getGroupNo() == group_no) { m_group_count++; } @@ -95,18 +95,18 @@ static actor_method_class l_daTagWatchGe_Method = { }; actor_process_profile_definition g_profile_Tag_WatchGe = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Tag_WatchGe, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagWatchGe_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 193, // mPriority - &l_daTagWatchGe_Method, // sub_method - 0x44000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_0_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_WatchGe_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagWatchGe_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_WatchGe_e, + /* Actor SubMtd */ &l_daTagWatchGe_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_waterfall.cpp b/src/d/actor/d_a_tag_waterfall.cpp index fab5afccace..6fac4d4d009 100644 --- a/src/d/actor/d_a_tag_waterfall.cpp +++ b/src/d/actor/d_a_tag_waterfall.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_tag_waterfall.h" #include "d/d_com_inf_game.h" #include "d/d_debug_viewer.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_camera_mng.h" daTagWaterFall_HIO_c::daTagWaterFall_HIO_c() { @@ -125,7 +125,7 @@ void* s_waterfall(void* pProc, void* param_1) { UNUSED(param_1); if (fopAcM_IsActor(pProc) && - fopAcM_GetName(pProc) == PROC_Tag_WaterFall && + fopAcM_GetName(pProc) == fpcNm_Tag_WaterFall_e && !fpcM_IsCreating(fopAcM_GetID(pProc)) && static_cast(pProc)->checkHitWaterFallCamera()) { return pProc; @@ -335,18 +335,18 @@ static actor_method_class l_daTagWaterFall_Method = { }; actor_process_profile_definition g_profile_Tag_WaterFall = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_WaterFall, - &g_fpcLf_Method.base, - sizeof(daTagWaterFall_c), - 0, - 0, - &g_fopAc_Method.base, - 198, - &l_daTagWaterFall_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_WaterFall_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagWaterFall_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_WaterFall_e, + /* Actor SubMtd */ &l_daTagWaterFall_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_tag_wljump.cpp b/src/d/actor/d_a_tag_wljump.cpp index d5d374deec2..9c09a8ad717 100644 --- a/src/d/actor/d_a_tag_wljump.cpp +++ b/src/d/actor/d_a_tag_wljump.cpp @@ -2,7 +2,7 @@ #include "d/actor/d_a_tag_wljump.h" #include "d/d_path.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/actor/d_a_player.h" #include "d/actor/d_a_midna.h" @@ -241,18 +241,18 @@ static actor_method_class l_daTagWljump_Method = { }; actor_process_profile_definition g_profile_Tag_Wljump = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Tag_Wljump, - &g_fpcLf_Method.base, - sizeof(daTagWljump_c), - 0, - 0, - &g_fopAc_Method.base, - 260, - &l_daTagWljump_Method, - 0x44000, - fopAc_ENV_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Tag_Wljump_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagWljump_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Tag_Wljump_e, + /* Actor SubMtd */ &l_daTagWljump_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ENV_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_yami.cpp b/src/d/actor/d_a_tag_yami.cpp index d9491c1e851..19467a0e254 100644 --- a/src/d/actor/d_a_tag_yami.cpp +++ b/src/d/actor/d_a_tag_yami.cpp @@ -132,18 +132,18 @@ static actor_method_class l_daTagYami_Method = { }; actor_process_profile_definition g_profile_TAG_YAMI = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TAG_YAMI, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTagYami_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 21, // mPriority - &l_daTagYami_Method, // sub_method - 0x40000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 3, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TAG_YAMI_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTagYami_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TAG_YAMI_e, + /* Actor SubMtd */ &l_daTagYami_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_talk.cpp b/src/d/actor/d_a_talk.cpp index b77a7069ebf..849dea194a5 100644 --- a/src/d/actor/d_a_talk.cpp +++ b/src/d/actor/d_a_talk.cpp @@ -107,18 +107,18 @@ static actor_method_class l_daTalk_Method = { }; actor_process_profile_definition g_profile_TALK = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TALK, - &g_fpcLf_Method.base, - sizeof(daTalk_c), - 0, - 0, - &g_fopAc_Method.base, - 766, - &l_daTalk_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_6_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TALK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTalk_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TALK_e, + /* Actor SubMtd */ &l_daTalk_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_6_e, }; diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 55e3d5f8ee1..358ecec8c10 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -293,7 +293,7 @@ int daTbox_c::checkEnvEffectTbox() { return false; } - if (getItemNo() == fpcNm_ITEM_BOOMERANG || getItemNo() == fpcNm_ITEM_MAP || getItemNo() == fpcNm_ITEM_COMPUS) { + if (getItemNo() == dItemNo_BOOMERANG_e || getItemNo() == dItemNo_MAP_e || getItemNo() == dItemNo_COMPUS_e) { return true; } @@ -1003,7 +1003,7 @@ int daTbox_c::actionDemo() { flagOff(0x18); dComIfGp_event_setItemPartner(NULL); - if (getItemNo() == fpcNm_ITEM_KAKERA_HEART) { + if (getItemNo() == dItemNo_KAKERA_HEART_e) { if (!strcmp(dComIfGp_getStartStageName(), "F_SP121")) { if (fopAcM_GetRoomNo(this) == 0) { switch (getTboxNo()) { @@ -1085,65 +1085,65 @@ int daTbox_c::actionDropDemo() { u8 daTbox_c::getBombItemNo(u8 i_bombType, u8 i_itemNo) { u8 new_item_no = i_itemNo; switch (i_bombType) { - case fpcNm_ITEM_NORMAL_BOMB: + case dItemNo_NORMAL_BOMB_e: switch (i_itemNo) { - case fpcNm_ITEM_WATER_BOMB_5: - case fpcNm_ITEM_WATER_BOMB_30: - case fpcNm_ITEM_BOMB_INSECT_5: - case fpcNm_ITEM_BOMB_INSECT_20: - new_item_no = fpcNm_ITEM_BOMB_5; + case dItemNo_WATER_BOMB_5_e: + case dItemNo_WATER_BOMB_30_e: + case dItemNo_BOMB_INSECT_5_e: + case dItemNo_BOMB_INSECT_20_e: + new_item_no = dItemNo_BOMB_5_e; break; - case fpcNm_ITEM_WATER_BOMB_10: - case fpcNm_ITEM_BOMB_INSECT_10: - new_item_no = fpcNm_ITEM_BOMB_10; + case dItemNo_WATER_BOMB_10_e: + case dItemNo_BOMB_INSECT_10_e: + new_item_no = dItemNo_BOMB_10_e; break; - case fpcNm_ITEM_WATER_BOMB_20: - new_item_no = fpcNm_ITEM_BOMB_20; + case dItemNo_WATER_BOMB_20_e: + new_item_no = dItemNo_BOMB_20_e; break; - case fpcNm_ITEM_BOMB_INSECT_30: - new_item_no = fpcNm_ITEM_BOMB_30; + case dItemNo_BOMB_INSECT_30_e: + new_item_no = dItemNo_BOMB_30_e; break; } break; - case fpcNm_ITEM_WATER_BOMB: + case dItemNo_WATER_BOMB_e: switch (i_itemNo) { - case fpcNm_ITEM_BOMB_INSECT_20: - case fpcNm_ITEM_BOMB_INSECT_30: - new_item_no = fpcNm_ITEM_WATER_BOMB_30; + case dItemNo_BOMB_INSECT_20_e: + case dItemNo_BOMB_INSECT_30_e: + new_item_no = dItemNo_WATER_BOMB_30_e; break; - case fpcNm_ITEM_BOMB_5: - case fpcNm_ITEM_BOMB_INSECT_5: - new_item_no = fpcNm_ITEM_WATER_BOMB_5; + case dItemNo_BOMB_5_e: + case dItemNo_BOMB_INSECT_5_e: + new_item_no = dItemNo_WATER_BOMB_5_e; break; - case fpcNm_ITEM_BOMB_10: - case fpcNm_ITEM_BOMB_INSECT_10: - new_item_no = fpcNm_ITEM_WATER_BOMB_10; + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_INSECT_10_e: + new_item_no = dItemNo_WATER_BOMB_10_e; break; - case fpcNm_ITEM_BOMB_20: - case fpcNm_ITEM_BOMB_30: - new_item_no = fpcNm_ITEM_WATER_BOMB_20; + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: + new_item_no = dItemNo_WATER_BOMB_20_e; break; } break; - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_POKE_BOMB_e: switch (i_itemNo) { - case fpcNm_ITEM_WATER_BOMB_30: - new_item_no = fpcNm_ITEM_BOMB_INSECT_20; + case dItemNo_WATER_BOMB_30_e: + new_item_no = dItemNo_BOMB_INSECT_20_e; break; - case fpcNm_ITEM_BOMB_5: - case fpcNm_ITEM_WATER_BOMB_5: - new_item_no = fpcNm_ITEM_BOMB_INSECT_5; + case dItemNo_BOMB_5_e: + case dItemNo_WATER_BOMB_5_e: + new_item_no = dItemNo_BOMB_INSECT_5_e; break; - case fpcNm_ITEM_BOMB_10: - case fpcNm_ITEM_BOMB_20: - case fpcNm_ITEM_BOMB_30: - case fpcNm_ITEM_WATER_BOMB_10: - case fpcNm_ITEM_WATER_BOMB_20: - new_item_no = fpcNm_ITEM_BOMB_INSECT_10; + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: + case dItemNo_WATER_BOMB_10_e: + case dItemNo_WATER_BOMB_20_e: + new_item_no = dItemNo_BOMB_INSECT_10_e; break; } break; - case fpcNm_ITEM_BOMB_BAG_LV1: + case dItemNo_BOMB_BAG_LV1_e: break; } @@ -1163,23 +1163,23 @@ u8 daTbox_c::getBombItemNo(u8 i_bombType, u8 i_itemNo) { u8 daTbox_c::getBombItemNo2(u8 i_bombType1, u8 i_bombType2, u8 i_itemNo) { u8 new_type, new_item_no = i_itemNo; switch (i_itemNo) { - case fpcNm_ITEM_BOMB_5: - case fpcNm_ITEM_BOMB_10: - case fpcNm_ITEM_BOMB_20: - case fpcNm_ITEM_BOMB_30: - new_type = fpcNm_ITEM_NORMAL_BOMB; + case dItemNo_BOMB_5_e: + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: + new_type = dItemNo_NORMAL_BOMB_e; break; - case fpcNm_ITEM_WATER_BOMB_5: - case fpcNm_ITEM_WATER_BOMB_10: - case fpcNm_ITEM_WATER_BOMB_20: - case fpcNm_ITEM_WATER_BOMB_30: - new_type = fpcNm_ITEM_WATER_BOMB; + case dItemNo_WATER_BOMB_5_e: + case dItemNo_WATER_BOMB_10_e: + case dItemNo_WATER_BOMB_20_e: + case dItemNo_WATER_BOMB_30_e: + new_type = dItemNo_WATER_BOMB_e; break; - case fpcNm_ITEM_BOMB_INSECT_5: - case fpcNm_ITEM_BOMB_INSECT_10: - case fpcNm_ITEM_BOMB_INSECT_20: - case fpcNm_ITEM_BOMB_INSECT_30: - new_type = fpcNm_ITEM_POKE_BOMB; + case dItemNo_BOMB_INSECT_5_e: + case dItemNo_BOMB_INSECT_10_e: + case dItemNo_BOMB_INSECT_20_e: + case dItemNo_BOMB_INSECT_30_e: + new_type = dItemNo_POKE_BOMB_e; break; } @@ -1191,30 +1191,30 @@ u8 daTbox_c::getBombItemNo2(u8 i_bombType1, u8 i_bombType2, u8 i_itemNo) { if (i_bombType1 == new_type || i_bombType2 == new_type) { // "There's a bag with the same bomb in it\n" OS_REPORT("同じ爆弾入りの袋があるのでそこに入れます\n"); - } else if (i_bombType1 == fpcNm_ITEM_BOMB_BAG_LV1 || i_bombType2 == fpcNm_ITEM_BOMB_BAG_LV1) { + } else if (i_bombType1 == dItemNo_BOMB_BAG_LV1_e || i_bombType2 == dItemNo_BOMB_BAG_LV1_e) { // "This is an empty bag so put it in\n" OS_REPORT("空の袋があるのでそこに入れます\n"); } else { switch (new_type) { - case fpcNm_ITEM_NORMAL_BOMB: - if (i_bombType1 == fpcNm_ITEM_WATER_BOMB || i_bombType2 == fpcNm_ITEM_WATER_BOMB) { - new_item_no = getBombItemNo(fpcNm_ITEM_WATER_BOMB, i_itemNo); + case dItemNo_NORMAL_BOMB_e: + if (i_bombType1 == dItemNo_WATER_BOMB_e || i_bombType2 == dItemNo_WATER_BOMB_e) { + new_item_no = getBombItemNo(dItemNo_WATER_BOMB_e, i_itemNo); } else { - new_item_no = getBombItemNo(fpcNm_ITEM_POKE_BOMB, i_itemNo); + new_item_no = getBombItemNo(dItemNo_POKE_BOMB_e, i_itemNo); } break; - case fpcNm_ITEM_WATER_BOMB: - if (i_bombType1 == fpcNm_ITEM_NORMAL_BOMB || i_bombType2 == fpcNm_ITEM_NORMAL_BOMB) { - new_item_no = getBombItemNo(fpcNm_ITEM_NORMAL_BOMB, i_itemNo); + case dItemNo_WATER_BOMB_e: + if (i_bombType1 == dItemNo_NORMAL_BOMB_e || i_bombType2 == dItemNo_NORMAL_BOMB_e) { + new_item_no = getBombItemNo(dItemNo_NORMAL_BOMB_e, i_itemNo); } else { - new_item_no = getBombItemNo(fpcNm_ITEM_POKE_BOMB, i_itemNo); + new_item_no = getBombItemNo(dItemNo_POKE_BOMB_e, i_itemNo); } break; - case fpcNm_ITEM_POKE_BOMB: - if (i_bombType1 == fpcNm_ITEM_NORMAL_BOMB || i_bombType2 == fpcNm_ITEM_NORMAL_BOMB) { - new_item_no = getBombItemNo(fpcNm_ITEM_NORMAL_BOMB, i_itemNo); + case dItemNo_POKE_BOMB_e: + if (i_bombType1 == dItemNo_NORMAL_BOMB_e || i_bombType2 == dItemNo_NORMAL_BOMB_e) { + new_item_no = getBombItemNo(dItemNo_NORMAL_BOMB_e, i_itemNo); } else { - new_item_no = getBombItemNo(fpcNm_ITEM_WATER_BOMB, i_itemNo); + new_item_no = getBombItemNo(dItemNo_WATER_BOMB_e, i_itemNo); } break; } @@ -1227,23 +1227,23 @@ u8 daTbox_c::getBombItemNo2(u8 i_bombType1, u8 i_bombType2, u8 i_itemNo) { u8 daTbox_c::getBombItemNo3(u8 i_bombType1, u8 i_bombType2, u8 i_bombType3, u8 i_itemNo) { u8 new_type, new_item_no = i_itemNo; switch (i_itemNo) { - case fpcNm_ITEM_BOMB_5: - case fpcNm_ITEM_BOMB_10: - case fpcNm_ITEM_BOMB_20: - case fpcNm_ITEM_BOMB_30: - new_type = fpcNm_ITEM_NORMAL_BOMB; + case dItemNo_BOMB_5_e: + case dItemNo_BOMB_10_e: + case dItemNo_BOMB_20_e: + case dItemNo_BOMB_30_e: + new_type = dItemNo_NORMAL_BOMB_e; break; - case fpcNm_ITEM_WATER_BOMB_5: - case fpcNm_ITEM_WATER_BOMB_10: - case fpcNm_ITEM_WATER_BOMB_20: - case fpcNm_ITEM_WATER_BOMB_30: - new_type = fpcNm_ITEM_WATER_BOMB; + case dItemNo_WATER_BOMB_5_e: + case dItemNo_WATER_BOMB_10_e: + case dItemNo_WATER_BOMB_20_e: + case dItemNo_WATER_BOMB_30_e: + new_type = dItemNo_WATER_BOMB_e; break; - case fpcNm_ITEM_BOMB_INSECT_5: - case fpcNm_ITEM_BOMB_INSECT_10: - case fpcNm_ITEM_BOMB_INSECT_20: - case fpcNm_ITEM_BOMB_INSECT_30: - new_type = fpcNm_ITEM_POKE_BOMB; + case dItemNo_BOMB_INSECT_5_e: + case dItemNo_BOMB_INSECT_10_e: + case dItemNo_BOMB_INSECT_20_e: + case dItemNo_BOMB_INSECT_30_e: + new_type = dItemNo_POKE_BOMB_e; break; } @@ -1255,30 +1255,30 @@ u8 daTbox_c::getBombItemNo3(u8 i_bombType1, u8 i_bombType2, u8 i_bombType3, u8 i if (i_bombType1 == new_type || i_bombType2 == new_type || i_bombType3 == new_type) { // "There's a bag with the same bomb in it\n" OS_REPORT("同じ爆弾入りの袋があるのでそこに入れます\n"); - } else if (i_bombType1 == fpcNm_ITEM_BOMB_BAG_LV1 || i_bombType2 == fpcNm_ITEM_BOMB_BAG_LV1 || i_bombType3 == fpcNm_ITEM_BOMB_BAG_LV1) { + } else if (i_bombType1 == dItemNo_BOMB_BAG_LV1_e || i_bombType2 == dItemNo_BOMB_BAG_LV1_e || i_bombType3 == dItemNo_BOMB_BAG_LV1_e) { // "This is an empty bag so put it in\n" OS_REPORT("空の袋があるのでそこに入れます\n"); } else { switch (new_type) { - case fpcNm_ITEM_NORMAL_BOMB: - if (i_bombType1 == fpcNm_ITEM_WATER_BOMB || i_bombType2 == fpcNm_ITEM_WATER_BOMB || i_bombType3 == fpcNm_ITEM_WATER_BOMB) { - new_item_no = getBombItemNo(fpcNm_ITEM_WATER_BOMB, i_itemNo); + case dItemNo_NORMAL_BOMB_e: + if (i_bombType1 == dItemNo_WATER_BOMB_e || i_bombType2 == dItemNo_WATER_BOMB_e || i_bombType3 == dItemNo_WATER_BOMB_e) { + new_item_no = getBombItemNo(dItemNo_WATER_BOMB_e, i_itemNo); } else { - new_item_no = getBombItemNo(fpcNm_ITEM_POKE_BOMB, i_itemNo); + new_item_no = getBombItemNo(dItemNo_POKE_BOMB_e, i_itemNo); } break; - case fpcNm_ITEM_WATER_BOMB: - if (i_bombType1 == fpcNm_ITEM_NORMAL_BOMB || i_bombType2 == fpcNm_ITEM_NORMAL_BOMB || i_bombType3 == fpcNm_ITEM_NORMAL_BOMB) { - new_item_no = getBombItemNo(fpcNm_ITEM_NORMAL_BOMB, i_itemNo); + case dItemNo_WATER_BOMB_e: + if (i_bombType1 == dItemNo_NORMAL_BOMB_e || i_bombType2 == dItemNo_NORMAL_BOMB_e || i_bombType3 == dItemNo_NORMAL_BOMB_e) { + new_item_no = getBombItemNo(dItemNo_NORMAL_BOMB_e, i_itemNo); } else { - new_item_no = getBombItemNo(fpcNm_ITEM_POKE_BOMB, i_itemNo); + new_item_no = getBombItemNo(dItemNo_POKE_BOMB_e, i_itemNo); } break; - case fpcNm_ITEM_POKE_BOMB: - if (i_bombType1 == fpcNm_ITEM_NORMAL_BOMB || i_bombType2 == fpcNm_ITEM_NORMAL_BOMB || i_bombType3 == fpcNm_ITEM_NORMAL_BOMB) { - new_item_no = getBombItemNo(fpcNm_ITEM_NORMAL_BOMB, i_itemNo); + case dItemNo_POKE_BOMB_e: + if (i_bombType1 == dItemNo_NORMAL_BOMB_e || i_bombType2 == dItemNo_NORMAL_BOMB_e || i_bombType3 == dItemNo_NORMAL_BOMB_e) { + new_item_no = getBombItemNo(dItemNo_NORMAL_BOMB_e, i_itemNo); } else { - new_item_no = getBombItemNo(fpcNm_ITEM_WATER_BOMB, i_itemNo); + new_item_no = getBombItemNo(dItemNo_WATER_BOMB_e, i_itemNo); } break; } @@ -1297,7 +1297,7 @@ u8 daTbox_c::getBombItemNoMain(u8 i_itemNo) { bomb_max[i] = dComIfGs_getBombMax(bomb_type[i]); bomb_num[i] = dComIfGs_getBombNum(i); - if (bomb_type[i] != fpcNm_ITEM_NONE) { + if (bomb_type[i] != dItemNo_NONE_e) { bag_count++; } } @@ -1390,9 +1390,9 @@ u8 daTbox_c::getBombItemNoMain(u8 i_itemNo) { int daTbox_c::setGetDemoItem() { u8 item_no = getItemNo(); - if (item_no == fpcNm_ITEM_BOMB_5 || item_no == fpcNm_ITEM_BOMB_10 || item_no == fpcNm_ITEM_BOMB_20 || item_no == fpcNm_ITEM_BOMB_30 || - item_no == fpcNm_ITEM_WATER_BOMB_5 || item_no == fpcNm_ITEM_WATER_BOMB_10 || item_no == fpcNm_ITEM_WATER_BOMB_20 || item_no == fpcNm_ITEM_WATER_BOMB_30 || - item_no == fpcNm_ITEM_BOMB_INSECT_5 || item_no == fpcNm_ITEM_BOMB_INSECT_10 || item_no == fpcNm_ITEM_BOMB_INSECT_20 || item_no == fpcNm_ITEM_BOMB_INSECT_30) + if (item_no == dItemNo_BOMB_5_e || item_no == dItemNo_BOMB_10_e || item_no == dItemNo_BOMB_20_e || item_no == dItemNo_BOMB_30_e || + item_no == dItemNo_WATER_BOMB_5_e || item_no == dItemNo_WATER_BOMB_10_e || item_no == dItemNo_WATER_BOMB_20_e || item_no == dItemNo_WATER_BOMB_30_e || + item_no == dItemNo_BOMB_INSECT_5_e || item_no == dItemNo_BOMB_INSECT_10_e || item_no == dItemNo_BOMB_INSECT_20_e || item_no == dItemNo_BOMB_INSECT_30_e) { item_no = getBombItemNoMain(item_no); } @@ -1904,20 +1904,20 @@ static actor_method_class daTbox_METHODS = { }; actor_process_profile_definition g_profile_TBOX = { - fpcLy_CURRENT_e, - 4, - fpcPi_CURRENT_e, - PROC_TBOX, - &g_fpcLf_Method.base, - sizeof(daTbox_c), - 0, - 0, - &g_fopAc_Method.base, - 0x10c, - &daTbox_METHODS, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TBOX_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTbox_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TBOX_e, + /* Actor SubMtd */ &daTbox_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; AUDIO_INSTANCES diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index 0d0d62397db..258ea40de77 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -456,18 +456,18 @@ static actor_method_class daTbox2_METHODS = { }; actor_process_profile_definition g_profile_TBOX2 = { - fpcLy_CURRENT_e, - 4, - fpcPi_CURRENT_e, - PROC_TBOX2, - &g_fpcLf_Method.base, - sizeof(daTbox2_c), - 0, - 0, - &g_fopAc_Method.base, - 269, - &daTbox2_METHODS, - 0x44100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 4, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TBOX2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTbox2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TBOX2_e, + /* Actor SubMtd */ &daTbox2_METHODS, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tboxSw.cpp b/src/d/actor/d_a_tboxSw.cpp index e0d13dfe7f1..e3ab3aed8ec 100644 --- a/src/d/actor/d_a_tboxSw.cpp +++ b/src/d/actor/d_a_tboxSw.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tboxSw.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" int daTboxSw_c::Create() { return 1; @@ -63,18 +63,18 @@ static actor_method_class l_daTboxSw_Method = { }; actor_process_profile_definition g_profile_TBOX_SW = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_TBOX_SW, - &g_fpcLf_Method.base, - sizeof(daTboxSw_c), - 0, - 0, - &g_fopAc_Method.base, - 526, - &l_daTboxSw_Method, - 0x40100, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TBOX_SW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTboxSw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TBOX_SW_e, + /* Actor SubMtd */ &l_daTboxSw_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index fef3260ef17..2f8f5852c40 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -310,11 +310,11 @@ void daTitle_c::nextScene_proc() { if (!dScnLogo_c::isOpeningCut()) #endif { - fopScnM_ChangeReq(playScene, PROC_NAME_SCENE, 0, 5); + fopScnM_ChangeReq(playScene, fpcNm_NAME_SCENE_e, 0, 5); } #if DEBUG else { - fopScnM_ChangeReq(playScene, PROC_MENU_SCENE, 0, 5); + fopScnM_ChangeReq(playScene, fpcNm_MENU_SCENE_e, 0, 5); dComIfGs_init(); dComIfG_playerStatusD(); } @@ -434,18 +434,18 @@ static actor_method_class l_daTitle_Method = { }; actor_process_profile_definition g_profile_TITLE = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_TITLE, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daTitle_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 0xa, // mPriority - &l_daTitle_Method, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TITLE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daTitle_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_TITLE_e, + /* Actor SubMtd */ &l_daTitle_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index 681ed0ed92e..49433c80d7d 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -149,18 +149,18 @@ static actor_method_class l_daVrbox_Method = { }; actor_process_profile_definition g_profile_VRBOX = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_VRBOX, - &g_fpcLf_Method.base, - sizeof(vrbox_class), - 0, - 0, - &g_fopAc_Method.base, - 7, - &l_daVrbox_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_VRBOX_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(vrbox_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_VRBOX_e, + /* Actor SubMtd */ &l_daVrbox_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index a357efb07a0..c234974404b 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_vrbox2.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "d/d_kankyo_rain.h" #include "f_op/f_op_camera_mng.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -454,18 +454,18 @@ static actor_method_class l_daVrbox2_Method = { }; actor_process_profile_definition g_profile_VRBOX2 = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_VRBOX2, - &g_fpcLf_Method.base, - sizeof(vrbox2_class), - 0, - 0, - &g_fopAc_Method.base, - 4, - &l_daVrbox2_Method, - 0x44000, - fopAc_ACTOR_e, - fopAc_CULLBOX_0_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_VRBOX2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(vrbox2_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_VRBOX2_e, + /* Actor SubMtd */ &l_daVrbox2_Method, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_0_e, }; diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp index 2e0a1bc0892..d1dab53117f 100644 --- a/src/d/actor/d_a_warp_bug.cpp +++ b/src/d/actor/d_a_warp_bug.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_warp_bug.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" void daWarpBug_c::create_init() {} @@ -159,18 +159,18 @@ static actor_method_class l_daWarpBug_Method = { }; actor_process_profile_definition g_profile_WarpBug = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_WarpBug, - &g_fpcLf_Method.base, - sizeof(daWarpBug_c), - 0, - 0, - &g_fopAc_Method.base, - 726, - &l_daWarpBug_Method, - 0x40000, - fopAc_ACTOR_e, - fopAc_CULLBOX_CUSTOM_e, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WarpBug_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daWarpBug_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_WarpBug_e, + /* Actor SubMtd */ &l_daWarpBug_Method, + /* Status */ fopAcStts_UNK_0x40000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index d059db6862e..dbbb12d2156 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -280,20 +280,20 @@ static actor_method_class daYkgrMethodTable = { }; actor_process_profile_definition g_profile_Ykgr = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_Ykgr, - &g_fpcLf_Method.base, - sizeof(daYkgr_c), - 0, - 0, - &g_fopAc_Method.base, - 0x01AE, - &daYkgrMethodTable, - 0x00044000, - 0, - 0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_Ykgr_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(daYkgr_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopAc_Method.base, + /* Draw Prio */ fpcDwPi_Ykgr_e, + /* Actor SubMtd */ &daYkgrMethodTable, + /* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e, + /* Group */ fopAc_ACTOR_e, + /* Cull Type */ 0, }; AUDIO_INSTANCES; diff --git a/src/d/actor/d_flower.inc b/src/d/actor/d_flower.inc index ccd874c21f3..d26c322f70a 100644 --- a/src/d/actor/d_flower.inc +++ b/src/d/actor/d_flower.inc @@ -293,7 +293,7 @@ void dFlower_data_c::WorkAt_NoCutAnim(fopAc_ac_c* i_hitActor, u32 i_massFlg, int cXyz sp14(*var_r26->GetAtVecP()); f32 temp_f31 = sp14.abs2XZ(); - if (cM3d_IsZero(temp_f31) && fopAcM_GetName(i_hitActor) == PROC_ALINK) { + if (cM3d_IsZero(temp_f31) && fopAcM_GetName(i_hitActor) == fpcNm_ALINK_e) { sp14.x = m_pos.x - i_hitActor->current.pos.x; sp14.y = m_pos.y - i_hitActor->current.pos.y; sp14.z = m_pos.z - i_hitActor->current.pos.z; @@ -453,7 +453,7 @@ void dFlower_data_c::hitCheck(fopAc_ac_c* i_hitActor, int i_roomNo) { fopAc_ac_c* hit_actor; u32 mass_flags = dComIfG_Ccsp()->ChkMass(&sp14, &hit_actor, &hitinf); - bool at_hit = (mass_flags & 1) && (hit_actor != NULL && fopAcM_GetName(hit_actor) != PROC_Obj_Carry); + bool at_hit = (mass_flags & 1) && (hit_actor != NULL && fopAcM_GetName(hit_actor) != fpcNm_Obj_Carry_e); if (!(mass_flags & 2) && !at_hit) { if (field_0x01 >= 8) { diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc index a0a86ab079f..04101acea94 100644 --- a/src/d/actor/d_grass.inc +++ b/src/d/actor/d_grass.inc @@ -373,7 +373,7 @@ void dGrass_data_c::hitCheck(int i_roomNo, u16 i_particleName) { fopAc_ac_c* hit_actor; u32 mass_flags = dComIfG_Ccsp()->ChkMass(&m_pos, &hit_actor, &hitinf); - bool at_hit = (mass_flags & 1) && (hit_actor != NULL && fopAcM_GetName(hit_actor) != PROC_Obj_Carry); + bool at_hit = (mass_flags & 1) && (hit_actor != NULL && fopAcM_GetName(hit_actor) != fpcNm_Obj_Carry_e); if (!(mass_flags & 2) && !at_hit) { if (field_0x02 >= 16) { diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index 7e94661310a..b3eec4b77d2 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -188,7 +188,7 @@ void HitSeStart(cXyz const* i_sePos, int i_roomNo, dCcD_GObjInf const* i_CcObj, } else if (hit_obj->ChkAtType(AT_TYPE_HOOKSHOT)) { sfx = Z2SE_HIT_HOOKSHOT_REBOUND; } else { - if (fopAcM_GetProfName(hit_actor) == PROC_ALINK) { + if (fopAcM_GetProfName(hit_actor) == fpcNm_ALINK_e) { daPy_py_c* sp14 = (daPy_py_c*)hit_actor; if (sp14->checkMasterSwordEquip()) { master_sword_hit = true; diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index f3318b63c2d..eed67479acb 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -635,7 +635,7 @@ int dAttention_c::makeList() { void dAttention_c::setOwnerAttentionPos() { mOwnerAttnPos = mpPlayer->attention_info.position; - if (fopAcM_GetName(mpPlayer) == PROC_ALINK) { + if (fopAcM_GetName(mpPlayer) == fpcNm_ALINK_e) { mOwnerAttnPos.y -= ((daPy_py_c*)mpPlayer)->getAttentionOffsetY(); } } @@ -829,7 +829,7 @@ bool dAttention_c::chaseAttention() { f32 dAttention_c::EnemyDistance(fopAc_ac_c* i_actor) { if (i_actor == mpPlayer || mpPlayer == NULL) { return -1.0f; - } else if (fopAcM_GetProfName(i_actor) == PROC_ALINK) { + } else if (fopAcM_GetProfName(i_actor) == fpcNm_ALINK_e) { return -1.0f; } else if (!(i_actor->attention_info.flags & fopAc_AttnFlag_BATTLE_e) && !(i_actor->attention_info.flags & fopAc_AttnFlag_ENEMY_NOLOCK_e)) { @@ -1748,7 +1748,7 @@ fopAc_ac_c* dAttCatch_c::convPId(fpc_ProcID i_id) { } void dAttCatch_c::init() { - mCatchItemNo = fpcNm_ITEM_WATER_BOTTLE; + mCatchItemNo = dItemNo_WATER_BOTTLE_e; mRequestActorID = fpcM_ERROR_PROCESS_ID_e; mCatghTargetID = fpcM_ERROR_PROCESS_ID_e; field_0x4 = 3; @@ -1759,7 +1759,7 @@ void dAttCatch_c::proc() { mChangeItem = mCatchItemNo; mRequestActorID = fpcM_ERROR_PROCESS_ID_e; field_0x4 = 3; - mCatchItemNo = fpcNm_ITEM_WATER_BOTTLE; + mCatchItemNo = dItemNo_WATER_BOTTLE_e; } int dAttCatch_c::request(fopAc_ac_c* i_reqActor, u8 i_itemNo, f32 i_horizontalDist, f32 i_upDist, diff --git a/src/d/d_bg_parts.cpp b/src/d/d_bg_parts.cpp index ccafb31b5b0..4a369a1ca79 100644 --- a/src/d/d_bg_parts.cpp +++ b/src/d/d_bg_parts.cpp @@ -660,7 +660,7 @@ int dBgp_c::execute(bool param_0) { angle.x = (unitData->field_0x14 << 8) | unitData->field_0x5; angle.z = (unitData->field_0x4 << 8) | unitData->field_0x3; - fopAcM_create(PROC_SET_BG_OBJ, parameters, &pos, mPacket.getRoomNo(), &angle, &size, -1); + fopAcM_create(fpcNm_SET_BG_OBJ_e, parameters, &pos, mPacket.getRoomNo(), &angle, &size, -1); } unitData++; } diff --git a/src/d/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp index 1f3046128cc..0259c3f55d5 100644 --- a/src/d/d_bg_s_acch.cpp +++ b/src/d/d_bg_s_acch.cpp @@ -236,7 +236,7 @@ void dBgS_Acch::LineCheck(dBgS& i_bgs) { pos.y += var_f2; if (GetSpeedY() < 0.0f) { - if (m_my_ac != NULL && fopAcM_GetName(m_my_ac) == PROC_ALINK && + if (m_my_ac != NULL && fopAcM_GetName(m_my_ac) == fpcNm_ALINK_e && !static_cast(m_my_ac)->checkPlayerFly() && ChkLink()) { pos.y -= GetSpeedY(); diff --git a/src/d/d_bomb.cpp b/src/d/d_bomb.cpp index 09d05aaf0fd..6b48ef87c3f 100644 --- a/src/d/d_bomb.cpp +++ b/src/d/d_bomb.cpp @@ -14,14 +14,14 @@ bool dBomb_c::checkStateCarry() { } bool dBomb_c::checkFlowerBombWait(fopAc_ac_c* i_actor) { - return (fopAcM_GetName(i_actor) == PROC_NBOMB && fopAcM_GetParam(i_actor) == PRM_FLOWER_BOMB); + return (fopAcM_GetName(i_actor) == fpcNm_NBOMB_e && fopAcM_GetParam(i_actor) == PRM_FLOWER_BOMB); } bool dBomb_c::checkWaterBomb(fopAc_ac_c* i_actor) { - return (fopAcM_GetName(i_actor) == PROC_NBOMB && ((daNbomb_c*)i_actor)->checkWaterBomb()); + return (fopAcM_GetName(i_actor) == fpcNm_NBOMB_e && ((daNbomb_c*)i_actor)->checkWaterBomb()); } bool dBomb_c::checkInsectBombMove(fopAc_ac_c* i_actor) { - return (fopAcM_GetName(i_actor) == PROC_NBOMB && + return (fopAcM_GetName(i_actor) == fpcNm_NBOMB_e && fopAcM_GetParam(i_actor) == PRM_INSECT_BOMB_MOVE); } diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 3b857b8b302..26c2874268b 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -45,7 +45,7 @@ static inline f32 rangef(f32 value1, f32 value2, f32 ratio) { } inline static bool is_player(fopAc_ac_c* actor) { - return fopAcM_GetName(actor) == PROC_ALINK || fopAcM_GetName(actor) == PROC_ALINK; + return fopAcM_GetName(actor) == fpcNm_ALINK_e || fopAcM_GetName(actor) == fpcNm_ALINK_e; } static void hideActor(fopAc_ac_c* actor) { @@ -54,10 +54,10 @@ static void hideActor(fopAc_ac_c* actor) { daPy_py_c* player = (daPy_py_c*)actor; if (player->checkHorseRide()) { daHorse_c* horse = dComIfGp_getHorseActor(); - fopAcM_OnStatus(horse, 0x1000000); + fopAcM_OnStatus(horse, fopAcStts_NODRAW_e); } } else { - fopAcM_OnStatus(actor, 0x1000000); + fopAcM_OnStatus(actor, fopAcStts_NODRAW_e); } } @@ -1701,13 +1701,13 @@ s32 dCamera_c::nextMode(s32 i_curMode) { } else if (link->checkGoatThrow() && dComIfGoat_GetThrow() != NULL) { dComIfGp_getAttention()->LockSoundOff(); mpLockonTarget = dComIfGoat_GetThrow(); - if (fopAcM_GetName(mpLockonTarget) == PROC_E_GOB) { + if (fopAcM_GetName(mpLockonTarget) == fpcNm_E_GOB_e) { if (link->checkGoatThrowAfter()) { next_mode = 2; } else { next_mode = 1; } - } else if (fopAcM_GetName(mpLockonTarget) == PROC_OBJ_GRA) { + } else if (fopAcM_GetName(mpLockonTarget) == fpcNm_OBJ_GRA_e) { next_mode = 1; } else { next_mode = 2; @@ -4156,7 +4156,7 @@ bool dCamera_c::chaseCamera(s32 param_0) { if (player->checkThrowDamage()) { chase->field_0x91 = true; fopAc_ac_c* target = dComIfGp_getAttention()->LockonTarget(0); - if (target != NULL && fopAcM_GetName(target) == PROC_E_HZ) { + if (target != NULL && fopAcM_GetName(target) == fpcNm_E_HZ_e) { setFlag(0x2000); mpAuxTargetActor1 = target; } @@ -4652,8 +4652,8 @@ bool dCamera_c::lockonCamera(s32 param_0) { } if (mpLockonTarget != NULL) { - if (fopAcM_GetName(mpLockonTarget) == PROC_Obj_Bemos - || fopAcM_GetName(mpLockonTarget) == PROC_Obj_Lv6bemos2) + if (fopAcM_GetName(mpLockonTarget) == fpcNm_Obj_Bemos_e + || fopAcM_GetName(mpLockonTarget) == fpcNm_Obj_Lv6bemos2_e) { setUSOAngle(); } @@ -4732,7 +4732,7 @@ bool dCamera_c::lockonCamera(s32 param_0) { } if (mpLockonTarget != NULL && mLockOnActorID != fpcM_ERROR_PROCESS_ID_e - && fopAcM_GetName(mpLockonTarget) != PROC_E_HZ) + && fopAcM_GetName(mpLockonTarget) != fpcNm_E_HZ_e) { val15 = 60.0f; val16 = 20.0f; @@ -4740,12 +4740,12 @@ bool dCamera_c::lockonCamera(s32 param_0) { } if (mpLockonTarget != NULL) { - if (fopAcM_GetName(mpLockonTarget) == PROC_COW) { + if (fopAcM_GetName(mpLockonTarget) == fpcNm_COW_e) { val27 = 0.8f; val22 = 0.8f; val23 = 5.0f; val24 = 10.0f; - } else if (fopAcM_GetName(mpLockonTarget) == PROC_Obj_Cdoor) { + } else if (fopAcM_GetName(mpLockonTarget) == fpcNm_Obj_Cdoor_e) { val23 = 15.0f; val24 = 5.0f; } @@ -4975,7 +4975,7 @@ bool dCamera_c::lockonCamera(s32 param_0) { dComIfG_Bgsp().GetTriPla(lin_chk, &plane); mViewCache.mCenter = lin_chk.GetCross(); mViewCache.mCenter += *plane.GetNP() * 5.0f; - if (fopAcM_GetName(mpLockonTarget) != PROC_E_HZ) { + if (fopAcM_GetName(mpLockonTarget) != fpcNm_E_HZ_e) { ForceLockOff(mLockOnActorID); } } @@ -5313,9 +5313,9 @@ bool dCamera_c::talktoCamera(s32 param_0) { } bool sp5C = false; - if (fopAcM_GetName(speaker) == PROC_NI || fopAcM_GetName(speaker) == PROC_BD - || fopAcM_GetName(speaker) == PROC_SQ || fopAcM_GetName(speaker) == PROC_FR - || fopAcM_GetName(speaker) == PROC_DO || fopAcM_GetName(speaker) == PROC_NPC_NE) + if (fopAcM_GetName(speaker) == fpcNm_NI_e || fopAcM_GetName(speaker) == fpcNm_BD_e + || fopAcM_GetName(speaker) == fpcNm_SQ_e || fopAcM_GetName(speaker) == fpcNm_FR_e + || fopAcM_GetName(speaker) == fpcNm_DO_e || fopAcM_GetName(speaker) == fpcNm_NPC_NE_e) { sp5C = true; talk->field_0x54 = 260.0f; @@ -5326,7 +5326,7 @@ bool dCamera_c::talktoCamera(s32 param_0) { val23 = 40.0f; } - if (fopAcM_GetName(speaker) == PROC_Tag_Mwait) { + if (fopAcM_GetName(speaker) == fpcNm_Tag_Mwait_e) { daTagMwait_c* tagMwait = (daTagMwait_c*)speaker; if (tagMwait->checkEndMessage()) { talk->field_0x3c = 35; @@ -5448,10 +5448,10 @@ bool dCamera_c::talktoCamera(s32 param_0) { sp284.Val(talk->field_0x5c); sp280 = sp284 - talk->field_0x30.U(); talk->field_0x28.U(sp284); - } else if (fopAcM_GetName(speaker) == PROC_OBJ_KANBAN2 - || fopAcM_GetName(speaker) == PROC_TAG_KMSG - || fopAcM_GetName(speaker) == PROC_KNOB20 - || fopAcM_GetName(speaker) == PROC_Obj_NamePlate) { + } else if (fopAcM_GetName(speaker) == fpcNm_OBJ_KANBAN2_e + || fopAcM_GetName(speaker) == fpcNm_TAG_KMSG_e + || fopAcM_GetName(speaker) == fpcNm_KNOB20_e + || fopAcM_GetName(speaker) == fpcNm_Obj_NamePlate_e) { sp284.Val(directionOf(speaker)); sp280 = sp284 - talk->field_0x30.U(); talk->field_0x28.U(sp284); @@ -5543,7 +5543,7 @@ bool dCamera_c::talktoCamera(s32 param_0) { bool sp5B = false; int i = 0; - if (fopAcM_GetName(speaker) == PROC_MIDNA && mMidnaRidingAndVisible) { + if (fopAcM_GetName(speaker) == fpcNm_MIDNA_e && mMidnaRidingAndVisible) { talk->field_0x4 = attentionPos(speaker); talk->field_0x4.y -= 35.0f; f32 fVar36 = talk->field_0x30.U() - talk->field_0x28.U() > cSAngle::_0 ? -40.0f : 40.0f; @@ -5644,8 +5644,8 @@ bool dCamera_c::talktoCamera(s32 param_0) { } } - if ((fopAcM_GetName(speaker) == PROC_Tag_Mhint && ((daTagMhint_c*)speaker)->checkNoAttention()) - || (fopAcM_GetName(speaker) == PROC_Tag_Mstop && ((daTagMstop_c*)speaker)->checkNoAttention())) + if ((fopAcM_GetName(speaker) == fpcNm_Tag_Mhint_e && ((daTagMhint_c*)speaker)->checkNoAttention()) + || (fopAcM_GetName(speaker) == fpcNm_Tag_Mstop_e && ((daTagMstop_c*)speaker)->checkNoAttention())) { bool sp59 = false; if (mIsWolf == 1 && check_owner_action(mPadID, 0x100000)) { @@ -5716,7 +5716,7 @@ bool dCamera_c::talktoCamera(s32 param_0) { if (sp5C) { sp1508.y = attentionPos(speaker).y; } - if (fopAcM_GetName(speaker) == PROC_NPC_KKRI) { + if (fopAcM_GetName(speaker) == fpcNm_NPC_KKRI_e) { sp1508.y = attentionPos(speaker).y - 40.0f; } if (sp58) { @@ -8521,7 +8521,7 @@ bool dCamera_c::rideCamera(s32 param_0) { wk->field_0x98 = (daHorse_c*)wk->field_0xa0; wk->field_0x00 = 0; } else if (player->checkCargoCarry()) { - fopAc_ac_c* spA0 = fopAcM_SearchByName(PROC_KAGO); + fopAc_ac_c* spA0 = fopAcM_SearchByName(fpcNm_KAGO_e); if (spA0 != NULL) { wk->field_0x9c = spA0; wk->field_0xa0 = spA0; @@ -8586,9 +8586,9 @@ bool dCamera_c::rideCamera(s32 param_0) { if (player->checkBoardRide()) { wk->field_0x94 = 0; if (dComIfGs_isTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[0x54])) { - wk->field_0x94 = fopAcM_SearchByName(PROC_NPC_YKM); + wk->field_0x94 = fopAcM_SearchByName(fpcNm_NPC_YKM_e); } else if (dComIfGs_isTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[0x55])) { - wk->field_0x94 = fopAcM_SearchByName(PROC_NPC_YKW); + wk->field_0x94 = fopAcM_SearchByName(fpcNm_NPC_YKW_e); } } @@ -8710,8 +8710,8 @@ bool dCamera_c::rideCamera(s32 param_0) { } if (sp1AC != NULL && - (fopAcM_GetName(sp1AC) == PROC_E_RD || fopAcM_GetName(sp1AC) == PROC_E_FK || - fopAcM_GetName(sp1AC) == PROC_B_GND || fopAcM_GetName(sp1AC) == PROC_E_KR)) + (fopAcM_GetName(sp1AC) == fpcNm_E_RD_e || fopAcM_GetName(sp1AC) == fpcNm_E_FK_e || + fopAcM_GetName(sp1AC) == fpcNm_B_GND_e || fopAcM_GetName(sp1AC) == fpcNm_E_KR_e)) { cXyz sp4C0 = positionOf(sp1AC) - positionOf(wk->field_0x9c); cSAngle spF8 = -mViewCache.mDirection.U(); @@ -8744,7 +8744,7 @@ bool dCamera_c::rideCamera(s32 param_0) { } } - if (sp1AC != NULL && fopAcM_GetName(sp1AC) == PROC_E_KR) { + if (sp1AC != NULL && fopAcM_GetName(sp1AC) == fpcNm_E_KR_e) { val12 = -5.0f; val15 = 10.0f; val7 = 800.0f; @@ -8752,9 +8752,9 @@ bool dCamera_c::rideCamera(s32 param_0) { val2 = -20.0f; } else { if (sp1AC != NULL && - (fopAcM_GetName(sp1AC) == PROC_E_RD && + (fopAcM_GetName(sp1AC) == fpcNm_E_RD_e && (fopAcM_GetParam(sp1AC) & 4) != 0 || - fopAcM_GetName(sp1AC) == PROC_B_GND) && + fopAcM_GetName(sp1AC) == fpcNm_B_GND_e) && sp1A8 == NULL) { #if DEBUG @@ -8777,10 +8777,10 @@ bool dCamera_c::rideCamera(s32 param_0) { val20 = 15.0f; } } else { - if (sp1AC != NULL && (fopAcM_GetName(sp1AC) == PROC_E_RD || - fopAcM_GetName(sp1AC) == PROC_E_FK) || - sp1A8 != NULL && (fopAcM_GetName(sp1A8) == PROC_E_RD || - fopAcM_GetName(sp1A8) == PROC_E_FK) || + if (sp1AC != NULL && (fopAcM_GetName(sp1AC) == fpcNm_E_RD_e || + fopAcM_GetName(sp1AC) == fpcNm_E_FK_e) || + sp1A8 != NULL && (fopAcM_GetName(sp1A8) == fpcNm_E_RD_e || + fopAcM_GetName(sp1A8) == fpcNm_E_FK_e) || sp1A4 != NULL) { #if DEBUG @@ -11204,43 +11204,43 @@ static leafdraw_method_class method = { }; camera_process_profile_definition g_profile_CAMERA = { - fpcLy_CURRENT_e, - 11, - fpcPi_CURRENT_e, - PROC_CAMERA, - &g_fpcLf_Method.base, - sizeof(camera_process_class), - 0, - 0, - &g_fopVw_Method, - 0, - &g_fopCam_Method, - 0, - 0, - 0, - 0, - 0, - &method, - 0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 11, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_CAMERA_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(camera_process_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* View Leaf SubMtd */ &g_fopVw_Method, + /* Draw Prio */ fpcDwPi_CAMERA_e, + /* fopCam Leaf SubMtd */ &g_fopCam_Method, + 0, + 0, + 0, + 0, + 0, + /* Camera SubMtd */ &method, + 0, }; camera_process_profile_definition g_profile_CAMERA2 = { - fpcLy_CURRENT_e, - 11, - fpcPi_CURRENT_e, - PROC_CAMERA2, - &g_fpcLf_Method.base, - sizeof(camera_process_class), - 0, - 0, - &g_fopVw_Method, - 1, - &g_fopCam_Method, - 0, - 0, - 0, - 0, - 0, - &method, - 0, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 11, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_CAMERA2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(camera_process_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* View Leaf SubMtd */ &g_fopVw_Method, + /* Draw Prio */ fpcDwPi_CAMERA2_e, + /* fopCam Leaf SubMtd */ &g_fopCam_Method, + 0, + 0, + 0, + 0, + 0, + /* Camera SubMtd */ &method, + 0, }; diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp index 42116b967fd..7d71e490ac4 100644 --- a/src/d/d_cc_uty.cpp +++ b/src/d/d_cc_uty.cpp @@ -320,7 +320,7 @@ fopAc_ac_c* at_power_check(dCcU_AtInfo* i_AtInfo) { i_AtInfo->mAttackPower = at_power_get(i_AtInfo); s16 ac_name = fopAcM_GetName(i_AtInfo->mpActor); - if (ac_name == PROC_ALINK || ac_name == PROC_ALINK) { + if (ac_name == fpcNm_ALINK_e || ac_name == fpcNm_ALINK_e) { if (i_AtInfo->mpCollider->ChkAtType(AT_TYPE_8000) || i_AtInfo->mpCollider->ChkAtType(AT_TYPE_IRON_BALL)) { @@ -329,13 +329,13 @@ fopAc_ac_c* at_power_check(dCcU_AtInfo* i_AtInfo) { i_AtInfo->mHitType = HIT_TYPE_LINK_NORMAL_ATTACK; i_AtInfo->mHitBit = cc_pl_cut_bit_get(); } - } else if (ac_name == PROC_NBOMB) { + } else if (ac_name == fpcNm_NBOMB_e) { i_AtInfo->mHitType = HIT_TYPE_BOMB; i_AtInfo->mHitBit = 0x10000000; - } else if (ac_name == PROC_BOOMERANG) { + } else if (ac_name == fpcNm_BOOMERANG_e) { i_AtInfo->mHitType = HIT_TYPE_BOOMERANG; i_AtInfo->mHitBit = 0x40000000; - } else if (ac_name == PROC_ARROW) { + } else if (ac_name == fpcNm_ARROW_e) { i_AtInfo->mHitType = HIT_TYPE_ARROW; i_AtInfo->mHitBit = 0x80000000; } @@ -352,7 +352,7 @@ fopAc_ac_c* at_power_check(dCcU_AtInfo* i_AtInfo) { i_AtInfo->mHitBit = 0x1000; } else { s16 ac_name = fopAcM_GetName(i_AtInfo->mpActor); - if (ac_name == PROC_ALINK || ac_name == PROC_ALINK) { + if (ac_name == fpcNm_ALINK_e || ac_name == fpcNm_ALINK_e) { if (dCcD_GetGObjInf(i_AtInfo->mpCollider)->GetAtSpl() == 1) { i_AtInfo->mHitStatus = 1; } @@ -378,7 +378,7 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* i_enemy, dCcU_AtInfo* i_AtInfo) { f32 z = i_AtInfo->mpActor->speed.z; i_AtInfo->mHitDirection.y = cM_atan2s(-x, -z) + (s16)cM_rndFX(4000.0f); } else { - if (fopAcM_GetName(i_AtInfo->mpActor) == PROC_BOOMERANG) { + if (fopAcM_GetName(i_AtInfo->mpActor) == fpcNm_BOOMERANG_e) { x_diff = i_enemy->current.pos.x - player_p->current.pos.x; z_diff = i_enemy->current.pos.z - player_p->current.pos.z; i_AtInfo->mHitDirection.y = cM_atan2s(-x_diff, -z_diff) + (s16)cM_rndFX(10000.0f); @@ -402,9 +402,9 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* i_enemy, dCcU_AtInfo* i_AtInfo) { } if (static_cast(i_AtInfo->mpCollider)->GetAtMtrl() == dCcD_MTRL_LIGHT) { - if (fopAcM_GetName(i_enemy) == PROC_B_GND) { + if (fopAcM_GetName(i_enemy) == fpcNm_B_GND_e) { i_AtInfo->mAttackPower = 0; - } else if (fopAcM_GetName(i_enemy) != PROC_B_ZANT) { + } else if (fopAcM_GetName(i_enemy) != fpcNm_B_ZANT_e) { i_AtInfo->mAttackPower = 100; } } @@ -467,8 +467,8 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* i_enemy, dCcU_AtInfo* i_AtInfo) { ((daPy_py_c*)dComIfGp_getPlayer(0))->checkHorseRide()) { // actor is Bulblin or Horseback Ganon - if ((fopAcM_GetName(i_enemy) == PROC_E_RD && ((s8*)i_enemy)[0x129a] != 0) || - fopAcM_GetName(i_enemy) == PROC_B_GND) + if ((fopAcM_GetName(i_enemy) == fpcNm_E_RD_e && ((s8*)i_enemy)[0x129a] != 0) || + fopAcM_GetName(i_enemy) == fpcNm_B_GND_e) { pause_time = 3; } else { @@ -478,9 +478,9 @@ fopAc_ac_c* cc_at_check(fopAc_ac_c* i_enemy, dCcU_AtInfo* i_AtInfo) { s16 ac_name = fopAcM_GetName(i_enemy); // actor is Stalkin, Chu, Keese, Shadow Keese, Shadow Vermin, Baby Gohma, or Rat - if (ac_name == PROC_E_BS || ac_name == PROC_E_SM2 || ac_name == PROC_E_BA || - ac_name == PROC_E_YK || ac_name == PROC_E_YG || ac_name == PROC_E_GM || - ac_name == PROC_E_MS) + if (ac_name == fpcNm_E_BS_e || ac_name == fpcNm_E_SM2_e || ac_name == fpcNm_E_BA_e || + ac_name == fpcNm_E_YK_e || ac_name == fpcNm_E_YG_e || ac_name == fpcNm_E_GM_e || + ac_name == fpcNm_E_MS_e) { pause_time = 0; } diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 5bd6d55b9e3..b461738e115 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -69,7 +69,7 @@ void dComIfG_play_c::itemInit() { mItemInfo.mNowOxygen = 600; mItemInfo.mMaxOxygen = 600; - if (dComIfGs_checkGetItem(fpcNm_ITEM_HAWK_EYE)) { + if (dComIfGs_checkGetItem(dItemNo_HAWK_EYE_e)) { mItemInfo.field_0x4f4b = 0; } else { mItemInfo.field_0x4f4b = 21; @@ -120,11 +120,11 @@ void dComIfG_play_c::clearItemBombNumCount(u8 i_item) { s16 dComIfG_play_c::getItemMaxBombNumCount(u8 i_bombType) { switch (i_bombType) { - case fpcNm_ITEM_NORMAL_BOMB: + case dItemNo_NORMAL_BOMB_e: return mItemInfo.mItemMaxBombNumCount1; - case fpcNm_ITEM_WATER_BOMB: + case dItemNo_WATER_BOMB_e: return mItemInfo.mItemMaxBombNumCount2; - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_POKE_BOMB_e: return mItemInfo.field_0x4ed8; } return 0; @@ -1238,7 +1238,7 @@ BOOL dComIfG_resetToOpening(scene_class* i_scene) { } #endif - dComIfG_changeOpeningScene(i_scene, PROC_OPENING_SCENE); + dComIfG_changeOpeningScene(i_scene, fpcNm_OPENING_SCENE_e); mDoAud_bgmStop(30); mDoAud_resetProcess(); #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG @@ -1940,7 +1940,7 @@ u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx) { return sel_item_slotNo; } - if (mix_item_slotNo != fpcNm_ITEM_NONE && mix_item_slotNo >= SLOT_15 && mix_item_slotNo < SLOT_18) { + if (mix_item_slotNo != dItemNo_NONE_e && mix_item_slotNo >= SLOT_15 && mix_item_slotNo < SLOT_18) { return mix_item_slotNo; } @@ -1961,17 +1961,17 @@ void dComIfGp_setSelectItem(int i_selItemIdx) { dComIfGs_setSelectItemIndex(i_selItemIdx, 0xFF); } } else { - g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, fpcNm_ITEM_NONE); + g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, dItemNo_NONE_e); } } else if (dComIfGs_getSelectItemIndex(i_selItemIdx) != 0xFF) { u8 item = dComIfGs_getItem(dComIfGs_getSelectItemIndex(i_selItemIdx), false); g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, item); - if (item == fpcNm_ITEM_NONE) { + if (item == dItemNo_NONE_e) { dComIfGs_setSelectItemIndex(i_selItemIdx, 0xFF); } } else { - g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, fpcNm_ITEM_NONE); + g_dComIfG_gameInfo.play.setSelectItem(i_selItemIdx, dItemNo_NONE_e); } } @@ -1983,35 +1983,35 @@ u8 dComIfGp_getSelectItem(int i_selItemIdx) { { u8 saveItem = dComIfGs_getItem(dComIfGs_getMixItemIndex(i_selItemIdx), false); - if (saveItem == fpcNm_ITEM_BOW) { + if (saveItem == dItemNo_BOW_e) { saveItem = playItem; - playItem = fpcNm_ITEM_BOW; - } else if (saveItem == fpcNm_ITEM_FISHING_ROD_1) { + playItem = dItemNo_BOW_e; + } else if (saveItem == dItemNo_FISHING_ROD_1_e) { saveItem = playItem; - playItem = fpcNm_ITEM_FISHING_ROD_1; + playItem = dItemNo_FISHING_ROD_1_e; } - if (playItem == fpcNm_ITEM_BOW) { + if (playItem == dItemNo_BOW_e) { switch (saveItem) { - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - playItem = fpcNm_ITEM_BOMB_ARROW; + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + playItem = dItemNo_BOMB_ARROW_e; break; - case fpcNm_ITEM_HAWK_EYE: - playItem = fpcNm_ITEM_HAWK_ARROW; + case dItemNo_HAWK_EYE_e: + playItem = dItemNo_HAWK_ARROW_e; break; } - } else if (playItem == fpcNm_ITEM_FISHING_ROD_1) { + } else if (playItem == dItemNo_FISHING_ROD_1_e) { switch (saveItem) { - case fpcNm_ITEM_BEE_CHILD: - playItem = fpcNm_ITEM_BEE_ROD; + case dItemNo_BEE_CHILD_e: + playItem = dItemNo_BEE_ROD_e; break; - case fpcNm_ITEM_WORM: - playItem = fpcNm_ITEM_WORM_ROD; + case dItemNo_WORM_e: + playItem = dItemNo_WORM_ROD_e; break; - case fpcNm_ITEM_ZORAS_JEWEL: - playItem = fpcNm_ITEM_JEWEL_ROD; + case dItemNo_ZORAS_JEWEL_e: + playItem = dItemNo_JEWEL_ROD_e; break; } } @@ -2129,10 +2129,10 @@ JKRExpHeap* dComIfGp_getSubHeap2D(int flag) { u8 dComIfGs_checkGetInsectNum() { static u8 l_itemno[24] = { - fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, - fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI, - fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL, - fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY, + dItemNo_M_BEETLE_e, dItemNo_F_BEETLE_e, dItemNo_M_BUTTERFLY_e, dItemNo_F_BUTTERFLY_e, dItemNo_M_STAG_BEETLE_e, dItemNo_F_STAG_BEETLE_e, + dItemNo_M_GRASSHOPPER_e, dItemNo_F_GRASSHOPPER_e, dItemNo_M_NANAFUSHI_e, dItemNo_F_NANAFUSHI_e, dItemNo_M_DANGOMUSHI_e, dItemNo_F_DANGOMUSHI_e, + dItemNo_M_MANTIS_e, dItemNo_F_MANTIS_e, dItemNo_M_LADYBUG_e, dItemNo_F_LADYBUG_e, dItemNo_M_SNAIL_e, dItemNo_F_SNAIL_e, + dItemNo_M_DRAGONFLY_e, dItemNo_F_DRAGONFLY_e, dItemNo_M_ANT_e, dItemNo_F_ANT_e, dItemNo_M_MAYFLY_e, dItemNo_F_MAYFLY_e, }; u8 insectCount = 0; @@ -2180,14 +2180,14 @@ s16 dComIfGp_getSelectItemNum(int i_selItemIdx) { u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); s16 itemNum = 0; - if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB || - selectItem == fpcNm_ITEM_BOMB_ARROW) + if (selectItem == dItemNo_NORMAL_BOMB_e || selectItem == dItemNo_WATER_BOMB_e || selectItem == dItemNo_POKE_BOMB_e || + selectItem == dItemNo_BOMB_ARROW_e) { u8 slot_no = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15; itemNum = dComIfGs_getBombNum(slot_no); - } else if (selectItem == fpcNm_ITEM_PACHINKO) { + } else if (selectItem == dItemNo_PACHINKO_e) { itemNum = dComIfGs_getPachinkoNum(); - } else if (selectItem == fpcNm_ITEM_BEE_CHILD) { + } else if (selectItem == dItemNo_BEE_CHILD_e) { u8 slot_no = dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11; itemNum = dComIfGs_getBottleNum(slot_no); } @@ -2199,15 +2199,15 @@ int dComIfGp_getSelectItemMaxNum(int i_selItemIdx) { u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); int itemNum = 0; - if (selectItem == fpcNm_ITEM_BOMB_BAG_LV1) { + if (selectItem == dItemNo_BOMB_BAG_LV1_e) { itemNum = 1; - } else if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB || - selectItem == fpcNm_ITEM_BOMB_ARROW) + } else if (selectItem == dItemNo_NORMAL_BOMB_e || selectItem == dItemNo_WATER_BOMB_e || selectItem == dItemNo_POKE_BOMB_e || + selectItem == dItemNo_BOMB_ARROW_e) { itemNum = dComIfGs_getBombMax(selectItem); - } else if (selectItem == fpcNm_ITEM_PACHINKO) { + } else if (selectItem == dItemNo_PACHINKO_e) { itemNum = dComIfGs_getPachinkoMax(); - } else if (selectItem == fpcNm_ITEM_BEE_CHILD) { + } else if (selectItem == dItemNo_BEE_CHILD_e) { itemNum = dComIfGs_getBottleMax(); } @@ -2217,8 +2217,8 @@ int dComIfGp_getSelectItemMaxNum(int i_selItemIdx) { void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) { u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); - if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB || - selectItem == fpcNm_ITEM_BOMB_ARROW) + if (selectItem == dItemNo_NORMAL_BOMB_e || selectItem == dItemNo_WATER_BOMB_e || selectItem == dItemNo_POKE_BOMB_e || + selectItem == dItemNo_BOMB_ARROW_e) { u8 mix_slotNo = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15; @@ -2226,9 +2226,9 @@ void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) { i_num = dComIfGs_getBombMax(selectItem); } dComIfGs_setBombNum(mix_slotNo, i_num); - } else if (selectItem == fpcNm_ITEM_PACHINKO) { + } else if (selectItem == dItemNo_PACHINKO_e) { dComIfGs_setPachinkoNum(i_num); - } else if (selectItem == fpcNm_ITEM_BEE_CHILD) { + } else if (selectItem == dItemNo_BEE_CHILD_e) { u8 bottle_slot_no = dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11; if (i_num > dComIfGs_getBottleMax()) { @@ -2241,14 +2241,14 @@ void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) { void dComIfGp_addSelectItemNum(int i_selItemIdx, s16 i_num) { u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx); - if (selectItem == fpcNm_ITEM_NORMAL_BOMB || selectItem == fpcNm_ITEM_WATER_BOMB || selectItem == fpcNm_ITEM_POKE_BOMB || - selectItem == fpcNm_ITEM_BOMB_ARROW) + if (selectItem == dItemNo_NORMAL_BOMB_e || selectItem == dItemNo_WATER_BOMB_e || selectItem == dItemNo_POKE_BOMB_e || + selectItem == dItemNo_BOMB_ARROW_e) { u8 slot_no = dComIfGs_getSelectMixItemNoArrowIndex(i_selItemIdx) - SLOT_15; dComIfGp_setItemBombNumCount(slot_no, i_num); - } else if (selectItem == fpcNm_ITEM_PACHINKO) { + } else if (selectItem == dItemNo_PACHINKO_e) { dComIfGp_setItemPachinkoNumCount(i_num); - } else if (selectItem == fpcNm_ITEM_BEE_CHILD) { + } else if (selectItem == dItemNo_BEE_CHILD_e) { u8 slot_no = dComIfGs_getSelectItemIndex(i_selItemIdx) - SLOT_11; dComIfGs_addBottleNum(slot_no, i_num); } @@ -2309,34 +2309,34 @@ void dComIfG_playerStatusD() { dComIfGs_onItemFirstBit(i); } - dComIfGs_offItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES1); - dComIfGs_offItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES2); - dComIfGs_offItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES3); - dComIfGs_offItemFirstBit(fpcNm_ITEM_LV2_BOSS_KEY); - dComIfGs_offItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV2); - dComIfGs_offItemFirstBit(fpcNm_ITEM_TOMATO_PUREE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_TASTE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_POU_FIRE1); - dComIfGs_offItemFirstBit(fpcNm_ITEM_POU_FIRE2); - dComIfGs_offItemFirstBit(fpcNm_ITEM_POU_FIRE3); - dComIfGs_offItemFirstBit(fpcNm_ITEM_POU_FIRE4); + dComIfGs_offItemFirstBit(dItemNo_L2_KEY_PIECES1_e); + dComIfGs_offItemFirstBit(dItemNo_L2_KEY_PIECES2_e); + dComIfGs_offItemFirstBit(dItemNo_L2_KEY_PIECES3_e); + dComIfGs_offItemFirstBit(dItemNo_LV2_BOSS_KEY_e); + dComIfGs_offItemFirstBit(dItemNo_BOMB_BAG_LV2_e); + dComIfGs_offItemFirstBit(dItemNo_TOMATO_PUREE_e); + dComIfGs_offItemFirstBit(dItemNo_TASTE_e); + dComIfGs_offItemFirstBit(dItemNo_POU_FIRE1_e); + dComIfGs_offItemFirstBit(dItemNo_POU_FIRE2_e); + dComIfGs_offItemFirstBit(dItemNo_POU_FIRE3_e); + dComIfGs_offItemFirstBit(dItemNo_POU_FIRE4_e); for (int i = 0; i < 24; i++) { - dComIfGs_offItemFirstBit(i + fpcNm_ITEM_M_BEETLE); + dComIfGs_offItemFirstBit(i + dItemNo_M_BEETLE_e); } - dComIfGs_offItemFirstBit(fpcNm_ITEM_LIGHT_SWORD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SHIELD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL); + dComIfGs_offItemFirstBit(dItemNo_LIGHT_SWORD_e); + dComIfGs_offItemFirstBit(dItemNo_SHIELD_e); + dComIfGs_offItemFirstBit(dItemNo_ZORAS_JEWEL_e); for (int i = 0; i < 19; i++) { dComIfGs_offItemFirstBit(i); } - dComIfGs_setCollectSmell(fpcNm_ITEM_SMELL_PUMPKIN); + dComIfGs_setCollectSmell(dItemNo_SMELL_PUMPKIN_e); if (!mDoCPd_c::isConnect(PAD_3)) { - dComIfGs_offItemFirstBit(fpcNm_ITEM_SMELL_POH); + dComIfGs_offItemFirstBit(dItemNo_SMELL_POH_e); } dComIfGs_setArrowNum(30); @@ -2354,13 +2354,13 @@ void dComIfG_playerStatusD() { dComIfGs_setSaveStartTime(OSGetTime()); dComIfGs_setBombNum(8, 30); - dComIfGs_setBombMax(fpcNm_ITEM_NORMAL_BOMB, 30); - dComIfGs_setBombMax(fpcNm_ITEM_WATER_BOMB, 15); - dComIfGs_setBombMax(fpcNm_ITEM_POKE_BOMB, 10); + dComIfGs_setBombMax(dItemNo_NORMAL_BOMB_e, 30); + dComIfGs_setBombMax(dItemNo_WATER_BOMB_e, 15); + dComIfGs_setBombMax(dItemNo_POKE_BOMB_e, 10); - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false); - dMeter2Info_setSword(fpcNm_ITEM_SWORD, false); - dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false); + dMeter2Info_setCloth(dItemNo_WEAR_KOKIRI_e, false); + dMeter2Info_setSword(dItemNo_SWORD_e, false); + dMeter2Info_setShield(dItemNo_HYLIA_SHIELD_e, false); dComIfGs_onGetMagicUseFlag(); dComIfGs_onEventBit(0x540); @@ -2404,15 +2404,15 @@ void dComIfG_playerStatusD_pre_clear() { dComIfGs_setSelectItemIndex(i, 0xFF); } - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_CASUAL); - dComIfGp_setSelectEquipClothes(fpcNm_ITEM_WEAR_CASUAL); - dComIfGs_setSelectEquipSword(fpcNm_ITEM_NONE); - dComIfGp_setSelectEquipSword(fpcNm_ITEM_NONE); - dComIfGs_setSelectEquipShield(fpcNm_ITEM_NONE); - dComIfGp_setSelectEquipShield(fpcNm_ITEM_NONE); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_CASUAL_e); + dComIfGp_setSelectEquipClothes(dItemNo_WEAR_CASUAL_e); + dComIfGs_setSelectEquipSword(dItemNo_NONE_e); + dComIfGp_setSelectEquipSword(dItemNo_NONE_e); + dComIfGs_setSelectEquipShield(dItemNo_NONE_e); + dComIfGp_setSelectEquipShield(dItemNo_NONE_e); for (int i = 0; i < 24; i++) { - dComIfGs_setItem(i, fpcNm_ITEM_NONE); + dComIfGs_setItem(i, dItemNo_NONE_e); } for (int i = 0; i < 0x100; i++) { @@ -2423,8 +2423,8 @@ void dComIfG_playerStatusD_pre_clear() { dComIfGs_setBombNum(0); dComIfGs_setArrowMax(0); dComIfGs_setBombMax(0); - dComIfGs_setSelectEquipShield(fpcNm_ITEM_SHIELD); - dComIfGp_setSelectEquipShield(fpcNm_ITEM_SHIELD); + dComIfGs_setSelectEquipShield(dItemNo_SHIELD_e); + dComIfGp_setSelectEquipShield(dItemNo_SHIELD_e); } #endif @@ -2584,16 +2584,16 @@ void dComIfGs_setSelectEquipClothes(u8 i_itemNo) { void dComIfGs_setSelectEquipSword(u8 i_itemNo) { switch (i_itemNo) { - case fpcNm_ITEM_SWORD: + case dItemNo_SWORD_e: dComIfGs_setCollectSword(COLLECT_ORDON_SWORD); break; - case fpcNm_ITEM_MASTER_SWORD: + case dItemNo_MASTER_SWORD_e: dComIfGs_setCollectSword(COLLECT_MASTER_SWORD); break; - case fpcNm_ITEM_WOOD_STICK: + case dItemNo_WOOD_STICK_e: dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD); break; - case fpcNm_ITEM_LIGHT_SWORD: + case dItemNo_LIGHT_SWORD_e: dComIfGs_setCollectSword(COLLECT_LIGHT_SWORD); break; } @@ -2603,13 +2603,13 @@ void dComIfGs_setSelectEquipSword(u8 i_itemNo) { void dComIfGs_setSelectEquipShield(u8 i_itemNo) { switch (i_itemNo) { - case fpcNm_ITEM_WOOD_SHIELD: + case dItemNo_WOOD_SHIELD_e: dComIfGs_setCollectShield(COLLECT_WOODEN_SHIELD); break; - case fpcNm_ITEM_SHIELD: + case dItemNo_SHIELD_e: dComIfGs_setCollectShield(COLLECT_ORDON_SHIELD); break; - case fpcNm_ITEM_HYLIA_SHIELD: + case dItemNo_HYLIA_SHIELD_e: dComIfGs_setCollectShield(COLLECT_HYLIAN_SHIELD); break; } diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index 734ed221e75..b96c06bf926 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -237,15 +237,15 @@ static leafdraw_method_class l_dEnvSe_Method = { }; kankyo_process_profile_definition g_profile_ENVSE = { - fpcLy_CURRENT_e, - 2, - fpcPi_CURRENT_e, - PROC_ENVSE, - &g_fpcLf_Method.base, - sizeof(dEnvSe_c), - 0, - 0, - &g_fopKy_Method, - 689, - &l_dEnvSe_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ENVSE_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dEnvSe_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_ENVSE_e, + /* Kankyo SubMtd */ &l_dEnvSe_Method, }; diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index cdf3a9efe8e..73891276df9 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -231,9 +231,9 @@ int dEvt_control_c::commonCheck(dEvt_order_c* order, u16 condition, u16 command) int dEvt_control_c::talkCheck(dEvt_order_c* order) { char* eventname = "DEFAULT_TALK"; fopAc_ac_c* actor = order->mpTargetActor; - if ((fopAcM_GetName(actor) == PROC_Tag_Mhint && ((daTagMhint_c*)actor)->checkNoAttention()) || - (fopAcM_GetName(actor) == PROC_Tag_Mstop && ((daTagMstop_c*)actor)->checkNoAttention()) || - fopAcM_GetName(actor) == PROC_MIDNA) + if ((fopAcM_GetName(actor) == fpcNm_Tag_Mhint_e && ((daTagMhint_c*)actor)->checkNoAttention()) || + (fopAcM_GetName(actor) == fpcNm_Tag_Mstop_e && ((daTagMstop_c*)actor)->checkNoAttention()) || + fopAcM_GetName(actor) == fpcNm_MIDNA_e) { daMidna_c* midna = (daMidna_c*)daPy_py_c::getMidnaActor(); if (!daPy_py_c::checkNowWolf() || midna->checkNoDraw()) { @@ -303,7 +303,7 @@ int dEvt_control_c::talkXyCheck(dEvt_order_c* order) { return 0; } - if (dComIfGp_getSelectItem(itemIndex) == fpcNm_ITEM_NONE) { + if (dComIfGp_getSelectItem(itemIndex) == dItemNo_NONE_e) { return 0; } @@ -381,7 +381,7 @@ int dEvt_control_c::talkEnd() { } daItemBase_c* item = (daItemBase_c*)fopAcM_getItemEventPartner(NULL); - if (item != NULL && fopAcM_GetName(item) == PROC_ITEM) { + if (item != NULL && fopAcM_GetName(item) == fpcNm_ITEM_e) { item->dead(); } @@ -580,7 +580,7 @@ int dEvt_control_c::endProc() { field_0xec = 0xFF; mTalkXyType = 0; mUnkEventId = 255; - mPreItemNo = fpcNm_ITEM_NONE; + mPreItemNo = dItemNo_NONE_e; dComIfGp_getEventManager().setStartDemo(-2); return 1; } @@ -1133,7 +1133,7 @@ int dEvt_control_c::Step() { int dEvt_control_c::moveApproval(void* param_0) { fopAc_ac_c* actor = (fopAc_ac_c*)param_0; - if (fopAcM_CheckStatus(actor, 0x20000)) { + if (fopAcM_CheckStatus(actor, fopAcStts_NOPAUSE_e)) { return 2; } @@ -1163,11 +1163,11 @@ int dEvt_control_c::moveApproval(void* param_0) { break; } - if (fopAcM_CheckStatus(actor, 0x8000)) { + if (fopAcM_CheckStatus(actor, fopAcStts_STAFF_PRIMARY_e)) { return 2; } - if (fopAcM_CheckStatus(actor, 0x800)) { + if (fopAcM_CheckStatus(actor, fopAcStts_STAFF_EXTRA_e)) { return 1; } @@ -1176,7 +1176,7 @@ int dEvt_control_c::moveApproval(void* param_0) { return 0; } - if (mMode == dEvt_mode_TALK_e && fopAcM_CheckStatus(actor, 0x40)) { + if (mMode == dEvt_mode_TALK_e && fopAcM_CheckStatus(actor, fopAcStts_UNK_0x40_e)) { return 1; } @@ -1184,15 +1184,15 @@ int dEvt_control_c::moveApproval(void* param_0) { return 1; } - if ((getMode() == 3 || getMode() == dEvt_mode_TALK_e) && fopAcM_CheckStatus(actor, 0x4000000)) { + if ((getMode() == 3 || getMode() == dEvt_mode_TALK_e) && fopAcM_CheckStatus(actor, fopAcStts_BOSS_e)) { return 0; } - if (fopAcM_CheckStatus(actor, 0x4000)) { + if (fopAcM_CheckStatus(actor, fopAcStts_UNK_0x4000_e)) { return 1; } - if (fopAcM_CheckStatus(actor, 0x2000)) { + if (fopAcM_CheckStatus(actor, fopAcStts_CARRY_NOW_e)) { return 1; } @@ -1222,7 +1222,7 @@ void dEvt_control_c::remove() { mStageEventDt = NULL; mUnkEventId = 255; mTalkXyType = 0; - mPreItemNo = fpcNm_ITEM_NONE; + mPreItemNo = dItemNo_NONE_e; mEventFlag = 0; mFlag2 = 0; mChangeActor = NULL; diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index 84af0a5d516..1333192a4f1 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -298,7 +298,7 @@ int dEvent_manager_c::create() { OS_REPORT("event manager: BASE_KEEPは読み込めなかった\n"); } #endif - + mEventList[BASE_ACTOR].init(); #if DEBUG @@ -495,19 +495,19 @@ void dEvent_manager_c::remove() { } static void* extraOnObjectCallBack(fopAc_ac_c* actor, void* data) { - fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x800); + fopAcM_OnStatus(actor, fopAcStts_STAFF_EXTRA_e); return NULL; } static void* extraOffObjectCallBack(fopAc_ac_c* actor, void* data) { - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x800); + fopAcM_OffStatus(actor, fopAcStts_STAFF_EXTRA_e); return NULL; } static void* allOffObjectCallBack(fopAc_ac_c* actor, void* data) { fopAc_ac_c* spC = (fopAc_ac_c*)data; - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x8000 | fopAcM_STATUS_UNK_0x1000); + fopAcM_OffStatus(actor, fopAcStts_STAFF_PRIMARY_e | fopAcStts_STAFF_SHUTTER_e); return NULL; } @@ -542,7 +542,7 @@ void dEvent_manager_c::startProc(dEvDtEvent_c* event) { } if (event_actor_p != NULL) { - fopAcM_OnStatus(event_actor_p, fopAcM_STATUS_UNK_0x8000); + fopAcM_OnStatus(event_actor_p, fopAcStts_STAFF_PRIMARY_e); // "event manager: C:Staff ON %s!!" OS_REPORT("\x1B[34m%06d: event manager: Ｃ：スタッフ　ON　%s!!\n\x1B[m", g_Counter.mCounter0, dStage_getName(fopAcM_GetProfName(event_actor_p), -1)); } else { @@ -1029,7 +1029,7 @@ int dEvent_manager_c::getMyStaffId(const char* staffName, fopAc_ac_c* actor, int dEvDtEvent_c* event = getEventData(mCurrentEvId); if (event != NULL && (event->mEventState == dEvDt_State_START_e || event->mEventState == dEvDt_State_END_e)) { n_staff = event->getNStaff(); - + bool hasDp = false; if (strchr(staffName, ':') != NULL) { hasDp = true; @@ -1300,7 +1300,7 @@ void dEvent_manager_c::issueStaff(const char* staffname) { char nameBuf[32]; strcpy(nameBuf, staffname); fopAc_ac_c* actor = fopAcM_searchFromName4Event(nameBuf, -1); - fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x800); + fopAcM_OnStatus(actor, fopAcStts_STAFF_EXTRA_e); } } @@ -1311,7 +1311,7 @@ void dEvent_manager_c::cancelStaff(const char* staffname) { char nameBuf[32]; strcpy(nameBuf, staffname); fopAc_ac_c* actor = fopAcM_searchFromName4Event(nameBuf, -1); - fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x800); + fopAcM_OffStatus(actor, fopAcStts_STAFF_EXTRA_e); } } @@ -1402,18 +1402,18 @@ fopAc_ac_c* dEvent_manager_c::specialCast(const char* staffname, BOOL param_1) { } if (strcmp(staffname, "SHUTTER_DOOR") == 0) { - shutterActor = specialCast_Shutter(PROC_KNOB20, param_1); + shutterActor = specialCast_Shutter(fpcNm_KNOB20_e, param_1); if (shutterActor == NULL) { - shutterActor = specialCast_Shutter(PROC_BOSS_DOOR, param_1); + shutterActor = specialCast_Shutter(fpcNm_BOSS_DOOR_e, param_1); } if (shutterActor == NULL) { - shutterActor = specialCast_Shutter(PROC_L1BOSS_DOOR, param_1); + shutterActor = specialCast_Shutter(fpcNm_L1BOSS_DOOR_e, param_1); } if (shutterActor == NULL) { - shutterActor = specialCast_Shutter(PROC_L1MBOSS_DOOR, param_1); + shutterActor = specialCast_Shutter(fpcNm_L1MBOSS_DOOR_e, param_1); } if (shutterActor == NULL) { - shutterActor = specialCast_Shutter(PROC_L5BOSS_DOOR, param_1); + shutterActor = specialCast_Shutter(fpcNm_L5BOSS_DOOR_e, param_1); } if (shutterActor != NULL) { dComIfGp_getEvent()->onEventFlag(0x10); @@ -1422,9 +1422,9 @@ fopAc_ac_c* dEvent_manager_c::specialCast(const char* staffname, BOOL param_1) { if (shutterActor != NULL) { if (param_1) { - fopAcM_OnStatus(shutterActor, 0x1000); + fopAcM_OnStatus(shutterActor, fopAcStts_STAFF_SHUTTER_e); } else { - fopAcM_OffStatus(shutterActor, 0x1000); + fopAcM_OffStatus(shutterActor, fopAcStts_STAFF_SHUTTER_e); } } diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 55456ad8267..1bbc3eb78ca 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -1007,10 +1007,10 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) { ken0->hide(); ken1->hide(); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_SWORD)) { + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_SWORD_e)) { ken0->hide(); ken1->show(); - } else if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WOOD_STICK) && + } else if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_WOOD_STICK_e) && !pSave->getEvent().isEventBit(dSv_event_flag_c::F_0026)) { ken0->show(); @@ -1018,8 +1018,8 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) { } J2DPane* ken2 = mSelDt.ScrDt->search(MULTI_CHAR('ken_02')); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_MASTER_SWORD) || - pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_LIGHT_SWORD)) + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_MASTER_SWORD_e) || + pSave->getPlayer().getGetItem().isFirstBit(dItemNo_LIGHT_SWORD_e)) { ken2->show(); } else { @@ -1031,37 +1031,37 @@ void dFile_select_c::makeRecInfo(u8 i_dataNo) { tate0->hide(); tate1->hide(); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_SHIELD)) { + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_SHIELD_e)) { tate0->show(); tate1->hide(); - } else if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WOOD_SHIELD)) { + } else if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_WOOD_SHIELD_e)) { tate0->hide(); tate1->show(); } J2DPane* tate2 = mSelDt.ScrDt->search(MULTI_CHAR('tate_02')); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_HYLIA_SHIELD)) { + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_HYLIA_SHIELD_e)) { tate2->show(); } else { tate2->hide(); } J2DPane* fuku0 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_00')); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WEAR_KOKIRI)) { + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_WEAR_KOKIRI_e)) { fuku0->show(); } else { fuku0->hide(); } J2DPane* fuku1 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_01')); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_WEAR_ZORA)) { + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_WEAR_ZORA_e)) { fuku1->show(); } else { fuku1->hide(); } J2DPane* fuku2 = mSelDt.ScrDt->search(MULTI_CHAR('fuku_02')); - if (pSave->getPlayer().getGetItem().isFirstBit(fpcNm_ITEM_ARMOR)) { + if (pSave->getPlayer().getGetItem().isFirstBit(dItemNo_ARMOR_e)) { fuku2->show(); } else { fuku2->hide(); diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 4275dbe3f5d..acc5afe0ebb 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -150,7 +150,7 @@ int dGameover_c::_create() { if (!strcmp(dComIfGp_getLastPlayStageName(), "D_MN10A")) { // Last stage was Stallord Arena // Remove Ooccoo from inventory - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_NONE); + dComIfGs_setItem(SLOT_18, dItemNo_NONE_e); dComIfGs_resetLastWarpAcceptStage(); } @@ -305,8 +305,8 @@ void dGameover_c::saveClose_proc() { } // Reset Lantern and oil status back into inventory if gameover during monkey steal sequence - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_KANTERA) && dComIfGs_getItem(SLOT_1, true) == fpcNm_ITEM_NONE) { - dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA); + if (dComIfGs_isItemFirstBit(dItemNo_KANTERA_e) && dComIfGs_getItem(SLOT_1, true) == dItemNo_NONE_e) { + dComIfGs_setItem(SLOT_1, dItemNo_KANTERA_e); dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp()); } @@ -476,7 +476,7 @@ static int dGameover_Create(msg_class* i_this) { s32 d_GameOver_Create(u8 i_gameoverType) { dMeter2Info_setGameOverType(i_gameoverType); - return fopMsgM_create(PROC_GAMEOVER, NULL, NULL, NULL, NULL, NULL); + return fopMsgM_create(fpcNm_GAMEOVER_e, NULL, NULL, NULL, NULL, NULL); } bool d_GameOver_Delete(fpc_ProcID& i_id) { @@ -499,15 +499,15 @@ static leafdraw_method_class l_dGameover_Method = { }; msg_process_profile_definition g_profile_GAMEOVER = { - fpcLy_CURRENT_e, - 0x0C, - fpcPi_CURRENT_e, - PROC_GAMEOVER, - &g_fpcLf_Method.base, - sizeof(dGameover_c), - 0, - 0, - &g_fopMsg_Method, - 0x303, - &l_dGameover_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_GAMEOVER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dGameover_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopMsg_Method, + /* Draw Prio */ fpcDwPi_GAMEOVER_e, + /* Msg SubMtd */ &l_dGameover_Method, }; diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp index f69e648c673..505309803da 100644 --- a/src/d/d_insect.cpp +++ b/src/d/d_insect.cpp @@ -16,7 +16,7 @@ dInsect_c::dInsect_c() { field_0x56c = 0; mDraw = true; m_mode = 0; - m_itemNo = fpcNm_ITEM_M_MAYFLY; + m_itemNo = dItemNo_M_MAYFLY_e; field_0x584 = 0; field_0x585 = 0; } @@ -63,7 +63,7 @@ void dInsect_c::Insect_GetDemoMain() { mDraw = true; m_mode = 0; if (field_0x584 == 0) { - fopAcM_createItem(¤t.pos, fpcNm_ITEM_HEART, -1, -1, NULL, NULL, 0); + fopAcM_createItem(¤t.pos, dItemNo_HEART_e, -1, -1, NULL, NULL, 0); field_0x584 = 1; } } else { diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index 0a7314fb31d..cb525139db7 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -592,19 +592,19 @@ void item_func_L_MAGIC() { } void item_func_BOMB_5() { - addBombCount(fpcNm_ITEM_NORMAL_BOMB, 5); + addBombCount(dItemNo_NORMAL_BOMB_e, 5); } void item_func_BOMB_10() { - addBombCount(fpcNm_ITEM_NORMAL_BOMB, 10); + addBombCount(dItemNo_NORMAL_BOMB_e, 10); } void item_func_BOMB_20() { - addBombCount(fpcNm_ITEM_NORMAL_BOMB, 20); + addBombCount(dItemNo_NORMAL_BOMB_e, 20); } void item_func_BOMB_30() { - addBombCount(fpcNm_ITEM_NORMAL_BOMB, 30); + addBombCount(dItemNo_NORMAL_BOMB_e, 30); } void item_func_ARROW_10() { @@ -628,31 +628,31 @@ void item_func_PACHINKO_SHOT() { } void item_func_WATER_BOMB_5() { - addBombCount(fpcNm_ITEM_WATER_BOMB, 5); + addBombCount(dItemNo_WATER_BOMB_e, 5); } void item_func_WATER_BOMB_10() { - addBombCount(fpcNm_ITEM_WATER_BOMB, 10); + addBombCount(dItemNo_WATER_BOMB_e, 10); } void item_func_WATER_BOMB_20() { - addBombCount(fpcNm_ITEM_WATER_BOMB, 15); + addBombCount(dItemNo_WATER_BOMB_e, 15); } void item_func_WATER_BOMB_30() { - addBombCount(fpcNm_ITEM_WATER_BOMB, 3); + addBombCount(dItemNo_WATER_BOMB_e, 3); } void item_func_BOMB_INSECT_5() { - addBombCount(fpcNm_ITEM_POKE_BOMB, 5); + addBombCount(dItemNo_POKE_BOMB_e, 5); } void item_func_BOMB_INSECT_10() { - addBombCount(fpcNm_ITEM_POKE_BOMB, 10); + addBombCount(dItemNo_POKE_BOMB_e, 10); } void item_func_BOMB_INSECT_20() { - addBombCount(fpcNm_ITEM_POKE_BOMB, 3); + addBombCount(dItemNo_POKE_BOMB_e, 3); } void item_func_BOMB_INSECT_30() {} @@ -692,7 +692,7 @@ void item_func_COMPUS() { void item_func_DUNGEON_EXIT() { dComIfGs_onDungeonItemWarp(); - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_EXIT); + dComIfGs_setItem(SLOT_18, dItemNo_DUNGEON_EXIT_e); } void item_func_BOSS_KEY() { @@ -700,22 +700,22 @@ void item_func_BOSS_KEY() { } void item_func_DUNGEON_BACK() { - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_BACK); + dComIfGs_setItem(SLOT_18, dItemNo_DUNGEON_BACK_e); } void item_func_SWORD() { dComIfGs_setCollectSword(COLLECT_ORDON_SWORD); - dComIfGs_setSelectEquipSword(fpcNm_ITEM_SWORD); + dComIfGs_setSelectEquipSword(dItemNo_SWORD_e); } void item_func_MASTER_SWORD() { dComIfGs_setCollectSword(COLLECT_MASTER_SWORD); - dComIfGs_setSelectEquipSword(fpcNm_ITEM_MASTER_SWORD); + dComIfGs_setSelectEquipSword(dItemNo_MASTER_SWORD_e); } void item_func_WOOD_SHIELD() { dComIfGs_setCollectShield(COLLECT_WOODEN_SHIELD); - dComIfGs_setSelectEquipShield(fpcNm_ITEM_WOOD_SHIELD); + dComIfGs_setSelectEquipShield(dItemNo_WOOD_SHIELD_e); } void item_func_SHIELD() {} @@ -723,16 +723,16 @@ void item_func_SHIELD() {} void item_func_HYLIA_SHIELD() {} void item_func_TKS_LETTER() { - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_TKS_LETTER); + dComIfGs_setItem(SLOT_18, dItemNo_TKS_LETTER_e); } void item_func_WEAR_CASUAL() { - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_CASUAL); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_CASUAL_e); } void item_func_WEAR_KOKIRI() { dComIfGs_setCollectClothes(KOKIRI_CLOTHES_FLAG); - dComIfGs_setSelectEquipClothes(fpcNm_ITEM_WEAR_KOKIRI); + dComIfGs_setSelectEquipClothes(dItemNo_WEAR_KOKIRI_e); } void item_func_ARMOR() {} @@ -745,7 +745,7 @@ void item_func_MAGIC_LV1() { } void item_func_DUNGEON_EXIT_2() { - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_EXIT); + dComIfGs_setItem(SLOT_18, dItemNo_DUNGEON_EXIT_e); } void item_func_WALLET_LV1() { @@ -764,93 +764,93 @@ void item_func_ZORAS_JEWEL() { if (item_getcheck_func_FISHING_ROD_1()) { dComIfGs_setRodTypeLevelUp(); } else { - dComIfGs_setItem(SLOT_20, fpcNm_ITEM_ZORAS_JEWEL); + dComIfGs_setItem(SLOT_20, dItemNo_ZORAS_JEWEL_e); } } void item_func_HAWK_EYE() { - dComIfGs_setItem(SLOT_5, fpcNm_ITEM_HAWK_EYE); + dComIfGs_setItem(SLOT_5, dItemNo_HAWK_EYE_e); } void item_func_WOOD_STICK() { dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD); - dComIfGs_setSelectEquipSword(fpcNm_ITEM_WOOD_STICK); + dComIfGs_setSelectEquipSword(dItemNo_WOOD_STICK_e); dComIfGs_onSwitch(28, dComIfGp_roomControl_getStayNo()); } void item_func_BOOMERANG() { - dComIfGs_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); + dComIfGs_setItem(SLOT_0, dItemNo_BOOMERANG_e); } void item_func_SPINNER() { - dComIfGs_setItem(SLOT_2, fpcNm_ITEM_SPINNER); + dComIfGs_setItem(SLOT_2, dItemNo_SPINNER_e); } void item_func_IRONBALL() { - dComIfGs_setItem(SLOT_6, fpcNm_ITEM_IRONBALL); + dComIfGs_setItem(SLOT_6, dItemNo_IRONBALL_e); } void item_func_BOW() { - dComIfGs_setItem(SLOT_4, fpcNm_ITEM_BOW); + dComIfGs_setItem(SLOT_4, dItemNo_BOW_e); dComIfGs_setArrowNum(30); dComIfGs_setArrowMax(30); } void item_func_HOOKSHOT() { - dComIfGs_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); + dComIfGs_setItem(SLOT_9, dItemNo_HOOKSHOT_e); } void item_func_HVY_BOOTS() { - dComIfGs_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); + dComIfGs_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); } void item_func_COPY_ROD() { - dComIfGs_setItem(SLOT_8, fpcNm_ITEM_COPY_ROD); + dComIfGs_setItem(SLOT_8, dItemNo_COPY_ROD_e); } void item_func_W_HOOKSHOT() { - dComIfGs_setItem(SLOT_9, fpcNm_ITEM_NONE); - dComIfGs_setItem(SLOT_10, fpcNm_ITEM_W_HOOKSHOT); + dComIfGs_setItem(SLOT_9, dItemNo_NONE_e); + dComIfGs_setItem(SLOT_10, dItemNo_W_HOOKSHOT_e); } void item_func_KANTERA() { dComIfGs_setMaxOil(21600); dComIfGs_setOil(21600); - dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA); + dComIfGs_setItem(SLOT_1, dItemNo_KANTERA_e); } void item_func_LIGHT_SWORD() { dComIfGs_setCollectSword(COLLECT_LIGHT_SWORD); - dMeter2Info_setSword(fpcNm_ITEM_LIGHT_SWORD, false); + dMeter2Info_setSword(dItemNo_LIGHT_SWORD_e, false); } void item_func_FISHING_ROD_1() { - dComIfGs_setItem(SLOT_20, fpcNm_ITEM_FISHING_ROD_1); + dComIfGs_setItem(SLOT_20, dItemNo_FISHING_ROD_1_e); } void item_func_PACHINKO() { u8 pachinko_max = dComIfGs_getPachinkoMax(); dComIfGp_setItemPachinkoNumCount(pachinko_max); - dComIfGs_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); + dComIfGs_setItem(SLOT_23, dItemNo_PACHINKO_e); } void item_func_COPY_ROD_2() { - dComIfGs_setItem(SLOT_8, fpcNm_ITEM_COPY_ROD); + dComIfGs_setItem(SLOT_8, dItemNo_COPY_ROD_e); } void item_func_BOMB_BAG_LV2() {} void item_func_BOMB_BAG_LV1() { - dComIfGs_setEmptyBombBag(fpcNm_ITEM_NORMAL_BOMB, 30); + dComIfGs_setEmptyBombBag(dItemNo_NORMAL_BOMB_e, 30); } void item_func_BOMB_IN_BAG() { - dComIfGs_setEmptyBombBag(fpcNm_ITEM_NORMAL_BOMB, 30); + dComIfGs_setEmptyBombBag(dItemNo_NORMAL_BOMB_e, 30); } void item_func_LIGHT_ARROW() { - dComIfGs_setItem(SLOT_4, fpcNm_ITEM_LIGHT_ARROW); + dComIfGs_setItem(SLOT_4, dItemNo_LIGHT_ARROW_e); } void item_func_ARROW_LV1() { @@ -889,55 +889,55 @@ void item_func_EMPTY_BOTTLE() { } void item_func_RED_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_RED_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_RED_BOTTLE_e); } void item_func_GREEN_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_GREEN_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_GREEN_BOTTLE_e); } void item_func_BLUE_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_BLUE_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_BLUE_BOTTLE_e); } void item_func_MILK_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_MILK_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_MILK_BOTTLE_e); } void item_func_HALF_MILK_BOTTLE() { - dComIfGs_setEmptyBottle(fpcNm_ITEM_HALF_MILK_BOTTLE); + dComIfGs_setEmptyBottle(dItemNo_HALF_MILK_BOTTLE_e); } void item_func_OIL_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_OIL_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_OIL_BOTTLE_e); } void item_func_WATER_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_WATER_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_WATER_BOTTLE_e); } void item_func_OIL_BOTTLE2() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_OIL_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_OIL_BOTTLE_e); } void item_func_RED_BOTTLE2() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_RED_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_RED_BOTTLE_e); } void item_func_UGLY_SOUP() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_UGLY_SOUP); + dComIfGs_setEmptyBottleItemIn(dItemNo_UGLY_SOUP_e); } void item_func_HOT_SPRING() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HOT_SPRING); + dComIfGs_setEmptyBottleItemIn(dItemNo_HOT_SPRING_e); } void item_func_FAIRY_BOTTLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_FAIRY); + dComIfGs_setEmptyBottleItemIn(dItemNo_FAIRY_e); } void item_func_HOT_SPRING2() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HOT_SPRING); + dComIfGs_setEmptyBottleItemIn(dItemNo_HOT_SPRING_e); } void item_func_OIL2() {} @@ -945,27 +945,27 @@ void item_func_OIL2() {} void item_func_OIL() {} void item_func_NORMAL_BOMB() { - dComIfGs_setEmptyBombBag(fpcNm_ITEM_NORMAL_BOMB, 60); + dComIfGs_setEmptyBombBag(dItemNo_NORMAL_BOMB_e, 60); } void item_func_WATER_BOMB() { dComIfGs_setEmptyBombBag(); - dComIfGs_setEmptyBombBagItemIn(fpcNm_ITEM_WATER_BOMB, true); + dComIfGs_setEmptyBombBagItemIn(dItemNo_WATER_BOMB_e, true); } void item_func_POKE_BOMB() { dComIfGs_setEmptyBombBag(); - dComIfGs_setEmptyBombBagItemIn(fpcNm_ITEM_POKE_BOMB, true); + dComIfGs_setEmptyBombBagItemIn(dItemNo_POKE_BOMB_e, true); } void item_func_FAIRY_DROP() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_FAIRY_DROP); + dComIfGs_setEmptyBottleItemIn(dItemNo_FAIRY_DROP_e); } void item_func_WORM() {} void item_func_DROP_BOTTLE() { - dComIfGs_setEmptyBottle(fpcNm_ITEM_FAIRY_DROP); + dComIfGs_setEmptyBottle(dItemNo_FAIRY_DROP_e); } void item_func_BEE_CHILD() { @@ -975,7 +975,7 @@ void item_func_BEE_CHILD() { for (bottleIdx = 0xFF, i = 0; i < 4; i++) { u8 getItem = dComIfGs_getItem(i + SLOT_11, true); - if (getItem == fpcNm_ITEM_EMPTY_BOTTLE) { + if (getItem == dItemNo_EMPTY_BOTTLE_e) { bottleIdx = i; break; } @@ -983,82 +983,82 @@ void item_func_BEE_CHILD() { if (bottleIdx != 0xff) { dComIfGs_setBottleNum(bottleIdx, 10); - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_BEE_CHILD); + dComIfGs_setEmptyBottleItemIn(dItemNo_BEE_CHILD_e); } } void item_func_CHUCHU_RARE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_RARE); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_RARE_e); } void item_func_CHUCHU_RED() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_RED); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_RED_e); } void item_func_CHUCHU_BLUE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_BLUE); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_BLUE_e); } void item_func_CHUCHU_GREEN() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_GREEN); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_GREEN_e); } void item_func_CHUCHU_YELLOW() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_YELLOW); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_YELLOW_e); } void item_func_CHUCHU_PURPLE() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_PURPLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_PURPLE_e); } void item_func_LV1_SOUP() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_LV1_SOUP); + dComIfGs_setEmptyBottleItemIn(dItemNo_LV1_SOUP_e); } void item_func_LV2_SOUP() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_LV2_SOUP); + dComIfGs_setEmptyBottleItemIn(dItemNo_LV2_SOUP_e); } void item_func_LV3_SOUP() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_LV3_SOUP); + dComIfGs_setEmptyBottleItemIn(dItemNo_LV3_SOUP_e); } void item_func_LETTER() { - dComIfGs_setItem(SLOT_21, fpcNm_ITEM_LETTER); + dComIfGs_setItem(SLOT_21, dItemNo_LETTER_e); } void item_func_BILL() { - dComIfGs_setItem(SLOT_21, fpcNm_ITEM_BILL); + dComIfGs_setItem(SLOT_21, dItemNo_BILL_e); } void item_func_WOOD_STATUE() { /* dSv_event_flag_c::F_283 - Hyrule Field - Get wood carving */ dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[283]); - dComIfGs_setItem(SLOT_21, fpcNm_ITEM_WOOD_STATUE); + dComIfGs_setItem(SLOT_21, dItemNo_WOOD_STATUE_e); } void item_func_IRIAS_PENDANT() { - dComIfGs_setItem(SLOT_21, fpcNm_ITEM_IRIAS_PENDANT); + dComIfGs_setItem(SLOT_21, dItemNo_IRIAS_PENDANT_e); } void item_func_HORSE_FLUTE() { - dComIfGs_setItem(SLOT_21, fpcNm_ITEM_HORSE_FLUTE); + dComIfGs_setItem(SLOT_21, dItemNo_HORSE_FLUTE_e); } void item_func_RAFRELS_MEMO() { - dComIfGs_setItem(SLOT_19, fpcNm_ITEM_RAFRELS_MEMO); + dComIfGs_setItem(SLOT_19, dItemNo_RAFRELS_MEMO_e); } void item_func_ASHS_SCRIBBLING() { - dComIfGs_setItem(SLOT_19, fpcNm_ITEM_ASHS_SCRIBBLING); + dComIfGs_setItem(SLOT_19, dItemNo_ASHS_SCRIBBLING_e); } void item_func_CHUCHU_YELLOW2() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_YELLOW); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_YELLOW_e); } void item_func_OIL_BOTTLE3() { - dComIfGs_setEmptyBottle(fpcNm_ITEM_OIL_BOTTLE); + dComIfGs_setEmptyBottle(dItemNo_OIL_BOTTLE_e); } void item_func_SHOP_BEE_CHILD() { @@ -1066,7 +1066,7 @@ void item_func_SHOP_BEE_CHILD() { } void item_func_CHUCHU_BLACK() { - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_CHUCHU_BLACK); + dComIfGs_setEmptyBottleItemIn(dItemNo_CHUCHU_BLACK_e); } void item_func_LIGHT_DROP() {} @@ -1154,19 +1154,19 @@ void item_func_F_MAYFLY() {} void item_func_POU_SPIRIT() {} void item_func_ANCIENT_DOCUMENT() { - dComIfGs_setItem(SLOT_22, fpcNm_ITEM_ANCIENT_DOCUMENT); + dComIfGs_setItem(SLOT_22, dItemNo_ANCIENT_DOCUMENT_e); } void item_func_AIR_LETTER() { - dComIfGs_setItem(SLOT_22, fpcNm_ITEM_AIR_LETTER); + dComIfGs_setItem(SLOT_22, dItemNo_AIR_LETTER_e); } void item_func_ANCIENT_DOCUMENT2() { - dComIfGs_setItem(SLOT_22, fpcNm_ITEM_ANCIENT_DOCUMENT2); + dComIfGs_setItem(SLOT_22, dItemNo_ANCIENT_DOCUMENT2_e); } void item_func_LV7_DUNGEON_EXIT() { - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_LV7_DUNGEON_EXIT); + dComIfGs_setItem(SLOT_18, dItemNo_LV7_DUNGEON_EXIT_e); } void item_func_LINKS_SAVINGS() { @@ -1226,31 +1226,31 @@ int item_getcheck_func_HEART() { } int item_getcheck_func_GREEN_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_GREEN_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_GREEN_RUPEE_e); } int item_getcheck_func_BLUE_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BLUE_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_BLUE_RUPEE_e); } int item_getcheck_func_YELLOW_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_YELLOW_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_YELLOW_RUPEE_e); } int item_getcheck_func_RED_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_RED_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_RED_RUPEE_e); } int item_getcheck_func_PURPLE_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_PURPLE_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_PURPLE_RUPEE_e); } int item_getcheck_func_ORANGE_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_ORANGE_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_ORANGE_RUPEE_e); } int item_getcheck_func_SILVER_RUPEE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_SILVER_RUPEE); + return dComIfGs_isItemFirstBit(dItemNo_SILVER_RUPEE_e); } int item_getcheck_func_S_MAGIC() { @@ -1262,39 +1262,39 @@ int item_getcheck_func_L_MAGIC() { } int item_getcheck_func_BOMB_5() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_5); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_5_e); } int item_getcheck_func_BOMB_10() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_10); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_10_e); } int item_getcheck_func_BOMB_20() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_20); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_20_e); } int item_getcheck_func_BOMB_30() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_30); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_30_e); } int item_getcheck_func_ARROW_10() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_10); + return dComIfGs_isItemFirstBit(dItemNo_ARROW_10_e); } int item_getcheck_func_ARROW_20() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_20); + return dComIfGs_isItemFirstBit(dItemNo_ARROW_20_e); } int item_getcheck_func_ARROW_30() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_30); + return dComIfGs_isItemFirstBit(dItemNo_ARROW_30_e); } int item_getcheck_func_ARROW_1() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_1); + return dComIfGs_isItemFirstBit(dItemNo_ARROW_1_e); } int item_getcheck_func_PACHINKO_SHOT() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_PACHINKO_SHOT); + return dComIfGs_isItemFirstBit(dItemNo_PACHINKO_SHOT_e); } int item_getcheck_func_WATER_BOMB_5() { @@ -1318,15 +1318,15 @@ int item_getcheck_func_BOMB_INSECT_5() { } int item_getcheck_func_BOMB_INSECT_10() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_INSECT_10); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_INSECT_10_e); } int item_getcheck_func_BOMB_INSECT_20() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_INSECT_20); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_INSECT_20_e); } int item_getcheck_func_BOMB_INSECT_30() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_INSECT_30); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_INSECT_30_e); } int item_getcheck_func_RECOVER_FAILY() { @@ -1358,7 +1358,7 @@ int item_getcheck_func_COMPUS() { } int item_getcheck_func_DUNGEON_EXIT() { - return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_DUNGEON_EXIT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == dItemNo_DUNGEON_EXIT_e ? TRUE : FALSE; } int item_getcheck_func_BOSS_KEY() { @@ -1366,7 +1366,7 @@ int item_getcheck_func_BOSS_KEY() { } int item_getcheck_func_DUNGEON_BACK() { - return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_DUNGEON_BACK ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == dItemNo_DUNGEON_BACK_e ? TRUE : FALSE; } int item_getcheck_func_SWORD() { @@ -1378,23 +1378,23 @@ int item_getcheck_func_MASTER_SWORD() { } int item_getcheck_func_WOOD_SHIELD() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD); + return dComIfGs_isItemFirstBit(dItemNo_WOOD_SHIELD_e); } int item_getcheck_func_SHIELD() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_SHIELD); + return dComIfGs_isItemFirstBit(dItemNo_SHIELD_e); } int item_getcheck_func_HYLIA_SHIELD() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD); + return dComIfGs_isItemFirstBit(dItemNo_HYLIA_SHIELD_e); } int item_getcheck_func_TKS_LETTER() { - return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_TKS_LETTER ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == dItemNo_TKS_LETTER_e ? TRUE : FALSE; } int item_getcheck_func_WEAR_CASUAL() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_WEAR_CASUAL); + return dComIfGs_isItemFirstBit(dItemNo_WEAR_CASUAL_e); } int item_getcheck_func_WEAR_KOKIRI() { @@ -1402,11 +1402,11 @@ int item_getcheck_func_WEAR_KOKIRI() { } int item_getcheck_func_ARMOR() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_ARMOR); + return dComIfGs_isItemFirstBit(dItemNo_ARMOR_e); } int item_getcheck_func_WEAR_ZORA() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_WEAR_ZORA); + return dComIfGs_isItemFirstBit(dItemNo_WEAR_ZORA_e); } int item_getcheck_func_MAGIC_LV1() { @@ -1414,7 +1414,7 @@ int item_getcheck_func_MAGIC_LV1() { } int item_getcheck_func_DUNGEON_EXIT_2() { - return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_DUNGEON_EXIT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == dItemNo_DUNGEON_EXIT_e ? TRUE : FALSE; } int item_getcheck_func_WALLET_LV1() { @@ -1430,51 +1430,51 @@ int item_getcheck_func_WALLET_LV3() { } int item_getcheck_func_ZORAS_JEWEL() { - return dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_ZORAS_JEWEL ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_20, true) == dItemNo_ZORAS_JEWEL_e ? TRUE : FALSE; } int item_getcheck_func_HAWK_EYE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_HAWK_EYE); + return dComIfGs_isItemFirstBit(dItemNo_HAWK_EYE_e); } int item_getcheck_func_WOOD_STICK() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_STICK); + return dComIfGs_isItemFirstBit(dItemNo_WOOD_STICK_e); } int item_getcheck_func_BOOMERANG() { - return dComIfGs_getItem(SLOT_0, true) == fpcNm_ITEM_BOOMERANG ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_0, true) == dItemNo_BOOMERANG_e ? TRUE : FALSE; } int item_getcheck_func_SPINNER() { - return dComIfGs_getItem(SLOT_2, true) == fpcNm_ITEM_SPINNER ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_2, true) == dItemNo_SPINNER_e ? TRUE : FALSE; } int item_getcheck_func_IRONBALL() { - return dComIfGs_getItem(SLOT_6, true) == fpcNm_ITEM_IRONBALL ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_6, true) == dItemNo_IRONBALL_e ? TRUE : FALSE; } int item_getcheck_func_BOW() { - return dComIfGs_getItem(SLOT_4, false) == fpcNm_ITEM_BOW ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_4, false) == dItemNo_BOW_e ? TRUE : FALSE; } int item_getcheck_func_HOOKSHOT() { - return dComIfGs_getItem(SLOT_9, true) == fpcNm_ITEM_HOOKSHOT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_9, true) == dItemNo_HOOKSHOT_e ? TRUE : FALSE; } int item_getcheck_func_HVY_BOOTS() { - return dComIfGs_getItem(SLOT_3, true) == fpcNm_ITEM_HVY_BOOTS ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_3, true) == dItemNo_HVY_BOOTS_e ? TRUE : FALSE; } int item_getcheck_func_COPY_ROD() { - return dComIfGs_getItem(SLOT_8, true) == fpcNm_ITEM_COPY_ROD ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_8, true) == dItemNo_COPY_ROD_e ? TRUE : FALSE; } int item_getcheck_func_W_HOOKSHOT() { - return dComIfGs_getItem(SLOT_10, true) == fpcNm_ITEM_W_HOOKSHOT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_10, true) == dItemNo_W_HOOKSHOT_e ? TRUE : FALSE; } int item_getcheck_func_KANTERA() { - return dComIfGs_getItem(SLOT_1, true) == fpcNm_ITEM_KANTERA ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_1, true) == dItemNo_KANTERA_e ? TRUE : FALSE; } int item_getcheck_func_LIGHT_SWORD() { @@ -1482,18 +1482,18 @@ int item_getcheck_func_LIGHT_SWORD() { } int item_getcheck_func_FISHING_ROD_1() { - return (dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_FISHING_ROD_1 || - dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_BEE_ROD || - dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_WORM_ROD || - dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_JEWEL_ROD || - dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_JEWEL_BEE_ROD || - dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_JEWEL_WORM_ROD) ? + return (dComIfGs_getItem(SLOT_20, true) == dItemNo_FISHING_ROD_1_e || + dComIfGs_getItem(SLOT_20, true) == dItemNo_BEE_ROD_e || + dComIfGs_getItem(SLOT_20, true) == dItemNo_WORM_ROD_e || + dComIfGs_getItem(SLOT_20, true) == dItemNo_JEWEL_ROD_e || + dComIfGs_getItem(SLOT_20, true) == dItemNo_JEWEL_BEE_ROD_e || + dComIfGs_getItem(SLOT_20, true) == dItemNo_JEWEL_WORM_ROD_e) ? TRUE : FALSE; } int item_getcheck_func_PACHINKO() { - return dComIfGs_getItem(SLOT_23, true) == fpcNm_ITEM_PACHINKO ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_23, true) == dItemNo_PACHINKO_e ? TRUE : FALSE; } int item_getcheck_func_COPY_ROD_2() { @@ -1501,31 +1501,31 @@ int item_getcheck_func_COPY_ROD_2() { } int item_getcheck_func_BOMB_BAG_LV2() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV2); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_BAG_LV2_e); } int item_getcheck_func_BOMB_BAG_LV1() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV1); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_BAG_LV1_e); } int item_getcheck_func_BOMB_IN_BAG() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_IN_BAG); + return dComIfGs_isItemFirstBit(dItemNo_BOMB_IN_BAG_e); } int item_getcheck_func_LIGHT_ARROW() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_ARROW); + return dComIfGs_isItemFirstBit(dItemNo_LIGHT_ARROW_e); } int item_getcheck_func_ARROW_LV1() { - return (dComIfGs_getItem(SLOT_4, false) == fpcNm_ITEM_BOW && dComIfGs_getArrowMax() >= 30) ? TRUE : FALSE; + return (dComIfGs_getItem(SLOT_4, false) == dItemNo_BOW_e && dComIfGs_getArrowMax() >= 30) ? TRUE : FALSE; } int item_getcheck_func_ARROW_LV2() { - return (dComIfGs_getItem(SLOT_4, false) == fpcNm_ITEM_BOW && dComIfGs_getArrowMax() >= 60) ? TRUE : FALSE; + return (dComIfGs_getItem(SLOT_4, false) == dItemNo_BOW_e && dComIfGs_getArrowMax() >= 60) ? TRUE : FALSE; } int item_getcheck_func_ARROW_LV3() { - return (dComIfGs_getItem(SLOT_4, false) == fpcNm_ITEM_BOW && dComIfGs_getArrowMax() >= 100) ? TRUE : FALSE; + return (dComIfGs_getItem(SLOT_4, false) == dItemNo_BOW_e && dComIfGs_getArrowMax() >= 100) ? TRUE : FALSE; } int item_getcheck_func_LURE_ROD() { @@ -1561,91 +1561,91 @@ int item_getcheck_func_JEWEL_WORM_ROD() { } int item_getcheck_func_EMPTY_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_EMPTY_BOTTLE); + return dComIfGs_checkBottle(dItemNo_EMPTY_BOTTLE_e); } int item_getcheck_func_RED_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_RED_BOTTLE); + return dComIfGs_checkBottle(dItemNo_RED_BOTTLE_e); } int item_getcheck_func_GREEN_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_GREEN_BOTTLE); + return dComIfGs_checkBottle(dItemNo_GREEN_BOTTLE_e); } int item_getcheck_func_BLUE_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_BLUE_BOTTLE); + return dComIfGs_checkBottle(dItemNo_BLUE_BOTTLE_e); } int item_getcheck_func_MILK_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_MILK_BOTTLE); + return dComIfGs_checkBottle(dItemNo_MILK_BOTTLE_e); } int item_getcheck_func_HALF_MILK_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_HALF_MILK_BOTTLE); + return dComIfGs_checkBottle(dItemNo_HALF_MILK_BOTTLE_e); } int item_getcheck_func_OIL_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_OIL_BOTTLE); + return dComIfGs_checkBottle(dItemNo_OIL_BOTTLE_e); } int item_getcheck_func_WATER_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_WATER_BOTTLE); + return dComIfGs_checkBottle(dItemNo_WATER_BOTTLE_e); } int item_getcheck_func_OIL_BOTTLE2() { - return dComIfGs_checkBottle(fpcNm_ITEM_OIL_BOTTLE_2); + return dComIfGs_checkBottle(dItemNo_OIL_BOTTLE_2_e); } int item_getcheck_func_RED_BOTTLE2() { - return dComIfGs_checkBottle(fpcNm_ITEM_RED_BOTTLE_2); + return dComIfGs_checkBottle(dItemNo_RED_BOTTLE_2_e); } int item_getcheck_func_UGLY_SOUP() { - return dComIfGs_checkBottle(fpcNm_ITEM_UGLY_SOUP); + return dComIfGs_checkBottle(dItemNo_UGLY_SOUP_e); } int item_getcheck_func_HOT_SPRING() { - return dComIfGs_checkBottle(fpcNm_ITEM_HOT_SPRING); + return dComIfGs_checkBottle(dItemNo_HOT_SPRING_e); } int item_getcheck_func_FAIRY_BOTTLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_FAIRY); + return dComIfGs_checkBottle(dItemNo_FAIRY_e); } int item_getcheck_func_HOT_SPRING2() { - return dComIfGs_checkBottle(fpcNm_ITEM_HOT_SPRING); + return dComIfGs_checkBottle(dItemNo_HOT_SPRING_e); } int item_getcheck_func_OIL2() { - return dComIfGs_checkBottle(fpcNm_ITEM_OIL2); + return dComIfGs_checkBottle(dItemNo_OIL2_e); } int item_getcheck_func_OIL() { - return dComIfGs_checkBottle(fpcNm_ITEM_OIL); + return dComIfGs_checkBottle(dItemNo_OIL_e); } int item_getcheck_func_NORMAL_BOMB() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_NORMAL_BOMB); + return dComIfGs_isItemFirstBit(dItemNo_NORMAL_BOMB_e); } int item_getcheck_func_WATER_BOMB() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_WATER_BOMB); + return dComIfGs_isItemFirstBit(dItemNo_WATER_BOMB_e); } int item_getcheck_func_POKE_BOMB() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_POKE_BOMB); + return dComIfGs_isItemFirstBit(dItemNo_POKE_BOMB_e); } int item_getcheck_func_FAIRY_DROP() { - return dComIfGs_checkBottle(fpcNm_ITEM_FAIRY_DROP); + return dComIfGs_checkBottle(dItemNo_FAIRY_DROP_e); } int item_getcheck_func_WORM() { - return dComIfGs_checkBottle(fpcNm_ITEM_WORM); + return dComIfGs_checkBottle(dItemNo_WORM_e); } int item_getcheck_func_DROP_BOTTLE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_DROP_BOTTLE); + return dComIfGs_isItemFirstBit(dItemNo_DROP_BOTTLE_e); } int item_getcheck_func_BEE_CHILD() { @@ -1653,71 +1653,71 @@ int item_getcheck_func_BEE_CHILD() { } int item_getcheck_func_CHUCHU_RARE() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_RARE); + return dComIfGs_checkBottle(dItemNo_CHUCHU_RARE_e); } int item_getcheck_func_CHUCHU_RED() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_RED); + return dComIfGs_checkBottle(dItemNo_CHUCHU_RED_e); } int item_getcheck_func_CHUCHU_BLUE() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_BLUE); + return dComIfGs_checkBottle(dItemNo_CHUCHU_BLUE_e); } int item_getcheck_func_CHUCHU_GREEN() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_GREEN); + return dComIfGs_checkBottle(dItemNo_CHUCHU_GREEN_e); } int item_getcheck_func_CHUCHU_YELLOW() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_YELLOW); + return dComIfGs_checkBottle(dItemNo_CHUCHU_YELLOW_e); } int item_getcheck_func_CHUCHU_PURPLE() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_PURPLE); + return dComIfGs_checkBottle(dItemNo_CHUCHU_PURPLE_e); } int item_getcheck_func_LV1_SOUP() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_LV1_SOUP); + return dComIfGs_isItemFirstBit(dItemNo_LV1_SOUP_e); } int item_getcheck_func_LV2_SOUP() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_LV2_SOUP); + return dComIfGs_isItemFirstBit(dItemNo_LV2_SOUP_e); } int item_getcheck_func_LV3_SOUP() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_LV3_SOUP); + return dComIfGs_isItemFirstBit(dItemNo_LV3_SOUP_e); } int item_getcheck_func_LETTER() { - return dComIfGs_getItem(SLOT_21, true) == fpcNm_ITEM_LETTER ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_21, true) == dItemNo_LETTER_e ? TRUE : FALSE; } int item_getcheck_func_BILL() { - return dComIfGs_getItem(SLOT_21, true) == fpcNm_ITEM_BILL ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_21, true) == dItemNo_BILL_e ? TRUE : FALSE; } int item_getcheck_func_WOOD_STATUE() { - return dComIfGs_getItem(SLOT_21, true) == fpcNm_ITEM_WOOD_STATUE ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_21, true) == dItemNo_WOOD_STATUE_e ? TRUE : FALSE; } int item_getcheck_func_IRIAS_PENDANT() { - return dComIfGs_getItem(SLOT_21, true) == fpcNm_ITEM_IRIAS_PENDANT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_21, true) == dItemNo_IRIAS_PENDANT_e ? TRUE : FALSE; } int item_getcheck_func_HORSE_FLUTE() { - return dComIfGs_getItem(SLOT_22, true) == fpcNm_ITEM_HORSE_FLUTE ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_22, true) == dItemNo_HORSE_FLUTE_e ? TRUE : FALSE; } int item_getcheck_func_RAFRELS_MEMO() { - return dComIfGs_getItem(SLOT_19, true) == fpcNm_ITEM_RAFRELS_MEMO ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_19, true) == dItemNo_RAFRELS_MEMO_e ? TRUE : FALSE; } int item_getcheck_func_ASHS_SCRIBBLING() { - return dComIfGs_getItem(SLOT_19, true) == fpcNm_ITEM_ASHS_SCRIBBLING ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_19, true) == dItemNo_ASHS_SCRIBBLING_e ? TRUE : FALSE; } int item_getcheck_func_CHUCHU_YELLOW2() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_YELLOW2); + return dComIfGs_checkBottle(dItemNo_CHUCHU_YELLOW2_e); } int item_getcheck_func_OIL_BOTTLE3() { @@ -1729,11 +1729,11 @@ int item_getcheck_func_SHOP_BEE_CHILD() { } int item_getcheck_func_CHUCHU_BLACK() { - return dComIfGs_checkBottle(fpcNm_ITEM_CHUCHU_BLACK); + return dComIfGs_checkBottle(dItemNo_CHUCHU_BLACK_e); } int item_getcheck_func_LIGHT_DROP() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_DROP); + return dComIfGs_isItemFirstBit(dItemNo_LIGHT_DROP_e); } int item_getcheck_func_DROP_CONTAINER() { @@ -1765,7 +1765,7 @@ int item_getcheck_func_MIRROR_PIECE_4() { } int item_getcheck_func_SMELL_YELIA_POUCH() { - return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_YELIA_POUCH ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == dItemNo_SMELL_YELIA_POUCH_e ? TRUE : FALSE; } int item_getcheck_func_SMELL_PUMPKIN() { @@ -1773,115 +1773,115 @@ int item_getcheck_func_SMELL_PUMPKIN() { } int item_getcheck_func_SMELL_POH() { - return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_POH ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == dItemNo_SMELL_POH_e ? TRUE : FALSE; } int item_getcheck_func_SMELL_FISH() { - return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_FISH ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == dItemNo_SMELL_FISH_e ? TRUE : FALSE; } int item_getcheck_func_SMELL_CHILDREN() { - return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_CHILDREN ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == dItemNo_SMELL_CHILDREN_e ? TRUE : FALSE; } int item_getcheck_func_SMELL_MEDICINE() { - return dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_MEDICINE ? TRUE : FALSE; + return dComIfGs_getCollectSmell() == dItemNo_SMELL_MEDICINE_e ? TRUE : FALSE; } int item_getcheck_func_M_BEETLE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_BEETLE); + return dComIfGs_isItemFirstBit(dItemNo_M_BEETLE_e); } int item_getcheck_func_F_BEETLE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_BEETLE); + return dComIfGs_isItemFirstBit(dItemNo_F_BEETLE_e); } int item_getcheck_func_M_BUTTERFLY() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_BUTTERFLY); + return dComIfGs_isItemFirstBit(dItemNo_M_BUTTERFLY_e); } int item_getcheck_func_F_BUTTERFLY() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_BUTTERFLY); + return dComIfGs_isItemFirstBit(dItemNo_F_BUTTERFLY_e); } int item_getcheck_func_M_STAG_BEETLE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_STAG_BEETLE); + return dComIfGs_isItemFirstBit(dItemNo_M_STAG_BEETLE_e); } int item_getcheck_func_F_STAG_BEETLE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_STAG_BEETLE); + return dComIfGs_isItemFirstBit(dItemNo_F_STAG_BEETLE_e); } int item_getcheck_func_M_GRASSHOPPER() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_GRASSHOPPER); + return dComIfGs_isItemFirstBit(dItemNo_M_GRASSHOPPER_e); } int item_getcheck_func_F_GRASSHOPPER() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_GRASSHOPPER); + return dComIfGs_isItemFirstBit(dItemNo_F_GRASSHOPPER_e); } int item_getcheck_func_M_NANAFUSHI() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_NANAFUSHI); + return dComIfGs_isItemFirstBit(dItemNo_M_NANAFUSHI_e); } int item_getcheck_func_F_NANAFUSHI() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_NANAFUSHI); + return dComIfGs_isItemFirstBit(dItemNo_F_NANAFUSHI_e); } int item_getcheck_func_M_DANGOMUSHI() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_DANGOMUSHI); + return dComIfGs_isItemFirstBit(dItemNo_M_DANGOMUSHI_e); } int item_getcheck_func_F_DANGOMUSHI() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_DANGOMUSHI); + return dComIfGs_isItemFirstBit(dItemNo_F_DANGOMUSHI_e); } int item_getcheck_func_M_MANTIS() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_MANTIS); + return dComIfGs_isItemFirstBit(dItemNo_M_MANTIS_e); } int item_getcheck_func_F_MANTIS() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_MANTIS); + return dComIfGs_isItemFirstBit(dItemNo_F_MANTIS_e); } int item_getcheck_func_M_LADYBUG() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_LADYBUG); + return dComIfGs_isItemFirstBit(dItemNo_M_LADYBUG_e); } int item_getcheck_func_F_LADYBUG() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_LADYBUG); + return dComIfGs_isItemFirstBit(dItemNo_F_LADYBUG_e); } int item_getcheck_func_M_SNAIL() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_SNAIL); + return dComIfGs_isItemFirstBit(dItemNo_M_SNAIL_e); } int item_getcheck_func_F_SNAIL() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_SNAIL); + return dComIfGs_isItemFirstBit(dItemNo_F_SNAIL_e); } int item_getcheck_func_M_DRAGONFLY() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_DRAGONFLY); + return dComIfGs_isItemFirstBit(dItemNo_M_DRAGONFLY_e); } int item_getcheck_func_F_DRAGONFLY() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_DRAGONFLY); + return dComIfGs_isItemFirstBit(dItemNo_F_DRAGONFLY_e); } int item_getcheck_func_M_ANT() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_ANT); + return dComIfGs_isItemFirstBit(dItemNo_M_ANT_e); } int item_getcheck_func_F_ANT() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_ANT); + return dComIfGs_isItemFirstBit(dItemNo_F_ANT_e); } int item_getcheck_func_M_MAYFLY() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_M_MAYFLY); + return dComIfGs_isItemFirstBit(dItemNo_M_MAYFLY_e); } int item_getcheck_func_F_MAYFLY() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_F_MAYFLY); + return dComIfGs_isItemFirstBit(dItemNo_F_MAYFLY_e); } int item_getcheck_func_POU_SPIRIT() { @@ -1889,19 +1889,19 @@ int item_getcheck_func_POU_SPIRIT() { } int item_getcheck_func_ANCIENT_DOCUMENT() { - return dComIfGs_getItem(SLOT_22, true) == fpcNm_ITEM_ANCIENT_DOCUMENT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_22, true) == dItemNo_ANCIENT_DOCUMENT_e ? TRUE : FALSE; } int item_getcheck_func_AIR_LETTER() { - return dComIfGs_getItem(SLOT_22, true) == fpcNm_ITEM_AIR_LETTER ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_22, true) == dItemNo_AIR_LETTER_e ? TRUE : FALSE; } int item_getcheck_func_ANCIENT_DOCUMENT2() { - return dComIfGs_getItem(SLOT_22, true) == fpcNm_ITEM_ANCIENT_DOCUMENT2 ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_22, true) == dItemNo_ANCIENT_DOCUMENT2_e ? TRUE : FALSE; } int item_getcheck_func_LV7_DUNGEON_EXIT() { - return dComIfGs_getItem(SLOT_18, true) == fpcNm_ITEM_LV7_DUNGEON_EXIT ? TRUE : FALSE; + return dComIfGs_getItem(SLOT_18, true) == dItemNo_LV7_DUNGEON_EXIT_e ? TRUE : FALSE; } int item_getcheck_func_LINKS_SAVINGS() { @@ -1933,11 +1933,11 @@ int item_getcheck_func_BOSSRIDER_KEY() { } int item_getcheck_func_TOMATO_PUREE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_TOMATO_PUREE); + return dComIfGs_isItemFirstBit(dItemNo_TOMATO_PUREE_e); } int item_getcheck_func_TASTE() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_TASTE); + return dComIfGs_isItemFirstBit(dItemNo_TASTE_e); } int item_getcheck_func_LV5_BOSS_KEY() { @@ -1953,19 +1953,19 @@ int item_getcheck_func_KANTERA2() { } int item_getcheck_func_L2_KEY_PIECES1() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES1); + return dComIfGs_isItemFirstBit(dItemNo_L2_KEY_PIECES1_e); } int item_getcheck_func_L2_KEY_PIECES2() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES2); + return dComIfGs_isItemFirstBit(dItemNo_L2_KEY_PIECES2_e); } int item_getcheck_func_L2_KEY_PIECES3() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES3); + return dComIfGs_isItemFirstBit(dItemNo_L2_KEY_PIECES3_e); } int item_getcheck_func_KEY_OF_CARAVAN() { - return dComIfGs_isItemFirstBit(fpcNm_ITEM_KEY_OF_CARAVAN); + return dComIfGs_isItemFirstBit(dItemNo_KEY_OF_CARAVAN_e); } int item_getcheck_func_LV2_BOSS_KEY() { @@ -1979,8 +1979,8 @@ int item_getcheck_func_KEY_OF_FILONE() { int isBomb(u8 i_itemNo) { int is_bomb = false; - if (i_itemNo == fpcNm_ITEM_BOMB_5 || i_itemNo == fpcNm_ITEM_BOMB_10 || i_itemNo == fpcNm_ITEM_BOMB_20 || i_itemNo == fpcNm_ITEM_BOMB_30 || - i_itemNo == fpcNm_ITEM_NORMAL_BOMB | i_itemNo == fpcNm_ITEM_WATER_BOMB || i_itemNo == fpcNm_ITEM_POKE_BOMB) + if (i_itemNo == dItemNo_BOMB_5_e || i_itemNo == dItemNo_BOMB_10_e || i_itemNo == dItemNo_BOMB_20_e || i_itemNo == dItemNo_BOMB_30_e || + i_itemNo == dItemNo_NORMAL_BOMB_e | i_itemNo == dItemNo_WATER_BOMB_e || i_itemNo == dItemNo_POKE_BOMB_e) { is_bomb = true; } @@ -1991,7 +1991,7 @@ int isBomb(u8 i_itemNo) { int isArrow(u8 i_itemNo) { int is_arrow = false; - if (i_itemNo == fpcNm_ITEM_ARROW_1 || i_itemNo == fpcNm_ITEM_ARROW_10 || i_itemNo == fpcNm_ITEM_ARROW_20 || i_itemNo == fpcNm_ITEM_ARROW_30) + if (i_itemNo == dItemNo_ARROW_1_e || i_itemNo == dItemNo_ARROW_10_e || i_itemNo == dItemNo_ARROW_20_e || i_itemNo == dItemNo_ARROW_30_e) { is_arrow = true; } @@ -2001,37 +2001,37 @@ int isArrow(u8 i_itemNo) { BOOL isBottleItem(u8 i_itemNo) { switch (i_itemNo) { - case fpcNm_ITEM_OIL_BOTTLE3: - case fpcNm_ITEM_EMPTY_BOTTLE: - case fpcNm_ITEM_RED_BOTTLE: - case fpcNm_ITEM_GREEN_BOTTLE: - case fpcNm_ITEM_BLUE_BOTTLE: - case fpcNm_ITEM_MILK_BOTTLE: - case fpcNm_ITEM_HALF_MILK_BOTTLE: - case fpcNm_ITEM_OIL_BOTTLE: - case fpcNm_ITEM_WATER_BOTTLE: - case fpcNm_ITEM_OIL_BOTTLE_2: - case fpcNm_ITEM_RED_BOTTLE_2: - case fpcNm_ITEM_UGLY_SOUP: - case fpcNm_ITEM_HOT_SPRING: - case fpcNm_ITEM_FAIRY: - case fpcNm_ITEM_FAIRY_DROP: - case fpcNm_ITEM_WORM: - case fpcNm_ITEM_BEE_CHILD: - case fpcNm_ITEM_CHUCHU_RARE: - case fpcNm_ITEM_CHUCHU_RED: - case fpcNm_ITEM_CHUCHU_BLUE: - case fpcNm_ITEM_CHUCHU_GREEN: - case fpcNm_ITEM_CHUCHU_YELLOW: - case fpcNm_ITEM_CHUCHU_PURPLE: - case fpcNm_ITEM_LV1_SOUP: - case fpcNm_ITEM_LV2_SOUP: - case fpcNm_ITEM_LV3_SOUP: - case fpcNm_ITEM_CHUCHU_BLACK: - case fpcNm_ITEM_POU_FIRE1: - case fpcNm_ITEM_POU_FIRE2: - case fpcNm_ITEM_POU_FIRE3: - case fpcNm_ITEM_POU_FIRE4: + case dItemNo_OIL_BOTTLE3_e: + case dItemNo_EMPTY_BOTTLE_e: + case dItemNo_RED_BOTTLE_e: + case dItemNo_GREEN_BOTTLE_e: + case dItemNo_BLUE_BOTTLE_e: + case dItemNo_MILK_BOTTLE_e: + case dItemNo_HALF_MILK_BOTTLE_e: + case dItemNo_OIL_BOTTLE_e: + case dItemNo_WATER_BOTTLE_e: + case dItemNo_OIL_BOTTLE_2_e: + case dItemNo_RED_BOTTLE_2_e: + case dItemNo_UGLY_SOUP_e: + case dItemNo_HOT_SPRING_e: + case dItemNo_FAIRY_e: + case dItemNo_FAIRY_DROP_e: + case dItemNo_WORM_e: + case dItemNo_BEE_CHILD_e: + case dItemNo_CHUCHU_RARE_e: + case dItemNo_CHUCHU_RED_e: + case dItemNo_CHUCHU_BLUE_e: + case dItemNo_CHUCHU_GREEN_e: + case dItemNo_CHUCHU_YELLOW_e: + case dItemNo_CHUCHU_PURPLE_e: + case dItemNo_LV1_SOUP_e: + case dItemNo_LV2_SOUP_e: + case dItemNo_LV3_SOUP_e: + case dItemNo_CHUCHU_BLACK_e: + case dItemNo_POU_FIRE1_e: + case dItemNo_POU_FIRE2_e: + case dItemNo_POU_FIRE3_e: + case dItemNo_POU_FIRE4_e: return TRUE; default: return FALSE; @@ -2041,7 +2041,7 @@ BOOL isBottleItem(u8 i_itemNo) { BOOL isHeart(u8 i_itemNo) { BOOL is_heart = false; - if (i_itemNo == fpcNm_ITEM_HEART || i_itemNo == fpcNm_ITEM_TRIPLE_HEART) { + if (i_itemNo == dItemNo_HEART_e || i_itemNo == dItemNo_TRIPLE_HEART_e) { is_heart = true; } @@ -2052,30 +2052,30 @@ BOOL isInsect(u8 i_itemNo) { BOOL is_insect = false; switch (i_itemNo) { - case fpcNm_ITEM_M_BEETLE: - case fpcNm_ITEM_F_BEETLE: - case fpcNm_ITEM_M_BUTTERFLY: - case fpcNm_ITEM_F_BUTTERFLY: - case fpcNm_ITEM_M_STAG_BEETLE: - case fpcNm_ITEM_F_STAG_BEETLE: - case fpcNm_ITEM_M_GRASSHOPPER: - case fpcNm_ITEM_F_GRASSHOPPER: - case fpcNm_ITEM_M_NANAFUSHI: - case fpcNm_ITEM_F_NANAFUSHI: - case fpcNm_ITEM_M_DANGOMUSHI: - case fpcNm_ITEM_F_DANGOMUSHI: - case fpcNm_ITEM_M_MANTIS: - case fpcNm_ITEM_F_MANTIS: - case fpcNm_ITEM_M_LADYBUG: - case fpcNm_ITEM_F_LADYBUG: - case fpcNm_ITEM_M_SNAIL: - case fpcNm_ITEM_F_SNAIL: - case fpcNm_ITEM_M_DRAGONFLY: - case fpcNm_ITEM_F_DRAGONFLY: - case fpcNm_ITEM_M_ANT: - case fpcNm_ITEM_F_ANT: - case fpcNm_ITEM_M_MAYFLY: - case fpcNm_ITEM_F_MAYFLY: + case dItemNo_M_BEETLE_e: + case dItemNo_F_BEETLE_e: + case dItemNo_M_BUTTERFLY_e: + case dItemNo_F_BUTTERFLY_e: + case dItemNo_M_STAG_BEETLE_e: + case dItemNo_F_STAG_BEETLE_e: + case dItemNo_M_GRASSHOPPER_e: + case dItemNo_F_GRASSHOPPER_e: + case dItemNo_M_NANAFUSHI_e: + case dItemNo_F_NANAFUSHI_e: + case dItemNo_M_DANGOMUSHI_e: + case dItemNo_F_DANGOMUSHI_e: + case dItemNo_M_MANTIS_e: + case dItemNo_F_MANTIS_e: + case dItemNo_M_LADYBUG_e: + case dItemNo_F_LADYBUG_e: + case dItemNo_M_SNAIL_e: + case dItemNo_F_SNAIL_e: + case dItemNo_M_DRAGONFLY_e: + case dItemNo_F_DRAGONFLY_e: + case dItemNo_M_ANT_e: + case dItemNo_F_ANT_e: + case dItemNo_M_MAYFLY_e: + case dItemNo_F_MAYFLY_e: is_insect = true; } @@ -2083,18 +2083,18 @@ BOOL isInsect(u8 i_itemNo) { } u8 check_itemno(int i_itemNo) { - if (!dComIfGs_isGetMagicUseFlag() && (i_itemNo == fpcNm_ITEM_S_MAGIC || i_itemNo == fpcNm_ITEM_L_MAGIC)) { - return fpcNm_ITEM_GREEN_RUPEE; + if (!dComIfGs_isGetMagicUseFlag() && (i_itemNo == dItemNo_S_MAGIC_e || i_itemNo == dItemNo_L_MAGIC_e)) { + return dItemNo_GREEN_RUPEE_e; } - if (i_itemNo == fpcNm_ITEM_ARROW_1) { - if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_BOW)) { - return fpcNm_ITEM_GREEN_RUPEE; + if (i_itemNo == dItemNo_ARROW_1_e) { + if (!dComIfGs_isItemFirstBit(dItemNo_BOW_e)) { + return dItemNo_GREEN_RUPEE_e; } } else { if (isArrow(i_itemNo)) { - if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_BOW)) { - return fpcNm_ITEM_GREEN_RUPEE; + if (!dComIfGs_isItemFirstBit(dItemNo_BOW_e)) { + return dItemNo_GREEN_RUPEE_e; } if (g_dComIfG_gameInfo.play.getLayerNo(0) == 0xD || @@ -2103,23 +2103,23 @@ u8 check_itemno(int i_itemNo) { const char* stage_name = dComIfGp_getStartStageName(); // D_MN08: Palace of Twilight if (strncmp(stage_name, "D_MN08", 6)) { - return fpcNm_ITEM_GREEN_RUPEE; + return dItemNo_GREEN_RUPEE_e; } } } } - if (!dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV1) && isBomb(i_itemNo)) { - return fpcNm_ITEM_GREEN_RUPEE; + if (!dComIfGs_isItemFirstBit(dItemNo_BOMB_BAG_LV1_e) && isBomb(i_itemNo)) { + return dItemNo_GREEN_RUPEE_e; } else { - if (i_itemNo == fpcNm_ITEM_TRIPLE_HEART) { - i_itemNo = fpcNm_ITEM_HEART; + if (i_itemNo == dItemNo_TRIPLE_HEART_e) { + i_itemNo = dItemNo_HEART_e; } - if (!checkItemGet(fpcNm_ITEM_PACHINKO, 1) && i_itemNo == fpcNm_ITEM_PACHINKO_SHOT) { - i_itemNo = fpcNm_ITEM_GREEN_RUPEE; + if (!checkItemGet(dItemNo_PACHINKO_e, 1) && i_itemNo == dItemNo_PACHINKO_SHOT_e) { + i_itemNo = dItemNo_GREEN_RUPEE_e; } - if (i_itemNo == fpcNm_ITEM_S_MAGIC || i_itemNo == fpcNm_ITEM_L_MAGIC) { - i_itemNo = fpcNm_ITEM_GREEN_RUPEE; + if (i_itemNo == dItemNo_S_MAGIC_e || i_itemNo == dItemNo_L_MAGIC_e) { + i_itemNo = dItemNo_GREEN_RUPEE_e; } } return i_itemNo; @@ -2132,7 +2132,7 @@ int addBombCount(u8 i_bombType, u8 i_addNum) { for (u8 i = 0; i < 3; i++) { bombType[i] = dComIfGs_getItem(i + SLOT_15, false); - if (bombType[i] == fpcNm_ITEM_BOMB_BAG_LV1) { + if (bombType[i] == dItemNo_BOMB_BAG_LV1_e) { bombNum[i] = 0; } else if (bombType[i] == i_bombType) { bombNum[i] = dComIfGs_getBombNum(i); diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index a619943cccc..402424953b3 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -169,15 +169,15 @@ static leafdraw_method_class l_dkWmark_Method = { }; kankyo_process_profile_definition g_profile_WMARK = { - fpcLy_CURRENT_e, - 9, - fpcPi_CURRENT_e, - PROC_WMARK, - &g_fpcLf_Method.base, - sizeof(dkWmark_c), - 0, - 0, - &g_fopKy_Method, - 760, - &l_dkWmark_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WMARK_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dkWmark_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_WMARK_e, + /* Kankyo SubMtd */ &l_dkWmark_Method, }; diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index b89783c6eec..555e913ef20 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -2,7 +2,7 @@ #include "d/d_k_wpillar.h" #include "d/d_com_inf_game.h" -#include "d/d_procname.h" +#include "f_pc/f_pc_name.h" #include "f_op/f_op_actor_mng.h" static const char l_arcName[] = "Always"; @@ -133,15 +133,15 @@ static leafdraw_method_class l_dkWpillar_Method = { }; kankyo_process_profile_definition g_profile_WPILLAR = { - fpcLy_CURRENT_e, - 9, - fpcPi_CURRENT_e, - PROC_WPILLAR, - &g_fpcLf_Method.base, - sizeof(dkWpillar_c), - 0, - 0, - &g_fopKy_Method, - 759, - &l_dkWpillar_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 9, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WPILLAR_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dkWpillar_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_WPILLAR_e, + /* Kankyo SubMtd */ &l_dkWpillar_Method, }; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 51d37db6476..624a30b7b00 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -8301,17 +8301,17 @@ static leafdraw_method_class l_dKy_Method = { }; kankyo_process_profile_definition g_profile_KANKYO = { - fpcLy_CURRENT_e, - 1, - fpcPi_CURRENT_e, - PROC_KANKYO, - &g_fpcLf_Method.base, - sizeof(sub_kankyo__class), - 0, - 0, - &g_fopKy_Method, - 2, - &l_dKy_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KANKYO_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(sub_kankyo__class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_KANKYO_e, + /* Kankyo SubMtd */ &l_dKy_Method, }; static void dummy_str_0x40a0() { diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 8150e828876..23ae66c7e89 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -5037,7 +5037,7 @@ void dKyr_thunder_move() { effect->mLightInfluence.mFluctuation = 1.0f; dKy_efplight_set(&effect->mLightInfluence); effect->field_0x1c = 0.6f + cM_rndF(0.4f); - fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL); + fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL); effect->mState++; } } else if (strcmp(dComIfGp_getStartStageName(), "D_MN09B") == 0 && dComIfGp_event_runCheck()) { @@ -5052,14 +5052,14 @@ void dKyr_thunder_move() { effect->mLightInfluence.mFluctuation = 1.0f; dKy_efplight_set(&effect->mLightInfluence); effect->field_0x1c = 0.6f + cM_rndF(0.4f); - fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL); + fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL); effect->mState++; } } else if (cM_rndF(1.0f) < 0.007f) { effect->field_0x1c = 0.6f + cM_rndF(0.4f); effect->mState = 11; if (cM_rndF(1.0f) < 0.2f) { - fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL); + fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL); } } else if (cM_rndF(1.0f) < 0.005f && g_env_light.mThunderEff.mMode < 10 && sp10 != 1) { effect->mLightInfluence.mPosition = camera->view.lookat.eye; @@ -5070,7 +5070,7 @@ void dKyr_thunder_move() { effect->mLightInfluence.mFluctuation = 1.0f; dKy_efplight_set(&effect->mLightInfluence); effect->field_0x1c = 0.6f + cM_rndF(0.4f); - fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL); + fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL); effect->mState++; } break; @@ -5099,7 +5099,7 @@ void dKyr_thunder_move() { } else if (effect->mFlashTimer <= 0.5f && effect->mFlashTimer > 0.4f && cM_rndF(1.0f) < 0.3f) { effect->field_0x1c = 0.6f + cM_rndF(0.4f); if (cM_rndF(1.0f) < 0.05f) { - fopKyM_create(PROC_KY_THUNDER, -1, NULL, NULL, NULL); + fopKyM_create(fpcNm_KY_THUNDER_e, -1, NULL, NULL, NULL); } effect->mState--; } @@ -5318,7 +5318,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { GXColor color_reg1; switch (dComIfGs_getCollectSmell()) { - case fpcNm_ITEM_SMELL_YELIA_POUCH: + case dItemNo_SMELL_YELIA_POUCH_e: color_reg0.r = 0xFF; color_reg0.g = 0xFF; color_reg0.b = 0xFF; @@ -5328,7 +5328,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { color_reg1.b = 0xA8; color_reg1.a = 0xFF; break; - case fpcNm_ITEM_SMELL_FISH: + case dItemNo_SMELL_FISH_e: color_reg0.r = 0xFF; color_reg0.g = 0xA1; color_reg0.b = 0x3B; @@ -5338,7 +5338,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { color_reg1.b = 0x32; color_reg1.a = 0xFF; break; - case fpcNm_ITEM_SMELL_CHILDREN: + case dItemNo_SMELL_CHILDREN_e: color_reg0.r = 0xFF; color_reg0.g = 0xDB; color_reg0.b = 0xFF; @@ -5348,7 +5348,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { color_reg1.b = 0x52; color_reg1.a = 0xFF; break; - case fpcNm_ITEM_SMELL_MEDICINE: + case dItemNo_SMELL_MEDICINE_e: color_reg0.r = 0xD5; color_reg0.g = 0xCE; color_reg0.b = 0xA7; @@ -5358,7 +5358,7 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) { color_reg1.b = 0x27; color_reg1.a = 0xFF; break; - case fpcNm_ITEM_SMELL_POH: + case dItemNo_SMELL_POH_e: color_reg0.r = 0xFF; color_reg0.g = 0xC8; color_reg0.b = 0xFF; diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 7b795d99810..d096493114f 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -271,15 +271,15 @@ static leafdraw_method_class l_dThunder_Method = { }; kankyo_process_profile_definition g_profile_KY_THUNDER = { - fpcLy_CURRENT_e, - 7, - fpcPi_CURRENT_e, - PROC_KY_THUNDER, - &g_fpcLf_Method.base, - sizeof(dThunder_c), - 0, - 0, - &g_fopKy_Method, - 6, - &l_dThunder_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 7, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KY_THUNDER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dThunder_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_KY_THUNDER_e, + /* Kankyo SubMtd */ &l_dThunder_Method, }; diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 447cb916c3e..4f643659015 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -144,15 +144,15 @@ static leafdraw_method_class l_dKyeff_Method = { }; kankyo_process_profile_definition g_profile_KYEFF = { - fpcLy_CURRENT_e, - 12, - fpcPi_CURRENT_e, - PROC_KYEFF, - &g_fpcLf_Method.base, - sizeof(dKyeff_c), - 0, - 0, - &g_fopKy_Method, - 5, - &l_dKyeff_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYEFF_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dKyeff_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_KYEFF_e, + /* Kankyo SubMtd */ &l_dKyeff_Method, }; diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index b58d781ff47..2fb6b42588f 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -44,15 +44,15 @@ static leafdraw_method_class l_dKyeff2_Method = { }; kankyo_process_profile_definition g_profile_KYEFF2 = { - fpcLy_CURRENT_e, - 12, - fpcPi_CURRENT_e, - PROC_KYEFF2, - &g_fpcLf_Method.base, - sizeof(dKyeff2_c), - 0, - 0, - &g_fopKy_Method, - 3, - &l_dKyeff2_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_KYEFF2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dKyeff2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopKy_Method, + /* Draw Prio */ fpcDwPi_KYEFF2_e, + /* Kankyo SubMtd */ &l_dKyeff2_Method, }; diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index 6536067bcf5..809a473c9af 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -404,7 +404,7 @@ void dMenu_Collect2D_c::screenSet() { field_0x22d[0][2] = 0; field_0x22d[1][2] = 0; field_0x22d[2][2] = 0; - if (dComIfGs_getSelectEquipClothes() == fpcNm_ITEM_WEAR_CASUAL) { + if (dComIfGs_getSelectEquipClothes() == dItemNo_WEAR_CASUAL_e) { field_0x22d[3][2] = 0; field_0x22d[4][2] = 0; field_0x22d[5][2] = 0; @@ -415,7 +415,7 @@ void dMenu_Collect2D_c::screenSet() { } field_0x22d[6][2] = 0; field_0x22d[0][3] = 1; - if (checkItemGet(fpcNm_ITEM_BOW, 1)) { + if (checkItemGet(dItemNo_BOW_e, 1)) { field_0x22d[1][3] = 1; } else { field_0x22d[1][3] = 0; @@ -429,7 +429,7 @@ void dMenu_Collect2D_c::screenSet() { field_0x22d[4][3] = 0; field_0x22d[5][3] = 0; field_0x22d[6][3] = 0; - if (dComIfGs_getCollectSmell() != fpcNm_ITEM_NONE) { + if (dComIfGs_getCollectSmell() != dItemNo_NONE_e) { field_0x22d[0][4] = 1; } else { field_0x22d[0][4] = 0; @@ -1015,39 +1015,39 @@ void dMenu_Collect2D_c::cursorPosSet() { void dMenu_Collect2D_c::changeSword() { switch (mCursorX) { case 3: - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SWORD)) { - if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_SWORD) { - dMeter2Info_setSword(fpcNm_ITEM_SWORD, false); + if (dComIfGs_isItemFirstBit(dItemNo_SWORD_e)) { + if (dComIfGs_getSelectEquipSword() != dItemNo_SWORD_e) { + dMeter2Info_setSword(dItemNo_SWORD_e, false); setEquipItemFrameColorSword(0); mDoAud_seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0); dMeter2Info_set2DVibration(); } - } else if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_WOOD_STICK) { - dMeter2Info_setSword(fpcNm_ITEM_WOOD_STICK, false); + } else if (dComIfGs_getSelectEquipSword() != dItemNo_WOOD_STICK_e) { + dMeter2Info_setSword(dItemNo_WOOD_STICK_e, false); setEquipItemFrameColorSword(0); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } break; case 4: - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_SWORD)) { - if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_LIGHT_SWORD) { - dMeter2Info_setSword(fpcNm_ITEM_LIGHT_SWORD, false); + if (dComIfGs_isItemFirstBit(dItemNo_LIGHT_SWORD_e)) { + if (dComIfGs_getSelectEquipSword() != dItemNo_LIGHT_SWORD_e) { + dMeter2Info_setSword(dItemNo_LIGHT_SWORD_e, false); setEquipItemFrameColorSword(1); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } - } else if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_MASTER_SWORD) { - dMeter2Info_setSword(fpcNm_ITEM_MASTER_SWORD, false); + } else if (dComIfGs_getSelectEquipSword() != dItemNo_MASTER_SWORD_e) { + dMeter2Info_setSword(dItemNo_MASTER_SWORD_e, false); setEquipItemFrameColorSword(1); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } break; case 5: - if (dComIfGs_getSelectEquipSword() != fpcNm_ITEM_LIGHT_SWORD) { - dMeter2Info_setSword(fpcNm_ITEM_LIGHT_SWORD, false); + if (dComIfGs_getSelectEquipSword() != dItemNo_LIGHT_SWORD_e) { + dMeter2Info_setSword(dItemNo_LIGHT_SWORD_e, false); setEquipItemFrameColorSword(2); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); @@ -1059,18 +1059,18 @@ void dMenu_Collect2D_c::changeSword() { void dMenu_Collect2D_c::changeShield() { switch (mCursorX) { case 3: - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SHIELD)) { - if (dComIfGs_getSelectEquipShield() != fpcNm_ITEM_SHIELD) { - dMeter2Info_setShield(fpcNm_ITEM_SHIELD, false); + if (dComIfGs_isItemFirstBit(dItemNo_SHIELD_e)) { + if (dComIfGs_getSelectEquipShield() != dItemNo_SHIELD_e) { + dMeter2Info_setShield(dItemNo_SHIELD_e, false); setEquipItemFrameColorShield(0); daAlink_getAlinkActorClass()->setShieldChange(); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); dMeter2Info_set2DVibration(); } - } else if (dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD)) { - if (dComIfGs_getSelectEquipShield() != fpcNm_ITEM_WOOD_SHIELD) { - dMeter2Info_setShield(fpcNm_ITEM_WOOD_SHIELD, false); + } else if (dComIfGs_isItemFirstBit(dItemNo_WOOD_SHIELD_e)) { + if (dComIfGs_getSelectEquipShield() != dItemNo_WOOD_SHIELD_e) { + dMeter2Info_setShield(dItemNo_WOOD_SHIELD_e, false); setEquipItemFrameColorShield(0); daAlink_getAlinkActorClass()->setShieldChange(); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, @@ -1080,8 +1080,8 @@ void dMenu_Collect2D_c::changeShield() { } break; case 4: - if (dComIfGs_getSelectEquipShield() != fpcNm_ITEM_HYLIA_SHIELD) { - dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false); + if (dComIfGs_getSelectEquipShield() != dItemNo_HYLIA_SHIELD_e) { + dMeter2Info_setShield(dItemNo_HYLIA_SHIELD_e, false); setEquipItemFrameColorShield(1); daAlink_getAlinkActorClass()->setShieldChange(); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -1094,8 +1094,8 @@ void dMenu_Collect2D_c::changeShield() { void dMenu_Collect2D_c::changeClothe() { switch (mCursorX) { case 3: - if (dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_WEAR_KOKIRI) { - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false); + if (dComIfGs_getSelectEquipClothes() != dItemNo_WEAR_KOKIRI_e) { + dMeter2Info_setCloth(dItemNo_WEAR_KOKIRI_e, false); setEquipItemFrameColorClothes(0); daPy_getPlayerActorClass()->setClothesChange(0); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -1103,8 +1103,8 @@ void dMenu_Collect2D_c::changeClothe() { } break; case 4: - if (dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_WEAR_ZORA) { - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_ZORA, false); + if (dComIfGs_getSelectEquipClothes() != dItemNo_WEAR_ZORA_e) { + dMeter2Info_setCloth(dItemNo_WEAR_ZORA_e, false); setEquipItemFrameColorClothes(1); daPy_getPlayerActorClass()->setClothesChange(0); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -1112,8 +1112,8 @@ void dMenu_Collect2D_c::changeClothe() { } break; case 5: - if (dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_ARMOR) { - dMeter2Info_setCloth(fpcNm_ITEM_ARMOR, false); + if (dComIfGs_getSelectEquipClothes() != dItemNo_ARMOR_e) { + dMeter2Info_setCloth(dItemNo_ARMOR_e, false); setEquipItemFrameColorClothes(2); daPy_getPlayerActorClass()->setClothesChange(0); Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_SET_X, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); @@ -1174,19 +1174,19 @@ void dMenu_Collect2D_c::setSmellType() { }; s32 smellType = -1; switch (dComIfGs_getCollectSmell()) { - case fpcNm_ITEM_SMELL_YELIA_POUCH: + case dItemNo_SMELL_YELIA_POUCH_e: smellType = 3; break; - case fpcNm_ITEM_SMELL_POH: + case dItemNo_SMELL_POH_e: smellType = 4; break; - case fpcNm_ITEM_SMELL_FISH: + case dItemNo_SMELL_FISH_e: smellType = 2; break; - case fpcNm_ITEM_SMELL_CHILDREN: + case dItemNo_SMELL_CHILDREN_e: smellType = 1; break; - case fpcNm_ITEM_SMELL_MEDICINE: + case dItemNo_SMELL_MEDICINE_e: smellType = 0; break; } @@ -1265,20 +1265,20 @@ void dMenu_Collect2D_c::setEquipItemFrameColorSword(int i_frame) { mEquippedSword = dComIfGs_getSelectEquipSword(); switch (mEquippedSword) { - case fpcNm_ITEM_SWORD: + case dItemNo_SWORD_e: i_frame = 0; break; - case fpcNm_ITEM_WOOD_STICK: + case dItemNo_WOOD_STICK_e: i_frame = 0; break; - case fpcNm_ITEM_MASTER_SWORD: + case dItemNo_MASTER_SWORD_e: i_frame = 1; break; - case fpcNm_ITEM_LIGHT_SWORD: - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_SWORD)) { + case dItemNo_LIGHT_SWORD_e: + if (dComIfGs_isItemFirstBit(dItemNo_LIGHT_SWORD_e)) { i_frame = 1; } break; @@ -1322,12 +1322,12 @@ void dMenu_Collect2D_c::setEquipItemFrameColorShield(int i_frame) { mEquippedShield = dComIfGs_getSelectEquipShield(); switch (mEquippedShield) { - case fpcNm_ITEM_SHIELD: - case fpcNm_ITEM_WOOD_SHIELD: + case dItemNo_SHIELD_e: + case dItemNo_WOOD_SHIELD_e: i_frame = 0; break; - case fpcNm_ITEM_HYLIA_SHIELD: + case dItemNo_HYLIA_SHIELD_e: i_frame = 1; break; } @@ -1371,15 +1371,15 @@ void dMenu_Collect2D_c::setEquipItemFrameColorClothes(int i_frame) { mEquippedClothes = dComIfGs_getSelectEquipClothes(); switch (mEquippedClothes) { - case fpcNm_ITEM_WEAR_KOKIRI: + case dItemNo_WEAR_KOKIRI_e: i_frame = 0; break; - case fpcNm_ITEM_WEAR_ZORA: + case dItemNo_WEAR_ZORA_e: i_frame = 1; break; - case fpcNm_ITEM_ARMOR: + case dItemNo_ARMOR_e: i_frame = 2; break; } diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index 187fa4b1726..3fcc8cc0942 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -1162,13 +1162,13 @@ void dMenu_Dmap_c::screenInit() { mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide(); u8 key_num = 0; - if (checkItemGet(fpcNm_ITEM_L2_KEY_PIECES1, 1)) { + if (checkItemGet(dItemNo_L2_KEY_PIECES1_e, 1)) { key_num = 1; } - if (checkItemGet(fpcNm_ITEM_L2_KEY_PIECES2, 1)) { + if (checkItemGet(dItemNo_L2_KEY_PIECES2_e, 1)) { key_num++; } - if (checkItemGet(fpcNm_ITEM_L2_KEY_PIECES3, 1)) { + if (checkItemGet(dItemNo_L2_KEY_PIECES3_e, 1)) { key_num++; } @@ -1201,34 +1201,34 @@ void dMenu_Dmap_c::screenInit() { mpDrawBg->mBaseScreen->search(MULTI_CHAR('nor_k_n'))->hide(); mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide(); - u8 itemNo = fpcNm_ITEM_NONE; + u8 itemNo = dItemNo_NONE_e; field_0x174[2] = 0; if (g_fmapHIO.mMapIconHIO.mLV5DungeonItemDebug) { itemNo = g_fmapHIO.mMapIconHIO.mLV5DungeonItem; - if (itemNo != fpcNm_ITEM_NONE) { + if (itemNo != dItemNo_NONE_e) { field_0x174[2] = itemNo; } } else { if (dComIfGs_isDungeonItemBossKey()) { - itemNo = fpcNm_ITEM_LV5_BOSS_KEY; - field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? fpcNm_ITEM_LV5_BOSS_KEY : 0; + itemNo = dItemNo_LV5_BOSS_KEY_e; + field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? dItemNo_LV5_BOSS_KEY_e : 0; /* dSv_event_flag_c::F_0003 - Snowpeak Ruins - Handed over tomato puree and left room */ - } else if (checkItemGet(fpcNm_ITEM_TOMATO_PUREE, 1) && !dComIfGs_isEventBit(2)) { - itemNo = fpcNm_ITEM_TOMATO_PUREE; - field_0x174[2] = fpcNm_ITEM_TOMATO_PUREE; + } else if (checkItemGet(dItemNo_TOMATO_PUREE_e, 1) && !dComIfGs_isEventBit(2)) { + itemNo = dItemNo_TOMATO_PUREE_e; + field_0x174[2] = dItemNo_TOMATO_PUREE_e; /* dSv_event_flag_c::F_0004 - Snowpeak Ruins - Handed over secret ingredient and left room */ - } else if (checkItemGet(fpcNm_ITEM_TASTE, 1) && !dComIfGs_isEventBit(1)) { - itemNo = fpcNm_ITEM_TASTE; - field_0x174[2] = fpcNm_ITEM_TASTE; + } else if (checkItemGet(dItemNo_TASTE_e, 1) && !dComIfGs_isEventBit(1)) { + itemNo = dItemNo_TASTE_e; + field_0x174[2] = dItemNo_TASTE_e; } } switch (itemNo) { - case fpcNm_ITEM_TOMATO_PUREE: - case fpcNm_ITEM_TASTE: + case dItemNo_TOMATO_PUREE_e: + case dItemNo_TASTE_e: dMeter2Info_readItemTexture(itemNo, mItemTexBuf, (J2DPicture*)mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_boss')), NULL, NULL, NULL, NULL, NULL, NULL, -1); @@ -1238,11 +1238,11 @@ void dMenu_Dmap_c::screenInit() { mpDrawBg->mBaseScreen->search(MULTI_CHAR('i_key_n'))->hide(); mpDrawBg->mBaseScreen->search(MULTI_CHAR('lv5_k_n'))->hide(); mpDrawBg->mBaseScreen->search(MULTI_CHAR('key_n_n'))->hide(); - field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? fpcNm_ITEM_BOSS_KEY : 0; + field_0x174[2] = (u8)dComIfGs_isDungeonItemBossKey() ? dItemNo_BOSS_KEY_e : 0; } - field_0x174[0] = (u8)dComIfGs_isDungeonItemMap() ? fpcNm_ITEM_MAP : 0; - field_0x174[1] = (u8)dComIfGs_isDungeonItemCompass() ? fpcNm_ITEM_COMPUS : 0; + field_0x174[0] = (u8)dComIfGs_isDungeonItemMap() ? dItemNo_MAP_e : 0; + field_0x174[1] = (u8)dComIfGs_isDungeonItemCompass() ? dItemNo_COMPUS_e : 0; field_0x177 = 0; int bVar6 = 0; diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index 1cc94b391b4..d2560b548a8 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -546,10 +546,10 @@ void dMenu_Insect_c::screenSetDoIcon() { u8 dMenu_Insect_c::getGetInsectNum() { static u8 l_itemno[MAX_INSECT_NUM] = { - fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, - fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI, - fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL, - fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY, + dItemNo_M_BEETLE_e, dItemNo_F_BEETLE_e, dItemNo_M_BUTTERFLY_e, dItemNo_F_BUTTERFLY_e, dItemNo_M_STAG_BEETLE_e, dItemNo_F_STAG_BEETLE_e, + dItemNo_M_GRASSHOPPER_e, dItemNo_F_GRASSHOPPER_e, dItemNo_M_NANAFUSHI_e, dItemNo_F_NANAFUSHI_e, dItemNo_M_DANGOMUSHI_e, dItemNo_F_DANGOMUSHI_e, + dItemNo_M_MANTIS_e, dItemNo_F_MANTIS_e, dItemNo_M_LADYBUG_e, dItemNo_F_LADYBUG_e, dItemNo_M_SNAIL_e, dItemNo_F_SNAIL_e, + dItemNo_M_DRAGONFLY_e, dItemNo_F_DRAGONFLY_e, dItemNo_M_ANT_e, dItemNo_F_ANT_e, dItemNo_M_MAYFLY_e, dItemNo_F_MAYFLY_e, }; u8 insectNum = 0; @@ -567,10 +567,10 @@ u8 dMenu_Insect_c::getGetInsectNum() { u8 dMenu_Insect_c::getInsectItemID(int param_0, int param_1) { static u8 l_itemno[MAX_INSECT_NUM] = { - fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY, fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, - fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI, - fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL, - fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, + dItemNo_M_ANT_e, dItemNo_F_ANT_e, dItemNo_M_MAYFLY_e, dItemNo_F_MAYFLY_e, dItemNo_M_BEETLE_e, dItemNo_F_BEETLE_e, + dItemNo_M_MANTIS_e, dItemNo_F_MANTIS_e, dItemNo_M_STAG_BEETLE_e, dItemNo_F_STAG_BEETLE_e, dItemNo_M_DANGOMUSHI_e, dItemNo_F_DANGOMUSHI_e, + dItemNo_M_BUTTERFLY_e, dItemNo_F_BUTTERFLY_e, dItemNo_M_LADYBUG_e, dItemNo_F_LADYBUG_e, dItemNo_M_SNAIL_e, dItemNo_F_SNAIL_e, + dItemNo_M_NANAFUSHI_e, dItemNo_F_NANAFUSHI_e, dItemNo_M_GRASSHOPPER_e, dItemNo_F_GRASSHOPPER_e, dItemNo_M_DRAGONFLY_e, dItemNo_F_DRAGONFLY_e, }; int index = param_0 + param_1 * 6; @@ -613,14 +613,14 @@ bool dMenu_Insect_c::isGiveInsect(int param_0, int param_1) { } bool dMenu_Insect_c::isCatchInsect(u8 i_insectID) { - if (i_insectID >= fpcNm_ITEM_M_BEETLE && i_insectID <= fpcNm_ITEM_F_MAYFLY) { + if (i_insectID >= dItemNo_M_BEETLE_e && i_insectID <= dItemNo_F_MAYFLY_e) { return dComIfGs_isItemFirstBit(i_insectID); } return false; } bool dMenu_Insect_c::isGiveInsect(u8 i_insectID) { - if (i_insectID >= fpcNm_ITEM_M_BEETLE && i_insectID <= fpcNm_ITEM_F_MAYFLY) { + if (i_insectID >= dItemNo_M_BEETLE_e && i_insectID <= dItemNo_F_MAYFLY_e) { int label = i_insectID + 0xd1; return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[label]); } diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index 7119ef3e030..cfb76fa24a2 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -364,7 +364,7 @@ void dMenu_ItemExplain_c::open_init() { if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV2) { s32 itemsObtained = 0; for (int i = 0; i < 3; i++) { - if (checkItemGet(i + fpcNm_ITEM_L2_KEY_PIECES1, 1) != 0) { + if (checkItemGet(i + dItemNo_L2_KEY_PIECES1_e, 1) != 0) { itemsObtained++; } } @@ -625,7 +625,7 @@ u8 dMenu_ItemExplain_c::openExplainDmap(u8 param_0, u8 param_1, u8 param_2, bool if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == dStage_SaveTbl_LV2 && param_0 == 0x26) { for (int i = 0; i < 3; i++) { - if (checkItemGet(i + fpcNm_ITEM_L2_KEY_PIECES1, 1) != 0) { + if (checkItemGet(i + dItemNo_L2_KEY_PIECES1_e, 1) != 0) { itemsObtained++; } } diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index efb8e0c4fd5..878c5342207 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -206,7 +206,7 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i mItemSlotParam1[i] = 0.0f; } for (int i = 0; i < MAX_ITEM_SLOTS; i++) { - if (dComIfGs_getLineUpItem(i) != fpcNm_ITEM_NONE) { + if (dComIfGs_getLineUpItem(i) != dItemNo_NONE_e) { mTotalItemTexToAlloc++; } } @@ -280,10 +280,10 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i mpItemBuf[i][j] = (ResTIMG*)mpHeap->alloc(0xC00, 0x20); } u8 item = dComIfGs_getItem(mItemSlots[i], false); - if (item != fpcNm_ITEM_NONE) { - if (item == fpcNm_ITEM_LIGHT_ARROW) { + if (item != dItemNo_NONE_e) { + if (item == dItemNo_LIGHT_ARROW_e) { // safety check to prevent attempts setting up a light arrow texture - item = fpcNm_ITEM_BOW; + item = dItemNo_BOW_e; } s32 i_textureNum = dMeter2Info_readItemTexture(item, mpItemBuf[i][0], NULL, mpItemBuf[i][1], NULL, @@ -430,7 +430,7 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i mpItemExplain = new dMenu_ItemExplain_c(mpHeap, dComIfGp_getRingResArchive(), i_stick, true); setRotate(); mpDrawCursor->setPos(mItemSlotPosX[0] + mCenterPosX, mItemSlotPosY[0] + mCenterPosY); - if (dComIfGs_getItem(mItemSlots[0], false) != fpcNm_ITEM_NONE) { + if (dComIfGs_getItem(mItemSlots[0], false) != dItemNo_NONE_e) { mpDrawCursor->setParam(mItemSlotParam1[0], mItemSlotParam2[0], 0.1f, 0.6f, 0.5f); } else { mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.6f, 0.5f); @@ -666,7 +666,7 @@ bool dMenu_Ring_c::isOpen() { } setScale(); mpDrawCursor->setPos(mItemSlotPosX[SLOT_0] + mCenterPosX, mItemSlotPosY[SLOT_0] + mCenterPosY); - if (dComIfGs_getItem(mItemSlots[SLOT_0], false) != fpcNm_ITEM_NONE) { + if (dComIfGs_getItem(mItemSlots[SLOT_0], false) != dItemNo_NONE_e) { mpDrawCursor->setParam(mItemSlotParam1[0], mItemSlotParam2[0], 0.1f, 0.6f, 0.5f); } else { mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.6f, 0.5f); @@ -728,7 +728,7 @@ bool dMenu_Ring_c::isClose() { } mpDrawCursor->setPos(mItemSlotPosX[mCurrentSlot] + mCenterPosX, mItemSlotPosY[mCurrentSlot] + mCenterPosY); - if (dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != fpcNm_ITEM_NONE) { + if (dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != dItemNo_NONE_e) { mpDrawCursor->setParam(mItemSlotParam1[mCurrentSlot], mItemSlotParam2[mCurrentSlot], 0.1f, 0.6f, 0.5f); } else { @@ -885,25 +885,25 @@ void dMenu_Ring_c::setItem() { u8 uVar3; u8 uVar4; - if (mXButtonSlot != fpcNm_ITEM_NONE) { + if (mXButtonSlot != dItemNo_NONE_e) { uVar1 = mItemSlots[mXButtonSlot]; } else { - uVar1 = fpcNm_ITEM_NONE; + uVar1 = dItemNo_NONE_e; } - if (mYButtonSlot != fpcNm_ITEM_NONE) { + if (mYButtonSlot != dItemNo_NONE_e) { uVar2 = mItemSlots[mYButtonSlot]; } else { - uVar2 = fpcNm_ITEM_NONE; + uVar2 = dItemNo_NONE_e; } - if (field_0x6ac != fpcNm_ITEM_NONE) { + if (field_0x6ac != dItemNo_NONE_e) { uVar3 = mItemSlots[field_0x6ac]; } else { - uVar3 = fpcNm_ITEM_NONE; + uVar3 = dItemNo_NONE_e; } - if (field_0x6ad != fpcNm_ITEM_NONE) { + if (field_0x6ad != dItemNo_NONE_e) { uVar4 = mItemSlots[field_0x6ad]; } else { - uVar4 = fpcNm_ITEM_NONE; + uVar4 = dItemNo_NONE_e; } u8 mixItemIndex0 = dComIfGs_getMixItemIndex(0); @@ -919,30 +919,30 @@ void dMenu_Ring_c::setItem() { if (mItemSlots[mCurrentSlot] == uVar1) { uVar2 = dComIfGs_getSelectItemIndex(0); mixItemIndex1 = dComIfGs_getMixItemIndex(0); - if (uVar2 == fpcNm_ITEM_NONE) { - mYButtonSlot = fpcNm_ITEM_NONE; + if (uVar2 == dItemNo_NONE_e) { + mYButtonSlot = dItemNo_NONE_e; } else { mYButtonSlot = mXButtonSlot; } mXButtonSlot = mCurrentSlot; uVar1 = mItemSlots[mXButtonSlot]; - mixItemIndex0 = fpcNm_ITEM_NONE; + mixItemIndex0 = dItemNo_NONE_e; } else { if (dComIfGs_getMixItemIndex(1) == mItemSlots[mCurrentSlot]) { uVar2 = dComIfGs_getSelectItemIndex(0); - mixItemIndex1 = fpcNm_ITEM_NONE; - if (uVar2 == fpcNm_ITEM_NONE) { - mYButtonSlot = fpcNm_ITEM_NONE; + mixItemIndex1 = dItemNo_NONE_e; + if (uVar2 == dItemNo_NONE_e) { + mYButtonSlot = dItemNo_NONE_e; } else { mYButtonSlot = mXButtonSlot; } mXButtonSlot = mCurrentSlot; uVar1 = mItemSlots[mXButtonSlot]; - mixItemIndex0 = fpcNm_ITEM_NONE; + mixItemIndex0 = dItemNo_NONE_e; } else { mXButtonSlot = mCurrentSlot; uVar1 = mItemSlots[mXButtonSlot]; - mixItemIndex0 = fpcNm_ITEM_NONE; + mixItemIndex0 = dItemNo_NONE_e; } } } else if (field_0x6b3 == 1) { @@ -950,30 +950,30 @@ void dMenu_Ring_c::setItem() { u8 temp = dComIfGs_getSelectItemIndex(1); uVar1 = temp; mixItemIndex0 = dComIfGs_getMixItemIndex(1); - if (temp == fpcNm_ITEM_NONE) { - mXButtonSlot = fpcNm_ITEM_NONE; + if (temp == dItemNo_NONE_e) { + mXButtonSlot = dItemNo_NONE_e; } else { mXButtonSlot = mYButtonSlot; } mYButtonSlot = mCurrentSlot; uVar2 = mItemSlots[mYButtonSlot]; - mixItemIndex1 = fpcNm_ITEM_NONE; + mixItemIndex1 = dItemNo_NONE_e; } else { if (dComIfGs_getMixItemIndex(0) == mItemSlots[mCurrentSlot]) { uVar1 = dComIfGs_getSelectItemIndex(1); - mixItemIndex0 = fpcNm_ITEM_NONE; - if (uVar1 == fpcNm_ITEM_NONE) { - mXButtonSlot = fpcNm_ITEM_NONE; + mixItemIndex0 = dItemNo_NONE_e; + if (uVar1 == dItemNo_NONE_e) { + mXButtonSlot = dItemNo_NONE_e; } else { mXButtonSlot = mYButtonSlot; } mYButtonSlot = mCurrentSlot; uVar2 = mItemSlots[mYButtonSlot]; - mixItemIndex1 = fpcNm_ITEM_NONE; + mixItemIndex1 = dItemNo_NONE_e; } else { mYButtonSlot = mCurrentSlot; uVar2 = mItemSlots[mYButtonSlot]; - mixItemIndex1 = fpcNm_ITEM_NONE; + mixItemIndex1 = dItemNo_NONE_e; } } } @@ -983,9 +983,9 @@ void dMenu_Ring_c::setItem() { field_0x6b4[3] = uVar4; field_0x6b8[0] = mixItemIndex0; field_0x6b8[1] = mixItemIndex1; - field_0x6b8[2] = fpcNm_ITEM_NONE; - field_0x6b8[3] = fpcNm_ITEM_NONE; - field_0x6cd = fpcNm_ITEM_NONE; + field_0x6b8[2] = dItemNo_NONE_e; + field_0x6b8[3] = dItemNo_NONE_e; + field_0x6cd = dItemNo_NONE_e; setJumpItem(true); } @@ -999,19 +999,19 @@ void dMenu_Ring_c::setJumpItem(bool i_useVibrationM) { setSelectItem(i, getItem(field_0x6b4[i], field_0x6b8[i])); } } - if (mXButtonSlot != fpcNm_ITEM_NONE) { + if (mXButtonSlot != dItemNo_NONE_e) { field_0x518[0] = mItemSlotPosX[mXButtonSlot]; field_0x528[0] = mItemSlotPosY[mXButtonSlot]; } - if (mYButtonSlot != fpcNm_ITEM_NONE) { + if (mYButtonSlot != dItemNo_NONE_e) { field_0x518[1] = mItemSlotPosX[mYButtonSlot]; field_0x528[1] = mItemSlotPosY[mYButtonSlot]; } - if (field_0x6ac != fpcNm_ITEM_NONE) { + if (field_0x6ac != dItemNo_NONE_e) { field_0x518[2] = mItemSlotPosX[field_0x6ac]; field_0x528[2] = mItemSlotPosY[field_0x6ac]; } - if (field_0x6ad != fpcNm_ITEM_NONE) { + if (field_0x6ad != dItemNo_NONE_e) { field_0x518[3] = mItemSlotPosX[field_0x6ad]; field_0x528[3] = mItemSlotPosY[field_0x6ad]; } @@ -1127,12 +1127,12 @@ void dMenu_Ring_c::setNameString(u32 i_stringID) { void dMenu_Ring_c::setActiveCursor() { u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); if (mStatus == STATUS_WAIT && mOldStatus != STATUS_EXPLAIN_FORCE && mOldStatus != STATUS_EXPLAIN && mpItemExplain->getStatus() == 0) { - if (mDoCPd_c::getTrigR(PAD_1) && !mPlayerIsWolf && item != fpcNm_ITEM_NONE) { + if (mDoCPd_c::getTrigR(PAD_1) && !mPlayerIsWolf && item != dItemNo_NONE_e) { for (int i = 0; i < MAX_SELECT_ITEM; i++) { setSelectItemForce(i); } setMixItem(); - } else if (mDoCPd_c::getTrigX(PAD_1) && !mPlayerIsWolf && item != fpcNm_ITEM_NONE) { + } else if (mDoCPd_c::getTrigX(PAD_1) && !mPlayerIsWolf && item != dItemNo_NONE_e) { for (int i = 0; i < MAX_SELECT_ITEM; i++) { setSelectItemForce(i); } @@ -1144,7 +1144,7 @@ void dMenu_Ring_c::setActiveCursor() { (this->*stick_init[mStatus])(); } } - } else if (mDoCPd_c::getTrigY(PAD_1) && !mPlayerIsWolf && item != fpcNm_ITEM_NONE) { + } else if (mDoCPd_c::getTrigY(PAD_1) && !mPlayerIsWolf && item != dItemNo_NONE_e) { for (int i = 0; i < MAX_SELECT_ITEM; i++) { setSelectItemForce(i); } @@ -1168,7 +1168,7 @@ void dMenu_Ring_c::setMixItem() { bool bVar1 = false; u8 selectItemIndex0 = dComIfGs_getSelectItemIndex(0); u8 selectItemIndex1 = dComIfGs_getSelectItemIndex(1); - u8 local_28[4] = {fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE}; + u8 local_28[4] = {dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e}; if (dComIfGs_getMixItemIndex(0) == SLOT_4 && mItemSlots[mCurrentSlot] == dComIfGs_getSelectItemIndex(0)) @@ -1194,11 +1194,11 @@ void dMenu_Ring_c::setMixItem() { bVar1 = true; } else { switch (item) { - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - case fpcNm_ITEM_HAWK_EYE: - if ((dComIfGs_getSelectItemIndex(0) == 4 && dComIfGs_getMixItemIndex(0) == fpcNm_ITEM_NONE) || + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + case dItemNo_HAWK_EYE_e: + if ((dComIfGs_getSelectItemIndex(0) == 4 && dComIfGs_getMixItemIndex(0) == dItemNo_NONE_e) || (dComIfGs_getMixItemIndex(0) == 4)) { Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, @@ -1214,7 +1214,7 @@ void dMenu_Ring_c::setMixItem() { mYButtonSlot = 0xff; } } else if ((dComIfGs_getSelectItemIndex(1) == 4 && - dComIfGs_getMixItemIndex(1) == fpcNm_ITEM_NONE) || + dComIfGs_getMixItemIndex(1) == dItemNo_NONE_e) || (dComIfGs_getMixItemIndex(1) == 4)) { Z2GetAudioMgr()->seStart(Z2SE_SY_ITEM_COMBINE_ON, NULL, 0, 0, 1.0f, 1.0f, -1.0f, @@ -1237,10 +1237,10 @@ void dMenu_Ring_c::setMixItem() { field_0x6b4[0] = selectItemIndex0; field_0x6b4[1] = selectItemIndex1; setJumpItem(false); - if (local_28[0] != fpcNm_ITEM_NONE) { + if (local_28[0] != dItemNo_NONE_e) { mXButtonSlot = local_28[0]; } - if (local_28[1] != fpcNm_ITEM_NONE) { + if (local_28[1] != dItemNo_NONE_e) { mYButtonSlot = local_28[1]; } } @@ -1281,7 +1281,7 @@ void dMenu_Ring_c::drawItem() { f32 y = (48.0f - f1) * 0.5f + (mItemSlotPosY[i] - 24.0f + mCenterPosY); mpItemTex[i][j]->draw(x, y, f0, f1, 0, 0, 0); u8 item = dComIfGs_getItem(mItemSlots[i], false); - if ((j == 0 && item != fpcNm_ITEM_BEE_CHILD) || (j == 2 && item == fpcNm_ITEM_BEE_CHILD)) { + if ((j == 0 && item != dItemNo_BEE_CHILD_e) || (j == 2 && item == dItemNo_BEE_CHILD_e)) { u8 itemNum = getItemNum(mItemSlots[i]); u8 itemMaxNum = getItemMaxNum(mItemSlots[i]); if (itemMaxNum != 0) { @@ -1289,7 +1289,7 @@ void dMenu_Ring_c::drawItem() { drawNumber(itemNum, itemMaxNum, x + 24.0f, y + 48.0f); } } - if (j == 0 && item == fpcNm_ITEM_KANTERA /* Lantern */) { + if (j == 0 && item == dItemNo_KANTERA_e /* Lantern */) { setKanteraPos(x + 24.0f + 15.0f, y + 48.0f + 10.0f); mpKanteraMeter->setScale(0.64f, 0.64f); mpKanteraMeter->setNowGauge(dComIfGs_getMaxOil(), dComIfGs_getOil()); @@ -1323,7 +1323,7 @@ void dMenu_Ring_c::drawItem2() { f32 y = (48.0f - f1) * 0.5f + (mItemSlotPosY[idx] - 24.0f + mCenterPosY); mpItemTex[idx][i]->draw(x, y, f0, f1, 0, 0, 0); u8 item = dComIfGs_getItem(mItemSlots[idx], false); - if ((i == 0 && item != fpcNm_ITEM_BEE_CHILD) || (i == 2 && item == fpcNm_ITEM_BEE_CHILD)) { + if ((i == 0 && item != dItemNo_BEE_CHILD_e) || (i == 2 && item == dItemNo_BEE_CHILD_e)) { u8 itemNum = getItemNum(mItemSlots[idx]); u8 itemMaxNum = getItemMaxNum(mItemSlots[idx]); if (itemMaxNum != 0) { @@ -1331,7 +1331,7 @@ void dMenu_Ring_c::drawItem2() { drawNumber(itemNum, itemMaxNum, x + 24.0f, y + 48.0f); } } - if (i == 0 && item == fpcNm_ITEM_KANTERA) { + if (i == 0 && item == dItemNo_KANTERA_e) { setKanteraPos(x + 24.0f + 15.0f, y + 48.0f + 10.0f); mpKanteraMeter->setScale(0.64f, 0.64f); mpKanteraMeter->setNowGauge(dComIfGs_getMaxOil(), dComIfGs_getOil()); @@ -1361,7 +1361,7 @@ void dMenu_Ring_c::stick_wait_init() { void dMenu_Ring_c::stick_wait_proc() { u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); - if (item != fpcNm_ITEM_NONE) { + if (item != dItemNo_NONE_e) { setDoStatus(0x24); } else { setDoStatus(0); @@ -1410,7 +1410,7 @@ void dMenu_Ring_c::stick_move_proc() { field_0x66e = field_0x670; mpDrawCursor->setPos(mItemSlotPosX[mCurrentSlot], mItemSlotPosY[mCurrentSlot]); u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); - if (item != fpcNm_ITEM_NONE) { + if (item != dItemNo_NONE_e) { mpDrawCursor->setParam(mItemSlotParam1[mCurrentSlot], mItemSlotParam2[mCurrentSlot], 0.1f, 0.6f, 0.5f); } else { @@ -1437,7 +1437,7 @@ void dMenu_Ring_c::stick_move_proc() { field_0x66e = field_0x670; mpDrawCursor->setPos(mItemSlotPosX[mCurrentSlot], mItemSlotPosY[mCurrentSlot]); u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); - if (item != fpcNm_ITEM_NONE) { + if (item != dItemNo_NONE_e) { mpDrawCursor->setParam(mItemSlotParam1[mCurrentSlot], mItemSlotParam2[mCurrentSlot], 0.1f, 0.6f, 0.5f); } else { @@ -1497,7 +1497,7 @@ void dMenu_Ring_c::stick_explain_force_proc() { void dMenu_Ring_c::setSelectItem(int i_idx, u8 i_itemNo) { f32 texScale = 1.0f; - if (i_itemNo != fpcNm_ITEM_NONE) { + if (i_itemNo != dItemNo_NONE_e) { if (field_0x6be[i_idx] == 0) { field_0x6be[i_idx] = 1; } else { @@ -1592,26 +1592,26 @@ u8 dMenu_Ring_c::getItemNum(u8 i_slotNo) { u8 ret = 0; switch (item) { - case fpcNm_ITEM_BOMB_BAG_LV1: + case dItemNo_BOMB_BAG_LV1_e: ret = 0; break; - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: ret = dComIfGs_getBombNum(i_slotNo - 0xF); break; - case fpcNm_ITEM_BEE_CHILD: + case dItemNo_BEE_CHILD_e: ret = dComIfGs_getBottleNum(i_slotNo - 0xB); break; - case fpcNm_ITEM_BOW: - case fpcNm_ITEM_LIGHT_ARROW: - case fpcNm_ITEM_ARROW_LV1: - case fpcNm_ITEM_ARROW_LV2: - case fpcNm_ITEM_ARROW_LV3: + case dItemNo_BOW_e: + case dItemNo_LIGHT_ARROW_e: + case dItemNo_ARROW_LV1_e: + case dItemNo_ARROW_LV2_e: + case dItemNo_ARROW_LV3_e: ret = dComIfGs_getArrowNum(); break; - case fpcNm_ITEM_PACHINKO: + case dItemNo_PACHINKO_e: ret = dComIfGs_getPachinkoNum(); break; } @@ -1631,26 +1631,26 @@ u8 dMenu_Ring_c::getItemMaxNum(u8 i_slotNo) { u8 ret = 0; switch (item) { - case fpcNm_ITEM_BOMB_BAG_LV1: + case dItemNo_BOMB_BAG_LV1_e: ret = 1; break; - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: ret = dComIfGs_getBombMax(item); break; - case fpcNm_ITEM_BEE_CHILD: + case dItemNo_BEE_CHILD_e: ret = dComIfGs_getBottleMax(); break; - case fpcNm_ITEM_BOW: - case fpcNm_ITEM_LIGHT_ARROW: - case fpcNm_ITEM_ARROW_LV1: - case fpcNm_ITEM_ARROW_LV2: - case fpcNm_ITEM_ARROW_LV3: + case dItemNo_BOW_e: + case dItemNo_LIGHT_ARROW_e: + case dItemNo_ARROW_LV1_e: + case dItemNo_ARROW_LV2_e: + case dItemNo_ARROW_LV3_e: ret = dComIfGs_getArrowMax(); break; - case fpcNm_ITEM_PACHINKO: + case dItemNo_PACHINKO_e: ret = dComIfGs_getPachinkoMax(); break; } @@ -1667,105 +1667,105 @@ bool dMenu_Ring_c::checkExplainForce() { u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], true); for (int i = 0; i < 4; i++) { - local_18[i] = fpcNm_ITEM_NONE; + local_18[i] = dItemNo_NONE_e; } switch (item) { - case fpcNm_ITEM_BOW: + case dItemNo_BOW_e: switch (item0) { - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - local_18[0] = fpcNm_ITEM_BOMB_ARROW; + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + local_18[0] = dItemNo_BOMB_ARROW_e; break; - case fpcNm_ITEM_HAWK_EYE: - local_18[0] = fpcNm_ITEM_HAWK_ARROW; + case dItemNo_HAWK_EYE_e: + local_18[0] = dItemNo_HAWK_ARROW_e; break; } switch (item1) { - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - local_18[1] = fpcNm_ITEM_BOMB_ARROW; + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + local_18[1] = dItemNo_BOMB_ARROW_e; break; - case fpcNm_ITEM_HAWK_EYE: - local_18[1] = fpcNm_ITEM_HAWK_ARROW; + case dItemNo_HAWK_EYE_e: + local_18[1] = dItemNo_HAWK_ARROW_e; break; } break; - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - if (item0 == fpcNm_ITEM_BOW) { - local_18[0] = fpcNm_ITEM_BOMB_ARROW; - } else if (item1 == fpcNm_ITEM_BOW) { - local_18[1] = fpcNm_ITEM_BOMB_ARROW; + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + if (item0 == dItemNo_BOW_e) { + local_18[0] = dItemNo_BOMB_ARROW_e; + } else if (item1 == dItemNo_BOW_e) { + local_18[1] = dItemNo_BOMB_ARROW_e; } break; - case fpcNm_ITEM_HAWK_EYE: - if (item0 == fpcNm_ITEM_BOW) { - local_18[0] = fpcNm_ITEM_HAWK_ARROW; - } else if (item1 == fpcNm_ITEM_BOW) { - local_18[1] = fpcNm_ITEM_HAWK_ARROW; + case dItemNo_HAWK_EYE_e: + if (item0 == dItemNo_BOW_e) { + local_18[0] = dItemNo_HAWK_ARROW_e; + } else if (item1 == dItemNo_BOW_e) { + local_18[1] = dItemNo_HAWK_ARROW_e; } break; - case fpcNm_ITEM_BEE_CHILD: - if (item0 == fpcNm_ITEM_FISHING_ROD_1) { - local_18[0] = fpcNm_ITEM_BEE_ROD; - } else if (item1 == fpcNm_ITEM_FISHING_ROD_1) { - local_18[1] = fpcNm_ITEM_BEE_ROD; + case dItemNo_BEE_CHILD_e: + if (item0 == dItemNo_FISHING_ROD_1_e) { + local_18[0] = dItemNo_BEE_ROD_e; + } else if (item1 == dItemNo_FISHING_ROD_1_e) { + local_18[1] = dItemNo_BEE_ROD_e; } break; - case fpcNm_ITEM_WORM: - if (item0 == fpcNm_ITEM_FISHING_ROD_1) { - local_18[0] = fpcNm_ITEM_WORM_ROD; - } else if (item1 == fpcNm_ITEM_FISHING_ROD_1) { - local_18[1] = fpcNm_ITEM_WORM_ROD; + case dItemNo_WORM_e: + if (item0 == dItemNo_FISHING_ROD_1_e) { + local_18[0] = dItemNo_WORM_ROD_e; + } else if (item1 == dItemNo_FISHING_ROD_1_e) { + local_18[1] = dItemNo_WORM_ROD_e; } break; - case fpcNm_ITEM_ZORAS_JEWEL: - if (item0 == fpcNm_ITEM_FISHING_ROD_1) { - local_18[0] = fpcNm_ITEM_JEWEL_ROD; - } else if (item1 == fpcNm_ITEM_FISHING_ROD_1) { - local_18[1] = fpcNm_ITEM_JEWEL_ROD; + case dItemNo_ZORAS_JEWEL_e: + if (item0 == dItemNo_FISHING_ROD_1_e) { + local_18[0] = dItemNo_JEWEL_ROD_e; + } else if (item1 == dItemNo_FISHING_ROD_1_e) { + local_18[1] = dItemNo_JEWEL_ROD_e; } break; - case fpcNm_ITEM_FISHING_ROD_1: - if (item0 == fpcNm_ITEM_BEE_CHILD) { - local_18[0] = fpcNm_ITEM_BEE_ROD; - } else if (item1 == fpcNm_ITEM_BEE_CHILD) { - local_18[1] = fpcNm_ITEM_BEE_ROD; - } else if (item0 == fpcNm_ITEM_ZORAS_JEWEL) { - local_18[0] = fpcNm_ITEM_JEWEL_ROD; - } else if (item1 == fpcNm_ITEM_ZORAS_JEWEL) { - local_18[1] = fpcNm_ITEM_JEWEL_ROD; - } else if (item0 == fpcNm_ITEM_WORM) { - local_18[0] = fpcNm_ITEM_WORM_ROD; - } else if (item1 == fpcNm_ITEM_WORM) { - local_18[1] = fpcNm_ITEM_WORM_ROD; + case dItemNo_FISHING_ROD_1_e: + if (item0 == dItemNo_BEE_CHILD_e) { + local_18[0] = dItemNo_BEE_ROD_e; + } else if (item1 == dItemNo_BEE_CHILD_e) { + local_18[1] = dItemNo_BEE_ROD_e; + } else if (item0 == dItemNo_ZORAS_JEWEL_e) { + local_18[0] = dItemNo_JEWEL_ROD_e; + } else if (item1 == dItemNo_ZORAS_JEWEL_e) { + local_18[1] = dItemNo_JEWEL_ROD_e; + } else if (item0 == dItemNo_WORM_e) { + local_18[0] = dItemNo_WORM_ROD_e; + } else if (item1 == dItemNo_WORM_e) { + local_18[1] = dItemNo_WORM_ROD_e; } break; } - if (local_18[0] != fpcNm_ITEM_NONE && local_18[1] == fpcNm_ITEM_NONE && local_18[2] == fpcNm_ITEM_NONE && local_18[3] == fpcNm_ITEM_NONE && - dComIfGs_getMixItemIndex(0) == fpcNm_ITEM_NONE) + if (local_18[0] != dItemNo_NONE_e && local_18[1] == dItemNo_NONE_e && local_18[2] == dItemNo_NONE_e && local_18[3] == dItemNo_NONE_e && + dComIfGs_getMixItemIndex(0) == dItemNo_NONE_e) { field_0x6c7[0] = local_18[0]; - field_0x6c7[1] = fpcNm_ITEM_NONE; - field_0x6c7[2] = fpcNm_ITEM_NONE; - field_0x6c7[3] = fpcNm_ITEM_NONE; - } else if (local_18[0] == fpcNm_ITEM_NONE && local_18[1] != fpcNm_ITEM_NONE && local_18[2] == fpcNm_ITEM_NONE && - local_18[3] == fpcNm_ITEM_NONE && dComIfGs_getMixItemIndex(1) == fpcNm_ITEM_NONE) + field_0x6c7[1] = dItemNo_NONE_e; + field_0x6c7[2] = dItemNo_NONE_e; + field_0x6c7[3] = dItemNo_NONE_e; + } else if (local_18[0] == dItemNo_NONE_e && local_18[1] != dItemNo_NONE_e && local_18[2] == dItemNo_NONE_e && + local_18[3] == dItemNo_NONE_e && dComIfGs_getMixItemIndex(1) == dItemNo_NONE_e) { - field_0x6c7[0] = fpcNm_ITEM_NONE; + field_0x6c7[0] = dItemNo_NONE_e; field_0x6c7[1] = local_18[1]; - field_0x6c7[2] = fpcNm_ITEM_NONE; - field_0x6c7[3] = fpcNm_ITEM_NONE; + field_0x6c7[2] = dItemNo_NONE_e; + field_0x6c7[3] = dItemNo_NONE_e; } else { - field_0x6c7[0] = fpcNm_ITEM_NONE; - field_0x6c7[1] = fpcNm_ITEM_NONE; - field_0x6c7[2] = fpcNm_ITEM_NONE; - field_0x6c7[3] = fpcNm_ITEM_NONE; + field_0x6c7[0] = dItemNo_NONE_e; + field_0x6c7[1] = dItemNo_NONE_e; + field_0x6c7[2] = dItemNo_NONE_e; + field_0x6c7[3] = dItemNo_NONE_e; } return 0; } @@ -1865,19 +1865,19 @@ void dMenu_Ring_c::setDoStatus(u8 i_doStatus) { } bool dMenu_Ring_c::isMixItemOn() { - if (!mPlayerIsWolf && dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != fpcNm_ITEM_NONE) { + if (!mPlayerIsWolf && dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != dItemNo_NONE_e) { u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false); switch (item) { - case fpcNm_ITEM_HAWK_EYE: - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - if ((dComIfGs_getSelectItemIndex(0) == SLOT_4) && (dComIfGs_getMixItemIndex(0) == fpcNm_ITEM_NONE) || + case dItemNo_HAWK_EYE_e: + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + if ((dComIfGs_getSelectItemIndex(0) == SLOT_4) && (dComIfGs_getMixItemIndex(0) == dItemNo_NONE_e) || (dComIfGs_getMixItemIndex(0) == SLOT_4)) { return true; } - if ((dComIfGs_getSelectItemIndex(1) == SLOT_4) && (dComIfGs_getMixItemIndex(1) == fpcNm_ITEM_NONE) || + if ((dComIfGs_getSelectItemIndex(1) == SLOT_4) && (dComIfGs_getMixItemIndex(1) == dItemNo_NONE_e) || (dComIfGs_getMixItemIndex(1) == SLOT_4)) { return true; @@ -1889,7 +1889,7 @@ bool dMenu_Ring_c::isMixItemOn() { } bool dMenu_Ring_c::isMixItemOff() { - if ((!mPlayerIsWolf) && (dComIfGs_getItem(mItemSlots[mCurrentSlot], 0) != fpcNm_ITEM_NONE)) { + if ((!mPlayerIsWolf) && (dComIfGs_getItem(mItemSlots[mCurrentSlot], 0) != dItemNo_NONE_e)) { if ((dComIfGs_getMixItemIndex(0) == SLOT_4) && (mItemSlots[mCurrentSlot] == dComIfGs_getSelectItemIndex(0))) { diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index 957910a036a..002e4a7a502 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -1556,8 +1556,8 @@ void dMenu_save_c::restartInit() { dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[225]); // Monkey dropped lantern } - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_KANTERA) && dComIfGs_getItem(SLOT_1, true) == fpcNm_ITEM_NONE) { - dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA); + if (dComIfGs_isItemFirstBit(dItemNo_KANTERA_e) && dComIfGs_getItem(SLOT_1, true) == dItemNo_NONE_e) { + dComIfGs_setItem(SLOT_1, dItemNo_KANTERA_e); dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp()); } diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index 860bb57323a..57206a79e20 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -1729,15 +1729,15 @@ static leafdraw_method_class l_dMw_Method = { }; msg_process_profile_definition g_profile_MENUWINDOW = { - fpcLy_CURRENT_e, - 12, - fpcPi_CURRENT_e, - PROC_MENUWINDOW, - &g_fpcLf_Method.base, - sizeof(dMw_c), - 0, - 0, - &g_fopMsg_Method, - 0x02FF, - &l_dMw_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MENUWINDOW_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dMw_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopMsg_Method, + /* Draw Prio */ fpcDwPi_MENUWINDOW_e, + /* Msg SubMtd */ &l_dMw_Method, }; diff --git a/src/d/d_menu_window_HIO.cpp b/src/d/d_menu_window_HIO.cpp index 7fe6ba153a5..c48e62d0a8e 100644 --- a/src/d/d_menu_window_HIO.cpp +++ b/src/d/d_menu_window_HIO.cpp @@ -13,9 +13,9 @@ dMw_HIO_c::dMw_HIO_c() { } void dMw_HIO_c::init() { - static u8 m_cloth_item[3] = {fpcNm_ITEM_WEAR_KOKIRI, fpcNm_ITEM_ARMOR, fpcNm_ITEM_WEAR_ZORA}; - static u8 m_sword_item[4] = {fpcNm_ITEM_SWORD, fpcNm_ITEM_MASTER_SWORD, fpcNm_ITEM_LIGHT_SWORD, fpcNm_ITEM_WOOD_STICK}; - static u8 m_shield_item[3] = {fpcNm_ITEM_SHIELD, fpcNm_ITEM_HYLIA_SHIELD, fpcNm_ITEM_WOOD_SHIELD}; + static u8 m_cloth_item[3] = {dItemNo_WEAR_KOKIRI_e, dItemNo_ARMOR_e, dItemNo_WEAR_ZORA_e}; + static u8 m_sword_item[4] = {dItemNo_SWORD_e, dItemNo_MASTER_SWORD_e, dItemNo_LIGHT_SWORD_e, dItemNo_WOOD_STICK_e}; + static u8 m_shield_item[3] = {dItemNo_SHIELD_e, dItemNo_HYLIA_SHIELD_e, dItemNo_WOOD_SHIELD_e}; mArrowFlag = 0; mBombFlag = 0; @@ -57,8 +57,8 @@ void dMw_HIO_c::init() { mDonationAmount = 0; for (int i = 0; i < 24; i++) { - mItemsCopy[i] = fpcNm_ITEM_NONE; - mItems[i] = fpcNm_ITEM_NONE; + mItemsCopy[i] = dItemNo_NONE_e; + mItems[i] = dItemNo_NONE_e; field_0x7a[i] = 0; } @@ -72,8 +72,8 @@ void dMw_HIO_c::init() { mBombNum[i] = 0; } - mScentCopy = fpcNm_ITEM_NONE; - mScent = fpcNm_ITEM_NONE; + mScentCopy = dItemNo_NONE_e; + mScent = dItemNo_NONE_e; field_0xa8 = 0; field_0xf4 = 0; field_0xea = 0; diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index 28cebd533b6..50db238bffd 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -190,22 +190,22 @@ int dMeter2_c::_create() { for (int i = 0; i < 2; i++) { if (field_0x128 == 0) { - if (mItemStatus[i * 2] == fpcNm_ITEM_BOMB_BAG_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_NORMAL_BOMB || - mItemStatus[i * 2] == fpcNm_ITEM_WATER_BOMB || mItemStatus[i * 2] == fpcNm_ITEM_POKE_BOMB) + if (mItemStatus[i * 2] == dItemNo_BOMB_BAG_LV1_e || mItemStatus[i * 2] == dItemNo_NORMAL_BOMB_e || + mItemStatus[i * 2] == dItemNo_WATER_BOMB_e || mItemStatus[i * 2] == dItemNo_POKE_BOMB_e) { mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), dComIfGp_getSelectItemMaxNum(i)); - } else if (mItemStatus[i * 2] == fpcNm_ITEM_BEE_CHILD) { + } else if (mItemStatus[i * 2] == dItemNo_BEE_CHILD_e) { mpMeterDraw->setItemNum(i, dComIfGp_getSelectItemNum(i), dComIfGp_getSelectItemMaxNum(i)); - } else if (mItemStatus[i * 2] == fpcNm_ITEM_BOW || mItemStatus[i * 2] == fpcNm_ITEM_LIGHT_ARROW || - mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV2 || - mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[i * 2] == fpcNm_ITEM_HAWK_ARROW) + } else if (mItemStatus[i * 2] == dItemNo_BOW_e || mItemStatus[i * 2] == dItemNo_LIGHT_ARROW_e || + mItemStatus[i * 2] == dItemNo_ARROW_LV1_e || mItemStatus[i * 2] == dItemNo_ARROW_LV2_e || + mItemStatus[i * 2] == dItemNo_ARROW_LV3_e || mItemStatus[i * 2] == dItemNo_HAWK_ARROW_e) { mpMeterDraw->setItemNum(i, mArrowNum, dComIfGs_getArrowMax()); - } else if (mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO) { + } else if (mItemStatus[i * 2] == dItemNo_PACHINKO_e) { mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax()); - } else if (mItemStatus[i * 2] == fpcNm_ITEM_BOMB_ARROW) { + } else if (mItemStatus[i * 2] == dItemNo_BOMB_ARROW_e) { u8 item_num = dComIfGp_getSelectItemNum(i); u8 item_max = dComIfGp_getSelectItemMaxNum(i); if (item_num > mArrowNum) { @@ -2473,7 +2473,7 @@ void dMeter2_c::moveBombNum() { temp_r31 = dComIfGs_getItem((u8)(i + SLOT_15), true); temp_r28 = dComIfGs_getItem((u8)(i + SLOT_15), false); - if (temp_r31 != fpcNm_ITEM_NONE && temp_r31 != fpcNm_ITEM_BOMB_BAG_LV1) { + if (temp_r31 != dItemNo_NONE_e && temp_r31 != dItemNo_BOMB_BAG_LV1_e) { if (g_mwHIO.getBombFlag() || (dMeter2Info_getMiniGameItemSetFlag() == 1 && i == dMeter2Info_getRentalBombBag())) { @@ -2501,7 +2501,7 @@ void dMeter2_c::moveBombNum() { } if (var_r22 == 0) { - if (temp_r31 == fpcNm_ITEM_BOMB_ARROW) { + if (temp_r31 == dItemNo_BOMB_ARROW_e) { for (int j = 0; j < 2; j++) { if (i + SLOT_15 == dComIfGs_getSelectItemIndex(j) || i + SLOT_15 == dComIfGs_getMixItemIndex(j)) @@ -2512,8 +2512,8 @@ void dMeter2_c::moveBombNum() { } } } - dComIfGs_setItem(i + SLOT_15, fpcNm_ITEM_BOMB_BAG_LV1); - dComIfGp_setItem(i + SLOT_15, fpcNm_ITEM_BOMB_BAG_LV1); + dComIfGs_setItem(i + SLOT_15, dItemNo_BOMB_BAG_LV1_e); + dComIfGp_setItem(i + SLOT_15, dItemNo_BOMB_BAG_LV1_e); for (int j = 0; j < 2; j++) { if (i + SLOT_15 == dComIfGs_getSelectMixItemNoArrowIndex(j)) { @@ -2525,7 +2525,7 @@ void dMeter2_c::moveBombNum() { dComIfGs_setBombNum(i, var_r22); mBombMax[i] = dComIfGs_getBombMax(temp_r28); - if (temp_r31 != fpcNm_ITEM_BOMB_ARROW) { + if (temp_r31 != dItemNo_BOMB_ARROW_e) { for (int j = 0; j < 2; j++) { if (i + SLOT_15 == dComIfGs_getSelectMixItemNoArrowIndex(j)) { mpMeterDraw->setItemNum(j, dComIfGp_getSelectItemNum(j), @@ -2535,7 +2535,7 @@ void dMeter2_c::moveBombNum() { } } } else { - if (temp_r31 != fpcNm_ITEM_BOMB_BAG_LV1) { + if (temp_r31 != dItemNo_BOMB_BAG_LV1_e) { dComIfGs_setBombNum(i, 0); } @@ -2565,7 +2565,7 @@ void dMeter2_c::moveBombNum() { void dMeter2_c::moveBottleNum() { for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_BEE_CHILD) { + if (dComIfGs_getItem((u8)(i + SLOT_11), true) == dItemNo_BEE_CHILD_e) { if (mBottleNum[i] != dComIfGs_getBottleNum(i)) { for (int j = 0; j < 2; j++) { if (i + SLOT_11 == dComIfGs_getSelectItemIndex(j)) { @@ -2640,14 +2640,14 @@ void dMeter2_c::moveArrowNum() { i = 0; var_r28 = 0; for (; i < 2; i++, var_r28 += 2) { - if (mItemStatus[var_r28] == fpcNm_ITEM_BOW || mItemStatus[var_r28] == fpcNm_ITEM_LIGHT_ARROW || - mItemStatus[var_r28] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[var_r28] == fpcNm_ITEM_ARROW_LV2 || - mItemStatus[var_r28] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[var_r28] == fpcNm_ITEM_HAWK_ARROW) + if (mItemStatus[var_r28] == dItemNo_BOW_e || mItemStatus[var_r28] == dItemNo_LIGHT_ARROW_e || + mItemStatus[var_r28] == dItemNo_ARROW_LV1_e || mItemStatus[var_r28] == dItemNo_ARROW_LV2_e || + mItemStatus[var_r28] == dItemNo_ARROW_LV3_e || mItemStatus[var_r28] == dItemNo_HAWK_ARROW_e) { mpMeterDraw->setItemNum(i, mArrowNum, dComIfGs_getArrowMax()); - } else if (mItemStatus[var_r28] == fpcNm_ITEM_PACHINKO) { + } else if (mItemStatus[var_r28] == dItemNo_PACHINKO_e) { mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax()); - } else if (mItemStatus[var_r28] == fpcNm_ITEM_BOMB_ARROW) { + } else if (mItemStatus[var_r28] == dItemNo_BOMB_ARROW_e) { var_r27 = dComIfGp_getSelectItemNum(i); var_r6_2 = dComIfGp_getSelectItemMaxNum(i); @@ -2721,7 +2721,7 @@ void dMeter2_c::movePachinkoNum() { } for (int i = 0; i < 2; i++) { - if (mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO) { + if (mItemStatus[i * 2] == dItemNo_PACHINKO_e) { mpMeterDraw->setItemNum(i, mPachinkoNum, dComIfGs_getPachinkoMax()); } } @@ -2746,7 +2746,7 @@ void dMeter2_c::alphaAnimeLife() { } void dMeter2_c::alphaAnimeKantera() { - if (dComIfGs_getMaxOil() == 0 || dComIfGs_getItem(SLOT_1, true) != fpcNm_ITEM_KANTERA || + if (dComIfGs_getMaxOil() == 0 || dComIfGs_getItem(SLOT_1, true) != dItemNo_KANTERA_e || !daPy_getPlayerActorClass()->checkUseKandelaar(0) || (mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x400)) || dComIfGp_getOxygenShowFlag() || ((daPy_getPlayerActorClass()->getSumouMode() != 0) || @@ -2903,20 +2903,20 @@ void dMeter2_c::alphaAnimeButton() { field_0x128 == 0 ? true : false); if (field_0x128 == 0 && dMeter2Info_getMiniGameItemSetFlag() != 1 && - (mItemStatus[i * 2] == fpcNm_ITEM_BOW || mItemStatus[i * 2] == fpcNm_ITEM_LIGHT_ARROW || - mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV2 || - mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[i * 2] == fpcNm_ITEM_BOMB_BAG_LV1 || - mItemStatus[i * 2] == fpcNm_ITEM_NORMAL_BOMB || mItemStatus[i * 2] == fpcNm_ITEM_WATER_BOMB || - mItemStatus[i * 2] == fpcNm_ITEM_POKE_BOMB || mItemStatus[i * 2] == fpcNm_ITEM_HAWK_ARROW || - mItemStatus[i * 2] == fpcNm_ITEM_BOMB_ARROW || mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO || - mItemStatus[i * 2] == fpcNm_ITEM_BEE_CHILD)) + (mItemStatus[i * 2] == dItemNo_BOW_e || mItemStatus[i * 2] == dItemNo_LIGHT_ARROW_e || + mItemStatus[i * 2] == dItemNo_ARROW_LV1_e || mItemStatus[i * 2] == dItemNo_ARROW_LV2_e || + mItemStatus[i * 2] == dItemNo_ARROW_LV3_e || mItemStatus[i * 2] == dItemNo_BOMB_BAG_LV1_e || + mItemStatus[i * 2] == dItemNo_NORMAL_BOMB_e || mItemStatus[i * 2] == dItemNo_WATER_BOMB_e || + mItemStatus[i * 2] == dItemNo_POKE_BOMB_e || mItemStatus[i * 2] == dItemNo_HAWK_ARROW_e || + mItemStatus[i * 2] == dItemNo_BOMB_ARROW_e || mItemStatus[i * 2] == dItemNo_PACHINKO_e || + mItemStatus[i * 2] == dItemNo_BEE_CHILD_e)) { mpMeterDraw->drawItemNum(i, 1.0f); } else { mpMeterDraw->drawItemNum(i, 0.0f); } - if (field_0x128 == 0 && mItemStatus[i * 2] == fpcNm_ITEM_KANTERA) { + if (field_0x128 == 0 && mItemStatus[i * 2] == dItemNo_KANTERA_e) { mpMeterDraw->drawKanteraMeter(i, 1.0f); } else { mpMeterDraw->drawKanteraMeter(i, 0.0f); @@ -3022,10 +3022,10 @@ u8 dMeter2_c::isKeyVisible() { int dMeter2_c::isArrowEquip() { for (int i = 0; i < 2; i++) { - if (mItemStatus[i * 2] == fpcNm_ITEM_BOW || mItemStatus[i * 2] == fpcNm_ITEM_LIGHT_ARROW || - mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV1 || mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV2 || - mItemStatus[i * 2] == fpcNm_ITEM_ARROW_LV3 || mItemStatus[i * 2] == fpcNm_ITEM_HAWK_ARROW || - mItemStatus[i * 2] == fpcNm_ITEM_BOMB_ARROW) + if (mItemStatus[i * 2] == dItemNo_BOW_e || mItemStatus[i * 2] == dItemNo_LIGHT_ARROW_e || + mItemStatus[i * 2] == dItemNo_ARROW_LV1_e || mItemStatus[i * 2] == dItemNo_ARROW_LV2_e || + mItemStatus[i * 2] == dItemNo_ARROW_LV3_e || mItemStatus[i * 2] == dItemNo_HAWK_ARROW_e || + mItemStatus[i * 2] == dItemNo_BOMB_ARROW_e) { return i + 1; } @@ -3035,7 +3035,7 @@ int dMeter2_c::isArrowEquip() { int dMeter2_c::isPachinkoEquip() { for (int i = 0; i < 2; i++) { - if (mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO) { + if (mItemStatus[i * 2] == dItemNo_PACHINKO_e) { return i + 1; } } @@ -3062,14 +3062,14 @@ static int dMeter2_Delete(dMeter2_c* i_this) { static int dMeter2_Create(msg_class* i_this) { dMeter2Info_setMeterClass(static_cast(i_this)); dComIfGp_2dShowOn(); - fopMsgM_Create(PROC_MENUWINDOW, NULL, NULL); + fopMsgM_Create(fpcNm_MENUWINDOW_e, NULL, NULL); g_drawHIO.field_0x4 = -1; g_ringHIO.field_0x4 = -1; g_fmapHIO.field_0x4 = -1; g_cursorHIO.field_0x4 = -1; - u32 id = fopMsgM_Create(PROC_MSG_OBJECT, NULL, NULL); + u32 id = fopMsgM_Create(fpcNm_MSG_OBJECT_e, NULL, NULL); fopMsgM_setMessageID(id); dTimer_createStockTimer(); @@ -3085,15 +3085,15 @@ static leafdraw_method_class l_dMeter2_Method = { }; msg_process_profile_definition g_profile_METER2 = { - fpcLy_CURRENT_e, - 12, - fpcPi_CURRENT_e, - PROC_METER2, - &g_fpcLf_Method.base, - sizeof(dMeter2_c), - 0, - 0, - &g_fopMsg_Method, - 0x0301, - &l_dMeter2_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_METER2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dMeter2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopMsg_Method, + /* Draw Prio */ fpcDwPi_METER2_e, + /* Msg SubMtd */ &l_dMeter2_Method, }; diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index 302ef5e06a0..da751d51155 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -1168,7 +1168,7 @@ void dMeter2Draw_c::initButton() { } } - mButtonBItem = fpcNm_ITEM_SWORD; + mButtonBItem = dItemNo_SWORD_e; changeTextureItemB(mButtonBItem); for (int i = 0; i < 2; i++) { @@ -2302,10 +2302,10 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos mButtonBItem = dComIfGs_getSelectEquipSword(); switch (dComIfGs_getSelectEquipSword()) { - case fpcNm_ITEM_WOOD_STICK: - case fpcNm_ITEM_SWORD: - case fpcNm_ITEM_MASTER_SWORD: - case fpcNm_ITEM_LIGHT_SWORD: + case dItemNo_WOOD_STICK_e: + case dItemNo_SWORD_e: + case dItemNo_MASTER_SWORD_e: + case dItemNo_LIGHT_SWORD_e: changeTextureItemB(mButtonBItem); break; default: @@ -2315,8 +2315,8 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos } } else if (param_1 == true && i_action == 0x4F) { mpScreen->search(MULTI_CHAR('item_b_n'))->show(); - mButtonBItem = fpcNm_ITEM_LURE_ROD; - changeTextureItemB(fpcNm_ITEM_LURE_ROD); + mButtonBItem = dItemNo_LURE_ROD_e; + changeTextureItemB(dItemNo_LURE_ROD_e); var_r31 = 2; } else { mpScreen->search(MULTI_CHAR('item_b_n'))->hide(); @@ -2415,7 +2415,7 @@ void dMeter2Draw_c::drawButtonS(u8 i_action) { void dMeter2Draw_c::drawButtonBin(u8 i_action) { int bottle_num = 0; for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(SLOT_11 + i), true) != fpcNm_ITEM_NONE) { + if (dComIfGs_getItem((u8)(SLOT_11 + i), true) != dItemNo_NONE_e) { bottle_num++; } } @@ -2489,7 +2489,7 @@ void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_ mpTextXY[i_no]->hide(); int var_r29; - if (i_itemNo == fpcNm_ITEM_NONE || i_itemNo == 0) { + if (i_itemNo == dItemNo_NONE_e || i_itemNo == 0) { mpScreen->search(tag[i_no])->hide(); var_r29 = 1; } else { @@ -3272,10 +3272,10 @@ char* dMeter2Draw_c::getActionString(u8 i_action, u8 i_type, u8* param_2) { void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) { int var_r31 = 0; - if (i_itemNo == fpcNm_ITEM_LURE_ROD) { + if (i_itemNo == dItemNo_LURE_ROD_e) { var_r31 = 2; - } else if (i_itemNo == fpcNm_ITEM_SWORD || i_itemNo == fpcNm_ITEM_MASTER_SWORD || i_itemNo == fpcNm_ITEM_WOOD_STICK || - i_itemNo == fpcNm_ITEM_LIGHT_SWORD) + } else if (i_itemNo == dItemNo_SWORD_e || i_itemNo == dItemNo_MASTER_SWORD_e || i_itemNo == dItemNo_WOOD_STICK_e || + i_itemNo == dItemNo_LIGHT_SWORD_e) { var_r31 = 1; } @@ -3317,8 +3317,8 @@ void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) { void dMeter2Draw_c::changeTextureItemXY(int i_no, u8 i_itemNo) { JUT_ASSERT(0, i_no < SELECT_MAX_e); - if (i_itemNo == fpcNm_ITEM_LIGHT_ARROW) { - i_itemNo = fpcNm_ITEM_BOW; + if (i_itemNo == dItemNo_LIGHT_ARROW_e) { + i_itemNo = dItemNo_BOW_e; } if (field_0x76c[i_no] == 0) { @@ -3509,7 +3509,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_scale = g_drawHIO.mXItemNumScale; } else { switch (i_itemNo) { - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: mItemParams[SELECT_X_e].pos_x = 4.0f; mItemParams[SELECT_X_e].pos_y = -11.0f; mItemParams[SELECT_X_e].scale = 1.7f; @@ -3518,7 +3518,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_pos_y = -9.2f; mItemParams[SELECT_X_e].num_scale = 0.95f; break; - case fpcNm_ITEM_BOW: + case dItemNo_BOW_e: mItemParams[SELECT_X_e].pos_x = 9.2f; mItemParams[SELECT_X_e].pos_y = -14.0f; mItemParams[SELECT_X_e].scale = 2.0f; @@ -3527,7 +3527,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_pos_y = -9.2f; mItemParams[SELECT_X_e].num_scale = 0.95f; break; - case fpcNm_ITEM_HVY_BOOTS: + case dItemNo_HVY_BOOTS_e: mItemParams[SELECT_X_e].pos_x = 4.0f; mItemParams[SELECT_X_e].pos_y = -14.0f; mItemParams[SELECT_X_e].scale = 1.7f; @@ -3536,7 +3536,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_pos_y = -9.2f; mItemParams[SELECT_X_e].num_scale = 0.95f; break; - case fpcNm_ITEM_HOOKSHOT: + case dItemNo_HOOKSHOT_e: mItemParams[SELECT_X_e].pos_x = 17.0f; mItemParams[SELECT_X_e].pos_y = -14.0f; mItemParams[SELECT_X_e].scale = 1.5f; @@ -3545,7 +3545,7 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) { mItemParams[SELECT_X_e].num_pos_y = -9.2f; mItemParams[SELECT_X_e].num_scale = 0.95f; break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: mItemParams[SELECT_X_e].pos_x = -2.0f; mItemParams[SELECT_X_e].pos_y = -15.0f; mItemParams[SELECT_X_e].scale = g_drawHIO.mButtonXItemScale; @@ -3588,7 +3588,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_scale = g_drawHIO.mYItemNumScale; } else { switch (i_itemNo) { - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: mItemParams[SELECT_Y_e].pos_x = 14.0f; mItemParams[SELECT_Y_e].pos_y = 1.3f; mItemParams[SELECT_Y_e].scale = 1.7f; @@ -3597,7 +3597,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_pos_y = -9.2f; mItemParams[SELECT_Y_e].num_scale = 0.95f; break; - case fpcNm_ITEM_BOW: + case dItemNo_BOW_e: mItemParams[SELECT_Y_e].pos_x = -1.3f; mItemParams[SELECT_Y_e].pos_y = -6.6f; mItemParams[SELECT_Y_e].scale = 2.0f; @@ -3606,7 +3606,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_pos_y = -9.2f; mItemParams[SELECT_Y_e].num_scale = 0.95f; break; - case fpcNm_ITEM_HVY_BOOTS: + case dItemNo_HVY_BOOTS_e: mItemParams[SELECT_Y_e].pos_x = 1.3f; mItemParams[SELECT_Y_e].pos_y = 1.3f; mItemParams[SELECT_Y_e].scale = 1.7f; @@ -3615,7 +3615,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_pos_y = -9.2f; mItemParams[SELECT_Y_e].num_scale = 0.95f; break; - case fpcNm_ITEM_HOOKSHOT: + case dItemNo_HOOKSHOT_e: mItemParams[SELECT_Y_e].pos_x = 6.6f; mItemParams[SELECT_Y_e].pos_y = -4.0f; mItemParams[SELECT_Y_e].scale = 1.5f; @@ -3624,7 +3624,7 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) { mItemParams[SELECT_Y_e].num_pos_y = -9.2f; mItemParams[SELECT_Y_e].num_scale = 0.95f; break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: mItemParams[SELECT_Y_e].pos_x = -1.8f; mItemParams[SELECT_Y_e].pos_y = g_drawHIO.mButtonYItemPosY; mItemParams[SELECT_Y_e].scale = g_drawHIO.mButtonYItemScale; @@ -3667,7 +3667,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_scale = g_drawHIO.field_0x218; } else { switch (i_itemNo) { - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: mItemParams[SELECT_Z_e].pos_x = 4.0f; mItemParams[SELECT_Z_e].pos_y = 1.3f; mItemParams[SELECT_Z_e].scale = 2.2f; @@ -3676,7 +3676,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_pos_y = -30.0f; mItemParams[SELECT_Z_e].num_scale = 0.75f; break; - case fpcNm_ITEM_BOW: + case dItemNo_BOW_e: mItemParams[SELECT_Z_e].pos_x = -1.3f; mItemParams[SELECT_Z_e].pos_y = 1.3f; mItemParams[SELECT_Z_e].scale = 2.2f; @@ -3685,7 +3685,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_pos_y = -30.0f; mItemParams[SELECT_Z_e].num_scale = 0.75f; break; - case fpcNm_ITEM_HVY_BOOTS: + case dItemNo_HVY_BOOTS_e: mItemParams[SELECT_Z_e].pos_x = -6.6f; mItemParams[SELECT_Z_e].pos_y = 9.2f; mItemParams[SELECT_Z_e].scale = 2.2f; @@ -3694,7 +3694,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_pos_y = -30.0f; mItemParams[SELECT_Z_e].num_scale = 0.8f; break; - case fpcNm_ITEM_HOOKSHOT: + case dItemNo_HOOKSHOT_e: mItemParams[SELECT_Z_e].pos_x = -4.0f; mItemParams[SELECT_Z_e].pos_y = 1.3f; mItemParams[SELECT_Z_e].scale = 1.7f; @@ -3703,7 +3703,7 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) { mItemParams[SELECT_Z_e].num_pos_y = -30.0f; mItemParams[SELECT_Z_e].num_scale = 0.8f; break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: mItemParams[SELECT_Z_e].pos_x = -6.6f; mItemParams[SELECT_Z_e].pos_y = 6.6f; mItemParams[SELECT_Z_e].scale = g_drawHIO.field_0x1d4; @@ -3755,13 +3755,13 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_scale = 0.75f; } else { switch (i_itemNo) { - case fpcNm_ITEM_LURE_ROD: - case fpcNm_ITEM_BEE_ROD: - case fpcNm_ITEM_JEWEL_ROD: - case fpcNm_ITEM_JEWEL_BEE_ROD: - case fpcNm_ITEM_JEWEL_WORM_ROD: - case fpcNm_ITEM_HORSE_FLUTE: - case fpcNm_ITEM_FISHING_ROD_1: + case dItemNo_LURE_ROD_e: + case dItemNo_BEE_ROD_e: + case dItemNo_JEWEL_ROD_e: + case dItemNo_JEWEL_BEE_ROD_e: + case dItemNo_JEWEL_WORM_ROD_e: + case dItemNo_HORSE_FLUTE_e: + case dItemNo_FISHING_ROD_1_e: mItemParams[3].pos_x = 17.3f; mItemParams[3].pos_y = -46.8f; mItemParams[3].scale = 1.7f; @@ -3770,7 +3770,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.75f; break; - case fpcNm_ITEM_BOOMERANG: + case dItemNo_BOOMERANG_e: mItemParams[3].pos_x = 26.0f; mItemParams[3].pos_y = -54.7f; mItemParams[3].scale = 2.2f; @@ -3779,7 +3779,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.75f; break; - case fpcNm_ITEM_BOW: + case dItemNo_BOW_e: mItemParams[3].pos_x = 20.7f; mItemParams[3].pos_y = -55.7f; mItemParams[3].scale = 2.2f; @@ -3788,7 +3788,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.75f; break; - case fpcNm_ITEM_HVY_BOOTS: + case dItemNo_HVY_BOOTS_e: mItemParams[3].pos_x = 15.4f; mItemParams[3].pos_y = -47.8f; mItemParams[3].scale = 2.2f; @@ -3797,8 +3797,8 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.8f; break; - case fpcNm_ITEM_SPINNER: - case fpcNm_ITEM_HAWK_EYE: + case dItemNo_SPINNER_e: + case dItemNo_HAWK_EYE_e: mItemParams[3].pos_x = 23.3f; mItemParams[3].pos_y = -47.8f; mItemParams[3].scale = 1.7f; @@ -3807,9 +3807,9 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.8f; break; - case fpcNm_ITEM_COPY_ROD: - case fpcNm_ITEM_W_HOOKSHOT: - case fpcNm_ITEM_IRONBALL: + case dItemNo_COPY_ROD_e: + case dItemNo_W_HOOKSHOT_e: + case dItemNo_IRONBALL_e: mItemParams[3].pos_x = 29.3f; mItemParams[3].pos_y = -47.8f; mItemParams[3].scale = 1.7f; @@ -3818,13 +3818,13 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.8f; break; - case fpcNm_ITEM_PACHINKO: - case fpcNm_ITEM_BOMB_BAG_LV1: - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: - case fpcNm_ITEM_RAFRELS_MEMO: - case fpcNm_ITEM_TKS_LETTER: + case dItemNo_PACHINKO_e: + case dItemNo_BOMB_BAG_LV1_e: + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: + case dItemNo_RAFRELS_MEMO_e: + case dItemNo_TKS_LETTER_e: mItemParams[3].pos_x = 20.3f; mItemParams[3].pos_y = -47.8f; mItemParams[3].scale = 1.7f; @@ -3833,7 +3833,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -22.0f; mItemParams[3].num_scale = 0.8f; break; - case fpcNm_ITEM_HOOKSHOT: + case dItemNo_HOOKSHOT_e: mItemParams[3].pos_x = 21.0f; mItemParams[3].pos_y = -46.7f; mItemParams[3].scale = 1.7f; @@ -3842,7 +3842,7 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) { mItemParams[3].num_pos_y = -30.0f; mItemParams[3].num_scale = 0.8f; break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: mItemParams[3].pos_x = 19.0f; mItemParams[3].pos_y = -45.0f; mItemParams[3].scale = g_drawHIO.mButtonBItemScale[0]; diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index dba0acf6fb7..b74bab0c5d0 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -622,8 +622,8 @@ void dMeter2Info_c::warpInProc() { dComIfGs_setWarpMarkFlag(0); dComIfGs_resetLastWarpAcceptStage(); - if (dComIfGs_getItem(SLOT_18, true) != fpcNm_ITEM_LV7_DUNGEON_EXIT) { - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_EXIT); + if (dComIfGs_getItem(SLOT_18, true) != dItemNo_LV7_DUNGEON_EXIT_e) { + dComIfGs_setItem(SLOT_18, dItemNo_DUNGEON_EXIT_e); } } @@ -654,7 +654,7 @@ void dMeter2Info_c::warpOutProc() { } dComIfGs_setWarpItemData(dComIfGp_getStartStageName(), pos, angle.y, room_no, 0, 1); - dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_BACK); + dComIfGs_setItem(SLOT_18, dItemNo_DUNGEON_BACK_e); } void dMeter2Info_c::resetMeterString() { @@ -674,114 +674,114 @@ void dMeter2Info_c::setWarpInfo(const char* i_stageName, const cXyz& i_position, u8 dMeter2Info_c::getItemType(u8 i_itemNo) { u8 type; switch (i_itemNo) { - case fpcNm_ITEM_GREEN_RUPEE: + case dItemNo_GREEN_RUPEE_e: type = ItemType_GREEN_RUPEE; break; - case fpcNm_ITEM_BLUE_RUPEE: + case dItemNo_BLUE_RUPEE_e: type = ItemType_BLUE_RUPEE; break; - case fpcNm_ITEM_YELLOW_RUPEE: + case dItemNo_YELLOW_RUPEE_e: type = ItemType_YELLOW_RUPEE; break; - case fpcNm_ITEM_RED_RUPEE: + case dItemNo_RED_RUPEE_e: type = ItemType_RED_RUPEE; break; - case fpcNm_ITEM_PURPLE_RUPEE: - case fpcNm_ITEM_LINKS_SAVINGS: + case dItemNo_PURPLE_RUPEE_e: + case dItemNo_LINKS_SAVINGS_e: type = ItemType_PURPLE_RUPEE; break; - case fpcNm_ITEM_ORANGE_RUPEE: + case dItemNo_ORANGE_RUPEE_e: type = ItemType_ORANGE_RUPEE; break; - case fpcNm_ITEM_SILVER_RUPEE: + case dItemNo_SILVER_RUPEE_e: type = ItemType_SILVER_RUPEE; break; - case fpcNm_ITEM_EMPTY_BOTTLE: + case dItemNo_EMPTY_BOTTLE_e: type = ItemType_EMPTY_BOTTLE; break; - case fpcNm_ITEM_RED_BOTTLE: - case fpcNm_ITEM_RED_BOTTLE_2: + case dItemNo_RED_BOTTLE_e: + case dItemNo_RED_BOTTLE_2_e: type = ItemType_RED_BOTTLE; break; - case fpcNm_ITEM_GREEN_BOTTLE: + case dItemNo_GREEN_BOTTLE_e: type = ItemType_GREEN_BOTTLE; break; - case fpcNm_ITEM_BLUE_BOTTLE: + case dItemNo_BLUE_BOTTLE_e: type = ItemType_BLUE_BOTTLE; break; - case fpcNm_ITEM_MILK_BOTTLE: + case dItemNo_MILK_BOTTLE_e: type = ItemType_MILK_BOTTLE; break; - case fpcNm_ITEM_HALF_MILK_BOTTLE: + case dItemNo_HALF_MILK_BOTTLE_e: type = ItemType_HALF_MILK_BOTTLE; break; - case fpcNm_ITEM_OIL_BOTTLE: - case fpcNm_ITEM_OIL_BOTTLE_2: - case fpcNm_ITEM_OIL_BOTTLE3: + case dItemNo_OIL_BOTTLE_e: + case dItemNo_OIL_BOTTLE_2_e: + case dItemNo_OIL_BOTTLE3_e: type = ItemType_OIL_BOTTLE; break; - case fpcNm_ITEM_WATER_BOTTLE: + case dItemNo_WATER_BOTTLE_e: type = ItemType_WATER_BOTTLE; break; - case fpcNm_ITEM_HOT_SPRING: - case fpcNm_ITEM_HOT_SPRING_2: + case dItemNo_HOT_SPRING_e: + case dItemNo_HOT_SPRING_2_e: type = ItemType_HOT_SPRING; break; - case fpcNm_ITEM_LV1_SOUP: + case dItemNo_LV1_SOUP_e: type = ItemType_LV1_SOUP; break; - case fpcNm_ITEM_LV2_SOUP: - case fpcNm_ITEM_LV3_SOUP: + case dItemNo_LV2_SOUP_e: + case dItemNo_LV3_SOUP_e: type = ItemType_LV2_3_SOUP; break; - case fpcNm_ITEM_UGLY_SOUP: + case dItemNo_UGLY_SOUP_e: type = ItemType_UGLY_SOUP; break; - case fpcNm_ITEM_CHUCHU_RED: + case dItemNo_CHUCHU_RED_e: type = ItemType_CHUCHU_RED; break; - case fpcNm_ITEM_CHUCHU_BLUE: + case dItemNo_CHUCHU_BLUE_e: type = ItemType_CHUCHU_BLUE; break; - case fpcNm_ITEM_CHUCHU_GREEN: + case dItemNo_CHUCHU_GREEN_e: type = ItemType_CHUCHU_GREEN; break; - case fpcNm_ITEM_CHUCHU_YELLOW: + case dItemNo_CHUCHU_YELLOW_e: type = ItemType_CHUCHU_YELLOW; break; - case fpcNm_ITEM_CHUCHU_PURPLE: + case dItemNo_CHUCHU_PURPLE_e: type = ItemType_CHUCHU_PURPLE; break; - case fpcNm_ITEM_CHUCHU_RARE: + case dItemNo_CHUCHU_RARE_e: type = ItemType_CHUCHU_RARE; break; - case fpcNm_ITEM_CHUCHU_BLACK: + case dItemNo_CHUCHU_BLACK_e: type = ItemType_CHUCHU_BLACK; break; - case fpcNm_ITEM_POU_FIRE1: - case fpcNm_ITEM_POU_FIRE2: - case fpcNm_ITEM_POU_FIRE3: - case fpcNm_ITEM_POU_FIRE4: + case dItemNo_POU_FIRE1_e: + case dItemNo_POU_FIRE2_e: + case dItemNo_POU_FIRE3_e: + case dItemNo_POU_FIRE4_e: type = ItemType_POU_FIRE; break; - case fpcNm_ITEM_FAIRY: + case dItemNo_FAIRY_e: type = ItemType_FAIRY; break; - case fpcNm_ITEM_BEE_CHILD: - case fpcNm_ITEM_SHOP_BEE_CHILD: + case dItemNo_BEE_CHILD_e: + case dItemNo_SHOP_BEE_CHILD_e: type = ItemType_BEE_CHILD; break; - case fpcNm_ITEM_WORM: + case dItemNo_WORM_e: type = ItemType_WORM; break; - case fpcNm_ITEM_FAIRY_DROP: - case fpcNm_ITEM_DROP_BOTTLE: + case dItemNo_FAIRY_DROP_e: + case dItemNo_DROP_BOTTLE_e: type = ItemType_DROP_BOTTLE; break; - case fpcNm_ITEM_BOMB_ARROW: + case dItemNo_BOMB_ARROW_e: type = ItemType_BOMB_ARROW; break; - case fpcNm_ITEM_HAWK_ARROW: + case dItemNo_HAWK_ARROW_e: type = ItemType_HAWK_ARROW; break; default: @@ -799,10 +799,10 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p int tex_num = 0; if (i_texBuf1 != NULL) { - if ((i_itemNo == fpcNm_ITEM_KANTERA && dComIfGs_getOil() == 0) || i_itemNo == fpcNm_ITEM_KANTERA2) { + if ((i_itemNo == dItemNo_KANTERA_e && dComIfGs_getOil() == 0) || i_itemNo == dItemNo_KANTERA2_e) { u32 size = JKRReadIdxResource(i_texBuf1, 0xC00, ITEMICON_BTI_IM_KANTERA_OFF_48, dComIfGp_getItemIconArchive()); JUT_ASSERT(1166, size != 0); - } else if (i_itemNo == fpcNm_ITEM_COPY_ROD && !daPy_getPlayerActorClass()->checkCopyRodTopUse() && param_9 == -1) { + } else if (i_itemNo == dItemNo_COPY_ROD_e && !daPy_getPlayerActorClass()->checkCopyRodTopUse() && param_9 == -1) { u32 size = JKRReadIdxResource(i_texBuf1, 0xC00, ITEMICON_BTI_ST_COPY_ROD_B, dComIfGp_getItemIconArchive()); JUT_ASSERT(1173, size != 0); } else if ((itemType == ItemType_POU_FIRE || itemType == ItemType_FAIRY || itemType == ItemType_BEE_CHILD || itemType == ItemType_WORM) && i_texBuf3 == NULL) { @@ -1265,8 +1265,8 @@ void dMeter2Info_c::changeWater(u8 i_slotNo) { mHotSpringTimer[i_bottleIdx] = 0; - if (dComIfGs_getItem(i_slotNo, true) == fpcNm_ITEM_HOT_SPRING) { - dComIfGs_setItem(i_slotNo, fpcNm_ITEM_WATER_BOTTLE); + if (dComIfGs_getItem(i_slotNo, true) == dItemNo_HOT_SPRING_e) { + dComIfGs_setItem(i_slotNo, dItemNo_WATER_BOTTLE_e); for (int i = 0; i < 3; i++) { if (i_slotNo == dComIfGs_getSelectItemIndex(i)) { @@ -1286,7 +1286,7 @@ void dMeter2Info_c::setMiniGameItem(u8 i_minigameFlag) { u8 setRentBagIdx = false; for (int bagIdx = 0; bagIdx < 3; bagIdx++) { - if (!setRentBagIdx && dComIfGs_getItem((u8)(bagIdx + SLOT_15), true) == fpcNm_ITEM_NONE) { + if (!setRentBagIdx && dComIfGs_getItem((u8)(bagIdx + SLOT_15), true) == dItemNo_NONE_e) { mRentalBombBagIdx = bagIdx; setRentBagIdx = true; } @@ -1322,12 +1322,12 @@ void dMeter2Info_c::setMiniGameItem(u8 i_minigameFlag) { dComIfGs_setArrowNum(mSaveArrowNumMG); } - dComIfGs_setItem((u8)(mRentalBombBagIdx + SLOT_15), fpcNm_ITEM_NORMAL_BOMB); - dComIfGp_setItem((u8)(mRentalBombBagIdx + SLOT_15), fpcNm_ITEM_NORMAL_BOMB); + dComIfGs_setItem((u8)(mRentalBombBagIdx + SLOT_15), dItemNo_NORMAL_BOMB_e); + dComIfGp_setItem((u8)(mRentalBombBagIdx + SLOT_15), dItemNo_NORMAL_BOMB_e); if (mMiniGameItemSetFlag != 3) { - dComIfGs_setItem(SLOT_4, fpcNm_ITEM_BOW); - dComIfGp_setItem(SLOT_4, fpcNm_ITEM_BOW); + dComIfGs_setItem(SLOT_4, dItemNo_BOW_e); + dComIfGp_setItem(SLOT_4, dItemNo_BOW_e); dComIfGs_setMixItemIndex(SELECT_ITEM_Y, 0xFF); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, 0xFF); dComIfGs_setMixItemIndex(SELECT_ITEM_X, SLOT_4); @@ -1445,18 +1445,18 @@ u8 dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32 i_ void dMeter2Info_setCloth(u8 i_clothId, bool i_offItemBit) { switch (i_clothId) { - case fpcNm_ITEM_WEAR_CASUAL: - case fpcNm_ITEM_WEAR_KOKIRI: - case fpcNm_ITEM_ARMOR: - case fpcNm_ITEM_WEAR_ZORA: + case dItemNo_WEAR_CASUAL_e: + case dItemNo_WEAR_KOKIRI_e: + case dItemNo_ARMOR_e: + case dItemNo_WEAR_ZORA_e: break; default: OS_REPORT("cloth item id error!! ==> %d\n", i_clothId); - i_clothId = fpcNm_ITEM_WEAR_CASUAL; + i_clothId = dItemNo_WEAR_CASUAL_e; i_offItemBit = false; } - if (i_offItemBit && dComIfGs_getSelectEquipClothes() != fpcNm_ITEM_NONE) { + if (i_offItemBit && dComIfGs_getSelectEquipClothes() != dItemNo_NONE_e) { dComIfGs_offItemFirstBit(dComIfGs_getSelectEquipClothes()); } @@ -1466,15 +1466,15 @@ void dMeter2Info_setCloth(u8 i_clothId, bool i_offItemBit) { void dMeter2Info_setSword(u8 i_itemId, bool i_offItemBit) { switch (i_itemId) { - case fpcNm_ITEM_NONE: - case fpcNm_ITEM_WOOD_STICK: - case fpcNm_ITEM_SWORD: - case fpcNm_ITEM_MASTER_SWORD: - case fpcNm_ITEM_LIGHT_SWORD: + case dItemNo_NONE_e: + case dItemNo_WOOD_STICK_e: + case dItemNo_SWORD_e: + case dItemNo_MASTER_SWORD_e: + case dItemNo_LIGHT_SWORD_e: break; default: OS_REPORT("sword item id error!! ==> %d\n", i_itemId); - i_itemId = fpcNm_ITEM_NONE; + i_itemId = dItemNo_NONE_e; i_offItemBit = false; } @@ -1488,14 +1488,14 @@ void dMeter2Info_setSword(u8 i_itemId, bool i_offItemBit) { void dMeter2Info_setShield(u8 i_itemId, bool i_offItemBit) { switch (i_itemId) { - case fpcNm_ITEM_NONE: - case fpcNm_ITEM_WOOD_SHIELD: - case fpcNm_ITEM_SHIELD: - case fpcNm_ITEM_HYLIA_SHIELD: + case dItemNo_NONE_e: + case dItemNo_WOOD_SHIELD_e: + case dItemNo_SHIELD_e: + case dItemNo_HYLIA_SHIELD_e: break; default: OS_REPORT("shield item id error!! ==> %d\n", i_itemId); - i_itemId = fpcNm_ITEM_NONE; + i_itemId = dItemNo_NONE_e; i_offItemBit = false; } diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index 73fe999993d..e3688811523 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -3605,7 +3605,7 @@ dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() { mCannonBallZoomScale[1] = 0.8f; mLV5DungeonItemDebug = false; - mLV5DungeonItem = fpcNm_ITEM_NONE; + mLV5DungeonItem = dItemNo_NONE_e; mIconDebug = false; for (int i = 0; i < ARRAY_SIZE(mIconDisplay); i++) { diff --git a/src/d/d_meter_button.cpp b/src/d/d_meter_button.cpp index 21f027c11d9..9fd0da14e0d 100644 --- a/src/d/d_meter_button.cpp +++ b/src/d/d_meter_button.cpp @@ -1158,11 +1158,11 @@ void dMeterButton_c::screenInitButton() { u8 fishing_item = dComIfGs_getItem(SLOT_20, false); if (dMeter2Info_getMeterClass()->getMeterDrawPtr()->getCanoeFishing()) { - fishing_item = fpcNm_ITEM_LURE_ROD; + fishing_item = dItemNo_LURE_ROD_e; } - if (fishing_item == fpcNm_ITEM_NONE) { - fishing_item = fpcNm_ITEM_FISHING_ROD_1; + if (fishing_item == dItemNo_NONE_e) { + fishing_item = dItemNo_FISHING_ROD_1_e; } dMeter2Info_readItemTexture(fishing_item, mpFishingTex, diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index 1c7edf2dd43..9fc38aca375 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -1325,13 +1325,13 @@ bool jmessage_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_siz return true; } case MSGTAG_BOMB_MAX: { - u8 bomb_type = fpcNm_ITEM_NORMAL_BOMB; + u8 bomb_type = dItemNo_NORMAL_BOMB_e; const u8 type = *(u8*)i_data; if (type == 1) { - bomb_type = fpcNm_ITEM_WATER_BOMB; + bomb_type = dItemNo_WATER_BOMB_e; } else if (type == 2) { - bomb_type = fpcNm_ITEM_POKE_BOMB; + bomb_type = dItemNo_POKE_BOMB_e; } char buffer[40]; @@ -4090,11 +4090,11 @@ bool jmessage_string_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u3 break; } case MSGTAG_BOMB_MAX: { - u8 bombType = fpcNm_ITEM_NORMAL_BOMB; + u8 bombType = dItemNo_NORMAL_BOMB_e; if ((*(u8*)i_data) == 1) { - bombType = fpcNm_ITEM_WATER_BOMB; + bombType = dItemNo_WATER_BOMB_e; } else if ((*(s8*)i_data & 0xFFU) == 2) { - bombType = fpcNm_ITEM_POKE_BOMB; + bombType = dItemNo_POKE_BOMB_e; } char buffer[40]; @@ -4703,11 +4703,11 @@ bool jmessage_string_tRenderingProcessor::do_tag(u32 i_tag, void const* i_data, break; } case MSGTAG_BOMB_MAX: { - u8 bombType = fpcNm_ITEM_NORMAL_BOMB; + u8 bombType = dItemNo_NORMAL_BOMB_e; if ((*(u8*)i_data) == 1) { - bombType = fpcNm_ITEM_WATER_BOMB; + bombType = dItemNo_WATER_BOMB_e; } else if ((*(s8*)i_data & 0xFFU) == 2) { - bombType = fpcNm_ITEM_POKE_BOMB; + bombType = dItemNo_POKE_BOMB_e; } char buffer[40]; diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index ef60b8ab695..4648f81dc97 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -1087,23 +1087,23 @@ u16 dMsgFlow_c::query021(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea u16 ret = 0; switch (prm0) { - case fpcNm_ITEM_SWORD: - case fpcNm_ITEM_MASTER_SWORD: - case fpcNm_ITEM_LIGHT_SWORD: + case dItemNo_SWORD_e: + case dItemNo_MASTER_SWORD_e: + case dItemNo_LIGHT_SWORD_e: if (dComIfGs_getSelectEquipSword() == prm0) { ret = 1; } break; - case fpcNm_ITEM_WOOD_SHIELD: - case fpcNm_ITEM_SHIELD: - case fpcNm_ITEM_HYLIA_SHIELD: + case dItemNo_WOOD_SHIELD_e: + case dItemNo_SHIELD_e: + case dItemNo_HYLIA_SHIELD_e: if (dComIfGs_getSelectEquipShield() == prm0) { ret = 1; } break; - case fpcNm_ITEM_WEAR_KOKIRI: - case fpcNm_ITEM_ARMOR: - case fpcNm_ITEM_WEAR_ZORA: + case dItemNo_WEAR_KOKIRI_e: + case dItemNo_ARMOR_e: + case dItemNo_WEAR_ZORA_e: if (dComIfGs_getSelectEquipClothes() == prm0) { ret = 1; } @@ -1145,7 +1145,7 @@ u16 dMsgFlow_c::query022(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea u16 dMsgFlow_c::query023(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) { const u8 prm0 = i_flowNode_p->param; - int i_bagNum = 3 - dComIfGs_checkBombBag(fpcNm_ITEM_NONE); + int i_bagNum = 3 - dComIfGs_checkBombBag(dItemNo_NONE_e); JUT_ASSERT(2312, i_bagNum >= 0); u16 ret = i_bagNum; @@ -1398,13 +1398,13 @@ u16 dMsgFlow_c::query038(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea u8 ret = 0; switch(dComIfGs_getItem((u8)(BombBag + SLOT_15), false)) { - case fpcNm_ITEM_NORMAL_BOMB: + case dItemNo_NORMAL_BOMB_e: ret = 1; break; - case fpcNm_ITEM_WATER_BOMB: + case dItemNo_WATER_BOMB_e: ret = 2; break; - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_POKE_BOMB_e: ret = 3; break; } @@ -1425,7 +1425,7 @@ u16 dMsgFlow_c::query039(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea u8 BombBag = dComIfGs_getTmpReg(0xFBFF) - 1; u8 BombNum = dComIfGs_getBombNum(BombBag); - u8 BombMax = dComIfGs_getBombMax(fpcNm_ITEM_NORMAL_BOMB); + u8 BombMax = dComIfGs_getBombMax(dItemNo_NORMAL_BOMB_e); u8 ret = 0; if (BombMax < BombNum + prm0) { @@ -1484,7 +1484,7 @@ u16 dMsgFlow_c::query041(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea u8 BombBag = dComIfGs_getTmpReg(0xFBFF) - 1; u8 BombNum = dComIfGs_getBombNum(BombBag); - u8 BombMax = dComIfGs_getBombMax(fpcNm_ITEM_WATER_BOMB); + u8 BombMax = dComIfGs_getBombMax(dItemNo_WATER_BOMB_e); u8 ret = 0; if (BombMax < BombNum + prm0) { @@ -1529,7 +1529,7 @@ u16 dMsgFlow_c::query043(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea const int prm0 = i_flowNode_p->param; u8 BombBag = dComIfGs_getTmpReg(0xFBFF) - 1; u8 BombNum = dComIfGs_getBombNum(BombBag); - u8 BombMax = dComIfGs_getBombMax(fpcNm_ITEM_POKE_BOMB); + u8 BombMax = dComIfGs_getBombMax(dItemNo_POKE_BOMB_e); u8 ret = 0; if (BombMax < BombNum + prm0) { @@ -2031,15 +2031,15 @@ int dMsgFlow_c::event017(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak if (prm1 <= 1) { switch (prm0) { - case fpcNm_ITEM_DROP_CONTAINER: + case dItemNo_DROP_CONTAINER_e: dMeter2Info_setLightDropGetFlag(0, 1); dComIfGs_onLightDropGetFlag(0); break; - case fpcNm_ITEM_DROP_CONTAINER02: + case dItemNo_DROP_CONTAINER02_e: dMeter2Info_setLightDropGetFlag(1, 1); dComIfGs_onLightDropGetFlag(1); break; - case fpcNm_ITEM_DROP_CONTAINER03: + case dItemNo_DROP_CONTAINER03_e: dMeter2Info_setLightDropGetFlag(2, 1); dComIfGs_onLightDropGetFlag(2); break; @@ -2146,25 +2146,25 @@ int dMsgFlow_c::event023(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak switch (prm0) { case 1: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_RED_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_RED_BOTTLE_e); break; case 2: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_GREEN_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_GREEN_BOTTLE_e); break; case 3: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_BLUE_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_BLUE_BOTTLE_e); break; case 4: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_MILK_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_MILK_BOTTLE_e); break; case 5: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HALF_MILK_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_HALF_MILK_BOTTLE_e); break; case 6: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_OIL_BOTTLE); + dComIfGs_setEmptyBottleItemIn(dItemNo_OIL_BOTTLE_e); break; case 7: - dComIfGs_setEmptyBottleItemIn(fpcNm_ITEM_HOT_SPRING); + dComIfGs_setEmptyBottleItemIn(dItemNo_HOT_SPRING_e); break; } @@ -2200,7 +2200,7 @@ int dMsgFlow_c::event025(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak int dMsgFlow_c::event026(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) { fopAc_ac_c* speaker_p; - if (fopAcM_GetName(i_speaker_p) == PROC_MYNA) { + if (fopAcM_GetName(i_speaker_p) == fpcNm_MYNA_e) { daMyna_c* myna = (daMyna_c*)i_speaker_p; speaker_p = myna->getSpeakActorPtr(); } else { @@ -2208,9 +2208,9 @@ int dMsgFlow_c::event026(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak } if (speaker_p != NULL) { - if (fopAcM_GetName(speaker_p) == PROC_OBJ_SSITEM || - fopAcM_GetName(speaker_p) == PROC_OBJ_SSDRINK || - fopAcM_GetName(speaker_p) == PROC_TAG_SSDRINK) + if (fopAcM_GetName(speaker_p) == fpcNm_OBJ_SSITEM_e || + fopAcM_GetName(speaker_p) == fpcNm_OBJ_SSDRINK_e || + fopAcM_GetName(speaker_p) == fpcNm_TAG_SSDRINK_e) { daObj_SSBase_c* ss_item = (daObj_SSBase_c*)speaker_p; ss_item->setSoldOut(); @@ -2247,36 +2247,36 @@ int dMsgFlow_c::event027(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak switch (aParam8[1]) { case 0: - if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), false) == fpcNm_ITEM_BOMB_BAG_LV1) { - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_NORMAL_BOMB); + if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), false) == dItemNo_BOMB_BAG_LV1_e) { + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_NORMAL_BOMB_e); } if (prm1 != 0) { dComIfGp_setItemBombNumCount(BombBag, (u8)prm1); } else { - dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(fpcNm_ITEM_NORMAL_BOMB)); + dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(dItemNo_NORMAL_BOMB_e)); } break; case 1: - if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), false) == fpcNm_ITEM_BOMB_BAG_LV1) { - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_WATER_BOMB); + if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), false) == dItemNo_BOMB_BAG_LV1_e) { + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_WATER_BOMB_e); } if (prm1 != 0) { dComIfGp_setItemBombNumCount(BombBag, (u8)prm1); } else { - dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(fpcNm_ITEM_WATER_BOMB)); + dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(dItemNo_WATER_BOMB_e)); } break; case 2: - if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), false) == fpcNm_ITEM_BOMB_BAG_LV1) { - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_POKE_BOMB); + if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), false) == dItemNo_BOMB_BAG_LV1_e) { + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_POKE_BOMB_e); } if (prm1 != 0) { dComIfGp_setItemBombNumCount(BombBag, (u8)prm1); } else { - dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(fpcNm_ITEM_POKE_BOMB)); + dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(dItemNo_POKE_BOMB_e)); } break; case 3: @@ -2286,16 +2286,16 @@ int dMsgFlow_c::event027(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak dComIfGp_setItemBombNumCount(BombBag, (u8)prm1); break; case 6: - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_NORMAL_BOMB); - dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(fpcNm_ITEM_NORMAL_BOMB)); + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_NORMAL_BOMB_e); + dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(dItemNo_NORMAL_BOMB_e)); break; case 7: - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_WATER_BOMB); - dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(fpcNm_ITEM_WATER_BOMB)); + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_WATER_BOMB_e); + dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(dItemNo_WATER_BOMB_e)); break; case 8: - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_POKE_BOMB); - dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(fpcNm_ITEM_POKE_BOMB)); + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_POKE_BOMB_e); + dComIfGp_setItemBombNumCount(BombBag, dComIfGs_getBombMax(dItemNo_POKE_BOMB_e)); break; case 9: case 10: @@ -2319,20 +2319,20 @@ int dMsgFlow_c::event028(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak dComIfGp_setItemRupeeCount(BombPrice); dComIfGs_setBombNum(BombBag, 0); - if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), true) != fpcNm_ITEM_BOMB_ARROW) { - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_BOMB_BAG_LV1); + if (dComIfGs_getItem((u8)(SLOT_15 + BombBag), true) != dItemNo_BOMB_ARROW_e) { + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_BOMB_BAG_LV1_e); } else { for (int i = 0; i < 3; i++) { if (SLOT_15 + BombBag == dComIfGs_getSelectItemIndex(i)) { u8 mix_item = dComIfGs_getMixItemIndex(i); - dComIfGs_setMixItemIndex(i, fpcNm_ITEM_NONE); + dComIfGs_setMixItemIndex(i, dItemNo_NONE_e); dComIfGs_setSelectItemIndex(i, mix_item); dComIfGp_setSelectItem(i); } } - dComIfGs_setItem((u8)(SLOT_15 + BombBag), fpcNm_ITEM_BOMB_BAG_LV1); + dComIfGs_setItem((u8)(SLOT_15 + BombBag), dItemNo_BOMB_BAG_LV1_e); } // "Bomb Purchase" @@ -2462,12 +2462,12 @@ int dMsgFlow_c::event034(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak int dMsgFlow_c::event035(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) { int prm0 = getParam(i_flowNode_p->params); - if (prm0 == fpcNm_ITEM_TOMATO_PUREE || prm0 == fpcNm_ITEM_TASTE) { + if (prm0 == dItemNo_TOMATO_PUREE_e || prm0 == dItemNo_TASTE_e) { dComIfGs_offItemFirstBit(prm0); - } else if (prm0 == fpcNm_ITEM_RAFRELS_MEMO || prm0 == fpcNm_ITEM_ASHS_SCRIBBLING) { - dComIfGs_setItem(SLOT_19, fpcNm_ITEM_NONE); - } else if (prm0 == fpcNm_ITEM_LETTER || prm0 == fpcNm_ITEM_BILL || prm0 == fpcNm_ITEM_WOOD_STATUE || prm0 == fpcNm_ITEM_IRIAS_PENDANT) { - dComIfGs_setWarashibeItem(fpcNm_ITEM_NONE); + } else if (prm0 == dItemNo_RAFRELS_MEMO_e || prm0 == dItemNo_ASHS_SCRIBBLING_e) { + dComIfGs_setItem(SLOT_19, dItemNo_NONE_e); + } else if (prm0 == dItemNo_LETTER_e || prm0 == dItemNo_BILL_e || prm0 == dItemNo_WOOD_STATUE_e || prm0 == dItemNo_IRIAS_PENDANT_e) { + dComIfGs_setWarashibeItem(dItemNo_NONE_e); } // "Item Remove" @@ -2533,25 +2533,25 @@ int dMsgFlow_c::event040(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak case 0: break; case 1: - dComIfGs_setBottleItemIn(fpcNm_ITEM_RED_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_RED_BOTTLE_e, dItemNo_EMPTY_BOTTLE_e); break; case 2: - dComIfGs_setBottleItemIn(fpcNm_ITEM_GREEN_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_GREEN_BOTTLE_e, dItemNo_EMPTY_BOTTLE_e); break; case 3: - dComIfGs_setBottleItemIn(fpcNm_ITEM_BLUE_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_BLUE_BOTTLE_e, dItemNo_EMPTY_BOTTLE_e); break; case 4: - dComIfGs_setBottleItemIn(fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_MILK_BOTTLE_e, dItemNo_EMPTY_BOTTLE_e); break; case 5: - dComIfGs_setBottleItemIn(fpcNm_ITEM_HALF_MILK_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_HALF_MILK_BOTTLE_e, dItemNo_EMPTY_BOTTLE_e); break; case 6: - dComIfGs_setBottleItemIn(fpcNm_ITEM_OIL_BOTTLE, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_OIL_BOTTLE_e, dItemNo_EMPTY_BOTTLE_e); break; case 7: - dComIfGs_setBottleItemIn(fpcNm_ITEM_HOT_SPRING, fpcNm_ITEM_EMPTY_BOTTLE); + dComIfGs_setBottleItemIn(dItemNo_HOT_SPRING_e, dItemNo_EMPTY_BOTTLE_e); break; } diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index aa2a6957aa8..0cb515113cb 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -39,7 +39,7 @@ s16 dMsgObject_getGroupID() { static int dMsgObject_searchSSItem(void* param_1, void* param_2) { daPy_py_c* player = daPy_getPlayerActorClass(); - if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_SSITEM) { + if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == fpcNm_OBJ_SSITEM_e) { if (static_cast(param_1)->getProcessID() == player->getGrabActorID()) { static_cast(param_1)->setSoldOut(); return 0; @@ -2130,7 +2130,7 @@ void dMsgObject_c::setDemoMessageLocal(u32 param_1) { u16 dMsgObject_c::getSmellTypeMessageIDLocal() { u16 msgId = 0; int smell = dComIfGs_getCollectSmell(); - if (smell < fpcNm_ITEM_SMELL_MEDICINE + 1 && smell >= fpcNm_ITEM_SMELL_YELIA_POUCH) { + if (smell < dItemNo_SMELL_MEDICINE_e + 1 && smell >= dItemNo_SMELL_YELIA_POUCH_e) { msgId = smell + 0x165; } else { if (dComIfGs_getCollectSmell() != -1) { @@ -2463,15 +2463,15 @@ static leafdraw_method_class l_dMsgObject_Method = { }; msg_process_profile_definition g_profile_MSG_OBJECT = { - fpcLy_CURRENT_e, // mLayerID - 12, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MSG_OBJECT, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(dMsgObject_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopMsg_Method, // sub_method - 770, // mPriority - &l_dMsgObject_Method, // sub_method + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MSG_OBJECT_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dMsgObject_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopMsg_Method, + /* Draw Prio */ fpcDwPi_MSG_OBJECT_e, + /* Msg SubMtd */ &l_dMsgObject_Method, }; diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp index d8edae5d33f..1ae49ab74a4 100644 --- a/src/d/d_ovlp_fade.cpp +++ b/src/d/d_ovlp_fade.cpp @@ -37,9 +37,9 @@ static int dOvlpFd_FadeOut(overlap1_class* i_this) { if (i_this->field_0xcc == 0) { mDoAud_setFadeInStart(0); - if (fpcM_GetProfName(i_this) == PROC_OVERLAP11) { + if (fpcM_GetProfName(i_this) == fpcNm_OVERLAP11_e) { i_this->field_0xcc = 10; - } else if (fpcM_GetProfName(i_this) != PROC_OVERLAP6) { + } else if (fpcM_GetProfName(i_this) != fpcNm_OVERLAP6_e) { dOvlpFd_startFadeIn(var_r31); i_this->field_0xcc = var_r31; } else { @@ -48,7 +48,7 @@ static int dOvlpFd_FadeOut(overlap1_class* i_this) { } } - if (fpcM_GetProfName(i_this) == PROC_OVERLAP11 && i_this->field_0xcc == 7) { + if (fpcM_GetProfName(i_this) == fpcNm_OVERLAP11_e && i_this->field_0xcc == 7) { dOvlpFd_startFadeIn(7); } @@ -76,7 +76,7 @@ static int dOvlpFd_FadeIn(overlap1_class* i_this) { int var_r30 = 30; if (i_this->field_0xd0 == 0) { - if (fpcM_GetProfName(i_this) == PROC_OVERLAP0 || fpcM_GetProfName(i_this) == PROC_OVERLAP7) + if (fpcM_GetProfName(i_this) == fpcNm_OVERLAP0_e || fpcM_GetProfName(i_this) == fpcNm_OVERLAP7_e) { if (dComIfGp_isEnableNextStage() == 1) { var_r30 = dComIfGp_getNextStageWipeSpeed(); @@ -87,8 +87,8 @@ static int dOvlpFd_FadeIn(overlap1_class* i_this) { } i_this->field_0xd0 = var_r30; - } else if (fpcM_GetProfName(i_this) == PROC_OVERLAP10 || - fpcM_GetProfName(i_this) == PROC_OVERLAP11) + } else if (fpcM_GetProfName(i_this) == fpcNm_OVERLAP10_e || + fpcM_GetProfName(i_this) == fpcNm_OVERLAP11_e) { i_this->field_0xd0 = 1; } else { @@ -133,113 +133,113 @@ static leafdraw_method_class l_dOvlpFd_Method = { }; overlap_process_profile_definition g_profile_OVERLAP0 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP0, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 773, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP0_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP0_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP1 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP1, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 774, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP1_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP1_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP6 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP6, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 777, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP6_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP6_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP7 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP7, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 778, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP7_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP7_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP8 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP8, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 779, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP8_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP8_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP9 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP9, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 780, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP9_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP9_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP10 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP10, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 781, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP10_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP10_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; overlap_process_profile_definition g_profile_OVERLAP11 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP11, - &g_fpcLf_Method.base, - sizeof(overlap1_class), - 0, - 0, - &g_fopOvlp_Method, - 782, - &l_dOvlpFd_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP11_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(overlap1_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP11_e, + /* Fade SubMtd */ &l_dOvlpFd_Method, }; diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index 6a9dbd87401..6faa9cd7f14 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -237,15 +237,15 @@ static leafdraw_method_class l_dOvlpFd2_Method = { }; overlap_process_profile_definition g_profile_OVERLAP2 = { - fpcLy_ROOT_e, - 2, - fpcPi_CURRENT_e, - PROC_OVERLAP2, - &g_fpcLf_Method.base, - sizeof(dOvlpFd2_c), - 0, - 0, - &g_fopOvlp_Method, - 775, - &l_dOvlpFd2_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 2, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP2_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dOvlpFd2_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP2_e, + /* Fade SubMtd */ &l_dOvlpFd2_Method, }; diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp index 89112207681..6ab7a929b3d 100644 --- a/src/d/d_ovlp_fade3.cpp +++ b/src/d/d_ovlp_fade3.cpp @@ -235,15 +235,15 @@ static leafdraw_method_class l_dOvlpFd3_Method = { }; overlap_process_profile_definition g_profile_OVERLAP3 = { - fpcLy_ROOT_e, - 0, - fpcPi_CURRENT_e, - PROC_OVERLAP3, - &g_fpcLf_Method.base, - sizeof(dOvlpFd3_c), - 0, - 0, - &g_fopOvlp_Method, - 776, - &l_dOvlpFd3_Method, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OVERLAP3_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dOvlpFd3_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopOvlp_Method, + /* Draw Prio */ fpcDwPi_OVERLAP3_e, + /* Fade SubMtd */ &l_dOvlpFd3_Method, }; diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index 663d98e4259..bdf5f325eee 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -160,20 +160,20 @@ static execFunc l_execFunc[] = { }; static s16 const l_preLoad_dylKeyTbl[14] = { - PROC_BG, - PROC_DEMO00, - PROC_NBOMB, - PROC_SPINNER, - PROC_Obj_LifeContainer, - PROC_CROD, - PROC_DISAPPEAR, - PROC_Tag_Attp, - PROC_MG_ROD, - PROC_BOOMERANG, - PROC_ARROW, - PROC_SUSPEND, - PROC_MIDNA, - PROC_Obj_Yousei, + fpcNm_BG_e, + fpcNm_DEMO00_e, + fpcNm_NBOMB_e, + fpcNm_SPINNER_e, + fpcNm_Obj_LifeContainer_e, + fpcNm_CROD_e, + fpcNm_DISAPPEAR_e, + fpcNm_Tag_Attp_e, + fpcNm_MG_ROD_e, + fpcNm_BOOMERANG_e, + fpcNm_ARROW_e, + fpcNm_SUSPEND_e, + fpcNm_MIDNA_e, + fpcNm_Obj_Yousei_e, }; bool dScnLogo_c::preLoad_dyl() { @@ -742,10 +742,10 @@ void dScnLogo_c::nextSceneChange() { if (!mDoRst::isReset()) { if (!isOpeningCut()) { - dComIfG_changeOpeningScene(this, PROC_OPENING_SCENE); + dComIfG_changeOpeningScene(this, fpcNm_OPENING_SCENE_e); } else { #if DEBUG - fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 30); + fopScnM_ChangeReq(this, fpcNm_MENU_SCENE_e, 0, 30); dComIfGs_init(); dComIfG_playerStatusD(); return; @@ -1441,7 +1441,7 @@ static int dScnLogo_Execute(dScnLogo_c* i_this) { fpc_ProcID id = fpcM_GetID(i_this); if (mDoRst::isReset()) { - fopScnM_ChangeReq(i_this, PROC_LOGO_SCENE, 0, 5); + fopScnM_ChangeReq(i_this, fpcNm_LOGO_SCENE_e, 0, 5); } return 1; @@ -1605,15 +1605,15 @@ static scene_method_class l_dScnLogo_Method = { }; scene_process_profile_definition g_profile_LOGO_SCENE = { - fpcLy_ROOT_e, - 1, - fpcPi_CURRENT_e, - PROC_LOGO_SCENE, - &g_fpcNd_Method.base, - sizeof(dScnLogo_c), - 0, - 0, - &g_fopScn_Method.base, - &l_dScnLogo_Method, - 0, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_LOGO_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(dScnLogo_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnLogo_Method, + 0, }; diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 8fb2ff819b2..18c81359eb9 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -217,19 +217,19 @@ u8 dSm_read_presettxt(u8* i_data) { OS_REPORT("\nsword[%d]", value); switch (value) { case 0: - dMeter2Info_setSword(fpcNm_ITEM_NONE, false); + dMeter2Info_setSword(dItemNo_NONE_e, false); break; case 1: - dMeter2Info_setSword(fpcNm_ITEM_SWORD, false); + dMeter2Info_setSword(dItemNo_SWORD_e, false); break; case 2: - dMeter2Info_setSword(fpcNm_ITEM_MASTER_SWORD, false); + dMeter2Info_setSword(dItemNo_MASTER_SWORD_e, false); break; case 3: - dMeter2Info_setSword(fpcNm_ITEM_WOOD_STICK, false); + dMeter2Info_setSword(dItemNo_WOOD_STICK_e, false); break; case 4: - dMeter2Info_setSword(fpcNm_ITEM_LIGHT_SWORD, false); + dMeter2Info_setSword(dItemNo_LIGHT_SWORD_e, false); break; } } @@ -243,16 +243,16 @@ u8 dSm_read_presettxt(u8* i_data) { OS_REPORT("\nshield[%d]", value); switch (value) { case 0: - dMeter2Info_setShield(fpcNm_ITEM_NONE, false); + dMeter2Info_setShield(dItemNo_NONE_e, false); break; case 1: - dMeter2Info_setShield(fpcNm_ITEM_WOOD_SHIELD, false); + dMeter2Info_setShield(dItemNo_WOOD_SHIELD_e, false); break; case 2: - dMeter2Info_setShield(fpcNm_ITEM_SHIELD, false); + dMeter2Info_setShield(dItemNo_SHIELD_e, false); break; case 3: - dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false); + dMeter2Info_setShield(dItemNo_HYLIA_SHIELD_e, false); break; } } @@ -266,10 +266,10 @@ u8 dSm_read_presettxt(u8* i_data) { OS_REPORT("\nboomerang[%d]", value); switch (value) { case 0: - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_NONE); + dScnMenu_setItem(SLOT_0, dItemNo_NONE_e); break; case 1: - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); break; } } @@ -282,13 +282,13 @@ u8 dSm_read_presettxt(u8* i_data) { } else { OS_REPORT("\nbow max[%d]", value); if (value == 0) { - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_NONE); + dScnMenu_setItem(SLOT_4, dItemNo_NONE_e); } else if (value <= 10) { - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_ARROW_10); + dScnMenu_setItem(SLOT_4, dItemNo_ARROW_10_e); } else if (value <= 20) { - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_ARROW_20); + dScnMenu_setItem(SLOT_4, dItemNo_ARROW_20_e); } else { - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_ARROW_30); + dScnMenu_setItem(SLOT_4, dItemNo_ARROW_30_e); } dComIfGs_setArrowMax(value); } @@ -309,7 +309,7 @@ u8 dSm_read_presettxt(u8* i_data) { error = 1; } else if (value == 1) { OS_REPORT("\narror-fire[%d]", value); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_LIGHT_ARROW); + dScnMenu_setItem(SLOT_4, dItemNo_LIGHT_ARROW_e); } } else if (dSm_read_comp_keyword(pos, i_data, "arrow-light", 11) == 0) { value = dSm_read_get_number(i_data, &pos); @@ -319,7 +319,7 @@ u8 dSm_read_presettxt(u8* i_data) { error = 1; } else if (value == 1) { OS_REPORT("\narror-light[%d]", value); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_LIGHT_ARROW); + dScnMenu_setItem(SLOT_4, dItemNo_LIGHT_ARROW_e); } } else if (dSm_read_comp_keyword(pos, i_data, "bomb", 4) == 0) { value = dSm_read_get_number(i_data, &pos); @@ -330,10 +330,10 @@ u8 dSm_read_presettxt(u8* i_data) { } else { OS_REPORT("\nbomb max [%d]", value); if (value == 0) { - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NONE); + dScnMenu_setItem(SLOT_15, dItemNo_NONE_e); dComIfGs_setBombMax(value); } else { - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_BOMB_BAG_LV1); + dScnMenu_setItem(SLOT_15, dItemNo_BOMB_BAG_LV1_e); dComIfGs_setBombMax(value); } } @@ -356,7 +356,7 @@ u8 dSm_read_presettxt(u8* i_data) { OS_REPORT("\nbottle [%d]", value); if (value <= 4) { for (int i = 0; i < value; i++) { - dScnMenu_setItem((u8)(i + SLOT_11), fpcNm_ITEM_EMPTY_BOTTLE); + dScnMenu_setItem((u8)(i + SLOT_11), dItemNo_EMPTY_BOTTLE_e); } } } @@ -768,7 +768,7 @@ int toGameScene(dScnMenu_c* i_this) { dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[550]); /* Secret techniques - Obtained 1 secret techinques - Shield attack */ dComIfGs_offEventBit(dSv_event_flag_c::F_0338); - rt = fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, 0, 5); + rt = fopScnM_ChangeReq(i_this, fpcNm_PLAY_SCENE_e, 0, 5); dComIfGs_init(); dComIfGp_offEnableNextStage(); daNpcMsg_setEvtNum(7); @@ -788,7 +788,7 @@ int toGameScene(dScnMenu_c* i_this) { g_env_light.light_mask_type = (u8)(g_env_light.light_mask_type | 0xF0); } - rt = fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, 0, 5); + rt = fopScnM_ChangeReq(i_this, fpcNm_PLAY_SCENE_e, 0, 5); dComIfGs_setRestartRoomParam(0); } @@ -840,30 +840,30 @@ void setEnvData(menu_data_class* i_data) { dComIfGs_onDarkClearLV(4); } else if (memcmp(&i_data->env_data[i], "剣無", 4) == 0) { // "No Sword" - dMeter2Info_setSword(fpcNm_ITEM_NONE, false); - dComIfGs_offItemFirstBit(fpcNm_ITEM_WOOD_STICK); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SWORD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_MASTER_SWORD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_LIGHT_SWORD); - dMeter2Info_setShield(fpcNm_ITEM_NONE, false); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SHIELD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_WOOD_SHIELD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD); + dMeter2Info_setSword(dItemNo_NONE_e, false); + dComIfGs_offItemFirstBit(dItemNo_WOOD_STICK_e); + dComIfGs_offItemFirstBit(dItemNo_SWORD_e); + dComIfGs_offItemFirstBit(dItemNo_MASTER_SWORD_e); + dComIfGs_offItemFirstBit(dItemNo_LIGHT_SWORD_e); + dMeter2Info_setShield(dItemNo_NONE_e, false); + dComIfGs_offItemFirstBit(dItemNo_SHIELD_e); + dComIfGs_offItemFirstBit(dItemNo_WOOD_SHIELD_e); + dComIfGs_offItemFirstBit(dItemNo_HYLIA_SHIELD_e); } else if (memcmp(&i_data->env_data[i], "神剣", 4) == 0) { // "Master Sword" - dMeter2Info_setSword(fpcNm_ITEM_MASTER_SWORD, false); - dComIfGs_onItemFirstBit(fpcNm_ITEM_WOOD_STICK); - dComIfGs_onItemFirstBit(fpcNm_ITEM_SWORD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_MASTER_SWORD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_LIGHT_SWORD); + dMeter2Info_setSword(dItemNo_MASTER_SWORD_e, false); + dComIfGs_onItemFirstBit(dItemNo_WOOD_STICK_e); + dComIfGs_onItemFirstBit(dItemNo_SWORD_e); + dComIfGs_onItemFirstBit(dItemNo_MASTER_SWORD_e); + dComIfGs_onItemFirstBit(dItemNo_LIGHT_SWORD_e); } else if (memcmp(&i_data->env_data[i], "木刀", 4) == 0) { // "Wooden Sword" - dMeter2Info_setSword(fpcNm_ITEM_WOOD_STICK, false); - dComIfGs_onItemFirstBit(fpcNm_ITEM_WOOD_STICK); - dMeter2Info_setShield(fpcNm_ITEM_NONE, false); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SHIELD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_WOOD_SHIELD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD); + dMeter2Info_setSword(dItemNo_WOOD_STICK_e, false); + dComIfGs_onItemFirstBit(dItemNo_WOOD_STICK_e); + dMeter2Info_setShield(dItemNo_NONE_e, false); + dComIfGs_offItemFirstBit(dItemNo_SHIELD_e); + dComIfGs_offItemFirstBit(dItemNo_WOOD_SHIELD_e); + dComIfGs_offItemFirstBit(dItemNo_HYLIA_SHIELD_e); } else if (memcmp(&i_data->env_data[i], "童", 2) == 0) { // "Child" if (g_playerKind == 0) { @@ -880,8 +880,8 @@ void setEnvData(menu_data_class* i_data) { // "Green Tunic" if (g_playerKind == 0) { g_playerKind = 3; - dMeter2Info_setSword(fpcNm_ITEM_SWORD, false); - dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false); + dMeter2Info_setSword(dItemNo_SWORD_e, false); + dMeter2Info_setShield(dItemNo_HYLIA_SHIELD_e, false); } } else if (memcmp(&i_data->env_data[i], "SET", 3) == 0 && i_data->env_data[i + 3] >= '0' && i_data->env_data[i + 3] <= '9') @@ -1023,17 +1023,17 @@ void setEnvData(menu_data_class* i_data) { i--; } else if (memcmp(&i_data->env_data[i], "鉄靴", 4) == 0) { // "Iron Boots" - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_3); } else if (memcmp(&i_data->env_data[i], "水服", 4) == 0) { // "Water Tunic" - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_ZORA, false); + dMeter2Info_setCloth(dItemNo_WEAR_ZORA_e, false); } else if (memcmp(&i_data->env_data[i], "(初)", 4) == 0 || memcmp(&i_data->env_data[i], "（初）", 6) == 0) { // "(First)" dComIfGs_offGetMagicUseFlag(); - dComIfGs_offItemFirstBit(fpcNm_ITEM_BOW); + dComIfGs_offItemFirstBit(dItemNo_BOW_e); } else if (memcmp(&i_data->env_data[i], "ミドナ瀕死", 10) == 0) { // "Midna Dying" dComIfGs_onDarkClearLV(0); @@ -1331,7 +1331,7 @@ int dScnMenu_Execute(dScnMenu_c* i_this) { if (g_presetHIO.field_0x2717 == 2) { g_presetHIO.field_0x2717 = 0; dSm_read_stageset(g_presetHIO.mPresetData); - fopScnM_ChangeReq(i_this, PROC_MENU_SCENE, 0, 5); + fopScnM_ChangeReq(i_this, fpcNm_MENU_SCENE_e, 0, 5); } else { dScnMenu_c::cursolStageName[0] = 0; toGameScene(i_this); @@ -1655,7 +1655,7 @@ int dScnMenu_Create(scene_class* i_this) { void dScnMenu_setItem(int i_slotNo, u8 i_itemNo) { dComIfGs_setItem(i_slotNo, i_itemNo); - if (i_itemNo != fpcNm_ITEM_NONE) { + if (i_itemNo != dItemNo_NONE_e) { dComIfGs_onItemFirstBit(i_itemNo); } } @@ -1663,8 +1663,8 @@ void dScnMenu_setItem(int i_slotNo, u8 i_itemNo) { void dScnMenu_setPlayerDebugMode() { if (mDoCPd_c::isConnect(PAD_3) || !dScnMenu_setPlayerDebugModeDungeon()) { if (strcmp(dComIfGp_getNextStageName(), "D_MN05") == 0) { - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_EMPTY_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_11, dItemNo_EMPTY_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_11); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_12); dComIfGs_setRupee(0); @@ -1674,36 +1674,36 @@ void dScnMenu_setPlayerDebugMode() { strcmp(dComIfGp_getNextStageName(), "D_MN04A") == 0) { for (int i = 0x17; i >= 0; i--) { - dScnMenu_setItem(i, fpcNm_ITEM_NONE); + dScnMenu_setItem(i, dItemNo_NONE_e); } for (int i = 0; i < 0x100; i++) { dComIfGs_offItemFirstBit(i); } - dComIfGs_onItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES1); - dComIfGs_onItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES2); - dComIfGs_onItemFirstBit(fpcNm_ITEM_L2_KEY_PIECES3); - dComIfGs_onItemFirstBit(fpcNm_ITEM_LV2_BOSS_KEY); - dComIfGs_onItemFirstBit(fpcNm_ITEM_BOW); - dComIfGs_onItemFirstBit(fpcNm_ITEM_HOOKSHOT); - dComIfGs_onItemFirstBit(fpcNm_ITEM_BOOMERANG); - dComIfGs_onItemFirstBit(fpcNm_ITEM_RED_BOTTLE); - dComIfGs_onItemFirstBit(fpcNm_ITEM_OIL_BOTTLE); - dComIfGs_onItemFirstBit(fpcNm_ITEM_FAIRY); - dComIfGs_onItemFirstBit(fpcNm_ITEM_KANTERA); - dComIfGs_onItemFirstBit(fpcNm_ITEM_PACHINKO); - dComIfGs_onItemFirstBit(fpcNm_ITEM_HVY_BOOTS); - - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_13, fpcNm_ITEM_FAIRY); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_OIL_BOTTLE); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_RED_BOTTLE); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); + dComIfGs_onItemFirstBit(dItemNo_L2_KEY_PIECES1_e); + dComIfGs_onItemFirstBit(dItemNo_L2_KEY_PIECES2_e); + dComIfGs_onItemFirstBit(dItemNo_L2_KEY_PIECES3_e); + dComIfGs_onItemFirstBit(dItemNo_LV2_BOSS_KEY_e); + dComIfGs_onItemFirstBit(dItemNo_BOW_e); + dComIfGs_onItemFirstBit(dItemNo_HOOKSHOT_e); + dComIfGs_onItemFirstBit(dItemNo_BOOMERANG_e); + dComIfGs_onItemFirstBit(dItemNo_RED_BOTTLE_e); + dComIfGs_onItemFirstBit(dItemNo_OIL_BOTTLE_e); + dComIfGs_onItemFirstBit(dItemNo_FAIRY_e); + dComIfGs_onItemFirstBit(dItemNo_KANTERA_e); + dComIfGs_onItemFirstBit(dItemNo_PACHINKO_e); + dComIfGs_onItemFirstBit(dItemNo_HVY_BOOTS_e); + + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_13, dItemNo_FAIRY_e); + dScnMenu_setItem(SLOT_12, dItemNo_OIL_BOTTLE_e); + dScnMenu_setItem(SLOT_11, dItemNo_RED_BOTTLE_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); dComIfGs_setMixItemIndex(SELECT_ITEM_X, 0xFF); dComIfGs_setMixItemIndex(SELECT_ITEM_Y, 0xFF); @@ -1731,15 +1731,15 @@ void dScnMenu_setPlayerDebugMode() { dMeter2Info_onTempBit(0); } } else if (strcmp(dComIfGp_getNextStageName(), "R_SP107") == 0) { - dMeter2Info_setSword(fpcNm_ITEM_NONE, false); - dMeter2Info_setShield(fpcNm_ITEM_NONE, false); + dMeter2Info_setSword(dItemNo_NONE_e, false); + dMeter2Info_setShield(dItemNo_NONE_e, false); } else if (dMeter2Info_isNextStage("F_SP102", 0, 0, 0) == 0) { if (strcmp(dComIfGp_getNextStageName(), "D_MN01A") == 0) { - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_9); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_3); - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_ZORA, false); + dMeter2Info_setCloth(dItemNo_WEAR_ZORA_e, false); } } } @@ -1747,23 +1747,23 @@ void dScnMenu_setPlayerDebugMode() { void dScnMenu_setPlayerItemReset() { for (int i = 23; i >= 0; i--) { - dScnMenu_setItem(i, fpcNm_ITEM_NONE); + dScnMenu_setItem(i, dItemNo_NONE_e); } for (int i = 0; i < 0x100; i++) { dComIfGs_offItemFirstBit(i); } - dComIfGs_onItemFirstBit(fpcNm_ITEM_SWORD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_MASTER_SWORD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_WOOD_STICK); - dComIfGs_offItemFirstBit(fpcNm_ITEM_LIGHT_SWORD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_SHIELD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_WEAR_CASUAL); - dComIfGs_onItemFirstBit(fpcNm_ITEM_WEAR_KOKIRI); - dComIfGs_onItemFirstBit(fpcNm_ITEM_ARMOR); - dComIfGs_onItemFirstBit(fpcNm_ITEM_WEAR_ZORA); + dComIfGs_onItemFirstBit(dItemNo_SWORD_e); + dComIfGs_onItemFirstBit(dItemNo_MASTER_SWORD_e); + dComIfGs_onItemFirstBit(dItemNo_WOOD_STICK_e); + dComIfGs_offItemFirstBit(dItemNo_LIGHT_SWORD_e); + dComIfGs_onItemFirstBit(dItemNo_SHIELD_e); + dComIfGs_onItemFirstBit(dItemNo_HYLIA_SHIELD_e); + dComIfGs_onItemFirstBit(dItemNo_WEAR_CASUAL_e); + dComIfGs_onItemFirstBit(dItemNo_WEAR_KOKIRI_e); + dComIfGs_onItemFirstBit(dItemNo_ARMOR_e); + dComIfGs_onItemFirstBit(dItemNo_WEAR_ZORA_e); dComIfGs_setMixItemIndex(SELECT_ITEM_X, 0xFF); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, 0xFF); @@ -1778,10 +1778,10 @@ void dScnMenu_setPlayerItemReset() { bool dScnMenu_setPlayerDebugModeDungeon() { if (strcmp(dComIfGp_getNextStageName(), "D_MN05") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_OIL_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_11, dItemNo_OIL_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_11); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_12); dComIfGs_setMaxLife(20); @@ -1792,14 +1792,14 @@ bool dScnMenu_setPlayerDebugModeDungeon() { strcmp(dComIfGp_getNextStageName(), "D_MN04A") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_OIL_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_OIL_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, 0); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, 3); dComIfGs_setMaxLife(25); @@ -1813,15 +1813,15 @@ bool dScnMenu_setPlayerDebugModeDungeon() { strcmp(dComIfGp_getNextStageName(), "D_MN01B") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_OIL_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_OIL_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_16); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_3); dComIfGs_setMaxLife(30); @@ -1836,16 +1836,16 @@ bool dScnMenu_setPlayerDebugModeDungeon() { strcmp(dComIfGp_getNextStageName(), "D_MN10B") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_GREEN_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_GREEN_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_9); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_4); dComIfGs_setMaxLife(40); @@ -1860,17 +1860,17 @@ bool dScnMenu_setPlayerDebugModeDungeon() { strcmp(dComIfGp_getNextStageName(), "D_MN11B") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_2, fpcNm_ITEM_SPINNER); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_GREEN_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_2, dItemNo_SPINNER_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_GREEN_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_2); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_12); dComIfGs_setMaxLife(45); @@ -1884,18 +1884,18 @@ bool dScnMenu_setPlayerDebugModeDungeon() { strcmp(dComIfGp_getNextStageName(), "T_MN06") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_2, fpcNm_ITEM_SPINNER); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_6, fpcNm_ITEM_IRONBALL); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_FAIRY); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_2, dItemNo_SPINNER_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_6, dItemNo_IRONBALL_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_FAIRY_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_6); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_12); dComIfGs_setMaxLife(50); @@ -1909,19 +1909,19 @@ bool dScnMenu_setPlayerDebugModeDungeon() { strcmp(dComIfGp_getNextStageName(), "T_MN07") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_2, fpcNm_ITEM_SPINNER); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_6, fpcNm_ITEM_IRONBALL); - dScnMenu_setItem(SLOT_8, fpcNm_ITEM_COPY_ROD); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_GREEN_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_2, dItemNo_SPINNER_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_6, dItemNo_IRONBALL_e); + dScnMenu_setItem(SLOT_8, dItemNo_COPY_ROD_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_GREEN_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_8); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_12); dComIfGs_setMaxLife(55); @@ -1933,20 +1933,20 @@ bool dScnMenu_setPlayerDebugModeDungeon() { dComIfGs_setBombNum(1, 15); } else if (strcmp(dComIfGp_getNextStageName(), "D_MN08") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_2, fpcNm_ITEM_SPINNER); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_6, fpcNm_ITEM_IRONBALL); - dScnMenu_setItem(SLOT_8, fpcNm_ITEM_COPY_ROD); - dScnMenu_setItem(SLOT_10, fpcNm_ITEM_W_HOOKSHOT); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_BLUE_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_2, dItemNo_SPINNER_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_6, dItemNo_IRONBALL_e); + dScnMenu_setItem(SLOT_8, dItemNo_COPY_ROD_e); + dScnMenu_setItem(SLOT_10, dItemNo_W_HOOKSHOT_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_BLUE_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_10); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_11); dComIfGs_setMaxLife(65); @@ -1958,20 +1958,20 @@ bool dScnMenu_setPlayerDebugModeDungeon() { dComIfGs_setBombNum(1, 15); } else if (strcmp(dComIfGp_getNextStageName(), "D_MN09") == 0) { dScnMenu_setPlayerItemReset(); - dScnMenu_setItem(SLOT_0, fpcNm_ITEM_BOOMERANG); - dScnMenu_setItem(SLOT_1, fpcNm_ITEM_KANTERA); - dScnMenu_setItem(SLOT_23, fpcNm_ITEM_PACHINKO); - dScnMenu_setItem(SLOT_2, fpcNm_ITEM_SPINNER); - dScnMenu_setItem(SLOT_3, fpcNm_ITEM_HVY_BOOTS); - dScnMenu_setItem(SLOT_4, fpcNm_ITEM_BOW); - dScnMenu_setItem(SLOT_9, fpcNm_ITEM_HOOKSHOT); - dScnMenu_setItem(SLOT_6, fpcNm_ITEM_IRONBALL); - dScnMenu_setItem(SLOT_8, fpcNm_ITEM_COPY_ROD); - dScnMenu_setItem(SLOT_10, fpcNm_ITEM_W_HOOKSHOT); - dScnMenu_setItem(SLOT_15, fpcNm_ITEM_NORMAL_BOMB); - dScnMenu_setItem(SLOT_16, fpcNm_ITEM_WATER_BOMB); - dScnMenu_setItem(SLOT_11, fpcNm_ITEM_BLUE_BOTTLE); - dScnMenu_setItem(SLOT_12, fpcNm_ITEM_RED_BOTTLE); + dScnMenu_setItem(SLOT_0, dItemNo_BOOMERANG_e); + dScnMenu_setItem(SLOT_1, dItemNo_KANTERA_e); + dScnMenu_setItem(SLOT_23, dItemNo_PACHINKO_e); + dScnMenu_setItem(SLOT_2, dItemNo_SPINNER_e); + dScnMenu_setItem(SLOT_3, dItemNo_HVY_BOOTS_e); + dScnMenu_setItem(SLOT_4, dItemNo_BOW_e); + dScnMenu_setItem(SLOT_9, dItemNo_HOOKSHOT_e); + dScnMenu_setItem(SLOT_6, dItemNo_IRONBALL_e); + dScnMenu_setItem(SLOT_8, dItemNo_COPY_ROD_e); + dScnMenu_setItem(SLOT_10, dItemNo_W_HOOKSHOT_e); + dScnMenu_setItem(SLOT_15, dItemNo_NORMAL_BOMB_e); + dScnMenu_setItem(SLOT_16, dItemNo_WATER_BOMB_e); + dScnMenu_setItem(SLOT_11, dItemNo_BLUE_BOTTLE_e); + dScnMenu_setItem(SLOT_12, dItemNo_RED_BOTTLE_e); dComIfGs_setSelectItemIndex(SELECT_ITEM_X, SLOT_4); dComIfGs_setSelectItemIndex(SELECT_ITEM_Y, SLOT_12); dComIfGs_setMaxLife(75); @@ -2005,28 +2005,28 @@ static scene_method_class l_dScnMenu_Method = { }; scene_process_profile_definition g_profile_MENU_SCENE = { - fpcLy_ROOT_e, // mLayerID - 1, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MENU_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - sizeof(dScnMenu_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - &l_dScnMenu_Method, // mpMtd + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MENU_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(dScnMenu_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnMenu_Method, }; #else scene_process_profile_definition g_profile_MENU_SCENE = { - fpcLy_ROOT_e, // mLayerID - 1, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_MENU_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - 0, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - NULL, // mpMtd + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_MENU_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ 0, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ NULL, }; #endif diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index fd240538d17..59d1c81974f 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -86,7 +86,7 @@ s32 dScnName_c::create() { dFs_c->_create(); - if (fpcM_GetName(this) == PROC_NAME_SCENE) { + if (fpcM_GetName(this) == fpcNm_NAME_SCENE_e) { dFs_c->setUseType(0); #if !PLATFORM_SHIELD @@ -193,7 +193,7 @@ static void setBaseCsrColor(int i_no) { #if VERSION == VERSION_GCN_PAL void dScnName_c::bmg_data_set() { - if (fopAcM_GetName(this) == PROC_NAMEEX_SCENE) { + if (fopAcM_GetName(this) == fpcNm_NAMEEX_SCENE_e) { mBmgStatus = 10; } } @@ -220,7 +220,7 @@ s32 dScnName_c::execute() { #if DEBUG if (!fopOvlpM_IsPeek() && dComIfG_isSceneResetButton()) { - fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 5); + fopScnM_ChangeReq(this, fpcNm_MENU_SCENE_e, 0, 5); dComIfGs_init(); dComIfG_playerStatusD(); } @@ -285,7 +285,7 @@ void dScnName_c::FileSelectOpen() { void dScnName_c::FileSelectMain() { dFs_c->_move(); - if (fpcM_GetName(this) == PROC_NAME_SCENE) { + if (fpcM_GetName(this) == fpcNm_NAME_SCENE_e) { FileSelectMainNormal(); } } @@ -336,13 +336,13 @@ void dScnName_c::brightCheck() { mProc = dScnName_PROC_ChangeGameScene; // Reset rupee "first-time collection" flags so the collection cutscene will play again - dComIfGs_offItemFirstBit(fpcNm_ITEM_GREEN_RUPEE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_BLUE_RUPEE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_YELLOW_RUPEE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_RED_RUPEE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_PURPLE_RUPEE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_ORANGE_RUPEE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SILVER_RUPEE); + dComIfGs_offItemFirstBit(dItemNo_GREEN_RUPEE_e); + dComIfGs_offItemFirstBit(dItemNo_BLUE_RUPEE_e); + dComIfGs_offItemFirstBit(dItemNo_YELLOW_RUPEE_e); + dComIfGs_offItemFirstBit(dItemNo_RED_RUPEE_e); + dComIfGs_offItemFirstBit(dItemNo_PURPLE_RUPEE_e); + dComIfGs_offItemFirstBit(dItemNo_ORANGE_RUPEE_e); + dComIfGs_offItemFirstBit(dItemNo_SILVER_RUPEE_e); } } @@ -353,7 +353,7 @@ void dScnName_c::changeGameScene() { #if DEBUG // Goto Map Select debug menu if opening File 1 with development mode on if (dFs_c->getSelectNum() == 0 && mDoMain::developmentMode) { - fopScnM_ChangeReq(this, PROC_MENU_SCENE, 0, 5); + fopScnM_ChangeReq(this, fpcNm_MENU_SCENE_e, 0, 5); dComIfGs_init(); dComIfG_playerStatusD(); return; @@ -361,9 +361,9 @@ void dScnName_c::changeGameScene() { #endif #if VERSION == VERSION_SHIELD_DEBUG - fopScnM_ChangeReq(this, PROC_PLAY_SCENE, 0, 5); + fopScnM_ChangeReq(this, fpcNm_PLAY_SCENE_e, 0, 5); #else - fopScnM_ChangeReq(this, field_0x41f == 0 ? PROC_PLAY_SCENE : PROC_PLAY_SCENE, 0, 5); + fopScnM_ChangeReq(this, field_0x41f == 0 ? fpcNm_PLAY_SCENE_e : fpcNm_PLAY_SCENE_e, 0, 5); #endif dComIfGp_offEnableNextStage(); @@ -418,29 +418,29 @@ static scene_method_class l_dScnName_Method = { }; scene_process_profile_definition g_profile_NAME_SCENE = { - fpcLy_ROOT_e, - 1, - fpcPi_CURRENT_e, - PROC_NAME_SCENE, - &g_fpcNd_Method.base, - sizeof(dScnName_c), - 0, - 0, - &g_fopScn_Method.base, - &l_dScnName_Method, - 0, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NAME_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(dScnName_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnName_Method, + 0, }; scene_process_profile_definition g_profile_NAMEEX_SCENE = { - fpcLy_ROOT_e, - 1, - fpcPi_CURRENT_e, - PROC_NAMEEX_SCENE, - &g_fpcNd_Method.base, - sizeof(dScnName_c), - 0, - 0, - &g_fopScn_Method.base, - &l_dScnName_Method, - 0, + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_NAMEEX_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(dScnName_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnName_Method, + 0, }; diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 4f3c6807f0b..869f5499b1a 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -95,7 +95,7 @@ u8 dScnPly_c::debugPause; #endif static const s16 T_JOINT_dylKeyTbl[1] = { - PROC_COW, + fpcNm_COW_e, }; static const char* T_JOINT_resName[1] = {"Always"}; @@ -461,10 +461,10 @@ static u32 l_usedMemoryBlockSize = 0xFFFFFFFF; static int checkObjectSize(void* i_process, void* i_data) { s16 profname = fpcM_GetProfName(i_process); - if (profname == PROC_BG) { + if (profname == fpcNm_BG_e) { fopAc_ac_c* actor = (fopAc_ac_c*)i_process; *((u32*)i_data) += ((l_usedMemoryBlockSize != 0 && actor->heap == NULL) ? 0 : actor->heap->getHeapSize()) + actor->base.base.profile->process_size; - } else if (profname == PROC_PLAY_SCENE || profname == PROC_ROOM_SCENE) { + } else if (profname == fpcNm_PLAY_SCENE_e || profname == fpcNm_ROOM_SCENE_e) { *((u32*)i_data) += ((base_process_class*)i_process)->profile->process_size; } else if (fopKyM_IsKy(i_process)) { *((u32*)i_data + 1) += ((base_process_class*)i_process)->profile->process_size; @@ -472,10 +472,10 @@ static int checkObjectSize(void* i_process, void* i_data) { fopAc_ac_c* actor = (fopAc_ac_c*)i_process; *((u32*)i_data + 1) += (actor->heap == NULL ? 0 : actor->heap->getHeapSize()) + actor->base.base.profile->process_size; - if (profname == PROC_ALINK) { + if (profname == fpcNm_ALINK_e) { daAlink_c* alink = (daAlink_c*)actor; *((u32*)i_data + 1) += alink->getOtherHeapSize(); - } else if (profname == PROC_MIDNA) { + } else if (profname == fpcNm_MIDNA_e) { daMidna_c* midna = (daMidna_c*)actor; *((u32*)i_data + 1) += midna->getOtherHeapSize(); } @@ -562,7 +562,7 @@ static int dScnPly_Draw(dScnPly_c* i_this) { } #endif - int rt = fopScnM_ChangeReq(i_this, PROC_PLAY_SCENE, l_wipeType[wipe], 5); + int rt = fopScnM_ChangeReq(i_this, fpcNm_PLAY_SCENE_e, l_wipeType[wipe], 5); int hour = dKy_getdaytime_hour(); BOOL isDaytime = (hour >= 6 && hour < 18) ? FALSE : TRUE; @@ -593,7 +593,7 @@ static int dScnPly_Draw(dScnPly_c* i_this) { && !fapGm_HIO_c::isCaptureScreen() #endif ) { - if (fpcM_GetName(i_this) == PROC_PLAY_SCENE) { + if (fpcM_GetName(i_this) == fpcNm_PLAY_SCENE_e) { dComIfGp_getVibration().Run(); } daSus_c::execute(); @@ -630,10 +630,10 @@ static int dScnPly_Draw(dScnPly_c* i_this) { spA = 7; } - fopScnM_ChangeReq(i_this, PROC_MENU_SCENE, spA, 5); + fopScnM_ChangeReq(i_this, fpcNm_MENU_SCENE_e, spA, 5); mDoAud_bgmStop(30); - if (fpcM_GetName(i_this) != PROC_PLAY_SCENE) { + if (fpcM_GetName(i_this) != fpcNm_PLAY_SCENE_e) { dComIfG_playerStatusD(); } } @@ -1010,7 +1010,7 @@ static BOOL heapSizeCheck() { #endif bool dScnPly_c::resetGame() { - if (fpcM_GetName(this) == PROC_OPENING_SCENE) { + if (fpcM_GetName(this) == fpcNm_OPENING_SCENE_e) { if (!dStage_roomControl_c::resetArchiveBank(0)) { return false; } @@ -1135,7 +1135,7 @@ static int phase_1(dScnPly_c* i_this) { dComIfGp_getStartStagePoint() == 3) { dComIfGs_onDarkClearLV(0); - execItemGet(fpcNm_ITEM_WEAR_KOKIRI); + execItemGet(dItemNo_WEAR_KOKIRI_e); } // Stage: Kakariko Village, Room: Kakariko Village else if (!strcmp(dComIfGp_getStartStageName(), "F_SP109") && @@ -1160,8 +1160,8 @@ static int phase_1(dScnPly_c* i_this) { if (!strcmp(dComIfGp_getStartStageName(), "F_SP104") && dComIfGp_getStartStageRoomNo() == 1 && dComIfGp_getStartStagePoint() == 23 && dComIfGp_getStartStageLayer() == 12) { - dComIfGs_onItemFirstBit(fpcNm_ITEM_HORSE_FLUTE); - dComIfGs_setItem(SLOT_21, fpcNm_ITEM_HORSE_FLUTE); + dComIfGs_onItemFirstBit(dItemNo_HORSE_FLUTE_e); + dComIfGs_setItem(SLOT_21, dItemNo_HORSE_FLUTE_e); } if ((u8)dKy_darkworld_stage_check(dComIfGp_getStartStageName(), @@ -1426,17 +1426,17 @@ static int phase_4(dScnPly_c* i_this) { JUT_ASSERT(2709, heap2 != NULL); dComIfGp_setMsgExpHeap(heap2); - if (fpcM_GetName(i_this) == PROC_OPENING_SCENE) { - fopAcM_create(PROC_TITLE, 0, NULL, -1, NULL, NULL, -1); + if (fpcM_GetName(i_this) == fpcNm_OPENING_SCENE_e) { + fopAcM_create(fpcNm_TITLE_e, 0, NULL, -1, NULL, NULL, -1); #if DEBUG g_playerKind = 0; #endif dComIfGs_init(); dComIfGs_setOptPointer(0); dComIfGs_setLife(12); - dMeter2Info_setCloth(fpcNm_ITEM_WEAR_KOKIRI, false); - dMeter2Info_setSword(fpcNm_ITEM_SWORD, false); - dMeter2Info_setShield(fpcNm_ITEM_HYLIA_SHIELD, false); + dMeter2Info_setCloth(dItemNo_WEAR_KOKIRI_e, false); + dMeter2Info_setSword(dItemNo_SWORD_e, false); + dMeter2Info_setShield(dItemNo_HYLIA_SHIELD_e, false); dComIfGs_onEventBit(0x0601); // Epona Tamed } @@ -1590,27 +1590,27 @@ static scene_method_class l_dScnPly_Method = { }; scene_process_profile_definition g_profile_PLAY_SCENE = { - fpcLy_ROOT_e, // mLayerID - 1, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_PLAY_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - sizeof(dScnPly_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - &l_dScnPly_Method, // mpMtd + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_PLAY_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(dScnPly_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnPly_Method, }; scene_process_profile_definition g_profile_OPENING_SCENE = { - fpcLy_ROOT_e, // mLayerID - 1, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OPENING_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - sizeof(dScnPly_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - &l_dScnPly_Method, // mpMtd + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_OPENING_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(dScnPly_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnPly_Method, }; diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 3b171087ae6..dcedfe3dc3c 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -120,7 +120,7 @@ static bool setArchiveBank(int i_roomNo) { } static int objectDeleteJugge(void* i_process, void* i_data) { - if (fpcM_GetProfName(i_process) != PROC_BG) { + if (fpcM_GetProfName(i_process) != fpcNm_BG_e) { if (fopAcM_IsActor(i_process)) { #if DEBUG char namebuf[16]; @@ -230,7 +230,7 @@ static bool objectSetCheck(room_of_scene_class* i_this) { } } - fopAcM_create(PROC_BG, roomNo, NULL, -1, NULL, NULL, -1); + fopAcM_create(fpcNm_BG_e, roomNo, NULL, -1, NULL, NULL, -1); dComIfGp_getPEvtManager()->demoInit(); dComIfGp_getPEvtManager()->roomInit(roomNo); dStage_dt_c_roomReLoader(i_this->roomInfo, i_this->roomDt, roomNo); @@ -509,14 +509,14 @@ static scene_method_class l_dScnRoom_Method = { }; scene_process_profile_definition g_profile_ROOM_SCENE = { - fpcLy_CURRENT_e, // mLayerID - 0, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_ROOM_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - sizeof(room_of_scene_class), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - &l_dScnRoom_Method, // mpMtd + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 0, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_ROOM_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ sizeof(room_of_scene_class), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ &l_dScnRoom_Method, }; diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index cf91ed7b17b..16a29a437e0 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -10,27 +10,27 @@ #include "f_pc/f_pc_leaf.h" scene_process_profile_definition g_profile_WARNING_SCENE = { - fpcLy_ROOT_e, // mLayerID - 1, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_WARNING_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - 0x204, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - NULL, // mpMtd + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WARNING_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ 0x204, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ NULL, }; scene_process_profile_definition g_profile_WARNING2_SCENE = { - fpcLy_ROOT_e, // mLayerID - 1, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_WARNING2_SCENE, // mProcName - &g_fpcNd_Method.base, // sub_method - 0x204, // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopScn_Method.base, // sub_method - NULL, // mpMtd + /* Layer ID */ fpcLy_ROOT_e, + /* List ID */ 1, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_WARNING2_SCENE_e, + /* Proc SubMtd */ &g_fpcNd_Method.base, + /* Size */ 0x204, + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopScn_Method.base, + /* Scene SubMtd */ NULL, }; diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 01bdb19ddfb..52daf21404b 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -27,12 +27,12 @@ static u8 dSv_item_rename(u8 i_itemNo) { switch (i_itemNo) { - case fpcNm_ITEM_OIL_BOTTLE_2: - return fpcNm_ITEM_OIL_BOTTLE; - case fpcNm_ITEM_RED_BOTTLE_2: - return fpcNm_ITEM_RED_BOTTLE; - case fpcNm_ITEM_OIL2: - return fpcNm_ITEM_OIL; + case dItemNo_OIL_BOTTLE_2_e: + return dItemNo_OIL_BOTTLE_e; + case dItemNo_RED_BOTTLE_2_e: + return dItemNo_RED_BOTTLE_e; + case dItemNo_OIL2_e: + return dItemNo_OIL_e; default: return i_itemNo; } @@ -56,11 +56,11 @@ void dSv_player_status_a_c::init() { mSelectEquip[i] = 0; } - mSelectEquip[COLLECT_CLOTHING] = fpcNm_ITEM_WEAR_CASUAL; - mSelectEquip[COLLECT_SWORD] = fpcNm_ITEM_NONE; - mSelectEquip[COLLECT_SHIELD] = fpcNm_ITEM_NONE; - mSelectEquip[COLLECT_SMELL] = fpcNm_ITEM_NONE; - mSelectEquip[B_BUTTON_ITEM] = fpcNm_ITEM_NONE; + mSelectEquip[COLLECT_CLOTHING] = dItemNo_WEAR_CASUAL_e; + mSelectEquip[COLLECT_SWORD] = dItemNo_NONE_e; + mSelectEquip[COLLECT_SHIELD] = dItemNo_NONE_e; + mSelectEquip[COLLECT_SMELL] = dItemNo_NONE_e; + mSelectEquip[B_BUTTON_ITEM] = dItemNo_NONE_e; mWalletSize = WALLET; mMaxMagic = 0; mMagic = 0; @@ -293,8 +293,8 @@ void dSv_player_last_mark_info_c::setWarpItemData(const char* i_name, const cXyz void dSv_player_item_c::init() { for (int i = 0; i < MAX_ITEM_SLOTS; i++) { - mItems[i] = fpcNm_ITEM_NONE; - mItemSlots[i] = fpcNm_ITEM_NONE; + mItems[i] = dItemNo_NONE_e; + mItemSlots[i] = dItemNo_NONE_e; } } @@ -316,51 +316,51 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { if (i_checkCombo) { for (int i = 0; i < SELECT_ITEM_NUM; i++) { if ((i_slotNo == dComIfGs_getSelectItemIndex(i) || i_slotNo == dComIfGs_getMixItemIndex(i)) && - dComIfGs_getMixItemIndex(i) != fpcNm_ITEM_NONE) + dComIfGs_getMixItemIndex(i) != dItemNo_NONE_e) { u8 select_item = mItems[dComIfGs_getSelectItemIndex(i)]; u8 mix_item = mItems[dComIfGs_getMixItemIndex(i)]; // Get Bomb arrow check: Bow + Normal Bombs - if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_NORMAL_BOMB) || - (mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_NORMAL_BOMB)) { - return fpcNm_ITEM_BOMB_ARROW; + if ((select_item == dItemNo_BOW_e && mix_item == dItemNo_NORMAL_BOMB_e) || + (mix_item == dItemNo_BOW_e && select_item == dItemNo_NORMAL_BOMB_e)) { + return dItemNo_BOMB_ARROW_e; } // Get Bomb arrow check: Bow + Water Bombs - if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_WATER_BOMB) || - (mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_WATER_BOMB)) { - return fpcNm_ITEM_BOMB_ARROW; + if ((select_item == dItemNo_BOW_e && mix_item == dItemNo_WATER_BOMB_e) || + (mix_item == dItemNo_BOW_e && select_item == dItemNo_WATER_BOMB_e)) { + return dItemNo_BOMB_ARROW_e; } // Get Bomb arrow check: Bow + Bomblings - if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_POKE_BOMB) || - (mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_POKE_BOMB)) { - return fpcNm_ITEM_BOMB_ARROW; + if ((select_item == dItemNo_BOW_e && mix_item == dItemNo_POKE_BOMB_e) || + (mix_item == dItemNo_BOW_e && select_item == dItemNo_POKE_BOMB_e)) { + return dItemNo_BOMB_ARROW_e; } // Get Hawkeye check - if ((select_item == fpcNm_ITEM_BOW && mix_item == fpcNm_ITEM_HAWK_EYE) || - (mix_item == fpcNm_ITEM_BOW && select_item == fpcNm_ITEM_HAWK_EYE)) { - return fpcNm_ITEM_HAWK_ARROW; + if ((select_item == dItemNo_BOW_e && mix_item == dItemNo_HAWK_EYE_e) || + (mix_item == dItemNo_BOW_e && select_item == dItemNo_HAWK_EYE_e)) { + return dItemNo_HAWK_ARROW_e; } // Get Rod w/ bee larva - if ((select_item == fpcNm_ITEM_FISHING_ROD_1 && mix_item == fpcNm_ITEM_BEE_CHILD) || - (mix_item == fpcNm_ITEM_FISHING_ROD_1 && select_item == fpcNm_ITEM_BEE_CHILD)) { - return fpcNm_ITEM_BEE_ROD; + if ((select_item == dItemNo_FISHING_ROD_1_e && mix_item == dItemNo_BEE_CHILD_e) || + (mix_item == dItemNo_FISHING_ROD_1_e && select_item == dItemNo_BEE_CHILD_e)) { + return dItemNo_BEE_ROD_e; } // Get Rod w/ coral earring - if ((select_item == fpcNm_ITEM_FISHING_ROD_1 && mix_item == fpcNm_ITEM_ZORAS_JEWEL) || - (mix_item == fpcNm_ITEM_FISHING_ROD_1 && select_item == fpcNm_ITEM_ZORAS_JEWEL)) { - return fpcNm_ITEM_JEWEL_ROD; + if ((select_item == dItemNo_FISHING_ROD_1_e && mix_item == dItemNo_ZORAS_JEWEL_e) || + (mix_item == dItemNo_FISHING_ROD_1_e && select_item == dItemNo_ZORAS_JEWEL_e)) { + return dItemNo_JEWEL_ROD_e; } // Get Rod w/ worm - if ((select_item == fpcNm_ITEM_FISHING_ROD_1 && mix_item == fpcNm_ITEM_WORM) || - (mix_item == fpcNm_ITEM_FISHING_ROD_1 && select_item == fpcNm_ITEM_WORM)) { - return fpcNm_ITEM_WORM_ROD; + if ((select_item == dItemNo_FISHING_ROD_1_e && mix_item == dItemNo_WORM_e) || + (mix_item == dItemNo_FISHING_ROD_1_e && select_item == dItemNo_WORM_e)) { + return dItemNo_WORM_ROD_e; } // This block will only run on the Wii version @@ -370,9 +370,9 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { if (dComIfGs_getSelectItemIndex(i) == 0 && dComIfGs_getMixItemIndex(i) == 0) { - dComIfGs_setSelectItemIndex(i, fpcNm_ITEM_NONE); - dComIfGs_setMixItemIndex(i, fpcNm_ITEM_NONE); - return fpcNm_ITEM_NONE; + dComIfGs_setSelectItemIndex(i, dItemNo_NONE_e); + dComIfGs_setMixItemIndex(i, dItemNo_NONE_e); + return dItemNo_NONE_e; } } // Uncertain combination item＝＝＝＞%d, %d\n @@ -384,7 +384,7 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { return mItems[i_slotNo]; } - return fpcNm_ITEM_NONE; + return dItemNo_NONE_e; } void dSv_player_item_c::setLineUpItem() { @@ -398,12 +398,12 @@ void dSv_player_item_c::setLineUpItem() { int slot_idx = 0; for (int i = 0; i < 24; i++) { - mItemSlots[i] = fpcNm_ITEM_NONE; + mItemSlots[i] = dItemNo_NONE_e; } for (int i = 0; i < 23; i++) { u8 current = i_item_lst[i]; - if (mItems[current] != fpcNm_ITEM_NONE) { + if (mItems[current] != dItemNo_NONE_e) { mItemSlots[slot_idx] = current; slot_idx++; } @@ -415,7 +415,7 @@ u8 dSv_player_item_c::getLineUpItem(int i_slotNo) const { return mItemSlots[i_slotNo]; } - return fpcNm_ITEM_NONE; + return dItemNo_NONE_e; } void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) { @@ -425,7 +425,7 @@ void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) { for (int i = 0; i < 4; i++) { if (curItemIn == mItems[i + SLOT_11]) { setItem(i + SLOT_11, newItemIn); - if (newItemIn == fpcNm_ITEM_HOT_SPRING) { + if (newItemIn == dItemNo_HOT_SPRING_e) { dMeter2Info_setHotSpringTimer(i + SLOT_11); } @@ -441,13 +441,13 @@ void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) { void dSv_player_item_c::setEmptyBottleItemIn(u8 i_itemNo) { i_itemNo = dSv_item_rename(i_itemNo); - setBottleItemIn(fpcNm_ITEM_EMPTY_BOTTLE, i_itemNo); + setBottleItemIn(dItemNo_EMPTY_BOTTLE_e, i_itemNo); } void dSv_player_item_c::setEmptyBottle() { for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_NONE) { - dComIfGs_setItem((u8)(i + SLOT_11), fpcNm_ITEM_EMPTY_BOTTLE); + if (dComIfGs_getItem((u8)(i + SLOT_11), true) == dItemNo_NONE_e) { + dComIfGs_setItem((u8)(i + SLOT_11), dItemNo_EMPTY_BOTTLE_e); return; } } @@ -455,7 +455,7 @@ void dSv_player_item_c::setEmptyBottle() { void dSv_player_item_c::setEmptyBottle(u8 i_itemNo) { for (int i = 0; i < 4; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_NONE) { + if (dComIfGs_getItem((u8)(i + SLOT_11), true) == dItemNo_NONE_e) { dComIfGs_setItem((u8)(i + SLOT_11), i_itemNo); return; } @@ -467,7 +467,7 @@ void dSv_player_item_c::setEquipBottleItemIn(u8 curItemIn, u8 newItemIn) { if (dComIfGs_getSelectItemIndex(curItemIn) >= SLOT_11 && dComIfGs_getSelectItemIndex(curItemIn) <= SLOT_14) { - if (newItemIn == fpcNm_ITEM_HOT_SPRING) { + if (newItemIn == dItemNo_HOT_SPRING_e) { dMeter2Info_setHotSpringTimer(dComIfGs_getSelectItemIndex(curItemIn)); } @@ -479,7 +479,7 @@ void dSv_player_item_c::setEquipBottleItemIn(u8 curItemIn, u8 newItemIn) { } void dSv_player_item_c::setEquipBottleItemEmpty(u8 curItemIn) { - setEquipBottleItemIn(curItemIn, fpcNm_ITEM_EMPTY_BOTTLE); + setEquipBottleItemIn(curItemIn, dItemNo_EMPTY_BOTTLE_e); } u8 dSv_player_item_c::checkBottle(u8 i_itemNo) { @@ -496,7 +496,7 @@ u8 dSv_player_item_c::checkBottle(u8 i_itemNo) { BOOL dSv_player_item_c::checkInsectBottle() { for (int i = 0; i < 24; i++) { - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_M_BEETLE + i) && + if (dComIfGs_isItemFirstBit(dItemNo_M_BEETLE_e + i) && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[0x191 + i])) { return TRUE; } @@ -508,7 +508,7 @@ u8 dSv_player_item_c::checkEmptyBottle() { u8 bottleNum = 0; for (int i = 0; i < BOTTLE_MAX; i++) { - if (mItems[i + SLOT_11] == fpcNm_ITEM_EMPTY_BOTTLE) { + if (mItems[i + SLOT_11] == dItemNo_EMPTY_BOTTLE_e) { bottleNum++; } } @@ -520,7 +520,7 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, bool i_setN if (i_curBomb == mItems[i + SLOT_15]) { setItem(i + SLOT_15, i_newBomb); - if (i_setNum == true && i_newBomb != fpcNm_ITEM_BOMB_BAG_LV1) { + if (i_setNum == true && i_newBomb != dItemNo_BOMB_BAG_LV1_e) { dComIfGs_setBombNum(i, dComIfGs_getBombMax(i_newBomb)); } @@ -539,7 +539,7 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNu if (i_curBomb == mItems[i + SLOT_15]) { setItem(i + SLOT_15, i_newBomb); - if (i_setNum == 1 && i_newBomb != fpcNm_ITEM_BOMB_BAG_LV1) { + if (i_setNum == 1 && i_newBomb != dItemNo_BOMB_BAG_LV1_e) { if (i_bombNum > dComIfGs_getBombMax(i_newBomb)) { i_bombNum = dComIfGs_getBombMax(i_newBomb); } @@ -557,17 +557,17 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNu } void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, bool i_setNum) { - setBombBagItemIn(fpcNm_ITEM_BOMB_BAG_LV1, i_newBomb, i_setNum); + setBombBagItemIn(dItemNo_BOMB_BAG_LV1_e, i_newBomb, i_setNum); } void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, u8 i_bombNum, bool i_setNum) { - setBombBagItemIn(fpcNm_ITEM_BOMB_BAG_LV1, i_newBomb, i_bombNum, i_setNum); + setBombBagItemIn(dItemNo_BOMB_BAG_LV1_e, i_newBomb, i_bombNum, i_setNum); } void dSv_player_item_c::setEmptyBombBag() { for (int i = 0; i < 3; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_15), true) == fpcNm_ITEM_NONE) { - dComIfGs_setItem((u8)(i + SLOT_15), fpcNm_ITEM_BOMB_BAG_LV1); + if (dComIfGs_getItem((u8)(i + SLOT_15), true) == dItemNo_NONE_e) { + dComIfGs_setItem((u8)(i + SLOT_15), dItemNo_BOMB_BAG_LV1_e); return; } } @@ -575,10 +575,10 @@ void dSv_player_item_c::setEmptyBombBag() { void dSv_player_item_c::setEmptyBombBag(u8 i_newBomb, u8 i_bombNum) { for (int i = 0; i < 3; i++) { - if (dComIfGs_getItem((u8)(i + SLOT_15), true) == fpcNm_ITEM_NONE) { + if (dComIfGs_getItem((u8)(i + SLOT_15), true) == dItemNo_NONE_e) { dComIfGs_setItem((u8)(i + SLOT_15), i_newBomb); - if (i_newBomb != fpcNm_ITEM_BOMB_BAG_LV1) { + if (i_newBomb != dItemNo_BOMB_BAG_LV1_e) { if (i_bombNum > dComIfGs_getBombMax(i_newBomb)) { i_bombNum = dComIfGs_getBombMax(i_newBomb); } @@ -614,16 +614,16 @@ void dSv_player_item_c::setWarashibeItem(u8 i_itemNo) { void dSv_player_item_c::setRodTypeLevelUp() { switch (mItems[SLOT_20]) { - case fpcNm_ITEM_BEE_ROD: { - mItems[SLOT_20] = fpcNm_ITEM_JEWEL_BEE_ROD; + case dItemNo_BEE_ROD_e: { + mItems[SLOT_20] = dItemNo_JEWEL_BEE_ROD_e; break; } - case fpcNm_ITEM_WORM_ROD: { - mItems[SLOT_20] = fpcNm_ITEM_JEWEL_WORM_ROD; + case dItemNo_WORM_ROD_e: { + mItems[SLOT_20] = dItemNo_JEWEL_WORM_ROD_e; break; } - case fpcNm_ITEM_FISHING_ROD_1: { - mItems[SLOT_20] = fpcNm_ITEM_JEWEL_ROD; + case dItemNo_FISHING_ROD_1_e: { + mItems[SLOT_20] = dItemNo_JEWEL_ROD_e; break; } } @@ -635,27 +635,27 @@ void dSv_player_item_c::setRodTypeLevelUp() { void dSv_player_item_c::setBaitItem(u8 i_itemNo) { switch (i_itemNo) { - case fpcNm_ITEM_BEE_CHILD: { - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL)) { - mItems[SLOT_20] = fpcNm_ITEM_JEWEL_BEE_ROD; + case dItemNo_BEE_CHILD_e: { + if (dComIfGs_isItemFirstBit(dItemNo_ZORAS_JEWEL_e)) { + mItems[SLOT_20] = dItemNo_JEWEL_BEE_ROD_e; } else { - mItems[SLOT_20] = fpcNm_ITEM_BEE_ROD; + mItems[SLOT_20] = dItemNo_BEE_ROD_e; } break; } - case fpcNm_ITEM_WORM: { - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL)) { - mItems[SLOT_20] = fpcNm_ITEM_JEWEL_WORM_ROD; + case dItemNo_WORM_e: { + if (dComIfGs_isItemFirstBit(dItemNo_ZORAS_JEWEL_e)) { + mItems[SLOT_20] = dItemNo_JEWEL_WORM_ROD_e; } else { - mItems[SLOT_20] = fpcNm_ITEM_WORM_ROD; + mItems[SLOT_20] = dItemNo_WORM_ROD_e; } break; } - case fpcNm_ITEM_NONE: { - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_ZORAS_JEWEL)) { - mItems[SLOT_20] = fpcNm_ITEM_JEWEL_ROD; + case dItemNo_NONE_e: { + if (dComIfGs_isItemFirstBit(dItemNo_ZORAS_JEWEL_e)) { + mItems[SLOT_20] = dItemNo_JEWEL_ROD_e; } else { - mItems[SLOT_20] = fpcNm_ITEM_FISHING_ROD_1; + mItems[SLOT_20] = dItemNo_FISHING_ROD_1_e; } break; } @@ -761,37 +761,37 @@ void dSv_player_item_max_c::init() { for (int i = 0; i < 7; i++) { mItemMax[i] = 30; } - setBombNum(fpcNm_ITEM_NORMAL_BOMB, 30); - setBombNum(fpcNm_ITEM_WATER_BOMB, 15); - setBombNum(fpcNm_ITEM_POKE_BOMB, 10); + setBombNum(dItemNo_NORMAL_BOMB_e, 30); + setBombNum(dItemNo_WATER_BOMB_e, 15); + setBombNum(dItemNo_POKE_BOMB_e, 10); mItemMax[7] = 0; } void dSv_player_item_max_c::setBombNum(u8 i_bombType, u8 i_maxNum) { switch (i_bombType) { - case fpcNm_ITEM_NORMAL_BOMB: + case dItemNo_NORMAL_BOMB_e: mItemMax[NORMAL_BOMB_MAX] = i_maxNum; return; - case fpcNm_ITEM_WATER_BOMB: + case dItemNo_WATER_BOMB_e: mItemMax[WATER_BOMB_MAX] = i_maxNum; return; - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_POKE_BOMB_e: mItemMax[POKE_BOMB_MAX] = i_maxNum; } } u8 dSv_player_item_max_c::getBombNum(u8 i_bombType) const { u8 lv_multiplier = 1; - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV2)) { + if (dComIfGs_isItemFirstBit(dItemNo_BOMB_BAG_LV2_e)) { lv_multiplier = 2; } switch (i_bombType) { - case fpcNm_ITEM_NORMAL_BOMB: + case dItemNo_NORMAL_BOMB_e: return (u8)(mItemMax[NORMAL_BOMB_MAX] * lv_multiplier); - case fpcNm_ITEM_WATER_BOMB: + case dItemNo_WATER_BOMB_e: return (u8)(mItemMax[WATER_BOMB_MAX] * lv_multiplier); - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_POKE_BOMB_e: return (u8)(mItemMax[POKE_BOMB_MAX] * lv_multiplier); default: return 0; @@ -1752,9 +1752,9 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { } // If have the lantern and Slot 1 in the item wheel is blank - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_KANTERA) && dComIfGs_getItem(SLOT_1, 1) == fpcNm_ITEM_NONE) { + if (dComIfGs_isItemFirstBit(dItemNo_KANTERA_e) && dComIfGs_getItem(SLOT_1, 1) == dItemNo_NONE_e) { // Set Slot 1 to Lantern and fetch current oil - dComIfGs_setItem(SLOT_1, fpcNm_ITEM_KANTERA); + dComIfGs_setItem(SLOT_1, dItemNo_KANTERA_e); current_lantern_oil = dComIfGs_getOil(); // Set oil to oil gauge backup @@ -1804,7 +1804,7 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { // Now that we've saved, reset slot if needed if (tmp_lantern_check == true) { - dComIfGs_setItem(SLOT_1, fpcNm_ITEM_NONE); + dComIfGs_setItem(SLOT_1, dItemNo_NONE_e); dComIfGs_setOil(current_lantern_oil); } @@ -1844,13 +1844,13 @@ int dSv_info_c::card_to_memory(char* i_cardPtr, int i_dataNum) { dComIfGs_setKeyNum(6, 0); - if (dComIfGs_getItem(SLOT_9, true) == fpcNm_ITEM_W_HOOKSHOT) { - dComIfGs_setItem(SLOT_10, fpcNm_ITEM_W_HOOKSHOT); - dComIfGs_setItem(SLOT_9, fpcNm_ITEM_NONE); + if (dComIfGs_getItem(SLOT_9, true) == dItemNo_W_HOOKSHOT_e) { + dComIfGs_setItem(SLOT_10, dItemNo_W_HOOKSHOT_e); + dComIfGs_setItem(SLOT_9, dItemNo_NONE_e); } - if (dComIfGs_getItem(SLOT_9, true) == fpcNm_ITEM_HOOKSHOT && dComIfGs_getItem(SLOT_10, true) == fpcNm_ITEM_W_HOOKSHOT) { - dComIfGs_setItem(SLOT_9, fpcNm_ITEM_NONE); + if (dComIfGs_getItem(SLOT_9, true) == dItemNo_HOOKSHOT_e && dComIfGs_getItem(SLOT_10, true) == dItemNo_W_HOOKSHOT_e) { + dComIfGs_setItem(SLOT_9, dItemNo_NONE_e); } dComIfGs_setLineUpItem(); diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp index a10ef7556e2..1c955f00763 100644 --- a/src/d/d_shop_system.cpp +++ b/src/d/d_shop_system.cpp @@ -25,7 +25,7 @@ static daTag_ShopItem_c* dShopSystem_itemActor[7] = { }; static u8 dShopSystem_itemNo[7] = { - fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, + dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e, dItemNo_NONE_e, }; static u8 dShopSystem_sellItemMax; @@ -35,7 +35,7 @@ static int dShopSystem_item_count; static u8 data_80451060; static int dShopSystem_searchItemActor(void* i_actor, void* param_1) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_SHOPITM) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_SHOPITM_e) { if ((fopAcM_GetParam(param_1) & 0xF0000000) == (fopAcM_GetParam(i_actor) & 0xF0000000) && dShopSystem_item_count < dShopSystem_sellItemMax) { @@ -54,7 +54,7 @@ static int dShopSystem_searchItemActor(void* i_actor, void* param_1) { if ((sw == 0xFF || !dComIfGs_isSaveSwitch(sw)) && (sw2 == 0xFF || dComIfGs_isSaveSwitch(sw2))) { - if (sw != 0xFF && item_no == fpcNm_ITEM_HYLIA_SHIELD && checkItemGet(item_no, true)) { + if (sw != 0xFF && item_no == dItemNo_HYLIA_SHIELD_e && checkItemGet(item_no, true)) { dComIfGs_onSaveSwitch(sw); } else { if (i_posID == 0) { @@ -82,7 +82,7 @@ static fopAc_ac_c* dShopSystem_cameraActor[2] = {NULL, NULL}; static int dShopSystem_camera_count; static int dShopSystem_searchCameraActor(void* i_actor, void* param_1) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_SHOPCAM) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_TAG_SHOPCAM_e) { if ((fopAcM_GetParam(param_1) & 0xf0000000) == (fopAcM_GetParam(i_actor) & 0xf0000000) && dShopSystem_camera_count < 2) { @@ -113,7 +113,7 @@ void dShopSystem_c::initShopSystem() { for (int i = 0; i < 7; i++) { dShopSystem_itemActor[i] = NULL; - dShopSystem_itemNo[i] = fpcNm_ITEM_NONE; + dShopSystem_itemNo[i] = dItemNo_NONE_e; } dShopSystem_item_count = 0; @@ -181,7 +181,7 @@ dShopSystem_c::~dShopSystem_c() { for (int i = 0; i < 7; i++) { dShopSystem_itemActor[i] = NULL; - dShopSystem_itemNo[i] = fpcNm_ITEM_NONE; + dShopSystem_itemNo[i] = dItemNo_NONE_e; } dShopSystem_item_count = 0; @@ -690,7 +690,7 @@ int dShopSystem_c::itemRotate() { u8 cursor_pos = mCursorPos; if (cursor_pos != 0 && mSeq != SEQ_WAIT) { - if (dShopSystem_itemNo[cursor_pos - 1] == fpcNm_ITEM_ARMOR) { + if (dShopSystem_itemNo[cursor_pos - 1] == dItemNo_ARMOR_e) { int tmp_index; if (isFlag(8) == false) { tmp_index = 0; @@ -724,7 +724,7 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { if (field_0xf60 >= 0) { local_1c.set(*param_0); - if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_OIL_BOTTLE) { + if (dShopSystem_itemNo[mCursorPos - 1] == dItemNo_OIL_BOTTLE_e) { mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mSeraShopObjZoomAngleX + -5000, isFlag(8) ? true : false); @@ -775,9 +775,9 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { g_cursorHIO.mObjZoom.z + 150.0f); } else { if (mMasterType == 5) { - if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_10 || - dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_20 || - dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_30) + if (dShopSystem_itemNo[mCursorPos - 1] == dItemNo_ARROW_10_e || + dShopSystem_itemNo[mCursorPos - 1] == dItemNo_ARROW_20_e || + dShopSystem_itemNo[mCursorPos - 1] == dItemNo_ARROW_30_e) { local_34.set(g_cursorHIO.mObjZoom.x, -50.0f + g_cursorHIO.mObjZoom.y + 5.0f, (g_cursorHIO.mObjZoom.z + 250.0f) - 60.0f); @@ -808,7 +808,7 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { u8 dvar1 = mMasterType; if (dvar1 == 1) { - if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_OIL_BOTTLE) { + if (dShopSystem_itemNo[mCursorPos - 1] == dItemNo_OIL_BOTTLE_e) { mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX + -7000, isFlag(8) ? true : false); @@ -817,7 +817,7 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { isFlag(8) ? true : false); } } else if (dvar1 == 2) { - if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_RED_BOTTLE) { + if (dShopSystem_itemNo[mCursorPos - 1] == dItemNo_RED_BOTTLE_e) { mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 3000, isFlag(8) ? true : false); } else { @@ -825,9 +825,9 @@ int dShopSystem_c::itemZoom(cXyz* param_0) { isFlag(8) ? true : false); } } else if (dvar1 == 5) { - if (dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_10 || - dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_20 || - dShopSystem_itemNo[mCursorPos - 1] == fpcNm_ITEM_ARROW_30) + if (dShopSystem_itemNo[mCursorPos - 1] == dItemNo_ARROW_10_e || + dShopSystem_itemNo[mCursorPos - 1] == dItemNo_ARROW_20_e || + dShopSystem_itemNo[mCursorPos - 1] == dItemNo_ARROW_30_e) { mItemCtrl.setZoomAnime(mCursorPos, &local_1c, g_cursorHIO.mShopObjZoomAngleX - 4000, isFlag(8) ? true : false); @@ -1297,7 +1297,7 @@ static shop_item_data* shop_item_pos_data_tbl = &item_seira_shop; void dShopSystem_c::createShopItem(int itemType) { static const u8 item_no[6] = { - fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_BEE_CHILD, fpcNm_ITEM_PACHINKO, fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_BEE_CHILD, fpcNm_ITEM_NONE, + dItemNo_MILK_BOTTLE_e, dItemNo_BEE_CHILD_e, dItemNo_PACHINKO_e, dItemNo_MILK_BOTTLE_e, dItemNo_BEE_CHILD_e, dItemNo_NONE_e, }; if (itemType != -1) { @@ -1312,8 +1312,8 @@ void dShopSystem_c::createShopItem(int itemType) { pos.y = shop_item_pos_data_tbl->mItemPos[i].y + current.pos.y; pos.z = shop_item_pos_data_tbl->mItemPos[i].z + current.pos.z; - if (itemTbl[i] != fpcNm_ITEM_NONE) { - u32 index = fopAcM_create(PROC_ShopItem, itemTbl[i], &pos, fopAcM_GetRoomNo(this), + if (itemTbl[i] != dItemNo_NONE_e) { + u32 index = fopAcM_create(fpcNm_ShopItem_e, itemTbl[i], &pos, fopAcM_GetRoomNo(this), ¤t.angle, NULL, -1); mItemCtrl.setItemIndex(i, index); offFlag(i); @@ -1352,19 +1352,19 @@ void dShopSystem_c::setSoldOut() { return; } else if (index == 0) { dShopSystem_itemActor[0] = NULL; - dShopSystem_itemNo[0] = fpcNm_ITEM_NONE; + dShopSystem_itemNo[0] = dItemNo_NONE_e; dShopSystem_item_count = 2; } else if (index == 1) { dShopSystem_itemActor[1] = NULL; - dShopSystem_itemNo[1] = fpcNm_ITEM_NONE; + dShopSystem_itemNo[1] = dItemNo_NONE_e; dShopSystem_item_count = 2; } else if (index == 2) { dShopSystem_itemActor[2] = NULL; - dShopSystem_itemNo[2] = fpcNm_ITEM_NONE; + dShopSystem_itemNo[2] = dItemNo_NONE_e; dShopSystem_item_count = 2; } else if (index == 6) { dShopSystem_itemActor[6] = NULL; - dShopSystem_itemNo[6] = fpcNm_ITEM_NONE; + dShopSystem_itemNo[6] = dItemNo_NONE_e; dShopSystem_item_count = 6; } diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index ff254b40d05..f44f432d2ff 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -268,7 +268,7 @@ static int createRoomScene(int param_0) { } *ptr = param_0; - if (!fopScnM_CreateReq(PROC_ROOM_SCENE, 0x7FFF, 0, (uintptr_t)ptr)) { + if (!fopScnM_CreateReq(fpcNm_ROOM_SCENE_e, 0x7FFF, 0, (uintptr_t)ptr)) { JKRFree(ptr); return 0; } @@ -487,927 +487,927 @@ void* dStage_roomControl_c::roomDzs_c::add(u8 i_no, u8 roomNo) { { name, proc, sub } static dStage_objectNameInf l_objectName[] = { - OBJNAME("Grass", PROC_GRASS, -1), - OBJNAME("kusax1", PROC_GRASS, -1), - OBJNAME("kusax7", PROC_GRASS, -1), - OBJNAME("kusax21", PROC_GRASS, -1), - OBJNAME("flower", PROC_GRASS, -1), - OBJNAME("flwr7", PROC_GRASS, -1), - OBJNAME("flwr17", PROC_GRASS, -1), - OBJNAME("pflower", PROC_GRASS, -1), - OBJNAME("pflwrx7", PROC_GRASS, -1), - OBJNAME("door", PROC_DOOR20, -1), - OBJNAME("kdoor", PROC_KNOB20, -1), - OBJNAME("ddoor", PROC_DBDOOR, -1), - OBJNAME("bdoor", PROC_BOSS_DOOR, -1), - OBJNAME("ndoor", PROC_DOOR20, -1), - OBJNAME("tadoor", PROC_DOOR20, -1), - OBJNAME("yodoor", PROC_DOOR20, -1), - OBJNAME("nadoor", PROC_DOOR20, -1), - OBJNAME("l9door", PROC_DOOR20, -1), - OBJNAME("l7door", PROC_DOOR20, -1), - OBJNAME("pdoor", PROC_PushDoor, -1), - OBJNAME("bigdoor", PROC_DOOR20, -1), - OBJNAME("kshtr00", PROC_Obj_Kshutter, -1), - OBJNAME("vshuter", PROC_Obj_Kshutter, -1), - OBJNAME("IzmGate", PROC_Izumi_Gate, -1), - OBJNAME("NoneCam", PROC_CAMERA, -1), - OBJNAME("NormCam", PROC_CAMERA, -1), - OBJNAME("Link", PROC_ALINK, -1), - OBJNAME("carry00", PROC_Obj_Carry, -1), - OBJNAME("carry01", PROC_Obj_Carry, -1), - OBJNAME("carry02", PROC_Obj_Carry, -1), - OBJNAME("carry04", PROC_Obj_Carry, -1), - OBJNAME("carry05", PROC_Obj_Carry, -1), - OBJNAME("carry06", PROC_Obj_Carry, -1), - OBJNAME("carry07", PROC_Obj_Carry, -1), - OBJNAME("carry08", PROC_Obj_Carry, -1), - OBJNAME("carry09", PROC_Obj_Carry, -1), - OBJNAME("ball1", PROC_Obj_Carry, -1), - OBJNAME("ball2", PROC_Obj_Carry, -1), - OBJNAME("ball3", PROC_Obj_Carry, -1), - OBJNAME("carry12", PROC_Obj_Carry, -1), - OBJNAME("carry13", PROC_Obj_Carry, -1), - OBJNAME("TagLite", PROC_Tag_LightBall, -1), - OBJNAME("InoBone", PROC_Obj_InoBone, -1), - OBJNAME("osiBLK0", PROC_Obj_Movebox, 0x00), - OBJNAME("dmblk", PROC_Obj_Movebox, 0x00), - OBJNAME("Kkiba", PROC_Obj_Movebox, 0x02), - OBJNAME("smblk", PROC_Obj_Movebox, 0x02), - OBJNAME("Lv4blk", PROC_Obj_Movebox, -1), - OBJNAME("Lv4blk2", PROC_Obj_Movebox, -1), - OBJNAME("gstone", PROC_Obj_Movebox, -1), - OBJNAME("TagAtt", PROC_Tag_Attp, -1), - OBJNAME("mmvbg", PROC_SET_BG_OBJ, -1), - OBJNAME("Drop", PROC_Obj_Drop, -1), - OBJNAME("BkLeaf", PROC_Obj_BkLeaf, -1), - OBJNAME("cylwind", PROC_Obj_Tornado, -1), - OBJNAME("TagTrnd", PROC_Obj_Tornado2, -1), - OBJNAME("mvstair", PROC_Obj_MvStair, -1), - OBJNAME("UHDoor", PROC_Obj_Cowdoor, -1), - OBJNAME("SwBoom", PROC_Obj_Swpropeller, -1), - OBJNAME("Swboom", PROC_Obj_Swpropeller, -1), - OBJNAME("BoomSht", PROC_Obj_BoomShutter, -1), - OBJNAME("haihai", PROC_Obj_Hfuta, -1), - OBJNAME("stopper", PROC_Obj_Stopper, -1), - OBJNAME("dstop", PROC_Obj_Stopper2, -1), - OBJNAME("mhole", PROC_Obj_MHole, -1), - OBJNAME("mhole2", PROC_Obj_MHole, -1), - OBJNAME("TagMag", PROC_Tag_Magne, -1), - OBJNAME("P_Warp", PROC_Obj_BossWarp, -1), - OBJNAME("fpillar", PROC_Obj_FirePillar, -1), - OBJNAME("yfire", PROC_Obj_FirePillar2, -1), - OBJNAME("pfire", PROC_Obj_FirePillar2, -1), - OBJNAME("Huriko1", PROC_Obj_WoodPendulum, -1), - OBJNAME("VolBall", PROC_Obj_VolcanicBall, -1), - OBJNAME("VolBom", PROC_Obj_VolcanicBall, -1), - OBJNAME("BigVolc", PROC_Obj_VolcanicBomb, -1), - OBJNAME("geyser", PROC_Obj_Geyser, -1), - OBJNAME("Cwall", PROC_Obj_ChainWall, -1), - OBJNAME("Tansu", PROC_Obj_Chest, -1), - OBJNAME("Onsen", PROC_Obj_Onsen, -1), - OBJNAME("Obj_bm", PROC_Obj_Bemos, -1), - OBJNAME("lv6bm", PROC_Obj_Lv6bemos, -1), - OBJNAME("E_bm6", PROC_Obj_Lv6bemos2, -1), - OBJNAME("stone", PROC_Obj_Stone, -1), - OBJNAME("stoneB", PROC_Obj_Stone, -1), - OBJNAME("TagSpin", PROC_Tag_Spinner, -1), - OBJNAME("L_RopeS", PROC_Obj_RopeBridge, -1), - OBJNAME("L_RopeB", PROC_Obj_RopeBridge, -1), - OBJNAME("wcover", PROC_Obj_WellCover, -1), - OBJNAME("rstair", PROC_Obj_RotStair, -1), - OBJNAME("marm", PROC_Obj_MagneArm, -1), - OBJNAME("turnSw", PROC_Obj_SwTurn, -1), - OBJNAME("chainSw", PROC_Obj_SwChain, -1), - OBJNAME("wsword", PROC_Obj_WoodenSword, -1), - OBJNAME("iceblk", PROC_Obj_IceBlock, -1), - OBJNAME("KkrSmk", PROC_Obj_Smoke, -1), - OBJNAME("dmele", PROC_Obj_Elevator, -1), - OBJNAME("wfall", PROC_Obj_WaterFall, -1), - OBJNAME("izora", PROC_Obj_ZoraCloth, -1), - OBJNAME("smgdoor", PROC_Obj_SmgDoor, -1), - OBJNAME("smkdoor", PROC_Obj_SmgDoor, -1), - OBJNAME("Obj_ava", PROC_Obj_Avalanche, -1), - OBJNAME("thdoor", PROC_Obj_TDoor, -1), - OBJNAME("mstrsrd", PROC_Obj_MasterSword, -1), - OBJNAME("wimage", PROC_Obj_WoodStatue, -1), - OBJNAME("sword", PROC_Obj_Sword, -1), - OBJNAME("spring", PROC_Tag_Spring, -1), - OBJNAME("BkDoorL", PROC_Obj_BkDoor, -1), - OBJNAME("BkDoorR", PROC_Obj_BkDoor, -1), - OBJNAME("IGateL", PROC_Obj_MGate, -1), - OBJNAME("IGateR", PROC_Obj_MGate, -1), - OBJNAME("HGateL", PROC_Obj_MGate, -1), - OBJNAME("HGateR", PROC_Obj_MGate, -1), - OBJNAME("K_Gate", PROC_Obj_KkrGate, -1), - OBJNAME("R_Gate", PROC_Obj_RiderGate, -1), - OBJNAME("kkanban", PROC_Obj_KKanban, -1), - OBJNAME("Mhsg6", PROC_Obj_Ladder, 0x00), - OBJNAME("Mhsg9", PROC_Obj_Ladder, 0x01), - OBJNAME("Mhsg12", PROC_Obj_Ladder, 0x02), - OBJNAME("Mhsg15", PROC_Obj_Ladder, 0x03), - OBJNAME("Mhsg4h", PROC_Obj_Ladder, 0x04), - OBJNAME("Mhsg3", PROC_Obj_Ladder, 0x05), - OBJNAME("bonbori", PROC_EP, -1), - OBJNAME("Cow", PROC_COW, -1), - OBJNAME("Peru", PROC_PERU, -1), - OBJNAME("Kago", PROC_KAGO, -1), - OBJNAME("TagFall", PROC_Tag_WaterFall, -1), - OBJNAME("Kbota_A", PROC_Obj_Swpush, 0x00), - OBJNAME("Kbota_B", PROC_Obj_Swpush, 0x01), - OBJNAME("KbotaC", PROC_Obj_Swpush, 0x02), - OBJNAME("Swpush", PROC_Obj_Swpush, 0x00), - OBJNAME("Lv3bota", PROC_Obj_Swpush, 0x00), - OBJNAME("Ksw00_C", PROC_Obj_Swpush2, 0x02), - OBJNAME("hvySw", PROC_Obj_Swpush5, 0x00), - OBJNAME("buraA", PROC_Obj_SwHang, 0x00), - OBJNAME("buraB", PROC_Obj_SwHang, 0x00), - OBJNAME("buraA2", PROC_Obj_SwHang, 0x00), - OBJNAME("buraB2", PROC_Obj_SwHang, 0x00), - OBJNAME("bura7A", PROC_Obj_SwHang, 0x00), - OBJNAME("bura7B", PROC_Obj_SwHang, 0x00), - OBJNAME("bura7C", PROC_Obj_SwHang, 0x00), - OBJNAME("bura7D", PROC_Obj_SwHang, 0x00), - OBJNAME("bura7E", PROC_Obj_SwHang, 0x00), - OBJNAME("tbox_sw", PROC_TBOX_SW, 0x00), - OBJNAME("swLight", PROC_Obj_SwLight, 0x00), - OBJNAME("iceleaf", PROC_Obj_IceLeaf, 0x00), - OBJNAME("swHit", PROC_SWHIT0, 0x00), - OBJNAME("swHit2", PROC_SWHIT0, 0x01), - OBJNAME("ObjTime", PROC_Obj_Timer, -1), - OBJNAME("AND_SW", PROC_ANDSW, -1), - OBJNAME("AND_SW2", PROC_ANDSW2, -1), - OBJNAME("ALLdie", PROC_ALLDIE, -1), - OBJNAME("rvback", PROC_Tag_RiverBack, -1), - OBJNAME("kagoFal", PROC_Tag_KagoFall, -1), - OBJNAME("CrvGate", PROC_Obj_CRVGATE, -1), - OBJNAME("CrvSaku", PROC_Obj_CRVFENCE, -1), - OBJNAME("CrvWood", PROC_Obj_CRVHAHEN, -1), - OBJNAME("CrvStel", PROC_Obj_CRVSTEEL, -1), - OBJNAME("CrvLH", PROC_Obj_CRVLH_DW, -1), - OBJNAME("RvRock", PROC_Obj_RIVERROCK, -1), - OBJNAME("P2a", PROC_NPC_P2, 0x00), - OBJNAME("P2b", PROC_NPC_P2, 0x01), - OBJNAME("P2c", PROC_NPC_P2, 0x02), - OBJNAME("Gnd", PROC_NPC_GND, -1), - OBJNAME("grA", PROC_NPC_GRA, -1), - OBJNAME("Obj_grA", PROC_OBJ_GRA, -1), - OBJNAME("Tag_grA", PROC_TAG_GRA, -1), - OBJNAME("TagYami", PROC_TAG_YAMI, -1), - OBJNAME("grC", PROC_NPC_GRC, -1), - OBJNAME("grM", PROC_NPC_GRM, -1), - OBJNAME("grMC", PROC_NPC_GRMC, -1), - OBJNAME("grS", PROC_NPC_GRS, -1), - OBJNAME("grD1", PROC_NPC_GRD, -1), - OBJNAME("grD", PROC_NPC_WRESTLER, 0x01), - OBJNAME("grR", PROC_NPC_GRR, -1), - OBJNAME("grO", PROC_NPC_GRO, -1), - OBJNAME("grZ", PROC_NPC_GRZ, -1), - OBJNAME("grARock", PROC_Obj_GraRock, -1), - OBJNAME("grZRock", PROC_Obj_GrzRock, -1), - OBJNAME("osnFire", PROC_OBJ_ONSEN_FIRE, -1), - OBJNAME("yamiD", PROC_NPC_YAMID, -1), - OBJNAME("yamiT", PROC_NPC_YAMIT, -1), - OBJNAME("yamiS", PROC_NPC_YAMIS, -1), - OBJNAME("Blue_NS", PROC_NPC_BLUENS, -1), - OBJNAME("Kakashi", PROC_NPC_KAKASHI, 0x00), - OBJNAME("Kdk", PROC_NPC_KDK, -1), - OBJNAME("Aru", PROC_NPC_ARU, -1), - OBJNAME("Bans", PROC_NPC_BANS, -1), - OBJNAME("Besu", PROC_NPC_BESU, -1), - OBJNAME("Bou", PROC_NPC_BOU, -1), - OBJNAME("BouS", PROC_NPC_BOU_S, 0x00), - OBJNAME("clerkA", PROC_NPC_CLERKA, 0x00), - OBJNAME("clerkB", PROC_NPC_CLERKB, 0x00), - OBJNAME("clerkT", PROC_NPC_CLERKT, 0x00), - OBJNAME("Ash", PROC_NPC_ASH, -1), - OBJNAME("AshB", PROC_NPC_ASHB, -1), - OBJNAME("Shad", PROC_NPC_SHAD, -1), - OBJNAME("Rafrel", PROC_NPC_RAFREL, -1), - OBJNAME("MoiR", PROC_NPC_MOIR, -1), - OBJNAME("impal", PROC_NPC_IMPAL, -1), - OBJNAME("Coach", PROC_NPC_COACH, -1), - OBJNAME("TheB", PROC_NPC_THEB, -1), - OBJNAME("TgArena", PROC_Tag_Arena, -1), - OBJNAME("TagInst", PROC_Tag_Instruction, -1), - OBJNAME("GWolf", PROC_NPC_GWOLF, -1), - OBJNAME("Len", PROC_NPC_LEN, -1), - OBJNAME("Lud", PROC_NPC_LUD, -1), - OBJNAME("Doc", PROC_NPC_DOC, -1), - OBJNAME("FSeirei", PROC_NPC_FAIRY_SEIREI, -1), - OBJNAME("Fairy", PROC_NPC_FAIRY, -1), - OBJNAME("Hanjo", PROC_NPC_HANJO, -1), - OBJNAME("Hoz", PROC_NPC_HOZ, -1), - OBJNAME("Jagar", PROC_NPC_JAGAR, -1), - OBJNAME("Kkri", PROC_NPC_KKRI, -1), - OBJNAME("Kn", PROC_NPC_KN, -1), - OBJNAME("KnBlt", PROC_KN_BULLET, -1), - OBJNAME("Knj", PROC_NPC_KNJ, -1), - OBJNAME("Kolin", PROC_NPC_KOLIN, -1), - OBJNAME("Kolinb", PROC_NPC_KOLINB, -1), - OBJNAME("Kyury", PROC_NPC_KYURY, -1), - OBJNAME("Maro", PROC_NPC_MARO, -1), - OBJNAME("midP", PROC_NPC_MIDP, -1), - OBJNAME("Moi", PROC_NPC_MOI, -1), - OBJNAME("Raca", PROC_NPC_RACA, -1), - OBJNAME("Post", PROC_NPC_POST, -1), - OBJNAME("Pouya", PROC_NPC_POUYA, -1), - OBJNAME("Saru", PROC_NPC_SARU, -1), - OBJNAME("seiB", PROC_NPC_SEIB, -1), - OBJNAME("seiC", PROC_NPC_SEIC, -1), - OBJNAME("seiD", PROC_NPC_SEID, -1), - OBJNAME("Seira", PROC_NPC_SEIRA, -1), - OBJNAME("Seira2", PROC_NPC_SERA2, -1), - OBJNAME("Seirei", PROC_NPC_SEIREI, -1), - OBJNAME("Sha", PROC_NPC_SHAMAN, -1), - OBJNAME("sMaro", PROC_NPC_SMARO, -1), - OBJNAME("solA", PROC_NPC_SOLA, -1), - OBJNAME("Taro", PROC_NPC_TARO, -1), - OBJNAME("PA_Besu", PROC_NPC_PACHI_BESU, -1), - OBJNAME("PA_Taro", PROC_NPC_PACHI_TARO, -1), - OBJNAME("PA_Maro", PROC_NPC_PACHI_MARO, -1), - OBJNAME("TagPati", PROC_TAG_PATI, -1), - OBJNAME("The", PROC_NPC_THE, -1), - OBJNAME("Tkj", PROC_NPC_TKJ, -1), - OBJNAME("Tks", PROC_NPC_TKS, -1), - OBJNAME("ObjTks", PROC_OBJ_TKS, -1), - OBJNAME("Tkc", PROC_NPC_TKC, -1), - OBJNAME("Tkj2", PROC_NPC_TKJ2, -1), - OBJNAME("Toby", PROC_NPC_TOBY, -1), - OBJNAME("Uri", PROC_NPC_URI, -1), - OBJNAME("Yelia", PROC_NPC_YELIA, -1), - OBJNAME("ykM", PROC_NPC_YKM, -1), - OBJNAME("ykW", PROC_NPC_YKW, -1), - OBJNAME("zanB", PROC_NPC_ZANB, -1), - OBJNAME("Zant", PROC_NPC_ZANT, -1), - OBJNAME("Zelda", PROC_NPC_ZELDA, -1), - OBJNAME("ZelR", PROC_NPC_ZELR, -1), - OBJNAME("ZelRo", PROC_NPC_ZELRO, -1), - OBJNAME("zrA", PROC_NPC_ZRA, 0x00), - OBJNAME("zrS", PROC_NPC_ZRA, 0x01), - OBJNAME("zrWF", PROC_NPC_ZRA, 0x02), - OBJNAME("zrR", PROC_NPC_ZRA, 0x03), - OBJNAME("zrD", PROC_NPC_ZRA, 0x04), - OBJNAME("zrSP", PROC_NPC_ZRA, 0x05), - OBJNAME("zrSPA", PROC_NPC_ZRA, 0x06), - OBJNAME("zrF", PROC_OBJ_ZRAFREEZE, 0x00), - OBJNAME("zrF2", PROC_OBJ_ZRAFREEZE, 0x01), - OBJNAME("zrF3", PROC_OBJ_ZRAFREEZE, 0x02), - OBJNAME("zrC", PROC_NPC_ZRC, -1), - OBJNAME("zrZ", PROC_NPC_ZRZ, -1), - OBJNAME("GrvStn", PROC_Obj_GraveStone, -1), - OBJNAME("zrARock", PROC_Obj_ZraRock, -1), - OBJNAME("StAndGl", PROC_START_AND_GOAL, -1), - OBJNAME("zrAMark", PROC_ZRA_MARK, -1), - OBJNAME("myna2", PROC_MYNA2, -1), - OBJNAME("myn2tag", PROC_TAG_MYNA2, -1), - OBJNAME("MAN_a", PROC_NPC_CD3, 0x00), - OBJNAME("MAD_a", PROC_NPC_CD3, 0x01), - OBJNAME("MCN_a", PROC_NPC_CD3, 0x02), - OBJNAME("MON_a", PROC_NPC_CD3, 0x03), - OBJNAME("MAN_b", PROC_NPC_CD3, 0x04), - OBJNAME("MAN_c", PROC_NPC_CD3, 0x05), - OBJNAME("MAS_a", PROC_NPC_CD3, 0x06), - OBJNAME("MBN_a", PROC_NPC_CD3, 0x07), - OBJNAME("MAN_a2", PROC_NPC_CD3, 0x08), - OBJNAME("MAD_a2", PROC_NPC_CD3, 0x09), - OBJNAME("MCN_a2", PROC_NPC_CD3, 0x0A), - OBJNAME("MON_a2", PROC_NPC_CD3, 0x0B), - OBJNAME("MAN_b2", PROC_NPC_CD3, 0x0C), - OBJNAME("MAN_c2", PROC_NPC_CD3, 0x0D), - OBJNAME("MAS_a2", PROC_NPC_CD3, 0x0E), - OBJNAME("MBN_a2", PROC_NPC_CD3, 0x0F), - OBJNAME("WAN_a", PROC_NPC_CD3, 0x10), - OBJNAME("WAD_a", PROC_NPC_CD3, 0x11), - OBJNAME("MAT_a", PROC_NPC_CD3, 0x12), - OBJNAME("WCN_a", PROC_NPC_CD3, 0x13), - OBJNAME("WON_a", PROC_NPC_CD3, 0x14), - OBJNAME("WGN_a", PROC_NPC_CD3, 0x15), - OBJNAME("WAN_b", PROC_NPC_CD3, 0x16), - OBJNAME("WAN_a2", PROC_NPC_CD3, 0x17), - OBJNAME("WAD_a2", PROC_NPC_CD3, 0x18), - OBJNAME("MAT_a2", PROC_NPC_CD3, 0x19), - OBJNAME("WCN_a2", PROC_NPC_CD3, 0x1A), - OBJNAME("WON_a2", PROC_NPC_CD3, 0x1B), - OBJNAME("WGN_a2", PROC_NPC_CD3, 0x1C), - OBJNAME("WAN_b2", PROC_NPC_CD3, 0x1D), - OBJNAME("shoe", PROC_NPC_SHOE, -1), - OBJNAME("DoorBoy", PROC_NPC_DOORBOY, -1), - OBJNAME("prayer", PROC_NPC_PRAYER, -1), - OBJNAME("km_Hana", PROC_NPC_KASIHANA, -1), - OBJNAME("km_Kyu", PROC_NPC_KASIKYU, -1), - OBJNAME("km_Mich", PROC_NPC_KASIMICH, -1), - OBJNAME("NpcChat", PROC_NPC_CHAT, -1), - OBJNAME("chtSolA", PROC_NPC_SOLDIERa, -1), - OBJNAME("chtSolB", PROC_NPC_SOLDIERb, -1), - OBJNAME("DrSol1", PROC_NPC_DRSOL, 0x00), - OBJNAME("DrSol2", PROC_NPC_DRSOL, 0x01), - OBJNAME("chin", PROC_NPC_CHIN, -1), - OBJNAME("ins", PROC_NPC_INS, -1), - OBJNAME("Shop0", PROC_NPC_SHOP0, -1), - OBJNAME("TagSch", PROC_Tag_Schedule, -1), - OBJNAME("TagEsc", PROC_Tag_Escape, -1), - OBJNAME("passer", PROC_PASSER_MNG, 0x00), - OBJNAME("passerL", PROC_PASSER_MNG, 0x01), - OBJNAME("fmtion", PROC_FORMATION_MNG, 0x00), - OBJNAME("fmtionL", PROC_FORMATION_MNG, 0x01), - OBJNAME("guard", PROC_GUARD_MNG, -1), - OBJNAME("TgGuard", PROC_TAG_GUARD, -1), - OBJNAME("Mk", PROC_NPC_MK, -1), - OBJNAME("Obj_Tbi", PROC_Obj_Yobikusa, 0x00), - OBJNAME("Obj_Uma", PROC_Obj_Yobikusa, 0x01), - OBJNAME("Obj_knk", PROC_Obj_KazeNeko, -1), - OBJNAME("Obj_nmp", PROC_Obj_NamePlate, -1), - OBJNAME("Obj_Tie", PROC_Obj_OnCloth, -1), - OBJNAME("Obj_Lrp", PROC_Obj_LndRope, -1), - OBJNAME("Obj_Sit", PROC_Obj_ItaRope, -1), - OBJNAME("Ikada", PROC_Obj_Ikada, -1), - OBJNAME("Dust", PROC_Obj_DUST, -1), - OBJNAME("Obj_Ita", PROC_Obj_ITA, -1), - OBJNAME("Ice_l", PROC_Obj_Ice_l, -1), - OBJNAME("Ice_s", PROC_Obj_Ice_s, -1), - OBJNAME("E_Make", PROC_Obj_E_CREATE, -1), - OBJNAME("Bhhashi", PROC_Obj_Bhbridge, -1), - OBJNAME("Yousei", PROC_Obj_Yousei, -1), - OBJNAME("G_Kabe", PROC_Obj_GOMIKABE, -1), - OBJNAME("B_ling", PROC_Obj_Mato, -1), - OBJNAME("kab_o", PROC_Obj_Kabuto, -1), - OBJNAME("I_Cho", PROC_Obj_Cho, -1), - OBJNAME("I_Kuw", PROC_Obj_Kuw, -1), - OBJNAME("I_Nan", PROC_Obj_Nan, -1), - OBJNAME("I_Dan", PROC_Obj_Dan, -1), - OBJNAME("I_Kam", PROC_Obj_Kam, -1), - OBJNAME("I_Ten", PROC_Obj_Ten, -1), - OBJNAME("I_Ari", PROC_Obj_Ari, -1), - OBJNAME("I_Kag", PROC_Obj_Kag, -1), - OBJNAME("I_Tom", PROC_Obj_Tombo, -1), - OBJNAME("I_Bat", PROC_Obj_Batta, -1), - OBJNAME("I_Kat", PROC_Obj_Kat, -1), - OBJNAME("H_Saku", PROC_Obj_H_Saku, -1), - OBJNAME("sm_door", PROC_Obj_SM_DOOR, -1), - OBJNAME("Kaisou", PROC_Obj_Kaisou, -1), - OBJNAME("Ni", PROC_NI, -1), - OBJNAME("Fr", PROC_FR, -1), - OBJNAME("Sq", PROC_SQ, -1), - OBJNAME("Bd", PROC_BD, -1), - OBJNAME("Obj_ki", PROC_OBJ_KI, -1), - OBJNAME("Do", PROC_DO, -1), - OBJNAME("Lm", PROC_NPC_FISH, 0x00), - OBJNAME("Tr", PROC_NPC_FISH, 0x05), - OBJNAME("Npc_tr", PROC_NPC_TR, -1), - OBJNAME("Npc_lf", PROC_NPC_LF, -1), - OBJNAME("Fish", PROC_MG_FISH, -1), - OBJNAME("NPC_TK", PROC_NPC_TK, -1), - OBJNAME("Obj_fd", PROC_OBJ_FOOD, -1), - OBJNAME("MYNA", PROC_MYNA, -1), - OBJNAME("SSITEM", PROC_OBJ_SSITEM, -1), - OBJNAME("SSDRINK", PROC_OBJ_SSDRINK, -1), - OBJNAME("TGDRINK", PROC_TAG_SSDRINK, -1), - OBJNAME("Tag_Btl", PROC_TAG_BTLITM, -1), - OBJNAME("lv5soup", PROC_TAG_LV5SOUP, -1), - OBJNAME("TGMNLIG", PROC_TAG_MNLIGHT, -1), - OBJNAME("TGSPCAM", PROC_TAG_SHOPCAM, -1), - OBJNAME("TGSPITM", PROC_TAG_SHOPITM, -1), - OBJNAME("OilTubo", PROC_OBJ_OILTUBO, -1), - OBJNAME("Roten", PROC_OBJ_ROTEN, -1), - OBJNAME("Pleaf", PROC_OBJ_PLEAF, -1), - OBJNAME("KBacket", PROC_OBJ_KBACKET, -1), - OBJNAME("YBag", PROC_OBJ_YBAG, -1), - OBJNAME("Pumpkin", PROC_OBJ_PUMPKIN, -1), - OBJNAME("Obj_kg", PROC_OBJ_KAGO, -1), - OBJNAME("BbKago", PROC_OBJ_KAGO, 0x00), - OBJNAME("OnKago", PROC_OBJ_KAGO, 0x01), - OBJNAME("ObjHasi", PROC_Obj_HHASHI, -1), - OBJNAME("Thashi", PROC_Obj_THASHI, -1), - OBJNAME("B_Hashi", PROC_Obj_BHASHI, -1), - OBJNAME("E_MD", PROC_E_MD, -1), - OBJNAME("E_s1", PROC_E_S1, -1), - OBJNAME("E_wb", PROC_E_WB, -1), - OBJNAME("E_rd", PROC_E_RD, -1), - OBJNAME("E_rdb", PROC_E_RDB, -1), - OBJNAME("E_rdy", PROC_E_RDY, -1), - OBJNAME("E_fm", PROC_E_FM, -1), - OBJNAME("E_dn", PROC_E_DN, -1), - OBJNAME("E_mf", PROC_E_MF, -1), - OBJNAME("TreeSh", PROC_TREESH, -1), - OBJNAME("E_bug", PROC_E_BUG, -1), - OBJNAME("E_bee", PROC_E_BEE, -1), - OBJNAME("E_nest", PROC_E_NEST, -1), - OBJNAME("E_kr", PROC_E_KR, -1), - OBJNAME("E_st", PROC_E_ST, -1), - OBJNAME("E_tk", PROC_E_TK, -1), - OBJNAME("E_tk2", PROC_E_TK2, -1), - OBJNAME("E_th", PROC_E_TH, -1), - OBJNAME("E_cr", PROC_E_CR, -1), - OBJNAME("E_df", PROC_E_DF, -1), - OBJNAME("E_ph", PROC_E_PH, -1), - OBJNAME("E_fs", PROC_E_FS, -1), - OBJNAME("E_SB", PROC_E_SB, -1), - OBJNAME("E_HM", PROC_E_HM, -1), - OBJNAME("E_fk", PROC_E_FK, -1), - OBJNAME("E_pm", PROC_E_PM, -1), - OBJNAME("Npc_ne", PROC_NPC_NE, -1), - OBJNAME("E_db", PROC_E_DB, -1), - OBJNAME("E_kg", PROC_E_KG, -1), - OBJNAME("E_sh", PROC_E_SH, -1), - OBJNAME("E_sf", PROC_E_SF, -1), - OBJNAME("Obj_lb", PROC_OBJ_LBOX, -1), - OBJNAME("Obj_kb", PROC_OBJ_KBOX, -1), - OBJNAME("E_bs", PROC_E_BS, -1), - OBJNAME("Sekizoa", PROC_OBJ_SEKIZOA, 0x00), - OBJNAME("Sekizob", PROC_OBJ_SEKIZOA, 0x01), - OBJNAME("E_sm", PROC_E_SM, -1), - OBJNAME("E_sm2", PROC_E_SM2, -1), - OBJNAME("ky_tag0", PROC_KYTAG00, -1), - OBJNAME("ky_tag1", PROC_KYTAG01, 0x00), - OBJNAME("ky_tag2", PROC_KYTAG02, -1), - OBJNAME("ky_tag3", PROC_KYTAG01, 0x01), - OBJNAME("kytag3", PROC_KYTAG03, -1), - OBJNAME("DK_tag", PROC_KYTAG04, -1), - OBJNAME("PPHole", PROC_KYTAG05, -1), - OBJNAME("KY_chg", PROC_KYTAG06, -1), - OBJNAME("Plight", PROC_KYTAG07, -1), - OBJNAME("KY_mk", PROC_KYTAG08, -1), - OBJNAME("Bound", PROC_KYTAG09, -1), - OBJNAME("WC_tag", PROC_KYTAG01, 0x02), - OBJNAME("Sparks", PROC_KYTAG10, -1), - OBJNAME("Tcntrl", PROC_KYTAG11, -1), - OBJNAME("Drkmst", PROC_KYTAG12, -1), - OBJNAME("Blsnow", PROC_KYTAG13, -1), - OBJNAME("Savmem", PROC_KYTAG14, -1), - OBJNAME("Zshake", PROC_KYTAG15, -1), - OBJNAME("Pikari", PROC_KYTAG16, -1), - OBJNAME("Lmask", PROC_KYTAG17, -1), - OBJNAME("E_is", PROC_E_IS, -1), - OBJNAME("E_ai", PROC_E_AI, -1), - OBJNAME("E_ba", PROC_E_BA, -1), - OBJNAME("E_bu", PROC_E_BU, -1), - OBJNAME("E_sw", PROC_E_SW, -1), - OBJNAME("E_ge", PROC_E_GE, -1), - OBJNAME("TagGe", PROC_Tag_WatchGe, -1), - OBJNAME("E_ym", PROC_E_YM, -1), - OBJNAME("E_ymt", PROC_E_YM_TAG, -1), - OBJNAME("E_ymb", PROC_E_YMB, -1), - OBJNAME("Fwall", PROC_Tag_FWall, -1), - OBJNAME("E_hz", PROC_E_HZ, -1), - OBJNAME("E_ws", PROC_E_WS, -1), - OBJNAME("E_oc", PROC_E_OC, -1), - OBJNAME("E_dt", PROC_E_DT, -1), - OBJNAME("E_bg", PROC_E_BG, -1), - OBJNAME("E_octbg", PROC_E_OctBg, -1), - OBJNAME("E_tt", PROC_E_TT, -1), - OBJNAME("E_dk", PROC_E_DK, -1), - OBJNAME("E_vt", PROC_E_VT, -1), - OBJNAME("E_ww", PROC_E_WW, -1), - OBJNAME("E_gi", PROC_E_GI, -1), - OBJNAME("E_mk", PROC_E_MK, -1), - OBJNAME("B_gm", PROC_B_GM, -1), - OBJNAME("E_gm", PROC_E_GM, -1), - OBJNAME("E_gs", PROC_E_GS, -1), - OBJNAME("Npc_ne", PROC_NPC_NE, -1), - OBJNAME("Obj_gm", PROC_OBJ_GM, -1), - OBJNAME("E_mm", PROC_E_MM, -1), - OBJNAME("E_mm2", PROC_E_MM, 0x01), - OBJNAME("E_fz", PROC_E_FZ, -1), - OBJNAME("E_fb", PROC_E_FB, -1), - OBJNAME("E_Zs", PROC_E_ZS, -1), - OBJNAME("E_kk", PROC_E_KK, -1), - OBJNAME("E_hp", PROC_E_HP, -1), - OBJNAME("E_zh", PROC_E_ZH, -1), - OBJNAME("E_zm", PROC_E_ZM, -1), - OBJNAME("E_zm2", PROC_E_ZM, 0x01), - OBJNAME("E_pz", PROC_E_PZ, -1), - OBJNAME("Kita", PROC_OBJ_KITA, -1), - OBJNAME("E_nz", PROC_E_NZ, -1), - OBJNAME("E_po", PROC_E_PO, -1), - OBJNAME("Obj_w0", PROC_OBJ_WEB0, -1), - OBJNAME("Obj_w1", PROC_OBJ_WEB1, -1), - OBJNAME("Obj_cb", PROC_OBJ_CB, -1), - OBJNAME("Obj_mak", PROC_OBJ_MAKI, -1), - OBJNAME("Obj_brg", PROC_OBJ_BRG, -1), - OBJNAME("E_rb", PROC_E_RB, -1), - OBJNAME("E_sg", PROC_E_SG, -1), - OBJNAME("Obj_tby", PROC_OBJ_TOBY, -1), - OBJNAME("Obj_sw", PROC_OBJ_SW, -1), - OBJNAME("Npc_ks", PROC_NPC_KS, -1), - OBJNAME("Obj_so", PROC_OBJ_SO, -1), - OBJNAME("E_bi", PROC_E_BI, -1), - OBJNAME("Obj_key", PROC_OBJ_KEY, -1), - OBJNAME("E_hb", PROC_E_HB, -1), - OBJNAME("Obj_hb", PROC_OBJ_HB, -1), - OBJNAME("B_bq", PROC_B_BQ, -1), - OBJNAME("B_bh", PROC_B_BH, -1), - OBJNAME("B_go", PROC_B_GO, -1), - OBJNAME("Obj_fw", PROC_OBJ_FW, -1), - OBJNAME("E_ga", PROC_E_GA, -1), - OBJNAME("E_gb", PROC_E_GB, -1), - OBJNAME("E_wap", PROC_E_WAP, -1), - OBJNAME("Obj_sui", PROC_OBJ_SUISYA, -1), - OBJNAME("Obj_bal", PROC_OBJ_BALLOON, -1), - OBJNAME("Obj_lp", PROC_OBJ_LP, -1), - OBJNAME("Obj_nd", PROC_OBJ_NDOOR, -1), - OBJNAME("Obj_ud", PROC_OBJ_UDOOR, -1), - OBJNAME("Obj_us", PROC_OBJ_USAKU, -1), - OBJNAME("Obj_kn2", PROC_OBJ_KANBAN2, -1), - OBJNAME("Obj_kyh", PROC_OBJ_KEYHOLE, -1), - OBJNAME("Bed", PROC_OBJ_BED, -1), - OBJNAME("BouMato", PROC_OBJ_BOUMATO, -1), - OBJNAME("AutoMt", PROC_OBJ_AUTOMATA, -1), - OBJNAME("Gadget", PROC_OBJ_GADGET, -1), - OBJNAME("ItaMato", PROC_OBJ_ITAMATO, -1), - OBJNAME("Nougu", PROC_OBJ_NOUGU, -1), - OBJNAME("Stick", PROC_OBJ_STICK, -1), - OBJNAME("Mie", PROC_OBJ_MIE, -1), - OBJNAME("SkDoor", PROC_OBJ_SEKIDOOR, -1), - OBJNAME("Sekizo", PROC_OBJ_SEKIZO, -1), - OBJNAME("SMTile", PROC_OBJ_SMTILE, -1), - OBJNAME("H_kage", PROC_OBJ_KAGE, -1), - OBJNAME("E_ms", PROC_E_MS, -1), - OBJNAME("Obj_tp", PROC_OBJ_TP, -1), - OBJNAME("Obj_ms", PROC_OBJ_MSIMA, -1), - OBJNAME("E_gob", PROC_E_GOB, -1), - OBJNAME("E_yk", PROC_E_YK, -1), - OBJNAME("E_yr", PROC_E_YR, -1), - OBJNAME("E_yg", PROC_E_YG, -1), - OBJNAME("Obj_fm", PROC_OBJ_FMOBJ, -1), - OBJNAME("B_ob", PROC_B_OB, -1), - OBJNAME("OcHashi", PROC_OCTHASHI, -1), - OBJNAME("E_dd", PROC_E_DD, -1), - OBJNAME("Obj_rw", PROC_OBJ_RW, -1), - OBJNAME("Obj_ih", PROC_OBJ_IHASI, -1), - OBJNAME("E_yc", PROC_E_YC, -1), - OBJNAME("B_ds", PROC_B_DS, -1), - OBJNAME("B_dr", PROC_B_DR, -1), - OBJNAME("B_gg", PROC_B_GG, -1), - OBJNAME("B_yo", PROC_B_YO, -1), - OBJNAME("B_tn", PROC_B_TN, -1), - OBJNAME("B_zant", PROC_B_ZANT, -1), - OBJNAME("B_zntm", PROC_B_ZANTZ, -1), - OBJNAME("B_znts", PROC_B_ZANTS, -1), - OBJNAME("E_yd", PROC_E_YD, -1), - OBJNAME("E_yh", PROC_E_YH, -1), - OBJNAME("Henna", PROC_NPC_HENNA, -1), - OBJNAME("Henna0", PROC_NPC_HENNA0, -1), - OBJNAME("Npc_du", PROC_NPC_DU, 0x00), - OBJNAME("Econt", PROC_ECONT, -1), - OBJNAME("B_mgn", PROC_B_MGN, -1), - OBJNAME("Hzelda", PROC_E_HZELDA, -1), - OBJNAME("Worm", PROC_NPC_WORM, -1), - OBJNAME("B_gnd", PROC_B_GND, -1), - OBJNAME("Obj_gb", PROC_OBJ_GB, -1), - OBJNAME("tboxA0", PROC_TBOX, -1), - OBJNAME("tboxA1", PROC_TBOX, -1), - OBJNAME("tboxA2", PROC_TBOX, -1), - OBJNAME("tboxB0", PROC_TBOX, -1), - OBJNAME("tboxB1", PROC_TBOX, -1), - OBJNAME("tboxB2", PROC_TBOX, -1), - OBJNAME("tboxJ0", PROC_TBOX, -1), - OBJNAME("tboxP0", PROC_TBOX, -1), - OBJNAME("tboxB00", PROC_TBOX, -1), - OBJNAME("tboxB01", PROC_TBOX, -1), - OBJNAME("tboxW0", PROC_TBOX, -1), - OBJNAME("tboxEL0", PROC_TBOX2, -1), - OBJNAME("tboxEL1", PROC_TBOX2, -1), - OBJNAME("l8warp", PROC_Obj_BossWarp, -1), - OBJNAME("L1Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L2Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L3Bdoor", PROC_Obj_Kshutter, -1), - OBJNAME("L4Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L5Bdoor", PROC_L5BOSS_DOOR, -1), - OBJNAME("L6Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L7Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L8Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L9Bdoor", PROC_L1BOSS_DOOR, -1), - OBJNAME("L1Mdoor", PROC_L1MBOSS_DOOR, 0x01), - OBJNAME("L2Mdoor", PROC_L1MBOSS_DOOR, 0x02), - OBJNAME("L3Mdoor", PROC_L1MBOSS_DOOR, 0x03), - OBJNAME("L4Mdoor", PROC_L1MBOSS_DOOR, 0x04), - OBJNAME("L5Mdoor", PROC_L1MBOSS_DOOR, 0x05), - OBJNAME("L6Mdoor", PROC_L1MBOSS_DOOR, 0x06), - OBJNAME("L7Mdoor", PROC_L1MBOSS_DOOR, 0x07), - OBJNAME("L8Mdoor", PROC_L1MBOSS_DOOR, 0x08), - OBJNAME("L7door", PROC_L1MBOSS_DOOR, 0x0A), - OBJNAME("L5door", PROC_L1MBOSS_DOOR, 0x0B), - OBJNAME("Horse", PROC_HORSE, -1), - OBJNAME("Canoe", PROC_CANOE, -1), - OBJNAME("Crope", PROC_Obj_Crope, -1), - OBJNAME("Cstatue", PROC_CSTATUE, -1), - OBJNAME("CstaF", PROC_CSTAF, -1), - OBJNAME("HoZelda", PROC_HOZELDA, -1), - OBJNAME("Mhint", PROC_Tag_Mhint, -1), - OBJNAME("Mmsg", PROC_Tag_Mmsg, -1), - OBJNAME("Mwait", PROC_Tag_Mwait, -1), - OBJNAME("Mstop", PROC_Tag_Mstop, -1), - OBJNAME("MstopE", PROC_Tag_Mstop, -1), - OBJNAME("Hinit", PROC_Tag_Hinit, -1), - OBJNAME("Hjump", PROC_Tag_Hjump, -1), - OBJNAME("Hstop", PROC_Tag_Hstop, -1), - OBJNAME("AJnot", PROC_Tag_AJnot, -1), - OBJNAME("Wljump", PROC_Tag_Wljump, -1), - OBJNAME("Sppath", PROC_Tag_Sppath, -1), - OBJNAME("Stream", PROC_Tag_Stream, -1), - OBJNAME("Gstart", PROC_Tag_Gstart, -1), - OBJNAME("TgTGate", PROC_Tag_TWGate, -1), - OBJNAME("Lv6Gate", PROC_Tag_Lv6Gate, -1), - OBJNAME("Lv7Gate", PROC_Tag_Lv7Gate, -1), - OBJNAME("Lv8Gate", PROC_Tag_Lv8Gate, -1), - OBJNAME("TgTHint", PROC_Tag_TheBHint, -1), - OBJNAME("TagAsst", PROC_Tag_Assist, -1), - OBJNAME("Dmidna", PROC_DMIDNA, -1), - OBJNAME("Fchain", PROC_Obj_Fchain, -1), - OBJNAME("Wchain", PROC_Obj_Wchain, -1), - OBJNAME("Cdoor", PROC_Obj_Cdoor, -1), - OBJNAME("Cgate", PROC_Obj_Cdoor, -1), - OBJNAME("Water00", PROC_GRDWATER, -1), - OBJNAME("Digpl", PROC_Obj_Digpl, -1), - OBJNAME("Digholl", PROC_Obj_Digholl, -1), - OBJNAME("Bombf", PROC_Obj_Bombf, -1), - OBJNAME("hider", PROC_SUSPEND, -1), - OBJNAME("SwAreaC", PROC_SWC00, -1), - OBJNAME("SwAreaS", PROC_SWC00, -1), - OBJNAME("SwLBall", PROC_SwLBall, -1), - OBJNAME("SwBall", PROC_SwBall, -1), - OBJNAME("thouse", PROC_Obj_TobyHouse, -1), - OBJNAME("ironbox", PROC_Obj_MetalBox, -1), - OBJNAME("l6swtrn", PROC_Obj_Lv6SwTurn, -1), - OBJNAME("l2bmtag", PROC_Tag_Lv2PrChk, -1), - OBJNAME("swspin", PROC_Obj_SwSpinner, -1), - OBJNAME("spnGear", PROC_Obj_Lv4Gear, -1), - OBJNAME("fan", PROC_Obj_Fan, -1), - OBJNAME("tgake", PROC_Obj_Gake, -1), - OBJNAME("tmoon", PROC_Obj_TMoon, -1), - OBJNAME("gwall", PROC_Obj_GanonWall, -1), - OBJNAME("gwall2", PROC_Obj_GanonWall2, -1), - OBJNAME("scnChg", PROC_SCENE_EXIT, -1), - OBJNAME("scnChg2", PROC_SCENE_EXIT2, -1), - OBJNAME("noChgRm", PROC_NO_CHG_ROOM, -1), - OBJNAME("readRm", PROC_NO_CHG_ROOM, 0x00), - OBJNAME("Tetd", PROC_DSHUTTER, -1), - OBJNAME("fence", PROC_DSHUTTER, -1), - OBJNAME("lv7saku", PROC_DSHUTTER, -1), - OBJNAME("YkgrON", PROC_Ykgr, -1), - OBJNAME("YkgrOFF", PROC_Ykgr, -1), - OBJNAME("TagEv", PROC_TAG_EVENT, -1), - OBJNAME("TagEvC", PROC_TAG_EVENT, -1), - OBJNAME("TagEvt", PROC_TAG_EVT, 0x00), - OBJNAME("TagEvt1", PROC_TAG_EVT, 0x01), - OBJNAME("TagHowl", PROC_TAG_HOWL, 0x01), - OBJNAME("Tag_ms", PROC_TAG_MSG, 0x00), - OBJNAME("LntnTag", PROC_TAG_LANTERN, -1), - OBJNAME("EvtArea", PROC_TAG_EVTAREA, -1), - OBJNAME("AllMato", PROC_TAG_ALLMATO, -1), - OBJNAME("EvtMsg", PROC_TAG_EVTMSG, -1), - OBJNAME("KMsg", PROC_TAG_KMSG, -1), - OBJNAME("Push", PROC_TAG_PUSH, -1), - OBJNAME("Teloper", PROC_TAG_TELOP, -1), - OBJNAME("CamChg", PROC_TAG_CAMERA, -1), - OBJNAME("CamArea", PROC_TAG_CAMERA, -1), - OBJNAME("CamAreC", PROC_TAG_CAMERA, -1), - OBJNAME("ChkPntS", PROC_TAG_CHKPOINT, -1), - OBJNAME("ChkPntC", PROC_TAG_CHKPOINT, -1), - OBJNAME("setball", PROC_Tag_SetBall, -1), - OBJNAME("atkItem", PROC_Tag_AttackItem, -1), - OBJNAME("TagStat", PROC_Tag_Statue, -1), - OBJNAME("zdoor", PROC_Obj_ZDoor, -1), - OBJNAME("rdoor", PROC_Obj_ZDoor, -1), - OBJNAME("STDoa", PROC_Obj_ZDoor, -1), - OBJNAME("hasi00", PROC_Obj_Pillar, -1), - OBJNAME("hasi01", PROC_Obj_Pillar, -1), - OBJNAME("window", PROC_Obj_Window, -1), - OBJNAME("bbox", PROC_Obj_BBox, -1), - OBJNAME("spiralC", PROC_Obj_Lv3R10Saka, -1), - OBJNAME("spiral2", PROC_Obj_Lv3R10Saka, -1), - OBJNAME("digsnow", PROC_Obj_DigSnow, -1), - OBJNAME("digsand", PROC_Obj_Lv4DigSand, -1), - OBJNAME("fallobj", PROC_Obj_FallObj, -1), - OBJNAME("l7brg", PROC_Obj_Lv7Bridge, -1), - OBJNAME("dr", PROC_DR, -1), - OBJNAME("L7lowDr", PROC_L7lowDr, -1), - OBJNAME("swTime", PROC_SwTime, -1), - OBJNAME("pdrobj", PROC_Obj_PushDoor, -1), - OBJNAME("crystal", PROC_Obj_Crystal, -1), - OBJNAME("WarpBrg", PROC_Obj_KakarikoBrg, -1), - OBJNAME("WarpB2", PROC_Obj_KakarikoBrg, -1), - OBJNAME("WarpOB1", PROC_Obj_OrdinBrg, 0x00), - OBJNAME("WarpOB2", PROC_Obj_OrdinBrg, 0x01), - OBJNAME("VolcGnd", PROC_Obj_VolcGnd, -1), - OBJNAME("r09wtr", PROC_Obj_WaterEff, -1), - OBJNAME("ballSw", PROC_Obj_SwBallA, -1), - OBJNAME("lballSw", PROC_Obj_SwBallB, -1), - OBJNAME("lbsw", PROC_Obj_SwBallC, -1), - OBJNAME("R50Sand", PROC_Obj_Lv4Sand, -1), - OBJNAME("rwall", PROC_Obj_Lv4RailWall, -1), - OBJNAME("l4brg", PROC_Obj_Lv4Bridge, -1), - OBJNAME("l4floor", PROC_Obj_Lv4Floor, -1), - OBJNAME("item", PROC_ITEM, -1), - OBJNAME("itemKey", PROC_Obj_SmallKey, -1), - OBJNAME("kantera", PROC_Obj_Kantera, -1), - OBJNAME("witem", PROC_ITEM, -1), - OBJNAME("wshield", PROC_Obj_Shield, -1), - OBJNAME("htPiece", PROC_Obj_LifeContainer, -1), - OBJNAME("htCase", PROC_Obj_LifeContainer, -1), - OBJNAME("Mbrid15", PROC_Obj_RotBridge, -1), - OBJNAME("Mbrid9", PROC_Obj_RotBridge, -1), - OBJNAME("maglift", PROC_Obj_MagLift, -1), - OBJNAME("Cldst00", PROC_Obj_Lv1Cdl00, -1), - OBJNAME("Cldst01", PROC_Obj_Lv1Cdl01, -1), - OBJNAME("RMback0", PROC_Tag_Restart, -1), - OBJNAME("RMback1", PROC_Tag_ChgRestart, -1), - OBJNAME("Mist", PROC_Tag_Mist, -1), - OBJNAME("magLifR", PROC_Obj_MagLiftRot, -1), - OBJNAME("TCdlst", PROC_Obj_TvCdlst, -1), - OBJNAME("wdstick", PROC_Obj_WdStick, -1), - OBJNAME("stBlock", PROC_Obj_StairBlock, -1), - OBJNAME("hsMato", PROC_Obj_HsTarget, -1), - OBJNAME("ktFire", PROC_Tag_KtOnFire, -1), - OBJNAME("hswitch", PROC_Obj_HeavySw, -1), - OBJNAME("goGate", PROC_Obj_GoGate, -1), - OBJNAME("taAmi", PROC_Obj_TaFence, -1), - OBJNAME("fireWd", PROC_Obj_FireWood, -1), - OBJNAME("fireWd2", PROC_Obj_FireWood2, -1), - OBJNAME("altar", PROC_Obj_Saidan, -1), - OBJNAME("gpTaru", PROC_Obj_GpTaru, -1), - OBJNAME("spinLf", PROC_Obj_SpinLift, -1), - OBJNAME("bmWin", PROC_Obj_BmWindow, -1), - OBJNAME("roofHl", PROC_Obj_RfHole, -1), - OBJNAME("syRock", PROC_Obj_SyRock, -1), - OBJNAME("wColumn", PROC_Obj_WaterPillar, -1), - OBJNAME("kpot", PROC_Obj_KiPot, -1), - OBJNAME("bsGate", PROC_Obj_BsGate, -1), - OBJNAME("amiShut", PROC_Obj_AmiShutter, -1), - OBJNAME("kwhel00", PROC_Obj_KWheel00, -1), - OBJNAME("kwhel01", PROC_Obj_KWheel01, -1), - OBJNAME("PRElvtr", PROC_Obj_PRElvtr, -1), - OBJNAME("swhel00", PROC_Obj_KWheel00, -1), - OBJNAME("M_hasu", PROC_Obj_MHasu, -1), - OBJNAME("yiblltr", PROC_Obj_YIblltray, -1), - OBJNAME("l6egate", PROC_Obj_Lv6EGate, -1), - OBJNAME("l6eleva", PROC_Obj_Lv6ElevtA, -1), - OBJNAME("wtGate", PROC_Obj_WtGate, -1), - OBJNAME("candlL2", PROC_Obj_Lv2Candle, -1), - OBJNAME("togeTp", PROC_Obj_TogeTrap, -1), - OBJNAME("rotTrap", PROC_Obj_RotTrap, -1), - OBJNAME("klift00", PROC_Obj_KLift00, -1), - OBJNAME("l4chand", PROC_Obj_Lv4Chan, -1), - OBJNAME("Ychndlr", PROC_Obj_Ychndlr, -1), - OBJNAME("hbmbkoy", PROC_Obj_HBombkoya, -1), - OBJNAME("TagCsw", PROC_TAG_CSW, -1), - OBJNAME("TagCswO", PROC_TAG_CSW, -1), - OBJNAME("P_Rwall", PROC_Obj_Lv4PRwall, -1), - OBJNAME("PDtile", PROC_Obj_PDtile, -1), - OBJNAME("PDwall", PROC_Obj_PDwall, -1), - OBJNAME("Qs", PROC_TAG_QS, -1), - OBJNAME("mirror", PROC_MIRROR, -1), - OBJNAME("rGate", PROC_Obj_SwallShutter, -1), - OBJNAME("l3water", PROC_Obj_Lv3Water, -1), - OBJNAME("l3wat02", PROC_Obj_Lv3Water2, -1), - OBJNAME("l3watB", PROC_OBJ_LV3WATERB, -1), - OBJNAME("szbridg", PROC_Obj_SZbridge, -1), - OBJNAME("kjgjs", PROC_Obj_KJgjs, -1), - OBJNAME("kjs", PROC_Obj_KJgjs, -1), - OBJNAME("candlL3", PROC_Obj_Lv3Candle, -1), - OBJNAME("l5icewl", PROC_Obj_IceWall, -1), - OBJNAME("Turara", PROC_Obj_Turara, -1), - OBJNAME("twGate", PROC_Obj_TwGate, -1), - OBJNAME("L4cdlTg", PROC_Tag_Lv4Candle, -1), - OBJNAME("L4cddTg", PROC_Tag_Lv4CandleDm, -1), - OBJNAME("togeRol", PROC_Obj_Lv6TogeRoll, -1), - OBJNAME("l6TogeT", PROC_Obj_Lv6TogeTrap, -1), - OBJNAME("Tenbin", PROC_Obj_Lv6Tenbin, -1), - OBJNAME("l6Lblk", PROC_Obj_Lv6Lblock, -1), - OBJNAME("l6SwGt", PROC_Obj_Lv6SwGate, -1), - OBJNAME("l6ChBlk", PROC_Obj_Lv6ChgGate, -1), - OBJNAME("l6FuriT", PROC_Obj_Lv6FuriTrap, -1), - OBJNAME("KHdesk", PROC_Obj_BarDesk, -1), - OBJNAME("Ytaihou", PROC_Obj_Ytaihou, -1), - OBJNAME("L4eShut", PROC_Obj_Lv4EdShutter, -1), - OBJNAME("pofire", PROC_Obj_poFire, -1), - OBJNAME("pofiTg", PROC_Tag_poFire, -1), - OBJNAME("poCandl", PROC_Obj_poCandle, -1), - OBJNAME("L4Gate", PROC_Obj_Lv4Gate, -1), - OBJNAME("L4Pgate", PROC_Obj_Lv4PoGate, -1), - OBJNAME("L4SWall", PROC_Obj_Lv4SlideWall, -1), - OBJNAME("L4hmato", PROC_Obj_Lv4HsTarget, -1), - OBJNAME("propy", PROC_Obj_Lv7PropY, -1), - OBJNAME("L7BsGt", PROC_Obj_Lv7BsGate, -1), - OBJNAME("optLift", PROC_Obj_Lv8OptiLift, -1), - OBJNAME("kkiTrap", PROC_Obj_Lv8KekkaiTrap, -1), - OBJNAME("L8LiftX", PROC_Obj_Lv8Lift, -1), - OBJNAME("swStep", PROC_Obj_Lv8UdFloor, -1), - OBJNAME("L9SwSht", PROC_Obj_Lv9SwShutter, -1), - OBJNAME("L5SwIce", PROC_Obj_Lv5SwIce, -1), - OBJNAME("glwSph", PROC_Obj_glowSphere, -1), - OBJNAME("MR_Scrw", PROC_Obj_MirrorScrew, -1), - OBJNAME("MR_Sand", PROC_Obj_MirrorSand, -1), - OBJNAME("MR_Tble", PROC_Obj_MirrorTable, -1), - OBJNAME("MR_Chin", PROC_Obj_MirrorChain, -1), - OBJNAME("MR_Pole", PROC_Obj_Mirror6Pole, -1), - OBJNAME("PPolamp", PROC_PPolamp, -1), - OBJNAME("l5hYuka", PROC_Obj_Lv5FBoard, -1), - OBJNAME("BYRock", PROC_BkyRock, -1), - OBJNAME("zrDrock", PROC_Obj_zrTurara, -1), - OBJNAME("tkrDai", PROC_Obj_TakaraDai, -1), - OBJNAME("Table", PROC_Obj_Table, -1), - OBJNAME("CatDoor", PROC_Obj_CatDoor, -1), - OBJNAME("RetTag", PROC_Tag_RetRoom, -1), - OBJNAME("WdStone", PROC_Obj_WindStone, -1), - OBJNAME("HwlWara", PROC_Tag_WaraHowl, -1), - OBJNAME("SCannon", PROC_Obj_SCannon, -1), - OBJNAME("szGate", PROC_Obj_Lv6SzGate, -1), - OBJNAME("onsTaru", PROC_Obj_OnsenTaru, -1), - OBJNAME("WStoneF", PROC_Obj_SmWStone, -1), - OBJNAME("SCanCrs", PROC_Obj_SCannonCrs, -1), - OBJNAME("snwEfTg", PROC_Tag_SnowEff, -1), - OBJNAME("tmFire", PROC_Obj_TimeFire, -1), - OBJNAME("L7Prop", PROC_Obj_Prop, -1), - OBJNAME("awaPlar", PROC_Obj_awaPlar, -1), - OBJNAME("poTbox", PROC_Obj_poTbox, -1), - OBJNAME("SnwSoup", PROC_Obj_SnowSoup, -1), - OBJNAME("Nagaisu", PROC_Obj_Nagaisu, -1), - OBJNAME("RCircle", PROC_Obj_RCircle, -1), - OBJNAME("L9Chand", PROC_Obj_Chandelier, -1), - OBJNAME("L9Pictr", PROC_Obj_Picture, -1), - OBJNAME("SmkEmt", PROC_Tag_SmkEmt, -1), - OBJNAME("HFtr", PROC_Obj_HFtr, -1), - OBJNAME("HBarrel", PROC_Obj_HBarrel, -1), - OBJNAME("SCanTen", PROC_Obj_SCannonTen, -1), - OBJNAME("cstaSw", PROC_Tag_CstaSw, -1), - OBJNAME("l6cstSw", PROC_Tag_Lv6CstaSw, -1), - OBJNAME("Hata", PROC_Obj_Hata, -1), - OBJNAME("RmbitSw", PROC_Tag_RmbitSw, -1), - OBJNAME("T_Maki", PROC_Obj_ToaruMaki, -1), - OBJNAME("d_act", PROC_DEMO00, -1), - OBJNAME("d_act0", PROC_DEMO00, 0x00), - OBJNAME("d_act1", PROC_DEMO00, 0x01), - OBJNAME("d_act2", PROC_DEMO00, 0x02), - OBJNAME("d_act3", PROC_DEMO00, 0x03), - OBJNAME("d_act4", PROC_DEMO00, 0x04), - OBJNAME("d_act5", PROC_DEMO00, 0x05), - OBJNAME("d_act6", PROC_DEMO00, 0x06), - OBJNAME("d_act7", PROC_DEMO00, 0x07), - OBJNAME("d_act8", PROC_DEMO00, 0x08), - OBJNAME("d_act9", PROC_DEMO00, 0x09), - OBJNAME("d_act10", PROC_DEMO00, 0x0A), - OBJNAME("d_act11", PROC_DEMO00, 0x0B), - OBJNAME("d_act12", PROC_DEMO00, 0x0C), - OBJNAME("d_act13", PROC_DEMO00, 0x0D), - OBJNAME("d_act14", PROC_DEMO00, 0x0E), - OBJNAME("d_act15", PROC_DEMO00, 0x0F), - OBJNAME("d_act16", PROC_DEMO00, 0x10), - OBJNAME("d_act17", PROC_DEMO00, 0x11), - OBJNAME("d_act18", PROC_DEMO00, 0x12), - OBJNAME("d_act19", PROC_DEMO00, 0x13), - OBJNAME("d_act20", PROC_DEMO00, 0x14), - OBJNAME("d_act21", PROC_DEMO00, 0x15), - OBJNAME("d_act22", PROC_DEMO00, 0x16), - OBJNAME("d_act23", PROC_DEMO00, 0x17), - OBJNAME("d_act24", PROC_DEMO00, 0x18), - OBJNAME("d_act25", PROC_DEMO00, 0x19), - OBJNAME("d_act26", PROC_DEMO00, 0x1A), - OBJNAME("d_act27", PROC_DEMO00, 0x1B), - OBJNAME("d_act28", PROC_DEMO00, 0x1C), - OBJNAME("d_act29", PROC_DEMO00, 0x1D), - OBJNAME("d_act30", PROC_DEMO00, 0x1E), - OBJNAME("d_act31", PROC_DEMO00, 0x1F), - OBJNAME("TLogo", PROC_TITLE, -1), + OBJNAME("Grass", fpcNm_GRASS_e, -1), + OBJNAME("kusax1", fpcNm_GRASS_e, -1), + OBJNAME("kusax7", fpcNm_GRASS_e, -1), + OBJNAME("kusax21", fpcNm_GRASS_e, -1), + OBJNAME("flower", fpcNm_GRASS_e, -1), + OBJNAME("flwr7", fpcNm_GRASS_e, -1), + OBJNAME("flwr17", fpcNm_GRASS_e, -1), + OBJNAME("pflower", fpcNm_GRASS_e, -1), + OBJNAME("pflwrx7", fpcNm_GRASS_e, -1), + OBJNAME("door", fpcNm_DOOR20_e, -1), + OBJNAME("kdoor", fpcNm_KNOB20_e, -1), + OBJNAME("ddoor", fpcNm_DBDOOR_e, -1), + OBJNAME("bdoor", fpcNm_BOSS_DOOR_e, -1), + OBJNAME("ndoor", fpcNm_DOOR20_e, -1), + OBJNAME("tadoor", fpcNm_DOOR20_e, -1), + OBJNAME("yodoor", fpcNm_DOOR20_e, -1), + OBJNAME("nadoor", fpcNm_DOOR20_e, -1), + OBJNAME("l9door", fpcNm_DOOR20_e, -1), + OBJNAME("l7door", fpcNm_DOOR20_e, -1), + OBJNAME("pdoor", fpcNm_PushDoor_e, -1), + OBJNAME("bigdoor", fpcNm_DOOR20_e, -1), + OBJNAME("kshtr00", fpcNm_Obj_Kshutter_e, -1), + OBJNAME("vshuter", fpcNm_Obj_Kshutter_e, -1), + OBJNAME("IzmGate", fpcNm_Izumi_Gate_e, -1), + OBJNAME("NoneCam", fpcNm_CAMERA_e, -1), + OBJNAME("NormCam", fpcNm_CAMERA_e, -1), + OBJNAME("Link", fpcNm_ALINK_e, -1), + OBJNAME("carry00", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry01", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry02", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry04", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry05", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry06", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry07", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry08", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry09", fpcNm_Obj_Carry_e, -1), + OBJNAME("ball1", fpcNm_Obj_Carry_e, -1), + OBJNAME("ball2", fpcNm_Obj_Carry_e, -1), + OBJNAME("ball3", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry12", fpcNm_Obj_Carry_e, -1), + OBJNAME("carry13", fpcNm_Obj_Carry_e, -1), + OBJNAME("TagLite", fpcNm_Tag_LightBall_e, -1), + OBJNAME("InoBone", fpcNm_Obj_InoBone_e, -1), + OBJNAME("osiBLK0", fpcNm_Obj_Movebox_e, 0x00), + OBJNAME("dmblk", fpcNm_Obj_Movebox_e, 0x00), + OBJNAME("Kkiba", fpcNm_Obj_Movebox_e, 0x02), + OBJNAME("smblk", fpcNm_Obj_Movebox_e, 0x02), + OBJNAME("Lv4blk", fpcNm_Obj_Movebox_e, -1), + OBJNAME("Lv4blk2", fpcNm_Obj_Movebox_e, -1), + OBJNAME("gstone", fpcNm_Obj_Movebox_e, -1), + OBJNAME("TagAtt", fpcNm_Tag_Attp_e, -1), + OBJNAME("mmvbg", fpcNm_SET_BG_OBJ_e, -1), + OBJNAME("Drop", fpcNm_Obj_Drop_e, -1), + OBJNAME("BkLeaf", fpcNm_Obj_BkLeaf_e, -1), + OBJNAME("cylwind", fpcNm_Obj_Tornado_e, -1), + OBJNAME("TagTrnd", fpcNm_Obj_Tornado2_e, -1), + OBJNAME("mvstair", fpcNm_Obj_MvStair_e, -1), + OBJNAME("UHDoor", fpcNm_Obj_Cowdoor_e, -1), + OBJNAME("SwBoom", fpcNm_Obj_Swpropeller_e, -1), + OBJNAME("Swboom", fpcNm_Obj_Swpropeller_e, -1), + OBJNAME("BoomSht", fpcNm_Obj_BoomShutter_e, -1), + OBJNAME("haihai", fpcNm_Obj_Hfuta_e, -1), + OBJNAME("stopper", fpcNm_Obj_Stopper_e, -1), + OBJNAME("dstop", fpcNm_Obj_Stopper2_e, -1), + OBJNAME("mhole", fpcNm_Obj_MHole_e, -1), + OBJNAME("mhole2", fpcNm_Obj_MHole_e, -1), + OBJNAME("TagMag", fpcNm_Tag_Magne_e, -1), + OBJNAME("P_Warp", fpcNm_Obj_BossWarp_e, -1), + OBJNAME("fpillar", fpcNm_Obj_FirePillar_e, -1), + OBJNAME("yfire", fpcNm_Obj_FirePillar2_e, -1), + OBJNAME("pfire", fpcNm_Obj_FirePillar2_e, -1), + OBJNAME("Huriko1", fpcNm_Obj_WoodPendulum_e, -1), + OBJNAME("VolBall", fpcNm_Obj_VolcanicBall_e, -1), + OBJNAME("VolBom", fpcNm_Obj_VolcanicBall_e, -1), + OBJNAME("BigVolc", fpcNm_Obj_VolcanicBomb_e, -1), + OBJNAME("geyser", fpcNm_Obj_Geyser_e, -1), + OBJNAME("Cwall", fpcNm_Obj_ChainWall_e, -1), + OBJNAME("Tansu", fpcNm_Obj_Chest_e, -1), + OBJNAME("Onsen", fpcNm_Obj_Onsen_e, -1), + OBJNAME("Obj_bm", fpcNm_Obj_Bemos_e, -1), + OBJNAME("lv6bm", fpcNm_Obj_Lv6bemos_e, -1), + OBJNAME("E_bm6", fpcNm_Obj_Lv6bemos2_e, -1), + OBJNAME("stone", fpcNm_Obj_Stone_e, -1), + OBJNAME("stoneB", fpcNm_Obj_Stone_e, -1), + OBJNAME("TagSpin", fpcNm_Tag_Spinner_e, -1), + OBJNAME("L_RopeS", fpcNm_Obj_RopeBridge_e, -1), + OBJNAME("L_RopeB", fpcNm_Obj_RopeBridge_e, -1), + OBJNAME("wcover", fpcNm_Obj_WellCover_e, -1), + OBJNAME("rstair", fpcNm_Obj_RotStair_e, -1), + OBJNAME("marm", fpcNm_Obj_MagneArm_e, -1), + OBJNAME("turnSw", fpcNm_Obj_SwTurn_e, -1), + OBJNAME("chainSw", fpcNm_Obj_SwChain_e, -1), + OBJNAME("wsword", fpcNm_Obj_WoodenSword_e, -1), + OBJNAME("iceblk", fpcNm_Obj_IceBlock_e, -1), + OBJNAME("KkrSmk", fpcNm_Obj_Smoke_e, -1), + OBJNAME("dmele", fpcNm_Obj_Elevator_e, -1), + OBJNAME("wfall", fpcNm_Obj_WaterFall_e, -1), + OBJNAME("izora", fpcNm_Obj_ZoraCloth_e, -1), + OBJNAME("smgdoor", fpcNm_Obj_SmgDoor_e, -1), + OBJNAME("smkdoor", fpcNm_Obj_SmgDoor_e, -1), + OBJNAME("Obj_ava", fpcNm_Obj_Avalanche_e, -1), + OBJNAME("thdoor", fpcNm_Obj_TDoor_e, -1), + OBJNAME("mstrsrd", fpcNm_Obj_MasterSword_e, -1), + OBJNAME("wimage", fpcNm_Obj_WoodStatue_e, -1), + OBJNAME("sword", fpcNm_Obj_Sword_e, -1), + OBJNAME("spring", fpcNm_Tag_Spring_e, -1), + OBJNAME("BkDoorL", fpcNm_Obj_BkDoor_e, -1), + OBJNAME("BkDoorR", fpcNm_Obj_BkDoor_e, -1), + OBJNAME("IGateL", fpcNm_Obj_MGate_e, -1), + OBJNAME("IGateR", fpcNm_Obj_MGate_e, -1), + OBJNAME("HGateL", fpcNm_Obj_MGate_e, -1), + OBJNAME("HGateR", fpcNm_Obj_MGate_e, -1), + OBJNAME("K_Gate", fpcNm_Obj_KkrGate_e, -1), + OBJNAME("R_Gate", fpcNm_Obj_RiderGate_e, -1), + OBJNAME("kkanban", fpcNm_Obj_KKanban_e, -1), + OBJNAME("Mhsg6", fpcNm_Obj_Ladder_e, 0x00), + OBJNAME("Mhsg9", fpcNm_Obj_Ladder_e, 0x01), + OBJNAME("Mhsg12", fpcNm_Obj_Ladder_e, 0x02), + OBJNAME("Mhsg15", fpcNm_Obj_Ladder_e, 0x03), + OBJNAME("Mhsg4h", fpcNm_Obj_Ladder_e, 0x04), + OBJNAME("Mhsg3", fpcNm_Obj_Ladder_e, 0x05), + OBJNAME("bonbori", fpcNm_EP_e, -1), + OBJNAME("Cow", fpcNm_COW_e, -1), + OBJNAME("Peru", fpcNm_PERU_e, -1), + OBJNAME("Kago", fpcNm_KAGO_e, -1), + OBJNAME("TagFall", fpcNm_Tag_WaterFall_e, -1), + OBJNAME("Kbota_A", fpcNm_Obj_Swpush_e, 0x00), + OBJNAME("Kbota_B", fpcNm_Obj_Swpush_e, 0x01), + OBJNAME("KbotaC", fpcNm_Obj_Swpush_e, 0x02), + OBJNAME("Swpush", fpcNm_Obj_Swpush_e, 0x00), + OBJNAME("Lv3bota", fpcNm_Obj_Swpush_e, 0x00), + OBJNAME("Ksw00_C", fpcNm_Obj_Swpush2_e, 0x02), + OBJNAME("hvySw", fpcNm_Obj_Swpush5_e, 0x00), + OBJNAME("buraA", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("buraB", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("buraA2", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("buraB2", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("bura7A", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("bura7B", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("bura7C", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("bura7D", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("bura7E", fpcNm_Obj_SwHang_e, 0x00), + OBJNAME("tbox_sw", fpcNm_TBOX_SW_e, 0x00), + OBJNAME("swLight", fpcNm_Obj_SwLight_e, 0x00), + OBJNAME("iceleaf", fpcNm_Obj_IceLeaf_e, 0x00), + OBJNAME("swHit", fpcNm_SWHIT0_e, 0x00), + OBJNAME("swHit2", fpcNm_SWHIT0_e, 0x01), + OBJNAME("ObjTime", fpcNm_Obj_Timer_e, -1), + OBJNAME("AND_SW", fpcNm_ANDSW_e, -1), + OBJNAME("AND_SW2", fpcNm_ANDSW2_e, -1), + OBJNAME("ALLdie", fpcNm_ALLDIE_e, -1), + OBJNAME("rvback", fpcNm_Tag_RiverBack_e, -1), + OBJNAME("kagoFal", fpcNm_Tag_KagoFall_e, -1), + OBJNAME("CrvGate", fpcNm_Obj_CRVGATE_e, -1), + OBJNAME("CrvSaku", fpcNm_Obj_CRVFENCE_e, -1), + OBJNAME("CrvWood", fpcNm_Obj_CRVHAHEN_e, -1), + OBJNAME("CrvStel", fpcNm_Obj_CRVSTEEL_e, -1), + OBJNAME("CrvLH", fpcNm_Obj_CRVLH_DW_e, -1), + OBJNAME("RvRock", fpcNm_Obj_RIVERROCK_e, -1), + OBJNAME("P2a", fpcNm_NPC_P2_e, 0x00), + OBJNAME("P2b", fpcNm_NPC_P2_e, 0x01), + OBJNAME("P2c", fpcNm_NPC_P2_e, 0x02), + OBJNAME("Gnd", fpcNm_NPC_GND_e, -1), + OBJNAME("grA", fpcNm_NPC_GRA_e, -1), + OBJNAME("Obj_grA", fpcNm_OBJ_GRA_e, -1), + OBJNAME("Tag_grA", fpcNm_TAG_GRA_e, -1), + OBJNAME("TagYami", fpcNm_TAG_YAMI_e, -1), + OBJNAME("grC", fpcNm_NPC_GRC_e, -1), + OBJNAME("grM", fpcNm_NPC_GRM_e, -1), + OBJNAME("grMC", fpcNm_NPC_GRMC_e, -1), + OBJNAME("grS", fpcNm_NPC_GRS_e, -1), + OBJNAME("grD1", fpcNm_NPC_GRD_e, -1), + OBJNAME("grD", fpcNm_NPC_WRESTLER_e, 0x01), + OBJNAME("grR", fpcNm_NPC_GRR_e, -1), + OBJNAME("grO", fpcNm_NPC_GRO_e, -1), + OBJNAME("grZ", fpcNm_NPC_GRZ_e, -1), + OBJNAME("grARock", fpcNm_Obj_GraRock_e, -1), + OBJNAME("grZRock", fpcNm_Obj_GrzRock_e, -1), + OBJNAME("osnFire", fpcNm_OBJ_ONSEN_FIRE_e, -1), + OBJNAME("yamiD", fpcNm_NPC_YAMID_e, -1), + OBJNAME("yamiT", fpcNm_NPC_YAMIT_e, -1), + OBJNAME("yamiS", fpcNm_NPC_YAMIS_e, -1), + OBJNAME("Blue_NS", fpcNm_NPC_BLUENS_e, -1), + OBJNAME("Kakashi", fpcNm_NPC_KAKASHI_e, 0x00), + OBJNAME("Kdk", fpcNm_NPC_KDK_e, -1), + OBJNAME("Aru", fpcNm_NPC_ARU_e, -1), + OBJNAME("Bans", fpcNm_NPC_BANS_e, -1), + OBJNAME("Besu", fpcNm_NPC_BESU_e, -1), + OBJNAME("Bou", fpcNm_NPC_BOU_e, -1), + OBJNAME("BouS", fpcNm_NPC_BOU_S_e, 0x00), + OBJNAME("clerkA", fpcNm_NPC_CLERKA_e, 0x00), + OBJNAME("clerkB", fpcNm_NPC_CLERKB_e, 0x00), + OBJNAME("clerkT", fpcNm_NPC_CLERKT_e, 0x00), + OBJNAME("Ash", fpcNm_NPC_ASH_e, -1), + OBJNAME("AshB", fpcNm_NPC_ASHB_e, -1), + OBJNAME("Shad", fpcNm_NPC_SHAD_e, -1), + OBJNAME("Rafrel", fpcNm_NPC_RAFREL_e, -1), + OBJNAME("MoiR", fpcNm_NPC_MOIR_e, -1), + OBJNAME("impal", fpcNm_NPC_IMPAL_e, -1), + OBJNAME("Coach", fpcNm_NPC_COACH_e, -1), + OBJNAME("TheB", fpcNm_NPC_THEB_e, -1), + OBJNAME("TgArena", fpcNm_Tag_Arena_e, -1), + OBJNAME("TagInst", fpcNm_Tag_Instruction_e, -1), + OBJNAME("GWolf", fpcNm_NPC_GWOLF_e, -1), + OBJNAME("Len", fpcNm_NPC_LEN_e, -1), + OBJNAME("Lud", fpcNm_NPC_LUD_e, -1), + OBJNAME("Doc", fpcNm_NPC_DOC_e, -1), + OBJNAME("FSeirei", fpcNm_NPC_FAIRY_SEIREI_e, -1), + OBJNAME("Fairy", fpcNm_NPC_FAIRY_e, -1), + OBJNAME("Hanjo", fpcNm_NPC_HANJO_e, -1), + OBJNAME("Hoz", fpcNm_NPC_HOZ_e, -1), + OBJNAME("Jagar", fpcNm_NPC_JAGAR_e, -1), + OBJNAME("Kkri", fpcNm_NPC_KKRI_e, -1), + OBJNAME("Kn", fpcNm_NPC_KN_e, -1), + OBJNAME("KnBlt", fpcNm_KN_BULLET_e, -1), + OBJNAME("Knj", fpcNm_NPC_KNJ_e, -1), + OBJNAME("Kolin", fpcNm_NPC_KOLIN_e, -1), + OBJNAME("Kolinb", fpcNm_NPC_KOLINB_e, -1), + OBJNAME("Kyury", fpcNm_NPC_KYURY_e, -1), + OBJNAME("Maro", fpcNm_NPC_MARO_e, -1), + OBJNAME("midP", fpcNm_NPC_MIDP_e, -1), + OBJNAME("Moi", fpcNm_NPC_MOI_e, -1), + OBJNAME("Raca", fpcNm_NPC_RACA_e, -1), + OBJNAME("Post", fpcNm_NPC_POST_e, -1), + OBJNAME("Pouya", fpcNm_NPC_POUYA_e, -1), + OBJNAME("Saru", fpcNm_NPC_SARU_e, -1), + OBJNAME("seiB", fpcNm_NPC_SEIB_e, -1), + OBJNAME("seiC", fpcNm_NPC_SEIC_e, -1), + OBJNAME("seiD", fpcNm_NPC_SEID_e, -1), + OBJNAME("Seira", fpcNm_NPC_SEIRA_e, -1), + OBJNAME("Seira2", fpcNm_NPC_SERA2_e, -1), + OBJNAME("Seirei", fpcNm_NPC_SEIREI_e, -1), + OBJNAME("Sha", fpcNm_NPC_SHAMAN_e, -1), + OBJNAME("sMaro", fpcNm_NPC_SMARO_e, -1), + OBJNAME("solA", fpcNm_NPC_SOLA_e, -1), + OBJNAME("Taro", fpcNm_NPC_TARO_e, -1), + OBJNAME("PA_Besu", fpcNm_NPC_PACHI_BESU_e, -1), + OBJNAME("PA_Taro", fpcNm_NPC_PACHI_TARO_e, -1), + OBJNAME("PA_Maro", fpcNm_NPC_PACHI_MARO_e, -1), + OBJNAME("TagPati", fpcNm_TAG_PATI_e, -1), + OBJNAME("The", fpcNm_NPC_THE_e, -1), + OBJNAME("Tkj", fpcNm_NPC_TKJ_e, -1), + OBJNAME("Tks", fpcNm_NPC_TKS_e, -1), + OBJNAME("ObjTks", fpcNm_OBJ_TKS_e, -1), + OBJNAME("Tkc", fpcNm_NPC_TKC_e, -1), + OBJNAME("Tkj2", fpcNm_NPC_TKJ2_e, -1), + OBJNAME("Toby", fpcNm_NPC_TOBY_e, -1), + OBJNAME("Uri", fpcNm_NPC_URI_e, -1), + OBJNAME("Yelia", fpcNm_NPC_YELIA_e, -1), + OBJNAME("ykM", fpcNm_NPC_YKM_e, -1), + OBJNAME("ykW", fpcNm_NPC_YKW_e, -1), + OBJNAME("zanB", fpcNm_NPC_ZANB_e, -1), + OBJNAME("Zant", fpcNm_NPC_ZANT_e, -1), + OBJNAME("Zelda", fpcNm_NPC_ZELDA_e, -1), + OBJNAME("ZelR", fpcNm_NPC_ZELR_e, -1), + OBJNAME("ZelRo", fpcNm_NPC_ZELRO_e, -1), + OBJNAME("zrA", fpcNm_NPC_ZRA_e, 0x00), + OBJNAME("zrS", fpcNm_NPC_ZRA_e, 0x01), + OBJNAME("zrWF", fpcNm_NPC_ZRA_e, 0x02), + OBJNAME("zrR", fpcNm_NPC_ZRA_e, 0x03), + OBJNAME("zrD", fpcNm_NPC_ZRA_e, 0x04), + OBJNAME("zrSP", fpcNm_NPC_ZRA_e, 0x05), + OBJNAME("zrSPA", fpcNm_NPC_ZRA_e, 0x06), + OBJNAME("zrF", fpcNm_OBJ_ZRAFREEZE_e, 0x00), + OBJNAME("zrF2", fpcNm_OBJ_ZRAFREEZE_e, 0x01), + OBJNAME("zrF3", fpcNm_OBJ_ZRAFREEZE_e, 0x02), + OBJNAME("zrC", fpcNm_NPC_ZRC_e, -1), + OBJNAME("zrZ", fpcNm_NPC_ZRZ_e, -1), + OBJNAME("GrvStn", fpcNm_Obj_GraveStone_e, -1), + OBJNAME("zrARock", fpcNm_Obj_ZraRock_e, -1), + OBJNAME("StAndGl", fpcNm_START_AND_GOAL_e, -1), + OBJNAME("zrAMark", fpcNm_ZRA_MARK_e, -1), + OBJNAME("myna2", fpcNm_MYNA2_e, -1), + OBJNAME("myn2tag", fpcNm_TAG_MYNA2_e, -1), + OBJNAME("MAN_a", fpcNm_NPC_CD3_e, 0x00), + OBJNAME("MAD_a", fpcNm_NPC_CD3_e, 0x01), + OBJNAME("MCN_a", fpcNm_NPC_CD3_e, 0x02), + OBJNAME("MON_a", fpcNm_NPC_CD3_e, 0x03), + OBJNAME("MAN_b", fpcNm_NPC_CD3_e, 0x04), + OBJNAME("MAN_c", fpcNm_NPC_CD3_e, 0x05), + OBJNAME("MAS_a", fpcNm_NPC_CD3_e, 0x06), + OBJNAME("MBN_a", fpcNm_NPC_CD3_e, 0x07), + OBJNAME("MAN_a2", fpcNm_NPC_CD3_e, 0x08), + OBJNAME("MAD_a2", fpcNm_NPC_CD3_e, 0x09), + OBJNAME("MCN_a2", fpcNm_NPC_CD3_e, 0x0A), + OBJNAME("MON_a2", fpcNm_NPC_CD3_e, 0x0B), + OBJNAME("MAN_b2", fpcNm_NPC_CD3_e, 0x0C), + OBJNAME("MAN_c2", fpcNm_NPC_CD3_e, 0x0D), + OBJNAME("MAS_a2", fpcNm_NPC_CD3_e, 0x0E), + OBJNAME("MBN_a2", fpcNm_NPC_CD3_e, 0x0F), + OBJNAME("WAN_a", fpcNm_NPC_CD3_e, 0x10), + OBJNAME("WAD_a", fpcNm_NPC_CD3_e, 0x11), + OBJNAME("MAT_a", fpcNm_NPC_CD3_e, 0x12), + OBJNAME("WCN_a", fpcNm_NPC_CD3_e, 0x13), + OBJNAME("WON_a", fpcNm_NPC_CD3_e, 0x14), + OBJNAME("WGN_a", fpcNm_NPC_CD3_e, 0x15), + OBJNAME("WAN_b", fpcNm_NPC_CD3_e, 0x16), + OBJNAME("WAN_a2", fpcNm_NPC_CD3_e, 0x17), + OBJNAME("WAD_a2", fpcNm_NPC_CD3_e, 0x18), + OBJNAME("MAT_a2", fpcNm_NPC_CD3_e, 0x19), + OBJNAME("WCN_a2", fpcNm_NPC_CD3_e, 0x1A), + OBJNAME("WON_a2", fpcNm_NPC_CD3_e, 0x1B), + OBJNAME("WGN_a2", fpcNm_NPC_CD3_e, 0x1C), + OBJNAME("WAN_b2", fpcNm_NPC_CD3_e, 0x1D), + OBJNAME("shoe", fpcNm_NPC_SHOE_e, -1), + OBJNAME("DoorBoy", fpcNm_NPC_DOORBOY_e, -1), + OBJNAME("prayer", fpcNm_NPC_PRAYER_e, -1), + OBJNAME("km_Hana", fpcNm_NPC_KASIHANA_e, -1), + OBJNAME("km_Kyu", fpcNm_NPC_KASIKYU_e, -1), + OBJNAME("km_Mich", fpcNm_NPC_KASIMICH_e, -1), + OBJNAME("NpcChat", fpcNm_NPC_CHAT_e, -1), + OBJNAME("chtSolA", fpcNm_NPC_SOLDIERa_e, -1), + OBJNAME("chtSolB", fpcNm_NPC_SOLDIERb_e, -1), + OBJNAME("DrSol1", fpcNm_NPC_DRSOL_e, 0x00), + OBJNAME("DrSol2", fpcNm_NPC_DRSOL_e, 0x01), + OBJNAME("chin", fpcNm_NPC_CHIN_e, -1), + OBJNAME("ins", fpcNm_NPC_INS_e, -1), + OBJNAME("Shop0", fpcNm_NPC_SHOP0_e, -1), + OBJNAME("TagSch", fpcNm_Tag_Schedule_e, -1), + OBJNAME("TagEsc", fpcNm_Tag_Escape_e, -1), + OBJNAME("passer", fpcNm_PASSER_MNG_e, 0x00), + OBJNAME("passerL", fpcNm_PASSER_MNG_e, 0x01), + OBJNAME("fmtion", fpcNm_FORMATION_MNG_e, 0x00), + OBJNAME("fmtionL", fpcNm_FORMATION_MNG_e, 0x01), + OBJNAME("guard", fpcNm_GUARD_MNG_e, -1), + OBJNAME("TgGuard", fpcNm_TAG_GUARD_e, -1), + OBJNAME("Mk", fpcNm_NPC_MK_e, -1), + OBJNAME("Obj_Tbi", fpcNm_Obj_Yobikusa_e, 0x00), + OBJNAME("Obj_Uma", fpcNm_Obj_Yobikusa_e, 0x01), + OBJNAME("Obj_knk", fpcNm_Obj_KazeNeko_e, -1), + OBJNAME("Obj_nmp", fpcNm_Obj_NamePlate_e, -1), + OBJNAME("Obj_Tie", fpcNm_Obj_OnCloth_e, -1), + OBJNAME("Obj_Lrp", fpcNm_Obj_LndRope_e, -1), + OBJNAME("Obj_Sit", fpcNm_Obj_ItaRope_e, -1), + OBJNAME("Ikada", fpcNm_Obj_Ikada_e, -1), + OBJNAME("Dust", fpcNm_Obj_DUST_e, -1), + OBJNAME("Obj_Ita", fpcNm_Obj_ITA_e, -1), + OBJNAME("Ice_l", fpcNm_Obj_Ice_l_e, -1), + OBJNAME("Ice_s", fpcNm_Obj_Ice_s_e, -1), + OBJNAME("E_Make", fpcNm_Obj_E_CREATE_e, -1), + OBJNAME("Bhhashi", fpcNm_Obj_Bhbridge_e, -1), + OBJNAME("Yousei", fpcNm_Obj_Yousei_e, -1), + OBJNAME("G_Kabe", fpcNm_Obj_GOMIKABE_e, -1), + OBJNAME("B_ling", fpcNm_Obj_Mato_e, -1), + OBJNAME("kab_o", fpcNm_Obj_Kabuto_e, -1), + OBJNAME("I_Cho", fpcNm_Obj_Cho_e, -1), + OBJNAME("I_Kuw", fpcNm_Obj_Kuw_e, -1), + OBJNAME("I_Nan", fpcNm_Obj_Nan_e, -1), + OBJNAME("I_Dan", fpcNm_Obj_Dan_e, -1), + OBJNAME("I_Kam", fpcNm_Obj_Kam_e, -1), + OBJNAME("I_Ten", fpcNm_Obj_Ten_e, -1), + OBJNAME("I_Ari", fpcNm_Obj_Ari_e, -1), + OBJNAME("I_Kag", fpcNm_Obj_Kag_e, -1), + OBJNAME("I_Tom", fpcNm_Obj_Tombo_e, -1), + OBJNAME("I_Bat", fpcNm_Obj_Batta_e, -1), + OBJNAME("I_Kat", fpcNm_Obj_Kat_e, -1), + OBJNAME("H_Saku", fpcNm_Obj_H_Saku_e, -1), + OBJNAME("sm_door", fpcNm_Obj_SM_DOOR_e, -1), + OBJNAME("Kaisou", fpcNm_Obj_Kaisou_e, -1), + OBJNAME("Ni", fpcNm_NI_e, -1), + OBJNAME("Fr", fpcNm_FR_e, -1), + OBJNAME("Sq", fpcNm_SQ_e, -1), + OBJNAME("Bd", fpcNm_BD_e, -1), + OBJNAME("Obj_ki", fpcNm_OBJ_KI_e, -1), + OBJNAME("Do", fpcNm_DO_e, -1), + OBJNAME("Lm", fpcNm_NPC_FISH_e, 0x00), + OBJNAME("Tr", fpcNm_NPC_FISH_e, 0x05), + OBJNAME("Npc_tr", fpcNm_NPC_TR_e, -1), + OBJNAME("Npc_lf", fpcNm_NPC_LF_e, -1), + OBJNAME("Fish", fpcNm_MG_FISH_e, -1), + OBJNAME("NPC_TK", fpcNm_NPC_TK_e, -1), + OBJNAME("Obj_fd", fpcNm_OBJ_FOOD_e, -1), + OBJNAME("MYNA", fpcNm_MYNA_e, -1), + OBJNAME("SSITEM", fpcNm_OBJ_SSITEM_e, -1), + OBJNAME("SSDRINK", fpcNm_OBJ_SSDRINK_e, -1), + OBJNAME("TGDRINK", fpcNm_TAG_SSDRINK_e, -1), + OBJNAME("Tag_Btl", fpcNm_TAG_BTLITM_e, -1), + OBJNAME("lv5soup", fpcNm_TAG_LV5SOUP_e, -1), + OBJNAME("TGMNLIG", fpcNm_TAG_MNLIGHT_e, -1), + OBJNAME("TGSPCAM", fpcNm_TAG_SHOPCAM_e, -1), + OBJNAME("TGSPITM", fpcNm_TAG_SHOPITM_e, -1), + OBJNAME("OilTubo", fpcNm_OBJ_OILTUBO_e, -1), + OBJNAME("Roten", fpcNm_OBJ_ROTEN_e, -1), + OBJNAME("Pleaf", fpcNm_OBJ_PLEAF_e, -1), + OBJNAME("KBacket", fpcNm_OBJ_KBACKET_e, -1), + OBJNAME("YBag", fpcNm_OBJ_YBAG_e, -1), + OBJNAME("Pumpkin", fpcNm_OBJ_PUMPKIN_e, -1), + OBJNAME("Obj_kg", fpcNm_OBJ_KAGO_e, -1), + OBJNAME("BbKago", fpcNm_OBJ_KAGO_e, 0x00), + OBJNAME("OnKago", fpcNm_OBJ_KAGO_e, 0x01), + OBJNAME("ObjHasi", fpcNm_Obj_HHASHI_e, -1), + OBJNAME("Thashi", fpcNm_Obj_THASHI_e, -1), + OBJNAME("B_Hashi", fpcNm_Obj_BHASHI_e, -1), + OBJNAME("E_MD", fpcNm_E_MD_e, -1), + OBJNAME("E_s1", fpcNm_E_S1_e, -1), + OBJNAME("E_wb", fpcNm_E_WB_e, -1), + OBJNAME("E_rd", fpcNm_E_RD_e, -1), + OBJNAME("E_rdb", fpcNm_E_RDB_e, -1), + OBJNAME("E_rdy", fpcNm_E_RDY_e, -1), + OBJNAME("E_fm", fpcNm_E_FM_e, -1), + OBJNAME("E_dn", fpcNm_E_DN_e, -1), + OBJNAME("E_mf", fpcNm_E_MF_e, -1), + OBJNAME("TreeSh", fpcNm_TREESH_e, -1), + OBJNAME("E_bug", fpcNm_E_BUG_e, -1), + OBJNAME("E_bee", fpcNm_E_BEE_e, -1), + OBJNAME("E_nest", fpcNm_E_NEST_e, -1), + OBJNAME("E_kr", fpcNm_E_KR_e, -1), + OBJNAME("E_st", fpcNm_E_ST_e, -1), + OBJNAME("E_tk", fpcNm_E_TK_e, -1), + OBJNAME("E_tk2", fpcNm_E_TK2_e, -1), + OBJNAME("E_th", fpcNm_E_TH_e, -1), + OBJNAME("E_cr", fpcNm_E_CR_e, -1), + OBJNAME("E_df", fpcNm_E_DF_e, -1), + OBJNAME("E_ph", fpcNm_E_PH_e, -1), + OBJNAME("E_fs", fpcNm_E_FS_e, -1), + OBJNAME("E_SB", fpcNm_E_SB_e, -1), + OBJNAME("E_HM", fpcNm_E_HM_e, -1), + OBJNAME("E_fk", fpcNm_E_FK_e, -1), + OBJNAME("E_pm", fpcNm_E_PM_e, -1), + OBJNAME("Npc_ne", fpcNm_NPC_NE_e, -1), + OBJNAME("E_db", fpcNm_E_DB_e, -1), + OBJNAME("E_kg", fpcNm_E_KG_e, -1), + OBJNAME("E_sh", fpcNm_E_SH_e, -1), + OBJNAME("E_sf", fpcNm_E_SF_e, -1), + OBJNAME("Obj_lb", fpcNm_OBJ_LBOX_e, -1), + OBJNAME("Obj_kb", fpcNm_OBJ_KBOX_e, -1), + OBJNAME("E_bs", fpcNm_E_BS_e, -1), + OBJNAME("Sekizoa", fpcNm_OBJ_SEKIZOA_e, 0x00), + OBJNAME("Sekizob", fpcNm_OBJ_SEKIZOA_e, 0x01), + OBJNAME("E_sm", fpcNm_E_SM_e, -1), + OBJNAME("E_sm2", fpcNm_E_SM2_e, -1), + OBJNAME("ky_tag0", fpcNm_KYTAG00_e, -1), + OBJNAME("ky_tag1", fpcNm_KYTAG01_e, 0x00), + OBJNAME("ky_tag2", fpcNm_KYTAG02_e, -1), + OBJNAME("ky_tag3", fpcNm_KYTAG01_e, 0x01), + OBJNAME("kytag3", fpcNm_KYTAG03_e, -1), + OBJNAME("DK_tag", fpcNm_KYTAG04_e, -1), + OBJNAME("PPHole", fpcNm_KYTAG05_e, -1), + OBJNAME("KY_chg", fpcNm_KYTAG06_e, -1), + OBJNAME("Plight", fpcNm_KYTAG07_e, -1), + OBJNAME("KY_mk", fpcNm_KYTAG08_e, -1), + OBJNAME("Bound", fpcNm_KYTAG09_e, -1), + OBJNAME("WC_tag", fpcNm_KYTAG01_e, 0x02), + OBJNAME("Sparks", fpcNm_KYTAG10_e, -1), + OBJNAME("Tcntrl", fpcNm_KYTAG11_e, -1), + OBJNAME("Drkmst", fpcNm_KYTAG12_e, -1), + OBJNAME("Blsnow", fpcNm_KYTAG13_e, -1), + OBJNAME("Savmem", fpcNm_KYTAG14_e, -1), + OBJNAME("Zshake", fpcNm_KYTAG15_e, -1), + OBJNAME("Pikari", fpcNm_KYTAG16_e, -1), + OBJNAME("Lmask", fpcNm_KYTAG17_e, -1), + OBJNAME("E_is", fpcNm_E_IS_e, -1), + OBJNAME("E_ai", fpcNm_E_AI_e, -1), + OBJNAME("E_ba", fpcNm_E_BA_e, -1), + OBJNAME("E_bu", fpcNm_E_BU_e, -1), + OBJNAME("E_sw", fpcNm_E_SW_e, -1), + OBJNAME("E_ge", fpcNm_E_GE_e, -1), + OBJNAME("TagGe", fpcNm_Tag_WatchGe_e, -1), + OBJNAME("E_ym", fpcNm_E_YM_e, -1), + OBJNAME("E_ymt", fpcNm_E_YM_TAG_e, -1), + OBJNAME("E_ymb", fpcNm_E_YMB_e, -1), + OBJNAME("Fwall", fpcNm_Tag_FWall_e, -1), + OBJNAME("E_hz", fpcNm_E_HZ_e, -1), + OBJNAME("E_ws", fpcNm_E_WS_e, -1), + OBJNAME("E_oc", fpcNm_E_OC_e, -1), + OBJNAME("E_dt", fpcNm_E_DT_e, -1), + OBJNAME("E_bg", fpcNm_E_BG_e, -1), + OBJNAME("E_octbg", fpcNm_E_OctBg_e, -1), + OBJNAME("E_tt", fpcNm_E_TT_e, -1), + OBJNAME("E_dk", fpcNm_E_DK_e, -1), + OBJNAME("E_vt", fpcNm_E_VT_e, -1), + OBJNAME("E_ww", fpcNm_E_WW_e, -1), + OBJNAME("E_gi", fpcNm_E_GI_e, -1), + OBJNAME("E_mk", fpcNm_E_MK_e, -1), + OBJNAME("B_gm", fpcNm_B_GM_e, -1), + OBJNAME("E_gm", fpcNm_E_GM_e, -1), + OBJNAME("E_gs", fpcNm_E_GS_e, -1), + OBJNAME("Npc_ne", fpcNm_NPC_NE_e, -1), + OBJNAME("Obj_gm", fpcNm_OBJ_GM_e, -1), + OBJNAME("E_mm", fpcNm_E_MM_e, -1), + OBJNAME("E_mm2", fpcNm_E_MM_e, 0x01), + OBJNAME("E_fz", fpcNm_E_FZ_e, -1), + OBJNAME("E_fb", fpcNm_E_FB_e, -1), + OBJNAME("E_Zs", fpcNm_E_ZS_e, -1), + OBJNAME("E_kk", fpcNm_E_KK_e, -1), + OBJNAME("E_hp", fpcNm_E_HP_e, -1), + OBJNAME("E_zh", fpcNm_E_ZH_e, -1), + OBJNAME("E_zm", fpcNm_E_ZM_e, -1), + OBJNAME("E_zm2", fpcNm_E_ZM_e, 0x01), + OBJNAME("E_pz", fpcNm_E_PZ_e, -1), + OBJNAME("Kita", fpcNm_OBJ_KITA_e, -1), + OBJNAME("E_nz", fpcNm_E_NZ_e, -1), + OBJNAME("E_po", fpcNm_E_PO_e, -1), + OBJNAME("Obj_w0", fpcNm_OBJ_WEB0_e, -1), + OBJNAME("Obj_w1", fpcNm_OBJ_WEB1_e, -1), + OBJNAME("Obj_cb", fpcNm_OBJ_CB_e, -1), + OBJNAME("Obj_mak", fpcNm_OBJ_MAKI_e, -1), + OBJNAME("Obj_brg", fpcNm_OBJ_BRG_e, -1), + OBJNAME("E_rb", fpcNm_E_RB_e, -1), + OBJNAME("E_sg", fpcNm_E_SG_e, -1), + OBJNAME("Obj_tby", fpcNm_OBJ_TOBY_e, -1), + OBJNAME("Obj_sw", fpcNm_OBJ_SW_e, -1), + OBJNAME("Npc_ks", fpcNm_NPC_KS_e, -1), + OBJNAME("Obj_so", fpcNm_OBJ_SO_e, -1), + OBJNAME("E_bi", fpcNm_E_BI_e, -1), + OBJNAME("Obj_key", fpcNm_OBJ_KEY_e, -1), + OBJNAME("E_hb", fpcNm_E_HB_e, -1), + OBJNAME("Obj_hb", fpcNm_OBJ_HB_e, -1), + OBJNAME("B_bq", fpcNm_B_BQ_e, -1), + OBJNAME("B_bh", fpcNm_B_BH_e, -1), + OBJNAME("B_go", fpcNm_B_GO_e, -1), + OBJNAME("Obj_fw", fpcNm_OBJ_FW_e, -1), + OBJNAME("E_ga", fpcNm_E_GA_e, -1), + OBJNAME("E_gb", fpcNm_E_GB_e, -1), + OBJNAME("E_wap", fpcNm_E_WAP_e, -1), + OBJNAME("Obj_sui", fpcNm_OBJ_SUISYA_e, -1), + OBJNAME("Obj_bal", fpcNm_OBJ_BALLOON_e, -1), + OBJNAME("Obj_lp", fpcNm_OBJ_LP_e, -1), + OBJNAME("Obj_nd", fpcNm_OBJ_NDOOR_e, -1), + OBJNAME("Obj_ud", fpcNm_OBJ_UDOOR_e, -1), + OBJNAME("Obj_us", fpcNm_OBJ_USAKU_e, -1), + OBJNAME("Obj_kn2", fpcNm_OBJ_KANBAN2_e, -1), + OBJNAME("Obj_kyh", fpcNm_OBJ_KEYHOLE_e, -1), + OBJNAME("Bed", fpcNm_OBJ_BED_e, -1), + OBJNAME("BouMato", fpcNm_OBJ_BOUMATO_e, -1), + OBJNAME("AutoMt", fpcNm_OBJ_AUTOMATA_e, -1), + OBJNAME("Gadget", fpcNm_OBJ_GADGET_e, -1), + OBJNAME("ItaMato", fpcNm_OBJ_ITAMATO_e, -1), + OBJNAME("Nougu", fpcNm_OBJ_NOUGU_e, -1), + OBJNAME("Stick", fpcNm_OBJ_STICK_e, -1), + OBJNAME("Mie", fpcNm_OBJ_MIE_e, -1), + OBJNAME("SkDoor", fpcNm_OBJ_SEKIDOOR_e, -1), + OBJNAME("Sekizo", fpcNm_OBJ_SEKIZO_e, -1), + OBJNAME("SMTile", fpcNm_OBJ_SMTILE_e, -1), + OBJNAME("H_kage", fpcNm_OBJ_KAGE_e, -1), + OBJNAME("E_ms", fpcNm_E_MS_e, -1), + OBJNAME("Obj_tp", fpcNm_OBJ_TP_e, -1), + OBJNAME("Obj_ms", fpcNm_OBJ_MSIMA_e, -1), + OBJNAME("E_gob", fpcNm_E_GOB_e, -1), + OBJNAME("E_yk", fpcNm_E_YK_e, -1), + OBJNAME("E_yr", fpcNm_E_YR_e, -1), + OBJNAME("E_yg", fpcNm_E_YG_e, -1), + OBJNAME("Obj_fm", fpcNm_OBJ_FMOBJ_e, -1), + OBJNAME("B_ob", fpcNm_B_OB_e, -1), + OBJNAME("OcHashi", fpcNm_OCTHASHI_e, -1), + OBJNAME("E_dd", fpcNm_E_DD_e, -1), + OBJNAME("Obj_rw", fpcNm_OBJ_RW_e, -1), + OBJNAME("Obj_ih", fpcNm_OBJ_IHASI_e, -1), + OBJNAME("E_yc", fpcNm_E_YC_e, -1), + OBJNAME("B_ds", fpcNm_B_DS_e, -1), + OBJNAME("B_dr", fpcNm_B_DR_e, -1), + OBJNAME("B_gg", fpcNm_B_GG_e, -1), + OBJNAME("B_yo", fpcNm_B_YO_e, -1), + OBJNAME("B_tn", fpcNm_B_TN_e, -1), + OBJNAME("B_zant", fpcNm_B_ZANT_e, -1), + OBJNAME("B_zntm", fpcNm_B_ZANTZ_e, -1), + OBJNAME("B_znts", fpcNm_B_ZANTS_e, -1), + OBJNAME("E_yd", fpcNm_E_YD_e, -1), + OBJNAME("E_yh", fpcNm_E_YH_e, -1), + OBJNAME("Henna", fpcNm_NPC_HENNA_e, -1), + OBJNAME("Henna0", fpcNm_NPC_HENNA0_e, -1), + OBJNAME("Npc_du", fpcNm_NPC_DU_e, 0x00), + OBJNAME("Econt", fpcNm_ECONT_e, -1), + OBJNAME("B_mgn", fpcNm_B_MGN_e, -1), + OBJNAME("Hzelda", fpcNm_E_HZELDA_e, -1), + OBJNAME("Worm", fpcNm_NPC_WORM_e, -1), + OBJNAME("B_gnd", fpcNm_B_GND_e, -1), + OBJNAME("Obj_gb", fpcNm_OBJ_GB_e, -1), + OBJNAME("tboxA0", fpcNm_TBOX_e, -1), + OBJNAME("tboxA1", fpcNm_TBOX_e, -1), + OBJNAME("tboxA2", fpcNm_TBOX_e, -1), + OBJNAME("tboxB0", fpcNm_TBOX_e, -1), + OBJNAME("tboxB1", fpcNm_TBOX_e, -1), + OBJNAME("tboxB2", fpcNm_TBOX_e, -1), + OBJNAME("tboxJ0", fpcNm_TBOX_e, -1), + OBJNAME("tboxP0", fpcNm_TBOX_e, -1), + OBJNAME("tboxB00", fpcNm_TBOX_e, -1), + OBJNAME("tboxB01", fpcNm_TBOX_e, -1), + OBJNAME("tboxW0", fpcNm_TBOX_e, -1), + OBJNAME("tboxEL0", fpcNm_TBOX2_e, -1), + OBJNAME("tboxEL1", fpcNm_TBOX2_e, -1), + OBJNAME("l8warp", fpcNm_Obj_BossWarp_e, -1), + OBJNAME("L1Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L2Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L3Bdoor", fpcNm_Obj_Kshutter_e, -1), + OBJNAME("L4Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L5Bdoor", fpcNm_L5BOSS_DOOR_e, -1), + OBJNAME("L6Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L7Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L8Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L9Bdoor", fpcNm_L1BOSS_DOOR_e, -1), + OBJNAME("L1Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x01), + OBJNAME("L2Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x02), + OBJNAME("L3Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x03), + OBJNAME("L4Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x04), + OBJNAME("L5Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x05), + OBJNAME("L6Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x06), + OBJNAME("L7Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x07), + OBJNAME("L8Mdoor", fpcNm_L1MBOSS_DOOR_e, 0x08), + OBJNAME("L7door", fpcNm_L1MBOSS_DOOR_e, 0x0A), + OBJNAME("L5door", fpcNm_L1MBOSS_DOOR_e, 0x0B), + OBJNAME("Horse", fpcNm_HORSE_e, -1), + OBJNAME("Canoe", fpcNm_CANOE_e, -1), + OBJNAME("Crope", fpcNm_Obj_Crope_e, -1), + OBJNAME("Cstatue", fpcNm_CSTATUE_e, -1), + OBJNAME("CstaF", fpcNm_CSTAF_e, -1), + OBJNAME("HoZelda", fpcNm_HOZELDA_e, -1), + OBJNAME("Mhint", fpcNm_Tag_Mhint_e, -1), + OBJNAME("Mmsg", fpcNm_Tag_Mmsg_e, -1), + OBJNAME("Mwait", fpcNm_Tag_Mwait_e, -1), + OBJNAME("Mstop", fpcNm_Tag_Mstop_e, -1), + OBJNAME("MstopE", fpcNm_Tag_Mstop_e, -1), + OBJNAME("Hinit", fpcNm_Tag_Hinit_e, -1), + OBJNAME("Hjump", fpcNm_Tag_Hjump_e, -1), + OBJNAME("Hstop", fpcNm_Tag_Hstop_e, -1), + OBJNAME("AJnot", fpcNm_Tag_AJnot_e, -1), + OBJNAME("Wljump", fpcNm_Tag_Wljump_e, -1), + OBJNAME("Sppath", fpcNm_Tag_Sppath_e, -1), + OBJNAME("Stream", fpcNm_Tag_Stream_e, -1), + OBJNAME("Gstart", fpcNm_Tag_Gstart_e, -1), + OBJNAME("TgTGate", fpcNm_Tag_TWGate_e, -1), + OBJNAME("Lv6Gate", fpcNm_Tag_Lv6Gate_e, -1), + OBJNAME("Lv7Gate", fpcNm_Tag_Lv7Gate_e, -1), + OBJNAME("Lv8Gate", fpcNm_Tag_Lv8Gate_e, -1), + OBJNAME("TgTHint", fpcNm_Tag_TheBHint_e, -1), + OBJNAME("TagAsst", fpcNm_Tag_Assist_e, -1), + OBJNAME("Dmidna", fpcNm_DMIDNA_e, -1), + OBJNAME("Fchain", fpcNm_Obj_Fchain_e, -1), + OBJNAME("Wchain", fpcNm_Obj_Wchain_e, -1), + OBJNAME("Cdoor", fpcNm_Obj_Cdoor_e, -1), + OBJNAME("Cgate", fpcNm_Obj_Cdoor_e, -1), + OBJNAME("Water00", fpcNm_GRDWATER_e, -1), + OBJNAME("Digpl", fpcNm_Obj_Digpl_e, -1), + OBJNAME("Digholl", fpcNm_Obj_Digholl_e, -1), + OBJNAME("Bombf", fpcNm_Obj_Bombf_e, -1), + OBJNAME("hider", fpcNm_SUSPEND_e, -1), + OBJNAME("SwAreaC", fpcNm_SWC00_e, -1), + OBJNAME("SwAreaS", fpcNm_SWC00_e, -1), + OBJNAME("SwLBall", fpcNm_SwLBall_e, -1), + OBJNAME("SwBall", fpcNm_SwBall_e, -1), + OBJNAME("thouse", fpcNm_Obj_TobyHouse_e, -1), + OBJNAME("ironbox", fpcNm_Obj_MetalBox_e, -1), + OBJNAME("l6swtrn", fpcNm_Obj_Lv6SwTurn_e, -1), + OBJNAME("l2bmtag", fpcNm_Tag_Lv2PrChk_e, -1), + OBJNAME("swspin", fpcNm_Obj_SwSpinner_e, -1), + OBJNAME("spnGear", fpcNm_Obj_Lv4Gear_e, -1), + OBJNAME("fan", fpcNm_Obj_Fan_e, -1), + OBJNAME("tgake", fpcNm_Obj_Gake_e, -1), + OBJNAME("tmoon", fpcNm_Obj_TMoon_e, -1), + OBJNAME("gwall", fpcNm_Obj_GanonWall_e, -1), + OBJNAME("gwall2", fpcNm_Obj_GanonWall2_e, -1), + OBJNAME("scnChg", fpcNm_SCENE_EXIT_e, -1), + OBJNAME("scnChg2", fpcNm_SCENE_EXIT2_e, -1), + OBJNAME("noChgRm", fpcNm_NO_CHG_ROOM_e, -1), + OBJNAME("readRm", fpcNm_NO_CHG_ROOM_e, 0x00), + OBJNAME("Tetd", fpcNm_DSHUTTER_e, -1), + OBJNAME("fence", fpcNm_DSHUTTER_e, -1), + OBJNAME("lv7saku", fpcNm_DSHUTTER_e, -1), + OBJNAME("YkgrON", fpcNm_Ykgr_e, -1), + OBJNAME("YkgrOFF", fpcNm_Ykgr_e, -1), + OBJNAME("TagEv", fpcNm_TAG_EVENT_e, -1), + OBJNAME("TagEvC", fpcNm_TAG_EVENT_e, -1), + OBJNAME("TagEvt", fpcNm_TAG_EVT_e, 0x00), + OBJNAME("TagEvt1", fpcNm_TAG_EVT_e, 0x01), + OBJNAME("TagHowl", fpcNm_TAG_HOWL_e, 0x01), + OBJNAME("Tag_ms", fpcNm_TAG_MSG_e, 0x00), + OBJNAME("LntnTag", fpcNm_TAG_LANTERN_e, -1), + OBJNAME("EvtArea", fpcNm_TAG_EVTAREA_e, -1), + OBJNAME("AllMato", fpcNm_TAG_ALLMATO_e, -1), + OBJNAME("EvtMsg", fpcNm_TAG_EVTMSG_e, -1), + OBJNAME("KMsg", fpcNm_TAG_KMSG_e, -1), + OBJNAME("Push", fpcNm_TAG_PUSH_e, -1), + OBJNAME("Teloper", fpcNm_TAG_TELOP_e, -1), + OBJNAME("CamChg", fpcNm_TAG_CAMERA_e, -1), + OBJNAME("CamArea", fpcNm_TAG_CAMERA_e, -1), + OBJNAME("CamAreC", fpcNm_TAG_CAMERA_e, -1), + OBJNAME("ChkPntS", fpcNm_TAG_CHKPOINT_e, -1), + OBJNAME("ChkPntC", fpcNm_TAG_CHKPOINT_e, -1), + OBJNAME("setball", fpcNm_Tag_SetBall_e, -1), + OBJNAME("atkItem", fpcNm_Tag_AttackItem_e, -1), + OBJNAME("TagStat", fpcNm_Tag_Statue_e, -1), + OBJNAME("zdoor", fpcNm_Obj_ZDoor_e, -1), + OBJNAME("rdoor", fpcNm_Obj_ZDoor_e, -1), + OBJNAME("STDoa", fpcNm_Obj_ZDoor_e, -1), + OBJNAME("hasi00", fpcNm_Obj_Pillar_e, -1), + OBJNAME("hasi01", fpcNm_Obj_Pillar_e, -1), + OBJNAME("window", fpcNm_Obj_Window_e, -1), + OBJNAME("bbox", fpcNm_Obj_BBox_e, -1), + OBJNAME("spiralC", fpcNm_Obj_Lv3R10Saka_e, -1), + OBJNAME("spiral2", fpcNm_Obj_Lv3R10Saka_e, -1), + OBJNAME("digsnow", fpcNm_Obj_DigSnow_e, -1), + OBJNAME("digsand", fpcNm_Obj_Lv4DigSand_e, -1), + OBJNAME("fallobj", fpcNm_Obj_FallObj_e, -1), + OBJNAME("l7brg", fpcNm_Obj_Lv7Bridge_e, -1), + OBJNAME("dr", fpcNm_DR_e, -1), + OBJNAME("L7lowDr", fpcNm_L7lowDr_e, -1), + OBJNAME("swTime", fpcNm_SwTime_e, -1), + OBJNAME("pdrobj", fpcNm_Obj_PushDoor_e, -1), + OBJNAME("crystal", fpcNm_Obj_Crystal_e, -1), + OBJNAME("WarpBrg", fpcNm_Obj_KakarikoBrg_e, -1), + OBJNAME("WarpB2", fpcNm_Obj_KakarikoBrg_e, -1), + OBJNAME("WarpOB1", fpcNm_Obj_OrdinBrg_e, 0x00), + OBJNAME("WarpOB2", fpcNm_Obj_OrdinBrg_e, 0x01), + OBJNAME("VolcGnd", fpcNm_Obj_VolcGnd_e, -1), + OBJNAME("r09wtr", fpcNm_Obj_WaterEff_e, -1), + OBJNAME("ballSw", fpcNm_Obj_SwBallA_e, -1), + OBJNAME("lballSw", fpcNm_Obj_SwBallB_e, -1), + OBJNAME("lbsw", fpcNm_Obj_SwBallC_e, -1), + OBJNAME("R50Sand", fpcNm_Obj_Lv4Sand_e, -1), + OBJNAME("rwall", fpcNm_Obj_Lv4RailWall_e, -1), + OBJNAME("l4brg", fpcNm_Obj_Lv4Bridge_e, -1), + OBJNAME("l4floor", fpcNm_Obj_Lv4Floor_e, -1), + OBJNAME("item", fpcNm_ITEM_e, -1), + OBJNAME("itemKey", fpcNm_Obj_SmallKey_e, -1), + OBJNAME("kantera", fpcNm_Obj_Kantera_e, -1), + OBJNAME("witem", fpcNm_ITEM_e, -1), + OBJNAME("wshield", fpcNm_Obj_Shield_e, -1), + OBJNAME("htPiece", fpcNm_Obj_LifeContainer_e, -1), + OBJNAME("htCase", fpcNm_Obj_LifeContainer_e, -1), + OBJNAME("Mbrid15", fpcNm_Obj_RotBridge_e, -1), + OBJNAME("Mbrid9", fpcNm_Obj_RotBridge_e, -1), + OBJNAME("maglift", fpcNm_Obj_MagLift_e, -1), + OBJNAME("Cldst00", fpcNm_Obj_Lv1Cdl00_e, -1), + OBJNAME("Cldst01", fpcNm_Obj_Lv1Cdl01_e, -1), + OBJNAME("RMback0", fpcNm_Tag_Restart_e, -1), + OBJNAME("RMback1", fpcNm_Tag_ChgRestart_e, -1), + OBJNAME("Mist", fpcNm_Tag_Mist_e, -1), + OBJNAME("magLifR", fpcNm_Obj_MagLiftRot_e, -1), + OBJNAME("TCdlst", fpcNm_Obj_TvCdlst_e, -1), + OBJNAME("wdstick", fpcNm_Obj_WdStick_e, -1), + OBJNAME("stBlock", fpcNm_Obj_StairBlock_e, -1), + OBJNAME("hsMato", fpcNm_Obj_HsTarget_e, -1), + OBJNAME("ktFire", fpcNm_Tag_KtOnFire_e, -1), + OBJNAME("hswitch", fpcNm_Obj_HeavySw_e, -1), + OBJNAME("goGate", fpcNm_Obj_GoGate_e, -1), + OBJNAME("taAmi", fpcNm_Obj_TaFence_e, -1), + OBJNAME("fireWd", fpcNm_Obj_FireWood_e, -1), + OBJNAME("fireWd2", fpcNm_Obj_FireWood2_e, -1), + OBJNAME("altar", fpcNm_Obj_Saidan_e, -1), + OBJNAME("gpTaru", fpcNm_Obj_GpTaru_e, -1), + OBJNAME("spinLf", fpcNm_Obj_SpinLift_e, -1), + OBJNAME("bmWin", fpcNm_Obj_BmWindow_e, -1), + OBJNAME("roofHl", fpcNm_Obj_RfHole_e, -1), + OBJNAME("syRock", fpcNm_Obj_SyRock_e, -1), + OBJNAME("wColumn", fpcNm_Obj_WaterPillar_e, -1), + OBJNAME("kpot", fpcNm_Obj_KiPot_e, -1), + OBJNAME("bsGate", fpcNm_Obj_BsGate_e, -1), + OBJNAME("amiShut", fpcNm_Obj_AmiShutter_e, -1), + OBJNAME("kwhel00", fpcNm_Obj_KWheel00_e, -1), + OBJNAME("kwhel01", fpcNm_Obj_KWheel01_e, -1), + OBJNAME("PRElvtr", fpcNm_Obj_PRElvtr_e, -1), + OBJNAME("swhel00", fpcNm_Obj_KWheel00_e, -1), + OBJNAME("M_hasu", fpcNm_Obj_MHasu_e, -1), + OBJNAME("yiblltr", fpcNm_Obj_YIblltray_e, -1), + OBJNAME("l6egate", fpcNm_Obj_Lv6EGate_e, -1), + OBJNAME("l6eleva", fpcNm_Obj_Lv6ElevtA_e, -1), + OBJNAME("wtGate", fpcNm_Obj_WtGate_e, -1), + OBJNAME("candlL2", fpcNm_Obj_Lv2Candle_e, -1), + OBJNAME("togeTp", fpcNm_Obj_TogeTrap_e, -1), + OBJNAME("rotTrap", fpcNm_Obj_RotTrap_e, -1), + OBJNAME("klift00", fpcNm_Obj_KLift00_e, -1), + OBJNAME("l4chand", fpcNm_Obj_Lv4Chan_e, -1), + OBJNAME("Ychndlr", fpcNm_Obj_Ychndlr_e, -1), + OBJNAME("hbmbkoy", fpcNm_Obj_HBombkoya_e, -1), + OBJNAME("TagCsw", fpcNm_TAG_CSW_e, -1), + OBJNAME("TagCswO", fpcNm_TAG_CSW_e, -1), + OBJNAME("P_Rwall", fpcNm_Obj_Lv4PRwall_e, -1), + OBJNAME("PDtile", fpcNm_Obj_PDtile_e, -1), + OBJNAME("PDwall", fpcNm_Obj_PDwall_e, -1), + OBJNAME("Qs", fpcNm_TAG_QS_e, -1), + OBJNAME("mirror", fpcNm_MIRROR_e, -1), + OBJNAME("rGate", fpcNm_Obj_SwallShutter_e, -1), + OBJNAME("l3water", fpcNm_Obj_Lv3Water_e, -1), + OBJNAME("l3wat02", fpcNm_Obj_Lv3Water2_e, -1), + OBJNAME("l3watB", fpcNm_OBJ_LV3WATERB_e, -1), + OBJNAME("szbridg", fpcNm_Obj_SZbridge_e, -1), + OBJNAME("kjgjs", fpcNm_Obj_KJgjs_e, -1), + OBJNAME("kjs", fpcNm_Obj_KJgjs_e, -1), + OBJNAME("candlL3", fpcNm_Obj_Lv3Candle_e, -1), + OBJNAME("l5icewl", fpcNm_Obj_IceWall_e, -1), + OBJNAME("Turara", fpcNm_Obj_Turara_e, -1), + OBJNAME("twGate", fpcNm_Obj_TwGate_e, -1), + OBJNAME("L4cdlTg", fpcNm_Tag_Lv4Candle_e, -1), + OBJNAME("L4cddTg", fpcNm_Tag_Lv4CandleDm_e, -1), + OBJNAME("togeRol", fpcNm_Obj_Lv6TogeRoll_e, -1), + OBJNAME("l6TogeT", fpcNm_Obj_Lv6TogeTrap_e, -1), + OBJNAME("Tenbin", fpcNm_Obj_Lv6Tenbin_e, -1), + OBJNAME("l6Lblk", fpcNm_Obj_Lv6Lblock_e, -1), + OBJNAME("l6SwGt", fpcNm_Obj_Lv6SwGate_e, -1), + OBJNAME("l6ChBlk", fpcNm_Obj_Lv6ChgGate_e, -1), + OBJNAME("l6FuriT", fpcNm_Obj_Lv6FuriTrap_e, -1), + OBJNAME("KHdesk", fpcNm_Obj_BarDesk_e, -1), + OBJNAME("Ytaihou", fpcNm_Obj_Ytaihou_e, -1), + OBJNAME("L4eShut", fpcNm_Obj_Lv4EdShutter_e, -1), + OBJNAME("pofire", fpcNm_Obj_poFire_e, -1), + OBJNAME("pofiTg", fpcNm_Tag_poFire_e, -1), + OBJNAME("poCandl", fpcNm_Obj_poCandle_e, -1), + OBJNAME("L4Gate", fpcNm_Obj_Lv4Gate_e, -1), + OBJNAME("L4Pgate", fpcNm_Obj_Lv4PoGate_e, -1), + OBJNAME("L4SWall", fpcNm_Obj_Lv4SlideWall_e, -1), + OBJNAME("L4hmato", fpcNm_Obj_Lv4HsTarget_e, -1), + OBJNAME("propy", fpcNm_Obj_Lv7PropY_e, -1), + OBJNAME("L7BsGt", fpcNm_Obj_Lv7BsGate_e, -1), + OBJNAME("optLift", fpcNm_Obj_Lv8OptiLift_e, -1), + OBJNAME("kkiTrap", fpcNm_Obj_Lv8KekkaiTrap_e, -1), + OBJNAME("L8LiftX", fpcNm_Obj_Lv8Lift_e, -1), + OBJNAME("swStep", fpcNm_Obj_Lv8UdFloor_e, -1), + OBJNAME("L9SwSht", fpcNm_Obj_Lv9SwShutter_e, -1), + OBJNAME("L5SwIce", fpcNm_Obj_Lv5SwIce_e, -1), + OBJNAME("glwSph", fpcNm_Obj_glowSphere_e, -1), + OBJNAME("MR_Scrw", fpcNm_Obj_MirrorScrew_e, -1), + OBJNAME("MR_Sand", fpcNm_Obj_MirrorSand_e, -1), + OBJNAME("MR_Tble", fpcNm_Obj_MirrorTable_e, -1), + OBJNAME("MR_Chin", fpcNm_Obj_MirrorChain_e, -1), + OBJNAME("MR_Pole", fpcNm_Obj_Mirror6Pole_e, -1), + OBJNAME("PPolamp", fpcNm_PPolamp_e, -1), + OBJNAME("l5hYuka", fpcNm_Obj_Lv5FBoard_e, -1), + OBJNAME("BYRock", fpcNm_BkyRock_e, -1), + OBJNAME("zrDrock", fpcNm_Obj_zrTurara_e, -1), + OBJNAME("tkrDai", fpcNm_Obj_TakaraDai_e, -1), + OBJNAME("Table", fpcNm_Obj_Table_e, -1), + OBJNAME("CatDoor", fpcNm_Obj_CatDoor_e, -1), + OBJNAME("RetTag", fpcNm_Tag_RetRoom_e, -1), + OBJNAME("WdStone", fpcNm_Obj_WindStone_e, -1), + OBJNAME("HwlWara", fpcNm_Tag_WaraHowl_e, -1), + OBJNAME("SCannon", fpcNm_Obj_SCannon_e, -1), + OBJNAME("szGate", fpcNm_Obj_Lv6SzGate_e, -1), + OBJNAME("onsTaru", fpcNm_Obj_OnsenTaru_e, -1), + OBJNAME("WStoneF", fpcNm_Obj_SmWStone_e, -1), + OBJNAME("SCanCrs", fpcNm_Obj_SCannonCrs_e, -1), + OBJNAME("snwEfTg", fpcNm_Tag_SnowEff_e, -1), + OBJNAME("tmFire", fpcNm_Obj_TimeFire_e, -1), + OBJNAME("L7Prop", fpcNm_Obj_Prop_e, -1), + OBJNAME("awaPlar", fpcNm_Obj_awaPlar_e, -1), + OBJNAME("poTbox", fpcNm_Obj_poTbox_e, -1), + OBJNAME("SnwSoup", fpcNm_Obj_SnowSoup_e, -1), + OBJNAME("Nagaisu", fpcNm_Obj_Nagaisu_e, -1), + OBJNAME("RCircle", fpcNm_Obj_RCircle_e, -1), + OBJNAME("L9Chand", fpcNm_Obj_Chandelier_e, -1), + OBJNAME("L9Pictr", fpcNm_Obj_Picture_e, -1), + OBJNAME("SmkEmt", fpcNm_Tag_SmkEmt_e, -1), + OBJNAME("HFtr", fpcNm_Obj_HFtr_e, -1), + OBJNAME("HBarrel", fpcNm_Obj_HBarrel_e, -1), + OBJNAME("SCanTen", fpcNm_Obj_SCannonTen_e, -1), + OBJNAME("cstaSw", fpcNm_Tag_CstaSw_e, -1), + OBJNAME("l6cstSw", fpcNm_Tag_Lv6CstaSw_e, -1), + OBJNAME("Hata", fpcNm_Obj_Hata_e, -1), + OBJNAME("RmbitSw", fpcNm_Tag_RmbitSw_e, -1), + OBJNAME("T_Maki", fpcNm_Obj_ToaruMaki_e, -1), + OBJNAME("d_act", fpcNm_DEMO00_e, -1), + OBJNAME("d_act0", fpcNm_DEMO00_e, 0x00), + OBJNAME("d_act1", fpcNm_DEMO00_e, 0x01), + OBJNAME("d_act2", fpcNm_DEMO00_e, 0x02), + OBJNAME("d_act3", fpcNm_DEMO00_e, 0x03), + OBJNAME("d_act4", fpcNm_DEMO00_e, 0x04), + OBJNAME("d_act5", fpcNm_DEMO00_e, 0x05), + OBJNAME("d_act6", fpcNm_DEMO00_e, 0x06), + OBJNAME("d_act7", fpcNm_DEMO00_e, 0x07), + OBJNAME("d_act8", fpcNm_DEMO00_e, 0x08), + OBJNAME("d_act9", fpcNm_DEMO00_e, 0x09), + OBJNAME("d_act10", fpcNm_DEMO00_e, 0x0A), + OBJNAME("d_act11", fpcNm_DEMO00_e, 0x0B), + OBJNAME("d_act12", fpcNm_DEMO00_e, 0x0C), + OBJNAME("d_act13", fpcNm_DEMO00_e, 0x0D), + OBJNAME("d_act14", fpcNm_DEMO00_e, 0x0E), + OBJNAME("d_act15", fpcNm_DEMO00_e, 0x0F), + OBJNAME("d_act16", fpcNm_DEMO00_e, 0x10), + OBJNAME("d_act17", fpcNm_DEMO00_e, 0x11), + OBJNAME("d_act18", fpcNm_DEMO00_e, 0x12), + OBJNAME("d_act19", fpcNm_DEMO00_e, 0x13), + OBJNAME("d_act20", fpcNm_DEMO00_e, 0x14), + OBJNAME("d_act21", fpcNm_DEMO00_e, 0x15), + OBJNAME("d_act22", fpcNm_DEMO00_e, 0x16), + OBJNAME("d_act23", fpcNm_DEMO00_e, 0x17), + OBJNAME("d_act24", fpcNm_DEMO00_e, 0x18), + OBJNAME("d_act25", fpcNm_DEMO00_e, 0x19), + OBJNAME("d_act26", fpcNm_DEMO00_e, 0x1A), + OBJNAME("d_act27", fpcNm_DEMO00_e, 0x1B), + OBJNAME("d_act28", fpcNm_DEMO00_e, 0x1C), + OBJNAME("d_act29", fpcNm_DEMO00_e, 0x1D), + OBJNAME("d_act30", fpcNm_DEMO00_e, 0x1E), + OBJNAME("d_act31", fpcNm_DEMO00_e, 0x1F), + OBJNAME("TLogo", fpcNm_TITLE_e, -1), #if DEBUG - OBJNAME("unitC00", PROC_Obj_TestCube, -1), - OBJNAME("unitS00", PROC_Obj_TestCube, -1), - OBJNAME("unitCy0", PROC_Obj_TestCube, -1), - OBJNAME("damCps", PROC_Obj_DamCps, -1), - OBJNAME("railDrw", PROC_PATH_LINE, -1), - OBJNAME("sdoor", PROC_SPIRAL_DOOR, -1), + OBJNAME("unitC00", fpcNm_Obj_TestCube_e, -1), + OBJNAME("unitS00", fpcNm_Obj_TestCube_e, -1), + OBJNAME("unitCy0", fpcNm_Obj_TestCube_e, -1), + OBJNAME("damCps", fpcNm_Obj_DamCps_e, -1), + OBJNAME("railDrw", fpcNm_PATH_LINE_e, -1), + OBJNAME("sdoor", fpcNm_SPIRAL_DOOR_e, -1), #endif - OBJNAME("ClearB", PROC_Obj_Cboard, -1), - OBJNAME("Bg", PROC_BG, -1), - OBJNAME("Boom", PROC_BOOMERANG, -1), - OBJNAME("Nbomb", PROC_NBOMB, -1), - OBJNAME("Arrow", PROC_ARROW, -1), - OBJNAME("E_Arrow", PROC_E_ARROW, -1), - OBJNAME("Spinner", PROC_SPINNER, -1), - OBJNAME("Crod", PROC_CROD, -1), - OBJNAME("Midna", PROC_MIDNA, -1), - OBJNAME("Vrbox", PROC_VRBOX, -1), - OBJNAME("Vrbox2", PROC_VRBOX2, -1), - OBJNAME("mvbg_a", PROC_BG_OBJ, -1), - OBJNAME("burnBox", PROC_Obj_BurnBox, -1), - OBJNAME("stnMark", PROC_Obj_StoneMark, -1), + OBJNAME("ClearB", fpcNm_Obj_Cboard_e, -1), + OBJNAME("Bg", fpcNm_BG_e, -1), + OBJNAME("Boom", fpcNm_BOOMERANG_e, -1), + OBJNAME("Nbomb", fpcNm_NBOMB_e, -1), + OBJNAME("Arrow", fpcNm_ARROW_e, -1), + OBJNAME("E_Arrow", fpcNm_E_ARROW_e, -1), + OBJNAME("Spinner", fpcNm_SPINNER_e, -1), + OBJNAME("Crod", fpcNm_CROD_e, -1), + OBJNAME("Midna", fpcNm_MIDNA_e, -1), + OBJNAME("Vrbox", fpcNm_VRBOX_e, -1), + OBJNAME("Vrbox2", fpcNm_VRBOX2_e, -1), + OBJNAME("mvbg_a", fpcNm_BG_OBJ_e, -1), + OBJNAME("burnBox", fpcNm_Obj_BurnBox_e, -1), + OBJNAME("stnMark", fpcNm_Obj_StoneMark_e, -1), #if PLATFORM_GCN - OBJNAME("Passer", PROC_NPC_PASSER, -1), + OBJNAME("Passer", fpcNm_NPC_PASSER_e, -1), #endif - OBJNAME("Passer2", PROC_NPC_PASSER2, -1), - OBJNAME("ShopItm", PROC_ShopItem, -1), - OBJNAME("E_yd_lf", PROC_E_YD_LEAF, -1), - OBJNAME("E_db_lf", PROC_E_DB_LEAF, -1), - OBJNAME("E_hb_lf", PROC_E_HB_LEAF, -1), - OBJNAME("E_bi_lf", PROC_E_BI_LEAF, -1), - OBJNAME("O_Mato", PROC_Obj_Mato, -1), - OBJNAME("O_Flag", PROC_Obj_Flag, -1), - OBJNAME("O_Flag2", PROC_Obj_Flag2, -1), - OBJNAME("O_Flag3", PROC_Obj_Flag3, -1), - OBJNAME("CRVLH_U", PROC_Obj_CRVLH_UP, -1), - OBJNAME("DemoItm", PROC_Demo_Item, -1), - OBJNAME("EndCode", PROC_PLAY_SCENE, -1), + OBJNAME("Passer2", fpcNm_NPC_PASSER2_e, -1), + OBJNAME("ShopItm", fpcNm_ShopItem_e, -1), + OBJNAME("E_yd_lf", fpcNm_E_YD_LEAF_e, -1), + OBJNAME("E_db_lf", fpcNm_E_DB_LEAF_e, -1), + OBJNAME("E_hb_lf", fpcNm_E_HB_LEAF_e, -1), + OBJNAME("E_bi_lf", fpcNm_E_BI_LEAF_e, -1), + OBJNAME("O_Mato", fpcNm_Obj_Mato_e, -1), + OBJNAME("O_Flag", fpcNm_Obj_Flag_e, -1), + OBJNAME("O_Flag2", fpcNm_Obj_Flag2_e, -1), + OBJNAME("O_Flag3", fpcNm_Obj_Flag3_e, -1), + OBJNAME("CRVLH_U", fpcNm_Obj_CRVLH_UP_e, -1), + OBJNAME("DemoItm", fpcNm_Demo_Item_e, -1), + OBJNAME("EndCode", fpcNm_PLAY_SCENE_e, -1), }; // clang-format on @@ -1581,7 +1581,7 @@ static void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_c JKRFree(i_actorPrm); } else { i_actorPrm->argument = actorInf->argument; - if (actorInf->procname == PROC_SUSPEND) { + if (actorInf->procname == fpcNm_SUSPEND_e) { fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_FastCreate(actorInf->procname, NULL, NULL, i_actorPrm); if (actor != NULL) { @@ -1596,7 +1596,7 @@ static void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_c static int dStage_cameraCreate(stage_camera2_data_class* i_cameraData, int i_cameraIdx, int param_2) { - s16 procname = PROC_CAMERA; + s16 procname = fpcNm_CAMERA_e; if (procname < 0) { return 0; } @@ -1688,9 +1688,9 @@ static int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* base_process_class* stageProc = (base_process_class*)fopScnM_SearchByID(dStage_roomControl_c::getProcID()); JUT_ASSERT(1683, stageProc != NULL); - if (fpcM_GetName(stageProc) == PROC_PLAY_SCENE) { + if (fpcM_GetName(stageProc) == fpcNm_PLAY_SCENE_e) { if (strcmp(dComIfGp_getStartStageName(), "S_MV000")) { - fopMsgM_Create(PROC_METER2, NULL, NULL); + fopMsgM_Create(fpcNm_METER2_e, NULL, NULL); } } @@ -2456,10 +2456,10 @@ static int dStage_elstInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, } static void dKankyo_create() { - fopKyM_fastCreate(PROC_KANKYO, 0, NULL, NULL, NULL); - fopKyM_fastCreate(PROC_KYEFF, 0, NULL, NULL, NULL); - fopKyM_fastCreate(PROC_KYEFF2, 0, NULL, NULL, NULL); - fopKyM_fastCreate(PROC_ENVSE, 0, NULL, NULL, NULL); + fopKyM_fastCreate(fpcNm_KANKYO_e, 0, NULL, NULL, NULL); + fopKyM_fastCreate(fpcNm_KYEFF_e, 0, NULL, NULL, NULL); + fopKyM_fastCreate(fpcNm_KYEFF2_e, 0, NULL, NULL, NULL); + fopKyM_fastCreate(fpcNm_ENVSE_e, 0, NULL, NULL, NULL); } static void layerMemoryInfoLoader(void* i_data, dStage_dt_c* i_stage, int param_2) { @@ -2714,8 +2714,8 @@ void dStage_Create() { dKankyo_create(); if (dComIfG_getStageRes("vrbox_sora.bmd")) { - fopAcM_Create(PROC_VRBOX, NULL, NULL); - fopAcM_Create(PROC_VRBOX2, NULL, NULL); + fopAcM_Create(fpcNm_VRBOX_e, NULL, NULL); + fopAcM_Create(fpcNm_VRBOX2_e, NULL, NULL); } dComIfGp_evmng_create(); diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 5dc02014833..bb526cd086e 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -1539,7 +1539,7 @@ static int dTimer_Create(msg_class* i_this) { fpc_ProcID dTimer_createTimer(s32 i_mode, u32 i_limitMs, u8 i_type, u8 param_3, f32 param_4, f32 param_5, f32 param_6, f32 param_7) { if (dComIfG_getTimerMode() == -1) { - return fopMsgM_Timer_create(PROC_TIMER, i_mode, i_limitMs, i_type, param_3, param_4, + return fopMsgM_Timer_create(fpcNm_TIMER_e, i_mode, i_limitMs, i_type, param_3, param_4, param_5, param_6, param_7, NULL); } @@ -1555,7 +1555,7 @@ s32 dTimer_createStockTimer() { return -1; } else { u8 timer_type = dComIfG_getTimerType(); - return fopMsgM_Timer_create(PROC_TIMER, 10, 0, timer_type, 0, 221.0f, 439.0f, 32.0f, + return fopMsgM_Timer_create(fpcNm_TIMER_e, 10, 0, timer_type, 0, 221.0f, 439.0f, 32.0f, 419.0f, NULL); } } else { @@ -1634,15 +1634,15 @@ static leafdraw_method_class l_dTimer_Method = { }; msg_process_profile_definition g_profile_TIMER = { - fpcLy_CURRENT_e, - 12, - fpcPi_CURRENT_e, - PROC_TIMER, - &g_fpcLf_Method.base, - sizeof(dTimer_c), - 0, - 0, - &g_fopMsg_Method, - 768, - &l_dTimer_Method, + /* Layer ID */ fpcLy_CURRENT_e, + /* List ID */ 12, + /* List Prio */ fpcPi_CURRENT_e, + /* Proc Name */ fpcNm_TIMER_e, + /* Proc SubMtd */ &g_fpcLf_Method.base, + /* Size */ sizeof(dTimer_c), + /* Size Other */ 0, + /* Parameters */ 0, + /* Leaf SubMtd */ &g_fopMsg_Method, + /* Draw Prio */ fpcDwPi_TIMER_e, + /* Msg SubMtd */ &l_dTimer_Method, }; diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp index 014d0b1e3a5..7848d2a7343 100644 --- a/src/f_ap/f_ap_game.cpp +++ b/src/f_ap/f_ap_game.cpp @@ -206,10 +206,10 @@ int dumpTagObject(void* i_object, void*) { } u32 other_heap_size = 0; - if (profname == PROC_ALINK) { + if (profname == fpcNm_ALINK_e) { fopAc_ac_c* spC = a_actor; other_heap_size = daAlink_c::getOtherHeapSize(); - } else if (profname == PROC_MIDNA) { + } else if (profname == fpcNm_MIDNA_e) { fopAc_ac_c* sp8 = a_actor; other_heap_size = daMidna_c::getOtherHeapSize(); } @@ -236,10 +236,10 @@ int dumpObject(void* i_object, void* i_data) { u32 actor_size = a_actor->base.base.profile->process_size + (a_actor->heap == NULL ? 0 : a_actor->heap->getHeapSize()); u32 other_heap_size = 0; - if (profname == PROC_ALINK) { + if (profname == fpcNm_ALINK_e) { fopAc_ac_c* sp24 = a_actor; other_heap_size = daAlink_c::getOtherHeapSize(); - } else if (profname == PROC_MIDNA) { + } else if (profname == fpcNm_MIDNA_e) { fopAc_ac_c* sp20 = a_actor; other_heap_size = daMidna_c::getOtherHeapSize(); } diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index db39a252ed0..d2240327b07 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -245,7 +245,7 @@ static int fopAc_Draw(void* i_this) { int var_r28 = dComIfGp_event_moveApproval(actor); if ((var_r28 == 2 || (!fopAcM_CheckStatus(actor, fopAc_ac_c::getStopStatus()) && (!fopAcM_CheckStatus(actor, fopAcStts_CULL_e) || !fopAcM_cullingCheck(actor)))) && - !fopAcM_CheckStatus(actor, 0x21000000)) + !fopAcM_CheckStatus(actor, fopAcStts_UNK_0x20000000_e | fopAcStts_NODRAW_e)) { fopAcM_OffCondition(actor, fopAcCnd_NODRAW_e); @@ -320,9 +320,9 @@ static int fopAc_Execute(void* i_this) { daSus_c::check(actor); actor->eventInfo.beforeProc(); s32 move = dComIfGp_event_moveApproval(actor); - fopAcM_OffStatus(actor, 0x40000000); + fopAcM_OffStatus(actor, fopAcStts_UNK_0x40000000_e); - if (!fopAcM_CheckStatus(actor, 0x20000000) && + if (!fopAcM_CheckStatus(actor, fopAcStts_UNK_0x20000000_e) && (move == 2 || (move != 0 && !fopAcM_CheckStatus(actor, fopAc_ac_c::getStopStatus()) && (!fopAcM_CheckStatus(actor, fopAcStts_NOEXEC_e) || !fopAcM_CheckCondition(actor, fopAcCnd_NODRAW_e))))) @@ -345,7 +345,7 @@ static int fopAc_Execute(void* i_this) { fopAcM_OnCondition(actor, fopAcCnd_NOEXEC_e); } - if (fopAcM_CheckStatus(actor, 0x20) && + if (fopAcM_CheckStatus(actor, fopAcStts_UNK_0x20_e) && actor->home.pos.y - actor->current.pos.y > 5000.0f) { fopAcM_delete(actor); @@ -385,7 +385,7 @@ static int fopAc_IsDelete(void* i_this) { #endif ret = fpcMtd_IsDelete((process_method_class*)actor->sub_method, actor); - + #if DEBUG } #endif @@ -407,7 +407,7 @@ static int fopAc_Delete(void* i_this) { #endif ret = fpcMtd_Delete((process_method_class*)actor->sub_method, actor); - + #if DEBUG } #endif @@ -533,13 +533,13 @@ static int fopAc_Create(void* i_this) { #endif ret = fpcMtd_Create((process_method_class*)actor->sub_method, actor); - + #if DEBUG } fopAcM_assert(1113, actor, fopAcM_CheckCondition(actor, fopAcCnd_INIT_e), "fopAcM_ct No Call !!"); #endif - + if (ret == cPhs_COMPLEATE_e) { fopDwTg_ToDrawQ(&actor->draw_tag, fpcM_DrawPriority(actor)); } else if (ret == cPhs_ERROR_e) { diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 000d790c3e8..8948b78b279 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -1130,11 +1130,11 @@ s32 fopAcM_orderDoorEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_prio s16 evid = i_actorB->eventInfo.getEventId(); u8 toolid = i_actorB->eventInfo.getMapToolId(); - if (fopAcM_GetProfName(i_actorB) == PROC_Obj_Kshutter) { + if (fopAcM_GetProfName(i_actorB) == fpcNm_Obj_Kshutter_e) { if (toolid != 0xFF) { evid = dComIfGp_getEventManager().getEventIdx(i_actorA, NULL, toolid); } - } else if (fopAcM_GetProfName(i_actorB) == PROC_Obj_SmgDoor) { + } else if (fopAcM_GetProfName(i_actorB) == fpcNm_Obj_SmgDoor_e) { } OS_REPORT("toolid<%d>evid<%d>\n", toolid, evid); @@ -1366,7 +1366,7 @@ fpc_ProcID fopAcM_createItemForPresentDemo(cXyz const* i_pos, int i_itemNo, u8 p JUT_ASSERT(3214, 0 <= i_itemNo && i_itemNo < 256); dComIfGp_event_setGtItm(i_itemNo); - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { OS_REPORT("プレゼントデモ用なのに「ハズレ」です！[%d]\n", i_itemNo); // Even though it is for a Present Demo, it is a 'Miss'! return fpcM_ERROR_PROCESS_ID_e; } @@ -1380,7 +1380,7 @@ fpc_ProcID fopAcM_createItemForTrBoxDemo(cXyz const* i_pos, int i_itemNo, int i_ JUT_ASSERT(3259, 0 <= i_itemNo && i_itemNo < 256); dComIfGp_event_setGtItm(i_itemNo); - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { OS_REPORT("ゲットデモ用なのに「ハズレ」です！[%d]\n", i_itemNo); // Even though it is for a Get Demo, it is a 'Miss'! return fpcM_ERROR_PROCESS_ID_e; } @@ -1513,7 +1513,7 @@ fpc_ProcID fopAcM_createItemFromTable(cXyz const* i_pos, int i_itemNo, int i_ite #endif i_itemNo = fopAcM_getItemNoFromTableNo(i_itemNo); - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; } @@ -1539,12 +1539,12 @@ fpc_ProcID fopAcM_createDemoItem(const cXyz* i_pos, int i_itemNo, int i_itemBitN JUT_ASSERT(3824, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; } u32 params = (i_itemNo & 0xFF) << 0x0 | (i_itemBitNo & 0x7F) << 0x8 | (param_7 & 0xFF) << 0x10; - return fopAcM_create(PROC_Demo_Item, params, i_pos, i_roomNo, i_angle, scale, -1); + return fopAcM_create(fpcNm_Demo_Item_e, params, i_pos, i_roomNo, i_angle, scale, -1); } fpc_ProcID fopAcM_createItemForBoss(const cXyz* i_pos, int i_itemNo, int i_roomNo, @@ -1553,7 +1553,7 @@ fpc_ProcID fopAcM_createItemForBoss(const cXyz* i_pos, int i_itemNo, int i_roomN int _ = -1; u32 params = 0xFFFF0000 | param_8 << 8 | (i_itemNo & 0xFF); - fopAc_ac_c* actor = fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, + fopAc_ac_c* actor = fopAcM_fastCreate(fpcNm_Obj_LifeContainer_e, params, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); if (actor != NULL) { actor->speedF = i_speedF; @@ -1598,7 +1598,7 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i JUT_ASSERT(4067, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { return fpcM_ERROR_PROCESS_ID_e; } @@ -1618,38 +1618,38 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i u32 params = MAKE_ITEM_PARAMS(item_no, i_itemBitNo, unk, param_7); switch (i_itemNo) { - case fpcNm_ITEM_RECOVERY_FAILY: - ret = fopAcM_create(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1); + case dItemNo_RECOVERY_FAILY_e: + ret = fopAcM_create(fpcNm_Obj_Yousei_e, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1); break; #if DEBUG // Return pointer fopAc_ac_c* is uninitialized for these branches - case fpcNm_ITEM_SMALL_KEY: + case dItemNo_SMALL_KEY_e: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); JUT_ASSERT(4145, FALSE); break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); JUT_ASSERT(4149, FALSE); break; - case fpcNm_ITEM_LIGHT_DROP: + case dItemNo_LIGHT_DROP_e: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); JUT_ASSERT(4153, FALSE); break; #endif - case fpcNm_ITEM_KAKERA_HEART: - case fpcNm_ITEM_UTAWA_HEART: - ret = fopAcM_create(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, -1); + case dItemNo_KAKERA_HEART_e: + case dItemNo_UTAWA_HEART_e: + ret = fopAcM_create(fpcNm_Obj_LifeContainer_e, params, i_pos, i_roomNo, i_angle, i_scale, -1); break; - case fpcNm_ITEM_TRIPLE_HEART: + case dItemNo_TRIPLE_HEART_e: for (i = 0; i < 2; i++) { - fopAcM_create(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1); + fopAcM_create(fpcNm_ITEM_e, params, i_pos, i_roomNo, &item_angle, i_scale, -1); item_angle.y = cM_rndFX(0x7FFF); } default: - ret = fopAcM_create(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1); + ret = fopAcM_create(fpcNm_ITEM_e, params, i_pos, i_roomNo, &item_angle, i_scale, -1); break; } @@ -1664,7 +1664,7 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi csXyz item_angle(csXyz::Zero); - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { return NULL; } @@ -1683,41 +1683,41 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi u32 params = MAKE_ITEM_PARAMS(item_no, i_itemBitNo, unk, param_5); switch (i_itemNo) { - case fpcNm_ITEM_RECOVERY_FAILY: - ret = fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, + case dItemNo_RECOVERY_FAILY_e: + ret = fopAcM_fastCreate(fpcNm_Obj_Yousei_e, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); break; #if DEBUG // Return pointer fopAc_ac_c* is uninitialized for these branches - case fpcNm_ITEM_SMALL_KEY: + case dItemNo_SMALL_KEY_e: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); JUT_ASSERT(4268, FALSE); break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); JUT_ASSERT(4272, FALSE); break; - case fpcNm_ITEM_LIGHT_DROP: + case dItemNo_LIGHT_DROP_e: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); JUT_ASSERT(4276, FALSE); break; #endif - case fpcNm_ITEM_KAKERA_HEART: - case fpcNm_ITEM_UTAWA_HEART: - ret = fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, + case dItemNo_KAKERA_HEART_e: + case dItemNo_UTAWA_HEART_e: + ret = fopAcM_fastCreate(fpcNm_Obj_LifeContainer_e, params, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); break; - case fpcNm_ITEM_TRIPLE_HEART: + case dItemNo_TRIPLE_HEART_e: for (i = 0; i < 2; i++) { - ret = fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1, + ret = fopAcM_fastCreate(fpcNm_ITEM_e, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL, NULL); item_angle.y = cM_rndFX(0x7FFF); } default: - ret = fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL, + ret = fopAcM_fastCreate(fpcNm_ITEM_e, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL, NULL); } return ret; @@ -1730,7 +1730,7 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, JUT_ASSERT(4324, 0 <= i_itemNo && i_itemNo < 256); csXyz angle; - if (i_itemNo == fpcNm_ITEM_NONE) { + if (i_itemNo == dItemNo_NONE_e) { return NULL; } @@ -1748,34 +1748,34 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, } switch (i_itemNo) { - case fpcNm_ITEM_RECOVERY_FAILY: - ret = fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, + case dItemNo_RECOVERY_FAILY_e: + ret = fopAcM_fastCreate(fpcNm_Obj_Yousei_e, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); break; #if DEBUG // Return pointer fopAc_ac_c* is uninitialized for these branches - case fpcNm_ITEM_SMALL_KEY: + case dItemNo_SMALL_KEY_e: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); JUT_ASSERT(4383, FALSE); break; - case fpcNm_ITEM_KANTERA: + case dItemNo_KANTERA_e: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); JUT_ASSERT(4387, FALSE); break; - case fpcNm_ITEM_LIGHT_DROP: + case dItemNo_LIGHT_DROP_e: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); JUT_ASSERT(4391, FALSE); break; #endif - case fpcNm_ITEM_KAKERA_HEART: - case fpcNm_ITEM_UTAWA_HEART: - ret = fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, + case dItemNo_KAKERA_HEART_e: + case dItemNo_UTAWA_HEART_e: + ret = fopAcM_fastCreate(fpcNm_Obj_LifeContainer_e, params, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); break; - case fpcNm_ITEM_TRIPLE_HEART: + case dItemNo_TRIPLE_HEART_e: for (i = 0; i < 2; i++) { if (i_angle != NULL) { angle = *i_angle; @@ -1786,7 +1786,7 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, ANGLE_ADD(angle.y, cM_rndFX(0x2000)); ret = (fopAc_ac_c*)fopAcM_fastCreate( - PROC_ITEM, params, i_pos, i_roomNo, &angle, i_scale, -1, i_createFunc, NULL); + fpcNm_ITEM_e, params, i_pos, i_roomNo, &angle, i_scale, -1, i_createFunc, NULL); if (ret != NULL) { if (i_speedF != NULL) { @@ -1806,7 +1806,7 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, } angle.z = 0xFF; - ret = fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, + ret = fopAcM_fastCreate(fpcNm_ITEM_e, params, i_pos, i_roomNo, &angle, i_scale, -1, i_createFunc, NULL); if (ret != NULL) { @@ -1838,7 +1838,7 @@ fpc_ProcID fopAcM_createBokkuri(u16 i_setId, const cXyz* i_pos, int i_itemNo, in } daObjCarry_c::make_prm_bokkuri(¶ms, ¶ms_ex, i_itemNo, i_itemBit, i_itemType, param_8); - return fopAcM_create(PROC_Obj_Carry, i_setId, params, i_pos, i_roomNo, ¶ms_ex, NULL, -1, NULL); + return fopAcM_create(fpcNm_Obj_Carry_e, i_setId, params, i_pos, i_roomNo, ¶ms_ex, NULL, -1, NULL); } fpc_ProcID fopAcM_createWarpHole(const cXyz* i_pos, const csXyz* i_angle, int i_roomNo, u8 param_4, @@ -1848,7 +1848,7 @@ fpc_ProcID fopAcM_createWarpHole(const cXyz* i_pos, const csXyz* i_angle, int i_ } u32 actorParams = 0x17000000 + 0xFF; u32 actorParamsOut = actorParams | (param_5 << 0x1B) | (param_6 << 0x10) | (param_4 << 0x8); - return fopAcM_create(PROC_Obj_BossWarp, actorParamsOut, i_pos, i_roomNo, i_angle, NULL, -1); + return fopAcM_create(fpcNm_Obj_BossWarp_e, actorParamsOut, i_pos, i_roomNo, i_angle, NULL, -1); } void* enemySearchJugge(void* i_actor, void* i_data) { @@ -1945,13 +1945,13 @@ fpc_ProcID fopAcM_createDisappear(const fopAc_ac_c* i_actor, const cXyz* i_pos, u8 i_type, u8 i_enemyID) { u32 param = (i_enemyID << 0x10) | (i_size << 0x8) | i_type; fopAc_ac_c* actor = fopAcM_fastCreate( - PROC_DISAPPEAR, param, i_pos, fopAcM_GetRoomNo(i_actor), &i_actor->current.angle, NULL, 0xFF, + fpcNm_DISAPPEAR_e, param, i_pos, fopAcM_GetRoomNo(i_actor), &i_actor->current.angle, NULL, 0xFF, NULL, NULL); return fopAcM_GetID(actor); } void fopAcM_setCarryNow(fopAc_ac_c* i_actor, int param_1) { - i_actor->actor_status |= 0x2000; + i_actor->actor_status |= fopAcStts_CARRY_NOW_e; if (param_1 != 0) { fopAcM_setStageLayer(i_actor); @@ -1961,7 +1961,7 @@ void fopAcM_setCarryNow(fopAc_ac_c* i_actor, int param_1) { void fopAcM_cancelCarryNow(fopAc_ac_c* i_actor) { if (fopAcM_checkCarryNow(i_actor)) { - i_actor->actor_status &= ~0x2000; + i_actor->actor_status &= ~fopAcStts_CARRY_NOW_e; if (fopAcM_GetHomeRoomNo(i_actor) != -1 && fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(fopAcM_GetRoomNo(i_actor))) != @@ -1973,8 +1973,8 @@ void fopAcM_cancelCarryNow(fopAc_ac_c* i_actor) { i_actor->shape_angle.z = 0; i_actor->shape_angle.x = 0; - if (dComIfGp_event_runCheck() && fopAcM_GetGroup(i_actor) != 2) { - i_actor->actor_status |= 0x800; + if (dComIfGp_event_runCheck() && fopAcM_GetGroup(i_actor) != fopAc_ENEMY_e) { + i_actor->actor_status |= fopAcStts_STAFF_EXTRA_e; } } } diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index 2e0563f2c97..84d7c5f3616 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -42,7 +42,7 @@ static int fopKy_Execute(void* i_this) { fapGm_HIO_c::startCpuTimer(); #endif - if (!dScnPly_c::isPause() && (!dComIfGp_isPauseFlag() || fpcM_GetName(a_this) == PROC_ENVSE)) { + if (!dScnPly_c::isPause() && (!dComIfGp_isPauseFlag() || fpcM_GetName(a_this) == fpcNm_ENVSE_e)) { ret = fpcMtd_Execute(&((kankyo_class*)i_this)->sub_method->base, i_this); } diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index fe71a828c22..13b6e62819a 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -84,7 +84,7 @@ fpc_ProcID fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param) { append->scale.set(scale, scale, scale); append->parameters = i_param; - return fopKyM_Create(PROC_WPILLAR, NULL, append); + return fopKyM_Create(fpcNm_WPILLAR_e, NULL, append); } fpc_ProcID fopKyM_createMpillar(cXyz const* i_pos, f32 i_size) { From a02b8ded72a762c8279051645579448a215530b8 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Mon, 9 Mar 2026 20:29:56 -0600 Subject: [PATCH 27/35] prep for penumbra release --- .vscode/launch.json | 16 +++--- .vscode/penumbra-debug/extension.js | 27 ++++++++++ .vscode/penumbra-debug/package.json | 78 +++++++++++++++++++++++++++++ configure.py | 1 + tools/download_tool.py | 17 +++++++ tools/project.py | 22 +++++++- 6 files changed, 152 insertions(+), 9 deletions(-) create mode 100644 .vscode/penumbra-debug/extension.js create mode 100644 .vscode/penumbra-debug/package.json diff --git a/.vscode/launch.json b/.vscode/launch.json index b4fee64e86f..2901ad347f7 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,20 +2,20 @@ "version": "0.2.0", "configurations": [ { - "name": "Attach to Nintendont", - "type": "gdb-dap", + "name": "Penumbra: Attach to Nintendont", + "type": "penumbra", "request": "attach", "program": "${workspaceFolder}/build/${input:gameId}/framework.elf", - "target": "${input:wiiAddress}:${input:gdbPort}", - "debugAdapterExecutable": "${workspaceFolder}/build/binutils/gdb-wrapper.sh" + "debugInfo": "${workspaceFolder}/build/${input:gameId}/debug_info.o", + "target": "${input:wiiAddress}:${input:gdbPort}" }, { - "name": "Attach to Dolphin", - "type": "gdb-dap", + "name": "Penumbra: Attach to Dolphin", + "type": "penumbra", "request": "attach", "program": "${workspaceFolder}/build/${input:gameId}/framework.elf", - "target": "${input:dolphinAddress}:${input:gdbPort}", - "debugAdapterExecutable": "${workspaceFolder}/build/binutils/gdb-wrapper.sh" + "debugInfo": "${workspaceFolder}/build/${input:gameId}/debug_info.o", + "target": "${input:dolphinAddress}:${input:gdbPort}" } ], "inputs": [ diff --git a/.vscode/penumbra-debug/extension.js b/.vscode/penumbra-debug/extension.js new file mode 100644 index 00000000000..61b29fab89c --- /dev/null +++ b/.vscode/penumbra-debug/extension.js @@ -0,0 +1,27 @@ +const vscode = require('vscode'); +const path = require('path'); +const fs = require('fs'); + +function activate(context) { + context.subscriptions.push( + vscode.debug.registerDebugAdapterDescriptorFactory('penumbra', { + createDebugAdapterDescriptor(_session) { + // Look for penumbra in build/binutils/ (downloaded by build system) + const workspaceFolder = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath; + if (workspaceFolder) { + const buildPath = path.join(workspaceFolder, 'build', 'binutils', 'penumbra'); + if (fs.existsSync(buildPath)) { + return new vscode.DebugAdapterExecutable(buildPath, ['--dap']); + } + } + + // Fallback to PATH + return new vscode.DebugAdapterExecutable('penumbra', ['--dap']); + } + }) + ); +} + +function deactivate() {} + +module.exports = { activate, deactivate }; diff --git a/.vscode/penumbra-debug/package.json b/.vscode/penumbra-debug/package.json new file mode 100644 index 00000000000..b671e00b8e9 --- /dev/null +++ b/.vscode/penumbra-debug/package.json @@ -0,0 +1,78 @@ +{ + "name": "penumbra-debug", + "displayName": "Penumbra Debug Adapter", + "description": "Debug adapter for PowerPC targets via GDB Remote Serial Protocol", + "version": "0.0.1", + "publisher": "pheenoh", + "engines": { + "vscode": "^1.80.0" + }, + "categories": [ + "Debuggers" + ], + "activationEvents": [ + "onDebugResolve:penumbra" + ], + "main": "./extension.js", + "contributes": { + "debuggers": [ + { + "type": "penumbra", + "label": "Penumbra", + "configurationAttributes": { + "attach": { + "required": [ + "program", + "target" + ], + "properties": { + "program": { + "type": "string", + "description": "Path to the ELF executable (e.g. build/GZ2E01/framework.elf)" + }, + "debugInfo": { + "type": "string", + "description": "Path to the DWARF debug info object (e.g. build/GZ2E01/debug_info.o)" + }, + "target": { + "type": "string", + "description": "RSP target as ip:port (e.g. 192.168.1.100:2159)" + }, + "verbose": { + "type": "boolean", + "description": "Enable verbose diagnostic output in the debug console", + "default": false + } + } + } + }, + "configurationSnippets": [ + { + "label": "Penumbra: Attach to Nintendont", + "description": "Attach to a Wii running Nintendont with GDB stub", + "body": { + "type": "penumbra", + "request": "attach", + "name": "Attach to Nintendont", + "program": "^\"\\${workspaceFolder}/build/\\${input:gameId}/framework.elf\"", + "debugInfo": "^\"\\${workspaceFolder}/build/\\${input:gameId}/debug_info.o\"", + "target": "^\"\\${input:wiiAddress}:\\${input:gdbPort}\"" + } + }, + { + "label": "Penumbra: Attach to Dolphin", + "description": "Attach to Dolphin emulator with GDB stub", + "body": { + "type": "penumbra", + "request": "attach", + "name": "Attach to Dolphin", + "program": "^\"\\${workspaceFolder}/build/\\${input:gameId}/framework.elf\"", + "debugInfo": "^\"\\${workspaceFolder}/build/\\${input:gameId}/debug_info.o\"", + "target": "^\"\\${input:dolphinAddress}:\\${input:gdbPort}\"" + } + } + ] + } + ] + } +} diff --git a/configure.py b/configure.py index c57874da8bc..d46a722a0d8 100755 --- a/configure.py +++ b/configure.py @@ -224,6 +224,7 @@ config.objdiff_tag = "v3.6.1" config.sjiswrap_tag = "v1.2.2" config.wibo_tag = "1.0.0" +config.penumbra_tag = "v0.1.0" # Project config.config_path = Path("config") / config.version / "config.yml" diff --git a/tools/download_tool.py b/tools/download_tool.py index 76d790850cd..8450613ba1d 100755 --- a/tools/download_tool.py +++ b/tools/download_tool.py @@ -88,11 +88,28 @@ def wibo_url(tag: str) -> str: return f"{repo}/releases/download/{tag}/wibo-{arch}" +def penumbra_url(tag: str) -> str: + uname = platform.uname() + suffix = "" + system = uname.system.lower() + if system == "darwin": + system = "macos" + elif system == "windows": + suffix = ".exe" + arch = uname.machine.lower() + if arch == "amd64": + arch = "x86_64" + + repo = "https://github.com/zsrtp/penumbra" + return f"{repo}/releases/download/{tag}/penumbra-{system}-{arch}{suffix}" + + TOOLS: Dict[str, Callable[[str], str]] = { "binutils": binutils_url, "compilers": compilers_url, "dtk": dtk_url, "objdiff-cli": objdiff_cli_url, + "penumbra": penumbra_url, "sjiswrap": sjiswrap_url, "wibo": wibo_url, } diff --git a/tools/project.py b/tools/project.py index 6759b8be917..6ac83594115 100644 --- a/tools/project.py +++ b/tools/project.py @@ -161,6 +161,8 @@ def __init__(self) -> None: self.ninja_path: Optional[Path] = None # If None, use system PATH self.objdiff_tag: Optional[str] = None # Git tag self.objdiff_path: Optional[Path] = None # If None, download + self.penumbra_tag: Optional[str] = None # Git tag + self.penumbra_path: Optional[Path] = None # If None, download # Project config self.non_matching: bool = False @@ -649,6 +651,24 @@ def write_cargo_rule(): else: sys.exit("ProjectConfig.binutils_tag missing") + penumbra_implicit = None + if config.penumbra_path: + penumbra = config.penumbra_path + elif config.penumbra_tag: + penumbra = config.build_dir / "binutils" / "penumbra" + penumbra_implicit = penumbra + n.build( + outputs=penumbra, + rule="download_tool", + implicit=download_tool, + variables={ + "tool": "penumbra", + "tag": config.penumbra_tag, + }, + ) + else: + penumbra = None + # Build GDB from source (links against system Python for scripting support) build_gdb_script = config.tools_dir / "build_gdb.py" gdb = binutils / f"powerpc-eabi-gdb{EXE}" @@ -673,7 +693,7 @@ def write_cargo_rule(): n.build( outputs="tools", rule="phony", - inputs=[dtk, sjiswrap, wrapper, compilers, binutils, objdiff], + inputs=[dtk, sjiswrap, wrapper, compilers, binutils, objdiff, penumbra], ) n.newline() From 1c3afba76f3cb5c36c47e9d48c6df0d4afb0ba15 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Mon, 9 Mar 2026 22:25:54 -0600 Subject: [PATCH 28/35] Add --penumbra flag to inline debug info generation, remove build_gdb --- README.md | 8 ++++---- configure.py | 42 ++++++++++++++++++++++++--------------- tools/gen_dwarf2_debug.py | 21 ++++++++++++-------- tools/project.py | 28 +++++--------------------- 4 files changed, 48 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index a6c07f9adff..9631753a1d7 100644 --- a/README.md +++ b/README.md @@ -147,13 +147,14 @@ Umbra includes a GDB remote stub for source-level debugging of game code. It sup ### Setup -GDB tooling is not built by default. If you want to use the debugger, run the post-build step after your initial build: +To include debug info (DWARF 2 conversion + REL symbol loader) as part of the default build, configure with `--penumbra`: ```sh -ninja post-build +python configure.py --penumbra +ninja ``` -This builds `powerpc-eabi-gdb` from source with Python scripting support, generates the symbol loader script, and converts MetroWerks DWARF 1 debug info to DWARF 2. This only needs to run once (or when source files change). +This converts MetroWerks DWARF 1 debug info to DWARF 2 and generates the GDB symbol loader script during the normal build. Debug info is regenerated automatically when source files change. ### Enabling GDB in your mod @@ -262,7 +263,6 @@ umbra/ │ ├── rebuild-decomp-tp.py # ISO rebuild script │ ├── patch_forceactive.py # Auto-patches linker script with custom symbols │ ├── check_mod_assets.py # Asset checksum tracker -│ ├── build_gdb.py # Builds powerpc-eabi-gdb from source │ ├── gen_gdb_rel_loader.py # Generates Python GDB symbol loader │ └── gen_dwarf2_debug.py # Converts MW DWARF 1 to DWARF 2 debug info ├── build/binutils/ # Cross-tools (powerpc-eabi-gdb, etc.) diff --git a/configure.py b/configure.py index d46a722a0d8..c909e1df916 100755 --- a/configure.py +++ b/configure.py @@ -189,6 +189,12 @@ action="store_false", help="disable progress calculation", ) +parser.add_argument( + "--penumbra", + dest="penumbra", + action="store_true", + help="include debug info generation in the default build", +) args = parser.parse_args() config = ProjectConfig() @@ -3101,21 +3107,14 @@ def link_order_callback(module_id: int, objects: List[str]) -> List[str]: # Generate DWARF 2 debug info from DWARF 1 .o files after link debug_info_out = f"build/{version}/debug_info.o" +as_exe = ".exe" if is_windows() else "" config.custom_build_rules.append({ "name": "gen_dwarf2_debug", - "command": f"$python tools/gen_dwarf2_debug.py build/{version}", + "command": f"$python tools/gen_dwarf2_debug.py build/{version}" + f" --as build/binutils/powerpc-eabi-as{as_exe}", "description": "DWARF2 DEBUG $out", "pool": "console", }) -config.custom_build_steps.setdefault("post-build", []).append({ - "outputs": debug_info_out, - "rule": "gen_dwarf2_debug", - "inputs": [f"build/{version}/framework.elf.MAP"], - "implicit": [ - f"build/{version}/framework.elf", - "tools/gen_dwarf2_debug.py", - ], -}) # Generate GDB REL symbol loader script after debug info is ready gdb_loader_out = f"build/{version}/load_rel_symbols.py" @@ -3124,12 +3123,23 @@ def link_order_callback(module_id: int, objects: List[str]) -> List[str]: "command": f"$python tools/gen_gdb_rel_loader.py build/{version}", "description": "GDB REL LOADER $out", }) -config.custom_build_steps.setdefault("post-build", []).append({ - "outputs": gdb_loader_out, - "rule": "gen_gdb_rel_loader", - "inputs": [f"build/{version}/config.json"], - "implicit": ["tools/gen_gdb_rel_loader.py", debug_info_out], -}) + +if args.penumbra: + config.custom_build_steps.setdefault("post-link", []).append({ + "outputs": debug_info_out, + "rule": "gen_dwarf2_debug", + "inputs": [f"build/{version}/framework.elf.MAP"], + "implicit": [ + f"build/{version}/framework.elf", + "tools/gen_dwarf2_debug.py", + ], + }) + config.custom_build_steps.setdefault("post-link", []).append({ + "outputs": gdb_loader_out, + "rule": "gen_gdb_rel_loader", + "inputs": [f"build/{version}/config.json"], + "implicit": ["tools/gen_gdb_rel_loader.py", debug_info_out], + }) # Optional extra categories for progress tracking config.progress_categories = [ diff --git a/tools/gen_dwarf2_debug.py b/tools/gen_dwarf2_debug.py index 002ef81012a..aadc2a7c79e 100644 --- a/tools/gen_dwarf2_debug.py +++ b/tools/gen_dwarf2_debug.py @@ -1072,7 +1072,7 @@ def process_object_varinfo(o_path, map_entries, remap_offsets=None, def generate_combined_obj(map_path, o_index, out_s, out_o, build_dir, - text_base, label=""): + text_base, label="", as_cmd="powerpc-eabi-as"): """Generate a combined debug_info.o from MAP file and .o index. Returns (n_funcs, n_vars, n_lines, n_skipped) or None. @@ -1155,7 +1155,7 @@ def generate_combined_obj(map_path, o_index, out_s, out_o, build_dir, func_count, var_count, line_count = result # Assemble - as_cmd = ["powerpc-eabi-as", "-o", out_o, out_s] + as_cmd = [as_cmd, "-o", out_o, out_s] res = subprocess.run(as_cmd, capture_output=True, text=True) if res.returncode != 0: print(" Assembly failed for %s: %s" % (label or out_o, res.stderr.strip())) @@ -1165,11 +1165,15 @@ def generate_combined_obj(map_path, o_index, out_s, out_o, build_dir, def main(): - if len(sys.argv) < 2: - print("Usage: %s " % sys.argv[0]) - sys.exit(1) + import argparse + p = argparse.ArgumentParser() + p.add_argument("build_dir") + p.add_argument("--as", dest="assembler", default="powerpc-eabi-as", + help="path to powerpc-eabi-as") + args = p.parse_args() - build_dir = os.path.abspath(sys.argv[1]) + build_dir = os.path.abspath(args.build_dir) + assembler = args.assembler # --- DOL --- dol_map = os.path.join(build_dir, "framework.elf.MAP") @@ -1193,7 +1197,7 @@ def main(): o_index = build_o_index([build_dir]) result = generate_combined_obj(dol_map, o_index, dol_s, dol_o, build_dir, - text_base, "DOL") + text_base, "DOL", assembler) if result: func_count, var_count, line_count, skip = result print("DOL: %d functions, %d params/vars, %d line entries (%d skipped)" % @@ -1228,7 +1232,8 @@ def main(): ]) result = generate_combined_obj(plf_map, rel_o_index, rel_s, rel_o, - build_dir, rel_text_base, entry) + build_dir, rel_text_base, entry, + assembler) if result: rel_count += 1 else: diff --git a/tools/project.py b/tools/project.py index 6ac83594115..b1d4824d0e2 100644 --- a/tools/project.py +++ b/tools/project.py @@ -194,7 +194,7 @@ def __init__(self) -> None: None # Custom ninja build rules ) self.custom_build_steps: Optional[Dict[str, List[Dict[str, Any]]]] = ( - None # Custom build steps, types are ["pre-compile", "post-compile", "post-link", "post-build"] + None # Custom build steps, types are ["pre-compile", "post-compile", "post-link"] ) self.generate_compile_commands: bool = ( True # Generate compile_commands.json for clangd @@ -669,21 +669,6 @@ def write_cargo_rule(): else: penumbra = None - # Build GDB from source (links against system Python for scripting support) - build_gdb_script = config.tools_dir / "build_gdb.py" - gdb = binutils / f"powerpc-eabi-gdb{EXE}" - gdb_version = getattr(config, "gdb_version", "17.1") - n.rule( - name="build_gdb", - command=f"$python {build_gdb_script} {binutils} --version {gdb_version}", - description="GDB $out", - ) - n.build( - outputs=gdb, - rule="build_gdb", - implicit=[build_gdb_script, binutils_implicit or binutils], - ) - n.newline() ### @@ -1331,9 +1316,6 @@ def add_unit(build_obj: BuildConfigUnit, link_step: LinkStep): ) n.newline() - # Add all build steps needed post-build (re-building archives and such) - write_custom_step("post-build", "post-link", extra_inputs=[gdb]) - ### # Helper rule for building all source files ### @@ -1361,7 +1343,7 @@ def add_unit(build_obj: BuildConfigUnit, link_step: LinkStep): rule="check", inputs=config.check_sha_path, implicit=[dtk, *link_outputs], - order_only="post-build", + order_only="post-link", ) n.newline() @@ -1383,7 +1365,7 @@ def add_unit(build_obj: BuildConfigUnit, link_step: LinkStep): python_lib, report_path, ], - order_only="post-build", + order_only="post-link", ) ### @@ -1399,7 +1381,7 @@ def add_unit(build_obj: BuildConfigUnit, link_step: LinkStep): outputs=report_path, rule="report", implicit=[objdiff, "objdiff.json", "all_source"], - order_only="post-build", + order_only="post-link", ) n.comment("Phony edge that will always be considered dirty by ninja.") @@ -1426,7 +1408,7 @@ def add_unit(build_obj: BuildConfigUnit, link_step: LinkStep): outputs=report_baseline_path, rule="report", implicit=[objdiff, "all_source", "always"], - order_only="post-build", + order_only="post-link", ) n.build( outputs="baseline", From 04a32a7df71c2a17f2c389f1359f4810c34fc638 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Mon, 9 Mar 2026 22:31:13 -0600 Subject: [PATCH 29/35] Update connecting section to reference bundled penumbra debug adapter --- README.md | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 9631753a1d7..3e868da921b 100644 --- a/README.md +++ b/README.md @@ -174,27 +174,12 @@ umbra_gdb_poll(); // check for halt requests from GDB ### Connecting -**VS Code (recommended):** Install the [GDB DAP](https://marketplace.visualstudio.com/items?itemName=OlegTolmatcev.gdb-dap) extension. Launch configurations are provided in `.vscode/launch.json` ("Attach to Nintendont" or "Attach to Dolphin"). Symbols are loaded automatically on connect. +A bundled VS Code debug adapter (`.vscode/penumbra-debug/`) handles connecting automatically. Use the launch configurations in `.vscode/launch.json`: -**Command line:** +- **Penumbra: Attach to Nintendont** -- connect to a Wii running the GDB stub +- **Penumbra: Attach to Dolphin** -- connect to Dolphin's GDB stub -```sh -build/binutils/powerpc-eabi-gdb build/GZ2E01/framework.elf \ - -ex "source build/GZ2E01/load_rel_symbols.py" \ - -ex "target remote 192.168.1.100:2159" -``` - -### GDB Commands - -DOL and REL symbols are loaded automatically on connect via a stop event handler. The following commands are also available manually in the GDB console: - -| Command | Description | -|---------|-------------| -| `load-dol-symbols` | Load DOL (framework.elf) symbols + DWARF debug info | -| `load-rel-symbols` | Walk the OS module list and load PLF symbols for all RELs | -| `load-all-symbols` | Run both `load-dol-symbols` and `load-rel-symbols` | -| `load-debug-for ` | Load DWARF debug info for a specific REL module by ID | -| `dbg-` | Shorthand for `load-debug-for` (e.g. `dbg-d_a_grass`) | +Symbols and debug info are loaded automatically on connect. ## Umbra Platform API @@ -265,6 +250,6 @@ umbra/ │ ├── check_mod_assets.py # Asset checksum tracker │ ├── gen_gdb_rel_loader.py # Generates Python GDB symbol loader │ └── gen_dwarf2_debug.py # Converts MW DWARF 1 to DWARF 2 debug info -├── build/binutils/ # Cross-tools (powerpc-eabi-gdb, etc.) +├── build/binutils/ # Cross-tools (penumbra, etc.) └── orig/GZ2E01/ # Vanilla disc image (not checked in) ``` From 888f0f35cdcc696428f8e54afcd36befe04bdf28 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Mon, 9 Mar 2026 22:39:16 -0600 Subject: [PATCH 30/35] Add packaged penumbra debug adapter VSIX for VS Code installation --- .vscode/penumbra-debug.vsix | Bin 0 -> 2663 bytes README.md | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .vscode/penumbra-debug.vsix diff --git a/.vscode/penumbra-debug.vsix b/.vscode/penumbra-debug.vsix new file mode 100644 index 0000000000000000000000000000000000000000..69c32ff3524e8bf45877dccdee73929e26b86a88 GIT binary patch literal 2663 zcma)8c{tSDAO6ak46=?9va4)a!;P|Kxt3gv?u>N|hB3ySvG03i9Sq5qJ!P3J3Atqp zDUB$MNFp@2R7knqQNO2htNZ+(^L);8&Oh(-S>E%$$I_IZfd>Ep7GS6m1ve7*1vk)c zT66%w4IBbsdOjFD5`%ZN4#FaF_VR(=XdCPO0KGwR9cnlH0uKOm3=8xC@M#N6*JAHf zWQ*S{6dN$N2XpF%vE2r>MDk8@c@$Ks+1xyN1kEN?vl`JCF+Qm0BL(SUuBECeTod)5 znZJ3JYD&3(N6pXHVLGE*Le3PqTD`_{c*UIFL|DvM%p1%+f=?CF$6HWY{0&IV{C0_c zrKa&U%7_8wrmdw>_`H7j=sUfAFx+-xPRD>t@~wa>W5AK^*ovxxxeVsbStys(+UrOv zjBDqfRUYr~g$r%5t9*VNbe3Q0AEwoReRaRn60P=b1_0or)sGCMRgXjYVC4OAs6cOL z49X3O!+&alDXsk7_*V;Rvdnxav=*$s_?4X);yle9f$j9h=#?}H$`H$kDv+mIMfl==!{Wcj|U zQklhD-bj+6Qrs(z*BP9Ptl}Q$9|~=?j4YHShO9Bd$yg5MM9haUxgNq>PrO;vej&F< zJnNJE0ohpRa}A_;6ShOYi)lKVs7CU~dmeaSXF2nWprQ-exjQCa)5T~MIhY=o#r)eD zzQxu;E09KxHM0bp+(3{;WZ~gv?el|wI`;`1#9BH@kRhB!d?MZI*FyD4y-v52WVaS@ zKIh)Z9zVaX?k@)^`}=ullTJ&$=J*G66%&)YO7Rm|=H|6@mo zlR`{emA?nqSnsf!DtNy_2%irWWh(DF{mZh~hp?-6)d%l^NH3mX(e|S|;uhiQ0fZd8 z*H&C;S$c%W1E~*jTnb39KO~6wF~de^;_mBd}50wjVZhFFSdMT-!8@~Fb~b9v2T|4p7yX$;VTb4asP#vl6l9xYnOdt ztkV-F;5xVP=d7m!a5X zRF6-ctQ#tTFyElxD6AS#q<3<~!qZrz+^ux7I+iL+9d0uR%Pp07 z{Xvy`uVhkGnR{wtyWH0|5D(vE9J(uUCXWDK(cN6|t221)nB&-$%N!M*shOjkf({&i{V+t z>M;iiV;pB?>@3v`w^{X!y%6^K9n;~1QuIC^Zv7&Ahb+B35;?OE07Piq**j#cGs4T+ z9VzdL^TGVrke}Mvdr=g5!iMTva!;ZkYWO;r-iI}pl`EPUiLk;ZL}BWwng;6<8mRq$ zuV%VR`%%kWkufB7*yh$GPA9c}1z?DlRb0?Zzud=95?eje8wAO30V6eMUo5spCm&;B z6JlV>a%Hk%G$@cE3P{Dp5Lv9moTPY@=U7L#l))udDiC7w?YY0Wf5nP|IzdMbPb6on zC}p%u*q03RIxA4)&IaYp9d{4LC~J-5^hIAH84Ly(JVQE~>rzii6M~mF&jz|_>3u~5gJbG|&mK2${p zE;$n;pDkqt?s+~rGCJ(NZN^oltBo$aUSJ$lakSSsxm~+7_@UG#k_xmVISM6N>(mV< z3<_3mz-NZ?kCds}Q0yvPtNTib-r|qbG{!VKCaJOkp^P~~l9g0%YV0OgcQ{k0PBgh6rhyL7U*6-_We8^=_)RXlJ{3U(+|Kb;lvX$ZCp9^T=C zK6OR6=0bQ%RxiTqN+*}l6e$y0d*5;${UA?Uvt5~27@L7}p|0*YPGs-&d`P&Udr#M~ zO_uVq&3vc(7H>hx>jRdibo+$qfA%W@e^ObROaf(5yT>2?Q5Zk}QNEMgufX5i{T^T% z{#Vi6YyLFs9~l4Vq<>}zpRoae6Ied2Nt5?4*fe{f;r-AWzUKP9IeeRI_#V73$TS`K jf3f#!(zn Date: Mon, 9 Mar 2026 22:41:39 -0600 Subject: [PATCH 31/35] Regenerate penumbra debug adapter VSIX with Python zipfile for compatibility --- .vscode/penumbra-debug.vsix | Bin 2663 -> 2286 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.vscode/penumbra-debug.vsix b/.vscode/penumbra-debug.vsix index 69c32ff3524e8bf45877dccdee73929e26b86a88..b963e3ae06421f8ff3afb421ceb142aa25c9541a 100644 GIT binary patch delta 875 zcmaDZ@=j1Xz?+#xgn@y9gMo2tW{ihip~Pk&&zg~eL3r|h4zY>8dxb#~6~@;kt^x)9 zSr{0^7#JqYGK$x)opLbmwgFGu`${gy?-8E@tfQ!@}g*culBP|ox4A--4oq&iRY8J zMgi}+Hxm|B*rnf5nQYds+4pQy&&GM0u9cml0YNiuDn9L=@nm0+RQ>mi+Fr-EFAd%$ zT{)X#_4ac5FWH8TZbq%IExIQPyp&ST=(r&FW5=Zzi#pvuipE?l;4kjX`;)AEwCihD ziSJfk-L%^xpKghlPc2A{+`P5Ti$^9($tvFKYV-8AEbim^0S}d48z$XMI$e3T1X3XZ9zZkaKMbNKn~mu3)Dxf24d( zjmyS^2?x4#e!M8okNl!_vHO#GnXc55caN${ZFX+hcjHga3dY@?y=HcmU!*4cuQTAg zDY=1H{8#a;JKKcA-z&%}?YeeXb<+)DHQ2l4T>t!k!aj-R`b)y)Do(&)KCLHfzoP_-*|LiN9=!BynYNW{mpVD-92s z7#QTaz%kE|T2YdkSDcxjH(7^^ck^b}$4o}B6a-TKp5a;eRA54R%#5a7AFfd^t9bJ{ z=IM+Yj7%cTIMN<44Z=VJ#^%oq>3LW#{lo;4!_gD`^(L$q^#UP)?RNqk6UL27ZV zUPW$BXb2|*v+IKOnIK$R!Og(P@`9Ox0ZdFZ+$($uXw0VfoC&XhMjT;bU=U-Fnas#2 zUJusi4b%g|X!_Pp@y)+&z|;2rr)bl=jkD%;9q_zpdRQPwvS;b*jSR_#+rlD^TyFaQ z`}^X?&lh~RC%n~|Srhk3_34+o@W_iv3Xkvl_)U`5yzn$mI{ZwE@b<^nmG<&WC7-Mh zc)&I1rjqN&nln4LWfFRA9NO!Ifi zSKgjYFKj^a;_}_2`U$*1m=s$A2DB3 z4~)0JBC?@`TG`yCssZvM$x!MMAx*UYZ+i`3-)bq0Jl zB{%Sj|1$D?x2totw#V*{b;afNjXBo+s?VGJ9@Hz9z5ZG6F~9e+`lZ?Y>)RRUwynDt zJ#*FRT<__9N)g=R*W%-BW!Zi#kE&W5@|Vk7KlgRATt|f>+tS01HgB{4)UG~me&#gq z#wXVca$>LkRrar&P(EpT#OENP93AH5jB{##T7~pevx`)wmGtzVY^pVywob(NYWBv^ zc?W*SU#$5e3`%lbz(mHta0QrFzzitC1x#|O6~F{noSC1e4^A-wz|;c5XekDfY(Zwc zXLuGq6`0;00}~=By&dEbm%*odvl-iTMrl~W2brM$_DaJ;CI$w1pu<2W)Dkj5k@+!G zJtLDGGp@`d0rnHnQ4C8OK}@V!i4~HSFg%Aa7&AK|3}ykE%s7cr0+_de24Trp0p1{k zaD_F*AO;2jhPRGZz>q@@d7yb%LmlBTq;MC720X%LOB(B#Cm-ODZ~?oF2$N95AK9Q} b*2y&-5_-4|Vr2sbFDnr41%~z%4iFCj%%hwu From 6bb5afad1a2de98316036c0127e4972fa3c81b7d Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Mon, 9 Mar 2026 22:44:30 -0600 Subject: [PATCH 32/35] Fix penumbra debug adapter .exe lookup on Windows --- .vscode/penumbra-debug.vsix | Bin 2286 -> 2328 bytes .vscode/penumbra-debug/extension.js | 5 +++-- .vscode/penumbra-debug/package.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.vscode/penumbra-debug.vsix b/.vscode/penumbra-debug.vsix index b963e3ae06421f8ff3afb421ceb142aa25c9541a..f479d617adb9fca23239f6a122ed0c910c6f8431 100644 GIT binary patch delta 1055 zcmV+)1mOGb5ttGSP)h>@6aWAK2mpqW3*!iewP{?58Ux{x_9cIg+At7??>vR&J27xt zp}=apR26EeqO#p%r6C>?cO5(OI4rz%-PzO4WyBIZ_Os9SNT)zV_)<~vs9cMWbBHdsF4H4P{AJ-aPH1Q<9 zfGZmAVIk3tzi*{jvtEs^sdk~o?3zMe`{J&WnG{*GvxZ6x99kkeUrN=3SB7c}r>{`q zGV3v7)ndehhB{(M)oo0lg_H+VM;2+jo>L7umsAHN3mYLF|1HnSaHQJ&FjS zz)0d?Kzv$#5Z|!!5ycjR0V}fLqtCr%(W^u+%HP(%M(!e+4f*-!&^8yjtW z^5``tA6;P_vNK>CF7(GVxoan`-a$G>bgjE9WZQWxITtj5|B2YH=l>ynHck(uS07%^ z0~&^|-dbUqs@rW#*N!4s3pdu^UOk-$__ta*tyKLEOK)xKVjhTiA$q0rK|Gym{Bx_9 zH_XcovE@6aWAK2mrdG zv-tuO0}_C>X&uoOL&> zSY-0#(TMOm#?$|RR(_0CJ|S5ZjSSiv5cGKy0dsN=cnAf&XF%4);vpq&oR#Q3Z)y=L zf9rOzTrPp_wfXXy!3tP|ChkfnIJqqmwW;E zm5X2Tr%%r-9-Zcu-_TGO6K-8Weie4Bu0h60>ZW@z>7DSuR-0>z8L*QdONVpObf)nZ zQwhC{%G3O5Z2s5L$o!J0xThzX!w{VTgZsW4&po~G3H4bz$cw!F^gtO;6Pg>f^ zZJXU1^jg$)DdZM{h0Wvd9}}Msi=)2Wmo>;~yQe{TJ6b@6mldQ=5wf!?)=0fORO928D0~7!N00;nvlh_A92!^$3T!|V3;gcW;JOa9+lU@iy4uG|3 ZT-|)DXTJde03igEt_V5?^#=d|008#@@6aWAK2mk?*3*!+1wP{>8KRsfZ$CPA5_g9UXm^xMen0t> za(Z{Dtk`29;b_ zI$uiFgO`SC3&(Fz;UeoXV%cKEy@onsNYyZ=&qB(BsUwTDUC*e7oJ*<$e-eg0%0)+j zjv#hEh|IrY$R0(6P+%mnHy}PQAH;X8d_=LqV8Dtj_~>(QS@bH=i}E*iEgGcm;(B#F zxv;+2{A{QJyNQi9K6&&SlTWTN4%r#74Hx=zn%uS%SMMMlBD&VyC9>^2mYfT^fImcR z*Yp37z8I%3q*otaP6N6OWL>?rGF8KEOIMB}SPKK|hgVOh0sgC&PAgS^!qTB_UCccZ zFGR0&I*6xZjel?T{DyhCA(s3a&aJDud*sP4@=o#+YhFr%tz}>g&84ujDx2~4udo>X z22e`_1QY-O00;ooqqF$}69W#^qiJ040OnVf0RRBw1CtsC9eyi>DY!m9cleAk`t($}|P4e5$7rPcllY<`;Mk3sS#c!`H zW@&el=Cee!9yNELLp|=v2e@|N<-mQC8veb-l>YFkV&)EmEjU46#GsF+6U%MK1$k^ zZfoqCYA$eYDv37K@$lqcU}r9L&z85Vd*-cTB`rcDW`CpHs)Xz;?9#hV7%l3eYjW%@ z`!Y(Ori3*iRl&s?oPou|+w;ih-*ChK@fzKUs_A}|pf`gN zlGqPXC?r@=Hb(jiLrH66U7Wt(e#|BVZ)j%8A5cpH0u%!j0000800EN%2tWt{wP{>< rGuIfCN(ejx)T5J#2tp3jqiJ040OnVf0RRBw1C!VYItI%J00000$+g&g diff --git a/.vscode/penumbra-debug/extension.js b/.vscode/penumbra-debug/extension.js index 61b29fab89c..b81a8a6d5a7 100644 --- a/.vscode/penumbra-debug/extension.js +++ b/.vscode/penumbra-debug/extension.js @@ -3,20 +3,21 @@ const path = require('path'); const fs = require('fs'); function activate(context) { + const exe = process.platform === 'win32' ? 'penumbra.exe' : 'penumbra'; context.subscriptions.push( vscode.debug.registerDebugAdapterDescriptorFactory('penumbra', { createDebugAdapterDescriptor(_session) { // Look for penumbra in build/binutils/ (downloaded by build system) const workspaceFolder = vscode.workspace.workspaceFolders?.[0]?.uri.fsPath; if (workspaceFolder) { - const buildPath = path.join(workspaceFolder, 'build', 'binutils', 'penumbra'); + const buildPath = path.join(workspaceFolder, 'build', 'binutils', exe); if (fs.existsSync(buildPath)) { return new vscode.DebugAdapterExecutable(buildPath, ['--dap']); } } // Fallback to PATH - return new vscode.DebugAdapterExecutable('penumbra', ['--dap']); + return new vscode.DebugAdapterExecutable(exe, ['--dap']); } }) ); diff --git a/.vscode/penumbra-debug/package.json b/.vscode/penumbra-debug/package.json index b671e00b8e9..46c9cb679a9 100644 --- a/.vscode/penumbra-debug/package.json +++ b/.vscode/penumbra-debug/package.json @@ -2,7 +2,7 @@ "name": "penumbra-debug", "displayName": "Penumbra Debug Adapter", "description": "Debug adapter for PowerPC targets via GDB Remote Serial Protocol", - "version": "0.0.1", + "version": "0.0.2", "publisher": "pheenoh", "engines": { "vscode": "^1.80.0" From 8d76ed79e565662ee477ad6c5eeda01ddf04c6f2 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Mon, 9 Mar 2026 22:50:43 -0600 Subject: [PATCH 33/35] Fix DWARF file paths on Windows by normalizing backslashes to forward slashes --- tools/gen_dwarf2_debug.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gen_dwarf2_debug.py b/tools/gen_dwarf2_debug.py index aadc2a7c79e..490c641fd06 100644 --- a/tools/gen_dwarf2_debug.py +++ b/tools/gen_dwarf2_debug.py @@ -1105,7 +1105,7 @@ def generate_combined_obj(map_path, o_index, out_s, out_o, build_dir, o_rel_norm = os.path.relpath(o_path, build_dir) parts = o_rel_norm.split(os.sep) src_dir = os.path.join(*parts[:-1]) if len(parts) >= 2 else "." - source_path = os.path.join(src_dir, source_name) + source_path = os.path.join(src_dir, source_name).replace("\\", "/") if source_path not in file_table: file_table[source_path] = len(file_table) + 1 From 6363e686139330a0670de5f95f124258ab82a93f Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Tue, 10 Mar 2026 01:07:06 -0600 Subject: [PATCH 34/35] Fix DWARF debug info generation on Windows - Use os.sep instead of hardcoded '/' in build_o_index path matching, so Windows backslash paths correctly prefer src/ over obj/ objects - Add libs/ path fallback for source files whose build paths have stripped prefixes (e.g. src/dolphin/os/X.c -> libs/dolphin/src/os/X.c) Co-Authored-By: Claude Opus 4.6 --- tools/gen_dwarf2_debug.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/gen_dwarf2_debug.py b/tools/gen_dwarf2_debug.py index 490c641fd06..61c279e38ac 100644 --- a/tools/gen_dwarf2_debug.py +++ b/tools/gen_dwarf2_debug.py @@ -238,7 +238,7 @@ def build_o_index(search_dirs): "debug_info.o", "debug_varinfo.o" ): full = os.path.join(dirpath, fn) - if fn not in o_by_basename or "/src/" in full: + if fn not in o_by_basename or (os.sep + "src" + os.sep) in full: o_by_basename[fn] = full return o_by_basename @@ -1107,6 +1107,18 @@ def generate_combined_obj(map_path, o_index, out_s, out_o, build_dir, src_dir = os.path.join(*parts[:-1]) if len(parts) >= 2 else "." source_path = os.path.join(src_dir, source_name).replace("\\", "/") + # The build system may strip prefixes (e.g. libs/dolphin/src/os/X.c + # compiles to build/src/dolphin/os/X.o, giving src/dolphin/os/X.c). + # Check if the path exists; if not, try libs//src/. + project_root = os.path.dirname(os.path.dirname(build_dir)) + if not os.path.exists(os.path.join(project_root, source_path)): + sp_parts = source_path.split("/") + if len(sp_parts) >= 3 and sp_parts[0] == "src": + libs_path = "libs/%s/src/%s" % ( + sp_parts[1], "/".join(sp_parts[2:])) + if os.path.exists(os.path.join(project_root, libs_path)): + source_path = libs_path + if source_path not in file_table: file_table[source_path] = len(file_table) + 1 file_idx = file_table[source_path] From bb6043f8746cb68a6adaff3d94f627ac39a350c4 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Tue, 10 Mar 2026 01:18:39 -0600 Subject: [PATCH 35/35] fixes from upstream merge --- include/gz/gz.h | 9 +- include/gz/gz_menu_flags.h | 6 +- src/gz/gz_menu_framework.cpp | 12 +- src/gz/gz_menu_inventory.cpp | 168 +++++++------- src/gz/gz_menu_inventory_pause.cpp | 254 ++++++++++----------- src/gz/gz_menu_inventory_pause_submenu.cpp | 14 +- src/gz/gz_menu_inventory_ring.cpp | 168 +++++++------- src/gz/gz_save_callbacks.cpp | 26 +-- 8 files changed, 329 insertions(+), 328 deletions(-) diff --git a/include/gz/gz.h b/include/gz/gz.h index b417ca394af..84684940b4d 100644 --- a/include/gz/gz.h +++ b/include/gz/gz.h @@ -4,6 +4,7 @@ #include "c/c_damagereaction.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" +#include "d/d_item_data.h" #include "gz/gz_capture.h" #include "gz/gz_utility_misc.h" #include "gz/gz_manager_cheats.h" @@ -969,11 +970,11 @@ inline void gzInfo_onMiniBossDefeated(int i_stageNo) { inline void gzInfo_onDropShadows() { g_gzInfo.setDropShadows(true); } inline void gzInfo_onDungeonBossKey(int i_stageNo) { - gzInfo_isInDungeon(i_stageNo) ? execItemGet(fpcNm_ITEM_BOSS_KEY) : dComIfGs_onSaveDungeonItemBossKey(i_stageNo); + gzInfo_isInDungeon(i_stageNo) ? execItemGet(dItemNo_BOSS_KEY_e) : dComIfGs_onSaveDungeonItemBossKey(i_stageNo); } inline void gzInfo_onDungeonCompass(int i_stageNo) { - gzInfo_isInDungeon(i_stageNo) ? execItemGet(fpcNm_ITEM_COMPUS) : dComIfGs_onSaveDungeonItemCompass(i_stageNo); + gzInfo_isInDungeon(i_stageNo) ? execItemGet(dItemNo_COMPUS_e) : dComIfGs_onSaveDungeonItemCompass(i_stageNo); } inline void gzInfo_onDungeonHeartContainer(int i_stageNo) { @@ -982,12 +983,12 @@ inline void gzInfo_onDungeonHeartContainer(int i_stageNo) { } inline void gzInfo_onDungeonMap(int i_stageNo) { - gzInfo_isInDungeon(i_stageNo) ? execItemGet(fpcNm_ITEM_MAP) : dComIfGs_onSaveDungeonItemMap(i_stageNo); + gzInfo_isInDungeon(i_stageNo) ? execItemGet(dItemNo_MAP_e) : dComIfGs_onSaveDungeonItemMap(i_stageNo); } inline void gzInfo_onDungeonOoccoo(int i_stageNo) { // NOTE(Pheenoh): This won't actually give you the ooccoo, just set the flag. - // Maybe we should call execItemGet(fpcNm_ITEM_DUNGEON_EXIT) which will do both? + // Maybe we should call execItemGet(dItemNo_DUNGEON_EXIT_e) which will do both? // Or should we leave them separate and let the user set ooccoo in the inventory menu? gzInfo_isInDungeon(i_stageNo) ? dComIfGs_onDungeonItemWarp() : dComIfGs_onSaveDungeonItemWarp(i_stageNo); } diff --git a/include/gz/gz_menu_flags.h b/include/gz/gz_menu_flags.h index 164f78c9d2d..7df246b6e75 100644 --- a/include/gz/gz_menu_flags.h +++ b/include/gz/gz_menu_flags.h @@ -212,18 +212,18 @@ inline bool isFundraising2() { return dComIfGs_isEventBit(0x0f10); } inline void onFundraising2() { dComIfGs_onEventBit(0x0f10); } inline void offFundraising2() { dComIfGs_offEventBit(0x0f10); } inline bool isRupeeCS() { - for (int itemNo = fpcNm_ITEM_BLUE_RUPEE; itemNo <= fpcNm_ITEM_SILVER_RUPEE; itemNo++) { + for (int itemNo = dItemNo_BLUE_RUPEE_e; itemNo <= dItemNo_SILVER_RUPEE_e; itemNo++) { if (dComIfGs_isItemFirstBit(itemNo)) return false; } return true; } inline void onRupeeCS() { - for (int itemNo = fpcNm_ITEM_BLUE_RUPEE; itemNo <= fpcNm_ITEM_SILVER_RUPEE; itemNo++) { + for (int itemNo = dItemNo_BLUE_RUPEE_e; itemNo <= dItemNo_SILVER_RUPEE_e; itemNo++) { dComIfGs_offItemFirstBit(itemNo); } } inline void offRupeeCS() { - for (int itemNo = fpcNm_ITEM_BLUE_RUPEE; itemNo <= fpcNm_ITEM_SILVER_RUPEE; itemNo++) { + for (int itemNo = dItemNo_BLUE_RUPEE_e; itemNo <= dItemNo_SILVER_RUPEE_e; itemNo++) { dComIfGs_onItemFirstBit(itemNo); } } diff --git a/src/gz/gz_menu_framework.cpp b/src/gz/gz_menu_framework.cpp index 77d3d6c8e2b..10f4f7a1d71 100644 --- a/src/gz/gz_menu_framework.cpp +++ b/src/gz/gz_menu_framework.cpp @@ -20,17 +20,17 @@ static const char* getProcessTypeName(base_process_class* process) { char* gzFrameworkMenu_c::getProcessName(base_process_class* process) { switch (process->name) { - case PROC_OPENING_SCENE: + case fpcNm_OPENING_SCENE_e: return "opening scene"; - case PROC_PLAY_SCENE: + case fpcNm_PLAY_SCENE_e: return "play scene"; - case PROC_ROOM_SCENE: + case fpcNm_ROOM_SCENE_e: return "room scene"; - case PROC_NAME_SCENE: + case fpcNm_NAME_SCENE_e: return "name scene"; - case PROC_LOGO_SCENE: + case fpcNm_LOGO_SCENE_e: return "logo scene"; - case PROC_MENU_SCENE: + case fpcNm_MENU_SCENE_e: return "menu scene"; default: return "unk"; diff --git a/src/gz/gz_menu_inventory.cpp b/src/gz/gz_menu_inventory.cpp index a3e8f4f9e53..86ca7980eb0 100644 --- a/src/gz/gz_menu_inventory.cpp +++ b/src/gz/gz_menu_inventory.cpp @@ -13,13 +13,13 @@ static bool isAmmoItem(u8 item) { switch (item) { - case fpcNm_ITEM_BOW: - case fpcNm_ITEM_LIGHT_ARROW: - case fpcNm_ITEM_BOMB_ARROW: - case fpcNm_ITEM_HAWK_ARROW: - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_BOW_e: + case dItemNo_LIGHT_ARROW_e: + case dItemNo_BOMB_ARROW_e: + case dItemNo_HAWK_ARROW_e: + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: return true; default: return false; @@ -35,7 +35,7 @@ gzInventoryMenu_c::gzInventoryMenu_c() { mRingRadiusH = 150.0f; mRingRadiusV = 140.0f; - mOriginalItem = fpcNm_ITEM_NONE; + mOriginalItem = dItemNo_NONE_e; for (int i = 0; i < gzInventoryMenu_c::RING_MAX_SLOTS; i++) { mItemSlots[i] = 0; @@ -51,7 +51,7 @@ gzInventoryMenu_c::gzInventoryMenu_c() { } for (int i = 0; i < 3; i++) { - mPickerItems[i] = fpcNm_ITEM_NONE; + mPickerItems[i] = dItemNo_NONE_e; for (int j = 0; j < 3; j++) { mpPickerTex[i][j] = NULL; mpPickerBuf[i][j] = NULL; @@ -460,81 +460,81 @@ gzButtonHints_s gzInventoryMenu_c::getButtonHints() { const char* gzInventoryMenu_c::getItemName(u8 itemId) { switch (itemId) { - case fpcNm_ITEM_NOENTRY_19: return "Black Rupee"; - case fpcNm_ITEM_BOOMERANG: return "Gale Boomerang"; - case fpcNm_ITEM_KANTERA: return "Lantern"; - case fpcNm_ITEM_PACHINKO: return "Slingshot"; - case fpcNm_ITEM_FISHING_ROD_1: return "Fishing Rod"; - case fpcNm_ITEM_LURE_ROD: return "Fishing Rod (Lure)"; - case fpcNm_ITEM_BEE_ROD: return "Fishing Rod (Bee)"; - case fpcNm_ITEM_WORM_ROD: return "Fishing Rod (Worm)"; - case fpcNm_ITEM_JEWEL_ROD: return "Fishing Rod (Coral)"; - case fpcNm_ITEM_JEWEL_BEE_ROD: return "Fishing Rod (Coral+Bee)"; - case fpcNm_ITEM_JEWEL_WORM_ROD: return "Fishing Rod (Coral+Worm)"; - case fpcNm_ITEM_HVY_BOOTS: return "Iron Boots"; - case fpcNm_ITEM_HOOKSHOT: return "Clawshot"; - case fpcNm_ITEM_W_HOOKSHOT: return "Double Clawshots"; - case fpcNm_ITEM_BOW: return "Hero's Bow"; - case fpcNm_ITEM_LIGHT_ARROW: return "Bow (Light Arrows)"; - case fpcNm_ITEM_BOMB_ARROW: return "Bow (Bomb Arrows)"; - case fpcNm_ITEM_HAWK_ARROW: return "Bow (Hawkeye)"; - case fpcNm_ITEM_HAWK_EYE: return "Hawkeye"; - case fpcNm_ITEM_NORMAL_BOMB: return "Bomb"; - case fpcNm_ITEM_WATER_BOMB: return "Water Bomb"; - case fpcNm_ITEM_POKE_BOMB: return "Bomblings"; - case fpcNm_ITEM_SPINNER: return "Spinner"; - case fpcNm_ITEM_IRONBALL: return "Ball and Chain"; - case fpcNm_ITEM_COPY_ROD: return "Dominion Rod"; - case fpcNm_ITEM_COPY_ROD_2: return "Dominion Rod (Powered)"; - case fpcNm_ITEM_HORSE_FLUTE: return "Horse Call"; - case fpcNm_ITEM_WOOD_STICK: return "Wooden Sword"; - case fpcNm_ITEM_EMPTY_BOTTLE: return "Empty Bottle"; - case fpcNm_ITEM_RED_BOTTLE: return "Red Potion"; - case fpcNm_ITEM_GREEN_BOTTLE: return "Green Potion"; - case fpcNm_ITEM_BLUE_BOTTLE: return "Blue Potion"; - case fpcNm_ITEM_MILK_BOTTLE: return "Milk"; - case fpcNm_ITEM_HALF_MILK_BOTTLE: return "Half Milk"; - case fpcNm_ITEM_WATER_BOTTLE: return "Water"; - case fpcNm_ITEM_HOT_SPRING: return "Hot Spring Water"; - case fpcNm_ITEM_OIL_BOTTLE: return "Lantern Oil"; - case fpcNm_ITEM_UGLY_SOUP: return "Nasty Soup"; - case fpcNm_ITEM_LV1_SOUP: return "Simple Soup"; - case fpcNm_ITEM_LV2_SOUP: return "Good Soup"; - case fpcNm_ITEM_LV3_SOUP: return "Superb Soup"; - case fpcNm_ITEM_CHUCHU_RARE: return "Rare Chu Jelly"; - case fpcNm_ITEM_CHUCHU_RED: return "Red Chu Jelly"; - case fpcNm_ITEM_CHUCHU_BLUE: return "Blue Chu Jelly"; - case fpcNm_ITEM_CHUCHU_GREEN: return "Green Chu Jelly"; - case fpcNm_ITEM_CHUCHU_YELLOW: return "Yellow Chu Jelly"; - case fpcNm_ITEM_CHUCHU_PURPLE: return "Purple Chu Jelly"; - case fpcNm_ITEM_BEE_CHILD: return "Bee Larva"; - case fpcNm_ITEM_FAIRY: return "Fairy"; - case fpcNm_ITEM_FAIRY_DROP: return "Fairy's Tears"; - case fpcNm_ITEM_WORM: return "Worm"; - case fpcNm_ITEM_ZORAS_JEWEL: return "Reekfish Scent"; - case fpcNm_ITEM_LETTER: return "Letter"; - case fpcNm_ITEM_BILL: return "Invoice"; - case fpcNm_ITEM_SWORD: return "Ordon Sword"; - case fpcNm_ITEM_MASTER_SWORD: return "Master Sword"; - case fpcNm_ITEM_LIGHT_SWORD: return "Master Sword (Light)"; - case fpcNm_ITEM_WOOD_SHIELD: return "Ordon Shield"; - case fpcNm_ITEM_SHIELD: return "Wooden Shield"; - case fpcNm_ITEM_HYLIA_SHIELD: return "Hylian Shield"; - case fpcNm_ITEM_WEAR_KOKIRI: return "Hero's Clothes"; - case fpcNm_ITEM_WEAR_ZORA: return "Zora Armor"; - case fpcNm_ITEM_ARMOR: return "Magic Armor"; - case fpcNm_ITEM_WALLET_LV1: return "Wallet (300)"; - case fpcNm_ITEM_WALLET_LV2: return "Wallet (600)"; - case fpcNm_ITEM_WALLET_LV3: return "Wallet (1000)"; - case fpcNm_ITEM_ARROW_LV1: return "Quiver (30)"; - case fpcNm_ITEM_ARROW_LV2: return "Quiver (60)"; - case fpcNm_ITEM_ARROW_LV3: return "Quiver (100)"; - case fpcNm_ITEM_SMELL_CHILDREN: return "Youth's Scent"; - case fpcNm_ITEM_SMELL_YELIA_POUCH: return "Scent of Ilia"; - case fpcNm_ITEM_SMELL_FISH: return "Reekfish Scent"; - case fpcNm_ITEM_SMELL_MEDICINE: return "Medicine Scent"; - case fpcNm_ITEM_SMELL_POH: return "Poe Scent"; - case fpcNm_ITEM_NONE: return ""; + case dItemNo_NOENTRY_19_e: return "Black Rupee"; + case dItemNo_BOOMERANG_e: return "Gale Boomerang"; + case dItemNo_KANTERA_e: return "Lantern"; + case dItemNo_PACHINKO_e: return "Slingshot"; + case dItemNo_FISHING_ROD_1_e: return "Fishing Rod"; + case dItemNo_LURE_ROD_e: return "Fishing Rod (Lure)"; + case dItemNo_BEE_ROD_e: return "Fishing Rod (Bee)"; + case dItemNo_WORM_ROD_e: return "Fishing Rod (Worm)"; + case dItemNo_JEWEL_ROD_e: return "Fishing Rod (Coral)"; + case dItemNo_JEWEL_BEE_ROD_e: return "Fishing Rod (Coral+Bee)"; + case dItemNo_JEWEL_WORM_ROD_e: return "Fishing Rod (Coral+Worm)"; + case dItemNo_HVY_BOOTS_e: return "Iron Boots"; + case dItemNo_HOOKSHOT_e: return "Clawshot"; + case dItemNo_W_HOOKSHOT_e: return "Double Clawshots"; + case dItemNo_BOW_e: return "Hero's Bow"; + case dItemNo_LIGHT_ARROW_e: return "Bow (Light Arrows)"; + case dItemNo_BOMB_ARROW_e: return "Bow (Bomb Arrows)"; + case dItemNo_HAWK_ARROW_e: return "Bow (Hawkeye)"; + case dItemNo_HAWK_EYE_e: return "Hawkeye"; + case dItemNo_NORMAL_BOMB_e: return "Bomb"; + case dItemNo_WATER_BOMB_e: return "Water Bomb"; + case dItemNo_POKE_BOMB_e: return "Bomblings"; + case dItemNo_SPINNER_e: return "Spinner"; + case dItemNo_IRONBALL_e: return "Ball and Chain"; + case dItemNo_COPY_ROD_e: return "Dominion Rod"; + case dItemNo_COPY_ROD_2_e: return "Dominion Rod (Powered)"; + case dItemNo_HORSE_FLUTE_e: return "Horse Call"; + case dItemNo_WOOD_STICK_e: return "Wooden Sword"; + case dItemNo_EMPTY_BOTTLE_e: return "Empty Bottle"; + case dItemNo_RED_BOTTLE_e: return "Red Potion"; + case dItemNo_GREEN_BOTTLE_e: return "Green Potion"; + case dItemNo_BLUE_BOTTLE_e: return "Blue Potion"; + case dItemNo_MILK_BOTTLE_e: return "Milk"; + case dItemNo_HALF_MILK_BOTTLE_e: return "Half Milk"; + case dItemNo_WATER_BOTTLE_e: return "Water"; + case dItemNo_HOT_SPRING_e: return "Hot Spring Water"; + case dItemNo_OIL_BOTTLE_e: return "Lantern Oil"; + case dItemNo_UGLY_SOUP_e: return "Nasty Soup"; + case dItemNo_LV1_SOUP_e: return "Simple Soup"; + case dItemNo_LV2_SOUP_e: return "Good Soup"; + case dItemNo_LV3_SOUP_e: return "Superb Soup"; + case dItemNo_CHUCHU_RARE_e: return "Rare Chu Jelly"; + case dItemNo_CHUCHU_RED_e: return "Red Chu Jelly"; + case dItemNo_CHUCHU_BLUE_e: return "Blue Chu Jelly"; + case dItemNo_CHUCHU_GREEN_e: return "Green Chu Jelly"; + case dItemNo_CHUCHU_YELLOW_e: return "Yellow Chu Jelly"; + case dItemNo_CHUCHU_PURPLE_e: return "Purple Chu Jelly"; + case dItemNo_BEE_CHILD_e: return "Bee Larva"; + case dItemNo_FAIRY_e: return "Fairy"; + case dItemNo_FAIRY_DROP_e: return "Fairy's Tears"; + case dItemNo_WORM_e: return "Worm"; + case dItemNo_ZORAS_JEWEL_e: return "Reekfish Scent"; + case dItemNo_LETTER_e: return "Letter"; + case dItemNo_BILL_e: return "Invoice"; + case dItemNo_SWORD_e: return "Ordon Sword"; + case dItemNo_MASTER_SWORD_e: return "Master Sword"; + case dItemNo_LIGHT_SWORD_e: return "Master Sword (Light)"; + case dItemNo_WOOD_SHIELD_e: return "Ordon Shield"; + case dItemNo_SHIELD_e: return "Wooden Shield"; + case dItemNo_HYLIA_SHIELD_e: return "Hylian Shield"; + case dItemNo_WEAR_KOKIRI_e: return "Hero's Clothes"; + case dItemNo_WEAR_ZORA_e: return "Zora Armor"; + case dItemNo_ARMOR_e: return "Magic Armor"; + case dItemNo_WALLET_LV1_e: return "Wallet (300)"; + case dItemNo_WALLET_LV2_e: return "Wallet (600)"; + case dItemNo_WALLET_LV3_e: return "Wallet (1000)"; + case dItemNo_ARROW_LV1_e: return "Quiver (30)"; + case dItemNo_ARROW_LV2_e: return "Quiver (60)"; + case dItemNo_ARROW_LV3_e: return "Quiver (100)"; + case dItemNo_SMELL_CHILDREN_e: return "Youth's Scent"; + case dItemNo_SMELL_YELIA_POUCH_e: return "Scent of Ilia"; + case dItemNo_SMELL_FISH_e: return "Reekfish Scent"; + case dItemNo_SMELL_MEDICINE_e: return "Medicine Scent"; + case dItemNo_SMELL_POH_e: return "Poe Scent"; + case dItemNo_NONE_e: return ""; default: return "Unknown"; } } diff --git a/src/gz/gz_menu_inventory_pause.cpp b/src/gz/gz_menu_inventory_pause.cpp index 035e6ed6c82..ea9d2289ddb 100644 --- a/src/gz/gz_menu_inventory_pause.cpp +++ b/src/gz/gz_menu_inventory_pause.cpp @@ -59,15 +59,15 @@ static bool loadArchiveTexture(JKRArchive* arc, const char* name, static const char* getScentTextureName(u8 itemId) { switch (itemId) { - case fpcNm_ITEM_SMELL_CHILDREN: + case dItemNo_SMELL_CHILDREN_e: return "ni_nioi_child.bti"; - case fpcNm_ITEM_SMELL_YELIA_POUCH: + case dItemNo_SMELL_YELIA_POUCH_e: return "ni_nioi_iria.bti"; - case fpcNm_ITEM_SMELL_FISH: + case dItemNo_SMELL_FISH_e: return "ni_nioi_fish.bti"; - case fpcNm_ITEM_SMELL_MEDICINE: + case dItemNo_SMELL_MEDICINE_e: return "ni_nioi_medicin.bti"; - case fpcNm_ITEM_SMELL_POH: + case dItemNo_SMELL_POH_e: return "ni_nioi_pou.bti"; default: return NULL; @@ -203,55 +203,55 @@ int gzInventoryMenu_c::getMaxColsForRow(int row) { } void gzInventoryMenu_c::readPauseSlotStates() { - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SWORD)) { + if (dComIfGs_isItemFirstBit(dItemNo_SWORD_e)) { mPauseSlotState[0][0] = 2; - } else if (dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_STICK)) { + } else if (dComIfGs_isItemFirstBit(dItemNo_WOOD_STICK_e)) { mPauseSlotState[0][0] = 1; } else { mPauseSlotState[0][0] = 0; } - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_LIGHT_SWORD)) { + if (dComIfGs_isItemFirstBit(dItemNo_LIGHT_SWORD_e)) { mPauseSlotState[0][1] = 2; - } else if (dComIfGs_isItemFirstBit(fpcNm_ITEM_MASTER_SWORD)) { + } else if (dComIfGs_isItemFirstBit(dItemNo_MASTER_SWORD_e)) { mPauseSlotState[0][1] = 1; } else { mPauseSlotState[0][1] = 0; } - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SHIELD)) { + if (dComIfGs_isItemFirstBit(dItemNo_SHIELD_e)) { mPauseSlotState[1][0] = 2; - } else if (dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD)) { + } else if (dComIfGs_isItemFirstBit(dItemNo_WOOD_SHIELD_e)) { mPauseSlotState[1][0] = 1; } else { mPauseSlotState[1][0] = 0; } - mPauseSlotState[1][1] = dComIfGs_isItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD) ? 1 : 0; + mPauseSlotState[1][1] = dComIfGs_isItemFirstBit(dItemNo_HYLIA_SHIELD_e) ? 1 : 0; - mPauseSlotState[2][0] = dComIfGs_isItemFirstBit(fpcNm_ITEM_WEAR_KOKIRI) ? 1 : 0; - mPauseSlotState[2][1] = dComIfGs_isItemFirstBit(fpcNm_ITEM_WEAR_ZORA) ? 1 : 0; - mPauseSlotState[2][2] = dComIfGs_isItemFirstBit(fpcNm_ITEM_ARMOR) ? 1 : 0; + mPauseSlotState[2][0] = dComIfGs_isItemFirstBit(dItemNo_WEAR_KOKIRI_e) ? 1 : 0; + mPauseSlotState[2][1] = dComIfGs_isItemFirstBit(dItemNo_WEAR_ZORA_e) ? 1 : 0; + mPauseSlotState[2][2] = dComIfGs_isItemFirstBit(dItemNo_ARMOR_e) ? 1 : 0; mPauseSlotState[3][0] = dComIfGs_getWalletSize(); - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_LV3)) { + if (dComIfGs_isItemFirstBit(dItemNo_ARROW_LV3_e)) { mPauseSlotState[3][1] = 3; - } else if (dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_LV2)) { + } else if (dComIfGs_isItemFirstBit(dItemNo_ARROW_LV2_e)) { mPauseSlotState[3][1] = 2; - } else if (dComIfGs_isItemFirstBit(fpcNm_ITEM_ARROW_LV1)) { + } else if (dComIfGs_isItemFirstBit(dItemNo_ARROW_LV1_e)) { mPauseSlotState[3][1] = 1; } else { mPauseSlotState[3][1] = 0; } { static const u8 sBugItems[] = { - fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY, - fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, - fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, fpcNm_ITEM_M_DANGOMUSHI, - fpcNm_ITEM_F_DANGOMUSHI, fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, - fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL, - fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_GRASSHOPPER, - fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, + dItemNo_M_ANT_e, dItemNo_F_ANT_e, dItemNo_M_MAYFLY_e, dItemNo_F_MAYFLY_e, + dItemNo_M_BEETLE_e, dItemNo_F_BEETLE_e, dItemNo_M_MANTIS_e, dItemNo_F_MANTIS_e, + dItemNo_M_STAG_BEETLE_e, dItemNo_F_STAG_BEETLE_e, dItemNo_M_DANGOMUSHI_e, + dItemNo_F_DANGOMUSHI_e, dItemNo_M_BUTTERFLY_e, dItemNo_F_BUTTERFLY_e, + dItemNo_M_LADYBUG_e, dItemNo_F_LADYBUG_e, dItemNo_M_SNAIL_e, dItemNo_F_SNAIL_e, + dItemNo_M_NANAFUSHI_e, dItemNo_F_NANAFUSHI_e, dItemNo_M_GRASSHOPPER_e, + dItemNo_F_GRASSHOPPER_e, dItemNo_M_DRAGONFLY_e, dItemNo_F_DRAGONFLY_e, }; bool hasBug = false; for (int i = 0; i < (int)(sizeof(sBugItems) / sizeof(sBugItems[0])); i++) { @@ -264,15 +264,15 @@ void gzInventoryMenu_c::readPauseSlotStates() { } mPauseSlotState[3][3] = dComIfGs_getEventReg(0x30ff) & 0x7; - if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SMELL_POH)) { + if (dComIfGs_isItemFirstBit(dItemNo_SMELL_POH_e)) { mPauseSlotState[4][0] = 5; - } else if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SMELL_MEDICINE)) { + } else if (dComIfGs_isItemFirstBit(dItemNo_SMELL_MEDICINE_e)) { mPauseSlotState[4][0] = 4; - } else if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SMELL_FISH)) { + } else if (dComIfGs_isItemFirstBit(dItemNo_SMELL_FISH_e)) { mPauseSlotState[4][0] = 3; - } else if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SMELL_YELIA_POUCH)) { + } else if (dComIfGs_isItemFirstBit(dItemNo_SMELL_YELIA_POUCH_e)) { mPauseSlotState[4][0] = 2; - } else if (dComIfGs_isItemFirstBit(fpcNm_ITEM_SMELL_CHILDREN)) { + } else if (dComIfGs_isItemFirstBit(dItemNo_SMELL_CHILDREN_e)) { mPauseSlotState[4][0] = 1; } else { mPauseSlotState[4][0] = 0; @@ -287,82 +287,82 @@ u8 gzInventoryMenu_c::getItemForSlot(int row, int col) { switch (row) { case 0: if (col == 0) { - if (state == 2) return fpcNm_ITEM_SWORD; - if (state == 1) return fpcNm_ITEM_WOOD_STICK; - return fpcNm_ITEM_NONE; + if (state == 2) return dItemNo_SWORD_e; + if (state == 1) return dItemNo_WOOD_STICK_e; + return dItemNo_NONE_e; } else { - if (state == 2) return fpcNm_ITEM_LIGHT_SWORD; - if (state == 1) return fpcNm_ITEM_MASTER_SWORD; - return fpcNm_ITEM_NONE; + if (state == 2) return dItemNo_LIGHT_SWORD_e; + if (state == 1) return dItemNo_MASTER_SWORD_e; + return dItemNo_NONE_e; } case 1: if (col == 0) { - if (state == 2) return fpcNm_ITEM_SHIELD; - if (state == 1) return fpcNm_ITEM_WOOD_SHIELD; - return fpcNm_ITEM_NONE; + if (state == 2) return dItemNo_SHIELD_e; + if (state == 1) return dItemNo_WOOD_SHIELD_e; + return dItemNo_NONE_e; } else { - return state ? fpcNm_ITEM_HYLIA_SHIELD : fpcNm_ITEM_NONE; + return state ? dItemNo_HYLIA_SHIELD_e : dItemNo_NONE_e; } case 2: - if (col == 0) return state ? fpcNm_ITEM_WEAR_KOKIRI : fpcNm_ITEM_NONE; - if (col == 1) return state ? fpcNm_ITEM_WEAR_ZORA : fpcNm_ITEM_NONE; - if (col == 2) return state ? fpcNm_ITEM_ARMOR : fpcNm_ITEM_NONE; + if (col == 0) return state ? dItemNo_WEAR_KOKIRI_e : dItemNo_NONE_e; + if (col == 1) return state ? dItemNo_WEAR_ZORA_e : dItemNo_NONE_e; + if (col == 2) return state ? dItemNo_ARMOR_e : dItemNo_NONE_e; break; case 3: if (col == 0) { - if (state >= 2) return fpcNm_ITEM_WALLET_LV3; - if (state == 1) return fpcNm_ITEM_WALLET_LV2; - return fpcNm_ITEM_WALLET_LV1; + if (state >= 2) return dItemNo_WALLET_LV3_e; + if (state == 1) return dItemNo_WALLET_LV2_e; + return dItemNo_WALLET_LV1_e; } if (col == 1) { - if (state >= 3) return fpcNm_ITEM_ARROW_LV3; - if (state == 2) return fpcNm_ITEM_ARROW_LV2; - if (state == 1) return fpcNm_ITEM_ARROW_LV1; - return fpcNm_ITEM_NONE; + if (state >= 3) return dItemNo_ARROW_LV3_e; + if (state == 2) return dItemNo_ARROW_LV2_e; + if (state == 1) return dItemNo_ARROW_LV1_e; + return dItemNo_NONE_e; } - if (col == 2) return fpcNm_ITEM_NONE; - if (col == 3) return fpcNm_ITEM_NONE; + if (col == 2) return dItemNo_NONE_e; + if (col == 3) return dItemNo_NONE_e; break; case 4: if (col == 0) { - if (state == 5) return fpcNm_ITEM_SMELL_POH; - if (state == 4) return fpcNm_ITEM_SMELL_MEDICINE; - if (state == 3) return fpcNm_ITEM_SMELL_FISH; - if (state == 2) return fpcNm_ITEM_SMELL_YELIA_POUCH; - if (state == 1) return fpcNm_ITEM_SMELL_CHILDREN; - return fpcNm_ITEM_NONE; + if (state == 5) return dItemNo_SMELL_POH_e; + if (state == 4) return dItemNo_SMELL_MEDICINE_e; + if (state == 3) return dItemNo_SMELL_FISH_e; + if (state == 2) return dItemNo_SMELL_YELIA_POUCH_e; + if (state == 1) return dItemNo_SMELL_CHILDREN_e; + return dItemNo_NONE_e; } - if (col == 1) return fpcNm_ITEM_NONE; - if (col == 2) return fpcNm_ITEM_NONE; - if (col == 3) return fpcNm_ITEM_NONE; + if (col == 1) return dItemNo_NONE_e; + if (col == 2) return dItemNo_NONE_e; + if (col == 3) return dItemNo_NONE_e; break; } - return fpcNm_ITEM_NONE; + return dItemNo_NONE_e; } u8 gzInventoryMenu_c::getDisplayItemForSlot(int row, int col) { u8 item = getItemForSlot(row, col); - if (item != fpcNm_ITEM_NONE) return item; + if (item != dItemNo_NONE_e) return item; switch (row) { case 0: - return (col == 0) ? fpcNm_ITEM_WOOD_STICK : fpcNm_ITEM_MASTER_SWORD; + return (col == 0) ? dItemNo_WOOD_STICK_e : dItemNo_MASTER_SWORD_e; case 1: - return (col == 0) ? fpcNm_ITEM_WOOD_SHIELD : fpcNm_ITEM_HYLIA_SHIELD; + return (col == 0) ? dItemNo_WOOD_SHIELD_e : dItemNo_HYLIA_SHIELD_e; case 2: - if (col == 0) return fpcNm_ITEM_WEAR_KOKIRI; - if (col == 1) return fpcNm_ITEM_WEAR_ZORA; - if (col == 2) return fpcNm_ITEM_ARMOR; + if (col == 0) return dItemNo_WEAR_KOKIRI_e; + if (col == 1) return dItemNo_WEAR_ZORA_e; + if (col == 2) return dItemNo_ARMOR_e; break; case 3: - if (col == 0) return fpcNm_ITEM_WALLET_LV1; - if (col == 1) return fpcNm_ITEM_ARROW_LV1; + if (col == 0) return dItemNo_WALLET_LV1_e; + if (col == 1) return dItemNo_ARROW_LV1_e; break; case 4: - if (col == 0) return fpcNm_ITEM_SMELL_CHILDREN; + if (col == 0) return dItemNo_SMELL_CHILDREN_e; break; } - return fpcNm_ITEM_NONE; + return dItemNo_NONE_e; } void gzInventoryMenu_c::loadPauseItemTexture(int row, int col, u8 itemId) { @@ -371,7 +371,7 @@ void gzInventoryMenu_c::loadPauseItemTexture(int row, int col, u8 itemId) { mpPauseItemTex[row][col][k] = NULL; } - if (itemId == fpcNm_ITEM_NONE) { + if (itemId == dItemNo_NONE_e) { return; } @@ -417,13 +417,13 @@ void gzInventoryMenu_c::loadPauseItemTexture(int row, int col, u8 itemId) { void gzInventoryMenu_c::loadBugIcons() { static const u8 sBugItemIds[BUG_COUNT] = { - fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY, - fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, - fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, fpcNm_ITEM_M_DANGOMUSHI, - fpcNm_ITEM_F_DANGOMUSHI, fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, - fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL, - fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_GRASSHOPPER, - fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, + dItemNo_M_ANT_e, dItemNo_F_ANT_e, dItemNo_M_MAYFLY_e, dItemNo_F_MAYFLY_e, + dItemNo_M_BEETLE_e, dItemNo_F_BEETLE_e, dItemNo_M_MANTIS_e, dItemNo_F_MANTIS_e, + dItemNo_M_STAG_BEETLE_e, dItemNo_F_STAG_BEETLE_e, dItemNo_M_DANGOMUSHI_e, + dItemNo_F_DANGOMUSHI_e, dItemNo_M_BUTTERFLY_e, dItemNo_F_BUTTERFLY_e, + dItemNo_M_LADYBUG_e, dItemNo_F_LADYBUG_e, dItemNo_M_SNAIL_e, dItemNo_F_SNAIL_e, + dItemNo_M_NANAFUSHI_e, dItemNo_F_NANAFUSHI_e, dItemNo_M_GRASSHOPPER_e, + dItemNo_F_GRASSHOPPER_e, dItemNo_M_DRAGONFLY_e, dItemNo_F_DRAGONFLY_e, }; JKRHeap* heap = gzHeap(GZ_GROUP_MENU); JKRHeap* oldHeap = heap->becomeCurrentHeap(); @@ -540,7 +540,7 @@ void gzInventoryMenu_c::initPauseMenu() { if (mpLetterIconBuf != NULL) { JKRHeap* oldHeap = heap->becomeCurrentHeap(); int texNum = dMeter2Info_readItemTexture( - fpcNm_ITEM_LETTER, mpLetterIconBuf, NULL, NULL, NULL, + dItemNo_LETTER_e, mpLetterIconBuf, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1); if (texNum > 0) { mpLetterIconPane = new (heap, 4) J2DPicture(mpLetterIconBuf); @@ -582,48 +582,48 @@ void gzInventoryMenu_c::cyclePauseSlot(int row, int col) { case 0: if (col == 0) { state = (state + 1) % 3; - dComIfGs_offItemFirstBit(fpcNm_ITEM_WOOD_STICK); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SWORD); - if (state == 1) dComIfGs_onItemFirstBit(fpcNm_ITEM_WOOD_STICK); - if (state == 2) dComIfGs_onItemFirstBit(fpcNm_ITEM_SWORD); + dComIfGs_offItemFirstBit(dItemNo_WOOD_STICK_e); + dComIfGs_offItemFirstBit(dItemNo_SWORD_e); + if (state == 1) dComIfGs_onItemFirstBit(dItemNo_WOOD_STICK_e); + if (state == 2) dComIfGs_onItemFirstBit(dItemNo_SWORD_e); } else { state = (state + 1) % 3; - dComIfGs_offItemFirstBit(fpcNm_ITEM_MASTER_SWORD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_LIGHT_SWORD); - if (state == 1) dComIfGs_onItemFirstBit(fpcNm_ITEM_MASTER_SWORD); + dComIfGs_offItemFirstBit(dItemNo_MASTER_SWORD_e); + dComIfGs_offItemFirstBit(dItemNo_LIGHT_SWORD_e); + if (state == 1) dComIfGs_onItemFirstBit(dItemNo_MASTER_SWORD_e); if (state == 2) { - dComIfGs_onItemFirstBit(fpcNm_ITEM_MASTER_SWORD); - dComIfGs_onItemFirstBit(fpcNm_ITEM_LIGHT_SWORD); + dComIfGs_onItemFirstBit(dItemNo_MASTER_SWORD_e); + dComIfGs_onItemFirstBit(dItemNo_LIGHT_SWORD_e); } } break; case 1: if (col == 0) { state = (state + 1) % 3; - dComIfGs_offItemFirstBit(fpcNm_ITEM_WOOD_SHIELD); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SHIELD); - if (state == 1) dComIfGs_onItemFirstBit(fpcNm_ITEM_WOOD_SHIELD); - if (state == 2) dComIfGs_onItemFirstBit(fpcNm_ITEM_SHIELD); + dComIfGs_offItemFirstBit(dItemNo_WOOD_SHIELD_e); + dComIfGs_offItemFirstBit(dItemNo_SHIELD_e); + if (state == 1) dComIfGs_onItemFirstBit(dItemNo_WOOD_SHIELD_e); + if (state == 2) dComIfGs_onItemFirstBit(dItemNo_SHIELD_e); } else { state = state ? 0 : 1; if (state) { - dComIfGs_onItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD); + dComIfGs_onItemFirstBit(dItemNo_HYLIA_SHIELD_e); } else { - dComIfGs_offItemFirstBit(fpcNm_ITEM_HYLIA_SHIELD); + dComIfGs_offItemFirstBit(dItemNo_HYLIA_SHIELD_e); } } break; case 2: state = state ? 0 : 1; if (col == 0) { - if (state) dComIfGs_onItemFirstBit(fpcNm_ITEM_WEAR_KOKIRI); - else dComIfGs_offItemFirstBit(fpcNm_ITEM_WEAR_KOKIRI); + if (state) dComIfGs_onItemFirstBit(dItemNo_WEAR_KOKIRI_e); + else dComIfGs_offItemFirstBit(dItemNo_WEAR_KOKIRI_e); } else if (col == 1) { - if (state) dComIfGs_onItemFirstBit(fpcNm_ITEM_WEAR_ZORA); - else dComIfGs_offItemFirstBit(fpcNm_ITEM_WEAR_ZORA); + if (state) dComIfGs_onItemFirstBit(dItemNo_WEAR_ZORA_e); + else dComIfGs_offItemFirstBit(dItemNo_WEAR_ZORA_e); } else if (col == 2) { - if (state) dComIfGs_onItemFirstBit(fpcNm_ITEM_ARMOR); - else dComIfGs_offItemFirstBit(fpcNm_ITEM_ARMOR); + if (state) dComIfGs_onItemFirstBit(dItemNo_ARMOR_e); + else dComIfGs_offItemFirstBit(dItemNo_ARMOR_e); } break; case 3: @@ -632,12 +632,12 @@ void gzInventoryMenu_c::cyclePauseSlot(int row, int col) { dComIfGs_setWalletSize(state); } else if (col == 1) { state = (state + 1) % 4; - dComIfGs_offItemFirstBit(fpcNm_ITEM_ARROW_LV1); - dComIfGs_offItemFirstBit(fpcNm_ITEM_ARROW_LV2); - dComIfGs_offItemFirstBit(fpcNm_ITEM_ARROW_LV3); - if (state >= 1) dComIfGs_onItemFirstBit(fpcNm_ITEM_ARROW_LV1); - if (state >= 2) dComIfGs_onItemFirstBit(fpcNm_ITEM_ARROW_LV2); - if (state >= 3) dComIfGs_onItemFirstBit(fpcNm_ITEM_ARROW_LV3); + dComIfGs_offItemFirstBit(dItemNo_ARROW_LV1_e); + dComIfGs_offItemFirstBit(dItemNo_ARROW_LV2_e); + dComIfGs_offItemFirstBit(dItemNo_ARROW_LV3_e); + if (state >= 1) dComIfGs_onItemFirstBit(dItemNo_ARROW_LV1_e); + if (state >= 2) dComIfGs_onItemFirstBit(dItemNo_ARROW_LV2_e); + if (state >= 3) dComIfGs_onItemFirstBit(dItemNo_ARROW_LV3_e); static const u8 sArrowMax[] = { 0, 30, 60, 100 }; dComIfGs_setArrowMax(sArrowMax[state]); dComIfGs_setArrowNum(sArrowMax[state]); @@ -651,28 +651,28 @@ void gzInventoryMenu_c::cyclePauseSlot(int row, int col) { case 4: if (col == 0) { state = (state + 1) % 6; - dComIfGs_offItemFirstBit(fpcNm_ITEM_SMELL_CHILDREN); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SMELL_YELIA_POUCH); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SMELL_FISH); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SMELL_MEDICINE); - dComIfGs_offItemFirstBit(fpcNm_ITEM_SMELL_POH); + dComIfGs_offItemFirstBit(dItemNo_SMELL_CHILDREN_e); + dComIfGs_offItemFirstBit(dItemNo_SMELL_YELIA_POUCH_e); + dComIfGs_offItemFirstBit(dItemNo_SMELL_FISH_e); + dComIfGs_offItemFirstBit(dItemNo_SMELL_MEDICINE_e); + dComIfGs_offItemFirstBit(dItemNo_SMELL_POH_e); if (state == 1) { - dComIfGs_onItemFirstBit(fpcNm_ITEM_SMELL_CHILDREN); - dComIfGs_setCollectSmell(fpcNm_ITEM_SMELL_CHILDREN); + dComIfGs_onItemFirstBit(dItemNo_SMELL_CHILDREN_e); + dComIfGs_setCollectSmell(dItemNo_SMELL_CHILDREN_e); } else if (state == 2) { - dComIfGs_onItemFirstBit(fpcNm_ITEM_SMELL_YELIA_POUCH); - dComIfGs_setCollectSmell(fpcNm_ITEM_SMELL_YELIA_POUCH); + dComIfGs_onItemFirstBit(dItemNo_SMELL_YELIA_POUCH_e); + dComIfGs_setCollectSmell(dItemNo_SMELL_YELIA_POUCH_e); } else if (state == 3) { - dComIfGs_onItemFirstBit(fpcNm_ITEM_SMELL_FISH); - dComIfGs_setCollectSmell(fpcNm_ITEM_SMELL_FISH); + dComIfGs_onItemFirstBit(dItemNo_SMELL_FISH_e); + dComIfGs_setCollectSmell(dItemNo_SMELL_FISH_e); } else if (state == 4) { - dComIfGs_onItemFirstBit(fpcNm_ITEM_SMELL_MEDICINE); - dComIfGs_setCollectSmell(fpcNm_ITEM_SMELL_MEDICINE); + dComIfGs_onItemFirstBit(dItemNo_SMELL_MEDICINE_e); + dComIfGs_setCollectSmell(dItemNo_SMELL_MEDICINE_e); } else if (state == 5) { - dComIfGs_onItemFirstBit(fpcNm_ITEM_SMELL_POH); - dComIfGs_setCollectSmell(fpcNm_ITEM_SMELL_POH); + dComIfGs_onItemFirstBit(dItemNo_SMELL_POH_e); + dComIfGs_setCollectSmell(dItemNo_SMELL_POH_e); } else { - dComIfGs_setCollectSmell(fpcNm_ITEM_NONE); + dComIfGs_setCollectSmell(dItemNo_NONE_e); } } else if (col == 1) { } else if (col == 2) { @@ -687,7 +687,7 @@ void gzInventoryMenu_c::cyclePauseSlot(int row, int col) { mPauseSlotState[row][col] = state; u8 item = getDisplayItemForSlot(row, col); loadPauseItemTexture(row, col, item); - if (wasEquipped && getItemForSlot(row, col) != fpcNm_ITEM_NONE) { + if (wasEquipped && getItemForSlot(row, col) != dItemNo_NONE_e) { equipPauseSlot(row, col); } } @@ -699,7 +699,7 @@ void gzInventoryMenu_c::equipPauseSlot(int row, int col) { if (state == 0) return; u8 item = getItemForSlot(row, col); - if (item == fpcNm_ITEM_NONE) return; + if (item == dItemNo_NONE_e) return; switch (row) { case 0: @@ -860,7 +860,7 @@ void gzInventoryMenu_c::executePauseMenu() { bool gzInventoryMenu_c::isSlotEquipped(int row, int col) { u8 item = getItemForSlot(row, col); - if (item == fpcNm_ITEM_NONE) return false; + if (item == dItemNo_NONE_e) return false; switch (row) { case 0: diff --git a/src/gz/gz_menu_inventory_pause_submenu.cpp b/src/gz/gz_menu_inventory_pause_submenu.cpp index 47095e05e48..ec40ff43dae 100644 --- a/src/gz/gz_menu_inventory_pause_submenu.cpp +++ b/src/gz/gz_menu_inventory_pause_submenu.cpp @@ -9,13 +9,13 @@ #include static const u8 sBugItemIds[gzInventoryMenu_c::BUG_COUNT] = { - fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT, fpcNm_ITEM_M_MAYFLY, fpcNm_ITEM_F_MAYFLY, - fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE, fpcNm_ITEM_M_MANTIS, fpcNm_ITEM_F_MANTIS, - fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE, fpcNm_ITEM_M_DANGOMUSHI, - fpcNm_ITEM_F_DANGOMUSHI, fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, - fpcNm_ITEM_M_LADYBUG, fpcNm_ITEM_F_LADYBUG, fpcNm_ITEM_M_SNAIL, fpcNm_ITEM_F_SNAIL, - fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI, fpcNm_ITEM_M_GRASSHOPPER, - fpcNm_ITEM_F_GRASSHOPPER, fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY, + dItemNo_M_ANT_e, dItemNo_F_ANT_e, dItemNo_M_MAYFLY_e, dItemNo_F_MAYFLY_e, + dItemNo_M_BEETLE_e, dItemNo_F_BEETLE_e, dItemNo_M_MANTIS_e, dItemNo_F_MANTIS_e, + dItemNo_M_STAG_BEETLE_e, dItemNo_F_STAG_BEETLE_e, dItemNo_M_DANGOMUSHI_e, + dItemNo_F_DANGOMUSHI_e, dItemNo_M_BUTTERFLY_e, dItemNo_F_BUTTERFLY_e, + dItemNo_M_LADYBUG_e, dItemNo_F_LADYBUG_e, dItemNo_M_SNAIL_e, dItemNo_F_SNAIL_e, + dItemNo_M_NANAFUSHI_e, dItemNo_F_NANAFUSHI_e, dItemNo_M_GRASSHOPPER_e, + dItemNo_F_GRASSHOPPER_e, dItemNo_M_DRAGONFLY_e, dItemNo_F_DRAGONFLY_e, }; static const u16 sSkillFlags[] = { diff --git a/src/gz/gz_menu_inventory_ring.cpp b/src/gz/gz_menu_inventory_ring.cpp index 1488783e1b8..9ee669a3905 100644 --- a/src/gz/gz_menu_inventory_ring.cpp +++ b/src/gz/gz_menu_inventory_ring.cpp @@ -10,61 +10,61 @@ #include static const u8 sRingItemList[] = { - fpcNm_ITEM_NOENTRY_19, - fpcNm_ITEM_BOOMERANG, - fpcNm_ITEM_KANTERA, - fpcNm_ITEM_PACHINKO, - fpcNm_ITEM_FISHING_ROD_1, - fpcNm_ITEM_LURE_ROD, - fpcNm_ITEM_BEE_ROD, - fpcNm_ITEM_WORM_ROD, - fpcNm_ITEM_JEWEL_ROD, - fpcNm_ITEM_JEWEL_BEE_ROD, - fpcNm_ITEM_JEWEL_WORM_ROD, - fpcNm_ITEM_HVY_BOOTS, - fpcNm_ITEM_HOOKSHOT, - fpcNm_ITEM_W_HOOKSHOT, - fpcNm_ITEM_BOW, - fpcNm_ITEM_LIGHT_ARROW, - fpcNm_ITEM_BOMB_ARROW, - fpcNm_ITEM_HAWK_ARROW, - fpcNm_ITEM_HAWK_EYE, - fpcNm_ITEM_NORMAL_BOMB, - fpcNm_ITEM_WATER_BOMB, - fpcNm_ITEM_POKE_BOMB, - fpcNm_ITEM_SPINNER, - fpcNm_ITEM_IRONBALL, - fpcNm_ITEM_COPY_ROD, - fpcNm_ITEM_COPY_ROD_2, - fpcNm_ITEM_HORSE_FLUTE, - fpcNm_ITEM_WOOD_STICK, - fpcNm_ITEM_EMPTY_BOTTLE, - fpcNm_ITEM_RED_BOTTLE, - fpcNm_ITEM_GREEN_BOTTLE, - fpcNm_ITEM_BLUE_BOTTLE, - fpcNm_ITEM_MILK_BOTTLE, - fpcNm_ITEM_HALF_MILK_BOTTLE, - fpcNm_ITEM_WATER_BOTTLE, - fpcNm_ITEM_HOT_SPRING, - fpcNm_ITEM_OIL_BOTTLE, - fpcNm_ITEM_UGLY_SOUP, - fpcNm_ITEM_LV1_SOUP, - fpcNm_ITEM_LV2_SOUP, - fpcNm_ITEM_LV3_SOUP, - fpcNm_ITEM_CHUCHU_RARE, - fpcNm_ITEM_CHUCHU_RED, - fpcNm_ITEM_CHUCHU_BLUE, - fpcNm_ITEM_CHUCHU_GREEN, - fpcNm_ITEM_CHUCHU_YELLOW, - fpcNm_ITEM_CHUCHU_PURPLE, - fpcNm_ITEM_BEE_CHILD, - fpcNm_ITEM_FAIRY, - fpcNm_ITEM_FAIRY_DROP, - fpcNm_ITEM_WORM, - fpcNm_ITEM_ZORAS_JEWEL, - fpcNm_ITEM_LETTER, - fpcNm_ITEM_BILL, - fpcNm_ITEM_NONE, + dItemNo_NOENTRY_19_e, + dItemNo_BOOMERANG_e, + dItemNo_KANTERA_e, + dItemNo_PACHINKO_e, + dItemNo_FISHING_ROD_1_e, + dItemNo_LURE_ROD_e, + dItemNo_BEE_ROD_e, + dItemNo_WORM_ROD_e, + dItemNo_JEWEL_ROD_e, + dItemNo_JEWEL_BEE_ROD_e, + dItemNo_JEWEL_WORM_ROD_e, + dItemNo_HVY_BOOTS_e, + dItemNo_HOOKSHOT_e, + dItemNo_W_HOOKSHOT_e, + dItemNo_BOW_e, + dItemNo_LIGHT_ARROW_e, + dItemNo_BOMB_ARROW_e, + dItemNo_HAWK_ARROW_e, + dItemNo_HAWK_EYE_e, + dItemNo_NORMAL_BOMB_e, + dItemNo_WATER_BOMB_e, + dItemNo_POKE_BOMB_e, + dItemNo_SPINNER_e, + dItemNo_IRONBALL_e, + dItemNo_COPY_ROD_e, + dItemNo_COPY_ROD_2_e, + dItemNo_HORSE_FLUTE_e, + dItemNo_WOOD_STICK_e, + dItemNo_EMPTY_BOTTLE_e, + dItemNo_RED_BOTTLE_e, + dItemNo_GREEN_BOTTLE_e, + dItemNo_BLUE_BOTTLE_e, + dItemNo_MILK_BOTTLE_e, + dItemNo_HALF_MILK_BOTTLE_e, + dItemNo_WATER_BOTTLE_e, + dItemNo_HOT_SPRING_e, + dItemNo_OIL_BOTTLE_e, + dItemNo_UGLY_SOUP_e, + dItemNo_LV1_SOUP_e, + dItemNo_LV2_SOUP_e, + dItemNo_LV3_SOUP_e, + dItemNo_CHUCHU_RARE_e, + dItemNo_CHUCHU_RED_e, + dItemNo_CHUCHU_BLUE_e, + dItemNo_CHUCHU_GREEN_e, + dItemNo_CHUCHU_YELLOW_e, + dItemNo_CHUCHU_PURPLE_e, + dItemNo_BEE_CHILD_e, + dItemNo_FAIRY_e, + dItemNo_FAIRY_DROP_e, + dItemNo_WORM_e, + dItemNo_ZORAS_JEWEL_e, + dItemNo_LETTER_e, + dItemNo_BILL_e, + dItemNo_NONE_e, }; static const int sRingItemCount = sizeof(sRingItemList) / sizeof(u8); @@ -91,7 +91,7 @@ void gzInventoryMenu_c::freeAllTextures() { mpPickerBuf[i][j] = NULL; } } - mPickerItems[i] = fpcNm_ITEM_NONE; + mPickerItems[i] = dItemNo_NONE_e; } } @@ -108,7 +108,7 @@ void gzInventoryMenu_c::initRingItems() { for (int i = 0; i < MAX_ITEM_SLOTS; i++) { u8 lineUpItem = dComIfGs_getLineUpItem(i); mItemSlots[i] = lineUpItem; - if (lineUpItem != fpcNm_ITEM_NONE) { + if (lineUpItem != dItemNo_NONE_e) { mItemsTotal++; } } @@ -135,9 +135,9 @@ void gzInventoryMenu_c::loadItemTexture(int slotIdx, u8 slotNo) { mpItemTex[slotIdx][j] = NULL; } - if (item != fpcNm_ITEM_NONE) { - if (item == fpcNm_ITEM_LIGHT_ARROW) { - item = fpcNm_ITEM_BOW; + if (item != dItemNo_NONE_e) { + if (item == dItemNo_LIGHT_ARROW_e) { + item = dItemNo_BOW_e; } JKRHeap* heap = gzHeap(GZ_GROUP_MENU); @@ -208,10 +208,10 @@ void gzInventoryMenu_c::loadPickerItemTexture(int pickerIdx, u8 itemId) { mPickerItems[pickerIdx] = itemId; - if (itemId != fpcNm_ITEM_NONE) { + if (itemId != dItemNo_NONE_e) { u8 item = itemId; - if (item == fpcNm_ITEM_LIGHT_ARROW) { - item = fpcNm_ITEM_BOW; + if (item == dItemNo_LIGHT_ARROW_e) { + item = dItemNo_BOW_e; } JKRHeap* heap = gzHeap(GZ_GROUP_MENU); @@ -269,8 +269,8 @@ void gzInventoryMenu_c::addSlot() { } mItemSlots[insertPos] = newSlotNo; - dComIfGs_setItem(newSlotNo, fpcNm_ITEM_NOENTRY_19); - dComIfGp_setItem(newSlotNo, fpcNm_ITEM_NOENTRY_19); + dComIfGs_setItem(newSlotNo, dItemNo_NOENTRY_19_e); + dComIfGp_setItem(newSlotNo, dItemNo_NOENTRY_19_e); mItemsTotal++; for (int i = 0; i < gzInventoryMenu_c::RING_MAX_SLOTS; i++) { @@ -295,8 +295,8 @@ void gzInventoryMenu_c::deleteSlot() { } u8 slotNo = mItemSlots[mCurrentSlot]; - dComIfGs_setItem(slotNo, fpcNm_ITEM_NONE); - dComIfGp_setItem(slotNo, fpcNm_ITEM_NONE); + dComIfGs_setItem(slotNo, dItemNo_NONE_e); + dComIfGp_setItem(slotNo, dItemNo_NONE_e); for (int i = mCurrentSlot; i < mItemsTotal - 1; i++) { mItemSlots[i] = mItemSlots[i + 1]; @@ -458,10 +458,10 @@ void gzInventoryMenu_c::drawItemPicker(f32 centerX, f32 centerY) { f32 texW = ITEM_SIZE; f32 texH = ITEM_SIZE; - if (mpPickerBuf[i][0] != NULL && mPickerItems[i] != fpcNm_ITEM_NONE) { + if (mpPickerBuf[i][0] != NULL && mPickerItems[i] != dItemNo_NONE_e) { u8 item = mPickerItems[i]; - if (item == fpcNm_ITEM_LIGHT_ARROW) { - item = fpcNm_ITEM_BOW; + if (item == dItemNo_LIGHT_ARROW_e) { + item = dItemNo_BOW_e; } u8 texScale = dItem_data::getTexScale(item); f32 scale = texScale / 100.0f; @@ -492,15 +492,15 @@ void gzInventoryMenu_c::drawItemPicker(f32 centerX, f32 centerY) { static bool getItemAmmoCount(u8 item, u8 slotNo, char* outBuf, int bufSize) { switch (item) { - case fpcNm_ITEM_BOW: - case fpcNm_ITEM_LIGHT_ARROW: - case fpcNm_ITEM_BOMB_ARROW: - case fpcNm_ITEM_HAWK_ARROW: + case dItemNo_BOW_e: + case dItemNo_LIGHT_ARROW_e: + case dItemNo_BOMB_ARROW_e: + case dItemNo_HAWK_ARROW_e: snprintf(outBuf, bufSize, "%d", dComIfGs_getArrowNum()); return true; - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: snprintf(outBuf, bufSize, "%d", dComIfGs_getBombNum(slotNo - SLOT_15)); return true; default: @@ -655,10 +655,10 @@ void gzInventoryMenu_c::executeRingMenu() { if (ammoDelta != 0) { bool adjusted = false; switch (currentItem) { - case fpcNm_ITEM_BOW: - case fpcNm_ITEM_LIGHT_ARROW: - case fpcNm_ITEM_BOMB_ARROW: - case fpcNm_ITEM_HAWK_ARROW: { + case dItemNo_BOW_e: + case dItemNo_LIGHT_ARROW_e: + case dItemNo_BOMB_ARROW_e: + case dItemNo_HAWK_ARROW_e: { u8 cur = dComIfGs_getArrowNum(); u8 max = dComIfGs_getArrowMax(); s32 val = (s32)cur + ammoDelta; @@ -668,9 +668,9 @@ void gzInventoryMenu_c::executeRingMenu() { adjusted = true; break; } - case fpcNm_ITEM_NORMAL_BOMB: - case fpcNm_ITEM_WATER_BOMB: - case fpcNm_ITEM_POKE_BOMB: { + case dItemNo_NORMAL_BOMB_e: + case dItemNo_WATER_BOMB_e: + case dItemNo_POKE_BOMB_e: { u8 bagIdx = slotNo - SLOT_15; u8 cur = dComIfGs_getBombNum(bagIdx); u8 max = dComIfGs_getBombMax(currentItem); diff --git a/src/gz/gz_save_callbacks.cpp b/src/gz/gz_save_callbacks.cpp index 37344287e52..41922e21653 100644 --- a/src/gz/gz_save_callbacks.cpp +++ b/src/gz/gz_save_callbacks.cpp @@ -30,7 +30,7 @@ static void SaveCb_OrdonGateClip() { } static void SaveCb_SetupHugo() { - fopAc_ac_c* hugo = fopAcM_SearchByName(PROC_E_RD); + fopAc_ac_c* hugo = fopAcM_SearchByName(fpcNm_E_RD_e); if (hugo != NULL) { hugo->current.pos = cXyz(-289.9785, 401.5400, -18533.078); hugo->shape_angle.y = 0x16F8; @@ -68,13 +68,13 @@ static void SaveCb_EmptyLakeHylia() { static void SaveCb_Morpheel() { daAlink_c* player = daAlink_getAlinkActorClass(); if (player != NULL) { - player->mEquipItem = fpcNm_ITEM_HOOKSHOT; + player->mEquipItem = dItemNo_HOOKSHOT_e; player->onNoResetFlg0(daPy_py_c::FLG0_EQUIP_HVY_BOOTS); } } static void SaveCb_StallordInit() { - fopAc_ac_c* stallord = fopAcM_SearchByName(PROC_B_DS); + fopAc_ac_c* stallord = fopAcM_SearchByName(fpcNm_B_DS_e); if (stallord != NULL) { dComIfGs_onZoneSwitch(5, fopAcM_GetRoomNo(stallord)); // intro cs off } @@ -83,7 +83,7 @@ static void SaveCb_StallordInit() { } static void* sub_findJosephActor(void* i_actor, void*) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_ZS) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_E_ZS_e) { return i_actor; } @@ -99,7 +99,7 @@ static void SaveCb_StallordSkipCAD() { joseph->field_0x673 = 1; joseph->mCyl.OnTgSetBit(); joseph->mCyl.OnCoSetBit(); - fopAcM_OnStatus(joseph, fopAcM_STATUS_UNK_0x200000); + fopAcM_OnStatus(joseph, fopAcStts_UNK_0x200000_e); } } @@ -114,7 +114,7 @@ static void SaveCb_StallordSkipJoseph() { joseph->field_0x673 = 1; joseph->mCyl.OnTgSetBit(); joseph->mCyl.OnCoSetBit(); - fopAcM_OnStatus(joseph, fopAcM_STATUS_UNK_0x200000); + fopAcM_OnStatus(joseph, fopAcStts_UNK_0x200000_e); joseph->current.pos.set(301.9f, 1800.0f, -4966.0f); } @@ -125,7 +125,7 @@ static void SaveCb_StallordPhase2() { // to handle custom situations rather than trying to hook onto the actor. // Probably want something similar to the debug "Register" system that can be used to // trigger special actions when the variable is set by a callback in the stageInit phase - daB_DS_c* stallord = (daB_DS_c*)fopAcM_SearchByName(PROC_B_DS); + daB_DS_c* stallord = (daB_DS_c*)fopAcM_SearchByName(fpcNm_B_DS_e); if (stallord != NULL) { stallord->mAction = daB_DS_c::ACT_DAMAGE; stallord->mMode = 100; @@ -133,17 +133,17 @@ static void SaveCb_StallordPhase2() { /* if (stallord != NULL) { // create the phase 2 version of stallord - fopAcM_create(PROC_B_DS, fopAcM_GetParam(stallord) | 2, &stallord->current.pos, + fopAcM_create(fpcNm_B_DS_e, fopAcM_GetParam(stallord) | 2, &stallord->current.pos, fopAcM_GetRoomNo(stallord), NULL, NULL, -1); fopAcM_delete(stallord); // delete phase 1 stallord } - daObjSwSpinner_c* spinnersw = (daObjSwSpinner_c*)fopAcM_SearchByName(PROC_Obj_SwSpinner); + daObjSwSpinner_c* spinnersw = (daObjSwSpinner_c*)fopAcM_SearchByName(fpcNm_Obj_SwSpinner_e); if (spinnersw != NULL) { spinnersw->mRotSpeedY = 3000; // set arena spinner switch to max speed } - daObjLv4Wall_c* rwall = (daObjLv4Wall_c*)fopAcM_SearchByName(PROC_Obj_Lv4RailWall); + daObjLv4Wall_c* rwall = (daObjLv4Wall_c*)fopAcM_SearchByName(fpcNm_Obj_Lv4RailWall_e); if (rwall != NULL) { rwall->mRotCounter = 101; // set spinner switch speed counter to threshold rwall->mHeight = 3370.0f; // set arena height to max @@ -156,7 +156,7 @@ static void SaveCb_CityFanTower() { } static void SaveCb_Argorok() { - fopAc_ac_c* argorok = fopAcM_SearchByName(PROC_B_DR); + fopAc_ac_c* argorok = fopAcM_SearchByName(fpcNm_B_DR_e); if (argorok != NULL) { dComIfGs_onZoneSwitch(20, fopAcM_GetRoomNo(argorok)); } @@ -169,7 +169,7 @@ static void SaveCb_Palace1() { } static void SaveCb_ZantFinal() { - daB_ZANT_c* zant = (daB_ZANT_c*)fopAcM_SearchByName(PROC_B_ZANT); + daB_ZANT_c* zant = (daB_ZANT_c*)fopAcM_SearchByName(fpcNm_B_ZANT_e); if (zant != NULL) { zant->mAction = daB_ZANT_c::ACT_ROOM_CHANGE; zant->mFightPhase = daB_ZANT_c::PHASE_YO; @@ -205,7 +205,7 @@ static void SaveCb_EldinCollection() { } static void SaveCb_Dangoro() { - fopAc_ac_c* dangoro = fopAcM_SearchByName(PROC_E_GOB); + fopAc_ac_c* dangoro = fopAcM_SearchByName(fpcNm_E_GOB_e); if (dangoro != NULL) { dComIfGs_onZoneSwitch(21, fopAcM_GetRoomNo(dangoro)); // intro cs off }