From 586e74f8d444189b2db283f0150d2072796ff5c0 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Wed, 22 Nov 2023 01:14:36 -0800 Subject: [PATCH 1/8] make function signatures more consistent --- include/JSystem/JKernel/JKRAram.h | 2 +- include/JSystem/JKernel/JKRDvdFile.h | 2 +- include/f_op/f_op_msg_mng.h | 2 +- src/JAZelAudio/JAIZelBasic.cpp | 2 +- src/JSystem/J3DGraphBase/J3DSys.cpp | 6 ++-- src/SSystem/SComponent/c_bg_w.cpp | 2 +- src/SSystem/SComponent/c_cc_d.cpp | 2 +- src/SSystem/SComponent/c_malloc.cpp | 2 +- src/d/d_attention.cpp | 48 ++++++++++++++-------------- src/m_Do/m_Do_Reset.cpp | 2 +- src/m_Do/m_Do_machine.cpp | 2 +- src/m_Do/m_Do_main.cpp | 2 +- 12 files changed, 37 insertions(+), 37 deletions(-) diff --git a/include/JSystem/JKernel/JKRAram.h b/include/JSystem/JKernel/JKRAram.h index f211a8a5a..754e9a45c 100644 --- a/include/JSystem/JKernel/JKRAram.h +++ b/include/JSystem/JKernel/JKRAram.h @@ -10,7 +10,7 @@ class JKRAMCommand; class JKRAramBlock; class JKRAram : public JKRThread { private: - JKRAram(u32, u32, long); + JKRAram(u32, u32, s32); virtual ~JKRAram(); /* vt[03] */ void* run(void); /* override */ diff --git a/include/JSystem/JKernel/JKRDvdFile.h b/include/JSystem/JKernel/JKRDvdFile.h index 4de87b8bc..442ef026c 100644 --- a/include/JSystem/JKernel/JKRDvdFile.h +++ b/include/JSystem/JKernel/JKRDvdFile.h @@ -15,7 +15,7 @@ class JKRDvdFile : public JKRFile { public: JKRDvdFile(); JKRDvdFile(const char*); - JKRDvdFile(long); + JKRDvdFile(s32); virtual ~JKRDvdFile(); void initiate(void); diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h index c6e21e543..65b231a4f 100644 --- a/include/f_op/f_op_msg_mng.h +++ b/include/f_op/f_op_msg_mng.h @@ -80,7 +80,7 @@ inline s32 fopMsgM_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3 param_8, createFunc); } -void fopMsgM_setPaneData(fopMsgM_pane_class*, J2DScreen*, unsigned long); +void fopMsgM_setPaneData(fopMsgM_pane_class*, J2DScreen*, u32); void fopMsgM_setNowAlpha(fopMsgM_pane_class*, f32); void fopMsgM_setNowAlphaZero(fopMsgM_pane_class*); void fopMsgM_setInitAlpha(fopMsgM_pane_class*); diff --git a/src/JAZelAudio/JAIZelBasic.cpp b/src/JAZelAudio/JAIZelBasic.cpp index 951471956..16eebddad 100644 --- a/src/JAZelAudio/JAIZelBasic.cpp +++ b/src/JAZelAudio/JAIZelBasic.cpp @@ -207,7 +207,7 @@ void JAIZelBasic::cbPracticeStop() { } /* 802A6508-802A6570 .text checkCbPracticePlay__11JAIZelBasicFv */ -void JAIZelBasic::checkCbPracticePlay() { +BOOL JAIZelBasic::checkCbPracticePlay() { /* Nonmatching */ } diff --git a/src/JSystem/J3DGraphBase/J3DSys.cpp b/src/JSystem/J3DGraphBase/J3DSys.cpp index 653bc38c7..a8c5c09d2 100644 --- a/src/JSystem/J3DGraphBase/J3DSys.cpp +++ b/src/JSystem/J3DGraphBase/J3DSys.cpp @@ -63,7 +63,7 @@ void J3DSys::loadNrmMtxIndx(int addr, u16 indx) const { } /* 802D8BD8-802D8C58 .text J3DFifoLoadPosMtxImm__FPA4_fUl */ -void J3DFifoLoadPosMtxImm(Mtx mtx, unsigned long idx) { +void J3DFifoLoadPosMtxImm(Mtx mtx, u32 idx) { J3DFifoWriteXFCmd(idx << 2, 12); u32 * mtx_u32 = (u32*)mtx; @@ -84,7 +84,7 @@ void J3DFifoLoadPosMtxImm(Mtx mtx, unsigned long idx) { } /* 802D8C58-802D8CC4 .text J3DFifoLoadNrmMtxImm__FPA4_fUl */ -void J3DFifoLoadNrmMtxImm(Mtx mtx, unsigned long idx) { +void J3DFifoLoadNrmMtxImm(Mtx mtx, u32 idx) { J3DFifoWriteXFCmd(0x400 + (idx * 3), 9); u32 * mtx_u32 = (u32*)mtx; @@ -102,7 +102,7 @@ void J3DFifoLoadNrmMtxImm(Mtx mtx, unsigned long idx) { } /* 802D8CC4-802D8D30 .text J3DFifoLoadNrmMtxImm3x3__FPA3_fUl */ -void J3DFifoLoadNrmMtxImm3x3(Mtx33 mtx, unsigned long idx) { +void J3DFifoLoadNrmMtxImm3x3(Mtx33 mtx, u32 idx) { J3DFifoWriteXFCmd(0x400 + (idx * 3), 9); u32 * mtx_u32 = (u32*)mtx; diff --git a/src/SSystem/SComponent/c_bg_w.cpp b/src/SSystem/SComponent/c_bg_w.cpp index 598189c77..250aea6fe 100644 --- a/src/SSystem/SComponent/c_bg_w.cpp +++ b/src/SSystem/SComponent/c_bg_w.cpp @@ -146,7 +146,7 @@ bool cBgW::ChkMemoryError() { } /* 802481C4-80248414 .text Set__4cBgWFP6cBgD_tUlPA3_A4_f */ -bool cBgW::Set(cBgD_t*, unsigned long, Mtx*) { +bool cBgW::Set(cBgD_t*, u32, Mtx*) { /* Nonmatching */ } diff --git a/src/SSystem/SComponent/c_cc_d.cpp b/src/SSystem/SComponent/c_cc_d.cpp index e76041724..e459a642e 100644 --- a/src/SSystem/SComponent/c_cc_d.cpp +++ b/src/SSystem/SComponent/c_cc_d.cpp @@ -44,7 +44,7 @@ void cCcD_DivideArea::SetArea(const cM3dGAab& aabb) { } /* 80241558-8024170C .text CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl */ -void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo*, const cM3dGAab&, unsigned long) { +void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo*, const cM3dGAab&, u32) { /* Nonmatching */ } diff --git a/src/SSystem/SComponent/c_malloc.cpp b/src/SSystem/SComponent/c_malloc.cpp index 98b0f84e6..2dfa08605 100644 --- a/src/SSystem/SComponent/c_malloc.cpp +++ b/src/SSystem/SComponent/c_malloc.cpp @@ -15,7 +15,7 @@ void cMl::init(JKRHeap* heap) { } /* 802412F8-80241330 .text memalignB__3cMlFiUl */ -void* cMl::memalignB(int alignment, unsigned long size) { +void* cMl::memalignB(int alignment, u32 size) { if (size == 0) return NULL; else diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 320fbec8b..c1d5faeba 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -12,7 +12,7 @@ #include "JSystem/JKernel/JKRSolidHeap.h" /* 8009D220-8009D268 .text __ct__11dAttParam_cFl */ -dAttParam_c::dAttParam_c(long) { +dAttParam_c::dAttParam_c(s32) { /* Nonmatching */ field_0x04 = 45.0f; field_0x08 = 30.0f; @@ -95,7 +95,7 @@ dAttention_c::~dAttention_c() { } /* 8009D6EC-8009D728 .text GetActionList__12dAttention_cFl */ -dAttList_c* dAttention_c::GetActionList(long idx) { +dAttList_c* dAttention_c::GetActionList(s32 idx) { if (mActionNum != 0) return &mActionList[(mActionOffs + idx) % mActionNum]; else @@ -103,7 +103,7 @@ dAttList_c* dAttention_c::GetActionList(long idx) { } /* 8009D728-8009D764 .text GetLockonList__12dAttention_cFl */ -dAttList_c* dAttention_c::GetLockonList(long idx) { +dAttList_c* dAttention_c::GetLockonList(s32 idx) { if (mLockOnNum != 0) return &mLockOnList[(mLockOnOffs + idx) % mLockOnNum]; else @@ -145,43 +145,43 @@ dAttList_c* dAttention_c::getActionBtnZ() { } /* 8009DAA4-8009DAF4 .text chkAttMask__12dAttention_cFUlUl */ -void dAttention_c::chkAttMask(unsigned long, unsigned long) { +void dAttention_c::chkAttMask(u32, u32) { /* Nonmatching */ } /* 8009DAF4-8009DB60 .text check_event_condition__FUlUs */ -void check_event_condition(unsigned long, unsigned short) { +void check_event_condition(u32, u16) { /* Nonmatching */ } /* 8009DB60-8009DC28 .text check_flontofplayer__FUlss */ -void check_flontofplayer(unsigned long, short, short) { +void check_flontofplayer(u32, s16, s16) { /* Nonmatching */ } /* 8009DC28-8009DC74 .text distace_weight__Ffsf */ -void distace_weight(float, short, float) { +void distace_weight(f32, s16, f32) { /* Nonmatching */ } /* 8009DC74-8009DCD4 .text distace_angle_adjust__Ffsf */ -void distace_angle_adjust(float, short, float) { +void distace_angle_adjust(f32, s16, f32) { /* Nonmatching */ } /* 8009DCD4-8009DE44 .text check_distace__FP4cXyzsP4cXyzffff */ -void check_distace(cXyz*, short, cXyz*, float, float, float, float) { +void check_distace(cXyz*, s16, cXyz*, f32, f32, f32, f32) { /* Nonmatching */ } /* 8009DE44-8009E03C .text calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl */ -f32 dAttention_c::calcWeight(int, fopAc_ac_c*, float, short, short, unsigned long*) { +f32 dAttention_c::calcWeight(int, fopAc_ac_c*, f32, s16, s16, u32*) { /* Nonmatching */ } /* 8009E03C-8009E128 .text setLList__12dAttention_cFP10fopAc_ac_cffUl */ -void dAttention_c::setLList(fopAc_ac_c* i_actor, float weight, float distance, unsigned long type) { - float bestWeight = 0.0f; +void dAttention_c::setLList(fopAc_ac_c* i_actor, f32 weight, f32 distance, u32 type) { + f32 bestWeight = 0.0f; if (weight > 0.0f) { int bestIdx; @@ -206,8 +206,8 @@ void dAttention_c::setLList(fopAc_ac_c* i_actor, float weight, float distance, u } /* 8009E128-8009E214 .text setAList__12dAttention_cFP10fopAc_ac_cffUl */ -void dAttention_c::setAList(fopAc_ac_c* i_actor, float weight, float distance, unsigned long type) { - float bestWeight = 0.0f; +void dAttention_c::setAList(fopAc_ac_c* i_actor, f32 weight, f32 distance, u32 type) { + f32 bestWeight = 0.0f; if (weight > 0.0f) { int bestIdx; @@ -232,7 +232,7 @@ void dAttention_c::setAList(fopAc_ac_c* i_actor, float weight, float distance, u } /* 8009E214-8009E2CC .text initList__12dAttention_cFUl */ -void dAttention_c::initList(unsigned long flagMask) { +void dAttention_c::initList(u32 flagMask) { int i; mFlagMask = flagMask; @@ -292,7 +292,7 @@ void dAttention_c::sortList() { } /* 8009E5C4-8009E684 .text stockAttention__12dAttention_cFUl */ -void dAttention_c::stockAttention(unsigned long interactMask) { +void dAttention_c::stockAttention(u32 interactMask) { fopAc_ac_c * pTarget = LockonTarget(0); initList(interactMask); if (makeList()) @@ -313,7 +313,7 @@ void dAttention_c::stockAttention(unsigned long interactMask) { } /* 8009E684-8009E728 .text nextAttention__12dAttention_cFUl */ -void dAttention_c::nextAttention(unsigned long interactMask) { +void dAttention_c::nextAttention(u32 interactMask) { fopAc_ac_c * pTarget = fopAcM_SearchByID(mLockOnTargetBsPcID); initList(interactMask); if (makeList()) @@ -386,17 +386,17 @@ void dAttention_c::judgementLostCheck() { } /* 8009EF40-8009F0A4 .text judgementStatusSw__12dAttention_cFUl */ -void dAttention_c::judgementStatusSw(unsigned long) { +void dAttention_c::judgementStatusSw(u32) { /* Nonmatching */ } /* 8009F0A4-8009F1D4 .text judgementStatusHd__12dAttention_cFUl */ -void dAttention_c::judgementStatusHd(unsigned long) { +void dAttention_c::judgementStatusHd(u32) { /* Nonmatching */ } /* 8009F1D4-8009F460 .text Run__12dAttention_cFUl */ -void dAttention_c::Run(unsigned long) { +void dAttention_c::Run(u32) { /* Nonmatching */ } @@ -411,7 +411,7 @@ void dAttDraw_c::setAnm(int, int, int) { } /* 8009F6B4-8009F834 .text draw__10dAttDraw_cFR4cXyzPA4_f */ -void dAttDraw_c::draw(cXyz&, float(*)[4]) { +void dAttDraw_c::draw(cXyz&, f32(*)[4]) { /* Nonmatching */ } @@ -531,7 +531,7 @@ void dAttCatch_c::proc() { } /* 8009FC08-8009FE10 .text request__11dAttCatch_cFP10fopAc_ac_cUcfffsi */ -void dAttCatch_c::request(fopAc_ac_c*, unsigned char, float, float, float, short, int) { +void dAttCatch_c::request(fopAc_ac_c*, u8, f32, f32, f32, s16, int) { /* Nonmatching */ } @@ -555,12 +555,12 @@ void dAttLook_c::proc() { } /* 8009FE74-800A009C .text request__10dAttLook_cFP10fopAc_ac_cfffsi */ -void dAttLook_c::request(fopAc_ac_c*, float, float, float, short, int) { +void dAttLook_c::request(fopAc_ac_c*, f32, f32, f32, s16, int) { /* Nonmatching */ } /* 800A009C-800A0270 .text requestF__10dAttLook_cFP10fopAc_ac_csi */ -void dAttLook_c::requestF(fopAc_ac_c*, short, int) { +void dAttLook_c::requestF(fopAc_ac_c*, s16, int) { /* Nonmatching */ } diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp index 1e362743c..62c5c6274 100644 --- a/src/m_Do/m_Do_Reset.cpp +++ b/src/m_Do/m_Do_Reset.cpp @@ -33,7 +33,7 @@ mDoRstData* mDoRst::mResetData; #endif /* 80017D7C-80017E40 .text mDoRst_reset__FiUli */ -void mDoRst_reset(int param_0, unsigned long param_1, int param_2) { +void mDoRst_reset(int param_0, u32 param_1, int param_2) { if (DVDGetDriveStatus() == DVD_STATE_FATAL_ERROR) { do { } while (true); diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index 0b81fb16a..2bab193f7 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -188,7 +188,7 @@ int developKeyCheck(u32 btnTrig, u32 btnHold) { } /* 8000C23C-8000C3C0 .text myExceptionCallback__FUsP9OSContextUlUl */ -void myExceptionCallback(unsigned short, OSContext*, unsigned long, unsigned long) { +void myExceptionCallback(OSError, OSContext*, u32, u32) { u32 btnHold; u32 btnTrig; diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 18b962c4d..5c7376afe 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -447,7 +447,7 @@ void main() { u8 ALIGN_DECL(0x20) stack[0xF000]; mDoMain::sPowerOnTime = OSGetTime(); - OSReportInit__Fv(); + OSReportInit(); version_check(); #if VERSION != VERSION_JPN mDoRstData* reset_data = (mDoRstData*)OSAllocFromArenaLo(0x10, 4); From 54bc1b916d53998c9e96245728b113afc3844b05 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Wed, 22 Nov 2023 22:36:16 -0800 Subject: [PATCH 2/8] remove declarations for functions that don't exist --- include/JSystem/J3DGraphBase/J3DMatBlock.h | 3 --- include/JSystem/J3DGraphBase/J3DShapeMtx.h | 2 -- include/JSystem/JParticle/JPAField.h | 1 - include/d/d_cc_s.h | 2 -- 4 files changed, 8 deletions(-) diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index 39f06ea4c..7fc159247 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -70,9 +70,6 @@ public: virtual void reset(J3DTexGenBlock*); virtual void calc(f32 const (*)[4]); - virtual void calcWithoutViewMtx(f32 const (*)[4]); - virtual void calcPostTexMtx(f32 const (*)[4]); - virtual void calcPostTexMtxWithoutViewMtx(f32 const (*)[4]); virtual void load() {} virtual void patch(); virtual void diff(u32); diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/include/JSystem/J3DGraphBase/J3DShapeMtx.h index eb5ba9f17..6c8de2dd6 100644 --- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h +++ b/include/JSystem/J3DGraphBase/J3DShapeMtx.h @@ -33,7 +33,6 @@ public: J3DShapeMtx(u16 useMtxIndex) : mUseMtxIndex(useMtxIndex) {} - void resetMtxLoadCache(); void loadMtxIndx_PNGP(int, u16) const; void loadMtxIndx_PCPU(int, u16) const; void loadMtxIndx_NCPU(int, u16) const; @@ -52,7 +51,6 @@ public: static u8 sNBTFlag; static void setCurrentPipeline(u32 pipeline) { sCurrentPipeline = pipeline; } - static void resetMtxLoadCache(); protected: /* 0x04 */ u16 mUseMtxIndex; diff --git a/include/JSystem/JParticle/JPAField.h b/include/JSystem/JParticle/JPAField.h index 1731f9b5a..4cfaa882a 100644 --- a/include/JSystem/JParticle/JPAField.h +++ b/include/JSystem/JParticle/JPAField.h @@ -131,7 +131,6 @@ class JPADragField : public JPABaseField { public: virtual ~JPADragField() {} virtual void init(JPAFieldData*, JPABaseParticle*); - virtual void preCalc(JPAFieldData*); virtual void calc(JPAFieldData*, JPABaseParticle*); }; diff --git a/include/d/d_cc_s.h b/include/d/d_cc_s.h index d004362bb..565225956 100644 --- a/include/d/d_cc_s.h +++ b/include/d/d_cc_s.h @@ -35,8 +35,6 @@ public: virtual void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*, cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*, cXyz*); - virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*, - cCcD_GStts*); virtual bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_Stts*, cCcD_Stts*, cCcD_GStts*, cCcD_GStts*); From d5abc1b49ab28f0d15de91b35938644de5fa0069 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Sat, 2 Dec 2023 00:52:32 -0800 Subject: [PATCH 3/8] include casing --- src/c/c_dylink.cpp | 2 +- src/f_pc/f_pc_manager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index 8f4c1445b..7e621be7a 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -14,7 +14,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "DynamicLink.h" -#include "dolphin/OS/OS.h" +#include "dolphin/os/OS.h" #include "MSL_C/string.h" DynamicModuleControlBase * DMC[PROC_COUNT_e]; diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index 58d65f876..a0aab1f2b 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -23,7 +23,7 @@ #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/JAudio/JAIStreamMgr.h" #include "JSystem/JUtility/JUTAssert.h" -#include "dolphin/dvd/DVD.h" +#include "dolphin/dvd/dvd.h" #include "dolphin/gx/GX.h" #include "f_pc/f_pc_manager_data.inc" From 3d8708a34e482c03c3e0d470be962710b1996340 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Sun, 10 Dec 2023 01:31:07 -0800 Subject: [PATCH 4/8] PSVEC -> VEC --- include/SSystem/SComponent/c_m3d_g_tri.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/SSystem/SComponent/c_m3d_g_tri.h b/include/SSystem/SComponent/c_m3d_g_tri.h index dc9f0ef11..2b4620351 100644 --- a/include/SSystem/SComponent/c_m3d_g_tri.h +++ b/include/SSystem/SComponent/c_m3d_g_tri.h @@ -35,10 +35,10 @@ public: void Up(f32 dist) { Vec delta; - PSVECScale(&mNormal, &delta, dist); - PSVECAdd(&mA, &delta, &mA); - PSVECAdd(&mB, &delta, &mB); - PSVECAdd(&mC, &delta, &mC); + VECScale(&mNormal, &delta, dist); + VECAdd(&mA, &delta, &mA); + VECAdd(&mB, &delta, &mB); + VECAdd(&mC, &delta, &mC); mD -= dist; } From 6af2f3a6cf97a4e7ed9bc16142823d429f521dab Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Sun, 17 Dec 2023 19:14:23 -0800 Subject: [PATCH 5/8] m_Do_MemCardRWmng header --- include/m_Do/m_Do_MemCard.h | 15 --------------- include/m_Do/m_Do_MemCardRWmng.h | 4 ++-- src/m_Do/m_Do_MemCard.cpp | 1 + src/m_Do/m_Do_MemCardRWmng.cpp | 4 ++-- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/include/m_Do/m_Do_MemCard.h b/include/m_Do/m_Do_MemCard.h index 75ad8229b..763719b83 100644 --- a/include/m_Do/m_Do_MemCard.h +++ b/include/m_Do/m_Do_MemCard.h @@ -71,19 +71,4 @@ inline void mDoMemCd_save(void* i_data, u32 param_1, u32 param_2) { g_mDoMemCd_control.save(i_data,param_1,param_2); } -struct CARDFileInfo; -struct mDoMemCdRWm_HeaderData; -s32 mDoMemCdRWm_Store(CARDFileInfo*, void*, u32); -s32 mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32); -void mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData*); -void mDoMemCdRWm_SetCardStat(CARDFileInfo*); -void mDoMemCdRWm_CheckCardStat(CARDFileInfo*); -void mDoMemCdRWm_CalcCheckSum(void*, u32); -void mDoMemCdRWm_CalcCheckSumPictData(void*, u32); -void mDoMemCdRWm_TestCheckSumPictData(void*); -void mDoMemCdRWm_SetCheckSumPictData(u8*); -void mDoMemCdRWm_CalcCheckSumGameData(void*, u32); -void mDoMemCdRWm_TestCheckSumGameData(void*); -void mDoMemCdRWm_SetCheckSumGameData(u8*, u8); - #endif /* M_DO_M_DO_MEMCARD_H */ diff --git a/include/m_Do/m_Do_MemCardRWmng.h b/include/m_Do/m_Do_MemCardRWmng.h index 684cffd4e..30889580d 100644 --- a/include/m_Do/m_Do_MemCardRWmng.h +++ b/include/m_Do/m_Do_MemCardRWmng.h @@ -6,8 +6,8 @@ typedef struct CARDFileInfo CARDFileInfo; struct mDoMemCdRWm_HeaderData; -void mDoMemCdRWm_Store(CARDFileInfo*, void*, u32); -void mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32); +s32 mDoMemCdRWm_Store(CARDFileInfo*, void*, u32); +s32 mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32); void mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData*); void mDoMemCdRWm_SetCardStat(CARDFileInfo*); void mDoMemCdRWm_CheckCardStat(CARDFileInfo*); diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp index 6fff7689b..71f06bae2 100644 --- a/src/m_Do/m_Do_MemCard.cpp +++ b/src/m_Do/m_Do_MemCard.cpp @@ -4,6 +4,7 @@ // #include "m_Do/m_Do_MemCard.h" +#include "m_Do/m_Do_MemCardRWmng.h" #include "m_Do/m_Do_Reset.h" #include "JSystem/JKernel/JKRThread.h" #include "dolphin/card.h" diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index 81f7658ca..74eef405a 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -7,12 +7,12 @@ #include "dolphin/types.h" /* 80019940-80019CE8 .text mDoMemCdRWm_Store__FP12CARDFileInfoPvUl */ -void mDoMemCdRWm_Store(CARDFileInfo*, void*, u32) { +s32 mDoMemCdRWm_Store(CARDFileInfo*, void*, u32) { /* Nonmatching */ } /* 80019CE8-80019F4C .text mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl */ -void mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32) { +s32 mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32) { /* Nonmatching */ } From 02d375361d7d839aa1de812b2cbc6409e78c7c4e Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Mon, 18 Dec 2023 23:42:25 -0800 Subject: [PATCH 6/8] implement various inlined functions --- include/JSystem/J3DGraphAnimator/J3DAnimation.h | 4 ++-- include/JSystem/J3DGraphBase/J3DPacket.h | 6 +++++- include/d/actor/d_a_agb.h | 2 +- include/d/actor/d_a_player.h | 5 +++-- include/d/actor/d_a_player_main.h | 13 +++++++------ include/d/d_bg_s_gnd_chk.h | 4 ++-- include/d/d_bg_s_lin_chk.h | 2 +- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index f4bf513d6..bd5da43a6 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -331,7 +331,7 @@ public: virtual void calcTransform(f32, u16, J3DTransformInfo*) const; virtual ~J3DAnmTransformKey() {} - virtual void getTransform(u16, J3DTransformInfo*) const; + virtual void getTransform(u16 param_1, J3DTransformInfo* param_2) const { calcTransform(getFrame(), param_1, param_2); } private: /* 0x24 */ int field_0x24; @@ -461,7 +461,7 @@ public: void searchUpdateMaterialID(J3DMaterialTable*); void searchUpdateMaterialID(J3DModelData*); - virtual ~J3DAnmTevRegKey(); + virtual ~J3DAnmTevRegKey() {} virtual s32 getKind() const; u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; } diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h index 20d828948..da11c26b3 100644 --- a/include/JSystem/J3DGraphBase/J3DPacket.h +++ b/include/JSystem/J3DGraphBase/J3DPacket.h @@ -1,6 +1,7 @@ #ifndef J3DPACKET_H #define J3DPACKET_H +#include "JSystem/J3DGraphBase/J3DDrawBuffer.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "dolphin/gd/GDBase.h" #include "dolphin/types.h" @@ -207,7 +208,10 @@ public: bool isEnabled_Diff() const { return mpInitShapePacket->getDisplayListObj() != NULL; } virtual ~J3DMatPacket(); - virtual int entry(J3DDrawBuffer*); + virtual int entry(J3DDrawBuffer* param_1) { + J3DDrawBuffer::sortFunc func = J3DDrawBuffer::sortFuncTable[param_1->mSortType]; + return (param_1->*func)(this); + } virtual void draw(); virtual bool isSame(J3DMatPacket*) const; diff --git a/include/d/actor/d_a_agb.h b/include/d/actor/d_a_agb.h index 7bf614fe7..c582af0ef 100644 --- a/include/d/actor/d_a_agb.h +++ b/include/d/actor/d_a_agb.h @@ -30,7 +30,7 @@ class dMsgCtrl_c { public: int init(u16); int execute(); - ~dMsgCtrl_c(); + ~dMsgCtrl_c() {} /* 0x00 */ u16 field_0x0; /* 0x04 */ u32 mMsgID; diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index 6f2c5c5f9..98f814204 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -40,7 +40,7 @@ STATIC_ASSERT(sizeof(daPy_mtxFollowEcallBack_c) == 0x0C); class daPy_HIO_c { public: - daPy_HIO_c(); + daPy_HIO_c() {} public: /* 0x00 */ u8 temp[0x3F - 0x00]; @@ -82,6 +82,7 @@ class daPy_py_c : public fopAc_ac_c { public: enum daPy_FLG0 { daPyFlg0_UNK4 = 0x00000004, + daPyFlg0_UNK8 = 0x00000008, daPyFlg0_DEKU_SP_RETURN_FLG = 0x00000010, daPyFlg0_CUT_AT_FLG = 0x00000040, daPyFlg0_UNK100 = 0x00000100, @@ -277,7 +278,7 @@ public: virtual BOOL checkTactWait() const { return FALSE; } virtual void setTactZev(unsigned int, int, char*) {} virtual void onDekuSpReturnFlg(u8) {} - virtual bool checkComboCutTurn() const { return false; } + virtual BOOL checkComboCutTurn() const { return false; } virtual f32 getBaseAnimeFrameRate() = 0; virtual f32 getBaseAnimeFrame() = 0; virtual u32 getItemID() const { return -1; } diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h index d9da6115c..79bc816ad 100644 --- a/include/d/actor/d_a_player_main.h +++ b/include/d/actor/d_a_player_main.h @@ -5,6 +5,7 @@ #include "d/d_attention.h" #include "d/d_bg_s_acch.h" #include "d/d_bg_s_lin_chk.h" +#include "d/d_com_inf_game.h" #include "d/d_drawlist.h" #include "d/d_bg_w.h" #include "d/actor/d_a_player.h" @@ -2178,28 +2179,28 @@ public: virtual BOOL checkTactWait() const { return mCurProc == PROC_TACT_WAIT_e; } virtual void setTactZev(unsigned int, int, char*); virtual void onDekuSpReturnFlg(u8 i_point); - virtual bool checkComboCutTurn() const; + virtual BOOL checkComboCutTurn() const { return mCurProc == 0x55 && m3570 != 0; } virtual f32 getBaseAnimeFrameRate() { return mFrameCtrlUnder[0].getRate(); } virtual f32 getBaseAnimeFrame() { return mFrameCtrlUnder[0].getFrame(); } virtual u32 getItemID() const { return mActorKeepEquip.getID(); } virtual u32 getThrowBoomerangID() const { return mActorKeepThrow.getID(); } virtual u32 getGrabActorID() const { return mActorKeepGrab.getID(); } virtual BOOL checkGrabBarrel() { return checkGrabBarrelSearch(1); } - virtual BOOL checkPlayerNoDraw(); + virtual BOOL checkPlayerNoDraw() { return dComIfGp_checkCameraAttentionStatus(mCameraInfoIdx, 2) || checkNoResetFlg0(daPyFlg0_NO_DRAW); } virtual BOOL checkRopeTag() { return mActorKeepEquip.getActor() == NULL; } - virtual BOOL checkRopeReadyAnime() const; + virtual BOOL checkRopeReadyAnime() const { return m_anm_heap_upper[2].mIdx == LKANM_BCK_ROPETHROWWAIT; } virtual void voiceStart(u32); virtual void setOutPower(f32, s16, int); - virtual void onFrollCrashFlg(u32); + virtual void onFrollCrashFlg(u32 param_1) { m3620 = param_1; onNoResetFlg0(daPyFlg0_UNK8); } virtual MtxP getModelJointMtx(u16 idx) { return mpCLModel->getAnmMtx(idx); } - virtual f32 getOldSpeedY(); + virtual f32 getOldSpeedY() { return mOldSpeed.y; } virtual BOOL setHookshotCarryOffset(unsigned int, const cXyz*); virtual void setPlayerPosAndAngle(cXyz*, s16); virtual void setPlayerPosAndAngle(cXyz*, csXyz*); virtual void setPlayerPosAndAngle(MtxP); virtual BOOL setThrowDamage(cXyz*, s16, f32, f32, int); virtual void changeTextureAnime(u16, u16, int); - virtual void cancelChangeTextureAnime(); + virtual void cancelChangeTextureAnime() { resetDemoTextureAnime(); } /* 0x0320 */ request_of_phase_process_class mPhsLoad; /* 0x0328 */ J3DModelData* mpCLModelData; diff --git a/include/d/d_bg_s_gnd_chk.h b/include/d/d_bg_s_gnd_chk.h index cbd7a0fe0..dd4e7adcc 100644 --- a/include/d/d_bg_s_gnd_chk.h +++ b/include/d/d_bg_s_gnd_chk.h @@ -52,7 +52,7 @@ public: OnSpl(); } - virtual ~dBgS_ObjGndChk_Spl(); + virtual ~dBgS_ObjGndChk_Spl() {} }; class dBgS_ObjGndChk_All : public dBgS_ObjGndChk { @@ -76,4 +76,4 @@ public: virtual ~dBgS_CamGndChk_Wtr(); }; -#endif /* D_BG_D_BG_S_GND_CHK_H */ \ No newline at end of file +#endif /* D_BG_D_BG_S_GND_CHK_H */ diff --git a/include/d/d_bg_s_lin_chk.h b/include/d/d_bg_s_lin_chk.h index 16ada5a18..6f4b2c942 100644 --- a/include/d/d_bg_s_lin_chk.h +++ b/include/d/d_bg_s_lin_chk.h @@ -38,7 +38,7 @@ class dBgS_BoomerangLinChk : public dBgS_LinChk { public: dBgS_BoomerangLinChk() { SetBoomerang(); } - virtual ~dBgS_BoomerangLinChk(); + virtual ~dBgS_BoomerangLinChk() {} }; class dBgS_ArrowLinChk : public dBgS_LinChk { From 8eda1d418d4c86669a14ad9a0cfe85583fa1d551 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Sun, 17 Dec 2023 19:24:09 -0800 Subject: [PATCH 7/8] make more TUs compile --- include/JSystem/J3DGraphBase/J3DMatBlock.h | 32 ++++++ include/JSystem/J3DGraphLoader/J3DAnmLoader.h | 80 +++++++++++++- .../JSystem/J3DGraphLoader/J3DClusterLoader.h | 17 ++- .../J3DGraphLoader/J3DMaterialFactory.h | 4 +- .../J3DGraphLoader/J3DMaterialFactory_v21.h | 4 +- include/JSystem/JAudio/JASBNKParser.h | 2 +- include/d/actor/d_a_grid.h | 16 +++ include/d/d_cc_mass_s.h | 3 +- include/d/d_detect.h | 6 +- include/d/d_drawlist.h | 20 ++++ include/d/d_msg.h | 30 +++++ include/d/d_salvage.h | 41 +++++++ include/d/d_timer.h | 24 +++- include/d/d_tree.h | 8 +- include/d/d_wood.h | 5 +- src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp | 104 ++---------------- .../J3DGraphLoader/J3DClusterLoader.cpp | 35 +----- .../J3DGraphLoader/J3DMaterialFactory.cpp | 102 +---------------- .../J3DGraphLoader/J3DShapeFactory.cpp | 36 ++---- src/JSystem/JAudio/JASBNKParser.cpp | 52 +-------- src/JSystem/JAudio/JASWSParser.cpp | 44 +------- src/d/actor/d_a_grid.cpp | 20 +--- src/d/d_bg_w.cpp | 39 +++---- src/d/d_cc_mass_s.cpp | 11 +- src/d/d_detect.cpp | 11 +- src/d/d_flower.cpp | 15 ++- src/d/d_grass.cpp | 15 ++- src/d/d_msg.cpp | 30 +++-- src/d/d_salvage.cpp | 12 +- src/d/d_timer.cpp | 27 +++-- src/d/d_tree.cpp | 17 ++- src/d/d_wood.cpp | 3 +- 32 files changed, 391 insertions(+), 474 deletions(-) create mode 100644 include/d/d_msg.h create mode 100644 include/d/d_salvage.h diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index 7fc159247..7e2549f1a 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -133,6 +133,18 @@ private: /* 0x4C */ J3DNBTScale mNBTScale; }; // Size: 0x5C +class J3DTexGenBlockNull : public J3DTexGenBlock { +public: + virtual void calc(f32 const (*)[4]) {} + virtual void load() {} + virtual void patch() {} + virtual void diff(u32) {} + virtual void diffTexMtx() {} + virtual void diffTexGen() {} + virtual u32 getType() { return 'TGNL'; } + virtual ~J3DTexGenBlockNull() {} +}; + class J3DTevBlock { public: virtual void reset(J3DTevBlock*) {} @@ -258,6 +270,13 @@ private: }; // Size: 0xD8 class J3DTevBlockNull : public J3DTevBlock { +public: + virtual void reset(J3DTevBlock*) {} + virtual void ptrToIndex() {} + virtual void indexToPtr() {} + virtual u32 getType() { return 'TVNL'; } + virtual ~J3DTevBlockNull() {} + void initialize(); }; @@ -787,6 +806,13 @@ private: /* 0x0F */ u8 mDither; }; // Size: 0x10 +class J3DPEBlockNull : public J3DPEBlock { +public: + virtual void load() {} + virtual u32 getType() { return 'PENL'; } + virtual ~J3DPEBlockNull() {} +}; + struct J3DIndTexCoordScale : public J3DIndTexCoordScaleInfo { J3DIndTexCoordScale() { *(J3DIndTexCoordScaleInfo*)this = j3dDefaultIndTexCoordScaleInfo; } ~J3DIndTexCoordScale() {} @@ -1080,6 +1106,12 @@ protected: /* 0x20 */ J3DGXColor mAmbColor[2]; }; // Size: 0x28 +class J3DColorBlockNull : public J3DColorBlock { +public: + virtual u32 getType() { return 'CLNL'; } + virtual ~J3DColorBlockNull() {} +}; + extern int SizeOfJ3DColorBlockAmbientOnLoad; #endif /* J3DMATBLOCK_H */ diff --git a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h index 9acc44d81..187672011 100644 --- a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h @@ -6,11 +6,85 @@ enum J3DAnmLoaderDataBaseFlag { J3DLOADER_UNK_FLAG0 }; class J3DAnmBase; +class J3DAnmClusterFull; +class J3DAnmClusterFullData; +class J3DAnmClusterKey; +class J3DAnmClusterKeyData; +class J3DAnmColorFull; +class J3DAnmColorFullData; +class J3DAnmColorKey; +class J3DAnmColorKeyData; +class J3DAnmTevRegKey; +class J3DAnmTevRegKeyData; +class J3DAnmTexPattern; +class J3DAnmTexPatternFullData; +class J3DAnmTextureSRTKey; +class J3DAnmTextureSRTKeyData; +class J3DAnmTransformFull; +class J3DAnmTransformFullData; +class J3DAnmTransformKey; +class J3DAnmTransformKeyData; +class J3DAnmVisibilityFull; +class J3DAnmVisibilityFullData; +class J3DAnmVtxColorFull; +class J3DAnmVtxColorFullData; +class J3DAnmVtxColorKey; +class J3DAnmVtxColorKeyData; struct J3DAnmLoaderDataBase { - static void* load(void const*, J3DAnmLoaderDataBaseFlag); - static void* load(void const*); - static void setResource(J3DAnmBase*, void const*); + static void* load(const void*); + static void setResource(J3DAnmBase*, const void*); +}; + +class J3DAnmLoader { +public: + virtual void* load(const void*) = 0; + virtual void setResource(J3DAnmBase*, const void*) = 0; + virtual ~J3DAnmLoader() {} +}; + +class J3DAnmFullLoader_v15 : public J3DAnmLoader { +public: + J3DAnmFullLoader_v15(); + ~J3DAnmFullLoader_v15(); + void* load(const void*); + void setResource(J3DAnmBase*, const void*); + void readAnmTransform(const J3DAnmTransformFullData*); + void setAnmTransform(J3DAnmTransformFull*, const J3DAnmTransformFullData*); + void readAnmColor(const J3DAnmColorFullData*); + void setAnmColor(J3DAnmColorFull*, const J3DAnmColorFullData*); + void readAnmTexPattern(const J3DAnmTexPatternFullData*); + void setAnmTexPattern(J3DAnmTexPattern*, const J3DAnmTexPatternFullData*); + void readAnmVisibility(const J3DAnmVisibilityFullData*); + void setAnmVisibility(J3DAnmVisibilityFull*, const J3DAnmVisibilityFullData*); + void readAnmCluster(const J3DAnmClusterFullData*); + void setAnmCluster(J3DAnmClusterFull*, const J3DAnmClusterFullData*); + void readAnmVtxColor(const J3DAnmVtxColorFullData*); + void setAnmVtxColor(J3DAnmVtxColorFull*, const J3DAnmVtxColorFullData*); + + void* field_0x4; +}; + +class J3DAnmKeyLoader_v15 : public J3DAnmLoader { +public: + J3DAnmKeyLoader_v15(); + ~J3DAnmKeyLoader_v15(); + void* load(const void*); + void setResource(J3DAnmBase*, const void*); + void readAnmTransform(const J3DAnmTransformKeyData*); + void setAnmTransform(J3DAnmTransformKey*, const J3DAnmTransformKeyData*); + void readAnmTextureSRT(const J3DAnmTextureSRTKeyData*); + void setAnmTextureSRT(J3DAnmTextureSRTKey*, const J3DAnmTextureSRTKeyData*); + void readAnmColor(const J3DAnmColorKeyData*); + void setAnmColor(J3DAnmColorKey*, const J3DAnmColorKeyData*); + void readAnmCluster(const J3DAnmClusterKeyData*); + void setAnmCluster(J3DAnmClusterKey*, const J3DAnmClusterKeyData*); + void readAnmTevReg(const J3DAnmTevRegKeyData*); + void setAnmTevReg(J3DAnmTevRegKey*, const J3DAnmTevRegKeyData*); + void readAnmVtxColor(const J3DAnmVtxColorKeyData*); + void setAnmVtxColor(J3DAnmVtxColorKey*, const J3DAnmVtxColorKeyData*); + + void* field_0x4; }; #endif /* J3DANMLOADER_H */ diff --git a/include/JSystem/J3DGraphLoader/J3DClusterLoader.h b/include/JSystem/J3DGraphLoader/J3DClusterLoader.h index bfe8d1df7..ef81cf3d5 100644 --- a/include/JSystem/J3DGraphLoader/J3DClusterLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DClusterLoader.h @@ -1,9 +1,24 @@ #ifndef J3DCLUSTERLOADER_H #define J3DCLUSTERLOADER_H +class J3DClusterBlock; struct J3DClusterLoaderDataBase { - static void* load(void const*); + static void* load(const void*); +}; + +class J3DClusterLoader { +public: + virtual void* load(const void*) = 0; + virtual ~J3DClusterLoader() {} +}; + +class J3DClusterLoader_v15 : public J3DClusterLoader { +public: + J3DClusterLoader_v15(); + ~J3DClusterLoader_v15(); + void* load(const void*); + void readCluster(const J3DClusterBlock*); }; #endif /* J3DCLUSTERLOADER_H */ diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h index b2cf98369..c0f909891 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h +++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h @@ -4,8 +4,8 @@ #include "dolphin/types.h" class J3DMaterial; -class J3DMaterialBlock; -class J3DMaterialDLBlock; +struct J3DMaterialBlock; +struct J3DMaterialDLBlock; class J3DMaterialFactory { public: diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h index febd19f30..7ad0ba513 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h +++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h @@ -1,9 +1,11 @@ #ifndef J3DMATERIALFACTORY_V21_H #define J3DMATERIALFACTORY_V21_H -#include "dolphin/types.h" +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" class J3DMaterial; +struct J3DMaterialBlock_v21; class J3DMaterialInitData_v21; class J3DIndInitData; class J3DColorChanInfo; diff --git a/include/JSystem/JAudio/JASBNKParser.h b/include/JSystem/JAudio/JASBNKParser.h index 89ceff910..91c5fbd92 100644 --- a/include/JSystem/JAudio/JASBNKParser.h +++ b/include/JSystem/JAudio/JASBNKParser.h @@ -18,7 +18,7 @@ namespace JASystem { TBasicBank* createBasicBank(void*); void findOscPtr(JASystem::TBasicBank*, JASystem::BNKParser::THeader*, JASystem::BNKParser::TOsc*); - void getOscTableEndPtr(short*); + void getOscTableEndPtr(s16*); }; } diff --git a/include/d/actor/d_a_grid.h b/include/d/actor/d_a_grid.h index e53a71c94..4fbb11116 100644 --- a/include/d/actor/d_a_grid.h +++ b/include/d/actor/d_a_grid.h @@ -3,6 +3,15 @@ #include "f_op/f_op_actor.h" +class daHo_packet_c { +public: + void setBackNrm(); + void setNrmMtx(cXyz&); + void setNrmVtx(cXyz*, int, int); + void setTopNrmVtx(cXyz*); + void draw(); +}; + class daGrid_c : public fopAc_ac_c { public: void force_calc_wind_rel_angle(short) {} @@ -16,4 +25,11 @@ public: /* Place member variables here */ }; +class daHo_HIO_c { +public: + virtual ~daHo_HIO_c() {} + + u8 field_0x4[0xa4 - 0x04]; +}; + #endif /* D_A_GRID_H */ diff --git a/include/d/d_cc_mass_s.h b/include/d/d_cc_mass_s.h index 18b52c2a2..ec2c3ef65 100644 --- a/include/d/d_cc_mass_s.h +++ b/include/d/d_cc_mass_s.h @@ -79,6 +79,7 @@ public: u32 Chk(cXyz* p_xyz, fopAc_ac_c** p_actor, dCcMassS_HitInf* p_hitInf); void Clear(); void Set(cCcD_Obj* p_obj, u8 priority); + void SetAreaChk(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32)); void SetCam(cM3dGCps const& cps); u8 GetResultCam() const; void GetCamTopPos(Vec* p_out); @@ -86,4 +87,4 @@ public: STATIC_ASSERT(sizeof(dCcMassS_Mng) == 0x1A0); -#endif /* D_CC_D_CC_MASS_S_H */ \ No newline at end of file +#endif /* D_CC_D_CC_MASS_S_H */ diff --git a/include/d/d_detect.h b/include/d/d_detect.h index bb449da33..f182a8bc2 100644 --- a/include/d/d_detect.h +++ b/include/d/d_detect.h @@ -5,6 +5,10 @@ class dDetectPlace_c { public: + dDetectPlace_c(); + ~dDetectPlace_c(); + void chk_enable() const; + /* 0x00 */ cXyz mPos; /* 0x0C */ s16 mEnable; }; @@ -26,4 +30,4 @@ public: /* 0x10 */ s16 mTimer; }; // Size: 0x14 -#endif /* D_D_DETECT_H */ \ No newline at end of file +#endif /* D_D_DETECT_H */ diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 6ec76b6a3..d66a99c52 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -75,6 +75,26 @@ public: class dDlst_2DM_c : public dDlst_base_c { public: virtual void draw(); + + s16 field_0x4; + s16 field_0x6; + s16 field_0x8; + s16 field_0xa; + u8 field_0xc; + GXColor field_0xd; + GXColor field_0x11; + void* field_0x18; + short field_0x1c; + u16 field_0x1e; + u16 field_0x20; + s16 field_0x22; + s16 field_0x24; + void* field_0x28; + short field_0x2c; + u16 field_0x2e; + u16 field_0x30; + s16 field_0x32; + s16 field_0x34; }; class dDlst_2Dm_c : public dDlst_base_c { diff --git a/include/d/d_msg.h b/include/d/d_msg.h new file mode 100644 index 000000000..e3fe83e29 --- /dev/null +++ b/include/d/d_msg.h @@ -0,0 +1,30 @@ + +#ifndef D_MSG_H +#define D_MSG_H + +#include "d/d_drawlist.h" + +class msg_class; +class sub_msg_class; + +class dDlst_2DMSG_c : public dDlst_base_c { +public: + virtual ~dDlst_2DMSG_c(); + virtual void draw(); + void outFontDraw(); + + msg_class* field_0x4; +}; + +class dDlst_2Dtact_c : public dDlst_base_c { +public: + virtual ~dDlst_2Dtact_c(); + virtual void draw(); + + u8 field_0x4[4]; + void* field_0x8; +}; + +extern JKRHeap* dMsg_getAgbWorkArea(); + +#endif /* D_MSG_H */ diff --git a/include/d/d_salvage.h b/include/d/d_salvage.h new file mode 100644 index 000000000..e630c35c7 --- /dev/null +++ b/include/d/d_salvage.h @@ -0,0 +1,41 @@ +#ifndef D_SALVAGE_H +#define D_SALVAGE_H + +#include "SSystem/SComponent/c_xyz.h" + +class JPABaseEmitter; +class fopAc_ac_c; + +class dSalvage_control_c { +public: + void init(); + void init_end(); + void entry(fopAc_ac_c*, JPABaseEmitter*); + void init_room(s8); + void init_one(int); + void init_one_sub(int); + void calcDistanceXZ(); + void getPos(int); + void getPosP(int); + void getScale(int); + void getR(int); + void getH(int); + void getRoomNo(int); + void getItemNo(int); + void getSwitchNo(int); + void getSaveNo(int); + void getType(int); + void getKind(int); + void getDistance(int); + void getAlphaPtr(int); + void getDrawMode(int); + void checkRegist(int); + void checkUsed(int); + void setPos(int, cXyz); + void setFlag(int, u8); + void clrFlag(int, u8); + void setNowAlpha(int, u8); + void setDrawMode(int, int); +}; + +#endif /* D_SALVAGE_H */ diff --git a/include/d/d_timer.h b/include/d/d_timer.h index 56436c102..e3b628904 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -4,7 +4,27 @@ #include "SSystem/SComponent/c_phase.h" #include "f_op/f_op_msg_mng.h" -class dDlst_TimerScrnDraw_c; +class J2DPane; +class JKRArchive; + +class dDlst_TimerScrnDraw_c { +public: + ~dDlst_TimerScrnDraw_c(); + void setScreen(const char*, JKRArchive*); + void changeNumberTexture(J2DPane*, int); + void getNumber(int); + void setTimer(int); + void setRupee(s16); + void setPaneInitialPos(fopMsgM_pane_class*, f32, f32); + void setTimerPos(f32, f32); + void setRupeePos(f32, f32); + void setShowType(u8); + void setIconType(void*, u8); + void anime(); + void closeAnime(); + void hide(); + void draw(); +}; class dTimer_c { public: @@ -37,4 +57,4 @@ public: /* 0x170 */ JKRHeap* mpSolidHeap; }; -#endif /* D_TIMER_H */ \ No newline at end of file +#endif /* D_TIMER_H */ diff --git a/include/d/d_tree.h b/include/d/d_tree.h index 5e71fc140..42469687a 100644 --- a/include/d/d_tree.h +++ b/include/d/d_tree.h @@ -5,6 +5,10 @@ #include "dolphin/mtx/mtx.h" #include "JSystem/J3DGraphBase/J3DPacket.h" +class cCcD_Obj; +class dCcMassS_HitInf; +class fopAc_ac_c; + class dTree_data_c { public: ~dTree_data_c(); @@ -15,7 +19,7 @@ public: void WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*); void hitCheck(fopAc_ac_c*, int); void animation(int); - + /* 0x000 */ u8 field_0x000; /* 0x001 */ u8 field_0x001; /* 0x002 */ u8 mAnimIdx; @@ -85,4 +89,4 @@ public: /* 0x673C */ cXyz field_0x673c; }; -#endif /* D_TREE_H */ \ No newline at end of file +#endif /* D_TREE_H */ diff --git a/include/d/d_wood.h b/include/d/d_wood.h index c7dba1573..cf20017e2 100644 --- a/include/d/d_wood.h +++ b/include/d/d_wood.h @@ -10,11 +10,13 @@ class cCcD_Obj; class fopAc_ac_c; namespace dWood { +enum AnmID_e {}; class Anm_c; class Packet_c; class Unit_c { public: Unit_c(); + ~Unit_c(); void set_ground(); void set_mtx(Anm_c*); @@ -40,7 +42,6 @@ STATIC_ASSERT(sizeof(Unit_c) == 0x18C); class Anm_c { public: enum Mode_e {}; - enum AnmID_e {}; Anm_c(); void play(Packet_c*); @@ -99,4 +100,4 @@ public: STATIC_ASSERT(sizeof(Packet_c) == 0x15DD0); }; // namespace dWood -#endif /* D_WOOD_H */ \ No newline at end of file +#endif /* D_WOOD_H */ diff --git a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp index 8cdb84241..309896b10 100644 --- a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp @@ -4,10 +4,10 @@ // #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" -#include "dolphin/types.h" +#include "JSystem/J3DGraphAnimator/J3DAnimation.h" /* 802FEDA0-802FF6C8 .text load__20J3DAnmLoaderDataBaseFPCv */ -void J3DAnmLoaderDataBase::load(const void*) { +void* J3DAnmLoaderDataBase::load(const void*) { /* Nonmatching */ } @@ -17,27 +17,19 @@ void J3DAnmLoaderDataBase::setResource(J3DAnmBase*, const void*) { } /* 802FF9EC-802FFA08 .text __ct__20J3DAnmFullLoader_v15Fv */ -J3DAnmFullLoader_v15::J3DAnmFullLoader_v15() { - /* Nonmatching */ -} +J3DAnmFullLoader_v15::J3DAnmFullLoader_v15() {} /* 802FFA08-802FFA64 .text __dt__20J3DAnmFullLoader_v15Fv */ -J3DAnmFullLoader_v15::~J3DAnmFullLoader_v15() { - /* Nonmatching */ -} +J3DAnmFullLoader_v15::~J3DAnmFullLoader_v15() {} /* 802FFA64-802FFA80 .text __ct__19J3DAnmKeyLoader_v15Fv */ -J3DAnmKeyLoader_v15::J3DAnmKeyLoader_v15() { - /* Nonmatching */ -} +J3DAnmKeyLoader_v15::J3DAnmKeyLoader_v15() {} /* 802FFA80-802FFADC .text __dt__19J3DAnmKeyLoader_v15Fv */ -J3DAnmKeyLoader_v15::~J3DAnmKeyLoader_v15() { - /* Nonmatching */ -} +J3DAnmKeyLoader_v15::~J3DAnmKeyLoader_v15() {} /* 802FFADC-802FFC28 .text load__20J3DAnmFullLoader_v15FPCv */ -void J3DAnmFullLoader_v15::load(const void*) { +void* J3DAnmFullLoader_v15::load(const void*) { /* Nonmatching */ } @@ -107,7 +99,7 @@ void J3DAnmFullLoader_v15::setAnmVtxColor(J3DAnmVtxColorFull*, const J3DAnmVtxCo } /* 80300318-80300464 .text load__19J3DAnmKeyLoader_v15FPCv */ -void J3DAnmKeyLoader_v15::load(const void*) { +void* J3DAnmKeyLoader_v15::load(const void*) { /* Nonmatching */ } @@ -175,83 +167,3 @@ void J3DAnmKeyLoader_v15::readAnmVtxColor(const J3DAnmVtxColorKeyData*) { void J3DAnmKeyLoader_v15::setAnmVtxColor(J3DAnmVtxColorKey*, const J3DAnmVtxColorKeyData*) { /* Nonmatching */ } - -/* 80300DC4-80300E20 .text __dt__20J3DAnmVisibilityFullFv */ -J3DAnmVisibilityFull::~J3DAnmVisibilityFull() { - /* Nonmatching */ -} - -/* 80300E20-80300EA8 .text __dt__15J3DAnmTevRegKeyFv */ -J3DAnmTevRegKey::~J3DAnmTevRegKey() { - /* Nonmatching */ -} - -/* 80300EA8-80300EF0 .text __dt__12J3DAnmLoaderFv */ -J3DAnmLoader::~J3DAnmLoader() { - /* Nonmatching */ -} - -/* 80300EF0-80300F08 .text JSUConvertOffsetToPtr<18J3DAnmKRegKeyTable>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 80300F08-80300F20 .text JSUConvertOffsetToPtr<18J3DAnmCRegKeyTable>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 80300F20-80300F38 .text JSUConvertOffsetToPtr<21J3DAnmClusterKeyTable>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 80300F38-80300F50 .text JSUConvertOffsetToPtr<19J3DAnmColorKeyTable>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 80300F50-80300F68 .text JSUConvertOffsetToPtr<3Vec>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 80300F68-80300F80 .text JSUConvertOffsetToPtr<23J3DAnmTransformKeyTable>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 80300F80-80300F98 .text JSUConvertOffsetToPtr<23J3DAnmVtxColorIndexData>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 80300F98-80300FB0 .text JSUConvertOffsetToPtr<22J3DAnmClusterFullTable>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 80300FB0-80300FC8 .text JSUConvertOffsetToPtr<25J3DAnmVisibilityFullTable>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 80300FC8-80300FE0 .text JSUConvertOffsetToPtr<25J3DAnmTexPatternFullTable>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 80300FE0-80300FF8 .text JSUConvertOffsetToPtr<20J3DAnmColorFullTable>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 80300FF8-80301010 .text JSUConvertOffsetToPtr__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 80301010-80301028 .text JSUConvertOffsetToPtr<24J3DAnmTransformFullTable>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp index 6d2c612fb..85f9c06bb 100644 --- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp @@ -4,10 +4,9 @@ // #include "JSystem/J3DGraphLoader/J3DClusterLoader.h" -#include "dolphin/types.h" /* 802FB04C-802FB0E8 .text load__24J3DClusterLoaderDataBaseFPCv */ -void J3DClusterLoaderDataBase::load(const void*) { +void* J3DClusterLoaderDataBase::load(const void*) { /* Nonmatching */ } @@ -22,7 +21,7 @@ J3DClusterLoader_v15::~J3DClusterLoader_v15() { } /* 802FB160-802FB21C .text load__20J3DClusterLoader_v15FPCv */ -void J3DClusterLoader_v15::load(const void*) { +void* J3DClusterLoader_v15::load(const void*) { /* Nonmatching */ } @@ -30,33 +29,3 @@ void J3DClusterLoader_v15::load(const void*) { void J3DClusterLoader_v15::readCluster(const J3DClusterBlock*) { /* Nonmatching */ } - -/* 802FB698-802FB6E0 .text __dt__16J3DClusterLoaderFv */ -J3DClusterLoader::~J3DClusterLoader() { - /* Nonmatching */ -} - -/* 802FB6E0-802FB6F8 .text JSUConvertOffsetToPtr<16J3DClusterVertex>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 802FB6F8-802FB710 .text JSUConvertOffsetToPtr<13J3DClusterKey>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 802FB710-802FB728 .text JSUConvertOffsetToPtr<10J3DCluster>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 802FB728-802FB740 .text JSUConvertOffsetToPtr__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} - -/* 802FB740-802FB758 .text JSUConvertOffsetToPtr<7ResNTAB>__FPCvPCv */ -void JSUConvertOffsetToPtr(const void*, const void*) { - /* Nonmatching */ -} diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp index a820a278c..e542244db 100644 --- a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp +++ b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp @@ -4,7 +4,7 @@ // #include "JSystem/J3DGraphLoader/J3DMaterialFactory.h" -#include "dolphin/types.h" +#include "JSystem/J3DGraphBase/J3DMatBlock.h" /* 802F68F0-802F6B38 .text __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock */ J3DMaterialFactory::J3DMaterialFactory(const J3DMaterialBlock&) { @@ -210,103 +210,3 @@ void J3DMaterialFactory::newDither(int) const { void J3DMaterialFactory::newNBTScale(int) const { /* Nonmatching */ } - -/* 802F95B8-802F95BC .text load__14J3DPEBlockNullFv */ -void J3DPEBlockNull::load() { - /* Nonmatching */ -} - -/* 802F95BC-802F95C8 .text getType__14J3DPEBlockNullFv */ -void J3DPEBlockNull::getType() { - /* Nonmatching */ -} - -/* 802F95C8-802F9624 .text __dt__14J3DPEBlockNullFv */ -J3DPEBlockNull::~J3DPEBlockNull() { - /* Nonmatching */ -} - -/* 802F9624-802F9628 .text reset__15J3DTevBlockNullFP11J3DTevBlock */ -void J3DTevBlockNull::reset(J3DTevBlock*) { - /* Nonmatching */ -} - -/* 802F9628-802F962C .text ptrToIndex__15J3DTevBlockNullFv */ -void J3DTevBlockNull::ptrToIndex() { - /* Nonmatching */ -} - -/* 802F962C-802F9650 .text indexToPtr__15J3DTevBlockNullFv */ -void J3DTevBlockNull::indexToPtr() { - /* Nonmatching */ -} - -/* 802F9650-802F965C .text getType__15J3DTevBlockNullFv */ -void J3DTevBlockNull::getType() { - /* Nonmatching */ -} - -/* 802F965C-802F96B8 .text __dt__15J3DTevBlockNullFv */ -J3DTevBlockNull::~J3DTevBlockNull() { - /* Nonmatching */ -} - -/* 802F96B8-802F96BC .text calc__18J3DTexGenBlockNullFPA4_Cf */ -void J3DTexGenBlockNull::calc(const float(*)[4]) { - /* Nonmatching */ -} - -/* 802F96BC-802F96C0 .text load__18J3DTexGenBlockNullFv */ -void J3DTexGenBlockNull::load() { - /* Nonmatching */ -} - -/* 802F96C0-802F96C4 .text patch__18J3DTexGenBlockNullFv */ -void J3DTexGenBlockNull::patch() { - /* Nonmatching */ -} - -/* 802F96C4-802F96C8 .text diff__18J3DTexGenBlockNullFUl */ -void J3DTexGenBlockNull::diff(unsigned long) { - /* Nonmatching */ -} - -/* 802F96C8-802F96CC .text diffTexMtx__18J3DTexGenBlockNullFv */ -void J3DTexGenBlockNull::diffTexMtx() { - /* Nonmatching */ -} - -/* 802F96CC-802F96D0 .text diffTexGen__18J3DTexGenBlockNullFv */ -void J3DTexGenBlockNull::diffTexGen() { - /* Nonmatching */ -} - -/* 802F96D0-802F96DC .text getType__18J3DTexGenBlockNullFv */ -void J3DTexGenBlockNull::getType() { - /* Nonmatching */ -} - -/* 802F96DC-802F9738 .text __dt__18J3DTexGenBlockNullFv */ -J3DTexGenBlockNull::~J3DTexGenBlockNull() { - /* Nonmatching */ -} - -/* 802F9738-802F9744 .text getType__17J3DColorBlockNullFv */ -void J3DColorBlockNull::getType() { - /* Nonmatching */ -} - -/* 802F9744-802F97A0 .text __dt__17J3DColorBlockNullFv */ -J3DColorBlockNull::~J3DColorBlockNull() { - /* Nonmatching */ -} - -/* 802F97A0-802F9800 .text __ct__11J3DTevStageFRC15J3DTevStageInfo */ -J3DTevStage::J3DTevStage(const J3DTevStageInfo&) { - /* Nonmatching */ -} - -/* 802F9800-802F9848 .text __dt__11J3DMaterialFv */ -J3DMaterial::~J3DMaterial() { - /* Nonmatching */ -} diff --git a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp index f790b3ace..9eeb74d45 100644 --- a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp +++ b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp @@ -4,7 +4,7 @@ // #include "JSystem/J3DGraphLoader/J3DShapeFactory.h" -#include "dolphin/types.h" +#include "dolphin/gx/GXAttr.h" /* 802FE3A8-802FE458 .text __ct__15J3DShapeFactoryFRC13J3DShapeBlock */ J3DShapeFactory::J3DShapeFactory(const J3DShapeBlock&) { @@ -12,56 +12,36 @@ J3DShapeFactory::J3DShapeFactory(const J3DShapeBlock&) { } /* 802FE458-802FE614 .text create__15J3DShapeFactoryFiUlP14_GXVtxDescList */ -void J3DShapeFactory::create(int, unsigned long, _GXVtxDescList*) { +J3DShape* J3DShapeFactory::create(int, u32, GXVtxDescList*) { /* Nonmatching */ } /* 802FE614-802FEA40 .text newShapeMtx__15J3DShapeFactoryCFUlii */ -void J3DShapeFactory::newShapeMtx(unsigned long, int, int) const { +J3DShapeMtx* J3DShapeFactory::newShapeMtx(u32, int, int) const { /* Nonmatching */ } /* 802FEA40-802FEACC .text newShapeDraw__15J3DShapeFactoryCFii */ -void J3DShapeFactory::newShapeDraw(int, int) const { +J3DShapeDraw* J3DShapeFactory::newShapeDraw(int, int) const { /* Nonmatching */ } /* 802FEACC-802FEB38 .text allocVcdVatCmdBuffer__15J3DShapeFactoryFUl */ -void J3DShapeFactory::allocVcdVatCmdBuffer(unsigned long) { +void J3DShapeFactory::allocVcdVatCmdBuffer(u32) { /* Nonmatching */ } /* 802FEB38-802FEBCC .text calcSize__15J3DShapeFactoryFiUl */ -void J3DShapeFactory::calcSize(int, unsigned long) { +s32 J3DShapeFactory::calcSize(int, u32) { /* Nonmatching */ } /* 802FEBCC-802FEBDC .text calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl */ -void J3DShapeFactory::calcSizeVcdVatCmdBuffer(unsigned long) { +s32 J3DShapeFactory::calcSizeVcdVatCmdBuffer(u32) { /* Nonmatching */ } /* 802FEBDC-802FED40 .text calcSizeShapeMtx__15J3DShapeFactoryCFUlii */ -void J3DShapeFactory::calcSizeShapeMtx(unsigned long, int, int) const { - /* Nonmatching */ -} - -/* 802FED40-802FED58 .text JSUConvertOffsetToPtr<20J3DShapeDrawInitData>__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 802FED58-802FED70 .text JSUConvertOffsetToPtr<19J3DShapeMtxInitData>__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 802FED70-802FED88 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 802FED88-802FEDA0 .text JSUConvertOffsetToPtr<14_GXVtxDescList>__FPCvUl */ -void JSUConvertOffsetToPtr<_GXVtxDescList>(const void*, unsigned long) { +s32 J3DShapeFactory::calcSizeShapeMtx(u32, int, int) const { /* Nonmatching */ } diff --git a/src/JSystem/JAudio/JASBNKParser.cpp b/src/JSystem/JAudio/JASBNKParser.cpp index 8b655ee44..223d63518 100644 --- a/src/JSystem/JAudio/JASBNKParser.cpp +++ b/src/JSystem/JAudio/JASBNKParser.cpp @@ -3,11 +3,11 @@ // Translation Unit: JASBNKParser.cpp // -#include "JASBNKParser.h" +#include "JSystem/JAudio/JASBNKParser.h" #include "dolphin/types.h" /* 802870F0-802879A0 .text createBasicBank__Q28JASystem9BNKParserFPv */ -void JASystem::BNKParser::createBasicBank(void*) { +JASystem::TBasicBank* JASystem::BNKParser::createBasicBank(void*) { /* Nonmatching */ } @@ -17,52 +17,6 @@ void JASystem::BNKParser::findOscPtr(JASystem::TBasicBank*, JASystem::BNKParser: } /* 80287AEC-80287B00 .text getOscTableEndPtr__Q28JASystem9BNKParserFPs */ -void JASystem::BNKParser::getOscTableEndPtr(short*) { +void JASystem::BNKParser::getOscTableEndPtr(s16*) { /* Nonmatching */ } - -/* 80287B00-80287B18 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 80287B18-80287B30 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 80287B30-80287B48 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 80287B48-80287B60 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 80287B60-80287B78 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 80287B78-80287B90 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 80287B90-80287BA8 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 80287BA8-80287BC0 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 80287BC0-80287BD8 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - diff --git a/src/JSystem/JAudio/JASWSParser.cpp b/src/JSystem/JAudio/JASWSParser.cpp index e9c4135b1..95f0b5308 100644 --- a/src/JSystem/JAudio/JASWSParser.cpp +++ b/src/JSystem/JAudio/JASWSParser.cpp @@ -3,56 +3,20 @@ // Translation Unit: JASWSParser.cpp // -#include "JASWSParser.h" +#include "JSystem/JAudio/JASWSParser.h" #include "dolphin/types.h" /* 80286BF4-80286C1C .text getGroupCount__Q28JASystem8WSParserFPv */ -void JASystem::WSParser::getGroupCount(void*) { +u32 JASystem::WSParser::getGroupCount(void*) { /* Nonmatching */ } /* 80286C1C-80286E38 .text createBasicWaveBank__Q28JASystem8WSParserFPv */ -void JASystem::WSParser::createBasicWaveBank(void*) { +JASystem::TBasicWaveBank* JASystem::WSParser::createBasicWaveBank(void*) { /* Nonmatching */ } /* 80286E38-80287048 .text createSimpleWaveBank__Q28JASystem8WSParserFPv */ -void JASystem::WSParser::createSimpleWaveBank(void*) { +JASystem::TSimpleWaveBank* JASystem::WSParser::createSimpleWaveBank(void*) { /* Nonmatching */ } - -/* 80287048-80287060 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 80287060-80287078 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 80287078-80287090 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 80287090-802870A8 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 802870A8-802870C0 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 802870C0-802870D8 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - -/* 802870D8-802870F0 .text JSUConvertOffsetToPtr__FPCvUl */ -void JSUConvertOffsetToPtr(const void*, unsigned long) { - /* Nonmatching */ -} - diff --git a/src/d/actor/d_a_grid.cpp b/src/d/actor/d_a_grid.cpp index 4876a6000..02de18142 100644 --- a/src/d/actor/d_a_grid.cpp +++ b/src/d/actor/d_a_grid.cpp @@ -4,7 +4,9 @@ // #include "d/actor/d_a_grid.h" -#include "dolphin/types.h" +#include "JSystem/J3DGraphBase/J3DPacket.h" + +static daHo_HIO_c l_HIO; /* 800E8CC0-800E8D48 .text setBackNrm__13daHo_packet_cFv */ void daHo_packet_c::setBackNrm() { @@ -80,19 +82,3 @@ BOOL daGrid_c::_execute() { BOOL daGrid_c::_draw() { /* Nonmatching */ } - -/* 800EB328-800EB388 .text entry__12J3DMatPacketFP13J3DDrawBuffer */ -void J3DMatPacket::entry(J3DDrawBuffer*) { - /* Nonmatching */ -} - -/* 800EB4D0-800EB520 .text __dt__10daHo_HIO_cFv */ -daHo_HIO_c::~daHo_HIO_c() { - /* Nonmatching */ -} - -/* 800EB5D8-800EB60C .text Eye__9dCamera_cFv */ -void dCamera_c::Eye() { - /* Nonmatching */ -} - diff --git a/src/d/d_bg_w.cpp b/src/d/d_bg_w.cpp index 51bd016d1..5f6e371d1 100644 --- a/src/d/d_bg_w.cpp +++ b/src/d/d_bg_w.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_bg_w.cpp // -#include "d_bg_w.h" +#include "d/d_bg_w.h" #include "dolphin/types.h" /* 800A5C3C-800A5CA8 .text __ct__4dBgWFv */ @@ -17,12 +17,12 @@ void dBgW::Move() { } /* 800A5CD4-800A5E64 .text positionWallCorrect__4dBgWFP9dBgS_AcchfR8cM3dGPlaP4cXyzf */ -void dBgW::positionWallCorrect(dBgS_Acch*, float, cM3dGPla&, cXyz*, float) { +void dBgW::positionWallCorrect(dBgS_Acch*, f32, cM3dGPla&, cXyz*, f32) { /* Nonmatching */ } /* 800A5E64-800A6DF8 .text RwgWallCorrect__4dBgWFP9dBgS_AcchUs */ -void dBgW::RwgWallCorrect(dBgS_Acch*, unsigned short) { +void dBgW::RwgWallCorrect(dBgS_Acch*, u16) { /* Nonmatching */ } @@ -37,7 +37,7 @@ void dBgW::WallCorrectGrpRp(dBgS_Acch*, int, int) { } /* 800A7120-800A72E0 .text RwgRoofChk__4dBgWFUsP12dBgS_RoofChk */ -void dBgW::RwgRoofChk(unsigned short, dBgS_RoofChk*) { +void dBgW::RwgRoofChk(u16, dBgS_RoofChk*) { /* Nonmatching */ } @@ -52,7 +52,7 @@ bool dBgW::RoofChkGrpRp(dBgS_RoofChk*, int, int) { } /* 800A767C-800A783C .text RwgSplGrpChk__4dBgWFUsP14dBgS_SplGrpChk */ -void dBgW::RwgSplGrpChk(unsigned short, dBgS_SplGrpChk*) { +void dBgW::RwgSplGrpChk(u16, dBgS_SplGrpChk*) { /* Nonmatching */ } @@ -67,7 +67,7 @@ bool dBgW::SplGrpChkGrpRp(dBgS_SplGrpChk*, int, int) { } /* 800A7BDC-800A7DCC .text RwgSphChk__4dBgWFUsP11dBgS_SphChkPv */ -void dBgW::RwgSphChk(unsigned short, dBgS_SphChk*, void*) { +void dBgW::RwgSphChk(u16, dBgS_SphChk*, void*) { /* Nonmatching */ } @@ -82,12 +82,12 @@ bool dBgW::SphChkGrpRp(dBgS_SphChk*, void*, int, int) { } /* 800A8158-800A819C .text positionWallCrrPos__4dBgWFR8cM3dGTriP11dBgS_CrrPosP4cXyzff */ -void dBgW::positionWallCrrPos(cM3dGTri&, dBgS_CrrPos*, cXyz*, float, float) { +void dBgW::positionWallCrrPos(cM3dGTri&, dBgS_CrrPos*, cXyz*, f32, f32) { /* Nonmatching */ } /* 800A819C-800A8964 .text RwgWallCrrPos__4dBgWFUsP11dBgS_CrrPos */ -void dBgW::RwgWallCrrPos(unsigned short, dBgS_CrrPos*) { +void dBgW::RwgWallCrrPos(u16, dBgS_CrrPos*) { /* Nonmatching */ } @@ -102,7 +102,7 @@ void dBgW::WallCrrPosGrpRp(dBgS_CrrPos*, int, int) { } /* 800A8C8C-800A8CB4 .text WallCrrPos__4dBgWFP11dBgS_CrrPos */ -void dBgW::WallCrrPos(dBgS_CrrPos*) { +bool dBgW::WallCrrPos(dBgS_CrrPos*) { /* Nonmatching */ } @@ -117,37 +117,26 @@ void dBgW::TransPos(cBgS_PolyInfo&, void*, bool, cXyz*, csXyz*, csXyz*) { } /* 800A8D2C-800A9474 .text ChkPolyThrough__4dBgWFiP16cBgS_PolyPassChk */ -void dBgW::ChkPolyThrough(int, cBgS_PolyPassChk*) { +bool dBgW::ChkPolyThrough(int, cBgS_PolyPassChk*) { /* Nonmatching */ } /* 800A9474-800A9684 .text ChkShdwDrawThrough__4dBgWFiP16cBgS_PolyPassChk */ -void dBgW::ChkShdwDrawThrough(int, cBgS_PolyPassChk*) { +bool dBgW::ChkShdwDrawThrough(int, cBgS_PolyPassChk*) { /* Nonmatching */ } /* 800A9684-800A974C .text ChkGrpThrough__4dBgWFiP15cBgS_GrpPassChki */ -void dBgW::ChkGrpThrough(int, cBgS_GrpPassChk*, int) { +bool dBgW::ChkGrpThrough(int, cBgS_GrpPassChk*, int) { /* Nonmatching */ } /* 800A974C-800A97E4 .text ChangeAttributeCodeByPathPntNo__4dBgWFiUl */ -void dBgW::ChangeAttributeCodeByPathPntNo(int, unsigned long) { +void dBgW::ChangeAttributeCodeByPathPntNo(int, u32) { /* Nonmatching */ } /* 800A97E4-800A986C .text dBgW_NewSet__FP6cBgD_tUlPA3_A4_f */ -void dBgW_NewSet(cBgD_t*, unsigned long, float(*)[3][4]) { +dBgW* dBgW_NewSet(cBgD_t*, u32, f32(*)[3][4]) { /* Nonmatching */ } - -/* 800A986C-800A98C8 .text __dt__8cM3dGTriFv */ -cM3dGTri::~cM3dGTri() { - /* Nonmatching */ -} - -/* 800A98C8-800A9928 .text __dt__4dBgWFv */ -dBgW::~dBgW() { - /* Nonmatching */ -} - diff --git a/src/d/d_cc_mass_s.cpp b/src/d/d_cc_mass_s.cpp index 02f2c2878..c1f12f204 100644 --- a/src/d/d_cc_mass_s.cpp +++ b/src/d/d_cc_mass_s.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_cc_mass_s.cpp // -#include "d_cc_mass_s.h" +#include "d/d_cc_mass_s.h" #include "dolphin/types.h" /* 800AC810-800AC920 .text __ct__12dCcMassS_MngFv */ @@ -22,7 +22,7 @@ void dCcMassS_Mng::Prepare() { } /* 800ACCB8-800AD17C .text Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf */ -void dCcMassS_Mng::Chk(cXyz*, fopAc_ac_c**, dCcMassS_HitInf*) { +u32 dCcMassS_Mng::Chk(cXyz*, fopAc_ac_c**, dCcMassS_HitInf*) { /* Nonmatching */ } @@ -32,12 +32,12 @@ void dCcMassS_Mng::Clear() { } /* 800AD234-800AD310 .text Set__12dCcMassS_MngFP8cCcD_ObjUc */ -void dCcMassS_Mng::Set(cCcD_Obj*, unsigned char) { +void dCcMassS_Mng::Set(cCcD_Obj*, u8) { /* Nonmatching */ } /* 800AD310-800AD384 .text SetAreaChk__12dCcMassS_MngFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v */ -void dCcMassS_Mng::SetAreaChk(cCcD_Obj*, unsigned char, void (*)(fopAc_ac_c*, cXyz*, unsigned long)) { +void dCcMassS_Mng::SetAreaChk(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32)) { /* Nonmatching */ } @@ -47,7 +47,7 @@ void dCcMassS_Mng::SetCam(const cM3dGCps&) { } /* 800AD3D4-800AD3DC .text GetResultCam__12dCcMassS_MngCFv */ -void dCcMassS_Mng::GetResultCam() const { +u8 dCcMassS_Mng::GetResultCam() const { /* Nonmatching */ } @@ -60,4 +60,3 @@ void dCcMassS_Mng::GetCamTopPos(Vec*) { dCcMassS_Obj::dCcMassS_Obj() { /* Nonmatching */ } - diff --git a/src/d/d_detect.cpp b/src/d/d_detect.cpp index 00f2010ce..72d53b28a 100644 --- a/src/d/d_detect.cpp +++ b/src/d/d_detect.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_detect.cpp // -#include "d_detect.h" +#include "d/d_detect.h" #include "dolphin/types.h" /* 8009BFD4-8009BFFC .text __ct__14dDetectPlace_cFv */ @@ -37,7 +37,7 @@ void dDetect_c::proc() { } /* 8009C14C-8009C1E0 .text chk_quake__9dDetect_cCFPC4cXyz */ -void dDetect_c::chk_quake(const cXyz*) const { +bool dDetect_c::chk_quake(const cXyz*) const { /* Nonmatching */ } @@ -47,7 +47,7 @@ void dDetect_c::set_quake(const cXyz*) { } /* 8009C254-8009C32C .text chk_quake_area__9dDetect_cCFPC4cXyz */ -void dDetect_c::chk_quake_area(const cXyz*) const { +bool dDetect_c::chk_quake_area(const cXyz*) const { /* Nonmatching */ } @@ -57,12 +57,11 @@ void dDetect_c::search_tag_light(void*, void*) { } /* 8009C588-8009C5B8 .text chk_light__9dDetect_cCFPC4cXyz */ -void dDetect_c::chk_light(const cXyz*) const { +bool dDetect_c::chk_light(const cXyz*) const { /* Nonmatching */ } /* 8009C5B8-8009C620 .text chk_attention__9dDetect_cCFP4cXyz */ -void dDetect_c::chk_attention(cXyz*) const { +bool dDetect_c::chk_attention(cXyz*) const { /* Nonmatching */ } - diff --git a/src/d/d_flower.cpp b/src/d/d_flower.cpp index 2ae00815a..1af6d530f 100644 --- a/src/d/d_flower.cpp +++ b/src/d/d_flower.cpp @@ -3,21 +3,21 @@ // Translation Unit: d_flower.cpp // -#include "d_flower.h" +#include "d/d_flower.h" #include "dolphin/types.h" /* 800BFA9C-800BFD28 .text WorkCo__14dFlower_data_cFP10fopAc_ac_cUli */ -void dFlower_data_c::WorkCo(fopAc_ac_c*, unsigned long, int) { +void dFlower_data_c::WorkCo(fopAc_ac_c*, u32, int) { /* Nonmatching */ } /* 800BFD28-800C0018 .text WorkAt_NoCutAnim__14dFlower_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInfP8cCcD_Obj */ -void dFlower_data_c::WorkAt_NoCutAnim(fopAc_ac_c*, unsigned long, int, dCcMassS_HitInf*, cCcD_Obj*) { +void dFlower_data_c::WorkAt_NoCutAnim(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*) { /* Nonmatching */ } /* 800C0018-800C0270 .text WorkAt__14dFlower_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInf */ -void dFlower_data_c::WorkAt(fopAc_ac_c*, unsigned long, int, dCcMassS_HitInf*) { +void dFlower_data_c::WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*) { /* Nonmatching */ } @@ -77,12 +77,12 @@ void dFlower_packet_c::update() { } /* 800C0EF4-800C10D4 .text setData__16dFlower_packet_cFP14dFlower_data_ciScR4cXyziSc */ -void dFlower_packet_c::setData(dFlower_data_c*, int, signed char, cXyz&, int, signed char) { +void dFlower_packet_c::setData(dFlower_data_c*, int, s8, cXyz&, int, s8) { /* Nonmatching */ } /* 800C10D4-800C121C .text newData__16dFlower_packet_cFScR4cXyziSc */ -void dFlower_packet_c::newData(signed char, cXyz&, int, signed char) { +void dFlower_packet_c::newData(s8, cXyz&, int, s8) { /* Nonmatching */ } @@ -92,7 +92,6 @@ void dFlower_packet_c::newAnm() { } /* 800C1264-800C1288 .text setAnm__16dFlower_packet_cFis */ -void dFlower_packet_c::setAnm(int, short) { +void dFlower_packet_c::setAnm(int, s16) { /* Nonmatching */ } - diff --git a/src/d/d_grass.cpp b/src/d/d_grass.cpp index 2bf37f188..ba8673e28 100644 --- a/src/d/d_grass.cpp +++ b/src/d/d_grass.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_grass.cpp // -#include "d_grass.h" +#include "d/d_grass.h" #include "dolphin/types.h" /* 80077048-8007712C .text setBatta__FP4cXyzP8_GXColor */ @@ -12,17 +12,17 @@ void setBatta(cXyz*, _GXColor*) { } /* 8007712C-8007734C .text WorkCo__13dGrass_data_cFP10fopAc_ac_cUli */ -void dGrass_data_c::WorkCo(fopAc_ac_c*, unsigned long, int) { +void dGrass_data_c::WorkCo(fopAc_ac_c*, u32, int) { /* Nonmatching */ } /* 8007734C-800775E4 .text WorkAt_NoCutAnim__13dGrass_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInfP8cCcD_Obj */ -void dGrass_data_c::WorkAt_NoCutAnim(fopAc_ac_c*, unsigned long, int, dCcMassS_HitInf*, cCcD_Obj*) { +void dGrass_data_c::WorkAt_NoCutAnim(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*) { /* Nonmatching */ } /* 800775EC-800777CC .text WorkAt__13dGrass_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInf */ -void dGrass_data_c::WorkAt(fopAc_ac_c*, unsigned long, int, dCcMassS_HitInf*) { +void dGrass_data_c::WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*) { /* Nonmatching */ } @@ -82,12 +82,12 @@ void dGrass_packet_c::update() { } /* 800784E8-800785C0 .text setData__15dGrass_packet_cFP13dGrass_data_ciR4cXyziSc */ -void dGrass_packet_c::setData(dGrass_data_c*, int, cXyz&, int, signed char) { +void dGrass_packet_c::setData(dGrass_data_c*, int, cXyz&, int, s8) { /* Nonmatching */ } /* 800785C0-800786FC .text newData__15dGrass_packet_cFR4cXyziSc */ -void dGrass_packet_c::newData(cXyz&, int, signed char) { +void dGrass_packet_c::newData(cXyz&, int, s8) { /* Nonmatching */ } @@ -97,7 +97,6 @@ void dGrass_packet_c::newAnm() { } /* 80078748-80078770 .text setAnm__15dGrass_packet_cFis */ -void dGrass_packet_c::setAnm(int, short) { +void dGrass_packet_c::setAnm(int, s16) { /* Nonmatching */ } - diff --git a/src/d/d_msg.cpp b/src/d/d_msg.cpp index 24522793d..84c1c9694 100644 --- a/src/d/d_msg.cpp +++ b/src/d/d_msg.cpp @@ -3,12 +3,25 @@ // Translation Unit: d_msg.cpp // -#include "d_msg.h" +#include "d/d_msg.h" #include "dolphin/types.h" +class J2DTextBox; +class fopMsgM_pane_class; + +J2DPicture* button_icon[8]; +J2DPicture* button_kage[8]; +s16 buttonTimer[8]; +J2DTextBox * numberPane[3]; + +JKRHeap* agb_work_area; +dDlst_2DMSG_c message; +dDlst_2Dtact_c capture; +dDlst_2DM_c multiTex; + /* 8020A620-8020A628 .text dMsg_getAgbWorkArea__Fv */ -void dMsg_getAgbWorkArea() { - /* Nonmatching */ +JKRHeap* dMsg_getAgbWorkArea() { + return agb_work_area; } /* 8020A628-8020A950 .text draw__13dDlst_2DMSG_cFv */ @@ -27,7 +40,7 @@ void dDlst_2Dtact_c::draw() { } /* 8020AD3C-8020ADD8 .text dMsg_msg_pane_parts_set__FP18fopMsgM_pane_classUc */ -void dMsg_msg_pane_parts_set(fopMsgM_pane_class*, unsigned char) { +void dMsg_msg_pane_parts_set(fopMsgM_pane_class*, u8) { /* Nonmatching */ } @@ -172,7 +185,7 @@ void dMsg_cornerMove(sub_msg_class*) { } /* 802109A0-80210AA0 .text dMsg_tactGuideShow__FP13sub_msg_classUc */ -void dMsg_tactGuideShow(sub_msg_class*, unsigned char) { +void dMsg_tactGuideShow(sub_msg_class*, u8) { /* Nonmatching */ } @@ -212,7 +225,7 @@ void dMsg_subTextClose(sub_msg_class*) { } /* 80211A8C-80211B34 .text dMsg_setCloseSound__FP13sub_msg_classUc */ -void dMsg_setCloseSound(sub_msg_class*, unsigned char) { +void dMsg_setCloseSound(sub_msg_class*, u8) { /* Nonmatching */ } @@ -317,8 +330,8 @@ void dMsg_Execute(sub_msg_class*) { } /* 802153B0-802153B8 .text dMsg_IsDelete__FP13sub_msg_class */ -void dMsg_IsDelete(sub_msg_class*) { - /* Nonmatching */ +BOOL dMsg_IsDelete(sub_msg_class*) { + return TRUE; } /* 802153B8-80215698 .text dMsg_Delete__FP13sub_msg_class */ @@ -340,4 +353,3 @@ dDlst_2Dtact_c::~dDlst_2Dtact_c() { dDlst_2DMSG_c::~dDlst_2DMSG_c() { /* Nonmatching */ } - diff --git a/src/d/d_salvage.cpp b/src/d/d_salvage.cpp index 2c9a3cdea..6795e7471 100644 --- a/src/d/d_salvage.cpp +++ b/src/d/d_salvage.cpp @@ -3,8 +3,7 @@ // Translation Unit: d_salvage.cpp // -#include "d_salvage.h" -#include "dolphin/types.h" +#include "d/d_salvage.h" /* 800CC734-800CC76C .text init__18dSalvage_control_cFv */ void dSalvage_control_c::init() { @@ -22,7 +21,7 @@ void dSalvage_control_c::entry(fopAc_ac_c*, JPABaseEmitter*) { } /* 800CCB70-800CCBC4 .text init_room__18dSalvage_control_cFSc */ -void dSalvage_control_c::init_room(signed char) { +void dSalvage_control_c::init_room(s8) { /* Nonmatching */ } @@ -127,17 +126,17 @@ void dSalvage_control_c::setPos(int, cXyz) { } /* 800CCF1C-800CCF34 .text setFlag__18dSalvage_control_cFiUc */ -void dSalvage_control_c::setFlag(int, unsigned char) { +void dSalvage_control_c::setFlag(int, u8) { /* Nonmatching */ } /* 800CCF34-800CCF4C .text clrFlag__18dSalvage_control_cFiUc */ -void dSalvage_control_c::clrFlag(int, unsigned char) { +void dSalvage_control_c::clrFlag(int, u8) { /* Nonmatching */ } /* 800CCF4C-800CCF5C .text setNowAlpha__18dSalvage_control_cFiUc */ -void dSalvage_control_c::setNowAlpha(int, unsigned char) { +void dSalvage_control_c::setNowAlpha(int, u8) { /* Nonmatching */ } @@ -145,4 +144,3 @@ void dSalvage_control_c::setNowAlpha(int, unsigned char) { void dSalvage_control_c::setDrawMode(int, int) { /* Nonmatching */ } - diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index bf0d3d9a0..0ffac5be0 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_timer.cpp // -#include "d_timer.h" +#include "d/d_timer.h" #include "dolphin/types.h" /* 8023B860-8023BCD8 .text _create__8dTimer_cFv */ @@ -47,7 +47,7 @@ void dTimer_c::start() { } /* 8023C2CC-8023C2F4 .text start__8dTimer_cFs */ -void dTimer_c::start(short) { +void dTimer_c::start(s16) { /* Nonmatching */ } @@ -57,17 +57,17 @@ void dTimer_c::stock_start() { } /* 8023C3A8-8023C3D0 .text stock_start__8dTimer_cFs */ -void dTimer_c::stock_start(short) { +void dTimer_c::stock_start(s16) { /* Nonmatching */ } /* 8023C3D0-8023C454 .text stop__8dTimer_cFUc */ -void dTimer_c::stop(unsigned char) { +void dTimer_c::stop(u8) { /* Nonmatching */ } /* 8023C454-8023C500 .text restart__8dTimer_cFUc */ -void dTimer_c::restart(unsigned char) { +void dTimer_c::restart(u8) { /* Nonmatching */ } @@ -117,37 +117,37 @@ void dDlst_TimerScrnDraw_c::setTimer(int) { } /* 8023CCD8-8023CEF0 .text setRupee__21dDlst_TimerScrnDraw_cFs */ -void dDlst_TimerScrnDraw_c::setRupee(short) { +void dDlst_TimerScrnDraw_c::setRupee(s16) { /* Nonmatching */ } /* 8023CEF0-8023CF48 .text dTm_parentPaneScale__FP18fopMsgM_pane_classP18fopMsgM_pane_classf */ -void dTm_parentPaneScale(fopMsgM_pane_class*, fopMsgM_pane_class*, float) { +void dTm_parentPaneScale(fopMsgM_pane_class*, fopMsgM_pane_class*, f32) { /* Nonmatching */ } /* 8023CF48-8023CF98 .text setPaneInitialPos__21dDlst_TimerScrnDraw_cFP18fopMsgM_pane_classff */ -void dDlst_TimerScrnDraw_c::setPaneInitialPos(fopMsgM_pane_class*, float, float) { +void dDlst_TimerScrnDraw_c::setPaneInitialPos(fopMsgM_pane_class*, f32, f32) { /* Nonmatching */ } /* 8023CF98-8023D0CC .text setTimerPos__21dDlst_TimerScrnDraw_cFff */ -void dDlst_TimerScrnDraw_c::setTimerPos(float, float) { +void dDlst_TimerScrnDraw_c::setTimerPos(f32, f32) { /* Nonmatching */ } /* 8023D0CC-8023D128 .text setRupeePos__21dDlst_TimerScrnDraw_cFff */ -void dDlst_TimerScrnDraw_c::setRupeePos(float, float) { +void dDlst_TimerScrnDraw_c::setRupeePos(f32, f32) { /* Nonmatching */ } /* 8023D128-8023D1F8 .text setShowType__21dDlst_TimerScrnDraw_cFUc */ -void dDlst_TimerScrnDraw_c::setShowType(unsigned char) { +void dDlst_TimerScrnDraw_c::setShowType(u8) { /* Nonmatching */ } /* 8023D1F8-8023D318 .text setIconType__21dDlst_TimerScrnDraw_cFPvUc */ -void dDlst_TimerScrnDraw_c::setIconType(void*, unsigned char) { +void dDlst_TimerScrnDraw_c::setIconType(void*, u8) { /* Nonmatching */ } @@ -197,7 +197,7 @@ void dTimer_Create(msg_class*) { } /* 8023DA28-8023DA88 .text dTimer_createTimer__FiUsUcUcffff */ -void dTimer_createTimer(int, unsigned short, unsigned char, unsigned char, float, float, float, float) { +void dTimer_createTimer(int, u16, u8, u8, f32, f32, f32, f32) { /* Nonmatching */ } @@ -210,4 +210,3 @@ void dTimer_createStockTimer() { dDlst_TimerScrnDraw_c::~dDlst_TimerScrnDraw_c() { /* Nonmatching */ } - diff --git a/src/d/d_tree.cpp b/src/d/d_tree.cpp index 62fca2f87..f0f1a3c6d 100644 --- a/src/d/d_tree.cpp +++ b/src/d/d_tree.cpp @@ -3,21 +3,21 @@ // Translation Unit: d_tree.cpp // -#include "d_tree.h" +#include "d/d_tree.h" #include "dolphin/types.h" /* 800787BC-80078960 .text WorkCo__12dTree_data_cFP10fopAc_ac_cUli */ -void dTree_data_c::WorkCo(fopAc_ac_c*, unsigned long, int) { +void dTree_data_c::WorkCo(fopAc_ac_c*, u32, int) { /* Nonmatching */ } /* 80078960-80078CC0 .text WorkAt_NoCutAnim__12dTree_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInfP8cCcD_Obj */ -void dTree_data_c::WorkAt_NoCutAnim(fopAc_ac_c*, unsigned long, int, dCcMassS_HitInf*, cCcD_Obj*) { +void dTree_data_c::WorkAt_NoCutAnim(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*) { /* Nonmatching */ } /* 80078CC0-80078ED4 .text WorkAt__12dTree_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInf */ -void dTree_data_c::WorkAt(fopAc_ac_c*, unsigned long, int, dCcMassS_HitInf*) { +void dTree_data_c::WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*) { /* Nonmatching */ } @@ -82,22 +82,21 @@ void dTree_packet_c::update() { } /* 8007A14C-8007A238 .text setData__14dTree_packet_cFP12dTree_data_ciR4cXyzUci */ -void dTree_packet_c::setData(dTree_data_c*, int, cXyz&, unsigned char, int) { +void dTree_packet_c::setData(dTree_data_c*, int, cXyz&, u8, int) { /* Nonmatching */ } /* 8007A238-8007A36C .text newData__14dTree_packet_cFR4cXyzUci */ -void dTree_packet_c::newData(cXyz&, unsigned char, int) { +void dTree_packet_c::newData(cXyz&, u8, int) { /* Nonmatching */ } /* 8007A36C-8007A3DC .text newAnm__14dTree_packet_cFs */ -void dTree_packet_c::newAnm(short) { +void dTree_packet_c::newAnm(s16) { /* Nonmatching */ } /* 8007A3DC-8007A428 .text setAnm__14dTree_packet_cFis */ -void dTree_packet_c::setAnm(int, short) { +void dTree_packet_c::setAnm(int, s16) { /* Nonmatching */ } - diff --git a/src/d/d_wood.cpp b/src/d/d_wood.cpp index 00ad39a2a..e5fca8060 100644 --- a/src/d/d_wood.cpp +++ b/src/d/d_wood.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_wood.cpp // -#include "d_wood.h" +#include "d/d_wood.h" #include "dolphin/types.h" /* 800BD678-800BD710 .text __ct__Q25dWood5Anm_cFv */ @@ -185,4 +185,3 @@ void dWood::Packet_c::search_empty_UnitID() const { void dWood::Packet_c::search_anm(dWood::Anm_c::Mode_e) { /* Nonmatching */ } - From eb0260d0ea84186e640fc4b8c75fbad16b8745aa Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Tue, 19 Dec 2023 20:56:08 -0800 Subject: [PATCH 8/8] create headers for GF --- include/dolphin/gf/GFGeometry.h | 11 +++++++++++ include/dolphin/gf/GFLight.h | 9 +++++++++ include/dolphin/gf/GFPixel.h | 10 ++++++++++ include/dolphin/gf/GFTev.h | 11 +++++++++++ include/dolphin/gf/GFTransform.h | 11 +++++++++++ src/d/d_drawlist.cpp | 12 ++++-------- src/d/d_kankyo.cpp | 3 +-- src/m_Do/m_Do_ext.cpp | 3 +-- 8 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 include/dolphin/gf/GFGeometry.h create mode 100644 include/dolphin/gf/GFLight.h create mode 100644 include/dolphin/gf/GFPixel.h create mode 100644 include/dolphin/gf/GFTev.h create mode 100644 include/dolphin/gf/GFTransform.h diff --git a/include/dolphin/gf/GFGeometry.h b/include/dolphin/gf/GFGeometry.h new file mode 100644 index 000000000..32d68cace --- /dev/null +++ b/include/dolphin/gf/GFGeometry.h @@ -0,0 +1,11 @@ +#ifndef GFGEOMETRY_H +#define GFGEOMETRY_H + +#include "dolphin/gx/GXAttr.h" + +void GFSetVtxDescv(GXVtxDescList*); +void GFSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList*); +void GFSetArray(GXAttr, void*, u8); +void GFSetCullMode(GXCullMode); + +#endif /* GFGEOMETRY_H */ diff --git a/include/dolphin/gf/GFLight.h b/include/dolphin/gf/GFLight.h new file mode 100644 index 000000000..b674630de --- /dev/null +++ b/include/dolphin/gf/GFLight.h @@ -0,0 +1,9 @@ +#ifndef GFLIGHT_H +#define GFLIGHT_H + +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" + +void GFSetChanMatColor(GXChannelID, GXColor); + +#endif /* GFLIGHT_H */ diff --git a/include/dolphin/gf/GFPixel.h b/include/dolphin/gf/GFPixel.h new file mode 100644 index 000000000..662a76b43 --- /dev/null +++ b/include/dolphin/gf/GFPixel.h @@ -0,0 +1,10 @@ +#ifndef GFPIXEL_H +#define GFPIXEL_H + +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" + +void GFSetFog(GXFogType type, f32 startZ, f32 endZ, f32 nearZ, f32 farZ, GXColor color); +void GFSetBlendModeEtc(GXBlendMode, GXBlendFactor, GXBlendFactor, GXLogicOp, u8, u8, u8); + +#endif /* GFPIXEL_H */ diff --git a/include/dolphin/gf/GFTev.h b/include/dolphin/gf/GFTev.h new file mode 100644 index 000000000..e16ad9b81 --- /dev/null +++ b/include/dolphin/gf/GFTev.h @@ -0,0 +1,11 @@ +#ifndef GFTEV_H +#define GFTEV_H + +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" + +void GFSetTevColor(GXTevRegID, GXColor); +void GFSetTevColorS10(GXTevRegID, GXColorS10); +void GFSetAlphaCompare(GXCompare, u8, GXAlphaOp, GXCompare, u8); + +#endif /* GFTEV_H */ diff --git a/include/dolphin/gf/GFTransform.h b/include/dolphin/gf/GFTransform.h new file mode 100644 index 000000000..00ec78cb4 --- /dev/null +++ b/include/dolphin/gf/GFTransform.h @@ -0,0 +1,11 @@ +#ifndef GFTRANSFORM_H +#define GFTRANSFORM_H + +#include "dolphin/gx/GXEnum.h" +#include "dolphin/mtx/mtx.h" + +void GFLoadPosMtxImm(MtxP, GXPosNrmMtx); +void GFLoadNrmMtxImm(MtxP, GXPosNrmMtx); +void GFSetCurrentMtx(u32, u32, u32, u32, u32, u32, u32, u32, u32); + +#endif /* GFTRANSFORM_H */ diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 7cffa80a3..1f40606d4 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -6,6 +6,10 @@ #include "d/d_drawlist.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo_rain.h" +#include "dolphin/gf/GFGeometry.h" +#include "dolphin/gf/GFLight.h" +#include "dolphin/gf/GFPixel.h" +#include "dolphin/gf/GFTransform.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_mtx.h" @@ -472,14 +476,6 @@ void dDlst_alphaModelData_c::set(u8 type, Mtx mtx, u8 alpha) { mAlpha = alpha; } -extern void GFLoadPosMtxImm(MtxP, GXPosNrmMtx); -extern void GFSetCurrentMtx(u32, u32, u32, u32, u32, u32, u32, u32, u32); -extern void GFSetChanMatColor(GXChannelID, GXColor); -extern void GFSetVtxDescv(GXVtxDescList*); -extern void GFSetVtxAttrFmtv(GXVtxFmt, GXVtxAttrFmtList*); -extern void GFSetBlendModeEtc(GXBlendMode, GXBlendFactor, GXBlendFactor, GXLogicOp, u8, u8, u8); -extern void GFSetArray(GXAttr, void*, u8); - char l_backRevZMat[0x41] ALIGN_DECL(32) = {}; char l_frontZMat[0x3c] ALIGN_DECL(32) = {}; char l_frontNoZSubMat[0x2a] ALIGN_DECL(32) = {}; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 3afd13493..f65afde0e 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -12,6 +12,7 @@ #include "d/d_procname.h" #include "d/d_s_play.h" #include "d/d_stage.h" +#include "dolphin/gf/GFPixel.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_kankyo.h" @@ -3151,8 +3152,6 @@ void dKy_GxFog_tevstr_set(dKy_tevstr_c* pTevStr) { GxXFog_set(); } -extern void GFSetFog(GXFogType type, f32 startZ, f32 endZ, f32 nearZ, f32 farZ, GXColor color); - /* 80196C5C-80196D04 .text dKy_GfFog_tevstr_set__FP12dKy_tevstr_c */ void dKy_GfFog_tevstr_set(dKy_tevstr_c* pTevStr) { f32 near = 1.0f; diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index a7082aa8f..51e087642 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -14,6 +14,7 @@ #include "SSystem/SComponent/c_m3d.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +#include "dolphin/gf/GFPixel.h" #include "m_Do/m_Do_mtx.h" #include "m_Do/m_Do_printf.h" @@ -1431,8 +1432,6 @@ void mDoExt_McaMorf2::stopZelAnime() { /* Nonmatching */ } -extern void GFSetBlendModeEtc(GXBlendMode, GXBlendFactor, GXBlendFactor, GXLogicOp, u8, u8, u8); - /* 8001427C-800142B8 .text draw__24mDoExt_offCupOnAupPacketFv */ void mDoExt_offCupOnAupPacket::draw() { GFSetBlendModeEtc(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_CLEAR, 0, 1, 1);