summaryrefslogtreecommitdiff
path: root/include/rel
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2023-02-03 20:24:26 -0800
committerGitHub <noreply@github.com>2023-02-03 21:24:26 -0700
commit0f1c72772500a2098c81ef34c0bee41d0df4063e (patch)
tree8bfc0d572ef00099399dbabedb3337c842a15dfb /include/rel
parentf030d04b1442d09272af2cb1621c8c6e0cc99bb6 (diff)
d_a_obj_cboard / finish f_op_actor / rels cleanup (#268)
* d_a_obj_cboard / finish f_op_actor / clean up some rel files * rename some actor vars / remove asm * progress
Diffstat (limited to 'include/rel')
-rw-r--r--include/rel/d/a/d_a_spinner/d_a_spinner.h2
-rw-r--r--include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h24
2 files changed, 24 insertions, 2 deletions
diff --git a/include/rel/d/a/d_a_spinner/d_a_spinner.h b/include/rel/d/a/d_a_spinner/d_a_spinner.h
index 383bfe5b76..2e096d5e87 100644
--- a/include/rel/d/a/d_a_spinner/d_a_spinner.h
+++ b/include/rel/d/a/d_a_spinner/d_a_spinner.h
@@ -43,7 +43,7 @@ public:
void setMove(f32 speedF, s16 param_1) {
fopAcM_SetParam(this, 1);
- mSpeedF = speedF;
+ speedF = speedF;
field_0xa7a = param_1;
mCyl.OnAtSetBit();
}
diff --git a/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h b/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h
index e3928195c5..eafbdabf4c 100644
--- a/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h
+++ b/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h
@@ -1,6 +1,28 @@
#ifndef D_A_OBJ_CBOARD_H
#define D_A_OBJ_CBOARD_H
-#include "dolphin/types.h"
+#include "d/bg/d_bg_s_movebg_actor.h"
+#include "d/com/d_com_inf_game.h"
+
+class daObjBoard_c : public dBgS_MoveBgActor {
+public:
+ /* 8057B958 */ void initBaseMtx();
+ /* 8057B978 */ void setBaseMtx();
+ /* 8057BA78 */ int create1st();
+
+ /* 8057BA70 */ virtual int CreateHeap();
+ /* 8057B9C8 */ virtual int Create();
+ /* 8057BB74 */ virtual int Execute(Mtx**);
+ /* 8057BCC0 */ virtual int Draw();
+ /* 8057BCC8 */ virtual int Delete();
+
+ u8 getNameArg() { return fopAcM_GetParamBit(this, 0, 4); }
+ u8 getArg0() { return fopAcM_GetParamBit(this, 4, 4); }
+ u8 getSwNo() { return fopAcM_GetParamBit(this, 8, 8); }
+
+private:
+ /* 0x5A0 */ request_of_phase_process_class mPhase;
+ /* 0x5A8 */ Mtx field_0x5a8;
+}; // Size: 0x5D8
#endif /* D_A_OBJ_CBOARD_H */