diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-19 17:10:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-19 14:10:03 -0800 |
| commit | 4cf2c7e37d08cc2ae9c0ef42435fc89ab87734e7 (patch) | |
| tree | 881aa06a300da3bcb30d95a27a18a291463dc47a /src/d/actor/d_a_obj_item.cpp | |
| parent | 8956be538efe0517dc2c5f1fbedee9fbed48115d (diff) | |
Misc fixes (#2830)
* Replace DANPCF_C_HACK with a better fakematch
* d_a_obj_item OK
* Fix ninja diff
* Misc debug/nonmatching fixes
* Fix ninja diff for PAL
* Fix bad PAL split
Diffstat (limited to 'src/d/actor/d_a_obj_item.cpp')
| -rw-r--r-- | src/d/actor/d_a_obj_item.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index 8fa0a96827..e795c596ab 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -16,21 +16,6 @@ #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_mtx.h" -// -// Forward References: -// - -extern "C" void itemGetNextExecute__8daItem_cFv(); -extern "C" void checkPlayerGet__8daItem_cFv(); - -// -// External References: -// - -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" void __dl__FPv(); -extern "C" void __dt__14Z2SoundObjBaseFv(); - /* 8015ADCC-8015B0B8 15570C 02EC+00 1/1 0/0 0/0 .text Reflect__FP4cXyzRC13cBgS_PolyInfof */ static f32 Reflect(cXyz* i_vec, cBgS_PolyInfo const& i_polyinfo, f32 i_scale) { @@ -105,8 +90,6 @@ void daItem_c::setBaseMtx_1() { /* 8015B254-8015B320 155B94 00CC+00 2/2 0/0 0/0 .text * itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */ -// NONMATCHING - matches, but pushes up weak daPy_py_c functions incorrectly -// might need other TUs that use daPy_py_c weaks to be finished first static void itemGetCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) { daItem_c* a_coActorA = (daItem_c*)i_coActorA; @@ -324,12 +307,6 @@ int daItem_c::_daItem_create() { return phase_state; } -/* 8015BA3C-8015BA9C 15637C 0060+00 0/0 1/1 0/0 .text __dt__16Z2SoundObjSimpleFv */ -// Z2SoundObjSimple::~Z2SoundObjSimple() { -extern "C" void __dt__16Z2SoundObjSimpleFv() { - // NONMATCHING -} - /* 8015BA9C-8015BD84 1563DC 02E8+00 1/1 0/0 0/0 .text _daItem_execute__8daItem_cFv */ int daItem_c::_daItem_execute() { field_0x950 = speed; |