J3DModelLoaderCalcSize + J2DScreen work (#2198)

* All literals functions in J2DScreen were matched

* Import J3DModelLoaderCalcSize work

* d_a_obj_rfHole OK

* Minor fixes for daVrbox2
This commit is contained in:
hatal175
2024-09-14 10:48:38 +03:00
committed by GitHub
parent ee0c0f12ac
commit f2ac35d738
48 changed files with 606 additions and 2285 deletions
@@ -2,6 +2,7 @@
#define D_A_OBJ_RFHOLE_H
#include "f_op/f_op_actor_mng.h"
#include "d/bg/d_bg_s_movebg_actor.h"
/**
* @ingroup actors-objects
@@ -11,14 +12,23 @@
* @details
*
*/
class daRfHole_c : public fopAc_ac_c {
class daRfHole_c : public dBgS_MoveBgActor {
public:
enum Mode {
MODE_WAIT,
MODE_BREAK,
MODE_BREAK_EFF,
MODE_END,
};
typedef void (daRfHole_c::*ModeFunc)();
/* 80CB8F04 */ void setBaseMtx();
/* 80CB8F8C */ void CreateHeap();
/* 80CB8FF8 */ void create();
/* 80CB9148 */ void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
/* 80CB9194 */ void playerAreaCheck();
/* 80CB940C */ void Execute(f32 (**)[3][4]);
/* 80CB8F8C */ int CreateHeap();
/* 80CB8FF8 */ int create();
/* 80CB9148 */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
/* 80CB9194 */ int playerAreaCheck();
/* 80CB940C */ int Execute(f32 (**)[3][4]);
/* 80CB9464 */ void holeProc();
/* 80CB9520 */ void init_modeWait();
/* 80CB952C */ void modeWait();
@@ -29,20 +39,33 @@ public:
/* 80CB973C */ void init_modeEnd();
/* 80CB9748 */ void modeEnd();
/* 80CB9768 */ void setBreakEffect();
/* 80CB9878 */ void Draw();
/* 80CB991C */ void Delete();
/* 80CB9878 */ int Draw();
/* 80CB991C */ int Delete();
private:
/* 0x568 */ u8 field_0x568[0x5b4 - 0x568];
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mModel;
/* 0x5AC */ u8 mMode;
/* 0x5AD */ u8 field_0x5ad;
/* 0x5AE */ u8 field_0x5ae;
/* 0x5AF */ u8 field_0x5af;
/* 0x5B0 */ s8 mRoofSoundOn;
/* 0x5B1 */ u8 field_0x5b1[0x5b4 - 0x5b1];
};
STATIC_ASSERT(sizeof(daRfHole_c) == 0x5b4);
class daRfHole_HIO_c {
class daRfHole_HIO_c : public mDoHIO_entry_c {
public:
/* 80CB8E6C */ daRfHole_HIO_c();
/* 80CB99D8 */ ~daRfHole_HIO_c();
/* 80CB99D8 */ virtual ~daRfHole_HIO_c() {}
/* 0x04 */ f32 field_0x04;
/* 0x08 */ f32 field_0x08;
/* 0x0C */ f32 field_0x0c;
/* 0x10 */ f32 field_0x10;
/* 0x14 */ u8 field_0x14;
/* 0x15 */ u8 field_0x15;
};
#endif /* D_A_OBJ_RFHOLE_H */