mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-04 16:49:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Daswc (#2398)

Browse Source 
* swball cleanup

* daSwc00_c OK

* Revert change in configure - we'll handle rel/dol changes in seperate PR
This commit is contained in:
hatal175
2025-04-18 02:23:05 +03:00
committed by GitHub
parent e65e571498
commit d5b277bbc5
12 changed files with 394 additions and 859 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_obj_swBallA.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 80CF3D84 */ void PutCrrPos();
/* 80CF406C */ int draw();
/* 80CF41F4 */ int _delete();
/* 80CF4354 */ ~daObjSwBallA_c();
/* 80CF4354 */ virtual ~daObjSwBallA_c() {}
u32 getArg0() { return fopAcM_GetParamBit(this, 0, 8); }
u32 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); }
include/d/actor/d_a_obj_swBallB.h
+1 -1
View File
@@ -30,7 +30,7 @@ public:
/* 80CF5388 */ void PutCrrPos();
/* 80CF56A4 */ int draw();
/* 80CF582C */ int _delete();
/* 80CF5940 */ ~daObjSwBallB_c();
/* 80CF5940 */ virtual ~daObjSwBallB_c() {}
s32 getID() { return fopAcM_GetParamBit(this, 0, 8); }
u32 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); }
include/d/actor/d_a_swc00.h
+23 -3
View File
@@ -13,7 +13,15 @@
*/
class daSwc00_c : public fopAc_ac_c {
public:
public:
typedef void (daSwc00_c::*actionFunc)();
enum Action {
ACTION_WAIT,
ACTION_ORDER_EVENT,
ACTION_EVENT,
ACTION_DEAD,
};
/* 805A15FC */ int execute();
/* 805A18E8 */ void event_proc_call();
/* 805A19A4 */ void actionWait();
@@ -21,14 +29,26 @@ public:
/* 805A1A94 */ void actionEvent();
/* 805A1AF0 */ void actionDead();
void setAction(u8 action) { mAction = action; }
/* 0x568 */ cXyz field_0x568;
/* 0x574 */ cXyz field_0x574;
/* 0x580 */ u16 mEventID;
/* 0x580 */ s16 mEventID;
/* 0x582 */ u8 mAction;
/* 0x584 */ u8 field_0x584[4];
/* 0x583 */ u8 field_0x583;
/* 0x584 */ u8 field_0x584;
/* 0x585 */ u8 field_0x585[3];
};
STATIC_ASSERT(sizeof(daSwc00_c) == 0x588);
inline u8 daSwc00_getCondition(daSwc00_c* i_this) {
return i_this->shape_angle.x;
}
inline int daSwc00_getShape(daSwc00_c* i_this) {
return (fopAcM_GetParam(i_this) >> 18) & 3;
}
#endif /* D_A_SWC00_H */