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

d_a_obj_wind_stone OK (#2066)

Browse Source 
* set up TU

* d_a_obj_wind_stone OK
This commit is contained in:
Trueffel
2024-02-08 13:35:24 +01:00
committed by GitHub
parent a825c39d93
commit 95176edb82
51 changed files with 413 additions and 1883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_alink.h
+1
View File
@@ -3140,6 +3140,7 @@ public:
u32 i_checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
bool i_checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
bool i_checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
Z2WolfHowlMgr* i_getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
// this might be a fake match, but helps fix usage in many functions
#pragma optimization_level 2
include/d/a/d_a_obj.h
+15
View File
@@ -1,5 +1,20 @@
#ifndef D_A_D_A_OBJ_H
#define D_A_D_A_OBJ_H
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
namespace daObj {
/* 80037038 */ void eff_break_tsubo(fopAc_ac_c*, cXyz, int);
/* 80037180 */ void make_eff_break_kotubo(fopAc_ac_c*);
/* 80037210 */ void make_eff_break_kotubo2(fopAc_ac_c*);
/* 800372A0 */ void make_eff_break_gm_kotubo(fopAc_ac_c*);
/* 80037330 */ void make_eff_break_gm_ootubo(fopAc_ac_c*);
/* 800373C0 */ void posMoveF_stream(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32);
/* 80037620 */ void posMoveF_grade(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32, cXyz const*,
f32, f32, cXyz const*);
/* 80037788 */ void quat_rotBaseY(Quaternion*, cXyz const&);
/* 80037900 */ void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32);
}; // namespace daObj
#endif /* D_A_D_A_OBJ_H */
include/d/event/d_event.h
+1 -1
View File
@@ -143,7 +143,7 @@ public:
/* 807E2908 */ void startCheckSkipEdge(void*);
u16 chkFlag2(u16 flag) { return flag & mFlag2; }
bool runCheck() { return mEventStatus != 0; }
BOOL runCheck() { return mEventStatus != 0; }
f32 getCullRate() { return mCullRate; }
u16 chkEventFlag(u16 flag) { return flag & mEventFlag; }
void onEventFlag(u16 flag) { mEventFlag |= flag; }
include/d/meter/d_meter2_info.h
+5
View File
@@ -142,6 +142,7 @@ public:
void setLightDropGetFlag(int index, u8 flag) { mLightDropGetFlag[index] = flag; }
u8 getRentalBombBag() { return mRentalBombBagIdx; }
void setTableMapRegionNo(u8 regionNo) { mTableMapRegionNo = regionNo; }
void setGoldWolfMapType(u8 i_mapType) { mGoldWolfMapType = i_mapType; }
dMeter2_c* getMeterClass() { return mMeterClass; }
u8 getMiniGameItemSetFlag() { return mMiniGameItemSetFlag; }
s16 getMsgKeyWaitTimer() { return mMsgKeyWaitTimer; }
@@ -543,6 +544,10 @@ inline void dMeter2Info_setTableMapRegionNo(u8 regionNo) {
g_meter2_info.setTableMapRegionNo(regionNo);
}
inline void dMeter2Info_setGoldWolfMapType(u8 i_mapType) {
g_meter2_info.setGoldWolfMapType(i_mapType);
}
inline void dMeter2Info_changeWater(u8 bottleIdx) {
g_meter2_info.changeWater(bottleIdx);
}
include/d/shop/d_shop_system.h
+1 -59
View File
@@ -3,69 +3,11 @@
#include "d/a/d_a_npc.h"
#include "d/shop/d_shop_item_ctrl.h"
#include "d/shop/d_shop_camera.h"
class dSelect_cursor_c;
class STControl;
typedef int (*ShopCam_actionFunc)(void);
class ShopCam_action_c {
public:
/* 80196544 */ void setCamDataIdx(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, cXyz*,
cXyz*);
/* 80196608 */ void setCamDataIdx2(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*,
fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*);
/* 801968B8 */ void setMasterCamCtrPos(cXyz*);
void setCameraSpeed(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
field_0xc0 = param_0;
field_0xc4 = param_1;
field_0xc8 = param_2;
field_0xcc = param_3;
}
void SetSelectIdx(s16 idx) {
mSelectIdx = idx;
setCameraSpeed(0.25f, 20.0f, 0.25f, 5.0f);
}
/* 0x00 */ int field_0x0;
/* 0x04 */ int field_0x4;
/* 0x08 */ ShopCam_actionFunc mCamActionFunc;
/* 0x0C */ u8 field_0xc[0xC];
/* 0x18 */ fopAc_ac_c* field_0x18;
/* 0x1C */ fopAc_ac_c* field_0x1c;
/* 0x20 */ fopAc_ac_c* field_0x20;
/* 0x24 */ fopAc_ac_c* field_0x24;
/* 0x28 */ fopAc_ac_c* field_0x28;
/* 0x2C */ fopAc_ac_c* field_0x2c;
/* 0x30 */ fopAc_ac_c* field_0x30;
/* 0x34 */ f32 field_0x34;
/* 0x38 */ cXyz field_0x38;
/* 0x44 */ cXyz field_0x44;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ cXyz field_0x54;
/* 0x60 */ cXyz field_0x60;
/* 0x6C */ f32 field_0x6c;
/* 0x70 */ cXyz field_0x70;
/* 0x7C */ cXyz field_0x7c;
/* 0x88 */ cXyz field_0x88;
/* 0x94 */ f32 field_0x94;
/* 0x98 */ cXyz field_0x98;
/* 0xA4 */ cXyz field_0xa4;
/* 0xB0 */ cXyz field_0xb0;
/* 0xBC */ f32 field_0xbc;
/* 0xC0 */ f32 field_0xc0;
/* 0xC4 */ f32 field_0xc4;
/* 0xC8 */ f32 field_0xc8;
/* 0xCC */ f32 field_0xcc;
/* 0xD0 */ u8 field_0xd0[4];
/* 0xD4 */ s16 mSelectIdx;
/* 0xD6 */ s16 field_0xd6;
/* 0xD8 */ s16 field_0xd8;
/* 0xDA */ u8 field_0xda;
};
class dShopSystem_c : public daNpcT_c {
public:
enum {