mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-23 06:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removeall remaining sym off fakematches, correctly fix more weak func order

Browse Source
This commit is contained in:
LagoLunatic
2025-08-22 14:19:03 -04:00
parent cfb225e413
commit 8fe7ca64e2
10 changed files with 51 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+8 -8
View File
@@ -465,7 +465,7 @@ config.libs = [
"objects": [
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_stage.cpp"),
Object(NonMatching, "d/d_map.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_com_inf_game.cpp", extra_cflags=['-sym off']),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_com_inf_game.cpp"),
Object(Matching, "d/d_com_lib_game.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_com_static.cpp"),
Object(Matching, "d/d_lib.cpp"),
@@ -494,7 +494,7 @@ config.libs = [
Object(Matching, "d/d_event.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_event_data.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_event_manager.cpp"),
Object(NonMatching, "d/d_magma.cpp", extra_cflags=['-sym off']),
Object(NonMatching, "d/d_magma.cpp"),
Object(NonMatching, "d/d_boss_magma.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_grass.cpp"),
Object(NonMatching, "d/d_tree.cpp"),
@@ -545,7 +545,7 @@ config.libs = [
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_snap.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_point_wind.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_agb.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_arrow.cpp", extra_cflags=["-sym off"]),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_arrow.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_bg.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_bomb.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/actor/d_a_bomb2.cpp"),
@@ -592,7 +592,7 @@ config.libs = [
Object(NonMatching, "d/d_menu_option.cpp"),
Object(NonMatching, "d/d_menu_save.cpp"),
Object(NonMatching, "d/d_menu_window.cpp"),
Object(NonMatching, "d/d_mesg.cpp", extra_cflags=["-sym off"]),
Object(NonMatching, "d/d_mesg.cpp"),
Object(NonMatching, "d/d_message.cpp"),
Object(NonMatching, "d/d_message_paper.cpp"),
Object(NonMatching, "d/d_meter.cpp"),
@@ -1473,8 +1473,8 @@ config.libs = [
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_tbox"),
ActorRel(Matching, "d_a_tpota"),
ActorRel(Equivalent, "d_a_tsubo"),
ActorRel(Matching, "d_a_warpdm20", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_warphr", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_warpdm20"),
ActorRel(Matching, "d_a_warphr"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_wbird"),
ActorRel(Matching, "d_a_ykgr"),
ActorRel(Matching, "d_a_alldie"),
@@ -1557,7 +1557,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_bo"),
ActorRel(Matching, "d_a_boss_item"),
ActorRel(NonMatching, "d_a_bpw"),
ActorRel(NonMatching, "d_a_bst", extra_cflags=["-sym off"]),
ActorRel(NonMatching, "d_a_bst"),
ActorRel(NonMatching, "d_a_btd"),
ActorRel(NonMatching, "d_a_bwd"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_bwdg"),
@@ -1604,7 +1604,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_bm1"),
ActorRel(NonMatching, "d_a_npc_bmcon1"),
ActorRel(NonMatching, "d_a_npc_bms1"),
ActorRel(Equivalent, "d_a_npc_bmsw", extra_cflags=['-sym off']),
ActorRel(Equivalent, "d_a_npc_bmsw"),
ActorRel(NonMatching, "d_a_npc_bs1"), # regalloc
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_btsw"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_btsw2"),
include/d/actor/d_a_arrow.h
-1
View File
@@ -21,7 +21,6 @@ public:
typedef BOOL (daArrow_c::*daArrow_c_ProcFunc)();
daArrow_c() {}
BOOL _createHeap();
void _atHit(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
void checkCreater();
include/d/actor/d_a_bst.h
-13
View File
@@ -117,17 +117,4 @@ public:
/* 0x2FE6 */ u8 field_0x2FE6[0x2FE8 - 0x2FE6];
}; // Size: 0x2FE8
class daBst_HIO_c : public JORReflexible {
public:
daBst_HIO_c();
virtual ~daBst_HIO_c() {}
void genMessage(JORMContext* ctx);
public:
/* 0x4 */ s8 field_0x4;
/* 0x5 */ u8 field_0x5;
/* 0x6 */ u8 field_0x6;
};
#endif /* D_A_BST_H */
include/d/actor/d_a_jbo.h
-3
View File
@@ -1,10 +1,7 @@
#ifndef D_A_JBO_H
#define D_A_JBO_H
#pragma push
#pragma sym off
#include "d/d_cc_d.h"
#pragma pop
#include "f_op/f_op_actor.h"
class mDoExt_McaMorf;
include/d/actor/d_a_npc_bmsw.h
-28
View File
@@ -229,32 +229,4 @@ public:
/* 0x9E0 */ fpc_ProcID field_0x9E0;
}; // Size: 0x9E4
class daNpc_Bmsw_HIO_c : public JORReflexible {
public:
daNpc_Bmsw_HIO_c();
virtual ~daNpc_Bmsw_HIO_c() {}
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x05[0x08 - 0x05];
/* 0x08 */ dNpc_HIO_c mNpc;
/* 0x30 */ s16 field_0x30;
/* 0x32 */ s16 field_0x32;
/* 0x34 */ s16 field_0x34;
/* 0x36 */ s16 r_1;
/* 0x38 */ s16 g_1;
/* 0x3A */ s16 b_1;
/* 0x3C */ s16 r_2;
/* 0x3E */ s16 g_2;
/* 0x40 */ s16 b_2;
/* 0x42 */ u8 field_0x42[0x44 - 0x42];
/* 0x44 */ f32 field_0x44;
/* 0x48 */ f32 field_0x48;
/* 0x4C */ f32 field_0x4C;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ f32 field_0x54;
}; // Size: 0x58
#endif /* D_A_NPC_BMSW_H */
include/d/dolzel.pch
+2
View File
@@ -22,5 +22,7 @@
#include "d/d_bg_s_lin_chk.h" // IWYU pragma: export
#include "m_Do/m_Do_hostIO.h" // IWYU pragma: export
#include "d/d_cc_uty.h" // IWYU pragma: export
#include "d/d_magma.h" // IWYU pragma: export
#include "d/d_mesg.h" // IWYU pragma: export
#endif /* DOLZEL_PCH */
src/d/actor/d_a_bst.cpp
+13
View File
@@ -23,6 +23,19 @@
#include "d/d_cc_d.h"
#include "JSystem/JUtility/JUTReport.h"
class daBst_HIO_c : public JORReflexible {
public:
daBst_HIO_c();
virtual ~daBst_HIO_c() {}
void genMessage(JORMContext* ctx);
public:
/* 0x4 */ s8 field_0x4;
/* 0x5 */ u8 field_0x5;
/* 0x6 */ u8 field_0x6;
};
static u8 hio_set;
static daBst_HIO_c l_HIO;
src/d/actor/d_a_npc_bmsw.cpp
+28
View File
@@ -17,6 +17,34 @@
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_hostIO.h"
class daNpc_Bmsw_HIO_c : public JORReflexible {
public:
daNpc_Bmsw_HIO_c();
virtual ~daNpc_Bmsw_HIO_c() {}
void genMessage(JORMContext* ctx);
public:
/* 0x04 */ s8 mNo;
/* 0x05 */ u8 field_0x05[0x08 - 0x05];
/* 0x08 */ dNpc_HIO_c mNpc;
/* 0x30 */ s16 field_0x30;
/* 0x32 */ s16 field_0x32;
/* 0x34 */ s16 field_0x34;
/* 0x36 */ s16 r_1;
/* 0x38 */ s16 g_1;
/* 0x3A */ s16 b_1;
/* 0x3C */ s16 r_2;
/* 0x3E */ s16 g_2;
/* 0x40 */ s16 b_2;
/* 0x42 */ u8 field_0x42[0x44 - 0x42];
/* 0x44 */ f32 field_0x44;
/* 0x48 */ f32 field_0x48;
/* 0x4C */ f32 field_0x4C;
/* 0x50 */ f32 field_0x50;
/* 0x54 */ f32 field_0x54;
}; // Size: 0x58
daNpc_Bmsw_HIO_c l_HIO;
src/d/actor/d_a_obj_homen.cpp
-2
View File
@@ -4,9 +4,7 @@
*/
#include "d/dolzel.h" // IWYU pragma: keep
#pragma sym off
#include "d/actor/d_a_obj_homen.h"
#pragma sym on
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include "d/d_procname.h"
src/d/d_magma.cpp
-2
View File
@@ -11,8 +11,6 @@
#include "m_Do/m_Do_mtx.h"
#include "m_Do/m_Do_lib.h"
// #pragma sym on
Mtx l_kuroOrthoMtx;
Mtx l_colOrthoMtx;
GXTexObj dMagma_packet_c::mKuroTexObj;