Merge branch 'main' into main

include/d/actor/d_a_ykgr.h

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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 */