Fix incorrect PCH being used in some framework objects (#2604)

caseif · web-flow · commit 22573bf7a6bd · 2025-08-25T15:34:26.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`*/`
`5`	`5`
`6`		`-#include "d/dolzel_rel.h"`
	`6`	`+#include "d/dolzel.h"`
`7`	`7`
`8`	`8`	`#include "d/actor/d_a_no_chg_room.h"`
`9`	`9`	`#include "d/d_s_room.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "d/dolzel_rel.h"`
	`1`	`+#include "d/dolzel.h"`
`2`	`2`
`3`	`3`	`#include "d/actor/d_a_npc.h"`
`4`	`4`	`#include "d/actor/d_a_npc_tk.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#include "d/dolzel_rel.h"`
`2`		`-`
`3`	`1`	`#include "d/actor/d_a_npc.h"`
`4`	`2`
`5`	`3`	`static s32 daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_3, int param_4, int param_5);`