move placement new to MSL_C

include/JSystem/JKernel/JKRHeap.h

@@ -187,10 +187,6 @@ void* operator new[](size_t size, JKRHeap* heap, int alignment);
 void operator delete(void* ptr);
 void operator delete[](void* ptr);
 
-inline void* operator new(size_t size, void* ptr) {
-    return ptr;
-}
-
 void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment);
 
 inline void* JKRAllocFromHeap(JKRHeap* heap, u32 size, int alignment) {

include/MSL_C/new.h

@@ -0,0 +1,10 @@
+#ifndef MSL_NEW_H_
+#define MSL_NEW_H_
+
+#include "MSL_C/MSL_Common/Src/stddef.h"
+
+inline void* operator new(size_t size, void* ptr) {
+    return ptr;
+}
+
+#endif

include/f_op/f_op_actor_mng.h

@@ -1,6 +1,7 @@
 #ifndef F_OP_ACTOR_MNG_H_
 #define F_OP_ACTOR_MNG_H_
 
+#include "MSL_C/new.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_iter.h"
 #include "f_pc/f_pc_manager.h"

src/JSystem/JKernel/JKRSolidHeap.cpp

@@ -6,6 +6,7 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTConsole.h"
+#include "MSL_C/new.h"
 #include "global.h"
 
 /* 802B3290-802B333C       .text create__12JKRSolidHeapFUlP7JKRHeapb */

src/JSystem/JKernel/JKRStdHeap.cpp

@@ -6,6 +6,7 @@
 #include "JSystem/JKernel/JKRStdHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTConsole.h"
+#include "MSL_C/new.h"
 #include "global.h"
 
 /* 802B0F34-802B0FE0       .text create__10JKRStdHeapFUlP7JKRHeapb */

src/JSystem/JUtility/JUTConsole.cpp

@@ -9,6 +9,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTDirectPrint.h"
 #include "JSystem/JUtility/JUTVideo.h"
+#include "MSL_C/new.h"
 #include "MSL_C/stdio.h"
 #include "dolphin/types.h"
 

src/d/actor/d_a_agbsw0.cpp

@@ -12,7 +12,6 @@ static u8 dummy3[4] = {0x02, 0x00, 0x02, 0x01};
 static f64 dummy4[2] = {3.0, 0.5};
 
 #include "d/actor/d_a_agbsw0.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"

src/d/actor/d_a_alldie.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_alldie.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"

src/d/actor/d_a_am.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_am.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/J3DGraphAnimator/J3DNode.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "d/d_procname.h"

src/d/actor/d_a_am2.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_am2.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_bg_s_lin_chk.h"
 #include "d/d_s_play.h"

src/d/actor/d_a_andsw0.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_andsw0.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"

src/d/actor/d_a_andsw2.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_andsw2.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "dolphin/types.h"

src/d/actor/d_a_arrow.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_arrow.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"

src/d/actor/d_a_arrow_iceeff.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_arrow_iceeff.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "m_Do/m_Do_mtx.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_arrow_lighteff.cpp

@@ -11,7 +11,6 @@
 #include "m_Do/m_Do_mtx.h"
 #include "m_Do/m_Do_graphic.h"
 #include "SSystem/SComponent/c_lib.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 /* 00000078-00000108       .text setTopPos__18daArrow_Lighteff_cFv */
 void daArrow_Lighteff_c::setTopPos() {
@@ -424,4 +423,3 @@ actor_process_profile_definition g_profile_ARROW_LIGHTEFF = {
     fopAc_ACTOR_e,
     fopAc_CULLBOX_CUSTOM_e,
 };
-

src/d/actor/d_a_bg.cpp

@@ -18,7 +18,6 @@
 #include "m_Do/m_Do_mtx.h"
 #include "SSystem/SComponent/c_lib.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 

src/d/actor/d_a_bk.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_bk.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_obj_search.h"

src/d/actor/d_a_bomb.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_bomb.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "SSystem/SComponent/c_counter.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"

src/d/actor/d_a_bomb2.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_bomb2.h"
 #include "d/d_procname.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_kankyo_wether.h"
 #include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_kankyo_mng.h"

src/d/actor/d_a_boss_item.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_boss_item.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_procname.h"

src/d/actor/d_a_branch.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_branch.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_procname.h"

src/d/actor/d_a_demo_item.cpp

@@ -8,7 +8,6 @@
 #include "d/d_drawlist.h"
 #include "f_op/f_op_actor_mng.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_item_data.h"
 #include "d/d_item.h"

src/d/actor/d_a_disappear.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_disappear.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_procname.h"

src/d/actor/d_a_dr.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_dr.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"

src/d/actor/d_a_fan.cpp

@@ -9,7 +9,6 @@
 #include "d/d_level_se.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
 const char* daFan_c::m_arcname[3] = { "Hsen1", "Hsen1", "Hsen3", };

src/d/actor/d_a_ghostship.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_ghostship.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "SSystem/SComponent/c_math.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_procname.h"

src/d/actor/d_a_grass.cpp

@@ -12,7 +12,6 @@
 #include "d/d_item_data.h"
 #include "d/d_procname.h"
 #include "d/d_tree.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "SSystem/SComponent/c_sxyz.h"
 
 namespace daGrass_prm {

src/d/actor/d_a_hookshot.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_hookshot.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
 #include "SSystem/SComponent/c_counter.h"

src/d/actor/d_a_hot_floor.cpp

@@ -6,7 +6,6 @@
 #include "d/actor/d_a_hot_floor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "JSystem/JParticle/JPAParticle.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_ib.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_ib.h"
 #include "d/d_procname.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"

src/d/actor/d_a_item.cpp

@@ -9,7 +9,6 @@
 #include "d/actor/d_a_player_main.h"
 #include "d/actor/d_a_sea.h"
 #include "d/d_com_inf_game.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
 #include "f_op/f_op_camera_mng.h"

src/d/actor/d_a_kaji.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_kaji.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_kytag00.cpp

@@ -13,7 +13,6 @@
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
 #include "SSystem/SComponent/c_lib.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
 /* 00000078-0000024C       .text get_check_pos__FP13kytag00_class */

src/d/actor/d_a_kytag01.cpp

@@ -7,7 +7,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 /* 00000078-0000007C       .text wether_tag_move__FP13kytag01_class */
 void wether_tag_move(kytag01_class* i_this) {

src/d/actor/d_a_kytag04.cpp

@@ -3,7 +3,6 @@
  */
 
 #include "d/actor/d_a_kytag04.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
@@ -83,4 +82,3 @@ actor_process_profile_definition g_profile_KYTAG04 = {
     fopAc_ACTOR_e,
     fopAc_CULLBOX_0_e,
 };
-

src/d/actor/d_a_kytag05.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_kytag05.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JAZelAudio/JAIZelBasic.h"
 #include "d/actor/d_a_player.h"
 #include "d/actor/d_a_player_main.h"
@@ -163,4 +162,4 @@ actor_process_profile_definition g_profile_KYTAG05 = {
     fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
     fopAc_ACTOR_e,
     fopAc_CULLBOX_0_e,
-};
+};

src/d/actor/d_a_kytag06.cpp

@@ -3,7 +3,6 @@
  */
 
 #include "d/actor/d_a_kytag06.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
@@ -92,4 +91,4 @@ actor_process_profile_definition g_profile_KYTAG06 = {
     fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
     fopAc_ACTOR_e,
     fopAc_CULLBOX_0_e,
-};
+};

src/d/actor/d_a_lamp.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_lamp.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"

src/d/actor/d_a_magma.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_magma.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_mbdoor.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_mbdoor.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_ext.h"

src/d/actor/d_a_mmusic.cpp

@@ -8,7 +8,6 @@
 #include "d/d_item_data.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 namespace daMmusic {
     namespace {

src/d/actor/d_a_mozo.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_mozo.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_kankyo.h"

src/d/actor/d_a_nh.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_nh.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"

src/d/actor/d_a_npc_kamome.cpp

@@ -10,7 +10,6 @@
 #include "d/d_item_data.h"
 #include "d/actor/d_a_player_main.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "d/d_npc.h"
 #include "d/d_snap.h"

src/d/actor/d_a_npc_md.cpp

@@ -6,7 +6,6 @@
 #include "d/actor/d_a_npc_md.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_item_data.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_mtx.h"

src/d/actor/d_a_obj_AjavW.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_AjavW.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_obj_Vteng.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_Vteng.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_obj_Yboil.cpp

@@ -8,7 +8,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_kankyo.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_procname.h"
 

src/d/actor/d_a_obj_Ygush00.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_Ygush00.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_a_obj.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_obj_adnno.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_adnno.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_obj_akabe.cpp

@@ -10,7 +10,6 @@
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 namespace daObjAkabe {
     const char* const Act_c::M_arcname[4] = {

src/d/actor/d_a_obj_barrier.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_obj_barrier.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/actor/d_a_player_main.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_obj_bscurtain.cpp

@@ -6,7 +6,6 @@
 #include "d/actor/d_a_obj_bscurtain.h"
 #include "f_op/f_op_actor_mng.h"
 #include "JSystem/JParticle/JPAParticle.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_obj_cafelmp.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_cafelmp.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_obj_dmgroom.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_dmgroom.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_obj_dragonhead.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_dragonhead.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_obj_eayogn.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_eayogn.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_obj_ganonbed.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_ganonbed.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_obj_gong.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_gong.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_a_obj.h"
 #include "d/d_bg_w.h"

src/d/actor/d_a_obj_hfuck1.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_hfuck1.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_obj_hole.cpp

@@ -11,7 +11,6 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
 #include "f_op/f_op_camera_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"

src/d/actor/d_a_obj_homensmoke.cpp

@@ -6,7 +6,6 @@
 #include "d/actor/d_a_obj_homensmoke.h"
 #include "d/d_procname.h"
 #include "d/d_particle.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_com_inf_game.h"
 

src/d/actor/d_a_obj_kanat.cpp

@@ -7,7 +7,6 @@
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_com_inf_game.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 Mtx daObjKanat::Act_c::M_tmp_mtx;
 const char daObjKanat::Act_c::M_arcname[] = "Kanat";

src/d/actor/d_a_obj_mknjd.cpp

@@ -8,7 +8,6 @@
 #include "f_pc/f_pc_manager.h"
 #include "f_op/f_op_msg.h"
 #include "f_op/f_op_draw_tag.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JAZelAudio/JAIZelBasic.h"

src/d/actor/d_a_obj_monument.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_monument.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_a_obj.h"
 #include "d/d_bg_w.h"

src/d/actor/d_a_obj_movebox.cpp

@@ -15,7 +15,6 @@ u8 dummy5[0x4C];
 #include "d/actor/d_a_obj_movebox.h"
 #include "d/d_cc_d.h"
 #include "d/d_procname.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"

src/d/actor/d_a_obj_mtest.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_mtest.h"
 #include "d/d_procname.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"

src/d/actor/d_a_obj_paper.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_obj_paper.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"

src/d/actor/d_a_obj_pbka.cpp

@@ -3,7 +3,6 @@
  */
 
 #include "d/actor/d_a_obj_pbka.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
@@ -117,4 +116,4 @@ actor_process_profile_definition g_profile_Obj_Pbka = {
     fopAcStts_UNK40000_e | fopAcStts_CULL_e,
     fopAc_ACTOR_e,
     fopAc_CULLBOX_CUSTOM_e,
-};
+};

src/d/actor/d_a_obj_toripost.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_toripost.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_obj_wood.cpp

@@ -7,7 +7,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 s32 daObjWood::Act_c::_create() {
     fopAcM_SetupActor(this, Act_c);

src/d/actor/d_a_obj_zouK.cpp

@@ -11,7 +11,6 @@
 #include "d/d_kankyo_rain.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
 namespace daObjZouk {

src/d/actor/d_a_player_main.cpp

@@ -12,7 +12,6 @@
 #include "d/actor/d_a_player_HIO.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_com_lib_game.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_kankyo.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"

src/d/actor/d_a_race_item.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_race_item.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_sea.h"
 #include "d/d_item_data.h"

src/d/actor/d_a_rd.cpp

@@ -6,7 +6,6 @@
 #include "d/actor/d_a_rd.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_lib.h"

src/d/actor/d_a_scene_change.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_scene_change.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_mtx.h"

src/d/actor/d_a_sea.cpp

@@ -8,7 +8,6 @@
 #include "d/d_procname.h"
 #include "d/d_stage.h"
 #include "m_Do/m_Do_lib.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/actor/d_a_daiocta.h"
 
 daSea_packet_c l_cloth;

src/d/actor/d_a_seatag.cpp

@@ -2,7 +2,6 @@
  * d_a_seatag.cpp
  */
 #include "d/actor/d_a_seatag.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_procname.h"
 

src/d/actor/d_a_shop_item.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_shop_item.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"

src/d/actor/d_a_spotbox.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_spotbox.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"

src/d/actor/d_a_swattack.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_swattack.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"

src/d/actor/d_a_swc00.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_swc00.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 

src/d/actor/d_a_swhit0.cpp

@@ -7,7 +7,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "m_Do/m_Do_mtx.h"
 

src/d/actor/d_a_switem.cpp

@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_switem.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_cc_d.h"
 #include "f_op/f_op_draw_tag.h"

src/d/actor/d_a_swtact.cpp

@@ -10,7 +10,6 @@
 #include "d/actor/d_a_player.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
 const char * daSwTact_c::m_arcname = "Itact";

src/d/actor/d_a_swtdoor.cpp

@@ -11,7 +11,6 @@
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
 #include "SSystem/SComponent/c_lib.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
 /* 00000078-000000C4       .text daSwtdoor_Draw__FP13swtdoor_class */

src/d/actor/d_a_tag_ghostship.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_tag_ghostship.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 

src/d/actor/d_a_tag_kb_item.cpp

@@ -4,7 +4,6 @@
  */
 
 #include "d/actor/d_a_tag_kb_item.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "dolphin/types.h"

src/d/actor/d_a_tag_msg.cpp

@@ -3,7 +3,6 @@
 // Translation Unit: d_a_tag_msg.cpp
 //
 #include "d/actor/d_a_tag_msg.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/actor/d_a_player_main.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
@@ -306,4 +305,4 @@ actor_process_profile_definition g_profile_TAG_MSG = {
     fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
     fopAc_ACTOR_e,
     fopAc_CULLBOX_6_e,
-};
+};

src/d/actor/d_a_tag_ret.cpp

@@ -11,8 +11,6 @@
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_player_main.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "dolphin/types.h"
 
 static dCcD_SrcCyl cyl_check_src = {
     // dCcD_SrcGObjInf

src/d/actor/d_a_tbox.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_tbox.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_s_acch.h"
 #include "d/d_bg_w.h"

src/d/actor/d_a_vrbox.cpp

@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_vrbox.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"

src/d/actor/d_a_vrbox2.cpp

@@ -11,7 +11,6 @@
 #include "d/d_kankyo_rain.h"
 #include "d/d_kankyo_wether.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 

src/d/d_throwstone.cpp

@@ -10,7 +10,6 @@
 #include "d/d_demo.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 const char daThrowstone_c::M_arcname[] = "Aisi";