mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-25 05:58:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

general cleanup, d_menu_quit / d_a_obj_testcube mostly done, d_msg_scrn_explain debug (#3065)

Browse Source 
* typedef for cPhs_Step

* make sdk includes consistent

* d_menu_quit / d_msg_scrn_explain debug

* d_a_obj_testcube mostly done

* d_debug_pad mostly done

* jstudio tool library headers

* some JStudioCameraEditor headers

* d_jcam_editor mostly done

* try fixing some shield regressions

* d_bg_parts mostly done

* fix merge errors

* debug fix
This commit is contained in:
TakaRikka
2026-01-24 23:36:23 -08:00
committed by GitHub
parent 6f73e18bd2
commit c9e2a73dda
612 changed files with 4052 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/J2DGraph/J2DAnimation.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/J3DGraphBase/J3DTexture.h"
#include "JSystem/JUtility/JUTPalette.h"
#include "JSystem/JUtility/JUTResource.h"
#include "dolphin/os.h"
#include <dolphin/os.h>
template<typename T>
f32 J2DGetKeyFrameInterpolation(f32 param_0, J3DAnmKeyTableBase* param_1, T* param_2) {
src/JSystem/J2DGraph/J2DGrafContext.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/J2DGraph/J2DGrafContext.h"
#include "dolphin/gx.h"
#include <dolphin/gx.h>
J2DGrafContext::J2DGrafContext(f32 x, f32 y, f32 width, f32 height)
: mBounds(x, y, x + width, y + height), mScissorBounds(x, y, x + width, y + height) {
src/JSystem/J2DGraph/J2DMatBlock.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/JUtility/JUTPalette.h"
#include "JSystem/JUtility/JUTResFont.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "dolphin/gx.h"
#include <dolphin/gx.h>
void J2DColorBlock::initialize() {
for (int i = 0; i < 2; i++) {
src/JSystem/J2DGraph/J2DMaterialFactory.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "JSystem/JSupport/JSupport.h"
#include "JSystem/JUtility/JUTResource.h"
#include <string>
#include "dolphin/types.h"
#include <dolphin/types.h>
J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) {
field_0x0 = param_0.field_0x8;
src/JSystem/J2DGraph/J2DOrthoGraph.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/J2DGraph/J2DOrthoGraph.h"
#include "dolphin/gx.h"
#include <dolphin/gx.h>
J2DOrthoGraph::J2DOrthoGraph() : J2DGrafContext(0, 0, 0, 0) {
this->setLookat();
src/JSystem/J2DGraph/J2DPicture.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include "JSystem/JUtility/JUTTexture.h"
#include "JSystem/JUtility/JUTResource.h"
#include "JSystem/JSupport/JSURandomInputStream.h"
#include "dolphin/gx.h"
#include <dolphin/gx.h>
J2DPicture::J2DPicture() : mPalette(NULL) {
for (u32 i = 0; i < 2; i++) {
src/JSystem/J2DGraph/J2DPictureEx.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/JSupport/JSURandomInputStream.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
void J2DPictureEx::initiate(ResTIMG const* param_0, ResTLUT const* param_1) {
u32 texGenNum = mMaterial->getTexGenBlock()->getTexGenNum();
src/JSystem/J2DGraph/J2DScreen.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include "JSystem/JKernel/JKRArchive.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JSupport/JSUMemoryStream.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
J2DScreen::J2DScreen()
: J2DPane(NULL, true, 'root', JGeometry::TBox2<f32>(JGeometry::TVec2<f32>(0, 0), JGeometry::TVec2<f32>(640, 480))), mColor() {
src/JSystem/J2DGraph/J2DTevs.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include "JSystem/J2DGraph/J2DTevs.h"
#include "JSystem/J2DGraph/J2DMaterial.h"
#include <cmath>
#include "dolphin/gx.h"
#include <dolphin/gx.h>
void J2DTexMtx::load(u32 mtxIdx) {
GXLoadTexMtxImm(mTexMtx, mtxIdx * 3 + GX_TEXMTX0, (GXTexMtxType)mInfo.mTexMtxType);
src/JSystem/J3DGraphAnimator/J3DCluster.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "JSystem/J3DGraphAnimator/J3DModel.h"
#include "JSystem/JMath/JMATrigonometric.h"
#include "dolphin/base/PPCArch.h"
#include <dolphin/base/PPCArch.h>
J3DDeformData::J3DDeformData() {
mClusterNum = 0;
src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
#include "JSystem/JSupport/JSupport.h"
#include "dolphin/os.h"
#include <dolphin/os.h>
J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseFlag flag) {
const JUTDataFileHeader* header = (const JUTDataFileHeader*)i_data;
src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"
#include "JSystem/JSupport/JSupport.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "dolphin/os.h"
#include <dolphin/os.h>
#include <string>
void* J3DClusterLoaderDataBase::load(const void* i_data) {
src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "JSystem/J3DGraphAnimator/J3DJoint.h"
#include "JSystem/J3DGraphAnimator/J3DModelData.h"
#include "JSystem/JSupport/JSupport.h"
#include "dolphin/os.h"
#include <dolphin/os.h>
#include "global.h"
u16 J3DModelLoader::countMaterialNum(const void* stream) {
src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/J3DGraphBase/J3DShapeMtx.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JSupport/JSupport.h"
#include "dolphin/os.h"
#include <dolphin/os.h>
#include "global.h"
J3DShapeFactory::J3DShapeFactory(J3DShapeBlock const& block) {
src/JSystem/JAudio2/JASAiCtrl.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include "JSystem/JAudio2/JASLfo.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/ai.h"
#include <dolphin/ai.h>
#include <dolphin/os.h>
#include <stdint.h>
src/JSystem/JAudio2/JASAudioReseter.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/JAudio2/JASCriticalSection.h"
#include "JSystem/JAudio2/JASDriverIF.h"
#include "JSystem/JAudio2/JASDSPChannel.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
JASAudioReseter::JASAudioReseter() {
field_0x0 = 0;
src/JSystem/JAudio2/JASAudioThread.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include "JSystem/JAudio2/JASProbe.h"
#include "JSystem/JAudio2/JASReport.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "dolphin/dsp.h"
#include <dolphin/dsp.h>
#include <stdint.h>
JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority)
src/JSystem/JAudio2/JASCmdStack.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "JSystem/JAudio2/JASCmdStack.h"
#include "JSystem/JAudio2/JASCriticalSection.h"
#include "dolphin/os.h"
#include <dolphin/os.h>
JASPortCmd::TPortHead JASPortCmd::sCommandListOnce;
src/JSystem/JAudio2/JASHeapCtrl.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "JSystem/JKernel/JKRExpHeap.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/ar.h"
#include <dolphin/ar.h>
JASHeap::JASHeap(JASDisposer* disposer) : mTree(this) {
mDisposer = disposer;
src/JSystem/JAudio2/JASWaveArcLoader.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "JSystem/JAudio2/JASMutex.h"
#include "JSystem/JKernel/JKRDvdAramRipper.h"
#include <string>
#include "dolphin/os.h"
#include <dolphin/os.h>
#include <stdint.h>
JASHeap* JASWaveArcLoader::sAramHeap;
src/JSystem/JAudio2/JAUSectionHeap.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include "JSystem/JAudio2/JAUSoundTable.h"
#include "JSystem/JAudio2/JAUStreamFileTable.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "dolphin/dvd.h"
#include <dolphin/dvd.h>
namespace {
class TPushCurrentHeap {
src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include "JSystem/JAudio2/JAUSeqDataBlockMgr.h"
#include "JSystem/JAudio2/JAUSoundInfo.h"
#include "JSystem/JAudio2/JASResArcLoader.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
JAUSeqDataBlock::JAUSeqDataBlock() : field_0x0(this) {}
src/JSystem/JAudio2/osdsp.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "JSystem/JAudio2/osdsp.h"
#include "JSystem/JAudio2/osdsp_task.h"
#include "dolphin/os.h"
#include <dolphin/os.h>
#include <dolphin/dsp.h>
extern "C" void __DSP_insert_task(DSPTaskInfo*);
src/JSystem/JFramework/JFWDisplay.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "JSystem/JUtility/JUTConsole.h"
#include "JSystem/JUtility/JUTDbPrint.h"
#include "JSystem/JUtility/JUTProcBar.h"
#include "dolphin/gx.h"
#include <dolphin/gx.h>
#include <dolphin/vi.h>
#include "global.h"
#include <stdint.h>
src/JSystem/JKernel/JKRAram.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "JSystem/JKernel/JKRDecomp.h"
#include "JSystem/JKernel/JKRExpHeap.h"
#include "JSystem/JUtility/JUTException.h"
#include "dolphin/ar.h"
#include <dolphin/ar.h>
#include <dolphin/os.h>
#include <string>
src/JSystem/JKernel/JKRAramPiece.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/JKernel/JKRAram.h"
#include "JSystem/JKernel/JKRDecomp.h"
#include "JSystem/JUtility/JUTException.h"
#include "dolphin/os.h"
#include <dolphin/os.h>
JKRAMCommand* JKRAramPiece::prepareCommand(int direction, u32 src, u32 dst, u32 length,
JKRAramBlock* block,
src/JSystem/JKernel/JKRDvdAramRipper.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include "JSystem/JSupport/JSUFileStream.h"
#include <dolphin/os.h>
#include <dolphin/os.h>
#include "dolphin/vi.h"
#include <dolphin/vi.h>
#include "global.h"
#include <string>
src/JSystem/JKernel/JKRDvdRipper.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include "JSystem/JUtility/JUTException.h"
#include <string>
#include <dolphin/os.h>
#include "dolphin/vi.h"
#include <dolphin/vi.h>
#include <stdint.h>
static int JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*);
src/JSystem/JKernel/JKRFile.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JKernel/JKRFile.h"
#include "dolphin/vi.h"
#include <dolphin/vi.h>
void JKRFile::read(void* data, s32 length, s32 offset) {
JUT_ASSERT(32, ( length & 0x1f ) == 0);
src/JSystem/JParticle/JPABaseShape.cpp
+2 -2
View File
@@ -6,8 +6,8 @@
#include "JSystem/JParticle/JPAEmitter.h"
#include "JSystem/JParticle/JPAResourceManager.h"
#include "JSystem/JMath/JMATrigonometric.h"
#include "dolphin/mtx.h"
#include "dolphin/gx.h"
#include <dolphin/mtx.h>
#include <dolphin/gx.h>
void JPASetPointSize(JPAEmitterWorkData* work) {
GXSetPointSize((u8)(25.0f * work->mGlobalPtclScl.x), GX_TO_ONE);
src/JSystem/JParticle/JPAChildShape.cpp
+2 -2
View File
@@ -3,8 +3,8 @@
#include "JSystem/JParticle/JPAChildShape.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "dolphin/gx.h"
#include "dolphin/os.h"
#include <dolphin/gx.h>
#include <dolphin/os.h>
void JPARegistChildPrmEnv(JPAEmitterWorkData* work) {
JPAChildShape* csp = work->mpRes->getCsp();
src/JSystem/JParticle/JPAEmitter.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAResourceManager.h"
#include "JSystem/JParticle/JPABaseShape.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
JPAEmitterCallBack::~JPAEmitterCallBack() {
}
src/JSystem/JParticle/JPAEmitterManager.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAResourceManager.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/gx.h"
#include <dolphin/gx.h>
JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, JKRHeap* pHeap, u8 i_gidMax,
u8 i_ridMax) {
src/JSystem/JParticle/JPAExTexShape.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/JParticle/JPAExTexShape.h"
#include "JSystem/JParticle/JPAResourceManager.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "dolphin/gx.h"
#include <dolphin/gx.h>
void JPALoadExTex(JPAEmitterWorkData* work) {
JPAExTexShape* ets = work->mpRes->getEts();
src/JSystem/JParticle/JPAExtraShape.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include "JSystem/JMath/JMATrigonometric.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAEmitter.h"
#include "dolphin/os.h"
#include <dolphin/os.h>
void JPACalcScaleX(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
JPAExtraShape* esp = work->mpRes->getEsp();
src/JSystem/JParticle/JPAResource.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
#include "JSystem/JParticle/JPAKeyBlock.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "JSystem/JParticle/JPAResourceManager.h"
#include "dolphin/gx.h"
#include <dolphin/gx.h>
#include "global.h"
JPAResource::JPAResource() {
src/JSystem/JStudio/JStudio/stb-data-parse.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "JSystem/JStudio/JStudio/stb-data-parse.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/os.h"
#include <dolphin/os.h>
#include <stdint.h>
namespace JStudio {
src/JSystem/JUtility/JUTCacheFont.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JUtility/JUTConsole.h"
#include "JSystem/JKernel/JKRAram.h"
#include "dolphin/gx.h"
#include <dolphin/gx.h>
#include <stdint.h>
JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_heap) {
src/JSystem/JUtility/JUTPalette.cpp
+2 -2
View File
@@ -1,8 +1,8 @@
#include "JSystem/JSystem.h" // IWYU pragma: keep
#include "JSystem/JUtility/JUTPalette.h"
#include "dolphin/gx.h"
#include "dolphin/os.h"
#include <dolphin/gx.h>
#include <dolphin/os.h>
void JUTPalette::storeTLUT(GXTlut param_0, ResTLUT* tlut) {
if (tlut == NULL) {
src/JSystem/JUtility/JUTResFont.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "JSystem/JSupport/JSupport.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "JSystem/JUtility/JUTConsole.h"
#include "dolphin/gx.h"
#include <dolphin/gx.h>
JUTResFont::JUTResFont() {
initialize_state();
src/JSystem/JUtility/JUTTexture.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "JSystem/JUtility/JUTTexture.h"
#include "JSystem/JUtility/JUTPalette.h"
#include "dolphin/gx.h"
#include <dolphin/gx.h>
JUTTexture::~JUTTexture() {
if (getCaptureFlag()) {
src/JSystem/JUtility/JUTVideo.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/JUtility/JUTVideo.h"
#include "JSystem/JUtility/JUTDirectPrint.h"
#include "JSystem/JUtility/JUTXfb.h"
#include "dolphin/gx.h"
#include <dolphin/gx.h>
#include <dolphin/vi.h>
JUTVideo* JUTVideo::sManager;
src/JSystem/JUtility/JUTXfb.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include "JSystem/JUtility/JUTXfb.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/gx.h"
#include <dolphin/gx.h>
void JUTXfb::clearIndex() {
mDrawingXfbIndex = -1;
src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include "uart_console_io_gcn.h"
#include "dolphin/os.h"
#include <dolphin/os.h>
int InitializeUART(size_t);
int WriteUARTN(unsigned char*, size_t);
src/PowerPC_EABI_Support/MetroTRK/trk.h
+2 -2
View File
@@ -1,7 +1,7 @@
#ifndef __METROTRK_TRK_H__
#define __METROTRK_TRK_H__
#include "dolphin/types.h"
#include <dolphin/types.h>
#ifdef __cplusplus
extern "C" {
@@ -375,4 +375,4 @@ void TRKSaveExtended1Block();
}
#endif
#endif /* __METROTRK_TRK_H__ */
#endif /* __METROTRK_TRK_H__ */
src/PowerPC_EABI_Support/Runtime/Inc/CPlusLibPPC.h
+2 -2
View File
@@ -1,6 +1,6 @@
#ifndef CPLUSLIBPPC_H
#define CPLUSLIBPPC_H
#include "dolphin/types.h"
#include <dolphin/types.h>
#endif /* CPLUSLIBPPC_H */
#endif /* CPLUSLIBPPC_H */
src/PowerPC_EABI_Support/Runtime/Inc/__init_cpp_exceptions.h
+2 -2
View File
@@ -1,6 +1,6 @@
#ifndef __INIT_CPP_EXCEPTIONS_H
#define __INIT_CPP_EXCEPTIONS_H
#include "dolphin/types.h"
#include <dolphin/types.h>
#endif /* __INIT_CPP_EXCEPTIONS_H */
#endif /* __INIT_CPP_EXCEPTIONS_H */
src/PowerPC_EABI_Support/Runtime/Inc/runtime.h
+2 -2
View File
@@ -1,6 +1,6 @@
#ifndef RUNTIME_H
#define RUNTIME_H
#include "dolphin/types.h"
#include <dolphin/types.h>
#endif /* RUNTIME_H */
#endif /* RUNTIME_H */
src/PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c
+1 -1
View File
@@ -3,7 +3,7 @@
* Description:
*/
#include "dolphin/os.h"
#include <dolphin/os.h>
inline static void InitDefaultHeap(void) {
void* arenaLo;
src/SSystem/SComponent/c_list_iter.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "SSystem/SComponent/c_list_iter.h"
#include "SSystem/SComponent/c_list.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
int cLsIt_Method(node_list_class* list, cNdIt_MethodFunc method, void* data) {
if (list->mSize > 0)
src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c
+1 -1
View File
@@ -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 "dolphin/base/PPCArch.h"
#include <dolphin/base/PPCArch.h>
#include "trk.h"
void TRKInterruptHandler();
src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c
+1 -1
View File
@@ -4,7 +4,7 @@
*/
#include "TRK_MINNOW_DOLPHIN/Os/dolphin/usr_put.h"
// #include "dolphin/os.h"
// #include <dolphin/os.h>
// void OSReport(char* fmt, ...) causes extra crclr instruction.
// look into issue later
src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c
+1 -1
View File
@@ -3,7 +3,7 @@
* Description:
*/
#include "dolphin/types.h"
#include <dolphin/types.h>
asm void TRK_flush_cache(u32, int) {
// clang-format off
src/d/actor/d_a_arrow.cpp
+1 -1
View File
@@ -1132,7 +1132,7 @@ static void* daAlink_searchHorseZelda(fopAc_ac_c* param_0, void* param_1) {
return NULL;
}
cPhs__Step daArrow_c::create() {
cPhs_Step daArrow_c::create() {
fopAcM_ct(this, daArrow_c);
mArrowType = fopAcM_GetParamBit(this, 8, 8);
src/d/actor/d_a_b_ds.cpp
+3 -3
View File
@@ -5426,10 +5426,10 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return static_cast<daB_DS_c*>(i_this)->CreateHeap();
}
cPhs__Step daB_DS_c::create() {
cPhs_Step daB_DS_c::create() {
fopAcM_ct(this, daB_DS_c);
cPhs__Step phase_state = (cPhs__Step)dComIfG_resLoad(&mPhase, "B_DS");
cPhs_Step phase_state = dComIfG_resLoad(&mPhase, "B_DS");
if (phase_state == cPhs_COMPLEATE_e) {
if (arg0 == TYPE_BATTLE_1 && dComIfGs_isStageBossEnemy()) {
// "After B_DS defeated, so not re-setting\n"
@@ -5676,7 +5676,7 @@ cPhs__Step daB_DS_c::create() {
daB_DS_c::daB_DS_c() {}
static cPhs__Step daB_DS_Create(daB_DS_c* i_this) {
static cPhs_Step daB_DS_Create(daB_DS_c* i_this) {
return i_this->create();
}
src/d/actor/d_a_b_tn.cpp
+2 -2
View File
@@ -5048,9 +5048,9 @@ int daB_TN_c::create() {
}
}
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq1, "B_tn");
cPhs_Step step = dComIfG_resLoad(&mPhaseReq1, "B_tn");
if (step == cPhs_COMPLEATE_e) {
step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq2, mArcName);
step = dComIfG_resLoad(&mPhaseReq2, mArcName);
if (step == cPhs_COMPLEATE_e) {
mBrkAnmFrame = fopAcM_GetParamBit(this, 16, 16);
src/d/actor/d_a_b_yo.cpp
+9 -9
View File
@@ -3242,9 +3242,9 @@ static int useHeapInit2(fopAc_ac_c* i_this) {
return static_cast<daB_YO_c*>(i_this)->CreateHeap2();
}
cPhs__Step daB_YO_c::create() {
cPhs_Step daB_YO_c::create() {
fopAcM_ct(this, daB_YO_c);
cPhs__Step step;
cPhs_Step step;
mSwNo = fopAcM_GetParam(this) & 0xff;
mSwNo2 = (fopAcM_GetParam(this) >> 8) & 0xff;
@@ -3258,7 +3258,7 @@ cPhs__Step daB_YO_c::create() {
mIsInactive2 = mIsInactive;
if (mIsInactive == 1) {
step = (cPhs__Step)dComIfG_resLoad(&mPhase2, "L5_R50");
step = dComIfG_resLoad(&mPhase2, "L5_R50");
if (step == cPhs_COMPLEATE_e) {
if (!daMirror_c::remove()) {
@@ -3292,11 +3292,11 @@ cPhs__Step daB_YO_c::create() {
return step;
} else {
if ((step = (cPhs__Step)dComIfG_resLoad(&mPhase1, "B_YO"), step == cPhs_COMPLEATE_e)
&& (step = (cPhs__Step)dComIfG_resLoad(&mPhase2, "L5_R50"), step == cPhs_COMPLEATE_e)
&& (step = (cPhs__Step)dComIfG_resLoad(&mPhase3, "ykW"), step == cPhs_COMPLEATE_e)
&& (step = (cPhs__Step)dComIfG_resLoad(&mPhase4, "ykW1"), step == cPhs_COMPLEATE_e)
&& (step = (cPhs__Step)dComIfG_resLoad(&mPhase5, "E_FZ"), step == cPhs_COMPLEATE_e))
if ((step = dComIfG_resLoad(&mPhase1, "B_YO"), step == cPhs_COMPLEATE_e)
&& (step = dComIfG_resLoad(&mPhase2, "L5_R50"), step == cPhs_COMPLEATE_e)
&& (step = dComIfG_resLoad(&mPhase3, "ykW"), step == cPhs_COMPLEATE_e)
&& (step = dComIfG_resLoad(&mPhase4, "ykW1"), step == cPhs_COMPLEATE_e)
&& (step = dComIfG_resLoad(&mPhase5, "E_FZ"), step == cPhs_COMPLEATE_e))
{
if (cDmr_SkipInfo != 0 && !daMirror_c::remove()) {
return cPhs_INIT_e;
@@ -3412,7 +3412,7 @@ cPhs__Step daB_YO_c::create() {
}
}
static cPhs__Step daB_YO_Create(daB_YO_c* i_this) {
static cPhs_Step daB_YO_Create(daB_YO_c* i_this) {
return i_this->create();
}
src/d/actor/d_a_b_yo_ice.cpp
+3 -3
View File
@@ -1010,9 +1010,9 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
// data/rodata swap
cPhs__Step daB_YOI_c::create() {
cPhs_Step daB_YOI_c::create() {
fopAcM_ct(this, daB_YOI_c);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "B_YO");
cPhs_Step step = dComIfG_resLoad(&mPhase, "B_YO");
if (step == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x1CA0)) {
@@ -1087,7 +1087,7 @@ daB_YOI_c::daB_YOI_c() {
/* empty function */
}
static cPhs__Step daB_YOI_Create(daB_YOI_c* i_this) {
static cPhs_Step daB_YOI_Create(daB_YOI_c* i_this) {
return i_this->create();
}
src/d/actor/d_a_bg.cpp
+1
View File
@@ -10,6 +10,7 @@
#include "d/d_com_static.h"
#include "d/actor/d_a_grass.h"
#include "d/d_bg_w.h"
#include "d/d_bg_parts.h"
#include "m_Do/m_Do_lib.h"
#include "d/d_demo.h"
#include "JSystem/JKernel/JKRExpHeap.h"
src/d/actor/d_a_bg_obj.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "d/actor/d_a_bg_obj.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include <cstdio>
#include "dolphin/os.h"
#include <dolphin/os.h>
#include "d/actor/d_a_set_bgobj.h"
#include "d/d_s_play.h"
#include "SSystem/SComponent/c_math.h"
src/d/actor/d_a_cow.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_meter2_info.h"
#include "d/d_timer.h"
#include "dolphin/types.h"
#include <dolphin/types.h>
#include "f_op/f_op_actor_mng.h"
#include "f_op/f_op_camera_mng.h"
#include "m_Do/m_Do_ext.h"
src/d/actor/d_a_do.cpp
+2 -2
View File
@@ -2402,11 +2402,11 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 1;
}
static cPhs__Step daDo_Create(fopAc_ac_c* i_this) {
static cPhs_Step daDo_Create(fopAc_ac_c* i_this) {
do_class* _this = static_cast<do_class*>(i_this);
fopAcM_ct(i_this, do_class);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, "Do");
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, "Do");
if (step == cPhs_COMPLEATE_e) {
_this->mParam0 = fopAcM_GetParam(i_this) & 7;
src/d/actor/d_a_door_boss.cpp
+3 -3
View File
@@ -104,9 +104,9 @@ int daBdoor_c::CreateInit() {
return 1;
}
cPhs__Step daBdoor_c::create() {
cPhs_Step daBdoor_c::create() {
fopAcM_ct(this, daBdoor_c);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, getArcName());
cPhs_Step step = dComIfG_resLoad(&mPhaseReq, getArcName());
if (step == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0xa000)) {
return cPhs_ERROR_e;
@@ -404,7 +404,7 @@ static int daBdoor_Delete(daBdoor_c* i_this) {
return 1;
}
static cPhs__Step daBdoor_Create(fopAc_ac_c* i_this) {
static cPhs_Step daBdoor_Create(fopAc_ac_c* i_this) {
return static_cast<daBdoor_c*>(i_this)->create();
}
src/d/actor/d_a_e_ba.cpp
+2 -2
View File
@@ -989,7 +989,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
}
static cPhs__Step daE_BA_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_BA_Create(fopAc_ac_c* i_this) {
static char* arc_name[3] = {"E_ba", "E_fb", "E_ib"};
static dCcD_SrcSph cc_sph_src = {
@@ -1013,7 +1013,7 @@ static cPhs__Step daE_BA_Create(fopAc_ac_c* i_this) {
}
_this->mArcName = arc_name[_this->mType];
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, _this->mArcName);
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, _this->mArcName);
if (step == cPhs_COMPLEATE_e) {
int sw = fopAcM_GetParam(_this) >> 24;
src/d/actor/d_a_e_bee.cpp
+2 -2
View File
@@ -716,11 +716,11 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return true;
}
static cPhs__Step daE_Bee_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_Bee_Create(fopAc_ac_c* i_this) {
e_bee_class* _this = static_cast<e_bee_class*>(i_this);
fopAcM_ct(_this, e_bee_class);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, "E_bee");
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, "E_bee");
if (step == cPhs_COMPLEATE_e) {
_this->mParam0 = (u8)fopAcM_GetParam(_this);
_this->mParam1 = (u8)(fopAcM_GetParam(_this) >> 8);
src/d/actor/d_a_e_bi.cpp
+2 -2
View File
@@ -864,11 +864,11 @@ static int useHeapInit(fopAc_ac_c* actor) {
return 1;
}
static cPhs__Step daE_BI_Create(fopAc_ac_c* actor) {
static cPhs_Step daE_BI_Create(fopAc_ac_c* actor) {
fopAcM_ct(actor, e_bi_class);
e_bi_class* i_this = (e_bi_class*)actor;
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->phase, "E_BI");
cPhs_Step phase = dComIfG_resLoad(&i_this->phase, "E_BI");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_BI PARAM %x\n", fopAcM_GetParam(actor));
src/d/actor/d_a_e_bug.cpp
+2 -2
View File
@@ -801,12 +801,12 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 1;
}
static cPhs__Step daE_Bug_Create(fopAc_ac_c* a_this) {
static cPhs_Step daE_Bug_Create(fopAc_ac_c* a_this) {
e_bug_class* i_this = (e_bug_class*)a_this;
fopAcM_ct(a_this, e_bug_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "E_bug");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "E_bug");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_BUG PARAM %x\n", fopAcM_GetParam(a_this));
i_this->field_0x570 = fopAcM_GetParam(a_this);
src/d/actor/d_a_e_dd.cpp
+2 -2
View File
@@ -1661,11 +1661,11 @@ static int kabe_initial_pos_set(e_dd_class* i_this) {
return 0;
}
static cPhs__Step daE_DD_Create(fopAc_ac_c* a_this) {
static cPhs_Step daE_DD_Create(fopAc_ac_c* a_this) {
e_dd_class* i_this = (e_dd_class*)a_this;
fopAcM_ct(a_this, e_dd_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "E_dd");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "E_dd");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_DD PARAM %x\n", fopAcM_GetParam(a_this));
src/d/actor/d_a_e_df.cpp
+1 -1
View File
@@ -649,7 +649,7 @@ static int daE_DF_Delete(daE_DF_c* i_this) {
int daE_DF_c::Create() {
fopAcM_ct(this, daE_DF_c);
cPhs__Step rv = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, "E_DF");
cPhs_Step rv = dComIfG_resLoad(&mPhaseReq, "E_DF");
if (rv == cPhs_COMPLEATE_e) {
OS_REPORT("E_DF PARAM %x\n", fopAcM_GetParam(this));
mArg0 = (u8)fopAcM_GetParam(this);
src/d/actor/d_a_e_dn.cpp
+2 -2
View File
@@ -3358,12 +3358,12 @@ static int useHeapInit(fopAc_ac_c* actor) {
return 1;
}
static cPhs__Step daE_DN_Create(fopAc_ac_c* actor) {
static cPhs_Step daE_DN_Create(fopAc_ac_c* actor) {
e_dn_class* i_this = (e_dn_class*)actor;
fopAcM_ct(actor, e_dn_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->phase, "E_dn");
cPhs_Step phase = dComIfG_resLoad(&i_this->phase, "E_dn");
if (phase == cPhs_COMPLEATE_e) {
int swBit = (fopAcM_GetParam(actor) & 0xFF000000) >> 24;
if (swBit != 0xFF) {
src/d/actor/d_a_e_dt.cpp
+5 -5
View File
@@ -2456,18 +2456,18 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return static_cast<daE_DT_c*>(i_this)->CreateHeap();
}
cPhs__Step daE_DT_c::create() {
cPhs_Step daE_DT_c::create() {
fopAcM_ct(this, daE_DT_c);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase[0], "E_DT");
cPhs_Step step = dComIfG_resLoad(&mPhase[0], "E_DT");
if (step != cPhs_COMPLEATE_e) {
return step;
}
step = (cPhs__Step)dComIfG_resLoad(&mPhase[1], "Dalways");
step = dComIfG_resLoad(&mPhase[1], "Dalways");
if (step != cPhs_COMPLEATE_e) {
return step;
}
step = (cPhs__Step)dComIfG_resLoad(&mPhase[2], "E_OT");
step = dComIfG_resLoad(&mPhase[2], "E_OT");
if (step != cPhs_COMPLEATE_e) {
return step;
}
@@ -2548,7 +2548,7 @@ cPhs__Step daE_DT_c::create() {
return step;
}
static cPhs__Step daE_DT_Create(daE_DT_c* i_this) {
static cPhs_Step daE_DT_Create(daE_DT_c* i_this) {
return i_this->create();
}
src/d/actor/d_a_e_fb.cpp
+2 -2
View File
@@ -907,7 +907,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return a_this->CreateHeap();
}
cPhs__Step daE_FB_c::create() {
cPhs_Step daE_FB_c::create() {
fopAcM_ct(this, daE_FB_c);
mType = fopAcM_GetParam(this);
swBit0 = (fopAcM_GetParam(this) & 0xFF00) >> 8;
@@ -916,7 +916,7 @@ cPhs__Step daE_FB_c::create() {
mType = 0;
}
cPhs__Step phase = (cPhs__Step) dComIfG_resLoad(&mPhaseReq, "E_FL");
cPhs_Step phase = dComIfG_resLoad(&mPhaseReq, "E_FL");
if (phase == cPhs_COMPLEATE_e) {
if (mType == 10 || mType == 11) {
fopAcM_OffStatus(this, 0);
src/d/actor/d_a_e_fs.cpp
+2 -2
View File
@@ -718,10 +718,10 @@ static int useHeapIe_fst(fopAc_ac_c* i_this) {
return 1;
}
static cPhs__Step daE_Fs_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_Fs_Create(fopAc_ac_c* i_this) {
fopAcM_ct(i_this, e_fs_class);
e_fs_class* _this = (e_fs_class*)(i_this);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, "E_FS");
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, "E_FS");
if (step == cPhs_COMPLEATE_e) {
_this->field_0x5b4 = fopAcM_GetParam(_this) & 0xff;
src/d/actor/d_a_e_gb.cpp
+2 -2
View File
@@ -1614,7 +1614,7 @@ static int useHeapInit(fopAc_ac_c* actor) {
return 1;
}
static cPhs__Step daE_GB_Create(fopAc_ac_c* actor) {
static cPhs_Step daE_GB_Create(fopAc_ac_c* actor) {
static dCcD_SrcSph head_cc_sph_src = {
{
{0x0, {{AT_TYPE_CSTATUE_SWING, 0x2, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj
@@ -1646,7 +1646,7 @@ static cPhs__Step daE_GB_Create(fopAc_ac_c* actor) {
e_gb_class* i_this = (e_gb_class*)actor;
fopAcM_ct(&i_this->actor, e_gb_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->phase, "E_gb");
cPhs_Step phase = dComIfG_resLoad(&i_this->phase, "E_gb");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_gb PARAM %x\n", fopAcM_GetParam(actor));
u8 sw_bit = (fopAcM_GetParam(actor) & 0xFF0000) >> 16;
src/d/actor/d_a_e_gm.cpp
+4 -4
View File
@@ -1699,7 +1699,7 @@ static u16 const l_heapsize[4] = {
0x3120, 0x3120, 0x21E0, 0x2DE0,
};
cPhs__Step daE_GM_c::create() {
cPhs_Step daE_GM_c::create() {
fopAcM_ct(this, daE_GM_c);
mType = fopAcM_GetParam(this);
@@ -1727,11 +1727,11 @@ cPhs__Step daE_GM_c::create() {
field_0xa54 = uVar1 * 100.0f;
}
cPhs__Step phase;
cPhs_Step phase;
if (mType == TYPE_GOMA) {
phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_mg");
phase = dComIfG_resLoad(&mPhase, "E_mg");
} else {
phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_gm");
phase = dComIfG_resLoad(&mPhase, "E_gm");
}
if (phase == cPhs_COMPLEATE_e) {
src/d/actor/d_a_e_mf.cpp
+2 -2
View File
@@ -3136,12 +3136,12 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 1;
}
static cPhs__Step daE_MF_Create(fopAc_ac_c* a_this) {
static cPhs_Step daE_MF_Create(fopAc_ac_c* a_this) {
e_mf_class* i_this = (e_mf_class*)a_this;
fopAcM_ct(a_this, e_mf_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "E_mf");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "E_mf");
if (phase == cPhs_COMPLEATE_e) {
int swBit = fopAcM_GetParam(a_this) >> 24;
if (swBit != 0xFF) {
src/d/actor/d_a_e_mm_mt.cpp
+1 -1
View File
@@ -750,7 +750,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
static int daE_MM_MT_Create(fopAc_ac_c* i_this) {
cPhs__Step cVar1;
cPhs_Step cVar1;
bool bVar2;
f32 fVar3;
src/d/actor/d_a_e_nest.cpp
+2 -2
View File
@@ -959,11 +959,11 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 1;
}
static cPhs__Step daE_Nest_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_Nest_Create(fopAc_ac_c* i_this) {
fopAcM_ct(i_this, e_nest_class);
e_nest_class* _this = static_cast<e_nest_class*>(i_this);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, "E_nest");
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, "E_nest");
if (step == cPhs_COMPLEATE_e) {
_this->mBrokenSwitch = (u8)((u16)_this->current.angle.z >> 8);
_this->shape_angle.z = 0;
src/d/actor/d_a_e_oc.cpp
+3 -3
View File
@@ -2669,7 +2669,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return a_this->CreateHeap();
}
cPhs__Step daE_OC_c::create() {
cPhs_Step daE_OC_c::create() {
fopAcM_ct(this, daE_OC_c);
field_0x6b4 = fopAcM_GetParam(this) & 0xFF;
if (field_0x6b4 == 0xFF) {
@@ -2706,9 +2706,9 @@ cPhs__Step daE_OC_c::create() {
mName = "E_OC2";
}
cPhs__Step phase = (cPhs__Step) dComIfG_resLoad(&mPhaseReqs[0], mName);
cPhs_Step phase = dComIfG_resLoad(&mPhaseReqs[0], mName);
if (phase == cPhs_COMPLEATE_e) {
phase = (cPhs__Step) dComIfG_resLoad(&mPhaseReqs[1], "E_ocb");
phase = dComIfG_resLoad(&mPhaseReqs[1], "E_ocb");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_OC PARAM %x\n", fopAcM_GetParam(this));
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x2e40)) {
src/d/actor/d_a_e_oct_bg.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "dolphin/types.h"
#include <dolphin/types.h>
#include "d/actor/d_a_e_oct_bg.h"
#include "f_op/f_op_actor_mng.h"
src/d/actor/d_a_e_ot.cpp
+3 -3
View File
@@ -741,10 +741,10 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return static_cast<daE_OT_c*>(i_this)->CreateHeap();
}
cPhs__Step daE_OT_c::create() {
cPhs_Step daE_OT_c::create() {
fopAcM_ct(this, daE_OT_c);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_OT");
cPhs_Step step = dComIfG_resLoad(&mPhase, "E_OT");
if (step == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x1f40)) {
return cPhs_ERROR_e;
@@ -825,7 +825,7 @@ cPhs__Step daE_OT_c::create() {
return step;
}
static cPhs__Step daE_OT_Create(daE_OT_c* i_this) {
static cPhs_Step daE_OT_Create(daE_OT_c* i_this) {
return i_this->create();
}
src/d/actor/d_a_e_pm.cpp
+3 -3
View File
@@ -2794,9 +2794,9 @@ void daE_PM_c::SkipChk() {
}
}
cPhs__Step daE_PM_c::Create() {
cPhs_Step daE_PM_c::Create() {
fopAcM_ct(this, daE_PM_c);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_PM");
cPhs_Step step = dComIfG_resLoad(&mPhase, "E_PM");
if (step == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x45E0)) {
@@ -2855,7 +2855,7 @@ cPhs__Step daE_PM_c::Create() {
return step;
}
static cPhs__Step daE_PM_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_PM_Create(fopAc_ac_c* i_this) {
return static_cast<daE_PM_c*>(i_this)->Create();
}
src/d/actor/d_a_e_rd.cpp
+2 -2
View File
@@ -7274,7 +7274,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 1;
}
static cPhs__Step daE_RD_Create(fopAc_ac_c* a_this) {
static cPhs_Step daE_RD_Create(fopAc_ac_c* a_this) {
e_rd_class* i_this = (e_rd_class*)a_this;
fopAcM_ct(&i_this->actor, e_rd_class);
@@ -7302,7 +7302,7 @@ static cPhs__Step daE_RD_Create(fopAc_ac_c* a_this) {
i_this->mResName = "E_RD";
}
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, i_this->mResName);
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, i_this->mResName);
if (phase == cPhs_COMPLEATE_e) {
if (strcmp(dComIfGp_getStartStageName(), "F_SP124") == 0) {
// Gerudo Desert
src/d/actor/d_a_e_rdy.cpp
+2 -2
View File
@@ -4869,7 +4869,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 1;
}
static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_RDY_Create(fopAc_ac_c* i_this) {
e_rdy_class* _this = (e_rdy_class*)i_this;
fopAcM_ct(&_this->actor, e_rdy_class);
@@ -4881,7 +4881,7 @@ static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) {
}
_this->mpArcName = "E_rdy";
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, _this->mpArcName);
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, _this->mpArcName);
if (step == cPhs_COMPLEATE_e) {
OS_REPORT("E_RDY PARAM %x\n", fopAcM_GetParam(i_this));
if (_this->field_0x5b8 != 3) {
src/d/actor/d_a_e_sb.cpp
+2 -2
View File
@@ -1094,9 +1094,9 @@ static int daE_SB_Delete(daE_SB_c* i_this) {
return i_this->Delete();
}
cPhs__Step daE_SB_c::Create() {
cPhs_Step daE_SB_c::Create() {
fopAcM_ct(this, daE_SB_c);
cPhs__Step phase = (cPhs__Step) dComIfG_resLoad(&mPhaseReq, "E_SB");
cPhs_Step phase = dComIfG_resLoad(&mPhaseReq, "E_SB");
if (phase == cPhs_COMPLEATE_e) {
field_0x61a = fopAcM_GetParam(this);
if (field_0x61a != 0xFF && dComIfGs_isSwitch(field_0x61a, fopAcM_GetRoomNo(this))) {
src/d/actor/d_a_e_sf.cpp
+2 -2
View File
@@ -1739,11 +1739,11 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 1;
}
static cPhs__Step daE_SF_Create(fopAc_ac_c* a_this) {
static cPhs_Step daE_SF_Create(fopAc_ac_c* a_this) {
e_sf_class* i_this = (e_sf_class*)a_this;
fopAcM_ct(a_this, e_sf_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "E_sf");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "E_sf");
if (phase == cPhs_COMPLEATE_e) {
i_this->mSwBit = a_this->current.angle.z & 0xFF;
if (i_this->mSwBit != 0xFF) {
src/d/actor/d_a_e_sg.cpp
+1 -1
View File
@@ -1163,7 +1163,7 @@ static int daE_SG_Create(fopAc_ac_c* i_this) {
e_sg_class* a_this = static_cast<e_sg_class*>(i_this);
fopAcM_ct(i_this, e_sg_class);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&a_this->mPhaseReq, "E_sg");
cPhs_Step step = dComIfG_resLoad(&a_this->mPhaseReq, "E_sg");
if (step == cPhs_COMPLEATE_e) {
if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 4000)) {
src/d/actor/d_a_e_sm.cpp
+2 -2
View File
@@ -1895,10 +1895,10 @@ void daE_SM_c::initCoSph() {
mCoCore.OnTgNoHitMark();
}
cPhs__Step daE_SM_c::Create() {
cPhs_Step daE_SM_c::Create() {
fopAcM_ct(this, daE_SM_c);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_SM");
cPhs_Step phase = dComIfG_resLoad(&mPhase, "E_SM");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_SM PARAM %x\n", fopAcM_GetParam(this));
src/d/actor/d_a_e_st.cpp
+2 -2
View File
@@ -3005,11 +3005,11 @@ static BOOL roof_initial_pos_set(e_st_class* i_this) {
return FALSE;
}
static cPhs__Step daE_ST_Create(fopAc_ac_c* a_this) {
static cPhs_Step daE_ST_Create(fopAc_ac_c* a_this) {
e_st_class* i_this = (e_st_class*)a_this;
fopAcM_ct(&i_this->actor, e_st_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "E_st");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "E_st");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_st PARAM %x\n", fopAcM_GetParam(a_this));
i_this->arg0 = fopAcM_GetParam(a_this) & 0xF;
src/d/actor/d_a_e_sw.cpp
+2 -2
View File
@@ -1638,7 +1638,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return i_this->CreateHeap();
}
cPhs__Step daE_SW_c::create() {
cPhs_Step daE_SW_c::create() {
fopAcM_ct(this, daE_SW_c);
field_0x68c = fopAcM_GetParam(this) & 15;
@@ -1682,7 +1682,7 @@ cPhs__Step daE_SW_c::create() {
field_0x696 = 0xFF;
}
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_SW");
cPhs_Step phase = dComIfG_resLoad(&mPhase, "E_SW");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_SW PARAM %x %d %d\n", fopAcM_GetParam(this), field_0x696, fopAcM_GetID(this));
shape_angle.x = 0;
src/d/actor/d_a_e_tk.cpp
+1 -1
View File
@@ -736,7 +736,7 @@ static int daE_TK_Create(fopAc_ac_c* actor) {
e_tk_class* i_this = (e_tk_class*)actor;
fopAcM_ct(i_this, e_tk_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhaseReq, "E_tk");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhaseReq, "E_tk");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_tk PARAM %x\n", fopAcM_GetParam(actor));
i_this->mArg0 = (fopAcM_GetParam(actor) & 0xFF) >> 0;
src/d/actor/d_a_e_tk2.cpp
+1 -1
View File
@@ -548,7 +548,7 @@ static int daE_TK2_Create(fopAc_ac_c* actor) {
e_tk2_class* i_this = (e_tk2_class*)actor;
fopAcM_ct(i_this, e_tk2_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhaseReq, "E_tk2");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhaseReq, "E_tk2");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_tk2 PARAM %x\n", fopAcM_GetParam(actor));
i_this->mArg0 = (fopAcM_GetParam(actor) & 0xFF) >> 0;
src/d/actor/d_a_e_tk_ball.cpp
+3 -3
View File
@@ -396,13 +396,13 @@ static int daE_TK_BALL_Create(fopAc_ac_c* i_this) {
actor->mType = TYPE_TK_BALL_WATER;
}
cPhs__Step phase;
cPhs_Step phase;
u32 size;
if (actor->mType == TYPE_TK_BALL_WATER) {
phase = (cPhs__Step)dComIfG_resLoad(&actor->mPhaseReq, "E_tk");
phase = dComIfG_resLoad(&actor->mPhaseReq, "E_tk");
size = 0x820;
} else {
phase = (cPhs__Step)dComIfG_resLoad(&actor->mPhaseReq, "E_tk2");
phase = dComIfG_resLoad(&actor->mPhaseReq, "E_tk2");
size = 0xEE0;
}
src/d/actor/d_a_e_yc.cpp
+2 -2
View File
@@ -752,11 +752,11 @@ static int useHeapInit(fopAc_ac_c* i_this) {
return 1;
}
static cPhs__Step daE_YC_Create(fopAc_ac_c* i_this) {
static cPhs_Step daE_YC_Create(fopAc_ac_c* i_this) {
e_yc_class* _this = static_cast<e_yc_class*>(i_this);
fopAcM_ct(i_this, e_yc_class);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, "E_yc");
cPhs_Step step = dComIfG_resLoad(&_this->mPhase, "E_yc");
if (step == cPhs_COMPLEATE_e) {
_this->mParam = (u8)fopAcM_GetParam(_this);
src/d/actor/d_a_e_yg.cpp
+2 -2
View File
@@ -1332,12 +1332,12 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return 1;
}
static cPhs__Step daE_YG_Create(fopAc_ac_c* actor) {
static cPhs_Step daE_YG_Create(fopAc_ac_c* actor) {
e_yg_class* i_this = (e_yg_class*)actor;
fopAcM_ct(&i_this->actor, e_yg_class);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&i_this->mPhase, "E_YG");
cPhs_Step phase = dComIfG_resLoad(&i_this->mPhase, "E_YG");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_YG PARAM %x\n", fopAcM_GetParam(actor));
src/d/actor/d_a_e_ymb.cpp
+2 -2
View File
@@ -3156,7 +3156,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return i_this->CreateHeap();
}
cPhs__Step daE_YMB_c::create() {
cPhs_Step daE_YMB_c::create() {
fopAcM_ct(this, daE_YMB_c);
mSwitchBit = fopAcM_GetParam(this);
@@ -3168,7 +3168,7 @@ cPhs__Step daE_YMB_c::create() {
}
}
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_YB");
cPhs_Step phase = dComIfG_resLoad(&mPhase, "E_YB");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_YMB PARAM %x\n", fopAcM_GetParam(this));
if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x5200)) {
src/d/actor/d_a_e_zh.cpp
+2 -2
View File
@@ -2165,10 +2165,10 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return i_this->CreateHeap();
}
cPhs__Step daE_ZH_c::create() {
cPhs_Step daE_ZH_c::create() {
fopAcM_ct(this, daE_ZH_c);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_ZH");
cPhs_Step phase = dComIfG_resLoad(&mPhase, "E_ZH");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_ZH PARAM %x\n", fopAcM_GetParam(this));
arg0 = fopAcM_GetParam(this);
src/d/actor/d_a_e_zm.cpp
+2 -2
View File
@@ -904,10 +904,10 @@ static int useHeapInit(fopAc_ac_c* a_this) {
return static_cast<daE_ZM_c*>(a_this)->CreateHeap();
}
cPhs__Step daE_ZM_c::create() {
cPhs_Step daE_ZM_c::create() {
fopAcM_ct(this, daE_ZM_c);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_ZM");
cPhs_Step phase = dComIfG_resLoad(&mPhase, "E_ZM");
if (phase == cPhs_COMPLEATE_e) {
OS_REPORT("E_ZM PARAM %x\n", fopAcM_GetParam(this));
src/d/actor/d_a_mg_fish.cpp
+2 -2
View File
@@ -3854,8 +3854,8 @@ static int daMg_Fish_Create(fopAc_ac_c* i_this) {
lit_1008 = 1;
#endif
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&a_this->mPhaseReq, a_this->mResName);
cPhs__Step retval = phase;
cPhs_Step phase = dComIfG_resLoad(&a_this->mPhaseReq, a_this->mResName);
cPhs_Step retval = phase;
if (phase == cPhs_COMPLEATE_e) {
s32 params_0 = fopAcM_GetParam(i_this) >> 24;
src/d/actor/d_a_midna.cpp
+3 -3
View File
@@ -541,9 +541,9 @@ daMidna_hio_c::daMidna_hio_c() {
}
#endif
cPhs__Step daMidna_c::create() {
cPhs_Step daMidna_c::create() {
fopAcM_ct(this, daMidna_c);
cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, l_arcName);
cPhs_Step step = dComIfG_resLoad(&mPhase, l_arcName);
if (step == cPhs_COMPLEATE_e) {
if (dStage_roomControl_c::getDemoArcName()[0] != '\0' &&
@@ -663,7 +663,7 @@ cPhs__Step daMidna_c::create() {
return step;
}
static cPhs__Step daMidna_Create(fopAc_ac_c* i_this) {
static cPhs_Step daMidna_Create(fopAc_ac_c* i_this) {
daMidna_c* a_this = (daMidna_c*)i_this;
fopAcM_RegisterCreateID(i_this, "MIDNA");
return a_this->create();

Some files were not shown because too many files have changed in this diff Show More