From fe28552c28e371f102369c3b3c225e3a5e5fa475 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Mon, 18 Dec 2023 00:15:36 -0800 Subject: [PATCH] move placement new to MSL_C --- include/JSystem/JKernel/JKRHeap.h | 4 ---- include/MSL_C/new.h | 10 ++++++++++ include/f_op/f_op_actor_mng.h | 1 + src/JSystem/JKernel/JKRSolidHeap.cpp | 1 + src/JSystem/JKernel/JKRStdHeap.cpp | 1 + src/JSystem/JUtility/JUTConsole.cpp | 1 + src/d/actor/d_a_agbsw0.cpp | 1 - src/d/actor/d_a_alldie.cpp | 1 - src/d/actor/d_a_am.cpp | 1 - src/d/actor/d_a_am2.cpp | 1 - src/d/actor/d_a_andsw0.cpp | 1 - src/d/actor/d_a_andsw2.cpp | 1 - src/d/actor/d_a_arrow.cpp | 1 - src/d/actor/d_a_arrow_iceeff.cpp | 1 - src/d/actor/d_a_arrow_lighteff.cpp | 2 -- src/d/actor/d_a_bg.cpp | 1 - src/d/actor/d_a_bk.cpp | 1 - src/d/actor/d_a_bomb.cpp | 1 - src/d/actor/d_a_bomb2.cpp | 1 - src/d/actor/d_a_boss_item.cpp | 1 - src/d/actor/d_a_branch.cpp | 1 - src/d/actor/d_a_demo_item.cpp | 1 - src/d/actor/d_a_disappear.cpp | 1 - src/d/actor/d_a_dr.cpp | 1 - src/d/actor/d_a_fan.cpp | 1 - src/d/actor/d_a_ghostship.cpp | 1 - src/d/actor/d_a_grass.cpp | 1 - src/d/actor/d_a_hookshot.cpp | 1 - src/d/actor/d_a_hot_floor.cpp | 1 - src/d/actor/d_a_ib.cpp | 1 - src/d/actor/d_a_item.cpp | 1 - src/d/actor/d_a_kaji.cpp | 1 - src/d/actor/d_a_kytag00.cpp | 1 - src/d/actor/d_a_kytag01.cpp | 1 - src/d/actor/d_a_kytag04.cpp | 2 -- src/d/actor/d_a_kytag05.cpp | 3 +-- src/d/actor/d_a_kytag06.cpp | 3 +-- src/d/actor/d_a_lamp.cpp | 1 - src/d/actor/d_a_magma.cpp | 1 - src/d/actor/d_a_mbdoor.cpp | 1 - src/d/actor/d_a_mmusic.cpp | 1 - src/d/actor/d_a_mozo.cpp | 1 - src/d/actor/d_a_nh.cpp | 1 - src/d/actor/d_a_npc_kamome.cpp | 1 - src/d/actor/d_a_npc_md.cpp | 1 - src/d/actor/d_a_obj_AjavW.cpp | 1 - src/d/actor/d_a_obj_Vteng.cpp | 1 - src/d/actor/d_a_obj_Yboil.cpp | 1 - src/d/actor/d_a_obj_Ygush00.cpp | 1 - src/d/actor/d_a_obj_adnno.cpp | 1 - src/d/actor/d_a_obj_akabe.cpp | 1 - src/d/actor/d_a_obj_barrier.cpp | 1 - src/d/actor/d_a_obj_bscurtain.cpp | 1 - src/d/actor/d_a_obj_cafelmp.cpp | 1 - src/d/actor/d_a_obj_dmgroom.cpp | 1 - src/d/actor/d_a_obj_dragonhead.cpp | 1 - src/d/actor/d_a_obj_eayogn.cpp | 1 - src/d/actor/d_a_obj_ganonbed.cpp | 1 - src/d/actor/d_a_obj_gong.cpp | 1 - src/d/actor/d_a_obj_hfuck1.cpp | 1 - src/d/actor/d_a_obj_hole.cpp | 1 - src/d/actor/d_a_obj_homensmoke.cpp | 1 - src/d/actor/d_a_obj_kanat.cpp | 1 - src/d/actor/d_a_obj_mknjd.cpp | 1 - src/d/actor/d_a_obj_monument.cpp | 1 - src/d/actor/d_a_obj_movebox.cpp | 1 - src/d/actor/d_a_obj_mtest.cpp | 1 - src/d/actor/d_a_obj_paper.cpp | 1 - src/d/actor/d_a_obj_pbka.cpp | 3 +-- src/d/actor/d_a_obj_toripost.cpp | 1 - src/d/actor/d_a_obj_wood.cpp | 1 - src/d/actor/d_a_obj_zouK.cpp | 1 - src/d/actor/d_a_player_main.cpp | 1 - src/d/actor/d_a_race_item.cpp | 1 - src/d/actor/d_a_rd.cpp | 1 - src/d/actor/d_a_scene_change.cpp | 1 - src/d/actor/d_a_sea.cpp | 1 - src/d/actor/d_a_seatag.cpp | 1 - src/d/actor/d_a_shop_item.cpp | 1 - src/d/actor/d_a_spotbox.cpp | 1 - src/d/actor/d_a_swattack.cpp | 1 - src/d/actor/d_a_swc00.cpp | 1 - src/d/actor/d_a_swhit0.cpp | 1 - src/d/actor/d_a_switem.cpp | 1 - src/d/actor/d_a_swtact.cpp | 1 - src/d/actor/d_a_swtdoor.cpp | 1 - src/d/actor/d_a_tag_ghostship.cpp | 1 - src/d/actor/d_a_tag_kb_item.cpp | 1 - src/d/actor/d_a_tag_msg.cpp | 3 +-- src/d/actor/d_a_tag_ret.cpp | 2 -- src/d/actor/d_a_tbox.cpp | 1 - src/d/actor/d_a_vrbox.cpp | 1 - src/d/actor/d_a_vrbox2.cpp | 1 - src/d/d_throwstone.cpp | 1 - 94 files changed, 18 insertions(+), 99 deletions(-) create mode 100644 include/MSL_C/new.h diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index 5f5dacb18..53638ec82 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/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) { diff --git a/include/MSL_C/new.h b/include/MSL_C/new.h new file mode 100644 index 000000000..17053c7f6 --- /dev/null +++ b/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 diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index dafa934f2..56c0b3388 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/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" diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp index 4cd450b2f..16056ae6e 100644 --- a/src/JSystem/JKernel/JKRSolidHeap.cpp +++ b/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 */ diff --git a/src/JSystem/JKernel/JKRStdHeap.cpp b/src/JSystem/JKernel/JKRStdHeap.cpp index 147e417e4..e7cac7c45 100644 --- a/src/JSystem/JKernel/JKRStdHeap.cpp +++ b/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 */ diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp index b66c51cef..a6117add9 100644 --- a/src/JSystem/JUtility/JUTConsole.cpp +++ b/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" diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index f288e0b28..9d46b787c 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/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" diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 3678768e6..3a341e67c 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/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" diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 6087140f8..eb3afc44a 100644 --- a/src/d/actor/d_a_am.cpp +++ b/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" diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 663e948f4..390d52a6f 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/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" diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp index 09d291d72..136a5127d 100644 --- a/src/d/actor/d_a_andsw0.cpp +++ b/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" diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index f4c8f09cd..6f880e86b 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/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" diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 1f6c15db1..e0d12e0d0 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/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" diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp index 146e276f5..074af3b64 100644 --- a/src/d/actor/d_a_arrow_iceeff.cpp +++ b/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" diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index 4584c4aa0..38a92244c 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/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, }; - diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 18d4d5bc9..0aec7eaa1 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/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" diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index e9b6e53a4..f44f32319 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/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" diff --git a/src/d/actor/d_a_bomb.cpp b/src/d/actor/d_a_bomb.cpp index 67bcf34a9..13586d3db 100644 --- a/src/d/actor/d_a_bomb.cpp +++ b/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" diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index b7a679c6e..48f422312 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/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" diff --git a/src/d/actor/d_a_boss_item.cpp b/src/d/actor/d_a_boss_item.cpp index 774e2d360..ef27ae76d 100644 --- a/src/d/actor/d_a_boss_item.cpp +++ b/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" diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index 00e8870ca..d28eb2f34 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/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" diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 0992d9d3e..a4d24f49d 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/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" diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 5d82b6adf..bf0e607ed 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/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" diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp index 6adfe8959..f8e535d70 100644 --- a/src/d/actor/d_a_dr.cpp +++ b/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" diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index 3a698ae22..dafd98072 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/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", }; diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index 1e5bab710..cb621d7b1 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/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" diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index f3896e25b..e2e6cdd83 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/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 { diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index 6fa9993ec..141a795a3 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/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" diff --git a/src/d/actor/d_a_hot_floor.cpp b/src/d/actor/d_a_hot_floor.cpp index 786596c11..52d84e322 100644 --- a/src/d/actor/d_a_hot_floor.cpp +++ b/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" diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index 4457a83e8..9dd65cd35 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/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" diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index 2f74fb6a8..27692e759 100644 --- a/src/d/actor/d_a_item.cpp +++ b/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" diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp index 9f67b2afe..9b9894aa6 100644 --- a/src/d/actor/d_a_kaji.cpp +++ b/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" diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index 7766e877a..ac7c83acb 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/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 */ diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index 9808b5734..f870d7e28 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/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) { diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 68f84920c..4835e13ee 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/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, }; - diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index 5b056ac8f..d9da620a9 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/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, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 4344e7ee5..0d948aeb0 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/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, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp index e042ab03e..d12933daa 100644 --- a/src/d/actor/d_a_lamp.cpp +++ b/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" diff --git a/src/d/actor/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp index 5ccd503c9..156220dc4 100644 --- a/src/d/actor/d_a_magma.cpp +++ b/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" diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp index 7453fe2cf..6e03dcde6 100644 --- a/src/d/actor/d_a_mbdoor.cpp +++ b/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" diff --git a/src/d/actor/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp index 6e70985f2..b6c0e0cf8 100644 --- a/src/d/actor/d_a_mmusic.cpp +++ b/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 { diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index 85b1f715f..cc10d3715 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/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" diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index c480a9bf8..924114a58 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/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" diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 2c1f010c0..b46a8fc20 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/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" diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index 17b3b0765..4cf2ae5c3 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp index 73153a0c4..8343f0159 100644 --- a/src/d/actor/d_a_obj_AjavW.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp index 2a0bbd11b..625799e7c 100644 --- a/src/d/actor/d_a_obj_Vteng.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp index 6684b6869..e1a325a5b 100644 --- a/src/d/actor/d_a_obj_Yboil.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index fc0a18468..32e7ca63e 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp index de6bd99fc..1a460fe7c 100644 --- a/src/d/actor/d_a_obj_adnno.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp index c6df28873..9ef730bba 100644 --- a/src/d/actor/d_a_obj_akabe.cpp +++ b/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] = { diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 80240e6b6..1405ee5c3 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp index 35624488e..8b028c13f 100644 --- a/src/d/actor/d_a_obj_bscurtain.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_cafelmp.cpp b/src/d/actor/d_a_obj_cafelmp.cpp index beecc204b..a90897483 100644 --- a/src/d/actor/d_a_obj_cafelmp.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp index ce9a535ce..3c8b4f558 100644 --- a/src/d/actor/d_a_obj_dmgroom.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp index 171f39f83..c670c59b2 100644 --- a/src/d/actor/d_a_obj_dragonhead.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_eayogn.cpp b/src/d/actor/d_a_obj_eayogn.cpp index 6bd253cf7..2b9447f04 100644 --- a/src/d/actor/d_a_obj_eayogn.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp index 0b52e535a..95d4dcd76 100644 --- a/src/d/actor/d_a_obj_ganonbed.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp index 4d988ef19..bce62d3d6 100644 --- a/src/d/actor/d_a_obj_gong.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp index a71274bc6..a11c49b43 100644 --- a/src/d/actor/d_a_obj_hfuck1.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index 6217bdb52..10b91c29c 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_homensmoke.cpp b/src/d/actor/d_a_obj_homensmoke.cpp index 094564037..472804446 100644 --- a/src/d/actor/d_a_obj_homensmoke.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp index 4a5ddb57b..9d3ca4b9d 100644 --- a/src/d/actor/d_a_obj_kanat.cpp +++ b/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"; diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 1c09c20e1..39c14e49c 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_monument.cpp b/src/d/actor/d_a_obj_monument.cpp index 47e890782..1a2ebef70 100644 --- a/src/d/actor/d_a_obj_monument.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 251914bb1..4825f9cbb 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp index 7072e5b51..3155ef639 100644 --- a/src/d/actor/d_a_obj_mtest.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index e6d437ab3..4981b1e41 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp index 07bcca256..654108748 100644 --- a/src/d/actor/d_a_obj_pbka.cpp +++ b/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, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index ebf374c87..df11438cc 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/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" diff --git a/src/d/actor/d_a_obj_wood.cpp b/src/d/actor/d_a_obj_wood.cpp index f443639fa..2e256e8ca 100644 --- a/src/d/actor/d_a_obj_wood.cpp +++ b/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); diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index d47450629..b2ef0394c 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/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 { diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 283ea1c17..56267f1b9 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/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" diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp index 571adb251..6d14cd59a 100644 --- a/src/d/actor/d_a_race_item.cpp +++ b/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" diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index 84a07b6e5..91c031759 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/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" diff --git a/src/d/actor/d_a_scene_change.cpp b/src/d/actor/d_a_scene_change.cpp index 87657bb52..4ab1835ca 100644 --- a/src/d/actor/d_a_scene_change.cpp +++ b/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" diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp index 822437ec4..7032498f0 100644 --- a/src/d/actor/d_a_sea.cpp +++ b/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; diff --git a/src/d/actor/d_a_seatag.cpp b/src/d/actor/d_a_seatag.cpp index ef8b85d36..561040eb3 100644 --- a/src/d/actor/d_a_seatag.cpp +++ b/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" diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 66ea9b67d..b62c3c1d8 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/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" diff --git a/src/d/actor/d_a_spotbox.cpp b/src/d/actor/d_a_spotbox.cpp index 54b6f6b3c..6bc56366c 100644 --- a/src/d/actor/d_a_spotbox.cpp +++ b/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" diff --git a/src/d/actor/d_a_swattack.cpp b/src/d/actor/d_a_swattack.cpp index 1852623dc..06f98697a 100644 --- a/src/d/actor/d_a_swattack.cpp +++ b/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" diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 608eea78b..9cfc2ebd9 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/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" diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 7a93dee16..d5ec18617 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/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" diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp index c99789b72..eeb559e5b 100644 --- a/src/d/actor/d_a_switem.cpp +++ b/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" diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp index cd41c09d7..5d16f20d0 100644 --- a/src/d/actor/d_a_swtact.cpp +++ b/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"; diff --git a/src/d/actor/d_a_swtdoor.cpp b/src/d/actor/d_a_swtdoor.cpp index 21ac65be8..03562cc15 100644 --- a/src/d/actor/d_a_swtdoor.cpp +++ b/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 */ diff --git a/src/d/actor/d_a_tag_ghostship.cpp b/src/d/actor/d_a_tag_ghostship.cpp index 44aa63de7..7e0fa95bd 100644 --- a/src/d/actor/d_a_tag_ghostship.cpp +++ b/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" diff --git a/src/d/actor/d_a_tag_kb_item.cpp b/src/d/actor/d_a_tag_kb_item.cpp index 8813bbc93..eac802f27 100644 --- a/src/d/actor/d_a_tag_kb_item.cpp +++ b/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" diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index b690adeaa..b5f1c3975 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/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, -}; \ No newline at end of file +}; diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp index 499ebd578..25b4b2166 100644 --- a/src/d/actor/d_a_tag_ret.cpp +++ b/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 diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index b0bde0966..323275706 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/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" diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index 433603e70..64ec52822 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/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" diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 3f2ad9859..2a02e586f 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/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" diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp index 13fd1a697..3b91f1963 100644 --- a/src/d/d_throwstone.cpp +++ b/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";