mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-26 00:14:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dol2asm_fullsplitt' into new-disasm-codecopy

Browse Source
This commit is contained in:
lepelog
2021-04-08 15:15:40 +02:00
parent ad23c0e24b cad608c551
commit d9859d41ed
1751 changed files with 78241 additions and 66159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DynamicLink.cpp
+17 -5
View File
@@ -66,6 +66,9 @@ struct DynamicModuleControlBase {
/* 802631FC */ void dump2();
/* 80263200 */ void getModuleTypeString() const;
/* 80263210 */ bool getModuleSize() const;
static u8 mFirst[4];
static u8 mLast[4];
};
struct DynamicModuleControl {
@@ -83,6 +86,10 @@ struct DynamicModuleControl {
/* 80263000 */ void getModuleSize() const;
/* 80263070 */ void getModuleTypeString() const;
/* 80263218 */ void getModuleName() const;
static u8 sAllocBytes[4];
static u8 sArchive[4];
static u8 sFileCache[4 + 4 /* padding */];
};
//
@@ -124,6 +131,11 @@ extern "C" void getModuleTypeString__24DynamicModuleControlBaseCFv();
extern "C" bool getModuleSize__24DynamicModuleControlBaseCFv();
extern "C" void getModuleName__20DynamicModuleControlCFv();
extern "C" extern char const* const DynamicLink__stringBase0;
extern "C" u8 mFirst__24DynamicModuleControlBase[4];
extern "C" u8 mLast__24DynamicModuleControlBase[4];
extern "C" u8 sAllocBytes__20DynamicModuleControl[4];
extern "C" u8 sArchive__20DynamicModuleControl[4];
extern "C" u8 sFileCache__20DynamicModuleControl[4 + 4 /* padding */];
//
// External References:
@@ -211,11 +223,11 @@ SECTION_DATA extern void* __vt__24DynamicModuleControlBase[13] = {
/* 80451138-8045113C 000638 0004+00 3/3 0/0 0/0 .sbss mFirst__24DynamicModuleControlBase
*/
static u8 mFirst__24DynamicModuleControlBase[4];
u8 DynamicModuleControlBase::mFirst[4];
/* 8045113C-80451140 00063C 0004+00 2/2 0/0 0/0 .sbss mLast__24DynamicModuleControlBase
*/
static u8 mLast__24DynamicModuleControlBase[4];
u8 DynamicModuleControlBase::mLast[4];
/* 802621CC-80262284 25CB0C 00B8+00 1/0 2/2 0/0 .text __dt__24DynamicModuleControlBaseFv
*/
@@ -316,14 +328,14 @@ asm DynamicModuleControl::DynamicModuleControl(char const* param_0) {
/* ############################################################################################## */
/* 80451140-80451144 000640 0004+00 3/3 0/0 0/0 .sbss sAllocBytes__20DynamicModuleControl
*/
static u8 sAllocBytes__20DynamicModuleControl[4];
u8 DynamicModuleControl::sAllocBytes[4];
/* 80451144-80451148 000644 0004+00 3/3 0/0 0/0 .sbss sArchive__20DynamicModuleControl */
static u8 sArchive__20DynamicModuleControl[4];
u8 DynamicModuleControl::sArchive[4];
/* 80451148-80451150 000648 0004+04 3/3 0/0 0/0 .sbss sFileCache__20DynamicModuleControl
*/
static u8 sFileCache__20DynamicModuleControl[4 + 4 /* padding */];
u8 DynamicModuleControl::sFileCache[4 + 4 /* padding */];
/* 802626D0-8026275C 25D010 008C+00 1/1 0/0 0/0 .text mountCallback__20DynamicModuleControlFPv */
#pragma push
src/a/npc/d_a_npc_cd.cpp
+24 -11
View File
@@ -16,21 +16,23 @@ struct request_of_phase_process_class {};
struct mDoMtx_stack_c {
/* 8000CD9C */ void transM(f32, f32, f32);
/* 8000CE38 */ void scaleM(f32, f32, f32);
static u8 now[48];
};
struct mDoHIO_entry_c {
/* 8015791C */ ~mDoHIO_entry_c();
};
struct J3DModelData {};
struct mDoExt_McaMorfCallBack2_c {};
struct J3DAnmTransform {};
struct mDoExt_McaMorfCallBack1_c {};
struct Z2Creature {};
struct J3DModelData {};
struct mDoExt_McaMorfCallBack1_c {};
struct J3DAnmTransform {};
struct mDoExt_McaMorfSO {
/* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
@@ -50,10 +52,10 @@ struct daPy_py_c {
/* 8015F424 */ void checkNowWolfEyeUp();
};
struct J3DAnmTransformKey {};
struct J3DJoint {};
struct J3DAnmTransformKey {};
struct J3DModel {};
struct daNpcCd_c {
@@ -74,6 +76,8 @@ struct daNpcCd_c {
/* 8015736C */ void setHitodamaParticle();
/* 80157524 */ void getNpcMdlDataP(int);
/* 80157588 */ void getObjMdlDataP(int);
static u8 const m_cylDat[68];
};
struct daNpcCd_HIO_c {
@@ -138,6 +142,14 @@ struct Z2CreatureCitizen {
/* 802C0D48 */ void setMdlType(s8, bool, bool);
};
struct JMath {
static u8 sincosTable_[65536];
};
struct J3DSys {
static u8 mCurrentMtx[48];
};
//
// Forward References:
//
@@ -169,6 +181,7 @@ extern "C" void __dt__18fOpAcm_HIO_entry_cFv();
extern "C" void __dt__14mDoHIO_entry_cFv();
extern "C" void __dt__13daNpcCd_HIO_cFv();
extern "C" void __sinit_d_a_npc_cd_cpp();
extern "C" u8 const m_cylDat__9daNpcCd_c[68];
extern "C" extern char const* const a_npc_d_a_npc_cd__stringBase0;
//
@@ -217,12 +230,12 @@ extern "C" void _restgpr_22();
extern "C" void _restgpr_26();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 mCurrentMtx__6J3DSys[48];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 mCurrentMtx__6J3DSys[48];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u8 data_80450FF8[8];
//
@@ -629,14 +642,14 @@ SECTION_RODATA static void* const l_bckTbl_W[20] = {
COMPILER_STRIP_GATE(80392DC8, &l_bckTbl_W);
/* 80392E18-80392E5C 01F478 0044+00 0/0 0/0 1/1 .rodata m_cylDat__9daNpcCd_c */
SECTION_RODATA extern u8 const m_cylDat__9daNpcCd_c[68] = {
SECTION_RODATA u8 const daNpcCd_c::m_cylDat[68] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80392E18, &m_cylDat__9daNpcCd_c);
COMPILER_STRIP_GATE(80392E18, &daNpcCd_c::m_cylDat);
/* 80392E5C-80392FC4 01F4BC 0168+00 1/1 0/0 0/0 .rodata a_transScaleTbl$3984 */
SECTION_RODATA static u8 const a_transScaleTbl[360] = {
src/a/npc/d_a_npc_cd2.cpp
+33 -16
View File
@@ -13,19 +13,21 @@
struct request_of_phase_process_class {};
struct cXyz {
/* 80009184 */ ~cXyz();
};
struct csXyz {
/* 802673F4 */ csXyz(s16, s16, s16);
};
struct cXyz {
/* 80009184 */ ~cXyz();
};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CDD4 */ void transM(cXyz const&);
/* 8000CE38 */ void scaleM(f32, f32, f32);
/* 8000CF44 */ void ZXYrotM(csXyz const&);
static u8 now[48];
};
struct J3DAnmTexPattern {};
@@ -39,15 +41,15 @@ struct mDoExt_btpAnm {
/* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
};
struct J3DModelData {};
struct mDoExt_McaMorfCallBack2_c {};
struct J3DAnmTransform {};
struct mDoExt_McaMorfCallBack1_c {};
struct Z2Creature {};
struct J3DModelData {};
struct mDoExt_McaMorfCallBack1_c {};
struct J3DAnmTransform {};
struct mDoExt_McaMorfSO {
/* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
@@ -65,10 +67,10 @@ struct daPy_py_c {
/* 8015F424 */ void checkNowWolfEyeUp();
};
struct J3DAnmTransformKey {};
struct J3DJoint {};
struct J3DAnmTransformKey {};
struct J3DModel {};
struct daNpcCd2_c {
@@ -94,6 +96,8 @@ struct daNpcCd2_c {
/* 801598E8 */ void getNpcMdlDataP(int);
/* 8015994C */ void getObjMdlDataP(int);
/* 801599C4 */ void getTexAnmP(int);
static u8 const m_cylDat[68];
};
struct daNpcCd2_HIO_c {
@@ -145,6 +149,10 @@ struct dPa_control_c {
_GXColor const*, cXyz const*, f32);
};
struct dDlst_shadowControl_c {
static u8 mSimpleTexObj[32];
};
struct cBgS_PolyInfo {};
struct dBgS {
@@ -175,6 +183,14 @@ struct PathTrace_c {
/* 8015A3E4 */ void checkObstacleSub(fopAc_ac_c*);
};
struct JMath {
static u8 sincosTable_[65536];
};
struct J3DSys {
static u8 mCurrentMtx[48];
};
struct J3DFrameCtrl {
/* 803283FC */ void init(s16);
};
@@ -228,6 +244,7 @@ extern "C" void __dt__21daNpcCd2_HIO_MChild_cFv();
extern "C" void __ct__21daNpcCd2_HIO_MChild_cFv();
extern "C" void __dt__14daNpcCd2_HIO_cFv();
extern "C" void __sinit_d_a_npc_cd2_cpp();
extern "C" u8 const m_cylDat__10daNpcCd2_c[68];
extern "C" extern char const* const a_npc_d_a_npc_cd2__stringBase0;
extern "C" extern u8 data_80451010[8];
@@ -305,13 +322,13 @@ extern "C" void pow();
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* __vt__18fOpAcm_HIO_entry_c[3];
extern "C" extern void* __vt__14mDoHIO_entry_c[3];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 mCurrentMtx__6J3DSys[48];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 mCurrentMtx__6J3DSys[48];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
//
@@ -814,14 +831,14 @@ SECTION_RODATA static void* const l_bckTbl_W[108] = {
COMPILER_STRIP_GATE(803937A0, &l_bckTbl_W);
/* 80393950-80393994 01FFB0 0044+00 0/0 0/0 4/4 .rodata m_cylDat__10daNpcCd2_c */
SECTION_RODATA extern u8 const m_cylDat__10daNpcCd2_c[68] = {
SECTION_RODATA u8 const daNpcCd2_c::m_cylDat[68] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80393950, &m_cylDat__10daNpcCd2_c);
COMPILER_STRIP_GATE(80393950, &daNpcCd2_c::m_cylDat);
/* 80393994-80393AFC 01FFF4 0168+00 1/1 0/0 0/0 .rodata a_transScaleTbl$3998 */
SECTION_RODATA static u8 const a_transScaleTbl[360] = {
src/a/obj/d_a_obj_item.cpp
+35 -11
View File
@@ -13,6 +13,8 @@
struct request_of_phase_process_class {};
struct csXyz {};
struct Vec {};
struct cXyz {
@@ -23,12 +25,12 @@ struct cXyz {
/* 8026706C */ bool operator!=(Vec const&) const;
};
struct csXyz {};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CD9C */ void transM(f32, f32, f32);
/* 8000CF44 */ void ZXYrotM(csXyz const&);
static u8 now[48];
};
struct fopAc_ac_c {
@@ -101,6 +103,10 @@ struct daItem_c {
/* 8015DBF0 */ void initScale();
/* 8015DC40 */ void initSpeed(int);
/* 8015DE38 */ void initAngle();
static u8 mFuncPtr[120];
static u8 m_cyl_src[68];
static u32 m_timer_max[1 + 1 /* padding */];
};
struct daItemBase_c {
@@ -125,6 +131,8 @@ struct daItemBase_c {
/* 801451B4 */ void getCollisionH();
/* 801451D0 */ void getCollisionR();
/* 8015B0B8 */ void getData();
static u8 const m_data[56];
};
struct dSv_player_get_item_c {
@@ -160,6 +168,11 @@ struct dPa_control_c {
cXyz const*, f32);
};
struct dItem_data {
static void* field_item_res[1020];
static u8 item_info[1020 + 4 /* padding */];
};
struct dEvt_control_c {
/* 80042468 */ void reset();
/* 800436EC */ void setPtI_Id(unsigned int);
@@ -249,6 +262,14 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JMath {
static u8 sincosTable_[65536];
};
//
// Forward References:
//
@@ -318,6 +339,9 @@ extern "C" void __sinit_d_a_obj_item_cpp();
extern "C" void getItemPos__9daPy_py_cCFv();
extern "C" void getLeftHandPos__9daPy_py_cCFv();
extern "C" extern char const* const a_obj_d_a_obj_item__stringBase0;
extern "C" u8 mFuncPtr__8daItem_c[120];
extern "C" u8 m_cyl_src__8daItem_c[68];
extern "C" u32 m_timer_max__8daItem_c[1 + 1 /* padding */];
//
// External References:
@@ -429,7 +453,7 @@ extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 const m_data__12daItemBase_c[56];
extern "C" u8 const m_data__12daItemBase_c[56];
extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */];
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* __vt__8cM3dGPla[3];
@@ -438,21 +462,21 @@ extern "C" extern void* __vt__8cM3dGCyl[3];
extern "C" extern void* __vt__8cM3dGAab[3];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* field_item_res__10dItem_data[1020];
extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */];
extern "C" void* field_item_res__10dItem_data[1020];
extern "C" u8 item_info__10dItem_data[1020 + 4 /* padding */];
extern "C" extern void* __vt__12dBgS_ObjAcch[9];
extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" extern void* __vt__16Z2SoundObjSimple[8];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern u8 data_80451010[8];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
@@ -715,7 +739,7 @@ SECTION_DATA static void* lit_5248[3] = {
#pragma pop
/* 803B9E98-803B9F10 016FB8 0078+00 1/2 0/0 0/0 .data mFuncPtr__8daItem_c */
SECTION_DATA static u8 mFuncPtr__8daItem_c[120] = {
SECTION_DATA u8 daItem_c::mFuncPtr[120] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -727,7 +751,7 @@ SECTION_DATA static u8 mFuncPtr__8daItem_c[120] = {
};
/* 803B9F10-803B9F54 017030 0044+00 1/1 0/0 0/0 .data m_cyl_src__8daItem_c */
SECTION_DATA static u8 m_cyl_src__8daItem_c[68] = {
SECTION_DATA u8 daItem_c::m_cyl_src[68] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x59,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1302,7 +1326,7 @@ asm void daItem_c::set_bound_se() {
/* ############################################################################################## */
/* 804506A8-804506B0 000128 0004+04 1/1 0/0 0/0 .sdata m_timer_max__8daItem_c */
SECTION_SDATA static u32 m_timer_max__8daItem_c[1 + 1 /* padding */] = {
SECTION_SDATA u32 daItem_c::m_timer_max[1 + 1 /* padding */] = {
0x00002710,
/* padding */
0x00000000,
src/c/c_damagereaction.cpp
+2 -2
View File
@@ -13,10 +13,10 @@
struct fopAc_ac_c {};
struct JPABaseEmitter {};
struct JPABaseParticle {};
struct JPABaseEmitter {};
struct JPTraceParticleCallBack4 {
/* 8001817C */ void execute(JPABaseEmitter*, JPABaseParticle*);
/* 800182A4 */ void draw(JPABaseEmitter*, JPABaseParticle*);
src/d/a/d_a_alink.cpp
+971 -320
View File
File diff suppressed because it is too large Load Diff
src/d/a/d_a_horse_static.cpp
+6 -3
View File
@@ -21,6 +21,10 @@ struct e_wb_class {
/* 80037DBC */ void setRunRideMode();
};
struct daTagHstop_c {
static u8 m_top[4 + 4 /* padding */];
};
struct Z2CreatureRide {
/* 802C522C */ void setLinkRiding(bool);
};
@@ -36,7 +40,7 @@ extern "C" void getOff__10e_wb_classFv();
extern "C" void checkDownDamage__10e_wb_classFv();
extern "C" void checkNormalRideMode__10e_wb_classCFv();
extern "C" void setRunRideMode__10e_wb_classFv();
extern "C" extern u8 m_top__12daTagHstop_c[4 + 4 /* padding */];
extern "C" u8 m_top__12daTagHstop_c[4 + 4 /* padding */];
//
// External References:
@@ -120,5 +124,4 @@ asm void e_wb_class::setRunRideMode() {
/* ############################################################################################## */
/* 80450DF8-80450E00 0002F8 0004+04 0/0 1/1 3/3 .sbss m_top__12daTagHstop_c */
extern u8 m_top__12daTagHstop_c[4 + 4 /* padding */];
u8 m_top__12daTagHstop_c[4 + 4 /* padding */];
u8 daTagHstop_c::m_top[4 + 4 /* padding */];
src/d/a/d_a_itembase.cpp
+16 -7
View File
@@ -13,10 +13,10 @@
struct request_of_phase_process_class {};
struct J3DAnmTexPattern {};
struct J3DMaterialTable {};
struct J3DAnmTexPattern {};
struct mDoExt_btpAnm {
/* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16);
/* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
@@ -43,10 +43,10 @@ struct mDoExt_bpkAnm {
/* 8000D518 */ void entry(J3DMaterialTable*, f32);
};
struct J3DAnmTransform {};
struct J3DModelData {};
struct J3DAnmTransform {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D9CC */ void entry(J3DModelData*, f32);
@@ -96,6 +96,15 @@ struct dRes_control_c {
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
};
struct dItem_data {
static void* item_resource[1530];
static u8 item_info[1020 + 4 /* padding */];
};
struct dDlst_shadowControl_c {
static u8 mSimpleTexObj[32];
};
struct cBgS_PolyInfo {};
struct _GXTexObj {};
@@ -164,10 +173,10 @@ extern "C" void _restfpr_27();
extern "C" void _savegpr_21();
extern "C" void _restgpr_21();
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* item_resource__10dItem_data[1530];
extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */];
extern "C" void* item_resource__10dItem_data[1530];
extern "C" u8 item_info__10dItem_data[1020 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
src/d/a/d_a_itembase_static.cpp
+12 -5
View File
@@ -22,6 +22,13 @@ struct daItemBase_c {
/* 80037AE4 */ void dead();
/* 80037AF4 */ void chkDead();
/* 8014475C */ void CreateItemHeap(char const*, s16, s16, s16, s16, s16, s16, s16);
static u8 const m_data[56];
};
struct dItem_data {
static void* item_resource[1530];
static void* field_item_res[1020];
};
//
@@ -37,15 +44,15 @@ extern "C" void dead__12daItemBase_cFv();
extern "C" void chkDead__12daItemBase_cFv();
extern "C" void CheckItemCreateHeap__FP10fopAc_ac_c();
extern "C" void CheckFieldItemCreateHeap__FP10fopAc_ac_c();
extern "C" extern u8 const m_data__12daItemBase_c[56];
extern "C" u8 const m_data__12daItemBase_c[56];
//
// External References:
//
extern "C" void CreateItemHeap__12daItemBase_cFPCcsssssss();
extern "C" extern void* item_resource__10dItem_data[1530];
extern "C" extern void* field_item_res__10dItem_data[1020];
extern "C" void* item_resource__10dItem_data[1530];
extern "C" void* field_item_res__10dItem_data[1020];
//
// Declarations:
@@ -144,10 +151,10 @@ asm void CheckFieldItemCreateHeap(fopAc_ac_c* param_0) {
/* ############################################################################################## */
/* 803792B0-803792E8 005910 0038+00 0/0 1/1 0/0 .rodata m_data__12daItemBase_c */
SECTION_RODATA extern u8 const m_data__12daItemBase_c[56] = {
SECTION_RODATA u8 const daItemBase_c::m_data[56] = {
0xC0, 0x90, 0x00, 0x00, 0x3F, 0x1E, 0xB8, 0x52, 0x42, 0x34, 0x00, 0x00, 0x41, 0x20,
0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, 0x00, 0x01, 0x00, 0xF0, 0x00, 0x3C, 0x0F, 0xA0,
0x00, 0x78, 0x00, 0x00, 0xC0, 0x80, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, 0x04, 0x4C,
0x0B, 0xB8, 0x41, 0xB8, 0x00, 0x00, 0xC0, 0xC0, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x0A,
};
COMPILER_STRIP_GATE(803792B0, &m_data__12daItemBase_c);
COMPILER_STRIP_GATE(803792B0, &daItemBase_c::m_data);
src/d/a/d_a_no_chg_room.cpp
+13 -3
View File
@@ -13,6 +13,10 @@
struct process_node_class {};
struct mDoMtx_stack_c {
static u8 now[48];
};
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
};
@@ -21,6 +25,8 @@ struct cXyz {};
struct fopAcM_gc_c {
/* 8001DCBC */ void gndCheck(cXyz const*);
static u8 mGndCheck[84];
};
struct daNocrm_c {
@@ -28,6 +34,10 @@ struct daNocrm_c {
/* 80145508 */ void getRoomNo(int);
};
struct dStage_roomControl_c {
static u8 mStatus[65792];
};
struct cBgS_PolyInfo {};
struct dBgS {
@@ -68,9 +78,9 @@ extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mGndCheck__11fopAcM_gc_c[84];
extern "C" u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 data_804505F0[8];
extern "C" extern u8 data_80450D68[4];
src/d/a/d_a_npc.cpp
+111 -48
View File
@@ -13,6 +13,14 @@
struct request_of_phase_process_class {};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 80112C80 */ csXyz();
/* 8026745C */ void operator+=(csXyz&);
static u8 Zero[4];
};
struct Vec {};
struct cXyz {
@@ -24,12 +32,6 @@ struct cXyz {
/* 802670AC */ void isZero() const;
};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 80112C80 */ csXyz();
/* 8026745C */ void operator+=(csXyz&);
};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CD9C */ void transM(f32, f32, f32);
@@ -38,18 +40,20 @@ struct mDoMtx_stack_c {
/* 8000CED4 */ void XYZrotM(csXyz const&);
/* 8000CF0C */ void ZXYrotS(csXyz const&);
/* 8000CF44 */ void ZXYrotM(csXyz const&);
static u8 now[48];
};
struct mDoExt_morf_c {
/* 8000FB7C */ void setMorf(f32);
};
struct J3DAnmColor {};
struct J3DAnmTexPattern {};
struct J3DAnmTevRegKey {};
struct J3DAnmColor {};
struct J3DAnmTextureSRTKey {};
struct J3DMaterialTable {
@@ -79,10 +83,10 @@ struct mDoExt_bpkAnm {
/* 8000D518 */ void entry(J3DMaterialTable*, f32);
};
struct J3DAnmTransform {};
struct J3DModelData {};
struct J3DAnmTransform {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D990 */ void changeBckOnly(J3DAnmTransform*);
@@ -116,21 +120,21 @@ struct daNpcT_motionAnmData_c {};
struct daNpcT_faceMotionAnmData_c {};
struct J3DAnmTransformKey {};
struct dCcD_GObjInf {
/* 80084460 */ void ChkTgHit();
};
struct J3DModel {};
struct _GXColorS10 {};
struct J3DFrameCtrl {
/* 803283FC */ void init(s16);
};
struct _GXColorS10 {};
struct J3DJoint {};
struct dCcD_GObjInf {
/* 80084460 */ void ChkTgHit();
};
struct J3DAnmTransformKey {};
struct daNpcT_c {
/* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
@@ -232,6 +236,13 @@ struct daNpcT_c {
/* 8014D0A8 */ bool getEyeballLMaterialNo();
/* 8014D0B0 */ bool getEyeballRMaterialNo();
/* 8014D0B8 */ bool getEyeballMaterialNo();
static u8 const mCcDObjData[48];
static u8 mCcDCyl[68];
static u8 mCcDSph[64];
static u8 mFindActorPtrs[200];
static u8 mSrchName[2 + 2 /* padding */];
static u8 mFindCount[4];
};
struct daNpcT_Hermite_c {
@@ -355,6 +366,13 @@ struct daNpcF_c {
/* 80155BF0 */ void setExpression(int, f32);
/* 80155BF4 */ ~daNpcF_c();
/* 80155EC8 */ bool setExpressionBtp(int);
static u8 const mCcDObjInfo[48];
static u8 mCcDCyl[68];
static u8 mCcDSph[64];
static u8 mFindActorPList[400];
static u8 mFindCount[4];
static u8 mSrchActorName[2 + 2 /* padding */];
};
struct dPath {};
@@ -457,6 +475,10 @@ struct daBaseNpc_moveBgActor_c {
/* 801503EC */ bool ToFore();
/* 801503F4 */ bool ToBack();
/* 80155FB0 */ ~daBaseNpc_moveBgActor_c();
static u8 m_name[4];
static u8 m_dzb_id[4];
static u8 m_set_func[4];
};
struct daBaseNpc_matAnm_c {
@@ -502,6 +524,10 @@ struct daBaseNpc_c {
/* 8014F4A4 */ void setAttnPos();
/* 8014F4A8 */ void drawOtherMdls();
/* 8014F4AC */ bool dbgDraw();
static u8 const mCcDObj[48];
static u8 mCcDCyl[68];
static u8 mCcDSph[64];
};
struct daBaseNpc_acMngr_c {
@@ -511,6 +537,14 @@ struct daBaseNpc_acMngr_c {
/* 80150524 */ ~daBaseNpc_acMngr_c();
};
struct dSv_event_tmp_flag_c {
static u8 const tempBitLabels[370 + 2 /* padding */];
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 8003498C */ void onEventBit(u16);
/* 800349A4 */ void offEventBit(u16);
@@ -588,6 +622,10 @@ struct dEvent_manager_c {
/* 800483E8 */ void getRunEventName();
};
struct dDlst_shadowControl_c {
static u8 mSimpleTexObj[32];
};
struct dCcD_GStts {
/* 80083760 */ dCcD_GStts();
/* 80083830 */ void Move();
@@ -634,6 +672,8 @@ struct dAttention_c {
/* 8007353C */ void LockonTarget(s32);
/* 80073734 */ void ActionTarget(s32);
/* 8014B010 */ void getDistTable(int);
static u8 dist_table[6552];
};
struct cSGlobe {
@@ -686,6 +726,10 @@ struct Z2Creature {
/* 802C0420 */ ~Z2Creature();
};
struct JMath {
static u8 sincosTable_[65536];
};
struct J3DTexNoAnm {
/* 8003B1F8 */ ~J3DTexNoAnm();
};
@@ -702,6 +746,10 @@ struct J3DTevColorAnm {
/* 8003B1A4 */ ~J3DTevColorAnm();
};
struct J3DSys {
static u8 mCurrentMtx[48];
};
struct J3DMaterialAnm {
/* 8032C3C4 */ void calc(J3DMaterial*) const;
};
@@ -1059,7 +1107,25 @@ extern "C" bool ToBack__20daNpcF_MoveBgActor_cFv();
extern "C" bool setExpressionBtp__8daNpcF_cFi();
extern "C" void __dt__15daNpcF_MatAnm_cFv();
extern "C" void __dt__23daBaseNpc_moveBgActor_cFv();
extern "C" u8 const mCcDObjData__8daNpcT_c[48];
extern "C" u8 const mCcDObj__11daBaseNpc_c[48];
extern "C" u8 const mCcDObjInfo__8daNpcF_c[48];
extern "C" extern char const* const d_a_d_a_npc__stringBase0;
extern "C" u8 mCcDCyl__8daNpcT_c[68];
extern "C" u8 mCcDSph__8daNpcT_c[64];
extern "C" u8 mCcDCyl__11daBaseNpc_c[68];
extern "C" u8 mCcDSph__11daBaseNpc_c[64];
extern "C" u8 mCcDCyl__8daNpcF_c[68];
extern "C" u8 mCcDSph__8daNpcF_c[64];
extern "C" u8 mFindActorPtrs__8daNpcT_c[200];
extern "C" u8 mFindActorPList__8daNpcF_c[400];
extern "C" u8 mSrchName__8daNpcT_c[2 + 2 /* padding */];
extern "C" u8 mFindCount__8daNpcT_c[4];
extern "C" u8 m_name__23daBaseNpc_moveBgActor_c[4];
extern "C" u8 m_dzb_id__23daBaseNpc_moveBgActor_c[4];
extern "C" u8 m_set_func__23daBaseNpc_moveBgActor_c[4];
extern "C" u8 mFindCount__8daNpcF_c[4];
extern "C" u8 mSrchActorName__8daNpcF_c[2 + 2 /* padding */];
extern "C" extern u8 data_80450FF8[8];
//
@@ -1269,11 +1335,11 @@ extern "C" void _restgpr_29();
extern "C" void abs();
extern "C" void strcmp();
extern "C" void strlen();
extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 dist_table__12dAttention_c[6552];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 dist_table__12dAttention_c[6552];
extern "C" extern void* __vt__12dBgS_AcchCir[3];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__10dCcD_GStts[3];
@@ -1281,15 +1347,15 @@ extern "C" extern void* __vt__10cCcD_GStts[3];
extern "C" extern void* __vt__12dBgS_ObjAcch[9];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" extern void* __vt__14J3DMaterialAnm[4];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 mCurrentMtx__6J3DSys[48];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 mCurrentMtx__6J3DSys[48];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern u8 Zero__5csXyz[4];
extern "C" u8 Zero__5csXyz[4];
extern "C" extern u8 data_80451164[4];
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
@@ -1579,7 +1645,7 @@ SECTION_DATA static void* lit_5258[9] = {
};
/* 803B36D8-803B371C 0107F8 0044+00 0/0 0/0 54/54 .data mCcDCyl__8daNpcT_c */
SECTION_DATA extern u8 mCcDCyl__8daNpcT_c[68] = {
SECTION_DATA u8 daNpcT_c::mCcDCyl[68] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1588,7 +1654,7 @@ SECTION_DATA extern u8 mCcDCyl__8daNpcT_c[68] = {
};
/* 803B371C-803B375C 01083C 0040+00 0/0 0/0 3/3 .data mCcDSph__8daNpcT_c */
SECTION_DATA extern u8 mCcDSph__8daNpcT_c[64] = {
SECTION_DATA u8 daNpcT_c::mCcDSph[64] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1596,7 +1662,7 @@ SECTION_DATA extern u8 mCcDSph__8daNpcT_c[64] = {
};
/* 803B375C-803B37A0 01087C 0044+00 0/0 0/0 1/1 .data mCcDCyl__11daBaseNpc_c */
SECTION_DATA extern u8 mCcDCyl__11daBaseNpc_c[68] = {
SECTION_DATA u8 daBaseNpc_c::mCcDCyl[68] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1605,7 +1671,7 @@ SECTION_DATA extern u8 mCcDCyl__11daBaseNpc_c[68] = {
};
/* 803B37A0-803B37E0 0108C0 0040+00 0/0 0/0 1/1 .data mCcDSph__11daBaseNpc_c */
SECTION_DATA extern u8 mCcDSph__11daBaseNpc_c[64] = {
SECTION_DATA u8 daBaseNpc_c::mCcDSph[64] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1613,7 +1679,7 @@ SECTION_DATA extern u8 mCcDSph__11daBaseNpc_c[64] = {
};
/* 803B37E0-803B3824 010900 0044+00 0/0 0/0 36/36 .data mCcDCyl__8daNpcF_c */
SECTION_DATA extern u8 mCcDCyl__8daNpcF_c[68] = {
SECTION_DATA u8 daNpcF_c::mCcDCyl[68] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1622,7 +1688,7 @@ SECTION_DATA extern u8 mCcDCyl__8daNpcF_c[68] = {
};
/* 803B3824-803B3864 010944 0040+00 0/0 0/0 2/2 .data mCcDSph__8daNpcF_c */
SECTION_DATA extern u8 mCcDSph__8daNpcF_c[64] = {
SECTION_DATA u8 daNpcF_c::mCcDSph[64] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2045,16 +2111,13 @@ asm void daNpcT_c::tgHitCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fop
/* ############################################################################################## */
/* 80425708-804257D0 052428 00C8+00 4/4 0/0 40/40 .bss mFindActorPtrs__8daNpcT_c */
extern u8 mFindActorPtrs__8daNpcT_c[200];
u8 mFindActorPtrs__8daNpcT_c[200];
u8 daNpcT_c::mFindActorPtrs[200];
/* 80450FD8-80450FDC 0004D8 0002+02 4/4 0/0 2/2 .sbss mSrchName__8daNpcT_c */
extern u8 mSrchName__8daNpcT_c[2 + 2 /* padding */];
u8 mSrchName__8daNpcT_c[2 + 2 /* padding */];
u8 daNpcT_c::mSrchName[2 + 2 /* padding */];
/* 80450FDC-80450FE0 0004DC 0004+00 4/4 0/0 42/42 .sbss mFindCount__8daNpcT_c */
extern u8 mFindCount__8daNpcT_c[4];
u8 mFindCount__8daNpcT_c[4];
u8 daNpcT_c::mFindCount[4];
/* 80147FD4-80148058 142914 0084+00 3/3 0/0 2/2 .text srchActor__8daNpcT_cFPvPv */
#pragma push
@@ -3201,12 +3264,12 @@ extern "C" asm void func_8014D364(int param_0, int param_1) {
/* ############################################################################################## */
/* 80392680-803926B0 01ECE0 0030+00 1/1 0/0 4/4 .rodata mCcDObjData__8daNpcT_c */
SECTION_RODATA extern u8 const mCcDObjData__8daNpcT_c[48] = {
SECTION_RODATA u8 const daNpcT_c::mCcDObjData[48] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(80392680, &mCcDObjData__8daNpcT_c);
COMPILER_STRIP_GATE(80392680, &daNpcT_c::mCcDObjData);
/* 8014D3D8-8014D538 147D18 0160+00 0/0 1/0 0/0 .text __sinit_d_a_npc_cpp */
#pragma push
@@ -3732,14 +3795,14 @@ static asm void CheckCreateHeap(fopAc_ac_c* param_0) {
/* ############################################################################################## */
/* 80450FE0-80450FE4 0004E0 0004+00 2/2 0/0 0/0 .sbss m_name__23daBaseNpc_moveBgActor_c
*/
static u8 m_name__23daBaseNpc_moveBgActor_c[4];
u8 daBaseNpc_moveBgActor_c::m_name[4];
/* 80450FE4-80450FE8 0004E4 0004+00 2/2 0/0 0/0 .sbss m_dzb_id__23daBaseNpc_moveBgActor_c
*/
static u8 m_dzb_id__23daBaseNpc_moveBgActor_c[4];
u8 daBaseNpc_moveBgActor_c::m_dzb_id[4];
/* 80450FE8-80450FEC 0004E8 0004+00 2/2 0/0 0/0 .sbss m_set_func__23daBaseNpc_moveBgActor_c */
static u8 m_set_func__23daBaseNpc_moveBgActor_c[4];
u8 daBaseNpc_moveBgActor_c::m_set_func[4];
/* 8014F518-8014F60C 149E58 00F4+00 1/1 0/0 0/0 .text
* MoveBGCreateHeap__23daBaseNpc_moveBgActor_cFv */
@@ -4316,10 +4379,10 @@ asm void daNpcF_c::tgHitCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fop
/* ############################################################################################## */
/* 804257E8-80425978 052508 0190+00 4/4 0/0 0/0 .bss mFindActorPList__8daNpcF_c */
static u8 mFindActorPList__8daNpcF_c[400];
u8 daNpcF_c::mFindActorPList[400];
/* 80450FF0-80450FF4 0004F0 0004+00 4/4 0/0 0/0 .sbss mFindCount__8daNpcF_c */
static u8 mFindCount__8daNpcF_c[4];
u8 daNpcF_c::mFindCount[4];
/* 80152654-801526E8 14CF94 0094+00 0/0 0/0 12/12 .text srchAttnActor1__8daNpcF_cFPvPv */
#pragma push
@@ -4333,7 +4396,7 @@ asm void daNpcF_c::srchAttnActor1(void* param_0, void* param_1) {
/* ############################################################################################## */
/* 80450FF4-80450FF8 0004F4 0002+02 2/2 0/0 0/0 .sbss mSrchActorName__8daNpcF_c */
static u8 mSrchActorName__8daNpcF_c[2 + 2 /* padding */];
u8 daNpcF_c::mSrchActorName[2 + 2 /* padding */];
/* 801526E8-8015276C 14D028 0084+00 1/1 0/0 0/0 .text srchActor__8daNpcF_cFPvPv */
#pragma push
@@ -5123,23 +5186,23 @@ asm daBaseNpc_moveBgActor_c::~daBaseNpc_moveBgActor_c() {
/* 803926B0-803926E0 01ED10 0030+00 0/0 0/0 0/0 .rodata mCcDObj__11daBaseNpc_c */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const mCcDObj__11daBaseNpc_c[48] = {
SECTION_RODATA u8 const daBaseNpc_c::mCcDObj[48] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803926B0, &mCcDObj__11daBaseNpc_c);
COMPILER_STRIP_GATE(803926B0, &daBaseNpc_c::mCcDObj);
#pragma pop
/* 803926E0-80392710 01ED40 0030+00 0/0 0/0 0/0 .rodata mCcDObjInfo__8daNpcF_c */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const mCcDObjInfo__8daNpcF_c[48] = {
SECTION_RODATA u8 const daNpcF_c::mCcDObjInfo[48] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(803926E0, &mCcDObjInfo__8daNpcF_c);
COMPILER_STRIP_GATE(803926E0, &daNpcF_c::mCcDObjInfo);
#pragma pop
/* 80450FF8-80451000 0004F8 0008+00 0/0 1/1 0/0 .sbss None */
src/d/a/d_a_obj.cpp
+29 -14
View File
@@ -17,6 +17,13 @@ struct daPy_py_c {
/* 8015F398 */ void checkMasterSwordEquip();
};
struct dCcD_GObjInf {
/* 800844F8 */ void GetTgHitObj();
/* 8008457C */ void GetTgHitObjSe();
};
struct Quaternion {};
struct Vec {};
struct cXyz {
@@ -25,13 +32,9 @@ struct cXyz {
/* 80266B84 */ void operator*(f32) const;
/* 80266C18 */ void operator/(f32) const;
/* 80266CBC */ void outprod(Vec const&) const;
};
struct Quaternion {};
struct dCcD_GObjInf {
/* 800844F8 */ void GetTgHitObj();
/* 8008457C */ void GetTgHitObjSe();
static f32 Zero[3];
static u8 BaseY[12];
};
struct daObj {
@@ -55,13 +58,15 @@ struct dRes_control_c {
struct dKy_tevstr_c {};
struct JPABaseEmitter {};
struct J3DModelData {};
struct JPABaseEmitter {};
struct dPa_modelEcallBack {
/* 8004AC00 */ void setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8, void*, u8,
u8);
static u8 mEcallback[4];
};
struct dPa_levelEcallBack {};
@@ -74,6 +79,8 @@ 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*,
cXyz const*, f32);
static u8 mTsubo[64];
};
struct dCcD_GAtTgCoCommonBase {
@@ -94,6 +101,14 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JMath {
static u8 sincosTable_[65536];
};
//
// Forward References:
//
@@ -153,13 +168,13 @@ extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void acos();
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 mTsubo__13dPa_control_c[64];
extern "C" extern f32 Zero__4cXyz[3];
extern "C" extern u8 BaseY__4cXyz[12];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 mTsubo__13dPa_control_c[64];
extern "C" f32 Zero__4cXyz[3];
extern "C" u8 BaseY__4cXyz[12];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u8 struct_80450DF0[8];
extern "C" extern u8 mEcallback__18dPa_modelEcallBack[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mEcallback__18dPa_modelEcallBack[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/a/d_a_player.cpp
+22 -6
View File
@@ -13,6 +13,8 @@
struct mDoMtx_stack_c {
/* 8000CE38 */ void scaleM(f32, f32, f32);
static u8 now[48];
};
struct fopAc_ac_c {};
@@ -63,6 +65,8 @@ struct daPy_py_c {
/* 8015F914 */ void setPlayerDamage(int, int);
/* 8015F954 */ void setMidnaMotionNum(int);
/* 8015F968 */ void setMidnaFaceNum(int);
static u8 m_midnaActor[4];
};
struct daPy_frameCtrl_c {
@@ -108,6 +112,10 @@ struct daAlink_c {
/* 800E7AEC */ void setFmChainPosFromOut(fopAc_ac_c*, cXyz*, int);
};
struct dStage_roomControl_c {
static u8 mDemoArcName[10 + 2 /* padding */];
};
struct dRes_info_c {};
struct dRes_control_c {
@@ -123,6 +131,10 @@ struct dDlst_list_c {
struct Vec {};
struct JMath {
static u8 sincosTable_[65536];
};
struct JKRSolidHeap {};
struct JKRHeap {
@@ -137,6 +149,10 @@ struct J3DSys {
/* 8031073C */ void reinitGX();
};
struct J3DShape {
static u8 sOldVcdVatCmd[4];
};
struct J3DFrameCtrl {
/* 803289CC */ void update();
};
@@ -221,6 +237,7 @@ extern "C" void setMidnaMotionNum__9daPy_py_cFi();
extern "C" void setMidnaFaceNum__9daPy_py_cFi();
extern "C" void daPy_addCalcShort__FPsssss();
extern "C" extern void* __vt__18daPy_sightPacket_c[4 + 1 /* padding */];
extern "C" u8 m_midnaActor__9daPy_py_c[4];
//
// External References:
@@ -280,13 +297,13 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__18mDoExt_transAnmBas[5];
extern "C" extern void* __vt__18J3DAnmTransformKey[5];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4];
extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
//
// Declarations:
@@ -362,8 +379,7 @@ asm void daPy_boomerangMove_c::initOffset(cXyz const* param_0) {
/* ############################################################################################## */
/* 80451018-8045101C 000518 0004+00 2/2 33/33 103/103 .sbss m_midnaActor__9daPy_py_c */
extern u8 m_midnaActor__9daPy_py_c[4];
u8 m_midnaActor__9daPy_py_c[4];
u8 daPy_py_c::m_midnaActor[4];
/* 8045101C-80451020 -00001 0004+00 1/1 1/1 1/1 .sbss None */
/* 8045101C 0002+00 data_8045101C m_dropAngleY__20daPy_boomerangMove_c */
src/d/a/d_a_shop_item_static.cpp
+5 -2
View File
@@ -16,6 +16,8 @@ struct fopAc_ac_c {};
struct daShopItem_c {
/* 80037C14 */ void getRotateP();
/* 80037C1C */ void getPosP();
static void* const mData[276];
};
struct daItemBase_c {
@@ -29,6 +31,7 @@ struct daItemBase_c {
extern "C" void getRotateP__12daShopItem_cFv();
extern "C" void getPosP__12daShopItem_cFv();
extern "C" void CheckShopItemCreateHeap__FP10fopAc_ac_c();
extern "C" void* const mData__12daShopItem_c[276];
extern "C" extern char const* const d_a_d_a_shop_item_static__stringBase0;
//
@@ -63,7 +66,7 @@ asm void daShopItem_c::getPosP() {
/* ############################################################################################## */
/* 803792E8-80379738 -00001 0450+00 1/1 0/0 9/9 .rodata mData__12daShopItem_c */
SECTION_RODATA extern void* const mData__12daShopItem_c[276] = {
SECTION_RODATA void* const daShopItem_c::mData[276] = {
(void*)&d_a_d_a_shop_item_static__stringBase0,
(void*)0x0003FFFF,
(void*)0xFFFFFFFF,
@@ -341,7 +344,7 @@ SECTION_RODATA extern void* const mData__12daShopItem_c[276] = {
(void*)0x0000000C,
(void*)NULL,
};
COMPILER_STRIP_GATE(803792E8, &mData__12daShopItem_c);
COMPILER_STRIP_GATE(803792E8, &daShopItem_c::mData);
/* 80037C24-80037C7C 032564 0058+00 0/0 0/0 1/1 .text CheckShopItemCreateHeap__FP10fopAc_ac_c */
#pragma push
src/d/bg/d_bg_s_acch.cpp
+3 -3
View File
@@ -60,6 +60,8 @@ struct dBgS_AcchCir {
/* 80077414 */ ~dBgS_AcchCir();
};
struct Vec {};
struct cBgS_PolyInfo {
/* 80268074 */ cBgS_PolyInfo();
/* 802680B0 */ ~cBgS_PolyInfo();
@@ -68,9 +70,9 @@ struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct dBgS_Acch;
struct csXyz {};
struct dBgS_Acch;
struct dBgS {
/* 8007524C */ void WallCorrect(dBgS_Acch*);
/* 80075374 */ void WallCorrectSort(dBgS_Acch*);
@@ -80,8 +82,6 @@ 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_s_movebg_actor.cpp
+15 -7
View File
@@ -13,6 +13,8 @@
struct mDoMtx_stack_c {
/* 8000CE38 */ void scaleM(f32, f32, f32);
static u8 now[48];
};
struct fopAc_ac_c {
@@ -32,12 +34,12 @@ struct dBgW {
/* 8007B9C0 */ void Move();
};
struct cXyz {};
struct cBgS_PolyInfo {};
struct csXyz {};
struct cXyz {};
struct dBgS_MoveBgActor {
/* 80078624 */ dBgS_MoveBgActor();
/* 80078688 */ bool CreateHeap();
@@ -55,6 +57,10 @@ struct dBgS_MoveBgActor {
u32, f32 (*)[3][4]);
/* 800788DC */ void MoveBGDelete();
/* 80078950 */ void MoveBGExecute();
static u8 m_name[4];
static u8 m_dzb_id[4];
static u8 m_set_func[4 + 4 /* padding */];
};
struct dBgS {
@@ -94,6 +100,9 @@ extern "C" void
MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f();
extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv();
extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv();
extern "C" u8 m_name__16dBgS_MoveBgActor[4];
extern "C" u8 m_dzb_id__16dBgS_MoveBgActor[4];
extern "C" u8 m_set_func__16dBgS_MoveBgActor[4 + 4 /* padding */];
//
// External References:
@@ -115,7 +124,7 @@ extern "C" void PSMTXCopy();
extern "C" void PSMTXTrans();
extern "C" void _savegpr_27();
extern "C" void _restgpr_27();
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
@@ -199,14 +208,13 @@ bool dBgS_MoveBgActor::ToBack() {
/* ############################################################################################## */
/* 80450F70-80450F74 000470 0004+00 2/2 0/0 0/0 .sbss m_name__16dBgS_MoveBgActor */
static u8 m_name__16dBgS_MoveBgActor[4];
u8 dBgS_MoveBgActor::m_name[4];
/* 80450F74-80450F78 000474 0004+00 2/2 0/0 0/0 .sbss m_dzb_id__16dBgS_MoveBgActor */
static u8 m_dzb_id__16dBgS_MoveBgActor[4];
u8 dBgS_MoveBgActor::m_dzb_id[4];
/* 80450F78-80450F80 000478 0004+04 2/2 0/0 1/1 .sbss m_set_func__16dBgS_MoveBgActor */
extern u8 m_set_func__16dBgS_MoveBgActor[4 + 4 /* padding */];
u8 m_set_func__16dBgS_MoveBgActor[4 + 4 /* padding */];
u8 dBgS_MoveBgActor::m_set_func[4 + 4 /* padding */];
/* 800786C8-800787BC 073008 00F4+00 1/1 0/0 0/0 .text MoveBGCreateHeap__16dBgS_MoveBgActorFv */
#pragma push
src/d/bg/d_bg_w.cpp
+16 -12
View File
@@ -23,15 +23,21 @@ struct dBgW_Base {
/* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
};
struct dBgS_CaptPoly {};
struct dBgS_SphChk {};
struct dBgS_SplGrpChk {};
struct cBgS_PolyPassChk {};
struct dBgS_CaptPoly {};
struct cM3dGPla {
/* 8026F57C */ void getCrossY(cXyz const&, f32*) const;
};
struct cBgS_GrpPassChk {};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct Vec {};
@@ -42,16 +48,10 @@ struct dBgS_Acch {
/* 800772E8 */ void CalcMovePosWork();
};
struct cBgS_PolyPassChk {};
struct cBgS_GrpPassChk {};
struct dBgS_RoofChk {};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct dBgS_SphChk {};
struct csXyz {};
struct dBgW {
@@ -174,12 +174,12 @@ struct cBgW_GrpElm {
/* 8007A1E4 */ cBgW_GrpElm();
};
struct cBgS_GndChk {};
struct cBgD_t {};
struct cBgS_ShdwDraw {};
struct cBgS_GndChk {};
struct cBgS_LinChk {};
struct cBgW {
@@ -238,6 +238,10 @@ struct cBgW {
/* 8007B964 */ void ChkMoveBg() const;
};
struct JMath {
static u8 sincosTable_[65536];
};
//
// Forward References:
//
@@ -445,7 +449,7 @@ extern "C" void _restgpr_29();
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern void* __vt__8cM3dGAab[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
//
src/d/bg/d_bg_w_kcol.cpp
+24 -20
View File
@@ -27,26 +27,16 @@ struct dBgW_Base {
/* 8007E6DC */ void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
};
struct dBgS_SplGrpChk {};
struct dBgS_CaptPoly {};
struct cBgS_GndChk {};
struct cBgS_GrpPassChk {};
struct cBgS_PolyPassChk {};
struct cBgS_LinChk {};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct dBgS_CaptPoly {};
struct cBgS_ShdwDraw {};
struct Vec {};
struct KC_PrismData {};
struct dBgS_RoofChk {};
struct dBgS_Acch {
/* 800771E4 */ void GetSpeedY();
/* 80077200 */ void GetWallAddY(Vec&);
@@ -54,18 +44,28 @@ struct dBgS_Acch {
/* 800772E8 */ void CalcMovePosWork();
};
struct dBgS_RoofChk {};
struct csXyz {};
struct dBgPc {
/* 80074048 */ void setCode(sBgPc&);
};
struct KC_PrismData {};
struct cBgS_PolyPassChk {};
struct dBgS_SplGrpChk {};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct cBgS_LinChk {};
struct cBgS_ShdwDraw {};
struct cBgS_GrpPassChk {};
struct dBgS_SphChk {};
struct csXyz {};
struct dBgWKCol {
/* 8007E6F4 */ dBgWKCol();
/* 8007E74C */ ~dBgWKCol();
@@ -163,6 +163,10 @@ struct cM3dGCyl {
struct cM2dGCir {};
struct JMath {
static u8 sincosTable_[65536];
};
//
// Forward References:
//
@@ -288,7 +292,7 @@ extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern void* __vt__8cM3dGAab[3];
extern "C" extern void* __vt__8cM3dGTri[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
src/d/bg/d_bg_w_sv.cpp
+10 -10
View File
@@ -17,14 +17,14 @@ struct dBgW_Base {
/* 80074AB4 */ void SetOldShapeAngleY(s16);
};
struct cBgD_t {};
struct cBgS_PolyInfo {};
struct cXyz {};
struct cBgS_PolyInfo {};
struct csXyz {};
struct cBgD_t {};
struct dBgWSv {
/* 80082F98 */ void Set(cBgD_t*, u32);
/* 80083020 */ void CopyBackVtx();
@@ -36,20 +36,20 @@ struct dBgWSv {
/* 800835DC */ ~dBgWSv();
};
struct dBgS_CaptPoly {};
struct dBgS_SphChk {};
struct dBgS_SplGrpChk {};
struct cBgS_GrpPassChk {};
struct cBgS_PolyPassChk {};
struct dBgS_CaptPoly {};
struct dBgS_Acch {};
struct cBgS_PolyPassChk {};
struct cBgS_GrpPassChk {};
struct dBgS_RoofChk {};
struct dBgS_SphChk {};
struct dBgW {
/* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&);
/* 8007B3D8 */ void GetPolyColor(cBgS_PolyInfo const&);
@@ -96,12 +96,12 @@ struct dBgW {
/* 8007E4B4 */ void ChkMoveFlag() const;
};
struct cBgS_ShdwDraw {};
struct cBgS_LinChk {};
struct cBgS_GndChk {};
struct cBgS_ShdwDraw {};
struct cBgW {
/* 8007933C */ ~cBgW();
/* 80079564 */ void CalcPlane();
src/d/cc/d_cc_d.cpp
+34 -27
View File
@@ -48,6 +48,8 @@ struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
static f32 Zero[3];
};
struct dCcD_Sph {
@@ -92,6 +94,8 @@ struct dCcD_GObjInf {
/* 800846B0 */ void ResetCoHit();
/* 800846F0 */ void GetCoHitObj();
/* 80084740 */ void Set(dCcD_SrcGObjInf const&);
static u8 const m_hitSeID[96];
};
struct dCcD_GObjCo {
@@ -155,38 +159,21 @@ struct cM3dGCps {
struct cCcD_AabAttr {};
struct cCcD_PntAttr {};
struct cCcD_ShapeAttr {
struct Shape {};
/* 80084E38 */ void GetCoCP() const;
/* 80084E2C */ void GetCoCP();
/* 80263A64 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
static f32 m_virtual_center[3];
};
struct cCcD_SphAttr;
struct cCcD_CpsAttr;
struct cCcD_TriAttr;
struct cCcD_CylAttr;
struct cCcD_PntAttr {};
struct cCcD_CpsAttr {
/* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 80263FC4 */ void CalcAabBox();
/* 80264014 */ void GetNVec(cXyz const&, cXyz*) const;
};
struct cCcD_SphAttr;
struct cCcD_CylAttr {
/* 80084CC0 */ void GetCoCP() const;
/* 80037A4C */ void GetCoCP();
@@ -231,6 +218,25 @@ struct cCcD_SphAttr {
/* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
};
struct cCcD_CpsAttr {
/* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 80263FC4 */ void CalcAabBox();
/* 80264014 */ void GetNVec(cXyz const&, cXyz*) const;
};
struct cCcD_TriAttr {
/* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
@@ -439,6 +445,7 @@ extern "C" static void func_800852C0();
extern "C" static void func_800852C8();
extern "C" static void func_800852D0();
extern "C" static void func_800852D8();
extern "C" u8 const m_hitSeID__12dCcD_GObjInf[96];
//
// External References:
@@ -516,8 +523,8 @@ extern "C" extern void* __vt__12cCcD_CpsAttr[25];
extern "C" extern void* __vt__12cCcD_TriAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" extern f32 m_virtual_center__14cCcD_ShapeAttr[3];
extern "C" extern f32 Zero__4cXyz[3];
extern "C" f32 m_virtual_center__14cCcD_ShapeAttr[3];
extern "C" f32 Zero__4cXyz[3];
//
// Declarations:
@@ -1266,7 +1273,7 @@ asm void dCcD_GObjInf::GetTgHitObjSe() {
/* ############################################################################################## */
/* 8037A780-8037A7E0 006DE0 0060+00 1/1 0/0 0/0 .rodata m_hitSeID__12dCcD_GObjInf */
SECTION_RODATA static u8 const m_hitSeID__12dCcD_GObjInf[96] = {
SECTION_RODATA u8 const dCcD_GObjInf::m_hitSeID[96] = {
0x00, 0x04, 0x00, 0x0F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x04, 0x00, 0x04,
0x00, 0x04, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x04, 0x00, 0x06, 0x00, 0x04, 0x00, 0x07,
0x00, 0x04, 0x00, 0x09, 0x00, 0x04, 0x00, 0x0B, 0x00, 0x04, 0x00, 0x0C, 0x00, 0x04, 0x00, 0x0D,
@@ -1274,7 +1281,7 @@ SECTION_RODATA static u8 const m_hitSeID__12dCcD_GObjInf[96] = {
0x00, 0x04, 0x00, 0x10, 0x00, 0x04, 0x00, 0x11, 0x00, 0x04, 0x00, 0x12, 0x00, 0x04, 0x00, 0x13,
0x00, 0x04, 0x00, 0x14, 0x00, 0x04, 0x00, 0x15, 0x00, 0x04, 0x00, 0x18, 0x00, 0x04, 0x00, 0x16,
};
COMPILER_STRIP_GATE(8037A780, &m_hitSeID__12dCcD_GObjInf);
COMPILER_STRIP_GATE(8037A780, &dCcD_GObjInf::m_hitSeID);
/* 800845B0-8008460C 07EEF0 005C+00 0/0 3/3 32/32 .text getHitSeID__12dCcD_GObjInfFUci */
#pragma push
src/d/cc/d_cc_mass_s.cpp
+8 -8
View File
@@ -13,10 +13,10 @@
struct fopAc_ac_c {};
struct cXyz {};
struct cCcD_Obj {};
struct cXyz {};
struct dCcMassS_Obj {
/* 800300F4 */ ~dCcMassS_Obj();
/* 800852E0 */ void Set(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32));
@@ -24,16 +24,16 @@ struct dCcMassS_Obj {
/* 800855C8 */ dCcMassS_Obj();
};
struct cM3dGCps {
/* 8026EF88 */ cM3dGCps();
/* 8026EFA4 */ ~cM3dGCps();
/* 8026F080 */ void SetCps(cM3dGCps const&);
struct dCcMassS_HitInf {
/* 80085334 */ void ClearPointer();
};
struct Vec {};
struct dCcMassS_HitInf {
/* 80085334 */ void ClearPointer();
struct cM3dGCps {
/* 8026EF88 */ cM3dGCps();
/* 8026EFA4 */ ~cM3dGCps();
/* 8026F080 */ void SetCps(cM3dGCps const&);
};
struct dCcMassS_Mng {
src/d/cc/d_cc_s.cpp
+22 -15
View File
@@ -15,11 +15,15 @@ struct csXyz {};
struct mDoMtx_stack_c {
/* 8000CF0C */ void ZXYrotS(csXyz const&);
static u8 now[48];
};
struct fopAc_ac_c {};
struct cXyz {};
struct cXyz {
static u8 BaseZ[12];
};
struct dPa_control_c {
/* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32);
@@ -29,29 +33,29 @@ struct dJntCol_c {
/* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
};
struct cCcD_Stts {
/* 80263934 */ void PlusCcMove(f32, f32, f32);
/* 80263970 */ void PlusDmg(int);
};
struct dCcD_GObjInf {
/* 800843DC */ void ChkAtNoGuard();
};
struct cCcD_GObjInf {};
struct cCcD_Obj {
/* 80263A48 */ void GetAc();
};
struct cCcD_GStts {};
struct dCcD_GStts {};
struct cCcD_ShapeAttr {
struct Shape {};
};
struct dCcD_GStts {};
struct cCcD_Stts {
/* 80263934 */ void PlusCcMove(f32, f32, f32);
/* 80263970 */ void PlusDmg(int);
struct cCcD_Obj {
/* 80263A48 */ void GetAc();
};
struct cCcD_GObjInf {};
struct dCcS {
/* 8002FF40 */ ~dCcS();
/* 80085ED4 */ void Ct();
@@ -84,6 +88,8 @@ struct dCcS {
/* 80087330 */ void ChkAtTgMtrlHit(u8, u8);
/* 8008734C */ void ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*,
cCcD_GStts*);
static u8 m_mtrl_hit_tbl[64];
};
struct dCcMassS_Mng {
@@ -169,6 +175,7 @@ extern "C" void Draw__4dCcSFv();
extern "C" void MassClear__4dCcSFv();
extern "C" void ChkAtTgMtrlHit__4dCcSFUcUc();
extern "C" void ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts();
extern "C" u8 m_mtrl_hit_tbl__4dCcS[64];
extern "C" extern void* __vt__4dCcS[13];
//
@@ -229,9 +236,9 @@ extern "C" extern void* __vt__8cM3dGSph[3];
extern "C" extern void* __vt__12cCcD_SphAttr[25];
extern "C" extern void* __vt__12cCcD_CpsAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 BaseZ__4cXyz[12];
extern "C" u8 BaseZ__4cXyz[12];
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
//
@@ -622,7 +629,7 @@ asm void dCcS::MassClear() {
/* ############################################################################################## */
/* 803AC3A4-803AC3E4 0094C4 0040+00 1/1 0/0 0/0 .data m_mtrl_hit_tbl__4dCcS */
SECTION_DATA static u8 m_mtrl_hit_tbl__4dCcS[64] = {
SECTION_DATA u8 dCcS::m_mtrl_hit_tbl[64] = {
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
src/d/com/d_com_inf_game.cpp
+28 -6
View File
@@ -19,6 +19,14 @@ struct request_of_phase_process_class {};
struct phaseParam_c {};
struct mDoRst {
static u8 mResetData[4 + 4 /* padding */];
};
struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct mDoExt_btkAnm {
/* 8003079C */ ~mDoExt_btkAnm();
/* 80030954 */ mDoExt_btkAnm();
@@ -39,6 +47,10 @@ struct mDoExt_bckAnm {
/* 80030A2C */ mDoExt_bckAnm();
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct daAlink_c {
/* 800BDE48 */ void setLastSceneMode(u32*);
};
@@ -157,6 +169,10 @@ struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 8003498C */ void onEventBit(u16);
/* 800349A4 */ void offEventBit(u16);
@@ -169,6 +185,8 @@ struct dStage_roomControl_c {
/* 80024338 */ void initZone();
/* 80024384 */ void getStatusRoomDt(int);
/* 8002D9B0 */ void getZoneNo(int);
static u8 mStatus[65792];
};
struct dStage_nextStage_c {
@@ -384,6 +402,10 @@ struct Z2SeqMgr {
/* 802AF408 */ void bgmStop(u32, s32);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
@@ -720,7 +742,7 @@ extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern void* __vt__16dStage_stageDt_c[93];
extern "C" extern void* __vt__11dStage_dt_c[93];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__19dAttDraw_CallBack_c[3];
extern "C" extern void* __vt__11dAttParam_c[3 + 1 /* padding */];
extern "C" extern void* __vt__4dBgS[5];
@@ -731,14 +753,14 @@ extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__12cCcD_CpsAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__4cCcS[12];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" u8 mFader__13mDoGph_gInf_c[4];
extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/com/d_com_static.cpp
+113 -51
View File
@@ -13,6 +13,12 @@
struct fopAc_ac_c {};
struct daYkgr_c {
static u8 m_aim_rate[4];
static u8 m_path[4];
static u8 m_emitter[4];
};
struct cXyz {
/* 80009184 */ ~cXyz();
/* 800125DC */ cXyz();
@@ -20,6 +26,8 @@ struct cXyz {
struct daTagStream_c {
/* 800318B4 */ void checkArea(cXyz const*);
static u8 m_top[4];
};
struct daTagMist_c {
@@ -33,6 +41,8 @@ struct daTagMagne_c {
/* 80031BF4 */ void checkMagneA();
/* 80031C48 */ void checkMagneB();
/* 80031C9C */ void checkMagneC();
static u8 mTagMagne[4];
};
struct daSus_c {
@@ -58,12 +68,21 @@ struct daSus_c {
/* 800314D4 */ void check(fopAc_ac_c*);
/* 80031434 */ void check(s8, cXyz const&);
/* 800315A4 */ void execute();
static u8 mData[1152];
static u8 mRoom[256];
};
struct daSetBgObj_c {
/* 80031870 */ void getArcName(fopAc_ac_c*);
};
struct daObjMovebox {
struct Act_c {
static void* M_dir_base[2];
};
};
struct daObjCarry_c {
/* 80031CF8 */ void clrSaveFlag();
/* 80031D04 */ void setSaveFlag();
@@ -75,6 +94,10 @@ struct daObjCarry_c {
/* 80031D8C */ void chkSttsFlag(int, u8);
/* 80031DAC */ void setRoomNo(int, s8);
/* 80031DB8 */ void getRoomNo(int);
static u8 mPos[60];
static u8 mSttsFlag[5 + 3 /* padding */];
static u8 mRoomNo[5 + 3 /* padding */];
};
struct J3DModel {};
@@ -82,6 +105,9 @@ struct J3DModel {};
struct daMirror_c {
/* 8003194C */ void entry(J3DModel*);
/* 80031990 */ void remove();
static u8 m_entryModel[12];
static u8 m_myObj[4];
};
struct daMP_c {
@@ -89,11 +115,29 @@ struct daMP_c {
/* 80031AA4 */ void daMP_c_Set_PercentMovieVolume(f32);
/* 80031AD0 */ void daMP_c_THPPlayerPlay();
/* 80031B24 */ void daMP_c_THPPlayerPause();
static u8 m_myObj[4];
};
struct daGrass_c {
/* 800319C8 */ void deleteRoomGrass(int);
/* 80031A20 */ void deleteRoomFlower(int);
static u8 m_myObj[4];
static u8 m_grass[4];
static u8 m_flower[4];
};
struct daDsh_c {
static u32 OPEN_SIZE;
static f32 OPEN_ACCEL;
static f32 OPEN_SPEED;
static f32 OPEN_BOUND_SPEED;
static f32 OPEN_BOUND_RATIO;
static f32 CLOSE_ACCEL;
static f32 CLOSE_SPEED;
static f32 CLOSE_BOUND_SPEED;
static f32 CLOSE_BOUND_RATIO;
};
struct dSv_info_c {
@@ -108,6 +152,18 @@ struct dSv_event_c {
/* 80034A04 */ void getEventReg(u16) const;
};
struct dGrass_packet_c {
static u8 m_deleteRoom[12];
};
struct dFlower_packet_c {
static u8 m_deleteRoom[12];
};
struct dDemo_c {
static u8 m_status[4];
};
struct dComIfG_play_c {
/* 8002C97C */ void getLayerNo(int);
};
@@ -174,6 +230,34 @@ extern "C" void func_80031EF0();
extern "C" void __dt__Q27daSus_c6data_cFv();
extern "C" void __ct__Q27daSus_c6data_cFv();
extern "C" extern char const* const d_com_d_com_static__stringBase0;
extern "C" u8 mData__7daSus_c[1152];
extern "C" u8 mRoom__7daSus_c[256];
extern "C" u8 m_entryModel__10daMirror_c[12];
extern "C" u8 m_deleteRoom__15dGrass_packet_c[12];
extern "C" u8 m_deleteRoom__16dFlower_packet_c[12];
extern "C" u8 mPos__12daObjCarry_c[60];
extern "C" u8 m_aim_rate__8daYkgr_c[4];
extern "C" u8 m_path__8daYkgr_c[4];
extern "C" u8 m_emitter__8daYkgr_c[4];
extern "C" u8 m_top__13daTagStream_c[4];
extern "C" u8 m_myObj__10daMirror_c[4];
extern "C" u8 m_myObj__9daGrass_c[4];
extern "C" u8 m_grass__9daGrass_c[4];
extern "C" u8 m_flower__9daGrass_c[4];
extern "C" u8 m_myObj__6daMP_c[4];
extern "C" u8 mTagMagne__12daTagMagne_c[4];
extern "C" u8 mSttsFlag__12daObjCarry_c[5 + 3 /* padding */];
extern "C" u8 mRoomNo__12daObjCarry_c[5 + 3 /* padding */];
extern "C" void* M_dir_base__Q212daObjMovebox5Act_c[2];
extern "C" u32 OPEN_SIZE__7daDsh_c;
extern "C" f32 OPEN_ACCEL__7daDsh_c;
extern "C" f32 OPEN_SPEED__7daDsh_c;
extern "C" f32 OPEN_BOUND_SPEED__7daDsh_c;
extern "C" f32 OPEN_BOUND_RATIO__7daDsh_c;
extern "C" f32 CLOSE_ACCEL__7daDsh_c;
extern "C" f32 CLOSE_SPEED__7daDsh_c;
extern "C" f32 CLOSE_BOUND_SPEED__7daDsh_c;
extern "C" f32 CLOSE_BOUND_RATIO__7daDsh_c;
//
// External References:
@@ -205,7 +289,7 @@ extern "C" void sprintf();
extern "C" void strcmp();
extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 m_status__7dDemo_c[4];
extern "C" u8 m_status__7dDemo_c[4];
//
// Declarations:
@@ -298,11 +382,10 @@ asm void daSus_c::room_c::reset() {
static u8 lit_3840[12];
/* 80423FFC-8042447C 050D1C 0480+00 6/7 0/0 0/0 .bss mData__7daSus_c */
static u8 mData__7daSus_c[1152];
u8 daSus_c::mData[1152];
/* 8042447C-8042457C 05119C 0100+00 2/3 0/0 1/1 .bss mRoom__7daSus_c */
extern u8 mRoom__7daSus_c[256];
u8 mRoom__7daSus_c[256];
u8 daSus_c::mRoom[256];
/* 80450D88-80450D8C -00001 0004+00 1/1 0/0 2/2 .sbss None */
/* 80450D88 0002+00 data_80450D88 m_count__9daArrow_c */
@@ -461,16 +544,13 @@ extern u8 struct_80450D8C[4];
u8 struct_80450D8C[4];
/* 80450D90-80450D94 000290 0004+00 0/0 0/0 1/1 .sbss m_aim_rate__8daYkgr_c */
extern u8 m_aim_rate__8daYkgr_c[4];
u8 m_aim_rate__8daYkgr_c[4];
u8 daYkgr_c::m_aim_rate[4];
/* 80450D94-80450D98 000294 0004+00 0/0 0/0 2/2 .sbss m_path__8daYkgr_c */
extern u8 m_path__8daYkgr_c[4];
u8 m_path__8daYkgr_c[4];
u8 daYkgr_c::m_path[4];
/* 80450D98-80450D9C 000298 0004+00 0/0 1/1 2/2 .sbss m_emitter__8daYkgr_c */
extern u8 m_emitter__8daYkgr_c[4];
u8 m_emitter__8daYkgr_c[4];
u8 daYkgr_c::m_emitter[4];
/* 80450D9C-80450DA4 00029C 0008+00 1/1 0/0 0/0 .sbss arcName$4309 */
static u8 arcName[8];
@@ -489,45 +569,37 @@ asm void daSetBgObj_c::getArcName(fopAc_ac_c* param_0) {
/* ############################################################################################## */
/* 80451D28-80451D30 -00001 0008+00 0/0 0/0 3/3 .sdata2 M_dir_base__Q212daObjMovebox5Act_c
*/
SECTION_SDATA2 extern void* M_dir_base__Q212daObjMovebox5Act_c[2] = {
SECTION_SDATA2 void* daObjMovebox::Act_c::M_dir_base[2] = {
(void*)0x00004000,
(void*)(((char*)mDoMch_Create__Fv) + 0x2BC),
};
/* 80451D30-80451D34 000330 0004+00 0/0 0/0 3/3 .sdata2 OPEN_SIZE__7daDsh_c */
SECTION_SDATA2 extern u32 OPEN_SIZE__7daDsh_c = 0x43870CCD;
SECTION_SDATA2 u32 daDsh_c::OPEN_SIZE = 0x43870CCD;
/* 80451D34-80451D38 000334 0004+00 0/0 0/0 1/1 .sdata2 OPEN_ACCEL__7daDsh_c */
SECTION_SDATA2 extern f32 OPEN_ACCEL__7daDsh_c;
SECTION_SDATA2 f32 OPEN_ACCEL__7daDsh_c = 10.0f;
SECTION_SDATA2 f32 daDsh_c::OPEN_ACCEL = 10.0f;
/* 80451D38-80451D3C 000338 0004+00 0/0 0/0 1/1 .sdata2 OPEN_SPEED__7daDsh_c */
SECTION_SDATA2 extern f32 OPEN_SPEED__7daDsh_c;
SECTION_SDATA2 f32 OPEN_SPEED__7daDsh_c = -40.0f;
SECTION_SDATA2 f32 daDsh_c::OPEN_SPEED = -40.0f;
/* 80451D3C-80451D40 00033C 0004+00 0/0 0/0 1/1 .sdata2 OPEN_BOUND_SPEED__7daDsh_c */
SECTION_SDATA2 extern f32 OPEN_BOUND_SPEED__7daDsh_c;
SECTION_SDATA2 f32 OPEN_BOUND_SPEED__7daDsh_c = -30.0f;
SECTION_SDATA2 f32 daDsh_c::OPEN_BOUND_SPEED = -30.0f;
/* 80451D40-80451D44 000340 0004+00 0/0 0/0 1/1 .sdata2 OPEN_BOUND_RATIO__7daDsh_c */
SECTION_SDATA2 extern f32 OPEN_BOUND_RATIO__7daDsh_c;
SECTION_SDATA2 f32 OPEN_BOUND_RATIO__7daDsh_c = -2.0f / 5.0f;
SECTION_SDATA2 f32 daDsh_c::OPEN_BOUND_RATIO = -2.0f / 5.0f;
/* 80451D44-80451D48 000344 0004+00 0/0 0/0 1/1 .sdata2 CLOSE_ACCEL__7daDsh_c */
SECTION_SDATA2 extern f32 CLOSE_ACCEL__7daDsh_c;
SECTION_SDATA2 f32 CLOSE_ACCEL__7daDsh_c = 10.0f;
SECTION_SDATA2 f32 daDsh_c::CLOSE_ACCEL = 10.0f;
/* 80451D48-80451D4C 000348 0004+00 0/0 0/0 1/1 .sdata2 CLOSE_SPEED__7daDsh_c */
SECTION_SDATA2 extern f32 CLOSE_SPEED__7daDsh_c;
SECTION_SDATA2 f32 CLOSE_SPEED__7daDsh_c = 40.0f;
SECTION_SDATA2 f32 daDsh_c::CLOSE_SPEED = 40.0f;
/* 80451D4C-80451D50 00034C 0004+00 0/0 0/0 1/1 .sdata2 CLOSE_BOUND_SPEED__7daDsh_c */
SECTION_SDATA2 extern f32 CLOSE_BOUND_SPEED__7daDsh_c;
SECTION_SDATA2 f32 CLOSE_BOUND_SPEED__7daDsh_c = 30.0f;
SECTION_SDATA2 f32 daDsh_c::CLOSE_BOUND_SPEED = 30.0f;
/* 80451D50-80451D54 000350 0004+00 0/0 0/0 1/1 .sdata2 CLOSE_BOUND_RATIO__7daDsh_c */
SECTION_SDATA2 extern f32 CLOSE_BOUND_RATIO__7daDsh_c;
SECTION_SDATA2 f32 CLOSE_BOUND_RATIO__7daDsh_c = -2.0f / 5.0f;
SECTION_SDATA2 f32 daDsh_c::CLOSE_BOUND_RATIO = -2.0f / 5.0f;
/* 80451D54-80451D58 000354 0004+00 1/1 0/0 0/0 .sdata2 @4338 */
SECTION_SDATA2 static u8 lit_4338[4] = {
@@ -550,16 +622,13 @@ asm void daTagStream_c::checkArea(cXyz const* param_0) {
/* ############################################################################################## */
/* 8042457C-80424588 05129C 000C+00 1/2 0/0 1/1 .bss m_entryModel__10daMirror_c */
extern u8 m_entryModel__10daMirror_c[12];
u8 m_entryModel__10daMirror_c[12];
u8 daMirror_c::m_entryModel[12];
/* 80450DA4-80450DA8 0002A4 0004+00 0/0 1/1 2/2 .sbss m_top__13daTagStream_c */
extern u8 m_top__13daTagStream_c[4];
u8 m_top__13daTagStream_c[4];
u8 daTagStream_c::m_top[4];
/* 80450DA8-80450DAC 0002A8 0004+00 2/2 0/0 4/4 .sbss m_myObj__10daMirror_c */
extern u8 m_myObj__10daMirror_c[4];
u8 m_myObj__10daMirror_c[4];
u8 daMirror_c::m_myObj[4];
/* 8003194C-80031990 02C28C 0044+00 0/0 1/1 9/9 .text entry__10daMirror_cFP8J3DModel */
#pragma push
@@ -583,16 +652,13 @@ asm void daMirror_c::remove() {
/* ############################################################################################## */
/* 80424588-80424594 0512A8 000C+00 1/2 0/0 1/1 .bss m_deleteRoom__15dGrass_packet_c */
extern u8 m_deleteRoom__15dGrass_packet_c[12];
u8 m_deleteRoom__15dGrass_packet_c[12];
u8 dGrass_packet_c::m_deleteRoom[12];
/* 80450DAC-80450DB0 0002AC 0004+00 0/0 0/0 2/2 .sbss m_myObj__9daGrass_c */
extern u8 m_myObj__9daGrass_c[4];
u8 m_myObj__9daGrass_c[4];
u8 daGrass_c::m_myObj[4];
/* 80450DB0-80450DB4 0002B0 0004+00 1/1 0/0 11/11 .sbss m_grass__9daGrass_c */
extern u8 m_grass__9daGrass_c[4];
u8 m_grass__9daGrass_c[4];
u8 daGrass_c::m_grass[4];
/* 800319C8-80031A20 02C308 0058+00 0/0 0/0 1/1 .text deleteRoomGrass__9daGrass_cFi */
#pragma push
@@ -606,12 +672,10 @@ asm void daGrass_c::deleteRoomGrass(int param_0) {
/* ############################################################################################## */
/* 80424594-804245A0 0512B4 000C+00 1/2 0/0 1/1 .bss m_deleteRoom__16dFlower_packet_c */
extern u8 m_deleteRoom__16dFlower_packet_c[12];
u8 m_deleteRoom__16dFlower_packet_c[12];
u8 dFlower_packet_c::m_deleteRoom[12];
/* 80450DB4-80450DB8 0002B4 0004+00 1/1 0/0 9/9 .sbss m_flower__9daGrass_c */
extern u8 m_flower__9daGrass_c[4];
u8 m_flower__9daGrass_c[4];
u8 daGrass_c::m_flower[4];
/* 80031A20-80031A78 02C360 0058+00 0/0 0/0 1/1 .text deleteRoomFlower__9daGrass_cFi */
#pragma push
@@ -625,8 +689,7 @@ asm void daGrass_c::deleteRoomFlower(int param_0) {
/* ############################################################################################## */
/* 80450DB8-80450DBC 0002B8 0004+00 4/4 0/0 2/2 .sbss m_myObj__6daMP_c */
extern u8 m_myObj__6daMP_c[4];
u8 m_myObj__6daMP_c[4];
u8 daMP_c::m_myObj[4];
/* 80031A78-80031AA4 02C3B8 002C+00 0/0 0/0 1/1 .text daMP_c_Get_MovieRestFrame__6daMP_cFv */
#pragma push
@@ -670,8 +733,7 @@ asm void daMP_c::daMP_c_THPPlayerPause() {
/* ############################################################################################## */
/* 80450DBC-80450DC0 0002BC 0004+00 1/1 0/0 3/3 .sbss mTagMagne__12daTagMagne_c */
extern u8 mTagMagne__12daTagMagne_c[4];
u8 mTagMagne__12daTagMagne_c[4];
u8 daTagMagne_c::mTagMagne[4];
/* 80031B50-80031BF4 02C490 00A4+00 0/0 4/4 0/0 .text
* checkMagnetCode__12daTagMagne_cFR13cBgS_PolyInfo */
@@ -769,7 +831,7 @@ static u8 lit_4480[12];
#pragma pop
/* 804245AC-804245E8 0512CC 003C+00 3/4 0/0 0/0 .bss mPos__12daObjCarry_c */
static u8 mPos__12daObjCarry_c[60];
u8 daObjCarry_c::mPos[60];
/* 80031D24-80031D38 02C664 0014+00 0/0 0/0 1/1 .text getPos__12daObjCarry_cFi */
#pragma push
@@ -793,7 +855,7 @@ asm void daObjCarry_c::savePos(int param_0, cXyz param_1) {
/* ############################################################################################## */
/* 80450DC4-80450DCC 0002C4 0005+03 3/3 0/0 0/0 .sbss mSttsFlag__12daObjCarry_c */
static u8 mSttsFlag__12daObjCarry_c[5 + 3 /* padding */];
u8 daObjCarry_c::mSttsFlag[5 + 3 /* padding */];
/* 80031D64-80031D78 02C6A4 0014+00 0/0 0/0 1/1 .text onSttsFlag__12daObjCarry_cFiUc */
#pragma push
@@ -827,7 +889,7 @@ asm void daObjCarry_c::chkSttsFlag(int param_0, u8 param_1) {
/* ############################################################################################## */
/* 80450DCC-80450DD4 0002CC 0005+03 2/2 0/0 0/0 .sbss mRoomNo__12daObjCarry_c */
static u8 mRoomNo__12daObjCarry_c[5 + 3 /* padding */];
u8 daObjCarry_c::mRoomNo[5 + 3 /* padding */];
/* 80031DAC-80031DB8 02C6EC 000C+00 0/0 0/0 2/2 .text setRoomNo__12daObjCarry_cFiSc */
#pragma push
src/d/d_att_dist.cpp
+10 -2
View File
@@ -7,11 +7,19 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct dAttention_c {
static u8 dist_table[6552];
};
//
// Forward References:
//
extern "C" extern u8 dist_table__12dAttention_c[6552];
extern "C" u8 dist_table__12dAttention_c[6552];
//
// External References:
@@ -23,7 +31,7 @@ extern "C" extern u8 dist_table__12dAttention_c[6552];
/* ############################################################################################## */
/* 803A9C70-803AB608 006D90 1998+00 0/0 5/5 13/13 .data dist_table__12dAttention_c */
SECTION_DATA extern u8 dist_table__12dAttention_c[6552] = {
SECTION_DATA u8 dAttention_c::dist_table[6552] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x3C, 0x23, 0xD7, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x43, 0x7A, 0x00, 0x00,
0x43, 0xBB, 0x80, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0xC8, 0x00, 0x00, 0xC3, 0xC8, 0x00, 0x00,
src/d/d_attention.cpp
+45 -19
View File
@@ -11,10 +11,14 @@
// Types:
//
struct J3DAnmTextureSRTKey {};
struct mDoMtx_stack_c {
static u8 now[48];
};
struct J3DMaterialTable {};
struct J3DAnmTextureSRTKey {};
struct mDoExt_btkAnm {
/* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
/* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
@@ -34,10 +38,10 @@ struct mDoExt_bpkAnm {
/* 8000D518 */ void entry(J3DMaterialTable*, f32);
};
struct J3DAnmTransform {};
struct J3DModelData {};
struct J3DAnmTransform {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D9CC */ void entry(J3DModelData*, f32);
@@ -47,6 +51,10 @@ struct mDoExt_baseAnm {
/* 8000D428 */ void play();
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct fopAc_ac_c {};
struct daPy_py_c {
@@ -63,12 +71,6 @@ 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);
@@ -76,6 +78,12 @@ 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();
@@ -113,6 +121,14 @@ struct dAttention_c {
/* 8007378C */ void CheckObjectTarget(s32);
/* 800737E4 */ void LockonTruth();
/* 80073838 */ void checkDistance(cXyz*, s16, cXyz*, f32, f32, f32, f32);
static u8 loc_type_tbl[12];
static u8 act_type_tbl[20];
static u8 dist_table[6552];
static u32 loc_type_num;
static u32 act_type_num;
static u32 chk_type_tbl;
static u32 chk_type_num;
};
struct dAttParam_c {
@@ -184,6 +200,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JKRSolidHeap {};
struct J3DGXColor {};
@@ -270,6 +290,12 @@ extern "C" void request__10dAttLook_cFP10fopAc_ac_cfffsi();
extern "C" void __dt__15dAttDrawParam_cFv();
extern "C" void __sinit_d_attention_cpp();
extern "C" extern char const* const d_d_attention__stringBase0;
extern "C" u8 loc_type_tbl__12dAttention_c[12];
extern "C" u8 act_type_tbl__12dAttention_c[20];
extern "C" u32 loc_type_num__12dAttention_c;
extern "C" u32 act_type_num__12dAttention_c;
extern "C" u32 chk_type_tbl__12dAttention_c;
extern "C" u32 chk_type_num__12dAttention_c;
extern "C" extern u8 data_80450680[8];
extern "C" extern u8 data_80450688[8];
@@ -340,16 +366,16 @@ extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" void tan();
extern "C" extern void* __vt__25mDoExt_McaMorfCallBack1_c[3];
extern "C" extern u8 dist_table__12dAttention_c[6552];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 dist_table__12dAttention_c[6552];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 j3dSys[284];
extern "C" extern u32 __float_nan;
extern "C" extern u32 __float_max;
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 data_80450F58[8];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
@@ -368,12 +394,12 @@ static asm void func_80070018() {
/* ############################################################################################## */
/* 803A9BF8-803A9C04 006D18 000C+00 2/2 0/0 0/0 .data loc_type_tbl__12dAttention_c */
SECTION_DATA static u8 loc_type_tbl__12dAttention_c[12] = {
SECTION_DATA u8 dAttention_c::loc_type_tbl[12] = {
0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x04,
};
/* 803A9C04-803A9C18 006D24 0014+00 1/1 0/0 0/0 .data act_type_tbl__12dAttention_c */
SECTION_DATA static u8 act_type_tbl__12dAttention_c[20] = {
SECTION_DATA u8 dAttention_c::act_type_tbl[20] = {
0x00, 0x03, 0x00, 0x08, 0x00, 0x04, 0x00, 0x10, 0x00, 0x05,
0x00, 0x20, 0x00, 0x06, 0x00, 0x40, 0x00, 0x07, 0x00, 0x80,
};
@@ -568,7 +594,7 @@ asm void dAttention_c::getActionBtnXY() {
/* ############################################################################################## */
/* 80450660-80450664 0000E0 0004+00 2/2 0/0 0/0 .sdata loc_type_num__12dAttention_c */
SECTION_SDATA static u32 loc_type_num__12dAttention_c = 0x00000003;
SECTION_SDATA u32 dAttention_c::loc_type_num = 0x00000003;
/* 80070A70-80070AC0 06B3B0 0050+00 1/1 0/0 0/0 .text chkAttMask__12dAttention_cFUlUl */
#pragma push
@@ -592,13 +618,13 @@ static asm void check_event_condition(u32 param_0, u16 param_1) {
/* ############################################################################################## */
/* 80450664-80450668 0000E4 0004+00 1/1 0/0 0/0 .sdata act_type_num__12dAttention_c */
SECTION_SDATA static u32 act_type_num__12dAttention_c = 0x00000005;
SECTION_SDATA u32 dAttention_c::act_type_num = 0x00000005;
/* 80450668-8045066C 0000E8 0004+00 1/1 0/0 0/0 .sdata chk_type_tbl__12dAttention_c */
SECTION_SDATA static u32 chk_type_tbl__12dAttention_c = 0x00080100;
SECTION_SDATA u32 dAttention_c::chk_type_tbl = 0x00080100;
/* 8045066C-80450670 0000EC 0004+00 1/1 0/0 0/0 .sdata chk_type_num__12dAttention_c */
SECTION_SDATA static u32 chk_type_num__12dAttention_c = 0x00000001;
SECTION_SDATA u32 dAttention_c::chk_type_num = 0x00000001;
/* 80450670-80450674 0000F0 0004+00 2/2 0/0 0/0 .sdata None */
SECTION_SDATA static u32 data_80450670 = 0x01000000;
src/d/d_bright_check.cpp
+10 -2
View File
@@ -11,6 +11,10 @@
// Types:
//
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct dMsgString_c {
/* 80249C20 */ dMsgString_c();
/* 80249D28 */ ~dMsgString_c();
@@ -47,6 +51,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct J2DTextBox {
/* 8030074C */ void setString(s16, char const*, ...);
};
@@ -95,9 +103,9 @@ extern "C" void __ptmf_scall();
extern "C" void _savegpr_22();
extern "C" void _restgpr_22();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/d_cam_param.cpp
+2 -2
View File
@@ -41,10 +41,10 @@ struct dCamParam_c {
/* 80088620 */ void SearchStyle(u32);
};
struct cXyz {};
struct cSAngle {};
struct cXyz {};
struct dCamMath {
/* 8008813C */ void rationalBezierRatio(f32, f32);
/* 80088284 */ void zoomFovy(f32, f32);
src/d/d_camera.cpp
+50 -19
View File
@@ -39,11 +39,16 @@ struct cXyz {
/* 80266CE4 */ void norm() const;
/* 80266EF4 */ void normalize();
/* 8026706C */ bool operator!=(Vec const&) const;
static f32 Zero[3];
static u8 BaseY[12];
};
struct mDoMtx_stack_c {
/* 8000CD9C */ void transM(f32, f32, f32);
/* 8000CE70 */ void scaleM(cXyz const&);
static u8 now[48];
};
struct mDoLib_clipper {
@@ -58,9 +63,13 @@ struct mDoGph_gInf_c {
struct mDoCPd_c {
/* 8016C314 */ void getHoldA(u32);
/* 80182BF8 */ void getTrigA(u32);
static u8 m_cpadInfo[256];
};
struct fopAc_ac_c {};
struct fopAc_ac_c {
static u8 stopStatus[4];
};
struct daTagMwait_c {
/* 80182D9C */ void checkEndMessage();
@@ -86,6 +95,8 @@ struct daPy_py_c {
/* 80182AC4 */ void checkCopyRodThrowAfter() const;
/* 80182AD8 */ void checkRide() const;
/* 80182B9C */ void getRightHandPos() const;
static u8 m_midnaActor[4];
};
struct daHorse_c {
@@ -119,6 +130,10 @@ struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct dSv_event_tmp_flag_c {
static u8 const tempBitLabels[370 + 2 /* padding */];
};
struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
@@ -159,6 +174,10 @@ struct dDemo_object_c {
/* 80039128 */ void getActiveCamera();
};
struct dDemo_c {
static u8 m_object[4];
};
struct dCstick_c {
/* 8008845C */ bool Shift(u32);
};
@@ -187,10 +206,6 @@ struct dCcMassS_Mng {
/* 80085EB8 */ void GetCamTopPos(Vec*);
};
struct dBgS_LinChk {
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct camera_class {};
struct dCamMapToolData {
@@ -227,6 +242,15 @@ struct cSAngle {
/* 802711E8 */ void operator-=(cSAngle const&);
/* 80271264 */ void operator*(f32) const;
/* 802712B4 */ void operator*=(f32);
static u8 _0[2 + 2 /* padding */];
static u8 _90[2 + 2 /* padding */];
static u8 _180[2 + 2 /* padding */];
static u8 _270[2 + 6 /* padding */];
};
struct dBgS_LinChk {
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct dCamera_c {
@@ -399,6 +423,8 @@ struct dCamera_c {
/* 8018296C */ void clrFlag(u32);
/* 80182980 */ void chkFlag(u32);
/* 801829AC */ void Bank();
static u8 engine_tbl[240];
};
struct dCamSetup_c {
@@ -617,6 +643,10 @@ struct Z2SeMgr {
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct Z2Audience {
/* 802BD2DC */ void setAudioCamera(f32 (*)[4], Vec&, Vec&, f32, f32, bool, int, bool);
};
@@ -864,6 +894,7 @@ extern "C" void checkNoAttention__12daTagMhint_cCFv();
extern "C" void set__4cXyzFfff();
extern "C" void checkEndMessage__12daTagMwait_cFv();
extern "C" extern char const* const d_d_camera__stringBase0;
extern "C" u8 engine_tbl__9dCamera_c[240];
//
// External References:
@@ -1152,7 +1183,7 @@ extern "C" void _restgpr_29();
extern "C" void strncmp();
extern "C" void strcmp();
extern "C" void tan();
extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern void* g_fopCam_Method[5 + 1 /* padding */];
@@ -1163,25 +1194,25 @@ extern "C" extern void* __vt__8cM3dGLin[3];
extern "C" extern void* __vt__8cM3dGSph[3];
extern "C" extern void* __vt__18dDlst_effectLine_c[3];
extern "C" extern void* __vt__14dBgS_CamGndChk[12];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern f32 Zero__4cXyz[3];
extern "C" extern u8 BaseY__4cXyz[12];
extern "C" f32 Zero__4cXyz[3];
extern "C" u8 BaseY__4cXyz[12];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */];
extern "C" extern u32 __float_nan;
extern "C" extern u8 data_80450B44[4];
extern "C" extern u8 struct_80450BE4[4];
extern "C" extern u8 stopStatus__10fopAc_ac_c[4];
extern "C" u8 stopStatus__10fopAc_ac_c[4];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 m_object__7dDemo_c[4];
extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 _0__7cSAngle[2 + 2 /* padding */];
extern "C" extern u8 _90__7cSAngle[2 + 2 /* padding */];
extern "C" extern u8 _180__7cSAngle[2 + 2 /* padding */];
extern "C" extern u8 _270__7cSAngle[2 + 6 /* padding */];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 m_object__7dDemo_c[4];
extern "C" u8 m_midnaActor__9daPy_py_c[4];
extern "C" u8 _0__7cSAngle[2 + 2 /* padding */];
extern "C" u8 _90__7cSAngle[2 + 2 /* padding */];
extern "C" u8 _180__7cSAngle[2 + 2 /* padding */];
extern "C" u8 _270__7cSAngle[2 + 6 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
@@ -1471,7 +1502,7 @@ SECTION_DATA static void* lit_4497[3] = {
#pragma pop
/* 803BA25C-803BA34C 01737C 00F0+00 2/3 3/3 0/0 .data engine_tbl__9dCamera_c */
SECTION_DATA extern u8 engine_tbl__9dCamera_c[240] = {
SECTION_DATA u8 dCamera_c::engine_tbl[240] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
src/d/d_demo.cpp
+68 -30
View File
@@ -37,6 +37,10 @@ struct daMP_c {
/* 80031AD0 */ void daMP_c_THPPlayerPlay();
};
struct dStage_roomControl_c {
static u8 mDemoArcName[10 + 2 /* padding */];
};
struct dRes_info_c {};
struct dRes_control_c {
@@ -46,18 +50,20 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct dKy_tevstr_c {};
struct cXyz {
/* 80009184 */ ~cXyz();
};
struct dKy_tevstr_c {};
struct csXyz {};
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*,
cXyz const*, f32);
static u8 mEmitterMng[4];
};
struct dMsgObject_c {
@@ -222,6 +228,26 @@ struct dDemo_c {
/* 80039EDC */ void setBranchType(u16);
/* 80039EEC */ void setBranchId(u16, s16);
/* 80039F04 */ void reset();
static u16 m_branchId[1 + 3 /* padding */];
static u8 m_system[4];
static u8 m_control[4];
static u8 m_stage[4];
static u8 m_audio[4];
static u8 m_particle[4];
static u8 m_message[4];
static u8 m_factory[4];
static u8 m_mesgControl[4];
static u8 m_object[4];
static u8 m_data[4];
static u8 m_frame[4];
static u8 m_translation[4];
static f32 m_rotationY;
static u8 m_frameNoMsg[4];
static u8 m_mode[4];
static u8 m_status[4];
static u8 m_branchType[2 + 2 /* padding */];
static u8 m_branchData[4];
};
struct dDemo_ambient_c {
@@ -451,6 +477,25 @@ extern "C" void JSGGetTranslation__13dDemo_actor_cCFP3Vec();
extern "C" void JSGGetScaling__13dDemo_actor_cCFP3Vec();
extern "C" void JSGGetRotation__13dDemo_actor_cCFP3Vec();
extern "C" extern char const* const d_d_demo__stringBase0;
extern "C" u16 m_branchId__7dDemo_c[1 + 3 /* padding */];
extern "C" u8 m_system__7dDemo_c[4];
extern "C" u8 m_control__7dDemo_c[4];
extern "C" u8 m_stage__7dDemo_c[4];
extern "C" u8 m_audio__7dDemo_c[4];
extern "C" u8 m_particle__7dDemo_c[4];
extern "C" u8 m_message__7dDemo_c[4];
extern "C" u8 m_factory__7dDemo_c[4];
extern "C" u8 m_mesgControl__7dDemo_c[4];
extern "C" u8 m_object__7dDemo_c[4];
extern "C" u8 m_data__7dDemo_c[4];
extern "C" u8 m_frame__7dDemo_c[4];
extern "C" u8 m_translation__7dDemo_c[4];
extern "C" f32 m_rotationY__7dDemo_c;
extern "C" u8 m_frameNoMsg__7dDemo_c[4];
extern "C" u8 m_mode__7dDemo_c[4];
extern "C" u8 m_status__7dDemo_c[4];
extern "C" u8 m_branchType__7dDemo_c[2 + 2 /* padding */];
extern "C" u8 m_branchData__7dDemo_c[4];
//
// External References:
@@ -584,14 +629,14 @@ extern "C" extern void* __vt__Q37JStudio3stb8TFactory[5];
extern "C" extern void* __vt__Q214JStudio_JStage13TCreateObject[4];
extern "C" extern void* __vt__Q215JStudio_JAudio213TCreateObject[4];
extern "C" extern void* __vt__Q217JStudio_JParticle13TCreateObject[6];
extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u32 g_blackColor;
extern "C" extern u32 __float_max;
extern "C" extern u8 data_80450B74[4];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 mEmitterMng__13dPa_control_c[4];
extern "C" u8 mEmitterMng__13dPa_control_c[4];
//
// Declarations:
@@ -961,65 +1006,58 @@ asm void dDemo_actor_c::getPrm_Morf() {
static u8 dummy[20];
/* 80450E00-80450E04 000300 0004+00 2/2 0/0 0/0 .sbss m_system__7dDemo_c */
static u8 m_system__7dDemo_c[4];
u8 dDemo_c::m_system[4];
/* 80450E04-80450E08 000304 0004+00 6/6 3/3 0/0 .sbss m_control__7dDemo_c */
extern u8 m_control__7dDemo_c[4];
u8 m_control__7dDemo_c[4];
u8 dDemo_c::m_control[4];
/* 80450E08-80450E0C 000308 0004+00 2/2 0/0 0/0 .sbss m_stage__7dDemo_c */
static u8 m_stage__7dDemo_c[4];
u8 dDemo_c::m_stage[4];
/* 80450E0C-80450E10 00030C 0004+00 2/2 0/0 0/0 .sbss m_audio__7dDemo_c */
static u8 m_audio__7dDemo_c[4];
u8 dDemo_c::m_audio[4];
/* 80450E10-80450E14 000310 0004+00 2/2 0/0 0/0 .sbss m_particle__7dDemo_c */
static u8 m_particle__7dDemo_c[4];
u8 dDemo_c::m_particle[4];
/* 80450E14-80450E18 000314 0004+00 2/2 0/0 0/0 .sbss m_message__7dDemo_c */
static u8 m_message__7dDemo_c[4];
u8 dDemo_c::m_message[4];
/* 80450E18-80450E1C 000318 0004+00 2/2 0/0 0/0 .sbss m_factory__7dDemo_c */
static u8 m_factory__7dDemo_c[4];
u8 dDemo_c::m_factory[4];
/* 80450E1C-80450E20 00031C 0004+00 2/2 1/1 0/0 .sbss m_mesgControl__7dDemo_c */
extern u8 m_mesgControl__7dDemo_c[4];
u8 m_mesgControl__7dDemo_c[4];
u8 dDemo_c::m_mesgControl[4];
/* 80450E20-80450E24 000320 0004+00 5/5 9/9 7/7 .sbss m_object__7dDemo_c */
extern u8 m_object__7dDemo_c[4];
u8 m_object__7dDemo_c[4];
u8 dDemo_c::m_object[4];
/* 80450E24-80450E28 000324 0004+00 4/4 0/0 0/0 .sbss m_data__7dDemo_c */
static u8 m_data__7dDemo_c[4];
u8 dDemo_c::m_data[4];
/* 80450E28-80450E2C 000328 0004+00 2/2 0/0 1/1 .sbss m_frame__7dDemo_c */
extern u8 m_frame__7dDemo_c[4];
u8 m_frame__7dDemo_c[4];
u8 dDemo_c::m_frame[4];
/* 80450E2C-80450E30 00032C 0004+00 2/2 0/0 0/0 .sbss m_translation__7dDemo_c */
static u8 m_translation__7dDemo_c[4];
u8 dDemo_c::m_translation[4];
/* 80450E30-80450E34 000330 0004+00 2/2 0/0 0/0 .sbss m_rotationY__7dDemo_c */
static f32 m_rotationY__7dDemo_c;
f32 dDemo_c::m_rotationY;
/* 80450E34-80450E38 000334 0004+00 2/2 1/1 0/0 .sbss m_frameNoMsg__7dDemo_c */
extern u8 m_frameNoMsg__7dDemo_c[4];
u8 m_frameNoMsg__7dDemo_c[4];
u8 dDemo_c::m_frameNoMsg[4];
/* 80450E38-80450E3C 000338 0004+00 4/4 4/4 0/0 .sbss m_mode__7dDemo_c */
extern u8 m_mode__7dDemo_c[4];
u8 m_mode__7dDemo_c[4];
u8 dDemo_c::m_mode[4];
/* 80450E3C-80450E40 00033C 0004+00 2/2 1/1 0/0 .sbss m_status__7dDemo_c */
extern u8 m_status__7dDemo_c[4];
u8 m_status__7dDemo_c[4];
u8 dDemo_c::m_status[4];
/* 80450E40-80450E44 000340 0002+02 2/2 0/0 0/0 .sbss m_branchType__7dDemo_c */
static u8 m_branchType__7dDemo_c[2 + 2 /* padding */];
u8 dDemo_c::m_branchType[2 + 2 /* padding */];
/* 80450E44-80450E48 000344 0004+00 5/5 0/0 0/0 .sbss m_branchData__7dDemo_c */
static u8 m_branchData__7dDemo_c[4];
u8 dDemo_c::m_branchData[4];
/* 80450E48-80450E4C -00001 0004+00 1/1 0/0 0/0 .sbss None */
/* 80450E48 0001+00 data_80450E48 None */
@@ -1080,7 +1118,7 @@ static asm void branchFile(char const* param_0) {
/* ############################################################################################## */
/* 80450620-80450628 0000A0 0002+06 3/3 1/1 0/0 .sdata m_branchId__7dDemo_c */
SECTION_SDATA extern u16 m_branchId__7dDemo_c[1 + 3 /* padding */] = {
SECTION_SDATA u16 dDemo_c::m_branchId[1 + 3 /* padding */] = {
0xFFFF,
/* padding */
0x0000,
src/d/d_drawlist.cpp
+48 -20
View File
@@ -13,6 +13,18 @@
struct mDoMtx_stack_c {
/* 8000CE38 */ void scaleM(f32, f32, f32);
static u8 now[48];
};
struct mDoLib_clipper {
static u8 mClipper[92];
static f32 mSystemFar;
static f32 mFovyRate;
};
struct mDoGph_gInf_c {
static u8 mBackColor[4];
};
struct mDoExt_3DlineMatSortPacket {
@@ -32,6 +44,8 @@ struct dDlst_shadowTri_c {
/* 80056344 */ dDlst_shadowTri_c();
};
struct _GXTexObj {};
struct Vec {};
struct cXyz {
@@ -42,8 +56,6 @@ struct cXyz {
/* 802670AC */ void isZero() const;
};
struct _GXTexObj {};
struct dDlst_shadowSimple_c {
/* 8005520C */ void draw();
/* 800553EC */ void set(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
@@ -88,6 +100,8 @@ struct dDlst_shadowControl_c {
/* 80055F1C */ void addReal(u32, J3DModel*);
/* 80055F84 */ void setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
/* 80055FE8 */ void setSimpleTex(ResTIMG const*);
static u8 mSimpleTexObj[32];
};
struct dDlst_peekZ_c {
@@ -95,10 +109,6 @@ struct dDlst_peekZ_c {
/* 80056080 */ void peekData();
};
struct _GXColor {};
struct dDlst_base_c {};
struct J3DPacket {};
struct J3DDrawBuffer {
@@ -110,6 +120,10 @@ struct J3DDrawBuffer {
/* 803254AC */ void draw() const;
};
struct dDlst_base_c {};
struct _GXColor {};
struct dDlst_list_c {
/* 800560F0 */ dDlst_list_c();
/* 80056390 */ void init();
@@ -125,6 +139,11 @@ struct dDlst_list_c {
/* 8005681C */ void wipeIn(f32, _GXColor&);
/* 800568D8 */ void wipeIn(f32);
/* 80056900 */ void calcWipe();
static u8 mWipeDlst[72];
static u8 mWipeColor[4];
static f32 mWipeRate;
static f32 mWipeSpeed[1 + 1 /* padding */];
};
struct dDlst_effectLine_c {
@@ -204,6 +223,10 @@ struct JUtility {
struct TColor {};
};
struct JMath {
static u8 sincosTable_[65536];
};
struct JKRArchive {
/* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*);
};
@@ -223,6 +246,8 @@ struct J3DShapePacket {
struct J3DShape {
/* 80315300 */ void loadPreDrawSetting() const;
static u8 sOldVcdVatCmd[4];
};
struct J2DGrafContext {};
@@ -339,6 +364,11 @@ extern "C" extern void* __vt__11dDlst_2DT_c[3];
extern "C" extern void* __vt__15dDlst_2DPoint_c[3];
extern "C" extern void* __vt__14dDlst_2DQuad_c[3];
extern "C" extern void* __vt__13dDlst_2DTri_c[3];
extern "C" u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" u8 mWipeDlst__12dDlst_list_c[72];
extern "C" u8 mWipeColor__12dDlst_list_c[4];
extern "C" f32 mWipeRate__12dDlst_list_c;
extern "C" f32 mWipeSpeed__12dDlst_list_c[1 + 1 /* padding */];
extern "C" extern u8 data_80450EE0[8];
//
@@ -469,23 +499,23 @@ extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
extern "C" extern void* __vt__26mDoExt_3DlineMatSortPacket[5];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__9J3DPacket[5];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 mClipper__14mDoLib_clipper[92];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mClipper__14mDoLib_clipper[92];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_envHIO[68];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u8 mBackColor__13mDoGph_gInf_c[4];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u8 mBackColor__13mDoGph_gInf_c[4];
extern "C" extern u8 g_clearColor[4];
extern "C" extern u32 g_blackColor;
extern "C" extern u32 g_whiteColor;
extern "C" extern u32 __float_nan;
extern "C" extern u32 __float_max;
extern "C" extern f32 mSystemFar__14mDoLib_clipper;
extern "C" extern f32 mFovyRate__14mDoLib_clipper;
extern "C" f32 mSystemFar__14mDoLib_clipper;
extern "C" f32 mFovyRate__14mDoLib_clipper;
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4];
extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
//
// Declarations:
@@ -2893,8 +2923,7 @@ asm void dDlst_shadowControl_c::setSimple(cXyz* param_0, f32 param_1, f32 param_
/* ############################################################################################## */
/* 804248D0-804248F0 0515F0 0020+00 1/1 6/6 173/173 .bss mSimpleTexObj__21dDlst_shadowControl_c */
extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
u8 dDlst_shadowControl_c::mSimpleTexObj[32];
/* 80055FE8-80056018 050928 0030+00 0/0 1/1 0/0 .text
* setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG */
@@ -3189,10 +3218,10 @@ asm void dDlst_list_c::draw(dDlst_base_c** param_0, dDlst_base_c** param_1) {
/* ############################################################################################## */
/* 804248F0-80424938 051610 0048+00 3/3 0/0 0/0 .bss mWipeDlst__12dDlst_list_c */
static u8 mWipeDlst__12dDlst_list_c[72];
u8 dDlst_list_c::mWipeDlst[72];
/* 8045065C-80450660 0000DC 0004+00 1/1 0/0 0/0 .sdata mWipeColor__12dDlst_list_c */
SECTION_SDATA static u8 mWipeColor__12dDlst_list_c[4] = {
SECTION_SDATA u8 dDlst_list_c::mWipeColor[4] = {
0x00,
0x00,
0x00,
@@ -3204,11 +3233,10 @@ extern u8 data_80450ED0[4];
u8 data_80450ED0[4];
/* 80450ED4-80450ED8 0003D4 0004+00 2/2 1/1 0/0 .sbss mWipeRate__12dDlst_list_c */
extern f32 mWipeRate__12dDlst_list_c;
f32 mWipeRate__12dDlst_list_c;
f32 dDlst_list_c::mWipeRate;
/* 80450ED8-80450EE0 0003D8 0004+04 2/2 0/0 0/0 .sbss mWipeSpeed__12dDlst_list_c */
static f32 mWipeSpeed__12dDlst_list_c[1 + 1 /* padding */];
f32 dDlst_list_c::mWipeSpeed[1 + 1 /* padding */];
/* 804520D0-804520D4 0006D0 0004+00 1/1 0/0 0/0 .sdata2 @5809 */
SECTION_SDATA2 static f32 lit_5809 = 608.0f;
src/d/d_error_msg.cpp
+20 -6
View File
@@ -11,8 +11,16 @@
// Types:
//
struct mDoRst {
static u8 mResetData[4 + 4 /* padding */];
};
struct mDoGph_gInf_c {
/* 80007F90 */ void beginRender();
static u8 mFrameBufferTexObj[32];
static u8 mFrameBufferTimg[4];
static u8 mFrameBufferTex[4];
};
struct dShutdownErrorMsg_c {
@@ -26,6 +34,8 @@ struct dDvdErrorMsg_c {
struct Z2AudioMgr {
/* 802CD974 */ void resetProcess(u32, bool);
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct ResTLUT {};
@@ -48,6 +58,10 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct JFWDisplay {
static u8 sManager[4];
};
struct J3DSys {
/* 803100BC */ void drawInit();
};
@@ -151,18 +165,18 @@ extern "C" void _restgpr_27();
extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
extern "C" extern void* __vt__14J2DGrafContext[10];
extern "C" extern void* __vt__13J2DOrthoGraph[10];
extern "C" extern u8 mFrameBufferTexObj__13mDoGph_gInf_c[32];
extern "C" u8 mFrameBufferTexObj__13mDoGph_gInf_c[32];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 g_clearColor[4];
extern "C" extern u8 data_80450688[8];
extern "C" extern u8 struct_80450BB8[4];
extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" extern u8 mFrameBufferTex__13mDoGph_gInf_c[4];
extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" u8 mFrameBufferTex__13mDoGph_gInf_c[4];
extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" extern u8 struct_80450FB0[8];
extern "C" extern u8 sManager__10JFWDisplay[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 sManager__10JFWDisplay[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/d_ev_camera.cpp
+24 -7
View File
@@ -11,6 +11,10 @@
// Types:
//
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct fopAc_ac_c {};
struct daPy_py_c {
@@ -19,6 +23,8 @@ struct daPy_py_c {
/* 80097858 */ bool checkBoardRide() const;
/* 80097860 */ bool checkSpinnerRide() const;
/* 80097868 */ bool checkBoarRide() const;
static u8 m_midnaActor[4];
};
struct daMidna_c {
@@ -48,6 +54,8 @@ struct cXyz {
/* 80266B84 */ void operator*(f32) const;
/* 80266CE4 */ void norm() const;
/* 80266EF4 */ void normalize();
static f32 Zero[3];
};
struct dEvent_manager_c {
@@ -60,6 +68,10 @@ struct dDemo_object_c {
/* 80039128 */ void getActiveCamera();
};
struct dDemo_c {
static u8 m_object[4];
};
struct dCcS {
/* 80086D8C */ void ChkCamera(cXyz&, cXyz&, f32, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*);
};
@@ -131,6 +143,8 @@ struct dCamera_c {
/* 80181208 */ void SetBlureAlpha(f32);
/* 80181210 */ void SetBlureScale(f32, f32, f32);
/* 80181220 */ void SetBlurePosition(f32, f32, f32);
static u8 engine_tbl[240];
};
struct dCamParam_c {
@@ -154,6 +168,9 @@ struct cSAngle {
/* 802711D4 */ void operator+=(cSAngle const&);
/* 80271264 */ void operator*(f32) const;
/* 802712B4 */ void operator*=(f32);
static u8 _0[2 + 2 /* padding */];
static u8 _90[2 + 2 /* padding */];
};
struct dCamMath {
@@ -380,17 +397,17 @@ extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" void strcpy();
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern u8 engine_tbl__9dCamera_c[240];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 engine_tbl__9dCamera_c[240];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern f32 Zero__4cXyz[3];
extern "C" f32 Zero__4cXyz[3];
extern "C" extern u32 __float_nan;
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 m_object__7dDemo_c[4];
extern "C" u8 m_object__7dDemo_c[4];
extern "C" extern u8 struct_80450F88[8];
extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 _0__7cSAngle[2 + 2 /* padding */];
extern "C" extern u8 _90__7cSAngle[2 + 2 /* padding */];
extern "C" u8 m_midnaActor__9daPy_py_c[4];
extern "C" u8 _0__7cSAngle[2 + 2 /* padding */];
extern "C" u8 _90__7cSAngle[2 + 2 /* padding */];
//
// Declarations:
src/d/d_eye_hl.cpp
+4 -1
View File
@@ -22,6 +22,8 @@ struct dEyeHL_mng_c {
/* 8009CA48 */ void update();
/* 8009CB14 */ void entry(dEyeHL_c*);
/* 8009CB34 */ void remove(dEyeHL_c*);
static u8 m_obj[4 + 4 /* padding */];
};
struct JUTNameTab {
@@ -38,6 +40,7 @@ extern "C" void update__12dEyeHL_mng_cFv();
extern "C" void entry__12dEyeHL_mng_cFP8dEyeHL_c();
extern "C" void remove__12dEyeHL_mng_cFP8dEyeHL_c();
extern "C" extern char const* const d_d_eye_hl__stringBase0;
extern "C" u8 m_obj__12dEyeHL_mng_c[4 + 4 /* padding */];
extern "C" extern u8 struct_80450FB0[8];
extern "C" extern u8 struct_80450FB8[4];
extern "C" extern u8 struct_80450FBC[4];
@@ -81,7 +84,7 @@ asm void dEyeHL_c::remove() {
/* ############################################################################################## */
/* 80450FA8-80450FB0 0004A8 0004+04 3/3 0/0 0/0 .sbss m_obj__12dEyeHL_mng_c */
static u8 m_obj__12dEyeHL_mng_c[4 + 4 /* padding */];
u8 dEyeHL_mng_c::m_obj[4 + 4 /* padding */];
/* 80452C10-80452C14 001210 0004+00 1/1 0/0 0/0 .sdata2 @3862 */
SECTION_SDATA2 static f32 lit_3862 = 2.0f;
src/d/d_gameover.cpp
+30 -9
View File
@@ -15,6 +15,19 @@ struct request_of_phase_process_class {};
struct msg_class {};
struct mDoRst {
static u8 mResetData[4 + 4 /* padding */];
};
struct mDoGph_gInf_c {
static u8 mFadeColor[4];
static u8 mFader[4];
static u8 mFrameBufferTimg[4];
static u8 mFrameBufferTex[4];
static u8 mZbufferTex[4];
static f32 mFadeRate;
};
struct fopAc_ac_c {};
struct dSv_player_item_c {
@@ -26,6 +39,10 @@ struct dSv_player_get_item_c {
/* 80033EC8 */ void isFirstBit(u8) const;
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 800349A4 */ void offEventBit(u16);
/* 800349BC */ void isEventBit(u16) const;
@@ -132,6 +149,10 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct JFWDisplay {
static u8 sManager[4];
};
struct J2DTextBox {
/* 80300660 */ void setString(char const*, ...);
};
@@ -278,23 +299,23 @@ extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__14mDoHIO_entry_c[3];
extern "C" extern void* __vt__16dDlst_MenuSave_c[4];
extern "C" extern void* __vt__23dDlst_MenuSaveExplain_c[4 + 18 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mFadeColor__13mDoGph_gInf_c[4];
extern "C" u8 mFadeColor__13mDoGph_gInf_c[4];
extern "C" extern u8 g_clearColor[4];
extern "C" extern u32 g_blackColor;
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" extern u8 mFrameBufferTex__13mDoGph_gInf_c[4];
extern "C" extern u8 mZbufferTex__13mDoGph_gInf_c[4];
extern "C" extern f32 mFadeRate__13mDoGph_gInf_c;
extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" u8 mFader__13mDoGph_gInf_c[4];
extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" u8 mFrameBufferTex__13mDoGph_gInf_c[4];
extern "C" u8 mZbufferTex__13mDoGph_gInf_c[4];
extern "C" f32 mFadeRate__13mDoGph_gInf_c;
extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" extern u8 g_menuHIO[8];
extern "C" extern u8 sManager__10JFWDisplay[4];
extern "C" u8 sManager__10JFWDisplay[4];
//
// Declarations:
src/d/d_insect.cpp
+5 -1
View File
@@ -15,6 +15,10 @@ struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
@@ -77,7 +81,7 @@ extern "C" void endCheckOld__16dEvent_manager_cFPCc();
extern "C" void newData__13dDlst_peekZ_cFssPUl();
extern "C" void Insect_Release__9dInsect_cFv();
extern "C" void isCatchNotGiveInsect__14dMenu_Insect_cFUc();
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
src/d/d_item.cpp
+11 -4
View File
@@ -62,10 +62,18 @@ struct dSv_info_c {
/* 80035200 */ void onSwitch(int, int);
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 8003498C */ void onEventBit(u16);
};
struct dEnemyItem_c {
static u8 mData[4 + 4 /* padding */];
};
struct dComIfG_play_c {
/* 8002B36C */ void setItemBombNumCount(u8, s16);
/* 8002C97C */ void getLayerNo(int);
@@ -461,7 +469,7 @@ extern "C" void isInsect__FUc();
extern "C" void check_itemno__Fi();
extern "C" static void addBombCount__FUcUc();
extern "C" extern char const* const d_d_item__stringBase0;
extern "C" extern u8 mData__12dEnemyItem_c[4 + 4 /* padding */];
extern "C" u8 mData__12dEnemyItem_c[4 + 4 /* padding */];
//
// External References:
@@ -506,7 +514,7 @@ extern "C" void _restgpr_20();
extern "C" void _restgpr_26();
extern "C" void _restgpr_29();
extern "C" void strncmp();
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 struct_80450D64[4];
@@ -4433,8 +4441,7 @@ static asm void addBombCount(u8 param_0, u8 param_1) {
/* ############################################################################################## */
/* 80450F90-80450F98 000490 0004+04 0/0 2/2 0/0 .sbss mData__12dEnemyItem_c */
extern u8 mData__12dEnemyItem_c[4 + 4 /* padding */];
u8 mData__12dEnemyItem_c[4 + 4 /* padding */];
u8 dEnemyItem_c::mData[4 + 4 /* padding */];
/* 8037B0D0-8037B0D8 007730 0007+01 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push
src/d/d_item_data.cpp
+16 -6
View File
@@ -7,14 +7,24 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct dItem_data {
static void* item_resource[1530];
static void* field_item_res[1020];
static u8 item_info[1020 + 4 /* padding */];
};
//
// Forward References:
//
extern "C" extern char const* const d_d_item_data__stringBase0;
extern "C" extern void* item_resource__10dItem_data[1530];
extern "C" extern void* field_item_res__10dItem_data[1020];
extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */];
extern "C" void* item_resource__10dItem_data[1530];
extern "C" void* field_item_res__10dItem_data[1020];
extern "C" u8 item_info__10dItem_data[1020 + 4 /* padding */];
//
// External References:
@@ -26,7 +36,7 @@ extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */];
/* ############################################################################################## */
/* 803AC5A0-803ADD88 -00001 17E8+00 0/0 10/10 2/2 .data item_resource__10dItem_data */
SECTION_DATA extern void* item_resource__10dItem_data[1530] = {
SECTION_DATA void* dItem_data::item_resource[1530] = {
(void*)&d_d_item_data__stringBase0,
(void*)0x0004FFFF,
(void*)0xFFFF0007,
@@ -1560,7 +1570,7 @@ SECTION_DATA extern void* item_resource__10dItem_data[1530] = {
};
/* 803ADD88-803AED78 -00001 0FF0+00 0/0 3/3 14/14 .data field_item_res__10dItem_data */
SECTION_DATA extern void* field_item_res__10dItem_data[1020] = {
SECTION_DATA void* dItem_data::field_item_res[1020] = {
(void*)(((char*)&d_d_item_data__stringBase0) + 0x327),
(void*)0x0014FFFF,
(void*)0x0030FF00,
@@ -2584,7 +2594,7 @@ SECTION_DATA extern void* field_item_res__10dItem_data[1020] = {
};
/* 803AED78-803AF178 00BE98 03FC+04 0/0 9/9 9/9 .data item_info__10dItem_data */
SECTION_DATA extern u8 item_info__10dItem_data[1020 + 4 /* padding */] = {
SECTION_DATA u8 dItem_data::item_info[1020 + 4 /* padding */] = {
0x0F,
0x28,
0x1E,
src/d/d_jnt_col.cpp
+10 -6
View File
@@ -11,6 +11,8 @@
// Types:
//
struct csXyz {};
struct Vec {};
struct cXyz {
@@ -21,27 +23,29 @@ struct cXyz {
/* 80266F48 */ void normalizeZP();
/* 80267128 */ void atan2sX_Z() const;
/* 80267150 */ void atan2sY_XZ() const;
};
struct csXyz {};
static u8 BaseZ[12];
};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CD9C */ void transM(f32, f32, f32);
/* 8000CF0C */ void ZXYrotS(csXyz const&);
static u8 now[48];
};
struct fopAc_ac_c {};
struct J3DModel {};
struct dJntColData_c {};
struct cM3dGLin {
/* 80036A5C */ ~cM3dGLin();
/* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&);
};
struct dJntColData_c {};
struct dJntCol_c {
/* 80035C8C */ dJntCol_c();
/* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int);
@@ -126,8 +130,8 @@ extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern void* __vt__8cM3dGCyl[3];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 BaseZ__4cXyz[12];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 BaseZ__4cXyz[12];
extern "C" extern u32 __float_nan;
extern "C" extern u32 __float_max;
src/d/d_k_wmark.cpp
+24 -6
View File
@@ -11,6 +11,14 @@
// Types:
//
struct mDoMtx_stack_c {
static u8 now[48];
};
struct mDoLib_clipper {
static u8 mClipper[92];
};
struct kankyo_class {};
struct cXyz {
@@ -20,11 +28,16 @@ struct cXyz {
struct fopAcM_gc_c {
/* 8001DCBC */ void gndCheck(cXyz const*);
static u8 mGndCheck[84];
static f32 mGroundY;
};
struct dkWmark_c {
/* 80261640 */ ~dkWmark_c();
/* 802616C4 */ void setMatrix();
static u8 m_nowID[4];
};
struct dKy_tevstr_c {};
@@ -56,6 +69,10 @@ struct cBgS {
struct Vec {};
struct JMath {
static u8 sincosTable_[65536];
};
struct JKRSolidHeap {};
struct J3DUClipper {
@@ -84,6 +101,7 @@ extern "C" static void dkWmark_Execute__FP9dkWmark_c();
extern "C" static void dkWmark_Draw__FP9dkWmark_c();
extern "C" extern char const* const d_d_k_wmark__stringBase0;
extern "C" extern void* g_profile_WMARK[10 + 1 /* padding */];
extern "C" u8 m_nowID__9dkWmark_c[4];
//
// External References:
@@ -123,15 +141,15 @@ extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 mClipper__14mDoLib_clipper[92];
extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mClipper__14mDoLib_clipper[92];
extern "C" u8 mGndCheck__11fopAcM_gc_c[84];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern f32 mGroundY__11fopAcM_gc_c;
extern "C" f32 mGroundY__11fopAcM_gc_c;
extern "C" extern u8 struct_80450D64[4];
//
@@ -147,7 +165,7 @@ static u8 lit_3644[12];
static f32 data_80430C9C[3];
/* 80451130-80451134 000630 0004+00 2/2 0/0 0/0 .sbss m_nowID__9dkWmark_c */
static u8 m_nowID__9dkWmark_c[4];
u8 dkWmark_c::m_nowID[4];
/* 80451134-80451138 000634 0004+00 1/1 0/0 0/0 .sbss None */
static u8 data_80451134[4];
src/d/d_k_wpillar.cpp
+11 -5
View File
@@ -11,10 +11,14 @@
// Types:
//
struct J3DAnmTextureSRTKey {};
struct mDoMtx_stack_c {
static u8 now[48];
};
struct J3DMaterialTable {};
struct J3DAnmTextureSRTKey {};
struct mDoExt_btkAnm {
/* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
/* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
@@ -27,10 +31,10 @@ struct mDoExt_brkAnm {
/* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
};
struct J3DAnmTransform {};
struct J3DModelData {};
struct J3DAnmTransform {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D9CC */ void entry(J3DModelData*, f32);
@@ -46,6 +50,8 @@ struct cXyz {};
struct fopAcM_gc_c {
/* 8001DCBC */ void gndCheck(cXyz const*);
static u8 mGndCheck[84];
};
struct dkWpillar_c {
@@ -158,8 +164,8 @@ extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mGndCheck__11fopAcM_gc_c[84];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
src/d/d_ky_thunder.cpp
+10 -2
View File
@@ -11,6 +11,10 @@
// Types:
//
struct mDoMtx_stack_c {
static u8 now[48];
};
struct J3DAnmTevRegKey {};
struct J3DMaterialTable {
@@ -50,6 +54,10 @@ struct Z2EnvSeMgr {
/* 802C7E68 */ void startFarThunderSe(Vec*, s8);
};
struct JMath {
static u8 sincosTable_[65536];
};
struct JKRSolidHeap {};
struct J3DModelData {};
@@ -113,13 +121,13 @@ extern "C" void strcmp();
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_mEnvSeMgr[780];
extern "C" extern u8 g_Counter[12 + 4 /* padding */];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 struct_80451070[8];
src/d/d_lib.cpp
+17 -4
View File
@@ -11,12 +11,23 @@
// Types:
//
struct mDoMtx_stack_c {
static u8 now[48];
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct fopAc_ac_c {};
struct dLib_time_c {
/* 80032804 */ void getTime();
/* 80032880 */ void stopTime();
/* 800328BC */ void startTime();
static u8 m_diffTime[4];
static u8 m_stopTime[4];
};
struct dEvt_control_c {
@@ -89,6 +100,8 @@ extern "C" void dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc();
extern "C" void getTime__11dLib_time_cFv();
extern "C" void stopTime__11dLib_time_cFv();
extern "C" void startTime__11dLib_time_cFv();
extern "C" u8 m_diffTime__11dLib_time_c[4];
extern "C" u8 m_stopTime__11dLib_time_c[4];
extern "C" extern u8 struct_80450DF0[8];
//
@@ -105,8 +118,8 @@ extern "C" void OSGetTime();
extern "C" void PSMTXMultVec();
extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
//
@@ -313,13 +326,13 @@ asm void dLib_getExpandSizeFromAramArchive(JKRAramArchive* param_0, char const*
/* ############################################################################################## */
/* 80450DD8-80450DDC 0002D8 0004+00 2/2 0/0 0/0 .sbss m_diffTime__11dLib_time_c */
static u8 m_diffTime__11dLib_time_c[4];
u8 dLib_time_c::m_diffTime[4];
/* 80450DDC-80450DE0 0002DC 0004+00 2/2 0/0 0/0 .sbss None */
static u8 data_80450DDC[4];
/* 80450DE0-80450DE4 0002E0 0004+00 3/3 0/0 0/0 .sbss m_stopTime__11dLib_time_c */
static u8 m_stopTime__11dLib_time_c[4];
u8 dLib_time_c::m_stopTime[4];
/* 80450DE4-80450DE8 0002E4 0004+00 3/3 0/0 0/0 .sbss None */
static u8 data_80450DE4[4];
src/d/d_model.cpp
+12 -3
View File
@@ -11,6 +11,10 @@
// Types:
//
struct dStage_roomControl_c {
static u8 mStatus[65792];
};
struct dMdl_obj_c {};
struct dKy_tevstr_c {};
@@ -24,6 +28,8 @@ struct dMdl_mng_c {
/* 8009C7AC */ void create();
/* 8009C864 */ void remove();
/* 8009C8C0 */ void reset();
static u8 m_myObj[4 + 4 /* padding */];
};
struct dMdl_c {
@@ -36,6 +42,8 @@ struct dMdl_c {
struct J3DShape {
/* 80315300 */ void loadPreDrawSetting() const;
static u8 sOldVcdVatCmd[4];
};
struct J3DPacket;
@@ -62,6 +70,7 @@ extern "C" void remove__10dMdl_mng_cFv();
extern "C" void reset__10dMdl_mng_cFv();
extern "C" void entry__10dMdl_mng_cFP12J3DModelDataUsi();
extern "C" void __ct__6dMdl_cFv();
extern "C" u8 m_myObj__10dMdl_mng_c[4 + 4 /* padding */];
//
// External References:
@@ -87,11 +96,11 @@ extern "C" void _savegpr_28();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" extern void* __vt__9J3DPacket[5];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 j3dSys[284];
extern "C" extern u32 g_whiteColor;
extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4];
extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
//
// Declarations:
@@ -156,7 +165,7 @@ asm void dMdl_mng_c::entry(J3DModelData* param_0, u16 param_1, dKy_tevstr_c* par
/* ############################################################################################## */
/* 80450FA0-80450FA8 0004A0 0004+04 4/4 0/0 0/0 .sbss m_myObj__10dMdl_mng_c */
static u8 m_myObj__10dMdl_mng_c[4 + 4 /* padding */];
u8 dMdl_mng_c::m_myObj[4 + 4 /* padding */];
/* 8009C7AC-8009C808 0970EC 005C+00 0/0 1/1 0/0 .text create__10dMdl_mng_cFv */
#pragma push
src/d/d_name.cpp
+10 -2
View File
@@ -11,6 +11,10 @@
// Types:
//
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct JKRArchive {};
struct J2DPane {};
@@ -89,6 +93,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 8003219C */ void checkTrigger();
@@ -244,9 +252,9 @@ extern "C" void sprintf();
extern "C" void strcat();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/d_npc_lib.cpp
+12 -8
View File
@@ -11,6 +11,14 @@
// Types:
//
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 80112C80 */ csXyz();
/* 8026745C */ void operator+=(csXyz&);
static u8 Zero[4];
};
struct Vec {};
struct cXyz {
@@ -21,16 +29,12 @@ struct cXyz {
/* 802670AC */ void isZero() const;
};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 80112C80 */ csXyz();
/* 8026745C */ void operator+=(csXyz&);
};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CE9C */ void XYZrotS(csXyz const&);
/* 8000CF44 */ void ZXYrotM(csXyz const&);
static u8 now[48];
};
struct fopAc_ac_c {};
@@ -91,9 +95,9 @@ extern "C" void _savegpr_25();
extern "C" void _restgpr_22();
extern "C" void _restgpr_23();
extern "C" void _restgpr_25();
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u32 __float_nan;
extern "C" extern u8 Zero__5csXyz[4];
extern "C" u8 Zero__5csXyz[4];
extern "C" extern u8 data_80451164[4];
//
src/d/d_resorce.cpp
+17 -6
View File
@@ -11,6 +11,15 @@
// Types:
//
struct mDoMtx_stack_c {
static u8 now[48];
};
struct mDoGph_gInf_c {
static u8 mFrameBufferTimg[4];
static u8 mZbufferTimg[4];
};
struct mDoExt_transAnmBas {
/* 8003C784 */ ~mDoExt_transAnmBas();
};
@@ -18,14 +27,14 @@ struct mDoExt_transAnmBas {
struct JKRHeap {
/* 802CE6B0 */ void getSize(void*, JKRHeap*);
/* 802CE83C */ void findFromRoot(void*);
static u8 sCurrentHeap[4];
};
struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
struct cXyz {};
struct JKRArchive {
/* 802D5CE4 */ void getIdxResource(u32);
/* 802D625C */ void getFileAttribute(u32) const;
@@ -39,6 +48,8 @@ struct J3DModelData {
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
};
struct cXyz {};
struct dRes_info_c {
/* 8003A260 */ dRes_info_c();
/* 8003A280 */ ~dRes_info_c();
@@ -327,12 +338,12 @@ extern "C" void strlen();
extern "C" void stricmp();
extern "C" extern u8 const j3dDefaultMtx[48];
extern "C" extern void* __vt__14J3DMaterialAnm[4];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" extern u8 mZbufferTimg__13mDoGph_gInf_c[4];
extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" u8 mZbufferTimg__13mDoGph_gInf_c[4];
extern "C" u8 sCurrentHeap__7JKRHeap[4];
extern "C" extern u8 j3dDefaultTevSwapMode[4];
//
src/d/d_select_cursor.cpp
+2 -2
View File
@@ -19,8 +19,6 @@ struct dSelect_icon_c {
/* 80195B70 */ void setPos(J2DPane*, f32, f32);
};
struct J2DAnmColor {};
struct JKRArchive {};
struct J2DAnmTextureSRTKey {};
@@ -29,6 +27,8 @@ struct J2DAnmTransformKey {
/* 801959C0 */ ~J2DAnmTransformKey();
};
struct J2DAnmColor {};
struct dSelect_cursor_c {
/* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
/* 801949EC */ ~dSelect_cursor_c();
src/d/d_simple_model.cpp
+5 -1
View File
@@ -27,6 +27,10 @@ struct diff_model_c {
/* 80049408 */ void insert(modelList_c*);
};
struct dStage_roomControl_c {
static u8 mStatus[65792];
};
struct J3DModel {};
struct dSmplMdl_draw_c {
@@ -90,7 +94,7 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
src/d/d_stage.cpp
+45 -29
View File
@@ -54,6 +54,10 @@ struct stage_actor_class {};
struct roomRead_class {};
struct mDoRst {
static u8 mResetData[4 + 4 /* padding */];
};
struct layer_class {};
struct fopAc_ac_c {};
@@ -99,29 +103,29 @@ struct dStage_startStage_c {
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_MemoryConfig_c {};
struct dStage_dPnt_c {};
struct dStage_FileList_dt_c {};
struct dStage_Multi_c {};
struct dStage_FloorInfo_c {};
struct dStage_Elst_c {};
struct dStage_DMap_c {};
struct dStage_MapEventInfo_c {};
struct dStage_SoundInfo_c {};
struct dStage_dPath_c {};
struct dStage_Multi_c {};
struct dStage_stageDt_c {
/* 8002483C */ void getStagInfo() const;
@@ -339,6 +343,15 @@ struct dStage_roomControl_c {
/* 80024940 */ void getArcBank(int);
/* 80024954 */ void resetArchiveBank(int);
/* 80024DB0 */ void SetTimePass(int);
static u8 mMemoryBlock[76];
static u8 mArcBank[320];
static u8 mStatus[65792];
static u8 mDemoArcName[10 + 2 /* padding */];
static u8 mProcID[4];
static u8 mArcBankName[4];
static u8 mArcBankData[4];
static u8 m_roomDzs[8];
};
struct dStage_nextStage_c {
@@ -715,6 +728,14 @@ extern "C" void __dt__19dStage_KeepDoorInfoFv();
extern "C" void __dt__21stage_tgsc_data_classFv();
extern "C" void __ct__21stage_tgsc_data_classFv();
extern "C" extern char const* const d_d_stage__stringBase0;
extern "C" u8 mMemoryBlock__20dStage_roomControl_c[76];
extern "C" u8 mArcBank__20dStage_roomControl_c[320];
extern "C" u8 mStatus__20dStage_roomControl_c[65792];
extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" u8 mProcID__20dStage_roomControl_c[4];
extern "C" u8 mArcBankName__20dStage_roomControl_c[4];
extern "C" u8 mArcBankData__20dStage_roomControl_c[4];
extern "C" u8 m_roomDzs__20dStage_roomControl_c[8];
//
// External References:
@@ -796,7 +817,7 @@ extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_save_bit_HIO[1184 + 4 /* padding */];
extern "C" extern u8 data_804505F0[8];
extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */];
//
// Declarations:
@@ -954,15 +975,13 @@ static u8 lit_5376[12];
#pragma pop
/* 803F6094-80406194 022DB4 10100+00 12/12 31/31 16/16 .bss mStatus__20dStage_roomControl_c */
extern u8 mStatus__20dStage_roomControl_c[65792];
u8 mStatus__20dStage_roomControl_c[65792];
u8 dStage_roomControl_c::mStatus[65792];
/* 80450D58-80450D60 000258 0008+00 1/1 0/0 0/0 .sbss tmp_name$4456 */
static u8 tmp_name[8];
/* 80450D60-80450D64 000260 0004+00 1/1 3/3 1/1 .sbss mProcID__20dStage_roomControl_c */
extern u8 mProcID__20dStage_roomControl_c[4];
u8 mProcID__20dStage_roomControl_c[4];
u8 dStage_roomControl_c::mProcID[4];
/* 80450D64-80450D68 -00001 0004+00 6/6 94/94 101/101 .sbss None */
/* 80450D64 0001+00 data_80450D64 None */
@@ -977,12 +996,10 @@ extern u8 data_80450D68[4];
u8 data_80450D68[4];
/* 80450D6C-80450D70 00026C 0004+00 1/1 2/2 0/0 .sbss mArcBankName__20dStage_roomControl_c */
extern u8 mArcBankName__20dStage_roomControl_c[4];
u8 mArcBankName__20dStage_roomControl_c[4];
u8 dStage_roomControl_c::mArcBankName[4];
/* 80450D70-80450D74 000270 0004+00 1/1 1/1 0/0 .sbss mArcBankData__20dStage_roomControl_c */
extern u8 mArcBankData__20dStage_roomControl_c[4];
u8 mArcBankData__20dStage_roomControl_c[4];
u8 dStage_roomControl_c::mArcBankData[4];
/* 800241E8-80024338 01EB28 0150+00 1/1 0/0 0/4 .text init__20dStage_roomControl_cFv */
#pragma push
@@ -1825,7 +1842,7 @@ SECTION_DATA static void* l_funcTable_5178[9] = {
};
/* 803A6920-803A696C 003A40 004C+00 3/3 0/0 0/0 .data mMemoryBlock__20dStage_roomControl_c */
SECTION_DATA static u8 mMemoryBlock__20dStage_roomControl_c[76] = {
SECTION_DATA u8 dStage_roomControl_c::mMemoryBlock[76] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1949,7 +1966,7 @@ asm void dStage_roomControl_c::destroyMemoryBlock() {
/* ############################################################################################## */
/* 803A696C-803A6AAC 003A8C 0140+00 2/2 0/0 0/0 .data mArcBank__20dStage_roomControl_c */
SECTION_DATA static u8 mArcBank__20dStage_roomControl_c[320] = {
SECTION_DATA u8 dStage_roomControl_c::mArcBank[320] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2733,7 +2750,7 @@ static asm void dStage_fieldMapMapPathInit(dStage_dt_c* param_0, void* param_1,
/* ############################################################################################## */
/* 80450D74-80450D7C 000274 0008+00 3/3 0/0 0/0 .sbss m_roomDzs__20dStage_roomControl_c
*/
static u8 m_roomDzs__20dStage_roomControl_c[8];
u8 dStage_roomControl_c::m_roomDzs[8];
/* 8002645C-800265DC 020D9C 0180+00 1/1 0/0 0/0 .text readMult__FP11dStage_dt_cP14dStage_Multi_cb
*/
@@ -2955,8 +2972,7 @@ asm void dStage_infoCreate() {
/* ############################################################################################## */
/* 80406194-804061A0 032EB4 000A+02 2/2 14/14 7/7 .bss mDemoArcName__20dStage_roomControl_c */
extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
u8 dStage_roomControl_c::mDemoArcName[10 + 2 /* padding */];
/* 80026D38-80026DF8 021678 00C0+00 0/0 1/1 0/0 .text dStage_Create__Fv */
#pragma push
src/d/d_timer.cpp
+5 -1
View File
@@ -130,6 +130,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JKRHeap {
/* 802CE784 */ void getTotalFreeSize();
};
@@ -307,7 +311,7 @@ extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/d_tresure.cpp
+19 -7
View File
@@ -11,6 +11,10 @@
// Types:
//
struct mDoMtx_stack_c {
static u8 now[48];
};
struct Vec {};
struct dTres_c {
@@ -35,6 +39,11 @@ struct dTres_c {
/* 8009C3CC */ void setPosition(int, u8, Vec const*, int);
/* 8009C49C */ void getTypeGroupNoToType(u8);
/* 8009C4B0 */ void getTypeToTypeGroupNo(u8);
static u8 const typeToTypeGroup[34 + 6 /* padding */];
static u8 mTypeGroupListAll[204 + 4 /* padding */];
static u8 mTypeGroupData[4];
static u8 mNum[2 + 2 /* padding */];
};
struct dSv_memBit_c {
@@ -72,6 +81,10 @@ extern "C" void getNextData__7dTres_cFPCQ27dTres_c15typeGroupData_c();
extern "C" void setPosition__7dTres_cFiUcPC3Veci();
extern "C" void getTypeGroupNoToType__7dTres_cFUc();
extern "C" void getTypeToTypeGroupNo__7dTres_cFUc();
extern "C" u8 const typeToTypeGroup__7dTres_c[34 + 6 /* padding */];
extern "C" u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */];
extern "C" u8 mTypeGroupData__7dTres_c[4];
extern "C" u8 mNum__7dTres_c[2 + 2 /* padding */];
//
// External References:
@@ -94,7 +107,7 @@ extern "C" void _savegpr_28();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 data_80450680[8];
extern "C" extern u32 __float_nan;
@@ -105,7 +118,7 @@ extern "C" extern u32 __float_nan;
/* ############################################################################################## */
/* 80450F98-80450F9C 000498 0004+00 2/2 0/0 0/0 .sbss mTypeGroupData__7dTres_c */
static u8 mTypeGroupData__7dTres_c[4];
u8 dTres_c::mTypeGroupData[4];
/* 8009BBD8-8009BC18 096518 0040+00 0/0 1/1 0/0 .text createWork__7dTres_cFv */
#pragma push
@@ -139,11 +152,10 @@ asm void dTres_c::remove() {
/* ############################################################################################## */
/* 80425438-80425508 052158 00CC+04 6/6 3/3 0/0 .bss mTypeGroupListAll__7dTres_c */
extern u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */];
u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */];
u8 dTres_c::mTypeGroupListAll[204 + 4 /* padding */];
/* 80450F9C-80450FA0 00049C 0002+02 2/2 0/0 0/0 .sbss mNum__7dTres_c */
static u8 mNum__7dTres_c[2 + 2 /* padding */];
u8 dTres_c::mNum[2 + 2 /* padding */];
/* 8009BC6C-8009BCB4 0965AC 0048+00 2/2 0/0 0/0 .text reset__7dTres_cFv */
#pragma push
@@ -278,7 +290,7 @@ asm void dTres_c::setPosition(int param_0, u8 param_1, Vec const* param_2, int p
/* ############################################################################################## */
/* 8037B0D8-8037B100 007738 0022+06 2/2 0/0 0/0 .rodata typeToTypeGroup__7dTres_c */
SECTION_RODATA static u8 const typeToTypeGroup__7dTres_c[34 + 6 /* padding */] = {
SECTION_RODATA u8 const dTres_c::typeToTypeGroup[34 + 6 /* padding */] = {
0xFF,
0x00,
0x00,
@@ -321,7 +333,7 @@ SECTION_RODATA static u8 const typeToTypeGroup__7dTres_c[34 + 6 /* padding */] =
0x00,
0x00,
};
COMPILER_STRIP_GATE(8037B0D8, &typeToTypeGroup__7dTres_c);
COMPILER_STRIP_GATE(8037B0D8, &dTres_c::typeToTypeGroup);
/* 8009C49C-8009C4B0 096DDC 0014+00 0/0 1/1 0/0 .text getTypeGroupNoToType__7dTres_cFUc
*/
src/d/d_vib_pattern.cpp
+23 -12
View File
@@ -7,14 +7,25 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct dVibration_c {
static u8 const MS_patt[88];
static u8 const CS_patt[88];
static u8 const MQ_patt[80];
static u8 const CQ_patt[80];
};
//
// Forward References:
//
extern "C" extern u8 const MS_patt__12dVibration_c[88];
extern "C" extern u8 const CS_patt__12dVibration_c[88];
extern "C" extern u8 const MQ_patt__12dVibration_c[80];
extern "C" extern u8 const CQ_patt__12dVibration_c[80];
extern "C" u8 const MS_patt__12dVibration_c[88];
extern "C" u8 const CS_patt__12dVibration_c[88];
extern "C" u8 const MQ_patt__12dVibration_c[80];
extern "C" u8 const CQ_patt__12dVibration_c[80];
//
// External References:
@@ -26,7 +37,7 @@ extern "C" extern u8 const CQ_patt__12dVibration_c[80];
/* ############################################################################################## */
/* 8037A620-8037A678 006C80 0058+00 0/0 1/1 0/0 .rodata MS_patt__12dVibration_c */
SECTION_RODATA extern u8 const MS_patt__12dVibration_c[88] = {
SECTION_RODATA u8 const dVibration_c::MS_patt[88] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xC0, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x04, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xE8, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xF6,
@@ -34,10 +45,10 @@ SECTION_RODATA extern u8 const MS_patt__12dVibration_c[88] = {
0xF6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xFB, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
0x08, 0xC2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xC0, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8037A620, &MS_patt__12dVibration_c);
COMPILER_STRIP_GATE(8037A620, &dVibration_c::MS_patt);
/* 8037A678-8037A6D0 006CD8 0058+00 0/0 1/1 0/0 .rodata CS_patt__12dVibration_c */
SECTION_RODATA extern u8 const CS_patt__12dVibration_c[88] = {
SECTION_RODATA u8 const dVibration_c::CS_patt[88] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xC0, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x04, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xE8, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xF6,
@@ -45,24 +56,24 @@ SECTION_RODATA extern u8 const CS_patt__12dVibration_c[88] = {
0xF6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xFB, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
0x08, 0xC2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xC0, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(8037A678, &CS_patt__12dVibration_c);
COMPILER_STRIP_GATE(8037A678, &dVibration_c::CS_patt);
/* 8037A6D0-8037A720 006D30 0050+00 0/0 1/1 0/0 .rodata MQ_patt__12dVibration_c */
SECTION_RODATA extern u8 const MQ_patt__12dVibration_c[80] = {
SECTION_RODATA u8 const dVibration_c::MQ_patt[80] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x10, 0x20, 0x20, 0x20,
0x00, 0x01, 0x00, 0x20, 0x42, 0x10, 0x42, 0x08, 0x00, 0x02, 0x00, 0x20, 0x22, 0x22, 0x22, 0x22,
0x00, 0x02, 0x00, 0x20, 0x22, 0x49, 0x22, 0x49, 0x00, 0x03, 0x00, 0x20, 0x52, 0x52, 0x52, 0x52,
0x00, 0x03, 0x00, 0x20, 0x4A, 0x94, 0xAA, 0x95, 0x00, 0x04, 0x00, 0x20, 0x36, 0x55, 0x56, 0x55,
0x00, 0x04, 0x00, 0x20, 0x6B, 0x6D, 0x6B, 0x6D, 0x00, 0x01, 0x00, 0x1B, 0x20, 0x20, 0x10, 0x00,
};
COMPILER_STRIP_GATE(8037A6D0, &MQ_patt__12dVibration_c);
COMPILER_STRIP_GATE(8037A6D0, &dVibration_c::MQ_patt);
/* 8037A720-8037A770 006D80 0050+00 0/0 1/1 0/0 .rodata CQ_patt__12dVibration_c */
SECTION_RODATA extern u8 const CQ_patt__12dVibration_c[80] = {
SECTION_RODATA u8 const dVibration_c::CQ_patt[80] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x10, 0x20, 0x20, 0x20,
0x00, 0x01, 0x00, 0x20, 0x42, 0x10, 0x42, 0x08, 0x00, 0x02, 0x00, 0x20, 0x22, 0x22, 0x22, 0x22,
0x00, 0x02, 0x00, 0x20, 0x22, 0x49, 0x22, 0x49, 0x00, 0x03, 0x00, 0x20, 0x52, 0x52, 0x52, 0x52,
0x00, 0x03, 0x00, 0x20, 0x4A, 0x94, 0xAA, 0x95, 0x00, 0x04, 0x00, 0x20, 0x36, 0x55, 0x56, 0x55,
0x00, 0x04, 0x00, 0x20, 0x6B, 0x6D, 0x6B, 0x6D, 0x00, 0x00, 0x00, 0x1B, 0x20, 0x20, 0x10, 0x00,
};
COMPILER_STRIP_GATE(8037A720, &CQ_patt__12dVibration_c);
COMPILER_STRIP_GATE(8037A720, &dVibration_c::CQ_patt);
src/d/d_vibration.cpp
+14 -5
View File
@@ -11,6 +11,10 @@
// Types:
//
struct mDoCPd_c {
static u8 m_gamePad[16];
};
struct Vec {};
struct cXyz {
@@ -30,6 +34,11 @@ struct dVibration_c {
/* 8006FF04 */ void Init();
/* 8006FF38 */ void Pause();
/* 8006FFF8 */ void Remove();
static u8 const MS_patt[88];
static u8 const CS_patt[88];
static u8 const MQ_patt[80];
static u8 const CQ_patt[80];
};
struct dSv_player_config_c {
@@ -94,11 +103,11 @@ extern "C" void _savegpr_26();
extern "C" void _savegpr_29();
extern "C" void _restgpr_26();
extern "C" void _restgpr_29();
extern "C" extern u8 const MS_patt__12dVibration_c[88];
extern "C" extern u8 const CS_patt__12dVibration_c[88];
extern "C" extern u8 const MQ_patt__12dVibration_c[80];
extern "C" extern u8 const CQ_patt__12dVibration_c[80];
extern "C" extern u8 m_gamePad__8mDoCPd_c[16];
extern "C" u8 const MS_patt__12dVibration_c[88];
extern "C" u8 const CS_patt__12dVibration_c[88];
extern "C" u8 const MQ_patt__12dVibration_c[80];
extern "C" u8 const CQ_patt__12dVibration_c[80];
extern "C" u8 m_gamePad__8mDoCPd_c[16];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
src/d/event/d_event.cpp
+26 -6
View File
@@ -15,8 +15,16 @@ struct mDoGph_gInf_c {
/* 800080D0 */ void fadeOut(f32);
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct fopAc_ac_c {};
struct daPy_py_c {
static u8 m_midnaActor[4];
};
struct daItemBase_c {
/* 80037AE4 */ void dead();
};
@@ -30,12 +38,18 @@ struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct dSv_event_tmp_flag_c {
static u8 const tempBitLabels[370 + 2 /* padding */];
};
struct dSv_event_c {
/* 800349A4 */ void offEventBit(u16);
};
struct dStage_roomControl_c {
/* 80024384 */ void getStatusRoomDt(int);
static u8 mDemoArcName[10 + 2 /* padding */];
};
struct dRes_info_c {};
@@ -135,6 +149,8 @@ struct dEvDtEvent_c {
struct dDemo_c {
/* 80039CF8 */ void end();
static u8 m_mode[4];
};
struct dCamera_c {
@@ -145,6 +161,10 @@ struct Z2StatusMgr {
/* 802B61E8 */ void setDemoName(char*);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
//
// Forward References:
//
@@ -266,15 +286,15 @@ extern "C" void _restgpr_29();
extern "C" void strcat();
extern "C" void strncpy();
extern "C" void strcpy();
extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern void* __vt__11dEvt_info_c[3 + 1 /* padding */];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 m_mode__7dDemo_c[4];
extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 m_mode__7dDemo_c[4];
extern "C" u8 m_midnaActor__9daPy_py_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/event/d_event_data.cpp
+28 -8
View File
@@ -16,6 +16,8 @@ struct _GXColor {};
struct mDoGph_gInf_c {
/* 80007FD8 */ void fadeOut(f32, _GXColor&);
/* 800080D0 */ void fadeOut(f32);
static f32 mFadeRate;
};
struct fopAc_ac_c {};
@@ -29,6 +31,14 @@ struct dVibration_c {
/* 8006FD94 */ void StopQuake(int);
};
struct dSv_event_tmp_flag_c {
static u8 const tempBitLabels[370 + 2 /* padding */];
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 8003498C */ void onEventBit(u16);
/* 800349A4 */ void offEventBit(u16);
@@ -107,11 +117,17 @@ struct dEvDtBase_c {
struct dDlst_list_c {
/* 800568D8 */ void wipeIn(f32);
static f32 mWipeRate;
};
struct dDemo_c {
/* 80039B6C */ void start(u8 const*, cXyz*, f32);
/* 80039CF8 */ void end();
static u8 m_control[4];
static u8 m_frameNoMsg[4];
static u8 m_mode[4];
};
struct dCamera_c {
@@ -133,6 +149,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
//
// Forward References:
//
@@ -236,17 +256,17 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern f32 mFadeRate__13mDoGph_gInf_c;
extern "C" f32 mFadeRate__13mDoGph_gInf_c;
extern "C" extern u8 struct_80450BE4[4];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 m_control__7dDemo_c[4];
extern "C" extern u8 m_frameNoMsg__7dDemo_c[4];
extern "C" extern u8 m_mode__7dDemo_c[4];
extern "C" extern f32 mWipeRate__12dDlst_list_c;
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 m_control__7dDemo_c[4];
extern "C" u8 m_frameNoMsg__7dDemo_c[4];
extern "C" u8 m_mode__7dDemo_c[4];
extern "C" f32 mWipeRate__12dDlst_list_c;
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/event/d_event_manager.cpp
+13 -3
View File
@@ -19,6 +19,8 @@ struct dSv_info_c {
struct dStage_roomControl_c {
/* 80024384 */ void getStatusRoomDt(int);
static u8 mDemoArcName[10 + 2 /* padding */];
};
struct dRes_info_c {};
@@ -138,6 +140,14 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JMath {
static u8 sincosTable_[65536];
};
//
// Forward References:
//
@@ -260,12 +270,12 @@ extern "C" void sprintf();
extern "C" void strchr();
extern "C" void strcmp();
extern "C" void strcpy();
extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/file/d_file_sel_warning.cpp
+4 -4
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();
@@ -61,10 +61,10 @@ struct J2DTextBox {
/* 8030074C */ void setString(s16, char const*, ...);
};
struct J2DAnmTransform {};
struct J2DGrafContext {};
struct J2DAnmTransform {};
struct J2DScreen {
/* 80192414 */ void setAnimation(J2DAnmTransform*);
/* 802F8498 */ J2DScreen();
src/d/file/d_file_select.cpp
+44 -17
View File
@@ -11,6 +11,14 @@
// Types:
//
struct mDoRst {
static u8 mResetData[4 + 4 /* padding */];
};
struct mDoMtx_stack_c {
static u8 now[48];
};
struct mDoMemCd_Ctrl_c {
/* 800169B4 */ void load();
/* 80016AB0 */ void LoadSync(void*, u32, u32);
@@ -21,14 +29,19 @@ struct mDoMemCd_Ctrl_c {
/* 80016F2C */ void FormatSync();
};
struct mDoGph_gInf_c {
static u8 mFadeColor[4];
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);
@@ -45,6 +58,10 @@ struct mDoExt_baseAnm {
/* 8000D428 */ void play();
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct dSv_save_c {};
struct dSv_player_get_item_c {
@@ -68,6 +85,10 @@ struct dSv_event_c {
struct JKRArchive {};
struct J2DAnmTextureSRTKey {
/* 80184274 */ ~J2DAnmTextureSRTKey();
};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -75,10 +96,6 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct J2DAnmTextureSRTKey {
/* 80184274 */ ~J2DAnmTextureSRTKey();
};
struct J2DPane {
/* 8018BF28 */ void setAnimation(J2DAnmTextureSRTKey*);
/* 802F5E88 */ J2DPane(u64, JGeometry::TBox2<f32> const&);
@@ -95,7 +112,9 @@ struct dSelect_cursor_c {
struct dKy_tevstr_c {};
struct cXyz {};
struct cXyz {
static f32 Zero[3];
};
struct dScnKy_env_light_c {
/* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
@@ -110,6 +129,8 @@ struct dName_c {
/* 80250560 */ void _draw();
};
struct COutFont_c {};
struct JUtility {
struct TColor {};
};
@@ -121,8 +142,6 @@ struct J2DTextBox {
/* 8030074C */ void setString(s16, char const*, ...);
};
struct COutFont_c {};
struct JUTFont {};
struct dMsgString_c {
@@ -384,6 +403,10 @@ struct Z2SeMgr {
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 8003219C */ void checkTrigger();
@@ -413,6 +436,10 @@ struct JKRFileLoader {
struct JKRExpHeap {};
struct JFWDisplay {
static u8 sManager[4];
};
struct J3DVertexBuffer {
/* 80310FD8 */ void init();
};
@@ -890,20 +917,20 @@ extern "C" extern void* __vt__19J2DAnmTextureSRTKey[4];
extern "C" extern void* __vt__11J2DAnmColor[5];
extern "C" extern void* __vt__8J3DModel[9];
extern "C" extern void* __vt__14J3DMaterialAnm[4];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_mDoMemCd_control[8192];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern f32 Zero__4cXyz[3];
extern "C" f32 Zero__4cXyz[3];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 mFadeColor__13mDoGph_gInf_c[4];
extern "C" u8 mFadeColor__13mDoGph_gInf_c[4];
extern "C" extern u32 g_blackColor;
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" extern u8 sManager__10JFWDisplay[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mFader__13mDoGph_gInf_c[4];
extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" u8 sManager__10JFWDisplay[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/kankyo/d_kankyo.cpp
+34 -14
View File
@@ -15,16 +15,22 @@ struct sub_kankyo__class {};
struct stage_pure_lightvec_info_class {};
struct mDoMtx_stack_c {
static u8 now[48];
};
struct mDoGph_gInf_c {
struct bloom_c {
/* 80009544 */ void create();
};
static u8 m_bloom[20];
};
struct J3DAnmTextureSRTKey {};
struct J3DMaterialTable {};
struct J3DAnmTextureSRTKey {};
struct mDoExt_btkAnm {
/* 8000D63C */ void init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16);
/* 8000D6D8 */ void entry(J3DMaterialTable*, f32);
@@ -51,6 +57,10 @@ struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct dSv_event_tmp_flag_c {
static u8 const tempBitLabels[370 + 2 /* padding */];
};
struct dSv_event_c {
/* 800349A4 */ void offEventBit(u16);
/* 800349BC */ void isEventBit(u16) const;
@@ -59,10 +69,18 @@ struct dSv_event_c {
struct dStage_roomControl_c {
/* 80024384 */ void getStatusRoomDt(int);
/* 8019F780 */ void GetTimePass();
static u8 mStatus[65792];
};
struct _GXColorS10 {};
struct dKy_tevstr_c {};
struct J3DModelData {
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
};
struct Vec {};
struct cXyz {
@@ -72,12 +90,6 @@ struct cXyz {
/* 80266B84 */ void operator*(f32) const;
};
struct _GXColorS10 {};
struct J3DModelData {
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
};
struct dScnKy_env_light_c {
/* 8019F2E8 */ dScnKy_env_light_c();
/* 8019F4FC */ void setDaytime();
@@ -173,6 +185,10 @@ struct Z2EnvSeMgr {
/* 802C6998 */ void resetScene();
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct WIND_INF_ENTITY {
/* 8019F4B8 */ ~WIND_INF_ENTITY();
/* 8019F4F4 */ WIND_INF_ENTITY();
@@ -191,6 +207,10 @@ struct JPABaseEmitter {
/* 8027EC60 */ void deleteAllParticle();
};
struct JMath {
static u8 sincosTable_[65536];
};
struct JKRSolidHeap {};
struct J3DTexMtxInfo {
@@ -574,23 +594,23 @@ extern "C" void memcmp();
extern "C" void strcmp();
extern "C" void cos();
extern "C" void sin();
extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern u8 const j3dDefaultMtx[48];
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 m_bloom__13mDoGph_gInf_c[20];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" u8 m_bloom__13mDoGph_gInf_c[20];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 g_Counter[12 + 4 /* padding */];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/kankyo/d_kankyo_rain.cpp
+29 -9
View File
@@ -11,6 +11,14 @@
// Types:
//
struct mDoMtx_stack_c {
static u8 now[48];
};
struct mDoGph_gInf_c {
static u8 mFrameBufferTimg[4];
};
struct daPy_py_c {
/* 8006F160 */ bool getKandelaarFlamePos();
/* 8015F424 */ void checkNowWolfEyeUp();
@@ -36,10 +44,6 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct _GXColor {};
struct dKy_tevstr_c {};
struct Vec {};
struct cXyz {
@@ -47,6 +51,10 @@ struct cXyz {
/* 80266AE4 */ void operator+(Vec const&) const;
};
struct dKy_tevstr_c {};
struct _GXColor {};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 802673F4 */ csXyz(s16, s16, s16);
@@ -68,6 +76,10 @@ struct dDlst_peekZ_c {
/* 80056018 */ void newData(s16, s16, u32*);
};
struct dDemo_c {
static u8 m_mode[4];
};
struct dComIfG_play_c {
/* 8002C97C */ void getLayerNo(int);
};
@@ -135,10 +147,18 @@ struct ResTIMG {};
struct LIGHT_INFLUENCE {};
struct JMath {
static u8 sincosTable_[65536];
};
struct J3DSys {
/* 8031073C */ void reinitGX();
};
struct J3DShape {
static u8 sOldVcdVatCmd[4];
};
struct DOUBLE_POS {};
//
@@ -350,18 +370,18 @@ extern "C" extern void* __vt__19dKankyo_star_Packet[5];
extern "C" extern void* __vt__19dKankyo_snow_Packet[5];
extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12];
extern "C" extern void* __vt__9J3DPacket[5];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_mEnvSeMgr[780];
extern "C" extern u8 g_Counter[12 + 4 /* padding */];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 m_mode__7dDemo_c[4];
extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4];
extern "C" u8 m_mode__7dDemo_c[4];
extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
//
// Declarations:
src/d/kankyo/d_kankyo_wether.cpp
+17 -7
View File
@@ -27,10 +27,6 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct _GXColor {};
struct dKy_tevstr_c {};
struct Vec {};
struct cXyz {
@@ -40,8 +36,14 @@ struct cXyz {
/* 80266B84 */ void operator*(f32) const;
/* 80266D30 */ void normZP() const;
/* 8026706C */ bool operator!=(Vec const&) const;
static f32 Zero[3];
};
struct dKy_tevstr_c {};
struct _GXColor {};
struct csXyz {};
struct dPa_control_c {
@@ -122,6 +124,10 @@ struct Z2EnvSeMgr {
/* 802C800C */ void startStrongWindSe(s8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct WIND_INFLUENCE {};
struct VRKUMO_EFF {
@@ -144,6 +150,10 @@ struct RAIN_EFF {
/* 80056D0C */ RAIN_EFF();
};
struct JMath {
static u8 sincosTable_[65536];
};
struct J3DPacket;
struct J3DDrawBuffer {
/* 8032548C */ void entryImm(J3DPacket*, u16);
@@ -382,13 +392,13 @@ extern "C" extern void* __vt__9J3DPacket[5];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_mEnvSeMgr[780];
extern "C" extern f32 Zero__4cXyz[3];
extern "C" f32 Zero__4cXyz[3];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 data_80450EE0[8];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/map/d_map.cpp
+35 -9
View File
@@ -117,6 +117,10 @@ struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
@@ -125,6 +129,10 @@ struct dSv_danBit_c {
/* 80034BE8 */ void isSwitch(int) const;
};
struct dStage_roomControl_c {
static u8 mStatus[65792];
};
struct dRes_info_c {};
struct dRes_control_c {
@@ -145,6 +153,13 @@ struct dRenderingFDAmap_c {
/* 8003D3C0 */ void renderingDecoration(dDrawPath_c::line_class const*);
};
struct dMpath_c {
static f32 mMinX;
static f32 mMaxX;
static f32 mMinZ;
static f32 mMaxZ;
};
struct dMap_c {
/* 80028DF4 */ void getColor(int);
/* 80029038 */ void getIconPosition(dTres_c::typeGroupData_c*) const;
@@ -174,6 +189,10 @@ struct dMap_c {
/* 8002AF20 */ ~dMap_c();
};
struct dMap_HIO_prm_res_dst_s {
static u8 m_res[4 + 4 /* padding */];
};
struct dMapInfo_n {
/* 8003ECA0 */ void chkGetCompass();
/* 8003ECD8 */ void chkGetMap();
@@ -183,6 +202,8 @@ struct dMapInfo_n {
struct dMapInfo_c {
/* 8003F6C8 */ void move(int, f32);
static u32 mNextRoomNo;
};
struct dDrawPathWithNormalPattern_c {
@@ -193,6 +214,10 @@ struct dDlst_base_c {
/* 8002ABEC */ void draw();
};
struct JMath {
static u8 sincosTable_[65536];
};
//
// Forward References:
//
@@ -265,6 +290,7 @@ extern "C" void __dt__28renderingPlusDoorAndCursor_cFv();
extern "C" void __dt__19renderingPlusDoor_cFv();
extern "C" void __dt__16renderingDAmap_cFv();
extern "C" extern char const* const d_map_d_map__stringBase0;
extern "C" u8 m_res__22dMap_HIO_prm_res_dst_s[4 + 4 /* padding */];
//
// External References:
@@ -329,23 +355,23 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__18dRenderingFDAmap_c[26];
extern "C" extern void* __vt__11dDrawPath_c[16];
extern "C" extern void* __vt__19renderingPlusDoor_c[41];
extern "C" extern void* __vt__28renderingPlusDoorAndCursor_c[47];
extern "C" extern void* __vt__16renderingDAmap_c[38];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_Counter[12 + 4 /* padding */];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u32 mNextRoomNo__10dMapInfo_c;
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u32 mNextRoomNo__10dMapInfo_c;
extern "C" extern u8 data_80450E58[4];
extern "C" extern u8 data_80450E60[4];
extern "C" extern f32 mMinX__8dMpath_c;
extern "C" extern f32 mMaxX__8dMpath_c;
extern "C" extern f32 mMinZ__8dMpath_c;
extern "C" extern f32 mMaxZ__8dMpath_c;
extern "C" f32 mMinX__8dMpath_c;
extern "C" f32 mMaxX__8dMpath_c;
extern "C" f32 mMinZ__8dMpath_c;
extern "C" f32 mMaxZ__8dMpath_c;
//
// Declarations:
@@ -376,7 +402,7 @@ asm void renderingAmap_c::getIconSize(u8 param_0) const {
/* ############################################################################################## */
/* 80450D80-80450D88 000280 0004+04 10/10 0/0 0/0 .sbss m_res__22dMap_HIO_prm_res_dst_s
*/
static u8 m_res__22dMap_HIO_prm_res_dst_s[4 + 4 /* padding */];
u8 dMap_HIO_prm_res_dst_s::m_res[4 + 4 /* padding */];
/* 80451CA0-80451CA4 0002A0 0004+00 4/4 0/0 0/0 .sdata2 @3745 */
SECTION_SDATA2 static f32 lit_3745 = 0.5f;
src/d/map/d_map_path.cpp
+4 -2
View File
@@ -64,6 +64,8 @@ struct dMpath_n {
/* 8003C8F4 */ void remove();
/* 8003D740 */ ~dTexObjAggregate_c();
};
static u8 m_texObjAgg[28];
};
struct dDlst_base_c {
@@ -101,6 +103,7 @@ extern "C" void __dt__Q28dMpath_n18dTexObjAggregate_cFv();
extern "C" extern char const* const d_map_d_map_path__stringBase0;
extern "C" extern void* __vt__18dRenderingFDAmap_c[26];
extern "C" extern void* __vt__11dDrawPath_c[16];
extern "C" u8 m_texObjAgg__8dMpath_n[28];
//
// External References:
@@ -366,8 +369,7 @@ asm void dRenderingFDAmap_c::postRenderingMap() {
static u8 lit_3639[12];
/* 80424684-804246A0 0513A4 001C+00 2/2 5/5 0/0 .bss m_texObjAgg__8dMpath_n */
extern u8 m_texObjAgg__8dMpath_n[28];
u8 m_texObjAgg__8dMpath_n[28];
u8 dMpath_n::m_texObjAgg[28];
/* 8003D3C0-8003D68C 037D00 02CC+00 0/0 2/2 0/0 .text
* renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class */
src/d/map/d_map_path_dmap.cpp
+49 -24
View File
@@ -34,6 +34,8 @@ struct dTres_c {
/* 8009C360 */ void getFirstData(u8);
/* 8009C3B4 */ void getNextData(dTres_c::typeGroupData_c const*);
/* 8009C39C */ void getNextData(dTres_c::typeGroupData_c*);
static u8 mTypeGroupListAll[204 + 4 /* padding */];
};
struct renderingPlusDoorAndCursor_c {
@@ -94,6 +96,8 @@ struct renderingDAmap_c {
struct mDoMtx_stack_c {
/* 8000CE38 */ void scaleM(f32, f32, f32);
static u8 now[48];
};
struct dSv_memBit_c {
@@ -104,6 +108,10 @@ struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct dStage_roomControl_c {
static u8 mStatus[65792];
};
struct dStage_FileList2_dt_c {};
struct dRenderingMap_c {
@@ -124,6 +132,8 @@ struct dMpath_n {
/* 8003C85C */ void create();
/* 8003C8F4 */ void remove();
};
static u8 m_texObjAgg[28];
};
struct dMpath_c {
@@ -135,6 +145,16 @@ struct dMpath_c {
/* 8003FB70 */ void create();
/* 8003FBD0 */ void reset();
/* 8003FC70 */ void remove();
static u8 mLayerList[4];
static f32 mMinX;
static f32 mMaxX;
static f32 mMinZ;
static f32 mMaxZ;
static f32 mAllCenterX;
static f32 mAllCenterZ;
static f32 mAllSizeX;
static f32 mAllSizeZ;
};
struct dMapInfo_n {
@@ -162,6 +182,9 @@ struct dMapInfo_c {
/* 8003F714 */ void reset();
/* 8003F734 */ void create();
/* 8003F754 */ void remove();
static u32 mNextRoomNo;
static u8 mNowStayRoomNo[4];
};
struct dDlst_base_c {};
@@ -244,6 +267,17 @@ extern "C" void __sinit_d_map_path_dmap_cpp();
extern "C" extern void* __vt__19renderingPlusDoor_c[41];
extern "C" extern void* __vt__28renderingPlusDoorAndCursor_c[47];
extern "C" extern void* __vt__16renderingDAmap_c[38];
extern "C" u32 mNextRoomNo__10dMapInfo_c;
extern "C" u8 mNowStayRoomNo__10dMapInfo_c[4];
extern "C" u8 mLayerList__8dMpath_c[4];
extern "C" f32 mMinX__8dMpath_c;
extern "C" f32 mMaxX__8dMpath_c;
extern "C" f32 mMinZ__8dMpath_c;
extern "C" f32 mMaxZ__8dMpath_c;
extern "C" f32 mAllCenterX__8dMpath_c;
extern "C" f32 mAllCenterZ__8dMpath_c;
extern "C" f32 mAllSizeX__8dMpath_c;
extern "C" f32 mAllSizeZ__8dMpath_c;
//
// External References:
@@ -310,11 +344,11 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void floor();
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 m_texObjAgg__8dMpath_n[28];
extern "C" extern u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */];
extern "C" u8 m_texObjAgg__8dMpath_n[28];
extern "C" u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u32 __float_max;
extern "C" extern u8 struct_80450D64[4];
@@ -495,7 +529,7 @@ extern u8 data_80450E58[4];
u8 data_80450E58[4];
/* 80450E5C-80450E60 00035C 0004+00 4/4 0/0 0/0 .sbss mNowStayRoomNo__10dMapInfo_c */
static u8 mNowStayRoomNo__10dMapInfo_c[4];
u8 dMapInfo_c::mNowStayRoomNo[4];
/* 80450E60-80450E64 000360 0004+00 4/4 3/3 0/0 .sbss None */
extern u8 data_80450E60[4];
@@ -569,40 +603,31 @@ void dMapInfo_c::remove() {
/* ############################################################################################## */
/* 80450E64-80450E68 000364 0004+00 5/5 1/1 0/0 .sbss mLayerList__8dMpath_c */
extern u8 mLayerList__8dMpath_c[4];
u8 mLayerList__8dMpath_c[4];
u8 dMpath_c::mLayerList[4];
/* 80450E68-80450E6C 000368 0004+00 3/3 1/1 0/0 .sbss mMinX__8dMpath_c */
extern f32 mMinX__8dMpath_c;
f32 mMinX__8dMpath_c;
f32 dMpath_c::mMinX;
/* 80450E6C-80450E70 00036C 0004+00 3/3 1/1 0/0 .sbss mMaxX__8dMpath_c */
extern f32 mMaxX__8dMpath_c;
f32 mMaxX__8dMpath_c;
f32 dMpath_c::mMaxX;
/* 80450E70-80450E74 000370 0004+00 3/3 2/2 0/0 .sbss mMinZ__8dMpath_c */
extern f32 mMinZ__8dMpath_c;
f32 mMinZ__8dMpath_c;
f32 dMpath_c::mMinZ;
/* 80450E74-80450E78 000374 0004+00 3/3 1/1 0/0 .sbss mMaxZ__8dMpath_c */
extern f32 mMaxZ__8dMpath_c;
f32 mMaxZ__8dMpath_c;
f32 dMpath_c::mMaxZ;
/* 80450E78-80450E7C 000378 0004+00 1/1 2/2 0/0 .sbss mAllCenterX__8dMpath_c */
extern f32 mAllCenterX__8dMpath_c;
f32 mAllCenterX__8dMpath_c;
f32 dMpath_c::mAllCenterX;
/* 80450E7C-80450E80 00037C 0004+00 1/1 2/2 0/0 .sbss mAllCenterZ__8dMpath_c */
extern f32 mAllCenterZ__8dMpath_c;
f32 mAllCenterZ__8dMpath_c;
f32 dMpath_c::mAllCenterZ;
/* 80450E80-80450E84 000380 0004+00 1/1 4/4 0/0 .sbss mAllSizeX__8dMpath_c */
extern f32 mAllSizeX__8dMpath_c;
f32 mAllSizeX__8dMpath_c;
f32 dMpath_c::mAllSizeX;
/* 80450E84-80450E88 000384 0004+00 1/1 4/4 0/0 .sbss mAllSizeZ__8dMpath_c */
extern f32 mAllSizeZ__8dMpath_c;
f32 mAllSizeZ__8dMpath_c;
f32 dMpath_c::mAllSizeZ;
/* 80450E88-80450E90 000388 0008+00 4/4 0/0 0/0 .sbss None */
static u8 data_80450E88[8];
@@ -619,7 +644,7 @@ asm void dMpath_c::isExistMapPathData() {
/* ############################################################################################## */
/* 80450630-80450634 0000B0 0004+00 0/0 1/1 2/2 .sdata mNextRoomNo__10dMapInfo_c */
SECTION_SDATA extern u32 mNextRoomNo__10dMapInfo_c = 0xFFFFFFFF;
SECTION_SDATA u32 dMapInfo_c::mNextRoomNo = 0xFFFFFFFF;
/* 80450634-80450638 -00001 0004+00 4/4 0/0 0/0 .sdata None */
SECTION_SDATA static u8 struct_80450634[4] = {
src/d/map/d_map_path_fmap.cpp
+5 -1
View File
@@ -48,6 +48,10 @@ struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
@@ -156,7 +160,7 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u32 __float_max;
src/d/menu/d_menu_calibration.cpp
+10 -2
View File
@@ -11,6 +11,10 @@
// Types:
//
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct J2DPane {};
struct dSelect_cursor_c {
@@ -57,6 +61,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
};
@@ -121,11 +129,11 @@ extern "C" void _savegpr_28();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void strcpy();
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/menu/d_menu_collect.cpp
+38 -18
View File
@@ -11,14 +11,22 @@
// Types:
//
struct mDoMtx_stack_c {
static u8 now[48];
};
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);
@@ -35,7 +43,9 @@ struct mDoExt_baseAnm {
/* 8000D428 */ void play();
};
struct cXyz {};
struct cXyz {
static f32 Zero[3];
};
struct daAlink_c {
/* 80140064 */ void setShieldChange();
@@ -58,6 +68,10 @@ struct dSv_player_collect_c {
/* 80034290 */ void isCollectMirror(u8) const;
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
@@ -106,14 +120,6 @@ 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();
@@ -125,6 +131,14 @@ 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();
@@ -276,6 +290,8 @@ struct dMenu_Collect3D_c {
/* 801B75E8 */ void setupItem3D(f32 (*)[4]);
/* 801B7660 */ void toItem3Dpos(f32, f32, f32, cXyz*);
/* 801B774C */ void calcViewMtx(f32 (*)[4]);
static f32 mViewOffsetY[1 + 1 /* padding */];
};
struct dMenu_Collect2DTop_c {
@@ -297,6 +313,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct ResTIMG {};
struct JKRSolidHeap {
@@ -506,6 +526,7 @@ extern "C" void __sinit_d_menu_collect_cpp();
extern "C" void __dt__20dMenu_Collect2DTop_cFv();
extern "C" void draw__17dMenu_Collect2D_cFv();
extern "C" extern char const* const d_menu_d_menu_collect__stringBase0;
extern "C" f32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */];
//
// External References:
@@ -670,18 +691,18 @@ extern "C" void tan();
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__8J3DModel[9];
extern "C" extern void* __vt__14J3DMaterialAnm[4];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern f32 Zero__4cXyz[3];
extern "C" f32 Zero__4cXyz[3];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mFader__13mDoGph_gInf_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
@@ -2510,8 +2531,7 @@ asm void dMenu_Collect3D_c::getMaskMdlVisible() {
/* ############################################################################################## */
/* 80450720-80450728 0001A0 0004+04 1/1 0/0 1/1 .sdata mViewOffsetY__17dMenu_Collect3D_c
*/
SECTION_SDATA extern f32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */];
SECTION_SDATA f32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */] = {
SECTION_SDATA f32 dMenu_Collect3D_c::mViewOffsetY[1 + 1 /* padding */] = {
-100.0f,
/* padding */
0.0f,
src/d/menu/d_menu_dmap.cpp
+32 -12
View File
@@ -27,6 +27,10 @@ struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct fopAc_ac_c {};
struct dTres_c {
@@ -80,6 +84,11 @@ struct dMsgFlow_c {
/* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int);
};
struct dMpath_c {
static f32 mAllSizeX;
static f32 mAllSizeZ;
};
struct dMeterHaihai_c {
/* 8020AE8C */ dMeterHaihai_c(u8);
/* 8020B814 */ void drawHaihai(u8, f32, f32, f32, f32);
@@ -131,6 +140,12 @@ struct dMenu_StageMapCtrl_c {
/* 801C2590 */ void setPlusZoomCenterZ(f32);
};
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();
@@ -140,12 +155,6 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct J2DOrthoGraph {};
struct dMenu_ItemExplain_c {
/* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
/* 801DB470 */ void move();
@@ -225,6 +234,8 @@ struct dMenu_Dmap_c {
/* 801C01A0 */ void zoomIn_proc();
/* 801C023C */ void zoomOut_init_proc();
/* 801C02F0 */ void zoomOut_proc();
static u8 myclass[4 + 4 /* padding */];
};
struct dMenu_DmapMap_c {
@@ -289,6 +300,14 @@ struct Z2SeMgr {
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JMath {
static u8 sincosTable_[65536];
};
struct JKRFileLoader {
/* 802D4270 */ void getGlbResource(char const*, JKRFileLoader*);
};
@@ -417,6 +436,7 @@ extern "C" void __ct__15renderingDmap_cFv();
extern "C" void __sinit_d_menu_dmap_cpp();
extern "C" static void func_801C0844();
extern "C" extern char const* const d_menu_d_menu_dmap__stringBase0;
extern "C" u8 myclass__12dMenu_Dmap_c[4 + 4 /* padding */];
//
// External References:
@@ -568,14 +588,14 @@ extern "C" extern void* __vt__19renderingPlusDoor_c[41];
extern "C" extern void* __vt__16renderingDAmap_c[38];
extern "C" extern void* __vt__19dMenu_DmapMapCtrl_c[10 + 51 /* padding */];
extern "C" extern void* __vt__15renderingDmap_c[43 + 1 /* padding */];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern f32 mAllSizeX__8dMpath_c;
extern "C" extern f32 mAllSizeZ__8dMpath_c;
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" f32 mAllSizeX__8dMpath_c;
extern "C" f32 mAllSizeZ__8dMpath_c;
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
@@ -1335,7 +1355,7 @@ static f32 player_px;
static f32 player_py;
/* 80451080-80451088 000580 0004+04 6/6 0/0 0/0 .sbss myclass__12dMenu_Dmap_c */
static u8 myclass__12dMenu_Dmap_c[4 + 4 /* padding */];
u8 dMenu_Dmap_c::myclass[4 + 4 /* padding */];
/* 8045400C-80454010 00260C 0004+00 7/7 0/0 0/0 .sdata2 @4249 */
SECTION_SDATA2 static f32 lit_4249 = 0.5f;
src/d/menu/d_menu_dmap_map.cpp
+38 -12
View File
@@ -23,6 +23,8 @@ struct dTres_c {
/* 8009C360 */ void getFirstData(u8);
/* 8009C39C */ void getNextData(dTres_c::typeGroupData_c*);
/* 8009C4B0 */ void getTypeToTypeGroupNo(u8);
static u8 mTypeGroupListAll[204 + 4 /* padding */];
};
struct renderingDmap_c {
@@ -101,6 +103,10 @@ struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct dStage_roomControl_c {
static u8 mStatus[65792];
};
struct ResTIMG {};
struct dRenderingMap_c {
@@ -116,6 +122,12 @@ struct dRenderingFDAmap_c {
struct dMpath_c {
/* 8003F760 */ void getTopBottomFloorNo(s8*, s8*);
static u8 mLayerList[4];
static f32 mAllCenterX;
static f32 mAllCenterZ;
static f32 mAllSizeX;
static f32 mAllSizeZ;
};
struct dMenu_StageMapCtrl_c {
@@ -154,6 +166,11 @@ struct dMenu_StageMapCtrl_c {
/* 801C2578 */ void isEnableZoomOut();
/* 801C2588 */ void setPlusZoomCenterX(f32);
/* 801C2590 */ void setPlusZoomCenterZ(f32);
static f32 m_zoomCenterMinX;
static f32 m_zoomCenterMaxX;
static f32 m_zoomCenterMinZ;
static f32 m_zoomCenterMaxZ[1 + 1 /* padding */];
};
struct dMenu_DmapMap_c {
@@ -174,6 +191,10 @@ struct dMenu_DmapMapCtrl_c {
/* 801C25C0 */ void getInitDispCenter(f32*, f32*);
};
struct dMdm_HIO_prm_res_dst_s {
static u8 m_res[4];
};
struct dMapInfo_n {
/* 8003ECA0 */ void chkGetCompass();
/* 8003ECD8 */ void chkGetMap();
@@ -259,6 +280,11 @@ extern "C" bool isRendIcon__15renderingDmap_cCFv();
extern "C" void __sinit_d_menu_dmap_map_cpp();
extern "C" extern void* __vt__19dMenu_DmapMapCtrl_c[10 + 51 /* padding */];
extern "C" extern void* __vt__15renderingDmap_c[43 + 1 /* padding */];
extern "C" u8 m_res__22dMdm_HIO_prm_res_dst_s[4];
extern "C" f32 m_zoomCenterMinX__20dMenu_StageMapCtrl_c;
extern "C" f32 m_zoomCenterMaxX__20dMenu_StageMapCtrl_c;
extern "C" f32 m_zoomCenterMinZ__20dMenu_StageMapCtrl_c;
extern "C" f32 m_zoomCenterMaxZ__20dMenu_StageMapCtrl_c[1 + 1 /* padding */];
//
// External References:
@@ -335,18 +361,18 @@ extern "C" void _restgpr_29();
extern "C" void ceil();
extern "C" void floor();
extern "C" void fmod();
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */];
extern "C" u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */];
extern "C" extern u32 __float_max;
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 data_80450E58[4];
extern "C" extern u8 data_80450E60[4];
extern "C" extern u8 mLayerList__8dMpath_c[4];
extern "C" extern f32 mAllCenterX__8dMpath_c;
extern "C" extern f32 mAllCenterZ__8dMpath_c;
extern "C" extern f32 mAllSizeX__8dMpath_c;
extern "C" extern f32 mAllSizeZ__8dMpath_c;
extern "C" u8 mLayerList__8dMpath_c[4];
extern "C" f32 mAllCenterX__8dMpath_c;
extern "C" f32 mAllCenterZ__8dMpath_c;
extern "C" f32 mAllSizeX__8dMpath_c;
extern "C" f32 mAllSizeZ__8dMpath_c;
//
// Declarations:
@@ -701,7 +727,7 @@ asm void renderingDmap_c::afterDrawPath() {
/* ############################################################################################## */
/* 80451088-8045108C 000588 0004+00 2/2 0/0 0/0 .sbss m_res__22dMdm_HIO_prm_res_dst_s */
static u8 m_res__22dMdm_HIO_prm_res_dst_s[4];
u8 dMdm_HIO_prm_res_dst_s::m_res[4];
/* 801C0CD8-801C0D04 1BB618 002C+00 1/1 0/0 0/0 .text _create__15dMenu_DmapMap_cFUsUsUsUsPv */
#pragma push
@@ -1311,16 +1337,16 @@ asm void dMenu_StageMapCtrl_c::_create(u16 param_0, u16 param_1, u16 param_2, u1
/* ############################################################################################## */
/* 8045108C-80451090 00058C 0004+00 1/1 0/0 0/0 .sbss m_zoomCenterMinX__20dMenu_StageMapCtrl_c */
static f32 m_zoomCenterMinX__20dMenu_StageMapCtrl_c;
f32 dMenu_StageMapCtrl_c::m_zoomCenterMinX;
/* 80451090-80451094 000590 0004+00 1/1 0/0 0/0 .sbss m_zoomCenterMaxX__20dMenu_StageMapCtrl_c */
static f32 m_zoomCenterMaxX__20dMenu_StageMapCtrl_c;
f32 dMenu_StageMapCtrl_c::m_zoomCenterMaxX;
/* 80451094-80451098 000594 0004+00 1/1 0/0 0/0 .sbss m_zoomCenterMinZ__20dMenu_StageMapCtrl_c */
static f32 m_zoomCenterMinZ__20dMenu_StageMapCtrl_c;
f32 dMenu_StageMapCtrl_c::m_zoomCenterMinZ;
/* 80451098-804510A0 000598 0004+04 1/1 0/0 0/0 .sbss m_zoomCenterMaxZ__20dMenu_StageMapCtrl_c */
static f32 m_zoomCenterMaxZ__20dMenu_StageMapCtrl_c[1 + 1 /* padding */];
f32 dMenu_StageMapCtrl_c::m_zoomCenterMaxZ[1 + 1 /* padding */];
/* 804540C8-804540CC 0026C8 0004+00 1/1 0/0 0/0 .sdata2 @4460 */
SECTION_SDATA2 static f32 lit_4460 = 6.0f / 5.0f;
src/d/menu/d_menu_fishing.cpp
+12 -4
View File
@@ -11,12 +11,20 @@
// Types:
//
struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct JKRHeap {};
struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct dMsgString_c {
/* 80249C20 */ dMsgString_c();
/* 80249D28 */ ~dMsgString_c();
@@ -28,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();
@@ -156,11 +164,11 @@ extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" u8 mFader__13mDoGph_gInf_c[4];
//
// Declarations:
src/d/menu/d_menu_fmap.cpp
+27 -9
View File
@@ -37,10 +37,18 @@ struct fmpTresTypeGroupDataList_c {
/* 8003EB10 */ ~fmpTresTypeGroupDataList_c();
};
struct daPy_py_c {
static u8 m_midnaActor[4];
};
struct dTres_c {
struct data_s {};
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 8003498C */ void onEventBit(u16);
/* 800349BC */ void isEventBit(u16) const;
@@ -72,6 +80,8 @@ struct dMsgFlow_c {
struct dMf_HIO_c {
/* 801C65F8 */ dMf_HIO_c();
/* 801CDA2C */ ~dMf_HIO_c();
static u8 mMySelfPointer[4];
};
struct dMeterMap_c {
@@ -90,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();
@@ -221,6 +231,8 @@ struct dMenu_Fmap_c {
/* 801CD8B4 */ void getHowlRegionID();
/* 801CD92C */ void isLightVesselGet();
/* 801CD95C */ void getPlayerPos2D();
static u8 MyClass[4];
};
struct dMenu_FmapMap_c {
@@ -324,6 +336,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JKRArchive {
/* 801CC284 */ void getExpandedResSize(void const*) const;
};
@@ -460,6 +476,8 @@ extern "C" void getPlayerPos2D__12dMenu_Fmap_cFv();
extern "C" void __dt__9dMf_HIO_cFv();
extern "C" void __sinit_d_menu_fmap_cpp();
extern "C" extern char const* const d_menu_d_menu_fmap__stringBase0;
extern "C" u8 mMySelfPointer__9dMf_HIO_c[4];
extern "C" u8 MyClass__12dMenu_Fmap_c[4];
//
// External References:
@@ -605,14 +623,14 @@ extern "C" void _restgpr_29();
extern "C" void sprintf();
extern "C" void strcmp();
extern "C" void strcpy();
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__19dMenuFmapIconDisp_c[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 m_midnaActor__9daPy_py_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
@@ -1313,7 +1331,7 @@ SECTION_DATA extern void* __vt__9dMf_HIO_c[3 + 1 /* padding */] = {
};
/* 804510A0-804510A4 0005A0 0004+00 1/1 0/0 0/0 .sbss mMySelfPointer__9dMf_HIO_c */
static u8 mMySelfPointer__9dMf_HIO_c[4];
u8 dMf_HIO_c::mMySelfPointer[4];
/* 80454120-80454124 002720 0004+00 1/1 0/0 0/0 .sdata2 @3994 */
SECTION_SDATA2 static f32 lit_3994 = 1.0f / 5.0f;
@@ -1347,7 +1365,7 @@ asm void dMenuFmap_getStartStageName(void* param_0) {
/* ############################################################################################## */
/* 804510AC-804510B0 0005AC 0004+00 2/2 0/0 0/0 .sbss MyClass__12dMenu_Fmap_c */
static u8 MyClass__12dMenu_Fmap_c[4];
u8 dMenu_Fmap_c::MyClass[4];
/* 80454128-8045412C 002728 0004+00 31/31 0/0 0/0 .sdata2 @4158 */
SECTION_SDATA2 static u8 lit_4158[4] = {
src/d/menu/d_menu_fmap2D.cpp
+27 -11
View File
@@ -18,18 +18,26 @@ struct renderingFmap_c {
int*);
};
struct daPy_py_c {
static u8 m_midnaActor[4];
};
struct dSv_player_field_last_stay_info_c {
/* 80032E78 */ void isRegionBit(int) const;
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
struct STControl {};
struct J2DOrthoGraph {};
struct STControl {};
struct dMsgScrnExplain_c {
/* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8);
/* 8023D918 */ void draw(J2DOrthoGraph*);
@@ -46,7 +54,9 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct JKRExpHeap {};
struct J2DAnmTextureSRTKey {};
struct JKRArchive {};
struct JGeometry {
template <typename A1>
@@ -59,8 +69,6 @@ struct J2DGrafContext {
/* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&);
};
struct JKRArchive {};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
@@ -68,6 +76,8 @@ struct J2DScreen {
/* 802F9690 */ void animation();
};
struct JKRExpHeap {};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80255608 */ void hide();
@@ -75,8 +85,6 @@ struct CPaneMgrAlpha {
/* 80255828 */ void getAlphaRate();
};
struct J2DAnmTextureSRTKey {};
struct dMenu_Fmap2DTop_c {
/* 801D5BD0 */ dMenu_Fmap2DTop_c(JKRExpHeap*, STControl*);
/* 801D6700 */ ~dMenu_Fmap2DTop_c();
@@ -196,10 +204,18 @@ struct Z2SeMgr {
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JUtility {
struct TColor {};
};
struct JMath {
static u8 sincosTable_[65536];
};
struct JKRHeap {};
struct JKRFileLoader {
@@ -411,13 +427,13 @@ extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u8 m_midnaActor__9daPy_py_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/menu/d_menu_fmap_map.cpp
+13 -4
View File
@@ -11,6 +11,8 @@
// Types:
//
struct dMenu_Fmap_world_data_c {};
struct dDrawPath_c {
struct group_class {};
@@ -32,8 +34,6 @@ 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 {};
@@ -82,6 +82,10 @@ struct dRenderingFDAmap_c {
/* 8003D6B8 */ void getDecorationLineWidth(int);
};
struct dMfm_HIO_prm_res_src_s {
static u8 m_other[1 + 3 /* padding */];
};
struct dMenu_Fmap_room_data_c {
/* 8003D818 */ void isArrival();
};
@@ -119,6 +123,10 @@ struct dDlst_list_c {
struct Vec {};
struct JMath {
static u8 sincosTable_[65536];
};
//
// Forward References:
//
@@ -167,6 +175,7 @@ extern "C" bool isRenderingFloor__15renderingFmap_cFi();
extern "C" void beforeDrawPath__15renderingFmap_cFv();
extern "C" void afterDrawPath__15renderingFmap_cFv();
extern "C" extern char const* const d_menu_d_menu_fmap_map__stringBase0;
extern "C" u8 m_other__22dMfm_HIO_prm_res_src_s[1 + 3 /* padding */];
//
// External References:
@@ -218,7 +227,7 @@ extern "C" extern void* __vt__18dRenderingFDAmap_c[26];
extern "C" extern void* __vt__11dDrawPath_c[16];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_Counter[12 + 4 /* padding */];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u8 struct_80450D64[4];
//
@@ -632,7 +641,7 @@ asm void dMenu_FmapMap_c::_delete() {
/* ############################################################################################## */
/* 80454194-80454198 002794 0001+03 2/2 0/0 0/0 .sdata2 m_other__22dMfm_HIO_prm_res_src_s
*/
SECTION_SDATA2 static u8 m_other__22dMfm_HIO_prm_res_src_s[1 + 3 /* padding */] = {
SECTION_SDATA2 u8 dMfm_HIO_prm_res_src_s::m_other[1 + 3 /* padding */] = {
0x1E,
/* padding */
0x00,
src/d/menu/d_menu_insect.cpp
+26 -10
View File
@@ -11,6 +11,10 @@
// Types:
//
struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE548 */ void free(void*);
@@ -20,10 +24,18 @@ struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct dSv_player_get_item_c {
/* 80033EC8 */ void isFirstBit(u8) const;
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
@@ -60,14 +72,14 @@ struct dMsgScrn3Select_c {
/* 8023A97C */ void getCharSpace();
};
struct JMSMesgEntry_c {};
struct ResTIMG {};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct JMSMesgEntry_c {};
struct JUTFont {};
struct dMeter2Info_c {
@@ -78,6 +90,10 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct JKRExpHeap {};
struct CSTControl {};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
@@ -86,10 +102,6 @@ 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();
@@ -137,6 +149,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
@@ -282,13 +298,13 @@ extern "C" void snprintf();
extern "C" void strcat();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mFader__13mDoGph_gInf_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/menu/d_menu_item_explain.cpp
+18 -10
View File
@@ -11,6 +11,10 @@
// Types:
//
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct dSv_player_item_record_c {
/* 80033F7C */ void getBombNum(u8) const;
};
@@ -48,8 +52,6 @@ struct dMsgScrn3Select_c {
/* 8023A97C */ void getCharSpace();
};
struct JMSMesgEntry_c {};
struct ResTLUT {};
struct JGeometry {
@@ -66,6 +68,8 @@ struct J2DPicture {
/* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
};
struct JMSMesgEntry_c {};
struct JUTFont {};
struct dMeter2Info_c {
@@ -75,18 +79,18 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct J2DOrthoGraph {};
struct JKRExpHeap {};
struct JKRArchive {};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct J2DOrthoGraph {};
struct JKRArchive {};
struct dMenu_ItemExplain_c {
/* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
/* 801DAFF0 */ ~dMenu_ItemExplain_c();
@@ -130,6 +134,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE548 */ void free(void*);
@@ -278,12 +286,12 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void snprintf();
extern "C" void strcat();
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_ringHIO[344];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/menu/d_menu_letter.cpp
+26 -10
View File
@@ -11,12 +11,20 @@
// Types:
//
struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct JKRHeap {};
struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct dSv_letter_info_c {
/* 80034428 */ void onLetterGetFlag(int);
/* 80034474 */ void onLetterReadFlag(int);
@@ -37,6 +45,8 @@ struct dSelect_cursor_c {
/* 801952A0 */ void setAlphaRate(f32);
};
struct COutFont_c {};
struct J2DTextBox {
/* 801DFA28 */ void getWhite() const;
/* 801DFA34 */ void getBlack() const;
@@ -44,8 +54,6 @@ struct J2DTextBox {
/* 8030074C */ void setString(s16, char const*, ...);
};
struct COutFont_c {};
struct JUTFont {};
struct dMsgString_c {
@@ -77,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();
@@ -131,6 +139,10 @@ struct dMenu_Letter_c {
/* 801E1D5C */ void draw();
};
struct dMenu_Letter {
static u8 letter_data[512];
};
struct Vec {};
struct JAISoundID {};
@@ -139,6 +151,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct ResTIMG {};
struct JUtility {
@@ -312,13 +328,13 @@ extern "C" void _restgpr_29();
extern "C" void sprintf();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 letter_data__12dMenu_Letter[512];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 letter_data__12dMenu_Letter[512];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mFader__13mDoGph_gInf_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/menu/d_menu_option.cpp
+18 -5
View File
@@ -11,12 +11,21 @@
// Types:
//
struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct JKRHeap {};
struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
struct mDoCPd_c {
static u8 m_gamePad[16];
static u8 m_cpadInfo[256];
};
struct dSv_player_config_c {
/* 80034684 */ void getSound();
/* 8003468C */ void setSound(u8);
@@ -179,6 +188,8 @@ struct Z2SeMgr {
struct Z2AudioMgr {
/* 802CD888 */ void setOutputMode(u32);
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct ResTIMG {};
@@ -189,6 +200,8 @@ struct JUTGamePad {
/* 802E18CC */ void startPatternedRumble(void*, JUTGamePad::CRumble::ERumble, u32);
};
static u8 sRumbleSupported[4];
};
struct JKRFileLoader {
@@ -406,14 +419,14 @@ extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 m_gamePad__8mDoCPd_c[16];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 m_gamePad__8mDoCPd_c[16];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" extern u8 sRumbleSupported__10JUTGamePad[4];
extern "C" u8 mFader__13mDoGph_gInf_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 sRumbleSupported__10JUTGamePad[4];
//
// Declarations:
src/d/menu/d_menu_ring.cpp
+22 -6
View File
@@ -11,6 +11,10 @@
// Types:
//
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct dSv_player_status_a_c {
/* 80032A5C */ void getSelectItemIndex(int) const;
};
@@ -65,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();
@@ -147,6 +151,10 @@ struct dKantera_icon_c {
/* 801AEC44 */ void setNowGauge(u16, u16);
};
struct dItem_data {
static void* item_resource[1530];
};
struct Vec {};
struct cXyz {
@@ -159,6 +167,14 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JMath {
static u8 sincosTable_[65536];
};
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE548 */ void free(void*);
@@ -364,14 +380,14 @@ extern "C" void _restgpr_29();
extern "C" void abs();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* item_resource__10dItem_data[1530];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" void* item_resource__10dItem_data[1530];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_ringHIO[344];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/menu/d_menu_save.cpp
+27 -7
View File
@@ -11,6 +11,10 @@
// Types:
//
struct mDoRst {
static u8 mResetData[4 + 4 /* padding */];
};
struct mDoMemCd_Ctrl_c {
/* 800169B4 */ void load();
/* 80016AB0 */ void LoadSync(void*, u32, u32);
@@ -28,6 +32,10 @@ struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct dSv_save_c {};
struct dSv_player_item_c {
@@ -45,6 +53,10 @@ struct dSv_info_c {
/* 80035BD0 */ void initdata_to_card(char*, int);
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 800349A4 */ void offEventBit(u16);
/* 800349BC */ void isEventBit(u16) const;
@@ -68,6 +80,8 @@ struct dMsgString_c {
/* 80249D28 */ ~dMsgString_c();
};
struct J2DOrthoGraph {};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 8003219C */ void checkTrigger();
@@ -77,8 +91,6 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct J2DOrthoGraph {};
struct dMsgScrnExplain_c {
/* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8);
/* 8023D7D8 */ void move();
@@ -265,6 +277,10 @@ struct Z2SeMgr {
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JUtility {
struct TColor {};
};
@@ -275,6 +291,10 @@ struct JKRFileLoader {
struct JKRExpHeap {};
struct JFWDisplay {
static u8 sManager[4];
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 80300660 */ void setString(char const*, ...);
@@ -542,15 +562,15 @@ extern "C" void printf();
extern "C" void strcpy();
extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__12dMenu_save_c[3 + 3 /* padding */];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_mDoMemCd_control[8192];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" extern u8 sManager__10JFWDisplay[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" u8 sManager__10JFWDisplay[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/menu/d_menu_skill.cpp
+24 -8
View File
@@ -11,12 +11,24 @@
// Types:
//
struct mDoGph_gInf_c {
static u8 mFader[4];
};
struct JKRHeap {};
struct mDoDvdThd_mountArchive_c {
/* 80015E14 */ void create(char const*, u8, JKRHeap*);
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
@@ -44,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();
@@ -94,6 +106,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct ResTIMG {};
struct JUtility {
@@ -219,13 +235,13 @@ extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mFader__13mDoGph_gInf_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/menu/d_menu_window.cpp
+28 -10
View File
@@ -13,6 +13,16 @@
struct msg_class {};
struct mDoGph_gInf_c {
static u8 mFader[4];
static u8 mFrameBufferTimg[4];
static u8 mFrameBufferTex[4];
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct dMw_c {
/* 801FA13C */ void key_wait_init(u8);
/* 801FA220 */ void ring_open_init(u8);
@@ -152,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();
@@ -268,11 +278,19 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JKRHeap {
/* 802CE5CC */ void freeAll();
/* 802CE784 */ void getTotalFreeSize();
};
struct JFWDisplay {
static u8 sManager[4];
};
//
// Forward References:
//
@@ -542,7 +560,7 @@ extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__10CSTControl[4];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_mwHIO[304];
extern "C" extern u8 g_mwDHIO[520];
@@ -550,12 +568,12 @@ extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 g_clearColor[4];
extern "C" extern u32 g_blackColor;
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" extern u8 mFrameBufferTex__13mDoGph_gInf_c[4];
extern "C" u8 mFader__13mDoGph_gInf_c[4];
extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" u8 mFrameBufferTex__13mDoGph_gInf_c[4];
extern "C" extern u8 struct_80450BE4[4];
extern "C" extern u8 sManager__10JFWDisplay[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 sManager__10JFWDisplay[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/meter/d_meter2.cpp
+10 -2
View File
@@ -224,6 +224,10 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct dDemo_c {
static u8 m_mode[4];
};
struct dComIfG_play_c {
/* 8002B36C */ void setItemBombNumCount(u8, s16);
/* 8002B384 */ void getItemBombNumCount(u8);
@@ -249,6 +253,10 @@ struct Z2SeMgr {
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JKRHeap {
/* 802CE5CC */ void freeAll();
/* 802CE784 */ void getTotalFreeSize();
@@ -474,8 +482,8 @@ extern "C" extern u8 g_ringHIO[344];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u8 g_cursorHIO[68 + 4 /* padding */];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 m_mode__7dDemo_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 m_mode__7dDemo_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/meter/d_meter2_draw.cpp
+27 -19
View File
@@ -58,12 +58,16 @@ struct dMeter2Info_c {
struct JKRExpHeap {};
struct J2DGrafContext {};
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*);
@@ -71,25 +75,10 @@ struct J2DScreen {
/* 802F9690 */ void animation();
};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802555C8 */ void show();
/* 80255608 */ void hide();
/* 8025564C */ void isVisible();
/* 802557D0 */ void setAlphaRate(f32);
/* 80255828 */ void getAlphaRate();
};
struct JUtility {
struct TColor {};
};
struct J2DAnmColor {};
struct J2DRotateAxis {};
struct J2DBasePosition {};
struct J2DRotateAxis {};
struct J2DPane {
/* 802F666C */ void appendChild(J2DPane*);
/* 802F71DC */ void rotate(f32, f32, J2DRotateAxis, f32);
@@ -105,6 +94,17 @@ struct CPaneMgr {
/* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 802555C8 */ void show();
/* 80255608 */ void hide();
/* 8025564C */ void isVisible();
/* 802557D0 */ void setAlphaRate(f32);
/* 80255828 */ void getAlphaRate();
};
struct J2DAnmColor {};
struct dMeter2Draw_c {
/* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*);
/* 802102F8 */ ~dMeter2Draw_c();
@@ -215,6 +215,10 @@ struct dKantera_icon_c {
/* 801AEC44 */ void setNowGauge(u16, u16);
};
struct dItem_data {
static void* item_resource[1530];
};
struct Vec {};
struct JAISoundID {};
@@ -224,6 +228,10 @@ struct Z2SeMgr {
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE548 */ void free(void*);
@@ -436,12 +444,12 @@ extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" void strcpy();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* item_resource__10dItem_data[1530];
extern "C" void* item_resource__10dItem_data[1530];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 g_MsgObject_HIO_c[1040];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/meter/d_meter2_info.cpp
+22 -9
View File
@@ -40,6 +40,10 @@ struct dSv_letter_info_c {
/* 8003444C */ void isLetterGetFlag(int) const;
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
@@ -60,18 +64,18 @@ struct dMeterMap_c {
/* 8020D900 */ void isMapOpenCheck();
};
struct JMSMesgEntry_c {};
struct JUTFont {};
struct cXyz {};
struct J2DTextBox {
/* 8021C7F4 */ void getFont() const;
};
struct JUTFont {};
struct J2DPicture {};
struct cXyz {};
struct JMSMesgEntry_c {};
struct dMeter2Info_c {
/* 8021BDDC */ dMeter2Info_c();
/* 8021BE20 */ ~dMeter2Info_c();
@@ -115,6 +119,14 @@ struct dMeter2Info_c {
/* 8021E290 */ void setSaveStageName(char const*);
};
struct dMenu_Letter {
static u8 letter_data[512];
};
struct dItem_data {
static void* item_resource[1530];
};
struct csXyz {
/* 802673F4 */ csXyz(s16, s16, s16);
};
@@ -190,6 +202,7 @@ extern "C" void dMeter2Info_set2DVibration__Fv();
extern "C" void dMeter2Info_set2DVibrationM__Fv();
extern "C" void __sinit_d_meter2_info_cpp();
extern "C" extern char const* const d_meter_d_meter2_info__stringBase0;
extern "C" u8 letter_data__12dMenu_Letter[512];
//
// External References:
@@ -242,8 +255,8 @@ extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" void strcpy();
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* item_resource__10dItem_data[1530];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" void* item_resource__10dItem_data[1530];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
@@ -307,7 +320,7 @@ SECTION_DATA static void* tex_name_5183[10] = {
};
/* 803BF81C-803BFA1C 01C93C 0200+00 3/3 6/6 0/0 .data letter_data__12dMenu_Letter */
SECTION_DATA extern u8 letter_data__12dMenu_Letter[512] = {
SECTION_DATA u8 dMenu_Letter::letter_data[512] = {
0x09, 0xC5, 0x0A, 0x29, 0x0A, 0x8D, 0x01, 0x0B, 0x09, 0xC6, 0x0A, 0x2A, 0x0A, 0x8E, 0x02, 0x37,
0x09, 0xC7, 0x0A, 0x2B, 0x0A, 0x8F, 0x02, 0x36, 0x09, 0xC8, 0x0A, 0x2C, 0x0A, 0x90, 0x00, 0x37,
0x09, 0xC9, 0x0A, 0x2D, 0x0A, 0x91, 0x00, 0x39, 0x09, 0xCA, 0x0A, 0x2E, 0x0A, 0x92, 0x00, 0x67,
src/d/meter/d_meter_button.cpp
+21 -13
View File
@@ -15,6 +15,10 @@ struct dSv_player_item_c {
/* 80033030 */ void getItem(int, bool) const;
};
struct dSv_event_tmp_flag_c {
static u8 const tempBitLabels[370 + 2 /* padding */];
};
struct dSv_event_c {
/* 800349BC */ void isEventBit(u16) const;
};
@@ -24,15 +28,15 @@ struct dMsgString_c {
/* 80249D28 */ ~dMsgString_c();
};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
/* 8030074C */ void setString(s16, char const*, ...);
};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct JUTFont {};
struct dMsgObject_c {
@@ -50,12 +54,10 @@ struct dMsgObject_c {
/* 80238258 */ void getScrnDrawPtr();
};
struct JKRExpHeap {};
struct JKRArchive {};
struct J2DGrafContext {};
struct JKRArchive {};
struct J2DScreen {
/* 802F8498 */ J2DScreen();
/* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
@@ -66,6 +68,8 @@ struct J2DPane {
/* 802F7100 */ void getBounds();
};
struct JKRExpHeap {};
struct CPaneMgr {
/* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80253930 */ CPaneMgr();
@@ -181,10 +185,6 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct JUtility {
struct TColor {};
};
struct CPaneMgrAlpha {
/* 802555C8 */ void show();
/* 80255608 */ void hide();
@@ -192,6 +192,10 @@ struct CPaneMgrAlpha {
/* 80255828 */ void getAlphaRate();
};
struct JUtility {
struct TColor {};
};
struct dMeter2Draw_c {
/* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor, f32, u8);
@@ -211,6 +215,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JKRHeap {
/* 802CE4D4 */ void alloc(u32, int);
/* 802CE548 */ void free(void*);
@@ -386,13 +394,13 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" void strcpy();
extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 g_MsgObject_HIO_c[1040];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/meter/d_meter_haihai.cpp
+2 -2
View File
@@ -15,11 +15,11 @@ struct dMeterSub_c {
/* 80194138 */ bool isDead();
};
struct J2DAnmColor {};
struct J2DAnmTransformKey {};
struct J2DAnmTextureSRTKey {};
struct J2DAnmTransformKey {};
struct J2DAnmColor {};
struct dMeterHaihai_c {
/* 8020AE8C */ dMeterHaihai_c(u8);
src/d/meter/d_meter_hakusha.cpp
+4 -4
View File
@@ -31,10 +31,6 @@ struct dMeterHakusha_c {
/* 8020D480 */ void getHakushaNum();
};
struct JUtility {
struct TColor {};
};
struct CPaneMgrAlpha {
/* 802555C8 */ void show();
/* 80255608 */ void hide();
@@ -42,6 +38,10 @@ struct CPaneMgrAlpha {
/* 80255828 */ void getAlphaRate();
};
struct JUtility {
struct TColor {};
};
struct dMeter2Draw_c {
/* 8021462C */ void drawPikariHakusha(f32, f32, f32, f32, JUtility::TColor, JUtility::TColor,
JUtility::TColor, JUtility::TColor);
src/d/meter/d_meter_map.cpp
+15 -3
View File
@@ -11,10 +11,18 @@
// Types:
//
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct dSv_memBit_c {
/* 80034934 */ void isDungeonItem(int) const;
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 8003498C */ void onEventBit(u16);
/* 800349BC */ void isEventBit(u16) const;
@@ -88,6 +96,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct ResTIMG {};
struct J2DPicture {
@@ -162,12 +174,12 @@ extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/msg/d_msg_class.cpp
+32 -16
View File
@@ -11,10 +11,12 @@
// Types:
//
struct Vec {};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
struct jmessage_tControl {
/* 802299EC */ jmessage_tControl();
};
struct jmessage_tReference {
@@ -49,8 +51,10 @@ struct jmessage_tReference {
/* 80232A20 */ void getActorPos();
};
struct jmessage_tControl {
/* 802299EC */ jmessage_tControl();
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct jmessage_tSequenceProcessor {
@@ -115,14 +119,19 @@ struct jmessage_tMeasureProcessor {
/* 8022B5F4 */ ~jmessage_tMeasureProcessor();
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
struct jmessage_string_tControl {
/* 8022FB5C */ jmessage_string_tControl();
/* 802328DC */ ~jmessage_string_tControl();
};
struct COutFont_c {
/* 80226CF8 */ void initialize();
};
struct J2DTextBox {
/* 80300658 */ void getStringPtr() const;
};
struct JUTFont {};
struct jmessage_string_tReference {
@@ -140,11 +149,6 @@ struct jmessage_string_tReference {
/* 8022FB24 */ void getLineCountNowPage();
};
struct jmessage_string_tControl {
/* 8022FB5C */ jmessage_string_tControl();
/* 802328DC */ ~jmessage_string_tControl();
};
struct jmessage_string_tSequenceProcessor {
/* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*,
jmessage_string_tControl*);
@@ -195,6 +199,14 @@ struct dSv_player_item_max_c {
/* 800340F8 */ void getBombNum(u8) const;
};
struct dSv_event_tmp_flag_c {
static u8 const tempBitLabels[370 + 2 /* padding */];
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 8003498C */ void onEventBit(u16);
/* 80034A04 */ void getEventReg(u16) const;
@@ -241,6 +253,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16);
@@ -553,18 +569,18 @@ extern "C" void snprintf();
extern "C" void strcat();
extern "C" void strcpy();
extern "C" void strlen();
extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__17jmessage_tControl[3];
extern "C" extern void* __vt__Q28JMessage10TReference[4 + 1 /* padding */];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 g_MsgObject_HIO_c[1040];
extern "C" extern u8 data_80450B70[4];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 g_msg_unit[4 + 4 /* padding */];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/msg/d_msg_flow.cpp
+25 -6
View File
@@ -29,6 +29,8 @@ struct daPy_py_c {
/* 8015F3FC */ void getAttentionOffsetY();
/* 8015F954 */ void setMidnaMotionNum(int);
/* 8015F968 */ void setMidnaFaceNum(int);
static u8 m_midnaActor[4];
};
struct daAlink_c {
@@ -77,6 +79,14 @@ struct dSv_light_drop_c {
/* 80034368 */ void onLightDropGetFlag(u8);
};
struct dSv_event_tmp_flag_c {
static u8 const tempBitLabels[370 + 2 /* padding */];
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 8003498C */ void onEventBit(u16);
/* 800349A4 */ void offEventBit(u16);
@@ -242,6 +252,9 @@ struct dMsgFlow_c {
/* 8024D970 */ void event040(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024DA78 */ void event041(mesg_flow_node_event*, fopAc_ac_c*);
/* 8024DAA8 */ bool event042(mesg_flow_node_event*, fopAc_ac_c*);
static u8 mQueryList[636];
static u8 mEventList[516];
};
struct dMeter2Info_c {
@@ -275,6 +288,10 @@ struct Z2SeMgr {
/* 802ADB14 */ void messageSePlay(u16, Vec*, s8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
//
// Forward References:
//
@@ -403,6 +420,8 @@ extern "C" bool event042__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c();
extern "C" void func_8024DAB0(s32*);
extern "C" void __sinit_d_msg_flow_cpp();
extern "C" extern char const* const d_msg_d_msg_flow__stringBase0;
extern "C" u8 mQueryList__10dMsgFlow_c[636];
extern "C" u8 mEventList__10dMsgFlow_c[516];
//
// External References:
@@ -514,16 +533,16 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 g_MsgObject_HIO_c[1040];
extern "C" extern u32 g_saftyWhiteColor;
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 m_midnaActor__9daPy_py_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
@@ -1145,7 +1164,7 @@ SECTION_DATA static void* lit_5075[3] = {
#pragma pop
/* 803C184C-803C1AC8 01E96C 027C+00 2/3 0/0 0/0 .data mQueryList__10dMsgFlow_c */
SECTION_DATA static u8 mQueryList__10dMsgFlow_c[636] = {
SECTION_DATA u8 dMsgFlow_c::mQueryList[636] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1619,7 +1638,7 @@ SECTION_DATA static void* lit_5986[3] = {
#pragma pop
/* 803C1CCC-803C1ED0 01EDEC 0204+00 1/2 0/0 0/0 .data mEventList__10dMsgFlow_c */
SECTION_DATA static u8 mEventList__10dMsgFlow_c[516] = {
SECTION_DATA u8 dMsgFlow_c::mEventList[516] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
src/d/msg/d_msg_object.cpp
+38 -13
View File
@@ -13,18 +13,24 @@
struct msg_class {};
struct JKRArchive {
struct EMountMode {};
};
struct JKRHeap {
/* 802CE784 */ void getTotalFreeSize();
};
struct JKRArchive {
struct EMountMode {};
};
struct mDoDvdThd_mountXArchive_c {
/* 800161E0 */ void create(char const*, u8, JKRArchive::EMountMode, JKRHeap*);
};
struct mDoCPd_c {
static u8 m_cpadInfo[256];
};
struct jmessage_tControl {};
struct Vec {};
struct cXyz {
@@ -42,8 +48,6 @@ struct jmessage_tReference {
/* 80238C78 */ void setActorPos(cXyz);
};
struct jmessage_tControl {};
struct jmessage_tSequenceProcessor {
/* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*);
};
@@ -55,6 +59,10 @@ struct jmessage_tRenderingProcessor {
struct fopAc_ac_c {};
struct daPy_py_c {
static u8 m_midnaActor[4];
};
struct dSv_player_item_record_c {
/* 80033F7C */ void getBombNum(u8) const;
};
@@ -67,6 +75,14 @@ struct dSv_player_get_item_c {
/* 80033E60 */ void onFirstBit(u8);
};
struct dSv_event_tmp_flag_c {
static u8 const tempBitLabels[370 + 2 /* padding */];
};
struct dSv_event_flag_c {
static u8 saveBitLabels[1644 + 4 /* padding */];
};
struct dSv_event_c {
/* 8003498C */ void onEventBit(u16);
/* 800349A4 */ void offEventBit(u16);
@@ -316,6 +332,11 @@ struct dDlst_list_c {
/* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
};
struct dDemo_c {
static u8 m_control[4];
static u8 m_mesgControl[4];
};
struct Z2StatusMgr {
/* 802B60CC */ void talkIn();
/* 802B6104 */ void talkOut();
@@ -335,6 +356,10 @@ struct Z2SeMgr {
/* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
};
struct Z2AudioMgr {
static u8 mAudioMgrPtr[4 + 4 /* padding */];
};
struct JUtility {
struct TColor {
/* 80193960 */ TColor();
@@ -652,18 +677,18 @@ extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" void sprintf();
extern "C" void strcpy();
extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 data_80450B70[4];
extern "C" extern u8 m_control__7dDemo_c[4];
extern "C" extern u8 m_mesgControl__7dDemo_c[4];
extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" u8 m_control__7dDemo_c[4];
extern "C" u8 m_mesgControl__7dDemo_c[4];
extern "C" u8 m_midnaActor__9daPy_py_c[4];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
//
// Declarations:
src/d/msg/d_msg_string.cpp
+2 -2
View File
@@ -11,12 +11,12 @@
// Types:
//
struct J2DTextBox {};
struct COutFont_c {
/* 80225C94 */ COutFont_c(u8);
};
struct J2DTextBox {};
struct JUTFont {};
struct dMsgString_c {
src/d/msg/d_msg_string_base.cpp
+5 -5
View File
@@ -11,10 +11,14 @@
// Types:
//
struct J2DTextBox {};
struct jmessage_string_tControl {
/* 8022FB5C */ jmessage_string_tControl();
};
struct COutFont_c {};
struct J2DTextBox {};
struct JUTFont {};
struct jmessage_string_tReference {
@@ -23,10 +27,6 @@ struct jmessage_string_tReference {
/* 8022FA38 */ void getLineLength(int);
};
struct jmessage_string_tControl {
/* 8022FB5C */ jmessage_string_tControl();
};
struct jmessage_string_tSequenceProcessor {
/* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*,
jmessage_string_tControl*);
src/d/ovlp/d_ovlp_fade.cpp
+5 -1
View File
@@ -21,6 +21,10 @@ struct JUTFader {
/* 802E57D0 */ void setStatus(JUTFader::EStatus, int);
};
struct JFWDisplay {
static u8 sManager[4];
};
//
// Forward References:
//
@@ -56,7 +60,7 @@ extern "C" void setStatus__8JUTFaderFQ28JUTFader7EStatusi();
extern "C" extern void* g_fopOvlp_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 sManager__10JFWDisplay[4];
extern "C" u8 sManager__10JFWDisplay[4];
//
// Declarations:
src/d/ovlp/d_ovlp_fade2.cpp
+15 -4
View File
@@ -15,6 +15,13 @@ struct overlap_task_class {};
struct mDoMtx_stack_c {
/* 8000CE38 */ void scaleM(f32, f32, f32);
static u8 now[48];
};
struct mDoGph_gInf_c {
static u8 mFrameBufferTexObj[32];
static u8 mFrameBufferTex[4];
};
struct dOvlpFd2_dlst_c {
@@ -43,6 +50,10 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct JFWDisplay {
static u8 sManager[4];
};
struct J2DOrthoGraph {
/* 802E980C */ void setOrtho(JGeometry::TBox2<f32> const&, f32, f32);
};
@@ -121,13 +132,13 @@ extern "C" extern void* g_fopOvlp_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__16dDlst_snapShot_c[3];
extern "C" extern u8 mFrameBufferTexObj__13mDoGph_gInf_c[32];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mFrameBufferTexObj__13mDoGph_gInf_c[32];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_clearColor[4];
extern "C" extern u8 mFrameBufferTex__13mDoGph_gInf_c[4];
extern "C" u8 mFrameBufferTex__13mDoGph_gInf_c[4];
extern "C" extern u8 struct_80450BE4[4];
extern "C" extern u8 sManager__10JFWDisplay[4];
extern "C" u8 sManager__10JFWDisplay[4];
//
// Declarations:
src/d/ovlp/d_ovlp_fade3.cpp
+15 -4
View File
@@ -15,6 +15,13 @@ struct overlap_task_class {};
struct mDoMtx_stack_c {
/* 8000CE38 */ void scaleM(f32, f32, f32);
static u8 now[48];
};
struct mDoGph_gInf_c {
static u8 mFrameBufferTexObj[32];
static u8 mFrameBufferTex[4];
};
struct dOvlpFd3_dlst_c {
@@ -51,6 +58,10 @@ struct JGeometry {
struct TBox2__template0 {};
};
struct JFWDisplay {
static u8 sManager[4];
};
struct J2DOrthoGraph {
/* 802E980C */ void setOrtho(JGeometry::TBox2<f32> const&, f32, f32);
};
@@ -134,12 +145,12 @@ extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
extern "C" extern void* g_fopOvlp_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 mFrameBufferTexObj__13mDoGph_gInf_c[32];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mFrameBufferTexObj__13mDoGph_gInf_c[32];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_clearColor[4];
extern "C" extern u8 mFrameBufferTex__13mDoGph_gInf_c[4];
extern "C" extern u8 sManager__10JFWDisplay[4];
extern "C" u8 mFrameBufferTex__13mDoGph_gInf_c[4];
extern "C" u8 sManager__10JFWDisplay[4];
//
// Declarations:
src/d/pane/d_pane_class_ex.cpp
+2 -2
View File
@@ -37,10 +37,10 @@ struct J2DPicture {
struct J2DAnmTexPattern {};
struct J2DAnmVisibilityFull {};
struct J2DAnmVtxColor {};
struct J2DAnmVisibilityFull {};
struct J2DPane {
/* 80256018 */ void setAnimation(J2DAnmVtxColor*);
/* 80256020 */ void setAnimation(J2DAnmTexPattern*);
src/d/particle/d_particle.cpp
+91 -42
View File
@@ -11,6 +11,14 @@
// Types:
//
struct mDoLib_clipper {
static u8 mClipper[92];
};
struct mDoGph_gInf_c {
static u8 mFrameBufferTimg[4];
};
struct JKRHeap {
/* 802CE500 */ void free(void*, JKRHeap*);
};
@@ -28,6 +36,8 @@ struct cXyz {
struct fopAcM_wt_c {
/* 8001DD84 */ void waterCheck(cXyz const*);
static f32 mWaterY[1 + 1 /* padding */];
};
struct daPy_py_c {
@@ -58,16 +68,23 @@ struct dPa_wbPcallBack_c {
/* 8004FECC */ ~dPa_wbPcallBack_c();
};
struct _GXColor {};
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 {};
/* TVec3<f32> */
struct TVec3__template0 {};
};
struct JPAEmitterCallBack {
/* 80050368 */ void execute(JPABaseEmitter*);
/* 8005036C */ void draw(JPABaseEmitter*);
@@ -76,8 +93,6 @@ struct JPAEmitterCallBack {
/* 8027E6A4 */ ~JPAEmitterCallBack();
};
struct JPADrawInfo {};
struct ResTIMG {};
struct JPAResourceManager {
@@ -87,12 +102,7 @@ struct JPAResourceManager {
/* 80273FCC */ void getResUserWork(u16) const;
};
struct JGeometry {
template <typename A1>
struct TVec3 {};
/* TVec3<f32> */
struct TVec3__template0 {};
};
struct JPADrawInfo {};
struct JPAEmitterManager {
/* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8);
@@ -140,6 +150,11 @@ struct dPa_particleTracePcallBack_c {
/* 8004FC68 */ ~dPa_particleTracePcallBack_c();
};
struct dPa_name {
static u8 j_o_id[10 + 2 /* padding */];
static u8 s_o_id[28];
};
struct dPa_modelPcallBack {
/* 8004A460 */ void draw(JPABaseEmitter*, JPABaseParticle*);
/* 80050038 */ ~dPa_modelPcallBack();
@@ -174,6 +189,10 @@ struct dPa_modelEcallBack {
/* 8004AD90 */ void getRotAxis(JPABaseEmitter*);
/* 80050014 */ void drawAfter(JPABaseEmitter*);
/* 80050378 */ ~dPa_modelEcallBack();
static u8 mEcallback[4];
static u8 mPcallback[4];
static u8 mModel[4];
};
struct dPa_light8PcallBack {
@@ -305,6 +324,20 @@ struct dPa_control_c {
cXyz const*);
/* 8004D988 */ void setCommonPoly(u32*, cBgS_PolyInfo*, cXyz const*, cXyz const*,
dKy_tevstr_c const*, u32, u32, csXyz const*, cXyz const*, s8);
static u8 mTsubo[64];
static u8 mLifeBall[24];
static u8 mWindViewMatrix[48];
static u8 mEmitterMng[4];
static u8 mWaterBubblePcallBack[4];
static u8 mFsenthPcallBack[4];
static u8 mLight8EcallBack[4];
static u8 mLight8PcallBack[4];
static u8 m_b_Light8EcallBack[4];
static u8 m_b_Light8PcallBack[4];
static u8 m_d_Light8EcallBack[4];
static u8 m_d_Light8PcallBack[4];
static u8 mParticleTracePCB[4 + 4 /* padding */];
};
struct dJntCol_c {
@@ -324,6 +357,10 @@ struct cBgS {
struct Vec {};
struct JMath {
static u8 sincosTable_[65536];
};
struct JKRSolidHeap {};
struct JKRExpHeap {
@@ -344,16 +381,18 @@ struct J3DSys {
struct J3DShape {
/* 80315300 */ void loadPreDrawSetting() const;
};
struct J3DAnmTevRegKey {
/* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
static u8 sOldVcdVatCmd[4];
};
struct J3DAnmTexPattern {
/* 8032B09C */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DAnmTevRegKey {
/* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
};
struct J3DMaterialTable {
/* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*);
/* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*);
@@ -522,6 +561,22 @@ extern "C" void __dt__18dPa_modelEcallBackFv();
extern "C" void __dt__25dPa_gen_d_light8EcallBackFv();
extern "C" void __sinit_d_particle_cpp();
extern "C" extern char const* const d_particle_d_particle__stringBase0;
extern "C" u8 mTsubo__13dPa_control_c[64];
extern "C" u8 mLifeBall__13dPa_control_c[24];
extern "C" u8 mWindViewMatrix__13dPa_control_c[48];
extern "C" u8 mEcallback__18dPa_modelEcallBack[4];
extern "C" u8 mPcallback__18dPa_modelEcallBack[4];
extern "C" u8 mModel__18dPa_modelEcallBack[4];
extern "C" u8 mEmitterMng__13dPa_control_c[4];
extern "C" u8 mWaterBubblePcallBack__13dPa_control_c[4];
extern "C" u8 mFsenthPcallBack__13dPa_control_c[4];
extern "C" u8 mLight8EcallBack__13dPa_control_c[4];
extern "C" u8 mLight8PcallBack__13dPa_control_c[4];
extern "C" u8 m_b_Light8EcallBack__13dPa_control_c[4];
extern "C" u8 m_b_Light8PcallBack__13dPa_control_c[4];
extern "C" u8 m_d_Light8EcallBack__13dPa_control_c[4];
extern "C" u8 m_d_Light8PcallBack__13dPa_control_c[4];
extern "C" u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */];
//
// External References:
@@ -684,21 +739,21 @@ extern "C" void sprintf();
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern void* __vt__19JPAParticleCallBack[5];
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern u8 j_o_id__8dPa_name[10 + 2 /* padding */];
extern "C" extern u8 s_o_id__8dPa_name[28];
extern "C" extern u8 mClipper__14mDoLib_clipper[92];
extern "C" u8 j_o_id__8dPa_name[10 + 2 /* padding */];
extern "C" u8 s_o_id__8dPa_name[28];
extern "C" u8 mClipper__14mDoLib_clipper[92];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" extern u32 g_whiteColor;
extern "C" extern u32 __float_nan;
extern "C" extern u32 __float_epsilon;
extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" extern u8 JPTracePCB4[4];
extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */];
extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4];
extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
//
// Declarations:
@@ -999,14 +1054,13 @@ asm void dPa_followEcallBack::end() {
/* ############################################################################################## */
/* 80450E90-80450E94 000390 0004+00 2/2 1/1 11/11 .sbss mEcallback__18dPa_modelEcallBack
*/
extern u8 mEcallback__18dPa_modelEcallBack[4];
u8 mEcallback__18dPa_modelEcallBack[4];
u8 dPa_modelEcallBack::mEcallback[4];
/* 80450E94-80450E98 000394 0004+00 2/2 0/0 0/0 .sbss mPcallback__18dPa_modelEcallBack */
static u8 mPcallback__18dPa_modelEcallBack[4];
u8 dPa_modelEcallBack::mPcallback[4];
/* 80450E98-80450E9C 000398 0004+00 5/5 0/0 0/0 .sbss mModel__18dPa_modelEcallBack */
static u8 mModel__18dPa_modelEcallBack[4];
u8 dPa_modelEcallBack::mModel[4];
/* 80450E9C-80450EA0 -00001 0004+00 3/3 0/0 0/0 .sbss None */
/* 80450E9C 0001+00 data_80450E9C None */
@@ -1015,25 +1069,22 @@ static u8 mModel__18dPa_modelEcallBack[4];
static u8 struct_80450E9C[4];
/* 80450EA0-80450EA4 0003A0 0004+00 14/14 1/1 0/0 .sbss mEmitterMng__13dPa_control_c */
extern u8 mEmitterMng__13dPa_control_c[4];
u8 mEmitterMng__13dPa_control_c[4];
u8 dPa_control_c::mEmitterMng[4];
/* 80450EA4-80450EA8 0003A4 0004+00 1/1 1/1 0/0 .sbss mWaterBubblePcallBack__13dPa_control_c */
extern u8 mWaterBubblePcallBack__13dPa_control_c[4];
u8 mWaterBubblePcallBack__13dPa_control_c[4];
u8 dPa_control_c::mWaterBubblePcallBack[4];
/* 80450EA8-80450EAC 0003A8 0004+00 3/3 0/0 0/0 .sbss mFsenthPcallBack__13dPa_control_c
*/
static u8 mFsenthPcallBack__13dPa_control_c[4];
u8 dPa_control_c::mFsenthPcallBack[4];
/* 80450EAC-80450EB0 0003AC 0004+00 2/2 0/0 1/1 .sbss mLight8EcallBack__13dPa_control_c
*/
extern u8 mLight8EcallBack__13dPa_control_c[4];
u8 mLight8EcallBack__13dPa_control_c[4];
u8 dPa_control_c::mLight8EcallBack[4];
/* 80450EB0-80450EB4 0003B0 0004+00 2/2 0/0 0/0 .sbss mLight8PcallBack__13dPa_control_c
*/
static u8 mLight8PcallBack__13dPa_control_c[4];
u8 dPa_control_c::mLight8PcallBack[4];
/* 8004979C-800497B0 0440DC 0014+00 1/0 0/0 0/0 .text
* setup__19dPa_light8EcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
@@ -1049,10 +1100,10 @@ asm void dPa_light8EcallBack::setup(JPABaseEmitter* param_0, cXyz const* param_1
/* ############################################################################################## */
/* 80450EB4-80450EB8 0003B4 0004+00 3/3 0/0 0/0 .sbss m_b_Light8EcallBack__13dPa_control_c */
static u8 m_b_Light8EcallBack__13dPa_control_c[4];
u8 dPa_control_c::m_b_Light8EcallBack[4];
/* 80450EB8-80450EBC 0003B8 0004+00 2/2 0/0 0/0 .sbss m_b_Light8PcallBack__13dPa_control_c */
static u8 m_b_Light8PcallBack__13dPa_control_c[4];
u8 dPa_control_c::m_b_Light8PcallBack[4];
/* 800497B0-800497CC 0440F0 001C+00 1/0 0/0 0/0 .text
* setup__25dPa_gen_b_light8EcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
@@ -1068,10 +1119,10 @@ asm void dPa_gen_b_light8EcallBack::setup(JPABaseEmitter* param_0, cXyz const* p
/* ############################################################################################## */
/* 80450EBC-80450EC0 0003BC 0004+00 3/3 0/0 0/0 .sbss m_d_Light8EcallBack__13dPa_control_c */
static u8 m_d_Light8EcallBack__13dPa_control_c[4];
u8 dPa_control_c::m_d_Light8EcallBack[4];
/* 80450EC0-80450EC4 0003C0 0004+00 2/2 0/0 0/0 .sbss m_d_Light8PcallBack__13dPa_control_c */
static u8 m_d_Light8PcallBack__13dPa_control_c[4];
u8 dPa_control_c::m_d_Light8PcallBack[4];
/* 800497CC-800497E8 04410C 001C+00 1/0 0/0 0/0 .text
* setup__25dPa_gen_d_light8EcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
@@ -1628,8 +1679,7 @@ extern u8 data_80450EC4[4];
u8 data_80450EC4[4];
/* 80450EC8-80450ED0 0003C8 0004+04 2/2 1/1 17/17 .sbss mParticleTracePCB__13dPa_control_c */
extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */];
u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */];
u8 dPa_control_c::mParticleTracePCB[4 + 4 /* padding */];
/* 8004B5AC-8004B688 045EEC 00DC+00 1/1 0/0 0/0 .text
* cleanup__Q313dPa_control_c7level_c9emitter_cFv */
@@ -1812,8 +1862,7 @@ static u8 lit_4730[12];
#pragma pop
/* 80424794-804247D4 0514B4 0040+00 0/1 1/1 1/1 .bss mTsubo__13dPa_control_c */
extern u8 mTsubo__13dPa_control_c[64];
u8 mTsubo__13dPa_control_c[64];
u8 dPa_control_c::mTsubo[64];
/* 804247D4-804247E0 0514F4 000C+00 0/1 0/0 0/0 .bss @4731 */
#pragma push
@@ -1836,7 +1885,7 @@ static u8 lit_4733[12];
/* 804247F8-80424810 051518 0018+00 0/1 0/0 0/0 .bss mLifeBall__13dPa_control_c */
#pragma push
#pragma force_active on
static u8 mLifeBall__13dPa_control_c[24];
u8 dPa_control_c::mLifeBall[24];
#pragma pop
/* 80424810-8042481C 051530 000C+00 0/1 0/0 0/0 .bss @4734 */
@@ -1888,7 +1937,7 @@ static u8 lit_4741[12];
#pragma pop
/* 80424870-804248A0 051590 0030+00 1/1 0/0 0/0 .bss mWindViewMatrix__13dPa_control_c */
static u8 mWindViewMatrix__13dPa_control_c[48];
u8 dPa_control_c::mWindViewMatrix[48];
/* 8004BACC-8004BB70 04640C 00A4+00 0/0 1/1 0/0 .text __ct__13dPa_control_cFv */
#pragma push
src/d/particle/d_particle_copoly.cpp
+16 -6
View File
@@ -13,12 +13,12 @@
struct dKy_tevstr_c {};
struct cXyz {};
struct cBgS_PolyInfo {};
struct csXyz {};
struct cXyz {};
struct dPa_control_c {
struct level_c {
/* 8004B918 */ void getEmitter(u32);
@@ -54,6 +54,9 @@ struct dPaPoT_c {
/* 8005147C */ void getLeftEffType(int) const;
/* 80051494 */ void getRightEmitter(int, int);
/* 800514DC */ void getLeftEmitter(int, int);
static u8 m_typeTwoData[36];
static u8 m_emitterTwoData[36];
};
struct dPaPoF_c {
@@ -65,6 +68,9 @@ struct dPaPoF_c {
/* 80051578 */ void getBackLeftEffType(int) const;
/* 80051584 */ void getBackRightEmitter(int, int);
/* 800515CC */ void getBackLeftEmitter(int, int);
static u8 m_typeFourData[60];
static u8 m_emitterFourData[60 + 28 /* padding */];
};
struct dBgS {
@@ -101,6 +107,10 @@ extern "C" void getBackLeftEffType__8dPaPoF_cCFi();
extern "C" void getBackRightEmitter__8dPaPoF_cFii();
extern "C" void getBackLeftEmitter__8dPaPoF_cFii();
extern "C" void __sinit_d_particle_copoly_cpp();
extern "C" u8 m_typeTwoData__8dPaPoT_c[36];
extern "C" u8 m_emitterTwoData__8dPaPoT_c[36];
extern "C" u8 m_typeFourData__8dPaPoF_c[60];
extern "C" u8 m_emitterFourData__8dPaPoF_c[60 + 28 /* padding */];
//
// External References:
@@ -386,7 +396,7 @@ SECTION_DATA static void* lit_3818[3] = {
/* 803A8628-803A864C 005748 0024+00 0/1 0/0 0/0 .data m_typeTwoData__8dPaPoT_c */
#pragma push
#pragma force_active on
SECTION_DATA static u8 m_typeTwoData__8dPaPoT_c[36] = {
SECTION_DATA u8 dPaPoT_c::m_typeTwoData[36] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -424,7 +434,7 @@ SECTION_DATA static void* lit_3828[3] = {
#pragma pop
/* 803A8670-803A8694 005790 0024+00 0/1 0/0 1/1 .data m_emitterTwoData__8dPaPoT_c */
SECTION_DATA extern u8 m_emitterTwoData__8dPaPoT_c[36] = {
SECTION_DATA u8 dPaPoT_c::m_emitterTwoData[36] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -481,7 +491,7 @@ SECTION_DATA static void* lit_3845[3] = {
#pragma pop
/* 803A86D0-803A870C 0057F0 003C+00 0/1 5/5 1/1 .data m_typeFourData__8dPaPoF_c */
SECTION_DATA extern u8 m_typeFourData__8dPaPoF_c[60] = {
SECTION_DATA u8 dPaPoF_c::m_typeFourData[60] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -539,7 +549,7 @@ SECTION_DATA static void* lit_3854[3] = {
#pragma pop
/* 803A8748-803A87A0 005868 003C+1C 0/1 5/5 1/1 .data m_emitterFourData__8dPaPoF_c */
SECTION_DATA extern u8 m_emitterFourData__8dPaPoF_c[60 + 28 /* padding */] = {
SECTION_DATA u8 dPaPoF_c::m_emitterFourData[60 + 28 /* padding */] = {
0x00,
0x00,
0x00,

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