mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-18 12:52:51 -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/d/shop/d_shop_camera.cpp
+13 -20
View File
@@ -68,9 +68,6 @@ void cM_atan2s(f32, f32);
void cLib_addCalc2(f32*, f32, f32, f32);
void cLib_addCalcPos2(cXyz*, cXyz const&, f32, f32);
void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*);
extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u32 __float_nan;
extern "C" void Stay__9dCamera_cFv();
extern "C" void SetTrimSize__9dCamera_cFl();
@@ -136,13 +133,13 @@ SECTION_DATA static void* lit_3771[3] = {
};
/* 80453A88-80453A8C 0004+00 s=1 e=0 z=0 None .sdata2 @3796 */
SECTION_SDATA2 static u32 lit_3796 = 0x3E800000;
SECTION_SDATA2 static f32 lit_3796 = 0.25f;
/* 80453A8C-80453A90 0004+00 s=1 e=0 z=0 None .sdata2 @3797 */
SECTION_SDATA2 static u32 lit_3797 = 0x41A00000;
SECTION_SDATA2 static f32 lit_3797 = 20.0f;
/* 80453A90-80453A94 0004+00 s=1 e=0 z=0 None .sdata2 @3798 */
SECTION_SDATA2 static u32 lit_3798 = 0x40A00000;
SECTION_SDATA2 static f32 lit_3798 = 5.0f;
/* 80195C9C-80195E18 017C+00 s=0 e=0 z=9 None .text shop_cam_action_init__16ShopCam_action_cFv
*/
@@ -165,14 +162,10 @@ SECTION_SDATA2 static u8 lit_3916[4] = {
};
/* 80453A98-80453AA0 0008+00 s=1 e=0 z=0 None .sdata2 @3917 */
SECTION_SDATA2 static u8 lit_3917[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3917 = 0.5;
/* 80453AA0-80453AA8 0008+00 s=1 e=0 z=0 None .sdata2 @3918 */
SECTION_SDATA2 static u8 lit_3918[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3918 = 3.0;
/* 80453AA8-80453AB0 0008+00 s=1 e=0 z=0 None .sdata2 @3919 */
SECTION_SDATA2 static u8 lit_3919[8] = {
@@ -180,7 +173,7 @@ SECTION_SDATA2 static u8 lit_3919[8] = {
};
/* 80453AB0-80453AB4 0004+00 s=1 e=0 z=0 None .sdata2 @3920 */
SECTION_SDATA2 static u32 lit_3920 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3920 = 1.0f;
/* 80195E18-8019630C 04F4+00 s=1 e=0 z=0 None .text shop_cam_action__16ShopCam_action_cFv */
#pragma push
@@ -235,7 +228,7 @@ asm void ShopCam_action_c::move() {
/* ############################################################################################## */
/* 80453AB4-80453AB8 0004+00 s=2 e=0 z=0 None .sdata2 @3992 */
SECTION_SDATA2 static u32 lit_3992 = 0x42340000;
SECTION_SDATA2 static f32 lit_3992 = 45.0f;
/* 80196544-80196608 00C4+00 s=0 e=1 z=0 None .text
* setCamDataIdx__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz
@@ -268,22 +261,22 @@ asm void ShopCam_action_c::setCamDataIdx2(fopAc_ac_c* param_0, fopAc_ac_c* param
/* ############################################################################################## */
/* 80453AB8-80453ABC 0004+00 s=1 e=0 z=0 None .sdata2 @4059 */
SECTION_SDATA2 static u32 lit_4059 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4059 = 0.5f;
/* 80453ABC-80453AC0 0004+00 s=1 e=0 z=0 None .sdata2 @4060 */
SECTION_SDATA2 static u32 lit_4060 = 0x43270000;
SECTION_SDATA2 static f32 lit_4060 = 167.0f;
/* 80453AC0-80453AC4 0004+00 s=1 e=0 z=0 None .sdata2 @4061 */
SECTION_SDATA2 static u32 lit_4061 = 0x435C0000;
SECTION_SDATA2 static f32 lit_4061 = 220.0f;
/* 80453AC4-80453AC8 0004+00 s=1 e=0 z=0 None .sdata2 @4062 */
SECTION_SDATA2 static u32 lit_4062 = 0x42F00000;
SECTION_SDATA2 static f32 lit_4062 = 120.0f;
/* 80453AC8-80453ACC 0004+00 s=1 e=0 z=0 None .sdata2 @4063 */
SECTION_SDATA2 static u32 lit_4063 = 0xC2480000;
SECTION_SDATA2 static f32 lit_4063 = -50.0f;
/* 80453ACC-80453AD0 0004+00 s=1 e=0 z=0 None .sdata2 @4064 */
SECTION_SDATA2 static u32 lit_4064 = 0x43AF0000;
SECTION_SDATA2 static f32 lit_4064 = 350.0f;
/* 801966D4-801968B8 01E4+00 s=2 e=0 z=0 None .text _debugSetCamera__16ShopCam_action_cFv */
#pragma push
src/d/shop/d_shop_item_ctrl.cpp
+9 -20
View File
@@ -54,7 +54,6 @@ void fpcFCtRq_Do(fast_create_request*);
void cLib_addCalcPos2(cXyz*, cXyz const&, f32, f32);
void cLib_addCalcAngleS(s16*, s16, s16, s16, s16);
void operator delete(void*);
extern "C" extern u32 __float_nan;
extern "C" void fopAcIt_Judge__FPFPvPv_PvPv();
extern "C" void fpcSch_JudgeByID__FPvPv();
@@ -108,16 +107,10 @@ asm dShopItemCtrl_c::~dShopItemCtrl_c() {
/* ############################################################################################## */
/* 80453AD0-80453AD8 0004+04 s=2 e=0 z=0 None .sdata2 @3659 */
SECTION_SDATA2 static u8 lit_3659[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_3659[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 801969A0-80196A3C 009C+00 s=0 e=3 z=3 None .text getCurrentPos__15dShopItemCtrl_cFi */
@@ -152,14 +145,10 @@ asm void dShopItemCtrl_c::setRotateAnime(int param_0) {
/* ############################################################################################## */
/* 80453AD8-80453AE0 0008+00 s=1 e=0 z=0 None .sdata2 @3838 */
SECTION_SDATA2 static u8 lit_3838[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3838 = 0.5;
/* 80453AE0-80453AE8 0008+00 s=1 e=0 z=0 None .sdata2 @3839 */
SECTION_SDATA2 static u8 lit_3839[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3839 = 3.0;
/* 80453AE8-80453AF0 0008+00 s=1 e=0 z=0 None .sdata2 @3840 */
SECTION_SDATA2 static u8 lit_3840[8] = {
@@ -167,16 +156,16 @@ SECTION_SDATA2 static u8 lit_3840[8] = {
};
/* 80453AF0-80453AF4 0004+00 s=1 e=0 z=0 None .sdata2 @3841 */
SECTION_SDATA2 static u32 lit_3841 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3841 = 0.5f;
/* 80453AF4-80453AF8 0004+00 s=1 e=0 z=0 None .sdata2 @3842 */
SECTION_SDATA2 static u32 lit_3842 = 0x3D4CCCCD;
SECTION_SDATA2 static f32 lit_3842 = 1.0f / 20.0f;
/* 80453AF8-80453AFC 0004+00 s=1 e=0 z=0 None .sdata2 @3843 */
SECTION_SDATA2 static u32 lit_3843 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_3843 = 1.0f / 10.0f;
/* 80453AFC-80453B00 0004+00 s=1 e=0 z=0 None .sdata2 @3844 */
SECTION_SDATA2 static u32 lit_3844 = 0x3C23D70A;
SECTION_SDATA2 static f32 lit_3844 = 1.0f / 100.0f;
/* 80196BA4-80197098 04F4+00 s=0 e=1 z=0 None .text setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb
*/
src/d/shop/d_shop_system.cpp
+28 -38
View File
@@ -19,8 +19,6 @@ struct daNpcT_motionAnmData_c {};
struct daNpcT_faceMotionAnmData_c {};
struct J3DModel {};
struct Vec {};
struct cXyz {
@@ -29,6 +27,8 @@ struct cXyz {
struct J3DJoint {};
struct J3DModel {};
struct daNpcT_c {
/* 801490D4 */ void ctrlBtk();
/* 8014951C */ void ctrlJoint(J3DJoint*, J3DModel*);
@@ -211,8 +211,6 @@ struct ShopCam_action_c {
static void dShopSystem_searchItemActor(void*, void*);
static void dShopSystem_searchCameraActor(void*, void*);
extern "C" extern char const* const d_shop_d_shop_system__stringBase0;
extern "C" extern void* __vt__13dShopSystem_c[52 + 1 /* padding */];
extern "C" static void dShopSystem_searchItemActor__FPvPv();
extern "C" static void dShopSystem_searchCameraActor__FPvPv();
@@ -289,12 +287,6 @@ void cM_atan2s(f32, f32);
void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern void* __vt__9STControl[4];
extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_cursorHIO[68 + 4 /* padding */];
extern "C" extern u8 g_meter2_info[248];
extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void mDoLib_project__FP3VecP3Vec();
extern "C" void fopAc_IsActor__FPv();
@@ -484,19 +476,19 @@ asm static void dShopSystem_searchCameraActor(void* param_0, void* param_1) {
/* ############################################################################################## */
/* 80453B00-80453B04 0004+00 s=1 e=0 z=0 None .sdata2 @4097 */
SECTION_SDATA2 static u32 lit_4097 = 0x3F666666;
SECTION_SDATA2 static f32 lit_4097 = 9.0f / 10.0f;
/* 80453B04-80453B08 0004+00 s=2 e=0 z=0 None .sdata2 @4098 */
SECTION_SDATA2 static u32 lit_4098 = 0x3F000000;
SECTION_SDATA2 static f32 lit_4098 = 0.5f;
/* 80453B08-80453B0C 0004+00 s=5 e=0 z=0 None .sdata2 @4099 */
SECTION_SDATA2 static u32 lit_4099 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4099 = 1.0f;
/* 80453B0C-80453B10 0004+00 s=1 e=0 z=0 None .sdata2 @4100 */
SECTION_SDATA2 static u32 lit_4100 = 0x3DCCCCCD;
SECTION_SDATA2 static f32 lit_4100 = 1.0f / 10.0f;
/* 80453B10-80453B14 0004+00 s=1 e=0 z=0 None .sdata2 @4101 */
SECTION_SDATA2 static u32 lit_4101 = 0x3F333333;
SECTION_SDATA2 static f32 lit_4101 = 7.0f / 10.0f;
/* 80197338-801974E4 01AC+00 s=0 e=0 z=19 None .text initShopSystem__13dShopSystem_cFv */
#pragma push
@@ -1010,16 +1002,16 @@ asm void dShopSystem_c::checkController(u8 param_0, dMsgFlow_c* param_1) {
/* ############################################################################################## */
/* 80453B14-80453B18 0004+00 s=4 e=0 z=0 None .sdata2 @4493 */
SECTION_SDATA2 static u32 lit_4493 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4493 = -1.0f;
/* 80453B18-80453B1C 0004+00 s=8 e=0 z=0 None .sdata2 @4494 */
SECTION_SDATA2 static u32 lit_4494 = 0x3E800000;
SECTION_SDATA2 static f32 lit_4494 = 0.25f;
/* 80453B1C-80453B20 0004+00 s=9 e=0 z=0 None .sdata2 @4495 */
SECTION_SDATA2 static u32 lit_4495 = 0x41A00000;
SECTION_SDATA2 static f32 lit_4495 = 20.0f;
/* 80453B20-80453B24 0004+00 s=9 e=0 z=0 None .sdata2 @4496 */
SECTION_SDATA2 static u32 lit_4496 = 0x40A00000;
SECTION_SDATA2 static f32 lit_4496 = 5.0f;
/* 80197808-80197DD0 05C8+00 s=1 e=0 z=0 None .text chooseItem3__13dShopSystem_cFUc */
#pragma push
@@ -1115,28 +1107,28 @@ SECTION_DEAD static char const* const pad_80394C26 = "\0";
#pragma pop
/* 80453B24-80453B28 0004+00 s=1 e=0 z=0 None .sdata2 @5000 */
SECTION_SDATA2 static u32 lit_5000 = 0xC1C80000;
SECTION_SDATA2 static f32 lit_5000 = -25.0f;
/* 80453B28-80453B2C 0004+00 s=1 e=0 z=0 None .sdata2 @5001 */
SECTION_SDATA2 static u32 lit_5001 = 0x43160000;
SECTION_SDATA2 static f32 lit_5001 = 150.0f;
/* 80453B2C-80453B30 0004+00 s=1 e=0 z=0 None .sdata2 @5002 */
SECTION_SDATA2 static u32 lit_5002 = 0xC2480000;
SECTION_SDATA2 static f32 lit_5002 = -50.0f;
/* 80453B30-80453B34 0004+00 s=1 e=0 z=0 None .sdata2 @5003 */
SECTION_SDATA2 static u32 lit_5003 = 0x437A0000;
SECTION_SDATA2 static f32 lit_5003 = 250.0f;
/* 80453B34-80453B38 0004+00 s=1 e=0 z=0 None .sdata2 @5004 */
SECTION_SDATA2 static u32 lit_5004 = 0x42700000;
SECTION_SDATA2 static f32 lit_5004 = 60.0f;
/* 80453B38-80453B3C 0004+00 s=1 e=0 z=0 None .sdata2 @5005 */
SECTION_SDATA2 static u32 lit_5005 = 0xC3020000;
SECTION_SDATA2 static f32 lit_5005 = -130.0f;
/* 80453B3C-80453B40 0004+00 s=2 e=0 z=0 None .sdata2 @5006 */
SECTION_SDATA2 static u32 lit_5006 = 0x43570000;
SECTION_SDATA2 static f32 lit_5006 = 215.0f;
/* 80453B40-80453B44 0004+00 s=1 e=0 z=0 None .sdata2 @5007 */
SECTION_SDATA2 static u32 lit_5007 = 0x41700000;
SECTION_SDATA2 static f32 lit_5007 = 15.0f;
/* 80198A2C-801990B0 0684+00 s=0 e=0 z=9 None .text itemZoom__13dShopSystem_cFP4cXyz */
#pragma push
@@ -1216,9 +1208,7 @@ SECTION_SDATA2 static f32 lit_5296[1 + 1 /* padding */] = {
};
/* 80453B50-80453B58 0008+00 s=1 e=0 z=0 None .sdata2 @5298 */
SECTION_SDATA2 static u8 lit_5298[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_5298 = 4503601774854144.0 /* cast s32 to float */;
/* 80199A18-80199BF8 01E0+00 s=1 e=0 z=0 None .text
* seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */
@@ -1401,28 +1391,28 @@ asm void dShopSystem_c::deleteObject() {
/* ############################################################################################## */
/* 80453B60-80453B64 0004+00 s=1 e=0 z=0 None .sdata2 @5687 */
SECTION_SDATA2 static u32 lit_5687 = 0xC32F0000;
SECTION_SDATA2 static f32 lit_5687 = -175.0f;
/* 80453B64-80453B68 0004+00 s=1 e=0 z=0 None .sdata2 @5688 */
SECTION_SDATA2 static u32 lit_5688 = 0x43250000;
SECTION_SDATA2 static f32 lit_5688 = 165.0f;
/* 80453B68-80453B6C 0004+00 s=1 e=0 z=0 None .sdata2 @5689 */
SECTION_SDATA2 static u32 lit_5689 = 0x41200000;
SECTION_SDATA2 static f32 lit_5689 = 10.0f;
/* 80453B6C-80453B70 0004+00 s=1 e=0 z=0 None .sdata2 @5690 */
SECTION_SDATA2 static u32 lit_5690 = 0x43610000;
SECTION_SDATA2 static f32 lit_5690 = 225.0f;
/* 80453B70-80453B74 0004+00 s=1 e=0 z=0 None .sdata2 @5691 */
SECTION_SDATA2 static u32 lit_5691 = 0x43B90000;
SECTION_SDATA2 static f32 lit_5691 = 370.0f;
/* 80453B74-80453B78 0004+00 s=1 e=0 z=0 None .sdata2 @5692 */
SECTION_SDATA2 static u32 lit_5692 = 0xC3340000;
SECTION_SDATA2 static f32 lit_5692 = -180.0f;
/* 80453B78-80453B7C 0004+00 s=1 e=0 z=0 None .sdata2 @5693 */
SECTION_SDATA2 static u32 lit_5693 = 0x43750000;
SECTION_SDATA2 static f32 lit_5693 = 245.0f;
/* 80453B7C-80453B80 0004+00 s=1 e=0 z=0 None .sdata2 @5694 */
SECTION_SDATA2 static u32 lit_5694 = 0xC3BE0000;
SECTION_SDATA2 static f32 lit_5694 = -380.0f;
/* 8019A5D0-8019AB00 0530+00 s=1 e=0 z=8 None .text searchItemActor__13dShopSystem_cFv */
#pragma push