mirror of
https://github.com/zeldaret/tww.git
synced 2026-07-07 13:23:27 -04:00
Remove a bunch of weak func order fakematches
This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
// Fixes weak function ordering
|
||||
#include "d/d_com_inf_game.h" // IWYU pragma: export
|
||||
#include "SSystem/SComponent/c_xyz.h" // IWYU pragma: export
|
||||
#include "SSystem/SComponent/c_angle.h" // IWYU pragma: export
|
||||
#include "d/d_cc_d.h" // IWYU pragma: export
|
||||
#include "d/d_bg_s_acch.h" // IWYU pragma: export
|
||||
#include "SSystem/SComponent/c_lib.h" // IWYU pragma: export
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
// Translation Unit: c_bg_w.cpp
|
||||
//
|
||||
|
||||
#if VERSION == VERSION_DEMO
|
||||
#include "d/dolzel.h"
|
||||
#endif
|
||||
#include "SSystem/SComponent/c_bg_w.h"
|
||||
#include "SSystem/SComponent/c_bg_s_gnd_chk.h"
|
||||
#include "SSystem/SComponent/c_bg_s_lin_chk.h"
|
||||
@@ -16,10 +19,6 @@
|
||||
#include "dolphin/mtx/mtxvec.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
#if VERSION == VERSION_DEMO
|
||||
#pragma nosyminline on
|
||||
#endif
|
||||
|
||||
/* 80247500-8024754C .text ASSERT_SOLDHEAP__Fv */
|
||||
void ASSERT_SOLDHEAP() {
|
||||
if (JKRHeap::sCurrentHeap->getHeapType() != 'SLID')
|
||||
|
||||
@@ -3,13 +3,12 @@
|
||||
// Translation Unit: c_cc_s.cpp
|
||||
//
|
||||
|
||||
#if VERSION == VERSION_DEMO
|
||||
#include "d/dolzel.h"
|
||||
#endif
|
||||
#include "SSystem/SComponent/c_cc_s.h"
|
||||
#include "JSystem/JUtility/JUTAssert.h"
|
||||
|
||||
#if VERSION == VERSION_DEMO
|
||||
#pragma nosyminline on
|
||||
#endif
|
||||
|
||||
#define CHECK_FLOAT_CLASS(line, x) JUT_ASSERT(line, !(fpclassify(x) == 1));
|
||||
#define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f);
|
||||
#define CHECK_VEC3_RANGE(line, v) JUT_ASSERT(line, -1.0e32f < v.x && v.x < 1.0e32f && -1.0e32f < v.y && v.y < 1.0e32f && -1.0e32f < v.z && v.z < 1.0e32f)
|
||||
|
||||
@@ -4,11 +4,6 @@
|
||||
*/
|
||||
|
||||
#include "d/dolzel.h" // IWYU pragma: keep
|
||||
// Fakematch? Having sym off before d_a_ks.h but then turning it on before
|
||||
// d_a_player_main.h fixes the weak function ordering of
|
||||
// `daPy_py_c::getSwordTopPos() const` and `daPy_py_c::getHeadTopPos() const`
|
||||
// in this TU.
|
||||
#pragma sym off
|
||||
#include "d/actor/d_a_ks.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/d_priority.h"
|
||||
@@ -16,7 +11,6 @@
|
||||
#include "d/d_s_play.h"
|
||||
#include "f_op/f_op_camera.h"
|
||||
#include "d/d_snap.h"
|
||||
#pragma sym on
|
||||
#include "d/actor/d_a_player_main.h"
|
||||
#include "d/actor/d_a_gm.h"
|
||||
#include "d/res/res_ks.h"
|
||||
|
||||
@@ -10,12 +10,7 @@
|
||||
#include "d/res/res_key.h"
|
||||
#include "d/res/res_hkyo.h"
|
||||
#include "d/actor/d_a_player.h"
|
||||
|
||||
// Fakematch to fix weak function ordering of cSAngle::~cSAngle() and cSGlobe::~cSGlobe().
|
||||
#pragma sym off
|
||||
#include "SSystem/SComponent/c_angle.h"
|
||||
#pragma sym on
|
||||
#pragma nosyminline off
|
||||
|
||||
/* 8006B39C-8006B3A8 .text getSwbit__12dDoor_info_cFv */
|
||||
u8 dDoor_info_c::getSwbit() {
|
||||
|
||||
@@ -84,9 +84,6 @@ u16 lightMaskData[] = {
|
||||
GX_LIGHT0, GX_LIGHT1, GX_LIGHT2, GX_LIGHT3, GX_LIGHT4, GX_LIGHT5, GX_LIGHT6, GX_LIGHT7,
|
||||
};
|
||||
|
||||
// Fakematch? Fixes weak function order.
|
||||
#pragma sym off
|
||||
|
||||
/**
|
||||
* Returns true if toon lighting and shadow should be reversed.
|
||||
*/
|
||||
|
||||
@@ -274,6 +274,3 @@ overlap_process_profile_definition g_profile_OVERLAP3 = {
|
||||
&l_dOvlpFd2_Method,
|
||||
};
|
||||
#endif
|
||||
|
||||
// Fakematch to fix the weak func order of cLib_calcTimer<signed char>(signed char*)
|
||||
#pragma sym off
|
||||
|
||||
Reference in New Issue
Block a user