diff options
| author | Tal Hayon <talhayon1@gmail.com> | 2023-06-28 14:54:53 +0300 |
|---|---|---|
| committer | Tal Hayon <talhayon1@gmail.com> | 2023-06-28 14:54:53 +0300 |
| commit | a3c4cc486e6f67c1beb5d84e45fb979cc744fba3 (patch) | |
| tree | f4d17c91d67b6017565c436400dca2a8a6fa705f /include | |
| parent | 31c37e5dcb04915d0580d6412129ef4c84ee1ddd (diff) | |
Work on d_com_static
Diffstat (limited to 'include')
| -rw-r--r-- | include/rel/d/a/d_a_suspend/d_a_suspend.h | 5 | ||||
| -rw-r--r-- | include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/rel/d/a/d_a_suspend/d_a_suspend.h b/include/rel/d/a/d_a_suspend/d_a_suspend.h index 97eb0a4a7d..4449d0580a 100644 --- a/include/rel/d/a/d_a_suspend/d_a_suspend.h +++ b/include/rel/d/a/d_a_suspend/d_a_suspend.h @@ -19,6 +19,8 @@ public: void setNext(data_c* i_next) { mpNext = i_next; } data_c* getNext() { return mpNext; } u8 getType() { return mType; } + bool isUsed() { return mRoomNo < 0; } + s8 getRoomNo() { return mRoomNo; } /* 0x00 */ s8 mRoomNo; /* 0x01 */ bool field_0x1; @@ -35,11 +37,12 @@ public: /* 80031190 */ void add(daSus_c::data_c*); /* 800311FC */ void reset(); /* 80031EE4 */ room_c(); + void init() { mpData = NULL; } /* 0x0 */ data_c* mpData; }; // Size: 0x4 - /* 80031248 */ static void newData(s8, cXyz const&, cXyz const&, u8, u8, u8); + /* 80031248 */ static int newData(s8, cXyz const&, cXyz const&, u8, u8, u8); /* 800313BC */ void reset(); /* 800314D4 */ static void check(fopAc_ac_c*); /* 80031434 */ static bool check(s8 i_roomNo, cXyz const& i_pos); diff --git a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h index 47be9da007..edb85d9da9 100644 --- a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h +++ b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h @@ -29,8 +29,8 @@ public: /* 80031CF8 */ static void clrSaveFlag(); /* 80031D04 */ static void setSaveFlag(); /* 80031D10 */ static bool chkSaveFlag(); - /* 80031D24 */ void getPos(int); - /* 80031D38 */ void savePos(int, cXyz); + /* 80031D24 */ static const cXyz& getPos(int); + /* 80031D38 */ static void savePos(int, cXyz); /* 80031D64 */ static void onSttsFlag(int, u8); /* 80031D78 */ static void offSttsFlag(int, u8); /* 80031D8C */ static u8 chkSttsFlag(int, u8); @@ -185,7 +185,7 @@ public: s32 getType() { return mType; } static u8 const mData[2072]; - static u8 mPos[60]; + static Vec mPos[5]; static u8 mSttsFlag[5]; static s8 mRoomNo[5]; static bool mSaveFlag; |