mirror of
https://github.com/zeldaret/tp
synced 2026-07-08 22:44:44 -04:00
d_a_b_oh2 / d_a_obj_web0 / d_a_obj_web1 (#243)
* d_a_obj_web0 / d_a_obj_web1 * remove asm * d_a_set_bgobj * d_cc_s work * remove asm * build fix * fix tp.py progress check and rel sha1 check * clean up some bg files
This commit is contained in:
@@ -112,13 +112,13 @@ public:
|
||||
|
||||
static u8 mFuncPtr[120];
|
||||
//static procFunc mFuncPtr[9];
|
||||
static u8 m_cyl_src[68];
|
||||
static dCcD_SrcCyl m_cyl_src;
|
||||
static s32 m_timer_max;
|
||||
|
||||
/* 0x92C */ s16 field_0x92c;
|
||||
/* 0x92E */ u16 field_0x92e;
|
||||
/* 0x930 */ cXyz field_0x930;
|
||||
/* 0x93C */ u32 field_0x93c;
|
||||
/* 0x93C */ int field_0x93c;
|
||||
/* 0x940 */ u16 field_0x940;
|
||||
/* 0x942 */ s16 field_0x942;
|
||||
/* 0x944 */ s16 field_0x944;
|
||||
|
||||
@@ -20,6 +20,14 @@ namespace daItem_prm {
|
||||
static inline u8 checkInWater(daItem_c* item) {
|
||||
return fopAcM_GetParamBit(item, 0x1C, 4);
|
||||
}
|
||||
|
||||
static inline u8 getType(daItem_c* item) {
|
||||
return (fopAcM_GetParam(item) >> 0x18) & 0xF;
|
||||
}
|
||||
|
||||
static inline u8 getSwitchNo(daItem_c* item) {
|
||||
return (fopAcM_GetParam(item) >> 0x10) & 0xFF;
|
||||
}
|
||||
};
|
||||
|
||||
#endif /* A_OBJ_D_A_OBJ_ITEM_H */
|
||||
|
||||
@@ -63,9 +63,9 @@ public:
|
||||
HEAP_TYPE_5,
|
||||
};
|
||||
|
||||
/* 80140DCC */ void __defctor(); // supposed to be the ctor?
|
||||
/* 80140DCC */ void __defctor(); // compiler generated due to ctor with default param
|
||||
|
||||
daPy_anmHeap_c(u32);
|
||||
daPy_anmHeap_c(u32 param_0 = 0);
|
||||
~daPy_anmHeap_c();
|
||||
void initData();
|
||||
void* mallocBuffer();
|
||||
@@ -350,6 +350,7 @@ public:
|
||||
RFLG0_UNK_8000000 = 0x8000000,
|
||||
RFLG0_UNK_4000000 = 0x4000000,
|
||||
RFLG0_UNK_4000 = 0x4000,
|
||||
RFLG0_FRONT_ROLL_CRASH = 0x2000,
|
||||
RFLG0_ENEMY_ATTN_LOCK = 0x1000,
|
||||
RFLG0_UNK_400 = 0x400,
|
||||
RFLG0_UNK_80 = 0x80,
|
||||
@@ -692,6 +693,7 @@ public:
|
||||
u16 getSwordAtUpTime() const { return mSwordUpTimer; }
|
||||
bool checkWaterInMove() const { return i_checkNoResetFlg0(FLG0_UNDERWATER); }
|
||||
bool checkSceneChangeAreaStart() const { return i_checkNoResetFlg2(FLG2_SCN_CHG_START); }
|
||||
bool checkFrontRollCrash() const { return i_checkResetFlg0(RFLG0_FRONT_ROLL_CRASH); }
|
||||
|
||||
void offGoronSideMove() {
|
||||
if (i_checkGoronSideMove()) {
|
||||
|
||||
Reference in New Issue
Block a user