d_a_tag_gra OK, d_a_suspend work (#286)

This commit is contained in:
Pheenoh
2023-02-14 23:37:09 -07:00
committed by GitHub
parent 88cbbead87
commit 82ff815386
8 changed files with 131 additions and 186 deletions
+29
View File
@@ -2,5 +2,34 @@
#define D_A_SUSPEND_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
class daSus_c : public fopAc_ac_c {
public:
u32 getScale() {
return fopAcM_GetParam(this) >> 0x1E;
}
u8 getArg1() {
return (fopAcM_GetParam(this) >> 9) & 1;
}
u8 getArg0() {
return (fopAcM_GetParam(this) >> 8) & 1;
}
u8 getSw() {
return fopAcM_GetParam(this) & 0xFF;
}
u8 getRoom() {
return fopAcM_GetParam(this) >> 10;
}
/* 80031248 */ void newData(s8, cXyz const&, cXyz const&, u8, u8, u8);
/* 804D5118 */ int create();
};
#endif /* D_A_SUSPEND_H */
@@ -2,5 +2,32 @@
#define D_A_TAG_GRA_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/com/d_com_inf_game.h"
class daTagGra_c : public fopAc_ac_c {
public:
s16 getMode() {
return (fopAcM_GetParam(this) >> 8) & 0xFF;
}
s16 getSwBit() {
return (fopAcM_GetParam(this) >> 16) & 0xFF;
}
int create() {
if (!fopAcM_CheckCondition(this, 8)) {
new (this) daTagGra_c();
fopAcM_OnCondition(this, 8);
}
if (getMode() == 2) {
if (dComIfGs_isSwitch(getSwBit(),fopAcM_GetRoomNo(this))) {
return cPhs_ERROR_e;
}
}
return cPhs_COMPLEATE_e;
}
};
#endif /* D_A_TAG_GRA_H */