mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-11 20:22:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_event_manager OK, d_kankyo rain WIP (#360)

Browse Source 
* d_event_manager OK, d_kankyo rain WIP

* Match createTimg
This commit is contained in:
hatal175
2023-07-03 22:04:51 +03:00
committed by GitHub
parent 92fa379d54
commit 01d9e0a514
15 changed files with 473 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/event/d_event_manager.h
+1 -1
View File
@@ -81,7 +81,7 @@ public:
bool dataLoaded() { return mDataLoaded; }
int flagCheck(int flag) { return mFlags.flagCheck(flag); }
static int getIndexCompositId(s16 param_0) { return param_0 != -1 ? (u8)param_0 : -1; }
inline static s16 getIndexCompositId(s16 param_0) { return param_0 != -1 ? (s16)(param_0 & 0xff) : (s16)-1; }
static int getTypeCompositId(s16 param_0) { return param_0 == -1 ? 0 : param_0 >> 8; }
static s16 makeCompositId(s16 a, int b) { return a | (b << 8); }
include/d/kankyo/d_kankyo.h
+6
View File
@@ -567,5 +567,11 @@ void dKy_plight_priority_set(LIGHT_INFLUENCE* param_0);
void dKy_tevstr_init(dKy_tevstr_c* param_0, s8 param_1, u8 param_2);
SND_INFLUENCE* dKy_Sound_get();
void dKy_plight_cut(LIGHT_INFLUENCE* param_0);
int dKy_rain_check();
void dKy_set_actcol_ratio(f32 ratio);
void dKy_set_bgcol_ratio(f32 ratio);
void dKy_set_fogcol_ratio(f32 ratio);
void dKy_set_vrboxcol_ratio(f32 ratio);
f32 dKy_get_parcent(f32 param_0, f32 param_1, f32 param_2);
#endif /* D_KANKYO_D_KANKYO_H */
include/d/kankyo/d_kankyo_wether.h
+5 -8
View File
@@ -42,11 +42,7 @@ public:
/* 0x38 */ u8* mpResMoon_A_A01;
/* 0x3C */ u8* mpResMoon_A_A02;
/* 0x40 */ u8* mpResMoon_A_A03;
/* 0x44 */ int field_0x44;
/* 0x48 */ int field_0x48;
/* 0x4C */ int field_0x4c;
/* 0x50 */ int field_0x50;
/* 0x54 */ int field_0x54;
/* 0x44 */ u32 field_0x44[5];
/* 0x58 */ int field_0x58;
/* 0x5C */ f32 field_0x5c;
/* 0x60 */ f32 field_0x60;
@@ -54,7 +50,7 @@ public:
/* 0x68 */ f32 field_0x68;
/* 0x6C */ f32 field_0x6c;
/* 0x70 */ GXColor mColor;
/* 0x74 */ u8 field_0x74[4];
/* 0x74 */ GXColor field_0x74;
}; // Size: 0x78
class dKankyo_sunlenz_Packet : public J3DPacket {
@@ -68,10 +64,11 @@ public:
/* 0x1C */ u8* mpResRing_A;
/* 0x20 */ u8* mpResLenz;
/* 0x24 */ cXyz mPositions[8];
/* 0x84 */ u8 field_0x84[8];
/* 0x84 */ f32 field_0x84;
/* 0x88 */ f32 field_0x88;
/* 0x8C */ f32 field_0x8c;
/* 0x90 */ f32 field_0x90;
/* 0x94 */ u8 field_0x94[4];
/* 0x94 */ f32 field_0x94;
/* 0x98 */ f32 field_0x98;
/* 0x9C */ u8 field_0x9c[2];
/* 0x9E */ bool mDrawLenzInSky;
include/m_Do/m_Do_mtx.h
+4
View File
@@ -35,6 +35,10 @@ inline void cMtx_concat(const Mtx a, const Mtx b, Mtx ab) {
PSMTXConcat(a, b, ab);
}
inline void cMtx_scale(Mtx m, f32 x, f32 y, f32 z) {
PSMTXScale(m, x, y, z);
}
inline void mDoMtx_multVec(Mtx m, const Vec* src, Vec* dst) {
PSMTXMultVec(m, src, dst);
}