Mark funcs with weak func order issues as Equivalent, fix a few other issues

5 files changed, 1 insertions, 34 deletions

diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index 2fb2739f..b1ec785f 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -3,14 +3,6 @@
 // Translation Unit: d_a_arrow.cpp
 //
 
-// Fakematch: This is supposed to be a weak function defined in d_a_player.h that wind up at the end of the
-// d_a_agb TU. But weak function ordering is currently broken, so to get d_a_agb to match, we define it
-// here (at the start of the *next* TU after d_a_agb) so that it gets placed into the correct spot in
-// the DOL, even though this is an ugly hack and they're now in the wrong translation unit instead.
-#include "d/actor/d_a_player.h"
-u32 daPy_py_c::checkPlayerFly() const { return 0; }
-#include "d/d_procname.h"
-
 #include "d/actor/d_a_arrow.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp
index abf596dc..195949d3 100644
--- a/src/d/actor/d_a_npc_nz.cpp
+++ b/src/d/actor/d_a_npc_nz.cpp
@@ -623,7 +623,7 @@ u16 daNpc_Nz_c::next_msgStatus(u32* pMsgNo) {
             if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) {
                 temp += 1;
             }
-            if(dComIfGs_getItem(dItem_BOW_e) != dItem_NONE_e) {
+            if(dComIfGs_getItem(dInvSlot_BOW_e) != dItem_NONE_e) {
                 temp += 1;
             }
 
diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp
index 28123e84..ba181ae7 100644
--- a/src/d/actor/d_a_npc_os.cpp
+++ b/src/d/actor/d_a_npc_os.cpp
@@ -2405,16 +2405,6 @@ void daNpc_Os_infiniteEcallBack_c::makeEmitter(u16 param_1, const cXyz* param_2,
     dComIfGp_particle_set(param_1, param_2, param_3, param_4, -1, this);
 }
 
-/* 00007A10-00007A14       .text execute__28daNpc_Os_infiniteEcallBack_cFP14JPABaseEmitter */
-void daNpc_Os_infiniteEcallBack_c::execute(JPABaseEmitter*) {
-    return;
-}
-
-/* 00007A14-00007A1C       .text setup__28daNpc_Os_infiniteEcallBack_cFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
-void daNpc_Os_infiniteEcallBack_c::setup(JPABaseEmitter* pEmitter, const cXyz*, const csXyz*, signed char) {
-    mpBaseEmitter = pEmitter;
-}
-
 static actor_method_class l_daNpc_Os_Method = {
     (process_method_func)daNpc_Os_Create,
     (process_method_func)daNpc_Os_Delete,
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index 46a8b443..984361bc 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -3,13 +3,6 @@
 // Translation Unit: d_resorce.cpp
 //
 
-// Fakematch: This is supposed to be a weak function defined in d_a_player.h that wind up at the end of the
-// d_door TU. But weak function ordering is currently broken, so to get d_door to match, we define it
-// here (at the start of the *next* TU after d_door) so that it gets placed into the correct spot in
-// the DOL, even though this is an ugly hack and they're now in the wrong translation unit instead.
-#include "d/actor/d_a_player.h"
-void daPy_py_c::setPlayerPosAndAngle(cXyz*, s16) { }
-
 #include "d/d_resorce.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_printf.h"
diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp
index d776f860..ff3305ca 100644
--- a/src/f_op/f_op_camera.cpp
+++ b/src/f_op/f_op_camera.cpp
@@ -3,14 +3,6 @@
 // Translation Unit: f_op_camera.cpp
 //
 
-// Fakematch: These are supposed to be weak functions defined in d_a_player.h that wind up at the end of the
-// f_op_actor_mng TU. But weak function ordering is currently broken, so to get f_op_actor_mng to match, we define them
-// here (at the start of the *next* TU after f_op_actor_mng) so that they get placed into the correct spot in
-// the DOL, even though this is an ugly hack and they're now in the wrong translation unit instead.
-#include "d/actor/d_a_player.h"
-void daPy_py_c::onFrollCrashFlg(u32) {}
-fpc_ProcID daPy_py_c::getGrabActorID() const { return fpcM_ERROR_PROCESS_ID_e; }
-
 #include "f_op/f_op_camera.h"
 #include "f_op/f_op_draw_tag.h"
 #include "dolphin/types.h"