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

This commit is contained in:
LagoLunatic
2025-01-23 21:52:41 -05:00
parent 067b47185b
commit ffe54e0bea
10 changed files with 41 additions and 74 deletions
-8
View File
@@ -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"
+1 -1
View File
@@ -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;
}
-10
View File
@@ -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,
-7
View File
@@ -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"
-8
View File
@@ -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"