Skip to content

Commit

Permalink
d_a_obj_gryw00 matching
Browse files Browse the repository at this point in the history
  • Loading branch information
Aelire committed Jun 5, 2024
1 parent 3203172 commit cb58c24
Show file tree
Hide file tree
Showing 3 changed files with 252 additions and 48 deletions.
2 changes: 1 addition & 1 deletion configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -1266,7 +1266,7 @@ def DolphinLib(lib_name, objects):
ActorRel(NonMatching, "d_a_obj_demo_barrel"),
ActorRel(NonMatching, "d_a_obj_doguu"),
ActorRel(Matching, "d_a_obj_doguu_demo"),
ActorRel(NonMatching, "d_a_obj_gryw00"),
ActorRel(Matching, "d_a_obj_gryw00", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_obj_hfuck1", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_obj_hole", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(NonMatching, "d_a_obj_ice"),
Expand Down
49 changes: 40 additions & 9 deletions include/d/actor/d_a_obj_gryw00.h
Original file line number Diff line number Diff line change
@@ -1,33 +1,64 @@
#ifndef D_A_OBJ_GRYW00_H
#define D_A_OBJ_GRYW00_H

#include "JSystem/JParticle/JPAEmitter.h"

#include "m_Do/m_Do_ext.h"
#include "f_op/f_op_actor.h"

class daObjGryw00_c : public fopAc_ac_c {
#include "d/d_a_obj.h"
#include "d/d_bg_s_movebg_actor.h"

class daObjGryw00_c : public dBgS_MoveBgActor {
public:
void param_get_swSave() const {}
enum Param_e {
PRM_SWSAVE_W = 0x08,
PRM_SWSAVE_S = 0x00,
};
typedef void (daObjGryw00_c::*ModeFunc)();

s32 param_get_swSave() const {
return daObj::PrmAbstract<Param_e>(this, PRM_SWSAVE_W, PRM_SWSAVE_S);
}

f32 get_draw_water_lv(void*);
void setup_high_water_level_btk_anm();
BOOL setup_high_water_level_btk_anm();
void particle_set();
void particle_move();
void particle_delete();
void set_se();
void CreateHeap();
s32 Create();
void Mthd_Create();
int CreateHeap();
int Create();
s32 Mthd_Create();
BOOL Delete();
void Mthd_Delete();
BOOL Mthd_Delete();
void switch_wait_act_proc();
void spread_water_face_act_proc();
void water_level_move_wait_act_proc();
void anime_loop_start_wait_act_proc();
void high_water_level_act_proc();
void Execute(float(**)[3][4]);
BOOL Execute(Mtx**);
BOOL Draw();

public:
/* Place member variables here */
/* 0x2C8 */ request_of_phase_process_class mPhs;
/* 0x2D0 */ J3DModel* mpModel;
/* 0x2D4 */ Mtx mMtx;
/* 0x304 */ mDoExt_btkAnm mBtk;
/* 0x318 */ mDoExt_bckAnm mBck;
/* 0x328 */ s32 mActivationSwitch;
/* 0x32C */ void (daObjGryw00_c::*modeFunc)();
/* 0x338 */ BOOL mIsHidden;
/* 0x33C */ f32 mWaterLv;
/* 0x340 */ f32 mWaterMaxLv;
/* 0x344 */ f32 mWaterLvIncrement;
/* 0x348 */ f32 mWaveAmplitude;
/* 0x34C */ f32 mWaveMaxAmplitude;
/* 0x350 */ f32 mWaveAmplitudeIncrement;
/* 0x354 */ f32 mWaterLvFinalYPos; // never read ? at least by this class
/* 0x358 */ BOOL mShouldPlaySe;
/* 0x35C */ s32 mGeyserSeRemaining;
/* 0x360 */ JPABaseEmitter* mpEmitters[2];
};

#endif /* D_A_OBJ_GRYW00_H */
Loading

0 comments on commit cb58c24

Please sign in to comment.