d_a_bomb 100%, not matching

This commit is contained in:
LagoLunatic
2023-12-28 23:27:49 -05:00
parent e57d4cebd3
commit 97c76bce9b
12 changed files with 214 additions and 129 deletions
@@ -41,8 +41,8 @@ public:
virtual ~cBgS_PolyInfo() {}
s32 GetPolyIndex() const { return mPolyIndex; }
u16 GetBgIndex() const { return mBgIndex; }
int GetPolyIndex() const { return mPolyIndex; }
int GetBgIndex() const { return mBgIndex; }
bool ChkSetInfo() const {
if (mPolyIndex == 0xFFFF || mBgIndex == 0x100) {
return false;
+14 -8
View File
@@ -14,11 +14,14 @@ public:
daBomb_fuseSmokeEcallBack() {}
~daBomb_fuseSmokeEcallBack() {}
void execute(JPABaseEmitter*);
void execute(JPABaseEmitter*) {}
void executeAfter(JPABaseEmitter*);
void draw(JPABaseEmitter*);
void draw(JPABaseEmitter*) {}
void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
void setup(JPABaseEmitter* emitter, const cXyz* pos, const csXyz*, s8) {
mpPos = pos;
mpEmitter = emitter;
}
/* 0x04 */ s16 field_0x04;
/* 0x08 */ const cXyz* mpPos;
@@ -33,9 +36,12 @@ public:
~daBomb_fuseSparksEcallBack() {}
void execute(JPABaseEmitter*);
void draw(JPABaseEmitter*);
void draw(JPABaseEmitter*) {}
void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
void setup(JPABaseEmitter* emitter, const cXyz* pos, const csXyz*, s8) {
mpPos = pos;
mpEmitter = emitter;
}
/* 0x04 */ const cXyz* mpPos;
/* 0x08 */ JPABaseEmitter* mpEmitter;
@@ -49,6 +55,8 @@ public:
class daBomb_c : public fopAc_ac_c {
public:
typedef bool(daBomb_c::*procFunc)();
daBomb_c();
void draw_norm();
@@ -101,7 +109,7 @@ public:
void se_cannon_fly_stop();
void eff_water_splash();
bool bombDelete();
bool createHeap();
BOOL createHeap();
int create();
void create_init();
@@ -159,8 +167,6 @@ public:
void _prm_chk_version() const;
private:
typedef bool(daBomb_c::*procFunc)();
/* 0x290 */ procFunc mFunc;
/* 0x29C */ request_of_phase_process_class mPhs;
/* 0x2A4 */ J3DModel* mpModel;
+1 -1
View File
@@ -24,7 +24,7 @@ public:
/* 0x291*/ u8 field_0x291;
/* 0x292*/ u8 field_0x292;
/* 0x293*/ u8 field_0x293;
/* 0x294 */ s32 mProcID;
/* 0x294 */ s32 mMedliPID;
/* 0x298 */ s16 mEventIdx;
/* 0x29A */ short field_0x29A;
};
+17
View File
@@ -197,6 +197,23 @@ enum CLOTH_RES_FILE_ID { // IDs and indexes are synced
CLOTH_BTI_CLOTHTOON=0x3,
};
enum VBAKH_RES_FILE_ID { // IDs and indexes are synced
/* BCK */
VBAKH_BCK_VBAHX=0x5,
VBAKH_BCK_VBAKH=0x6,
VBAKH_BCK_VBAKM=0x7,
VBAKH_BCK_VBAMX=0x8,
/* BDLM */
VBAKH_BDL_VBAKH=0xB,
VBAKH_BDL_VBAKM=0xC,
/* BRK */
VBAKH_BRK_VBAHX=0xF,
VBAKH_BRK_VBAKM=0x10,
VBAKH_BRK_VBAMX=0x11,
};
class __d_timer_info_c {
public:
__d_timer_info_c() {