encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

demangle data-symbols

Browse Source
This commit is contained in:
Julgodis
2021-04-08 01:47:05 +02:00
parent dca1d2a1c0
commit a23a106399
1756 changed files with 78295 additions and 66184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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,

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