d_a_tag_attention & d_a_tag_spring OK (#297)

This commit is contained in:
Trueffel
2023-02-20 05:39:09 +01:00
committed by GitHub
parent d58a6f5b35
commit 8471d1d6cc
24 changed files with 324 additions and 975 deletions
@@ -1,6 +1,42 @@
#ifndef D_A_TAG_ATTENTION_H
#define D_A_TAG_ATTENTION_H
#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
#include "d/d_procname.h"
#include "dol2asm.h"
#include "f_op/f_op_actor_mng.h"
class daAttp_c : public fopAc_ac_c {
public:
/* 804D5318 */ int Create();
/* 804D5354 */ int create();
/* 804D53AC */ int execute();
/* 804D568C */ int draw();
/* 804D5694 */ int _delete();
}; // Size: 0x568
namespace daAttp_prm {
static inline u32 getArg0(daAttp_c* pActor) {
return fopAcM_GetParam(pActor) & 3;
}
static inline u32 getArg1(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 2) & 3;
}
static inline u32 getArg2(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 4) & 7;
}
static inline u32 getArg3(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 7) & 1;
}
static inline u32 getArg4(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 8) & 1;
}
static inline u32 getSw1(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 0x10) & 0xff;
}
static inline u32 getSw2(daAttp_c* pActor) {
return (fopAcM_GetParam(pActor) >> 0x18);
}
} // namespace daAttp_prm
#endif /* D_A_TAG_ATTENTION_H */
@@ -1,7 +1,9 @@
#ifndef D_A_TAG_HINIT_H
#define D_A_TAG_HINIT_H
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor.h"
#include "rel/d/a/d_a_horse/d_a_horse.h"
class daTagHinit_c : public fopAc_ac_c {
public:
@@ -1,6 +1,22 @@
#ifndef D_A_TAG_SPRING_H
#define D_A_TAG_SPRING_H
#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
#include "d/d_procname.h"
#include "f_op/f_op_actor_mng.h"
class daTagSpring_c : public fopAc_ac_c {
public:
/* 805A6A58 */ void initBaseMtx();
/* 805A6A78 */ void setBaseMtx();
/* 805A6AD0 */ int Create();
/* 805A6AF4 */ int create();
/* 805A6B5C */ int execute();
/* 805A6C84 */ u8 checkArea();
/* 805A6DFC */ int _delete();
u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
/* 0x568 */ u8 mTimer;
}; // Size: 0x56C
#endif /* D_A_TAG_SPRING_H */