From d53c702bb7529884e56e2eb0da59223b0751e970 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Mon, 23 Oct 2023 20:16:32 -0400 Subject: [PATCH] Rename d_a_player_link.h -> d_a_player_main.h --- include/d/actor/{d_a_player_link.h => d_a_player_main.h} | 6 +++--- src/d/actor/d_a_agb.cpp | 2 +- src/d/actor/d_a_agbsw0.cpp | 2 +- src/d/actor/d_a_arrow.cpp | 2 +- src/d/actor/d_a_bomb.cpp | 2 +- src/d/actor/d_a_item.cpp | 2 +- src/d/actor/d_a_itembase.cpp | 2 +- src/d/actor/d_a_kytag05.cpp | 2 +- src/d/actor/d_a_npc_kamome.cpp | 2 +- src/d/actor/d_a_obj_barrier.cpp | 2 +- src/d/actor/d_a_player_battle.inc | 2 +- src/d/actor/d_a_player_boomerang.inc | 2 +- src/d/actor/d_a_player_bottle.inc | 2 +- src/d/actor/d_a_player_bow.inc | 2 +- src/d/actor/d_a_player_climb.inc | 2 +- src/d/actor/d_a_player_crawl.inc | 2 +- src/d/actor/d_a_player_dproc.inc | 2 +- src/d/actor/d_a_player_fan.inc | 2 +- src/d/actor/d_a_player_food.inc | 2 +- src/d/actor/d_a_player_grab.inc | 2 +- src/d/actor/d_a_player_hammer.inc | 2 +- src/d/actor/d_a_player_hang.inc | 2 +- src/d/actor/d_a_player_hook.inc | 2 +- src/d/actor/d_a_player_ladder.inc | 2 +- src/d/actor/d_a_player_main.cpp | 2 +- src/d/actor/d_a_player_particle.inc | 2 +- src/d/actor/d_a_player_pushpull.inc | 2 +- src/d/actor/d_a_player_rope.inc | 2 +- src/d/actor/d_a_player_ship.inc | 2 +- src/d/actor/d_a_player_swim.inc | 2 +- src/d/actor/d_a_player_sword.inc | 2 +- src/d/actor/d_a_player_tact.inc | 2 +- src/d/actor/d_a_player_vomit.inc | 2 +- src/d/actor/d_a_player_weapon.inc | 2 +- src/d/actor/d_a_player_whide.inc | 2 +- src/d/actor/d_a_tag_msg.cpp | 2 +- src/d/actor/d_a_tag_ret.cpp | 2 +- src/d/d_com_inf_game.cpp | 2 +- src/d/d_metronome.cpp | 2 +- src/d/d_s_play.cpp | 2 +- src/d/d_stage.cpp | 2 +- src/f_op/f_op_actor_mng.cpp | 2 +- 42 files changed, 44 insertions(+), 44 deletions(-) rename include/d/actor/{d_a_player_link.h => d_a_player_main.h} (99%) diff --git a/include/d/actor/d_a_player_link.h b/include/d/actor/d_a_player_main.h similarity index 99% rename from include/d/actor/d_a_player_link.h rename to include/d/actor/d_a_player_main.h index 94962705d..b00c25131 100644 --- a/include/d/actor/d_a_player_link.h +++ b/include/d/actor/d_a_player_main.h @@ -1,5 +1,5 @@ -#ifndef D_A_PLAYER_LINK -#define D_A_PLAYER_LINK +#ifndef D_A_PLAYER_MAIN +#define D_A_PLAYER_MAIN #include "JAZelAudio/JAIZelBasic.h" #include "m_Do/m_Do_ext.h" @@ -2412,4 +2412,4 @@ public: static daPy_ProcFunc mDemoProcInitFuncTable[0x4B]; }; // Size: 0x4C28 -#endif /* D_A_PLAYER_LINK */ \ No newline at end of file +#endif /* D_A_PLAYER_MAIN */ diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index ddef64d48..8d1263bb6 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -7,7 +7,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTGba.h" -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "d/d_bg_s_lin_chk.h" #include "d/d_com_inf_game.h" #include "d/d_item_data.h" diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index 15e2acdaf..860a1c88d 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -12,7 +12,7 @@ #include "d/d_map.h" #include "d/d_kankyo_wether.h" #include "d/actor/d_a_agb.h" -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "d/actor/d_a_bomb.h" #include "m_Do/m_Do_gba_com.h" diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 2512a8cc3..c8c795b40 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -11,7 +11,7 @@ #include "d/d_npc.h" #include "d/d_item_data.h" #include "d/actor/d_a_player.h" -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "d/d_jnt_hit.h" #include "d/d_s_play.h" #include "dolphin/types.h" diff --git a/src/d/actor/d_a_bomb.cpp b/src/d/actor/d_a_bomb.cpp index 6ed079ead..490886a8b 100644 --- a/src/d/actor/d_a_bomb.cpp +++ b/src/d/actor/d_a_bomb.cpp @@ -8,7 +8,7 @@ #include "SSystem/SComponent/c_counter.h" #include "d/d_com_inf_game.h" #include "d/d_procname.h" -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.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_item.cpp b/src/d/actor/d_a_item.cpp index 3d5824c99..2c84b995a 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -7,7 +7,7 @@ #include "d/d_item_data.h" #include "d/actor/d_a_itembase_static.h" #include "d/actor/d_a_item.h" -#include "d/actor/d_a_player_link.h" +#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" diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index 2e50af0eb..ca09a048b 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -13,7 +13,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "d/d_item_data.h" #include "d/d_com_inf_game.h" -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "dolphin/types.h" /* 800F8A14-800F8A3C .text DeleteBase__12daItemBase_cFPCc */ diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index a951e5bb2..6157c3c62 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -5,7 +5,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JAZelAudio/JAIZelBasic.h" #include "d/actor/d_a_player.h" -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera_mng.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 6dc98b536..930c435b0 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -8,7 +8,7 @@ #include "d/d_procname.h" #include "m_Do/m_Do_hostIO.h" #include "d/d_item_data.h" -#include "d/actor/d_a_player_link.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" diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index fda774cc2..9ac41853d 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -5,7 +5,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "d/d_a_obj.h" #include "d/d_com_inf_game.h" #include "d/d_item_data.h" diff --git a/src/d/actor/d_a_player_battle.inc b/src/d/actor/d_a_player_battle.inc index 63fcac56c..d1f150d57 100644 --- a/src/d/actor/d_a_player_battle.inc +++ b/src/d/actor/d_a_player_battle.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 8013E250-8013E384 .text setSpecialBattle__9daPy_lk_cFi */ void daPy_lk_c::setSpecialBattle(int) { diff --git a/src/d/actor/d_a_player_boomerang.inc b/src/d/actor/d_a_player_boomerang.inc index 0ceb68954..6e4c26054 100644 --- a/src/d/actor/d_a_player_boomerang.inc +++ b/src/d/actor/d_a_player_boomerang.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 8014956C-80149590 .text checkBoomerangAnime__9daPy_lk_cCFv */ void daPy_lk_c::checkBoomerangAnime() const { diff --git a/src/d/actor/d_a_player_bottle.inc b/src/d/actor/d_a_player_bottle.inc index 9d81c34f4..4822ac5a0 100644 --- a/src/d/actor/d_a_player_bottle.inc +++ b/src/d/actor/d_a_player_bottle.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 80151E40-80151E60 .text changeBottleDrinkFace__9daPy_lk_cFi */ void daPy_lk_c::changeBottleDrinkFace(int) { diff --git a/src/d/actor/d_a_player_bow.inc b/src/d/actor/d_a_player_bow.inc index 39fa1085a..fe326feb3 100644 --- a/src/d/actor/d_a_player_bow.inc +++ b/src/d/actor/d_a_player_bow.inc @@ -10,7 +10,7 @@ * a function from this file. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 80149ECC-80149F88 .text bowJointCB__9daPy_lk_cFi */ void daPy_lk_c::bowJointCB(int) { diff --git a/src/d/actor/d_a_player_climb.inc b/src/d/actor/d_a_player_climb.inc index 9abbd1d6b..19e02e4f5 100644 --- a/src/d/actor/d_a_player_climb.inc +++ b/src/d/actor/d_a_player_climb.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 80135B50-80135B74 .text getClimbMoveAnmSpeed__9daPy_lk_cFv */ void daPy_lk_c::getClimbMoveAnmSpeed() { diff --git a/src/d/actor/d_a_player_crawl.inc b/src/d/actor/d_a_player_crawl.inc index 46eecac2c..7ea008dd5 100644 --- a/src/d/actor/d_a_player_crawl.inc +++ b/src/d/actor/d_a_player_crawl.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 801387A4-801387EC .text getCrawlMoveAnmSpeed__9daPy_lk_cFv */ void daPy_lk_c::getCrawlMoveAnmSpeed() { diff --git a/src/d/actor/d_a_player_dproc.inc b/src/d/actor/d_a_player_dproc.inc index 4185a9c5a..d3608494a 100644 --- a/src/d/actor/d_a_player_dproc.inc +++ b/src/d/actor/d_a_player_dproc.inc @@ -10,7 +10,7 @@ * a function from this file. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 8012CD60-8012CDD4 .text getDemoLookActor__9daPy_lk_cFv */ void daPy_lk_c::getDemoLookActor() { diff --git a/src/d/actor/d_a_player_fan.inc b/src/d/actor/d_a_player_fan.inc index eb830f892..6033e1779 100644 --- a/src/d/actor/d_a_player_fan.inc +++ b/src/d/actor/d_a_player_fan.inc @@ -10,7 +10,7 @@ * a function from this file. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 8014BAA0-8014BAEC .text fanWindEffectDraw__9daPy_lk_cFv */ void daPy_lk_c::fanWindEffectDraw() { diff --git a/src/d/actor/d_a_player_food.inc b/src/d/actor/d_a_player_food.inc index 471102d34..369cda007 100644 --- a/src/d/actor/d_a_player_food.inc +++ b/src/d/actor/d_a_player_food.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 80154334-801543A0 .text setHyoiModel__9daPy_lk_cFv */ void daPy_lk_c::setHyoiModel() { diff --git a/src/d/actor/d_a_player_grab.inc b/src/d/actor/d_a_player_grab.inc index fcbbf0358..7eae1b99c 100644 --- a/src/d/actor/d_a_player_grab.inc +++ b/src/d/actor/d_a_player_grab.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 8013A85C-8013A890 .text checkGrabSpecialHeavyState__9daPy_lk_cFv */ BOOL daPy_lk_c::checkGrabSpecialHeavyState() { diff --git a/src/d/actor/d_a_player_hammer.inc b/src/d/actor/d_a_player_hammer.inc index 66639520f..99cd6a8e3 100644 --- a/src/d/actor/d_a_player_hammer.inc +++ b/src/d/actor/d_a_player_hammer.inc @@ -10,7 +10,7 @@ * a function from this file. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 8015023C-80150324 .text setHammerModel__9daPy_lk_cFv */ void daPy_lk_c::setHammerModel() { diff --git a/src/d/actor/d_a_player_hang.inc b/src/d/actor/d_a_player_hang.inc index 334ec2e55..d28541cda 100644 --- a/src/d/actor/d_a_player_hang.inc +++ b/src/d/actor/d_a_player_hang.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 80133F1C-80133F40 .text getHangMoveAnmSpeed__9daPy_lk_cFv */ void daPy_lk_c::getHangMoveAnmSpeed() { diff --git a/src/d/actor/d_a_player_hook.inc b/src/d/actor/d_a_player_hook.inc index c9b8743e8..3519f885e 100644 --- a/src/d/actor/d_a_player_hook.inc +++ b/src/d/actor/d_a_player_hook.inc @@ -10,7 +10,7 @@ * a function from this file. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 8014AB5C-8014ABA0 .text checkHookshotReturn__9daPy_lk_cFv */ void daPy_lk_c::checkHookshotReturn() { diff --git a/src/d/actor/d_a_player_ladder.inc b/src/d/actor/d_a_player_ladder.inc index 2106066f1..f2c01bc92 100644 --- a/src/d/actor/d_a_player_ladder.inc +++ b/src/d/actor/d_a_player_ladder.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 80132F34-80132F58 .text getLadderMoveAnmSpeed__9daPy_lk_cFv */ void daPy_lk_c::getLadderMoveAnmSpeed() { diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index 97a2bbcb4..4b5541d1f 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -8,7 +8,7 @@ * The original split locations are indicated in the map file. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "d/d_com_inf_game.h" #include "d/d_com_lib_game.h" #include "JSystem/JKernel/JKRHeap.h" diff --git a/src/d/actor/d_a_player_particle.inc b/src/d/actor/d_a_player_particle.inc index a9d393ef4..588c5982a 100644 --- a/src/d/actor/d_a_player_particle.inc +++ b/src/d/actor/d_a_player_particle.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 8012901C-80129034 .text setup__24daPy_swimTailEcallBack_cFP14JPABaseEmitterPC4cXyzPC5csXyzSc */ void daPy_swimTailEcallBack_c::setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8) { diff --git a/src/d/actor/d_a_player_pushpull.inc b/src/d/actor/d_a_player_pushpull.inc index 618d01372..9848899f1 100644 --- a/src/d/actor/d_a_player_pushpull.inc +++ b/src/d/actor/d_a_player_pushpull.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 801514B0-80151644 .text setPushPullKeepData__9daPy_lk_cFQ24dBgW13PushPullLabel */ void daPy_lk_c::setPushPullKeepData(dBgW::PushPullLabel) { diff --git a/src/d/actor/d_a_player_rope.inc b/src/d/actor/d_a_player_rope.inc index 5afb14cb3..c1e92e8f8 100644 --- a/src/d/actor/d_a_player_rope.inc +++ b/src/d/actor/d_a_player_rope.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 80142D08-80142D68 .text checkRopeAnime__9daPy_lk_cCFv */ void daPy_lk_c::checkRopeAnime() const { diff --git a/src/d/actor/d_a_player_ship.inc b/src/d/actor/d_a_player_ship.inc index 1dd178551..acb3f7d07 100644 --- a/src/d/actor/d_a_player_ship.inc +++ b/src/d/actor/d_a_player_ship.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 8013F848-8013F8AC .text shipSpecialDemoStart__9daPy_lk_cFv */ void daPy_lk_c::shipSpecialDemoStart() { diff --git a/src/d/actor/d_a_player_swim.inc b/src/d/actor/d_a_player_swim.inc index 9013548f5..dc0af0c91 100644 --- a/src/d/actor/d_a_player_swim.inc +++ b/src/d/actor/d_a_player_swim.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 8013CC64-8013CF2C .text setSpeedAndAngleSwim__9daPy_lk_cFv */ void daPy_lk_c::setSpeedAndAngleSwim() { diff --git a/src/d/actor/d_a_player_sword.inc b/src/d/actor/d_a_player_sword.inc index 7f2246076..d8d0552f8 100644 --- a/src/d/actor/d_a_player_sword.inc +++ b/src/d/actor/d_a_player_sword.inc @@ -10,7 +10,7 @@ * a function from this file. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 80154B80-80154FBC .text setSwordModel__9daPy_lk_cFi */ void daPy_lk_c::setSwordModel(int) { diff --git a/src/d/actor/d_a_player_tact.inc b/src/d/actor/d_a_player_tact.inc index c934dcd54..13062c36f 100644 --- a/src/d/actor/d_a_player_tact.inc +++ b/src/d/actor/d_a_player_tact.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 8014D778-8014D7D4 .text getDayNightParamData__9daPy_lk_cFv */ u32 daPy_lk_c::getDayNightParamData() { diff --git a/src/d/actor/d_a_player_vomit.inc b/src/d/actor/d_a_player_vomit.inc index 1727edd7f..8ae501832 100644 --- a/src/d/actor/d_a_player_vomit.inc +++ b/src/d/actor/d_a_player_vomit.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 8014F8A0-8014F994 .text checkJumpFlower__9daPy_lk_cFv */ void daPy_lk_c::checkJumpFlower() { diff --git a/src/d/actor/d_a_player_weapon.inc b/src/d/actor/d_a_player_weapon.inc index 72fe7f472..105d0c9f9 100644 --- a/src/d/actor/d_a_player_weapon.inc +++ b/src/d/actor/d_a_player_weapon.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 80153554-801535D8 .text setEnemyWeaponAtParam__9daPy_lk_cFi */ void daPy_lk_c::setEnemyWeaponAtParam(int) { diff --git a/src/d/actor/d_a_player_whide.inc b/src/d/actor/d_a_player_whide.inc index dd3ae68bd..03a1c2f48 100644 --- a/src/d/actor/d_a_player_whide.inc +++ b/src/d/actor/d_a_player_whide.inc @@ -10,7 +10,7 @@ * based on the original names of the functions it contains. */ -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" /* 8013707C-801371E0 .text setBlendWHideMoveAnime__9daPy_lk_cFf */ void daPy_lk_c::setBlendWHideMoveAnime(f32) { diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 7b8b49a03..f3082d915 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_tag_msg.cpp // #include "JSystem/JKernel/JKRHeap.h" -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "d/d_procname.h" struct daTag_Msg_c : public fopAc_ac_c { diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp index b5f3ff82c..8f216f2a7 100644 --- a/src/d/actor/d_a_tag_ret.cpp +++ b/src/d/actor/d_a_tag_ret.cpp @@ -9,7 +9,7 @@ #include "d/d_cc_d.h" #include "d/d_procname.h" #include "d/d_com_inf_game.h" -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "JSystem/JKernel/JKRHeap.h" #include "dolphin/types.h" diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 210b6244e..1a04ac1ec 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -7,7 +7,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "MSL_C/string.h" #include "SSystem/SComponent/c_phase.h" -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "d/d_com_lib_game.h" #include "d/d_demo.h" #include "d/d_flower.h" diff --git a/src/d/d_metronome.cpp b/src/d/d_metronome.cpp index 4e2c74487..e3476bfb8 100644 --- a/src/d/d_metronome.cpp +++ b/src/d/d_metronome.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_metronome.cpp // -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "d/d_com_inf_game.h" #include "d/d_drawlist.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 7b7cff940..b2a5cb7c0 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -10,7 +10,7 @@ #include "JSystem/JUtility/JUTReport.h" #include "MSL_C/string.h" #include "SSystem/SComponent/c_counter.h" -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "d/actor/d_a_title.h" #include "d/d_com_inf_game.h" #include "d/d_com_lib_game.h" diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index ae9aab23b..67e9c328d 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -8,7 +8,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "MSL_C/string.h" #include "SSystem/SComponent/c_malloc.h" -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "d/actor/d_a_ship.h" #include "d/d_bg_s.h" #include "d/d_bg_s_gnd_chk.h" diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 1293c9c59..ea4e0ea4c 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -13,7 +13,7 @@ #include "d/d_item.h" #include "d/d_item_data.h" #include "d/actor/d_a_player.h" -#include "d/actor/d_a_player_link.h" +#include "d/actor/d_a_player_main.h" #include "d/actor/d_a_item.h" #include "d/actor/d_a_sea.h" #include "m_Do/m_Do_ext.h"