mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-03 10:31:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

auto decompile more functions

Browse Source
This commit is contained in:
Julgodis
2021-04-08 21:05:48 +02:00
parent a23a106399
commit 2661db6aaa
559 changed files with 3534 additions and 3686 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/a/npc/d_a_npc_cd.cpp
+6 -6
View File
@@ -24,16 +24,16 @@ struct mDoHIO_entry_c {
/* 8015791C */ ~mDoHIO_entry_c();
};
struct J3DAnmTransform {};
struct mDoExt_McaMorfCallBack1_c {};
struct J3DModelData {};
struct mDoExt_McaMorfCallBack2_c {};
struct mDoExt_McaMorfCallBack1_c {};
struct Z2Creature {};
struct J3DAnmTransform {};
struct mDoExt_McaMorfSO {
/* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
@@ -52,12 +52,12 @@ struct daPy_py_c {
/* 8015F424 */ void checkNowWolfEyeUp();
};
struct J3DJoint {};
struct J3DAnmTransformKey {};
struct J3DModel {};
struct J3DJoint {};
struct daNpcCd_c {
/* 8015605C */ void NpcCreate(int);
/* 801561E8 */ void ObjCreate(int);
src/a/npc/d_a_npc_cd2.cpp
+6 -6
View File
@@ -41,16 +41,16 @@ struct mDoExt_btpAnm {
/* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
};
struct J3DAnmTransform {};
struct mDoExt_McaMorfCallBack1_c {};
struct J3DModelData {};
struct mDoExt_McaMorfCallBack2_c {};
struct mDoExt_McaMorfCallBack1_c {};
struct Z2Creature {};
struct J3DAnmTransform {};
struct mDoExt_McaMorfSO {
/* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
@@ -67,12 +67,12 @@ struct daPy_py_c {
/* 8015F424 */ void checkNowWolfEyeUp();
};
struct J3DJoint {};
struct J3DAnmTransformKey {};
struct J3DModel {};
struct J3DJoint {};
struct daNpcCd2_c {
/* 80157D00 */ void NpcCreate(int);
/* 80157F28 */ void ObjCreate(int);
src/d/a/d_a_alink.cpp
+46 -46
View File
@@ -71,10 +71,10 @@ struct mDoExt_blkAnm {
/* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16);
};
struct J3DModelData {};
struct J3DAnmTransform {};
struct J3DModelData {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D990 */ void changeBckOnly(J3DAnmTransform*);
@@ -512,11 +512,31 @@ struct daAlink_footData_c {
/* 800CFCF4 */ daAlink_footData_c();
};
struct dCcG_At_Spl {};
struct dDemo_actor_c {
/* 8003819C */ void getPrm_Morf();
/* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*);
};
struct daAlinkHIO_anm_c {};
struct JKRHeap {
/* 802CE5CC */ void freeAll();
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct J3DGXColorS10 {
/* 8000E460 */ J3DGXColorS10();
};
struct dBgW_Base {
struct PushPullLabel {};
};
struct dCcD_GObjInf {
/* 80083A28 */ dCcD_GObjInf();
/* 800840E4 */ ~dCcD_GObjInf();
@@ -532,22 +552,6 @@ struct dCcD_GObjInf {
/* 800846B0 */ void ResetCoHit();
};
struct dBgS_LinChk {
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct dCcG_At_Spl {};
struct J3DAnmBase {};
struct daAlinkHIO_anm_c {};
struct dAttList_c {
/* 80073864 */ void getActor();
};
struct JPABaseEmitter {};
struct cM3dGPla {
/* 8001DB90 */ ~cM3dGPla();
/* 801411F0 */ cM3dGPla();
@@ -555,8 +559,12 @@ struct cM3dGPla {
/* 8026F408 */ void crossInfLin(cXyz const&, cXyz const&, cXyz&) const;
};
struct dBgW_Base {
struct PushPullLabel {};
struct dAttList_c {
/* 80073864 */ void getActor();
};
struct dBgS_LinChk {
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct _GXColorS10 {};
@@ -566,17 +574,9 @@ struct J3DAnmTevRegKey {
/* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DGXColorS10 {
/* 8000E460 */ J3DGXColorS10();
};
struct JPABaseEmitter {};
struct JKRHeap {
/* 802CE5CC */ void freeAll();
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct J3DAnmBase {};
struct daAlink_c {
struct daAlink_ANM {};
@@ -3074,13 +3074,6 @@ struct dPa_control_c {
static u8 mParticleTracePCB[4 + 4 /* padding */];
};
struct dBgS_AcchCir {
/* 80075EAC */ dBgS_AcchCir();
/* 80075F40 */ void SetWallR(f32);
/* 80075F58 */ void SetWall(f32, f32);
/* 80077414 */ ~dBgS_AcchCir();
};
struct dBgS_RoofChk {
/* 80078FF4 */ dBgS_RoofChk();
/* 80079090 */ ~dBgS_RoofChk();
@@ -3112,6 +3105,13 @@ struct dBgS {
dBgW_Base::PushPullLabel);
};
struct dBgS_AcchCir {
/* 80075EAC */ dBgS_AcchCir();
/* 80075F40 */ void SetWallR(f32);
/* 80075F58 */ void SetWall(f32, f32);
/* 80077414 */ ~dBgS_AcchCir();
};
struct dBgS_Acch {
/* 80075F94 */ ~dBgS_Acch();
/* 800760A0 */ dBgS_Acch();
@@ -3229,15 +3229,15 @@ struct dDlst_peekZ_c {
/* 80056018 */ void newData(s16, s16, u32*);
};
struct J3DPacket;
struct J3DDrawBuffer {
/* 8032548C */ void entryImm(J3DPacket*, u16);
};
struct J3DDrawBuffer;
struct J3DPacket {
/* 80312750 */ bool entry(J3DDrawBuffer*);
};
struct J3DDrawBuffer {
/* 8032548C */ void entryImm(J3DPacket*, u16);
};
struct dDlst_list_c {
/* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&);
};
@@ -3626,14 +3626,14 @@ struct J3DShape {
static u8 sOldVcdVatCmd[4];
};
struct J3DAnmTexPattern {
/* 8032B09C */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DAnmTextureSRTKey {
/* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DAnmTexPattern {
/* 8032B09C */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DMaterialTable {
/* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*);
/* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*);
src/d/a/d_a_itembase.cpp
+2 -2
View File
@@ -43,10 +43,10 @@ struct mDoExt_bpkAnm {
/* 8000D518 */ void entry(J3DMaterialTable*, f32);
};
struct J3DModelData {};
struct J3DAnmTransform {};
struct J3DModelData {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D9CC */ void entry(J3DModelData*, f32);
src/d/a/d_a_npc.cpp
+15 -15
View File
@@ -48,13 +48,13 @@ struct mDoExt_morf_c {
/* 8000FB7C */ void setMorf(f32);
};
struct J3DAnmColor {};
struct J3DAnmTexPattern {};
struct J3DAnmTextureSRTKey {};
struct J3DAnmTevRegKey {};
struct J3DAnmTextureSRTKey {};
struct J3DAnmColor {};
struct J3DAnmTexPattern {};
struct J3DMaterialTable {
/* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*);
@@ -83,10 +83,10 @@ struct mDoExt_bpkAnm {
/* 8000D518 */ void entry(J3DMaterialTable*, f32);
};
struct J3DModelData {};
struct J3DAnmTransform {};
struct J3DModelData {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D990 */ void changeBckOnly(J3DAnmTransform*);
@@ -120,21 +120,21 @@ struct daNpcT_motionAnmData_c {};
struct daNpcT_faceMotionAnmData_c {};
struct dCcD_GObjInf {
/* 80084460 */ void ChkTgHit();
};
struct J3DModel {};
struct _GXColorS10 {};
struct J3DFrameCtrl {
/* 803283FC */ void init(s16);
};
struct J3DAnmTransformKey {};
struct J3DJoint {};
struct J3DAnmTransformKey {};
struct dCcD_GObjInf {
/* 80084460 */ void ChkTgHit();
};
struct _GXColorS10 {};
struct J3DModel {};
struct daNpcT_c {
/* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
src/d/a/d_a_obj.cpp
+4 -4
View File
@@ -17,13 +17,13 @@ struct daPy_py_c {
/* 8015F398 */ void checkMasterSwordEquip();
};
struct Quaternion {};
struct dCcD_GObjInf {
/* 800844F8 */ void GetTgHitObj();
/* 8008457C */ void GetTgHitObjSe();
};
struct Quaternion {};
struct Vec {};
struct cXyz {
@@ -56,11 +56,11 @@ struct dRes_control_c {
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
};
struct dKy_tevstr_c {};
struct JPABaseEmitter {};
struct J3DModelData {};
struct JPABaseEmitter {};
struct dKy_tevstr_c {};
struct dPa_modelEcallBack {
/* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8,
src/d/a/d_a_player.cpp
+1 -1
View File
@@ -378,7 +378,7 @@ asm void daPy_boomerangMove_c::initOffset(cXyz const* param_0) {
#pragma pop
/* ############################################################################################## */
/* 80451018-8045101C 000518 0004+00 2/2 33/33 103/103 .sbss m_midnaActor__9daPy_py_c */
/* 80451018-8045101C 000518 0004+00 2/2 33/32 103/103 .sbss m_midnaActor__9daPy_py_c */
u8 daPy_py_c::m_midnaActor[4];
/* 8045101C-80451020 -00001 0004+00 1/1 1/1 1/1 .sbss None */
src/d/bg/d_bg_s.cpp
+2 -2
View File
@@ -38,6 +38,8 @@ struct dBgS_Acch {
/* 8007732C */ void CalcWallRR();
};
struct csXyz {};
struct cXyz {};
struct cBgS_PolyInfo {
@@ -48,8 +50,6 @@ struct cBgS_PolyInfo {
/* 802681AC */ void ChkBgIndex() const;
};
struct csXyz {};
struct dBgS {
/* 80030C50 */ ~dBgS();
/* 800748FC */ void Ct();
src/d/bg/d_bg_s_acch.cpp
+3 -3
View File
@@ -60,8 +60,7 @@ struct dBgS_AcchCir {
/* 80077414 */ ~dBgS_AcchCir();
};
struct Vec {};
struct dBgS_Acch;
struct cBgS_PolyInfo {
/* 80268074 */ cBgS_PolyInfo();
/* 802680B0 */ ~cBgS_PolyInfo();
@@ -70,7 +69,6 @@ struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct dBgS_Acch;
struct csXyz {};
struct dBgS {
@@ -82,6 +80,8 @@ struct dBgS {
/* 80075B84 */ void RideCallBack(cBgS_PolyInfo const&, fopAc_ac_c*);
};
struct Vec {};
struct dBgS_Acch {
/* 80075F94 */ ~dBgS_Acch();
/* 800760A0 */ dBgS_Acch();
src/d/bg/d_bg_w.cpp
+15 -15
View File
@@ -23,21 +23,15 @@ struct dBgW_Base {
/* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
};
struct dBgS_SphChk {};
struct csXyz {};
struct dBgS_SplGrpChk {};
struct cBgS_PolyPassChk {};
struct cBgS_GrpPassChk {};
struct dBgS_CaptPoly {};
struct cM3dGPla {
/* 8026F57C */ void getCrossY(cXyz const&, f32*) const;
};
struct dBgS_RoofChk {};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct dBgS_SplGrpChk {};
struct Vec {};
@@ -48,11 +42,17 @@ struct dBgS_Acch {
/* 800772E8 */ void CalcMovePosWork();
};
struct cBgS_GrpPassChk {};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct dBgS_RoofChk {};
struct cBgS_PolyPassChk {};
struct csXyz {};
struct dBgS_SphChk {};
struct cM3dGPla {
/* 8026F57C */ void getCrossY(cXyz const&, f32*) const;
};
struct dBgW {
/* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&);
@@ -174,14 +174,14 @@ struct cBgW_GrpElm {
/* 8007A1E4 */ cBgW_GrpElm();
};
struct cBgS_GndChk {};
struct cBgD_t {};
struct cBgS_ShdwDraw {};
struct cBgS_LinChk {};
struct cBgS_GndChk {};
struct cBgW {
/* 80079294 */ cBgW();
/* 8007933C */ ~cBgW();
src/d/bg/d_bg_w_kcol.cpp
+18 -18
View File
@@ -27,16 +27,22 @@ struct dBgW_Base {
/* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
};
struct dBgS_CaptPoly {};
struct cBgS_ShdwDraw {};
struct cBgS_GndChk {};
struct cBgS_GrpPassChk {};
struct Vec {};
struct KC_PrismData {};
struct cBgS_LinChk {};
struct dBgS_RoofChk {};
struct dBgS_SplGrpChk {};
struct dBgPc {
/* 80074048 */ void setCode(sBgPc&);
};
struct Vec {};
struct dBgS_Acch {
/* 800771E4 */ void GetSpeedY();
/* 80077200 */ void GetWallAddY(Vec&);
@@ -44,25 +50,19 @@ struct dBgS_Acch {
/* 800772E8 */ void CalcMovePosWork();
};
struct csXyz {};
struct dBgPc {
/* 80074048 */ void setCode(sBgPc&);
};
struct cBgS_PolyPassChk {};
struct dBgS_SplGrpChk {};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct cBgS_LinChk {};
struct cBgS_PolyPassChk {};
struct cBgS_ShdwDraw {};
struct KC_PrismData {};
struct cBgS_GrpPassChk {};
struct csXyz {};
struct dBgS_CaptPoly {};
struct cBgS_GndChk {};
struct dBgS_SphChk {};
src/d/bg/d_bg_w_sv.cpp
+11 -11
View File
@@ -19,11 +19,11 @@ struct dBgW_Base {
struct cBgS_PolyInfo {};
struct cXyz {};
struct cBgD_t {};
struct csXyz {};
struct cBgD_t {};
struct cXyz {};
struct dBgWSv {
/* 80082F98 */ void Set(cBgD_t*, u32);
@@ -36,19 +36,19 @@ struct dBgWSv {
/* 800835DC */ ~dBgWSv();
};
struct dBgS_SphChk {};
struct dBgS_SplGrpChk {};
struct cBgS_PolyPassChk {};
struct cBgS_GrpPassChk {};
struct dBgS_CaptPoly {};
struct dBgS_RoofChk {};
struct dBgS_SplGrpChk {};
struct dBgS_Acch {};
struct cBgS_GrpPassChk {};
struct cBgS_PolyPassChk {};
struct dBgS_RoofChk {};
struct dBgS_SphChk {};
struct dBgW {
/* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&);
@@ -98,10 +98,10 @@ struct dBgW {
struct cBgS_LinChk {};
struct cBgS_GndChk {};
struct cBgS_ShdwDraw {};
struct cBgS_GndChk {};
struct cBgW {
/* 8007933C */ ~cBgW();
/* 80079564 */ void CalcPlane();
src/d/cc/d_cc_d.cpp
+5 -5
View File
@@ -157,10 +157,7 @@ struct cM3dGCps {
/* 8026F03C */ void Set(cM3dGCpsS const&);
};
struct cCcD_AabAttr {};
struct cCcD_PntAttr {};
struct cCcD_TriAttr;
struct cCcD_ShapeAttr {
struct Shape {};
@@ -171,9 +168,12 @@ struct cCcD_ShapeAttr {
static f32 m_virtual_center[3];
};
struct cCcD_AabAttr {};
struct cCcD_CpsAttr;
struct cCcD_TriAttr;
struct cCcD_SphAttr;
struct cCcD_PntAttr {};
struct cCcD_CylAttr {
/* 80084CC0 */ void GetCoCP() const;
/* 80037A4C */ void GetCoCP();
src/d/cc/d_cc_mass_s.cpp
+6 -6
View File
@@ -13,10 +13,10 @@
struct fopAc_ac_c {};
struct cCcD_Obj {};
struct cXyz {};
struct cCcD_Obj {};
struct dCcMassS_Obj {
/* 800300F4 */ ~dCcMassS_Obj();
/* 800852E0 */ void Set(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32));
@@ -24,10 +24,6 @@ struct dCcMassS_Obj {
/* 800855C8 */ dCcMassS_Obj();
};
struct dCcMassS_HitInf {
/* 80085334 */ void ClearPointer();
};
struct Vec {};
struct cM3dGCps {
@@ -36,6 +32,10 @@ struct cM3dGCps {
/* 8026F080 */ void SetCps(cM3dGCps const&);
};
struct dCcMassS_HitInf {
/* 80085334 */ void ClearPointer();
};
struct dCcMassS_Mng {
/* 80085350 */ dCcMassS_Mng();
/* 800855E4 */ void Ct();
src/d/cc/d_cc_s.cpp
+6 -6
View File
@@ -33,19 +33,15 @@ struct dJntCol_c {
/* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
};
struct dCcD_GStts {};
struct cCcD_Stts {
/* 80263934 */ void PlusCcMove(f32, f32, f32);
/* 80263970 */ void PlusDmg(int);
};
struct dCcD_GObjInf {
/* 800843DC */ void ChkAtNoGuard();
};
struct cCcD_GStts {};
struct dCcD_GStts {};
struct cCcD_ShapeAttr {
struct Shape {};
};
@@ -56,6 +52,10 @@ struct cCcD_Obj {
struct cCcD_GObjInf {};
struct dCcD_GObjInf {
/* 800843DC */ void ChkAtNoGuard();
};
struct dCcS {
/* 8002FF40 */ ~dCcS();
/* 80085ED4 */ void Ct();
src/d/com/d_com_inf_game.cpp
+2 -2
View File
@@ -193,10 +193,10 @@ struct dStage_nextStage_c {
/* 80023E28 */ void set(char const*, s8, s16, s8, s8, u8);
};
struct J3DModelData {};
struct J3DModel {};
struct J3DModelData {};
struct dSmplMdl_draw_c {
/* 80048CB4 */ dSmplMdl_draw_c();
/* 80048E0C */ void draw();
src/d/d_attention.cpp
+8 -8
View File
@@ -38,10 +38,10 @@ struct mDoExt_bpkAnm {
/* 8000D518 */ void entry(J3DMaterialTable*, f32);
};
struct J3DModelData {};
struct J3DAnmTransform {};
struct J3DModelData {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D9CC */ void entry(J3DModelData*, f32);
@@ -71,6 +71,12 @@ struct dRes_control_c {
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct cSAngle {
/* 80270F68 */ cSAngle(cSAngle const&);
/* 80270F98 */ cSAngle(s16);
@@ -78,12 +84,6 @@ struct cSAngle {
/* 80271228 */ void operator-(s16) const;
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct dAttention_c {
/* 80070198 */ dAttention_c(fopAc_ac_c*, u32);
/* 80070774 */ ~dAttention_c();
src/d/d_camera.cpp
+9 -14
View File
@@ -91,7 +91,7 @@ struct daPy_py_c {
/* 80182A10 */ void checkGoronSideMove() const;
/* 80182AAC */ void getRightFootPosP();
/* 80182AB4 */ void getLeftFootPosP();
/* 80182ABC */ void getMidnaActor();
/* 80182ABC */ u32 getMidnaActor();
/* 80182AC4 */ void checkCopyRodThrowAfter() const;
/* 80182AD8 */ void checkRide() const;
/* 80182B9C */ void getRightHandPos() const;
@@ -208,8 +208,8 @@ struct dCcMassS_Mng {
struct camera_class {};
struct dCamMapToolData {
/* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8);
struct dBgS_LinChk {
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct cSAngle {
@@ -249,8 +249,8 @@ struct cSAngle {
static u8 _270[2 + 6 /* padding */];
};
struct dBgS_LinChk {
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
struct dCamMapToolData {
/* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8);
};
struct dCamera_c {
@@ -852,7 +852,7 @@ extern "C" bool __lt__7cSAngleCFRC7cSAngle();
extern "C" bool __gt__7cSAngleCFRC7cSAngle();
extern "C" void getRightFootPosP__9daPy_py_cFv();
extern "C" void getLeftFootPosP__9daPy_py_cFv();
extern "C" void getMidnaActor__9daPy_py_cFv();
extern "C" u32 getMidnaActor__9daPy_py_cFv();
extern "C" void checkCopyRodThrowAfter__9daPy_py_cCFv();
extern "C" void keepLock__12dAttention_cFi();
extern "C" void checkRide__9daPy_py_cCFv();
@@ -4620,15 +4620,10 @@ asm void daPy_py_c::getLeftFootPosP() {
}
#pragma pop
/* 80182ABC-80182AC4 17D3FC 0008+00 2/2 0/0 0/0 .text getMidnaActor__9daPy_py_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daPy_py_c::getMidnaActor() {
nofralloc
#include "asm/d/d_camera/getMidnaActor__9daPy_py_cFv.s"
/* 80182ABC-80182AC4 -00001 0008+00 0/0 0/0 0/0 .text getMidnaActor__9daPy_py_cFv */
u32 daPy_py_c::getMidnaActor() {
return *(u32*)(&daPy_py_c::m_midnaActor);
}
#pragma pop
/* 80182AC4-80182AD0 17D404 000C+00 1/1 0/0 0/0 .text checkCopyRodThrowAfter__9daPy_py_cCFv */
#pragma push
src/d/d_demo.cpp
+6 -6
View File
@@ -17,10 +17,10 @@ struct mDoGph_gInf_c {
/* 80007FD8 */ void fadeOut(f32, _GXColor&);
};
struct Vec {};
struct J3DAnmTransform {};
struct Vec {};
struct mDoExt_McaMorf {
/* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*);
/* 800105C8 */ void play(Vec*, u32, s8);
@@ -54,10 +54,10 @@ struct cXyz {
/* 80009184 */ ~cXyz();
};
struct dKy_tevstr_c {};
struct csXyz {};
struct dKy_tevstr_c {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
@@ -110,10 +110,10 @@ struct JStage {
/* 80280B88 */ void JSGGetColor() const;
};
struct TECameraProjection {};
struct TECameraView {};
struct TECameraProjection {};
struct TCamera {
/* 80280BA0 */ ~TCamera();
/* 80280C00 */ s32 JSGFGetType() const;
src/d/d_drawlist.cpp
+4 -4
View File
@@ -80,10 +80,10 @@ struct dDlst_shadowRealPoly_c {
/* 800569A8 */ s32 getTriMax();
};
struct cBgD_Vtx_t {};
struct cM3dGPla {};
struct cBgD_Vtx_t {};
struct dDlst_shadowPoly_c {
/* 80054288 */ void set(cBgD_Vtx_t*, u16, u16, u16, cM3dGPla*);
/* 800543B4 */ void draw();
@@ -109,6 +109,8 @@ struct dDlst_peekZ_c {
/* 80056080 */ void peekData();
};
struct dDlst_base_c {};
struct J3DPacket {};
struct J3DDrawBuffer {
@@ -120,8 +122,6 @@ struct J3DDrawBuffer {
/* 803254AC */ void draw() const;
};
struct dDlst_base_c {};
struct _GXColor {};
struct dDlst_list_c {
src/d/d_jnt_col.cpp
+2 -2
View File
@@ -37,14 +37,14 @@ struct mDoMtx_stack_c {
struct fopAc_ac_c {};
struct J3DModel {};
struct dJntColData_c {};
struct cM3dGLin {
/* 80036A5C */ ~cM3dGLin();
/* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&);
};
struct dJntColData_c {};
struct J3DModel {};
struct dJntCol_c {
/* 80035C8C */ dJntCol_c();
src/d/d_k_wpillar.cpp
+2 -2
View File
@@ -31,10 +31,10 @@ struct mDoExt_brkAnm {
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
};
struct J3DModelData {};
struct J3DAnmTransform {};
struct J3DModelData {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D9CC */ void entry(J3DModelData*, f32);
src/d/d_model.cpp
+2 -2
View File
@@ -17,10 +17,10 @@ struct dStage_roomControl_c {
struct dMdl_obj_c {};
struct dKy_tevstr_c {};
struct J3DModelData {};
struct dKy_tevstr_c {};
struct dMdl_mng_c {
/* 8009C6DC */ void search(J3DModelData*, u16, dKy_tevstr_c*);
/* 8009C724 */ void entry(J3DModelData*, u16, dKy_tevstr_c*);
src/d/d_name.cpp
+2 -2
View File
@@ -15,10 +15,10 @@ struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct JKRArchive {};
struct J2DPane {};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
src/d/d_select_cursor.cpp
+3 -3
View File
@@ -19,15 +19,15 @@ struct dSelect_icon_c {
/* 80195B70 */ void setPos(J2DPane*, f32, f32);
};
struct JKRArchive {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmTransformKey {
/* 801959C0 */ ~J2DAnmTransformKey();
};
struct J2DAnmColor {};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
src/d/d_stage.cpp
+20 -20
View File
@@ -101,31 +101,31 @@ struct dStage_startStage_c {
/* 8002419C */ void set(char const*, s8, s16, s8);
};
struct dStage_Lbnk_c {};
struct dStage_DMap_c {};
struct dStage_FileList2_dt_c {};
struct dStage_FloorInfo_c {};
struct dStage_dPnt_c {};
struct dStage_Elst_c {};
struct dStage_dPath_c {};
struct dStage_SoundInfo_c {};
struct dStage_FileList_dt_c {};
struct dStage_MemoryMap_c {};
struct dStage_Multi_c {};
struct dStage_MemoryConfig_c {};
struct dStage_MapEventInfo_c {};
struct dStage_Multi_c {};
struct dStage_SoundInfo_c {};
struct dStage_MemoryMap_c {};
struct dStage_DMap_c {};
struct dStage_dPnt_c {};
struct dStage_dPath_c {};
struct dStage_FloorInfo_c {};
struct dStage_Lbnk_c {};
struct dStage_Elst_c {};
struct dStage_FileList2_dt_c {};
struct dStage_FileList_dt_c {};
struct dStage_stageDt_c {
/* 8002483C */ void getStagInfo() const;
src/d/d_timer.cpp
+2 -2
View File
@@ -73,13 +73,13 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct JKRArchive {};
struct J2DPane {
/* 802F7AFC */ void getParentPane();
/* 802F7FCC */ void animationTransform();
};
struct JKRArchive {};
struct dDlst_TimerScrnDraw_c {
/* 8025DB38 */ dDlst_TimerScrnDraw_c();
/* 8025DBE0 */ void setHIO();
src/d/event/d_event_manager.cpp
+2 -2
View File
@@ -43,8 +43,6 @@ struct dEvt_control_c {
/* 800436F4 */ void setPtD(void*);
};
struct dEvDtData_c {};
struct dEvDtStaff_c {
/* 80044134 */ void init();
};
@@ -60,6 +58,8 @@ struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct dEvDtData_c {};
struct dEvent_manager_c {
/* 800465E8 */ void getSubstance(dEvDtData_c*, int);
/* 80046688 */ dEvent_manager_c();
src/d/file/d_file_sel_warning.cpp
+2 -2
View File
@@ -16,12 +16,12 @@ struct dMsgString_c {
/* 80249D28 */ ~dMsgString_c();
};
struct JKRArchive {};
struct JUtility {
struct TColor {};
};
struct JKRArchive {};
struct dFile_warning_c {
/* 80191BAC */ dFile_warning_c(JKRArchive*, u8);
/* 80191C18 */ ~dFile_warning_c();
src/d/file/d_file_select.cpp
+4 -4
View File
@@ -34,14 +34,14 @@ struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct J3DMaterialTable {};
struct J3DModelData {};
struct J3DAnmTevRegKey {
/* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DMaterialTable {};
struct mDoExt_brkAnm {
/* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
@@ -83,8 +83,6 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct JKRArchive {};
struct J2DAnmTextureSRTKey {
/* 80184274 */ ~J2DAnmTextureSRTKey();
};
@@ -103,6 +101,8 @@ struct J2DPane {
/* 802F7FCC */ void animationTransform();
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
src/d/kankyo/d_kankyo.cpp
+8 -8
View File
@@ -73,14 +73,6 @@ struct dStage_roomControl_c {
static u8 mStatus[65792];
};
struct _GXColorS10 {};
struct dKy_tevstr_c {};
struct J3DModelData {
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
};
struct Vec {};
struct cXyz {
@@ -90,6 +82,14 @@ struct cXyz {
/* 80266B84 */ void operator*(f32) const;
};
struct J3DModelData {
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
};
struct _GXColorS10 {};
struct dKy_tevstr_c {};
struct dScnKy_env_light_c {
/* 8019F2E8 */ dScnKy_env_light_c();
/* 8019F4FC */ void setDaytime();
src/d/kankyo/d_kankyo_rain.cpp
+4 -4
View File
@@ -44,6 +44,8 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct _GXColor {};
struct Vec {};
struct cXyz {
@@ -51,15 +53,13 @@ struct cXyz {
/* 80266AE4 */ void operator+(Vec const&) const;
};
struct dKy_tevstr_c {};
struct _GXColor {};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 802673F4 */ csXyz(s16, s16, s16);
};
struct dKy_tevstr_c {};
struct dPa_control_c {
/* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
src/d/kankyo/d_kankyo_wether.cpp
+4 -4
View File
@@ -27,6 +27,8 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct _GXColor {};
struct Vec {};
struct cXyz {
@@ -40,12 +42,10 @@ struct cXyz {
static f32 Zero[3];
};
struct dKy_tevstr_c {};
struct _GXColor {};
struct csXyz {};
struct dKy_tevstr_c {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
src/d/map/d_map.cpp
+2 -2
View File
@@ -31,8 +31,6 @@ struct renderingPlusDoorAndCursor_c {
/* 80040ADC */ void getIconPosition(dTres_c::typeGroupData_c*) const;
};
struct Vec {};
struct dDrawPath_c {
struct room_class {};
@@ -51,6 +49,8 @@ struct dDrawPath_c {
/* 8003CCC4 */ void drawPath();
};
struct Vec {};
struct renderingDAmap_c {
/* 8002B150 */ ~renderingDAmap_c();
/* 8003FCC8 */ void init(u8*, u16, u16, u16, u16);
src/d/map/d_map_path_dmap.cpp
+6 -11
View File
@@ -137,7 +137,7 @@ struct dMpath_n {
};
struct dMpath_c {
/* 8003F758 */ void isExistMapPathData();
/* 8003F758 */ u8 isExistMapPathData();
/* 8003F760 */ void getTopBottomFloorNo(s8*, s8*);
/* 8003F7E8 */ void createWork();
/* 8003FA40 */ void setPointer(s8, void*, int);
@@ -218,7 +218,7 @@ extern "C" void init__10dMapInfo_cFv();
extern "C" void reset__10dMapInfo_cFv();
extern "C" void create__10dMapInfo_cFv();
extern "C" void remove__10dMapInfo_cFv();
extern "C" void isExistMapPathData__8dMpath_cFv();
extern "C" u8 isExistMapPathData__8dMpath_cFv();
extern "C" void getTopBottomFloorNo__8dMpath_cFPScPSc();
extern "C" void createWork__8dMpath_cFv();
extern "C" void setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc();
@@ -629,18 +629,13 @@ f32 dMpath_c::mAllSizeX;
/* 80450E84-80450E88 000384 0004+00 1/1 4/4 0/0 .sbss mAllSizeZ__8dMpath_c */
f32 dMpath_c::mAllSizeZ;
/* 80450E88-80450E90 000388 0008+00 4/4 0/0 0/0 .sbss None */
/* 80450E88-80450E90 000388 0008+00 4/3 0/0 0/0 .sbss None */
static u8 data_80450E88[8];
/* 8003F758-8003F760 03A098 0008+00 2/2 1/1 0/0 .text isExistMapPathData__8dMpath_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dMpath_c::isExistMapPathData() {
nofralloc
#include "asm/d/map/d_map_path_dmap/isExistMapPathData__8dMpath_cFv.s"
/* 8003F758-8003F760 -00001 0008+00 0/0 0/0 0/0 .text isExistMapPathData__8dMpath_cFv */
u8 dMpath_c::isExistMapPathData() {
return *(u8*)(&data_80450E88);
}
#pragma pop
/* ############################################################################################## */
/* 80450630-80450634 0000B0 0004+00 0/0 1/1 2/2 .sdata mNextRoomNo__10dMapInfo_c */
src/d/menu/d_menu_collect.cpp
+12 -12
View File
@@ -19,14 +19,14 @@ struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct J3DMaterialTable {};
struct J3DModelData {};
struct J3DAnmTevRegKey {
/* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DMaterialTable {};
struct mDoExt_brkAnm {
/* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
@@ -76,10 +76,10 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct JKRArchive {};
struct J2DPane {};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -120,6 +120,14 @@ struct dMenu_save_c {
/* 801F69B8 */ void _draw();
};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
/* 800324A8 */ void checkRightTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct JKRHeap {
/* 802CE5CC */ void freeAll();
/* 802CE784 */ void getTotalFreeSize();
@@ -131,14 +139,6 @@ struct JKRExpHeap {
struct CSTControl {};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
/* 800324A8 */ void checkRightTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct dMenu_Skill_c {
/* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801F7718 */ void _move();
src/d/menu/d_menu_dmap.cpp
+10 -10
View File
@@ -50,8 +50,6 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct JKRArchive {};
struct J2DBasePosition {};
struct J2DPane {
@@ -59,6 +57,8 @@ struct J2DPane {
/* 802F76F8 */ void setBasePosition(J2DBasePosition);
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -95,8 +95,6 @@ struct dMeterHaihai_c {
/* 8020BC20 */ void setScale(f32);
};
struct JMSMesgEntry_c {};
struct ResTIMG {};
struct J2DPicture {
@@ -105,6 +103,8 @@ struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
@@ -142,10 +142,6 @@ struct dMenu_StageMapCtrl_c {
struct J2DOrthoGraph {};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 8003219C */ void checkTrigger();
@@ -155,6 +151,10 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct dMenu_ItemExplain_c {
/* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
/* 801DB470 */ void move();
@@ -162,6 +162,8 @@ struct dMenu_ItemExplain_c {
/* 801DC3C8 */ void openExplainDmap(u8, u8, u8, bool, u8);
};
struct CSTControl {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -180,8 +182,6 @@ struct J2DScreen {
/* 802F9690 */ void animation();
};
struct CSTControl {};
struct dMenu_Dmap_c {
/* 801BB498 */ dMenu_Dmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8);
/* 801BB634 */ void screenInit();
src/d/menu/d_menu_dmap_map.cpp
+2 -2
View File
@@ -47,8 +47,6 @@ struct renderingDmap_c {
/* 801C263C */ bool isRendIcon() const;
};
struct Vec {};
struct dDrawPath_c {
struct line_class {};
@@ -66,6 +64,8 @@ struct dDrawPath_c {
/* 8003CCC4 */ void drawPath();
};
struct Vec {};
struct renderingDAmap_c {
/* 8003FCC8 */ void init(u8*, u16, u16, u16, u16);
/* 8003FD08 */ void entry(f32, f32, f32, int, s8);
src/d/menu/d_menu_fishing.cpp
+2 -2
View File
@@ -36,12 +36,12 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct STControl {};
struct JKRExpHeap {};
struct CSTControl {};
struct STControl {};
struct dMenu_Fishing_c {
/* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801C4D98 */ ~dMenu_Fishing_c();
src/d/menu/d_menu_fmap.cpp
+4 -4
View File
@@ -100,16 +100,16 @@ struct dMenu_Fmap_world_data_c {
struct dMenu_Fmap_stage_data_c {};
struct STControl {
/* 8003219C */ void checkTrigger();
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct CSTControl {};
struct STControl {
/* 8003219C */ void checkTrigger();
};
struct dMenu_Fmap_c {
/* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8);
/* 801C6AC8 */ ~dMenu_Fmap_c();
src/d/menu/d_menu_fmap2D.cpp
+5 -5
View File
@@ -34,10 +34,10 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct J2DOrthoGraph {};
struct STControl {};
struct J2DOrthoGraph {};
struct dMsgScrnExplain_c {
/* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8);
/* 8023D918 */ void draw(J2DOrthoGraph*);
@@ -56,7 +56,7 @@ struct dMeter2Info_c {
struct J2DAnmTextureSRTKey {};
struct JKRArchive {};
struct JKRExpHeap {};
struct JGeometry {
template <typename A1>
@@ -69,6 +69,8 @@ struct J2DGrafContext {
/* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&);
};
struct JKRArchive {};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
@@ -76,8 +78,6 @@ struct J2DScreen {
/* 802F9690 */ void animation();
};
struct JKRExpHeap {};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80255608 */ void hide();
src/d/menu/d_menu_fmap_map.cpp
+2 -2
View File
@@ -11,8 +11,6 @@
// Types:
//
struct dMenu_Fmap_world_data_c {};
struct dDrawPath_c {
struct group_class {};
@@ -34,6 +32,8 @@ struct dMenu_Fmap_region_data_c {
/* 8003DB70 */ void getPointStagePathInnerNo(f32, f32, int, int*, int*);
};
struct dMenu_Fmap_world_data_c {};
struct renderingFmap_c {
struct palette_e {};
src/d/menu/d_menu_insect.cpp
+6 -6
View File
@@ -40,10 +40,10 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct JKRArchive {};
struct J2DPane {};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -90,10 +90,6 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct JKRExpHeap {};
struct CSTControl {};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
@@ -102,6 +98,10 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct dMenu_Insect_c {
/* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8);
/* 801D82F4 */ ~dMenu_Insect_c();
src/d/menu/d_menu_item_explain.cpp
+6 -6
View File
@@ -52,8 +52,6 @@ struct dMsgScrn3Select_c {
/* 8023A97C */ void getCharSpace();
};
struct ResTLUT {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -63,6 +61,8 @@ struct JGeometry {
struct ResTIMG {};
struct ResTLUT {};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
/* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
@@ -81,16 +81,16 @@ struct dMeter2Info_c {
struct J2DOrthoGraph {};
struct JKRExpHeap {};
struct JKRArchive {};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct JKRArchive {};
struct dMenu_ItemExplain_c {
/* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
/* 801DAFF0 */ ~dMenu_ItemExplain_c();
src/d/menu/d_menu_letter.cpp
+6 -6
View File
@@ -31,12 +31,12 @@ struct dSv_letter_info_c {
/* 8003449C */ void isLetterReadFlag(int) const;
};
struct JKRArchive {};
struct J2DPane {
/* 802F7100 */ void getBounds();
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -85,15 +85,15 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct JKRExpHeap {};
struct CSTControl {};
struct STControl {
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct dMenu_Letter_c {
/* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801DCF34 */ ~dMenu_Letter_c();
src/d/menu/d_menu_option.cpp
+2 -2
View File
@@ -32,8 +32,6 @@ struct dSv_player_config_c {
/* 8003469C */ void setVibration(u8);
};
struct JKRArchive {};
struct J2DBasePosition {};
struct J2DPane {
@@ -42,6 +40,8 @@ struct J2DPane {
/* 802F7FCC */ void animationTransform();
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
src/d/menu/d_menu_ring.cpp
+2 -2
View File
@@ -69,12 +69,12 @@ struct dMeter2Draw_c {
JUtility::TColor, JUtility::TColor, f32, u8);
};
struct STControl {};
struct JKRExpHeap {};
struct CSTControl {};
struct STControl {};
struct dMenu_Ring_c {
/* 801E9118 */ dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8);
/* 801EA708 */ ~dMenu_Ring_c();
src/d/menu/d_menu_save.cpp
+4 -4
View File
@@ -62,12 +62,12 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct JKRArchive {};
struct J2DPane {
/* 802F7FCC */ void animationTransform();
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -80,8 +80,6 @@ struct dMsgString_c {
/* 80249D28 */ ~dMsgString_c();
};
struct J2DOrthoGraph {};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 8003219C */ void checkTrigger();
@@ -91,6 +89,8 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct J2DOrthoGraph {};
struct dMsgScrnExplain_c {
/* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8);
/* 8023D7D8 */ void move();
src/d/menu/d_menu_skill.cpp
+6 -6
View File
@@ -33,10 +33,10 @@ struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct JKRArchive {};
struct J2DPane {};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -56,15 +56,15 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct JKRExpHeap {};
struct CSTControl {};
struct STControl {
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct dMenu_Skill_c {
/* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801F7348 */ ~dMenu_Skill_c();
src/d/menu/d_menu_window.cpp
+4 -4
View File
@@ -162,16 +162,16 @@ struct dMenu_save_c {
/* 801F69FC */ void _draw2();
};
struct JKRExpHeap {};
struct CSTControl {};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16);
/* 8003219C */ void checkTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct dMenu_Skill_c {
/* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801F7718 */ void _move();
src/d/meter/d_meter2_draw.cpp
+25 -25
View File
@@ -29,10 +29,6 @@ struct dMsgObject_c {
/* 8023822C */ void getStatus();
};
struct JMSMesgEntry_c {};
struct ResTLUT {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -42,11 +38,15 @@ struct JGeometry {
struct ResTIMG {};
struct ResTLUT {};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
/* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C370 */ void getStringKana(u32, char*, JMSMesgEntry_c*);
@@ -56,25 +56,6 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct JKRExpHeap {};
struct JUtility {
struct TColor {};
};
struct JKRArchive {
/* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*);
};
struct J2DGrafContext {};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
/* 802F9690 */ void animation();
};
struct J2DRotateAxis {};
struct J2DBasePosition {};
@@ -87,6 +68,25 @@ struct J2DPane {
/* 802F7FCC */ void animationTransform();
};
struct JKRExpHeap {};
struct JUtility {
struct TColor {};
};
struct J2DGrafContext {};
struct JKRArchive {
/* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*);
};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
/* 802F9690 */ void animation();
};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80254458 */ void setBlackWhite(JUtility::TColor, JUtility::TColor);
@@ -94,6 +94,8 @@ struct CPaneMgr {
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
struct J2DAnmColor {};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802555C8 */ void show();
@@ -103,8 +105,6 @@ struct CPaneMgrAlpha {
/* 80255828 */ void getAlphaRate();
};
struct J2DAnmColor {};
struct dMeter2Draw_c {
/* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*);
/* 802102F8 */ ~dMeter2Draw_c();
src/d/meter/d_meter2_info.cpp
+6 -6
View File
@@ -64,18 +64,18 @@ struct dMeterMap_c {
/* 8020D900 */ void isMapOpenCheck();
};
struct cXyz {};
struct J2DPicture {};
struct J2DTextBox {
/* 8021C7F4 */ void getFont() const;
};
struct JUTFont {};
struct J2DPicture {};
struct cXyz {};
struct JMSMesgEntry_c {};
struct JUTFont {};
struct dMeter2Info_c {
/* 8021BDDC */ dMeter2Info_c();
/* 8021BE20 */ ~dMeter2Info_c();
src/d/meter/d_meter_button.cpp
+7 -7
View File
@@ -54,22 +54,22 @@ struct dMsgObject_c {
/* 80238258 */ void getScrnDrawPtr();
};
struct JKRArchive {};
struct J2DPane {
/* 802F7100 */ void getBounds();
};
struct JKRExpHeap {};
struct J2DGrafContext {};
struct JKRArchive {};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
/* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
};
struct J2DPane {
/* 802F7100 */ void getBounds();
};
struct JKRExpHeap {};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80253930 */ CPaneMgr();
src/d/meter/d_meter_haihai.cpp
+2 -2
View File
@@ -15,12 +15,12 @@ struct dMeterSub_c {
/* 80194138 */ bool isDead();
};
struct J2DAnmTransformKey {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmColor {};
struct J2DAnmTransformKey {};
struct dMeterHaihai_c {
/* 8020AE8C */ dMeterHaihai_c(u8);
/* 8020AEF0 */ ~dMeterHaihai_c();
src/d/meter/d_meter_map.cpp
-4
View File
@@ -36,10 +36,6 @@ struct dMsgObject_c {
/* 8023822C */ void getStatus();
};
struct dMpath_c {
/* 8003F758 */ void isExistMapPathData();
};
struct J2DScreen {};
struct dMeterMap_c {
src/d/msg/d_msg_class.cpp
+6 -6
View File
@@ -19,6 +19,12 @@ struct jmessage_tControl {
/* 802299EC */ jmessage_tControl();
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct jmessage_tReference {
/* 80228B04 */ jmessage_tReference();
/* 80228CB4 */ ~jmessage_tReference();
@@ -51,12 +57,6 @@ struct jmessage_tReference {
/* 80232A20 */ void getActorPos();
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct jmessage_tSequenceProcessor {
/* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*);
/* 8022B654 */ void do_reset();
src/d/msg/d_msg_object.cpp
+4 -4
View File
@@ -13,14 +13,14 @@
struct msg_class {};
struct JKRHeap {
/* 802CE784 */ void getTotalFreeSize();
};
struct JKRArchive {
struct EMountMode {};
};
struct JKRHeap {
/* 802CE784 */ void getTotalFreeSize();
};
struct mDoDvdThd_mountXArchive_c {
/* 800161E0 */ void create(char const*, u8, JKRArchive::EMountMode, JKRHeap*);
};
src/d/particle/d_particle.cpp
+13 -13
View File
@@ -68,16 +68,8 @@ struct dPa_wbPcallBack_c {
/* 8004FECC */ ~dPa_wbPcallBack_c();
};
struct dKy_tevstr_c {};
struct _GXColor {};
struct JPAParticleCallBack {
/* 800183D4 */ void execute(JPABaseEmitter*, JPABaseParticle*);
/* 800183D8 */ void draw(JPABaseEmitter*, JPABaseParticle*);
/* 8027EFA4 */ ~JPAParticleCallBack();
};
struct JGeometry {
template <typename A1>
struct TVec3 {};
@@ -85,6 +77,8 @@ struct JGeometry {
struct TVec3__template0 {};
};
struct JPADrawInfo {};
struct JPAEmitterCallBack {
/* 80050368 */ void execute(JPABaseEmitter*);
/* 8005036C */ void draw(JPABaseEmitter*);
@@ -102,7 +96,11 @@ struct JPAResourceManager {
/* 80273FCC */ void getResUserWork(u16) const;
};
struct JPADrawInfo {};
struct JPAParticleCallBack {
/* 800183D4 */ void execute(JPABaseEmitter*, JPABaseParticle*);
/* 800183D8 */ void draw(JPABaseEmitter*, JPABaseParticle*);
/* 8027EFA4 */ ~JPAParticleCallBack();
};
struct JPAEmitterManager {
/* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8);
@@ -115,6 +113,8 @@ struct JPAEmitterManager {
/* 8027E354 */ void clearResourceManager(u8);
};
struct dKy_tevstr_c {};
struct dPa_simpleEcallBack {
/* 8004ADF4 */ dPa_simpleEcallBack();
/* 8004AE1C */ void executeAfter(JPABaseEmitter*);
@@ -385,14 +385,14 @@ struct J3DShape {
static u8 sOldVcdVatCmd[4];
};
struct J3DAnmTexPattern {
/* 8032B09C */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DAnmTevRegKey {
/* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DAnmTexPattern {
/* 8032B09C */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DMaterialTable {
/* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*);
/* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*);
src/d/particle/d_particle_copoly.cpp
+2 -2
View File
@@ -11,10 +11,10 @@
// Types:
//
struct dKy_tevstr_c {};
struct cBgS_PolyInfo {};
struct dKy_tevstr_c {};
struct csXyz {};
struct cXyz {};
src/d/shop/d_shop_system.cpp
+2 -2
View File
@@ -23,7 +23,7 @@ struct daNpcT_motionAnmData_c {};
struct daNpcT_faceMotionAnmData_c {};
struct J3DModel {};
struct J3DJoint {};
struct Vec {};
@@ -31,7 +31,7 @@ struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct J3DJoint {};
struct J3DModel {};
struct daNpcT_c {
/* 801490D4 */ void ctrlBtk();
src/f_op/f_op_actor.cpp
+2 -2
View File
@@ -63,12 +63,12 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct _GXColor {};
struct cXyz {
static f32 Zero[3];
};
struct _GXColor {};
struct csXyz {
/* 80018BD0 */ ~csXyz();
};
src/f_op/f_op_actor_mng.cpp
+3 -3
View File
@@ -93,18 +93,18 @@ struct dStage_roomControl_c {
struct dPa_levelEcallBack {};
struct dKy_tevstr_c {};
struct _GXColor {};
struct cBgS_PolyInfo {};
struct _GXColor {};
struct csXyz {
/* 802673F4 */ csXyz(s16, s16, s16);
static u8 Zero[4];
};
struct dKy_tevstr_c {};
struct dPa_control_c {
struct level_c {
/* 8004B918 */ void getEmitter(u32);
src/f_op/f_op_kankyo_mng.cpp
+4 -4
View File
@@ -15,14 +15,14 @@ struct layer_class {};
struct dPa_levelEcallBack {};
struct cXyz {};
struct dKy_tevstr_c {};
struct _GXColor {};
struct cXyz {};
struct csXyz {};
struct dKy_tevstr_c {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
src/f_pc/f_pc_layer.cpp
+5 -10
View File
@@ -41,7 +41,7 @@ extern "C" void fpcLy_CreatingMesg__FP11layer_class();
extern "C" void fpcLy_CreatedMesg__FP11layer_class();
extern "C" void fpcLy_RootLayer__Fv();
extern "C" void fpcLy_SetCurrentLayer__FP11layer_class();
extern "C" void fpcLy_CurrentLayer__Fv();
extern "C" u32 fpcLy_CurrentLayer__Fv();
extern "C" static void fpcLy_Search__FUi();
extern "C" void fpcLy_Layer__FUi();
extern "C" static void fpcLy_Regist__FP11layer_class();
@@ -227,7 +227,7 @@ asm void fpcLy_RootLayer() {
#pragma pop
/* ############################################################################################## */
/* 80450D18-80450D1C 000218 0004+00 2/2 0/0 0/0 .sbss l_fpcLy_CurrLayer_p */
/* 80450D18-80450D1C 000218 0004+00 2/1 0/0 0/0 .sbss l_fpcLy_CurrLayer_p */
static u8 l_fpcLy_CurrLayer_p[4];
/* 800216EC-800216F4 01C02C 0008+00 1/1 13/13 0/0 .text fpcLy_SetCurrentLayer__FP11layer_class */
@@ -240,15 +240,10 @@ asm void fpcLy_SetCurrentLayer(layer_class* param_0) {
}
#pragma pop
/* 800216F4-800216FC 01C034 0008+00 1/1 21/21 0/0 .text fpcLy_CurrentLayer__Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void fpcLy_CurrentLayer() {
nofralloc
#include "asm/f_pc/f_pc_layer/fpcLy_CurrentLayer__Fv.s"
/* 800216F4-800216FC -00001 0008+00 0/0 0/0 0/0 .text fpcLy_CurrentLayer__Fv */
u32 fpcLy_CurrentLayer() {
return *(u32*)(&l_fpcLy_CurrLayer_p);
}
#pragma pop
/* 800216FC-8002174C 01C03C 0050+00 1/1 0/0 0/0 .text fpcLy_Search__FUi */
#pragma push
src/init.cpp
+4 -9
View File
@@ -27,7 +27,7 @@ struct daBgObj_c {
SECTION_INIT void __check_pad3();
SECTION_INIT void __set_debug_bba();
SECTION_INIT void __get_debug_bba();
SECTION_INIT u8 __get_debug_bba();
SECTION_INIT void __start();
SECTION_INIT void __init_registers();
SECTION_INIT void __init_data();
@@ -89,15 +89,10 @@ SECTION_INIT asm void __set_debug_bba() {
}
#pragma pop
/* 8000314C-80003154 00004C 0008+00 1/1 0/0 0/0 .init __get_debug_bba */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
SECTION_INIT asm void __get_debug_bba() {
nofralloc
#include "asm/init/__get_debug_bba.s"
/* 8000314C-80003154 -00001 0008+00 0/0 0/0 0/0 .init __get_debug_bba */
SECTION_INIT u8 __get_debug_bba() {
return *(u8*)(&data_804516D0);
}
#pragma pop
/* 80003154-800032B0 000054 015C+00 0/0 1/0 0/0 .init __start */
#pragma push
src/m_Do/m_Do_Reset.cpp
+6 -15
View File
@@ -12,7 +12,7 @@
//
struct mDoRst {
/* 800157F4 */ void getResetData();
/* 800157F4 */ u32 getResetData();
static u8 mResetData[4 + 4 /* padding */];
};
@@ -44,10 +44,6 @@ struct JASTaskThread {
/* 8028FE88 */ void pause(bool);
};
struct JASDvd {
/* 8028FEFC */ void getThreadPointer();
};
//
// Forward References:
//
@@ -56,7 +52,7 @@ extern "C" static void my_OSCancelAlarmAll__Fv();
extern "C" static void destroyVideo__Fv();
extern "C" void mDoRst_reset__FiUli();
extern "C" void mDoRst_resetCallBack__FiPv();
extern "C" void getResetData__6mDoRstFv();
extern "C" u32 getResetData__6mDoRstFv();
extern "C" extern char const* const m_Do_m_Do_Reset__stringBase0;
extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" extern u8 struct_80450C80[8];
@@ -123,7 +119,7 @@ static asm void destroyVideo() {
#pragma pop
/* ############################################################################################## */
/* 80450C78-80450C80 000178 0004+04 3/3 42/42 2/2 .sbss mResetData__6mDoRst */
/* 80450C78-80450C80 000178 0004+04 3/2 42/42 2/2 .sbss mResetData__6mDoRst */
u8 mDoRst::mResetData[4 + 4 /* padding */];
/* 80015614-8001574C 00FF54 0138+00 0/0 3/3 0/0 .text mDoRst_reset__FiUli */
@@ -146,15 +142,10 @@ asm void mDoRst_resetCallBack(int param_0, void* param_1) {
}
#pragma pop
/* 800157F4-800157FC 010134 0008+00 1/1 0/0 0/0 .text getResetData__6mDoRstFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void mDoRst::getResetData() {
nofralloc
#include "asm/m_Do/m_Do_Reset/getResetData__6mDoRstFv.s"
/* 800157F4-800157FC -00001 0008+00 0/0 0/0 0/0 .text getResetData__6mDoRstFv */
u32 mDoRst::getResetData() {
return *(u32*)(&mDoRst::mResetData);
}
#pragma pop
/* ############################################################################################## */
/* 80450C80-80450C88 -00001 0008+00 0/0 6/6 0/0 .sbss None */
src/m_Do/m_Do_audio.cpp
+11 -11
View File
@@ -58,17 +58,6 @@ struct Z2MultiSeMgr {
/* 802AEB34 */ ~Z2MultiSeMgr();
};
struct JAISoundHandle {
/* 80007838 */ ~JAISoundHandle();
/* 802A2184 */ void releaseSound();
};
struct JKRSolidHeap {
/* 802D0BF4 */ void adjustSize();
};
struct JAISoundID {};
struct JGeometry {
template <typename A1>
struct TVec3 {};
@@ -76,6 +65,17 @@ struct JGeometry {
struct TVec3__template0 {};
};
struct JAISoundID {};
struct JKRSolidHeap {
/* 802D0BF4 */ void adjustSize();
};
struct JAISoundHandle {
/* 80007838 */ ~JAISoundHandle();
/* 802A2184 */ void releaseSound();
};
struct Z2AudioMgr {
/* 800073C8 */ ~Z2AudioMgr();
/* 802CD248 */ Z2AudioMgr();
src/m_Do/m_Do_controller_pad.cpp
+2 -2
View File
@@ -15,6 +15,8 @@ struct mDoRst {
static u8 mResetData[4 + 4 /* padding */];
};
struct interface_of_controller_pad {};
struct JUTGamePad {
struct EPadPort {};
@@ -35,8 +37,6 @@ struct JUTGamePad {
static u8 sAnalogMode[4];
};
struct interface_of_controller_pad {};
struct mDoCPd_c {
/* 80007954 */ void create();
/* 80007A94 */ void read();
src/m_Do/m_Do_dvd_thread.cpp
-4
View File
@@ -105,10 +105,6 @@ struct JASTaskThread {
/* 8028FB5C */ void sendCmdMsg(void (*)(void*), void const*, u32);
};
struct JASDvd {
/* 8028FEFC */ void getThreadPointer();
};
//
// Forward References:
//
src/m_Do/m_Do_ext.cpp
+69 -119
View File
@@ -54,20 +54,20 @@ struct mDoExt_invJntPacket {
};
struct J3DMaterialTable;
struct J3DAnmColor {
/* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DAnmTexPattern {
/* 8032B004 */ void searchUpdateMaterialID(J3DMaterialTable*);
struct J3DAnmTextureSRTKey {
/* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DAnmTevRegKey {
/* 8032B780 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DAnmTextureSRTKey {
/* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*);
struct J3DAnmColor {
/* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DAnmTexPattern {
/* 8032B004 */ void searchUpdateMaterialID(J3DMaterialTable*);
};
struct J3DMaterialTable {
@@ -136,12 +136,12 @@ struct mDoExt_MtxCalcAnmBlendTbl {
/* 80014F3C */ ~mDoExt_MtxCalcAnmBlendTbl();
};
struct mDoExt_McaMorfCallBack1_c {};
struct mDoExt_McaMorfCallBack2_c {};
struct J3DTransformInfo {};
struct mDoExt_McaMorfCallBack1_c {};
struct Z2Creature {
/* 802C0628 */ void initAnime(void*, bool, f32, f32);
/* 802C06D0 */ void updateAnime(f32, f32);
@@ -214,10 +214,10 @@ struct mDoExt_3DlineMatSortPacket {
struct dKy_tevstr_c {};
struct _GXColor {};
struct ResTIMG {};
struct _GXColor {};
struct mDoExt_3DlineMat1_c {
/* 80013360 */ void init(u16, u16, ResTIMG*, int);
/* 800134F8 */ void setMaterial();
@@ -236,16 +236,16 @@ struct mDoExt_3DlineMat0_c {
/* 80014E84 */ bool getMaterialID();
};
struct J3DPacket;
struct J3DDrawBuffer {
/* 8032548C */ void entryImm(J3DPacket*, u16);
};
struct J3DDrawBuffer;
struct J3DPacket {
/* 8000E680 */ ~J3DPacket();
/* 80312750 */ bool entry(J3DDrawBuffer*);
};
struct J3DDrawBuffer {
/* 8032548C */ void entryImm(J3DPacket*, u16);
};
struct dDlst_list_c {
/* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&);
};
@@ -374,10 +374,6 @@ struct J3DTevKColorAnm {};
struct J3DTevColorAnm {};
struct J3DIndTevStage {
/* 8000E14C */ J3DIndTevStage();
};
struct J3DGXColorS10 {
/* 8000E460 */ J3DGXColorS10();
};
@@ -386,6 +382,10 @@ struct J3DGXColor {
/* 8000E538 */ J3DGXColor();
};
struct J3DIndTevStage {
/* 8000E14C */ J3DIndTevStage();
};
struct J3DTevBlock {
/* 8000DBC8 */ void patchTexNoAndTexCoordScale();
/* 8000DBD4 */ void patch();
@@ -664,21 +664,21 @@ extern "C" void entryDL__21mDoExt_invisibleModelFP4cXyz();
extern "C" void mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData();
extern "C" void mDoExt_setupStageTexture__FP12J3DModelData();
extern "C" void mDoExt_createAssertHeap__FP7JKRHeap();
extern "C" void mDoExt_getAssertHeap__Fv();
extern "C" u32 mDoExt_getAssertHeap__Fv();
extern "C" void mDoExt_createDbPrintHeap__FUlP7JKRHeap();
extern "C" void mDoExt_getDbPrintHeap__Fv();
extern "C" u32 mDoExt_getDbPrintHeap__Fv();
extern "C" void mDoExt_createGameHeap__FUlP7JKRHeap();
extern "C" void mDoExt_getGameHeap__Fv();
extern "C" u32 mDoExt_getGameHeap__Fv();
extern "C" void mDoExt_createZeldaHeap__FUlP7JKRHeap();
extern "C" void mDoExt_getZeldaHeap__Fv();
extern "C" u32 mDoExt_getZeldaHeap__Fv();
extern "C" void mDoExt_createCommandHeap__FUlP7JKRHeap();
extern "C" void mDoExt_getCommandHeap__Fv();
extern "C" u32 mDoExt_getCommandHeap__Fv();
extern "C" void mDoExt_createArchiveHeap__FUlP7JKRHeap();
extern "C" void mDoExt_getArchiveHeap__Fv();
extern "C" void mDoExt_getArchiveHeapPtr__Fv();
extern "C" u32 mDoExt_getArchiveHeap__Fv();
extern "C" u32 mDoExt_getArchiveHeapPtr__Fv();
extern "C" void mDoExt_createJ2dHeap__FUlP7JKRHeap();
extern "C" void mDoExt_getJ2dHeap__Fv();
extern "C" void mDoExt_getHostIOHeap__Fv();
extern "C" u32 mDoExt_getJ2dHeap__Fv();
extern "C" u32 mDoExt_getHostIOHeap__Fv();
extern "C" static void mDoExt_createSolidHeap__FUlP7JKRHeapUl();
extern "C" void mDoExt_createSolidHeapFromGame__FUlUl();
extern "C" void mDoExt_createSolidHeapFromSystem__FUlUl();
@@ -691,7 +691,7 @@ extern "C" void mDoExt_adjustSolidHeapToSystem__FP12JKRSolidHeap();
extern "C" void mDoExt_destroySolidHeap__FP12JKRSolidHeap();
extern "C" void mDoExt_destroyExpHeap__FP10JKRExpHeap();
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
extern "C" void mDoExt_getCurrentHeap__Fv();
extern "C" u32 mDoExt_getCurrentHeap__Fv();
extern "C" void mDoExt_restoreCurrentHeap__Fv();
extern "C" void mDoExt_resIDToIndex__FP10JKRArchiveUs();
extern "C" void calc__25mDoExt_MtxCalcAnmBlendTblFv();
@@ -2506,7 +2506,7 @@ asm void mDoExt_setupStageTexture(J3DModelData* param_0) {
#pragma pop
/* ############################################################################################## */
/* 80450C20-80450C24 000120 0004+00 2/2 0/0 0/0 .sbss AssertHeap */
/* 80450C20-80450C24 000120 0004+00 2/1 0/0 0/0 .sbss AssertHeap */
static u8 AssertHeap[4];
/* 8000ECC0-8000ECE4 009600 0024+00 0/0 1/1 0/0 .text mDoExt_createAssertHeap__FP7JKRHeap
@@ -2520,18 +2520,13 @@ asm void mDoExt_createAssertHeap(JKRHeap* param_0) {
}
#pragma pop
/* 8000ECE4-8000ECEC 009624 0008+00 0/0 3/3 0/0 .text mDoExt_getAssertHeap__Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void mDoExt_getAssertHeap() {
nofralloc
#include "asm/m_Do/m_Do_ext/mDoExt_getAssertHeap__Fv.s"
/* 8000ECE4-8000ECEC -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getAssertHeap__Fv */
u32 mDoExt_getAssertHeap() {
return *(u32*)(&AssertHeap);
}
#pragma pop
/* ############################################################################################## */
/* 80450C24-80450C28 000124 0004+00 2/2 0/0 0/0 .sbss DbPrintHeap */
/* 80450C24-80450C28 000124 0004+00 2/1 0/0 0/0 .sbss DbPrintHeap */
static u8 DbPrintHeap[4];
/* 8000ECEC-8000ED14 00962C 0028+00 0/0 1/1 0/0 .text mDoExt_createDbPrintHeap__FUlP7JKRHeap */
@@ -2544,18 +2539,13 @@ asm void mDoExt_createDbPrintHeap(u32 param_0, JKRHeap* param_1) {
}
#pragma pop
/* 8000ED14-8000ED1C 009654 0008+00 0/0 1/1 0/0 .text mDoExt_getDbPrintHeap__Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void mDoExt_getDbPrintHeap() {
nofralloc
#include "asm/m_Do/m_Do_ext/mDoExt_getDbPrintHeap__Fv.s"
/* 8000ED14-8000ED1C -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getDbPrintHeap__Fv */
u32 mDoExt_getDbPrintHeap() {
return *(u32*)(&DbPrintHeap);
}
#pragma pop
/* ############################################################################################## */
/* 80450C28-80450C2C 000128 0004+00 2/2 3/3 0/0 .sbss gameHeap */
/* 80450C28-80450C2C 000128 0004+00 2/1 3/3 0/0 .sbss gameHeap */
extern u8 gameHeap[4];
u8 gameHeap[4];
@@ -2570,18 +2560,13 @@ asm void mDoExt_createGameHeap(u32 param_0, JKRHeap* param_1) {
}
#pragma pop
/* 8000ED50-8000ED58 009690 0008+00 3/3 10/10 1/1 .text mDoExt_getGameHeap__Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void mDoExt_getGameHeap() {
nofralloc
#include "asm/m_Do/m_Do_ext/mDoExt_getGameHeap__Fv.s"
/* 8000ED50-8000ED58 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getGameHeap__Fv */
u32 mDoExt_getGameHeap() {
return *(u32*)(&gameHeap);
}
#pragma pop
/* ############################################################################################## */
/* 80450C2C-80450C30 00012C 0004+00 2/2 3/3 0/0 .sbss zeldaHeap */
/* 80450C2C-80450C30 00012C 0004+00 2/1 3/3 0/0 .sbss zeldaHeap */
extern u8 zeldaHeap[4];
u8 zeldaHeap[4];
@@ -2595,18 +2580,13 @@ asm void mDoExt_createZeldaHeap(u32 param_0, JKRHeap* param_1) {
}
#pragma pop
/* 8000ED80-8000ED88 0096C0 0008+00 4/4 4/4 0/0 .text mDoExt_getZeldaHeap__Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void mDoExt_getZeldaHeap() {
nofralloc
#include "asm/m_Do/m_Do_ext/mDoExt_getZeldaHeap__Fv.s"
/* 8000ED80-8000ED88 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getZeldaHeap__Fv */
u32 mDoExt_getZeldaHeap() {
return *(u32*)(&zeldaHeap);
}
#pragma pop
/* ############################################################################################## */
/* 80450C30-80450C34 000130 0004+00 2/2 1/1 0/0 .sbss commandHeap */
/* 80450C30-80450C34 000130 0004+00 2/1 1/1 0/0 .sbss commandHeap */
extern u8 commandHeap[4];
u8 commandHeap[4];
@@ -2620,18 +2600,13 @@ asm void mDoExt_createCommandHeap(u32 param_0, JKRHeap* param_1) {
}
#pragma pop
/* 8000EDB0-8000EDB8 0096F0 0008+00 0/0 6/6 0/0 .text mDoExt_getCommandHeap__Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void mDoExt_getCommandHeap() {
nofralloc
#include "asm/m_Do/m_Do_ext/mDoExt_getCommandHeap__Fv.s"
/* 8000EDB0-8000EDB8 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getCommandHeap__Fv */
u32 mDoExt_getCommandHeap() {
return *(u32*)(&commandHeap);
}
#pragma pop
/* ############################################################################################## */
/* 80450C34-80450C38 000134 0004+00 3/3 5/5 0/0 .sbss archiveHeap */
/* 80450C34-80450C38 000134 0004+00 3/1 5/5 0/0 .sbss archiveHeap */
extern u8 archiveHeap[4];
u8 archiveHeap[4];
@@ -2645,28 +2620,18 @@ asm void mDoExt_createArchiveHeap(u32 param_0, JKRHeap* param_1) {
}
#pragma pop
/* 8000EDEC-8000EDF4 00972C 0008+00 0/0 18/18 1/1 .text mDoExt_getArchiveHeap__Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void mDoExt_getArchiveHeap() {
nofralloc
#include "asm/m_Do/m_Do_ext/mDoExt_getArchiveHeap__Fv.s"
/* 8000EDEC-8000EDF4 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getArchiveHeap__Fv */
u32 mDoExt_getArchiveHeap() {
return *(u32*)(&archiveHeap);
}
#pragma pop
/* 8000EDF4-8000EDFC 009734 0008+00 0/0 1/1 0/0 .text mDoExt_getArchiveHeapPtr__Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void mDoExt_getArchiveHeapPtr() {
nofralloc
#include "asm/m_Do/m_Do_ext/mDoExt_getArchiveHeapPtr__Fv.s"
/* 8000EDF4-8000EDFC -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getArchiveHeapPtr__Fv */
u32 mDoExt_getArchiveHeapPtr() {
return *(u32*)(&archiveHeap);
}
#pragma pop
/* ############################################################################################## */
/* 80450C38-80450C3C 000138 0004+00 2/2 0/0 0/0 .sbss j2dHeap */
/* 80450C38-80450C3C 000138 0004+00 2/1 0/0 0/0 .sbss j2dHeap */
static u8 j2dHeap[4];
/* 8000EDFC-8000EE30 00973C 0034+00 0/0 1/1 0/0 .text mDoExt_createJ2dHeap__FUlP7JKRHeap
@@ -2680,29 +2645,19 @@ asm void mDoExt_createJ2dHeap(u32 param_0, JKRHeap* param_1) {
}
#pragma pop
/* 8000EE30-8000EE38 009770 0008+00 0/0 7/7 0/0 .text mDoExt_getJ2dHeap__Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void mDoExt_getJ2dHeap() {
nofralloc
#include "asm/m_Do/m_Do_ext/mDoExt_getJ2dHeap__Fv.s"
/* 8000EE30-8000EE38 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getJ2dHeap__Fv */
u32 mDoExt_getJ2dHeap() {
return *(u32*)(&j2dHeap);
}
#pragma pop
/* ############################################################################################## */
/* 80450C3C-80450C40 00013C 0004+00 1/1 0/0 0/0 .sbss HostIOHeap */
/* 80450C3C-80450C40 00013C 0004+00 1/0 0/0 0/0 .sbss HostIOHeap */
static u8 HostIOHeap[4];
/* 8000EE38-8000EE40 009778 0008+00 0/0 1/1 0/0 .text mDoExt_getHostIOHeap__Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void mDoExt_getHostIOHeap() {
nofralloc
#include "asm/m_Do/m_Do_ext/mDoExt_getHostIOHeap__Fv.s"
/* 8000EE38-8000EE40 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getHostIOHeap__Fv */
u32 mDoExt_getHostIOHeap() {
return *(u32*)(&HostIOHeap);
}
#pragma pop
/* 8000EE40-8000EED8 009780 0098+00 3/3 0/0 0/0 .text mDoExt_createSolidHeap__FUlP7JKRHeapUl */
#pragma push
@@ -2837,15 +2792,10 @@ asm void mDoExt_setCurrentHeap(JKRHeap* param_0) {
}
#pragma pop
/* 8000F1EC-8000F1F4 009B2C 0008+00 0/0 4/4 0/0 .text mDoExt_getCurrentHeap__Fv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void mDoExt_getCurrentHeap() {
nofralloc
#include "asm/m_Do/m_Do_ext/mDoExt_getCurrentHeap__Fv.s"
/* 8000F1EC-8000F1F4 -00001 0008+00 0/0 0/0 0/0 .text mDoExt_getCurrentHeap__Fv */
u32 mDoExt_getCurrentHeap() {
return *(u32*)(&JKRHeap::sCurrentHeap);
}
#pragma pop
/* 8000F1F4-8000F220 009B34 002C+00 1/1 9/9 0/0 .text mDoExt_restoreCurrentHeap__Fv */
#pragma push
src/m_Do/m_Do_graphic.cpp
+2 -2
View File
@@ -76,10 +76,10 @@ struct dDlst_shadowControl_c {
/* 80055A14 */ void draw(f32 (*)[4]);
};
struct J3DDrawBuffer {};
struct dDlst_base_c {};
struct J3DDrawBuffer {};
struct dDlst_list_c {
/* 80056390 */ void init();
/* 80056538 */ void reset();
src/msg/scrn/d_msg_scrn_3select.cpp
+2 -2
View File
@@ -11,13 +11,13 @@
// Types:
//
struct JKRArchive {};
struct J2DPane {
/* 802F7100 */ void getBounds();
/* 802F7FCC */ void animationTransform();
};
struct JKRArchive {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
src/msg/scrn/d_msg_scrn_explain.cpp
+2 -2
View File
@@ -20,14 +20,14 @@ struct dMsgString_c {
/* 80249D28 */ ~dMsgString_c();
};
struct J2DOrthoGraph {};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct J2DOrthoGraph {};
struct dMsgScrnExplain_c {
/* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8);
/* 8023D538 */ ~dMsgScrnExplain_c();
src/msg/scrn/d_msg_scrn_item.cpp
+2 -2
View File
@@ -18,10 +18,10 @@ struct dMsgScrnLight_c {
struct J2DAnmTextureSRTKey {};
struct JKRExpHeap {};
struct J2DAnmColor {};
struct JKRExpHeap {};
struct dMsgScrnItem_c {
/* 8023E79C */ dMsgScrnItem_c(u8, u8, JKRExpHeap*);
/* 8023F51C */ ~dMsgScrnItem_c();