mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-18 20:57:46 -04:00
re-generate with bug fixes
This commit is contained in:
Julgodis
+453
-561
File diff suppressed because it is too large
Load Diff
@@ -29,8 +29,6 @@ struct Z2CreatureRide {
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" extern u8 m_top__12daTagHstop_c[4 + 4 /* padding */];
|
||||
|
||||
extern "C" void checkWait__10e_wb_classFv();
|
||||
extern "C" void setPlayerRideNow__10e_wb_classFv();
|
||||
extern "C" void setPlayerRide__10e_wb_classFv();
|
||||
|
||||
@@ -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);
|
||||
@@ -81,10 +81,10 @@ struct daItemBase_c {
|
||||
/* 8015B0B8 */ void getData();
|
||||
};
|
||||
|
||||
struct dKy_tevstr_c {};
|
||||
|
||||
struct cXyz {};
|
||||
|
||||
struct dKy_tevstr_c {};
|
||||
|
||||
struct dScnKy_env_light_c {
|
||||
/* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
|
||||
/* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
|
||||
@@ -110,8 +110,6 @@ struct J3DFrameCtrl {
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */];
|
||||
|
||||
extern "C" void DeleteBase__12daItemBase_cFPCc();
|
||||
extern "C" bool clothCreate__12daItemBase_cFv();
|
||||
extern "C" bool __CreateHeap__12daItemBase_cFv();
|
||||
@@ -145,13 +143,6 @@ void dComIfGd_setSimpleShadow(cXyz*, f32, f32, cBgS_PolyInfo&, s16, f32, _GXTexO
|
||||
void dComIfGd_setShadow(u32, s8, J3DModel*, cXyz*, f32, f32, f32, f32, cBgS_PolyInfo&,
|
||||
dKy_tevstr_c*, s16, f32, _GXTexObj*);
|
||||
void* operator new(u32);
|
||||
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" extern u8 g_dComIfG_gameInfo[122384];
|
||||
extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
|
||||
extern "C" extern u8 g_env_light[4880];
|
||||
extern "C" extern u8 j3dSys[284];
|
||||
|
||||
extern "C" void play__14mDoExt_baseAnmFv();
|
||||
extern "C" void init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss();
|
||||
@@ -215,7 +206,7 @@ bool daItemBase_c::__CreateHeap() {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 804533A8-804533AC 0004+00 s=2 e=0 z=0 None .sdata2 @3881 */
|
||||
SECTION_SDATA2 static u32 lit_3881 = 0x3F800000;
|
||||
SECTION_SDATA2 static f32 lit_3881 = 1.0f;
|
||||
|
||||
/* 8014475C-80144B94 0438+00 s=0 e=3 z=0 None .text CreateItemHeap__12daItemBase_cFPCcsssssss
|
||||
*/
|
||||
@@ -306,9 +297,7 @@ SECTION_SDATA2 static f32 lit_3953[1 + 1 /* padding */] = {
|
||||
};
|
||||
|
||||
/* 804533B8-804533C0 0008+00 s=1 e=0 z=0 None .sdata2 @3955 */
|
||||
SECTION_SDATA2 static u8 lit_3955[8] = {
|
||||
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
SECTION_SDATA2 static f64 lit_3955 = 4503599627370496.0 /* cast u32 to float */;
|
||||
|
||||
/* 80144D70-80144EDC 016C+00 s=1 e=1 z=9 None .text setShadow__12daItemBase_cFv */
|
||||
#pragma push
|
||||
@@ -322,9 +311,7 @@ asm void daItemBase_c::setShadow() {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 804533C0-804533C8 0008+00 s=1 e=0 z=0 None .sdata2 @4041 */
|
||||
SECTION_SDATA2 static u8 lit_4041[8] = {
|
||||
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
|
||||
};
|
||||
SECTION_SDATA2 static f64 lit_4041 = 4503601774854144.0 /* cast s32 to float */;
|
||||
|
||||
/* 80144EDC-8014503C 0160+00 s=1 e=1 z=9 None .text animEntry__12daItemBase_cFv */
|
||||
#pragma push
|
||||
|
||||
@@ -30,7 +30,6 @@ struct daItemBase_c {
|
||||
|
||||
void CheckItemCreateHeap(fopAc_ac_c*);
|
||||
void CheckFieldItemCreateHeap(fopAc_ac_c*);
|
||||
extern "C" extern u8 const m_data__12daItemBase_c[56];
|
||||
|
||||
extern "C" void getItemNo__12daItemBase_cFv();
|
||||
extern "C" void hide__12daItemBase_cFv();
|
||||
@@ -47,9 +46,6 @@ extern "C" extern u8 const m_data__12daItemBase_c[56];
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" extern void* item_resource__10dItem_data[1530];
|
||||
extern "C" extern void* field_item_res__10dItem_data[1020];
|
||||
|
||||
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];
|
||||
|
||||
@@ -43,8 +43,6 @@ static void daNocrm_create(daNocrm_c*);
|
||||
static bool daNocrm_Delete(daNocrm_c*);
|
||||
static void daNocrm_execute(daNocrm_c*);
|
||||
static bool daNocrm_draw(daNocrm_c*);
|
||||
extern "C" extern char const* const d_a_d_a_no_chg_room__stringBase0;
|
||||
extern "C" extern void* g_profile_NO_CHG_ROOM[12];
|
||||
|
||||
extern "C" static void isLoadRoom__Fi();
|
||||
extern "C" void execute__9daNocrm_cFv();
|
||||
@@ -63,14 +61,6 @@ extern "C" extern void* g_profile_NO_CHG_ROOM[12];
|
||||
void mDoMtx_YrotM(f32 (*)[4], s16);
|
||||
void fopScnM_SearchByID(unsigned int);
|
||||
void fpcNd_IsDeleteTiming(process_node_class*);
|
||||
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" extern u8 g_dComIfG_gameInfo[122384];
|
||||
extern "C" extern u8 data_804505F0[8];
|
||||
extern "C" extern u8 data_80450D68[4];
|
||||
|
||||
extern "C" void OSReport_Warning();
|
||||
extern "C" void mDoMtx_YrotM__FPA4_fs();
|
||||
@@ -150,7 +140,7 @@ SECTION_DEAD static char const* const pad_8039267C = "\0\0\0";
|
||||
#pragma pop
|
||||
|
||||
/* 804533CC-804533D0 0004+00 s=1 e=0 z=0 None .sdata2 @3832 */
|
||||
SECTION_SDATA2 static u32 lit_3832 = 0x447A0000;
|
||||
SECTION_SDATA2 static f32 lit_3832 = 1000.0f;
|
||||
|
||||
/* 804533D0-804533D8 0004+04 s=1 e=0 z=0 None .sdata2 @3833 */
|
||||
SECTION_SDATA2 static f32 lit_3833[1 + 1 /* padding */] = {
|
||||
|
||||
+61
-110
@@ -13,12 +13,6 @@
|
||||
|
||||
struct request_of_phase_process_class {};
|
||||
|
||||
struct csXyz {
|
||||
/* 80018BD0 */ ~csXyz();
|
||||
/* 80112C80 */ csXyz();
|
||||
/* 8026745C */ void operator+=(csXyz&);
|
||||
};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct cXyz {
|
||||
@@ -30,6 +24,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&);
|
||||
/* 8000CD9C */ void transM(f32, f32, f32);
|
||||
@@ -44,13 +44,13 @@ struct mDoExt_morf_c {
|
||||
/* 8000FB7C */ void setMorf(f32);
|
||||
};
|
||||
|
||||
struct J3DAnmTexPattern {};
|
||||
|
||||
struct J3DAnmTextureSRTKey {};
|
||||
|
||||
struct J3DAnmColor {};
|
||||
|
||||
struct J3DAnmTevRegKey {};
|
||||
|
||||
struct J3DAnmColor {};
|
||||
struct J3DAnmTexPattern {};
|
||||
|
||||
struct J3DMaterialTable {
|
||||
/* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*);
|
||||
@@ -116,21 +116,21 @@ struct daNpcT_motionAnmData_c {};
|
||||
|
||||
struct daNpcT_faceMotionAnmData_c {};
|
||||
|
||||
struct _GXColorS10 {};
|
||||
struct J3DModel {};
|
||||
|
||||
struct dCcD_GObjInf {
|
||||
/* 80084460 */ void ChkTgHit();
|
||||
};
|
||||
struct J3DJoint {};
|
||||
|
||||
struct J3DFrameCtrl {
|
||||
/* 803283FC */ void init(s16);
|
||||
};
|
||||
|
||||
struct J3DModel {};
|
||||
|
||||
struct J3DAnmTransformKey {};
|
||||
|
||||
struct J3DJoint {};
|
||||
struct dCcD_GObjInf {
|
||||
/* 80084460 */ void ChkTgHit();
|
||||
};
|
||||
|
||||
struct _GXColorS10 {};
|
||||
|
||||
struct daNpcT_c {
|
||||
/* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
|
||||
@@ -763,24 +763,6 @@ void daNpcF_chkDoBtnEqSpeak(fopAc_ac_c*);
|
||||
void daNpcF_chkPointInArea(cXyz, cXyz, cXyz, s16);
|
||||
void daNpcF_getDistTableIdx(int, int);
|
||||
void daNpcF_clearMessageTmpBit();
|
||||
extern "C" extern u8 const mCcDObjData__8daNpcT_c[48];
|
||||
extern "C" extern u8 const mCcDObj__11daBaseNpc_c[48];
|
||||
extern "C" extern u8 const mCcDObjInfo__8daNpcF_c[48];
|
||||
extern "C" extern char const* const d_a_d_a_npc__stringBase0;
|
||||
extern "C" extern u8 mCcDCyl__8daNpcT_c[68];
|
||||
extern "C" extern u8 mCcDSph__8daNpcT_c[64];
|
||||
extern "C" extern u8 mCcDCyl__11daBaseNpc_c[68];
|
||||
extern "C" extern u8 mCcDSph__11daBaseNpc_c[64];
|
||||
extern "C" extern u8 mCcDCyl__8daNpcF_c[68];
|
||||
extern "C" extern u8 mCcDSph__8daNpcF_c[64];
|
||||
extern "C" extern void* __vt__8daNpcF_c[18];
|
||||
extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */];
|
||||
extern "C" extern void* __vt__8daNpcT_c[49];
|
||||
extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */];
|
||||
extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200];
|
||||
extern "C" extern u8 mSrchName__8daNpcT_c[2 + 2 /* padding */];
|
||||
extern "C" extern u8 mFindCount__8daNpcT_c[4];
|
||||
extern "C" extern u8 data_80450FF8[8];
|
||||
|
||||
extern "C" void initialize__18daNpcT_ActorMngr_cFv();
|
||||
extern "C" void entry__18daNpcT_ActorMngr_cFP10fopAc_ac_c();
|
||||
@@ -1195,29 +1177,6 @@ void cLib_targetAngleY(Vec const*, Vec const*);
|
||||
void cLib_targetAngleX(cXyz const*, cXyz const*);
|
||||
void* operator new(u32);
|
||||
void operator delete(void*);
|
||||
extern "C" extern 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" extern void* __vt__12dBgS_AcchCir[3];
|
||||
extern "C" extern void* __vt__9dCcD_Stts[11];
|
||||
extern "C" extern void* __vt__10dCcD_GStts[3];
|
||||
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" extern u8 g_dComIfG_gameInfo[122384];
|
||||
extern "C" extern 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" extern u32 __float_nan;
|
||||
extern "C" extern u8 Zero__5csXyz[4];
|
||||
extern "C" extern u8 data_80451164[4];
|
||||
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
|
||||
|
||||
SECTION_INIT void memset();
|
||||
extern "C" void __dt__4cXyzFv();
|
||||
@@ -1512,12 +1471,10 @@ asm void daNpcT_MatAnm_c::initialize() {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 804533DC-804533E0 0004+00 s=25 e=0 z=0 None .sdata2 @4140 */
|
||||
SECTION_SDATA2 static u32 lit_4140 = 0x3F800000;
|
||||
SECTION_SDATA2 static f32 lit_4140 = 1.0f;
|
||||
|
||||
/* 804533E0-804533E8 0008+00 s=24 e=0 z=0 None .sdata2 @4142 */
|
||||
SECTION_SDATA2 static u8 lit_4142[8] = {
|
||||
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
|
||||
};
|
||||
SECTION_SDATA2 static f64 lit_4142 = 4503601774854144.0 /* cast s32 to float */;
|
||||
|
||||
/* 80145788-80145898 0110+00 s=1 e=0 z=0 None .text calc__15daNpcT_MatAnm_cCFP11J3DMaterial */
|
||||
#pragma push
|
||||
@@ -1531,7 +1488,7 @@ asm void daNpcT_MatAnm_c::calc(J3DMaterial* param_0) const {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 804533E8-804533EC 0004+00 s=13 e=0 z=0 None .sdata2 @4148 */
|
||||
SECTION_SDATA2 static u32 lit_4148 = 0xBF800000;
|
||||
SECTION_SDATA2 static f32 lit_4148 = -1.0f;
|
||||
|
||||
/* 80145898-801458C0 0028+00 s=4 e=0 z=533 None .text initialize__22daNpcT_MotionSeqMngr_cFv
|
||||
*/
|
||||
@@ -1690,7 +1647,7 @@ asm void daNpcT_Path_c::getDstPosH(cXyz param_0, cXyz* param_1, int param_2, int
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 804533EC-804533F0 0004+00 s=1 e=0 z=0 None .sdata2 @4513 */
|
||||
SECTION_SDATA2 static u32 lit_4513 = 0x42C80000;
|
||||
SECTION_SDATA2 static f32 lit_4513 = 100.0f;
|
||||
|
||||
/* 80146188-801464D8 0350+00 s=2 e=0 z=2 None .text chkPassed1__13daNpcT_Path_cF4cXyzi */
|
||||
#pragma push
|
||||
@@ -2039,10 +1996,10 @@ SECTION_DATA static void* __vt__16daNpcT_Hermite_c[3] = {
|
||||
};
|
||||
|
||||
/* 804533F0-804533F4 0004+00 s=4 e=0 z=0 None .sdata2 @4672 */
|
||||
SECTION_SDATA2 static u32 lit_4672 = 0x40000000;
|
||||
SECTION_SDATA2 static f32 lit_4672 = 2.0f;
|
||||
|
||||
/* 804533F4-804533F8 0004+00 s=1 e=0 z=0 None .sdata2 @4673 */
|
||||
SECTION_SDATA2 static u32 lit_4673 = 0x40400000;
|
||||
SECTION_SDATA2 static f32 lit_4673 = 3.0f;
|
||||
|
||||
/* 804533F8-80453400 0004+04 s=3 e=0 z=0 None .sdata2 @4674 */
|
||||
SECTION_SDATA2 static f32 lit_4674[1 + 1 /* padding */] = {
|
||||
@@ -2052,9 +2009,7 @@ SECTION_SDATA2 static f32 lit_4674[1 + 1 /* padding */] = {
|
||||
};
|
||||
|
||||
/* 80453400-80453408 0008+00 s=1 e=0 z=0 None .sdata2 @4677 */
|
||||
SECTION_SDATA2 static u8 lit_4677[8] = {
|
||||
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
SECTION_SDATA2 static f64 lit_4677 = 4503599627370496.0 /* cast u32 to float */;
|
||||
|
||||
/* 801464D8-8014698C 04B4+00 s=1 e=0 z=0 None .text chkPassed2__13daNpcT_Path_cF4cXyzP4cXyzii
|
||||
*/
|
||||
@@ -2091,14 +2046,10 @@ asm void daNpcT_JntAnm_c::initialize() {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453408-80453410 0008+00 s=8 e=0 z=0 None .sdata2 @4723 */
|
||||
SECTION_SDATA2 static u8 lit_4723[8] = {
|
||||
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
SECTION_SDATA2 static f64 lit_4723 = 0.5;
|
||||
|
||||
/* 80453410-80453418 0008+00 s=8 e=0 z=0 None .sdata2 @4724 */
|
||||
SECTION_SDATA2 static u8 lit_4724[8] = {
|
||||
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
SECTION_SDATA2 static f64 lit_4724 = 3.0;
|
||||
|
||||
/* 80453418-80453420 0008+00 s=8 e=0 z=0 None .sdata2 @4725 */
|
||||
SECTION_SDATA2 static u8 lit_4725[8] = {
|
||||
@@ -2106,13 +2057,13 @@ SECTION_SDATA2 static u8 lit_4725[8] = {
|
||||
};
|
||||
|
||||
/* 80453420-80453424 0004+00 s=5 e=0 z=0 None .sdata2 @5239 */
|
||||
SECTION_SDATA2 static u32 lit_5239 = 0x43360B61;
|
||||
SECTION_SDATA2 static f32 lit_5239 = 182.04444885253906f;
|
||||
|
||||
/* 80453424-80453428 0004+00 s=2 e=0 z=0 None .sdata2 @5240 */
|
||||
SECTION_SDATA2 static u32 lit_5240 = 0x38C90FDB;
|
||||
SECTION_SDATA2 static f32 lit_5240 = 9.58738019107841e-05f;
|
||||
|
||||
/* 80453428-8045342C 0004+00 s=2 e=0 z=0 None .sdata2 @5241 */
|
||||
SECTION_SDATA2 static u32 lit_5241 = 0x447A0000;
|
||||
SECTION_SDATA2 static f32 lit_5241 = 1000.0f;
|
||||
|
||||
/* 80146CD8-80147858 0B80+00 s=1 e=0 z=52 None .text
|
||||
* setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz */
|
||||
@@ -2141,7 +2092,7 @@ asm void daNpcT_JntAnm_c::calc(f32 param_0) {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 8045342C-80453430 0004+00 s=1 e=0 z=0 None .sdata2 @5410 */
|
||||
SECTION_SDATA2 static u32 lit_5410 = 0x40490FDB;
|
||||
SECTION_SDATA2 static f32 lit_5410 = 3.1415927410125732f;
|
||||
|
||||
/* 80147C38-80147DCC 0194+00 s=0 e=0 z=52 None .text calcJntRad__15daNpcT_JntAnm_cFfff */
|
||||
#pragma push
|
||||
@@ -2155,10 +2106,10 @@ asm void daNpcT_JntAnm_c::calcJntRad(f32 param_0, f32 param_1, f32 param_2) {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453430-80453434 0004+00 s=1 e=0 z=0 None .sdata2 @5422 */
|
||||
SECTION_SDATA2 static u32 lit_5422 = 0x462AA800;
|
||||
SECTION_SDATA2 static f32 lit_5422 = 10922.0f;
|
||||
|
||||
/* 80453434-80453438 0004+00 s=1 e=0 z=0 None .sdata2 @5423 */
|
||||
SECTION_SDATA2 static u32 lit_5423 = 0x45E38800;
|
||||
SECTION_SDATA2 static f32 lit_5423 = 7281.0f;
|
||||
|
||||
/* 80147DCC-80147E3C 0070+00 s=0 e=0 z=28 None .text
|
||||
* setParam__19daNpcT_DmgStagger_cFP10fopAc_ac_cP10fopAc_ac_cs */
|
||||
@@ -2173,10 +2124,10 @@ asm void daNpcT_DmgStagger_c::setParam(fopAc_ac_c* param_0, fopAc_ac_c* param_1,
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453438-8045343C 0004+00 s=1 e=0 z=0 None .sdata2 @5459 */
|
||||
SECTION_SDATA2 static u32 lit_5459 = 0x3DCCCCCD;
|
||||
SECTION_SDATA2 static f32 lit_5459 = 1.0f / 10.0f;
|
||||
|
||||
/* 8045343C-80453440 0004+00 s=1 e=0 z=0 None .sdata2 @5460 */
|
||||
SECTION_SDATA2 static u32 lit_5460 = 0x42FA0000;
|
||||
SECTION_SDATA2 static f32 lit_5460 = 125.0f;
|
||||
|
||||
/* 80147E3C-80147FA4 0168+00 s=0 e=0 z=47 None .text calc__19daNpcT_DmgStagger_cFi */
|
||||
#pragma push
|
||||
@@ -2374,7 +2325,7 @@ asm void daNpcT_c::deleteRes(s8 const* param_0, char const** param_1) {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453440-80453444 0004+00 s=3 e=0 z=0 None .sdata2 @5667 */
|
||||
SECTION_SDATA2 static u32 lit_5667 = 0xCE6E6B28;
|
||||
SECTION_SDATA2 static f32 lit_5667 = -1000000000.0f;
|
||||
|
||||
/* 8014852C-8014886C 0340+00 s=0 e=0 z=59 None .text execute__8daNpcT_cFv */
|
||||
#pragma push
|
||||
@@ -2388,7 +2339,7 @@ asm void daNpcT_c::execute() {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453444-80453448 0004+00 s=3 e=0 z=0 None .sdata2 @5794 */
|
||||
SECTION_SDATA2 static u32 lit_5794 = 0x41A00000;
|
||||
SECTION_SDATA2 static f32 lit_5794 = 20.0f;
|
||||
|
||||
/* 8014886C-80148C70 0404+00 s=0 e=0 z=58 None .text draw__8daNpcT_cFiifP11_GXColorS10fiii */
|
||||
#pragma push
|
||||
@@ -2680,7 +2631,7 @@ asm void daNpcT_c::setMotionAnm(int param_0, f32 param_1, int param_2) {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453448-8045344C 0004+00 s=1 e=0 z=0 None .sdata2 @6667 */
|
||||
SECTION_SDATA2 static u32 lit_6667 = 0x43960000;
|
||||
SECTION_SDATA2 static f32 lit_6667 = 300.0f;
|
||||
|
||||
/* 8014A908-8014A99C 0094+00 s=0 e=0 z=40 None .text setPos__8daNpcT_cF4cXyz */
|
||||
#pragma push
|
||||
@@ -2734,7 +2685,7 @@ asm void daNpcT_c::setDamage(int param_0, int param_1, int param_2) {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 8045344C-80453450 0004+00 s=7 e=0 z=0 None .sdata2 @6775 */
|
||||
SECTION_SDATA2 static u32 lit_6775 = 0x43340000;
|
||||
SECTION_SDATA2 static f32 lit_6775 = 180.0f;
|
||||
|
||||
/* 8014ABD0-8014ACF0 0120+00 s=2 e=0 z=53 None .text chkActorInSight__8daNpcT_cFP10fopAc_ac_cfs
|
||||
*/
|
||||
@@ -2772,22 +2723,22 @@ asm void daNpcT_c::chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453450-80453454 0004+00 s=2 e=0 z=0 None .sdata2 @6904 */
|
||||
SECTION_SDATA2 static u32 lit_6904 = 0x41F00000;
|
||||
SECTION_SDATA2 static f32 lit_6904 = 30.0f;
|
||||
|
||||
/* 80453454-80453458 0004+00 s=2 e=0 z=0 None .sdata2 @6905 */
|
||||
SECTION_SDATA2 static u32 lit_6905 = 0x42340000;
|
||||
SECTION_SDATA2 static f32 lit_6905 = 45.0f;
|
||||
|
||||
/* 80453458-8045345C 0004+00 s=2 e=0 z=0 None .sdata2 @6906 */
|
||||
SECTION_SDATA2 static u32 lit_6906 = 0x42700000;
|
||||
SECTION_SDATA2 static f32 lit_6906 = 60.0f;
|
||||
|
||||
/* 8045345C-80453460 0004+00 s=2 e=0 z=0 None .sdata2 @6907 */
|
||||
SECTION_SDATA2 static u32 lit_6907 = 0x42B40000;
|
||||
SECTION_SDATA2 static f32 lit_6907 = 90.0f;
|
||||
|
||||
/* 80453460-80453464 0004+00 s=2 e=0 z=0 None .sdata2 @6908 */
|
||||
SECTION_SDATA2 static u32 lit_6908 = 0x42DC0000;
|
||||
SECTION_SDATA2 static f32 lit_6908 = 110.0f;
|
||||
|
||||
/* 80453464-80453468 0004+00 s=2 e=0 z=0 None .sdata2 @6909 */
|
||||
SECTION_SDATA2 static u32 lit_6909 = 0x43070000;
|
||||
SECTION_SDATA2 static f32 lit_6909 = 135.0f;
|
||||
|
||||
/* 8014AE1C-8014B010 01F4+00 s=1 e=0 z=0 None .text chkFindActor__8daNpcT_cFP10fopAc_ac_cis */
|
||||
#pragma push
|
||||
@@ -2852,13 +2803,13 @@ asm void daNpcT_c::getAttnPos(fopAc_ac_c* param_0) {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453468-8045346C 0004+00 s=4 e=0 z=0 None .sdata2 @7089 */
|
||||
SECTION_SDATA2 static u32 lit_7089 = 0x3BB40000;
|
||||
SECTION_SDATA2 static f32 lit_7089 = 0.0054931640625f;
|
||||
|
||||
/* 8045346C-80453470 0004+00 s=4 e=0 z=0 None .sdata2 @7090 */
|
||||
SECTION_SDATA2 static u32 lit_7090 = 0x41000000;
|
||||
SECTION_SDATA2 static f32 lit_7090 = 8.0f;
|
||||
|
||||
/* 80453470-80453474 0004+00 s=2 e=0 z=0 None .sdata2 @7091 */
|
||||
SECTION_SDATA2 static u32 lit_7091 = 0x46800000;
|
||||
SECTION_SDATA2 static f32 lit_7091 = 16384.0f;
|
||||
|
||||
/* 8014B4A4-8014B648 01A4+00 s=1 e=0 z=1 None .text turn__8daNpcT_cFsii */
|
||||
#pragma push
|
||||
@@ -2882,7 +2833,7 @@ asm void daNpcT_c::step(s16 param_0, int param_1, int param_2, int param_3, int
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453474-80453478 0004+00 s=1 e=0 z=0 None .sdata2 @7222 */
|
||||
SECTION_SDATA2 static u32 lit_7222 = 0x3F59999A;
|
||||
SECTION_SDATA2 static f32 lit_7222 = 17.0f / 20.0f;
|
||||
|
||||
/* 8014B808-8014BB00 02F8+00 s=0 e=0 z=11 None .text calcSpeedAndAngle__8daNpcT_cF4cXyziss */
|
||||
#pragma push
|
||||
@@ -2896,7 +2847,7 @@ asm void daNpcT_c::calcSpeedAndAngle(cXyz param_0, int param_1, s16 param_2, s16
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453478-8045347C 0004+00 s=1 e=0 z=0 None .sdata2 @7242 */
|
||||
SECTION_SDATA2 static u32 lit_7242 = 0x40C00000;
|
||||
SECTION_SDATA2 static f32 lit_7242 = 6.0f;
|
||||
|
||||
/* 8014BB00-8014BBF0 00F0+00 s=0 e=0 z=2 None .text getActorDistance__8daNpcT_cFP10fopAc_ac_cii
|
||||
*/
|
||||
@@ -2932,7 +2883,7 @@ asm void daNpcT_c::talkProc(int* param_0, int param_1, fopAc_ac_c** param_2, int
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 8045347C-80453480 0004+00 s=2 e=0 z=0 None .sdata2 @7337 */
|
||||
SECTION_SDATA2 static u32 lit_7337 = 0x4E6E6B28;
|
||||
SECTION_SDATA2 static f32 lit_7337 = 1000000000.0f;
|
||||
|
||||
/* 8014BE2C-8014BEE4 00B8+00 s=0 e=0 z=25 None .text getNearestActorP__8daNpcT_cFs */
|
||||
#pragma push
|
||||
@@ -2974,7 +2925,7 @@ SECTION_SDATA2 static u8 id_7388[4] = {
|
||||
};
|
||||
|
||||
/* 80453484-80453488 0004+00 s=2 e=0 z=0 None .sdata2 @7442 */
|
||||
SECTION_SDATA2 static u32 lit_7442 = 0x40800000;
|
||||
SECTION_SDATA2 static f32 lit_7442 = 4.0f;
|
||||
|
||||
/* 8014C030-8014C200 01D0+00 s=1 e=0 z=0 None .text setHitodamaPrtcl__8daNpcT_cFv */
|
||||
#pragma push
|
||||
@@ -2988,10 +2939,10 @@ asm void daNpcT_c::setHitodamaPrtcl() {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453488-8045348C 0004+00 s=1 e=0 z=0 None .sdata2 @7550 */
|
||||
SECTION_SDATA2 static u32 lit_7550 = 0x44180000;
|
||||
SECTION_SDATA2 static f32 lit_7550 = 608.0f;
|
||||
|
||||
/* 8045348C-80453490 0004+00 s=1 e=0 z=0 None .sdata2 @7551 */
|
||||
SECTION_SDATA2 static u32 lit_7551 = 0x43E00000;
|
||||
SECTION_SDATA2 static f32 lit_7551 = 448.0f;
|
||||
|
||||
/* 8014C200-8014C384 0184+00 s=0 e=0 z=2 None .text
|
||||
* daNpcT_chkActorInScreen__FP10fopAc_ac_cfffffffi */
|
||||
@@ -3622,10 +3573,10 @@ asm void daBaseNpc_lookat_c::limitter(s16 param_0, s16* param_1, s16 param_2, s1
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453490-80453494 0004+00 s=2 e=0 z=0 None .sdata2 @8404 */
|
||||
SECTION_SDATA2 static u32 lit_8404 = 0x3E800000;
|
||||
SECTION_SDATA2 static f32 lit_8404 = 0.25f;
|
||||
|
||||
/* 80453494-80453498 0004+00 s=1 e=0 z=0 None .sdata2 @8405 */
|
||||
SECTION_SDATA2 static u32 lit_8405 = 0x3F4CCCCD;
|
||||
SECTION_SDATA2 static f32 lit_8405 = 4.0f / 5.0f;
|
||||
|
||||
/* 8014DBB4-8014E634 0A80+00 s=0 e=0 z=1 None .text
|
||||
* calc__18daBaseNpc_lookat_cFP10fopAc_ac_cPA4_fs */
|
||||
@@ -4379,7 +4330,7 @@ static u8 vec[12];
|
||||
static u8 data_80450FEC[4];
|
||||
|
||||
/* 80453498-8045349C 0004+00 s=1 e=0 z=0 None .sdata2 @9971 */
|
||||
SECTION_SDATA2 static u32 lit_9971 = 0x42000000;
|
||||
SECTION_SDATA2 static f32 lit_9971 = 32.0f;
|
||||
|
||||
/* 801510B8-80151350 0298+00 s=0 e=0 z=34 None .text
|
||||
* setParam__15daNpcF_Lookat_cFffffffffffffsP4cXyz */
|
||||
@@ -4419,7 +4370,7 @@ asm void daNpcF_Lookat_c::adjustMoveDisAngle(s16& param_0, s16 param_1, s16 para
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 8045349C-804534A0 0004+00 s=1 e=0 z=0 None .sdata2 @10253 */
|
||||
SECTION_SDATA2 static u32 lit_10253 = 0x3F2147AE;
|
||||
SECTION_SDATA2 static f32 lit_10253 = 63.0f / 100.0f;
|
||||
|
||||
/* 80151648-80151A54 040C+00 s=1 e=0 z=0 None .text
|
||||
* initCalc__15daNpcF_Lookat_cFP10fopAc_ac_cPA4_fP4cXyzP5csXyzPfR4cXyzi */
|
||||
@@ -4561,7 +4512,7 @@ asm void daNpcF_c::setMtx2() {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 804534A0-804534A4 0004+00 s=1 e=0 z=0 None .sdata2 @10745 */
|
||||
SECTION_SDATA2 static u32 lit_10745 = 0x47800000;
|
||||
SECTION_SDATA2 static f32 lit_10745 = 65536.0f;
|
||||
|
||||
/* 801528C8-80152B2C 0264+00 s=0 e=0 z=76 None .text initialize__8daNpcF_cFv */
|
||||
#pragma push
|
||||
@@ -4767,10 +4718,10 @@ asm void daNpcF_c::hitChk2(dCcD_Cyl* param_0, int param_1, int param_2) {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 804534A4-804534A8 0004+00 s=1 e=0 z=0 None .sdata2 @11061 */
|
||||
SECTION_SDATA2 static u32 lit_11061 = 0x46000000;
|
||||
SECTION_SDATA2 static f32 lit_11061 = 8192.0f;
|
||||
|
||||
/* 804534A8-804534AC 0004+00 s=1 e=0 z=0 None .sdata2 @11062 */
|
||||
SECTION_SDATA2 static u32 lit_11062 = 0x46471C00;
|
||||
SECTION_SDATA2 static f32 lit_11062 = 12743.0f;
|
||||
|
||||
/* 80153658-80153718 00C0+00 s=0 e=0 z=12 None .text setDamage__8daNpcF_cFiii */
|
||||
#pragma push
|
||||
@@ -4838,7 +4789,7 @@ asm void daNpcF_c::chkActorInArea(fopAc_ac_c* param_0, cXyz param_1, cXyz param_
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 804534AC-804534B0 0004+00 s=3 e=0 z=0 None .sdata2 @11253 */
|
||||
SECTION_SDATA2 static u32 lit_11253 = 0x3F000000;
|
||||
SECTION_SDATA2 static f32 lit_11253 = 0.5f;
|
||||
|
||||
/* 80153BDC-80153D1C 0140+00 s=0 e=0 z=25 None .text
|
||||
* chkActorInAttnArea__8daNpcF_cFP10fopAc_ac_cP10fopAc_ac_ci */
|
||||
@@ -4923,7 +4874,7 @@ asm void daNpcF_c::getEvtAreaTagP(int param_0, int param_1) {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 804534B0-804534B4 0004+00 s=1 e=0 z=0 None .sdata2 @11605 */
|
||||
SECTION_SDATA2 static u32 lit_11605 = 0x43E10000;
|
||||
SECTION_SDATA2 static f32 lit_11605 = 450.0f;
|
||||
|
||||
/* 8015436C-80154730 03C4+00 s=0 e=0 z=12 None .text getAttnActorP__8daNpcF_cFiPFPvPv_Pvffffsii
|
||||
*/
|
||||
|
||||
+15
-22
@@ -17,13 +17,6 @@ struct daPy_py_c {
|
||||
/* 8015F398 */ void checkMasterSwordEquip();
|
||||
};
|
||||
|
||||
struct Quaternion {};
|
||||
|
||||
struct dCcD_GObjInf {
|
||||
/* 800844F8 */ void GetTgHitObj();
|
||||
/* 8008457C */ void GetTgHitObjSe();
|
||||
};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct cXyz {
|
||||
@@ -34,6 +27,13 @@ struct cXyz {
|
||||
/* 80266CBC */ void outprod(Vec const&) const;
|
||||
};
|
||||
|
||||
struct Quaternion {};
|
||||
|
||||
struct dCcD_GObjInf {
|
||||
/* 800844F8 */ void GetTgHitObj();
|
||||
/* 8008457C */ void GetTgHitObjSe();
|
||||
};
|
||||
|
||||
struct daObj {
|
||||
/* 80037038 */ void eff_break_tsubo(fopAc_ac_c*, cXyz, int);
|
||||
/* 80037180 */ void make_eff_break_kotubo(fopAc_ac_c*);
|
||||
@@ -98,8 +98,6 @@ struct Z2SeMgr {
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" extern char const* const d_a_d_a_obj__stringBase0;
|
||||
|
||||
extern "C" void eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi();
|
||||
extern "C" void make_eff_break_kotubo__5daObjFP10fopAc_ac_c();
|
||||
extern "C" void make_eff_break_kotubo2__5daObjFP10fopAc_ac_c();
|
||||
@@ -123,14 +121,6 @@ void fopAcM_posMove(fopAc_ac_c*, cXyz const*);
|
||||
void dComIfGp_getReverb(int);
|
||||
void cM_atan2s(f32, f32);
|
||||
void cM3d_CrawVec(Vec const&, Vec const&, Vec*);
|
||||
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" extern u8 struct_80450DF0[8];
|
||||
extern "C" extern u8 mEcallback__18dPa_modelEcallBack[4];
|
||||
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
|
||||
|
||||
extern "C" void __dt__4cXyzFv();
|
||||
extern "C" void fopAcM_posMove__FP10fopAc_ac_cPC4cXyz();
|
||||
@@ -182,8 +172,11 @@ extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80379298-803792A8 0010+00 s=1 e=0 z=0 None .rodata zero_quat$3920 */
|
||||
SECTION_RODATA static u8 const zero_quat[16] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
|
||||
SECTION_RODATA static f32 const zero_quat[4] = {
|
||||
0.0f,
|
||||
0.0f,
|
||||
0.0f,
|
||||
1.0f,
|
||||
};
|
||||
|
||||
/* 803792A8-803792B0 0007+01 s=1 e=0 z=0 None .rodata @stringBase0 */
|
||||
@@ -196,7 +189,7 @@ SECTION_DEAD static char const* const pad_803792AF = "";
|
||||
#pragma pop
|
||||
|
||||
/* 80451D98-80451D9C 0004+00 s=6 e=0 z=0 None .sdata2 @3671 */
|
||||
SECTION_SDATA2 static u32 lit_3671 = 0x3F800000;
|
||||
SECTION_SDATA2 static f32 lit_3671 = 1.0f;
|
||||
|
||||
/* 80037038-80037180 0148+00 s=4 e=0 z=0 None .text eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi
|
||||
*/
|
||||
@@ -271,7 +264,7 @@ static u8 lit_3732[12];
|
||||
static f32 scale_3731[3];
|
||||
|
||||
/* 80451D9C-80451DA0 0004+00 s=1 e=0 z=0 None .sdata2 @3714 */
|
||||
SECTION_SDATA2 static u32 lit_3714 = 0x40000000;
|
||||
SECTION_SDATA2 static f32 lit_3714 = 2.0f;
|
||||
|
||||
/* 80037330-800373C0 0090+00 s=0 e=0 z=1 None .text
|
||||
* make_eff_break_gm_ootubo__5daObjFP10fopAc_ac_c */
|
||||
@@ -307,7 +300,7 @@ asm void daObj::posMoveF_stream(fopAc_ac_c* param_0, cXyz const* param_1, cXyz c
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80451DA4-80451DA8 0004+00 s=2 e=0 z=0 None .sdata2 @3836 */
|
||||
SECTION_SDATA2 static u32 lit_3836 = 0xBF800000;
|
||||
SECTION_SDATA2 static f32 lit_3836 = -1.0f;
|
||||
|
||||
/* 800373F0-800374EC 00FC+00 s=1 e=0 z=0 None .text
|
||||
* posMoveF_resist_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzff */
|
||||
|
||||
+14
-38
@@ -164,9 +164,6 @@ struct J3DAnmLoaderDataBase {
|
||||
//
|
||||
|
||||
void daPy_addCalcShort(s16*, s16, s16, s16, s16);
|
||||
extern "C" extern void* __vt__18daPy_sightPacket_c[4 + 1 /* padding */];
|
||||
extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
|
||||
extern "C" extern u8 struct_8045101C[4];
|
||||
|
||||
extern "C" void checkAnmEnd__16daPy_frameCtrl_cFv();
|
||||
extern "C" void updateFrame__16daPy_frameCtrl_cFv();
|
||||
@@ -246,15 +243,6 @@ void* operator new(u32);
|
||||
void* operator new[](u32);
|
||||
void* operator new[](u32, int);
|
||||
void operator delete(void*);
|
||||
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" extern u8 g_dComIfG_gameInfo[122384];
|
||||
extern "C" extern u8 j3dSys[284];
|
||||
extern "C" extern u8 sincosTable___5JMath[65536];
|
||||
extern "C" extern u32 __float_nan;
|
||||
extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4];
|
||||
|
||||
extern "C" void scaleM__14mDoMtx_stack_cFfff();
|
||||
extern "C" void mDoExt_createSolidHeapFromGameToCurrent__FPP7JKRHeapUlUl();
|
||||
@@ -324,16 +312,10 @@ extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4];
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453600-80453608 0004+04 s=6 e=0 z=0 None .sdata2 @4215 */
|
||||
SECTION_SDATA2 static u8 lit_4215[4 + 4 /* padding */] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
SECTION_SDATA2 static f32 lit_4215[1 + 1 /* padding */] = {
|
||||
0.0f,
|
||||
/* padding */
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0.0f,
|
||||
};
|
||||
|
||||
/* 8015E4CC-8015E510 0044+00 s=0 e=235 z=6 None .text checkAnmEnd__16daPy_frameCtrl_cFv */
|
||||
@@ -358,9 +340,7 @@ asm void daPy_frameCtrl_c::updateFrame() {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453608-80453610 0008+00 s=2 e=0 z=0 None .sdata2 @4237 */
|
||||
SECTION_SDATA2 static u8 lit_4237[8] = {
|
||||
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
|
||||
};
|
||||
SECTION_SDATA2 static f64 lit_4237 = 4503601774854144.0 /* cast s32 to float */;
|
||||
|
||||
/* 8015E544-8015E5B0 006C+00 s=0 e=1 z=6 None .text setFrameCtrl__16daPy_frameCtrl_cFUcssff */
|
||||
#pragma push
|
||||
@@ -375,16 +355,16 @@ asm void daPy_frameCtrl_c::setFrameCtrl(u8 param_0, s16 param_1, s16 param_2, f3
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453610-80453614 0004+00 s=1 e=0 z=0 None .sdata2 @4247 */
|
||||
SECTION_SDATA2 static u32 lit_4247 = 0x41F00000;
|
||||
SECTION_SDATA2 static f32 lit_4247 = 30.0f;
|
||||
|
||||
/* 80453614-80453618 0004+00 s=1 e=0 z=0 None .sdata2 @4248 */
|
||||
SECTION_SDATA2 static u32 lit_4248 = 0x428C0000;
|
||||
SECTION_SDATA2 static f32 lit_4248 = 70.0f;
|
||||
|
||||
/* 80453618-8045361C 0004+00 s=2 e=0 z=0 None .sdata2 @4249 */
|
||||
SECTION_SDATA2 static u32 lit_4249 = 0x42480000;
|
||||
SECTION_SDATA2 static f32 lit_4249 = 50.0f;
|
||||
|
||||
/* 8045361C-80453620 0004+00 s=1 e=0 z=0 None .sdata2 @4250 */
|
||||
SECTION_SDATA2 static u32 lit_4250 = 0x47800000;
|
||||
SECTION_SDATA2 static f32 lit_4250 = 65536.0f;
|
||||
|
||||
/* 8015E5B0-8015E654 00A4+00 s=0 e=1 z=18 None .text initOffset__20daPy_boomerangMove_cFPC4cXyz
|
||||
*/
|
||||
@@ -405,10 +385,10 @@ u8 m_midnaActor__9daPy_py_c[4];
|
||||
u8 struct_8045101C[4];
|
||||
|
||||
/* 80453620-80453624 0004+00 s=1 e=0 z=0 None .sdata2 @4332 */
|
||||
SECTION_SDATA2 static u32 lit_4332 = 0x43960000;
|
||||
SECTION_SDATA2 static f32 lit_4332 = 300.0f;
|
||||
|
||||
/* 80453624-80453628 0004+00 s=1 e=0 z=0 None .sdata2 @4333 */
|
||||
SECTION_SDATA2 static u32 lit_4333 = 0xC42F0000;
|
||||
SECTION_SDATA2 static f32 lit_4333 = -700.0f;
|
||||
|
||||
/* 80453628-80453630 0004+04 s=1 e=0 z=0 None .sdata2 @4334 */
|
||||
SECTION_SDATA2 static f32 lit_4334[1 + 1 /* padding */] = {
|
||||
@@ -431,14 +411,10 @@ asm void daPy_boomerangMove_c::posMove(cXyz* param_0, s16* param_1, fopAc_ac_c*
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453630-80453638 0008+00 s=1 e=0 z=0 None .sdata2 @4379 */
|
||||
SECTION_SDATA2 static u8 lit_4379[8] = {
|
||||
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
SECTION_SDATA2 static f64 lit_4379 = 0.5;
|
||||
|
||||
/* 80453638-80453640 0008+00 s=1 e=0 z=0 None .sdata2 @4380 */
|
||||
SECTION_SDATA2 static u8 lit_4380[8] = {
|
||||
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
SECTION_SDATA2 static f64 lit_4380 = 3.0;
|
||||
|
||||
/* 80453640-80453648 0008+00 s=1 e=0 z=0 None .sdata2 @4381 */
|
||||
SECTION_SDATA2 static u8 lit_4381[8] = {
|
||||
@@ -983,7 +959,7 @@ asm void daPy_sightPacket_c::draw() {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453680-80453684 0004+00 s=1 e=0 z=0 None .sdata2 @4699 */
|
||||
SECTION_SDATA2 static u32 lit_4699 = 0x42000000;
|
||||
SECTION_SDATA2 static f32 lit_4699 = 32.0f;
|
||||
|
||||
/* 8015F2FC-8015F384 0088+00 s=0 e=1 z=0 None .text setSight__18daPy_sightPacket_cFv */
|
||||
#pragma push
|
||||
@@ -1028,7 +1004,7 @@ asm void daPy_py_c::checkWoodShieldEquip() {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80453684-80453688 0004+00 s=1 e=0 z=0 None .sdata2 @4741 */
|
||||
SECTION_SDATA2 static u32 lit_4741 = 0xC1480000;
|
||||
SECTION_SDATA2 static f32 lit_4741 = -12.5f;
|
||||
|
||||
/* 80453688-80453690 0004+04 s=1 e=0 z=0 None .sdata2 @4742 */
|
||||
SECTION_SDATA2 static f32 lit_4742[1 + 1 /* padding */] = {
|
||||
|
||||
@@ -27,8 +27,6 @@ struct daItemBase_c {
|
||||
//
|
||||
|
||||
void CheckShopItemCreateHeap(fopAc_ac_c*);
|
||||
extern "C" extern void* const mData__12daShopItem_c[276];
|
||||
extern "C" extern char const* const d_a_d_a_shop_item_static__stringBase0;
|
||||
|
||||
extern "C" void getRotateP__12daShopItem_cFv();
|
||||
extern "C" void getPosP__12daShopItem_cFv();
|
||||
|
||||
Reference in New Issue
Block a user