diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2023-09-07 21:22:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-07 21:22:55 -0700 |
| commit | 6deaa22a19c725fa62ee4db8eb6ec5a07e60b22f (patch) | |
| tree | 3f39d25656c0b19fc4d521f6b30d942e5df1fc24 /include/d/a | |
| parent | 3dd1963a59c4cf80c0348f10532d2ce445dec7de (diff) | |
d_a_npc / d_a_tag_mhint / d_a_grass work (#1916)
* some npc work / cleanup
* tag_mhint / grass work
* fix path / remove asm
Diffstat (limited to 'include/d/a')
| -rw-r--r-- | include/d/a/d_a_alink.h | 29 | ||||
| -rw-r--r-- | include/d/a/d_a_npc.h | 12 |
2 files changed, 12 insertions, 29 deletions
diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index bc98e385ea..fcc4f4e2f0 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -6365,39 +6365,22 @@ public: } bool checkShadowModelDrawSmode() const { - if (field_0x84e != 3 && field_0x84e != 4) { - if (field_0x84e == 2) { - return false; - } - } - return true; + return field_0x84e == 3 || field_0x84e == 4 || field_0x84e == 2; } - int checkShadowModelDraw() const { - int ret = 0; - - if (checkShadowModelDrawDemoForce() == 0) { - if (checkShadowModelDrawSmode() != 0) { - ret = 0; - } - } - - return ret; + bool checkShadowModelDraw() const { + return checkShadowModelDrawDemoForce() || checkShadowModelDrawSmode(); } - int checkShadowReturnEnd() const { - if (field_0x5e4[0].getIdx() == 0x21C && !field_0x578->isStop()) { - return 1; - } - - return 0; + bool checkShadowReturnEnd() const { + return field_0x5e4[0].getIdx() == 0x21C && field_0x578->isStop(); } bool checkShadowModeTalkWait() const { return (field_0x84e == 2 || field_0x84e == 1) ; } - void setShadowReturn() { mDemoType = 4; } + void setShadowReturn() { field_0x84e = 4; } bool checkPortalObjRide() const { diff --git a/include/d/a/d_a_npc.h b/include/d/a/d_a_npc.h index f19d7bf4a4..4cda66ba8b 100644 --- a/include/d/a/d_a_npc.h +++ b/include/d/a/d_a_npc.h @@ -290,7 +290,7 @@ public: /* 0xE1E */ u16 field_0xe1e; /* 0xE20 */ u16 field_0xe20; /* 0xE22 */ u16 field_0xe22; - /* 0xE24 */ u8 field_0xe24; + /* 0xE24 */ s8 field_0xe24; /* 0xE25 */ u8 field_0xe25; /* 0xE26 */ u8 field_0xe26; /* 0xE27 */ u8 field_0xe27; @@ -422,8 +422,8 @@ public: } static u8 const mCcDObjData[48]; - static u8 mCcDCyl[68]; - static u8 mCcDSph[64]; + static dCcD_SrcCyl mCcDCyl; + static dCcD_SrcSph mCcDSph; static fopAc_ac_c* mFindActorPtrs[50]; static s16 mSrchName; static s32 mFindCount; @@ -643,7 +643,7 @@ public: static u8 const mCcDObjInfo[48]; static dCcD_SrcCyl mCcDCyl; - static u8 mCcDSph[64]; + static dCcD_SrcSph mCcDSph; static fopAc_ac_c* mFindActorPList[100]; static s32 mFindCount; static s16 mSrchActorName; @@ -794,8 +794,8 @@ public: void setVtable(void* table) { vtable = table;} static u8 const mCcDObj[48]; - static u8 mCcDCyl[68]; - static u8 mCcDSph[64]; + static dCcD_SrcCyl mCcDCyl; + static dCcD_SrcSph mCcDSph; }; class daBaseNpc_moveBgActor_c : public daBaseNpc_c { |