mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-13 20:24:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

various fixes / matches (#2052)

Browse Source 
* some fixes in d/s, d_item, d_shop

* fix for dKankyo_DayProc weak generation

* d_cc_uty fix

* some d_name / d_com_inf_game / f_op_actor_mng matches

* fix some player inline virtuals

* remove asm
This commit is contained in:
TakaRikka
2024-01-29 07:39:51 -08:00
committed by GitHub
parent 7f0ba98c9f
commit 36a29bc4fe
52 changed files with 2407 additions and 7166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/shop/d_shop_camera.h
+2 -2
View File
@@ -22,7 +22,7 @@ struct ShopCam_action_c {
/* 801968B8 */ void setMasterCamCtrPos(cXyz*);
void setCamAction(ShopCamFunc func) {
field_0x0 = func;
mCamAction = func;
}
void setCameraSpeed(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
@@ -37,7 +37,7 @@ struct ShopCam_action_c {
setCameraSpeed(0.25f, 20.0f, 0.25f, 5.0f);
}
/* 0x00 */ ShopCamFunc field_0x0;
/* 0x00 */ ShopCamFunc mCamAction;
/* 0x0c */ u8 field_0xc[0x18 - 0xc];
/* 0x18 */ fopAc_ac_c* field_0x18;
/* 0x1c */ fopAc_ac_c* field_0x1c;
include/d/shop/d_shop_system.h
+9 -3
View File
@@ -82,6 +82,10 @@ public:
/* 0xA */ SEQ_FINISH,
};
enum {
ITEM_MAX_e = 7,
};
/* 80197338 */ void initShopSystem();
/* 801975C0 */ void onFlag(int);
/* 801975DC */ void offFlag(int);
@@ -127,10 +131,12 @@ public:
/* 8019AB84 */ bool checkRightTrigger(STControl*);
/* 8019ABA8 */ bool dpdMove();
void dummyWeakOrder(); // fake, used to fix weak function order in d_shop_system.cpp
/* 801974E4 */ virtual ~dShopSystem_c();
/* 8019ACF0 */ virtual bool getResName2(int);
/* 8019ACE0 */ virtual int beforeStartSeqAction(dMsgFlow_c*, int);
/* 8019ACE8 */ virtual int beforeSelectSeqAction(dMsgFlow_c*, int);
/* 8019ACF0 */ virtual bool getResName2(int) { return false; }
/* 8019ACE0 */ virtual int beforeStartSeqAction(dMsgFlow_c*, int) { return 1; }
/* 8019ACE8 */ virtual int beforeSelectSeqAction(dMsgFlow_c*, int) { return 1; }
bool chkSpMode() { return mSpMode == 1; }
void offSpMode() { mSpMode = 0; }