mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-29 17:42:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

re-generate with bug fixes

Browse Source
This commit is contained in:
Julgodis
2021-03-30 01:58:08 +02:00
parent b27bb6b262
commit 2404fb33c7
3631 changed files with 20347 additions and 42325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DynamicLink.cpp
+1 -5
View File
@@ -90,8 +90,6 @@ struct DynamicModuleControl {
//
static void calcSum2(u16 const*, u32);
extern "C" extern char const* const DynamicLink__stringBase0;
extern "C" extern void* __vt__20DynamicModuleControl[13];
extern "C" void __dt__24DynamicModuleControlBaseFv();
extern "C" void __ct__24DynamicModuleControlBaseFv();
@@ -346,9 +344,7 @@ SECTION_SDATA2 static f32 lit_3772[1 + 1 /* padding */] = {
};
/* 80455010-80455018 0008+00 s=1 e=0 z=0 None .sdata2 @3774 */
SECTION_SDATA2 static u8 lit_3774[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3774 = 4503599627370496.0 /* cast u32 to float */;
/* 80262470-80262660 01F0+00 s=2 e=2 z=0 None .text dump__24DynamicModuleControlBaseFv */
#pragma push
src/a/npc/d_a_npc_cd.cpp
+11 -25
View File
@@ -24,13 +24,13 @@ struct mDoHIO_entry_c {
struct mDoExt_McaMorfCallBack2_c {};
struct J3DAnmTransform {};
struct Z2Creature {};
struct J3DModelData {};
struct mDoExt_McaMorfCallBack1_c {};
struct Z2Creature {};
struct J3DAnmTransform {};
struct mDoExt_McaMorfSO {
/* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
@@ -52,10 +52,10 @@ struct daPy_py_c {
struct J3DModel {};
struct J3DJoint {};
struct J3DAnmTransformKey {};
struct J3DJoint {};
struct daNpcCd_c {
/* 8015605C */ void NpcCreate(int);
/* 801561E8 */ void ObjCreate(int);
@@ -91,12 +91,12 @@ struct daNpcCd_HIO_Child_c {
/* 80157858 */ daNpcCd_HIO_Child_c();
};
struct dKy_tevstr_c {};
struct cXyz {
/* 80009184 */ ~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*);
@@ -143,11 +143,6 @@ struct Z2CreatureCitizen {
//
static void jntNodeCallBack(J3DJoint*, int);
extern "C" extern u8 const m_cylDat__9daNpcCd_c[68];
extern "C" extern char const* const a_npc_d_a_npc_cd__stringBase0;
extern "C" extern void* __vt__18fOpAcm_HIO_entry_c[3];
extern "C" extern void* __vt__14mDoHIO_entry_c[3];
extern "C" extern u8 l_Cd_HIO[10684];
extern "C" static void jntNodeCallBack__FP8J3DJointi();
extern "C" void NpcCreate__9daNpcCd_cFi();
@@ -194,13 +189,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*);
void cLib_calcTimer__template2(int*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 mCurrentMtx__6J3DSys[48];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u8 data_80450FF8[8];
SECTION_INIT void memcpy();
extern "C" void __dt__4cXyzFv();
@@ -739,7 +727,7 @@ SECTION_DEAD static char const* const pad_8039324E = "\0";
#pragma pop
/* 804534B8-804534BC 0004+00 s=2 e=0 z=0 None .sdata2 @4021 */
SECTION_SDATA2 static u32 lit_4021 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4021 = 1.0f;
/* 8015605C-801561E8 018C+00 s=0 e=0 z=1 None .text NpcCreate__9daNpcCd_cFi */
#pragma push
@@ -897,9 +885,7 @@ SECTION_SDATA2 static f32 lit_4373[1 + 1 /* padding */] = {
};
/* 804534C8-804534D0 0008+00 s=3 e=0 z=0 None .sdata2 @4375 */
SECTION_SDATA2 static u8 lit_4375[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4375 = 4503601774854144.0 /* cast s32 to float */;
/* 801563C8-80156B4C 0784+00 s=0 e=0 z=2 None .text setAttention__9daNpcCd_cFi */
#pragma push
@@ -1013,7 +999,7 @@ asm void daNpcCd_c::drawNpc() {
/* ############################################################################################## */
/* 804534D0-804534D4 0004+00 s=1 e=0 z=0 None .sdata2 @4582 */
SECTION_SDATA2 static u32 lit_4582 = 0x43360B61;
SECTION_SDATA2 static f32 lit_4582 = 182.04444885253906f;
/* 80157084-8015736C 02E8+00 s=1 e=0 z=0 None .text jntNodeCB__9daNpcCd_cFP8J3DJointP8J3DModel
*/
@@ -1036,10 +1022,10 @@ SECTION_SDATA2 static u8 id[4] = {
};
/* 804534D8-804534DC 0004+00 s=1 e=0 z=0 None .sdata2 @4656 */
SECTION_SDATA2 static u32 lit_4656 = 0x41000000;
SECTION_SDATA2 static f32 lit_4656 = 8.0f;
/* 804534DC-804534E0 0004+00 s=1 e=0 z=0 None .sdata2 @4657 */
SECTION_SDATA2 static u32 lit_4657 = 0x40800000;
SECTION_SDATA2 static f32 lit_4657 = 4.0f;
/* 8015736C-80157524 01B8+00 s=1 e=0 z=0 None .text setHitodamaParticle__9daNpcCd_cFv */
#pragma push
src/a/npc/d_a_npc_cd2.cpp
+18 -45
View File
@@ -13,14 +13,14 @@
struct request_of_phase_process_class {};
struct csXyz {
/* 802673F4 */ csXyz(s16, s16, s16);
};
struct cXyz {
/* 80009184 */ ~cXyz();
};
struct csXyz {
/* 802673F4 */ csXyz(s16, s16, s16);
};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CDD4 */ void transM(cXyz const&);
@@ -41,13 +41,13 @@ struct mDoExt_btpAnm {
struct mDoExt_McaMorfCallBack2_c {};
struct J3DAnmTransform {};
struct Z2Creature {};
struct J3DModelData {};
struct mDoExt_McaMorfCallBack1_c {};
struct Z2Creature {};
struct J3DAnmTransform {};
struct mDoExt_McaMorfSO {
/* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
@@ -67,10 +67,10 @@ struct daPy_py_c {
struct J3DModel {};
struct J3DJoint {};
struct J3DAnmTransformKey {};
struct J3DJoint {};
struct daNpcCd2_c {
/* 80157D00 */ void NpcCreate(int);
/* 80157F28 */ void ObjCreate(int);
@@ -186,10 +186,6 @@ struct J3DFrameCtrl {
static void jntNodeCallBack(J3DJoint*, int);
static void s_sub1(void*, void*);
static void s_sub(void*, void*);
extern "C" extern u8 const m_cylDat__10daNpcCd2_c[68];
extern "C" extern char const* const a_npc_d_a_npc_cd2__stringBase0;
extern "C" extern u8 l_Cd2_HIO[16396];
extern "C" extern u8 data_80451010[8];
extern "C" static void jntNodeCallBack__FP8J3DJointi();
extern "C" void NpcCreate__10daNpcCd2_cFi();
@@ -265,17 +261,6 @@ void cLib_targetAngleY(Vec const*, Vec const*);
void cLib_distanceAngleS(s16, s16);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* __vt__18fOpAcm_HIO_entry_c[3];
extern "C" extern void* __vt__14mDoHIO_entry_c[3];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" 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;
SECTION_INIT void memcpy();
extern "C" void __dt__4cXyzFv();
@@ -948,7 +933,7 @@ SECTION_DEAD static char const* const pad_80393D84 = "\0\0\0";
#pragma pop
/* 804534E0-804534E4 0004+00 s=3 e=0 z=0 None .sdata2 @4050 */
SECTION_SDATA2 static u32 lit_4050 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4050 = 1.0f;
/* 80157D00-80157F28 0228+00 s=0 e=0 z=4 None .text NpcCreate__10daNpcCd2_cFi */
#pragma push
@@ -2176,9 +2161,7 @@ SECTION_SDATA2 static f32 lit_4586[1 + 1 /* padding */] = {
};
/* 804534F0-804534F8 0008+00 s=3 e=0 z=0 None .sdata2 @4588 */
SECTION_SDATA2 static u8 lit_4588[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4588 = 4503601774854144.0 /* cast s32 to float */;
/* 80158420-80158BB8 0798+00 s=0 e=0 z=5 None .text setAttention__10daNpcCd2_cFi */
#pragma push
@@ -2284,7 +2267,7 @@ asm void daNpcCd2_c::drawNpc() {
/* ############################################################################################## */
/* 804534F8-804534FC 0004+00 s=1 e=0 z=0 None .sdata2 @4845 */
SECTION_SDATA2 static u32 lit_4845 = 0x43360B61;
SECTION_SDATA2 static f32 lit_4845 = 182.04444885253906f;
/* 80159258-80159550 02F8+00 s=1 e=0 z=0 None .text jntNodeCB__10daNpcCd2_cFP8J3DJointP8J3DModel
*/
@@ -2307,10 +2290,10 @@ SECTION_SDATA2 static u8 id[4] = {
};
/* 80453500-80453504 0004+00 s=1 e=0 z=0 None .sdata2 @4921 */
SECTION_SDATA2 static u32 lit_4921 = 0x41000000;
SECTION_SDATA2 static f32 lit_4921 = 8.0f;
/* 80453504-80453508 0004+00 s=1 e=0 z=0 None .sdata2 @4922 */
SECTION_SDATA2 static u32 lit_4922 = 0x40800000;
SECTION_SDATA2 static f32 lit_4922 = 4.0f;
/* 80159550-80159708 01B8+00 s=1 e=0 z=0 None .text setHitodamaParticle__10daNpcCd2_cFv */
#pragma push
@@ -2361,14 +2344,10 @@ SECTION_SDATA2 static f32 lit_4970[1 + 1 /* padding */] = {
};
/* 80453510-80453518 0008+00 s=1 e=0 z=0 None .sdata2 @4971 */
SECTION_SDATA2 static u8 lit_4971[8] = {
0x40, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4971 = 500.0;
/* 80453518-80453520 0008+00 s=2 e=0 z=0 None .sdata2 @4972 */
SECTION_SDATA2 static u8 lit_4972[8] = {
0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4972 = 2.0;
/* 80159818-801598E8 00D0+00 s=0 e=0 z=5 None .text checkFearSituation__10daNpcCd2_cFv */
#pragma push
@@ -2419,14 +2398,10 @@ SECTION_SDATA2 static f32 lit_5050[1 + 1 /* padding */] = {
};
/* 80453528-80453530 0008+00 s=4 e=0 z=0 None .sdata2 @5051 */
SECTION_SDATA2 static u8 lit_5051[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5051 = 0.5;
/* 80453530-80453538 0008+00 s=4 e=0 z=0 None .sdata2 @5052 */
SECTION_SDATA2 static u8 lit_5052[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5052 = 3.0;
/* 80453538-80453540 0008+00 s=4 e=0 z=0 None .sdata2 @5053 */
SECTION_SDATA2 static u8 lit_5053[8] = {
@@ -2554,9 +2529,7 @@ asm void PathTrace_c::checkObstacle(fopAc_ac_c* param_0) {
/* ############################################################################################## */
/* 80453548-80453550 0008+00 s=1 e=0 z=0 None .sdata2 @5359 */
SECTION_SDATA2 static u8 lit_5359[8] = {
0x40, 0x6F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5359 = 250.0;
/* 8015A3E4-8015A4D8 00F4+00 s=1 e=0 z=0 None .text checkObstacleSub__11PathTrace_cFP10fopAc_ac_c
*/
src/a/obj/d_a_obj_item.cpp
+29 -69
View File
@@ -13,8 +13,6 @@
struct request_of_phase_process_class {};
struct csXyz {};
struct Vec {};
struct cXyz {
@@ -25,6 +23,8 @@ struct cXyz {
/* 8026706C */ bool operator!=(Vec const&) const;
};
struct csXyz {};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CD9C */ void transM(f32, f32, f32);
@@ -260,8 +260,6 @@ static void daItem_Draw(daItem_c*);
static void daItem_Execute(daItem_c*);
static void daItem_Delete(daItem_c*);
static void daItem_Create(fopAc_ac_c*);
extern "C" extern char const* const a_obj_d_a_obj_item__stringBase0;
extern "C" extern void* g_profile_ITEM[12];
extern "C" static void Reflect__FP4cXyzRC13cBgS_PolyInfof();
extern "C" void getData__12daItemBase_cFv();
@@ -355,30 +353,6 @@ void cM_rndF(f32);
void cM_rndFX(f32);
void cLib_chaseF(f32*, f32, f32);
void operator delete(void*);
extern "C" extern u8 const m_data__12daItemBase_c[56];
extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */];
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern void* __vt__8cM3dGCyl[3];
extern "C" extern void* __vt__8cM3dGAab[3];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* field_item_res__10dItem_data[1020];
extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */];
extern "C" extern void* __vt__12dBgS_ObjAcch[9];
extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" extern void* __vt__16Z2SoundObjSimple[8];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern u8 data_80451010[8];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
@@ -517,27 +491,17 @@ extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
/* ############################################################################################## */
/* 80453550-80453558 0004+04 s=11 e=0 z=0 None .sdata2 @3857 */
SECTION_SDATA2 static u8 lit_3857[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_3857[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 80453558-80453560 0008+00 s=2 e=0 z=0 None .sdata2 @3858 */
SECTION_SDATA2 static u8 lit_3858[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3858 = 0.5;
/* 80453560-80453568 0008+00 s=2 e=0 z=0 None .sdata2 @3859 */
SECTION_SDATA2 static u8 lit_3859[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3859 = 3.0;
/* 80453568-80453570 0008+00 s=2 e=0 z=0 None .sdata2 @3860 */
SECTION_SDATA2 static u8 lit_3860[8] = {
@@ -596,7 +560,7 @@ asm void daItem_c::setBaseMtx_0() {
/* ############################################################################################## */
/* 80453570-80453574 0004+00 s=3 e=0 z=0 None .sdata2 @3923 */
SECTION_SDATA2 static u32 lit_3923 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3923 = 0.5f;
/* 8015B1C8-8015B254 008C+00 s=1 e=0 z=0 None .text setBaseMtx_1__8daItem_cFv */
#pragma push
@@ -766,13 +730,13 @@ SECTION_DATA static u8 m_cyl_src__8daItem_c[68] = {
};
/* 80453574-80453578 0004+00 s=1 e=0 z=0 None .sdata2 @4067 */
SECTION_SDATA2 static u32 lit_4067 = 0x41F00000;
SECTION_SDATA2 static f32 lit_4067 = 30.0f;
/* 80453578-8045357C 0004+00 s=1 e=0 z=0 None .sdata2 @4068 */
SECTION_SDATA2 static u32 lit_4068 = 0x461C4000;
SECTION_SDATA2 static f32 lit_4068 = 10000.0f;
/* 8045357C-80453580 0004+00 s=7 e=0 z=0 None .sdata2 @4069 */
SECTION_SDATA2 static u32 lit_4069 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4069 = 1.0f;
/* 80453580-80453588 0004+04 s=2 e=0 z=0 None .sdata2 @4070 */
SECTION_SDATA2 static f32 lit_4070[1 + 1 /* padding */] = {
@@ -782,9 +746,7 @@ SECTION_SDATA2 static f32 lit_4070[1 + 1 /* padding */] = {
};
/* 80453588-80453590 0008+00 s=3 e=0 z=0 None .sdata2 @4072 */
SECTION_SDATA2 static u8 lit_4072[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4072 = 4503599627370496.0 /* cast u32 to float */;
/* 8015B3D8-8015B7BC 03E4+00 s=1 e=0 z=0 None .text CreateInit__8daItem_cFv */
#pragma push
@@ -909,10 +871,10 @@ asm Z2SoundObjSimple::~Z2SoundObjSimple() {
/* ############################################################################################## */
/* 80453590-80453594 0004+00 s=1 e=0 z=0 None .sdata2 @4320 */
SECTION_SDATA2 static u32 lit_4320 = 0x43960000;
SECTION_SDATA2 static f32 lit_4320 = 300.0f;
/* 80453594-80453598 0004+00 s=1 e=0 z=0 None .sdata2 @4321 */
SECTION_SDATA2 static u32 lit_4321 = 0x41900000;
SECTION_SDATA2 static f32 lit_4321 = 18.0f;
/* 8015BA9C-8015BD84 02E8+00 s=1 e=0 z=0 None .text _daItem_execute__8daItem_cFv */
#pragma push
@@ -991,7 +953,7 @@ asm void daItem_c::procMainForceGet() {
/* ############################################################################################## */
/* 80453598-8045359C 0004+00 s=3 e=0 z=0 None .sdata2 @4404 */
SECTION_SDATA2 static u32 lit_4404 = 0x41700000;
SECTION_SDATA2 static f32 lit_4404 = 15.0f;
/* 8015C058-8015C134 00DC+00 s=4 e=0 z=0 None .text procInitSimpleGetDemo__8daItem_cFv */
#pragma push
@@ -1053,7 +1015,7 @@ asm void daItem_c::procMainGetDemoEvent() {
/* ############################################################################################## */
/* 8045359C-804535A0 0004+00 s=2 e=0 z=0 None .sdata2 @4506 */
SECTION_SDATA2 static u32 lit_4506 = 0x40000000;
SECTION_SDATA2 static f32 lit_4506 = 2.0f;
/* 8015C41C-8015C514 00F8+00 s=1 e=0 z=0 None .text procInitBoomerangCarry__8daItem_cFv */
#pragma push
@@ -1067,7 +1029,7 @@ asm void daItem_c::procInitBoomerangCarry() {
/* ############################################################################################## */
/* 804535A0-804535A4 0004+00 s=2 e=0 z=0 None .sdata2 @4524 */
SECTION_SDATA2 static u32 lit_4524 = 0x43480000;
SECTION_SDATA2 static f32 lit_4524 = 200.0f;
/* 8015C514-8015C5F4 00E0+00 s=1 e=0 z=0 None .text procMainBoomerangCarry__8daItem_cFv */
#pragma push
@@ -1111,7 +1073,7 @@ asm void daItem_c::procInitBoomHitWait() {
/* ############################################################################################## */
/* 804535A4-804535A8 0004+00 s=2 e=0 z=0 None .sdata2 @4665 */
SECTION_SDATA2 static u32 lit_4665 = 0x42C80000;
SECTION_SDATA2 static f32 lit_4665 = 100.0f;
/* 804535A8-804535B0 0004+04 s=2 e=0 z=0 None .sdata2 @4666 */
SECTION_SDATA2 static f32 lit_4666[1 + 1 /* padding */] = {
@@ -1121,9 +1083,7 @@ SECTION_SDATA2 static f32 lit_4666[1 + 1 /* padding */] = {
};
/* 804535B0-804535B8 0008+00 s=3 e=0 z=0 None .sdata2 @4668 */
SECTION_SDATA2 static u8 lit_4668[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4668 = 4503601774854144.0 /* cast s32 to float */;
/* 8015C738-8015CAB8 0380+00 s=1 e=0 z=0 None .text procMainBoomHitWait__8daItem_cFv */
#pragma push
@@ -1177,7 +1137,7 @@ asm void daItem_c::mode_wait() {
/* ############################################################################################## */
/* 804535B8-804535BC 0004+00 s=1 e=0 z=0 None .sdata2 @4781 */
SECTION_SDATA2 static u32 lit_4781 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_4781 = 1.0f / 10.0f;
/* 8015CDCC-8015CE94 00C8+00 s=1 e=0 z=0 None .text mode_water__8daItem_cFv */
#pragma push
@@ -1211,7 +1171,7 @@ asm void daItem_c::itemGetNextExecute() {
/* ############################################################################################## */
/* 804535BC-804535C0 0004+00 s=3 e=0 z=0 None .sdata2 @4923 */
SECTION_SDATA2 static u32 lit_4923 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4923 = -1.0f;
/* 8015D0A8-8015D370 02C8+00 s=2 e=0 z=0 None .text itemGet__8daItem_cFv */
#pragma push
@@ -1265,7 +1225,7 @@ asm void daItem_c::deleteItem() {
/* ############################################################################################## */
/* 804535C0-804535C4 0004+00 s=1 e=0 z=0 None .sdata2 @4979 */
SECTION_SDATA2 static u32 lit_4979 = 0x3F733333;
SECTION_SDATA2 static f32 lit_4979 = 19.0f / 20.0f;
/* 8015D4AC-8015D56C 00C0+00 s=1 e=0 z=0 None .text itemActionForRupee__8daItem_cFv */
#pragma push
@@ -1309,10 +1269,10 @@ asm void daItem_c::itemActionForBoomerang() {
/* ############################################################################################## */
/* 804535C4-804535C8 0004+00 s=3 e=0 z=0 None .sdata2 @5050 */
SECTION_SDATA2 static u32 lit_5050 = 0x40A00000;
SECTION_SDATA2 static f32 lit_5050 = 5.0f;
/* 804535C8-804535CC 0004+00 s=1 e=0 z=0 None .sdata2 @5051 */
SECTION_SDATA2 static u32 lit_5051 = 0x40400000;
SECTION_SDATA2 static f32 lit_5051 = 3.0f;
/* 8015D734-8015D834 0100+00 s=2 e=0 z=0 None .text bg_check__8daItem_cFv */
#pragma push
@@ -1354,7 +1314,7 @@ asm void daItem_c::CountTimer() {
/* ############################################################################################## */
/* 804535CC-804535D0 0004+00 s=1 e=0 z=0 None .sdata2 @5110 */
SECTION_SDATA2 static u32 lit_5110 = 0x41A00000;
SECTION_SDATA2 static f32 lit_5110 = 20.0f;
/* 8015D9F0-8015DAAC 00BC+00 s=1 e=0 z=0 None .text initAction__8daItem_cFv */
#pragma push
@@ -1388,16 +1348,16 @@ asm void daItem_c::initScale() {
/* ############################################################################################## */
/* 804535D0-804535D4 0004+00 s=1 e=0 z=0 None .sdata2 @5230 */
SECTION_SDATA2 static u32 lit_5230 = 0x3F333333;
SECTION_SDATA2 static f32 lit_5230 = 7.0f / 10.0f;
/* 804535D4-804535D8 0004+00 s=1 e=0 z=0 None .sdata2 @5231 */
SECTION_SDATA2 static u32 lit_5231 = 0x3F99999A;
SECTION_SDATA2 static f32 lit_5231 = 6.0f / 5.0f;
/* 804535D8-804535DC 0004+00 s=1 e=0 z=0 None .sdata2 @5232 */
SECTION_SDATA2 static u32 lit_5232 = 0x3F0CCCCD;
SECTION_SDATA2 static f32 lit_5232 = 11.0f / 20.0f;
/* 804535DC-804535E0 0004+00 s=1 e=0 z=0 None .sdata2 @5233 */
SECTION_SDATA2 static u32 lit_5233 = 0x42480000;
SECTION_SDATA2 static f32 lit_5233 = 50.0f;
/* 8015DC40-8015DE38 01F8+00 s=2 e=0 z=0 None .text initSpeed__8daItem_cFi */
#pragma push
src/c/c_damagereaction.cpp
+4 -10
View File
@@ -34,9 +34,6 @@ struct JPAParticleCallBack {
//
void cDmrNowMidnaTalk();
extern "C" extern void* __vt__19JPAParticleCallBack[5];
extern "C" extern u8 data_80450CA0[4];
extern "C" extern u8 JPTracePCB4[4];
extern "C" void execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle();
extern "C" void draw__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle();
@@ -55,7 +52,6 @@ extern "C" extern u8 JPTracePCB4[4];
void fopAcM_getTalkEventPartner(fopAc_ac_c const*);
void operator delete(void*);
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" void fopAcM_getTalkEventPartner__FPC10fopAc_ac_c();
extern "C" void __dt__19JPAParticleCallBackFv();
@@ -69,7 +65,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384];
/* ############################################################################################## */
/* 80451BA8-80451BAC 0004+00 s=1 e=0 z=0 None .sdata2 @3731 */
SECTION_SDATA2 static u32 lit_3731 = 0x41C80000;
SECTION_SDATA2 static f32 lit_3731 = 25.0f;
/* 80451BAC-80451BB0 0004+00 s=1 e=0 z=0 None .sdata2 @3732 */
SECTION_SDATA2 static u8 lit_3732[4] = {
@@ -80,15 +76,13 @@ SECTION_SDATA2 static u8 lit_3732[4] = {
};
/* 80451BB0-80451BB4 0004+00 s=1 e=0 z=0 None .sdata2 @3733 */
SECTION_SDATA2 static u32 lit_3733 = 0x3E99999A;
SECTION_SDATA2 static f32 lit_3733 = 3.0f / 10.0f;
/* 80451BB4-80451BB8 0004+00 s=1 e=0 z=0 None .sdata2 @3734 */
SECTION_SDATA2 static u32 lit_3734 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3734 = 0.5f;
/* 80451BB8-80451BC0 0008+00 s=1 e=0 z=0 None .sdata2 @3736 */
SECTION_SDATA2 static u8 lit_3736[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3736 = 4503599627370496.0 /* cast u32 to float */;
/* 8001817C-800182A4 0128+00 s=1 e=0 z=0 None .text
* execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle */
src/c/c_dylink.cpp
-2
View File
@@ -68,7 +68,6 @@ void cDyl_LinkASync(s16);
static void cDyl_InitCallback(void*);
void cDyl_InitAsync();
void cDyl_InitAsyncIsDone();
extern "C" extern char const* const c_c_dylink__stringBase0;
extern "C" static void cCc_Init__Fv();
extern "C" void cDyl_IsLinked__Fs();
@@ -95,7 +94,6 @@ void fopScnM_CreateReq(s16, s16, u16, u32);
void dComLbG_PhaseHandler(request_of_phase_process_class*, int (**)(void*), void*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__20DynamicModuleControl[13];
SECTION_INIT void memset();
extern "C" void OSReport_Error();
src/d/a/d_a_alink.cpp
+453 -561
View File
File diff suppressed because it is too large Load Diff
src/d/a/d_a_horse_static.cpp
-2
View File
@@ -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();
src/d/a/d_a_itembase.cpp
+7 -20
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);
@@ -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
src/d/a/d_a_itembase_static.cpp
-4
View File
@@ -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];
src/d/a/d_a_no_chg_room.cpp
+1 -11
View File
@@ -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 */] = {
src/d/a/d_a_npc.cpp
+61 -110
View File
@@ -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
*/
src/d/a/d_a_obj.cpp
+15 -22
View File
@@ -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 */
src/d/a/d_a_player.cpp
+14 -38
View File
@@ -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 */] = {
src/d/a/d_a_shop_item_static.cpp
-2
View File
@@ -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();
src/d/bg/d_bg_s.cpp
+2 -8
View File
@@ -38,10 +38,10 @@ struct dBgS_Acch {
/* 8007732C */ void CalcWallRR();
};
struct csXyz {};
struct cXyz {};
struct csXyz {};
struct cBgS_PolyInfo {
/* 802680F8 */ void ChkSetInfo() const;
/* 80268120 */ void ClearPi();
@@ -157,10 +157,6 @@ void dBgS_CheckBWallPoly(cBgS_PolyInfo const&);
void dBgS_CheckBGroundPoly(cBgS_PolyInfo const&);
void dBgS_CheckBRoofPoly(cBgS_PolyInfo const&);
void dBgS_GetNY(cBgS_PolyInfo const&);
extern "C" extern void* __vt__4dBgS[5];
extern "C" extern void* __vt__4cBgS[5];
extern "C" extern void* __vt__11cBgS_ChkElm[4];
extern "C" extern u8 data_80450F68[8];
extern "C" void Init__11cBgS_ChkElmFv();
extern "C" void Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv();
@@ -240,8 +236,6 @@ extern "C" extern u8 data_80450F68[8];
void cBgW_CheckBGround(f32);
void cBgW_CheckBRoof(f32);
void cBgW_CheckBWall(f32);
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" void __dt__11cBgS_ChkElmFv();
extern "C" void __dt__4dBgSFv();
src/d/bg/d_bg_s_acch.cpp
+10 -19
View File
@@ -62,9 +62,6 @@ struct dBgS_AcchCir {
struct csXyz {};
struct Vec {};
struct dBgS_Acch;
struct cBgS_PolyInfo {
/* 80268074 */ cBgS_PolyInfo();
/* 802680B0 */ ~cBgS_PolyInfo();
@@ -73,6 +70,7 @@ struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct dBgS_Acch;
struct dBgS {
/* 8007524C */ void WallCorrect(dBgS_Acch*);
/* 80075374 */ void WallCorrectSort(dBgS_Acch*);
@@ -82,6 +80,8 @@ struct dBgS {
/* 80075B84 */ void RideCallBack(cBgS_PolyInfo const&, fopAc_ac_c*);
};
struct Vec {};
struct dBgS_Acch {
/* 80075F94 */ ~dBgS_Acch();
/* 800760A0 */ dBgS_Acch();
@@ -159,8 +159,6 @@ struct cBgS {
// Forward References:
//
extern "C" extern void* __vt__12dBgS_AcchCir[3];
extern "C" void __ct__12dBgS_AcchCirFv();
extern "C" void ClrWallHit__12dBgS_AcchCirFv();
extern "C" void SetWallR__12dBgS_AcchCirFf();
@@ -209,13 +207,6 @@ extern "C" extern void* __vt__12dBgS_AcchCir[3];
void cBgW_CheckBGround(f32);
void operator delete(void*);
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern void* __vt__11dBgS_WtrChk[12];
extern "C" extern void* __vt__8cM3dGCyl[3];
extern "C" extern void* __vt__8cM3dGLin[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 data_80450F68[8];
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
extern "C" void LineCross__4cBgSFP11cBgS_LinChk();
extern "C" void GroundCross__4cBgSFP11cBgS_GndChk();
@@ -373,16 +364,16 @@ asm dBgS_Acch::~dBgS_Acch() {
/* ############################################################################################## */
/* 804526C4-804526C8 0004+00 s=5 e=0 z=0 None .sdata2 @4089 */
SECTION_SDATA2 static u32 lit_4089 = 0xCE6E6B28;
SECTION_SDATA2 static f32 lit_4089 = -1000000000.0f;
/* 804526C8-804526CC 0004+00 s=1 e=0 z=0 None .sdata2 @4090 */
SECTION_SDATA2 static u32 lit_4090 = 0x42700000;
SECTION_SDATA2 static f32 lit_4090 = 60.0f;
/* 804526CC-804526D0 0004+00 s=3 e=0 z=0 None .sdata2 @4091 */
SECTION_SDATA2 static u32 lit_4091 = 0x4E6E6B28;
SECTION_SDATA2 static f32 lit_4091 = 1000000000.0f;
/* 804526D0-804526D4 0004+00 s=1 e=0 z=0 None .sdata2 @4092 */
SECTION_SDATA2 static u32 lit_4092 = 0x447A0000;
SECTION_SDATA2 static f32 lit_4092 = 1000.0f;
/* 800760A0-800761CC 012C+00 s=0 e=4 z=338 None .text __ct__9dBgS_AcchFv */
#pragma push
@@ -466,7 +457,7 @@ asm void dBgS_Acch::GroundRoofProc(dBgS& param_0) {
/* ############################################################################################## */
/* 804526D4-804526D8 0004+00 s=1 e=0 z=0 None .sdata2 @4424 */
SECTION_SDATA2 static u32 lit_4424 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4424 = 1.0f;
/* 80076624-80076AAC 0488+00 s=1 e=0 z=0 None .text LineCheck__9dBgS_AcchFR4dBgS */
#pragma push
@@ -480,10 +471,10 @@ asm void dBgS_Acch::LineCheck(dBgS& param_0) {
/* ############################################################################################## */
/* 804526D8-804526DC 0004+00 s=1 e=0 z=0 None .sdata2 @4554 */
SECTION_SDATA2 static u32 lit_4554 = 0x42480000;
SECTION_SDATA2 static f32 lit_4554 = 50.0f;
/* 804526DC-804526E0 0004+00 s=1 e=0 z=0 None .sdata2 @4555 */
SECTION_SDATA2 static u32 lit_4555 = 0x49742400;
SECTION_SDATA2 static f32 lit_4555 = 1000000.0f;
/* 80076AAC-80076F84 04D8+00 s=0 e=15 z=414 None .text CrrPos__9dBgS_AcchFR4dBgS */
#pragma push
src/d/bg/d_bg_s_gnd_chk.cpp
-4
View File
@@ -60,9 +60,6 @@ struct cBgS_GndChk {
// Forward References:
//
extern "C" extern void* __vt__14dBgS_CamGndChk[12];
extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12];
extern "C" void __ct__11dBgS_GndChkFv();
extern "C" void __dt__11dBgS_GndChkFv();
extern "C" void __ct__18dBgS_ObjGndChk_WtrFv();
@@ -99,7 +96,6 @@ extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12];
//
void operator delete(void*);
extern "C" extern void* __vt__14dBgS_ObjGndChk[12 + 1 /* padding */];
extern "C" void __ct__8dBgS_ChkFv();
extern "C" void __dt__8dBgS_ChkFv();
src/d/bg/d_bg_s_movebg_actor.cpp
+2 -6
View File
@@ -32,12 +32,12 @@ struct dBgW {
/* 8007B9C0 */ void Move();
};
struct cXyz {};
struct csXyz {};
struct cBgS_PolyInfo {};
struct cXyz {};
struct dBgS_MoveBgActor {
/* 80078624 */ dBgS_MoveBgActor();
/* 80078688 */ bool CreateHeap();
@@ -80,8 +80,6 @@ struct cBgS {
//
static void CheckCreateHeap(fopAc_ac_c*);
extern "C" extern void* __vt__16dBgS_MoveBgActor[10];
extern "C" extern u8 m_set_func__16dBgS_MoveBgActor[4 + 4 /* padding */];
extern "C" void __ct__16dBgS_MoveBgActorFv();
extern "C" static void CheckCreateHeap__FP10fopAc_ac_c();
@@ -108,8 +106,6 @@ extern "C" extern u8 m_set_func__16dBgS_MoveBgActor[4 + 4 /* padding */];
void mDoMtx_YrotM(f32 (*)[4], s16);
void fopAcM_entrySolidHeap(fopAc_ac_c*, int (*)(fopAc_ac_c*), u32);
void* operator new(u32);
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void scaleM__14mDoMtx_stack_cFfff();
src/d/bg/d_bg_s_roof_chk.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ asm dBgS_RoofChk::~dBgS_RoofChk() {
/* ############################################################################################## */
/* 804526F4-804526F8 0004+00 s=1 e=0 z=0 None .sdata2 @333 */
SECTION_SDATA2 static u32 lit_333 = 0x4E6E6B28;
SECTION_SDATA2 static f32 lit_333 = 1000000000.0f;
/* 80079124-8007914C 0028+00 s=0 e=1 z=0 None .text Init__12dBgS_RoofChkFv */
#pragma push
src/d/bg/d_bg_s_sph_chk.cpp
-1
View File
@@ -50,7 +50,6 @@ extern "C" static void func_80078B88();
//
void operator delete(void*);
extern "C" extern void* __vt__8cM3dGSph[3];
extern "C" void __ct__8dBgS_ChkFv();
extern "C" void __dt__8dBgS_ChkFv();
src/d/bg/d_bg_s_spl_grp_chk.cpp
+1 -1
View File
@@ -99,7 +99,7 @@ SECTION_SDATA2 static u8 lit_319[4] = {
};
/* 804526EC-804526F0 0004+00 s=1 e=0 z=0 None .sdata2 @320 */
SECTION_SDATA2 static u32 lit_320 = 0x4E6E6B28;
SECTION_SDATA2 static f32 lit_320 = 1000000000.0f;
/* 80078BB0-80078C78 00C8+00 s=0 e=1 z=0 None .text __ct__14dBgS_SplGrpChkFv */
#pragma push
src/d/bg/d_bg_s_wtr_chk.cpp
-2
View File
@@ -29,8 +29,6 @@ extern "C" void __ct__11dBgS_WtrChkFv();
// External References:
//
extern "C" extern void* __vt__11dBgS_WtrChk[12];
extern "C" void __ct__14dBgS_SplGrpChkFv();
extern "C" extern void* __vt__11dBgS_WtrChk[12];
src/d/bg/d_bg_w.cpp
+15 -23
View File
@@ -25,21 +25,17 @@ struct dBgW_Base {
struct csXyz {};
struct dBgS_SphChk {};
struct dBgS_SplGrpChk {};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct cBgS_PolyPassChk {};
struct dBgS_RoofChk {};
struct cM3dGPla {
/* 8026F57C */ void getCrossY(cXyz const&, f32*) const;
};
struct cBgS_GrpPassChk {};
struct cBgS_PolyPassChk {};
struct Vec {};
@@ -50,9 +46,13 @@ struct dBgS_Acch {
/* 800772E8 */ void CalcMovePosWork();
};
struct dBgS_CaptPoly {};
struct dBgS_SplGrpChk {};
struct dBgS_RoofChk {};
struct cBgS_GrpPassChk {};
struct dBgS_SphChk {};
struct dBgS_CaptPoly {};
struct dBgW {
/* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&);
@@ -174,12 +174,12 @@ struct cBgW_GrpElm {
/* 8007A1E4 */ cBgW_GrpElm();
};
struct cBgD_t {};
struct cBgS_GndChk {};
struct cBgS_ShdwDraw {};
struct cBgD_t {};
struct cBgS_LinChk {};
struct cBgW {
@@ -243,9 +243,6 @@ struct cBgW {
//
void dBgW_NewSet(cBgD_t*, u32, f32 (*)[3][4]);
extern "C" extern void* __vt__4dBgW[65];
extern "C" extern void* __vt__8cM3dGTri[3];
extern "C" extern u8 struct_80450F88[8];
extern "C" void __ct__11cBgW_RwgElmFv();
extern "C" void __dt__11cBgW_RwgElmFv();
@@ -405,11 +402,6 @@ void cM3d_Cross_SphTri(cM3dGSph const*, cM3dGTri const*, Vec*);
void* operator new(u32);
void* operator new[](u32);
void operator delete(void*);
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" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
extern "C" void SetOldShapeAngleY__9dBgW_BaseFs();
extern "C" void GetSpeedY__9dBgS_AcchFv();
@@ -841,13 +833,13 @@ asm void cBgW::MakeBlckMinMax(int param_0, cXyz* param_1, cXyz* param_2) {
/* ############################################################################################## */
/* 804526FC-80452700 0004+00 s=1 e=0 z=0 None .sdata2 @3935 */
SECTION_SDATA2 static u32 lit_3935 = 0x4E6E6B28;
SECTION_SDATA2 static f32 lit_3935 = 1000000000.0f;
/* 80452700-80452704 0004+00 s=1 e=0 z=0 None .sdata2 @3936 */
SECTION_SDATA2 static u32 lit_3936 = 0xCE6E6B28;
SECTION_SDATA2 static f32 lit_3936 = -1000000000.0f;
/* 80452704-80452708 0004+00 s=5 e=0 z=0 None .sdata2 @3937 */
SECTION_SDATA2 static u32 lit_3937 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3937 = 1.0f;
/* 80079A68-80079BDC 0174+00 s=1 e=0 z=0 None .text MakeBlckBnd__4cBgWFiP4cXyzP4cXyz */
#pragma push
@@ -901,7 +893,7 @@ asm void cBgW::ChkMemoryError() {
/* ############################################################################################## */
/* 80452708-8045270C 0004+00 s=1 e=0 z=0 None .sdata2 @4073 */
SECTION_SDATA2 static u32 lit_4073 = 0x43000000;
SECTION_SDATA2 static f32 lit_4073 = 128.0f;
/* 80079F38-8007A184 024C+00 s=1 e=3 z=85 None .text Set__4cBgWFP6cBgD_tUlPA3_A4_f */
#pragma push
@@ -1007,7 +999,7 @@ asm void cBgW::RwgGroundCheckGnd(u16 param_0, cBgS_GndChk* param_1) {
/* ############################################################################################## */
/* 8045270C-80452710 0004+00 s=1 e=0 z=0 None .sdata2 @4271 */
SECTION_SDATA2 static u32 lit_4271 = 0x3C656042;
SECTION_SDATA2 static f32 lit_4271 = 0.014000000432133675f;
/* 8007A824-8007A8F4 00D0+00 s=1 e=0 z=0 None .text RwgGroundCheckWall__4cBgWFUsP11cBgS_GndChk
*/
src/d/bg/d_bg_w_kcol.cpp
+32 -45
View File
@@ -29,34 +29,12 @@ struct dBgW_Base {
struct csXyz {};
struct dBgS_SphChk {};
struct cBgS_GndChk {};
struct dBgS_RoofChk {};
struct cBgS_ShdwDraw {};
struct dBgS_SplGrpChk {};
struct dBgPc {
/* 80074048 */ void setCode(sBgPc&);
};
struct cBgS_PolyPassChk {};
struct Vec {};
struct dBgS_CaptPoly {};
struct cBgS_LinChk {};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct KC_PrismData {};
struct cBgS_GrpPassChk {};
struct dBgS_Acch {
/* 800771E4 */ void GetSpeedY();
/* 80077200 */ void GetWallAddY(Vec&);
@@ -64,7 +42,29 @@ struct dBgS_Acch {
/* 800772E8 */ void CalcMovePosWork();
};
struct dBgS_RoofChk {};
struct cBgS_LinChk {};
struct dBgS_SphChk {};
struct dBgS_CaptPoly {};
struct dBgPc {
/* 80074048 */ void setCode(sBgPc&);
};
struct cBgS_PolyInfo {
/* 802681A4 */ void SetPolyIndex(int);
};
struct KC_PrismData {};
struct cBgS_PolyPassChk {};
struct cBgS_GndChk {};
struct dBgS_SplGrpChk {};
struct cBgS_GrpPassChk {};
struct dBgWKCol {
/* 8007E6F4 */ dBgWKCol();
@@ -245,13 +245,6 @@ void cM3d_Len2dSq(f32, f32, f32, f32);
void cM3d_Len2dSqPntAndSegLine(f32, f32, f32, f32, f32, f32, f32*, f32*, f32*);
void cM3d_Cross_SphTri(cM3dGSph const*, cM3dGTri const*, Vec*);
void operator delete(void*);
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" extern u32 __float_nan;
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
extern "C" void setCode__5dBgPcFR5sBgPc();
extern "C" void __ct__6dBgPlcFv();
@@ -565,16 +558,16 @@ SECTION_SDATA2 static u8 lit_4187[4] = {
};
/* 8045271C-80452720 0004+00 s=1 e=0 z=0 None .sdata2 @4188 */
SECTION_SDATA2 static u32 lit_4188 = 0x43FA0000;
SECTION_SDATA2 static f32 lit_4188 = 500.0f;
/* 80452720-80452724 0004+00 s=6 e=0 z=0 None .sdata2 @4189 */
SECTION_SDATA2 static u32 lit_4189 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4189 = 1.0f;
/* 80452724-80452728 0004+00 s=4 e=0 z=0 None .sdata2 @4190 */
SECTION_SDATA2 static u32 lit_4190 = 0x3BF5C28F;
SECTION_SDATA2 static f32 lit_4190 = 0.007499999832361937f;
/* 80452728-8045272C 0004+00 s=4 e=0 z=0 None .sdata2 @4191 */
SECTION_SDATA2 static u32 lit_4191 = 0xBBF5C28F;
SECTION_SDATA2 static f32 lit_4191 = -0.007499999832361937f;
/* 8007EE34-8007F628 07F4+00 s=1 e=0 z=0 None .text LineCheck__8dBgWKColFP11cBgS_LinChk */
#pragma push
@@ -588,7 +581,7 @@ asm void dBgWKCol::LineCheck(cBgS_LinChk* param_0) {
/* ############################################################################################## */
/* 8045272C-80452730 0004+00 s=1 e=0 z=0 None .sdata2 @4293 */
SECTION_SDATA2 static u32 lit_4293 = 0x3C656042;
SECTION_SDATA2 static f32 lit_4293 = 0.014000000432133675f;
/* 8007F628-8007F9A4 037C+00 s=1 e=0 z=0 None .text GroundCross__8dBgWKColFP11cBgS_GndChk */
#pragma push
@@ -639,14 +632,10 @@ asm void dBgWKCol::CaptPoly(dBgS_CaptPoly& param_0) {
static u8 l_wcsbuf[1008];
/* 80452730-80452738 0008+00 s=2 e=0 z=0 None .sdata2 @5298 */
SECTION_SDATA2 static u8 lit_5298[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5298 = 0.5;
/* 80452738-80452740 0008+00 s=2 e=0 z=0 None .sdata2 @5299 */
SECTION_SDATA2 static u8 lit_5299[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5299 = 3.0;
/* 80452740-80452748 0008+00 s=2 e=0 z=0 None .sdata2 @5300 */
SECTION_SDATA2 static u8 lit_5300[8] = {
@@ -716,9 +705,7 @@ asm void dBgWKCol::SphChk(dBgS_SphChk* param_0, void* param_1) {
/* ############################################################################################## */
/* 80452750-80452758 0008+00 s=1 e=0 z=0 None .sdata2 @6099 */
SECTION_SDATA2 static u8 lit_6099[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_6099 = 4503599627370496.0 /* cast u32 to float */;
/* 800829AC-800829F0 0044+00 s=1 e=0 z=0 None .text GetTopUnder__8dBgWKColCFPfPf */
#pragma push
src/d/bg/d_bg_w_sv.cpp
+9 -13
View File
@@ -17,14 +17,14 @@ struct dBgW_Base {
/* 80074AB4 */ void SetOldShapeAngleY(s16);
};
struct cXyz {};
struct csXyz {};
struct cBgS_PolyInfo {};
struct cBgD_t {};
struct cXyz {};
struct dBgWSv {
/* 80082F98 */ void Set(cBgD_t*, u32);
/* 80083020 */ void CopyBackVtx();
@@ -36,19 +36,19 @@ struct dBgWSv {
/* 800835DC */ ~dBgWSv();
};
struct dBgS_SphChk {};
struct dBgS_SplGrpChk {};
struct dBgS_RoofChk {};
struct cBgS_PolyPassChk {};
struct cBgS_GrpPassChk {};
struct dBgS_SplGrpChk {};
struct dBgS_Acch {};
struct dBgS_CaptPoly {};
struct cBgS_GrpPassChk {};
struct dBgS_RoofChk {};
struct dBgS_SphChk {};
struct dBgS_CaptPoly {};
struct dBgW {
/* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&);
@@ -126,8 +126,6 @@ struct cBgW {
// Forward References:
//
extern "C" extern void* __vt__6dBgWSv[65 + 1 /* padding */];
extern "C" void Set__6dBgWSvFP6cBgD_tUl();
extern "C" void CopyBackVtx__6dBgWSvFv();
extern "C" void CrrPosWork__6dBgWSvFP4cXyziii();
@@ -144,8 +142,6 @@ extern "C" extern void* __vt__6dBgWSv[65 + 1 /* padding */];
void* operator new[](u32);
void operator delete(void*);
extern "C" extern void* __vt__4dBgW[65];
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
extern "C" void SetOldShapeAngleY__9dBgW_BaseFs();
extern "C" void __dt__4cBgWFv();
@@ -271,7 +267,7 @@ SECTION_SDATA2 static u8 lit_3807[4] = {
};
/* 8045275C-80452760 0004+00 s=1 e=0 z=0 None .sdata2 @3808 */
SECTION_SDATA2 static u32 lit_3808 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3808 = 1.0f;
/* 80083300-8008351C 021C+00 s=1 e=0 z=0 None .text TransPosWork__6dBgWSvFP4cXyziii */
#pragma push
src/d/cc/d_cc_d.cpp
+26 -47
View File
@@ -153,7 +153,8 @@ struct cM3dGCps {
/* 8026F03C */ void Set(cM3dGCpsS const&);
};
struct cCcD_CpsAttr;
struct cCcD_PntAttr {};
struct cCcD_ShapeAttr {
struct Shape {};
@@ -163,33 +164,10 @@ struct cCcD_ShapeAttr {
};
struct cCcD_TriAttr;
struct cCcD_CylAttr;
struct cCcD_PntAttr {};
struct cCcD_SphAttr;
struct cCcD_CpsAttr;
struct cCcD_AabAttr {};
struct cCcD_SphAttr {
/* 80084B44 */ void GetCoCP() const;
/* 80037A54 */ void GetCoCP();
/* 80264538 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 802645C0 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80084B4C */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80084B54 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80084B5C */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 802644EC */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 8026457C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80264688 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80084B94 */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80084B9C */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80084BA4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 80084BAC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80264644 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 802645F8 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 802646E0 */ void CalcAabBox();
/* 8026476C */ void GetNVec(cXyz const&, cXyz*) const;
/* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
};
struct cCcD_CylAttr {
/* 80084CC0 */ void GetCoCP() const;
/* 80037A4C */ void GetCoCP();
@@ -231,6 +209,28 @@ struct cCcD_CpsAttr {
/* 80264014 */ void GetNVec(cXyz const&, cXyz*) const;
};
struct cCcD_SphAttr {
/* 80084B44 */ void GetCoCP() const;
/* 80037A54 */ void GetCoCP();
/* 80264538 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
/* 802645C0 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
/* 80084B4C */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80084B54 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
/* 80084B5C */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
/* 802644EC */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
/* 8026457C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
/* 80264688 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
/* 80084B94 */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
/* 80084B9C */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
/* 80084BA4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
/* 80084BAC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
/* 80264644 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
/* 802645F8 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
/* 802646E0 */ void CalcAabBox();
/* 8026476C */ void GetNVec(cXyz const&, cXyz*) const;
/* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
};
struct cCcD_TriAttr {
/* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
/* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
@@ -313,13 +313,6 @@ struct cCcD_GObjInf {
//
void dCcD_GetGObjInf(cCcD_Obj*);
extern "C" extern void* __vt__8dCcD_Sph[36];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__8dCcD_Tri[36];
extern "C" extern void* __vt__8dCcD_Cps[36];
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" void ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv();
extern "C" void ct__22dCcD_GAtTgCoCommonBaseFv();
@@ -463,20 +456,6 @@ extern "C" extern void* __vt__10cCcD_GStts[3];
void fopAcIt_Judge(void* (*)(void*, void*), void*);
void fpcSch_JudgeByID(void*, void*);
void operator delete(void*);
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern void* __vt__8cM3dGCyl[3];
extern "C" extern void* __vt__8cM3dGAab[3];
extern "C" extern void* __vt__15cCcD_DivideInfo[3];
extern "C" extern void* __vt__8cM3dGSph[3];
extern "C" extern void* __vt__8cM3dGTri[3];
extern "C" extern void* __vt__12cCcD_SphAttr[25];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
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 u8 m_virtual_center__14cCcD_ShapeAttr[12];
extern "C" extern f32 Zero__4cXyz[3];
extern "C" void fopAcIt_Judge__FPFPvPv_PvPv();
extern "C" void fpcSch_JudgeByID__FPvPv();
src/d/cc/d_cc_mass_s.cpp
+13 -23
View File
@@ -13,10 +13,10 @@
struct fopAc_ac_c {};
struct cCcD_Obj {};
struct cXyz {};
struct cCcD_Obj {};
struct dCcMassS_Obj {
/* 800300F4 */ ~dCcMassS_Obj();
/* 800852E0 */ void Set(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32));
@@ -24,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 {
@@ -115,16 +115,6 @@ extern "C" void GetCamTopPos__12dCcMassS_MngFP3Vec();
void cM_rndF(f32);
void operator delete(void*);
extern "C" extern void* __vt__12dCcMassS_Obj[3];
extern "C" extern void* __vt__15cCcD_DivideArea[3];
extern "C" extern void* __vt__8cM3dGCyl[3];
extern "C" extern void* __vt__8cM3dGAab[3];
extern "C" extern void* __vt__15cCcD_DivideInfo[3];
extern "C" extern void* __vt__12dCcMassS_Mng[3 + 1 /* padding */];
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 f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
extern "C" void __dt__12dCcMassS_ObjFv();
extern "C" void Set__15cCcD_DivideInfoFUlUlUl();
@@ -261,7 +251,7 @@ asm dCcMassS_Obj::dCcMassS_Obj() {
/* ############################################################################################## */
/* 80452764-80452768 0004+00 s=2 e=0 z=0 None .sdata2 @3724 */
SECTION_SDATA2 static u32 lit_3724 = 0xCE6E6B28;
SECTION_SDATA2 static f32 lit_3724 = -1000000000.0f;
/* 800855E4-80085630 004C+00 s=1 e=1 z=0 None .text Ct__12dCcMassS_MngFv */
#pragma push
@@ -285,7 +275,7 @@ asm void dCcMassS_Mng::SetAttr(f32 param_0, f32 param_1, u8 param_2, u8 param_3)
/* ############################################################################################## */
/* 80452768-8045276C 0004+00 s=1 e=0 z=0 None .sdata2 @3780 */
SECTION_SDATA2 static u32 lit_3780 = 0x4E6E6B28;
SECTION_SDATA2 static f32 lit_3780 = 1000000000.0f;
/* 80085690-800858AC 021C+00 s=0 e=1 z=1 None .text Prepare__12dCcMassS_MngFv */
#pragma push
@@ -299,10 +289,10 @@ asm void dCcMassS_Mng::Prepare() {
/* ############################################################################################## */
/* 8045276C-80452770 0004+00 s=2 e=0 z=0 None .sdata2 @3899 */
SECTION_SDATA2 static u32 lit_3899 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3899 = 1.0f;
/* 80452770-80452774 0004+00 s=1 e=0 z=0 None .sdata2 @3900 */
SECTION_SDATA2 static u32 lit_3900 = 0x41A00000;
SECTION_SDATA2 static f32 lit_3900 = 20.0f;
/* 800858AC-80085CF0 0444+00 s=0 e=0 z=2 None .text
* Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf */
@@ -327,7 +317,7 @@ asm void dCcMassS_Mng::Clear() {
/* ############################################################################################## */
/* 80452774-80452778 0004+00 s=1 e=0 z=0 None .sdata2 @3941 */
SECTION_SDATA2 static u32 lit_3941 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3941 = 0.5f;
/* 80085D98-80085E6C 00D4+00 s=0 e=4 z=7 None .text Set__12dCcMassS_MngFP8cCcD_ObjUc */
#pragma push
src/d/cc/d_cc_s.cpp
+11 -25
View File
@@ -29,28 +29,28 @@ struct dJntCol_c {
/* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
};
struct cCcD_GStts {};
struct cCcD_ShapeAttr {
struct Shape {};
};
struct cCcD_GObjInf {};
struct cCcD_Obj {
/* 80263A48 */ void GetAc();
};
struct cCcD_Stts {
/* 80263934 */ void PlusCcMove(f32, f32, f32);
/* 80263970 */ void PlusDmg(int);
};
struct cCcD_GObjInf {};
struct dCcD_GStts {};
struct dCcD_GObjInf {
/* 800843DC */ void ChkAtNoGuard();
};
struct cCcD_Obj {
/* 80263A48 */ void GetAc();
};
struct cCcD_GStts {};
struct dCcD_GStts {};
struct dCcS {
/* 8002FF40 */ ~dCcS();
@@ -142,8 +142,6 @@ struct Vec {};
// Forward References:
//
extern "C" extern void* __vt__4dCcS[13];
extern "C" void Ct__4dCcSFv();
extern "C" void Dt__4dCcSFv();
extern "C" void ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz();
@@ -180,16 +178,6 @@ extern "C" extern void* __vt__4dCcS[13];
void cM3d_CalcVecZAngle(Vec const&, csXyz*);
void cLib_distanceAngleS(s16, s16);
void operator delete(void*);
extern "C" extern void* __vt__8cM3dGAab[3];
extern "C" extern void* __vt__15cCcD_DivideInfo[3];
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" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 BaseZ__4cXyz[12];
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz();
extern "C" void __dt__4dCcSFv();
@@ -488,7 +476,7 @@ SECTION_DATA static u8 rank_tbl[121 + 3 /* padding */] = {
};
/* 8045277C-80452780 0004+00 s=1 e=0 z=0 None .sdata2 @3924 */
SECTION_SDATA2 static u32 lit_3924 = 0x3C23D70A;
SECTION_SDATA2 static f32 lit_3924 = 1.0f / 100.0f;
/* 80452780-80452788 0004+04 s=2 e=0 z=0 None .sdata2 @3925 */
SECTION_SDATA2 static f32 lit_3925[1 + 1 /* padding */] = {
@@ -498,9 +486,7 @@ SECTION_SDATA2 static f32 lit_3925[1 + 1 /* padding */] = {
};
/* 80452788-80452790 0008+00 s=1 e=0 z=0 None .sdata2 @3927 */
SECTION_SDATA2 static u8 lit_3927[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3927 = 4503599627370496.0 /* cast u32 to float */;
/* 8008640C-80086754 0348+00 s=1 e=0 z=0 None .text
* SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf */
src/d/cc/d_cc_uty.cpp
+7 -20
View File
@@ -60,9 +60,6 @@ extern "C" bool checkCutJumpCancelTurn__9daPy_py_cCFv();
void dCcD_GetGObjInf(cCcD_Obj*);
void cM_atan2s(f32, f32);
void cM_rndFX(f32);
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u32 __float_nan;
extern "C" extern u8 struct_80451124[4];
extern "C" void getHitSeID__12dCcD_GObjInfFUci();
extern "C" void dCcD_GetGObjInf__FP8cCcD_Obj();
@@ -174,27 +171,17 @@ asm void at_power_check(dCcU_AtInfo* param_0) {
/* ############################################################################################## */
/* 80452798-804527A0 0004+04 s=1 e=0 z=0 None .sdata2 @4212 */
SECTION_SDATA2 static u8 lit_4212[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_4212[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 804527A0-804527A8 0008+00 s=1 e=0 z=0 None .sdata2 @4213 */
SECTION_SDATA2 static u8 lit_4213[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4213 = 0.5;
/* 804527A8-804527B0 0008+00 s=1 e=0 z=0 None .sdata2 @4214 */
SECTION_SDATA2 static u8 lit_4214[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4214 = 3.0;
/* 804527B0-804527B8 0008+00 s=1 e=0 z=0 None .sdata2 @4215 */
SECTION_SDATA2 static u8 lit_4215[8] = {
@@ -202,10 +189,10 @@ SECTION_SDATA2 static u8 lit_4215[8] = {
};
/* 804527B8-804527BC 0004+00 s=1 e=0 z=0 None .sdata2 @4216 */
SECTION_SDATA2 static u32 lit_4216 = 0x42C80000;
SECTION_SDATA2 static f32 lit_4216 = 100.0f;
/* 804527BC-804527C0 0004+00 s=1 e=0 z=0 None .sdata2 @4217 */
SECTION_SDATA2 static u32 lit_4217 = 0x457A0000;
SECTION_SDATA2 static f32 lit_4217 = 4000.0f;
/* 804527C0-804527C8 0004+04 s=1 e=0 z=0 None .sdata2 @4218 */
SECTION_SDATA2 static f32 lit_4218[1 + 1 /* padding */] = {
src/d/com/d_com_inf_actor.cpp
-3
View File
@@ -14,9 +14,6 @@
extern "C" extern u8 g_dComIfAc_gameInfo[8];
extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */];
extern "C" extern u8 g_dComIfAc_gameInfo[8];
extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */];
//
// External References:
//
src/d/com/d_com_inf_game.cpp
+5 -45
View File
@@ -509,19 +509,6 @@ void dComIfGs_offVisitedRoom(int);
void dComIfGs_isVisitedRoom(int);
void dComIfGs_staffroll_next_go();
void dComIfGs_staffroll_next_go_check();
extern "C" extern char const* const d_com_d_com_inf_game__stringBase0;
extern "C" extern void* __vt__25mDoExt_McaMorfCallBack1_c[3];
extern "C" extern void* __vt__12dCcMassS_Obj[3];
extern "C" extern void* __vt__15cCcD_DivideArea[3];
extern "C" extern void* __vt__8cM3dGCyl[3];
extern "C" extern void* __vt__8cM3dGAab[3];
extern "C" extern void* __vt__15cCcD_DivideInfo[3];
extern "C" extern void* __vt__12dCcMassS_Mng[3 + 1 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_clearColor[4];
extern "C" extern u32 g_blackColor;
extern "C" extern u32 g_whiteColor;
extern "C" extern u32 g_saftyWhiteColor;
extern "C" void ct__14dComIfG_play_cFv();
extern "C" void init__14dComIfG_play_cFv();
@@ -740,29 +727,6 @@ void dMenuFmap_getStartStageName(void*);
void cPhs_Handler(request_of_phase_process_class*, int (**)(void*), void*);
void* operator new(u32);
void operator delete(void*);
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" extern void* __vt__19dAttDraw_CallBack_c[3];
extern "C" extern void* __vt__11dAttParam_c[3 + 1 /* padding */];
extern "C" extern void* __vt__4dBgS[5];
extern "C" extern void* __vt__4cBgS[5];
extern "C" extern void* __vt__11cBgS_ChkElm[4];
extern "C" extern void* __vt__4dCcS[13];
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" 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" extern u8 struct_80450D64[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
SECTION_INIT void memset();
extern "C" void OSReport_Error();
@@ -1455,7 +1419,7 @@ asm void dComIfGp_getReverb(int param_0) {
/* ############################################################################################## */
/* 80451D00-80451D04 0004+00 s=2 e=0 z=0 None .sdata2 @5090 */
SECTION_SDATA2 static u32 lit_5090 = 0xCE6E6B28;
SECTION_SDATA2 static f32 lit_5090 = -1000000000.0f;
/* 8002D0B4-8002D1AC 00F8+00 s=0 e=3 z=34 None .text
* dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj */
@@ -1851,9 +1815,7 @@ SECTION_SDATA2 static f32 lit_6335[1 + 1 /* padding */] = {
};
/* 80451D10-80451D18 0008+00 s=1 e=0 z=0 None .sdata2 @6337 */
SECTION_SDATA2 static u8 lit_6337[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_6337 = 4503601774854144.0 /* cast s32 to float */;
/* 8002E22C-8002E2DC 00B0+00 s=1 e=0 z=0 None .text dComIfGp_createSubExpHeap2D__Fv */
#pragma push
@@ -2013,10 +1975,10 @@ asm void dComIfG_getTrigA(u32 param_0) {
/* ############################################################################################## */
/* 80451D18-80451D1C 0004+00 s=1 e=0 z=0 None .sdata2 @6980 */
SECTION_SDATA2 static u32 lit_6980 = 0xC7B05E00;
SECTION_SDATA2 static f32 lit_6980 = -90300.0f;
/* 80451D1C-80451D20 0004+00 s=1 e=0 z=0 None .sdata2 @6981 */
SECTION_SDATA2 static u32 lit_6981 = 0x474A5800;
SECTION_SDATA2 static f32 lit_6981 = 51800.0f;
/* 8002E9F0-8002EC54 0264+00 s=0 e=1 z=0 None .text dComIfGp_calcNowRegion__Fv */
#pragma push
@@ -2403,9 +2365,7 @@ asm void dComIfGs_shake_kandelaar_check() {
/* ############################################################################################## */
/* 80451D20-80451D28 0008+00 s=1 e=0 z=0 None .sdata2 @7580 */
SECTION_SDATA2 static u8 lit_7580[8] = {
0x3F, 0xE3, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33,
};
SECTION_SDATA2 static f64 lit_7580 = 0.6;
/* 8002FA54-8002FA84 0030+00 s=0 e=4 z=96 None .text dComIfGs_wolfeye_effect_check__Fv */
#pragma push
src/d/com/d_com_static.cpp
-32
View File
@@ -129,35 +129,6 @@ void daNpcKakashi_setSwdTutorialResult(bool);
void daNpcKakashi_getSuccessCount();
void daNpcKakashi_incSuccessCount();
void daNpcKakashi_clrSuccessCount();
extern "C" extern char const* const d_com_d_com_static__stringBase0;
extern "C" extern u8 mRoom__7daSus_c[256];
extern "C" extern u8 m_entryModel__10daMirror_c[12];
extern "C" extern u8 m_deleteRoom__15dGrass_packet_c[12];
extern "C" extern u8 m_deleteRoom__16dFlower_packet_c[12];
extern "C" extern u8 struct_80450D88[4];
extern "C" extern u8 struct_80450D8C[4];
extern "C" extern u8 m_aim_rate__8daYkgr_c[4];
extern "C" extern u8 m_path__8daYkgr_c[4];
extern "C" extern u8 m_emitter__8daYkgr_c[4];
extern "C" extern u8 m_top__13daTagStream_c[4];
extern "C" extern u8 m_myObj__10daMirror_c[4];
extern "C" extern u8 m_myObj__9daGrass_c[4];
extern "C" extern u8 m_grass__9daGrass_c[4];
extern "C" extern u8 m_flower__9daGrass_c[4];
extern "C" extern u8 m_myObj__6daMP_c[4];
extern "C" extern u8 mTagMagne__12daTagMagne_c[4];
extern "C" extern u8 struct_80450DC0[4];
extern "C" extern u8 pad_80450DD1[4];
extern "C" extern void* M_dir_base__Q212daObjMovebox5Act_c[2];
extern "C" extern u32 OPEN_SIZE__7daDsh_c;
extern "C" extern u32 OPEN_ACCEL__7daDsh_c;
extern "C" extern u32 OPEN_SPEED__7daDsh_c;
extern "C" extern u32 OPEN_BOUND_SPEED__7daDsh_c;
extern "C" extern u32 OPEN_BOUND_RATIO__7daDsh_c;
extern "C" extern u32 CLOSE_ACCEL__7daDsh_c;
extern "C" extern u32 CLOSE_SPEED__7daDsh_c;
extern "C" extern u32 CLOSE_BOUND_SPEED__7daDsh_c;
extern "C" extern u32 CLOSE_BOUND_RATIO__7daDsh_c;
extern "C" void set__Q27daSus_c6data_cFScRC4cXyzRC4cXyzUcUcUc();
extern "C" void reset__Q27daSus_c6data_cFv();
@@ -250,9 +221,6 @@ void mDoMch_Create();
void fopAcM_delete(fopAc_ac_c*);
void fpoAcM_relativePos(fopAc_ac_c const*, cXyz const*, cXyz*);
void operator delete(void*);
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" void __dt__4cXyzFv();
extern "C" void mDoMch_Create__Fv();
src/d/d_att_dist.cpp
-2
View File
@@ -13,8 +13,6 @@
extern "C" extern u8 dist_table__12dAttention_c[6552];
extern "C" extern u8 dist_table__12dAttention_c[6552];
//
// External References:
//
src/d/d_attention.cpp
+31 -56
View File
@@ -63,6 +63,12 @@ struct dRes_control_c {
/* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int);
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct cSAngle {
/* 80270F68 */ cSAngle(cSAngle const&);
/* 80270F98 */ cSAngle(s16);
@@ -70,12 +76,6 @@ struct cSAngle {
/* 80271228 */ void operator-(s16) const;
};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct dAttention_c {
/* 80070198 */ dAttention_c(fopAc_ac_c*, u32);
/* 80070774 */ ~dAttention_c();
@@ -205,12 +205,6 @@ static void distace_angle_adjust(f32, s16, f32);
static void check_distace(cXyz*, s16, cXyz*, f32, f32, f32, f32);
static void select_attention(fopAc_ac_c*, void*);
static void sound_attention(fopAc_ac_c*, void*);
extern "C" extern char const* const d_d_attention__stringBase0;
extern "C" extern void* __vt__19dAttDraw_CallBack_c[3];
extern "C" extern void* __vt__11dAttParam_c[3 + 1 /* padding */];
extern "C" extern u8 pad_8045067A[4];
extern "C" extern u8 data_80450680[8];
extern "C" extern u8 data_80450688[8];
extern "C" static void func_80070018();
extern "C" void __ct__11dAttParam_cFl();
@@ -305,17 +299,6 @@ void fopAcIt_Judge(void* (*)(void*, void*), void*);
void fopAcM_searchActorDistance(fopAc_ac_c const*, fopAc_ac_c const*);
void fpcSch_JudgeByID(void*, void*);
void operator delete(void*);
extern "C" extern void* __vt__25mDoExt_McaMorfCallBack1_c[3];
extern "C" extern u8 dist_table__12dAttention_c[6552];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 j3dSys[284];
extern "C" extern u32 __float_nan;
extern "C" extern u32 __float_max;
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 data_80450F58[8];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
SECTION_INIT void memcpy();
extern "C" void play__14mDoExt_baseAnmFv();
@@ -464,34 +447,34 @@ SECTION_DATA void* __vt__11dAttParam_c[3 + 1 /* padding */] = {
};
/* 80452628-8045262C 0004+00 s=1 e=0 z=0 None .sdata2 @4061 */
SECTION_SDATA2 static u32 lit_4061 = 0x42340000;
SECTION_SDATA2 static f32 lit_4061 = 45.0f;
/* 8045262C-80452630 0004+00 s=1 e=0 z=0 None .sdata2 @4062 */
SECTION_SDATA2 static u32 lit_4062 = 0x41F00000;
SECTION_SDATA2 static f32 lit_4062 = 30.0f;
/* 80452630-80452634 0004+00 s=1 e=0 z=0 None .sdata2 @4063 */
SECTION_SDATA2 static u32 lit_4063 = 0x42B40000;
SECTION_SDATA2 static f32 lit_4063 = 90.0f;
/* 80452634-80452638 0004+00 s=2 e=0 z=0 None .sdata2 @4064 */
SECTION_SDATA2 static u32 lit_4064 = 0xBF666666;
SECTION_SDATA2 static f32 lit_4064 = -9.0f / 10.0f;
/* 80452638-8045263C 0004+00 s=1 e=0 z=0 None .sdata2 @4065 */
SECTION_SDATA2 static u32 lit_4065 = 0x453B8000;
SECTION_SDATA2 static f32 lit_4065 = 3000.0f;
/* 8045263C-80452640 0004+00 s=1 e=0 z=0 None .sdata2 @4066 */
SECTION_SDATA2 static u32 lit_4066 = 0x447A0000;
SECTION_SDATA2 static f32 lit_4066 = 1000.0f;
/* 80452640-80452644 0004+00 s=1 e=0 z=0 None .sdata2 @4067 */
SECTION_SDATA2 static u32 lit_4067 = 0x40C00000;
SECTION_SDATA2 static f32 lit_4067 = 6.0f;
/* 80452644-80452648 0004+00 s=1 e=0 z=0 None .sdata2 @4068 */
SECTION_SDATA2 static u32 lit_4068 = 0x40900000;
SECTION_SDATA2 static f32 lit_4068 = 4.5f;
/* 80452648-8045264C 0004+00 s=1 e=0 z=0 None .sdata2 @4069 */
SECTION_SDATA2 static u32 lit_4069 = 0x41600000;
SECTION_SDATA2 static f32 lit_4069 = 14.0f;
/* 8045264C-80452650 0004+00 s=1 e=0 z=0 None .sdata2 @4070 */
SECTION_SDATA2 static u32 lit_4070 = 0x41200000;
SECTION_SDATA2 static f32 lit_4070 = 10.0f;
/* 80452650-80452654 0004+00 s=12 e=0 z=0 None .sdata2 @4071 */
SECTION_SDATA2 static u8 lit_4071[4] = {
@@ -502,10 +485,10 @@ SECTION_SDATA2 static u8 lit_4071[4] = {
};
/* 80452654-80452658 0004+00 s=1 e=0 z=0 None .sdata2 @4072 */
SECTION_SDATA2 static u32 lit_4072 = 0x3FD9999A;
SECTION_SDATA2 static f32 lit_4072 = 17.0f / 10.0f;
/* 80452658-8045265C 0004+00 s=10 e=0 z=0 None .sdata2 @4073 */
SECTION_SDATA2 static u32 lit_4073 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4073 = 1.0f;
/* 80070038-80070110 00D8+00 s=1 e=0 z=0 None .text __ct__11dAttParam_cFl */
#pragma push
@@ -529,10 +512,10 @@ asm dAttParam_c::~dAttParam_c() {
/* ############################################################################################## */
/* 8045265C-80452660 0004+00 s=1 e=0 z=0 None .sdata2 @4084 */
SECTION_SDATA2 static u32 lit_4084 = 0x437A0000;
SECTION_SDATA2 static f32 lit_4084 = 250.0f;
/* 80452660-80452664 0004+00 s=1 e=0 z=0 None .sdata2 @4085 */
SECTION_SDATA2 static u32 lit_4085 = 0x40000000;
SECTION_SDATA2 static f32 lit_4085 = 2.0f;
/* 80070158-80070178 0020+00 s=1 e=0 z=0 None .text __ct__15dAttDrawParam_cFv */
#pragma push
@@ -546,7 +529,7 @@ asm dAttDrawParam_c::dAttDrawParam_c() {
/* ############################################################################################## */
/* 80452664-80452668 0004+00 s=1 e=0 z=0 None .sdata2 @4092 */
SECTION_SDATA2 static u32 lit_4092 = 0x3F19999A;
SECTION_SDATA2 static f32 lit_4092 = 3.0f / 5.0f;
/* 80070178-80070198 0020+00 s=1 e=0 z=0 None .text
* execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo */
@@ -685,9 +668,7 @@ SECTION_SDATA2 static f32 lit_4448[1 + 1 /* padding */] = {
};
/* 80452670-80452678 0008+00 s=3 e=0 z=0 None .sdata2 @4450 */
SECTION_SDATA2 static u8 lit_4450[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4450 = 4503601774854144.0 /* cast s32 to float */;
/* 80070BF4-80070C40 004C+00 s=2 e=0 z=0 None .text distace_weight__Ffsf */
#pragma push
@@ -711,14 +692,10 @@ asm static void distace_angle_adjust(f32 param_0, s16 param_1, f32 param_2) {
/* ############################################################################################## */
/* 80452678-80452680 0008+00 s=3 e=0 z=0 None .sdata2 @4514 */
SECTION_SDATA2 static u8 lit_4514[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4514 = 0.5;
/* 80452680-80452688 0008+00 s=3 e=0 z=0 None .sdata2 @4515 */
SECTION_SDATA2 static u8 lit_4515[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4515 = 3.0;
/* 80452688-80452690 0008+00 s=3 e=0 z=0 None .sdata2 @4516 */
SECTION_SDATA2 static u8 lit_4516[8] = {
@@ -738,10 +715,10 @@ asm static void check_distace(cXyz* param_0, s16 param_1, cXyz* param_2, f32 par
/* ############################################################################################## */
/* 80452690-80452694 0004+00 s=3 e=0 z=0 None .sdata2 @4562 */
SECTION_SDATA2 static u32 lit_4562 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4562 = -1.0f;
/* 80452694-80452698 0004+00 s=3 e=0 z=0 None .sdata2 @4563 */
SECTION_SDATA2 static u32 lit_4563 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4563 = 0.5f;
/* 80070E90-800710C0 0230+00 s=2 e=0 z=0 None .text
* calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl */
@@ -901,10 +878,10 @@ asm static void sound_attention(fopAc_ac_c* param_0, void* param_1) {
/* ############################################################################################## */
/* 80452698-8045269C 0004+00 s=1 e=0 z=0 None .sdata2 @5137 */
SECTION_SDATA2 static u32 lit_5137 = 0x461C4000;
SECTION_SDATA2 static f32 lit_5137 = 10000.0f;
/* 8045269C-804526A0 0004+00 s=1 e=0 z=0 None .sdata2 @5138 */
SECTION_SDATA2 static u32 lit_5138 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_5138 = 1.0f / 10.0f;
/* 80071DEC-80071E84 0098+00 s=1 e=0 z=0 None .text runSoundProc__12dAttention_cFv */
#pragma push
@@ -1041,9 +1018,7 @@ SECTION_SDATA2 static f32 lit_5668[1 + 1 /* padding */] = {
};
/* 804526A8-804526B0 0008+00 s=1 e=0 z=0 None .sdata2 @5670 */
SECTION_SDATA2 static u8 lit_5670[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5670 = 4503599627370496.0 /* cast u32 to float */;
/* 80073004-800732AC 02A8+00 s=1 e=0 z=0 None .text alphaAnm__10dAttDraw_cFv */
#pragma push
@@ -1063,10 +1038,10 @@ void J3DTevBlock::setTevKColor(u32 param_0, J3DGXColor const* param_1) {
/* ############################################################################################## */
/* 804526B0-804526B4 0004+00 s=1 e=0 z=0 None .sdata2 @5784 */
SECTION_SDATA2 static u32 lit_5784 = 0x3C8EFA35;
SECTION_SDATA2 static f32 lit_5784 = 0.01745329238474369f;
/* 804526B4-804526B8 0004+00 s=1 e=0 z=0 None .sdata2 @5785 */
SECTION_SDATA2 static u32 lit_5785 = 0xC2C80000;
SECTION_SDATA2 static f32 lit_5785 = -100.0f;
/* 800732B0-8007353C 028C+00 s=1 e=0 z=0 None .text draw__10dAttDraw_cFR4cXyzPA4_f */
#pragma push
src/d/d_bright_check.cpp
+1 -7
View File
@@ -63,8 +63,6 @@ struct J2DScreen {
// Forward References:
//
extern "C" extern char const* const d_d_bright_check__stringBase0;
extern "C" void __ct__14dBrightCheck_cFP10JKRArchive();
extern "C" void __dt__14dBrightCheck_cFv();
extern "C" void screenSet__14dBrightCheck_cFv();
@@ -85,10 +83,6 @@ void mDoExt_getMesgFont();
void mDoExt_getRubyFont();
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoExt_getMesgFont__Fv();
extern "C" void mDoExt_getRubyFont__Fv();
@@ -254,7 +248,7 @@ void dBrightCheck_c::modeWait() {
/* ############################################################################################## */
/* 80453A04-80453A08 0004+00 s=1 e=0 z=0 None .sdata2 @3821 */
SECTION_SDATA2 static u32 lit_3821 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3821 = 1.0f;
/* 80453A08-80453A10 0004+04 s=1 e=0 z=0 None .sdata2 @3822 */
SECTION_SDATA2 static f32 lit_3822[1 + 1 /* padding */] = {
src/d/d_cam_param.cpp
+54 -77
View File
@@ -41,10 +41,10 @@ struct dCamParam_c {
/* 80088620 */ void SearchStyle(u32);
};
struct cSAngle {};
struct cXyz {};
struct cSAngle {};
struct dCamMath {
/* 8008813C */ void rationalBezierRatio(f32, f32);
/* 80088284 */ void zoomFovy(f32, f32);
@@ -68,8 +68,6 @@ struct cDegree {
// Forward References:
//
extern "C" extern char const* const d_d_cam_param__stringBase0;
extern "C" void rationalBezierRatio__8dCamMathFff();
extern "C" void zoomFovy__8dCamMathFff();
extern "C" void __dt__7cDegreeFv();
@@ -99,7 +97,6 @@ void mDoMtx_YrotS(f32 (*)[4], s16);
void dCam_getBody();
void cM_atan2f(f32, f32);
void operator delete(void*);
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" void mDoMtx_XrotS__FPA4_fs();
extern "C" void mDoMtx_YrotS__FPA4_fs();
@@ -121,37 +118,23 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384];
/* ############################################################################################## */
/* 804527C8-804527D0 0004+04 s=2 e=0 z=0 None .sdata2 @3769 */
SECTION_SDATA2 static u8 lit_3769[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_3769[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 804527D0-804527D8 0008+00 s=1 e=0 z=0 None .sdata2 @3770 */
SECTION_SDATA2 static u8 lit_3770[8] = {
0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3770 = 1.0;
/* 804527D8-804527E0 0008+00 s=1 e=0 z=0 None .sdata2 @3771 */
SECTION_SDATA2 static u8 lit_3771[8] = {
0xBF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3771 = -1.0;
/* 804527E0-804527E8 0008+00 s=1 e=0 z=0 None .sdata2 @3772 */
SECTION_SDATA2 static u8 lit_3772[8] = {
0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3772 = 2.0;
/* 804527E8-804527F0 0008+00 s=1 e=0 z=0 None .sdata2 @3773 */
SECTION_SDATA2 static u8 lit_3773[8] = {
0x40, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3773 = 4.0;
/* 804527F0-804527F8 0008+00 s=1 e=0 z=0 None .sdata2 @3774 */
SECTION_SDATA2 static u8 lit_3774[8] = {
@@ -159,19 +142,13 @@ SECTION_SDATA2 static u8 lit_3774[8] = {
};
/* 804527F8-80452800 0008+00 s=1 e=0 z=0 None .sdata2 @3775 */
SECTION_SDATA2 static u8 lit_3775[8] = {
0x3E, 0x7A, 0xD7, 0xF2, 0x9A, 0xBC, 0xAF, 0x48,
};
SECTION_SDATA2 static f64 lit_3775 = 1e-07;
/* 80452800-80452808 0008+00 s=1 e=0 z=0 None .sdata2 @3776 */
SECTION_SDATA2 static u8 lit_3776[8] = {
0xBE, 0x7A, 0xD7, 0xF2, 0x9A, 0xBC, 0xAF, 0x48,
};
SECTION_SDATA2 static f64 lit_3776 = -1e-07;
/* 80452808-80452810 0008+00 s=1 e=0 z=0 None .sdata2 @3777 */
SECTION_SDATA2 static u8 lit_3777[8] = {
0x3E, 0x7A, 0xD7, 0xF2, 0xA0, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3777 = 1.0000000116860974e-07;
/* 8008813C-80088284 0148+00 s=0 e=12 z=0 None .text rationalBezierRatio__8dCamMathFff */
#pragma push
@@ -185,10 +162,10 @@ asm void dCamMath::rationalBezierRatio(f32 param_0, f32 param_1) {
/* ############################################################################################## */
/* 80452810-80452814 0004+00 s=2 e=0 z=0 None .sdata2 @3791 */
SECTION_SDATA2 static u32 lit_3791 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3791 = 1.0f;
/* 80452814-80452818 0004+00 s=1 e=0 z=0 None .sdata2 @3807 */
SECTION_SDATA2 static u32 lit_3807 = 0x42652EE0;
SECTION_SDATA2 static f32 lit_3807 = 57.2957763671875f;
/* 80088284-800882E0 005C+00 s=0 e=1 z=0 None .text zoomFovy__8dCamMathFff */
#pragma push
@@ -266,10 +243,10 @@ SECTION_DATA static void* __vt__9dCstick_c[3 + 1 /* padding */] = {
};
/* 80452818-8045281C 0004+00 s=3 e=0 z=0 None .sdata2 @3991 */
SECTION_SDATA2 static u32 lit_3991 = 0x3E4CCCCD;
SECTION_SDATA2 static f32 lit_3991 = 1.0f / 5.0f;
/* 8045281C-80452820 0004+00 s=1 e=0 z=0 None .sdata2 @3992 */
SECTION_SDATA2 static u32 lit_3992 = 0x3F733333;
SECTION_SDATA2 static f32 lit_3992 = 19.0f / 20.0f;
/* 80088434-8008845C 0028+00 s=1 e=0 z=0 None .text __ct__9dCstick_cFv */
#pragma push
@@ -288,46 +265,46 @@ bool dCstick_c::Shift(u32 param_0) {
/* ############################################################################################## */
/* 80452820-80452824 0004+00 s=1 e=0 z=0 None .sdata2 @4001 */
SECTION_SDATA2 static u32 lit_4001 = 0x42000000;
SECTION_SDATA2 static f32 lit_4001 = 32.0f;
/* 80452824-80452828 0004+00 s=2 e=0 z=0 None .sdata2 @4002 */
SECTION_SDATA2 static u32 lit_4002 = 0x41C80000;
SECTION_SDATA2 static f32 lit_4002 = 25.0f;
/* 80452828-8045282C 0004+00 s=2 e=0 z=0 None .sdata2 @4003 */
SECTION_SDATA2 static u32 lit_4003 = 0x3ECCCCCD;
SECTION_SDATA2 static f32 lit_4003 = 2.0f / 5.0f;
/* 8045282C-80452830 0004+00 s=1 e=0 z=0 None .sdata2 @4004 */
SECTION_SDATA2 static u32 lit_4004 = 0x3F19999A;
SECTION_SDATA2 static f32 lit_4004 = 3.0f / 5.0f;
/* 80452830-80452834 0004+00 s=1 e=0 z=0 None .sdata2 @4005 */
SECTION_SDATA2 static u32 lit_4005 = 0x40400000;
SECTION_SDATA2 static f32 lit_4005 = 3.0f;
/* 80452834-80452838 0004+00 s=2 e=0 z=0 None .sdata2 @4006 */
SECTION_SDATA2 static u32 lit_4006 = 0x41700000;
SECTION_SDATA2 static f32 lit_4006 = 15.0f;
/* 80452838-8045283C 0004+00 s=2 e=0 z=0 None .sdata2 @4007 */
SECTION_SDATA2 static u32 lit_4007 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4007 = 0.5f;
/* 8045283C-80452840 0004+00 s=2 e=0 z=0 None .sdata2 @4008 */
SECTION_SDATA2 static u32 lit_4008 = 0x3E99999A;
SECTION_SDATA2 static f32 lit_4008 = 3.0f / 10.0f;
/* 80452840-80452844 0004+00 s=2 e=0 z=0 None .sdata2 @4009 */
SECTION_SDATA2 static u32 lit_4009 = 0x41200000;
SECTION_SDATA2 static f32 lit_4009 = 10.0f;
/* 80452844-80452848 0004+00 s=2 e=0 z=0 None .sdata2 @4010 */
SECTION_SDATA2 static u32 lit_4010 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_4010 = 1.0f / 10.0f;
/* 80452848-8045284C 0004+00 s=2 e=0 z=0 None .sdata2 @4011 */
SECTION_SDATA2 static u32 lit_4011 = 0x3F400000;
SECTION_SDATA2 static f32 lit_4011 = 0.75f;
/* 8045284C-80452850 0004+00 s=2 e=0 z=0 None .sdata2 @4012 */
SECTION_SDATA2 static u32 lit_4012 = 0x42A00000;
SECTION_SDATA2 static f32 lit_4012 = 80.0f;
/* 80452850-80452854 0004+00 s=1 e=0 z=0 None .sdata2 @4013 */
SECTION_SDATA2 static u32 lit_4013 = 0x3DA3D70A;
SECTION_SDATA2 static f32 lit_4013 = 2.0f / 25.0f;
/* 80452854-80452858 0004+00 s=2 e=0 z=0 None .sdata2 @4014 */
SECTION_SDATA2 static u32 lit_4014 = 0x42F00000;
SECTION_SDATA2 static f32 lit_4014 = 120.0f;
/* 80088464-800884F0 008C+00 s=1 e=0 z=0 None .text __ct__11dCamBGChk_cFv */
#pragma push
@@ -391,73 +368,73 @@ asm void dCamParam_c::SearchStyle(u32 param_0) {
/* ############################################################################################## */
/* 80452858-8045285C 0004+00 s=1 e=0 z=0 None .sdata2 @4058 */
SECTION_SDATA2 static u32 lit_4058 = 0x3E800000;
SECTION_SDATA2 static f32 lit_4058 = 0.25f;
/* 8045285C-80452860 0004+00 s=1 e=0 z=0 None .sdata2 @4119 */
SECTION_SDATA2 static u32 lit_4119 = 0x47C35000;
SECTION_SDATA2 static f32 lit_4119 = 100000.0f;
/* 80452860-80452864 0004+00 s=1 e=0 z=0 None .sdata2 @4120 */
SECTION_SDATA2 static u32 lit_4120 = 0x3D4CCCCD;
SECTION_SDATA2 static f32 lit_4120 = 1.0f / 20.0f;
/* 80452864-80452868 0004+00 s=1 e=0 z=0 None .sdata2 @4121 */
SECTION_SDATA2 static u32 lit_4121 = 0xC2700000;
SECTION_SDATA2 static f32 lit_4121 = -60.0f;
/* 80452868-8045286C 0004+00 s=1 e=0 z=0 None .sdata2 @4122 */
SECTION_SDATA2 static u32 lit_4122 = 0x3EA8F5C3;
SECTION_SDATA2 static f32 lit_4122 = 33.0f / 100.0f;
/* 8045286C-80452870 0004+00 s=1 e=0 z=0 None .sdata2 @4123 */
SECTION_SDATA2 static u32 lit_4123 = 0x3CA3D70A;
SECTION_SDATA2 static f32 lit_4123 = 1.0f / 50.0f;
/* 80452870-80452874 0004+00 s=1 e=0 z=0 None .sdata2 @4124 */
SECTION_SDATA2 static u32 lit_4124 = 0x42C80000;
SECTION_SDATA2 static f32 lit_4124 = 100.0f;
/* 80452874-80452878 0004+00 s=1 e=0 z=0 None .sdata2 @4125 */
SECTION_SDATA2 static u32 lit_4125 = 0x3E8F5C29;
SECTION_SDATA2 static f32 lit_4125 = 7.0f / 25.0f;
/* 80452878-8045287C 0004+00 s=1 e=0 z=0 None .sdata2 @4126 */
SECTION_SDATA2 static u32 lit_4126 = 0x3E19999A;
SECTION_SDATA2 static f32 lit_4126 = 3.0f / 20.0f;
/* 8045287C-80452880 0004+00 s=1 e=0 z=0 None .sdata2 @4127 */
SECTION_SDATA2 static u32 lit_4127 = 0x3BA3D70A;
SECTION_SDATA2 static f32 lit_4127 = 0.004999999888241291f;
/* 80452880-80452884 0004+00 s=1 e=0 z=0 None .sdata2 @4128 */
SECTION_SDATA2 static u32 lit_4128 = 0x3D75C28F;
SECTION_SDATA2 static f32 lit_4128 = 3.0f / 50.0f;
/* 80452884-80452888 0004+00 s=1 e=0 z=0 None .sdata2 @4129 */
SECTION_SDATA2 static u32 lit_4129 = 0x428C0000;
SECTION_SDATA2 static f32 lit_4129 = 70.0f;
/* 80452888-8045288C 0004+00 s=1 e=0 z=0 None .sdata2 @4130 */
SECTION_SDATA2 static u32 lit_4130 = 0x42700000;
SECTION_SDATA2 static f32 lit_4130 = 60.0f;
/* 8045288C-80452890 0004+00 s=1 e=0 z=0 None .sdata2 @4131 */
SECTION_SDATA2 static u32 lit_4131 = 0x420C0000;
SECTION_SDATA2 static f32 lit_4131 = 35.0f;
/* 80452890-80452894 0004+00 s=1 e=0 z=0 None .sdata2 @4132 */
SECTION_SDATA2 static u32 lit_4132 = 0x42820000;
SECTION_SDATA2 static f32 lit_4132 = 65.0f;
/* 80452894-80452898 0004+00 s=1 e=0 z=0 None .sdata2 @4133 */
SECTION_SDATA2 static u32 lit_4133 = 0x41F00000;
SECTION_SDATA2 static f32 lit_4133 = 30.0f;
/* 80452898-8045289C 0004+00 s=1 e=0 z=0 None .sdata2 @4134 */
SECTION_SDATA2 static u32 lit_4134 = 0x41D80000;
SECTION_SDATA2 static f32 lit_4134 = 27.0f;
/* 8045289C-804528A0 0004+00 s=1 e=0 z=0 None .sdata2 @4135 */
SECTION_SDATA2 static u32 lit_4135 = 0x42340000;
SECTION_SDATA2 static f32 lit_4135 = 45.0f;
/* 804528A0-804528A4 0004+00 s=1 e=0 z=0 None .sdata2 @4136 */
SECTION_SDATA2 static u32 lit_4136 = 0x455AC000;
SECTION_SDATA2 static f32 lit_4136 = 3500.0f;
/* 804528A4-804528A8 0004+00 s=1 e=0 z=0 None .sdata2 @4137 */
SECTION_SDATA2 static u32 lit_4137 = 0x40800000;
SECTION_SDATA2 static f32 lit_4137 = 4.0f;
/* 804528A8-804528AC 0004+00 s=1 e=0 z=0 None .sdata2 @4138 */
SECTION_SDATA2 static u32 lit_4138 = 0x44960000;
SECTION_SDATA2 static f32 lit_4138 = 1200.0f;
/* 804528AC-804528B0 0004+00 s=1 e=0 z=0 None .sdata2 @4139 */
SECTION_SDATA2 static u32 lit_4139 = 0x3F59999A;
SECTION_SDATA2 static f32 lit_4139 = 17.0f / 20.0f;
/* 804528B0-804528B4 0004+00 s=1 e=0 z=0 None .sdata2 @4140 */
SECTION_SDATA2 static u32 lit_4140 = 0x42480000;
SECTION_SDATA2 static f32 lit_4140 = 50.0f;
/* 80088668-800888B8 0250+00 s=0 e=1 z=0 None .text __ct__11dCamSetup_cFv */
#pragma push
@@ -481,7 +458,7 @@ asm dCamSetup_c::~dCamSetup_c() {
/* ############################################################################################## */
/* 804528B4-804528B8 0004+00 s=1 e=0 z=0 None .sdata2 @4173 */
SECTION_SDATA2 static u32 lit_4173 = 0x43360B61;
SECTION_SDATA2 static f32 lit_4173 = 182.04444885253906f;
/* 80088918-80088988 0070+00 s=0 e=1 z=0 None .text CheckLatitudeRange__11dCamSetup_cFPs */
#pragma push
src/d/d_camera.cpp
+162 -204
View File
@@ -187,8 +187,16 @@ struct dCcMassS_Mng {
/* 80085EB8 */ void GetCamTopPos(Vec*);
};
struct dBgS_LinChk {
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct camera_class {};
struct dCamMapToolData {
/* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8);
};
struct cSAngle {
/* 80030510 */ ~cSAngle();
/* 80271004 */ void Val(s16);
@@ -221,14 +229,6 @@ struct cSAngle {
/* 802712B4 */ void operator*=(f32);
};
struct dBgS_LinChk {
/* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*);
};
struct dCamMapToolData {
/* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8);
};
struct dCamera_c {
struct dCamInfo_c {
/* 8018291C */ dCamInfo_c();
@@ -648,10 +648,6 @@ static void dComIfG_Bgsp();
static void JMAFastSqrt(f32);
static void dComIfGp_evmng_cameraPlay();
static void fopAcM_GetParam(void const*);
extern "C" extern char const* const d_d_camera__stringBase0;
extern "C" extern u8 engine_tbl__9dCamera_c[240];
extern "C" extern void* g_profile_CAMERA[17];
extern "C" extern void* g_profile_CAMERA2[17 + 6 /* padding */];
extern "C" static void func_8015FA2C();
extern "C" static void func_8015FA4C();
@@ -937,36 +933,6 @@ void cM3d_2PlaneLinePosNearPos(cM3dGPla const&, cM3dGPla const&, Vec const*, Vec
void operator+(s16, cSAngle const&);
void operator-(s16, cSAngle const&);
void operator delete(void*);
extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern void* g_fopCam_Method[5 + 1 /* padding */];
extern "C" extern void* g_fopVw_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__8cM3dGLin[3];
extern "C" extern void* __vt__8cM3dGSph[3];
extern "C" extern void* __vt__18dDlst_effectLine_c[3];
extern "C" extern void* __vt__14dBgS_CamGndChk[12];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern f32 Zero__4cXyz[3];
extern "C" extern u8 BaseY__4cXyz[12];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */];
extern "C" extern u32 __float_nan;
extern "C" extern u8 data_80450B44[4];
extern "C" extern u8 struct_80450BE4[4];
extern "C" extern u8 stopStatus__10fopAc_ac_c[4];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 m_object__7dDemo_c[4];
extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 _0__7cSAngle[2 + 2 /* padding */];
extern "C" extern u8 _90__7cSAngle[2 + 2 /* padding */];
extern "C" extern u8 _180__7cSAngle[2 + 2 /* padding */];
extern "C" extern u8 _270__7cSAngle[2 + 6 /* padding */];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void onBlure__13mDoGph_gInf_cFv();
extern "C" void onBlure__13mDoGph_gInf_cFPA4_Cf();
@@ -1338,9 +1304,7 @@ SECTION_SDATA2 static f32 lit_4445[1 + 1 /* padding */] = {
};
/* 80453698-804536A0 0008+00 s=20 e=0 z=0 None .sdata2 @4448 */
SECTION_SDATA2 static u8 lit_4448[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4448 = 4503601774854144.0 /* cast s32 to float */;
/* 8015FBF8-8015FEB8 02C0+00 s=1 e=0 z=0 None .text
* relationalPos2__22@unnamed@d_camera_cpp@FP10fopAc_ac_cP10fopAc_ac_cP4cXyzf7cSAngle */
@@ -2211,25 +2175,25 @@ SECTION_SDATA2 static u8 lit_5656[4] = {
};
/* 804536A4-804536A8 0004+00 s=1 e=0 z=0 None .sdata2 @5657 */
SECTION_SDATA2 static u32 lit_5657 = 0x46FFFE00;
SECTION_SDATA2 static f32 lit_5657 = 32767.0f;
/* 804536A8-804536AC 0004+00 s=26 e=0 z=0 None .sdata2 @5658 */
SECTION_SDATA2 static u32 lit_5658 = 0x3F800000;
SECTION_SDATA2 static f32 lit_5658 = 1.0f;
/* 804536AC-804536B0 0004+00 s=6 e=0 z=0 None .sdata2 @5659 */
SECTION_SDATA2 static u32 lit_5659 = 0xCE6E6B28;
SECTION_SDATA2 static f32 lit_5659 = -1000000000.0f;
/* 804536B0-804536B4 0004+00 s=4 e=0 z=0 None .sdata2 @5660 */
SECTION_SDATA2 static u32 lit_5660 = 0xC1A00000;
SECTION_SDATA2 static f32 lit_5660 = -20.0f;
/* 804536B4-804536B8 0004+00 s=6 e=0 z=0 None .sdata2 @5661 */
SECTION_SDATA2 static u32 lit_5661 = 0x43960000;
SECTION_SDATA2 static f32 lit_5661 = 300.0f;
/* 804536B8-804536BC 0004+00 s=9 e=0 z=0 None .sdata2 @5662 */
SECTION_SDATA2 static u32 lit_5662 = 0x42700000;
SECTION_SDATA2 static f32 lit_5662 = 60.0f;
/* 804536BC-804536C0 0004+00 s=2 e=0 z=0 None .sdata2 @5663 */
SECTION_SDATA2 static u32 lit_5663 = 0x42AA0000;
SECTION_SDATA2 static f32 lit_5663 = 85.0f;
/* 80160470-801614AC 103C+00 s=1 e=0 z=0 None .text
* initialize__9dCamera_cFP12camera_classP10fopAc_ac_cUlUl */
@@ -2333,14 +2297,10 @@ asm void dCamera_c::initMonitor() {
/* ############################################################################################## */
/* 804536C8-804536D0 0008+00 s=7 e=0 z=0 None .sdata2 @6177 */
SECTION_SDATA2 static u8 lit_6177[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_6177 = 0.5;
/* 804536D0-804536D8 0008+00 s=7 e=0 z=0 None .sdata2 @6178 */
SECTION_SDATA2 static u8 lit_6178[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_6178 = 3.0;
/* 804536D8-804536E0 0008+00 s=7 e=0 z=0 None .sdata2 @6179 */
SECTION_SDATA2 static u8 lit_6179[8] = {
@@ -2348,7 +2308,7 @@ SECTION_SDATA2 static u8 lit_6179[8] = {
};
/* 804536E0-804536E4 0004+00 s=8 e=0 z=0 None .sdata2 @6180 */
SECTION_SDATA2 static u32 lit_6180 = 0x3C23D70A;
SECTION_SDATA2 static f32 lit_6180 = 1.0f / 100.0f;
/* 80161E34-80162088 0254+00 s=1 e=0 z=0 None .text updateMonitor__9dCamera_cFv */
#pragma push
@@ -2377,10 +2337,10 @@ void dCamera_c::infoReport() {
/* ############################################################################################## */
/* 804536E4-804536E8 0004+00 s=12 e=0 z=0 None .sdata2 @6629 */
SECTION_SDATA2 static u32 lit_6629 = 0x41200000;
SECTION_SDATA2 static f32 lit_6629 = 10.0f;
/* 804536E8-804536EC 0004+00 s=9 e=0 z=0 None .sdata2 @6630 */
SECTION_SDATA2 static u32 lit_6630 = 0x3D4CCCCD;
SECTION_SDATA2 static f32 lit_6630 = 1.0f / 20.0f;
/* 801622B4-80162D38 0A84+00 s=1 e=0 z=0 None .text Run__9dCamera_cFv */
#pragma push
@@ -2444,7 +2404,7 @@ asm void dCamera_c::SetTrimTypeForce(s32 param_0) {
/* ############################################################################################## */
/* 804536EC-804536F0 0004+00 s=5 e=0 z=0 None .sdata2 @6766 */
SECTION_SDATA2 static u32 lit_6766 = 0x3E800000;
SECTION_SDATA2 static f32 lit_6766 = 0.25f;
/* 80163034-80163154 0120+00 s=1 e=0 z=0 None .text CalcTrimSize__9dCamera_cFv */
#pragma push
@@ -2645,7 +2605,7 @@ asm void dCamera_c::popInfo(dCamera_c::dCamInfo_c* param_0) {
/* ############################################################################################## */
/* 804536F0-804536F4 0004+00 s=2 e=0 z=0 None .sdata2 @7609 */
SECTION_SDATA2 static u32 lit_7609 = 0x3F8CCCCD;
SECTION_SDATA2 static f32 lit_7609 = 11.0f / 10.0f;
/* 80164D2C-80164D6C 0040+00 s=4 e=0 z=0 None .text heightOf__9dCamera_cFP10fopAc_ac_c */
#pragma push
@@ -2712,31 +2672,31 @@ asm void dCamera_c::pointInSight(cXyz* param_0) {
/* ############################################################################################## */
/* 804536F4-804536F8 0004+00 s=1 e=0 z=0 None .sdata2 @8015 */
SECTION_SDATA2 static u32 lit_8015 = 0x3C8EFA35;
SECTION_SDATA2 static f32 lit_8015 = 0.01745329238474369f;
/* 804536F8-804536FC 0004+00 s=9 e=0 z=0 None .sdata2 @8016 */
SECTION_SDATA2 static u32 lit_8016 = 0x40000000;
SECTION_SDATA2 static f32 lit_8016 = 2.0f;
/* 804536FC-80453700 0004+00 s=3 e=0 z=0 None .sdata2 @8017 */
SECTION_SDATA2 static u32 lit_8017 = 0x43E00000;
SECTION_SDATA2 static f32 lit_8017 = 448.0f;
/* 80453700-80453704 0004+00 s=3 e=0 z=0 None .sdata2 @8018 */
SECTION_SDATA2 static u32 lit_8018 = 0x3F733333;
SECTION_SDATA2 static f32 lit_8018 = 19.0f / 20.0f;
/* 80453704-80453708 0004+00 s=1 e=0 z=0 None .sdata2 @8019 */
SECTION_SDATA2 static u32 lit_8019 = 0x3F59999A;
SECTION_SDATA2 static f32 lit_8019 = 17.0f / 20.0f;
/* 80453708-8045370C 0004+00 s=3 e=0 z=0 None .sdata2 @8020 */
SECTION_SDATA2 static u32 lit_8020 = 0x44180000;
SECTION_SDATA2 static f32 lit_8020 = 608.0f;
/* 8045370C-80453710 0004+00 s=11 e=0 z=0 None .sdata2 @8021 */
SECTION_SDATA2 static u32 lit_8021 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_8021 = 1.0f / 10.0f;
/* 80453710-80453714 0004+00 s=6 e=0 z=0 None .sdata2 @8022 */
SECTION_SDATA2 static u32 lit_8022 = 0x43480000;
SECTION_SDATA2 static f32 lit_8022 = 200.0f;
/* 80453714-80453718 0004+00 s=5 e=0 z=0 None .sdata2 @8023 */
SECTION_SDATA2 static u32 lit_8023 = 0x3E4CCCCD;
SECTION_SDATA2 static f32 lit_8023 = 1.0f / 5.0f;
/* 80165238-801657EC 05B4+00 s=3 e=0 z=0 None .text
* radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyzfsf */
@@ -2794,7 +2754,7 @@ asm void dCamera_c::lineBGCheck(cXyz* param_0, cXyz* param_1, u32 param_2) {
/* ############################################################################################## */
/* 80453718-8045371C 0004+00 s=7 e=0 z=0 None .sdata2 @8127 */
SECTION_SDATA2 static u32 lit_8127 = 0x41F00000;
SECTION_SDATA2 static f32 lit_8127 = 30.0f;
/* 80165B60-80165C08 00A8+00 s=1 e=0 z=0 None .text
* lineCollisionCheckBush__9dCamera_cFP4cXyzP4cXyz */
@@ -2809,7 +2769,7 @@ asm void dCamera_c::lineCollisionCheckBush(cXyz* param_0, cXyz* param_1) {
/* ############################################################################################## */
/* 8045371C-80453720 0004+00 s=1 e=0 z=0 None .sdata2 @8163 */
SECTION_SDATA2 static u32 lit_8163 = 0xB8D1B717;
SECTION_SDATA2 static f32 lit_8163 = -9.999999747378752e-05f;
/* 80165C08-80165CE0 00D8+00 s=1 e=0 z=0 None .text
* sph_chk_callback__FP11dBgS_SphChkP10cBgD_Vtx_tiiiP8cM3dGPlaPv */
@@ -2866,10 +2826,10 @@ asm void dCamera_c::setView(f32 param_0, f32 param_1, f32 param_2, f32 param_3)
/* ############################################################################################## */
/* 80453720-80453724 0004+00 s=3 e=0 z=0 None .sdata2 @8529 */
SECTION_SDATA2 static u32 lit_8529 = 0x43360B61;
SECTION_SDATA2 static f32 lit_8529 = 182.04444885253906f;
/* 80453724-80453728 0004+00 s=12 e=0 z=0 None .sdata2 @8530 */
SECTION_SDATA2 static u32 lit_8530 = 0x3F400000;
SECTION_SDATA2 static f32 lit_8530 = 0.75f;
/* 8016608C-80166764 06D8+00 s=1 e=0 z=0 None .text forwardCheckAngle__9dCamera_cFv */
#pragma push
@@ -2895,51 +2855,49 @@ static u8 prev_plat2[4];
static u8 data_80451030[4];
/* 80453728-8045372C 0004+00 s=4 e=0 z=0 None .sdata2 @9395 */
SECTION_SDATA2 static u32 lit_9395 = 0x3E99999A;
SECTION_SDATA2 static f32 lit_9395 = 3.0f / 10.0f;
/* 8045372C-80453730 0004+00 s=2 e=0 z=0 None .sdata2 @9396 */
SECTION_SDATA2 static u32 lit_9396 = 0x38D1B717;
SECTION_SDATA2 static f32 lit_9396 = 9.999999747378752e-05f;
/* 80453730-80453734 0004+00 s=3 e=0 z=0 None .sdata2 @9397 */
SECTION_SDATA2 static u32 lit_9397 = 0x3F333333;
SECTION_SDATA2 static f32 lit_9397 = 7.0f / 10.0f;
/* 80453734-80453738 0004+00 s=10 e=0 z=0 None .sdata2 @9398 */
SECTION_SDATA2 static u32 lit_9398 = 0x42200000;
SECTION_SDATA2 static f32 lit_9398 = 40.0f;
/* 80453738-8045373C 0004+00 s=6 e=0 z=0 None .sdata2 @9399 */
SECTION_SDATA2 static u32 lit_9399 = 0x42C80000;
SECTION_SDATA2 static f32 lit_9399 = 100.0f;
/* 8045373C-80453740 0004+00 s=2 e=0 z=0 None .sdata2 @9400 */
SECTION_SDATA2 static u32 lit_9400 = 0x3EA8F5C3;
SECTION_SDATA2 static f32 lit_9400 = 33.0f / 100.0f;
/* 80453740-80453744 0004+00 s=2 e=0 z=0 None .sdata2 @9401 */
SECTION_SDATA2 static u32 lit_9401 = 0x3DA3D70A;
SECTION_SDATA2 static f32 lit_9401 = 2.0f / 25.0f;
/* 80453744-80453748 0004+00 s=1 e=0 z=0 None .sdata2 @9402 */
SECTION_SDATA2 static u32 lit_9402 = 0xBF000000;
SECTION_SDATA2 static f32 lit_9402 = -0.5f;
/* 80453748-8045374C 0004+00 s=1 e=0 z=0 None .sdata2 @9403 */
SECTION_SDATA2 static u32 lit_9403 = 0x40C00000;
SECTION_SDATA2 static f32 lit_9403 = 6.0f;
/* 8045374C-80453750 0004+00 s=2 e=0 z=0 None .sdata2 @9404 */
SECTION_SDATA2 static u32 lit_9404 = 0x3FC00000;
SECTION_SDATA2 static f32 lit_9404 = 1.5f;
/* 80453750-80453754 0004+00 s=9 e=0 z=0 None .sdata2 @9405 */
SECTION_SDATA2 static u32 lit_9405 = 0x40A00000;
SECTION_SDATA2 static f32 lit_9405 = 5.0f;
/* 80453754-80453758 0004+00 s=6 e=0 z=0 None .sdata2 @9406 */
SECTION_SDATA2 static u32 lit_9406 = 0x42A00000;
SECTION_SDATA2 static f32 lit_9406 = 80.0f;
/* 80453758-8045375C 0004+00 s=2 e=0 z=0 None .sdata2 @9407 */
SECTION_SDATA2 static u32 lit_9407 = 0x40400000;
SECTION_SDATA2 static f32 lit_9407 = 3.0f;
/* 8045375C-80453760 0004+00 s=1 e=0 z=0 None .sdata2 @9408 */
SECTION_SDATA2 static u32 lit_9408 = 0xC0400000;
SECTION_SDATA2 static f32 lit_9408 = -3.0f;
/* 80453760-80453768 0008+00 s=6 e=0 z=0 None .sdata2 @9410 */
SECTION_SDATA2 static u8 lit_9410[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_9410 = 4503599627370496.0 /* cast u32 to float */;
/* 80166764-80167BBC 1458+00 s=1 e=0 z=0 None .text bumpCheck__9dCamera_cFUl */
#pragma push
@@ -3029,7 +2987,7 @@ asm void dCamera_c::getWaterSurfaceHeight(cXyz* param_0) {
/* ############################################################################################## */
/* 80453768-8045376C 0004+00 s=8 e=0 z=0 None .sdata2 @9788 */
SECTION_SDATA2 static u32 lit_9788 = 0x41A00000;
SECTION_SDATA2 static f32 lit_9788 = 20.0f;
/* 80167FEC-80168744 0758+00 s=3 e=0 z=0 None .text checkGroundInfo__9dCamera_cFv */
#pragma push
@@ -3055,103 +3013,103 @@ static u8 struct_80451038[4];
static u8 struct_8045103C[4];
/* 8045376C-80453770 0004+00 s=3 e=0 z=0 None .sdata2 @10550 */
SECTION_SDATA2 static u32 lit_10550 = 0x3F666666;
SECTION_SDATA2 static f32 lit_10550 = 9.0f / 10.0f;
/* 80453770-80453774 0004+00 s=2 e=0 z=0 None .sdata2 @10551 */
SECTION_SDATA2 static u32 lit_10551 = 0xC2960000;
SECTION_SDATA2 static f32 lit_10551 = -75.0f;
/* 80453774-80453778 0004+00 s=2 e=0 z=0 None .sdata2 @10552 */
SECTION_SDATA2 static u32 lit_10552 = 0x42960000;
SECTION_SDATA2 static f32 lit_10552 = 75.0f;
/* 80453778-8045377C 0004+00 s=1 e=0 z=0 None .sdata2 @10553 */
SECTION_SDATA2 static u32 lit_10553 = 0x41B00000;
SECTION_SDATA2 static f32 lit_10553 = 22.0f;
/* 8045377C-80453780 0004+00 s=2 e=0 z=0 None .sdata2 @10554 */
SECTION_SDATA2 static u32 lit_10554 = 0x44098000;
SECTION_SDATA2 static f32 lit_10554 = 550.0f;
/* 80453780-80453784 0004+00 s=2 e=0 z=0 None .sdata2 @10555 */
SECTION_SDATA2 static u32 lit_10555 = 0xC28C0000;
SECTION_SDATA2 static f32 lit_10555 = -70.0f;
/* 80453784-80453788 0004+00 s=3 e=0 z=0 None .sdata2 @10556 */
SECTION_SDATA2 static u32 lit_10556 = 0x42B40000;
SECTION_SDATA2 static f32 lit_10556 = 90.0f;
/* 80453788-8045378C 0004+00 s=6 e=0 z=0 None .sdata2 @10557 */
SECTION_SDATA2 static u32 lit_10557 = 0x42480000;
SECTION_SDATA2 static f32 lit_10557 = 50.0f;
/* 8045378C-80453790 0004+00 s=3 e=0 z=0 None .sdata2 @10558 */
SECTION_SDATA2 static u32 lit_10558 = 0xC1F00000;
SECTION_SDATA2 static f32 lit_10558 = -30.0f;
/* 80453790-80453794 0004+00 s=4 e=0 z=0 None .sdata2 @10559 */
SECTION_SDATA2 static u32 lit_10559 = 0xC2A00000;
SECTION_SDATA2 static f32 lit_10559 = -80.0f;
/* 80453794-80453798 0004+00 s=3 e=0 z=0 None .sdata2 @10560 */
SECTION_SDATA2 static u32 lit_10560 = 0x3E19999A;
SECTION_SDATA2 static f32 lit_10560 = 3.0f / 20.0f;
/* 80453798-8045379C 0004+00 s=3 e=0 z=0 None .sdata2 @10561 */
SECTION_SDATA2 static u32 lit_10561 = 0xC2700000;
SECTION_SDATA2 static f32 lit_10561 = -60.0f;
/* 8045379C-804537A0 0004+00 s=2 e=0 z=0 None .sdata2 @10562 */
SECTION_SDATA2 static u32 lit_10562 = 0xBE4CCCCD;
SECTION_SDATA2 static f32 lit_10562 = -1.0f / 5.0f;
/* 804537A0-804537A4 0004+00 s=2 e=0 z=0 None .sdata2 @10563 */
SECTION_SDATA2 static u32 lit_10563 = 0x3D23D70A;
SECTION_SDATA2 static f32 lit_10563 = 1.0f / 25.0f;
/* 804537A4-804537A8 0004+00 s=3 e=0 z=0 None .sdata2 @10564 */
SECTION_SDATA2 static u32 lit_10564 = 0xC2340000;
SECTION_SDATA2 static f32 lit_10564 = -45.0f;
/* 804537A8-804537AC 0004+00 s=3 e=0 z=0 None .sdata2 @10565 */
SECTION_SDATA2 static u32 lit_10565 = 0x42340000;
SECTION_SDATA2 static f32 lit_10565 = 45.0f;
/* 804537AC-804537B0 0004+00 s=2 e=0 z=0 None .sdata2 @10566 */
SECTION_SDATA2 static u32 lit_10566 = 0x3D75C28F;
SECTION_SDATA2 static f32 lit_10566 = 3.0f / 50.0f;
/* 804537B0-804537B4 0004+00 s=2 e=0 z=0 None .sdata2 @10567 */
SECTION_SDATA2 static u32 lit_10567 = 0x47C35000;
SECTION_SDATA2 static f32 lit_10567 = 100000.0f;
/* 804537B4-804537B8 0004+00 s=1 e=0 z=0 None .sdata2 @10568 */
SECTION_SDATA2 static u32 lit_10568 = 0x40200000;
SECTION_SDATA2 static f32 lit_10568 = 2.5f;
/* 804537B8-804537BC 0004+00 s=5 e=0 z=0 None .sdata2 @10569 */
SECTION_SDATA2 static u32 lit_10569 = 0x41000000;
SECTION_SDATA2 static f32 lit_10569 = 8.0f;
/* 804537BC-804537C0 0004+00 s=2 e=0 z=0 None .sdata2 @10570 */
SECTION_SDATA2 static u32 lit_10570 = 0x3F99999A;
SECTION_SDATA2 static f32 lit_10570 = 6.0f / 5.0f;
/* 804537C0-804537C4 0004+00 s=1 e=0 z=0 None .sdata2 @10571 */
SECTION_SDATA2 static u32 lit_10571 = 0x3BCCCCCD;
SECTION_SDATA2 static f32 lit_10571 = 0.0062500000931322575f;
/* 804537C4-804537C8 0004+00 s=1 e=0 z=0 None .sdata2 @10572 */
SECTION_SDATA2 static u32 lit_10572 = 0x400CCCCD;
SECTION_SDATA2 static f32 lit_10572 = 11.0f / 5.0f;
/* 804537C8-804537CC 0004+00 s=1 e=0 z=0 None .sdata2 @10573 */
SECTION_SDATA2 static u32 lit_10573 = 0xBDCCCCCD;
SECTION_SDATA2 static f32 lit_10573 = -1.0f / 10.0f;
/* 804537CC-804537D0 0004+00 s=6 e=0 z=0 None .sdata2 @10574 */
SECTION_SDATA2 static u32 lit_10574 = 0x41700000;
SECTION_SDATA2 static f32 lit_10574 = 15.0f;
/* 804537D0-804537D4 0004+00 s=3 e=0 z=0 None .sdata2 @10575 */
SECTION_SDATA2 static u32 lit_10575 = 0x3FA00000;
SECTION_SDATA2 static f32 lit_10575 = 1.25f;
/* 804537D4-804537D8 0004+00 s=1 e=0 z=0 None .sdata2 @10576 */
SECTION_SDATA2 static u32 lit_10576 = 0x3EB33333;
SECTION_SDATA2 static f32 lit_10576 = 7.0f / 20.0f;
/* 804537D8-804537DC 0004+00 s=3 e=0 z=0 None .sdata2 @10577 */
SECTION_SDATA2 static u32 lit_10577 = 0x3ECCCCCD;
SECTION_SDATA2 static f32 lit_10577 = 2.0f / 5.0f;
/* 804537DC-804537E0 0004+00 s=1 e=0 z=0 None .sdata2 @10578 */
SECTION_SDATA2 static u32 lit_10578 = 0x43FA0000;
SECTION_SDATA2 static f32 lit_10578 = 500.0f;
/* 804537E0-804537E4 0004+00 s=1 e=0 z=0 None .sdata2 @10579 */
SECTION_SDATA2 static u32 lit_10579 = 0x3F0CCCCD;
SECTION_SDATA2 static f32 lit_10579 = 11.0f / 20.0f;
/* 804537E4-804537E8 0004+00 s=1 e=0 z=0 None .sdata2 @10580 */
SECTION_SDATA2 static u32 lit_10580 = 0x41600000;
SECTION_SDATA2 static f32 lit_10580 = 14.0f;
/* 804537E8-804537EC 0004+00 s=5 e=0 z=0 None .sdata2 @10581 */
SECTION_SDATA2 static u32 lit_10581 = 0x43340000;
SECTION_SDATA2 static f32 lit_10581 = 180.0f;
/* 804537EC-804537F0 0004+00 s=4 e=0 z=0 None .sdata2 @10582 */
SECTION_SDATA2 static u32 lit_10582 = 0xC2480000;
SECTION_SDATA2 static f32 lit_10582 = -50.0f;
/* 80168744-8016C25C 3B18+00 s=3 e=0 z=0 None .text chaseCamera__9dCamera_cFl */
#pragma push
@@ -3240,31 +3198,31 @@ extern "C" asm static void func_8016C368() {
/* ############################################################################################## */
/* 804537F0-804537F4 0004+00 s=4 e=0 z=0 None .sdata2 @11167 */
SECTION_SDATA2 static u32 lit_11167 = 0xC1200000;
SECTION_SDATA2 static f32 lit_11167 = -10.0f;
/* 804537F4-804537F8 0004+00 s=3 e=0 z=0 None .sdata2 @11168 */
SECTION_SDATA2 static u32 lit_11168 = 0x3F4CCCCD;
SECTION_SDATA2 static f32 lit_11168 = 4.0f / 5.0f;
/* 804537F8-804537FC 0004+00 s=1 e=0 z=0 None .sdata2 @11169 */
SECTION_SDATA2 static u32 lit_11169 = 0x437A0000;
SECTION_SDATA2 static f32 lit_11169 = 250.0f;
/* 804537FC-80453800 0004+00 s=1 e=0 z=0 None .sdata2 @11170 */
SECTION_SDATA2 static u32 lit_11170 = 0xC2B40000;
SECTION_SDATA2 static f32 lit_11170 = -90.0f;
/* 80453800-80453804 0004+00 s=3 e=0 z=0 None .sdata2 @11171 */
SECTION_SDATA2 static u32 lit_11171 = 0x41C80000;
SECTION_SDATA2 static f32 lit_11171 = 25.0f;
/* 80453804-80453808 0004+00 s=1 e=0 z=0 None .sdata2 @11172 */
SECTION_SDATA2 static u32 lit_11172 = 0x40F00000;
SECTION_SDATA2 static f32 lit_11172 = 7.5f;
/* 80453808-8045380C 0004+00 s=3 e=0 z=0 None .sdata2 @11173 */
SECTION_SDATA2 static u32 lit_11173 = 0xC1700000;
SECTION_SDATA2 static f32 lit_11173 = -15.0f;
/* 8045380C-80453810 0004+00 s=2 e=0 z=0 None .sdata2 @11174 */
SECTION_SDATA2 static u32 lit_11174 = 0x438C0000;
SECTION_SDATA2 static f32 lit_11174 = 280.0f;
/* 80453810-80453814 0004+00 s=1 e=0 z=0 None .sdata2 @11175 */
SECTION_SDATA2 static u32 lit_11175 = 0x3CA3D70A;
SECTION_SDATA2 static f32 lit_11175 = 1.0f / 50.0f;
/* 8016C384-8016E410 208C+00 s=1 e=0 z=0 None .text lockonCamera__9dCamera_cFl */
#pragma push
@@ -3323,94 +3281,94 @@ asm void dCamera_c::getMsgCmdCut(s32 param_0) {
/* ############################################################################################## */
/* 80453814-80453818 0004+00 s=1 e=0 z=0 None .sdata2 @12268 */
SECTION_SDATA2 static u32 lit_12268 = 0x4479F99A;
SECTION_SDATA2 static f32 lit_12268 = 999.9000244140625f;
/* 80453818-8045381C 0004+00 s=1 e=0 z=0 None .sdata2 @12269 */
SECTION_SDATA2 static u32 lit_12269 = 0x43820000;
SECTION_SDATA2 static f32 lit_12269 = 260.0f;
/* 8045381C-80453820 0004+00 s=1 e=0 z=0 None .sdata2 @12270 */
SECTION_SDATA2 static u32 lit_12270 = 0x43520000;
SECTION_SDATA2 static f32 lit_12270 = 210.0f;
/* 80453820-80453824 0004+00 s=1 e=0 z=0 None .sdata2 @12271 */
SECTION_SDATA2 static u32 lit_12271 = 0x42400000;
SECTION_SDATA2 static f32 lit_12271 = 48.0f;
/* 80453824-80453828 0004+00 s=1 e=0 z=0 None .sdata2 @12272 */
SECTION_SDATA2 static u32 lit_12272 = 0x42B00000;
SECTION_SDATA2 static f32 lit_12272 = 88.0f;
/* 80453828-8045382C 0004+00 s=1 e=0 z=0 None .sdata2 @12273 */
SECTION_SDATA2 static u32 lit_12273 = 0xC3340000;
SECTION_SDATA2 static f32 lit_12273 = -180.0f;
/* 8045382C-80453830 0004+00 s=1 e=0 z=0 None .sdata2 @12274 */
SECTION_SDATA2 static u32 lit_12274 = 0x43B40000;
SECTION_SDATA2 static f32 lit_12274 = 360.0f;
/* 80453830-80453834 0004+00 s=1 e=0 z=0 None .sdata2 @12275 */
SECTION_SDATA2 static u32 lit_12275 = 0x420C0000;
SECTION_SDATA2 static f32 lit_12275 = 35.0f;
/* 80453834-80453838 0004+00 s=1 e=0 z=0 None .sdata2 @12276 */
SECTION_SDATA2 static u32 lit_12276 = 0xC2200000;
SECTION_SDATA2 static f32 lit_12276 = -40.0f;
/* 80453838-8045383C 0004+00 s=2 e=0 z=0 None .sdata2 @12277 */
SECTION_SDATA2 static u32 lit_12277 = 0x425C0000;
SECTION_SDATA2 static f32 lit_12277 = 55.0f;
/* 8045383C-80453840 0004+00 s=2 e=0 z=0 None .sdata2 @12278 */
SECTION_SDATA2 static u32 lit_12278 = 0x428C0000;
SECTION_SDATA2 static f32 lit_12278 = 70.0f;
/* 80453840-80453844 0004+00 s=3 e=0 z=0 None .sdata2 @12279 */
SECTION_SDATA2 static u32 lit_12279 = 0xC3480000;
SECTION_SDATA2 static f32 lit_12279 = -200.0f;
/* 80453844-80453848 0004+00 s=1 e=0 z=0 None .sdata2 @12280 */
SECTION_SDATA2 static u32 lit_12280 = 0x430C0000;
SECTION_SDATA2 static f32 lit_12280 = 140.0f;
/* 80453848-8045384C 0004+00 s=1 e=0 z=0 None .sdata2 @12281 */
SECTION_SDATA2 static u32 lit_12281 = 0x42DC0000;
SECTION_SDATA2 static f32 lit_12281 = 110.0f;
/* 8045384C-80453850 0004+00 s=1 e=0 z=0 None .sdata2 @12282 */
SECTION_SDATA2 static u32 lit_12282 = 0x42FA0000;
SECTION_SDATA2 static f32 lit_12282 = 125.0f;
/* 80453850-80453854 0004+00 s=1 e=0 z=0 None .sdata2 @12283 */
SECTION_SDATA2 static u32 lit_12283 = 0x42980000;
SECTION_SDATA2 static f32 lit_12283 = 76.0f;
/* 80453854-80453858 0004+00 s=1 e=0 z=0 None .sdata2 @12284 */
SECTION_SDATA2 static u32 lit_12284 = 0x433E0000;
SECTION_SDATA2 static f32 lit_12284 = 190.0f;
/* 80453858-8045385C 0004+00 s=3 e=0 z=0 None .sdata2 @12285 */
SECTION_SDATA2 static u32 lit_12285 = 0x42F00000;
SECTION_SDATA2 static f32 lit_12285 = 120.0f;
/* 8045385C-80453860 0004+00 s=2 e=0 z=0 None .sdata2 @12286 */
SECTION_SDATA2 static u32 lit_12286 = 0xC0A00000;
SECTION_SDATA2 static f32 lit_12286 = -5.0f;
/* 80453860-80453864 0004+00 s=1 e=0 z=0 None .sdata2 @12287 */
SECTION_SDATA2 static u32 lit_12287 = 0xC20C0000;
SECTION_SDATA2 static f32 lit_12287 = -35.0f;
/* 80453864-80453868 0004+00 s=1 e=0 z=0 None .sdata2 @12288 */
SECTION_SDATA2 static u32 lit_12288 = 0x3EE66666;
SECTION_SDATA2 static f32 lit_12288 = 9.0f / 20.0f;
/* 80453868-8045386C 0004+00 s=1 e=0 z=0 None .sdata2 @12289 */
SECTION_SDATA2 static u32 lit_12289 = 0x42820000;
SECTION_SDATA2 static f32 lit_12289 = 65.0f;
/* 8045386C-80453870 0004+00 s=2 e=0 z=0 None .sdata2 @12290 */
SECTION_SDATA2 static u32 lit_12290 = 0x43C80000;
SECTION_SDATA2 static f32 lit_12290 = 400.0f;
/* 80453870-80453874 0004+00 s=1 e=0 z=0 None .sdata2 @12291 */
SECTION_SDATA2 static u32 lit_12291 = 0x42880000;
SECTION_SDATA2 static f32 lit_12291 = 68.0f;
/* 80453874-80453878 0004+00 s=1 e=0 z=0 None .sdata2 @12292 */
SECTION_SDATA2 static u32 lit_12292 = 0x443B8000;
SECTION_SDATA2 static f32 lit_12292 = 750.0f;
/* 80453878-8045387C 0004+00 s=1 e=0 z=0 None .sdata2 @12293 */
SECTION_SDATA2 static u32 lit_12293 = 0x42680000;
SECTION_SDATA2 static f32 lit_12293 = 58.0f;
/* 8045387C-80453880 0004+00 s=2 e=0 z=0 None .sdata2 @12294 */
SECTION_SDATA2 static u32 lit_12294 = 0x43200000;
SECTION_SDATA2 static f32 lit_12294 = 160.0f;
/* 80453880-80453884 0004+00 s=1 e=0 z=0 None .sdata2 @12295 */
SECTION_SDATA2 static u32 lit_12295 = 0x42BE0000;
SECTION_SDATA2 static f32 lit_12295 = 95.0f;
/* 80453884-80453888 0004+00 s=3 e=0 z=0 None .sdata2 @12296 */
SECTION_SDATA2 static u32 lit_12296 = 0xC3160000;
SECTION_SDATA2 static f32 lit_12296 = -150.0f;
/* 80453888-8045388C 0004+00 s=1 e=0 z=0 None .sdata2 @12297 */
SECTION_SDATA2 static u32 lit_12297 = 0x3E8F5C29;
SECTION_SDATA2 static f32 lit_12297 = 7.0f / 25.0f;
/* 8016E4F4-80174E18 6924+00 s=2 e=0 z=0 None .text talktoCamera__9dCamera_cFl */
#pragma push
@@ -3470,22 +3428,22 @@ asm void dCamera_c::SaveZoomRatio() {
/* ############################################################################################## */
/* 8045388C-80453890 0004+00 s=1 e=0 z=0 None .sdata2 @12864 */
SECTION_SDATA2 static u32 lit_12864 = 0x43870000;
SECTION_SDATA2 static f32 lit_12864 = 270.0f;
/* 80453890-80453894 0004+00 s=1 e=0 z=0 None .sdata2 @12865 */
SECTION_SDATA2 static u32 lit_12865 = 0x41980000;
SECTION_SDATA2 static f32 lit_12865 = 19.0f;
/* 80453894-80453898 0004+00 s=1 e=0 z=0 None .sdata2 @12866 */
SECTION_SDATA2 static u32 lit_12866 = 0x43160000;
SECTION_SDATA2 static f32 lit_12866 = 150.0f;
/* 80453898-8045389C 0004+00 s=1 e=0 z=0 None .sdata2 @12867 */
SECTION_SDATA2 static u32 lit_12867 = 0xBC23D70A;
SECTION_SDATA2 static f32 lit_12867 = -1.0f / 100.0f;
/* 8045389C-804538A0 0004+00 s=5 e=0 z=0 None .sdata2 @12868 */
SECTION_SDATA2 static u32 lit_12868 = 0xBF800000;
SECTION_SDATA2 static f32 lit_12868 = -1.0f;
/* 804538A0-804538A4 0004+00 s=1 e=0 z=0 None .sdata2 @12869 */
SECTION_SDATA2 static u32 lit_12869 = 0xC3FF8000;
SECTION_SDATA2 static f32 lit_12869 = -511.0f;
/* 80174ED4-80176074 11A0+00 s=1 e=0 z=0 None .text subjectCamera__9dCamera_cFl */
#pragma push
@@ -3499,7 +3457,7 @@ asm void dCamera_c::subjectCamera(s32 param_0) {
/* ############################################################################################## */
/* 804538A4-804538A8 0004+00 s=3 e=0 z=0 None .sdata2 @13132 */
SECTION_SDATA2 static u32 lit_13132 = 0x40800000;
SECTION_SDATA2 static f32 lit_13132 = 4.0f;
/* 80176074-801767F8 0784+00 s=1 e=0 z=0 None .text magneCamera__9dCamera_cFl */
#pragma push
@@ -3513,7 +3471,7 @@ asm void dCamera_c::magneCamera(s32 param_0) {
/* ############################################################################################## */
/* 804538A8-804538AC 0004+00 s=1 e=0 z=0 None .sdata2 @13314 */
SECTION_SDATA2 static u32 lit_13314 = 0x3F7FBE77;
SECTION_SDATA2 static f32 lit_13314 = 0.9990000128746033f;
/* 801767F8-80176DF0 05F8+00 s=1 e=0 z=0 None .text colosseumCamera__9dCamera_cFl */
#pragma push
@@ -3537,7 +3495,7 @@ bool dCamera_c::test2Camera(s32 param_0) {
/* ############################################################################################## */
/* 804538AC-804538B0 0004+00 s=2 e=0 z=0 None .sdata2 @13673 */
SECTION_SDATA2 static u32 lit_13673 = 0x3CCCCCCD;
SECTION_SDATA2 static f32 lit_13673 = 1.0f / 40.0f;
/* 80176E00-80178E50 2050+00 s=1 e=0 z=0 None .text towerCamera__9dCamera_cFl */
#pragma push
@@ -3551,22 +3509,22 @@ asm void dCamera_c::towerCamera(s32 param_0) {
/* ############################################################################################## */
/* 804538B0-804538B4 0004+00 s=1 e=0 z=0 None .sdata2 @14059 */
SECTION_SDATA2 static u32 lit_14059 = 0xC3200000;
SECTION_SDATA2 static f32 lit_14059 = -160.0f;
/* 804538B4-804538B8 0004+00 s=1 e=0 z=0 None .sdata2 @14060 */
SECTION_SDATA2 static u32 lit_14060 = 0x432A0000;
SECTION_SDATA2 static f32 lit_14060 = 170.0f;
/* 804538B8-804538BC 0004+00 s=2 e=0 z=0 None .sdata2 @14061 */
SECTION_SDATA2 static u32 lit_14061 = 0xC2F00000;
SECTION_SDATA2 static f32 lit_14061 = -120.0f;
/* 804538BC-804538C0 0004+00 s=1 e=0 z=0 None .sdata2 @14062 */
SECTION_SDATA2 static u32 lit_14062 = 0xC3700000;
SECTION_SDATA2 static f32 lit_14062 = -240.0f;
/* 804538C0-804538C4 0004+00 s=1 e=0 z=0 None .sdata2 @14063 */
SECTION_SDATA2 static u32 lit_14063 = 0x43AA0000;
SECTION_SDATA2 static f32 lit_14063 = 340.0f;
/* 804538C4-804538C8 0004+00 s=2 e=0 z=0 None .sdata2 @14064 */
SECTION_SDATA2 static u32 lit_14064 = 0xC2C80000;
SECTION_SDATA2 static f32 lit_14064 = -100.0f;
/* 80178E50-80179590 0740+00 s=1 e=0 z=0 None .text hookshotCamera__9dCamera_cFl */
#pragma push
@@ -3626,46 +3584,46 @@ static u8 struct_80451048[4];
static u8 LatMax[2 + 2 /* padding */];
/* 804538C8-804538CC 0004+00 s=1 e=0 z=0 None .sdata2 @15474 */
SECTION_SDATA2 static u32 lit_15474 = 0x44960000;
SECTION_SDATA2 static f32 lit_15474 = 1200.0f;
/* 804538CC-804538D0 0004+00 s=1 e=0 z=0 None .sdata2 @15475 */
SECTION_SDATA2 static u32 lit_15475 = 0x3F19999A;
SECTION_SDATA2 static f32 lit_15475 = 3.0f / 5.0f;
/* 804538D0-804538D4 0004+00 s=1 e=0 z=0 None .sdata2 @15476 */
SECTION_SDATA2 static u32 lit_15476 = 0x44480000;
SECTION_SDATA2 static f32 lit_15476 = 800.0f;
/* 804538D4-804538D8 0004+00 s=1 e=0 z=0 None .sdata2 @15477 */
SECTION_SDATA2 static u32 lit_15477 = 0x41E00000;
SECTION_SDATA2 static f32 lit_15477 = 28.0f;
/* 804538D8-804538DC 0004+00 s=2 e=0 z=0 None .sdata2 @15478 */
SECTION_SDATA2 static u32 lit_15478 = 0x43A00000;
SECTION_SDATA2 static f32 lit_15478 = 320.0f;
/* 804538DC-804538E0 0004+00 s=1 e=0 z=0 None .sdata2 @15479 */
SECTION_SDATA2 static u32 lit_15479 = 0x45BB8000;
SECTION_SDATA2 static f32 lit_15479 = 6000.0f;
/* 804538E0-804538E4 0004+00 s=1 e=0 z=0 None .sdata2 @15480 */
SECTION_SDATA2 static u32 lit_15480 = 0x447A0000;
SECTION_SDATA2 static f32 lit_15480 = 1000.0f;
/* 804538E4-804538E8 0004+00 s=1 e=0 z=0 None .sdata2 @15481 */
SECTION_SDATA2 static u32 lit_15481 = 0x41B80000;
SECTION_SDATA2 static f32 lit_15481 = 23.0f;
/* 804538E8-804538EC 0004+00 s=1 e=0 z=0 None .sdata2 @15482 */
SECTION_SDATA2 static u32 lit_15482 = 0x44430000;
SECTION_SDATA2 static f32 lit_15482 = 780.0f;
/* 804538EC-804538F0 0004+00 s=1 e=0 z=0 None .sdata2 @15483 */
SECTION_SDATA2 static u32 lit_15483 = 0x449C4000;
SECTION_SDATA2 static f32 lit_15483 = 1250.0f;
/* 804538F0-804538F4 0004+00 s=1 e=0 z=0 None .sdata2 @15484 */
SECTION_SDATA2 static u32 lit_15484 = 0x42080000;
SECTION_SDATA2 static f32 lit_15484 = 34.0f;
/* 804538F4-804538F8 0004+00 s=1 e=0 z=0 None .sdata2 @15485 */
SECTION_SDATA2 static u32 lit_15485 = 0x44610000;
SECTION_SDATA2 static f32 lit_15485 = 900.0f;
/* 804538F8-804538FC 0004+00 s=1 e=0 z=0 None .sdata2 @15486 */
SECTION_SDATA2 static u32 lit_15486 = 0x3F866667;
SECTION_SDATA2 static f32 lit_15486 = 1.0500000715255737f;
/* 804538FC-80453900 0004+00 s=1 e=0 z=0 None .sdata2 @15487 */
SECTION_SDATA2 static u32 lit_15487 = 0x3F933334;
SECTION_SDATA2 static f32 lit_15487 = 1.1500000953674316f;
/* 8017ADC0-8017D934 2B74+00 s=1 e=0 z=0 None .text rideCamera__9dCamera_cFl */
#pragma push
@@ -3695,10 +3653,10 @@ bool dCamera_c::manualCamera(s32 param_0) {
/* ############################################################################################## */
/* 80453900-80453904 0004+00 s=1 e=0 z=0 None .sdata2 @15772 */
SECTION_SDATA2 static u32 lit_15772 = 0xBF400000;
SECTION_SDATA2 static f32 lit_15772 = -0.75f;
/* 80453904-80453908 0004+00 s=1 e=0 z=0 None .sdata2 @15773 */
SECTION_SDATA2 static u32 lit_15773 = 0x3FAAAAAB;
SECTION_SDATA2 static f32 lit_15773 = 4.0f / 3.0f;
/* 8017D97C-8017DFAC 0630+00 s=1 e=0 z=0 None .text observeCamera__9dCamera_cFl */
#pragma push
@@ -3857,13 +3815,13 @@ asm void dCamera_c::Reset() {
/* ############################################################################################## */
/* 80453908-8045390C 0004+00 s=1 e=0 z=0 None .sdata2 @17253 */
SECTION_SDATA2 static u32 lit_17253 = 0x3EDC28F6;
SECTION_SDATA2 static f32 lit_17253 = 43.0f / 100.0f;
/* 8045390C-80453910 0004+00 s=1 e=0 z=0 None .sdata2 @17254 */
SECTION_SDATA2 static u32 lit_17254 = 0x3D3851EC;
SECTION_SDATA2 static f32 lit_17254 = 0.04500000178813934f;
/* 80453910-80453914 0004+00 s=1 e=0 z=0 None .sdata2 @17255 */
SECTION_SDATA2 static u32 lit_17255 = 0x3DF5C28F;
SECTION_SDATA2 static f32 lit_17255 = 3.0f / 25.0f;
/* 80180D24-80181000 02DC+00 s=2 e=0 z=0 None .text shakeCamera__9dCamera_cFv */
#pragma push
@@ -3968,7 +3926,7 @@ asm void dCamera_c::SetBlureActor(fopAc_ac_c* param_0) {
/* ############################################################################################## */
/* 80453918-8045391C 0004+00 s=1 e=0 z=0 None .sdata2 @17392 */
SECTION_SDATA2 static u32 lit_17392 = 0x43660000;
SECTION_SDATA2 static f32 lit_17392 = 230.0f;
/* 80181280-80181490 0210+00 s=2 e=0 z=0 None .text blureCamera__9dCamera_cFv */
#pragma push
@@ -4083,7 +4041,7 @@ asm void dCam_getBody() {
/* ############################################################################################## */
/* 8045391C-80453920 0004+00 s=2 e=0 z=0 None .sdata2 @17525 */
SECTION_SDATA2 static u32 lit_17525 = 0x3FADB6DB;
SECTION_SDATA2 static f32 lit_17525 = 19.0f / 14.0f;
/* 80181664-80181708 00A4+00 s=1 e=0 z=0 None .text preparation__FP20camera_process_class */
#pragma push
@@ -4178,7 +4136,7 @@ asm static void init_phase1(camera_class* param_0) {
/* ############################################################################################## */
/* 80453920-80453924 0004+00 s=1 e=0 z=0 None .sdata2 @17948 */
SECTION_SDATA2 static u32 lit_17948 = 0x481C4000;
SECTION_SDATA2 static f32 lit_17948 = 160000.0f;
/* 80182260-80182454 01F4+00 s=1 e=0 z=0 None .text init_phase2__FP12camera_class */
#pragma push
@@ -4217,7 +4175,7 @@ static bool is_camera_delete(void* param_0) {
/* ############################################################################################## */
/* 80453924-80453928 0004+00 s=1 e=0 z=0 None .sdata2 @17979 */
SECTION_SDATA2 static u32 lit_17979 = 0x43700000;
SECTION_SDATA2 static f32 lit_17979 = 240.0f;
/* 801824C8-80182560 0098+00 s=1 e=0 z=0 None .text Init__14dCamForcusLineFv */
#pragma push
src/d/d_demo.cpp
+13 -52
View File
@@ -17,10 +17,10 @@ struct mDoGph_gInf_c {
/* 80007FD8 */ void fadeOut(f32, _GXColor&);
};
struct Vec {};
struct J3DAnmTransform {};
struct Vec {};
struct mDoExt_McaMorf {
/* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*);
/* 800105C8 */ void play(Vec*, u32, s8);
@@ -46,12 +46,12 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct csXyz {};
struct cXyz {
/* 80009184 */ ~cXyz();
};
struct csXyz {};
struct dKy_tevstr_c {};
struct dPa_control_c {
@@ -368,18 +368,6 @@ static void dDemo_getJaiPointer(char const*, u32, int, u16*);
void dDemo_setDemoData(fopAc_ac_c*, u8, mDoExt_McaMorf*, char const*, int, u16*, u32, s8);
static void branchFile(char const*);
static void getView();
extern "C" extern char const* const d_d_demo__stringBase0;
extern "C" extern void* __vt__17jmessage_tControl[3];
extern "C" extern void* __vt__Q27JStudio13TCreateObject[4];
extern "C" extern void* __vt__Q27JStudio16TAdaptor_message[9];
extern "C" extern u16 m_branchId__7dDemo_c[1 + 3 /* padding */];
extern "C" extern u8 m_control__7dDemo_c[4];
extern "C" extern u8 m_mesgControl__7dDemo_c[4];
extern "C" extern u8 m_object__7dDemo_c[4];
extern "C" extern u8 m_frame__7dDemo_c[4];
extern "C" extern u8 m_frameNoMsg__7dDemo_c[4];
extern "C" extern u8 m_mode__7dDemo_c[4];
extern "C" extern u8 m_status__7dDemo_c[4];
extern "C" static void func_80037DE4();
extern "C" static void func_80037E44();
@@ -493,29 +481,6 @@ void fpcSch_JudgeByID(void*, void*);
void dComIfGs_staffroll_next_go_check();
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__Q26JStage6TActor[35 + 1 /* padding */];
extern "C" extern void* __vt__Q26JStage13TAmbientLight[17 + 1 /* padding */];
extern "C" extern void* __vt__Q26JStage7TCamera[37 + 1 /* padding */];
extern "C" extern void* __vt__Q26JStage4TFog[23 + 1 /* padding */];
extern "C" extern void* __vt__Q26JStage6TLight[27 + 1 /* padding */];
extern "C" extern void* __vt__Q26JStage7TObject[15 + 1 /* padding */];
extern "C" extern void* __vt__Q26JStage7TSystem[20];
extern "C" extern void* __vt__Q37JStudio3ctb8TFactory[5];
extern "C" extern void* __vt__Q37JStudio3fvb8TFactory[5];
extern "C" extern void* __vt__Q27JStudio8TFactory[5];
extern "C" extern void* __vt__Q27JStudio8TAdaptor[8];
extern "C" extern void* __vt__Q37JStudio3stb8TFactory[5];
extern "C" extern void* __vt__Q214JStudio_JStage13TCreateObject[4];
extern "C" extern void* __vt__Q215JStudio_JAudio213TCreateObject[4];
extern "C" extern void* __vt__Q217JStudio_JParticle13TCreateObject[6];
extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u32 g_blackColor;
extern "C" extern u32 __float_max;
extern "C" extern u8 data_80450B74[4];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 mEmitterMng__13dPa_control_c[4];
extern "C" void OSReport_Error();
extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor();
@@ -960,7 +925,7 @@ SECTION_SDATA2 static u8 lit_4040[4] = {
};
/* 80451DB4-80451DB8 0004+00 s=6 e=0 z=0 None .sdata2 @4041 */
SECTION_SDATA2 static u32 lit_4041 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4041 = 1.0f;
/* 80038020-80038098 0078+00 s=1 e=0 z=0 None .text __ct__13dDemo_actor_cFv */
#pragma push
@@ -1004,9 +969,7 @@ asm void dDemo_actor_c::setActor(fopAc_ac_c* param_0) {
/* ############################################################################################## */
/* 80451DB8-80451DC0 0008+00 s=4 e=0 z=0 None .sdata2 @4127 */
SECTION_SDATA2 static u8 lit_4127[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4127 = 4503601774854144.0 /* cast s32 to float */;
/* 8003819C-80038338 019C+00 s=1 e=1 z=1 None .text getPrm_Morf__13dDemo_actor_cFv */
#pragma push
@@ -1106,7 +1069,7 @@ asm static void dDemo_getJaiPointer(char const* param_0, u32 param_1, int param_
/* ############################################################################################## */
/* 80451DC0-80451DC4 0004+00 s=1 e=0 z=0 None .sdata2 @4152 */
SECTION_SDATA2 static u32 lit_4152 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4152 = -1.0f;
/* 80038518-800387A8 0290+00 s=0 e=0 z=2 None .text
* dDemo_setDemoData__FP10fopAc_ac_cUcP14mDoExt_McaMorfPCciPUsUlSc */
@@ -1165,10 +1128,10 @@ asm void dDemo_actor_c::JSGSetData(u32 param_0, void const* param_1, u32 param_2
/* ############################################################################################## */
/* 80451DC4-80451DC8 0004+00 s=1 e=0 z=0 None .sdata2 @4553 */
SECTION_SDATA2 static u32 lit_4553 = 0xF49DC5AE;
SECTION_SDATA2 static f32 lit_4553 = -1.0000000331813535e+32f;
/* 80451DC8-80451DCC 0004+00 s=1 e=0 z=0 None .sdata2 @4554 */
SECTION_SDATA2 static u32 lit_4554 = 0x749DC5AE;
SECTION_SDATA2 static f32 lit_4554 = 1.0000000331813535e+32f;
/* 80038920-80038980 0060+00 s=1 e=0 z=0 None .text JSGSetTranslation__13dDemo_actor_cFRC3Vec
*/
@@ -1193,7 +1156,7 @@ asm void dDemo_actor_c::JSGSetScaling(Vec const& param_0) {
/* ############################################################################################## */
/* 80451DCC-80451DD0 0004+00 s=1 e=0 z=0 None .sdata2 @4567 */
SECTION_SDATA2 static u32 lit_4567 = 0x43360B61;
SECTION_SDATA2 static f32 lit_4567 = 182.04444885253906f;
/* 800389A8-80038A0C 0064+00 s=1 e=0 z=0 None .text JSGSetRotation__13dDemo_actor_cFRC3Vec */
#pragma push
@@ -1323,7 +1286,7 @@ asm void dDemo_camera_c::JSGSetProjectionFar(f32 param_0) {
/* ############################################################################################## */
/* 80451DD0-80451DD4 0004+00 s=1 e=0 z=0 None .sdata2 @4642 */
SECTION_SDATA2 static u32 lit_4642 = 0x42700000;
SECTION_SDATA2 static f32 lit_4642 = 60.0f;
/* 80038B54-80038B88 0034+00 s=1 e=0 z=0 None .text JSGGetProjectionFovy__14dDemo_camera_cCFv
*/
@@ -1349,7 +1312,7 @@ asm void dDemo_camera_c::JSGSetProjectionFovy(f32 param_0) {
/* ############################################################################################## */
/* 80451DD4-80451DD8 0004+00 s=1 e=0 z=0 None .sdata2 @4655 */
SECTION_SDATA2 static u32 lit_4655 = 0x3FADB6DB;
SECTION_SDATA2 static f32 lit_4655 = 19.0f / 14.0f;
/* 80038B9C-80038BD0 0034+00 s=1 e=0 z=0 None .text JSGGetProjectionAspect__14dDemo_camera_cCFv
*/
@@ -1727,9 +1690,7 @@ asm void dDemo_system_c::JSGFindObject(JStage::TObject** param_0, char const* pa
/* ############################################################################################## */
/* 80451DE0-80451DE8 0008+00 s=1 e=0 z=0 None .sdata2 @5123 */
SECTION_SDATA2 static u8 lit_5123[8] = {
0x3F, 0xA1, 0x11, 0x11, 0x20, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5123 = 0.03333333507180214;
/* 80039678-80039910 0298+00 s=0 e=1 z=0 None .text create__7dDemo_cFv */
#pragma push
src/d/d_drawlist.cpp
+48 -106
View File
@@ -32,8 +32,6 @@ struct dDlst_shadowTri_c {
/* 80056344 */ dDlst_shadowTri_c();
};
struct _GXTexObj {};
struct Vec {};
struct cXyz {
@@ -44,6 +42,8 @@ struct cXyz {
/* 802670AC */ void isZero() const;
};
struct _GXTexObj {};
struct dDlst_shadowSimple_c {
/* 8005520C */ void draw();
/* 800553EC */ void set(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
@@ -95,10 +95,12 @@ struct dDlst_peekZ_c {
/* 80056080 */ void peekData();
};
struct dDlst_base_c {};
struct J3DPacket {};
struct _GXColor {};
struct dDlst_base_c {};
struct J3DDrawBuffer {
/* 80324F08 */ void initialize();
/* 80324F70 */ void allocBuffer(u32);
@@ -108,8 +110,6 @@ struct J3DDrawBuffer {
/* 803254AC */ void draw() const;
};
struct _GXColor {};
struct dDlst_list_c {
/* 800560F0 */ dDlst_list_c();
/* 80056390 */ void init();
@@ -259,27 +259,6 @@ static void J3DDrawBuffer__create(u32);
static void psdRealCallBack(cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int, cM3dGPla*);
static void realPolygonCheck(cXyz*, f32, f32, cXyz*, dDlst_shadowPoly_c*);
static void setkankyoShadow(dKy_tevstr_c*, f32*);
extern "C" extern char const* const d_d_drawlist__stringBase0;
extern "C" extern u8 l_frontZMat[60 + 4 /* padding */];
extern "C" extern u8 l_frontNoZSubMat[42 + 2 /* padding */];
extern "C" extern u8 l_shadowVolDL[59 + 5 /* padding */];
extern "C" extern u8 l_shadowVolMat[90 + 6 /* padding */];
extern "C" extern u8 data_803A8D9C[48];
extern "C" extern void* __vt__18dDlst_effectLine_c[3];
extern "C" extern void* __vt__10J2DAnmBase[4];
extern "C" extern void* __vt__11dDlst_blo_c[3];
extern "C" extern void* __vt__10dDlst_2D_c[3];
extern "C" extern void* __vt__12dDlst_2DMt_c[3];
extern "C" extern void* __vt__11dDlst_2Dm_c[3];
extern "C" extern void* __vt__11dDlst_2DM_c[3 + 3 /* padding */];
extern "C" extern void* __vt__11dDlst_2DT_c[3];
extern "C" extern void* __vt__15dDlst_2DPoint_c[3];
extern "C" extern void* __vt__14dDlst_2DQuad_c[3];
extern "C" extern void* __vt__13dDlst_2DTri_c[3];
extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32];
extern "C" extern u8 data_80450ED0[4];
extern "C" extern f32 mWipeRate__12dDlst_list_c;
extern "C" extern u8 data_80450EE0[8];
extern "C" void setViewPort__14dDlst_window_cFffffff();
extern "C" void setScissor__14dDlst_window_cFffff();
@@ -395,27 +374,6 @@ void cLib_chaseUC(u8*, u8, u8);
void* operator new(u32);
void* operator new[](u32, int);
void operator delete(void*);
extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
extern "C" extern void* __vt__26mDoExt_3DlineMatSortPacket[5];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__9J3DPacket[5];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 mClipper__14mDoLib_clipper[92];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_envHIO[68];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u8 mBackColor__13mDoGph_gInf_c[4];
extern "C" extern u8 g_clearColor[4];
extern "C" extern u32 g_blackColor;
extern "C" extern u32 g_whiteColor;
extern "C" extern u32 __float_nan;
extern "C" extern u32 __float_max;
extern "C" extern f32 mSystemFar__14mDoLib_clipper;
extern "C" extern f32 mFovyRate__14mDoLib_clipper;
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4];
extern "C" void __dt__4cXyzFv();
extern "C" void mDoMtx_YrotM__FPA4_fs();
@@ -624,33 +582,23 @@ SECTION_SDATA static u8 l_color_4033[4] = {
};
/* 80452008-8045200C 0004+00 s=4 e=0 z=0 None .sdata2 @4072 */
SECTION_SDATA2 static u32 lit_4072 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4072 = 0.5f;
/* 8045200C-80452010 0004+00 s=1 e=0 z=0 None .sdata2 @4073 */
SECTION_SDATA2 static u32 lit_4073 = 0x47000000;
SECTION_SDATA2 static f32 lit_4073 = 32768.0f;
/* 80452010-80452018 0004+04 s=10 e=0 z=0 None .sdata2 @4074 */
SECTION_SDATA2 static u8 lit_4074[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_4074[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 80452018-80452020 0008+00 s=8 e=0 z=0 None .sdata2 @4076 */
SECTION_SDATA2 static u8 lit_4076[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4076 = 4503599627370496.0 /* cast u32 to float */;
/* 80452020-80452028 0008+00 s=5 e=0 z=0 None .sdata2 @4079 */
SECTION_SDATA2 static u8 lit_4079[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4079 = 4503601774854144.0 /* cast s32 to float */;
/* 80051F98-80052354 03BC+00 s=1 e=0 z=0 None .text draw__11dDlst_2DT_cFv */
#pragma push
@@ -664,7 +612,7 @@ asm void dDlst_2DT_c::draw() {
/* ############################################################################################## */
/* 80452028-8045202C 0004+00 s=10 e=0 z=0 None .sdata2 @4270 */
SECTION_SDATA2 static u32 lit_4270 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4270 = 1.0f;
/* 80052354-80052B00 07AC+00 s=1 e=0 z=0 None .text draw__12dDlst_2DT2_cFv */
#pragma push
@@ -2332,7 +2280,7 @@ asm void dDlst_2DT2_c::init(ResTIMG* param_0, f32 param_1, f32 param_2, f32 para
/* ############################################################################################## */
/* 80452030-80452034 0004+00 s=2 e=0 z=0 None .sdata2 @4360 */
SECTION_SDATA2 static u32 lit_4360 = 0x43800000;
SECTION_SDATA2 static f32 lit_4360 = 256.0f;
/* 80052C58-8005312C 04D4+00 s=1 e=0 z=0 None .text draw__11dDlst_2DM_cFv */
#pragma push
@@ -2484,18 +2432,16 @@ asm void cM_rnd_c::init(int param_0, int param_1, int param_2) {
/* ############################################################################################## */
/* 80452034-80452038 0004+00 s=1 e=0 z=0 None .sdata2 @4791 */
SECTION_SDATA2 static u32 lit_4791 = 0x46ECE600;
SECTION_SDATA2 static f32 lit_4791 = 30323.0f;
/* 80452038-8045203C 0004+00 s=1 e=0 z=0 None .sdata2 @4792 */
SECTION_SDATA2 static u32 lit_4792 = 0x46EC7A00;
SECTION_SDATA2 static f32 lit_4792 = 30269.0f;
/* 8045203C-80452040 0004+00 s=1 e=0 z=0 None .sdata2 @4793 */
SECTION_SDATA2 static u32 lit_4793 = 0x46ECC600;
SECTION_SDATA2 static f32 lit_4793 = 30307.0f;
/* 80452040-80452048 0008+00 s=1 e=0 z=0 None .sdata2 @4794 */
SECTION_SDATA2 static u8 lit_4794[8] = {
0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4794 = 1.0;
/* 80053CEC-80053DE0 00F4+00 s=2 e=0 z=0 None .text get__8cM_rnd_cFv */
#pragma push
@@ -2519,7 +2465,7 @@ asm void cM_rnd_c::getF(f32 param_0) {
/* ############################################################################################## */
/* 80452048-8045204C 0004+00 s=5 e=0 z=0 None .sdata2 @4806 */
SECTION_SDATA2 static u32 lit_4806 = 0x40000000;
SECTION_SDATA2 static f32 lit_4806 = 2.0f;
/* 80053E18-80053E60 0048+00 s=1 e=0 z=0 None .text getFX__8cM_rnd_cFf */
#pragma push
@@ -2543,7 +2489,7 @@ asm void cM_rnd_c::getValue(f32 param_0, f32 param_1) {
/* ############################################################################################## */
/* 8045204C-80452050 0004+00 s=1 e=0 z=0 None .sdata2 @4876 */
SECTION_SDATA2 static u32 lit_4876 = 0x46FFFE00;
SECTION_SDATA2 static f32 lit_4876 = 32767.0f;
/* 80053E9C-800541F4 0358+00 s=1 e=0 z=0 None .text draw__18dDlst_effectLine_cFv */
#pragma push
@@ -2641,10 +2587,10 @@ asm void dDlst_shadowReal_c::draw() {
/* ############################################################################################## */
/* 80452050-80452054 0004+00 s=1 e=0 z=0 None .sdata2 @5061 */
SECTION_SDATA2 static u32 lit_5061 = 0xBE4CCCCD;
SECTION_SDATA2 static f32 lit_5061 = -1.0f / 5.0f;
/* 80452054-80452058 0004+00 s=1 e=0 z=0 None .sdata2 @5062 */
SECTION_SDATA2 static u32 lit_5062 = 0xC2B40000;
SECTION_SDATA2 static f32 lit_5062 = -90.0f;
/* 80054688-80054854 01CC+00 s=1 e=0 z=0 None .text
* psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla */
@@ -2660,16 +2606,16 @@ asm static void psdRealCallBack(cBgS_ShdwDraw* param_0, cBgD_Vtx_t* param_1, int
/* ############################################################################################## */
/* 80452058-8045205C 0004+00 s=1 e=0 z=0 None .sdata2 @5127 */
SECTION_SDATA2 static u32 lit_5127 = 0x3B03126F;
SECTION_SDATA2 static f32 lit_5127 = 0.0020000000949949026f;
/* 8045205C-80452060 0004+00 s=1 e=0 z=0 None .sdata2 @5128 */
SECTION_SDATA2 static u32 lit_5128 = 0x42F00000;
SECTION_SDATA2 static f32 lit_5128 = 120.0f;
/* 80452060-80452064 0004+00 s=1 e=0 z=0 None .sdata2 @5129 */
SECTION_SDATA2 static u32 lit_5129 = 0x3E19999A;
SECTION_SDATA2 static f32 lit_5129 = 3.0f / 20.0f;
/* 80452064-80452068 0004+00 s=3 e=0 z=0 None .sdata2 @5130 */
SECTION_SDATA2 static u32 lit_5130 = 0x461C4000;
SECTION_SDATA2 static f32 lit_5130 = 10000.0f;
/* 80054854-80054A6C 0218+00 s=1 e=0 z=0 None .text
* realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c */
@@ -2695,10 +2641,10 @@ asm ShdwDrawPoly_c::~ShdwDrawPoly_c() {
/* ############################################################################################## */
/* 80452068-8045206C 0004+00 s=1 e=0 z=0 None .sdata2 @5155 */
SECTION_SDATA2 static u32 lit_5155 = 0x41700000;
SECTION_SDATA2 static f32 lit_5155 = 15.0f;
/* 8045206C-80452070 0004+00 s=1 e=0 z=0 None .sdata2 @5156 */
SECTION_SDATA2 static u32 lit_5156 = 0x3F266666;
SECTION_SDATA2 static f32 lit_5156 = 13.0f / 20.0f;
/* 80054ACC-80054BD0 0104+00 s=2 e=0 z=0 None .text setkankyoShadow__FP12dKy_tevstr_cPf */
#pragma push
@@ -2712,10 +2658,10 @@ asm static void setkankyoShadow(dKy_tevstr_c* param_0, f32* param_1) {
/* ############################################################################################## */
/* 80452070-80452074 0004+00 s=1 e=0 z=0 None .sdata2 @5267 */
SECTION_SDATA2 static u32 lit_5267 = 0x42480000;
SECTION_SDATA2 static f32 lit_5267 = 50.0f;
/* 80452074-80452078 0004+00 s=1 e=0 z=0 None .sdata2 @5268 */
SECTION_SDATA2 static u32 lit_5268 = 0x3F4CCCCD;
SECTION_SDATA2 static f32 lit_5268 = 4.0f / 5.0f;
/* 80452078-80452080 0004+04 s=1 e=0 z=0 None .sdata2 @5269 */
SECTION_SDATA2 static f32 lit_5269[1 + 1 /* padding */] = {
@@ -2725,14 +2671,10 @@ SECTION_SDATA2 static f32 lit_5269[1 + 1 /* padding */] = {
};
/* 80452080-80452088 0008+00 s=1 e=0 z=0 None .sdata2 @5270 */
SECTION_SDATA2 static u8 lit_5270[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5270 = 0.5;
/* 80452088-80452090 0008+00 s=1 e=0 z=0 None .sdata2 @5271 */
SECTION_SDATA2 static u8 lit_5271[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5271 = 3.0;
/* 80452090-80452098 0008+00 s=1 e=0 z=0 None .sdata2 @5272 */
SECTION_SDATA2 static u8 lit_5272[8] = {
@@ -2740,13 +2682,13 @@ SECTION_SDATA2 static u8 lit_5272[8] = {
};
/* 80452098-8045209C 0004+00 s=1 e=0 z=0 None .sdata2 @5273 */
SECTION_SDATA2 static u32 lit_5273 = 0x3ECCCCCD;
SECTION_SDATA2 static f32 lit_5273 = 2.0f / 5.0f;
/* 8045209C-804520A0 0004+00 s=1 e=0 z=0 None .sdata2 @5274 */
SECTION_SDATA2 static u32 lit_5274 = 0xBF800000;
SECTION_SDATA2 static f32 lit_5274 = -1.0f;
/* 804520A0-804520A4 0004+00 s=1 e=0 z=0 None .sdata2 @5275 */
SECTION_SDATA2 static u32 lit_5275 = 0xBF000000;
SECTION_SDATA2 static f32 lit_5275 = -0.5f;
/* 80054BD0-80055028 0458+00 s=1 e=0 z=0 None .text
* setShadowRealMtx__18dDlst_shadowReal_cFP4cXyzP4cXyzfffP12dKy_tevstr_c */
@@ -2803,16 +2745,16 @@ asm void dDlst_shadowSimple_c::draw() {
/* ############################################################################################## */
/* 804520A4-804520A8 0004+00 s=1 e=0 z=0 None .sdata2 @5375 */
SECTION_SDATA2 static u32 lit_5375 = 0xC37F0000;
SECTION_SDATA2 static f32 lit_5375 = -255.0f;
/* 804520A8-804520AC 0004+00 s=1 e=0 z=0 None .sdata2 @5376 */
SECTION_SDATA2 static u32 lit_5376 = 0x3A378034;
SECTION_SDATA2 static f32 lit_5376 = 0.000699999975040555f;
/* 804520AC-804520B0 0004+00 s=1 e=0 z=0 None .sdata2 @5377 */
SECTION_SDATA2 static u32 lit_5377 = 0x3FB33333;
SECTION_SDATA2 static f32 lit_5377 = 7.0f / 5.0f;
/* 804520B0-804520B4 0004+00 s=1 e=0 z=0 None .sdata2 @5378 */
SECTION_SDATA2 static u32 lit_5378 = 0x41800000;
SECTION_SDATA2 static f32 lit_5378 = 16.0f;
/* 800553EC-80055684 0298+00 s=1 e=0 z=0 None .text
* set__20dDlst_shadowSimple_cFP4cXyzffP4cXyzsfP9_GXTexObj */
@@ -2890,13 +2832,13 @@ asm void dDlst_shadowControl_c::draw(f32 (*param_0)[4]) {
/* ############################################################################################## */
/* 804520B8-804520BC 0004+00 s=1 e=0 z=0 None .sdata2 @5551 */
SECTION_SDATA2 static u32 lit_5551 = 0x3B449BA6;
SECTION_SDATA2 static f32 lit_5551 = 0.003000000026077032f;
/* 804520BC-804520C0 0004+00 s=1 e=0 z=0 None .sdata2 @5552 */
SECTION_SDATA2 static u32 lit_5552 = 0xC47A0000;
SECTION_SDATA2 static f32 lit_5552 = -1000.0f;
/* 804520C0-804520C4 0004+00 s=1 e=0 z=0 None .sdata2 @5553 */
SECTION_SDATA2 static u32 lit_5553 = 0x3A83126F;
SECTION_SDATA2 static f32 lit_5553 = 0.0010000000474974513f;
/* 80055C74-80055F1C 02A8+00 s=0 e=1 z=1 None .text
* setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c */
@@ -3146,7 +3088,7 @@ asm void dDlst_list_c::reset() {
/* ############################################################################################## */
/* 804520CC-804520D0 0004+00 s=1 e=0 z=0 None .sdata2 @5747 */
SECTION_SDATA2 static u32 lit_5747 = 0x461C3C00;
SECTION_SDATA2 static f32 lit_5747 = 9999.0f;
/* 800565EC-800566D4 00E8+00 s=0 e=2 z=0 None .text
* entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz */
@@ -3256,13 +3198,13 @@ f32 mWipeRate__12dDlst_list_c;
static f32 mWipeSpeed__12dDlst_list_c[1 + 1 /* padding */];
/* 804520D0-804520D4 0004+00 s=1 e=0 z=0 None .sdata2 @5809 */
SECTION_SDATA2 static u32 lit_5809 = 0x44180000;
SECTION_SDATA2 static f32 lit_5809 = 608.0f;
/* 804520D4-804520D8 0004+00 s=1 e=0 z=0 None .sdata2 @5810 */
SECTION_SDATA2 static u32 lit_5810 = 0x43E00000;
SECTION_SDATA2 static f32 lit_5810 = 448.0f;
/* 804520D8-804520DC 0004+00 s=1 e=0 z=0 None .sdata2 @5811 */
SECTION_SDATA2 static u32 lit_5811 = 0x401BE76D;
SECTION_SDATA2 static f32 lit_5811 = 2.436000108718872f;
/* 8005681C-800568D8 00BC+00 s=1 e=0 z=0 None .text wipeIn__12dDlst_list_cFfR8_GXColor */
#pragma push
@@ -3286,7 +3228,7 @@ asm void dDlst_list_c::wipeIn(f32 param_0) {
/* ############################################################################################## */
/* 804520DC-804520E0 0004+00 s=1 e=0 z=0 None .sdata2 @5838 */
SECTION_SDATA2 static u32 lit_5838 = 0x3F9BE76D;
SECTION_SDATA2 static f32 lit_5838 = 1.218000054359436f;
/* 80056900-800569A0 00A0+00 s=0 e=1 z=0 None .text calcWipe__12dDlst_list_cFv */
#pragma push
src/d/d_envse.cpp
-9
View File
@@ -64,8 +64,6 @@ static void dEnvSe_Execute(dEnvSe_c*);
static bool dEnvSe_IsDelete(dEnvSe_c*);
static bool dEnvSe_Delete(dEnvSe_c*);
static void dEnvSe_Create(dEnvSe_c*);
extern "C" extern char const* const d_d_envse__stringBase0;
extern "C" extern void* g_profile_ENVSE[10 + 1 /* padding */];
extern "C" static bool dEnvSe_Draw__FP8dEnvSe_c();
extern "C" static void dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath();
@@ -86,13 +84,6 @@ void dComIfGp_getReverb(int);
void dPath_GetRoomPath(int, int);
void dPath_GetNextRoomPath(dPath const*, int);
void cM3d_Len3dSqPntAndSegLine(cM3dGLin const*, Vec const*, Vec*, f32*);
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern void* __vt__8cM3dGLin[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_mEnvSeMgr[780];
extern "C" extern u32 __float_max;
extern "C" extern u8 struct_80450D64[4];
extern "C" void getStatusRoomDt__20dStage_roomControl_cFi();
extern "C" void dComIfGp_getReverb__Fi();
src/d/d_error_msg.cpp
+10 -28
View File
@@ -83,7 +83,6 @@ struct J2DOrthoGraph {
static void messageSet(u32, bool);
static void drawCapture(u8);
extern "C" extern char const* const d_d_error_msg__stringBase0;
extern "C" static void messageSet__FUlb();
extern "C" void draw__14dDvdErrorMsg_cFl();
@@ -100,21 +99,6 @@ void mDoAud_resetRecover();
void mDoGph_drawFilterQuad(s8, s8);
void mDoRst_reset(int, u32, int);
void cLib_chaseUC(u8*, u8, u8);
extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
extern "C" extern void* __vt__14J2DGrafContext[10];
extern "C" extern void* __vt__13J2DOrthoGraph[10];
extern "C" extern u8 mFrameBufferTexObj__13mDoGph_gInf_c[32];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 g_clearColor[4];
extern "C" extern u8 data_80450688[8];
extern "C" extern u8 struct_80450BB8[4];
extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" extern u8 mFrameBufferTex__13mDoGph_gInf_c[4];
extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" extern u8 struct_80450FB0[8];
extern "C" extern u8 sManager__10JFWDisplay[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void OSReport_Error();
extern "C" void mDoAud_resetRecover__Fv();
@@ -18841,36 +18825,34 @@ SECTION_SDATA2 static u8 lit_3758[4] = {
};
/* 80452C1C-80452C20 0004+00 s=2 e=0 z=0 None .sdata2 @3759 */
SECTION_SDATA2 static u32 lit_3759 = 0x44180000;
SECTION_SDATA2 static f32 lit_3759 = 608.0f;
/* 80452C20-80452C24 0004+00 s=1 e=0 z=0 None .sdata2 @3760 */
SECTION_SDATA2 static u32 lit_3760 = 0x43480000;
SECTION_SDATA2 static f32 lit_3760 = 200.0f;
/* 80452C24-80452C28 0004+00 s=2 e=0 z=0 None .sdata2 @3761 */
SECTION_SDATA2 static u32 lit_3761 = 0x43E00000;
SECTION_SDATA2 static f32 lit_3761 = 448.0f;
/* 80452C28-80452C2C 0004+00 s=1 e=0 z=0 None .sdata2 @3762 */
SECTION_SDATA2 static u32 lit_3762 = 0x41B80000;
SECTION_SDATA2 static f32 lit_3762 = 23.0f;
/* 80452C2C-80452C30 0004+00 s=1 e=0 z=0 None .sdata2 @3763 */
SECTION_SDATA2 static u32 lit_3763 = 0x41B00000;
SECTION_SDATA2 static f32 lit_3763 = 22.0f;
/* 80452C30-80452C34 0004+00 s=3 e=0 z=0 None .sdata2 @3764 */
SECTION_SDATA2 static u32 lit_3764 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3764 = 1.0f;
/* 80452C34-80452C38 0004+00 s=1 e=0 z=0 None .sdata2 @3765 */
SECTION_SDATA2 static u32 lit_3765 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3765 = 0.5f;
/* 80452C38-80452C3C 0004+00 s=1 e=0 z=0 None .sdata2 @3766 */
SECTION_SDATA2 static u32 lit_3766 = 0x40000000;
SECTION_SDATA2 static f32 lit_3766 = 2.0f;
/* 80452C3C-80452C40 0004+00 s=2 e=0 z=0 None .sdata2 @3767 */
SECTION_SDATA2 static u32 lit_3767 = 0x41200000;
SECTION_SDATA2 static f32 lit_3767 = 10.0f;
/* 80452C40-80452C48 0008+00 s=1 e=0 z=0 None .sdata2 @3769 */
SECTION_SDATA2 static u8 lit_3769[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3769 = 4503601774854144.0 /* cast s32 to float */;
/* 8009CB88-8009D194 060C+00 s=1 e=0 z=0 None .text messageSet__FUlb */
#pragma push
src/d/d_ev_camera.cpp
+187 -218
View File
@@ -207,11 +207,6 @@ struct cBgS {
static void dComIfGp_saveCameraPosition(int, cXyz*, cXyz*, f32, s16);
void fopAcM_GetID(void const*);
extern "C" extern u8 const lit_5985[28];
extern "C" extern u8 const lit_5986[28];
extern "C" extern u8 const lit_5987[20];
extern "C" extern u8 const lit_5988[20];
extern "C" extern char const* const d_d_ev_camera__stringBase0;
extern "C" static void func_800889F8();
extern "C" void StartEventCamera__9dCamera_cFiie();
@@ -309,18 +304,6 @@ void cM_rndFX(f32);
void cM3d_Len3dSqPntAndSegLine(cM3dGLin const*, Vec const*, Vec*, f32*);
void operator+(s16, cSAngle const&);
void operator delete(void*);
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern u8 engine_tbl__9dCamera_c[240];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern f32 Zero__4cXyz[3];
extern "C" extern u32 __float_nan;
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 m_object__7dDemo_c[4];
extern "C" extern u8 struct_80450F88[8];
extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 _0__7cSAngle[2 + 2 /* padding */];
extern "C" extern u8 _90__7cSAngle[2 + 2 /* padding */];
extern "C" void __dt__4cXyzFv();
extern "C" void mDoLib_project__FP3VecP3Vec();
@@ -811,27 +794,17 @@ static u8 lit_4202[12];
static u8 data_804253B4[12];
/* 804528B8-804528C0 0004+04 s=16 e=0 z=0 None .sdata2 @5141 */
SECTION_SDATA2 static u8 lit_5141[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_5141[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 804528C0-804528C8 0008+00 s=3 e=0 z=0 None .sdata2 @5142 */
SECTION_SDATA2 static u8 lit_5142[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5142 = 0.5;
/* 804528C8-804528D0 0008+00 s=3 e=0 z=0 None .sdata2 @5143 */
SECTION_SDATA2 static u8 lit_5143[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5143 = 3.0;
/* 804528D0-804528D8 0008+00 s=3 e=0 z=0 None .sdata2 @5144 */
SECTION_SDATA2 static u8 lit_5144[8] = {
@@ -839,7 +812,7 @@ SECTION_SDATA2 static u8 lit_5144[8] = {
};
/* 804528D8-804528DC 0004+00 s=5 e=0 z=0 None .sdata2 @5145 */
SECTION_SDATA2 static u32 lit_5145 = 0x43360B61;
SECTION_SDATA2 static f32 lit_5145 = 182.04444885253906f;
/* 800897E8-8008A510 0D28+00 s=0 e=1 z=0 None .text fixedFrameEvCamera__9dCamera_cFv */
#pragma push
@@ -853,7 +826,7 @@ asm void dCamera_c::fixedFrameEvCamera() {
/* ############################################################################################## */
/* 804528DC-804528E0 0004+00 s=10 e=0 z=0 None .sdata2 @5346 */
SECTION_SDATA2 static u32 lit_5346 = 0x3F800000;
SECTION_SDATA2 static f32 lit_5346 = 1.0f;
/* 8008A510-8008A974 0464+00 s=0 e=1 z=0 None .text stokerEvCamera__9dCamera_cFv */
#pragma push
@@ -874,9 +847,7 @@ SECTION_SDATA2 static f32 lit_5844[1 + 1 /* padding */] = {
};
/* 804528E8-804528F0 0008+00 s=7 e=0 z=0 None .sdata2 @5846 */
SECTION_SDATA2 static u8 lit_5846[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5846 = 4503599627370496.0 /* cast u32 to float */;
/* 8008A974-8008B9B0 103C+00 s=0 e=1 z=0 None .text rollingEvCamera__9dCamera_cFv */
#pragma push
@@ -910,9 +881,7 @@ SECTION_SDATA2 static f32 lit_5959[1 + 1 /* padding */] = {
};
/* 804528F8-80452900 0008+00 s=10 e=0 z=0 None .sdata2 @5962 */
SECTION_SDATA2 static u8 lit_5962[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5962 = 4503601774854144.0 /* cast s32 to float */;
/* 8008B9B0-8008BE2C 047C+00 s=0 e=1 z=0 None .text fixedPositionEvCamera__9dCamera_cFv */
#pragma push
@@ -956,10 +925,10 @@ asm void dCamera_c::uniformAcceleEvCamera() {
/* ############################################################################################## */
/* 80452900-80452904 0004+00 s=1 e=0 z=0 None .sdata2 @6682 */
SECTION_SDATA2 static u32 lit_6682 = 0x43B40000;
SECTION_SDATA2 static f32 lit_6682 = 360.0f;
/* 80452904-80452908 0004+00 s=1 e=0 z=0 None .sdata2 @6683 */
SECTION_SDATA2 static u32 lit_6683 = 0xC3B40000;
SECTION_SDATA2 static f32 lit_6683 = -360.0f;
/* 8008BE98-8008E750 28B8+00 s=3 e=0 z=0 None .text transEvCamera__9dCamera_cFi */
#pragma push
@@ -1040,46 +1009,46 @@ static u8 lit_6756[12];
static u8 DefaultGap_6755[12];
/* 80452908-8045290C 0004+00 s=2 e=0 z=0 None .sdata2 @7334 */
SECTION_SDATA2 static u32 lit_7334 = 0x443B8000;
SECTION_SDATA2 static f32 lit_7334 = 750.0f;
/* 8045290C-80452910 0004+00 s=1 e=0 z=0 None .sdata2 @7335 */
SECTION_SDATA2 static u32 lit_7335 = 0x43C80000;
SECTION_SDATA2 static f32 lit_7335 = 400.0f;
/* 80452910-80452914 0004+00 s=2 e=0 z=0 None .sdata2 @7336 */
SECTION_SDATA2 static u32 lit_7336 = 0x44BB8000;
SECTION_SDATA2 static f32 lit_7336 = 1500.0f;
/* 80452914-80452918 0004+00 s=1 e=0 z=0 None .sdata2 @7337 */
SECTION_SDATA2 static u32 lit_7337 = 0x42780000;
SECTION_SDATA2 static f32 lit_7337 = 62.0f;
/* 80452918-8045291C 0004+00 s=1 e=0 z=0 None .sdata2 @7338 */
SECTION_SDATA2 static u32 lit_7338 = 0x43330000;
SECTION_SDATA2 static f32 lit_7338 = 179.0f;
/* 8045291C-80452920 0004+00 s=6 e=0 z=0 None .sdata2 @7339 */
SECTION_SDATA2 static u32 lit_7339 = 0x41200000;
SECTION_SDATA2 static f32 lit_7339 = 10.0f;
/* 80452920-80452924 0004+00 s=4 e=0 z=0 None .sdata2 @7340 */
SECTION_SDATA2 static u32 lit_7340 = 0x40A00000;
SECTION_SDATA2 static f32 lit_7340 = 5.0f;
/* 80452924-80452928 0004+00 s=4 e=0 z=0 None .sdata2 @7341 */
SECTION_SDATA2 static u32 lit_7341 = 0xC0A00000;
SECTION_SDATA2 static f32 lit_7341 = -5.0f;
/* 80452928-8045292C 0004+00 s=5 e=0 z=0 None .sdata2 @7342 */
SECTION_SDATA2 static u32 lit_7342 = 0x42F00000;
SECTION_SDATA2 static f32 lit_7342 = 120.0f;
/* 8045292C-80452930 0004+00 s=2 e=0 z=0 None .sdata2 @7343 */
SECTION_SDATA2 static u32 lit_7343 = 0xC1000000;
SECTION_SDATA2 static f32 lit_7343 = -8.0f;
/* 80452930-80452934 0004+00 s=2 e=0 z=0 None .sdata2 @7344 */
SECTION_SDATA2 static u32 lit_7344 = 0x41000000;
SECTION_SDATA2 static f32 lit_7344 = 8.0f;
/* 80452934-80452938 0004+00 s=6 e=0 z=0 None .sdata2 @7345 */
SECTION_SDATA2 static u32 lit_7345 = 0x428C0000;
SECTION_SDATA2 static f32 lit_7345 = 70.0f;
/* 80452938-8045293C 0004+00 s=1 e=0 z=0 None .sdata2 @7346 */
SECTION_SDATA2 static u32 lit_7346 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_7346 = 1.0f / 10.0f;
/* 8045293C-80452940 0004+00 s=6 e=0 z=0 None .sdata2 @7347 */
SECTION_SDATA2 static u32 lit_7347 = 0x41F00000;
SECTION_SDATA2 static f32 lit_7347 = 30.0f;
/* 8008E938-8008FA58 1120+00 s=0 e=1 z=0 None .text watchActorEvCamera__9dCamera_cFv */
#pragma push
@@ -1103,7 +1072,7 @@ asm void cSGlobe::V(cSAngle const& param_0) {
/* ############################################################################################## */
/* 80452940-80452944 0004+00 s=5 e=0 z=0 None .sdata2 @7357 */
SECTION_SDATA2 static u32 lit_7357 = 0x41700000;
SECTION_SDATA2 static f32 lit_7357 = 15.0f;
/* 8008FA94-8008FAE8 0054+00 s=7 e=0 z=0 None .text
* lineCollisionCheck__25@unnamed@d_ev_camera_cpp@F4cXyz4cXyzP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c
@@ -1166,151 +1135,151 @@ asm void dCamera_c::styleEvCamera() {
/* ############################################################################################## */
/* 80452944-80452948 0004+00 s=4 e=0 z=0 None .sdata2 @8178 */
SECTION_SDATA2 static u32 lit_8178 = 0xC2340000;
SECTION_SDATA2 static f32 lit_8178 = -45.0f;
/* 80452948-8045294C 0004+00 s=2 e=0 z=0 None .sdata2 @8179 */
SECTION_SDATA2 static u32 lit_8179 = 0x42AA0000;
SECTION_SDATA2 static f32 lit_8179 = 85.0f;
/* 8045294C-80452950 0004+00 s=4 e=0 z=0 None .sdata2 @8180 */
SECTION_SDATA2 static u32 lit_8180 = 0xC2480000;
SECTION_SDATA2 static f32 lit_8180 = -50.0f;
/* 80452950-80452954 0004+00 s=4 e=0 z=0 None .sdata2 @8181 */
SECTION_SDATA2 static u32 lit_8181 = 0x43250000;
SECTION_SDATA2 static f32 lit_8181 = 165.0f;
/* 80452954-80452958 0004+00 s=1 e=0 z=0 None .sdata2 @8182 */
SECTION_SDATA2 static u32 lit_8182 = 0x42900000;
SECTION_SDATA2 static f32 lit_8182 = 72.0f;
/* 80452958-8045295C 0004+00 s=1 e=0 z=0 None .sdata2 @8183 */
SECTION_SDATA2 static u32 lit_8183 = 0xC2800000;
SECTION_SDATA2 static f32 lit_8183 = -64.0f;
/* 8045295C-80452960 0004+00 s=6 e=0 z=0 None .sdata2 @8184 */
SECTION_SDATA2 static u32 lit_8184 = 0x42700000;
SECTION_SDATA2 static f32 lit_8184 = 60.0f;
/* 80452960-80452964 0004+00 s=4 e=0 z=0 None .sdata2 @8185 */
SECTION_SDATA2 static u32 lit_8185 = 0xC1A00000;
SECTION_SDATA2 static f32 lit_8185 = -20.0f;
/* 80452964-80452968 0004+00 s=4 e=0 z=0 None .sdata2 @8186 */
SECTION_SDATA2 static u32 lit_8186 = 0x42340000;
SECTION_SDATA2 static f32 lit_8186 = 45.0f;
/* 80452968-8045296C 0004+00 s=6 e=0 z=0 None .sdata2 @8187 */
SECTION_SDATA2 static u32 lit_8187 = 0x42200000;
SECTION_SDATA2 static f32 lit_8187 = 40.0f;
/* 8045296C-80452970 0004+00 s=6 e=0 z=0 None .sdata2 @8188 */
SECTION_SDATA2 static u32 lit_8188 = 0xC28C0000;
SECTION_SDATA2 static f32 lit_8188 = -70.0f;
/* 80452970-80452974 0004+00 s=3 e=0 z=0 None .sdata2 @8189 */
SECTION_SDATA2 static u32 lit_8189 = 0x42DC0000;
SECTION_SDATA2 static f32 lit_8189 = 110.0f;
/* 80452974-80452978 0004+00 s=4 e=0 z=0 None .sdata2 @8190 */
SECTION_SDATA2 static u32 lit_8190 = 0xC1200000;
SECTION_SDATA2 static f32 lit_8190 = -10.0f;
/* 80452978-8045297C 0004+00 s=2 e=0 z=0 None .sdata2 @8191 */
SECTION_SDATA2 static u32 lit_8191 = 0xC2F00000;
SECTION_SDATA2 static f32 lit_8191 = -120.0f;
/* 8045297C-80452980 0004+00 s=3 e=0 z=0 None .sdata2 @8192 */
SECTION_SDATA2 static u32 lit_8192 = 0x43020000;
SECTION_SDATA2 static f32 lit_8192 = 130.0f;
/* 80452980-80452984 0004+00 s=2 e=0 z=0 None .sdata2 @8193 */
SECTION_SDATA2 static u32 lit_8193 = 0x420C0000;
SECTION_SDATA2 static f32 lit_8193 = 35.0f;
/* 80452984-80452988 0004+00 s=5 e=0 z=0 None .sdata2 @8194 */
SECTION_SDATA2 static u32 lit_8194 = 0x43200000;
SECTION_SDATA2 static f32 lit_8194 = 160.0f;
/* 80452988-8045298C 0004+00 s=3 e=0 z=0 None .sdata2 @8195 */
SECTION_SDATA2 static u32 lit_8195 = 0x42D20000;
SECTION_SDATA2 static f32 lit_8195 = 105.0f;
/* 8045298C-80452990 0004+00 s=2 e=0 z=0 None .sdata2 @8196 */
SECTION_SDATA2 static u32 lit_8196 = 0xC2820000;
SECTION_SDATA2 static f32 lit_8196 = -65.0f;
/* 80452990-80452994 0004+00 s=1 e=0 z=0 None .sdata2 @8197 */
SECTION_SDATA2 static u32 lit_8197 = 0x43480000;
SECTION_SDATA2 static f32 lit_8197 = 200.0f;
/* 80452994-80452998 0004+00 s=3 e=0 z=0 None .sdata2 @8198 */
SECTION_SDATA2 static u32 lit_8198 = 0x42C80000;
SECTION_SDATA2 static f32 lit_8198 = 100.0f;
/* 80452998-8045299C 0004+00 s=4 e=0 z=0 None .sdata2 @8199 */
SECTION_SDATA2 static u32 lit_8199 = 0xC2700000;
SECTION_SDATA2 static f32 lit_8199 = -60.0f;
/* 8045299C-804529A0 0004+00 s=3 e=0 z=0 None .sdata2 @8200 */
SECTION_SDATA2 static u32 lit_8200 = 0xC2A00000;
SECTION_SDATA2 static f32 lit_8200 = -80.0f;
/* 804529A0-804529A4 0004+00 s=2 e=0 z=0 None .sdata2 @8201 */
SECTION_SDATA2 static u32 lit_8201 = 0x41C80000;
SECTION_SDATA2 static f32 lit_8201 = 25.0f;
/* 804529A4-804529A8 0004+00 s=1 e=0 z=0 None .sdata2 @8202 */
SECTION_SDATA2 static u32 lit_8202 = 0x41400000;
SECTION_SDATA2 static f32 lit_8202 = 12.0f;
/* 804529A8-804529AC 0004+00 s=1 e=0 z=0 None .sdata2 @8203 */
SECTION_SDATA2 static u32 lit_8203 = 0xC30C0000;
SECTION_SDATA2 static f32 lit_8203 = -140.0f;
/* 804529AC-804529B0 0004+00 s=2 e=0 z=0 None .sdata2 @8204 */
SECTION_SDATA2 static u32 lit_8204 = 0x433E0000;
SECTION_SDATA2 static f32 lit_8204 = 190.0f;
/* 804529B0-804529B4 0004+00 s=2 e=0 z=0 None .sdata2 @8205 */
SECTION_SDATA2 static u32 lit_8205 = 0xC3160000;
SECTION_SDATA2 static f32 lit_8205 = -150.0f;
/* 804529B4-804529B8 0004+00 s=5 e=0 z=0 None .sdata2 @8206 */
SECTION_SDATA2 static u32 lit_8206 = 0x41A00000;
SECTION_SDATA2 static f32 lit_8206 = 20.0f;
/* 804529B8-804529BC 0004+00 s=2 e=0 z=0 None .sdata2 @8207 */
SECTION_SDATA2 static u32 lit_8207 = 0xC2960000;
SECTION_SDATA2 static f32 lit_8207 = -75.0f;
/* 804529BC-804529C0 0004+00 s=3 e=0 z=0 None .sdata2 @8208 */
SECTION_SDATA2 static u32 lit_8208 = 0x42E60000;
SECTION_SDATA2 static f32 lit_8208 = 115.0f;
/* 804529C0-804529C4 0004+00 s=3 e=0 z=0 None .sdata2 @8209 */
SECTION_SDATA2 static u32 lit_8209 = 0xC2200000;
SECTION_SDATA2 static f32 lit_8209 = -40.0f;
/* 804529C4-804529C8 0004+00 s=1 e=0 z=0 None .sdata2 @8210 */
SECTION_SDATA2 static u32 lit_8210 = 0x43070000;
SECTION_SDATA2 static f32 lit_8210 = 135.0f;
/* 804529C8-804529CC 0004+00 s=3 e=0 z=0 None .sdata2 @8211 */
SECTION_SDATA2 static u32 lit_8211 = 0x430C0000;
SECTION_SDATA2 static f32 lit_8211 = 140.0f;
/* 804529CC-804529D0 0004+00 s=3 e=0 z=0 None .sdata2 @8212 */
SECTION_SDATA2 static u32 lit_8212 = 0xC2C80000;
SECTION_SDATA2 static f32 lit_8212 = -100.0f;
/* 804529D0-804529D4 0004+00 s=1 e=0 z=0 None .sdata2 @8213 */
SECTION_SDATA2 static u32 lit_8213 = 0x42E00000;
SECTION_SDATA2 static f32 lit_8213 = 112.0f;
/* 804529D4-804529D8 0004+00 s=3 e=0 z=0 None .sdata2 @8214 */
SECTION_SDATA2 static u32 lit_8214 = 0x43160000;
SECTION_SDATA2 static f32 lit_8214 = 150.0f;
/* 804529D8-804529DC 0004+00 s=3 e=0 z=0 None .sdata2 @8215 */
SECTION_SDATA2 static u32 lit_8215 = 0x42820000;
SECTION_SDATA2 static f32 lit_8215 = 65.0f;
/* 804529DC-804529E0 0004+00 s=2 e=0 z=0 None .sdata2 @8216 */
SECTION_SDATA2 static u32 lit_8216 = 0x43340000;
SECTION_SDATA2 static f32 lit_8216 = 180.0f;
/* 804529E0-804529E4 0004+00 s=2 e=0 z=0 None .sdata2 @8217 */
SECTION_SDATA2 static u32 lit_8217 = 0xC3480000;
SECTION_SDATA2 static f32 lit_8217 = -200.0f;
/* 804529E4-804529E8 0004+00 s=7 e=0 z=0 None .sdata2 @8218 */
SECTION_SDATA2 static u32 lit_8218 = 0x42480000;
SECTION_SDATA2 static f32 lit_8218 = 50.0f;
/* 804529E8-804529EC 0004+00 s=1 e=0 z=0 None .sdata2 @8219 */
SECTION_SDATA2 static u32 lit_8219 = 0x43660000;
SECTION_SDATA2 static f32 lit_8219 = 230.0f;
/* 804529EC-804529F0 0004+00 s=1 e=0 z=0 None .sdata2 @8220 */
SECTION_SDATA2 static u32 lit_8220 = 0x3F666666;
SECTION_SDATA2 static f32 lit_8220 = 9.0f / 10.0f;
/* 804529F0-804529F4 0004+00 s=2 e=0 z=0 None .sdata2 @8221 */
SECTION_SDATA2 static u32 lit_8221 = 0x42960000;
SECTION_SDATA2 static f32 lit_8221 = 75.0f;
/* 804529F4-804529F8 0004+00 s=1 e=0 z=0 None .sdata2 @8222 */
SECTION_SDATA2 static u32 lit_8222 = 0x3BA3D70A;
SECTION_SDATA2 static f32 lit_8222 = 0.004999999888241291f;
/* 804529F8-804529FC 0004+00 s=4 e=0 z=0 None .sdata2 @8223 */
SECTION_SDATA2 static u32 lit_8223 = 0x425C0000;
SECTION_SDATA2 static f32 lit_8223 = 55.0f;
/* 804529FC-80452A00 0004+00 s=1 e=0 z=0 None .sdata2 @8224 */
SECTION_SDATA2 static u32 lit_8224 = 0x3CA3D70A;
SECTION_SDATA2 static f32 lit_8224 = 1.0f / 50.0f;
/* 80452A00-80452A04 0004+00 s=3 e=0 z=0 None .sdata2 @8225 */
SECTION_SDATA2 static u32 lit_8225 = 0x43AF0000;
SECTION_SDATA2 static f32 lit_8225 = 350.0f;
/* 80452A04-80452A08 0004+00 s=2 e=0 z=0 None .sdata2 @8226 */
SECTION_SDATA2 static u32 lit_8226 = 0x3F7AE148;
SECTION_SDATA2 static f32 lit_8226 = 49.0f / 50.0f;
/* 80090514-80091468 0F54+00 s=0 e=1 z=0 None .text gameOverEvCamera__9dCamera_cFv */
#pragma push
@@ -1358,100 +1327,100 @@ SECTION_DATA static void* lit_8754[30] = {
};
/* 80452A08-80452A0C 0004+00 s=1 e=0 z=0 None .sdata2 @8722 */
SECTION_SDATA2 static u32 lit_8722 = 0x43570000;
SECTION_SDATA2 static f32 lit_8722 = 215.0f;
/* 80452A0C-80452A10 0004+00 s=1 e=0 z=0 None .sdata2 @8723 */
SECTION_SDATA2 static u32 lit_8723 = 0xC1D00000;
SECTION_SDATA2 static f32 lit_8723 = -26.0f;
/* 80452A10-80452A14 0004+00 s=2 e=0 z=0 None .sdata2 @8724 */
SECTION_SDATA2 static u32 lit_8724 = 0x42A00000;
SECTION_SDATA2 static f32 lit_8724 = 80.0f;
/* 80452A14-80452A18 0004+00 s=1 e=0 z=0 None .sdata2 @8725 */
SECTION_SDATA2 static u32 lit_8725 = 0xC0800000;
SECTION_SDATA2 static f32 lit_8725 = -4.0f;
/* 80452A18-80452A1C 0004+00 s=1 e=0 z=0 None .sdata2 @8726 */
SECTION_SDATA2 static u32 lit_8726 = 0x41E00000;
SECTION_SDATA2 static f32 lit_8726 = 28.0f;
/* 80452A1C-80452A20 0004+00 s=1 e=0 z=0 None .sdata2 @8727 */
SECTION_SDATA2 static u32 lit_8727 = 0x435C0000;
SECTION_SDATA2 static f32 lit_8727 = 220.0f;
/* 80452A20-80452A24 0004+00 s=2 e=0 z=0 None .sdata2 @8728 */
SECTION_SDATA2 static u32 lit_8728 = 0xC1700000;
SECTION_SDATA2 static f32 lit_8728 = -15.0f;
/* 80452A24-80452A28 0004+00 s=2 e=0 z=0 None .sdata2 @8729 */
SECTION_SDATA2 static u32 lit_8729 = 0x43700000;
SECTION_SDATA2 static f32 lit_8729 = 240.0f;
/* 80452A28-80452A2C 0004+00 s=1 e=0 z=0 None .sdata2 @8730 */
SECTION_SDATA2 static u32 lit_8730 = 0x43BE0000;
SECTION_SDATA2 static f32 lit_8730 = 380.0f;
/* 80452A2C-80452A30 0004+00 s=1 e=0 z=0 None .sdata2 @8731 */
SECTION_SDATA2 static u32 lit_8731 = 0x43E10000;
SECTION_SDATA2 static f32 lit_8731 = 450.0f;
/* 80452A30-80452A34 0004+00 s=1 e=0 z=0 None .sdata2 @8732 */
SECTION_SDATA2 static u32 lit_8732 = 0xC36B0000;
SECTION_SDATA2 static f32 lit_8732 = -235.0f;
/* 80452A34-80452A38 0004+00 s=1 e=0 z=0 None .sdata2 @8733 */
SECTION_SDATA2 static u32 lit_8733 = 0xC30E0000;
SECTION_SDATA2 static f32 lit_8733 = -142.0f;
/* 80452A38-80452A3C 0004+00 s=1 e=0 z=0 None .sdata2 @8734 */
SECTION_SDATA2 static u32 lit_8734 = 0x43EB0000;
SECTION_SDATA2 static f32 lit_8734 = 470.0f;
/* 80452A3C-80452A40 0004+00 s=3 e=0 z=0 None .sdata2 @8735 */
SECTION_SDATA2 static u32 lit_8735 = 0xC3820000;
SECTION_SDATA2 static f32 lit_8735 = -260.0f;
/* 80452A40-80452A44 0004+00 s=1 e=0 z=0 None .sdata2 @8736 */
SECTION_SDATA2 static u32 lit_8736 = 0xC2840000;
SECTION_SDATA2 static f32 lit_8736 = -66.0f;
/* 80452A44-80452A48 0004+00 s=1 e=0 z=0 None .sdata2 @8737 */
SECTION_SDATA2 static u32 lit_8737 = 0x43C30000;
SECTION_SDATA2 static f32 lit_8737 = 390.0f;
/* 80452A48-80452A4C 0004+00 s=1 e=0 z=0 None .sdata2 @8738 */
SECTION_SDATA2 static u32 lit_8738 = 0x42600000;
SECTION_SDATA2 static f32 lit_8738 = 56.0f;
/* 80452A4C-80452A50 0004+00 s=1 e=0 z=0 None .sdata2 @8739 */
SECTION_SDATA2 static u32 lit_8739 = 0xC1800000;
SECTION_SDATA2 static f32 lit_8739 = -16.0f;
/* 80452A50-80452A54 0004+00 s=1 e=0 z=0 None .sdata2 @8740 */
SECTION_SDATA2 static u32 lit_8740 = 0x41600000;
SECTION_SDATA2 static f32 lit_8740 = 14.0f;
/* 80452A54-80452A58 0004+00 s=2 e=0 z=0 None .sdata2 @8741 */
SECTION_SDATA2 static u32 lit_8741 = 0xC1900000;
SECTION_SDATA2 static f32 lit_8741 = -18.0f;
/* 80452A58-80452A5C 0004+00 s=3 e=0 z=0 None .sdata2 @8742 */
SECTION_SDATA2 static u32 lit_8742 = 0xC1400000;
SECTION_SDATA2 static f32 lit_8742 = -12.0f;
/* 80452A5C-80452A60 0004+00 s=1 e=0 z=0 None .sdata2 @8743 */
SECTION_SDATA2 static u32 lit_8743 = 0xC3000000;
SECTION_SDATA2 static f32 lit_8743 = -128.0f;
/* 80452A60-80452A64 0004+00 s=2 e=0 z=0 None .sdata2 @8744 */
SECTION_SDATA2 static u32 lit_8744 = 0xC1E00000;
SECTION_SDATA2 static f32 lit_8744 = -28.0f;
/* 80452A64-80452A68 0004+00 s=1 e=0 z=0 None .sdata2 @8745 */
SECTION_SDATA2 static u32 lit_8745 = 0x432C0000;
SECTION_SDATA2 static f32 lit_8745 = 172.0f;
/* 80452A68-80452A6C 0004+00 s=1 e=0 z=0 None .sdata2 @8746 */
SECTION_SDATA2 static u32 lit_8746 = 0x42680000;
SECTION_SDATA2 static f32 lit_8746 = 58.0f;
/* 80452A6C-80452A70 0004+00 s=2 e=0 z=0 None .sdata2 @8747 */
SECTION_SDATA2 static u32 lit_8747 = 0xC1C80000;
SECTION_SDATA2 static f32 lit_8747 = -25.0f;
/* 80452A70-80452A74 0004+00 s=1 e=0 z=0 None .sdata2 @8748 */
SECTION_SDATA2 static u32 lit_8748 = 0xC2600000;
SECTION_SDATA2 static f32 lit_8748 = -56.0f;
/* 80452A74-80452A78 0004+00 s=1 e=0 z=0 None .sdata2 @8749 */
SECTION_SDATA2 static u32 lit_8749 = 0xC2580000;
SECTION_SDATA2 static f32 lit_8749 = -54.0f;
/* 80452A78-80452A7C 0004+00 s=2 e=0 z=0 None .sdata2 @8750 */
SECTION_SDATA2 static u32 lit_8750 = 0x42D80000;
SECTION_SDATA2 static f32 lit_8750 = 108.0f;
/* 80452A7C-80452A80 0004+00 s=1 e=0 z=0 None .sdata2 @8751 */
SECTION_SDATA2 static u32 lit_8751 = 0xC29C0000;
SECTION_SDATA2 static f32 lit_8751 = -78.0f;
/* 80452A80-80452A84 0004+00 s=3 e=0 z=0 None .sdata2 @8752 */
SECTION_SDATA2 static u32 lit_8752 = 0xC1F00000;
SECTION_SDATA2 static f32 lit_8752 = -30.0f;
/* 80452A84-80452A88 0004+00 s=1 e=0 z=0 None .sdata2 @8753 */
SECTION_SDATA2 static u32 lit_8753 = 0xC3200000;
SECTION_SDATA2 static f32 lit_8753 = -160.0f;
/* 80091468-8009236C 0F04+00 s=1 e=1 z=0 None .text tactEvCamera__9dCamera_cFv */
#pragma push
@@ -1512,145 +1481,145 @@ asm void dCamera_c::loadEvCamera() {
/* ############################################################################################## */
/* 80452A88-80452A8C 0004+00 s=1 e=0 z=0 None .sdata2 @9395 */
SECTION_SDATA2 static u32 lit_9395 = 0x42800000;
SECTION_SDATA2 static f32 lit_9395 = 64.0f;
/* 80452A8C-80452A90 0004+00 s=1 e=0 z=0 None .sdata2 @9396 */
SECTION_SDATA2 static u32 lit_9396 = 0x42EC0000;
SECTION_SDATA2 static f32 lit_9396 = 118.0f;
/* 80452A90-80452A94 0004+00 s=1 e=0 z=0 None .sdata2 @9397 */
SECTION_SDATA2 static u32 lit_9397 = 0xC2000000;
SECTION_SDATA2 static f32 lit_9397 = -32.0f;
/* 80452A94-80452A98 0004+00 s=1 e=0 z=0 None .sdata2 @9398 */
SECTION_SDATA2 static u32 lit_9398 = 0xC2500000;
SECTION_SDATA2 static f32 lit_9398 = -52.0f;
/* 80452A98-80452A9C 0004+00 s=1 e=0 z=0 None .sdata2 @9399 */
SECTION_SDATA2 static u32 lit_9399 = 0x42080000;
SECTION_SDATA2 static f32 lit_9399 = 34.0f;
/* 80452A9C-80452AA0 0004+00 s=1 e=0 z=0 None .sdata2 @9400 */
SECTION_SDATA2 static u32 lit_9400 = 0x42E80000;
SECTION_SDATA2 static f32 lit_9400 = 116.0f;
/* 80452AA0-80452AA4 0004+00 s=1 e=0 z=0 None .sdata2 @9401 */
SECTION_SDATA2 static u32 lit_9401 = 0x42B00000;
SECTION_SDATA2 static f32 lit_9401 = 88.0f;
/* 80452AA4-80452AA8 0004+00 s=1 e=0 z=0 None .sdata2 @9402 */
SECTION_SDATA2 static u32 lit_9402 = 0xC2040000;
SECTION_SDATA2 static f32 lit_9402 = -33.0f;
/* 80452AA8-80452AAC 0004+00 s=1 e=0 z=0 None .sdata2 @9403 */
SECTION_SDATA2 static u32 lit_9403 = 0xC25C0000;
SECTION_SDATA2 static f32 lit_9403 = -55.0f;
/* 80452AAC-80452AB0 0004+00 s=1 e=0 z=0 None .sdata2 @9404 */
SECTION_SDATA2 static u32 lit_9404 = 0x41800000;
SECTION_SDATA2 static f32 lit_9404 = 16.0f;
/* 80452AB0-80452AB4 0004+00 s=1 e=0 z=0 None .sdata2 @9405 */
SECTION_SDATA2 static u32 lit_9405 = 0x42500000;
SECTION_SDATA2 static f32 lit_9405 = 52.0f;
/* 80452AB4-80452AB8 0004+00 s=3 e=0 z=0 None .sdata2 @9406 */
SECTION_SDATA2 static u32 lit_9406 = 0xC2AA0000;
SECTION_SDATA2 static f32 lit_9406 = -85.0f;
/* 80452AB8-80452ABC 0004+00 s=1 e=0 z=0 None .sdata2 @9407 */
SECTION_SDATA2 static u32 lit_9407 = 0xC2BE0000;
SECTION_SDATA2 static f32 lit_9407 = -95.0f;
/* 80452ABC-80452AC0 0004+00 s=1 e=0 z=0 None .sdata2 @9408 */
SECTION_SDATA2 static u32 lit_9408 = 0x42B80000;
SECTION_SDATA2 static f32 lit_9408 = 92.0f;
/* 80452AC0-80452AC4 0004+00 s=1 e=0 z=0 None .sdata2 @9409 */
SECTION_SDATA2 static u32 lit_9409 = 0x431B0000;
SECTION_SDATA2 static f32 lit_9409 = 155.0f;
/* 80452AC4-80452AC8 0004+00 s=2 e=0 z=0 None .sdata2 @9410 */
SECTION_SDATA2 static u32 lit_9410 = 0xC1D80000;
SECTION_SDATA2 static f32 lit_9410 = -27.0f;
/* 80452AC8-80452ACC 0004+00 s=1 e=0 z=0 None .sdata2 @9411 */
SECTION_SDATA2 static u32 lit_9411 = 0xC2B40000;
SECTION_SDATA2 static f32 lit_9411 = -90.0f;
/* 80452ACC-80452AD0 0004+00 s=1 e=0 z=0 None .sdata2 @9412 */
SECTION_SDATA2 static u32 lit_9412 = 0xC2880000;
SECTION_SDATA2 static f32 lit_9412 = -68.0f;
/* 80452AD0-80452AD4 0004+00 s=1 e=0 z=0 None .sdata2 @9413 */
SECTION_SDATA2 static u32 lit_9413 = 0x42E40000;
SECTION_SDATA2 static f32 lit_9413 = 114.0f;
/* 80452AD4-80452AD8 0004+00 s=1 e=0 z=0 None .sdata2 @9414 */
SECTION_SDATA2 static u32 lit_9414 = 0xC2DC0000;
SECTION_SDATA2 static f32 lit_9414 = -110.0f;
/* 80452AD8-80452ADC 0004+00 s=1 e=0 z=0 None .sdata2 @9415 */
SECTION_SDATA2 static u32 lit_9415 = 0x41F1ED91;
SECTION_SDATA2 static f32 lit_9415 = 30.240999221801758f;
/* 80452ADC-80452AE0 0004+00 s=1 e=0 z=0 None .sdata2 @9416 */
SECTION_SDATA2 static u32 lit_9416 = 0x414A72B0;
SECTION_SDATA2 static f32 lit_9416 = 12.652999877929688f;
/* 80452AE0-80452AE4 0004+00 s=1 e=0 z=0 None .sdata2 @9417 */
SECTION_SDATA2 static u32 lit_9417 = 0x415F3333;
SECTION_SDATA2 static f32 lit_9417 = 13.949999809265137f;
/* 80452AE4-80452AE8 0004+00 s=1 e=0 z=0 None .sdata2 @9418 */
SECTION_SDATA2 static u32 lit_9418 = 0x41BD1CAC;
SECTION_SDATA2 static f32 lit_9418 = 23.638999938964844f;
/* 80452AE8-80452AEC 0004+00 s=1 e=0 z=0 None .sdata2 @9419 */
SECTION_SDATA2 static u32 lit_9419 = 0x42C145A2;
SECTION_SDATA2 static f32 lit_9419 = 96.63600158691406f;
/* 80452AEC-80452AF0 0004+00 s=1 e=0 z=0 None .sdata2 @9420 */
SECTION_SDATA2 static u32 lit_9420 = 0x426545A2;
SECTION_SDATA2 static f32 lit_9420 = 57.31800079345703f;
/* 80452AF0-80452AF4 0004+00 s=1 e=0 z=0 None .sdata2 @9421 */
SECTION_SDATA2 static u32 lit_9421 = 0xC0365604;
SECTION_SDATA2 static f32 lit_9421 = -2.8489999771118164f;
/* 80452AF4-80452AF8 0004+00 s=1 e=0 z=0 None .sdata2 @9422 */
SECTION_SDATA2 static u32 lit_9422 = 0x42C1472B;
SECTION_SDATA2 static f32 lit_9422 = 96.63899993896484f;
/* 80452AF8-80452AFC 0004+00 s=1 e=0 z=0 None .sdata2 @9423 */
SECTION_SDATA2 static u32 lit_9423 = 0x422B0312;
SECTION_SDATA2 static f32 lit_9423 = 42.75299835205078f;
/* 80452AFC-80452B00 0004+00 s=2 e=0 z=0 None .sdata2 @9424 */
SECTION_SDATA2 static u32 lit_9424 = 0xC3020000;
SECTION_SDATA2 static f32 lit_9424 = -130.0f;
/* 80452B00-80452B04 0004+00 s=1 e=0 z=0 None .sdata2 @9425 */
SECTION_SDATA2 static u32 lit_9425 = 0xC3D20000;
SECTION_SDATA2 static f32 lit_9425 = -420.0f;
/* 80452B04-80452B08 0004+00 s=1 e=0 z=0 None .sdata2 @9426 */
SECTION_SDATA2 static u32 lit_9426 = 0xC3C80000;
SECTION_SDATA2 static f32 lit_9426 = -400.0f;
/* 80452B08-80452B0C 0004+00 s=1 e=0 z=0 None .sdata2 @9427 */
SECTION_SDATA2 static u32 lit_9427 = 0x42BE0000;
SECTION_SDATA2 static f32 lit_9427 = 95.0f;
/* 80452B0C-80452B10 0004+00 s=1 e=0 z=0 None .sdata2 @9428 */
SECTION_SDATA2 static u32 lit_9428 = 0xC3750000;
SECTION_SDATA2 static f32 lit_9428 = -245.0f;
/* 80452B10-80452B14 0004+00 s=1 e=0 z=0 None .sdata2 @9429 */
SECTION_SDATA2 static u32 lit_9429 = 0xC2680000;
SECTION_SDATA2 static f32 lit_9429 = -58.0f;
/* 80452B14-80452B18 0004+00 s=1 e=0 z=0 None .sdata2 @9430 */
SECTION_SDATA2 static u32 lit_9430 = 0xC37A0000;
SECTION_SDATA2 static f32 lit_9430 = -250.0f;
/* 80452B18-80452B1C 0004+00 s=1 e=0 z=0 None .sdata2 @9431 */
SECTION_SDATA2 static u32 lit_9431 = 0xC2D20000;
SECTION_SDATA2 static f32 lit_9431 = -105.0f;
/* 80452B1C-80452B20 0004+00 s=1 e=0 z=0 None .sdata2 @9432 */
SECTION_SDATA2 static u32 lit_9432 = 0x3FC00000;
SECTION_SDATA2 static f32 lit_9432 = 1.5f;
/* 80452B20-80452B24 0004+00 s=1 e=0 z=0 None .sdata2 @9433 */
SECTION_SDATA2 static u32 lit_9433 = 0x423C0000;
SECTION_SDATA2 static f32 lit_9433 = 47.0f;
/* 80452B24-80452B28 0004+00 s=1 e=0 z=0 None .sdata2 @9434 */
SECTION_SDATA2 static u32 lit_9434 = 0x42E20000;
SECTION_SDATA2 static f32 lit_9434 = 113.0f;
/* 80452B28-80452B2C 0004+00 s=1 e=0 z=0 None .sdata2 @9435 */
SECTION_SDATA2 static u32 lit_9435 = 0x42C00000;
SECTION_SDATA2 static f32 lit_9435 = 96.0f;
/* 80452B2C-80452B30 0004+00 s=1 e=0 z=0 None .sdata2 @9436 */
SECTION_SDATA2 static u32 lit_9436 = 0x42180000;
SECTION_SDATA2 static f32 lit_9436 = 38.0f;
/* 80452B30-80452B34 0004+00 s=1 e=0 z=0 None .sdata2 @9437 */
SECTION_SDATA2 static u32 lit_9437 = 0x42A40000;
SECTION_SDATA2 static f32 lit_9437 = 82.0f;
/* 80452B34-80452B38 0004+00 s=1 e=0 z=0 None .sdata2 @9438 */
SECTION_SDATA2 static u32 lit_9438 = 0x43AA0000;
SECTION_SDATA2 static f32 lit_9438 = 340.0f;
/* 80452B38-80452B3C 0004+00 s=1 e=0 z=0 None .sdata2 @9439 */
SECTION_SDATA2 static u32 lit_9439 = 0xC2E60000;
SECTION_SDATA2 static f32 lit_9439 = -115.0f;
/* 80452B3C-80452B40 0004+00 s=1 e=0 z=0 None .sdata2 @9440 */
SECTION_SDATA2 static u32 lit_9440 = 0x43870000;
SECTION_SDATA2 static f32 lit_9440 = 270.0f;
/* 80452B40-80452B44 0004+00 s=2 e=0 z=0 None .sdata2 @9441 */
SECTION_SDATA2 static u32 lit_9441 = 0x43960000;
SECTION_SDATA2 static f32 lit_9441 = 300.0f;
/* 800929AC-800937AC 0E00+00 s=0 e=1 z=0 None .text useItem0EvCamera__9dCamera_cFv */
#pragma push
@@ -1664,16 +1633,16 @@ asm void dCamera_c::useItem0EvCamera() {
/* ############################################################################################## */
/* 80452B44-80452B48 0004+00 s=2 e=0 z=0 None .sdata2 @9798 */
SECTION_SDATA2 static u32 lit_9798 = 0x3D4CCCCD;
SECTION_SDATA2 static f32 lit_9798 = 1.0f / 20.0f;
/* 80452B48-80452B4C 0004+00 s=1 e=0 z=0 None .sdata2 @9799 */
SECTION_SDATA2 static u32 lit_9799 = 0x42B40000;
SECTION_SDATA2 static f32 lit_9799 = 90.0f;
/* 80452B4C-80452B50 0004+00 s=1 e=0 z=0 None .sdata2 @9800 */
SECTION_SDATA2 static u32 lit_9800 = 0xC3340000;
SECTION_SDATA2 static f32 lit_9800 = -180.0f;
/* 80452B50-80452B54 0004+00 s=1 e=0 z=0 None .sdata2 @9801 */
SECTION_SDATA2 static u32 lit_9801 = 0x432A0000;
SECTION_SDATA2 static f32 lit_9801 = 170.0f;
/* 800937AC-80094240 0A94+00 s=0 e=1 z=0 None .text useItem1EvCamera__9dCamera_cFv */
#pragma push
@@ -1687,31 +1656,31 @@ asm void dCamera_c::useItem1EvCamera() {
/* ############################################################################################## */
/* 80452B54-80452B58 0004+00 s=1 e=0 z=0 None .sdata2 @10118 */
SECTION_SDATA2 static u32 lit_10118 = 0x42000000;
SECTION_SDATA2 static f32 lit_10118 = 32.0f;
/* 80452B58-80452B5C 0004+00 s=1 e=0 z=0 None .sdata2 @10119 */
SECTION_SDATA2 static u32 lit_10119 = 0x42A80000;
SECTION_SDATA2 static f32 lit_10119 = 84.0f;
/* 80452B5C-80452B60 0004+00 s=1 e=0 z=0 None .sdata2 @10120 */
SECTION_SDATA2 static u32 lit_10120 = 0x43060000;
SECTION_SDATA2 static f32 lit_10120 = 134.0f;
/* 80452B60-80452B64 0004+00 s=1 e=0 z=0 None .sdata2 @10121 */
SECTION_SDATA2 static u32 lit_10121 = 0x41880000;
SECTION_SDATA2 static f32 lit_10121 = 17.0f;
/* 80452B64-80452B68 0004+00 s=1 e=0 z=0 None .sdata2 @10122 */
SECTION_SDATA2 static u32 lit_10122 = 0x43000000;
SECTION_SDATA2 static f32 lit_10122 = 128.0f;
/* 80452B68-80452B6C 0004+00 s=1 e=0 z=0 None .sdata2 @10123 */
SECTION_SDATA2 static u32 lit_10123 = 0xC2780000;
SECTION_SDATA2 static f32 lit_10123 = -62.0f;
/* 80452B6C-80452B70 0004+00 s=1 e=0 z=0 None .sdata2 @10124 */
SECTION_SDATA2 static u32 lit_10124 = 0xC2A80000;
SECTION_SDATA2 static f32 lit_10124 = -84.0f;
/* 80452B70-80452B74 0004+00 s=1 e=0 z=0 None .sdata2 @10125 */
SECTION_SDATA2 static u32 lit_10125 = 0xC3240000;
SECTION_SDATA2 static f32 lit_10125 = -164.0f;
/* 80452B74-80452B78 0004+00 s=1 e=0 z=0 None .sdata2 @10126 */
SECTION_SDATA2 static u32 lit_10126 = 0xC35C0000;
SECTION_SDATA2 static f32 lit_10126 = -220.0f;
/* 80094240-80094A70 0830+00 s=0 e=1 z=0 None .text getItemEvCamera__9dCamera_cFv */
#pragma push
@@ -1725,25 +1694,25 @@ asm void dCamera_c::getItemEvCamera() {
/* ############################################################################################## */
/* 80452B78-80452B7C 0004+00 s=1 e=0 z=0 None .sdata2 @10278 */
SECTION_SDATA2 static u32 lit_10278 = 0x3F000000;
SECTION_SDATA2 static f32 lit_10278 = 0.5f;
/* 80452B7C-80452B80 0004+00 s=1 e=0 z=0 None .sdata2 @10279 */
SECTION_SDATA2 static u32 lit_10279 = 0x3F7D70A4;
SECTION_SDATA2 static f32 lit_10279 = 99.0f / 100.0f;
/* 80452B80-80452B84 0004+00 s=1 e=0 z=0 None .sdata2 @10280 */
SECTION_SDATA2 static u32 lit_10280 = 0x3F2147AE;
SECTION_SDATA2 static f32 lit_10280 = 63.0f / 100.0f;
/* 80452B84-80452B88 0004+00 s=1 e=0 z=0 None .sdata2 @10281 */
SECTION_SDATA2 static u32 lit_10281 = 0x3F333333;
SECTION_SDATA2 static f32 lit_10281 = 7.0f / 10.0f;
/* 80452B88-80452B8C 0004+00 s=1 e=0 z=0 None .sdata2 @10282 */
SECTION_SDATA2 static u32 lit_10282 = 0x3F8CCCCD;
SECTION_SDATA2 static f32 lit_10282 = 11.0f / 10.0f;
/* 80452B8C-80452B90 0004+00 s=1 e=0 z=0 None .sdata2 @10283 */
SECTION_SDATA2 static u32 lit_10283 = 0x3DB851EC;
SECTION_SDATA2 static f32 lit_10283 = 9.0f / 100.0f;
/* 80452B90-80452B94 0004+00 s=1 e=0 z=0 None .sdata2 @10284 */
SECTION_SDATA2 static u32 lit_10284 = 0x3E3851EC;
SECTION_SDATA2 static f32 lit_10284 = 9.0f / 50.0f;
/* 80094A70-80095010 05A0+00 s=0 e=1 z=0 None .text possessedEvCamera__9dCamera_cFv */
#pragma push
@@ -1757,7 +1726,7 @@ asm void dCamera_c::possessedEvCamera() {
/* ############################################################################################## */
/* 80452B94-80452B98 0004+00 s=1 e=0 z=0 None .sdata2 @10437 */
SECTION_SDATA2 static u32 lit_10437 = 0x3C23D70A;
SECTION_SDATA2 static f32 lit_10437 = 1.0f / 100.0f;
/* 80095010-8009544C 043C+00 s=0 e=1 z=0 None .text fixedFramesEvCamera__9dCamera_cFv */
#pragma push
@@ -1787,13 +1756,13 @@ static u8 lit_10516[12];
static f32 DefaultGap_10515[3];
/* 80452B98-80452B9C 0004+00 s=1 e=0 z=0 None .sdata2 @10780 */
SECTION_SDATA2 static u32 lit_10780 = 0xBDCCCCCD;
SECTION_SDATA2 static f32 lit_10780 = -1.0f / 10.0f;
/* 80452B9C-80452BA0 0004+00 s=1 e=0 z=0 None .sdata2 @10781 */
SECTION_SDATA2 static u32 lit_10781 = 0x461C4000;
SECTION_SDATA2 static f32 lit_10781 = 10000.0f;
/* 80452BA0-80452BA4 0004+00 s=1 e=0 z=0 None .sdata2 @10782 */
SECTION_SDATA2 static u32 lit_10782 = 0x3E800000;
SECTION_SDATA2 static f32 lit_10782 = 0.25f;
/* 800956E4-80095E7C 0798+00 s=0 e=1 z=0 None .text twoActor0EvCamera__9dCamera_cFv */
#pragma push
@@ -1817,7 +1786,7 @@ asm void dCamera_c::peepHoleEvCamera() {
/* ############################################################################################## */
/* 80452BA4-80452BA8 0004+00 s=1 e=0 z=0 None .sdata2 @11068 */
SECTION_SDATA2 static u32 lit_11068 = 0x43750000;
SECTION_SDATA2 static f32 lit_11068 = 245.0f;
/* 80095FD0-800965AC 05DC+00 s=0 e=1 z=0 None .text digHoleEvCamera__9dCamera_cFv */
#pragma push
@@ -1831,28 +1800,28 @@ asm void dCamera_c::digHoleEvCamera() {
/* ############################################################################################## */
/* 80452BA8-80452BAC 0004+00 s=1 e=0 z=0 None .sdata2 @11415 */
SECTION_SDATA2 static u32 lit_11415 = 0x438C0000;
SECTION_SDATA2 static f32 lit_11415 = 280.0f;
/* 80452BAC-80452BB0 0004+00 s=1 e=0 z=0 None .sdata2 @11416 */
SECTION_SDATA2 static u32 lit_11416 = 0x3F4CCCCD;
SECTION_SDATA2 static f32 lit_11416 = 4.0f / 5.0f;
/* 80452BB0-80452BB4 0004+00 s=1 e=0 z=0 None .sdata2 @11417 */
SECTION_SDATA2 static u32 lit_11417 = 0xBF800000;
SECTION_SDATA2 static f32 lit_11417 = -1.0f;
/* 80452BB4-80452BB8 0004+00 s=1 e=0 z=0 None .sdata2 @11418 */
SECTION_SDATA2 static u32 lit_11418 = 0x3E4CCCCD;
SECTION_SDATA2 static f32 lit_11418 = 1.0f / 5.0f;
/* 80452BB8-80452BBC 0004+00 s=1 e=0 z=0 None .sdata2 @11419 */
SECTION_SDATA2 static u32 lit_11419 = 0xC0200000;
SECTION_SDATA2 static f32 lit_11419 = -2.5f;
/* 80452BBC-80452BC0 0004+00 s=1 e=0 z=0 None .sdata2 @11420 */
SECTION_SDATA2 static u32 lit_11420 = 0x40900000;
SECTION_SDATA2 static f32 lit_11420 = 4.5f;
/* 80452BC0-80452BC4 0004+00 s=1 e=0 z=0 None .sdata2 @11421 */
SECTION_SDATA2 static u32 lit_11421 = 0x3F400000;
SECTION_SDATA2 static f32 lit_11421 = 0.75f;
/* 80452BC4-80452BC8 0004+00 s=1 e=0 z=0 None .sdata2 @11422 */
SECTION_SDATA2 static u32 lit_11422 = 0x3ECCCCCD;
SECTION_SDATA2 static f32 lit_11422 = 2.0f / 5.0f;
/* 800965AC-80096EDC 0930+00 s=0 e=1 z=0 None .text hintTalkEvCamera__9dCamera_cFv */
#pragma push
src/d/d_eye_hl.cpp
+2 -10
View File
@@ -32,11 +32,6 @@ struct JUTNameTab {
// Forward References:
//
extern "C" extern char const* const d_d_eye_hl__stringBase0;
extern "C" extern u8 struct_80450FB0[8];
extern "C" extern u8 struct_80450FB8[4];
extern "C" extern u8 struct_80450FBC[4];
extern "C" void entry__8dEyeHL_cFP12J3DModelDataPCc();
extern "C" void remove__8dEyeHL_cFv();
extern "C" void update__12dEyeHL_mng_cFv();
@@ -51,9 +46,6 @@ extern "C" extern u8 struct_80450FBC[4];
// External References:
//
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_envHIO[68];
extern "C" void OSReport_Error();
extern "C" void getName__10JUTNameTabCFUs();
extern "C" void _savegpr_27();
@@ -101,10 +93,10 @@ asm void dEyeHL_c::remove() {
static u8 m_obj__12dEyeHL_mng_c[4 + 4 /* padding */];
/* 80452C10-80452C14 0004+00 s=1 e=0 z=0 None .sdata2 @3862 */
SECTION_SDATA2 static u32 lit_3862 = 0x40000000;
SECTION_SDATA2 static f32 lit_3862 = 2.0f;
/* 80452C14-80452C18 0004+00 s=1 e=0 z=0 None .sdata2 @3863 */
SECTION_SDATA2 static u32 lit_3863 = 0x42340000;
SECTION_SDATA2 static f32 lit_3863 = 45.0f;
/* 8009CA48-8009CB14 00CC+00 s=0 e=1 z=0 None .text update__12dEyeHL_mng_cFv */
#pragma push
src/d/d_gameover.cpp
+12 -38
View File
@@ -159,9 +159,6 @@ static void dGameover_Delete(dGameover_c*);
static void dGameover_Create(msg_class*);
void d_GameOver_Create(u8);
void d_GameOver_Delete(unsigned int&);
extern "C" extern char const* const d_d_gameover__stringBase0;
extern "C" extern void* g_profile_GAMEOVER[10];
extern "C" extern void* __vt__12dMenu_save_c[3 + 3 /* padding */];
extern "C" void draw__24dDlst_Gameover_CAPTURE_cFv();
extern "C" void __ct__10dGov_HIO_cFv();
@@ -222,27 +219,6 @@ void dComIfGp_offHeapLockFlag(int);
void dPaneClass_showNullPane(J2DScreen*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__14mDoHIO_entry_c[3];
extern "C" extern void* __vt__16dDlst_MenuSave_c[4];
extern "C" extern void* __vt__23dDlst_MenuSaveExplain_c[4 + 18 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mFadeColor__13mDoGph_gInf_c[4];
extern "C" extern u8 g_clearColor[4];
extern "C" extern u32 g_blackColor;
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" extern u8 mFrameBufferTex__13mDoGph_gInf_c[4];
extern "C" extern u8 mZbufferTex__13mDoGph_gInf_c[4];
extern "C" extern f32 mFadeRate__13mDoGph_gInf_c;
extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" extern u8 g_menuHIO[8];
extern "C" extern u8 sManager__10JFWDisplay[4];
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
extern "C" void mDoExt_getSubFont__Fv();
@@ -357,10 +333,10 @@ SECTION_SDATA2 static u8 lit_3868[4] = {
};
/* 80453B84-80453B88 0004+00 s=6 e=0 z=0 None .sdata2 @3869 */
SECTION_SDATA2 static u32 lit_3869 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3869 = 1.0f;
/* 80453B88-80453B8C 0004+00 s=1 e=0 z=0 None .sdata2 @3870 */
SECTION_SDATA2 static u32 lit_3870 = 0x41200000;
SECTION_SDATA2 static f32 lit_3870 = 10.0f;
/* 8019ACF8-8019AFE0 02E8+00 s=1 e=0 z=0 None .text draw__24dDlst_Gameover_CAPTURE_cFv */
#pragma push
@@ -579,10 +555,10 @@ SECTION_DATA static void* __vt__10dGov_HIO_c[3 + 3 /* padding */] = {
};
/* 80453B8C-80453B90 0004+00 s=1 e=0 z=0 None .sdata2 @3878 */
SECTION_SDATA2 static u32 lit_3878 = 0x402CCCCD;
SECTION_SDATA2 static f32 lit_3878 = 27.0f / 10.0f;
/* 80453B90-80453B94 0004+00 s=1 e=0 z=0 None .sdata2 @3879 */
SECTION_SDATA2 static u32 lit_3879 = 0x3E4CCCCD;
SECTION_SDATA2 static f32 lit_3879 = 1.0f / 5.0f;
/* 8019AFE0-8019B044 0064+00 s=1 e=0 z=0 None .text __ct__10dGov_HIO_cFv */
#pragma push
@@ -722,12 +698,10 @@ asm void dGameover_c::demoFadeOut_init() {
/* ############################################################################################## */
/* 80453B94-80453B98 0004+00 s=1 e=0 z=0 None .sdata2 @4069 */
SECTION_SDATA2 static u32 lit_4069 = 0x44610000;
SECTION_SDATA2 static f32 lit_4069 = 900.0f;
/* 80453B98-80453BA0 0008+00 s=1 e=0 z=0 None .sdata2 @4071 */
SECTION_SDATA2 static u8 lit_4071[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4071 = 4503601774854144.0 /* cast s32 to float */;
/* 8019B4E4-8019B560 007C+00 s=1 e=0 z=0 None .text demoFadeOut_proc__11dGameover_cFv */
#pragma push
@@ -816,10 +790,10 @@ asm void dGameover_c::_delete() {
/* ############################################################################################## */
/* 80453BA0-80453BA4 0004+00 s=1 e=0 z=0 None .sdata2 @4290 */
SECTION_SDATA2 static u32 lit_4290 = 0x43F30000;
SECTION_SDATA2 static f32 lit_4290 = 486.0f;
/* 80453BA4-80453BA8 0004+00 s=1 e=0 z=0 None .sdata2 @4291 */
SECTION_SDATA2 static u32 lit_4291 = 0x44250000;
SECTION_SDATA2 static f32 lit_4291 = 660.0f;
/* 8019B940-8019BBFC 02BC+00 s=1 e=0 z=0 None .text
* __ct__24dDlst_GameOverScrnDraw_cFP10JKRArchive */
@@ -844,7 +818,7 @@ asm dDlst_GameOverScrnDraw_c::~dDlst_GameOverScrnDraw_c() {
/* ############################################################################################## */
/* 80453BA8-80453BAC 0004+00 s=1 e=0 z=0 None .sdata2 @4316 */
SECTION_SDATA2 static u32 lit_4316 = 0x437F0000;
SECTION_SDATA2 static f32 lit_4316 = 255.0f;
/* 8019BCB0-8019BCF4 0044+00 s=3 e=0 z=0 None .text setBackAlpha__24dDlst_GameOverScrnDraw_cFf
*/
@@ -865,13 +839,13 @@ static u8 lit_3882[12];
static u8 l_HIO[28];
/* 80453BAC-80453BB0 0004+00 s=1 e=0 z=0 None .sdata2 @4374 */
SECTION_SDATA2 static u32 lit_4374 = 0x44180000;
SECTION_SDATA2 static f32 lit_4374 = 608.0f;
/* 80453BB0-80453BB4 0004+00 s=1 e=0 z=0 None .sdata2 @4375 */
SECTION_SDATA2 static u32 lit_4375 = 0x43E00000;
SECTION_SDATA2 static f32 lit_4375 = 448.0f;
/* 80453BB4-80453BB8 0004+00 s=1 e=0 z=0 None .sdata2 @4376 */
SECTION_SDATA2 static u32 lit_4376 = 0x43980000;
SECTION_SDATA2 static f32 lit_4376 = 304.0f;
/* 80453BB8-80453BC0 0004+04 s=1 e=0 z=0 None .sdata2 @4377 */
SECTION_SDATA2 static f32 lit_4377[1 + 1 /* padding */] = {
src/d/d_insect.cpp
+5 -9
View File
@@ -53,8 +53,6 @@ struct Vec {};
// Forward References:
//
extern "C" extern char const* const d_d_insect__stringBase0;
extern "C" void __ct__9dInsect_cFv();
extern "C" void Insect_GetDemoMain__9dInsect_cFv();
extern "C" void CalcZBuffer__9dInsect_cFf();
@@ -71,8 +69,6 @@ void fopAcM_orderItemEvent(fopAc_ac_c*, u16, u16);
void fopAcM_createItemForTrBoxDemo(cXyz const*, int, int, int, csXyz const*, cXyz const*);
void fopAcM_createItem(cXyz const*, int, int, int, csXyz const*, cXyz const*, int);
void fopAcM_cancelCarryNow(fopAc_ac_c*);
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" void mDoLib_project__FP3VecP3Vec();
extern "C" void mDoLib_pos2camera__FP3VecP3Vec();
@@ -136,7 +132,7 @@ asm void dInsect_c::Insect_GetDemoMain() {
/* ############################################################################################## */
/* 804535E0-804535E4 0004+00 s=1 e=0 z=0 None .sdata2 @3871 */
SECTION_SDATA2 static u32 lit_3871 = 0x41A00000;
SECTION_SDATA2 static f32 lit_3871 = 20.0f;
/* 804535E4-804535E8 0004+00 s=1 e=0 z=0 None .sdata2 @3872 */
SECTION_SDATA2 static u8 lit_3872[4] = {
@@ -147,16 +143,16 @@ SECTION_SDATA2 static u8 lit_3872[4] = {
};
/* 804535E8-804535EC 0004+00 s=1 e=0 z=0 None .sdata2 @3873 */
SECTION_SDATA2 static u32 lit_3873 = 0x44180000;
SECTION_SDATA2 static f32 lit_3873 = 608.0f;
/* 804535EC-804535F0 0004+00 s=1 e=0 z=0 None .sdata2 @3874 */
SECTION_SDATA2 static u32 lit_3874 = 0x43E00000;
SECTION_SDATA2 static f32 lit_3874 = 448.0f;
/* 804535F0-804535F4 0004+00 s=1 e=0 z=0 None .sdata2 @3875 */
SECTION_SDATA2 static u32 lit_3875 = 0xC1200000;
SECTION_SDATA2 static f32 lit_3875 = -10.0f;
/* 804535F4-804535F8 0004+00 s=1 e=0 z=0 None .sdata2 @3876 */
SECTION_SDATA2 static u32 lit_3876 = 0x4B7FFFFF;
SECTION_SDATA2 static f32 lit_3876 = 16777215.0f;
/* 804535F8-80453600 0004+04 s=1 e=0 z=0 None .sdata2 @3877 */
SECTION_SDATA2 static f32 lit_3877[1 + 1 /* padding */] = {
src/d/d_item.cpp
+3 -10
View File
@@ -460,8 +460,6 @@ void isHeart(u8);
void isInsect(u8);
void check_itemno(int);
static void addBombCount(u8, u8);
extern "C" extern char const* const d_d_item__stringBase0;
extern "C" extern u8 mData__12dEnemyItem_c[4 + 4 /* padding */];
extern "C" void execItemGet__FUc();
extern "C" void checkItemGet__FUci();
@@ -860,9 +858,6 @@ void dComIfGs_setSelectEquipClothes(u8);
void dComIfGs_setSelectEquipSword(u8);
void dComIfGs_setSelectEquipShield(u8);
void dMeter2Info_setSword(u8, bool);
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 struct_80450D64[4];
extern "C" void setItemBombNumCount__14dComIfG_play_cFUcs();
extern "C" void getLayerNo__14dComIfG_play_cFi();
@@ -1455,7 +1450,7 @@ asm void checkItemGet(u8 param_0, int param_1) {
/* ############################################################################################## */
/* 80452BD8-80452BDC 0004+00 s=1 e=0 z=0 None .sdata2 @3655 */
SECTION_SDATA2 static u32 lit_3655 = 0x40800000;
SECTION_SDATA2 static f32 lit_3655 = 4.0f;
/* 80097F2C-80097F50 0024+00 s=1 e=0 z=0 None .text item_func_HEART__Fv */
#pragma push
@@ -1724,7 +1719,7 @@ static void item_func_BOMB_INSECT_30() {
/* ############################################################################################## */
/* 80452BDC-80452BE0 0004+00 s=1 e=0 z=0 None .sdata2 @3794 */
SECTION_SDATA2 static u32 lit_3794 = 0x42000000;
SECTION_SDATA2 static f32 lit_3794 = 32.0f;
/* 8009825C-80098280 0024+00 s=1 e=0 z=0 None .text item_func_RECOVER_FAILY__Fv */
#pragma push
@@ -1763,9 +1758,7 @@ asm static void item_func_KAKERA_HEART() {
/* ############################################################################################## */
/* 80452BE0-80452BE8 0008+00 s=1 e=0 z=0 None .sdata2 @3828 */
SECTION_SDATA2 static u8 lit_3828[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3828 = 4503599627370496.0 /* cast u32 to float */;
/* 800982B4-80098344 0090+00 s=1 e=0 z=0 None .text item_func_UTUWA_HEART__Fv */
#pragma push
src/d/d_item_data.cpp
-5
View File
@@ -16,11 +16,6 @@ extern "C" extern void* item_resource__10dItem_data[1530];
extern "C" extern void* field_item_res__10dItem_data[1020];
extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */];
extern "C" extern char const* const d_d_item_data__stringBase0;
extern "C" extern void* item_resource__10dItem_data[1530];
extern "C" extern void* field_item_res__10dItem_data[1020];
extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */];
//
// External References:
//
src/d/d_jnt_col.cpp
+15 -34
View File
@@ -11,8 +11,6 @@
// Types:
//
struct csXyz {};
struct Vec {};
struct cXyz {
@@ -25,6 +23,8 @@ struct cXyz {
/* 80267150 */ void atan2sY_XZ() const;
};
struct csXyz {};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CD9C */ void transM(f32, f32, f32);
@@ -35,13 +35,13 @@ struct fopAc_ac_c {};
struct J3DModel {};
struct dJntColData_c {};
struct cM3dGLin {
/* 80036A5C */ ~cM3dGLin();
/* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&);
};
struct dJntColData_c {};
struct dJntCol_c {
/* 80035C8C */ dJntCol_c();
/* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int);
@@ -70,9 +70,6 @@ struct cM3dGCyl {
// Forward References:
//
extern "C" extern void* __vt__8cM3dGLin[3];
extern "C" extern void* __vt__8cM3dGSph[3];
extern "C" void __ct__9dJntCol_cFv();
extern "C" void init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli();
extern "C" void setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz();
@@ -99,12 +96,6 @@ void cM3d_Cross_CylLin(cM3dGCyl const*, cM3dGLin const*, Vec*, Vec*);
void cM3d_lineVsPosSuisenCross(cM3dGLin const*, Vec const*, Vec*);
void cM3d_lineVsPosSuisenCross(Vec const&, Vec const&, Vec const&, Vec*);
void operator delete(void*);
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern void* __vt__8cM3dGCyl[3];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 BaseZ__4cXyz[12];
extern "C" extern u32 __float_nan;
extern "C" extern u32 __float_max;
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
@@ -181,7 +172,7 @@ asm void dJntCol_c::init(fopAc_ac_c* param_0, dJntColData_c const* param_1, J3DM
/* ############################################################################################## */
/* 80451D60-80451D64 0004+00 s=1 e=0 z=0 None .sdata2 @3655 */
SECTION_SDATA2 static u32 lit_3655 = 0x43FA0000;
SECTION_SDATA2 static f32 lit_3655 = 500.0f;
/* 80035CC8-80035DC8 0100+00 s=2 e=0 z=0 None .text
* setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz */
@@ -211,30 +202,20 @@ SECTION_DATA void* __vt__8cM3dGSph[3] = {
};
/* 80451D64-80451D68 0004+00 s=1 e=0 z=0 None .sdata2 @4141 */
SECTION_SDATA2 static u32 lit_4141 = 0xCB189680;
SECTION_SDATA2 static f32 lit_4141 = -10000000.0f;
/* 80451D68-80451D70 0004+04 s=2 e=0 z=0 None .sdata2 @4142 */
SECTION_SDATA2 static u8 lit_4142[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_4142[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 80451D70-80451D78 0008+00 s=2 e=0 z=0 None .sdata2 @4143 */
SECTION_SDATA2 static u8 lit_4143[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4143 = 0.5;
/* 80451D78-80451D80 0008+00 s=2 e=0 z=0 None .sdata2 @4144 */
SECTION_SDATA2 static u8 lit_4144[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4144 = 3.0;
/* 80451D80-80451D88 0008+00 s=2 e=0 z=0 None .sdata2 @4145 */
SECTION_SDATA2 static u8 lit_4145[8] = {
@@ -242,16 +223,16 @@ SECTION_SDATA2 static u8 lit_4145[8] = {
};
/* 80451D88-80451D8C 0004+00 s=1 e=0 z=0 None .sdata2 @4146 */
SECTION_SDATA2 static u32 lit_4146 = 0x3C23D70A;
SECTION_SDATA2 static f32 lit_4146 = 1.0f / 100.0f;
/* 80451D8C-80451D90 0004+00 s=2 e=0 z=0 None .sdata2 @4147 */
SECTION_SDATA2 static u32 lit_4147 = 0x38D1B717;
SECTION_SDATA2 static f32 lit_4147 = 9.999999747378752e-05f;
/* 80451D90-80451D94 0004+00 s=1 e=0 z=0 None .sdata2 @4148 */
SECTION_SDATA2 static u32 lit_4148 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4148 = 0.5f;
/* 80451D94-80451D98 0004+00 s=1 e=0 z=0 None .sdata2 @4149 */
SECTION_SDATA2 static u32 lit_4149 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4149 = 1.0f;
/* 80035DC8-80036A5C 0C94+00 s=2 e=0 z=0 None .text
* searchNearPos__9dJntCol_cCFPC8cM3dGLinPC4cXyzP4cXyzi */
src/d/d_k_wmark.cpp
+12 -40
View File
@@ -80,8 +80,6 @@ static void dkWmark_Create(kankyo_class*);
static void dkWmark_Delete(dkWmark_c*);
static void dkWmark_Execute(dkWmark_c*);
static void dkWmark_Draw(dkWmark_c*);
extern "C" extern char const* const d_d_k_wmark__stringBase0;
extern "C" extern void* g_profile_WMARK[10 + 1 /* padding */];
extern "C" static void dkWmark_Create__FP12kankyo_class();
extern "C" void __dt__9dkWmark_cFv();
@@ -107,20 +105,6 @@ void fopKyM_Delete(void*);
void dKy_tevstr_init(dKy_tevstr_c*, s8, u8);
void cM_atan2s(f32, f32);
void operator delete(void*);
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern void* __vt__8cM3dGPla[3];
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 mClipper__14mDoLib_clipper[92];
extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern f32 mGroundY__11fopAcM_gc_c;
extern "C" extern u8 struct_80450D64[4];
extern "C" void __dt__4cXyzFv();
extern "C" void mDoMtx_ZXYrotM__FPA4_fsss();
@@ -200,13 +184,13 @@ static u8 m_nowID__9dkWmark_c[4];
static u8 data_80451134[4];
/* 80454FB0-80454FB4 0004+00 s=1 e=0 z=0 None .sdata2 @3718 */
SECTION_SDATA2 static u32 lit_3718 = 0x3F8CCCCD;
SECTION_SDATA2 static f32 lit_3718 = 11.0f / 10.0f;
/* 80454FB4-80454FB8 0004+00 s=2 e=0 z=0 None .sdata2 @3719 */
SECTION_SDATA2 static u32 lit_3719 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3719 = 1.0f;
/* 80454FB8-80454FBC 0004+00 s=1 e=0 z=0 None .sdata2 @3720 */
SECTION_SDATA2 static u32 lit_3720 = 0x3F19999A;
SECTION_SDATA2 static f32 lit_3720 = 3.0f / 5.0f;
/* 8026141C-80261640 0224+00 s=1 e=0 z=0 None .text dkWmark_Create__FP12kankyo_class */
#pragma push
@@ -240,30 +224,20 @@ asm static void dkWmark_Delete(dkWmark_c* param_0) {
/* ############################################################################################## */
/* 80454FBC-80454FC0 0004+00 s=1 e=0 z=0 None .sdata2 @3844 */
SECTION_SDATA2 static u32 lit_3844 = 0x42C80000;
SECTION_SDATA2 static f32 lit_3844 = 100.0f;
/* 80454FC0-80454FC8 0004+04 s=2 e=0 z=0 None .sdata2 @3845 */
SECTION_SDATA2 static u8 lit_3845[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_3845[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 80454FC8-80454FD0 0008+00 s=1 e=0 z=0 None .sdata2 @3846 */
SECTION_SDATA2 static u8 lit_3846[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3846 = 0.5;
/* 80454FD0-80454FD8 0008+00 s=1 e=0 z=0 None .sdata2 @3847 */
SECTION_SDATA2 static u8 lit_3847[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3847 = 3.0;
/* 80454FD8-80454FE0 0008+00 s=1 e=0 z=0 None .sdata2 @3848 */
SECTION_SDATA2 static u8 lit_3848[8] = {
@@ -282,7 +256,7 @@ asm void dkWmark_c::setMatrix() {
/* ############################################################################################## */
/* 80454FE0-80454FE4 0004+00 s=1 e=0 z=0 None .sdata2 @3873 */
SECTION_SDATA2 static u32 lit_3873 = 0x3CA3D70A;
SECTION_SDATA2 static f32 lit_3873 = 1.0f / 50.0f;
/* 80261964-80261A18 00B4+00 s=1 e=0 z=0 None .text dkWmark_Execute__FP9dkWmark_c */
#pragma push
@@ -296,12 +270,10 @@ asm static void dkWmark_Execute(dkWmark_c* param_0) {
/* ############################################################################################## */
/* 80454FE4-80454FE8 0004+00 s=1 e=0 z=0 None .sdata2 @3906 */
SECTION_SDATA2 static u32 lit_3906 = 0x42480000;
SECTION_SDATA2 static f32 lit_3906 = 50.0f;
/* 80454FE8-80454FF0 0008+00 s=1 e=0 z=0 None .sdata2 @3908 */
SECTION_SDATA2 static u8 lit_3908[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3908 = 4503599627370496.0 /* cast u32 to float */;
/* 80261A18-80261B54 013C+00 s=1 e=0 z=0 None .text dkWmark_Draw__FP9dkWmark_c */
#pragma push
src/d/d_k_wpillar.cpp
+3 -15
View File
@@ -111,7 +111,6 @@ static void dkWpillar_Create(kankyo_class*);
static void dkWpillar_Delete(dkWpillar_c*);
static void dkWpillar_Execute(dkWpillar_c*);
static void dkWpillar_Draw(dkWpillar_c*);
extern "C" extern void* g_profile_WPILLAR[10 + 1 /* padding */];
extern "C" void create__11dkWpillar_cFv();
extern "C" static void dkWpillar_Create__FP12kankyo_class();
@@ -137,17 +136,6 @@ void fopAcM_getWaterY(cXyz const*, f32*);
void fopKyM_Delete(void*);
void dKy_tevstr_init(dKy_tevstr_c*, s8, u8);
void operator delete(void*);
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern f32 lit_2762[1 + 1 /* padding */];
extern "C" void play__14mDoExt_baseAnmFv();
extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss();
@@ -213,13 +201,13 @@ SECTION_SDATA2 static u8 l_arcName[7 + 1 /* padding */] = {
};
/* 80454FF8-80454FFC 0004+00 s=1 e=0 z=0 None .sdata2 @3838 */
SECTION_SDATA2 static u32 lit_3838 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3838 = 1.0f;
/* 80454FFC-80455000 0004+00 s=1 e=0 z=0 None .sdata2 @3839 */
SECTION_SDATA2 static u32 lit_3839 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3839 = 0.5f;
/* 80455000-80455004 0004+00 s=1 e=0 z=0 None .sdata2 @3840 */
SECTION_SDATA2 static u32 lit_3840 = 0x3E800000;
SECTION_SDATA2 static f32 lit_3840 = 0.25f;
/* 80261B54-80261F04 03B0+00 s=1 e=0 z=0 None .text create__11dkWpillar_cFv */
#pragma push
src/d/d_kantera_icon_meter.cpp
+4 -17
View File
@@ -50,8 +50,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_d_kantera_icon_meter__stringBase0;
extern "C" void __ct__15dKantera_icon_cFv();
extern "C" void __dt__15dKantera_icon_cFv();
extern "C" void initiate__15dKantera_icon_cFv();
@@ -70,9 +68,6 @@ extern "C" extern char const* const d_d_kantera_icon_meter__stringBase0;
void dPaneClass_showNullPane(J2DScreen*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap();
extern "C" void dPaneClass_showNullPane__FP9J2DScreen();
@@ -187,9 +182,7 @@ SECTION_SDATA2 static f32 lit_3759[1 + 1 /* padding */] = {
};
/* 80453F00-80453F08 0008+00 s=1 e=0 z=0 None .sdata2 @3761 */
SECTION_SDATA2 static u8 lit_3761[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3761 = 4503599627370496.0 /* cast u32 to float */;
/* 801AEC44-801AECB8 0074+00 s=0 e=4 z=0 None .text setNowGauge__15dKantera_icon_cFUsUs */
#pragma push
@@ -203,16 +196,10 @@ asm void dKantera_icon_c::setNowGauge(u16 param_0, u16 param_1) {
/* ############################################################################################## */
/* 80453F08-80453F10 0004+04 s=1 e=0 z=0 None .sdata2 @3776 */
SECTION_SDATA2 static u8 lit_3776[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_3776[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 801AECB8-801AED1C 0064+00 s=1 e=0 z=0 None .text draw__19dDlst_KanteraIcon_cFv */
src/d/d_ky_thunder.cpp
+30 -46
View File
@@ -69,8 +69,6 @@ static void dThunder_Execute(dThunder_c*);
static bool dThunder_IsDelete(dThunder_c*);
static void dThunder_Delete(dThunder_c*);
static void dThunder_Create(kankyo_class*);
extern "C" extern char const* const d_d_ky_thunder__stringBase0;
extern "C" extern void* g_profile_KY_THUNDER[10 + 1 /* padding */];
extern "C" void createHeap__10dThunder_cFv();
extern "C" void adjustHeap__10dThunder_cFv();
@@ -103,18 +101,6 @@ void cM_rndF(f32);
void cM_rndFX(f32);
void cLib_addCalc(f32*, f32, f32, f32, f32);
void cLib_targetAngleY(Vec const*, Vec const*);
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_mEnvSeMgr[780];
extern "C" extern u8 g_Counter[12 + 4 /* padding */];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 struct_80451070[8];
extern "C" void __dt__4cXyzFv();
extern "C" void mDoMtx_XrotM__FPA4_fs();
@@ -208,13 +194,13 @@ SECTION_SDATA2 static u8 lit_3882[4] = {
};
/* 80453E74-80453E78 0004+00 s=1 e=0 z=0 None .sdata2 @3883 */
SECTION_SDATA2 static u32 lit_3883 = 0x42200000;
SECTION_SDATA2 static f32 lit_3883 = 40.0f;
/* 80453E78-80453E7C 0004+00 s=1 e=0 z=0 None .sdata2 @3884 */
SECTION_SDATA2 static u32 lit_3884 = 0xC37A0000;
SECTION_SDATA2 static f32 lit_3884 = -250.0f;
/* 80453E7C-80453E80 0004+00 s=3 e=0 z=0 None .sdata2 @3885 */
SECTION_SDATA2 static u32 lit_3885 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3885 = 1.0f;
/* 801AE000-801AE19C 019C+00 s=1 e=0 z=0 None .text dThunder_Draw__FP10dThunder_c */
#pragma push
@@ -228,25 +214,25 @@ asm static void dThunder_Draw(dThunder_c* param_0) {
/* ############################################################################################## */
/* 80453E80-80453E84 0004+00 s=2 e=0 z=0 None .sdata2 @3923 */
SECTION_SDATA2 static u32 lit_3923 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_3923 = 1.0f / 10.0f;
/* 80453E84-80453E88 0004+00 s=1 e=0 z=0 None .sdata2 @3924 */
SECTION_SDATA2 static u32 lit_3924 = 0x3D4CCCCD;
SECTION_SDATA2 static f32 lit_3924 = 1.0f / 20.0f;
/* 80453E88-80453E8C 0004+00 s=1 e=0 z=0 None .sdata2 @3925 */
SECTION_SDATA2 static u32 lit_3925 = 0x3C8B4396;
SECTION_SDATA2 static f32 lit_3925 = 0.017000000923871994f;
/* 80453E8C-80453E90 0004+00 s=1 e=0 z=0 None .sdata2 @3926 */
SECTION_SDATA2 static u32 lit_3926 = 0x3727C5AC;
SECTION_SDATA2 static f32 lit_3926 = 9.999999747378752e-06f;
/* 80453E90-80453E94 0004+00 s=1 e=0 z=0 None .sdata2 @3927 */
SECTION_SDATA2 static u32 lit_3927 = 0x42700000;
SECTION_SDATA2 static f32 lit_3927 = 60.0f;
/* 80453E94-80453E98 0004+00 s=1 e=0 z=0 None .sdata2 @3928 */
SECTION_SDATA2 static u32 lit_3928 = 0x3C23D70A;
SECTION_SDATA2 static f32 lit_3928 = 1.0f / 100.0f;
/* 80453E98-80453E9C 0004+00 s=1 e=0 z=0 None .sdata2 @3929 */
SECTION_SDATA2 static u32 lit_3929 = 0x3CA3D70A;
SECTION_SDATA2 static f32 lit_3929 = 1.0f / 50.0f;
/* 801AE19C-801AE374 01D8+00 s=1 e=0 z=0 None .text dThunder_Execute__FP10dThunder_c */
#pragma push
@@ -295,37 +281,37 @@ SECTION_DEAD static char const* const pad_80394F4E = "\0";
#pragma pop
/* 80453E9C-80453EA0 0004+00 s=1 e=0 z=0 None .sdata2 @4079 */
SECTION_SDATA2 static u32 lit_4079 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4079 = 0.5f;
/* 80453EA0-80453EA4 0004+00 s=1 e=0 z=0 None .sdata2 @4080 */
SECTION_SDATA2 static u32 lit_4080 = 0x3E800000;
SECTION_SDATA2 static f32 lit_4080 = 0.25f;
/* 80453EA4-80453EA8 0004+00 s=1 e=0 z=0 None .sdata2 @4081 */
SECTION_SDATA2 static u32 lit_4081 = 0x41600000;
SECTION_SDATA2 static f32 lit_4081 = 14.0f;
/* 80453EA8-80453EAC 0004+00 s=1 e=0 z=0 None .sdata2 @4082 */
SECTION_SDATA2 static u32 lit_4082 = 0x41A00000;
SECTION_SDATA2 static f32 lit_4082 = 20.0f;
/* 80453EAC-80453EB0 0004+00 s=1 e=0 z=0 None .sdata2 @4083 */
SECTION_SDATA2 static u32 lit_4083 = 0x476A6000;
SECTION_SDATA2 static f32 lit_4083 = 60000.0f;
/* 80453EB0-80453EB4 0004+00 s=1 e=0 z=0 None .sdata2 @4084 */
SECTION_SDATA2 static u32 lit_4084 = 0xC59C4000;
SECTION_SDATA2 static f32 lit_4084 = -5000.0f;
/* 80453EB4-80453EB8 0004+00 s=1 e=0 z=0 None .sdata2 @4085 */
SECTION_SDATA2 static u32 lit_4085 = 0x44FA0000;
SECTION_SDATA2 static f32 lit_4085 = 2000.0f;
/* 80453EB8-80453EBC 0004+00 s=1 e=0 z=0 None .sdata2 @4086 */
SECTION_SDATA2 static u32 lit_4086 = 0x41C00000;
SECTION_SDATA2 static f32 lit_4086 = 24.0f;
/* 80453EBC-80453EC0 0004+00 s=1 e=0 z=0 None .sdata2 @4087 */
SECTION_SDATA2 static u32 lit_4087 = 0x451C4000;
SECTION_SDATA2 static f32 lit_4087 = 2500.0f;
/* 80453EC0-80453EC4 0004+00 s=1 e=0 z=0 None .sdata2 @4088 */
SECTION_SDATA2 static u32 lit_4088 = 0x45BB8000;
SECTION_SDATA2 static f32 lit_4088 = 6000.0f;
/* 80453EC4-80453EC8 0004+00 s=1 e=0 z=0 None .sdata2 @4089 */
SECTION_SDATA2 static u32 lit_4089 = 0x3E19999A;
SECTION_SDATA2 static f32 lit_4089 = 3.0f / 20.0f;
/* 80453EC8-80453ED0 0004+04 s=1 e=0 z=0 None .sdata2 @4090 */
SECTION_SDATA2 static f32 lit_4090[1 + 1 /* padding */] = {
@@ -335,33 +321,31 @@ SECTION_SDATA2 static f32 lit_4090[1 + 1 /* padding */] = {
};
/* 80453ED0-80453ED8 0008+00 s=1 e=0 z=0 None .sdata2 @4091 */
SECTION_SDATA2 static u8 lit_4091[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4091 = 0.5;
/* 80453ED8-80453EDC 0004+00 s=1 e=0 z=0 None .sdata2 @4092 */
SECTION_SDATA2 static u32 lit_4092 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4092 = -1.0f;
/* 80453EDC-80453EE0 0004+00 s=1 e=0 z=0 None .sdata2 @4093 */
SECTION_SDATA2 static u32 lit_4093 = 0x47C35000;
SECTION_SDATA2 static f32 lit_4093 = 100000.0f;
/* 80453EE0-80453EE4 0004+00 s=1 e=0 z=0 None .sdata2 @4094 */
SECTION_SDATA2 static u32 lit_4094 = 0x46996600;
SECTION_SDATA2 static f32 lit_4094 = 19635.0f;
/* 80453EE4-80453EE8 0004+00 s=1 e=0 z=0 None .sdata2 @4095 */
SECTION_SDATA2 static u32 lit_4095 = 0x43820000;
SECTION_SDATA2 static f32 lit_4095 = 260.0f;
/* 80453EE8-80453EEC 0004+00 s=1 e=0 z=0 None .sdata2 @4096 */
SECTION_SDATA2 static u32 lit_4096 = 0x458F8000;
SECTION_SDATA2 static f32 lit_4096 = 4592.0f;
/* 80453EEC-80453EF0 0004+00 s=1 e=0 z=0 None .sdata2 @4097 */
SECTION_SDATA2 static u32 lit_4097 = 0x44BC6000;
SECTION_SDATA2 static f32 lit_4097 = 1507.0f;
/* 80453EF0-80453EF4 0004+00 s=1 e=0 z=0 None .sdata2 @4098 */
SECTION_SDATA2 static u32 lit_4098 = 0x42C80000;
SECTION_SDATA2 static f32 lit_4098 = 100.0f;
/* 80453EF4-80453EF8 0004+00 s=1 e=0 z=0 None .sdata2 @4099 */
SECTION_SDATA2 static u32 lit_4099 = 0x3E99999A;
SECTION_SDATA2 static f32 lit_4099 = 3.0f / 10.0f;
/* 801AE458-801AE938 04E0+00 s=1 e=0 z=0 None .text create__10dThunder_cFv */
#pragma push
src/d/d_kyeff.cpp
+4 -13
View File
@@ -30,8 +30,6 @@ static void dKyeff_Execute(dKyeff_c*);
static bool dKyeff_IsDelete(dKyeff_c*);
static void dKyeff_Delete(dKyeff_c*);
static void dKyeff_Create(kankyo_class*);
extern "C" extern char const* const d_d_kyeff__stringBase0;
extern "C" extern void* g_profile_KYEFF[10 + 1 /* padding */];
extern "C" static void dKyeff_Draw__FP8dKyeff_c();
extern "C" void execute__8dKyeff_cFv();
@@ -52,11 +50,6 @@ void dKyw_wether_move();
void dKyw_wether_move_draw();
void dKyw_wether_draw();
void dKy_FiveSenses_fullthrottle_dark();
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_mEnvSeMgr[780];
extern "C" void dKyw_wether_init__Fv();
extern "C" void dKyw_wether_delete__Fv();
@@ -143,18 +136,16 @@ SECTION_SDATA2 static u8 lit_3804[4] = {
};
/* 80453E5C-80453E60 0004+00 s=1 e=0 z=0 None .sdata2 @3805 */
SECTION_SDATA2 static u32 lit_3805 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3805 = 1.0f;
/* 80453E60-80453E68 0008+00 s=1 e=0 z=0 None .sdata2 @3812 */
SECTION_SDATA2 static u8 lit_3812[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3812 = 4503601774854144.0 /* cast s32 to float */;
/* 80453E68-80453E6C 0004+00 s=1 e=0 z=0 None .sdata2 @3843 */
SECTION_SDATA2 static u32 lit_3843 = 0x3F333333;
SECTION_SDATA2 static f32 lit_3843 = 7.0f / 10.0f;
/* 80453E6C-80453E70 0004+00 s=1 e=0 z=0 None .sdata2 @3844 */
SECTION_SDATA2 static u32 lit_3844 = 0x41700000;
SECTION_SDATA2 static f32 lit_3844 = 15.0f;
/* 801ADE00-801ADEA0 00A0+00 s=1 e=0 z=0 None .text dKyeff_Create__FP12kankyo_class */
#pragma push
src/d/d_kyeff2.cpp
-3
View File
@@ -26,7 +26,6 @@ static void dKyeff2_Execute(dKyeff2_c*);
static bool dKyeff2_IsDelete(dKyeff2_c*);
static void dKyeff2_Delete(dKyeff2_c*);
static void dKyeff2_Create(kankyo_class*);
extern "C" extern void* g_profile_KYEFF2[10 + 1 /* padding */];
extern "C" static void dKyeff2_Draw__FP9dKyeff2_c();
extern "C" void execute__9dKyeff2_cFv();
@@ -44,8 +43,6 @@ void dKyw_wether_init2();
void dKyw_wether_delete2();
void dKyw_wether_move_draw2();
void dKyw_wether_draw2();
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" void dKyw_wether_init2__Fv();
extern "C" void dKyw_wether_delete2__Fv();
src/d/d_lib.cpp
-7
View File
@@ -72,10 +72,6 @@ struct CSTControl {
void dLib_getEventSwitchNo(int);
void dLib_checkActorInRectangle(fopAc_ac_c*, fopAc_ac_c*, cXyz const*, cXyz const*);
void dLib_getExpandSizeFromAramArchive(JKRAramArchive*, char const*);
extern "C" extern u8 ZeroQuat[16];
extern "C" extern void* __vt__10CSTControl[4];
extern "C" extern void* __vt__9STControl[4];
extern "C" extern u8 struct_80450DF0[8];
extern "C" void __ct__9STControlFssssffss();
extern "C" void setWaitParm__9STControlFssssffss();
@@ -107,9 +103,6 @@ extern "C" extern u8 struct_80450DF0[8];
//
void mDoMtx_YrotS(f32 (*)[4], s16);
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void searchMapEventData__14dEvt_control_cFUc();
src/d/d_model.cpp
-8
View File
@@ -51,8 +51,6 @@ struct J3DPacket {
// Forward References:
//
extern "C" extern void* __vt__6dMdl_c[5 + 1 /* padding */];
extern "C" void draw__6dMdl_cFv();
extern "C" void create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c();
extern "C" void entryObj__6dMdl_cFP10dMdl_obj_c();
@@ -75,12 +73,6 @@ void dKy_setLight_again();
void dKy_GxFog_tevstr_set(dKy_tevstr_c*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__9J3DPacket[5];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 j3dSys[284];
extern "C" extern u32 g_whiteColor;
extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4];
extern "C" void dKy_setLight_nowroom_actor__FP12dKy_tevstr_c();
extern "C" void dKy_setLight_again__Fv();
src/d/d_name.cpp
+10 -18
View File
@@ -139,8 +139,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_d_name__stringBase0;
extern "C" void __ct__9dNm_HIO_cFv();
extern "C" void __ct__7dName_cFP7J2DPane();
extern "C" void __dt__7dName_cFv();
@@ -198,10 +196,6 @@ void fopMsgM_messageGet(char*, u32);
void dPaneClass_showNullPane(J2DScreen*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoExt_getMesgFont__Fv();
extern "C" void mDoExt_removeMesgFont__Fv();
@@ -1250,10 +1244,10 @@ SECTION_DATA static void* __vt__9dNm_HIO_c[3] = {
};
/* 80454DB0-80454DB4 0004+00 s=1 e=0 z=0 None .sdata2 @3665 */
SECTION_SDATA2 static u32 lit_3665 = 0x3FA66666;
SECTION_SDATA2 static f32 lit_3665 = 13.0f / 10.0f;
/* 80454DB4-80454DB8 0004+00 s=1 e=0 z=0 None .sdata2 @3666 */
SECTION_SDATA2 static u32 lit_3666 = 0x3FB33333;
SECTION_SDATA2 static f32 lit_3666 = 7.0f / 5.0f;
/* 8024E3E0-8024E408 0028+00 s=1 e=0 z=0 None .text __ct__9dNm_HIO_cFv */
#pragma push
@@ -1293,10 +1287,10 @@ static u8 lit_3660[12];
static u8 g_nmHIO[20];
/* 80454DB8-80454DBC 0004+00 s=1 e=0 z=0 None .sdata2 @3755 */
SECTION_SDATA2 static u32 lit_3755 = 0x3F666666;
SECTION_SDATA2 static f32 lit_3755 = 9.0f / 10.0f;
/* 80454DBC-80454DC0 0004+00 s=1 e=0 z=0 None .sdata2 @3756 */
SECTION_SDATA2 static u32 lit_3756 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3756 = 0.5f;
/* 8024E62C-8024E6D4 00A8+00 s=1 e=0 z=0 None .text _create__7dName_cFv */
#pragma push
@@ -1330,7 +1324,7 @@ asm void dName_c::initial() {
/* ############################################################################################## */
/* 80454DC0-80454DC4 0004+00 s=16 e=0 z=0 None .sdata2 @3820 */
SECTION_SDATA2 static u32 lit_3820 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3820 = 1.0f;
/* 8024E7EC-8024E9A0 01B4+00 s=0 e=2 z=0 None .text showIcon__7dName_cFv */
#pragma push
@@ -1344,7 +1338,7 @@ asm void dName_c::showIcon() {
/* ############################################################################################## */
/* 80454DC4-80454DC8 0004+00 s=6 e=0 z=0 None .sdata2 @3886 */
SECTION_SDATA2 static u32 lit_3886 = 0xBF800000;
SECTION_SDATA2 static f32 lit_3886 = -1.0f;
/* 8024E9A0-8024EC10 0270+00 s=0 e=2 z=0 None .text _move__7dName_cFv */
#pragma push
@@ -1378,9 +1372,7 @@ asm void dName_c::playNameSet(int param_0) {
/* ############################################################################################## */
/* 80454DC8-80454DD0 0008+00 s=1 e=0 z=0 None .sdata2 @3936 */
SECTION_SDATA2 static u8 lit_3936[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3936 = 4503601774854144.0 /* cast s32 to float */;
/* 8024EC84-8024ED48 00C4+00 s=1 e=0 z=0 None .text cursorAnm__7dName_cFv */
#pragma push
@@ -1648,13 +1640,13 @@ asm void dName_c::_draw() {
/* ############################################################################################## */
/* 80454DD4-80454DD8 0004+00 s=1 e=0 z=0 None .sdata2 @4722 */
SECTION_SDATA2 static u32 lit_4722 = 0x3F51EB85;
SECTION_SDATA2 static f32 lit_4722 = 41.0f / 50.0f;
/* 80454DD8-80454DDC 0004+00 s=1 e=0 z=0 None .sdata2 @4723 */
SECTION_SDATA2 static u32 lit_4723 = 0x3F451EB8;
SECTION_SDATA2 static f32 lit_4723 = 77.0f / 100.0f;
/* 80454DDC-80454DE0 0004+00 s=1 e=0 z=0 None .sdata2 @4724 */
SECTION_SDATA2 static u32 lit_4724 = 0x3D4CCCCD;
SECTION_SDATA2 static f32 lit_4724 = 1.0f / 20.0f;
/* 80454DE0-80454DE8 0004+04 s=1 e=0 z=0 None .sdata2 @4725 */
SECTION_SDATA2 static f32 lit_4725[1 + 1 /* padding */] = {
src/d/d_npc_lib.cpp
+10 -20
View File
@@ -11,12 +11,6 @@
// Types:
//
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 80112C80 */ csXyz();
/* 8026745C */ void operator+=(csXyz&);
};
struct Vec {};
struct cXyz {
@@ -27,6 +21,12 @@ struct cXyz {
/* 802670AC */ void isZero() const;
};
struct csXyz {
/* 80018BD0 */ ~csXyz();
/* 80112C80 */ csXyz();
/* 8026745C */ void operator+=(csXyz&);
};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CE9C */ void XYZrotS(csXyz const&);
@@ -67,10 +67,6 @@ extern "C" void __dt__16dNpcLib_lookat_cFv();
void cM_atan2s(f32, f32);
void operator delete(void*);
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u32 __float_nan;
extern "C" extern u8 Zero__5csXyz[4];
extern "C" extern u8 data_80451164[4];
extern "C" void __dt__4cXyzFv();
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
@@ -148,17 +144,13 @@ SECTION_SDATA2 static u8 lit_3864[4] = {
};
/* 80454DEC-80454DF0 0004+00 s=1 e=0 z=0 None .sdata2 @3865 */
SECTION_SDATA2 static u32 lit_3865 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3865 = 1.0f;
/* 80454DF0-80454DF8 0008+00 s=2 e=0 z=0 None .sdata2 @3866 */
SECTION_SDATA2 static u8 lit_3866[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3866 = 0.5;
/* 80454DF8-80454E00 0008+00 s=2 e=0 z=0 None .sdata2 @3867 */
SECTION_SDATA2 static u8 lit_3867[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3867 = 3.0;
/* 80454E00-80454E08 0008+00 s=2 e=0 z=0 None .sdata2 @3868 */
SECTION_SDATA2 static u8 lit_3868[8] = {
@@ -173,9 +165,7 @@ SECTION_SDATA2 static f32 lit_3869[1 + 1 /* padding */] = {
};
/* 80454E10-80454E18 0008+00 s=2 e=0 z=0 None .sdata2 @3873 */
SECTION_SDATA2 static u8 lit_3873[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3873 = 4503601774854144.0 /* cast s32 to float */;
/* 80251534-80251B60 062C+00 s=0 e=0 z=2 None .text
* action__16dNpcLib_lookat_cF4cXyz4cXyzP10fopAc_ac_cPA4_fi */
src/d/d_path.cpp
+3 -11
View File
@@ -49,8 +49,6 @@ extern "C" void dPath_GetPolyRoomPathVec__FRC13cBgS_PolyInfoP4cXyzPi();
// External References:
//
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" void getStatusRoomDt__20dStage_roomControl_cFi();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void GetRoomPathId__4dBgSFRC13cBgS_PolyInfo();
@@ -96,16 +94,10 @@ asm void dPath_GetNextRoomPath(dPath const* param_0, int param_1) {
/* ############################################################################################## */
/* 80452000-80452008 0004+04 s=1 e=0 z=0 None .sdata2 @3685 */
SECTION_SDATA2 static u8 lit_3685[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_3685[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 8005195C-80051AC0 0164+00 s=0 e=1 z=4 None .text
src/d/d_resorce.cpp
+1 -18
View File
@@ -204,12 +204,6 @@ static void addWarpMaterial(J3DModelData*);
static void getArcHeader(JKRArchive*);
static void myGetMemBlockSize(void*);
static void myGetMemBlockSize0(void*);
extern "C" extern char const* const d_d_resorce__stringBase0;
extern "C" extern void* __vt__10J3DAnmBase[4];
extern "C" extern void* __vt__15J3DAnmTransform[5];
extern "C" extern void* __vt__18mDoExt_transAnmBas[5];
extern "C" extern void* __vt__18J3DAnmTransformKey[5];
extern "C" extern void* __vt__11J3DTexNoAnm[3];
extern "C" void __ct__11dRes_info_cFv();
extern "C" void __dt__11dRes_info_cFv();
@@ -288,15 +282,6 @@ void mDoExt_resIDToIndex(JKRArchive*, u16);
void* operator new(u32);
void* operator new[](u32);
void operator delete(void*);
extern "C" extern u8 const j3dDefaultMtx[48];
extern "C" extern void* __vt__14J3DMaterialAnm[4];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4];
extern "C" extern u8 mZbufferTimg__13mDoGph_gInf_c[4];
extern "C" extern u8 sCurrentHeap__7JKRHeap[4];
extern "C" extern u8 j3dDefaultTevSwapMode[4];
extern "C" void OSReport_Error();
extern "C" void OSReport_Warning();
@@ -861,9 +846,7 @@ asm void dRes_info_c::dump_long(dRes_info_c* param_0, int param_1) {
/* ############################################################################################## */
/* 80451DF8-80451E00 0008+00 s=1 e=0 z=0 None .sdata2 @4277 */
SECTION_SDATA2 static u8 lit_4277[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4277 = 4503601774854144.0 /* cast s32 to float */;
/* 80451E00-80451E08 0004+04 s=1 e=0 z=0 None .sdata2 @4333 */
SECTION_SDATA2 static f32 lit_4333[1 + 1 /* padding */] = {
src/d/d_scope.cpp
+11 -21
View File
@@ -50,9 +50,6 @@ struct J2DPicture {
// Forward References:
//
extern "C" extern char const* const d_d_scope__stringBase0;
extern "C" extern void* __vt__11dMeterSub_c[8 + 3 /* padding */];
extern "C" void __ct__8dScope_cFUc();
extern "C" void __ct__Q28JUtility6TColorFv();
extern "C" void __dt__8dScope_cFv();
@@ -82,9 +79,6 @@ extern "C" extern void* __vt__11dMeterSub_c[8 + 3 /* padding */];
void* operator new(u32);
void operator delete(void*);
void J2DDrawLine(f32, f32, f32, f32, JUtility::TColor, int);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_meter2_info[248];
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
@@ -205,7 +199,7 @@ SECTION_DATA void* __vt__11dMeterSub_c[8 + 3 /* padding */] = {
};
/* 80453A10-80453A14 0004+00 s=4 e=0 z=0 None .sdata2 @3756 */
SECTION_SDATA2 static u32 lit_3756 = 0x40400000;
SECTION_SDATA2 static f32 lit_3756 = 3.0f;
/* 80453A14-80453A18 0004+00 s=4 e=0 z=0 None .sdata2 @3757 */
SECTION_SDATA2 static u8 lit_3757[4] = {
@@ -216,9 +210,7 @@ SECTION_SDATA2 static u8 lit_3757[4] = {
};
/* 80453A18-80453A20 0008+00 s=1 e=0 z=0 None .sdata2 @3759 */
SECTION_SDATA2 static u8 lit_3759[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3759 = 4503599627370496.0 /* cast u32 to float */;
/* 80193690-80193960 02D0+00 s=0 e=1 z=0 None .text __ct__8dScope_cFUc */
#pragma push
@@ -262,19 +254,19 @@ asm void dScope_c::_execute(u32 param_0) {
/* ############################################################################################## */
/* 80453A20-80453A24 0004+00 s=1 e=0 z=0 None .sdata2 @3879 */
SECTION_SDATA2 static u32 lit_3879 = 0x437F0000;
SECTION_SDATA2 static f32 lit_3879 = 255.0f;
/* 80453A24-80453A28 0004+00 s=1 e=0 z=0 None .sdata2 @3880 */
SECTION_SDATA2 static u32 lit_3880 = 0x43980000;
SECTION_SDATA2 static f32 lit_3880 = 304.0f;
/* 80453A28-80453A2C 0004+00 s=1 e=0 z=0 None .sdata2 @3881 */
SECTION_SDATA2 static u32 lit_3881 = 0x43E00000;
SECTION_SDATA2 static f32 lit_3881 = 448.0f;
/* 80453A2C-80453A30 0004+00 s=1 e=0 z=0 None .sdata2 @3882 */
SECTION_SDATA2 static u32 lit_3882 = 0x43600000;
SECTION_SDATA2 static f32 lit_3882 = 224.0f;
/* 80453A30-80453A34 0004+00 s=1 e=0 z=0 None .sdata2 @3883 */
SECTION_SDATA2 static u32 lit_3883 = 0x44180000;
SECTION_SDATA2 static f32 lit_3883 = 608.0f;
/* 80193C68-80193FA0 0338+00 s=1 e=0 z=0 None .text draw__8dScope_cFv */
#pragma push
@@ -308,18 +300,16 @@ asm void dScope_c::open_init() {
/* ############################################################################################## */
/* 80453A34-80453A38 0004+00 s=2 e=0 z=0 None .sdata2 @3902 */
SECTION_SDATA2 static u32 lit_3902 = 0x3FC00000;
SECTION_SDATA2 static f32 lit_3902 = 1.5f;
/* 80453A38-80453A3C 0004+00 s=2 e=0 z=0 None .sdata2 @3903 */
SECTION_SDATA2 static u32 lit_3903 = 0x40A00000;
SECTION_SDATA2 static f32 lit_3903 = 5.0f;
/* 80453A3C-80453A40 0004+00 s=2 e=0 z=0 None .sdata2 @3904 */
SECTION_SDATA2 static u32 lit_3904 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3904 = 1.0f;
/* 80453A40-80453A48 0008+00 s=2 e=0 z=0 None .sdata2 @3906 */
SECTION_SDATA2 static u8 lit_3906[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3906 = 4503601774854144.0 /* cast s32 to float */;
/* 80193FD0-80194048 0078+00 s=1 e=0 z=0 None .text open_proc__8dScope_cFv */
#pragma push
src/d/d_select_cursor.cpp
+8 -17
View File
@@ -88,8 +88,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_d_select_cursor__stringBase0;
extern "C" void __ct__19dSelect_cursorHIO_cFv();
extern "C" void __ct__16dSelect_cursor_cFUcfP10JKRArchive();
extern "C" void __dt__16dSelect_cursor_cFv();
@@ -117,11 +115,6 @@ extern "C" extern char const* const d_d_select_cursor__stringBase0;
void dPaneClass_showNullPane(J2DScreen*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__10J2DAnmBase[4];
extern "C" extern void* __vt__15J2DAnmTransform[5 + 4 /* padding */];
extern "C" extern void* __vt__18J2DAnmTransformKey[6];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" void animation__14dSelect_icon_cFv();
extern "C" void setAlpha__14dSelect_icon_cFUc();
@@ -288,10 +281,10 @@ SECTION_DATA static void* __vt__19dSelect_cursorHIO_c[3 + 1 /* padding */] = {
};
/* 80453A48-80453A4C 0004+00 s=4 e=0 z=0 None .sdata2 @3673 */
SECTION_SDATA2 static u32 lit_3673 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3673 = 1.0f;
/* 80453A4C-80453A50 0004+00 s=1 e=0 z=0 None .sdata2 @3674 */
SECTION_SDATA2 static u32 lit_3674 = 0x3E99999A;
SECTION_SDATA2 static f32 lit_3674 = 3.0f / 10.0f;
/* 801941E4-80194220 003C+00 s=1 e=0 z=0 None .text __ct__19dSelect_cursorHIO_cFv */
#pragma push
@@ -345,12 +338,10 @@ asm void dSelect_cursor_c::draw() {
/* ############################################################################################## */
/* 80453A54-80453A58 0004+00 s=3 e=0 z=0 None .sdata2 @4062 */
SECTION_SDATA2 static u32 lit_4062 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4062 = 0.5f;
/* 80453A58-80453A60 0008+00 s=3 e=0 z=0 None .sdata2 @4064 */
SECTION_SDATA2 static u8 lit_4064[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4064 = 4503601774854144.0 /* cast s32 to float */;
/* 80194CC0-801950F4 0434+00 s=1 e=0 z=0 None .text update__16dSelect_cursor_cFv */
#pragma push
@@ -364,7 +355,7 @@ asm void dSelect_cursor_c::update() {
/* ############################################################################################## */
/* 80453A60-80453A64 0004+00 s=1 e=0 z=0 None .sdata2 @4089 */
SECTION_SDATA2 static u32 lit_4089 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4089 = -1.0f;
/* 801950F4-801951B0 00BC+00 s=0 e=30 z=0 None .text setPos__16dSelect_cursor_cFffP7J2DPaneb
*/
@@ -410,7 +401,7 @@ asm void dSelect_cursor_c::setAlphaRate(f32 param_0) {
/* ############################################################################################## */
/* 80453A64-80453A68 0004+00 s=2 e=0 z=0 None .sdata2 @4157 */
SECTION_SDATA2 static u32 lit_4157 = 0x40A00000;
SECTION_SDATA2 static f32 lit_4157 = 5.0f;
/* 80195330-801953CC 009C+00 s=0 e=1 z=0 None .text addAlpha__16dSelect_cursor_cFv */
#pragma push
@@ -456,10 +447,10 @@ asm void dSelect_cursor_c::setBtk0Animation(J2DAnmTextureSRTKey* param_0) {
/* ############################################################################################## */
/* 80453A68-80453A6C 0004+00 s=1 e=0 z=0 None .sdata2 @4237 */
SECTION_SDATA2 static u32 lit_4237 = 0x41A00000;
SECTION_SDATA2 static f32 lit_4237 = 20.0f;
/* 80453A6C-80453A70 0004+00 s=1 e=0 z=0 None .sdata2 @4238 */
SECTION_SDATA2 static u32 lit_4238 = 0x41200000;
SECTION_SDATA2 static f32 lit_4238 = 10.0f;
/* 80195724-801958E0 01BC+00 s=1 e=0 z=0 None .text setCursorAnimation__16dSelect_cursor_cFv
*/
src/d/d_select_icon.cpp
+4 -12
View File
@@ -80,22 +80,14 @@ asm dSi_HIO_c::dSi_HIO_c() {
/* ############################################################################################## */
/* 80453A70-80453A78 0004+04 s=1 e=0 z=0 None .sdata2 @3740 */
SECTION_SDATA2 static u8 lit_3740[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_3740[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 80453A78-80453A80 0008+00 s=1 e=0 z=0 None .sdata2 @3773 */
SECTION_SDATA2 static u8 lit_3773[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3773 = 4503601774854144.0 /* cast s32 to float */;
/* 80195A3C-80195B40 0104+00 s=0 e=1 z=0 None .text animation__14dSelect_icon_cFv */
#pragma push
src/d/d_simple_model.cpp
+3 -14
View File
@@ -80,11 +80,6 @@ void mDoExt_destroySolidHeap(JKRSolidHeap*);
void mDoExt_restoreCurrentHeap();
void mDoExt_J3DModel__create(J3DModelData*, u32, u32);
void operator delete(void*);
extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
extern "C" void mDoExt_modelUpdateDL__FP8J3DModel();
extern "C" void mDoExt_createSolidHeapFromGameToCurrent__FUlUl();
@@ -208,16 +203,10 @@ asm void dSmplMdl_draw_c::removeModel(J3DModelData* param_0, int param_1) {
/* ############################################################################################## */
/* 80451F38-80451F40 0004+04 s=1 e=0 z=0 None .sdata2 @3763 */
SECTION_SDATA2 static u8 lit_3763[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_3763[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 800490EC-800491F4 0108+00 s=1 e=0 z=0 None .text create__12diff_model_cFP12J3DModelDataiUc
src/d/d_spline_path.cpp
+3 -5
View File
@@ -52,9 +52,7 @@ extern "C" void PSVECAdd();
/* ############################################################################################## */
/* 80452BC8-80452BD0 0008+00 s=4 e=0 z=0 None .sdata2 @3632 */
SECTION_SDATA2 static u8 lit_3632[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3632 = 4503601774854144.0 /* cast s32 to float */;
/* 80097878-80097904 008C+00 s=0 e=7 z=0 None .text Init__14d2DBSplinePathFll */
#pragma push
@@ -68,10 +66,10 @@ asm void d2DBSplinePath::Init(s32 param_0, s32 param_1) {
/* ############################################################################################## */
/* 80452BD0-80452BD4 0004+00 s=3 e=0 z=0 None .sdata2 @3684 */
SECTION_SDATA2 static u32 lit_3684 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3684 = 1.0f;
/* 80452BD4-80452BD8 0004+00 s=3 e=0 z=0 None .sdata2 @3685 */
SECTION_SDATA2 static u32 lit_3685 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3685 = 0.5f;
/* 80097904-80097A6C 0168+00 s=0 e=5 z=0 None .text Step__14d2DBSplinePathFv */
#pragma push
src/d/d_stage.cpp
+20 -38
View File
@@ -97,32 +97,32 @@ struct dStage_startStage_c {
/* 8002419C */ void set(char const*, s8, s16, s8);
};
struct dStage_dPath_c {};
struct dStage_FileList2_dt_c {};
struct dStage_SoundInfo_c {};
struct dStage_MemoryMap_c {};
struct dStage_MapEventInfo_c {};
struct dStage_Elst_c {};
struct dStage_dPnt_c {};
struct dStage_FloorInfo_c {};
struct dStage_MemoryConfig_c {};
struct dStage_DMap_c {};
struct dStage_dPath_c {};
struct dStage_FileList_dt_c {};
struct dStage_Lbnk_c {};
struct dStage_MemoryMap_c {};
struct dStage_dPnt_c {};
struct dStage_Multi_c {};
struct dStage_MemoryConfig_c {};
struct dStage_FloorInfo_c {};
struct dStage_FileList2_dt_c {};
struct dStage_DMap_c {};
struct dStage_Lbnk_c {};
struct dStage_Elst_c {};
struct dStage_SoundInfo_c {};
struct dStage_stageDt_c {
/* 8002483C */ void getStagInfo() const;
/* 80024C1C */ void init();
@@ -505,17 +505,6 @@ void dStage_changeSceneExitId(cBgS_PolyInfo&, f32, u32, s8, s16);
void dStage_changeScene(int, f32, u32, s8, s16, int);
void dStage_changeScene4Event(int, s8, int, bool, f32, u32, s16, int);
void dStage_restartRoom(u32, u32, int);
extern "C" extern char const* const d_d_stage__stringBase0;
extern "C" extern void* __vt__16dStage_stageDt_c[93];
extern "C" extern void* __vt__11dStage_dt_c[93];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" extern u8 mProcID__20dStage_roomControl_c[4];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 data_80450D68[4];
extern "C" extern u8 mArcBankName__20dStage_roomControl_c[4];
extern "C" extern u8 mArcBankData__20dStage_roomControl_c[4];
extern "C" extern u8 pad_80450D7C[4];
extern "C" void set__18dStage_nextStage_cFPCcScsScScUc();
extern "C" static void dStage_SetErrorRoom__Fv();
@@ -850,11 +839,6 @@ void dKy_set_nexttime(f32);
void* operator new[](u32, JKRHeap*, int);
void operator delete(void*);
void operator delete[](void*);
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_save_bit_HIO[1184 + 4 /* padding */];
extern "C" extern u8 data_804505F0[8];
extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" void OSReport();
extern "C" void OSReport_Error();
@@ -3196,12 +3180,10 @@ asm void dStage_changeSceneExitId(cBgS_PolyInfo& param_0, f32 param_1, u32 param
/* ############################################################################################## */
/* 80451C94-80451C98 0004+00 s=2 e=0 z=0 None .sdata2 @5315 */
SECTION_SDATA2 static u32 lit_5315 = 0x41700000;
SECTION_SDATA2 static f32 lit_5315 = 15.0f;
/* 80451C98-80451CA0 0008+00 s=2 e=0 z=0 None .sdata2 @5317 */
SECTION_SDATA2 static u8 lit_5317[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5317 = 4503601774854144.0 /* cast s32 to float */;
/* 80027170-800272E0 0170+00 s=1 e=10 z=63 None .text dStage_changeScene__FifUlScsi */
#pragma push
src/d/d_timer.cpp
+22 -33
View File
@@ -186,8 +186,6 @@ void dTimer_getRestTimeMs();
void dTimer_show();
void dTimer_hide();
void dTimer_isReadyFlag();
extern "C" extern char const* const d_d_timer__stringBase0;
extern "C" extern void* g_profile_TIMER[10];
extern "C" void _create__8dTimer_cFv();
extern "C" void _execute__8dTimer_cFv();
@@ -269,13 +267,6 @@ void dPaneClass_showNullPane(J2DScreen*);
void cM_rndFX(f32);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
extern "C" void mDoExt_getMesgFont__Fv();
@@ -379,7 +370,7 @@ SECTION_SDATA2 static u8 lit_3919[4] = {
};
/* 80454F44-80454F48 0004+00 s=2 e=0 z=0 None .sdata2 @3920 */
SECTION_SDATA2 static u32 lit_3920 = 0x43110000;
SECTION_SDATA2 static f32 lit_3920 = 145.0f;
/* 8025CA0C-8025CF04 04F8+00 s=1 e=0 z=0 None .text _create__8dTimer_cFv */
#pragma push
@@ -393,7 +384,7 @@ asm void dTimer_c::_create() {
/* ############################################################################################## */
/* 80454F48-80454F4C 0004+00 s=3 e=0 z=0 None .sdata2 @4050 */
SECTION_SDATA2 static u32 lit_4050 = 0x41C80000;
SECTION_SDATA2 static f32 lit_4050 = 25.0f;
/* 8025CF04-8025D33C 0438+00 s=1 e=0 z=0 None .text _execute__8dTimer_cFv */
#pragma push
@@ -701,7 +692,7 @@ asm void dDlst_TimerScrnDraw_c::getNumber(int param_0) {
/* ############################################################################################## */
/* 80454F4C-80454F50 0004+00 s=5 e=0 z=0 None .sdata2 @4124 */
SECTION_SDATA2 static u32 lit_4124 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4124 = 1.0f;
/* 80454F50-80454F58 0004+04 s=3 e=0 z=0 None .sdata2 @4125 */
SECTION_SDATA2 static f32 lit_4125[1 + 1 /* padding */] = {
@@ -711,9 +702,7 @@ SECTION_SDATA2 static f32 lit_4125[1 + 1 /* padding */] = {
};
/* 80454F58-80454F60 0008+00 s=7 e=0 z=0 None .sdata2 @4627 */
SECTION_SDATA2 static u8 lit_4627[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4627 = 4503601774854144.0 /* cast s32 to float */;
/* 8025EEF0-8025F180 0290+00 s=1 e=0 z=0 None .text setTimer__21dDlst_TimerScrnDraw_cFi */
#pragma push
@@ -803,7 +792,7 @@ SECTION_SDATA2 static u8 animeFrame[6 + 2 /* padding */] = {
};
/* 80454F68-80454F6C 0004+00 s=3 e=0 z=0 None .sdata2 @5094 */
SECTION_SDATA2 static u32 lit_5094 = 0xC2480000;
SECTION_SDATA2 static f32 lit_5094 = -50.0f;
/* 8025FB74-8025FF98 0424+00 s=1 e=0 z=0 None .text anime__21dDlst_TimerScrnDraw_cFv */
#pragma push
@@ -817,7 +806,7 @@ asm void dDlst_TimerScrnDraw_c::anime() {
/* ############################################################################################## */
/* 80454F6C-80454F70 0004+00 s=1 e=0 z=0 None .sdata2 @5143 */
SECTION_SDATA2 static u32 lit_5143 = 0x42440000;
SECTION_SDATA2 static f32 lit_5143 = 49.0f;
/* 8025FF98-802601E4 024C+00 s=1 e=0 z=0 None .text closeAnime__21dDlst_TimerScrnDraw_cFv */
#pragma push
@@ -831,31 +820,31 @@ asm void dDlst_TimerScrnDraw_c::closeAnime() {
/* ############################################################################################## */
/* 80454F70-80454F74 0004+00 s=3 e=0 z=0 None .sdata2 @5227 */
SECTION_SDATA2 static u32 lit_5227 = 0x42200000;
SECTION_SDATA2 static f32 lit_5227 = 40.0f;
/* 80454F74-80454F78 0004+00 s=2 e=0 z=0 None .sdata2 @5228 */
SECTION_SDATA2 static u32 lit_5228 = 0x42700000;
SECTION_SDATA2 static f32 lit_5228 = 60.0f;
/* 80454F78-80454F7C 0004+00 s=1 e=0 z=0 None .sdata2 @5229 */
SECTION_SDATA2 static u32 lit_5229 = 0xC2C80000;
SECTION_SDATA2 static f32 lit_5229 = -100.0f;
/* 80454F7C-80454F80 0004+00 s=1 e=0 z=0 None .sdata2 @5230 */
SECTION_SDATA2 static u32 lit_5230 = 0x42C80000;
SECTION_SDATA2 static f32 lit_5230 = 100.0f;
/* 80454F80-80454F84 0004+00 s=1 e=0 z=0 None .sdata2 @5231 */
SECTION_SDATA2 static u32 lit_5231 = 0x42960000;
SECTION_SDATA2 static f32 lit_5231 = 75.0f;
/* 80454F84-80454F88 0004+00 s=1 e=0 z=0 None .sdata2 @5232 */
SECTION_SDATA2 static u32 lit_5232 = 0xC2960000;
SECTION_SDATA2 static f32 lit_5232 = -75.0f;
/* 80454F88-80454F8C 0004+00 s=1 e=0 z=0 None .sdata2 @5233 */
SECTION_SDATA2 static u32 lit_5233 = 0x43480000;
SECTION_SDATA2 static f32 lit_5233 = 200.0f;
/* 80454F8C-80454F90 0004+00 s=1 e=0 z=0 None .sdata2 @5234 */
SECTION_SDATA2 static u32 lit_5234 = 0x43160000;
SECTION_SDATA2 static f32 lit_5234 = 150.0f;
/* 80454F90-80454F94 0004+00 s=1 e=0 z=0 None .sdata2 @5235 */
SECTION_SDATA2 static u32 lit_5235 = 0x41A00000;
SECTION_SDATA2 static f32 lit_5235 = 20.0f;
/* 802601E4-80260574 0390+00 s=2 e=0 z=0 None .text createGetIn__21dDlst_TimerScrnDraw_cF4cXyz
*/
@@ -880,13 +869,13 @@ asm void dDlst_TimerScrnDraw_c::createStart(u16 param_0) {
/* ############################################################################################## */
/* 80454F94-80454F98 0004+00 s=1 e=0 z=0 None .sdata2 @5325 */
SECTION_SDATA2 static u32 lit_5325 = 0x3E19999A;
SECTION_SDATA2 static f32 lit_5325 = 3.0f / 20.0f;
/* 80454F98-80454F9C 0004+00 s=2 e=0 z=0 None .sdata2 @5326 */
SECTION_SDATA2 static u32 lit_5326 = 0x3F000000;
SECTION_SDATA2 static f32 lit_5326 = 0.5f;
/* 80454F9C-80454FA0 0004+00 s=1 e=0 z=0 None .sdata2 @5327 */
SECTION_SDATA2 static u32 lit_5327 = 0x41900000;
SECTION_SDATA2 static f32 lit_5327 = 18.0f;
/* 80260690-80260AA8 0418+00 s=1 e=0 z=0 None .text draw__21dDlst_TimerScrnDraw_cFv */
#pragma push
@@ -988,16 +977,16 @@ asm void dTimer_createTimer(s32 param_0, u32 param_1, u8 param_2, u8 param_3, f3
/* ############################################################################################## */
/* 80454FA0-80454FA4 0004+00 s=1 e=0 z=0 None .sdata2 @5544 */
SECTION_SDATA2 static u32 lit_5544 = 0x435D0000;
SECTION_SDATA2 static f32 lit_5544 = 221.0f;
/* 80454FA4-80454FA8 0004+00 s=1 e=0 z=0 None .sdata2 @5545 */
SECTION_SDATA2 static u32 lit_5545 = 0x43DB8000;
SECTION_SDATA2 static f32 lit_5545 = 439.0f;
/* 80454FA8-80454FAC 0004+00 s=1 e=0 z=0 None .sdata2 @5546 */
SECTION_SDATA2 static u32 lit_5546 = 0x42000000;
SECTION_SDATA2 static f32 lit_5546 = 32.0f;
/* 80454FAC-80454FB0 0004+00 s=1 e=0 z=0 None .sdata2 @5547 */
SECTION_SDATA2 static u32 lit_5547 = 0x43D18000;
SECTION_SDATA2 static f32 lit_5547 = 419.0f;
/* 80261034-80261100 00CC+00 s=0 e=1 z=0 None .text dTimer_createStockTimer__Fv */
#pragma push
src/d/d_tresure.cpp
+4 -16
View File
@@ -57,8 +57,6 @@ struct dMapInfo_c {
// Forward References:
//
extern "C" extern u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */];
extern "C" void createWork__7dTres_cFv();
extern "C" void create__7dTres_cFv();
extern "C" void remove__7dTres_cFv();
@@ -83,10 +81,6 @@ extern "C" extern u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */];
void mDoMtx_YrotS(f32 (*)[4], s16);
void dPath_GetRoomPath(int, int);
void* operator new[](u32);
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 data_80450680[8];
extern "C" extern u32 __float_nan;
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void isDungeonItem__12dSv_memBit_cCFi();
@@ -178,7 +172,7 @@ asm void dTres_c::addData(dTres_c::list_class* param_0, s8 param_1) {
/* ############################################################################################## */
/* 80452BE8-80452BEC 0004+00 s=1 e=0 z=0 None .sdata2 @3839 */
SECTION_SDATA2 static u32 lit_3839 = 0x43360B61;
SECTION_SDATA2 static f32 lit_3839 = 182.04444885253906f;
/* 80452BEC-80452BF0 0004+00 s=1 e=0 z=0 None .sdata2 @3840 */
SECTION_SDATA2 static u8 lit_3840[4] = {
@@ -189,14 +183,10 @@ SECTION_SDATA2 static u8 lit_3840[4] = {
};
/* 80452BF0-80452BF8 0008+00 s=1 e=0 z=0 None .sdata2 @3841 */
SECTION_SDATA2 static u8 lit_3841[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3841 = 0.5;
/* 80452BF8-80452C00 0008+00 s=1 e=0 z=0 None .sdata2 @3842 */
SECTION_SDATA2 static u8 lit_3842[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3842 = 3.0;
/* 80452C00-80452C08 0008+00 s=1 e=0 z=0 None .sdata2 @3843 */
SECTION_SDATA2 static u8 lit_3843[8] = {
@@ -204,9 +194,7 @@ SECTION_SDATA2 static u8 lit_3843[8] = {
};
/* 80452C08-80452C10 0008+00 s=1 e=0 z=0 None .sdata2 @3845 */
SECTION_SDATA2 static u8 lit_3845[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3845 = 4503601774854144.0 /* cast s32 to float */;
/* 8009BE28-8009C168 0340+00 s=1 e=0 z=0 None .text checkTreasureBox__7dTres_cFPQ27dTres_c6data_s
*/
src/d/d_vib_pattern.cpp
-5
View File
@@ -16,11 +16,6 @@ extern "C" extern u8 const CS_patt__12dVibration_c[88];
extern "C" extern u8 const MQ_patt__12dVibration_c[80];
extern "C" extern u8 const CQ_patt__12dVibration_c[80];
extern "C" extern u8 const MS_patt__12dVibration_c[88];
extern "C" extern u8 const CS_patt__12dVibration_c[88];
extern "C" extern u8 const MQ_patt__12dVibration_c[80];
extern "C" extern u8 const CQ_patt__12dVibration_c[80];
//
// External References:
//
src/d/d_vibration.cpp
+1 -11
View File
@@ -56,8 +56,6 @@ struct JUTGamePad {
// Forward References:
//
extern "C" extern u8 data_80450F58[8];
extern "C" static void func_8006F168();
extern "C" static void func_8006F184();
extern "C" static void func_8006F1A4();
@@ -82,12 +80,6 @@ extern "C" extern u8 data_80450F58[8];
void dCam_getBody();
void dKy_darkworld_check();
void cM_rnd();
extern "C" extern u8 const MS_patt__12dVibration_c[88];
extern "C" extern u8 const CS_patt__12dVibration_c[88];
extern "C" extern u8 const MQ_patt__12dVibration_c[80];
extern "C" extern u8 const CQ_patt__12dVibration_c[80];
extern "C" extern u8 m_gamePad__8mDoCPd_c[16];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" void checkVibration__19dSv_player_config_cCFv();
extern "C" void StartShake__9dCamera_cFlPUcl4cXyz();
@@ -152,9 +144,7 @@ extern "C" asm static void func_8006F1A4() {
/* ############################################################################################## */
/* 80452620-80452628 0008+00 s=1 e=0 z=0 None .sdata2 @3756 */
SECTION_SDATA2 static u8 lit_3756[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3756 = 4503601774854144.0 /* cast s32 to float */;
/* 8006F1D8-8006F268 0090+00 s=1 e=0 z=0 None .text randombit__25@unnamed@d_vibration_cpp@Fll
*/
src/d/event/d_event.cpp
+3 -13
View File
@@ -153,7 +153,6 @@ void dEv_defaultSkipProc(void*, int);
void dEv_defaultSkipZev(void*, int);
void dEv_defaultSkipStb(void*, int);
void dEv_noFinishSkipProc(void*, int);
extern "C" extern char const* const d_event_d_event__stringBase0;
extern "C" static bool func_80041480();
extern "C" static void func_80041488();
@@ -229,15 +228,6 @@ void dComIfG_getStageRes(char const*);
void dComIfG_getRoomArcName(int);
void dComIfGs_onVisitedRoom(int);
void dCam_getBody();
extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern void* __vt__11dEvt_info_c[3 + 1 /* padding */];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 m_mode__7dDemo_c[4];
extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void fadeOut__13mDoGph_gInf_cFf();
extern "C" void fopAcIt_Judge__FPFPvPv_PvPv();
@@ -364,7 +354,7 @@ asm void dEvt_control_c::order(u16 param_0, u16 param_1, u16 param_2, u16 param_
/* ############################################################################################## */
/* 80451EC0-80451EC4 0004+00 s=1 e=0 z=0 None .sdata2 @4361 */
SECTION_SDATA2 static u32 lit_4361 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4361 = 1.0f;
/* 80041804-80041934 0130+00 s=5 e=0 z=0 None .text setParam__14dEvt_control_cFP12dEvt_order_c
*/
@@ -696,7 +686,7 @@ asm void dEvt_control_c::offSkipFade() {
/* ############################################################################################## */
/* 80451EC4-80451EC8 0004+00 s=1 e=0 z=0 None .sdata2 @4904 */
SECTION_SDATA2 static u32 lit_4904 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_4904 = 1.0f / 10.0f;
/* 800429D4-80042BBC 01E8+00 s=1 e=0 z=0 None .text skipper__14dEvt_control_cFv */
#pragma push
@@ -710,7 +700,7 @@ asm void dEvt_control_c::skipper() {
/* ############################################################################################## */
/* 80451EC8-80451ECC 0004+00 s=1 e=0 z=0 None .sdata2 @5013 */
SECTION_SDATA2 static u32 lit_5013 = 0xBD4CCCCD;
SECTION_SDATA2 static f32 lit_5013 = -1.0f / 20.0f;
/* 80042BBC-80042FA8 03EC+00 s=0 e=1 z=0 None .text Step__14dEvt_control_cFv */
#pragma push
src/d/event/d_event_data.cpp
+7 -23
View File
@@ -141,7 +141,6 @@ static void getTelopNo(char const*);
static void getTelopNo();
static void getStartTelopNo();
static void dEvDt_Next_Stage(int, int);
extern "C" extern char const* const d_event_d_event_data__stringBase0;
extern "C" static void getTelopNo__FPCc();
extern "C" static void getTelopNo__Fv();
@@ -195,17 +194,6 @@ void d_GameOver_Delete(unsigned int&);
void dKy_set_nexttime(f32);
void dKy_instant_timechg(f32);
void dKy_instant_rainchg();
extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern f32 mFadeRate__13mDoGph_gInf_c;
extern "C" extern u8 struct_80450BE4[4];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 m_control__7dDemo_c[4];
extern "C" extern u8 m_frameNoMsg__7dDemo_c[4];
extern "C" extern u8 m_mode__7dDemo_c[4];
extern "C" extern f32 mWipeRate__12dDlst_list_c;
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor();
extern "C" void fadeOut__13mDoGph_gInf_cFf();
@@ -441,12 +429,10 @@ SECTION_SDATA2 static u8 lit_4264[4] = {
};
/* 80451ED4-80451ED8 0004+00 s=2 e=0 z=0 None .sdata2 @4265 */
SECTION_SDATA2 static u32 lit_4265 = 0x41700000;
SECTION_SDATA2 static f32 lit_4265 = 15.0f;
/* 80451ED8-80451EE0 0008+00 s=1 e=0 z=0 None .sdata2 @4267 */
SECTION_SDATA2 static u8 lit_4267[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4267 = 4503601774854144.0 /* cast s32 to float */;
/* 80043A14-80043D60 034C+00 s=1 e=0 z=0 None .text dEvDt_Next_Stage__Fii */
#pragma push
@@ -608,9 +594,7 @@ SECTION_SDATA2 static f32 lit_4460[1 + 1 /* padding */] = {
};
/* 80451EE8-80451EF0 0008+00 s=1 e=0 z=0 None .sdata2 @4461 */
SECTION_SDATA2 static u8 lit_4461[8] = {
0x40, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4461 = 24.0;
/* 80044190-80044324 0194+00 s=1 e=0 z=0 None .text specialProcLight__12dEvDtStaff_cFv */
#pragma push
@@ -634,10 +618,10 @@ asm void dEvDtStaff_c::specialProcMessage() {
/* ############################################################################################## */
/* 80451EF0-80451EF4 0004+00 s=4 e=0 z=0 None .sdata2 @4668 */
SECTION_SDATA2 static u32 lit_4668 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4668 = 1.0f;
/* 80451EF4-80451EF8 0004+00 s=2 e=0 z=0 None .sdata2 @4669 */
SECTION_SDATA2 static u32 lit_4669 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4669 = -1.0f;
/* 80044A58-80044CB8 0260+00 s=1 e=0 z=0 None .text specialProcSound__12dEvDtStaff_cFv */
#pragma push
@@ -671,7 +655,7 @@ asm void dEvDtStaff_c::specialProcDirector() {
/* ############################################################################################## */
/* 80451EF8-80451EFC 0004+00 s=1 e=0 z=0 None .sdata2 @5057 */
SECTION_SDATA2 static u32 lit_5057 = 0x41200000;
SECTION_SDATA2 static f32 lit_5057 = 10.0f;
/* 80045878-80045AFC 0284+00 s=1 e=0 z=0 None .text specialProcPackage__12dEvDtStaff_cFv */
#pragma push
@@ -695,7 +679,7 @@ asm void dEvDtStaff_c::specialProcTimekeeper() {
/* ############################################################################################## */
/* 80451EFC-80451F00 0004+00 s=1 e=0 z=0 None .sdata2 @5200 */
SECTION_SDATA2 static u32 lit_5200 = 0x3F4CCCCD;
SECTION_SDATA2 static f32 lit_5200 = 4.0f / 5.0f;
/* 80045C34-800460A8 0474+00 s=1 e=0 z=0 None .text specialProcEffect__12dEvDtStaff_cFv */
#pragma push
src/d/event/d_event_lib.cpp
-1
View File
@@ -62,7 +62,6 @@ extern "C" void __sinit_d_event_lib_cpp();
void fopAcM_orderOtherEventId(fopAc_ac_c*, s16, u8, u16, u16, u16);
void fopAcM_orderMapToolEvent(fopAc_ac_c*, u8, s16, u16, u16, u16);
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs();
extern "C" void fopAcM_orderMapToolEvent__FP10fopAc_ac_cUcsUsUsUs();
src/d/event/d_event_manager.cpp
+13 -30
View File
@@ -41,14 +41,14 @@ struct dEvt_control_c {
/* 800436F4 */ void setPtD(void*);
};
struct dEvDtData_c {};
struct Vec {};
struct cXyz {
/* 80266B34 */ void operator-(Vec const&) const;
};
struct dEvDtData_c {};
struct dEvDtStaff_c {
/* 80044134 */ void init();
};
@@ -148,7 +148,6 @@ static void allOffObjectCallBack(fopAc_ac_c*, void*);
static void dEvmng_strcmp(char const*, char*);
static void findShutterCallBack(fopAc_ac_c*, void*);
static void dEv_talkman_get_action(int);
extern "C" extern char const* const d_event_d_event_manager__stringBase0;
extern "C" void init__18dEvent_exception_cFv();
extern "C" void setStartDemo__18dEvent_exception_cFi();
@@ -220,12 +219,6 @@ void dEv_defaultSkipProc(void*, int);
void dEv_defaultSkipZev(void*, int);
void dEv_defaultSkipStb(void*, int);
void dCam_getBody();
extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void fopAcIt_Judge__FPFPvPv_PvPv();
extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs();
@@ -576,27 +569,17 @@ asm void dEvent_manager_c::endProc(s16 param_0, int param_1) {
/* ############################################################################################## */
/* 80451F00-80451F08 0004+04 s=1 e=0 z=0 None .sdata2 @4398 */
SECTION_SDATA2 static u8 lit_4398[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_4398[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 80451F08-80451F10 0008+00 s=1 e=0 z=0 None .sdata2 @4399 */
SECTION_SDATA2 static u8 lit_4399[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4399 = 0.5;
/* 80451F10-80451F18 0008+00 s=1 e=0 z=0 None .sdata2 @4400 */
SECTION_SDATA2 static u8 lit_4400[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4400 = 3.0;
/* 80451F18-80451F20 0008+00 s=1 e=0 z=0 None .sdata2 @4401 */
SECTION_SDATA2 static u8 lit_4401[8] = {
@@ -604,13 +587,13 @@ SECTION_SDATA2 static u8 lit_4401[8] = {
};
/* 80451F20-80451F24 0004+00 s=1 e=0 z=0 None .sdata2 @4402 */
SECTION_SDATA2 static u32 lit_4402 = 0x43340000;
SECTION_SDATA2 static f32 lit_4402 = 180.0f;
/* 80451F24-80451F28 0004+00 s=1 e=0 z=0 None .sdata2 @4403 */
SECTION_SDATA2 static u32 lit_4403 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4403 = 1.0f;
/* 80451F28-80451F2C 0004+00 s=1 e=0 z=0 None .sdata2 @4404 */
SECTION_SDATA2 static u32 lit_4404 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4404 = -1.0f;
/* 80046E64-800473FC 0598+00 s=0 e=1 z=0 None .text Sequencer__16dEvent_manager_cFv */
#pragma push
@@ -914,10 +897,10 @@ asm void dEvent_manager_c::getRunEventName() {
/* ############################################################################################## */
/* 80451F2C-80451F30 0004+00 s=1 e=0 z=0 None .sdata2 @5025 */
SECTION_SDATA2 static u32 lit_5025 = 0x41200000;
SECTION_SDATA2 static f32 lit_5025 = 10.0f;
/* 80451F30-80451F34 0004+00 s=1 e=0 z=0 None .sdata2 @5026 */
SECTION_SDATA2 static u32 lit_5026 = 0xC1200000;
SECTION_SDATA2 static f32 lit_5026 = -10.0f;
/* 8004846C-80048520 00B4+00 s=1 e=0 z=0 None .text findShutterCallBack__FP10fopAc_ac_cPv */
#pragma push
@@ -931,7 +914,7 @@ asm static void findShutterCallBack(fopAc_ac_c* param_0, void* param_1) {
/* ############################################################################################## */
/* 80451F34-80451F38 0004+00 s=1 e=0 z=0 None .sdata2 @5055 */
SECTION_SDATA2 static u32 lit_5055 = 0x42C80000;
SECTION_SDATA2 static f32 lit_5055 = 100.0f;
/* 80048520-80048618 00F8+00 s=1 e=0 z=0 None .text specialCast_Shutter__16dEvent_manager_cFsi
*/
src/d/file/d_file_sel_info.cpp
+1 -6
View File
@@ -68,8 +68,6 @@ struct CPaneMgrAlpha {
// Forward References:
//
extern "C" extern char const* const d_file_d_file_sel_info__stringBase0;
extern "C" void __ct__12dFile_info_cFP10JKRArchiveUc();
extern "C" void __dt__12dFile_info_cFv();
extern "C" void screenSet__12dFile_info_cFv();
@@ -93,9 +91,6 @@ void mDoExt_getMesgFont();
void mDoExt_removeMesgFont();
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_meter2_info[248];
extern "C" void mDoExt_getMesgFont__Fv();
extern "C" void mDoExt_removeMesgFont__Fv();
@@ -326,7 +321,7 @@ asm void dFile_info_c::_draw() {
/* ############################################################################################## */
/* 804539F8-804539FC 0004+00 s=1 e=0 z=0 None .sdata2 @4000 */
SECTION_SDATA2 static u32 lit_4000 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4000 = 1.0f;
/* 804539FC-80453A00 0004+00 s=1 e=0 z=0 None .sdata2 @4001 */
SECTION_SDATA2 static u8 lit_4001[4] = {
src/d/file/d_file_sel_warning.cpp
+4 -10
View File
@@ -16,12 +16,12 @@ struct dMsgString_c {
/* 80249D28 */ ~dMsgString_c();
};
struct JKRArchive {};
struct JUtility {
struct TColor {};
};
struct JKRArchive {};
struct dFile_warning_c {
/* 80191BAC */ dFile_warning_c(JKRArchive*, u8);
/* 80191C18 */ ~dFile_warning_c();
@@ -89,8 +89,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_file_d_file_sel_warning__stringBase0;
extern "C" void __ct__15dFile_warning_cFP10JKRArchiveUc();
extern "C" void __dt__15dFile_warning_cFv();
extern "C" void screenSet__15dFile_warning_cFv();
@@ -120,8 +118,6 @@ void mDoExt_getMesgFont();
void mDoExt_removeMesgFont();
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" void mDoExt_getMesgFont__Fv();
extern "C" void mDoExt_removeMesgFont__Fv();
@@ -260,7 +256,7 @@ SECTION_SDATA2 static void* data_804539E8 =
(void*)(((char*)&d_file_d_file_sel_warning__stringBase0) + 0x69);
/* 804539EC-804539F0 0004+00 s=2 e=0 z=0 None .sdata2 @3799 */
SECTION_SDATA2 static u32 lit_3799 = 0x45321000;
SECTION_SDATA2 static f32 lit_3799 = 2849.0f;
/* 80191CF4-80191F18 0224+00 s=1 e=0 z=0 None .text screenSet__15dFile_warning_cFv */
#pragma push
@@ -299,9 +295,7 @@ asm void dFile_warning_c::modeMove() {
/* ############################################################################################## */
/* 804539F0-804539F8 0008+00 s=3 e=0 z=0 None .sdata2 @3868 */
SECTION_SDATA2 static u8 lit_3868[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3868 = 4503601774854144.0 /* cast s32 to float */;
/* 80191FD4-801920B8 00E4+00 s=1 e=0 z=0 None .text baseMoveAnm__15dFile_warning_cFv */
#pragma push
src/d/file/d_file_select.cpp
+38 -76
View File
@@ -93,10 +93,10 @@ struct dSelect_cursor_c {
/* 801952A0 */ void setAlphaRate(f32);
};
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,6 +110,8 @@ struct dName_c {
/* 80250560 */ void _draw();
};
struct COutFont_c {};
struct JUtility {
struct TColor {};
};
@@ -123,8 +125,6 @@ struct J2DTextBox {
struct JUTFont {};
struct COutFont_c {};
struct dMsgString_c {
/* 80191B6C */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
/* 80249C20 */ dMsgString_c();
@@ -530,14 +530,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_file_d_file_select__stringBase0;
extern "C" extern void* lit_7799[3];
extern "C" extern void* lit_7801[3];
extern "C" extern void* lit_7803[3];
extern "C" extern void* lit_7808[3];
extern "C" extern void* __vt__15J2DAnmTransform[5 + 4 /* padding */];
extern "C" extern void* __vt__10JUTNameTab[3];
extern "C" void __ct__9dFs_HIO_cFv();
extern "C" void __ct__14dFile_select_cFP10JKRArchive();
extern "C" void __dt__14dFile_select_cFv();
@@ -763,30 +755,6 @@ void dPaneClass_showNullPane(J2DScreen*);
void cAPICPad_ANY_BUTTON(u32);
void* operator new(u32);
void operator delete(void*);
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */];
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__10J2DAnmBase[4];
extern "C" extern void* __vt__15J2DAnmTevRegKey[4];
extern "C" extern void* __vt__19J2DAnmTextureSRTKey[4];
extern "C" extern void* __vt__11J2DAnmColor[5];
extern "C" extern void* __vt__8J3DModel[9];
extern "C" extern void* __vt__14J3DMaterialAnm[4];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_mDoMemCd_control[8192];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern f32 Zero__4cXyz[3];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 mFadeColor__13mDoGph_gInf_c[4];
extern "C" extern u32 g_blackColor;
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */];
extern "C" extern u8 sManager__10JFWDisplay[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
SECTION_INIT void memcpy();
extern "C" void mDoMtx_XYZrotM__FPA4_fsss();
@@ -2076,7 +2044,7 @@ SECTION_DATA static void* __vt__9dFs_HIO_c[3 + 1 /* padding */] = {
};
/* 80453928-8045392C 0004+00 s=1 e=0 z=0 None .sdata2 @3812 */
SECTION_SDATA2 static u32 lit_3812 = 0x3F8E147B;
SECTION_SDATA2 static f32 lit_3812 = 111.0f / 100.0f;
/* 801835F8-8018366C 0074+00 s=1 e=0 z=0 None .text __ct__9dFs_HIO_cFv */
#pragma push
@@ -2156,7 +2124,7 @@ static u8 lit_3807[12];
static u8 g_fsHIO[36];
/* 8045392C-80453930 0004+00 s=1 e=0 z=0 None .sdata2 @4165 */
SECTION_SDATA2 static u32 lit_4165 = 0x3F666666;
SECTION_SDATA2 static f32 lit_4165 = 9.0f / 10.0f;
/* 80453930-80453938 0004+04 s=5 e=0 z=0 None .sdata2 @4166 */
SECTION_SDATA2 static f32 lit_4166[1 + 1 /* padding */] = {
@@ -2187,9 +2155,7 @@ asm void dFile_select_c::_move() {
/* ############################################################################################## */
/* 80453938-80453940 0008+00 s=34 e=0 z=0 None .sdata2 @4342 */
SECTION_SDATA2 static u8 lit_4342[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4342 = 4503601774854144.0 /* cast s32 to float */;
/* 80184664-801848A0 023C+00 s=1 e=0 z=0 None .text selFileWakuAnm__14dFile_select_cFv */
#pragma push
@@ -2275,10 +2241,10 @@ asm void dFile_select_c::selectDataBaseMoveAnm() {
/* ############################################################################################## */
/* 80453940-80453944 0004+00 s=38 e=0 z=0 None .sdata2 @4611 */
SECTION_SDATA2 static u32 lit_4611 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4611 = 1.0f;
/* 80453944-80453948 0004+00 s=19 e=0 z=0 None .sdata2 @4612 */
SECTION_SDATA2 static u32 lit_4612 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4612 = -1.0f;
/* 80184E38-80185040 0208+00 s=1 e=0 z=0 None .text dataSelectInAnmSet__14dFile_select_cFv */
#pragma push
@@ -2578,7 +2544,7 @@ asm void dFile_select_c::nameToDataSelectMove() {
/* ############################################################################################## */
/* 8045394C-80453950 0004+00 s=4 e=0 z=0 None .sdata2 @5472 */
SECTION_SDATA2 static u32 lit_5472 = 0x437F0000;
SECTION_SDATA2 static f32 lit_5472 = 255.0f;
/* 80453950-80453958 0004+04 s=4 e=0 z=0 None .sdata2 @5473 */
SECTION_SDATA2 static f32 lit_5473[1 + 1 /* padding */] = {
@@ -2588,9 +2554,7 @@ SECTION_SDATA2 static f32 lit_5473[1 + 1 /* padding */] = {
};
/* 80453958-80453960 0008+00 s=4 e=0 z=0 None .sdata2 @5475 */
SECTION_SDATA2 static u8 lit_5475[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5475 = 4503599627370496.0 /* cast u32 to float */;
/* 8018759C-801876A0 0104+00 s=1 e=0 z=0 None .text nameInputFade__14dFile_select_cFv */
#pragma push
@@ -2674,10 +2638,10 @@ asm void dFile_select_c::backSelectMove() {
/* ############################################################################################## */
/* 80453960-80453964 0004+00 s=1 e=0 z=0 None .sdata2 @5614 */
SECTION_SDATA2 static u32 lit_5614 = 0x42C60000;
SECTION_SDATA2 static f32 lit_5614 = 99.0f;
/* 80453964-80453968 0004+00 s=1 e=0 z=0 None .sdata2 @5615 */
SECTION_SDATA2 static u32 lit_5615 = 0x42DA0000;
SECTION_SDATA2 static f32 lit_5615 = 109.0f;
/* 80187BE8-80187DB8 01D0+00 s=6 e=0 z=0 None .text copySelMoveAnmInitSet__14dFile_select_cFii
*/
@@ -2841,13 +2805,13 @@ asm void dFile_select_c::yesnoSelectMoveAnm() {
/* ############################################################################################## */
/* 80453968-8045396C 0004+00 s=6 e=0 z=0 None .sdata2 @6069 */
SECTION_SDATA2 static u32 lit_6069 = 0x3F75C28F;
SECTION_SDATA2 static f32 lit_6069 = 24.0f / 25.0f;
/* 8045396C-80453970 0004+00 s=3 e=0 z=0 None .sdata2 @6070 */
SECTION_SDATA2 static u32 lit_6070 = 0x3F570A3D;
SECTION_SDATA2 static f32 lit_6070 = 21.0f / 25.0f;
/* 80453970-80453974 0004+00 s=3 e=0 z=0 None .sdata2 @6071 */
SECTION_SDATA2 static u32 lit_6071 = 0x3D75C28F;
SECTION_SDATA2 static f32 lit_6071 = 3.0f / 50.0f;
/* 8018912C-8018929C 0170+00 s=9 e=0 z=0 None .text yesnoCursorShow__14dFile_select_cFv */
#pragma push
@@ -3087,46 +3051,46 @@ void dFile_select_c::nextModeWait() {
/* ############################################################################################## */
/* 80453974-80453978 0004+00 s=1 e=0 z=0 None .sdata2 @6867 */
SECTION_SDATA2 static u32 lit_6867 = 0x41C00000;
SECTION_SDATA2 static f32 lit_6867 = 24.0f;
/* 80453978-8045397C 0004+00 s=1 e=0 z=0 None .sdata2 @6868 */
SECTION_SDATA2 static u32 lit_6868 = 0x41A00000;
SECTION_SDATA2 static f32 lit_6868 = 20.0f;
/* 8045397C-80453980 0004+00 s=1 e=0 z=0 None .sdata2 @6869 */
SECTION_SDATA2 static u32 lit_6869 = 0x43DC0000;
SECTION_SDATA2 static f32 lit_6869 = 440.0f;
/* 80453980-80453984 0004+00 s=1 e=0 z=0 None .sdata2 @6870 */
SECTION_SDATA2 static u32 lit_6870 = 0x43460000;
SECTION_SDATA2 static f32 lit_6870 = 198.0f;
/* 80453984-80453988 0004+00 s=1 e=0 z=0 None .sdata2 @6871 */
SECTION_SDATA2 static u32 lit_6871 = 0x41A80000;
SECTION_SDATA2 static f32 lit_6871 = 21.0f;
/* 80453988-8045398C 0004+00 s=3 e=0 z=0 None .sdata2 @6872 */
SECTION_SDATA2 static u32 lit_6872 = 0x3F70A3D7;
SECTION_SDATA2 static f32 lit_6872 = 47.0f / 50.0f;
/* 8045398C-80453990 0004+00 s=3 e=0 z=0 None .sdata2 @6873 */
SECTION_SDATA2 static u32 lit_6873 = 0x3CF5C28F;
SECTION_SDATA2 static f32 lit_6873 = 3.0f / 100.0f;
/* 80453990-80453994 0004+00 s=3 e=0 z=0 None .sdata2 @6874 */
SECTION_SDATA2 static u32 lit_6874 = 0x3F333333;
SECTION_SDATA2 static f32 lit_6874 = 7.0f / 10.0f;
/* 80453994-80453998 0004+00 s=1 e=0 z=0 None .sdata2 @6875 */
SECTION_SDATA2 static u32 lit_6875 = 0x436E0000;
SECTION_SDATA2 static f32 lit_6875 = 238.0f;
/* 80453998-8045399C 0004+00 s=1 e=0 z=0 None .sdata2 @6876 */
SECTION_SDATA2 static u32 lit_6876 = 0x422C0000;
SECTION_SDATA2 static f32 lit_6876 = 43.0f;
/* 8045399C-804539A0 0004+00 s=1 e=0 z=0 None .sdata2 @6877 */
SECTION_SDATA2 static u32 lit_6877 = 0x44320000;
SECTION_SDATA2 static f32 lit_6877 = 712.0f;
/* 804539A0-804539A4 0004+00 s=1 e=0 z=0 None .sdata2 @6878 */
SECTION_SDATA2 static u32 lit_6878 = 0x43020000;
SECTION_SDATA2 static f32 lit_6878 = 130.0f;
/* 804539A4-804539A8 0004+00 s=3 e=0 z=0 None .sdata2 @6879 */
SECTION_SDATA2 static u32 lit_6879 = 0x44180000;
SECTION_SDATA2 static f32 lit_6879 = 608.0f;
/* 804539A8-804539AC 0004+00 s=3 e=0 z=0 None .sdata2 @6880 */
SECTION_SDATA2 static u32 lit_6880 = 0x43E00000;
SECTION_SDATA2 static f32 lit_6880 = 448.0f;
/* 8018ADA0-8018BEE0 1140+00 s=1 e=0 z=0 None .text screenSet__14dFile_select_cFv */
#pragma push
@@ -3196,7 +3160,7 @@ SECTION_SDATA static u8 l_msgNum[3 + 1 /* padding */] = {
};
/* 804539AC-804539B0 0004+00 s=1 e=0 z=0 None .sdata2 @7146 */
SECTION_SDATA2 static u32 lit_7146 = 0x4447C000;
SECTION_SDATA2 static f32 lit_7146 = 799.0f;
/* 8018C8F4-8018CCD0 03DC+00 s=1 e=0 z=0 None .text screenSet3Menu__14dFile_select_cFv */
#pragma push
@@ -3220,7 +3184,7 @@ asm void dFile_select_c::screenSetDetail() {
/* ############################################################################################## */
/* 804539B0-804539B4 0004+00 s=1 e=0 z=0 None .sdata2 @7201 */
SECTION_SDATA2 static u32 lit_7201 = 0x453B8000;
SECTION_SDATA2 static f32 lit_7201 = 3000.0f;
/* 8018CE38-8018CF50 0118+00 s=2 e=0 z=0 None .text setWakuAnm__14dFile_select_cFv */
#pragma push
@@ -4045,7 +4009,7 @@ asm void dFile_select3D_c::freeHeap() {
/* ############################################################################################## */
/* 804539B4-804539B8 0004+00 s=1 e=0 z=0 None .sdata2 @8459 */
SECTION_SDATA2 static u32 lit_8459 = 0x44340000;
SECTION_SDATA2 static f32 lit_8459 = 720.0f;
/* 801904E4-801905A8 00C4+00 s=1 e=0 z=0 None .text _move__16dFile_select3D_cFv */
#pragma push
@@ -4079,7 +4043,7 @@ asm void dFile_select3D_c::setJ3D(char const* param_0, char const* param_1, char
/* ############################################################################################## */
/* 804539B8-804539BC 0004+00 s=1 e=0 z=0 None .sdata2 @8608 */
SECTION_SDATA2 static u32 lit_8608 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_8608 = 1.0f / 10.0f;
/* 8019095C-80190A14 00B8+00 s=2 e=0 z=0 None .text set_mtx__16dFile_select3D_cFv */
#pragma push
@@ -4133,7 +4097,7 @@ asm void dFile_select3D_c::createMirrorModel() {
/* ############################################################################################## */
/* 804539BC-804539C0 0004+00 s=1 e=0 z=0 None .sdata2 @8978 */
SECTION_SDATA2 static u32 lit_8978 = 0x40000000;
SECTION_SDATA2 static f32 lit_8978 = 2.0f;
/* 804539C0-804539C8 0004+04 s=1 e=0 z=0 None .sdata2 @8979 */
SECTION_SDATA2 static f32 lit_8979[1 + 1 /* padding */] = {
@@ -4143,12 +4107,10 @@ SECTION_SDATA2 static f32 lit_8979[1 + 1 /* padding */] = {
};
/* 804539C8-804539D0 0008+00 s=1 e=0 z=0 None .sdata2 @8980 */
SECTION_SDATA2 static u8 lit_8980[8] = {
0x3F, 0xD9, 0x21, 0xFB, 0x60, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_8980 = 0.39269909262657166;
/* 804539D0-804539D4 0004+00 s=1 e=0 z=0 None .sdata2 @8981 */
SECTION_SDATA2 static u32 lit_8981 = 0x3FADB6DB;
SECTION_SDATA2 static f32 lit_8981 = 19.0f / 14.0f;
/* 80190FE8-801910D4 00EC+00 s=1 e=0 z=0 None .text toItem3Dpos__16dFile_select3D_cFfffP4cXyz
*/
@@ -4163,7 +4125,7 @@ asm void dFile_select3D_c::toItem3Dpos(f32 param_0, f32 param_1, f32 param_2, cX
/* ############################################################################################## */
/* 804539D4-804539D8 0004+00 s=1 e=0 z=0 None .sdata2 @8993 */
SECTION_SDATA2 static u32 lit_8993 = 0xC47A0000;
SECTION_SDATA2 static f32 lit_8993 = -1000.0f;
/* 801910D4-80191130 005C+00 s=1 e=0 z=0 None .text calcViewMtx__16dFile_select3D_cFPA4_f */
#pragma push
src/d/kankyo/d_kankyo.cpp
+163 -193
View File
@@ -61,14 +61,6 @@ struct dStage_roomControl_c {
/* 8019F780 */ void GetTimePass();
};
struct dKy_tevstr_c {};
struct _GXColorS10 {};
struct J3DModelData {
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
};
struct Vec {};
struct cXyz {
@@ -78,6 +70,14 @@ struct cXyz {
/* 80266B84 */ void operator*(f32) const;
};
struct dKy_tevstr_c {};
struct J3DModelData {
/* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]);
};
struct _GXColorS10 {};
struct dScnKy_env_light_c {
/* 8019F2E8 */ dScnKy_env_light_c();
/* 8019F4FC */ void setDaytime();
@@ -396,11 +396,6 @@ void dKy_shadow_mode_reset(u8);
void dKy_shadow_mode_check(u8);
void dKy_bg_MAxx_proc(void*);
static void dKankyo_DayProc();
extern "C" extern char const* const d_kankyo_d_kankyo__stringBase0;
extern "C" extern void* g_profile_KANKYO[10];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_mEnvSeMgr[780];
extern "C" extern u8 struct_80451070[8];
extern "C" static void dKy_WolfPowerup_AmbCol__FP11_GXColorS10();
extern "C" static void dKy_sense_pat_get__Fv();
@@ -646,23 +641,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32);
void GFSetFog(_GXFogType, f32, f32, f32, f32, _GXColor);
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 u8 const j3dDefaultMtx[48];
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern u8 m_bloom__13mDoGph_gInf_c[20];
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 g_Counter[12 + 4 /* padding */];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
SECTION_INIT void memset();
SECTION_INIT void memcpy();
@@ -1024,61 +1002,61 @@ SECTION_DATA static void* lit_4364[16] = {
};
/* 80453BC0-80453BC4 0004+00 s=1 e=0 z=0 None .sdata2 @4345 */
SECTION_SDATA2 static u32 lit_4345 = 0x443B8000;
SECTION_SDATA2 static f32 lit_4345 = 750.0f;
/* 80453BC4-80453BC8 0004+00 s=1 e=0 z=0 None .sdata2 @4346 */
SECTION_SDATA2 static u32 lit_4346 = 0x44DAC000;
SECTION_SDATA2 static f32 lit_4346 = 1750.0f;
/* 80453BC8-80453BCC 0004+00 s=2 e=0 z=0 None .sdata2 @4347 */
SECTION_SDATA2 static u32 lit_4347 = 0x459C4000;
SECTION_SDATA2 static f32 lit_4347 = 5000.0f;
/* 80453BCC-80453BD0 0004+00 s=1 e=0 z=0 None .sdata2 @4348 */
SECTION_SDATA2 static u32 lit_4348 = 0x471C4000;
SECTION_SDATA2 static f32 lit_4348 = 40000.0f;
/* 80453BD0-80453BD4 0004+00 s=1 e=0 z=0 None .sdata2 @4349 */
SECTION_SDATA2 static u32 lit_4349 = 0x457A0000;
SECTION_SDATA2 static f32 lit_4349 = 4000.0f;
/* 80453BD4-80453BD8 0004+00 s=1 e=0 z=0 None .sdata2 @4350 */
SECTION_SDATA2 static u32 lit_4350 = 0x463B8000;
SECTION_SDATA2 static f32 lit_4350 = 12000.0f;
/* 80453BD8-80453BDC 0004+00 s=4 e=0 z=0 None .sdata2 @4351 */
SECTION_SDATA2 static u32 lit_4351 = 0x43FA0000;
SECTION_SDATA2 static f32 lit_4351 = 500.0f;
/* 80453BDC-80453BE0 0004+00 s=1 e=0 z=0 None .sdata2 @4352 */
SECTION_SDATA2 static u32 lit_4352 = 0x450CA000;
SECTION_SDATA2 static f32 lit_4352 = 2250.0f;
/* 80453BE0-80453BE4 0004+00 s=4 e=0 z=0 None .sdata2 @4353 */
SECTION_SDATA2 static u32 lit_4353 = 0x447A0000;
SECTION_SDATA2 static f32 lit_4353 = 1000.0f;
/* 80453BE4-80453BE8 0004+00 s=2 e=0 z=0 None .sdata2 @4354 */
SECTION_SDATA2 static u32 lit_4354 = 0x44E10000;
SECTION_SDATA2 static f32 lit_4354 = 1800.0f;
/* 80453BE8-80453BEC 0004+00 s=1 e=0 z=0 None .sdata2 @4355 */
SECTION_SDATA2 static u32 lit_4355 = 0x452BE000;
SECTION_SDATA2 static f32 lit_4355 = 2750.0f;
/* 80453BEC-80453BF0 0004+00 s=4 e=0 z=0 None .sdata2 @4356 */
SECTION_SDATA2 static u32 lit_4356 = 0x44FA0000;
SECTION_SDATA2 static f32 lit_4356 = 2000.0f;
/* 80453BF0-80453BF4 0004+00 s=2 e=0 z=0 None .sdata2 @4357 */
SECTION_SDATA2 static u32 lit_4357 = 0x453B8000;
SECTION_SDATA2 static f32 lit_4357 = 3000.0f;
/* 80453BF4-80453BF8 0004+00 s=4 e=0 z=0 None .sdata2 @4358 */
SECTION_SDATA2 static u32 lit_4358 = 0x43960000;
SECTION_SDATA2 static f32 lit_4358 = 300.0f;
/* 80453BF8-80453BFC 0004+00 s=1 e=0 z=0 None .sdata2 @4359 */
SECTION_SDATA2 static u32 lit_4359 = 0x442F0000;
SECTION_SDATA2 static f32 lit_4359 = 700.0f;
/* 80453BFC-80453C00 0004+00 s=4 e=0 z=0 None .sdata2 @4360 */
SECTION_SDATA2 static u32 lit_4360 = 0x44BB8000;
SECTION_SDATA2 static f32 lit_4360 = 1500.0f;
/* 80453C00-80453C04 0004+00 s=1 e=0 z=0 None .sdata2 @4361 */
SECTION_SDATA2 static u32 lit_4361 = 0x449C4000;
SECTION_SDATA2 static f32 lit_4361 = 1250.0f;
/* 80453C04-80453C08 0004+00 s=2 e=0 z=0 None .sdata2 @4362 */
SECTION_SDATA2 static u32 lit_4362 = 0x479C4000;
SECTION_SDATA2 static f32 lit_4362 = 80000.0f;
/* 80453C08-80453C0C 0004+00 s=1 e=0 z=0 None .sdata2 @4363 */
SECTION_SDATA2 static u32 lit_4363 = 0x45947000;
SECTION_SDATA2 static f32 lit_4363 = 4750.0f;
/* 8019CCDC-8019CE5C 0180+00 s=4 e=0 z=0 None .text dKy_WolfPowerup_FogNearFar__FPfPf */
#pragma push
@@ -1100,14 +1078,10 @@ SECTION_SDATA2 static u8 lit_4409[4] = {
};
/* 80453C10-80453C18 0008+00 s=12 e=0 z=0 None .sdata2 @4410 */
SECTION_SDATA2 static u8 lit_4410[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4410 = 0.5;
/* 80453C18-80453C20 0008+00 s=12 e=0 z=0 None .sdata2 @4411 */
SECTION_SDATA2 static u8 lit_4411[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4411 = 3.0;
/* 80453C20-80453C28 0008+00 s=12 e=0 z=0 None .sdata2 @4412 */
SECTION_SDATA2 static u8 lit_4412[8] = {
@@ -1132,15 +1106,13 @@ static u8 lit_4112[12];
u8 g_env_light[4880];
/* 80453C28-80453C2C 0004+00 s=1 e=0 z=0 None .sdata2 @4441 */
SECTION_SDATA2 static u32 lit_4441 = 0x3BB40000;
SECTION_SDATA2 static f32 lit_4441 = 0.0054931640625f;
/* 80453C2C-80453C30 0004+00 s=13 e=0 z=0 None .sdata2 @4442 */
SECTION_SDATA2 static u32 lit_4442 = 0x42B40000;
SECTION_SDATA2 static f32 lit_4442 = 90.0f;
/* 80453C30-80453C38 0008+00 s=25 e=0 z=0 None .sdata2 @4444 */
SECTION_SDATA2 static u8 lit_4444[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4444 = 4503601774854144.0 /* cast s32 to float */;
/* 8019CFE4-8019D1A0 01BC+00 s=4 e=0 z=0 None .text dKy_twi_wolflight_set__Fi */
#pragma push
@@ -1154,7 +1126,7 @@ asm static void dKy_twi_wolflight_set(int param_0) {
/* ############################################################################################## */
/* 80453C38-80453C3C 0004+00 s=1 e=0 z=0 None .sdata2 @4477 */
SECTION_SDATA2 static u32 lit_4477 = 0x42652EE0;
SECTION_SDATA2 static f32 lit_4477 = 57.2957763671875f;
/* 8019D1A0-8019D2C4 0124+00 s=3 e=0 z=0 None .text dKy_lightdir_set__FffP3Vec */
#pragma push
@@ -1179,31 +1151,31 @@ SECTION_DATA static void* lit_4511[7] = {
};
/* 80453C3C-80453C40 0004+00 s=1 e=0 z=0 None .sdata2 @4502 */
SECTION_SDATA2 static u32 lit_4502 = 0x40490FDB;
SECTION_SDATA2 static f32 lit_4502 = 3.1415927410125732f;
/* 80453C40-80453C44 0004+00 s=3 e=0 z=0 None .sdata2 @4503 */
SECTION_SDATA2 static u32 lit_4503 = 0x43340000;
SECTION_SDATA2 static f32 lit_4503 = 180.0f;
/* 80453C44-80453C48 0004+00 s=2 e=0 z=0 None .sdata2 @4504 */
SECTION_SDATA2 static u32 lit_4504 = 0xC47A0000;
SECTION_SDATA2 static f32 lit_4504 = -1000.0f;
/* 80453C48-80453C4C 0004+00 s=36 e=0 z=0 None .sdata2 @4505 */
SECTION_SDATA2 static u32 lit_4505 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4505 = 1.0f;
/* 80453C4C-80453C50 0004+00 s=6 e=0 z=0 None .sdata2 @4506 */
SECTION_SDATA2 static u32 lit_4506 = 0x40000000;
SECTION_SDATA2 static f32 lit_4506 = 2.0f;
/* 80453C50-80453C54 0004+00 s=6 e=0 z=0 None .sdata2 @4507 */
SECTION_SDATA2 static u32 lit_4507 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4507 = -1.0f;
/* 80453C54-80453C58 0004+00 s=1 e=0 z=0 None .sdata2 @4508 */
SECTION_SDATA2 static u32 lit_4508 = 0xC0800000;
SECTION_SDATA2 static f32 lit_4508 = -4.0f;
/* 80453C58-80453C5C 0004+00 s=2 e=0 z=0 None .sdata2 @4509 */
SECTION_SDATA2 static u32 lit_4509 = 0x40800000;
SECTION_SDATA2 static f32 lit_4509 = 4.0f;
/* 80453C5C-80453C60 0004+00 s=1 e=0 z=0 None .sdata2 @4510 */
SECTION_SDATA2 static u32 lit_4510 = 0xC0000000;
SECTION_SDATA2 static f32 lit_4510 = -2.0f;
/* 8019D2C4-8019D44C 0188+00 s=3 e=0 z=0 None .text dKy_GXInitLightSpot__FP12J3DLightInfofUc
*/
@@ -1218,7 +1190,7 @@ asm static void dKy_GXInitLightSpot(J3DLightInfo* param_0, f32 param_1, u8 param
/* ############################################################################################## */
/* 80453C60-80453C64 0004+00 s=8 e=0 z=0 None .sdata2 @4529 */
SECTION_SDATA2 static u32 lit_4529 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4529 = 0.5f;
/* 8019D44C-8019D520 00D4+00 s=2 e=0 z=0 None .text dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc
*/
@@ -1327,13 +1299,13 @@ asm void dKy_get_parcent(f32 param_0, f32 param_1, f32 param_2) {
/* ############################################################################################## */
/* 80453C64-80453C68 0004+00 s=4 e=0 z=0 None .sdata2 @4730 */
SECTION_SDATA2 static u32 lit_4730 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_4730 = 1.0f / 10.0f;
/* 80453C68-80453C6C 0004+00 s=9 e=0 z=0 None .sdata2 @4731 */
SECTION_SDATA2 static u32 lit_4731 = 0x3C23D70A;
SECTION_SDATA2 static f32 lit_4731 = 1.0f / 100.0f;
/* 80453C6C-80453C70 0004+00 s=8 e=0 z=0 None .sdata2 @4732 */
SECTION_SDATA2 static u32 lit_4732 = 0x437F0000;
SECTION_SDATA2 static f32 lit_4732 = 255.0f;
/* 8019D8CC-8019DD4C 0480+00 s=1 e=0 z=0 None .text dKy_FiveSenses_fullthrottle_dark_static1__Fv
*/
@@ -1358,10 +1330,10 @@ asm void dKy_FiveSenses_fullthrottle_dark() {
/* ############################################################################################## */
/* 80453C70-80453C74 0004+00 s=4 e=0 z=0 None .sdata2 @4850 */
SECTION_SDATA2 static u32 lit_4850 = 0x49742400;
SECTION_SDATA2 static f32 lit_4850 = 1000000.0f;
/* 80453C74-80453C78 0004+00 s=1 e=0 z=0 None .sdata2 @4851 */
SECTION_SDATA2 static u32 lit_4851 = 0x44480000;
SECTION_SDATA2 static f32 lit_4851 = 800.0f;
/* 80453C78-80453C80 0004+04 s=3 e=0 z=0 None .sdata2 @4852 */
SECTION_SDATA2 static f32 lit_4852[1 + 1 /* padding */] = {
@@ -1402,9 +1374,7 @@ asm static void dKy_light_influence_col(int param_0) {
/* ############################################################################################## */
/* 80453C80-80453C88 0008+00 s=14 e=0 z=0 None .sdata2 @4964 */
SECTION_SDATA2 static u8 lit_4964[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4964 = 4503599627370496.0 /* cast u32 to float */;
/* 8019E430-8019E520 00F0+00 s=4 e=3 z=0 None .text dKy_light_influence_col__FP8_GXColorf */
#pragma push
@@ -1448,7 +1418,7 @@ asm static void dKy_light_influence_distance(cXyz param_0, int param_1) {
/* ############################################################################################## */
/* 80453C88-80453C8C 0004+00 s=2 e=0 z=0 None .sdata2 @5077 */
SECTION_SDATA2 static u32 lit_5077 = 0x47C34FF3;
SECTION_SDATA2 static f32 lit_5077 = 99999.8984375f;
/* 8019E694-8019E708 0074+00 s=2 e=0 z=0 None .text plight_init__Fv */
#pragma push
@@ -1472,7 +1442,7 @@ asm static void darkmist_init() {
/* ############################################################################################## */
/* 80453C8C-80453C90 0004+00 s=6 e=0 z=0 None .sdata2 @5106 */
SECTION_SDATA2 static u32 lit_5106 = 0x43480000;
SECTION_SDATA2 static f32 lit_5106 = 200.0f;
/* 8019E734-8019E854 0120+00 s=1 e=0 z=0 None .text plight_set__Fv */
#pragma push
@@ -1512,16 +1482,16 @@ SECTION_DATA static u8 test_color_tbl[24] = {
};
/* 80453C90-80453C94 0004+00 s=5 e=0 z=0 None .sdata2 @5191 */
SECTION_SDATA2 static u32 lit_5191 = 0x3F7D70A4;
SECTION_SDATA2 static f32 lit_5191 = 99.0f / 100.0f;
/* 80453C94-80453C98 0004+00 s=9 e=0 z=0 None .sdata2 @5192 */
SECTION_SDATA2 static u32 lit_5192 = 0x42C80000;
SECTION_SDATA2 static f32 lit_5192 = 100.0f;
/* 80453C98-80453C9C 0004+00 s=1 e=0 z=0 None .sdata2 @5193 */
SECTION_SDATA2 static u32 lit_5193 = 0xC2B40000;
SECTION_SDATA2 static f32 lit_5193 = -90.0f;
/* 80453C9C-80453CA0 0004+00 s=3 e=0 z=0 None .sdata2 @5194 */
SECTION_SDATA2 static u32 lit_5194 = 0x3A83126F;
SECTION_SDATA2 static f32 lit_5194 = 0.0010000000474974513f;
/* 8019E874-8019EAA0 022C+00 s=1 e=0 z=0 None .text dungeonlight_init__Fv */
#pragma push
@@ -1555,22 +1525,22 @@ asm static void dKy_light_size_get(char const* param_0) {
/* ############################################################################################## */
/* 80453CA0-80453CA4 0004+00 s=2 e=0 z=0 None .sdata2 @5344 */
SECTION_SDATA2 static u32 lit_5344 = 0x3DE147AE;
SECTION_SDATA2 static f32 lit_5344 = 11.0f / 100.0f;
/* 80453CA4-80453CA8 0004+00 s=1 e=0 z=0 None .sdata2 @5345 */
SECTION_SDATA2 static u32 lit_5345 = 0xC37F0000;
SECTION_SDATA2 static f32 lit_5345 = -255.0f;
/* 80453CA8-80453CAC 0004+00 s=3 e=0 z=0 None .sdata2 @5346 */
SECTION_SDATA2 static u32 lit_5346 = 0x497423FE;
SECTION_SDATA2 static f32 lit_5346 = 999999.875f;
/* 80453CAC-80453CB0 0004+00 s=7 e=0 z=0 None .sdata2 @5347 */
SECTION_SDATA2 static u32 lit_5347 = 0x41700000;
SECTION_SDATA2 static f32 lit_5347 = 15.0f;
/* 80453CB0-80453CB4 0004+00 s=3 e=0 z=0 None .sdata2 @5348 */
SECTION_SDATA2 static u32 lit_5348 = 0x43B40000;
SECTION_SDATA2 static f32 lit_5348 = 360.0f;
/* 80453CB4-80453CB8 0004+00 s=1 e=0 z=0 None .sdata2 @5349 */
SECTION_SDATA2 static u32 lit_5349 = 0x3C449BA6;
SECTION_SDATA2 static f32 lit_5349 = 0.012000000104308128f;
/* 8019EC98-8019F264 05CC+00 s=1 e=0 z=0 None .text envcolor_init__Fv */
#pragma push
@@ -1584,7 +1554,7 @@ asm static void envcolor_init() {
/* ############################################################################################## */
/* 80453CB8-80453CBC 0004+00 s=3 e=0 z=0 None .sdata2 @5365 */
SECTION_SDATA2 static u32 lit_5365 = 0x42F00000;
SECTION_SDATA2 static f32 lit_5365 = 120.0f;
/* 8019F264-8019F2E8 0084+00 s=1 e=1 z=0 None .text dKy_clear_game_init__Fv */
#pragma push
@@ -1905,13 +1875,13 @@ LIGHT_INFLUENCE::LIGHT_INFLUENCE() {
/* ############################################################################################## */
/* 80453CBC-80453CC0 0004+00 s=5 e=0 z=0 None .sdata2 @5554 */
SECTION_SDATA2 static u32 lit_5554 = 0x42700000;
SECTION_SDATA2 static f32 lit_5554 = 60.0f;
/* 80453CC0-80453CC4 0004+00 s=3 e=0 z=0 None .sdata2 @5555 */
SECTION_SDATA2 static u32 lit_5555 = 0x43160000;
SECTION_SDATA2 static f32 lit_5555 = 150.0f;
/* 80453CC4-80453CC8 0004+00 s=1 e=0 z=0 None .sdata2 @5556 */
SECTION_SDATA2 static u32 lit_5556 = 0x43430000;
SECTION_SDATA2 static f32 lit_5556 = 195.0f;
/* 8019F4FC-8019F780 0284+00 s=1 e=0 z=0 None .text setDaytime__18dScnKy_env_light_cFv */
#pragma push
@@ -1935,22 +1905,22 @@ asm void dStage_roomControl_c::GetTimePass() {
/* ############################################################################################## */
/* 80453CC8-80453CCC 0004+00 s=2 e=0 z=0 None .sdata2 @5613 */
SECTION_SDATA2 static u32 lit_5613 = 0x43870000;
SECTION_SDATA2 static f32 lit_5613 = 270.0f;
/* 80453CCC-80453CD0 0004+00 s=1 e=0 z=0 None .sdata2 @5614 */
SECTION_SDATA2 static u32 lit_5614 = 0x42D20000;
SECTION_SDATA2 static f32 lit_5614 = 105.0f;
/* 80453CD0-80453CD4 0004+00 s=3 e=0 z=0 None .sdata2 @5615 */
SECTION_SDATA2 static u32 lit_5615 = 0x43E10000;
SECTION_SDATA2 static f32 lit_5615 = 450.0f;
/* 80453CD4-80453CD8 0004+00 s=1 e=0 z=0 None .sdata2 @5616 */
SECTION_SDATA2 static u32 lit_5616 = 0x43520000;
SECTION_SDATA2 static f32 lit_5616 = 210.0f;
/* 80453CD8-80453CDC 0004+00 s=1 e=0 z=0 None .sdata2 @5617 */
SECTION_SDATA2 static u32 lit_5617 = 0x3C8EFA35;
SECTION_SDATA2 static f32 lit_5617 = 0.01745329238474369f;
/* 80453CDC-80453CE0 0004+00 s=1 e=0 z=0 None .sdata2 @5618 */
SECTION_SDATA2 static u32 lit_5618 = 0xC73B8000;
SECTION_SDATA2 static f32 lit_5618 = -48000.0f;
/* 8019F788-8019FA08 0280+00 s=1 e=0 z=0 None .text setSunpos__18dScnKy_env_light_cFv */
#pragma push
@@ -2044,10 +2014,10 @@ asm void dScnKy_env_light_c::getDarkDaytime() {
/* ############################################################################################## */
/* 80453CE0-80453CE4 0004+00 s=1 e=0 z=0 None .sdata2 @5839 */
SECTION_SDATA2 static u32 lit_5839 = 0x3D088889;
SECTION_SDATA2 static f32 lit_5839 = 1.0f / 30.0f;
/* 80453CE4-80453CE8 0004+00 s=1 e=0 z=0 None .sdata2 @5840 */
SECTION_SDATA2 static u32 lit_5840 = 0x3D888889;
SECTION_SDATA2 static f32 lit_5840 = 1.0f / 15.0f;
/* 8019FBD4-801A0340 076C+00 s=5 e=0 z=0 None .text
* setLight_palno_get__18dScnKy_env_light_cFPUcPUcPUcPUcPUcPUcPUcPUcPfPiPiPfPUc */
@@ -2083,37 +2053,37 @@ asm static void dKy_calc_color_set(_GXColorS10* param_0, color_RGB_class* param_
static u8 struct_80451068[8];
/* 80453CE8-80453CEC 0004+00 s=3 e=0 z=0 None .sdata2 @6032 */
SECTION_SDATA2 static u32 lit_6032 = 0x47C35000;
SECTION_SDATA2 static f32 lit_6032 = 100000.0f;
/* 80453CEC-80453CF0 0004+00 s=5 e=0 z=0 None .sdata2 @6033 */
SECTION_SDATA2 static u32 lit_6033 = 0x3E800000;
SECTION_SDATA2 static f32 lit_6033 = 0.25f;
/* 80453CF0-80453CF4 0004+00 s=2 e=0 z=0 None .sdata2 @6034 */
SECTION_SDATA2 static u32 lit_6034 = 0x29E12E13;
SECTION_SDATA2 static f32 lit_6034 = 9.9999998245167e-14f;
/* 80453CF4-80453CF8 0004+00 s=4 e=0 z=0 None .sdata2 @6035 */
SECTION_SDATA2 static u32 lit_6035 = 0x3E4CCCCD;
SECTION_SDATA2 static f32 lit_6035 = 1.0f / 5.0f;
/* 80453CF8-80453CFC 0004+00 s=3 e=0 z=0 None .sdata2 @6036 */
SECTION_SDATA2 static u32 lit_6036 = 0x3F4CCCCD;
SECTION_SDATA2 static f32 lit_6036 = 4.0f / 5.0f;
/* 80453CFC-80453D00 0004+00 s=3 e=0 z=0 None .sdata2 @6037 */
SECTION_SDATA2 static u32 lit_6037 = 0x3ECCCCCD;
SECTION_SDATA2 static f32 lit_6037 = 2.0f / 5.0f;
/* 80453D00-80453D04 0004+00 s=2 e=0 z=0 None .sdata2 @6038 */
SECTION_SDATA2 static u32 lit_6038 = 0x3F266666;
SECTION_SDATA2 static f32 lit_6038 = 13.0f / 20.0f;
/* 80453D04-80453D08 0004+00 s=1 e=0 z=0 None .sdata2 @6039 */
SECTION_SDATA2 static u32 lit_6039 = 0x3F0CCCCD;
SECTION_SDATA2 static f32 lit_6039 = 11.0f / 20.0f;
/* 80453D08-80453D0C 0004+00 s=4 e=0 z=0 None .sdata2 @6040 */
SECTION_SDATA2 static u32 lit_6040 = 0x3D4CCCCD;
SECTION_SDATA2 static f32 lit_6040 = 1.0f / 20.0f;
/* 80453D0C-80453D10 0004+00 s=1 e=0 z=0 None .sdata2 @6041 */
SECTION_SDATA2 static u32 lit_6041 = 0x3BA3D70A;
SECTION_SDATA2 static f32 lit_6041 = 0.004999999888241291f;
/* 80453D10-80453D14 0004+00 s=9 e=0 z=0 None .sdata2 @6042 */
SECTION_SDATA2 static u32 lit_6042 = 0x358637BD;
SECTION_SDATA2 static f32 lit_6042 = 9.999999974752427e-07f;
/* 801A040C-801A133C 0F30+00 s=1 e=0 z=0 None .text setLight__18dScnKy_env_light_cFv */
#pragma push
@@ -2187,46 +2157,46 @@ asm static void cLib_addCalcU8(u8* param_0, u8 param_1, s16 param_2, s16 param_3
/* ############################################################################################## */
/* 80453D14-80453D18 0004+00 s=1 e=0 z=0 None .sdata2 @6761 */
SECTION_SDATA2 static u32 lit_6761 = 0x42200000;
SECTION_SDATA2 static f32 lit_6761 = 40.0f;
/* 80453D18-80453D1C 0004+00 s=1 e=0 z=0 None .sdata2 @6762 */
SECTION_SDATA2 static u32 lit_6762 = 0xC4480000;
SECTION_SDATA2 static f32 lit_6762 = -800.0f;
/* 80453D1C-80453D20 0004+00 s=1 e=0 z=0 None .sdata2 @6763 */
SECTION_SDATA2 static u32 lit_6763 = 0xC2F00000;
SECTION_SDATA2 static f32 lit_6763 = -120.0f;
/* 80453D20-80453D24 0004+00 s=2 e=0 z=0 None .sdata2 @6764 */
SECTION_SDATA2 static u32 lit_6764 = 0x42A00000;
SECTION_SDATA2 static f32 lit_6764 = 80.0f;
/* 80453D24-80453D28 0004+00 s=3 e=0 z=0 None .sdata2 @6765 */
SECTION_SDATA2 static u32 lit_6765 = 0x461C4000;
SECTION_SDATA2 static f32 lit_6765 = 10000.0f;
/* 80453D28-80453D2C 0004+00 s=3 e=0 z=0 None .sdata2 @6766 */
SECTION_SDATA2 static u32 lit_6766 = 0x41200000;
SECTION_SDATA2 static f32 lit_6766 = 10.0f;
/* 80453D2C-80453D30 0004+00 s=1 e=0 z=0 None .sdata2 @6767 */
SECTION_SDATA2 static u32 lit_6767 = 0xC1A00000;
SECTION_SDATA2 static f32 lit_6767 = -20.0f;
/* 80453D30-80453D34 0004+00 s=4 e=0 z=0 None .sdata2 @6768 */
SECTION_SDATA2 static u32 lit_6768 = 0x38D1B717;
SECTION_SDATA2 static f32 lit_6768 = 9.999999747378752e-05f;
/* 80453D34-80453D38 0004+00 s=3 e=0 z=0 None .sdata2 @6769 */
SECTION_SDATA2 static u32 lit_6769 = 0x3F400000;
SECTION_SDATA2 static f32 lit_6769 = 0.75f;
/* 80453D38-80453D3C 0004+00 s=1 e=0 z=0 None .sdata2 @6770 */
SECTION_SDATA2 static u32 lit_6770 = 0x3E570A3D;
SECTION_SDATA2 static f32 lit_6770 = 21.0f / 100.0f;
/* 80453D3C-80453D40 0004+00 s=1 e=0 z=0 None .sdata2 @6771 */
SECTION_SDATA2 static u32 lit_6771 = 0xC20C0000;
SECTION_SDATA2 static f32 lit_6771 = -35.0f;
/* 80453D40-80453D44 0004+00 s=2 e=0 z=0 None .sdata2 @6772 */
SECTION_SDATA2 static u32 lit_6772 = 0x3727C5AC;
SECTION_SDATA2 static f32 lit_6772 = 9.999999747378752e-06f;
/* 80453D44-80453D48 0004+00 s=1 e=0 z=0 None .sdata2 @6773 */
SECTION_SDATA2 static u32 lit_6773 = 0xC2C80000;
SECTION_SDATA2 static f32 lit_6773 = -100.0f;
/* 80453D48-80453D4C 0004+00 s=1 e=0 z=0 None .sdata2 @6774 */
SECTION_SDATA2 static u32 lit_6774 = 0x3D23D70A;
SECTION_SDATA2 static f32 lit_6774 = 1.0f / 25.0f;
/* 801A2128-801A37C4 169C+00 s=2 e=0 z=0 None .text
* settingTevStruct_plightcol_plus__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_c11_GXColorS1011_GXColorS10Uc
@@ -2253,55 +2223,55 @@ u8 g_mEnvSeMgr[780];
static u8 lightStatusData[1856];
/* 80453D4C-80453D50 0004+00 s=1 e=0 z=0 None .sdata2 @7011 */
SECTION_SDATA2 static u32 lit_7011 = 0x46EA6000;
SECTION_SDATA2 static f32 lit_7011 = 30000.0f;
/* 80453D50-80453D54 0004+00 s=3 e=0 z=0 None .sdata2 @7012 */
SECTION_SDATA2 static u32 lit_7012 = 0x3F7FFF58;
SECTION_SDATA2 static f32 lit_7012 = 0.9999899864196777f;
/* 80453D54-80453D58 0004+00 s=1 e=0 z=0 None .sdata2 @7013 */
SECTION_SDATA2 static u32 lit_7013 = 0xC3FA0000;
SECTION_SDATA2 static f32 lit_7013 = -500.0f;
/* 80453D58-80453D5C 0004+00 s=1 e=0 z=0 None .sdata2 @7014 */
SECTION_SDATA2 static u32 lit_7014 = 0xC6EA6000;
SECTION_SDATA2 static f32 lit_7014 = -30000.0f;
/* 80453D5C-80453D60 0004+00 s=1 e=0 z=0 None .sdata2 @7015 */
SECTION_SDATA2 static u32 lit_7015 = 0x4692E000;
SECTION_SDATA2 static f32 lit_7015 = 18800.0f;
/* 80453D60-80453D64 0004+00 s=1 e=0 z=0 None .sdata2 @7016 */
SECTION_SDATA2 static u32 lit_7016 = 0x46E29000;
SECTION_SDATA2 static f32 lit_7016 = 29000.0f;
/* 80453D64-80453D68 0004+00 s=1 e=0 z=0 None .sdata2 @7017 */
SECTION_SDATA2 static u32 lit_7017 = 0xC7108800;
SECTION_SDATA2 static f32 lit_7017 = -37000.0f;
/* 80453D68-80453D6C 0004+00 s=1 e=0 z=0 None .sdata2 @7018 */
SECTION_SDATA2 static u32 lit_7018 = 0x46610000;
SECTION_SDATA2 static f32 lit_7018 = 14400.0f;
/* 80453D6C-80453D70 0004+00 s=1 e=0 z=0 None .sdata2 @7019 */
SECTION_SDATA2 static u32 lit_7019 = 0x45EA6000;
SECTION_SDATA2 static f32 lit_7019 = 7500.0f;
/* 80453D70-80453D74 0004+00 s=1 e=0 z=0 None .sdata2 @7020 */
SECTION_SDATA2 static u32 lit_7020 = 0x4573C000;
SECTION_SDATA2 static f32 lit_7020 = 3900.0f;
/* 80453D74-80453D78 0004+00 s=1 e=0 z=0 None .sdata2 @7021 */
SECTION_SDATA2 static u32 lit_7021 = 0x468CA000;
SECTION_SDATA2 static f32 lit_7021 = 18000.0f;
/* 80453D78-80453D7C 0004+00 s=1 e=0 z=0 None .sdata2 @7022 */
SECTION_SDATA2 static u32 lit_7022 = 0xC5CB2000;
SECTION_SDATA2 static f32 lit_7022 = -6500.0f;
/* 80453D7C-80453D80 0004+00 s=1 e=0 z=0 None .sdata2 @7023 */
SECTION_SDATA2 static u32 lit_7023 = 0xC61C4000;
SECTION_SDATA2 static f32 lit_7023 = -10000.0f;
/* 80453D80-80453D84 0004+00 s=1 e=0 z=0 None .sdata2 @7024 */
SECTION_SDATA2 static u32 lit_7024 = 0x3E99999A;
SECTION_SDATA2 static f32 lit_7024 = 3.0f / 10.0f;
/* 80453D84-80453D88 0004+00 s=2 e=0 z=0 None .sdata2 @7025 */
SECTION_SDATA2 static u32 lit_7025 = 0x3F19999A;
SECTION_SDATA2 static f32 lit_7025 = 3.0f / 5.0f;
/* 80453D88-80453D8C 0004+00 s=2 e=0 z=0 None .sdata2 @7026 */
SECTION_SDATA2 static u32 lit_7026 = 0x3F666666;
SECTION_SDATA2 static f32 lit_7026 = 9.0f / 10.0f;
/* 80453D8C-80453D90 0004+00 s=2 e=0 z=0 None .sdata2 @7027 */
SECTION_SDATA2 static u32 lit_7027 = 0x3F99999A;
SECTION_SDATA2 static f32 lit_7027 = 6.0f / 5.0f;
/* 801A37C4-801A441C 0C58+00 s=2 e=14 z=515 None .text
* settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c */
@@ -2322,10 +2292,10 @@ void dScnKy_env_light_c::setLightTevColorType(J3DModelData* param_0, dKy_tevstr_
/* ############################################################################################## */
/* 80453D90-80453D94 0004+00 s=1 e=0 z=0 None .sdata2 @7186 */
SECTION_SDATA2 static u32 lit_7186 = 0x43390000;
SECTION_SDATA2 static f32 lit_7186 = 185.0f;
/* 80453D94-80453D98 0004+00 s=1 e=0 z=0 None .sdata2 @7187 */
SECTION_SDATA2 static u32 lit_7187 = 0x42BE0000;
SECTION_SDATA2 static f32 lit_7187 = 95.0f;
/* 801A4420-801A4C08 07E8+00 s=2 e=0 z=0 None .text
* setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci */
@@ -2417,10 +2387,10 @@ SECTION_SDATA static u16 lightMask[1 + 1 /* padding */] = {
SECTION_SDATA static void* lightStatusPt = (void*)&lightStatusData;
/* 80453D98-80453D9C 0004+00 s=1 e=0 z=0 None .sdata2 @7365 */
SECTION_SDATA2 static u32 lit_7365 = 0x42870000;
SECTION_SDATA2 static f32 lit_7365 = 67.5f;
/* 80453D9C-80453DA0 0004+00 s=1 e=0 z=0 None .sdata2 @7366 */
SECTION_SDATA2 static u32 lit_7366 = 0x43924000;
SECTION_SDATA2 static f32 lit_7366 = 292.5f;
/* 801A516C-801A5288 011C+00 s=1 e=0 z=0 None .text SetBaseLight__18dScnKy_env_light_cFv */
#pragma push
@@ -2466,10 +2436,10 @@ static u8 lit_7489[12];
static u8 S_old_camctr[12 + 4 /* padding */];
/* 80453DA0-80453DA4 0004+00 s=1 e=0 z=0 None .sdata2 @7608 */
SECTION_SDATA2 static u32 lit_7608 = 0x3BABB44E;
SECTION_SDATA2 static f32 lit_7608 = 0.005239999853074551f;
/* 80453DA4-80453DA8 0004+00 s=2 e=0 z=0 None .sdata2 @7609 */
SECTION_SDATA2 static u32 lit_7609 = 0x420C0000;
SECTION_SDATA2 static f32 lit_7609 = 35.0f;
/* 801A572C-801A5B6C 0440+00 s=0 e=1 z=0 None .text dKy_undwater_filter_draw__Fv */
#pragma push
@@ -2926,7 +2896,7 @@ asm void dKy_SordFlush_set(cXyz param_0, int param_1) {
/* ############################################################################################## */
/* 80453DA8-80453DAC 0004+00 s=3 e=0 z=0 None .sdata2 @8647 */
SECTION_SDATA2 static u32 lit_8647 = 0x481C4000;
SECTION_SDATA2 static f32 lit_8647 = 160000.0f;
/* 801A8538-801A85E8 00B0+00 s=1 e=0 z=0 None .text GxFogSet_Sub__FP8_GXColor */
#pragma push
@@ -3170,25 +3140,25 @@ asm static void NewAmbColGet(_GXColorS10* param_0) {
/* ############################################################################################## */
/* 80453DAC-80453DB0 0004+00 s=1 e=0 z=0 None .sdata2 @8975 */
SECTION_SDATA2 static u32 lit_8975 = 0x42480000;
SECTION_SDATA2 static f32 lit_8975 = 50.0f;
/* 80453DB0-80453DB4 0004+00 s=2 e=0 z=0 None .sdata2 @9254 */
SECTION_SDATA2 static u32 lit_9254 = 0x438E8000;
SECTION_SDATA2 static f32 lit_9254 = 285.0f;
/* 80453DB4-80453DB8 0004+00 s=1 e=0 z=0 None .sdata2 @9255 */
SECTION_SDATA2 static u32 lit_9255 = 0x41880000;
SECTION_SDATA2 static f32 lit_9255 = 17.0f;
/* 80453DB8-80453DBC 0004+00 s=1 e=0 z=0 None .sdata2 @9256 */
SECTION_SDATA2 static u32 lit_9256 = 0x41A00000;
SECTION_SDATA2 static f32 lit_9256 = 20.0f;
/* 80453DBC-80453DC0 0004+00 s=1 e=0 z=0 None .sdata2 @9257 */
SECTION_SDATA2 static u32 lit_9257 = 0x433E0000;
SECTION_SDATA2 static f32 lit_9257 = 190.0f;
/* 80453DC0-80453DC4 0004+00 s=1 e=0 z=0 None .sdata2 @9258 */
SECTION_SDATA2 static u32 lit_9258 = 0x4CBEBC20;
SECTION_SDATA2 static f32 lit_9258 = 100000000.0f;
/* 80453DC4-80453DC8 0004+00 s=1 e=0 z=0 None .sdata2 @9259 */
SECTION_SDATA2 static u32 lit_9259 = 0x40A00000;
SECTION_SDATA2 static f32 lit_9259 = 5.0f;
/* 801A8E20-801A9BE4 0DC4+00 s=2 e=0 z=0 None .text
* dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf */
@@ -3254,10 +3224,10 @@ asm void dKy_BossSpotLight_set(cXyz* param_0, f32 param_1, f32 param_2, f32 para
/* ############################################################################################## */
/* 80453DC8-80453DCC 0004+00 s=1 e=0 z=0 None .sdata2 @9676 */
SECTION_SDATA2 static u32 lit_9676 = 0x43AF0000;
SECTION_SDATA2 static f32 lit_9676 = 350.0f;
/* 80453DCC-80453DD0 0004+00 s=2 e=0 z=0 None .sdata2 @9677 */
SECTION_SDATA2 static u32 lit_9677 = 0x3FC00000;
SECTION_SDATA2 static f32 lit_9677 = 1.5f;
/* 801AAC5C-801AAD50 00F4+00 s=0 e=1 z=0 None .text
* dKy_WolfEyeLight_set__FP4cXyzfffP8_GXColorfUcUc */
@@ -3273,25 +3243,25 @@ asm void dKy_WolfEyeLight_set(cXyz* param_0, f32 param_1, f32 param_2, f32 param
/* ############################################################################################## */
/* 80453DD0-80453DD4 0004+00 s=3 e=0 z=0 None .sdata2 @9722 */
SECTION_SDATA2 static u32 lit_9722 = 0x44160000;
SECTION_SDATA2 static f32 lit_9722 = 600.0f;
/* 80453DD4-80453DD8 0004+00 s=1 e=0 z=0 None .sdata2 @9723 */
SECTION_SDATA2 static u32 lit_9723 = 0x3F880000;
SECTION_SDATA2 static f32 lit_9723 = 1.0625f;
/* 80453DD8-80453DDC 0004+00 s=1 e=0 z=0 None .sdata2 @9724 */
SECTION_SDATA2 static u32 lit_9724 = 0x3FD9999A;
SECTION_SDATA2 static f32 lit_9724 = 17.0f / 10.0f;
/* 80453DDC-80453DE0 0004+00 s=1 e=0 z=0 None .sdata2 @9725 */
SECTION_SDATA2 static u32 lit_9725 = 0x428C0000;
SECTION_SDATA2 static f32 lit_9725 = 70.0f;
/* 80453DE0-80453DE4 0004+00 s=1 e=0 z=0 None .sdata2 @9726 */
SECTION_SDATA2 static u32 lit_9726 = 0x40233334;
SECTION_SDATA2 static f32 lit_9726 = 2.5500001907348633f;
/* 80453DE4-80453DE8 0004+00 s=1 e=0 z=0 None .sdata2 @9727 */
SECTION_SDATA2 static u32 lit_9727 = 0x4059999A;
SECTION_SDATA2 static f32 lit_9727 = 17.0f / 5.0f;
/* 80453DE8-80453DEC 0004+00 s=1 e=0 z=0 None .sdata2 @9728 */
SECTION_SDATA2 static u32 lit_9728 = 0x42820000;
SECTION_SDATA2 static f32 lit_9728 = 65.0f;
/* 801AAD50-801AB01C 02CC+00 s=1 e=0 z=0 None .text dKy_twilight_camelight_set__Fv */
#pragma push
@@ -3305,13 +3275,13 @@ asm static void dKy_twilight_camelight_set() {
/* ############################################################################################## */
/* 80453DEC-80453DF0 0004+00 s=1 e=0 z=0 None .sdata2 @9779 */
SECTION_SDATA2 static u32 lit_9779 = 0x40E73334;
SECTION_SDATA2 static f32 lit_9779 = 7.225000381469727f;
/* 80453DF0-80453DF4 0004+00 s=1 e=0 z=0 None .sdata2 @9780 */
SECTION_SDATA2 static u32 lit_9780 = 0x41E00000;
SECTION_SDATA2 static f32 lit_9780 = 28.0f;
/* 80453DF4-80453DF8 0004+00 s=1 e=0 z=0 None .sdata2 @9781 */
SECTION_SDATA2 static u32 lit_9781 = 0x3FA00000;
SECTION_SDATA2 static f32 lit_9781 = 1.25f;
/* 801AB01C-801AB270 0254+00 s=1 e=0 z=0 None .text dKy_WaterIn_Light_set__Fv */
#pragma push
@@ -3520,10 +3490,10 @@ bool dKy_withwarp_capture_check() {
/* ############################################################################################## */
/* 80453DF8-80453DFC 0004+00 s=1 e=0 z=0 None .sdata2 @10273 */
SECTION_SDATA2 static u32 lit_10273 = 0x43C80000;
SECTION_SDATA2 static f32 lit_10273 = 400.0f;
/* 80453DFC-80453E00 0004+00 s=1 e=0 z=0 None .sdata2 @10274 */
SECTION_SDATA2 static u32 lit_10274 = 0x44180000;
SECTION_SDATA2 static f32 lit_10274 = 608.0f;
/* 801AC2E8-801AC57C 0294+00 s=0 e=1 z=0 None .text dKy_depth_dist_set__FPv */
#pragma push
@@ -3587,16 +3557,16 @@ asm void dKy_darkworld_Area_set(char const* param_0, int param_1) {
/* ############################################################################################## */
/* 80453E00-80453E04 0004+00 s=1 e=0 z=0 None .sdata2 @10483 */
SECTION_SDATA2 static u32 lit_10483 = 0x42100000;
SECTION_SDATA2 static f32 lit_10483 = 36.0f;
/* 80453E04-80453E08 0004+00 s=1 e=0 z=0 None .sdata2 @10484 */
SECTION_SDATA2 static u32 lit_10484 = 0x41E80000;
SECTION_SDATA2 static f32 lit_10484 = 29.0f;
/* 80453E08-80453E0C 0004+00 s=1 e=0 z=0 None .sdata2 @10485 */
SECTION_SDATA2 static u32 lit_10485 = 0x44C1C000;
SECTION_SDATA2 static f32 lit_10485 = 1550.0f;
/* 80453E0C-80453E10 0004+00 s=1 e=0 z=0 None .sdata2 @10486 */
SECTION_SDATA2 static u32 lit_10486 = 0x430C0000;
SECTION_SDATA2 static f32 lit_10486 = 140.0f;
/* 801AC918-801ACCDC 03C4+00 s=1 e=0 z=0 None .text dKy_murky_set__FP11J3DMaterial */
#pragma push
@@ -3656,52 +3626,52 @@ SECTION_SDATA static u8 l_alphaCompInfo[8] = {
};
/* 80453E10-80453E14 0004+00 s=1 e=0 z=0 None .sdata2 @10916 */
SECTION_SDATA2 static u32 lit_10916 = 0x43750000;
SECTION_SDATA2 static f32 lit_10916 = 245.0f;
/* 80453E14-80453E18 0004+00 s=1 e=0 z=0 None .sdata2 @10917 */
SECTION_SDATA2 static u32 lit_10917 = 0x42340000;
SECTION_SDATA2 static f32 lit_10917 = 45.0f;
/* 80453E18-80453E1C 0004+00 s=1 e=0 z=0 None .sdata2 @10918 */
SECTION_SDATA2 static u32 lit_10918 = 0xBC23D70A;
SECTION_SDATA2 static f32 lit_10918 = -1.0f / 100.0f;
/* 80453E1C-80453E20 0004+00 s=1 e=0 z=0 None .sdata2 @10919 */
SECTION_SDATA2 static u32 lit_10919 = 0x3EFAE148;
SECTION_SDATA2 static f32 lit_10919 = 49.0f / 100.0f;
/* 80453E20-80453E24 0004+00 s=1 e=0 z=0 None .sdata2 @10920 */
SECTION_SDATA2 static u32 lit_10920 = 0xBEFAE148;
SECTION_SDATA2 static f32 lit_10920 = -49.0f / 100.0f;
/* 80453E24-80453E28 0004+00 s=1 e=0 z=0 None .sdata2 @10921 */
SECTION_SDATA2 static u32 lit_10921 = 0x40333333;
SECTION_SDATA2 static f32 lit_10921 = 14.0f / 5.0f;
/* 80453E28-80453E2C 0004+00 s=1 e=0 z=0 None .sdata2 @10922 */
SECTION_SDATA2 static u32 lit_10922 = 0x432A0000;
SECTION_SDATA2 static f32 lit_10922 = 170.0f;
/* 80453E2C-80453E30 0004+00 s=1 e=0 z=0 None .sdata2 @10923 */
SECTION_SDATA2 static u32 lit_10923 = 0xC666C800;
SECTION_SDATA2 static f32 lit_10923 = -14770.0f;
/* 80453E30-80453E34 0004+00 s=1 e=0 z=0 None .sdata2 @10924 */
SECTION_SDATA2 static u32 lit_10924 = 0xC663A800;
SECTION_SDATA2 static f32 lit_10924 = -14570.0f;
/* 80453E34-80453E38 0004+00 s=1 e=0 z=0 None .sdata2 @10925 */
SECTION_SDATA2 static u32 lit_10925 = 0xC5B6E800;
SECTION_SDATA2 static f32 lit_10925 = -5853.0f;
/* 80453E38-80453E3C 0004+00 s=1 e=0 z=0 None .sdata2 @10926 */
SECTION_SDATA2 static u32 lit_10926 = 0xC45BC000;
SECTION_SDATA2 static f32 lit_10926 = -879.0f;
/* 80453E3C-80453E40 0004+00 s=1 e=0 z=0 None .sdata2 @10927 */
SECTION_SDATA2 static u32 lit_10927 = 0xBE4CCCCD;
SECTION_SDATA2 static f32 lit_10927 = -1.0f / 5.0f;
/* 80453E40-80453E44 0004+00 s=1 e=0 z=0 None .sdata2 @10928 */
SECTION_SDATA2 static u32 lit_10928 = 0x458CA000;
SECTION_SDATA2 static f32 lit_10928 = 4500.0f;
/* 80453E44-80453E48 0004+00 s=1 e=0 z=0 None .sdata2 @10929 */
SECTION_SDATA2 static u32 lit_10929 = 0x42960000;
SECTION_SDATA2 static f32 lit_10929 = 75.0f;
/* 80453E48-80453E4C 0004+00 s=1 e=0 z=0 None .sdata2 @10930 */
SECTION_SDATA2 static u32 lit_10930 = 0xBF4F5C29;
SECTION_SDATA2 static f32 lit_10930 = -81.0f / 100.0f;
/* 80453E4C-80453E50 0004+00 s=1 e=0 z=0 None .sdata2 @10931 */
SECTION_SDATA2 static u32 lit_10931 = 0x3F153F7D;
SECTION_SDATA2 static f32 lit_10931 = 0.5830000042915344f;
/* 80453E50-80453E58 0004+04 s=1 e=0 z=0 None .sdata2 @10932 */
SECTION_SDATA2 static f32 lit_10932[1 + 1 /* padding */] = {
src/d/kankyo/d_kankyo_data.cpp
-3
View File
@@ -23,7 +23,6 @@ void dKyd_darkworld_tbl_getp();
void dKyd_light_size_tbl_getp();
void dKyd_light_tw_size_tbl_getp();
void dKyd_BloomInf_tbl_getp(int);
extern "C" extern char const* const d_kankyo_d_kankyo_data__stringBase0;
extern "C" void dKyd_dmpalet_getp__Fv();
extern "C" void dKyd_dmpselect_getp__Fv();
@@ -45,8 +44,6 @@ extern "C" extern char const* const d_kankyo_d_kankyo_data__stringBase0;
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_env_light[4880];
//
// Declarations:
//
src/d/kankyo/d_kankyo_rain.cpp
+270 -300
View File
File diff suppressed because it is too large Load Diff
src/d/kankyo/d_kankyo_wether.cpp
+45 -65
View File
@@ -27,8 +27,6 @@ struct dRes_control_c {
struct dPa_levelEcallBack {};
struct csXyz {};
struct Vec {};
struct cXyz {
@@ -40,10 +38,12 @@ struct cXyz {
/* 8026706C */ bool operator!=(Vec const&) const;
};
struct dKy_tevstr_c {};
struct csXyz {};
struct _GXColor {};
struct dKy_tevstr_c {};
struct dPa_control_c {
/* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*,
u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*,
@@ -253,9 +253,6 @@ void dKyw_custom_windpower(f32);
void dKyw_evt_wind_set(s16, s16);
void dKyw_evt_wind_set_go();
void dKyw_rain_set(int);
extern "C" extern char const* const d_kankyo_d_kankyo_wether__stringBase0;
extern "C" extern void* __vt__19dKankyo_star_Packet[5];
extern "C" extern void* __vt__19dKankyo_snow_Packet[5];
extern "C" static void dKyw_setDrawPacketList__FP9J3DPacketi();
extern "C" static void dKyw_setDrawPacketListIndScreen__FP9J3DPacketi();
@@ -419,17 +416,6 @@ void cM_atan2s(f32, f32);
void cLib_addCalc(f32*, f32, f32, f32, f32);
void* operator new(u32, int);
void operator delete(void*);
extern "C" extern void* __vt__9J3DPacket[5];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 g_mEnvSeMgr[780];
extern "C" extern f32 Zero__4cXyz[3];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 data_80450EE0[8];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void __dt__4cXyzFv();
extern "C" void __ct__4cXyzFv();
@@ -1105,7 +1091,7 @@ SECTION_SDATA2 static u8 lit_4378[4] = {
};
/* 804520E4-804520E8 0004+00 s=11 e=0 z=0 None .sdata2 @4379 */
SECTION_SDATA2 static u32 lit_4379 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4379 = 1.0f;
/* 800574E0-800579EC 050C+00 s=0 e=1 z=0 None .text dKyw_wether_init__Fv */
#pragma push
@@ -1389,10 +1375,10 @@ asm void dKyw_wether_move() {
/* ############################################################################################## */
/* 804520E8-804520EC 0004+00 s=1 e=0 z=0 None .sdata2 @4610 */
SECTION_SDATA2 static u32 lit_4610 = 0x437F0000;
SECTION_SDATA2 static f32 lit_4610 = 255.0f;
/* 804520EC-804520F0 0004+00 s=1 e=0 z=0 None .sdata2 @4611 */
SECTION_SDATA2 static u32 lit_4611 = 0x4E6E6B28;
SECTION_SDATA2 static f32 lit_4611 = 1000000000.0f;
/* 80058318-80058894 057C+00 s=1 e=0 z=0 None .text wether_move_sun__Fv */
#pragma push
@@ -1406,15 +1392,13 @@ asm static void wether_move_sun() {
/* ############################################################################################## */
/* 804520F0-804520F4 0004+00 s=2 e=0 z=0 None .sdata2 @4668 */
SECTION_SDATA2 static u32 lit_4668 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4668 = -1.0f;
/* 804520F4-804520F8 0004+00 s=1 e=0 z=0 None .sdata2 @4669 */
SECTION_SDATA2 static u32 lit_4669 = 0x42FA0000;
SECTION_SDATA2 static f32 lit_4669 = 125.0f;
/* 804520F8-80452100 0008+00 s=2 e=0 z=0 None .sdata2 @4671 */
SECTION_SDATA2 static u8 lit_4671[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4671 = 4503601774854144.0 /* cast s32 to float */;
/* 80058894-80058B00 026C+00 s=1 e=0 z=0 None .text wether_move_rain__Fv */
#pragma push
@@ -1438,40 +1422,40 @@ asm static void wether_move_snow() {
/* ############################################################################################## */
/* 80452100-80452104 0004+00 s=1 e=0 z=0 None .sdata2 @4761 */
SECTION_SDATA2 static u32 lit_4761 = 0x43A50000;
SECTION_SDATA2 static f32 lit_4761 = 330.0f;
/* 80452104-80452108 0004+00 s=1 e=0 z=0 None .sdata2 @4762 */
SECTION_SDATA2 static u32 lit_4762 = 0x42340000;
SECTION_SDATA2 static f32 lit_4762 = 45.0f;
/* 80452108-8045210C 0004+00 s=1 e=0 z=0 None .sdata2 @4763 */
SECTION_SDATA2 static u32 lit_4763 = 0x438E8000;
SECTION_SDATA2 static f32 lit_4763 = 285.0f;
/* 8045210C-80452110 0004+00 s=1 e=0 z=0 None .sdata2 @4764 */
SECTION_SDATA2 static u32 lit_4764 = 0x3CB60B61;
SECTION_SDATA2 static f32 lit_4764 = 1.0f / 45.0f;
/* 80452110-80452114 0004+00 s=2 e=0 z=0 None .sdata2 @4765 */
SECTION_SDATA2 static u32 lit_4765 = 0x42960000;
SECTION_SDATA2 static f32 lit_4765 = 75.0f;
/* 80452114-80452118 0004+00 s=1 e=0 z=0 None .sdata2 @4766 */
SECTION_SDATA2 static u32 lit_4766 = 0x3D088889;
SECTION_SDATA2 static f32 lit_4766 = 1.0f / 30.0f;
/* 80452118-8045211C 0004+00 s=2 e=0 z=0 None .sdata2 @4767 */
SECTION_SDATA2 static u32 lit_4767 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4767 = 0.5f;
/* 8045211C-80452120 0004+00 s=2 e=0 z=0 None .sdata2 @4768 */
SECTION_SDATA2 static u32 lit_4768 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_4768 = 1.0f / 10.0f;
/* 80452120-80452124 0004+00 s=3 e=0 z=0 None .sdata2 @4769 */
SECTION_SDATA2 static u32 lit_4769 = 0x3C23D70A;
SECTION_SDATA2 static f32 lit_4769 = 1.0f / 100.0f;
/* 80452124-80452128 0004+00 s=2 e=0 z=0 None .sdata2 @4770 */
SECTION_SDATA2 static u32 lit_4770 = 0x358637BD;
SECTION_SDATA2 static f32 lit_4770 = 9.999999974752427e-07f;
/* 80452128-8045212C 0004+00 s=1 e=0 z=0 None .sdata2 @4771 */
SECTION_SDATA2 static u32 lit_4771 = 0x44960000;
SECTION_SDATA2 static f32 lit_4771 = 1200.0f;
/* 8045212C-80452130 0004+00 s=1 e=0 z=0 None .sdata2 @4772 */
SECTION_SDATA2 static u32 lit_4772 = 0x43FA0000;
SECTION_SDATA2 static f32 lit_4772 = 500.0f;
/* 80058B8C-80058F18 038C+00 s=1 e=0 z=0 None .text wether_move_star__Fv */
#pragma push
@@ -1521,43 +1505,43 @@ static u8 lit_4965[12];
static u8 r09o[12];
/* 80452130-80452134 0004+00 s=1 e=0 z=0 None .sdata2 @5181 */
SECTION_SDATA2 static u32 lit_5181 = 0xC82FC800;
SECTION_SDATA2 static f32 lit_5181 = -180000.0f;
/* 80452134-80452138 0004+00 s=1 e=0 z=0 None .sdata2 @5182 */
SECTION_SDATA2 static u32 lit_5182 = 0x443B8000;
SECTION_SDATA2 static f32 lit_5182 = 750.0f;
/* 80452138-8045213C 0004+00 s=1 e=0 z=0 None .sdata2 @5183 */
SECTION_SDATA2 static u32 lit_5183 = 0xC8435000;
SECTION_SDATA2 static f32 lit_5183 = -200000.0f;
/* 8045213C-80452140 0004+00 s=1 e=0 z=0 None .sdata2 @5184 */
SECTION_SDATA2 static u32 lit_5184 = 0x3B449BA6;
SECTION_SDATA2 static f32 lit_5184 = 0.003000000026077032f;
/* 80452140-80452144 0004+00 s=1 e=0 z=0 None .sdata2 @5185 */
SECTION_SDATA2 static u32 lit_5185 = 0x33D6BF95;
SECTION_SDATA2 static f32 lit_5185 = 1.0000000116860974e-07f;
/* 80452144-80452148 0004+00 s=1 e=0 z=0 None .sdata2 @5186 */
SECTION_SDATA2 static u32 lit_5186 = 0x3DA3D70A;
SECTION_SDATA2 static f32 lit_5186 = 2.0f / 25.0f;
/* 80452148-8045214C 0004+00 s=1 e=0 z=0 None .sdata2 @5187 */
SECTION_SDATA2 static u32 lit_5187 = 0x3B03126F;
SECTION_SDATA2 static f32 lit_5187 = 0.0020000000949949026f;
/* 8045214C-80452150 0004+00 s=1 e=0 z=0 None .sdata2 @5188 */
SECTION_SDATA2 static u32 lit_5188 = 0x322BCC77;
SECTION_SDATA2 static f32 lit_5188 = 9.99999993922529e-09f;
/* 80452150-80452154 0004+00 s=1 e=0 z=0 None .sdata2 @5189 */
SECTION_SDATA2 static u32 lit_5189 = 0x40C00000;
SECTION_SDATA2 static f32 lit_5189 = 6.0f;
/* 80452154-80452158 0004+00 s=1 e=0 z=0 None .sdata2 @5190 */
SECTION_SDATA2 static u32 lit_5190 = 0x42600000;
SECTION_SDATA2 static f32 lit_5190 = 56.0f;
/* 80452158-8045215C 0004+00 s=2 e=0 z=0 None .sdata2 @5191 */
SECTION_SDATA2 static u32 lit_5191 = 0x3E99999A;
SECTION_SDATA2 static f32 lit_5191 = 3.0f / 10.0f;
/* 8045215C-80452160 0004+00 s=1 e=0 z=0 None .sdata2 @5192 */
SECTION_SDATA2 static u32 lit_5192 = 0x46BFFE00;
SECTION_SDATA2 static f32 lit_5192 = 24575.0f;
/* 80452160-80452164 0004+00 s=1 e=0 z=0 None .sdata2 @5193 */
SECTION_SDATA2 static u32 lit_5193 = 0x3AB78034;
SECTION_SDATA2 static f32 lit_5193 = 0.00139999995008111f;
/* 80059728-80059E38 0710+00 s=1 e=0 z=0 None .text wether_move_vrkumo__Fv */
#pragma push
@@ -1631,13 +1615,13 @@ asm void dKyw_wether_draw2() {
/* ############################################################################################## */
/* 80452164-80452168 0004+00 s=1 e=0 z=0 None .sdata2 @5361 */
SECTION_SDATA2 static u32 lit_5361 = 0x42F00000;
SECTION_SDATA2 static f32 lit_5361 = 120.0f;
/* 80452168-8045216C 0004+00 s=3 e=0 z=0 None .sdata2 @5362 */
SECTION_SDATA2 static u32 lit_5362 = 0x3D4CCCCD;
SECTION_SDATA2 static f32 lit_5362 = 1.0f / 20.0f;
/* 8045216C-80452170 0004+00 s=1 e=0 z=0 None .sdata2 @5363 */
SECTION_SDATA2 static u32 lit_5363 = 0x3B23D70A;
SECTION_SDATA2 static f32 lit_5363 = 0.0024999999441206455f;
/* 80452170-80452178 0004+04 s=1 e=0 z=0 None .sdata2 @5364 */
SECTION_SDATA2 static f32 lit_5364[1 + 1 /* padding */] = {
@@ -1668,14 +1652,10 @@ asm static void dKyw_wind_init() {
/* ############################################################################################## */
/* 80452178-80452180 0008+00 s=3 e=0 z=0 None .sdata2 @5524 */
SECTION_SDATA2 static u8 lit_5524[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5524 = 0.5;
/* 80452180-80452188 0008+00 s=3 e=0 z=0 None .sdata2 @5525 */
SECTION_SDATA2 static u8 lit_5525[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5525 = 3.0;
/* 80452188-80452190 0008+00 s=3 e=0 z=0 None .sdata2 @5526 */
SECTION_SDATA2 static u8 lit_5526[8] = {
@@ -1683,19 +1663,19 @@ SECTION_SDATA2 static u8 lit_5526[8] = {
};
/* 80452190-80452194 0004+00 s=1 e=0 z=0 None .sdata2 @5527 */
SECTION_SDATA2 static u32 lit_5527 = 0x3F19999A;
SECTION_SDATA2 static f32 lit_5527 = 3.0f / 5.0f;
/* 80452194-80452198 0004+00 s=1 e=0 z=0 None .sdata2 @5528 */
SECTION_SDATA2 static u32 lit_5528 = 0x3F666666;
SECTION_SDATA2 static f32 lit_5528 = 9.0f / 10.0f;
/* 80452198-8045219C 0004+00 s=1 e=0 z=0 None .sdata2 @5529 */
SECTION_SDATA2 static u32 lit_5529 = 0x40000000;
SECTION_SDATA2 static f32 lit_5529 = 2.0f;
/* 8045219C-804521A0 0004+00 s=2 e=0 z=0 None .sdata2 @5530 */
SECTION_SDATA2 static u32 lit_5530 = 0x3A83126F;
SECTION_SDATA2 static f32 lit_5530 = 0.0010000000474974513f;
/* 804521A0-804521A4 0004+00 s=1 e=0 z=0 None .sdata2 @5531 */
SECTION_SDATA2 static u32 lit_5531 = 0x3BA3D70A;
SECTION_SDATA2 static f32 lit_5531 = 0.004999999888241291f;
/* 8005A5C0-8005AAE0 0520+00 s=0 e=2 z=0 None .text dKyw_wind_set__Fv */
#pragma push
@@ -1751,7 +1731,7 @@ asm void dKyw_plight_collision_set(cXyz* param_0, s16 param_1, s16 param_2, f32
/* ############################################################################################## */
/* 804521A4-804521A8 0004+00 s=1 e=0 z=0 None .sdata2 @5630 */
SECTION_SDATA2 static u32 lit_5630 = 0x3E4CCCCD;
SECTION_SDATA2 static f32 lit_5630 = 1.0f / 5.0f;
/* 8005AC30-8005AD44 0114+00 s=1 e=0 z=0 None .text squal_proc__Fv */
#pragma push
src/d/map/d_map.cpp
+13 -39
View File
@@ -31,6 +31,8 @@ struct renderingPlusDoorAndCursor_c {
/* 80040ADC */ void getIconPosition(dTres_c::typeGroupData_c*) const;
};
struct Vec {};
struct dDrawPath_c {
struct room_class {};
@@ -49,8 +51,6 @@ struct dDrawPath_c {
/* 8003CCC4 */ void drawPath();
};
struct Vec {};
struct renderingDAmap_c {
/* 8002B150 */ ~renderingDAmap_c();
/* 8003FCC8 */ void init(u8*, u16, u16, u16, u16);
@@ -197,11 +197,6 @@ struct dDlst_base_c {
// Forward References:
//
extern "C" extern char const* const d_map_d_map__stringBase0;
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__28dDrawPathWithNormalPattern_c[16];
extern "C" extern void* __vt__15dRenderingMap_c[23];
extern "C" void getIconSize__15renderingAmap_cCFUc();
extern "C" void draw__15renderingAmap_cFv();
extern "C" void getDispType__15renderingAmap_cCFv();
@@ -284,23 +279,6 @@ void* operator new(u32, int);
void* operator new[](u32, int);
void operator delete(void*);
void operator delete[](void*);
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__18dRenderingFDAmap_c[26];
extern "C" extern void* __vt__11dDrawPath_c[16];
extern "C" extern void* __vt__19renderingPlusDoor_c[41];
extern "C" extern void* __vt__28renderingPlusDoorAndCursor_c[47];
extern "C" extern void* __vt__16renderingDAmap_c[38];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_Counter[12 + 4 /* padding */];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u32 mNextRoomNo__10dMapInfo_c;
extern "C" extern u8 data_80450E58[4];
extern "C" extern u8 data_80450E60[4];
extern "C" extern u8 mMinX__8dMpath_c[4];
extern "C" extern u8 mMaxX__8dMpath_c[4];
extern "C" extern u8 mMinZ__8dMpath_c[4];
extern "C" extern u8 mMaxZ__8dMpath_c[4];
extern "C" void dComIfGp_isLightDropMapVisible__Fv();
extern "C" void isTbox__12dSv_memBit_cCFi();
@@ -408,10 +386,10 @@ asm void renderingAmap_c::getIconSize(u8 param_0) const {
static u8 m_res__22dMap_HIO_prm_res_dst_s[4 + 4 /* padding */];
/* 80451CA0-80451CA4 0004+00 s=4 e=0 z=0 None .sdata2 @3745 */
SECTION_SDATA2 static u32 lit_3745 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3745 = 0.5f;
/* 80451CA4-80451CA8 0004+00 s=1 e=0 z=0 None .sdata2 @3746 */
SECTION_SDATA2 static u32 lit_3746 = 0x47800000;
SECTION_SDATA2 static f32 lit_3746 = 65536.0f;
/* 80451CA8-80451CB0 0004+04 s=1 e=0 z=0 None .sdata2 @3747 */
SECTION_SDATA2 static f32 lit_3747[1 + 1 /* padding */] = {
@@ -421,14 +399,10 @@ SECTION_SDATA2 static f32 lit_3747[1 + 1 /* padding */] = {
};
/* 80451CB0-80451CB8 0008+00 s=5 e=0 z=0 None .sdata2 @3749 */
SECTION_SDATA2 static u8 lit_3749[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3749 = 4503599627370496.0 /* cast u32 to float */;
/* 80451CB8-80451CC0 0008+00 s=4 e=0 z=0 None .sdata2 @3751 */
SECTION_SDATA2 static u8 lit_3751[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3751 = 4503601774854144.0 /* cast s32 to float */;
/* 800284D0-800288C4 03F4+00 s=2 e=0 z=0 None .text draw__15renderingAmap_cFv */
#pragma push
@@ -883,7 +857,7 @@ bool dMap_c::isSpecialOutline() {
/* ############################################################################################## */
/* 80451CE0-80451CE4 0004+00 s=4 e=0 z=0 None .sdata2 @4284 */
SECTION_SDATA2 static u32 lit_4284 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4284 = 1.0f;
/* 8002974C-800297A8 005C+00 s=1 e=0 z=0 None .text copyPalette__6dMap_cFv */
#pragma push
@@ -1102,7 +1076,7 @@ asm void dMap_c::calcMapCenterXZ(int param_0, f32* param_1, f32* param_2) {
/* ############################################################################################## */
/* 80451CE8-80451CEC 0004+00 s=1 e=0 z=0 None .sdata2 @4503 */
SECTION_SDATA2 static u32 lit_4503 = 0x4628C000;
SECTION_SDATA2 static f32 lit_4503 = 10800.0f;
/* 80029E1C-80029F84 0168+00 s=1 e=0 z=0 None .text calcMapCmPerTexel__6dMap_cFiPf */
#pragma push
@@ -1186,19 +1160,19 @@ asm void dMap_c::isDrawRoomIcon(int param_0, int param_1) const {
/* ############################################################################################## */
/* 80451CEC-80451CF0 0004+00 s=1 e=0 z=0 None .sdata2 @4688 */
SECTION_SDATA2 static u32 lit_4688 = 0xC567E000;
SECTION_SDATA2 static f32 lit_4688 = -3710.0f;
/* 80451CF0-80451CF4 0004+00 s=1 e=0 z=0 None .sdata2 @4689 */
SECTION_SDATA2 static u32 lit_4689 = 0xC6AEFA00;
SECTION_SDATA2 static f32 lit_4689 = -22397.0f;
/* 80451CF4-80451CF8 0004+00 s=1 e=0 z=0 None .sdata2 @4690 */
SECTION_SDATA2 static u32 lit_4690 = 0x42700000;
SECTION_SDATA2 static f32 lit_4690 = 60.0f;
/* 80451CF8-80451CFC 0004+00 s=1 e=0 z=0 None .sdata2 @4691 */
SECTION_SDATA2 static u32 lit_4691 = 0x40A00000;
SECTION_SDATA2 static f32 lit_4691 = 5.0f;
/* 80451CFC-80451D00 0004+00 s=1 e=0 z=0 None .sdata2 @4692 */
SECTION_SDATA2 static u32 lit_4692 = 0x41A00000;
SECTION_SDATA2 static f32 lit_4692 = 20.0f;
/* 8002A32C-8002AB54 0828+00 s=1 e=1 z=0 None .text _move__6dMap_cFffif */
#pragma push
src/d/map/d_map_path.cpp
+4 -14
View File
@@ -78,11 +78,6 @@ struct _GXTexObj {};
// Forward References:
//
extern "C" extern char const* const d_map_d_map_path__stringBase0;
extern "C" extern void* __vt__18dRenderingFDAmap_c[26];
extern "C" extern void* __vt__11dDrawPath_c[16];
extern "C" extern u8 m_texObjAgg__8dMpath_n[28];
extern "C" void create__Q28dMpath_n18dTexObjAggregate_cFv();
extern "C" void remove__Q28dMpath_n18dTexObjAggregate_cFv();
extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class();
@@ -115,9 +110,6 @@ extern "C" extern u8 m_texObjAgg__8dMpath_n[28];
void mDoLib_setResTimgObj(ResTIMG const*, _GXTexObj*, u32, _GXTlutObj*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_clearColor[4];
extern "C" void mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj();
extern "C" void draw__12dDlst_base_cFv();
@@ -351,18 +343,16 @@ asm void dRenderingFDAmap_c::drawBack() const {
/* ############################################################################################## */
/* 80451E0C-80451E10 0004+00 s=1 e=0 z=0 None .sdata2 @3846 */
SECTION_SDATA2 static u32 lit_3846 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3846 = 1.0f;
/* 80451E10-80451E14 0004+00 s=1 e=0 z=0 None .sdata2 @3847 */
SECTION_SDATA2 static u32 lit_3847 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3847 = 0.5f;
/* 80451E14-80451E18 0004+00 s=1 e=0 z=0 None .sdata2 @3848 */
SECTION_SDATA2 static u32 lit_3848 = 0x461C4000;
SECTION_SDATA2 static f32 lit_3848 = 10000.0f;
/* 80451E18-80451E20 0008+00 s=1 e=0 z=0 None .sdata2 @3850 */
SECTION_SDATA2 static u8 lit_3850[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3850 = 4503599627370496.0 /* cast u32 to float */;
/* 8003D188-8003D320 0198+00 s=1 e=8 z=0 None .text preRenderingMap__18dRenderingFDAmap_cFv */
#pragma push
src/d/map/d_map_path_dmap.cpp
+8 -36
View File
@@ -174,22 +174,6 @@ struct dDlst_list_c {
// Forward References:
//
extern "C" extern void* __vt__19renderingPlusDoor_c[41];
extern "C" extern void* __vt__28renderingPlusDoorAndCursor_c[47];
extern "C" extern void* __vt__16renderingDAmap_c[38];
extern "C" extern u32 mNextRoomNo__10dMapInfo_c;
extern "C" extern u8 data_80450E58[4];
extern "C" extern u8 data_80450E60[4];
extern "C" extern u8 mLayerList__8dMpath_c[4];
extern "C" extern u8 mMinX__8dMpath_c[4];
extern "C" extern u8 mMaxX__8dMpath_c[4];
extern "C" extern u8 mMinZ__8dMpath_c[4];
extern "C" extern u8 mMaxZ__8dMpath_c[4];
extern "C" extern f32 mAllCenterX__8dMpath_c;
extern "C" extern f32 mAllCenterZ__8dMpath_c;
extern "C" extern f32 mAllSizeX__8dMpath_c;
extern "C" extern f32 mAllSizeZ__8dMpath_c;
extern "C" void chkGetCompass__10dMapInfo_nFv();
extern "C" void chkGetMap__10dMapInfo_nFv();
extern "C" void isVisitedRoom__10dMapInfo_nFi();
@@ -285,14 +269,6 @@ void dStage_GetKeepDoorInfo();
void dStage_GetRoomKeepDoorInfo();
void dComIfGs_isVisitedRoom(int);
void* operator new(u32);
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 m_texObjAgg__8dMpath_n[28];
extern "C" extern u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u32 __float_max;
extern "C" extern u8 struct_80450D64[4];
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
@@ -493,7 +469,7 @@ asm void dMapInfo_n::getMapRestartAngleY() {
/* ############################################################################################## */
/* 80451E2C-80451E30 0004+00 s=4 e=0 z=0 None .sdata2 @3887 */
SECTION_SDATA2 static u32 lit_3887 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3887 = 0.5f;
/* 8003F19C-8003F1F4 0058+00 s=0 e=1 z=0 None .text getRoomCenter__10dMapInfo_nFiPfPf */
#pragma push
@@ -518,9 +494,7 @@ asm void dMapInfo_n::getRoomMinMaxXZ(int param_0, f32* param_1, f32* param_2, f3
/* ############################################################################################## */
/* 80451E30-80451E38 0008+00 s=1 e=0 z=0 None .sdata2 @3957 */
SECTION_SDATA2 static u8 lit_3957[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3957 = 4503601774854144.0 /* cast s32 to float */;
/* 8003F24C-8003F40C 01C0+00 s=2 e=0 z=0 None .text getFloorParameter__10dMapInfo_nFfPScPfPfPfPf
*/
@@ -767,9 +741,7 @@ asm void renderingDAmap_c::init(u8* param_0, u16 param_1, u16 param_2, u16 param
/* ############################################################################################## */
/* 80451E40-80451E48 0008+00 s=2 e=0 z=0 None .sdata2 @4211 */
SECTION_SDATA2 static u8 lit_4211[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4211 = 4503599627370496.0 /* cast u32 to float */;
/* 8003FD08-8003FD9C 0094+00 s=0 e=2 z=0 None .text entry__16renderingDAmap_cFfffiSc */
#pragma push
@@ -849,13 +821,13 @@ asm void renderingDAmap_c::isDrawRoom(int param_0, int param_1) const {
/* ############################################################################################## */
/* 80451E4C-80451E50 0004+00 s=1 e=0 z=0 None .sdata2 @4264 */
SECTION_SDATA2 static u32 lit_4264 = 0xC59C4000;
SECTION_SDATA2 static f32 lit_4264 = -5000.0f;
/* 80451E50-80451E54 0004+00 s=1 e=0 z=0 None .sdata2 @4265 */
SECTION_SDATA2 static u32 lit_4265 = 0x459C4000;
SECTION_SDATA2 static f32 lit_4265 = 5000.0f;
/* 80451E54-80451E58 0004+00 s=1 e=0 z=0 None .sdata2 @4266 */
SECTION_SDATA2 static u32 lit_4266 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4266 = -1.0f;
/* 8003FF14-8003FFC4 00B0+00 s=3 e=3 z=0 None .text preDrawPath__16renderingDAmap_cFv */
#pragma push
@@ -1048,7 +1020,7 @@ SECTION_RODATA static u8 const l_100x100BoxVertexList[48] = {
};
/* 80451E70-80451E74 0004+00 s=1 e=0 z=0 None .sdata2 @4484 */
SECTION_SDATA2 static u32 lit_4484 = 0x40C00000;
SECTION_SDATA2 static f32 lit_4484 = 6.0f;
/* 80040838-800409B4 017C+00 s=1 e=0 z=0 None .text
* drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib */
@@ -1194,7 +1166,7 @@ SECTION_SDATA2 static u8 tboxNotStayColor_4542[4] = {
};
/* 80451EA8-80451EAC 0004+00 s=2 e=0 z=0 None .sdata2 @4600 */
SECTION_SDATA2 static u32 lit_4600 = 0x40000000;
SECTION_SDATA2 static f32 lit_4600 = 2.0f;
/* 80040B00-80040E84 0384+00 s=1 e=0 z=0 None .text
* drawTreasure__28renderingPlusDoorAndCursor_cFv */
src/d/map/d_map_path_fmap.cpp
+3 -14
View File
@@ -95,8 +95,6 @@ struct dMenuFmapIconDisp_c {
// Forward References:
//
extern "C" extern void* __vt__19dMenuFmapIconDisp_c[3];
extern "C" void addTypeGroupData__26fmpTresTypeGroupDataList_cFUcPCQ27dTres_c6data_s();
extern "C" void isArrival__22dMenu_Fmap_room_data_cFv();
extern "C" void buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii();
@@ -134,9 +132,6 @@ void dComIfGs_isStageSwitch(int, int);
void dComIfGp_isLightDropMapVisible();
void* operator new(u32);
void operator delete(void*);
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u32 __float_max;
extern "C" void dComIfGs_isStageTbox__Fii();
extern "C" void dComIfGs_isStageSwitch__Fii();
@@ -231,16 +226,10 @@ asm void dMenu_Fmap_stage_data_c::isArrival() {
/* ############################################################################################## */
/* 80451E20-80451E28 0004+04 s=5 e=0 z=0 None .sdata2 @3894 */
SECTION_SDATA2 static u8 lit_3894[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_3894[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 8003D9D8-8003DB48 0170+00 s=1 e=0 z=0 None .text
src/d/menu/d_menu_calibration.cpp
+2 -11
View File
@@ -75,8 +75,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_menu_d_menu_calibration__stringBase0;
extern "C" void __dt__19dMenu_Calibration_cFv();
extern "C" void _move__19dMenu_Calibration_cFv();
extern "C" void _draw__19dMenu_Calibration_cFv();
@@ -108,11 +106,6 @@ extern "C" extern char const* const d_menu_d_menu_calibration__stringBase0;
void dMeter2Info_set2DVibration();
void operator delete(void*);
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void setPos__16dSelect_cursor_cFffP7J2DPaneb();
extern "C" void setAlphaRate__16dSelect_cursor_cFf();
@@ -308,12 +301,10 @@ asm void dMenu_Calibration_c::step1_wait_init() {
/* ############################################################################################## */
/* 80453F14-80453F18 0004+00 s=6 e=0 z=0 None .sdata2 @3885 */
SECTION_SDATA2 static u32 lit_3885 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3885 = 1.0f;
/* 80453F18-80453F20 0008+00 s=3 e=0 z=0 None .sdata2 @3887 */
SECTION_SDATA2 static u8 lit_3887[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3887 = 4503601774854144.0 /* cast s32 to float */;
/* 801AEF60-801AF084 0124+00 s=1 e=0 z=0 None .text step1_wait_move__19dMenu_Calibration_cFv
*/
src/d/menu/d_menu_collect.cpp
+46 -70
View File
@@ -106,13 +106,7 @@ struct dMenu_save_c {
/* 801F69B8 */ void _draw();
};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
/* 800324A8 */ void checkRightTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct CSTControl {};
struct JKRHeap {
/* 802CE5CC */ void freeAll();
@@ -123,7 +117,13 @@ struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct CSTControl {};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
/* 800324A8 */ void checkRightTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct dMenu_Skill_c {
/* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
@@ -403,9 +403,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_menu_d_menu_collect__stringBase0;
extern "C" extern u32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */];
extern "C" void __ct__17dMenu_Collect2D_cFP10JKRExpHeapP9STControlP10CSTControl();
extern "C" void __dt__17dMenu_Collect2D_cFv();
extern "C" void _create__17dMenu_Collect2D_cFv();
@@ -541,21 +538,6 @@ void dPaneClass_showNullPane(J2DScreen*);
void cLib_addCalcAngleS(s16*, s16, s16, s16, s16);
void* operator new(u32);
void operator delete(void*);
extern "C" extern u8 const j3dDefaultLightInfo[52];
extern "C" extern void* __vt__12J3DFrameCtrl[3];
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__8J3DModel[9];
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 g_env_light[4880];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern f32 Zero__4cXyz[3];
extern "C" extern u8 j3dSys[284];
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
@@ -1370,7 +1352,7 @@ SECTION_SDATA2 static u8 lit_4481[4] = {
};
/* 80453F2C-80453F30 0004+00 s=15 e=0 z=0 None .sdata2 @4482 */
SECTION_SDATA2 static u32 lit_4482 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4482 = 1.0f;
/* 801AFD48-801AFE34 00EC+00 s=1 e=0 z=0 None .text
* __ct__17dMenu_Collect2D_cFP10JKRExpHeapP9STControlP10CSTControl */
@@ -1459,10 +1441,10 @@ asm void dMenu_Collect2D_c::isInsectIconVisible() {
/* ############################################################################################## */
/* 80453F30-80453F34 0004+00 s=2 e=0 z=0 None .sdata2 @5173 */
SECTION_SDATA2 static u32 lit_5173 = 0x3F000000;
SECTION_SDATA2 static f32 lit_5173 = 0.5f;
/* 80453F34-80453F38 0004+00 s=2 e=0 z=0 None .sdata2 @5174 */
SECTION_SDATA2 static u32 lit_5174 = 0xC47A0000;
SECTION_SDATA2 static f32 lit_5174 = -1000.0f;
/* 801B074C-801B1C3C 14F0+00 s=1 e=0 z=0 None .text screenSet__17dMenu_Collect2D_cFv */
#pragma push
@@ -1486,9 +1468,7 @@ asm void dMenu_Collect2D_c::animationSet() {
/* ############################################################################################## */
/* 80453F38-80453F40 0008+00 s=2 e=0 z=0 None .sdata2 @5199 */
SECTION_SDATA2 static u8 lit_5199[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5199 = 4503601774854144.0 /* cast s32 to float */;
/* 801B1CE0-801B1EDC 01FC+00 s=1 e=0 z=0 None .text
* btkAnimeLoop0__17dMenu_Collect2D_cFP19J2DAnmTextureSRTKey */
@@ -1503,15 +1483,13 @@ asm void dMenu_Collect2D_c::btkAnimeLoop0(J2DAnmTextureSRTKey* param_0) {
/* ############################################################################################## */
/* 80453F40-80453F44 0004+00 s=1 e=0 z=0 None .sdata2 @5268 */
SECTION_SDATA2 static u32 lit_5268 = 0x43160000;
SECTION_SDATA2 static f32 lit_5268 = 150.0f;
/* 80453F44-80453F48 0004+00 s=1 e=0 z=0 None .sdata2 @5269 */
SECTION_SDATA2 static u32 lit_5269 = 0x3E4CCCCD;
SECTION_SDATA2 static f32 lit_5269 = 1.0f / 5.0f;
/* 80453F48-80453F50 0008+00 s=1 e=0 z=0 None .sdata2 @5271 */
SECTION_SDATA2 static u8 lit_5271[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5271 = 4503599627370496.0 /* cast u32 to float */;
/* 801B1EDC-801B1FAC 00D0+00 s=1 e=0 z=0 None .text setBackAlpha__17dMenu_Collect2D_cFv */
#pragma push
@@ -1537,7 +1515,7 @@ SECTION_SDATA2 static u32 lit_5403 = 0x03030403;
SECTION_SDATA2 static u32 data_80453F5C = 0x04030404;
/* 80453F60-80453F64 0004+00 s=6 e=0 z=0 None .sdata2 @5531 */
SECTION_SDATA2 static u32 lit_5531 = 0xBF800000;
SECTION_SDATA2 static f32 lit_5531 = -1.0f;
/* 801B1FAC-801B27EC 0840+00 s=1 e=0 z=0 None .text cursorMove__17dMenu_Collect2D_cFv */
#pragma push
@@ -1551,25 +1529,25 @@ asm void dMenu_Collect2D_c::cursorMove() {
/* ############################################################################################## */
/* 80453F64-80453F68 0004+00 s=1 e=0 z=0 None .sdata2 @5611 */
SECTION_SDATA2 static u32 lit_5611 = 0x3F8CCCCD;
SECTION_SDATA2 static f32 lit_5611 = 11.0f / 10.0f;
/* 80453F68-80453F6C 0004+00 s=1 e=0 z=0 None .sdata2 @5612 */
SECTION_SDATA2 static u32 lit_5612 = 0x3F59999A;
SECTION_SDATA2 static f32 lit_5612 = 17.0f / 20.0f;
/* 80453F6C-80453F70 0004+00 s=1 e=0 z=0 None .sdata2 @5613 */
SECTION_SDATA2 static u32 lit_5613 = 0x3D4CCCCD;
SECTION_SDATA2 static f32 lit_5613 = 1.0f / 20.0f;
/* 80453F70-80453F74 0004+00 s=1 e=0 z=0 None .sdata2 @5614 */
SECTION_SDATA2 static u32 lit_5614 = 0x3F19999A;
SECTION_SDATA2 static f32 lit_5614 = 3.0f / 5.0f;
/* 80453F74-80453F78 0004+00 s=1 e=0 z=0 None .sdata2 @5615 */
SECTION_SDATA2 static u32 lit_5615 = 0x3CF5C28F;
SECTION_SDATA2 static f32 lit_5615 = 3.0f / 100.0f;
/* 80453F78-80453F7C 0004+00 s=1 e=0 z=0 None .sdata2 @5616 */
SECTION_SDATA2 static u32 lit_5616 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_5616 = 1.0f / 10.0f;
/* 80453F7C-80453F80 0004+00 s=1 e=0 z=0 None .sdata2 @5617 */
SECTION_SDATA2 static u32 lit_5617 = 0x3F333333;
SECTION_SDATA2 static f32 lit_5617 = 7.0f / 10.0f;
/* 801B27EC-801B2A74 0288+00 s=2 e=0 z=0 None .text cursorPosSet__17dMenu_Collect2D_cFv */
#pragma push
@@ -2239,43 +2217,43 @@ asm void dMenu_Collect3D_c::_delete() {
/* ############################################################################################## */
/* 80453F80-80453F84 0004+00 s=1 e=0 z=0 None .sdata2 @7324 */
SECTION_SDATA2 static u32 lit_7324 = 0x42700000;
SECTION_SDATA2 static f32 lit_7324 = 60.0f;
/* 80453F84-80453F88 0004+00 s=1 e=0 z=0 None .sdata2 @7325 */
SECTION_SDATA2 static u32 lit_7325 = 0x44110000;
SECTION_SDATA2 static f32 lit_7325 = 580.0f;
/* 80453F88-80453F8C 0004+00 s=1 e=0 z=0 None .sdata2 @7326 */
SECTION_SDATA2 static u32 lit_7326 = 0x42B40000;
SECTION_SDATA2 static f32 lit_7326 = 90.0f;
/* 80453F8C-80453F90 0004+00 s=1 e=0 z=0 None .sdata2 @7327 */
SECTION_SDATA2 static u32 lit_7327 = 0x44098000;
SECTION_SDATA2 static f32 lit_7327 = 550.0f;
/* 80453F90-80453F94 0004+00 s=1 e=0 z=0 None .sdata2 @7328 */
SECTION_SDATA2 static u32 lit_7328 = 0x43E10000;
SECTION_SDATA2 static f32 lit_7328 = 450.0f;
/* 80453F94-80453F98 0004+00 s=1 e=0 z=0 None .sdata2 @7329 */
SECTION_SDATA2 static u32 lit_7329 = 0xC0400000;
SECTION_SDATA2 static f32 lit_7329 = -3.0f;
/* 80453F98-80453F9C 0004+00 s=1 e=0 z=0 None .sdata2 @7330 */
SECTION_SDATA2 static u32 lit_7330 = 0xC0A00000;
SECTION_SDATA2 static f32 lit_7330 = -5.0f;
/* 80453F9C-80453FA0 0004+00 s=1 e=0 z=0 None .sdata2 @7331 */
SECTION_SDATA2 static u32 lit_7331 = 0x41800000;
SECTION_SDATA2 static f32 lit_7331 = 16.0f;
/* 80453FA0-80453FA4 0004+00 s=1 e=0 z=0 None .sdata2 @7332 */
SECTION_SDATA2 static u32 lit_7332 = 0x41000000;
SECTION_SDATA2 static f32 lit_7332 = 8.0f;
/* 80453FA4-80453FA8 0004+00 s=2 e=0 z=0 None .sdata2 @7333 */
SECTION_SDATA2 static u32 lit_7333 = 0x40000000;
SECTION_SDATA2 static f32 lit_7333 = 2.0f;
/* 80453FA8-80453FAC 0004+00 s=1 e=0 z=0 None .sdata2 @7334 */
SECTION_SDATA2 static u32 lit_7334 = 0xC0800000;
SECTION_SDATA2 static f32 lit_7334 = -4.0f;
/* 80453FAC-80453FB0 0004+00 s=1 e=0 z=0 None .sdata2 @7335 */
SECTION_SDATA2 static u32 lit_7335 = 0xC1200000;
SECTION_SDATA2 static f32 lit_7335 = -10.0f;
/* 80453FB0-80453FB4 0004+00 s=1 e=0 z=0 None .sdata2 @7336 */
SECTION_SDATA2 static u32 lit_7336 = 0x44160000;
SECTION_SDATA2 static f32 lit_7336 = 600.0f;
/* 801B66C8-801B696C 02A4+00 s=2 e=0 z=0 None .text _move__17dMenu_Collect3D_cFUcUc */
#pragma push
@@ -2309,16 +2287,16 @@ asm void dMenu_Collect3D_c::setJ3D(char const* param_0, char const* param_1, cha
/* ############################################################################################## */
/* 80453FB4-80453FB8 0004+00 s=1 e=0 z=0 None .sdata2 @7505 */
SECTION_SDATA2 static u32 lit_7505 = 0xBDCCCCCD;
SECTION_SDATA2 static f32 lit_7505 = -1.0f / 10.0f;
/* 80453FB8-80453FBC 0004+00 s=1 e=0 z=0 None .sdata2 @7506 */
SECTION_SDATA2 static u32 lit_7506 = 0xBF19999A;
SECTION_SDATA2 static f32 lit_7506 = -3.0f / 5.0f;
/* 80453FBC-80453FC0 0004+00 s=1 e=0 z=0 None .sdata2 @7507 */
SECTION_SDATA2 static u32 lit_7507 = 0xBECCCCCD;
SECTION_SDATA2 static f32 lit_7507 = -2.0f / 5.0f;
/* 80453FC0-80453FC4 0004+00 s=1 e=0 z=0 None .sdata2 @7508 */
SECTION_SDATA2 static u32 lit_7508 = 0xBE99999A;
SECTION_SDATA2 static f32 lit_7508 = -3.0f / 10.0f;
/* 801B6D30-801B6E70 0140+00 s=2 e=0 z=0 None .text set_mtx__17dMenu_Collect3D_cFv */
#pragma push
@@ -2411,19 +2389,19 @@ SECTION_SDATA u32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */] = {
};
/* 80453FC4-80453FC8 0004+00 s=3 e=0 z=0 None .sdata2 @7944 */
SECTION_SDATA2 static u32 lit_7944 = 0x44180000;
SECTION_SDATA2 static f32 lit_7944 = 608.0f;
/* 80453FC8-80453FCC 0004+00 s=3 e=0 z=0 None .sdata2 @7945 */
SECTION_SDATA2 static u32 lit_7945 = 0x43E00000;
SECTION_SDATA2 static f32 lit_7945 = 448.0f;
/* 80453FCC-80453FD0 0004+00 s=2 e=0 z=0 None .sdata2 @7946 */
SECTION_SDATA2 static u32 lit_7946 = 0xC2C80000;
SECTION_SDATA2 static f32 lit_7946 = -100.0f;
/* 80453FD0-80453FD4 0004+00 s=1 e=0 z=0 None .sdata2 @7947 */
SECTION_SDATA2 static u32 lit_7947 = 0x42340000;
SECTION_SDATA2 static f32 lit_7947 = 45.0f;
/* 80453FD4-80453FD8 0004+00 s=2 e=0 z=0 None .sdata2 @7948 */
SECTION_SDATA2 static u32 lit_7948 = 0x3FADB6DB;
SECTION_SDATA2 static f32 lit_7948 = 19.0f / 14.0f;
/* 80453FD8-80453FE0 0004+04 s=1 e=0 z=0 None .sdata2 @7949 */
SECTION_SDATA2 static f32 lit_7949[1 + 1 /* padding */] = {
@@ -2444,9 +2422,7 @@ asm void dMenu_Collect3D_c::setupItem3D(f32 (*param_0)[4]) {
/* ############################################################################################## */
/* 80453FE0-80453FE8 0008+00 s=1 e=0 z=0 None .sdata2 @7963 */
SECTION_SDATA2 static u8 lit_7963[8] = {
0x3F, 0xD9, 0x21, 0xFB, 0x60, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_7963 = 0.39269909262657166;
/* 801B7660-801B774C 00EC+00 s=1 e=0 z=0 None .text toItem3Dpos__17dMenu_Collect3D_cFfffP4cXyz
*/
src/d/menu/d_menu_dmap.cpp
+31 -54
View File
@@ -133,6 +133,10 @@ struct dMenu_StageMapCtrl_c {
struct J2DOrthoGraph {};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct STControl {
/* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
/* 8003219C */ void checkTrigger();
@@ -142,10 +146,6 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct dMenu_ItemExplain_c {
/* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
/* 801DB470 */ void move();
@@ -330,8 +330,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_menu_d_menu_dmap__stringBase0;
extern "C" void __ct__14dMenu_DmapBg_cFP10JKRExpHeapP9STControl();
extern "C" void mapScreenInit__14dMenu_DmapBg_cFv();
extern "C" void mapScreenAnime__14dMenu_DmapBg_cFv();
@@ -440,23 +438,6 @@ void dPaneClass_showNullPane(J2DScreen*);
void cLib_addCalc2(f32*, f32, f32, f32);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__28dDrawPathWithNormalPattern_c[16];
extern "C" extern void* __vt__15dRenderingMap_c[23];
extern "C" extern void* __vt__18dRenderingFDAmap_c[26];
extern "C" extern void* __vt__11dDrawPath_c[16];
extern "C" extern void* __vt__19renderingPlusDoor_c[41];
extern "C" extern void* __vt__16renderingDAmap_c[38];
extern "C" extern void* __vt__19dMenu_DmapMapCtrl_c[10 + 51 /* padding */];
extern "C" extern void* __vt__15renderingDmap_c[43 + 1 /* padding */];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern f32 mAllSizeX__8dMpath_c;
extern "C" extern f32 mAllSizeZ__8dMpath_c;
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
SECTION_INIT void memset();
SECTION_INIT void memcpy();
@@ -1246,7 +1227,7 @@ SECTION_SDATA2 static u8 lit_3962[4] = {
};
/* 80453FEC-80453FF0 0004+00 s=26 e=0 z=0 None .sdata2 @3963 */
SECTION_SDATA2 static u32 lit_3963 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3963 = 1.0f;
/* 801B7F20-801B8110 01F0+00 s=1 e=0 z=0 None .text
* __ct__14dMenu_DmapBg_cFP10JKRExpHeapP9STControl */
@@ -1261,7 +1242,7 @@ asm dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* param_0, STControl* param_1) {
/* ############################################################################################## */
/* 80453FF0-80453FF4 0004+00 s=1 e=0 z=0 None .sdata2 @4073 */
SECTION_SDATA2 static u32 lit_4073 = 0xC1700000;
SECTION_SDATA2 static f32 lit_4073 = -15.0f;
/* 801B8110-801B884C 073C+00 s=1 e=0 z=0 None .text mapScreenInit__14dMenu_DmapBg_cFv */
#pragma push
@@ -1275,12 +1256,10 @@ asm void dMenu_DmapBg_c::mapScreenInit() {
/* ############################################################################################## */
/* 80453FF4-80453FF8 0004+00 s=2 e=0 z=0 None .sdata2 @4106 */
SECTION_SDATA2 static u32 lit_4106 = 0x3ECCCCCD;
SECTION_SDATA2 static f32 lit_4106 = 2.0f / 5.0f;
/* 80453FF8-80454000 0008+00 s=8 e=0 z=0 None .sdata2 @4108 */
SECTION_SDATA2 static u8 lit_4108[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4108 = 4503601774854144.0 /* cast s32 to float */;
/* 801B884C-801B88F4 00A8+00 s=1 e=0 z=0 None .text mapScreenAnime__14dMenu_DmapBg_cFv */
#pragma push
@@ -1314,7 +1293,7 @@ asm void dMenu_DmapBg_c::iconScaleAnmInit(f32 param_0, f32 param_1, u8 param_2)
/* ############################################################################################## */
/* 80454000-80454004 0004+00 s=1 e=0 z=0 None .sdata2 @4133 */
SECTION_SDATA2 static u32 lit_4133 = 0x3D4CCCCD;
SECTION_SDATA2 static f32 lit_4133 = 1.0f / 20.0f;
/* 801B8954-801B8A0C 00B8+00 s=2 e=0 z=0 None .text iconScaleAnm__14dMenu_DmapBg_cFv */
#pragma push
@@ -1328,10 +1307,10 @@ asm void dMenu_DmapBg_c::iconScaleAnm() {
/* ############################################################################################## */
/* 80454004-80454008 0004+00 s=1 e=0 z=0 None .sdata2 @4191 */
SECTION_SDATA2 static u32 lit_4191 = 0x43200000;
SECTION_SDATA2 static f32 lit_4191 = 160.0f;
/* 80454008-8045400C 0004+00 s=1 e=0 z=0 None .sdata2 @4192 */
SECTION_SDATA2 static u32 lit_4192 = 0x43A08000;
SECTION_SDATA2 static f32 lit_4192 = 321.0f;
/* 801B8A0C-801B8DE4 03D8+00 s=1 e=0 z=0 None .text buttonIconScreenInit__14dMenu_DmapBg_cFv
*/
@@ -1375,7 +1354,7 @@ static u8 player_py[4];
static u8 myclass__12dMenu_Dmap_c[4 + 4 /* padding */];
/* 8045400C-80454010 0004+00 s=7 e=0 z=0 None .sdata2 @4249 */
SECTION_SDATA2 static u32 lit_4249 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4249 = 0.5f;
/* 801B8F94-801B90BC 0128+00 s=1 e=0 z=0 None .text setCButtonString__14dMenu_DmapBg_cFUl */
#pragma push
@@ -1419,16 +1398,16 @@ asm void dMenu_DmapBg_c::deleteExplain() {
/* ############################################################################################## */
/* 80454010-80454014 0004+00 s=1 e=0 z=0 None .sdata2 @4312 */
SECTION_SDATA2 static u32 lit_4312 = 0x3F733333;
SECTION_SDATA2 static f32 lit_4312 = 19.0f / 20.0f;
/* 80454014-80454018 0004+00 s=7 e=0 z=0 None .sdata2 @4313 */
SECTION_SDATA2 static u32 lit_4313 = 0x3F666666;
SECTION_SDATA2 static f32 lit_4313 = 9.0f / 10.0f;
/* 80454018-8045401C 0004+00 s=1 e=0 z=0 None .sdata2 @4314 */
SECTION_SDATA2 static u32 lit_4314 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_4314 = 1.0f / 10.0f;
/* 8045401C-80454020 0004+00 s=1 e=0 z=0 None .sdata2 @4315 */
SECTION_SDATA2 static u32 lit_4315 = 0x3F19999A;
SECTION_SDATA2 static f32 lit_4315 = 3.0f / 5.0f;
/* 801B91DC-801B944C 0270+00 s=1 e=0 z=0 None .text baseScreenInit__14dMenu_DmapBg_cFv */
#pragma push
@@ -1487,7 +1466,7 @@ asm void dMenu_DmapBg_c::setGoldAnimation(bool param_0) {
/* ############################################################################################## */
/* 80454020-80454024 0004+00 s=3 e=0 z=0 None .sdata2 @4643 */
SECTION_SDATA2 static u32 lit_4643 = 0x437F0000;
SECTION_SDATA2 static f32 lit_4643 = 255.0f;
/* 801BA7F0-801BA974 0184+00 s=3 e=0 z=0 None .text setGoldFrameAlphaRate__14dMenu_DmapBg_cFf
*/
@@ -1524,24 +1503,22 @@ asm void dMenu_DmapBg_c::decGoldFrameAlphaRate() {
/* ############################################################################################## */
/* 80454024-80454028 0004+00 s=4 e=0 z=0 None .sdata2 @4784 */
SECTION_SDATA2 static u32 lit_4784 = 0x44180000;
SECTION_SDATA2 static f32 lit_4784 = 608.0f;
/* 80454028-8045402C 0004+00 s=4 e=0 z=0 None .sdata2 @4785 */
SECTION_SDATA2 static u32 lit_4785 = 0x43E00000;
SECTION_SDATA2 static f32 lit_4785 = 448.0f;
/* 8045402C-80454030 0004+00 s=1 e=0 z=0 None .sdata2 @4786 */
SECTION_SDATA2 static u32 lit_4786 = 0x40000000;
SECTION_SDATA2 static f32 lit_4786 = 2.0f;
/* 80454030-80454034 0004+00 s=1 e=0 z=0 None .sdata2 @4787 */
SECTION_SDATA2 static u32 lit_4787 = 0x3F333333;
SECTION_SDATA2 static f32 lit_4787 = 7.0f / 10.0f;
/* 80454034-80454038 0004+00 s=1 e=0 z=0 None .sdata2 @4788 */
SECTION_SDATA2 static u32 lit_4788 = 0xC20C0000;
SECTION_SDATA2 static f32 lit_4788 = -35.0f;
/* 80454038-80454040 0008+00 s=2 e=0 z=0 None .sdata2 @4790 */
SECTION_SDATA2 static u8 lit_4790[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4790 = 4503599627370496.0 /* cast u32 to float */;
/* 801BAB10-801BB334 0824+00 s=1 e=0 z=0 None .text draw__14dMenu_DmapBg_cFv */
#pragma push
@@ -1555,7 +1532,7 @@ asm void dMenu_DmapBg_c::draw() {
/* ############################################################################################## */
/* 80454040-80454044 0004+00 s=1 e=0 z=0 None .sdata2 @4848 */
SECTION_SDATA2 static u32 lit_4848 = 0x41CC0000;
SECTION_SDATA2 static f32 lit_4848 = 25.5f;
/* 801BB334-801BB464 0130+00 s=1 e=0 z=0 None .text update__14dMenu_DmapBg_cFv */
#pragma push
@@ -1584,10 +1561,10 @@ asm void dMenu_DmapBg_c::drawCursor() {
/* ############################################################################################## */
/* 80454044-80454048 0004+00 s=3 e=0 z=0 None .sdata2 @4926 */
SECTION_SDATA2 static u32 lit_4926 = 0xC4180000;
SECTION_SDATA2 static f32 lit_4926 = -608.0f;
/* 80454048-8045404C 0004+00 s=3 e=0 z=0 None .sdata2 @4927 */
SECTION_SDATA2 static u32 lit_4927 = 0xC3E00000;
SECTION_SDATA2 static f32 lit_4927 = -448.0f;
/* 801BB498-801BB634 019C+00 s=0 e=1 z=0 None .text
* __ct__12dMenu_Dmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUc */
@@ -1603,7 +1580,7 @@ asm dMenu_Dmap_c::dMenu_Dmap_c(JKRExpHeap* param_0, STControl* param_1, CSTContr
/* ############################################################################################## */
/* 8045404C-80454050 0004+00 s=1 e=0 z=0 None .sdata2 @5277 */
SECTION_SDATA2 static u32 lit_5277 = 0x40E00000;
SECTION_SDATA2 static f32 lit_5277 = 7.0f;
/* 801BB634-801BC788 1154+00 s=1 e=0 z=0 None .text screenInit__12dMenu_Dmap_cFv */
#pragma push
@@ -1617,7 +1594,7 @@ asm void dMenu_Dmap_c::screenInit() {
/* ############################################################################################## */
/* 80454050-80454054 0004+00 s=2 e=0 z=0 None .sdata2 @5288 */
SECTION_SDATA2 static u32 lit_5288 = 0x3BB40000;
SECTION_SDATA2 static f32 lit_5288 = 0.0054931640625f;
/* 801BC788-801BC848 00C0+00 s=1 e=0 z=0 None .text getPlayerIconPos__12dMenu_Dmap_cFScf */
#pragma push
@@ -1765,7 +1742,7 @@ asm void J2DPicture::insert(ResTIMG const* param_0, u8 param_1, f32 param_2) {
/* ############################################################################################## */
/* 80454054-80454058 0004+00 s=1 e=0 z=0 None .sdata2 @6017 */
SECTION_SDATA2 static u32 lit_6017 = 0x3F34B4B5;
SECTION_SDATA2 static f32 lit_6017 = 12.0f / 17.0f;
/* 801BDDA4-801BDEF8 0154+00 s=0 e=1 z=0 None .text _move__12dMenu_Dmap_cFv */
#pragma push
@@ -1799,10 +1776,10 @@ asm void dMenu_Dmap_c::mapBgAnime() {
/* ############################################################################################## */
/* 80454058-8045405C 0004+00 s=2 e=0 z=0 None .sdata2 @6180 */
SECTION_SDATA2 static u32 lit_6180 = 0x42C80000;
SECTION_SDATA2 static f32 lit_6180 = 100.0f;
/* 8045405C-80454060 0004+00 s=7 e=0 z=0 None .sdata2 @6181 */
SECTION_SDATA2 static u32 lit_6181 = 0xBF800000;
SECTION_SDATA2 static f32 lit_6181 = -1.0f;
/* 801BDF6C-801BE328 03BC+00 s=1 e=0 z=0 None .text mapControl__12dMenu_Dmap_cFv */
#pragma push
src/d/menu/d_menu_dmap_map.cpp
+12 -34
View File
@@ -45,6 +45,8 @@ struct renderingDmap_c {
/* 801C263C */ bool isRendIcon() const;
};
struct Vec {};
struct dDrawPath_c {
struct line_class {};
@@ -62,8 +64,6 @@ struct dDrawPath_c {
/* 8003CCC4 */ void drawPath();
};
struct Vec {};
struct renderingDAmap_c {
/* 8003FCC8 */ void init(u8*, u16, u16, u16, u16);
/* 8003FD08 */ void entry(f32, f32, f32, int, s8);
@@ -194,10 +194,6 @@ struct dMapInfo_c {
// Forward References:
//
extern "C" extern void* l_data[61];
extern "C" extern void* __vt__19dMenu_DmapMapCtrl_c[10 + 51 /* padding */];
extern "C" extern void* __vt__15renderingDmap_c[43 + 1 /* padding */];
extern "C" void hasMap__15renderingDmap_cCFv();
extern "C" void isDrawIconSingle2__15renderingDmap_cCFPCQ27dTres_c6data_sbbi();
extern "C" void getPlayerCursorSize__15renderingDmap_cFv();
@@ -273,18 +269,6 @@ void fopMsgM_valueIncrease(int, int, u8);
void* operator new(u32, int);
void* operator new[](u32, int);
void operator delete[](void*);
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */];
extern "C" extern u32 __float_max;
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 data_80450E58[4];
extern "C" extern u8 data_80450E60[4];
extern "C" extern u8 mLayerList__8dMpath_c[4];
extern "C" extern f32 mAllCenterX__8dMpath_c;
extern "C" extern f32 mAllCenterZ__8dMpath_c;
extern "C" extern f32 mAllSizeX__8dMpath_c;
extern "C" extern f32 mAllSizeZ__8dMpath_c;
extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor();
extern "C" void fopMsgM_valueIncrease__FiiUc();
@@ -552,7 +536,7 @@ asm void renderingDmap_c::getLineWidthZoomSmall(int param_0) {
/* ############################################################################################## */
/* 80454094-80454098 0004+00 s=4 e=0 z=0 None .sdata2 @3837 */
SECTION_SDATA2 static u32 lit_3837 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3837 = 0.5f;
/* 801C0C10-801C0C48 0038+00 s=1 e=0 z=0 None .text getLineWidth__15renderingDmap_cFi */
#pragma push
@@ -763,9 +747,7 @@ SECTION_SDATA2 static f32 lit_3946[1 + 1 /* padding */] = {
};
/* 804540A0-804540A8 0008+00 s=2 e=0 z=0 None .sdata2 @3947 */
SECTION_SDATA2 static u8 lit_3947[8] = {
0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3947 = 1.0;
/* 801C0EE0-801C0F24 0044+00 s=0 e=2 z=0 None .text getMapBlendPer__20dMenu_StageMapCtrl_cCFv
*/
@@ -892,14 +874,10 @@ asm void dMenu_StageMapCtrl_c::setPlusNowStayFloorNo(s8 param_0, u8 param_1) {
/* ############################################################################################## */
/* 804540A8-804540B0 0008+00 s=1 e=0 z=0 None .sdata2 @4168 */
SECTION_SDATA2 static u8 lit_4168[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4168 = 4503601774854144.0 /* cast s32 to float */;
/* 804540B0-804540B8 0008+00 s=2 e=0 z=0 None .sdata2 @4170 */
SECTION_SDATA2 static u8 lit_4170[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4170 = 4503599627370496.0 /* cast u32 to float */;
/* 801C12B4-801C1878 05C4+00 s=2 e=0 z=0 None .text moveFloor__20dMenu_StageMapCtrl_cFv */
#pragma push
@@ -945,7 +923,7 @@ asm void dMenu_StageMapCtrl_c::zoomIn_init_proc() {
/* ############################################################################################## */
/* 804540B8-804540BC 0004+00 s=1 e=0 z=0 None .sdata2 @4245 */
SECTION_SDATA2 static u32 lit_4245 = 0x45610000;
SECTION_SDATA2 static f32 lit_4245 = 3600.0f;
/* 801C18C0-801C1B14 0254+00 s=1 e=0 z=0 None .text
* getZoomMinMaxCheck__19dMenu_DmapMapCtrl_cFPfPfPfPfPbPb */
@@ -972,10 +950,10 @@ asm void dMenu_DmapMapCtrl_c::calcZoomCenter(f32* param_0, f32* param_1) {
/* ############################################################################################## */
/* 804540BC-804540C0 0004+00 s=1 e=0 z=0 None .sdata2 @4277 */
SECTION_SDATA2 static u32 lit_4277 = 0x4628C000;
SECTION_SDATA2 static f32 lit_4277 = 10800.0f;
/* 804540C0-804540C4 0004+00 s=1 e=0 z=0 None .sdata2 @4278 */
SECTION_SDATA2 static u32 lit_4278 = 0x3FC00000;
SECTION_SDATA2 static f32 lit_4278 = 1.5f;
/* 801C1BA4-801C1C40 009C+00 s=1 e=0 z=0 None .text getZoomCmPerPixel__19dMenu_DmapMapCtrl_cFv
*/
@@ -1184,7 +1162,7 @@ asm void dMenu_DmapMapCtrl_c::isEnableZoomMove() const {
/* ############################################################################################## */
/* 804540C4-804540C8 0004+00 s=1 e=0 z=0 None .sdata2 @4395 */
SECTION_SDATA2 static u32 lit_4395 = 0x3C23D70A;
SECTION_SDATA2 static f32 lit_4395 = 1.0f / 100.0f;
/* 801C205C-801C2198 013C+00 s=1 e=0 z=0 None .text zoomWait_proc__20dMenu_StageMapCtrl_cFv */
#pragma push
@@ -1314,10 +1292,10 @@ static u8 m_zoomCenterMinZ__20dMenu_StageMapCtrl_c[4];
static u8 m_zoomCenterMaxZ__20dMenu_StageMapCtrl_c[4 + 4 /* padding */];
/* 804540C8-804540CC 0004+00 s=1 e=0 z=0 None .sdata2 @4460 */
SECTION_SDATA2 static u32 lit_4460 = 0x3F99999A;
SECTION_SDATA2 static f32 lit_4460 = 6.0f / 5.0f;
/* 804540CC-804540D0 0004+00 s=1 e=0 z=0 None .sdata2 @4461 */
SECTION_SDATA2 static u32 lit_4461 = 0x43900000;
SECTION_SDATA2 static f32 lit_4461 = 288.0f;
/* 804540D0-804540D8 0004+04 s=1 e=0 z=0 None .sdata2 @4462 */
SECTION_SDATA2 static f32 lit_4462[1 + 1 /* padding */] = {
src/d/menu/d_menu_fishing.cpp
+6 -16
View File
@@ -28,11 +28,11 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct STControl {};
struct CSTControl {};
struct JKRExpHeap {};
struct CSTControl {};
struct STControl {};
struct dMenu_Fishing_c {
/* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*);
@@ -92,8 +92,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_menu_d_menu_fishing__stringBase0;
extern "C" void __ct__15dMenu_Fishing_cFP10JKRExpHeapP9STControlP10CSTControl();
extern "C" void __dt__15dMenu_Fishing_cFv();
extern "C" void _create__15dMenu_Fishing_cFv();
@@ -126,12 +124,6 @@ void mDoExt_getSubFont();
void dPaneClass_showNullPane(J2DScreen*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
extern "C" void mDoExt_getMesgFont__Fv();
@@ -274,10 +266,10 @@ SECTION_SDATA2 static u8 lit_3904[4] = {
};
/* 8045410C-80454110 0004+00 s=1 e=0 z=0 None .sdata2 @3905 */
SECTION_SDATA2 static u32 lit_3905 = 0x44180000;
SECTION_SDATA2 static f32 lit_3905 = 608.0f;
/* 80454110-80454114 0004+00 s=1 e=0 z=0 None .sdata2 @3906 */
SECTION_SDATA2 static u32 lit_3906 = 0x43E00000;
SECTION_SDATA2 static f32 lit_3906 = 448.0f;
/* 801C514C-801C5204 00B8+00 s=1 e=1 z=0 None .text _draw__15dMenu_Fishing_cFv */
#pragma push
@@ -435,12 +427,10 @@ SECTION_DEAD static char const* const pad_803960CD = "\0\0";
#pragma pop
/* 80454114-80454118 0004+00 s=1 e=0 z=0 None .sdata2 @4010 */
SECTION_SDATA2 static u32 lit_4010 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4010 = 1.0f;
/* 80454118-80454120 0008+00 s=2 e=0 z=0 None .sdata2 @4012 */
SECTION_SDATA2 static u8 lit_4012[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4012 = 4503601774854144.0 /* cast s32 to float */;
/* 801C52E4-801C5470 018C+00 s=0 e=2 z=0 None .text _open__15dMenu_Fishing_cFv */
#pragma push
src/d/menu/d_menu_fmap.cpp
+24 -35
View File
@@ -90,15 +90,15 @@ struct dMenu_Fmap_world_data_c {
struct dMenu_Fmap_stage_data_c {};
struct STControl {
/* 8003219C */ void checkTrigger();
};
struct CSTControl {};
struct JKRExpHeap {
/* 802CEE2C */ void create(u32, JKRHeap*, bool);
};
struct CSTControl {};
struct STControl {
/* 8003219C */ void checkTrigger();
};
struct dMenu_Fmap_c {
/* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8);
@@ -335,7 +335,6 @@ struct JKRAramArchive {};
//
void dMenuFmap_getStartStageName(void*);
extern "C" extern char const* const d_menu_d_menu_fmap__stringBase0;
extern "C" void __ct__9dMf_HIO_cFv();
extern "C" void dMenuFmap_getStartStageName__FPv();
@@ -489,14 +488,6 @@ void dMeter2Info_set2DVibrationM();
void cLib_addCalc2(f32*, f32, f32, f32);
void* operator new(u32);
void operator delete(void*);
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__19dMenuFmapIconDisp_c[3];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 struct_80450D64[4];
extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoExt_destroyExpHeap__FP10JKRExpHeap();
extern "C" void create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap();
@@ -1201,10 +1192,10 @@ SECTION_DATA static void* __vt__9dMf_HIO_c[3 + 1 /* padding */] = {
static u8 mMySelfPointer__9dMf_HIO_c[4];
/* 80454120-80454124 0004+00 s=1 e=0 z=0 None .sdata2 @3994 */
SECTION_SDATA2 static u32 lit_3994 = 0x3E4CCCCD;
SECTION_SDATA2 static f32 lit_3994 = 1.0f / 5.0f;
/* 80454124-80454128 0004+00 s=26 e=0 z=0 None .sdata2 @3995 */
SECTION_SDATA2 static u32 lit_3995 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3995 = 1.0f;
/* 801C65F8-801C662C 0034+00 s=1 e=0 z=0 None .text __ct__9dMf_HIO_cFv */
#pragma push
@@ -1243,16 +1234,16 @@ SECTION_SDATA2 static u8 lit_4158[4] = {
};
/* 8045412C-80454130 0004+00 s=3 e=0 z=0 None .sdata2 @4159 */
SECTION_SDATA2 static u32 lit_4159 = 0xC4180000;
SECTION_SDATA2 static f32 lit_4159 = -608.0f;
/* 80454130-80454134 0004+00 s=3 e=0 z=0 None .sdata2 @4160 */
SECTION_SDATA2 static u32 lit_4160 = 0x44180000;
SECTION_SDATA2 static f32 lit_4160 = 608.0f;
/* 80454134-80454138 0004+00 s=3 e=0 z=0 None .sdata2 @4161 */
SECTION_SDATA2 static u32 lit_4161 = 0xC3E00000;
SECTION_SDATA2 static f32 lit_4161 = -448.0f;
/* 80454138-8045413C 0004+00 s=3 e=0 z=0 None .sdata2 @4162 */
SECTION_SDATA2 static u32 lit_4162 = 0x43E00000;
SECTION_SDATA2 static f32 lit_4162 = 448.0f;
/* 801C66E4-801C6AC8 03E4+00 s=0 e=1 z=0 None .text
* __ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc */
@@ -1279,12 +1270,10 @@ asm dMenu_Fmap_c::~dMenu_Fmap_c() {
/* ############################################################################################## */
/* 8045413C-80454140 0004+00 s=12 e=0 z=0 None .sdata2 @4353 */
SECTION_SDATA2 static u32 lit_4353 = 0x41200000;
SECTION_SDATA2 static f32 lit_4353 = 10.0f;
/* 80454140-80454148 0008+00 s=16 e=0 z=0 None .sdata2 @4358 */
SECTION_SDATA2 static u8 lit_4358[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4358 = 4503601774854144.0 /* cast s32 to float */;
/* 801C6D64-801C74A4 0740+00 s=1 e=0 z=0 None .text _create__12dMenu_Fmap_cFv */
#pragma push
@@ -1309,13 +1298,13 @@ static u8 lit_3989[12];
static u8 g_fmHIO[20];
/* 80454148-8045414C 0004+00 s=1 e=0 z=0 None .sdata2 @4397 */
SECTION_SDATA2 static u32 lit_4397 = 0x3ECCCCCD;
SECTION_SDATA2 static f32 lit_4397 = 2.0f / 5.0f;
/* 8045414C-80454150 0004+00 s=2 e=0 z=0 None .sdata2 @4398 */
SECTION_SDATA2 static u32 lit_4398 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4398 = 0.5f;
/* 80454150-80454154 0004+00 s=1 e=0 z=0 None .sdata2 @4399 */
SECTION_SDATA2 static u32 lit_4399 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_4399 = 1.0f / 10.0f;
/* 801C74A8-801C7650 01A8+00 s=0 e=1 z=0 None .text _move__12dMenu_Fmap_cFv */
#pragma push
@@ -1339,7 +1328,7 @@ asm void dMenu_Fmap_c::_draw() {
/* ############################################################################################## */
/* 80454154-80454158 0004+00 s=19 e=0 z=0 None .sdata2 @4541 */
SECTION_SDATA2 static u32 lit_4541 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4541 = -1.0f;
/* 801C77F0-801C7AFC 030C+00 s=0 e=1 z=0 None .text getNextStatus__12dMenu_Fmap_cFPUc */
#pragma push
@@ -1437,10 +1426,10 @@ asm void dMenu_Fmap_c::region_map_init() {
/* ############################################################################################## */
/* 80454158-8045415C 0004+00 s=2 e=0 z=0 None .sdata2 @4939 */
SECTION_SDATA2 static u32 lit_4939 = 0x43980000;
SECTION_SDATA2 static f32 lit_4939 = 304.0f;
/* 8045415C-80454160 0004+00 s=2 e=0 z=0 None .sdata2 @4940 */
SECTION_SDATA2 static u32 lit_4940 = 0x43600000;
SECTION_SDATA2 static f32 lit_4940 = 224.0f;
/* 801C8600-801C8B00 0500+00 s=1 e=0 z=0 None .text region_map_proc__12dMenu_Fmap_cFv */
#pragma push
@@ -2215,7 +2204,7 @@ asm void dMenu_Fmap_c::setAreaNameZero() {
/* ############################################################################################## */
/* 80454160-80454164 0004+00 s=1 e=0 z=0 None .sdata2 @6855 */
SECTION_SDATA2 static u32 lit_6855 = 0x43FA0000;
SECTION_SDATA2 static f32 lit_6855 = 500.0f;
/* 801CC8DC-801CCA70 0194+00 s=2 e=0 z=0 None .text portalWarpMapMove__12dMenu_Fmap_cFP9STControl
*/
@@ -2260,7 +2249,7 @@ asm void dMenu_Fmap_c::resetRoomDataBit() {
/* ############################################################################################## */
/* 80454164-80454168 0004+00 s=2 e=0 z=0 None .sdata2 @6987 */
SECTION_SDATA2 static u32 lit_6987 = 0x3BB40000;
SECTION_SDATA2 static f32 lit_6987 = 0.0054931640625f;
/* 801CCB08-801CCD98 0290+00 s=2 e=0 z=0 None .text drawIcon__12dMenu_Fmap_cFfb */
#pragma push
@@ -2434,7 +2423,7 @@ asm void dMenu_Fmap_c::drawDebugStage() {
/* ############################################################################################## */
/* 80454168-8045416C 0004+00 s=1 e=0 z=0 None .sdata2 @7300 */
SECTION_SDATA2 static u32 lit_7300 = 0xC2480000;
SECTION_SDATA2 static f32 lit_7300 = -50.0f;
/* 801CD460-801CD5CC 016C+00 s=1 e=0 z=0 None .text arrowPosInit__12dMenu_Fmap_cFv */
#pragma push
@@ -2448,7 +2437,7 @@ asm void dMenu_Fmap_c::arrowPosInit() {
/* ############################################################################################## */
/* 8045416C-80454170 0004+00 s=2 e=0 z=0 None .sdata2 @7348 */
SECTION_SDATA2 static u32 lit_7348 = 0xC1A00000;
SECTION_SDATA2 static f32 lit_7348 = -20.0f;
/* 801CD5CC-801CD770 01A4+00 s=2 e=0 z=0 None .text tableArrowPosInit__12dMenu_Fmap_cFb */
#pragma push
@@ -2462,10 +2451,10 @@ asm void dMenu_Fmap_c::tableArrowPosInit(bool param_0) {
/* ############################################################################################## */
/* 80454170-80454174 0004+00 s=1 e=0 z=0 None .sdata2 @7356 */
SECTION_SDATA2 static u32 lit_7356 = 0xC7169878;
SECTION_SDATA2 static f32 lit_7356 = -38552.46875f;
/* 80454174-80454178 0004+00 s=1 e=0 z=0 None .sdata2 @7357 */
SECTION_SDATA2 static u32 lit_7357 = 0x4716F797;
SECTION_SDATA2 static f32 lit_7357 = 38647.58984375f;
/* 801CD770-801CD814 00A4+00 s=1 e=0 z=0 None .text yamibossArrowPosInit__12dMenu_Fmap_cFv */
#pragma push
src/d/menu/d_menu_fmap2D.cpp
+21 -35
View File
@@ -46,8 +46,6 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct JKRExpHeap {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -68,6 +66,8 @@ struct J2DScreen {
/* 802F9690 */ void animation();
};
struct JKRExpHeap {};
struct CPaneMgrAlpha {
/* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
/* 80255608 */ void hide();
@@ -242,8 +242,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_menu_d_menu_fmap2D__stringBase0;
extern "C" void __ct__18dMenu_Fmap2DBack_cFv();
extern "C" void __dt__18dMenu_Fmap2DBack_cFv();
extern "C" void draw__18dMenu_Fmap2DBack_cFv();
@@ -357,14 +355,6 @@ void operator delete(void*);
void J2DDrawLine(f32, f32, f32, f32, JUtility::TColor, int);
void J2DFillBox(f32, f32, f32, f32, JUtility::TColor);
void J2DDrawFrame(f32, f32, f32, f32, JUtility::TColor, u8);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
extern "C" void mDoExt_getMesgFont__Fv();
@@ -653,10 +643,10 @@ SECTION_SDATA2 static u8 lit_3970[4] = {
};
/* 804541D4-804541D8 0004+00 s=14 e=0 z=0 None .sdata2 @3971 */
SECTION_SDATA2 static u32 lit_3971 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3971 = 1.0f;
/* 804541D8-804541DC 0004+00 s=2 e=0 z=0 None .sdata2 @3972 */
SECTION_SDATA2 static u32 lit_3972 = 0x43B40000;
SECTION_SDATA2 static f32 lit_3972 = 360.0f;
/* 801CF56C-801CFCDC 0770+00 s=0 e=1 z=0 None .text __ct__18dMenu_Fmap2DBack_cFv */
#pragma push
@@ -680,30 +670,28 @@ asm dMenu_Fmap2DBack_c::~dMenu_Fmap2DBack_c() {
/* ############################################################################################## */
/* 804541DC-804541E0 0004+00 s=6 e=0 z=0 None .sdata2 @4199 */
SECTION_SDATA2 static u32 lit_4199 = 0x44180000;
SECTION_SDATA2 static f32 lit_4199 = 608.0f;
/* 804541E0-804541E4 0004+00 s=5 e=0 z=0 None .sdata2 @4200 */
SECTION_SDATA2 static u32 lit_4200 = 0x43E00000;
SECTION_SDATA2 static f32 lit_4200 = 448.0f;
/* 804541E4-804541E8 0004+00 s=4 e=0 z=0 None .sdata2 @4201 */
SECTION_SDATA2 static u32 lit_4201 = 0x437F0000;
SECTION_SDATA2 static f32 lit_4201 = 255.0f;
/* 804541E8-804541EC 0004+00 s=18 e=0 z=0 None .sdata2 @4202 */
SECTION_SDATA2 static u32 lit_4202 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4202 = 0.5f;
/* 804541EC-804541F0 0004+00 s=2 e=0 z=0 None .sdata2 @4203 */
SECTION_SDATA2 static u32 lit_4203 = 0x40000000;
SECTION_SDATA2 static f32 lit_4203 = 2.0f;
/* 804541F0-804541F4 0004+00 s=5 e=0 z=0 None .sdata2 @4204 */
SECTION_SDATA2 static u32 lit_4204 = 0x40400000;
SECTION_SDATA2 static f32 lit_4204 = 3.0f;
/* 804541F4-804541F8 0004+00 s=6 e=0 z=0 None .sdata2 @4205 */
SECTION_SDATA2 static u32 lit_4205 = 0x40C00000;
SECTION_SDATA2 static f32 lit_4205 = 6.0f;
/* 804541F8-80454200 0008+00 s=4 e=0 z=0 None .sdata2 @4207 */
SECTION_SDATA2 static u8 lit_4207[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4207 = 4503599627370496.0 /* cast u32 to float */;
/* 801CFF34-801D0804 08D0+00 s=1 e=0 z=0 None .text draw__18dMenu_Fmap2DBack_cFv */
#pragma push
@@ -1238,15 +1226,13 @@ asm void dMenu_Fmap2DBack_c::regionGridDraw() {
/* ############################################################################################## */
/* 80454208-80454210 0008+00 s=8 e=0 z=0 None .sdata2 @4496 */
SECTION_SDATA2 static u8 lit_4496[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4496 = 4503601774854144.0 /* cast s32 to float */;
/* 80454210-80454214 0004+00 s=1 e=0 z=0 None .sdata2 @5133 */
SECTION_SDATA2 static u32 lit_5133 = 0x80000000;
SECTION_SDATA2 static f32 lit_5133 = -0.0f;
/* 80454214-80454218 0004+00 s=1 e=0 z=0 None .sdata2 @5134 */
SECTION_SDATA2 static u32 lit_5134 = 0xC4180000;
SECTION_SDATA2 static f32 lit_5134 = -608.0f;
/* 801D382C-801D38FC 00D0+00 s=1 e=0 z=0 None .text worldOriginDraw__18dMenu_Fmap2DBack_cFv */
#pragma push
@@ -1301,10 +1287,10 @@ asm void dMenu_Fmap2DBack_c::calcBlink() {
/* ############################################################################################## */
/* 80454218-8045421C 0004+00 s=1 e=0 z=0 None .sdata2 @5433 */
SECTION_SDATA2 static u32 lit_5433 = 0x3ECCCCCD;
SECTION_SDATA2 static f32 lit_5433 = 2.0f / 5.0f;
/* 8045421C-80454220 0004+00 s=1 e=0 z=0 None .sdata2 @5434 */
SECTION_SDATA2 static u32 lit_5434 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_5434 = 1.0f / 10.0f;
/* 801D4928-801D49E0 00B8+00 s=0 e=1 z=0 None .text calcBackAlpha__18dMenu_Fmap2DBack_cFb */
#pragma push
@@ -1350,7 +1336,7 @@ asm void dMenu_Fmap2DBack_c::regionMapMove(STControl* param_0) {
/* ############################################################################################## */
/* 80454220-80454224 0004+00 s=1 e=0 z=0 None .sdata2 @5568 */
SECTION_SDATA2 static u32 lit_5568 = 0xBF800000;
SECTION_SDATA2 static f32 lit_5568 = -1.0f;
/* 801D4E80-801D5334 04B4+00 s=0 e=1 z=0 None .text
* stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb */
@@ -1376,10 +1362,10 @@ asm void dMenu_Fmap2DBack_c::setAllAlphaRate(f32 param_0, bool param_1) {
/* ############################################################################################## */
/* 80454224-80454228 0004+00 s=1 e=0 z=0 None .sdata2 @5632 */
SECTION_SDATA2 static u32 lit_5632 = 0x43980000;
SECTION_SDATA2 static f32 lit_5632 = 304.0f;
/* 80454228-8045422C 0004+00 s=1 e=0 z=0 None .sdata2 @5633 */
SECTION_SDATA2 static u32 lit_5633 = 0x43600000;
SECTION_SDATA2 static f32 lit_5633 = 224.0f;
/* 801D5388-801D564C 02C4+00 s=1 e=0 z=0 None .text drawDebugStageArea__18dMenu_Fmap2DBack_cFv
*/
@@ -1632,7 +1618,7 @@ asm void dMenu_Fmap2DTop_c::setArrowAlphaRatio(u8 param_0, f32 param_1) {
/* ############################################################################################## */
/* 8045422C-80454230 0004+00 s=2 e=0 z=0 None .sdata2 @6309 */
SECTION_SDATA2 static u32 lit_6309 = 0x40A00000;
SECTION_SDATA2 static f32 lit_6309 = 5.0f;
/* 801D77C4-801D7858 0094+00 s=1 e=0 z=0 None .text
* setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha */
src/d/menu/d_menu_fmap_map.cpp
+15 -29
View File
@@ -11,6 +11,12 @@
// Types:
//
struct dMenu_Fmap_region_data_c {
/* 8003DB70 */ void getPointStagePathInnerNo(f32, f32, int, int*, int*);
};
struct dMenu_Fmap_world_data_c {};
struct dDrawPath_c {
struct group_class {};
@@ -28,12 +34,6 @@ struct dDrawPath_c {
/* 8003CCC4 */ void drawPath();
};
struct dMenu_Fmap_region_data_c {
/* 8003DB70 */ void getPointStagePathInnerNo(f32, f32, int, int*, int*);
};
struct dMenu_Fmap_world_data_c {};
struct renderingFmap_c {
struct palette_e {};
@@ -125,7 +125,6 @@ struct Vec {};
static void twoValueLineInterpolation(u8, u8, f32);
static void twoColorLineInterporation(_GXColor const&, _GXColor const&, f32, _GXColor&);
extern "C" extern char const* const d_menu_d_menu_fmap_map__stringBase0;
extern "C" static void twoValueLineInterpolation__FUcUcf();
extern "C" static void twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor();
@@ -183,15 +182,6 @@ void* operator new(u32, int);
void* operator new[](u32, int);
void operator delete(void*);
void operator delete[](void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__28dDrawPathWithNormalPattern_c[16];
extern "C" extern void* __vt__15dRenderingMap_c[23];
extern "C" extern void* __vt__18dRenderingFDAmap_c[26];
extern "C" extern void* __vt__11dDrawPath_c[16];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_Counter[12 + 4 /* padding */];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u8 struct_80450D64[4];
extern "C" void mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs();
extern "C" void draw__12dDlst_base_cFv();
@@ -248,9 +238,7 @@ extern "C" extern u8 struct_80450D64[4];
/* ############################################################################################## */
/* 80454178-80454180 0008+00 s=3 e=0 z=0 None .sdata2 @3689 */
SECTION_SDATA2 static u8 lit_3689[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3689 = 4503599627370496.0 /* cast u32 to float */;
/* 801CE068-801CE0CC 0064+00 s=1 e=0 z=0 None .text twoValueLineInterpolation__FUcUcf */
#pragma push
@@ -295,7 +283,7 @@ asm void renderingFmap_c::init(u8* param_0, u16 param_1, u16 param_2, u16 param_
/* ############################################################################################## */
/* 80454184-80454188 0004+00 s=3 e=0 z=0 None .sdata2 @3711 */
SECTION_SDATA2 static u32 lit_3711 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3711 = 1.0f;
/* 801CE188-801CE224 009C+00 s=1 e=0 z=0 None .text
* entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff */
@@ -382,13 +370,13 @@ asm void renderingFmap_c::getPointStagePathInnerNo(dMenu_Fmap_region_data_c* par
/* ############################################################################################## */
/* 80454188-8045418C 0004+00 s=1 e=0 z=0 None .sdata2 @3769 */
SECTION_SDATA2 static u32 lit_3769 = 0xC59C4000;
SECTION_SDATA2 static f32 lit_3769 = -5000.0f;
/* 8045418C-80454190 0004+00 s=1 e=0 z=0 None .sdata2 @3770 */
SECTION_SDATA2 static u32 lit_3770 = 0x459C4000;
SECTION_SDATA2 static f32 lit_3770 = 5000.0f;
/* 80454190-80454194 0004+00 s=1 e=0 z=0 None .sdata2 @3771 */
SECTION_SDATA2 static u32 lit_3771 = 0xBF800000;
SECTION_SDATA2 static f32 lit_3771 = -1.0f;
/* 801CE410-801CE4D4 00C4+00 s=2 e=0 z=0 None .text preDrawPath__15renderingFmap_cFv */
#pragma push
@@ -684,10 +672,10 @@ SECTION_SDATA2 static u8 m_other__22dMfm_HIO_prm_res_src_s[1 + 3 /* padding */]
};
/* 80454198-8045419C 0004+00 s=1 e=0 z=0 None .sdata2 @4104 */
SECTION_SDATA2 static u32 lit_4104 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4104 = 0.5f;
/* 8045419C-804541A0 0004+00 s=1 e=0 z=0 None .sdata2 @4105 */
SECTION_SDATA2 static u32 lit_4105 = 0x47800000;
SECTION_SDATA2 static f32 lit_4105 = 65536.0f;
/* 804541A0-804541A8 0004+04 s=1 e=0 z=0 None .sdata2 @4106 */
SECTION_SDATA2 static f32 lit_4106[1 + 1 /* padding */] = {
@@ -697,9 +685,7 @@ SECTION_SDATA2 static f32 lit_4106[1 + 1 /* padding */] = {
};
/* 804541A8-804541B0 0008+00 s=2 e=0 z=0 None .sdata2 @4108 */
SECTION_SDATA2 static u8 lit_4108[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4108 = 4503601774854144.0 /* cast s32 to float */;
/* 801CEE94-801CF0B4 0220+00 s=1 e=0 z=0 None .text draw__15dMenu_FmapMap_cFv */
#pragma push
@@ -750,7 +736,7 @@ SECTION_SDATA2 static u8 l_lineWidthPatData2[5 + 3 /* padding */] = {
};
/* 804541C0-804541C4 0004+00 s=1 e=0 z=0 None .sdata2 @4152 */
SECTION_SDATA2 static u32 lit_4152 = 0x3FC00000;
SECTION_SDATA2 static f32 lit_4152 = 1.5f;
/* 801CF12C-801CF1D4 00A8+00 s=1 e=0 z=0 None .text getLineWidth__15dMenu_FmapMap_cFi */
#pragma push
src/d/menu/d_menu_insect.cpp
+17 -31
View File
@@ -62,14 +62,14 @@ struct dMsgScrn3Select_c {
struct JMSMesgEntry_c {};
struct JUTFont {};
struct ResTIMG {};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
};
struct JUTFont {};
struct dMeter2Info_c {
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
@@ -78,6 +78,10 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct CSTControl {};
struct JKRExpHeap {};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 8003242C */ void checkLeftTrigger();
@@ -86,10 +90,6 @@ struct STControl {
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct dMenu_Insect_c {
/* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8);
/* 801D82F4 */ ~dMenu_Insect_c();
@@ -168,8 +168,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_menu_d_menu_insect__stringBase0;
extern "C" void __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc();
extern "C" void __dt__14dMenu_Insect_cFv();
extern "C" void _create__14dMenu_Insect_cFv();
@@ -220,14 +218,6 @@ void dMeter2Info_set2DVibration();
void dPaneClass_showNullPane(J2DScreen*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
extern "C" void mDoExt_getMesgFont__Fv();
@@ -502,13 +492,13 @@ SECTION_DATA static void* __vt__14dMenu_Insect_c[4 + 3 /* padding */] = {
};
/* 80454238-8045423C 0004+00 s=6 e=0 z=0 None .sdata2 @3834 */
SECTION_SDATA2 static u32 lit_3834 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3834 = 1.0f;
/* 8045423C-80454240 0004+00 s=1 e=0 z=0 None .sdata2 @3835 */
SECTION_SDATA2 static u32 lit_3835 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_3835 = 1.0f / 10.0f;
/* 80454240-80454244 0004+00 s=1 e=0 z=0 None .sdata2 @3836 */
SECTION_SDATA2 static u32 lit_3836 = 0x3F333333;
SECTION_SDATA2 static f32 lit_3836 = 7.0f / 10.0f;
/* 80454244-80454248 0004+00 s=5 e=0 z=0 None .sdata2 @3837 */
SECTION_SDATA2 static u8 lit_3837[4] = {
@@ -562,16 +552,16 @@ asm void dMenu_Insect_c::_move() {
/* ############################################################################################## */
/* 80454248-8045424C 0004+00 s=1 e=0 z=0 None .sdata2 @3961 */
SECTION_SDATA2 static u32 lit_3961 = 0x44180000;
SECTION_SDATA2 static f32 lit_3961 = 608.0f;
/* 8045424C-80454250 0004+00 s=1 e=0 z=0 None .sdata2 @3962 */
SECTION_SDATA2 static u32 lit_3962 = 0x43E00000;
SECTION_SDATA2 static f32 lit_3962 = 448.0f;
/* 80454250-80454254 0004+00 s=1 e=0 z=0 None .sdata2 @3963 */
SECTION_SDATA2 static u32 lit_3963 = 0x43160000;
SECTION_SDATA2 static f32 lit_3963 = 150.0f;
/* 80454254-80454258 0004+00 s=1 e=0 z=0 None .sdata2 @3964 */
SECTION_SDATA2 static u32 lit_3964 = 0x43F30000;
SECTION_SDATA2 static f32 lit_3964 = 486.0f;
/* 80454258-80454260 0004+04 s=1 e=0 z=0 None .sdata2 @3965 */
SECTION_SDATA2 static f32 lit_3965[1 + 1 /* padding */] = {
@@ -612,9 +602,7 @@ asm void dMenu_Insect_c::init() {
/* ############################################################################################## */
/* 80454260-80454268 0008+00 s=2 e=0 z=0 None .sdata2 @4020 */
SECTION_SDATA2 static u8 lit_4020[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4020 = 4503601774854144.0 /* cast s32 to float */;
/* 801D894C-801D8B2C 01E0+00 s=0 e=3 z=0 None .text _open__14dMenu_Insect_cFv */
#pragma push
@@ -648,7 +636,7 @@ asm void dMenu_Insect_c::wait_init() {
/* ############################################################################################## */
/* 80454268-8045426C 0004+00 s=4 e=0 z=0 None .sdata2 @4089 */
SECTION_SDATA2 static u32 lit_4089 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4089 = -1.0f;
/* 801D8CCC-801D8E00 0134+00 s=1 e=0 z=0 None .text wait_move__14dMenu_Insect_cFv */
#pragma push
@@ -662,7 +650,7 @@ asm void dMenu_Insect_c::wait_move() {
/* ############################################################################################## */
/* 8045426C-80454270 0004+00 s=1 e=0 z=0 None .sdata2 @4135 */
SECTION_SDATA2 static u32 lit_4135 = 0x42400000;
SECTION_SDATA2 static f32 lit_4135 = 48.0f;
/* 80454270-80454278 0004+04 s=1 e=0 z=0 None .sdata2 @4136 */
SECTION_SDATA2 static f32 lit_4136[1 + 1 /* padding */] = {
@@ -672,9 +660,7 @@ SECTION_SDATA2 static f32 lit_4136[1 + 1 /* padding */] = {
};
/* 80454278-80454280 0008+00 s=1 e=0 z=0 None .sdata2 @4138 */
SECTION_SDATA2 static u8 lit_4138[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4138 = 4503599627370496.0 /* cast u32 to float */;
/* 801D8E00-801D91E4 03E4+00 s=1 e=0 z=0 None .text explain_open_init__14dMenu_Insect_cFv */
#pragma push
src/d/menu/d_menu_item_explain.cpp
+25 -37
View File
@@ -50,10 +50,6 @@ struct dMsgScrn3Select_c {
struct JMSMesgEntry_c {};
struct JUTFont {};
struct ResTIMG {};
struct JGeometry {
template <typename A1>
struct TBox2 {};
@@ -63,11 +59,15 @@ struct JGeometry {
struct ResTLUT {};
struct ResTIMG {};
struct J2DPicture {
/* 802FC708 */ J2DPicture(ResTIMG const*);
/* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
};
struct JUTFont {};
struct dMeter2Info_c {
/* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
/* 8021C7FC */ void getStringLength(JUTFont*, f32, f32, char*);
@@ -75,18 +75,18 @@ struct dMeter2Info_c {
J2DPicture*, void*, J2DPicture*, int);
};
struct JKRArchive {};
struct J2DOrthoGraph {};
struct JKRExpHeap {};
struct STControl {
/* 8003219C */ void checkTrigger();
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct JKRArchive {};
struct dMenu_ItemExplain_c {
/* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
/* 801DAFF0 */ ~dMenu_ItemExplain_c();
@@ -174,8 +174,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_menu_d_menu_item_explain__stringBase0;
extern "C" void __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb();
extern "C" void __dt__19dMenu_ItemExplain_cFv();
extern "C" void move__19dMenu_ItemExplain_cFv();
@@ -215,12 +213,6 @@ void dMeter2Info_getNumberTextureName(int);
void dMeter2Info_set2DVibration();
void* operator new(u32);
void operator delete(void*);
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_ringHIO[344];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoExt_getMesgFont__Fv();
extern "C" void dComIfGs_isDungeonItemWarp__Fi();
@@ -456,13 +448,13 @@ SECTION_SDATA2 static u8 lit_4062[4] = {
};
/* 8045428C-80454290 0004+00 s=4 e=0 z=0 None .sdata2 @4063 */
SECTION_SDATA2 static u32 lit_4063 = 0x43490000;
SECTION_SDATA2 static f32 lit_4063 = 201.0f;
/* 80454290-80454294 0004+00 s=1 e=0 z=0 None .sdata2 @4064 */
SECTION_SDATA2 static u32 lit_4064 = 0x41800000;
SECTION_SDATA2 static f32 lit_4064 = 16.0f;
/* 80454294-80454298 0004+00 s=2 e=0 z=0 None .sdata2 @4065 */
SECTION_SDATA2 static u32 lit_4065 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4065 = 0.5f;
/* 80454298-804542A0 0004+04 s=1 e=0 z=0 None .sdata2 @4066 */
SECTION_SDATA2 static f32 lit_4066[1 + 1 /* padding */] = {
@@ -472,9 +464,7 @@ SECTION_SDATA2 static f32 lit_4066[1 + 1 /* padding */] = {
};
/* 804542A0-804542A8 0008+00 s=1 e=0 z=0 None .sdata2 @4068 */
SECTION_SDATA2 static u8 lit_4068[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4068 = 4503601774854144.0 /* cast s32 to float */;
/* 801DA754-801DAFF0 089C+00 s=0 e=2 z=0 None .text
* __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb */
@@ -510,19 +500,19 @@ asm void dMenu_ItemExplain_c::move() {
/* ############################################################################################## */
/* 804542A8-804542AC 0004+00 s=1 e=0 z=0 None .sdata2 @4302 */
SECTION_SDATA2 static u32 lit_4302 = 0x44180000;
SECTION_SDATA2 static f32 lit_4302 = 608.0f;
/* 804542AC-804542B0 0004+00 s=1 e=0 z=0 None .sdata2 @4303 */
SECTION_SDATA2 static u32 lit_4303 = 0x43E00000;
SECTION_SDATA2 static f32 lit_4303 = 448.0f;
/* 804542B0-804542B4 0004+00 s=5 e=0 z=0 None .sdata2 @4304 */
SECTION_SDATA2 static u32 lit_4304 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4304 = -1.0f;
/* 804542B4-804542B8 0004+00 s=1 e=0 z=0 None .sdata2 @4305 */
SECTION_SDATA2 static u32 lit_4305 = 0x43F30000;
SECTION_SDATA2 static f32 lit_4305 = 486.0f;
/* 804542B8-804542BC 0004+00 s=1 e=0 z=0 None .sdata2 @4306 */
SECTION_SDATA2 static u32 lit_4306 = 0x43510000;
SECTION_SDATA2 static f32 lit_4306 = 209.0f;
/* 801DB514-801DB744 0230+00 s=0 e=2 z=0 None .text draw__19dMenu_ItemExplain_cFP13J2DOrthoGraph
*/
@@ -537,13 +527,13 @@ asm void dMenu_ItemExplain_c::draw(J2DOrthoGraph* param_0) {
/* ############################################################################################## */
/* 804542BC-804542C0 0004+00 s=2 e=0 z=0 None .sdata2 @4346 */
SECTION_SDATA2 static u32 lit_4346 = 0x42400000;
SECTION_SDATA2 static f32 lit_4346 = 48.0f;
/* 804542C0-804542C4 0004+00 s=1 e=0 z=0 None .sdata2 @4347 */
SECTION_SDATA2 static u32 lit_4347 = 0x40A00000;
SECTION_SDATA2 static f32 lit_4347 = 5.0f;
/* 804542C4-804542C8 0004+00 s=8 e=0 z=0 None .sdata2 @4348 */
SECTION_SDATA2 static u32 lit_4348 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4348 = 1.0f;
/* 801DB744-801DB818 00D4+00 s=1 e=0 z=0 None .text drawKantera__19dMenu_ItemExplain_cFv */
#pragma push
@@ -577,10 +567,10 @@ asm void dMenu_ItemExplain_c::open_init() {
/* ############################################################################################## */
/* 804542C8-804542CC 0004+00 s=1 e=0 z=0 None .sdata2 @4452 */
SECTION_SDATA2 static u32 lit_4452 = 0x40000000;
SECTION_SDATA2 static f32 lit_4452 = 2.0f;
/* 804542CC-804542D0 0004+00 s=1 e=0 z=0 None .sdata2 @4453 */
SECTION_SDATA2 static u32 lit_4453 = 0x43160000;
SECTION_SDATA2 static f32 lit_4453 = 150.0f;
/* 801DBAB4-801DBB50 009C+00 s=1 e=0 z=0 None .text open_proc__19dMenu_ItemExplain_cFv */
#pragma push
@@ -710,7 +700,7 @@ asm void dMenu_ItemExplain_c::openExplainTx(u32 param_0, u32 param_1) {
/* ############################################################################################## */
/* 804542D0-804542D4 0004+00 s=1 e=0 z=0 None .sdata2 @4820 */
SECTION_SDATA2 static u32 lit_4820 = 0x40E00000;
SECTION_SDATA2 static f32 lit_4820 = 7.0f;
/* 801DC7AC-801DC7FC 0050+00 s=1 e=2 z=0 None .text getAlphaRatio__19dMenu_ItemExplain_cFv */
#pragma push
@@ -745,12 +735,10 @@ asm void dMenu_ItemExplain_c::getWarpMarkFlag() {
/* ############################################################################################## */
/* 804542D4-804542D8 0004+00 s=1 e=0 z=0 None .sdata2 @4948 */
SECTION_SDATA2 static u32 lit_4948 = 0x42C80000;
SECTION_SDATA2 static f32 lit_4948 = 100.0f;
/* 804542D8-804542E0 0008+00 s=1 e=0 z=0 None .sdata2 @4950 */
SECTION_SDATA2 static u8 lit_4950[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4950 = 4503599627370496.0 /* cast u32 to float */;
/* 801DCBBC-801DCC8C 00D0+00 s=2 e=0 z=0 None .text setScale__19dMenu_ItemExplain_cFv */
#pragma push
src/d/menu/d_menu_letter.cpp
+17 -31
View File
@@ -37,6 +37,8 @@ struct dSelect_cursor_c {
/* 801952A0 */ void setAlphaRate(f32);
};
struct COutFont_c {};
struct J2DTextBox {
/* 801DFA28 */ void getWhite() const;
/* 801DFA34 */ void getBlack() const;
@@ -46,8 +48,6 @@ struct J2DTextBox {
struct JUTFont {};
struct COutFont_c {};
struct dMsgString_c {
/* 801E1D10 */ void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
u8);
@@ -77,15 +77,15 @@ struct dMeter2Info_c {
/* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
};
struct CSTControl {};
struct JKRExpHeap {};
struct STControl {
/* 80032524 */ void checkUpTrigger();
/* 800325A0 */ void checkDownTrigger();
};
struct JKRExpHeap {};
struct CSTControl {};
struct dMenu_Letter_c {
/* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*);
/* 801DCF34 */ ~dMenu_Letter_c();
@@ -187,8 +187,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_menu_d_menu_letter__stringBase0;
extern "C" void __ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl();
extern "C" void __dt__14dMenu_Letter_cFv();
extern "C" void _create__14dMenu_Letter_cFv();
@@ -253,14 +251,6 @@ void dPaneClass_showNullPane(J2DScreen*);
void cLib_addCalc2(f32*, f32, f32, f32);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 letter_data__12dMenu_Letter[512];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap();
extern "C" void mDoExt_getMesgFont__Fv();
@@ -503,7 +493,7 @@ SECTION_SDATA2 static u8 lit_3827[4] = {
};
/* 804542E4-804542E8 0004+00 s=10 e=0 z=0 None .sdata2 @3828 */
SECTION_SDATA2 static u32 lit_3828 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3828 = 1.0f;
/* 801DCDC0-801DCF34 0174+00 s=0 e=2 z=0 None .text
* __ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl */
@@ -528,16 +518,16 @@ asm dMenu_Letter_c::~dMenu_Letter_c() {
/* ############################################################################################## */
/* 804542E8-804542EC 0004+00 s=1 e=0 z=0 None .sdata2 @3964 */
SECTION_SDATA2 static u32 lit_3964 = 0x3F87AE14;
SECTION_SDATA2 static f32 lit_3964 = 53.0f / 50.0f;
/* 804542EC-804542F0 0004+00 s=1 e=0 z=0 None .sdata2 @3965 */
SECTION_SDATA2 static u32 lit_3965 = 0x3F666666;
SECTION_SDATA2 static f32 lit_3965 = 9.0f / 10.0f;
/* 804542F0-804542F4 0004+00 s=1 e=0 z=0 None .sdata2 @3966 */
SECTION_SDATA2 static u32 lit_3966 = 0x3CA3D70A;
SECTION_SDATA2 static f32 lit_3966 = 1.0f / 50.0f;
/* 804542F4-804542F8 0004+00 s=1 e=0 z=0 None .sdata2 @3967 */
SECTION_SDATA2 static u32 lit_3967 = 0x3ECCCCCD;
SECTION_SDATA2 static f32 lit_3967 = 2.0f / 5.0f;
/* 801DD36C-801DD474 0108+00 s=1 e=0 z=0 None .text _create__14dMenu_Letter_cFv */
#pragma push
@@ -561,10 +551,10 @@ asm void dMenu_Letter_c::_move() {
/* ############################################################################################## */
/* 804542F8-804542FC 0004+00 s=1 e=0 z=0 None .sdata2 @4054 */
SECTION_SDATA2 static u32 lit_4054 = 0x44180000;
SECTION_SDATA2 static f32 lit_4054 = 608.0f;
/* 804542FC-80454300 0004+00 s=1 e=0 z=0 None .sdata2 @4055 */
SECTION_SDATA2 static u32 lit_4055 = 0x43E00000;
SECTION_SDATA2 static f32 lit_4055 = 448.0f;
/* 80454300-80454308 0004+04 s=3 e=0 z=0 None .sdata2 @4056 */
SECTION_SDATA2 static f32 lit_4056[1 + 1 /* padding */] = {
@@ -574,9 +564,7 @@ SECTION_SDATA2 static f32 lit_4056[1 + 1 /* padding */] = {
};
/* 80454308-80454310 0008+00 s=3 e=0 z=0 None .sdata2 @4058 */
SECTION_SDATA2 static u8 lit_4058[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4058 = 4503599627370496.0 /* cast u32 to float */;
/* 801DD50C-801DD934 0428+00 s=1 e=1 z=0 None .text _draw__14dMenu_Letter_cFv */
#pragma push
@@ -778,9 +766,7 @@ SECTION_DEAD char const* const stringBase_80396E82 = "zelda_collect_soubi_do_ico
#pragma pop
/* 80454310-80454318 0008+00 s=7 e=0 z=0 None .sdata2 @4171 */
SECTION_SDATA2 static u8 lit_4171[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4171 = 4503601774854144.0 /* cast s32 to float */;
/* 801DDA74-801DDC98 0224+00 s=0 e=2 z=0 None .text _open__14dMenu_Letter_cFv */
#pragma push
@@ -834,10 +820,10 @@ asm void dMenu_Letter_c::slide_right_init() {
/* ############################################################################################## */
/* 80454318-8045431C 0004+00 s=3 e=0 z=0 None .sdata2 @4308 */
SECTION_SDATA2 static u32 lit_4308 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4308 = 0.5f;
/* 8045431C-80454320 0004+00 s=2 e=0 z=0 None .sdata2 @4309 */
SECTION_SDATA2 static u32 lit_4309 = 0x42480000;
SECTION_SDATA2 static f32 lit_4309 = 50.0f;
/* 80454320-80454328 0004+04 s=2 e=0 z=0 None .sdata2 @4310 */
SECTION_SDATA2 static f32 lit_4310[1 + 1 /* padding */] = {
src/d/menu/d_menu_map_common.cpp
+9 -17
View File
@@ -55,8 +55,6 @@ struct J2DPane {
// Forward References:
//
extern "C" extern char const* const d_menu_d_menu_map_common__stringBase0;
extern "C" void __ct__16dMenuMapCommon_cFv();
extern "C" void __dt__16dMenuMapCommon_cFv();
extern "C" void initiate__16dMenuMapCommon_cFP10JKRArchive();
@@ -78,8 +76,6 @@ extern "C" extern char const* const d_menu_d_menu_map_common__stringBase0;
void* operator new(u32);
void operator delete(void*);
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" void __ct__16dSelect_cursor_cFUcfP10JKRArchive();
extern "C" void setScale__16dSelect_cursor_cFf();
@@ -202,7 +198,7 @@ SECTION_DEAD static char const* const pad_80395D8F = "";
#pragma pop
/* 804540DC-804540E0 0004+00 s=7 e=0 z=0 None .sdata2 @3882 */
SECTION_SDATA2 static u32 lit_3882 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3882 = 1.0f;
/* 801C28D8-801C38E4 100C+00 s=0 e=2 z=0 None .text initiate__16dMenuMapCommon_cFP10JKRArchive
*/
@@ -217,16 +213,16 @@ asm void dMenuMapCommon_c::initiate(JKRArchive* param_0) {
/* ############################################################################################## */
/* 804540E0-804540E4 0004+00 s=1 e=0 z=0 None .sdata2 @4010 */
SECTION_SDATA2 static u32 lit_4010 = 0x437F0000;
SECTION_SDATA2 static f32 lit_4010 = 255.0f;
/* 804540E4-804540E8 0004+00 s=1 e=0 z=0 None .sdata2 @4011 */
SECTION_SDATA2 static u32 lit_4011 = 0x3F124925;
SECTION_SDATA2 static f32 lit_4011 = 4.0f / 7.0f;
/* 804540E8-804540EC 0004+00 s=3 e=0 z=0 None .sdata2 @4012 */
SECTION_SDATA2 static u32 lit_4012 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4012 = 0.5f;
/* 804540EC-804540F0 0004+00 s=1 e=0 z=0 None .sdata2 @4013 */
SECTION_SDATA2 static u32 lit_4013 = 0x43340000;
SECTION_SDATA2 static f32 lit_4013 = 180.0f;
/* 801C38E4-801C3EC4 05E0+00 s=0 e=2 z=0 None .text drawIcon__16dMenuMapCommon_cFffff */
#pragma push
@@ -240,10 +236,10 @@ asm void dMenuMapCommon_c::drawIcon(f32 param_0, f32 param_1, f32 param_2, f32 p
/* ############################################################################################## */
/* 804540F0-804540F4 0004+00 s=1 e=0 z=0 None .sdata2 @4072 */
SECTION_SDATA2 static u32 lit_4072 = 0x3F17B426;
SECTION_SDATA2 static f32 lit_4072 = 16.0f / 27.0f;
/* 804540F4-804540F8 0004+00 s=1 e=0 z=0 None .sdata2 @4073 */
SECTION_SDATA2 static u32 lit_4073 = 0x3ED097B4;
SECTION_SDATA2 static f32 lit_4073 = 11.0f / 27.0f;
/* 801C3EC4-801C43A8 04E4+00 s=0 e=4 z=0 None .text iconScale__16dMenuMapCommon_cFifff */
#pragma push
@@ -289,9 +285,7 @@ asm void dMenuMapCommon_c::setBlendRatio(u8 param_0, f32 param_1, f32 param_2) {
/* ############################################################################################## */
/* 804540F8-80454100 0008+00 s=2 e=0 z=0 None .sdata2 @4119 */
SECTION_SDATA2 static u8 lit_4119[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4119 = 4503601774854144.0 /* cast s32 to float */;
/* 801C452C-801C4600 00D4+00 s=0 e=1 z=0 None .text blinkMove__16dMenuMapCommon_cFs */
#pragma push
@@ -305,9 +299,7 @@ asm void dMenuMapCommon_c::blinkMove(s16 param_0) {
/* ############################################################################################## */
/* 80454100-80454108 0008+00 s=1 e=0 z=0 None .sdata2 @4140 */
SECTION_SDATA2 static u8 lit_4140[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4140 = 4503599627370496.0 /* cast u32 to float */;
/* 801C4600-801C4738 0138+00 s=0 e=1 z=0 None .text moveLightDropAnime__16dMenuMapCommon_cFv
*/
src/d/menu/d_menu_option.cpp
+18 -35
View File
@@ -240,10 +240,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern u8 const data_803974D8[32];
extern "C" extern u8 const data_80397560[40];
extern "C" extern char const* const d_menu_d_menu_option__stringBase0;
extern "C" void __ct__14dMenu_Option_cFP10JKRArchiveP9STControl();
extern "C" void __dt__14dMenu_Option_cFv();
extern "C" void _create__14dMenu_Option_cFv();
@@ -333,15 +329,6 @@ void dPaneClass_showNullPane(J2DScreen*);
void cLib_addCalc2(f32*, f32, f32, f32);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern u8 m_gamePad__8mDoCPd_c[16];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_drawHIO[3880];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mFader__13mDoGph_gInf_c[4];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" extern u8 sRumbleSupported__10JUTGamePad[4];
extern "C" void mDoExt_getMesgFont__Fv();
extern "C" void mDoExt_getRubyFont__Fv();
@@ -1188,7 +1175,7 @@ SECTION_SDATA2 static u8 lit_4068[4] = {
};
/* 80454330-80454334 0004+00 s=18 e=0 z=0 None .sdata2 @4069 */
SECTION_SDATA2 static u32 lit_4069 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4069 = 1.0f;
/* 801E205C-801E2C1C 0BC0+00 s=1 e=0 z=0 None .text _create__14dMenu_Option_cFv */
#pragma push
@@ -1222,7 +1209,7 @@ asm void dMenu_Option_c::_move() {
/* ############################################################################################## */
/* 80454334-80454338 0004+00 s=1 e=0 z=0 None .sdata2 @4442 */
SECTION_SDATA2 static u32 lit_4442 = 0x44180000;
SECTION_SDATA2 static f32 lit_4442 = 608.0f;
/* 80454338-80454340 0004+04 s=1 e=0 z=0 None .sdata2 @4443 */
SECTION_SDATA2 static f32 lit_4443[1 + 1 /* padding */] = {
@@ -1232,9 +1219,7 @@ SECTION_SDATA2 static f32 lit_4443[1 + 1 /* padding */] = {
};
/* 80454340-80454348 0008+00 s=1 e=0 z=0 None .sdata2 @4445 */
SECTION_SDATA2 static u8 lit_4445[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4445 = 4503599627370496.0 /* cast u32 to float */;
/* 801E36CC-801E38CC 0200+00 s=1 e=1 z=0 None .text _draw__14dMenu_Option_cFv */
#pragma push
@@ -1248,16 +1233,16 @@ asm void dMenu_Option_c::_draw() {
/* ############################################################################################## */
/* 80454348-8045434C 0004+00 s=1 e=0 z=0 None .sdata2 @4469 */
SECTION_SDATA2 static u32 lit_4469 = 0x4089999A;
SECTION_SDATA2 static f32 lit_4469 = 43.0f / 10.0f;
/* 8045434C-80454350 0004+00 s=1 e=0 z=0 None .sdata2 @4470 */
SECTION_SDATA2 static u32 lit_4470 = 0xC0A00000;
SECTION_SDATA2 static f32 lit_4470 = -5.0f;
/* 80454350-80454354 0004+00 s=5 e=0 z=0 None .sdata2 @4471 */
SECTION_SDATA2 static u32 lit_4471 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4471 = 0.5f;
/* 80454354-80454358 0004+00 s=11 e=0 z=0 None .sdata2 @4472 */
SECTION_SDATA2 static u32 lit_4472 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4472 = -1.0f;
/* 801E38CC-801E3A7C 01B0+00 s=1 e=0 z=0 None .text drawHaihai__14dMenu_Option_cFv */
#pragma push
@@ -1301,9 +1286,7 @@ asm void dMenu_Option_c::checkRightTrigger() {
/* ############################################################################################## */
/* 80454358-80454360 0008+00 s=8 e=0 z=0 None .sdata2 @4520 */
SECTION_SDATA2 static u8 lit_4520[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4520 = 4503601774854144.0 /* cast s32 to float */;
/* 801E3AEC-801E3B98 00AC+00 s=4 e=0 z=0 None .text setAnimation__14dMenu_Option_cFv */
#pragma push
@@ -1407,7 +1390,7 @@ asm void dMenu_Option_c::change_init() {
/* ############################################################################################## */
/* 80454360-80454364 0004+00 s=2 e=0 z=0 None .sdata2 @4862 */
SECTION_SDATA2 static u32 lit_4862 = 0x40A00000;
SECTION_SDATA2 static f32 lit_4862 = 5.0f;
/* 801E48E8-801E4B34 024C+00 s=1 e=0 z=0 None .text change_move__14dMenu_Option_cFv */
#pragma push
@@ -1431,10 +1414,10 @@ asm void dMenu_Option_c::confirm_open_init() {
/* ############################################################################################## */
/* 80454364-80454368 0004+00 s=2 e=0 z=0 None .sdata2 @4893 */
SECTION_SDATA2 static u32 lit_4893 = 0x3ECCCCCD;
SECTION_SDATA2 static f32 lit_4893 = 2.0f / 5.0f;
/* 80454368-8045436C 0004+00 s=2 e=0 z=0 None .sdata2 @4894 */
SECTION_SDATA2 static u32 lit_4894 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_4894 = 1.0f / 10.0f;
/* 801E4C10-801E4CE4 00D4+00 s=1 e=0 z=0 None .text confirm_open_move__14dMenu_Option_cFv */
#pragma push
@@ -1493,13 +1476,13 @@ asm void dMenu_Option_c::confirm_close_init() {
/* ############################################################################################## */
/* 8045436C-80454370 0004+00 s=2 e=0 z=0 None .sdata2 @5026 */
SECTION_SDATA2 static u32 lit_5026 = 0x3F8147AE;
SECTION_SDATA2 static f32 lit_5026 = 101.0f / 100.0f;
/* 80454370-80454374 0004+00 s=2 e=0 z=0 None .sdata2 @5027 */
SECTION_SDATA2 static u32 lit_5027 = 0x3F59999A;
SECTION_SDATA2 static f32 lit_5027 = 17.0f / 20.0f;
/* 80454374-80454378 0004+00 s=2 e=0 z=0 None .sdata2 @5028 */
SECTION_SDATA2 static u32 lit_5028 = 0x3CA3D70A;
SECTION_SDATA2 static f32 lit_5028 = 1.0f / 50.0f;
/* 801E4FB0-801E51CC 021C+00 s=1 e=0 z=0 None .text confirm_close_move__14dMenu_Option_cFv */
#pragma push
@@ -1813,7 +1796,7 @@ bool dMenu_Option_c::dpdMenuMove() {
/* ############################################################################################## */
/* 80454378-8045437C 0004+00 s=1 e=0 z=0 None .sdata2 @6256 */
SECTION_SDATA2 static u32 lit_6256 = 0x41200000;
SECTION_SDATA2 static f32 lit_6256 = 10.0f;
/* 801E80B4-801E8210 015C+00 s=1 e=0 z=0 None .text paneResize__14dMenu_Option_cFUx */
#pragma push
@@ -1879,13 +1862,13 @@ asm void dMenu_Option_c::yesnoSelectMoveAnm() {
/* ############################################################################################## */
/* 8045437C-80454380 0004+00 s=1 e=0 z=0 None .sdata2 @6507 */
SECTION_SDATA2 static u32 lit_6507 = 0x3F75C28F;
SECTION_SDATA2 static f32 lit_6507 = 24.0f / 25.0f;
/* 80454380-80454384 0004+00 s=1 e=0 z=0 None .sdata2 @6508 */
SECTION_SDATA2 static u32 lit_6508 = 0x3F570A3D;
SECTION_SDATA2 static f32 lit_6508 = 21.0f / 25.0f;
/* 80454384-80454388 0004+00 s=1 e=0 z=0 None .sdata2 @6509 */
SECTION_SDATA2 static u32 lit_6509 = 0x3D75C28F;
SECTION_SDATA2 static f32 lit_6509 = 3.0f / 50.0f;
/* 801E8888-801E89F8 0170+00 s=2 e=0 z=0 None .text yesnoCursorShow__14dMenu_Option_cFv */
#pragma push
src/d/menu/d_menu_ring.cpp
+29 -49
View File
@@ -65,11 +65,11 @@ struct dMeter2Draw_c {
JUtility::TColor, JUtility::TColor, f32, u8);
};
struct STControl {};
struct CSTControl {};
struct JKRExpHeap {};
struct CSTControl {};
struct STControl {};
struct dMenu_Ring_c {
/* 801E9118 */ dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8);
@@ -204,9 +204,6 @@ struct CPaneMgr {
// Forward References:
//
extern "C" extern char const* const d_menu_d_menu_ring__stringBase0;
extern "C" extern u8 pad_80454434[4];
extern "C" void __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc();
extern "C" void __dt__12dMenu_Ring_cFv();
extern "C" void _create__12dMenu_Ring_cFv();
@@ -291,15 +288,6 @@ void* operator new[](u32);
void operator delete(void*);
void operator delete[](void*);
void J2DDrawFrame(f32, f32, f32, f32, JUtility::TColor, u8);
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* item_resource__10dItem_data[1530];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_ringHIO[344];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u32 __float_nan;
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoExt_getMesgFont__Fv();
extern "C" void dComIfGs_setSelectItemIndex__FiUc();
@@ -606,31 +594,31 @@ SECTION_SDATA2 static u8 lit_4300[4] = {
};
/* 8045438C-80454390 0004+00 s=3 e=0 z=0 None .sdata2 @4301 */
SECTION_SDATA2 static u32 lit_4301 = 0x43E00000;
SECTION_SDATA2 static f32 lit_4301 = 448.0f;
/* 80454390-80454394 0004+00 s=3 e=0 z=0 None .sdata2 @4302 */
SECTION_SDATA2 static u32 lit_4302 = 0xC3E00000;
SECTION_SDATA2 static f32 lit_4302 = -448.0f;
/* 80454394-80454398 0004+00 s=3 e=0 z=0 None .sdata2 @4303 */
SECTION_SDATA2 static u32 lit_4303 = 0x44180000;
SECTION_SDATA2 static f32 lit_4303 = 608.0f;
/* 80454398-8045439C 0004+00 s=3 e=0 z=0 None .sdata2 @4304 */
SECTION_SDATA2 static u32 lit_4304 = 0xC4180000;
SECTION_SDATA2 static f32 lit_4304 = -608.0f;
/* 8045439C-804543A0 0004+00 s=18 e=0 z=0 None .sdata2 @4305 */
SECTION_SDATA2 static u32 lit_4305 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4305 = 1.0f;
/* 804543A0-804543A4 0004+00 s=2 e=0 z=0 None .sdata2 @4306 */
SECTION_SDATA2 static u32 lit_4306 = 0x42C80000;
SECTION_SDATA2 static f32 lit_4306 = 100.0f;
/* 804543A4-804543A8 0004+00 s=5 e=0 z=0 None .sdata2 @4307 */
SECTION_SDATA2 static u32 lit_4307 = 0x42400000;
SECTION_SDATA2 static f32 lit_4307 = 48.0f;
/* 804543A8-804543AC 0004+00 s=4 e=0 z=0 None .sdata2 @4308 */
SECTION_SDATA2 static u32 lit_4308 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_4308 = 1.0f / 10.0f;
/* 804543AC-804543B0 0004+00 s=4 e=0 z=0 None .sdata2 @4309 */
SECTION_SDATA2 static u32 lit_4309 = 0x3F19999A;
SECTION_SDATA2 static f32 lit_4309 = 3.0f / 5.0f;
/* 804543B0-804543B8 0004+04 s=7 e=0 z=0 None .sdata2 @4310 */
SECTION_SDATA2 static f32 lit_4310[1 + 1 /* padding */] = {
@@ -640,9 +628,7 @@ SECTION_SDATA2 static f32 lit_4310[1 + 1 /* padding */] = {
};
/* 804543B8-804543C0 0008+00 s=5 e=0 z=0 None .sdata2 @4312 */
SECTION_SDATA2 static u8 lit_4312[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4312 = 4503599627370496.0 /* cast u32 to float */;
/* 801E9118-801EA708 15F0+00 s=0 e=1 z=0 None .text
* __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc */
@@ -721,9 +707,7 @@ asm void dMenu_Ring_c::setKanteraPos(f32 param_0, f32 param_1) {
/* ############################################################################################## */
/* 804543C8-804543D0 0008+00 s=6 e=0 z=0 None .sdata2 @4596 */
SECTION_SDATA2 static u8 lit_4596[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4596 = 4503601774854144.0 /* cast s32 to float */;
/* 801EB0A4-801EB2B4 0210+00 s=0 e=1 z=0 None .text isOpen__12dMenu_Ring_cFv */
#pragma push
@@ -757,7 +741,7 @@ asm void dMenu_Ring_c::isClose() {
/* ############################################################################################## */
/* 804543D0-804543D4 0004+00 s=1 e=0 z=0 None .sdata2 @4739 */
SECTION_SDATA2 static u32 lit_4739 = 0x3F400000;
SECTION_SDATA2 static f32 lit_4739 = 0.75f;
/* 801EB624-801EB8C0 029C+00 s=1 e=0 z=0 None .text getStickInfo__12dMenu_Ring_cFP9STControl
*/
@@ -783,10 +767,10 @@ asm void dMenu_Ring_c::calcStickAngle(STControl* param_0, u8 param_1) {
/* ############################################################################################## */
/* 804543D4-804543D8 0004+00 s=2 e=0 z=0 None .sdata2 @4810 */
SECTION_SDATA2 static u32 lit_4810 = 0x43980000;
SECTION_SDATA2 static f32 lit_4810 = 304.0f;
/* 804543D8-804543DC 0004+00 s=2 e=0 z=0 None .sdata2 @4811 */
SECTION_SDATA2 static u32 lit_4811 = 0x43600000;
SECTION_SDATA2 static f32 lit_4811 = 224.0f;
/* 801EB960-801EBA38 00D8+00 s=1 e=0 z=0 None .text setRotate__12dMenu_Ring_cFv */
#pragma push
@@ -884,19 +868,19 @@ asm void dMenu_Ring_c::setMixItem() {
/* ############################################################################################## */
/* 804543E0-804543E4 0004+00 s=2 e=0 z=0 None .sdata2 @5366 */
SECTION_SDATA2 static u32 lit_5366 = 0x41C00000;
SECTION_SDATA2 static f32 lit_5366 = 24.0f;
/* 804543E4-804543E8 0004+00 s=3 e=0 z=0 None .sdata2 @5367 */
SECTION_SDATA2 static u32 lit_5367 = 0x437F0000;
SECTION_SDATA2 static f32 lit_5367 = 255.0f;
/* 804543E8-804543EC 0004+00 s=2 e=0 z=0 None .sdata2 @5368 */
SECTION_SDATA2 static u32 lit_5368 = 0x41700000;
SECTION_SDATA2 static f32 lit_5368 = 15.0f;
/* 804543EC-804543F0 0004+00 s=3 e=0 z=0 None .sdata2 @5369 */
SECTION_SDATA2 static u32 lit_5369 = 0x41200000;
SECTION_SDATA2 static f32 lit_5369 = 10.0f;
/* 804543F0-804543F4 0004+00 s=2 e=0 z=0 None .sdata2 @5370 */
SECTION_SDATA2 static u32 lit_5370 = 0x3F23D70A;
SECTION_SDATA2 static f32 lit_5370 = 16.0f / 25.0f;
/* 801ECB14-801ECF9C 0488+00 s=1 e=0 z=0 None .text drawItem__12dMenu_Ring_cFv */
#pragma push
@@ -950,17 +934,13 @@ asm void dMenu_Ring_c::stick_move_init() {
/* ############################################################################################## */
/* 804543F4-804543F8 0004+00 s=1 e=0 z=0 None .sdata2 @5648 */
SECTION_SDATA2 static u32 lit_5648 = 0x428C0000;
SECTION_SDATA2 static f32 lit_5648 = 70.0f;
/* 804543F8-80454400 0008+00 s=1 e=0 z=0 None .sdata2 @5649 */
SECTION_SDATA2 static u8 lit_5649[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5649 = 0.5;
/* 80454400-80454408 0008+00 s=1 e=0 z=0 None .sdata2 @5650 */
SECTION_SDATA2 static u8 lit_5650[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5650 = 3.0;
/* 80454408-80454410 0008+00 s=1 e=0 z=0 None .sdata2 @5651 */
SECTION_SDATA2 static u8 lit_5651[8] = {
@@ -990,7 +970,7 @@ void dMenu_Ring_c::stick_explain_force_init() {
/* ############################################################################################## */
/* 80454410-80454414 0004+00 s=2 e=0 z=0 None .sdata2 @5683 */
SECTION_SDATA2 static u32 lit_5683 = 0x43160000;
SECTION_SDATA2 static f32 lit_5683 = 150.0f;
/* 801ED93C-801EDA0C 00D0+00 s=1 e=0 z=0 None .text stick_explain_proc__12dMenu_Ring_cFv */
#pragma push
@@ -1025,7 +1005,7 @@ asm void dMenu_Ring_c::setSelectItem(int param_0, u8 param_1) {
/* ############################################################################################## */
/* 80454414-80454418 0004+00 s=1 e=0 z=0 None .sdata2 @5811 */
SECTION_SDATA2 static u32 lit_5811 = 0x3FD9999A;
SECTION_SDATA2 static f32 lit_5811 = 17.0f / 10.0f;
/* 801EDC98-801EDF2C 0294+00 s=1 e=0 z=0 None .text drawSelectItem__12dMenu_Ring_cFv */
#pragma push
@@ -1099,7 +1079,7 @@ void dMenu_Ring_c::setCombineBomb(int param_0) {
/* ############################################################################################## */
/* 80454418-8045441C 0004+00 s=1 e=0 z=0 None .sdata2 @6143 */
SECTION_SDATA2 static u32 lit_6143 = 0x41800000;
SECTION_SDATA2 static f32 lit_6143 = 16.0f;
/* 801EE648-801EEA84 043C+00 s=2 e=0 z=0 None .text drawNumber__12dMenu_Ring_cFiiff */
#pragma push
@@ -1153,7 +1133,7 @@ asm void dMenu_Ring_c::isMixItemOff() {
/* ############################################################################################## */
/* 8045441C-80454420 0004+00 s=1 e=0 z=0 None .sdata2 @6308 */
SECTION_SDATA2 static u32 lit_6308 = 0x41900000;
SECTION_SDATA2 static f32 lit_6308 = 18.0f;
/* 801EED84-801EEF14 0190+00 s=1 e=0 z=0 None .text setMixMessage__12dMenu_Ring_cFv */
#pragma push
@@ -1207,7 +1187,7 @@ asm void dMenu_Ring_c::calcDistance(f32 param_0, f32 param_1, f32 param_2, f32 p
/* ############################################################################################## */
/* 80454420-80454424 0004+00 s=1 e=0 z=0 None .sdata2 @6454 */
SECTION_SDATA2 static u32 lit_6454 = 0x447A0000;
SECTION_SDATA2 static f32 lit_6454 = 1000.0f;
/* 801EF1A0-801EF484 02E4+00 s=1 e=0 z=0 None .text clacEllipsePlotAverage__12dMenu_Ring_cFiff
*/

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