mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-20 13:45:14 -04:00
Fix weak function order of dBgS_MoveBgActor::Draw
fixes #217 fixes #239 fixes #389 fixes #418 fixes #428 fixes #147
This commit is contained in:
@@ -222,6 +222,9 @@ static BOOL daHys_Draw(void* i_this) {
|
||||
return ((daHys_c*)i_this)->MoveBGDraw();
|
||||
}
|
||||
|
||||
// Fakematch to fix weak func order/.text section splitting of dBgS_MoveBgActor::Draw().
|
||||
#pragma nosyminline off
|
||||
|
||||
/* 00000C08-00000C28 .text daHys_Execute__FPv */
|
||||
static BOOL daHys_Execute(void* i_this) {
|
||||
return ((daHys_c*)i_this)->MoveBGExecute();
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
// Translation Unit: d_a_obj_eskban.cpp
|
||||
//
|
||||
|
||||
#include "d/d_procname.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "d/actor/d_a_obj_eskban.h"
|
||||
#include "d/res/res_eskban.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
#include "weak_bss_936_to_1036.h" // IWYU pragma: keep
|
||||
@@ -408,6 +408,9 @@ BOOL Mthd_Draw(void* i_this) {
|
||||
return ((Act_c*)i_this)->MoveBGDraw();
|
||||
}
|
||||
|
||||
// Fakematch to fix weak func order/.text section splitting of dBgS_MoveBgActor::Draw().
|
||||
#pragma nosyminline off
|
||||
|
||||
/* 00001540-0000156C .text Mthd_IsDelete__Q211daObjEskban28@unnamed@d_a_obj_eskban_cpp@FPv */
|
||||
BOOL Mthd_IsDelete(void* i_this) {
|
||||
return ((Act_c*)i_this)->MoveBGIsDelete();
|
||||
|
||||
@@ -323,6 +323,9 @@ static BOOL Mthd_Draw(void* i_this) {
|
||||
return static_cast<Act_c*>(i_this)->MoveBGDraw();
|
||||
}
|
||||
|
||||
// Fakematch to fix weak func order/.text section splitting of dBgS_MoveBgActor::Draw().
|
||||
#pragma nosyminline off
|
||||
|
||||
/* 000011CC-000011F8 .text Mthd_IsDelete__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@FPv */
|
||||
static BOOL Mthd_IsDelete(void* i_this) {
|
||||
return static_cast<Act_c*>(i_this)->MoveBGIsDelete();
|
||||
|
||||
@@ -3,12 +3,6 @@
|
||||
* Object - Pushable Box
|
||||
*/
|
||||
|
||||
#include "global.h"
|
||||
#include "d/d_procname.h"
|
||||
|
||||
#include "weak_bss_936_to_1036.h" // IWYU pragma: keep
|
||||
#include "weak_data_1811.h" // IWYU pragma: keep
|
||||
|
||||
#include "d/actor/d_a_obj_movebox.h"
|
||||
#include "d/res/res_ecube.h"
|
||||
#include "d/res/res_hbox2.h"
|
||||
@@ -17,6 +11,7 @@
|
||||
#include "d/res/res_mmirror.h"
|
||||
#include "d/res/res_mpwrb.h"
|
||||
#include "d/res/res_osiblk.h"
|
||||
#include "d/d_path.h"
|
||||
#include "d/d_cc_d.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "JSystem/JUtility/JUTAssert.h"
|
||||
@@ -28,6 +23,9 @@
|
||||
#include "d/actor/d_a_obj_mkie.h"
|
||||
#include "d/actor/d_a_player.h"
|
||||
|
||||
#include "weak_bss_936_to_1036.h" // IWYU pragma: keep
|
||||
#include "weak_data_1811.h" // IWYU pragma: keep
|
||||
|
||||
namespace daObjMovebox {
|
||||
dBgS_ObjGndChk Bgc_c::M_gnd_work[23];
|
||||
dBgS_WtrChk Bgc_c::M_wrt_work;
|
||||
@@ -1894,6 +1892,10 @@ namespace daObjMovebox {
|
||||
cPhs_State Mthd_Create(void* i_this) {
|
||||
return static_cast<Act_c*>(i_this)->Mthd_Create();
|
||||
}
|
||||
|
||||
// Fakematch to fix weak func order/.text section splitting of daObjMovebox::EffSmokeCB's ctor and dtor.
|
||||
// Also fixes weak func order/.text section splitting of dBgS_MoveBgActor::Draw().
|
||||
#pragma nosyminline off
|
||||
|
||||
/* 000044E0-00004544 .text Mthd_Delete__Q212daObjMovebox29@unnamed@d_a_obj_movebox_cpp@FPv */
|
||||
BOOL Mthd_Delete(void* i_this) {
|
||||
|
||||
@@ -366,6 +366,9 @@ namespace daObjMtest {
|
||||
return ((Act_c*)i_this)->MoveBGDraw();
|
||||
}
|
||||
|
||||
// Fakematch to fix weak func order/.text section splitting of dBgS_MoveBgActor::Draw().
|
||||
#pragma nosyminline off
|
||||
|
||||
BOOL Mthd_IsDelete(void* i_this) {
|
||||
return ((Act_c*)i_this)->MoveBGIsDelete();
|
||||
}
|
||||
|
||||
@@ -461,6 +461,9 @@ BOOL Mthd_Draw(void* i_this) {
|
||||
return static_cast<daObjSwhammer::Act_c*>(i_this)->MoveBGDraw();
|
||||
}
|
||||
|
||||
// Fakematch to fix weak func order/.text section splitting of dBgS_MoveBgActor::Draw().
|
||||
#pragma nosyminline off
|
||||
|
||||
/* 000015F4-00001620 .text Mthd_IsDelete__Q213daObjSwhammer30@unnamed@d_a_obj_swhammer_cpp@FPv */
|
||||
BOOL Mthd_IsDelete(void* i_this) {
|
||||
return static_cast<daObjSwhammer::Act_c*>(i_this)->MoveBGIsDelete();
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include "d/d_com_lib_game.h"
|
||||
#include "d/d_kankyo_wether.h"
|
||||
#include "d/d_path.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/d_kankyo.h"
|
||||
#include "JSystem/JKernel/JKRSolidHeap.h"
|
||||
|
||||
Reference in New Issue
Block a user