mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-08 21:54:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into main

Browse Source
This commit is contained in:
SuperDude88
2023-10-07 13:56:06 -04:00
committed by GitHub
parent c1cf48eca3 a36337a285
commit fd133e3757
44 changed files with 582 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_ykgr.h
+20
View File
@@ -0,0 +1,20 @@
//
// Created by kris on 04/10/23.
//
#ifndef TWW_D_A_YKGR_H
#define TWW_D_A_YKGR_H
struct daYkgr_c {
public:
static JPABaseEmitter* m_emitter;
static u8 m_alpha_flag;
public:
};
extern daYkgr_c daYkgr_c_class;
#endif // TWW_D_A_YKGR_H
include/d/d_com_inf_game.h
+20 -4
View File
@@ -1246,11 +1246,11 @@ inline bool dComIfGp_event_chkTalkXY() {
}
inline void dComIfGp_event_onEventFlag(s16 flag) {
return g_dComIfG_gameInfo.play.getEvent().onEventFlag(flag);
g_dComIfG_gameInfo.play.getEvent().onEventFlag(flag);
}
inline void dComIfGp_event_offEventFlag(s16 flag) {
return g_dComIfG_gameInfo.play.getEvent().offEventFlag(flag);
g_dComIfG_gameInfo.play.getEvent().offEventFlag(flag);
}
inline void dComIfGp_event_reset() {
@@ -1262,7 +1262,15 @@ inline u8 dComIfGp_event_getPreItemNo() {
}
inline void dComIfGp_event_setItemPartnerId(u32 id) {
return g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id);
g_dComIfG_gameInfo.play.getEvent().setPtI_Id(id);
}
inline void dComIfGp_event_setGtItm(u8 itemNo) {
g_dComIfG_gameInfo.play.getEvent().setGtItm(itemNo);
}
inline u8 dComIfGp_event_getGtItm() {
return g_dComIfG_gameInfo.play.getEvent().getGtItm();
}
inline s32 dComIfGp_event_moveApproval(void* actor) {
@@ -1301,11 +1309,19 @@ inline fopAc_ac_c* dComIfGp_event_getPt2() {
return g_dComIfG_gameInfo.play.getEvent().convPId(pt2);
}
inline f32 dComIfGp_event_getCullRate() {
return g_dComIfG_gameInfo.play.getEvent().getCullRate();
}
inline void dComIfGp_event_setCullRate(f32 ratio) {
g_dComIfG_gameInfo.play.getEvent().setCullRate(ratio);
}
inline dEvent_manager_c& dComIfGp_getEventManager() {
return g_dComIfG_gameInfo.play.getEvtManager();
}
inline s32 dComIfGp_evmng_getEventPrio(s16 eventIdx) {
inline s16 dComIfGp_evmng_getEventPrio(s16 eventIdx) {
return dComIfGp_getEventManager().getEventPrio(eventIdx);
}
include/d/d_demo.h
+1 -1
View File
@@ -87,7 +87,7 @@ public:
/* 0x1C */ void* mpMessage;
/* 0x20 */ dDemo_object_c mDemoObj;
/* 0xD0 */ void* field_0xd0;
/* 0xD4 */ void* field_0xd4;
/* 0xD4 */ int field_0xd4;
/* 0xD8 */ int field_0xd8;
/* 0xDC */ int mState;
};
include/d/d_event.h
+7 -2
View File
@@ -78,9 +78,14 @@ public:
u8 getTalkXYBtn() { return mTalkButton; }
bool chkTalkXY() { return mTalkButton == 1 || mTalkButton == 2 || mTalkButton == 3; }
void setPtI_Id(u32 id) { mPtItem = id; }
void setGtItm(u8 itemNo) { mGetItemNo = itemNo; }
u8 getGtItm() { return mGetItemNo; }
void setPtT(void* i_actor) { mPtTalk = getPId(i_actor); }
u8 getPreItemNo() { return mItemNo; }
f32 getCullRate() { return mCullFarClipRatio; }
void setCullRate(f32 ratio) { mCullFarClipRatio = ratio; }
u16 chkEventFlag(u16 flag) { return flag & mEventFlag; }
void onEventFlag(u16 flag) { mEventFlag |= flag; }
void offEventFlag(u16 flag) { mEventFlag &= ~flag; }
@@ -97,7 +102,7 @@ public:
/* 0xC8 */ u32 mPt2;
/* 0xCC */ int mPtTalk;
/* 0xD0 */ u32 mPtItem;
/* 0xD4 */ u8 mCurStaffId;
/* 0xD4 */ u8 mGetItemNo;
/* 0xD5 */ u8 field_0xD5[0xD6 - 0xD5];
/* 0xD6 */ s16 field_0xd6;
/* 0xD8 */ s16 mEventId;
include/d/d_item.h
+1 -1
View File
@@ -389,7 +389,7 @@ BOOL isUseClothPacket(u8);
BOOL isTriforce(u8);
BOOL isHeart(u8);
void getItemNoByLife(u8);
void check_itemno(int);
int check_itemno(int);
void getEmonoItemFromLifeBallTable(u16);
void getItemFromLifeBallTableWithoutEmono(u16);
include/d/d_kankyo.h
+1
View File
@@ -406,6 +406,7 @@ BOOL dKy_daynight_check();
void dKy_tevstr_init(dKy_tevstr_c*, s8, u8);
void dKy_Sound_init();
void dKy_change_colpat(u8 param_0);
void dKy_custom_colset(u8 param_0, u8 param_1, f32 i_blend);
u8 dKy_pship_existense_chk();
void dKy_Itemgetcol_chg_move();
void dKy_arrowcol_chg_on(cXyz*, int);
include/d/d_kankyo_wether.h
+2 -1
View File
@@ -344,5 +344,6 @@ void squal_proc();
void dKyw_pntwind_set(WIND_INFLUENCE*);
void dKyw_pntwind_cut(WIND_INFLUENCE*);
void dKyw_pwind_cylinder_set(WIND_INFLUENCE*);
void dKyw_evt_wind_set(s16 i_windX, s16 i_windY);
void dKyw_evt_wind_set_go();
#endif /* D_KANKYO_WETHER_H */
include/f_op/f_op_actor.h
+8 -8
View File
@@ -16,11 +16,17 @@ struct actor_method_class {
enum fopAc_Status_e {
fopAcStts_SHOWMAP_e = 0x00000020,
fopAcStts_NOEXEC_e = 0x00000080,
fopAcStts_NOCULLEXEC_e = 0x00000080,
fopAcStts_CULL_e = 0x00000100,
fopAcStts_FREEZE_e = 0x00000400,
fopAcStts_UNK800_e = 0x00000800,
fopAcStts_CARRY_e = 0x00002000,
fopAcStts_UNK4000_e = 0x00004000,
fopAcStts_NOPAUSE_e = 0x00020000,
fopAcStts_UNK40000_e = 0x00040000,
fopAcStts_UNK80000_e = 0x00080000,
fopAcStts_HOOK_CARRY_e = 0x00100000,
fopAcStts_UNK200000_e = 0x00200000,
fopAcStts_NODRAW_e = 0x01000000,
fopAcStts_BOSS_e = 0x04000000,
};
@@ -63,12 +69,6 @@ enum fopAc_Cull_e {
fopAc_CULLSPHERE_5_e,
fopAc_CULLSPHERE_6_e,
fopAc_CULLSPHERE_7_e,
fopAc_CULLSPHERE_8_e,
fopAc_CULLSPHERE_9_e,
fopAc_CULLSPHERE_10_e,
fopAc_CULLSPHERE_11_e,
fopAc_CULLSPHERE_12_e,
fopAc_CULLSPHERE_13_e,
fopAc_CULLSPHERE_CUSTOM_e,
};
@@ -198,7 +198,7 @@ public:
/* 0x10C */ dKy_tevstr_c mTevStr;
/* 0x1BC */ u16 mSetId;
/* 0x1BE */ u8 mGroup;
/* 0x1BF */ s8 mCullType;
/* 0x1BF */ u8 mCullType;
/* 0x1C0 */ u8 mDemoActorId;
/* 0x1C1 */ s8 mSubtype;
/* 0x1C2 */ u8 mGbaName;
include/f_op/f_op_actor_mng.h
+16 -37
View File
@@ -100,7 +100,7 @@ enum fopAcM_CARRY {
};
inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* pActor) {
return fopAcM_checkStatus(pActor, 0x100000);
return fopAcM_checkStatus(pActor, fopAcStts_HOOK_CARRY_e);
}
inline u32 fopAcM_GetParam(void* pActor) {
@@ -184,11 +184,11 @@ inline void fopAcM_SetRoomNo(fopAc_ac_c* actor, s8 roomNo) {
}
inline void fopAcM_setHookCarryNow(fopAc_ac_c* actor) {
fopAcM_OnStatus(actor, 0x100000);
fopAcM_OnStatus(actor, fopAcStts_HOOK_CARRY_e);
}
inline void fopAcM_cancelHookCarryNow(fopAc_ac_c* actor) {
fopAcM_OffStatus(actor, 0x100000);
fopAcM_OffStatus(actor, fopAcStts_HOOK_CARRY_e);
}
inline s8 fopAcM_GetHomeRoomNo(fopAc_ac_c* pActor) {
@@ -412,8 +412,8 @@ f32 fopAcM_searchActorDistanceXZ(fopAc_ac_c* p_actorA, fopAc_ac_c* p_actorB);
f32 fopAcM_searchActorDistanceXZ2(fopAc_ac_c* p_actorA, fopAc_ac_c* p_actorB);
s32 fopAcM_rollPlayerCrash(fopAc_ac_c*, f32, u32);
s32 fopAcM_checkCullingBox(f32[3][4], f32, f32, f32, f32, f32, f32);
s32 fopAcM_rollPlayerCrash(fopAc_ac_c* i_this, f32 distAdjust, u32 flag);
s32 fopAcM_checkCullingBox(Mtx, f32, f32, f32, f32, f32, f32);
s32 fopAcM_cullingCheck(fopAc_ac_c*);
void* event_second_actor(u16);
s32 fopAcM_orderTalkEvent(fopAc_ac_c*, fopAc_ac_c*);
@@ -438,16 +438,16 @@ s32 fopAcM_createItemForPresentDemo(cXyz* p_pos, int i_itemNo, u8 param_2, int i
s32 fopAcM_createItemForTrBoxDemo(cXyz* p_pos, int i_itemNo, int i_itemBitNo, int i_roomNo,
csXyz* p_angle, cXyz* p_scale);
u8 fopAcM_getItemNoFromTableNo(u8 i_tableNo);
s32 fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz* p_pos, int i_itemBitNo, int i_roomNo,
csXyz * p_angle, cXyz * p_scale, f32* speedF,
f32* speedY);
s32 fopAcM_createItemFromTable(cXyz* p_pos, int i_tableNo, int i_itemBitNo, int i_roomNo,
csXyz* p_angle, int param_5, cXyz * p_scale, f32* speedF,
f32* speedY, bool createDirect);
s32 fopAcM_createShopItem(cXyz* pos, int i_itemNo, csXyz* rot, int roomNo, cXyz* scale,
createFunc createFunc);
s32 fopAcM_createRaceItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot, int roomNo,
cXyz* scale, int param_7);
s32 fopAcM_createIball(cXyz*, int, int, csXyz*, int);
s32 fopAcM_createDemoItem(cXyz* p_pos, int itemNo, int itemBitNo, csXyz* p_angle,
@@ -456,19 +456,12 @@ s32 fopAcM_createDemoItem(cXyz* p_pos, int itemNo, int itemBitNo, csXyz* p_angle
s32 fopAcM_createItemForBoss(cXyz* p_pos, int param_2, int roomNo, csXyz* p_angle,
cXyz* p_scale, int param_8);
s32 fopAcM_createItemForMidBoss(cXyz* p_pos, int i_itemNo, int i_roomNo, csXyz* p_angle,
cXyz* p_scale, int param_6, int param_7);
void* fopAcM_createItemForDirectGet(cXyz* p_pos, int i_itemNo, int i_roomNo,
csXyz* p_angle, cXyz* p_scale, f32 speedF,
f32 speedY);
void* fopAcM_createItemForSimpleDemo(cXyz* p_pos, int i_itemNo, int i_roomNo,
csXyz* p_angle, cXyz* p_scale, f32 speedF,
f32 speedY);
s32 fopAcM_createItem(cXyz* p_pos, int itemNo, int param_3, int roomNo, int param_4, csXyz* p_angle,
int param_7, cXyz* p_scale);
s32 fopAcM_createItem(cXyz* p_pos, int itemNo, int param_3, int roomNo, int type, csXyz* p_angle,
int action, cXyz* p_scale);
void* fopAcM_fastCreateItem2(cXyz* p_pos, int itemNo, int param_3, int roomNo, int param_5,
csXyz* p_angle, int, cXyz* p_scale);
@@ -477,14 +470,13 @@ void* fopAcM_fastCreateItem(cXyz* p_pos, int i_itemNo, int i_roomNo, csXyz* p_an
cXyz* p_scale, f32 p_speedF, f32 p_speedY, f32 param_8,
int param_9, createFunc p_createFunc);
s32 fopAcM_createBokkuri(u16, cXyz*, int, int, int, cXyz*, int, int);
s32 fopAcM_createWarpHole(cXyz*, csXyz*, int, u8, u8, u8);
BOOL stealItem_CB(void* actor);
fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo);
s32 fopAcM_createDisappear(fopAc_ac_c*, cXyz*, u8, u8, u8);
void fopAcM_setCarryNow(fopAc_ac_c*, int);
void fopAcM_cancelCarryNow(fopAc_ac_c*);
void fopAcM_setCarryNow(fopAc_ac_c* i_this, int stageLayer);
void fopAcM_cancelCarryNow(fopAc_ac_c* i_this);
s32 fopAcM_otoCheck(fopAc_ac_c*, f32);
// void vectle_calc(DOUBLE_POS*, cXyz*);
// void get_vectle_calc(cXyz*, cXyz*, cXyz*);
@@ -504,19 +496,6 @@ void fpoAcM_relativePos(fopAc_ac_c* actor, cXyz* p_inPos, cXyz* p_outPos);
void fopAcM_setGbaName(fopAc_ac_c* i_this, u8 itemNo, u8 gbaName0, u8 gbaName1);
inline void make_prm_warp_hole(u32* actorParams, u8 p1, u8 p2, u8 p3) {
u32 pp1 = (p3 << 0x8);
u32 pp2 = (p2 << 0x10);
u32 pp3 = (p1 << 0x1B) | 0x170000FF;
*actorParams = pp2 | pp3 | pp1;
}
inline void make_prm_bokkuri(u32* pActorParams, csXyz* p_angle, u8 param_2, u8 param_3, u8 param_4,
u8 param_5, u8 param_6) {
p_angle->x = (param_4 << 0x8) | (param_3 & 0xFF);
p_angle->z = (param_6 << 0xD) | (param_2 << 0x1) | param_5;
}
inline fopAc_ac_c* dComIfGp_getPlayer(int);
inline s16 fopAcM_searchPlayerAngleY(fopAc_ac_c* actor) {
include/m_Do/m_Do_lib.h
+6 -4
View File
@@ -16,13 +16,15 @@ struct mDoLib_clipper {
mClipper.calcViewFrustum();
}
static s32 clip(const Mtx m, const Vec* param_1, const Vec* param_2) {
return mClipper.clip(m, (Vec*)param_1, (Vec*)param_2);
static s32 clip(const Mtx m, const Vec* max, const Vec* min) {
return mClipper.clip(m, (Vec*)max, (Vec*)min);
}
static s32 clip(const Mtx m, Vec param_1, f32 param_2) {
return mClipper.clip(m, param_1, param_2);
static s32 clip(const Mtx m, Vec center, f32 radius) {
return mClipper.clip(m, center, radius);
}
static s32 clip(J3DModel*);
static f32 getFar() { return mSystemFar; }
static f32 getFovyRate() { return mFovyRate; }