From 22573bf7a6bdfaaeef3777fee7879c3eeddf62b2 Mon Sep 17 00:00:00 2001 From: Max Roncace Date: Mon, 25 Aug 2025 18:34:26 -0400 Subject: [PATCH] Fix incorrect PCH being used in some framework objects (#2604) --- include/d/dolzel_rel.h | 1 - src/d/actor/d_a_alink.cpp | 2 +- src/d/actor/d_a_itembase.cpp | 2 +- src/d/actor/d_a_no_chg_room.cpp | 2 +- src/d/actor/d_a_npc.cpp | 2 +- src/d/actor/d_a_npc2.cpp | 2 -- src/d/actor/d_a_npc3.cpp | 2 -- src/d/actor/d_a_npc4.cpp | 2 -- src/d/actor/d_a_npc_cd.cpp | 2 +- src/d/actor/d_a_npc_cd2.cpp | 2 +- src/d/actor/d_a_obj_item.cpp | 2 +- src/d/actor/d_a_obj_ss_base.cpp | 2 +- src/d/actor/d_a_player.cpp | 2 +- 13 files changed, 9 insertions(+), 16 deletions(-) diff --git a/include/d/dolzel_rel.h b/include/d/dolzel_rel.h index 4aa114f5147..699d3994911 100644 --- a/include/d/dolzel_rel.h +++ b/include/d/dolzel_rel.h @@ -1,7 +1,6 @@ #ifndef DOLZEL_REL_H #define DOLZEL_REL_H -// PCH breaks debug build for RELs right now #if __MWERKS__ #include "d/dolzel_rel.mch" #else diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 6c3516d9d71..34d92145e01 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -3,7 +3,7 @@ * Player (Link) Actor */ -#include "d/dolzel_rel.h" +#include "d/dolzel.h" #include "d/actor/d_a_alink.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index a9e76833016..4261148d24e 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -3,7 +3,7 @@ * Item Actor base */ -#include "d/dolzel_rel.h" +#include "d/dolzel.h" #include "d/actor/d_a_itembase.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_no_chg_room.cpp b/src/d/actor/d_a_no_chg_room.cpp index 80ce52b5302..99305efb5ba 100644 --- a/src/d/actor/d_a_no_chg_room.cpp +++ b/src/d/actor/d_a_no_chg_room.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel.h" #include "d/actor/d_a_no_chg_room.h" #include "d/d_s_room.h" diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index 61bf57141f8..aff2485cc26 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel_rel.h" +#include "d/dolzel.h" #include "d/actor/d_a_npc.h" #include "d/actor/d_a_npc_tk.h" diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp index f2f4153ed5f..d63cffe1e3b 100644 --- a/src/d/actor/d_a_npc2.cpp +++ b/src/d/actor/d_a_npc2.cpp @@ -1,5 +1,3 @@ -#include "d/dolzel_rel.h" - #include "d/actor/d_a_npc.h" static s32 daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_3, int param_4, int param_5); diff --git a/src/d/actor/d_a_npc3.cpp b/src/d/actor/d_a_npc3.cpp index 4823005e89d..00ec3e979a4 100644 --- a/src/d/actor/d_a_npc3.cpp +++ b/src/d/actor/d_a_npc3.cpp @@ -1,5 +1,3 @@ -#include "d/dolzel_rel.h" - #include "d/actor/d_a_npc.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index 4e1d1000ca9..9f1a79e95f4 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -1,5 +1,3 @@ -#include "d/dolzel_rel.h" - #include "d/actor/d_a_npc.h" #include "d/actor/d_a_npc_tk.h" #include "d/d_msg_object.h" diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp index dca33d6d980..4473f05aeb3 100644 --- a/src/d/actor/d_a_npc_cd.cpp +++ b/src/d/actor/d_a_npc_cd.cpp @@ -3,7 +3,7 @@ // Translation Unit: a/npc/d_a_npc_cd // -#include "d/dolzel_rel.h" +#include "d/dolzel.h" #include "d/actor/d_a_npc_cd.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index 8f1d9f61e9e..f600bc42c7d 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -3,7 +3,7 @@ // Translation Unit: a/npc/d_a_npc_cd2 // -#include "d/dolzel_rel.h" +#include "d/dolzel.h" #include "d/actor/d_a_npc_cd2.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index 7d4299487ea..81f276ae364 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -3,7 +3,7 @@ * Item (Rupee, Arrow, Heart, etc) Object Actor */ -#include "d/dolzel_rel.h" +#include "d/dolzel.h" #include "d/actor/d_a_obj_item.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_ss_base.cpp b/src/d/actor/d_a_obj_ss_base.cpp index 3b7071ee799..42853e86c43 100644 --- a/src/d/actor/d_a_obj_ss_base.cpp +++ b/src/d/actor/d_a_obj_ss_base.cpp @@ -3,7 +3,7 @@ // Translation Unit: a/obj/d_a_obj_ss_base // -#include "d/dolzel_rel.h" +#include "d/dolzel.h" #include "d/actor/d_a_obj_ss_base.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp index abed5f15249..3a085b8fe5b 100644 --- a/src/d/actor/d_a_player.cpp +++ b/src/d/actor/d_a_player.cpp @@ -3,7 +3,7 @@ * Base Player Actor functionality */ -#include "d/dolzel_rel.h" +#include "d/dolzel.h" #include "d/actor/d_a_player.h" #include "JSystem/J3DGraphLoader/J3DAnmLoader.h"