diff options
| author | TakaRikka <takarikka@outlook.com> | 2023-06-30 00:26:45 -0700 |
|---|---|---|
| committer | TakaRikka <takarikka@outlook.com> | 2023-06-30 00:26:45 -0700 |
| commit | 7b680de442ca367fca79bf1c0a74ab477a50fa21 (patch) | |
| tree | c642b50ef3debab541c442683c7aab05bd0024e3 /include | |
| parent | dae37fdbbb757cbf42eb636816f01ef076e2c1aa (diff) | |
d_a_obj_lv3waterEff / d_a_kytag16 OK
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/kankyo/d_kankyo.h | 6 | ||||
| -rw-r--r-- | include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h | 21 | ||||
| -rw-r--r-- | include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h | 14 |
3 files changed, 37 insertions, 4 deletions
diff --git a/include/d/kankyo/d_kankyo.h b/include/d/kankyo/d_kankyo.h index 6daa055ab8..5265deda92 100644 --- a/include/d/kankyo/d_kankyo.h +++ b/include/d/kankyo/d_kankyo.h @@ -42,6 +42,8 @@ void dKy_BossLight_set(cXyz* param_0, _GXColor* param_1, f32 param_2, u8 param_3 void dKy_custom_colset(u8 prevGather, u8 curGather, f32 blend); void dKy_setLight(); cXyz dKy_plight_near_pos(); +void dKy_BossSpotLight_set(cXyz* param_0, f32 param_1, f32 param_2, f32 param_3, _GXColor* param_4, + f32 param_5, u8 param_6, u8 param_7); struct LIGHT_INFLUENCE { /* 800CFC7C */ ~LIGHT_INFLUENCE() {} @@ -168,12 +170,12 @@ struct LightStatus { /* 0x4C */ f32 mRefDist; /* 0x50 */ f32 mRefBrightness; /* 0x54 */ GXDistAttnFn mDistFn; - /* 0x58 */ u32 field_0x58[2][6]; //? + /* 0x58 */ u32 field_0x58[2][6]; //? /* 0x88 */ f32 field_0x88; /* 0x8C */ f32 field_0x8c; /* 0x90 */ f32 field_0x90; /* 0x94 */ f32 field_0x94; - /* 0x98 */ u32 field_0x98[2][8]; //? + /* 0x98 */ u32 field_0x98[2][8]; //? /* 0xD8 */ f32 field_0xd8; /* 0xDC */ f32 field_0xdc; /* 0xE0 */ f32 field_0xe0; diff --git a/include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h b/include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h index 8aced5f54f..57bf6472eb 100644 --- a/include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h +++ b/include/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.h @@ -1,6 +1,25 @@ #ifndef D_A_KYTAG16_H #define D_A_KYTAG16_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class kytag16_class : public fopAc_ac_c { +public: + /* 0x568 */ f32 field_0x568; + /* 0x56C */ u8 field_0x56c; + /* 0x56D */ GXColor field_0x56d; + /* 0x571 */ u8 field_0x571; + /* 0x572 */ u8 field_0x572; + /* 0x573 */ u8 field_0x573; + /* 0x574 */ f32 field_0x574; + /* 0x578 */ f32 field_0x578; + /* 0x57C */ f32 field_0x57c; + /* 0x580 */ f32 field_0x580; + /* 0x584 */ f32 field_0x584; + /* 0x588 */ s16 field_0x588; + /* 0x58A */ s16 field_0x58a; + /* 0x58C */ u8 field_0x58c; + /* 0x58D */ u8 field_0x58d; +}; #endif /* D_A_KYTAG16_H */ diff --git a/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h b/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h index 1dc777bd76..e8064a8889 100644 --- a/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h +++ b/include/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.h @@ -1,6 +1,18 @@ #ifndef D_A_OBJ_LV3WATEREFF_H #define D_A_OBJ_LV3WATEREFF_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class daObjWaterEff_c : public fopAc_ac_c { +public: + /* 80C5C4F8 */ int Create(); + /* 80C5C5DC */ int create(); + /* 80C5C6B0 */ int execute(); + /* 80C5C7B8 */ int _delete(); + + /* 0x568 */ cXyz mSePositions[2]; + /* 0x580 */ JPABaseEmitter* mParticles[4]; + /* 0x590 */ u8 unused_0x590[0x594 - 0x590]; +}; #endif /* D_A_OBJ_LV3WATEREFF_H */ |