Work on daNpc_Hanjo_c (#2225)

zeldaret · Oct 26, 2024 · 606178d · 606178d
1 parent 8a08025
commit 606178d
Show file tree

Hide file tree

Showing 148 changed files with 2,748 additions and 2,387 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -23,7 +23,18 @@
   "search.useIgnoreFiles": false,
   "search.exclude": {
     "build/*/config.json": true,
+    "build/*/report.json": true,
     "build/**/*.MAP": true,
+    "build/**/*.o": true,
+    "build/**/*.plf": true,
+    "build/**/*.rel": true,
+    "build/**/*.lcf": true,
+    "build/**/*.preplf": true,
+    "build/**/*.d": true,
+    "build/**/*.s": true,
+    "build/**/*.map": true,
+    "build/**/*.cpp": true,
+    "build/**/*.ctx": true,
     "build.ninja": true,
     ".ninja_*": true,
     "objdiff.json": true,

diff --git a/configure.py b/configure.py
@@ -1394,7 +1394,7 @@ def MatchingFor(*versions):
     ActorRel(Matching, "d_a_tag_lantern"),
     ActorRel(Matching, "d_a_tag_mist"),
     ActorRel(Matching, "d_a_tag_msg"),
-    ActorRel(Matching, "d_a_tag_push"),
+    ActorRel(Matching, "d_a_tag_push", extra_cflags=['-pragma "nosyminline off"']),
     ActorRel(Matching, "d_a_tag_telop"),
     ActorRel(NonMatching, "d_a_tbox"),
     ActorRel(Matching, "d_a_tbox2"),

diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h
@@ -445,6 +445,7 @@ class cCcD_ObjCo : public cCcD_ObjCommonBase {
     u32 GetVsGrp() const { return MskSPrm(0x70); }
     u32 GetIGrp() const { return MskSPrm(0xE); }
     u32 ChkNoCrr() const { return MskSPrm(0x100); }
+    void OnNoCrrBit() { OnSPrmBit(0x100); }
     u32 ChkSph3DCrr() const { return MskSPrm(0x80); }
     void ClrSet() { OffSPrmBit(1); }
     u32 ChkHit() { return MskRPrm(1); }
@@ -487,6 +488,7 @@ class cCcD_ObjHitInf {
     void SetCoHit(cCcD_Obj* obj) { mObjCo.SetHit(obj); }
     BOOL ChkAtType(u32 type) const { return mObjAt.MskType(type); }
     u32 ChkCoNoCrr() const { return mObjCo.ChkNoCrr(); }
+    void OnCoNoCrrBit() { mObjCo.OnNoCrrBit(); }
     u32 ChkCoSph3DCrr() const { return mObjCo.ChkSph3DCrr(); }
     void OnAtSPrmBit(u32 flag) { mObjAt.OnSPrmBit(flag); }
     void OffAtSPrmBit(u32 flag) { mObjAt.OffSPrmBit(flag); }