From a116292705d0c04d6ef9765c9b637900062fc825 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Wed, 17 Apr 2024 13:27:52 -0400 Subject: [PATCH] add static keyword in more places --- src/d/actor/d_a_agb.cpp | 2 +- src/d/actor/d_a_arrow.cpp | 2 +- src/d/actor/d_a_bg.cpp | 2 +- src/d/actor/d_a_bomb3.inc | 2 +- src/d/actor/d_a_disappear.cpp | 2 +- src/d/actor/d_a_esa.cpp | 2 +- src/d/actor/d_a_grass.cpp | 2 +- src/d/actor/d_a_hookshot.cpp | 2 +- src/d/actor/d_a_ib.cpp | 2 +- src/d/actor/d_a_kytag00.cpp | 2 +- src/d/actor/d_a_nh.cpp | 2 +- src/d/actor/d_a_npc_btsw2.cpp | 2 +- src/d/actor/d_a_player_main.cpp | 2 +- src/d/actor/d_a_sea.cpp | 2 +- src/d/actor/d_a_swtact.cpp | 2 +- src/d/actor/d_a_swtdoor.cpp | 2 +- src/d/actor/d_a_vrbox.cpp | 2 +- src/d/actor/d_a_vrbox2.cpp | 2 +- src/d/d_auction_screen.cpp | 10 +++++----- src/d/d_envse.cpp | 10 +++++----- src/d/d_gameover.cpp | 10 +++++----- src/d/d_kankyo.cpp | 10 +++++----- src/d/d_ky_thunder.cpp | 10 +++++----- src/d/d_kyeff.cpp | 10 +++++----- src/d/d_kyeff2.cpp | 10 +++++----- src/d/d_level_se.cpp | 8 ++++---- src/d/d_menu_cloth.cpp | 10 +++++----- src/d/d_menu_window.cpp | 10 +++++----- src/d/d_mesg.cpp | 10 +++++----- src/d/d_message.cpp | 10 +++++----- src/d/d_message_paper.cpp | 10 +++++----- src/d/d_meter.cpp | 10 +++++----- src/d/d_minigame_starter.cpp | 10 +++++----- src/d/d_minigame_terminater.cpp | 10 +++++----- src/d/d_msg.cpp | 10 +++++----- src/d/d_operate_wind.cpp | 10 +++++----- src/d/d_ovlp_fade.cpp | 10 +++++----- src/d/d_ovlp_fade2.cpp | 10 +++++----- src/d/d_ovlp_fade4.cpp | 10 +++++----- src/d/d_picture_box.cpp | 10 +++++----- src/d/d_place_name.cpp | 10 +++++----- src/d/d_s_logo.cpp | 10 +++++----- src/d/d_s_menu.cpp | 10 +++++----- src/d/d_s_name.cpp | 10 +++++----- src/d/d_s_open.cpp | 10 +++++----- src/d/d_s_play.cpp | 10 +++++----- src/d/d_s_room.cpp | 10 +++++----- src/d/d_s_title.cpp | 10 +++++----- src/d/d_scope.cpp | 10 +++++----- src/d/d_throwstone.cpp | 12 ++++++------ src/d/d_timer.cpp | 10 +++++----- src/d/d_water_mark.cpp | 10 +++++----- src/d/d_wind_arrow.cpp | 10 +++++----- src/d/d_wpillar.cpp | 10 +++++----- src/d/d_wpot_water.cpp | 10 +++++----- 55 files changed, 203 insertions(+), 203 deletions(-) diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 908d0c224..2d80377c3 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -1794,7 +1794,7 @@ static int daAgb_Create(fopAc_ac_c* i_this) { return phase; } -actor_method_class l_daAgb_Method = { +static actor_method_class l_daAgb_Method = { (process_method_func)daAgb_Create, (process_method_func)daAgb_Delete, (process_method_func)daAgb_Execute, diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 9ddaa4217..d1c5e0990 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -1294,7 +1294,7 @@ static BOOL daArrowIsDelete(void* i_this) { return TRUE; } -actor_method_class daArrowMethodTable = { +static actor_method_class daArrowMethodTable = { (process_method_func)daArrowCreate, (process_method_func)daArrowDelete, (process_method_func)daArrowExecute, diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 0224a0a8e..645b3e55c 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -393,7 +393,7 @@ s32 daBg_c::create() { return cPhs_COMPLEATE_e; } -actor_method_class l_daBg_Method = { +static actor_method_class l_daBg_Method = { (process_method_func)daBg_Create, (process_method_func)daBg_Delete, (process_method_func)daBg_Execute, diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index 35ab8e5ed..132394e25 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -1467,7 +1467,7 @@ void daBomb_c::create_init() { init_mtx(); } -actor_method_class l_daBomb_Method = { +static actor_method_class l_daBomb_Method = { (process_method_func)daBomb_Create, (process_method_func)daBomb_Delete, (process_method_func)daBomb_Execute, diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 84c8755fc..d211fe370 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -115,7 +115,7 @@ static s32 daDisappear_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -actor_method_class l_daDisappear_Method = { +static actor_method_class l_daDisappear_Method = { (process_method_func)daDisappear_Create, (process_method_func)daDisappear_Delete, (process_method_func)daDisappear_Execute, diff --git a/src/d/actor/d_a_esa.cpp b/src/d/actor/d_a_esa.cpp index 090da33fc..76a125991 100644 --- a/src/d/actor/d_a_esa.cpp +++ b/src/d/actor/d_a_esa.cpp @@ -280,7 +280,7 @@ static s32 daEsa_Create(fopAc_ac_c* i_actor) { return cPhs_COMPLEATE_e; } -actor_method_class l_daEsa_Method = { +static actor_method_class l_daEsa_Method = { (process_method_func)daEsa_Create, (process_method_func)daEsa_Delete, (process_method_func)daEsa_Execute, diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 2bf97878f..0837165a1 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -195,7 +195,7 @@ static s32 daGrass_Create(fopAc_ac_c* i_ac) { return cPhs_ERROR_e; } -actor_method_class daGrass_METHODS = { +static actor_method_class daGrass_METHODS = { (process_method_func)daGrass_Create, (process_method_func)daGrass_Delete, (process_method_func)NULL, diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index 93169b848..62c5cd384 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -389,7 +389,7 @@ static s32 daHookshot_Create(fopAc_ac_c* i_actor) { return reinterpret_cast(i_actor)->create(); } -actor_method_class l_daHookshot_Method = { +static actor_method_class l_daHookshot_Method = { (process_method_func)daHookshot_Create, (process_method_func)daHookshot_Delete, (process_method_func)daHookshot_Execute, diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index 07b5cf0ee..c90991d22 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -513,7 +513,7 @@ dCcD_SrcCyl daIball_c::m_cyl_src = { }, }; -actor_method_class l_daIball_Method = { +static actor_method_class l_daIball_Method = { (process_method_func)daIball_Create, (process_method_func)daIball_Delete, (process_method_func)daIball_Execute, diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index 9addbaa2b..c3cf58af9 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -401,7 +401,7 @@ static s32 daKytag00_Create(fopAc_ac_c* i_ac) { return cPhs_COMPLEATE_e; } -actor_method_class l_daKytag00_Method = { +static actor_method_class l_daKytag00_Method = { (process_method_func)daKytag00_Create, (process_method_func)daKytag00_Delete, (process_method_func)daKytag00_Execute, diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index 028c4f486..51dfe2b48 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -498,7 +498,7 @@ static s32 daNh_Create(fopAc_ac_c* i_this) { return ((daNh_c*)i_this)->create(); } -actor_method_class l_daNh_Method = { +static actor_method_class l_daNh_Method = { (process_method_func)daNh_Create, (process_method_func)daNh_Delete, (process_method_func)daNh_Execute, diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index c422e7907..c254ab398 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -712,7 +712,7 @@ static BOOL daNpc_Btsw2_IsDelete(daNpc_Btsw2_c* i_this) { return TRUE; } -actor_method_class l_daNpc_Btsw2_Method = { +static actor_method_class l_daNpc_Btsw2_Method = { (process_method_func)daNpc_Btsw2_Create, (process_method_func)daNpc_Btsw2_Delete, (process_method_func)daNpc_Btsw2_Execute, diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index bbb036227..7781e4bb8 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -4635,7 +4635,7 @@ BOOL daPy_lk_c::getBokoFlamePos(cXyz* outPos) { return FALSE; } -actor_method_class2 l_daPy_Method = { +static actor_method_class2 l_daPy_Method = { (process_method_func)daPy_Create, (process_method_func)daPy_Delete, (process_method_func)daPy_Execute, diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp index 545ed8407..9d17f9b9c 100644 --- a/src/d/actor/d_a_sea.cpp +++ b/src/d/actor/d_a_sea.cpp @@ -388,7 +388,7 @@ static s32 daSea_Create(fopAc_ac_c* i_this) { return cPhs_COMPLEATE_e; } -actor_method_class l_daSea_Method = { +static actor_method_class l_daSea_Method = { (process_method_func)daSea_Create, (process_method_func)daSea_Delete, (process_method_func)daSea_Execute, diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp index 3a63fcfb6..7e2d567f7 100644 --- a/src/d/actor/d_a_swtact.cpp +++ b/src/d/actor/d_a_swtact.cpp @@ -203,7 +203,7 @@ static BOOL daSwTact_IsDelete(void* i_ac) { return TRUE; } -actor_method_class daSwTactMethodTable = { +static actor_method_class daSwTactMethodTable = { (process_method_func)daSwTact_Create, (process_method_func)daSwTact_Delete, (process_method_func)daSwTact_Execute, diff --git a/src/d/actor/d_a_swtdoor.cpp b/src/d/actor/d_a_swtdoor.cpp index 5107f215b..ce62f3085 100644 --- a/src/d/actor/d_a_swtdoor.cpp +++ b/src/d/actor/d_a_swtdoor.cpp @@ -85,7 +85,7 @@ static s32 daSwtdoor_Create(fopAc_ac_c* i_ac) { return cPhs_COMPLEATE_e; } -actor_method_class l_daSwtdoor_Method = { +static actor_method_class l_daSwtdoor_Method = { (process_method_func)daSwtdoor_Create, (process_method_func)daSwtdoor_Delete, (process_method_func)daSwtdoor_Execute, diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index f1d42cfcd..af9ef58ca 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -194,7 +194,7 @@ static s32 daVrbox_Create(fopAc_ac_c* i_actor) { return phase_state; } -actor_method_class l_daVrbox_Method = { +static actor_method_class l_daVrbox_Method = { (process_method_func)daVrbox_Create, (process_method_func)daVrbox_Delete, (process_method_func)daVrbox_Execute, diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 2629b6ce2..81ef1bfcb 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -285,7 +285,7 @@ static s32 daVrbox2_Create(fopAc_ac_c* i_actor) { return phase_state; } -actor_method_class l_daVrbox2_Method = { +static actor_method_class l_daVrbox2_Method = { (process_method_func)daVrbox2_Create, (process_method_func)daVrbox2_Delete, (process_method_func)daVrbox2_Execute, diff --git a/src/d/d_auction_screen.cpp b/src/d/d_auction_screen.cpp index 20b3e3de4..db457f610 100644 --- a/src/d/d_auction_screen.cpp +++ b/src/d/d_auction_screen.cpp @@ -117,27 +117,27 @@ void dAs_c::_delete() { } /* 80160C7C-80160C9C .text dAs_Draw__FP5dAs_c */ -void dAs_Draw(dAs_c*) { +static void dAs_Draw(dAs_c*) { /* Nonmatching */ } /* 80160C9C-80160CBC .text dAs_Execute__FP5dAs_c */ -void dAs_Execute(dAs_c*) { +static void dAs_Execute(dAs_c*) { /* Nonmatching */ } /* 80160CBC-80160CC4 .text dAs_IsDelete__FP5dAs_c */ -void dAs_IsDelete(dAs_c*) { +static void dAs_IsDelete(dAs_c*) { /* Nonmatching */ } /* 80160CC4-80160CF8 .text dAs_Delete__FP5dAs_c */ -void dAs_Delete(dAs_c*) { +static void dAs_Delete(dAs_c*) { /* Nonmatching */ } /* 80160CF8-80160D20 .text dAs_Create__FP9msg_class */ -void dAs_Create(msg_class*) { +static void dAs_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index 49615c7d2..e1f6c11a3 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -21,7 +21,7 @@ public: }; /* 8017D4C0-8017D4C8 .text dEnvSe_Draw__FP8dEnvSe_c */ -BOOL dEnvSe_Draw(dEnvSe_c* i_this) { +static BOOL dEnvSe_Draw(dEnvSe_c* i_this) { return TRUE; } @@ -167,23 +167,23 @@ BOOL dEnvSe_c::execute() { } /* 8017DAE0-8017DB00 .text dEnvSe_Execute__FP8dEnvSe_c */ -BOOL dEnvSe_Execute(dEnvSe_c* i_this) { +static BOOL dEnvSe_Execute(dEnvSe_c* i_this) { return i_this->execute(); } /* 8017DB00-8017DB08 .text dEnvSe_IsDelete__FP8dEnvSe_c */ -BOOL dEnvSe_IsDelete(dEnvSe_c* i_this) { +static BOOL dEnvSe_IsDelete(dEnvSe_c* i_this) { return TRUE; } /* 8017DB08-8017DB38 .text dEnvSe_Delete__FP8dEnvSe_c */ -BOOL dEnvSe_Delete(dEnvSe_c* i_this) { +static BOOL dEnvSe_Delete(dEnvSe_c* i_this) { mDoAud_seDeleteObject(&i_this->mPos); return TRUE; } /* 8017DB38-8017DB40 .text dEnvSe_Create__FP12kankyo_class */ -s32 dEnvSe_Create(kankyo_class*) { +static s32 dEnvSe_Create(kankyo_class*) { return cPhs_COMPLEATE_e; } diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 3714d54c4..71a120785 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -375,27 +375,27 @@ void dDlst_GameOverScrnDraw_c::draw() { } /* 8018F5EC-8018F60C .text dGameover_Draw__FP11dGameover_c */ -BOOL dGameover_Draw(dGameover_c* i_this) { +static BOOL dGameover_Draw(dGameover_c* i_this) { return i_this->_draw(); } /* 8018F60C-8018F62C .text dGameover_Execute__FP11dGameover_c */ -BOOL dGameover_Execute(dGameover_c* i_this) { +static BOOL dGameover_Execute(dGameover_c* i_this) { return i_this->_execute(); } /* 8018F62C-8018F634 .text dGameover_IsDelete__FP11dGameover_c */ -BOOL dGameover_IsDelete(dGameover_c* i_this) { +static BOOL dGameover_IsDelete(dGameover_c* i_this) { return TRUE; } /* 8018F634-8018F654 .text dGameover_Delete__FP11dGameover_c */ -BOOL dGameover_Delete(dGameover_c* i_this) { +static BOOL dGameover_Delete(dGameover_c* i_this) { return i_this->_delete(); } /* 8018F654-8018F674 .text dGameover_Create__FP9msg_class */ -s32 dGameover_Create(msg_class* i_this) { +static s32 dGameover_Create(msg_class* i_this) { return ((dGameover_c*)i_this)->_create(); } diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index dda10b70c..a30448831 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -2304,13 +2304,13 @@ void dScnKy_env_light_c::drawKankyo() { } /* 80194888-801948B4 .text dKy_Draw__FP17sub_kankyo__class */ -int dKy_Draw(sub_kankyo__class*) { +static int dKy_Draw(sub_kankyo__class*) { g_env_light.drawKankyo(); return 1; } /* 801948B4-801948E8 .text dKy_Execute__FP17sub_kankyo__class */ -int dKy_Execute(sub_kankyo__class*) { +static int dKy_Execute(sub_kankyo__class*) { dKy_event_proc(); g_env_light.exeKankyo(); dKyw_wind_set(); @@ -2318,18 +2318,18 @@ int dKy_Execute(sub_kankyo__class*) { } /* 801948E8-801948F0 .text dKy_IsDelete__FP17sub_kankyo__class */ -int dKy_IsDelete(sub_kankyo__class*) { +static int dKy_IsDelete(sub_kankyo__class*) { return 1; } /* 801948F0-80194914 .text dKy_Delete__FP17sub_kankyo__class */ -int dKy_Delete(sub_kankyo__class*) { +static int dKy_Delete(sub_kankyo__class*) { plight_init(); return 1; } /* 80194914-80194974 .text dKy_Create__FPv */ -int dKy_Create(void*) { +static int dKy_Create(void*) { envcolor_init(); g_env_light.field_0xc78 = NULL; g_env_light.field_0xc44 = 1.0f; diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index c5a5db1a9..5fbf223db 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -98,22 +98,22 @@ void dThunder_c::adjustHeap() { } /* 801988B8-80198A38 .text dThunder_Draw__FP10dThunder_c */ -BOOL dThunder_Draw(dThunder_c* i_this) { +static BOOL dThunder_Draw(dThunder_c* i_this) { return i_this->draw(); } /* 80198A38-80198AB4 .text dThunder_Execute__FP10dThunder_c */ -BOOL dThunder_Execute(dThunder_c* i_this) { +static BOOL dThunder_Execute(dThunder_c* i_this) { return i_this->execute(); } /* 80198AB4-80198ABC .text dThunder_IsDelete__FP10dThunder_c */ -BOOL dThunder_IsDelete(dThunder_c* i_this) { +static BOOL dThunder_IsDelete(dThunder_c* i_this) { return TRUE; } /* 80198ABC-80198B68 .text dThunder_Delete__FP10dThunder_c */ -BOOL dThunder_Delete(dThunder_c* i_this) { +static BOOL dThunder_Delete(dThunder_c* i_this) { mDoAud_seDeleteObject(&i_this->mPos); mDoAud_seDeleteObject(&i_this->mPosNeg); i_this->~dThunder_c(); @@ -121,7 +121,7 @@ BOOL dThunder_Delete(dThunder_c* i_this) { } /* 80198B68-80198BC4 .text dThunder_Create__FP12kankyo_class */ -s32 dThunder_Create(kankyo_class* i_ky) { +static s32 dThunder_Create(kankyo_class* i_ky) { dThunder_c * i_this = (dThunder_c *)i_ky; if (!i_this->createHeap()) return cPhs_ERROR_e; diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 0c16577a4..fac25692c 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -20,7 +20,7 @@ public: }; /* 80197FE4-80198008 .text dKyeff_Draw__FP8dKyeff_c */ -BOOL dKyeff_Draw(dKyeff_c* i_this) { +static BOOL dKyeff_Draw(dKyeff_c* i_this) { dKyw_wether_draw(); return TRUE; } @@ -119,23 +119,23 @@ BOOL dKyeff_c::execute() { } /* 801984CC-801984EC .text dKyeff_Execute__FP8dKyeff_c */ -BOOL dKyeff_Execute(dKyeff_c* i_this) { +static BOOL dKyeff_Execute(dKyeff_c* i_this) { return i_this->execute(); } /* 801984EC-801984F4 .text dKyeff_IsDelete__FP8dKyeff_c */ -BOOL dKyeff_IsDelete(dKyeff_c* i_this) { +static BOOL dKyeff_IsDelete(dKyeff_c* i_this) { return TRUE; } /* 801984F4-80198518 .text dKyeff_Delete__FP8dKyeff_c */ -BOOL dKyeff_Delete(dKyeff_c* i_this) { +static BOOL dKyeff_Delete(dKyeff_c* i_this) { dKyw_wether_delete(); return TRUE; } /* 80198518-80198758 .text dKyeff_Create__FP12kankyo_class */ -s32 dKyeff_Create(kankyo_class* i_ky) { +static s32 dKyeff_Create(kankyo_class* i_ky) { dKyw_wether_init(); if (strcmp(dComIfGp_getStartStageName(), "Name") == 0) { diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index e0da5a888..0dc3d9aca 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -20,7 +20,7 @@ public: }; /* 80198758-8019877C .text dKyeff2_Draw__FP9dKyeff2_c */ -BOOL dKyeff2_Draw(dKyeff2_c* i_this) { +static BOOL dKyeff2_Draw(dKyeff2_c* i_this) { dKyw_wether_draw2(); return TRUE; } @@ -32,23 +32,23 @@ BOOL dKyeff2_c::execute() { } /* 801987A0-801987C0 .text dKyeff2_Execute__FP9dKyeff2_c */ -BOOL dKyeff2_Execute(dKyeff2_c* i_this) { +static BOOL dKyeff2_Execute(dKyeff2_c* i_this) { return i_this->execute(); } /* 801987C0-801987C8 .text dKyeff2_IsDelete__FP9dKyeff2_c */ -BOOL dKyeff2_IsDelete(dKyeff2_c* i_this) { +static BOOL dKyeff2_IsDelete(dKyeff2_c* i_this) { return TRUE; } /* 801987C8-801987EC .text dKyeff2_Delete__FP9dKyeff2_c */ -BOOL dKyeff2_Delete(dKyeff2_c* i_this) { +static BOOL dKyeff2_Delete(dKyeff2_c* i_this) { dKyw_wether_delete2(); return TRUE; } /* 801987EC-80198810 .text dKyeff2_Create__FP12kankyo_class */ -s32 dKyeff2_Create(kankyo_class*) { +static s32 dKyeff2_Create(kankyo_class*) { dKyw_wether_init2(); return cPhs_COMPLEATE_e; } diff --git a/src/d/d_level_se.cpp b/src/d/d_level_se.cpp index 606d73d76..566f07d06 100644 --- a/src/d/d_level_se.cpp +++ b/src/d/d_level_se.cpp @@ -10,7 +10,7 @@ #include "m_Do/m_Do_audio.h" /* 80199308-801993CC .text dLevelSe_Execute__FP10dLevelSe_c */ -BOOL dLevelSe_Execute(dLevelSe_c* i_this) { +static BOOL dLevelSe_Execute(dLevelSe_c* i_this) { s32 soundId = i_this->mParam; if (i_this->mFlag & 0x08) { @@ -26,18 +26,18 @@ BOOL dLevelSe_Execute(dLevelSe_c* i_this) { } /* 801993CC-801993D4 .text dLevelSe_IsDelete__FP10dLevelSe_c */ -BOOL dLevelSe_IsDelete(dLevelSe_c*) { +static BOOL dLevelSe_IsDelete(dLevelSe_c*) { return TRUE; } /* 801993D4-80199404 .text dLevelSe_Delete__FP10dLevelSe_c */ -BOOL dLevelSe_Delete(dLevelSe_c* i_this) { +static BOOL dLevelSe_Delete(dLevelSe_c* i_this) { mDoAud_seDeleteObject(&i_this->mPos); return TRUE; } /* 80199404-8019940C .text dLevelSe_Create__FP12kankyo_class */ -s32 dLevelSe_Create(kankyo_class*) { +static s32 dLevelSe_Create(kankyo_class*) { return cPhs_COMPLEATE_e; } diff --git a/src/d/d_menu_cloth.cpp b/src/d/d_menu_cloth.cpp index efc1da3a5..620443414 100644 --- a/src/d/d_menu_cloth.cpp +++ b/src/d/d_menu_cloth.cpp @@ -122,26 +122,26 @@ void dMCloth_c::cloth_move() { } /* 8019BDB8-8019BDC0 .text dMenu_ClothCreate__FPv */ -void dMenu_ClothCreate(void*) { +static void dMenu_ClothCreate(void*) { /* Nonmatching */ } /* 8019BDC0-8019BDC8 .text dMenu_ClothDelete__FPv */ -void dMenu_ClothDelete(void*) { +static void dMenu_ClothDelete(void*) { /* Nonmatching */ } /* 8019BDC8-8019BDD0 .text dMenu_ClothExecute__FPv */ -void dMenu_ClothExecute(void*) { +static void dMenu_ClothExecute(void*) { /* Nonmatching */ } /* 8019BDD0-8019BDD8 .text dMenu_ClothDraw__FPv */ -void dMenu_ClothDraw(void*) { +static void dMenu_ClothDraw(void*) { /* Nonmatching */ } /* 8019BDD8-8019BDE0 .text dMenu_ClothIsDelete__FPv */ -void dMenu_ClothIsDelete(void*) { +static void dMenu_ClothIsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index 58ef14562..c7f986c8d 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -137,26 +137,26 @@ void dMs_placenameMove(sub_ms_screen_class*) { } /* 801DD6D8-801DD960 .text dMs_Draw__FP19sub_ms_screen_class */ -void dMs_Draw(sub_ms_screen_class*) { +static void dMs_Draw(sub_ms_screen_class*) { /* Nonmatching */ } /* 801DD960-801DF340 .text dMs_Execute__FP19sub_ms_screen_class */ -void dMs_Execute(sub_ms_screen_class*) { +static void dMs_Execute(sub_ms_screen_class*) { /* Nonmatching */ } /* 801DF340-801DF368 .text dMs_IsDelete__FP19sub_ms_screen_class */ -void dMs_IsDelete(sub_ms_screen_class*) { +static void dMs_IsDelete(sub_ms_screen_class*) { /* Nonmatching */ } /* 801DF368-801DF4C4 .text dMs_Delete__FP19sub_ms_screen_class */ -void dMs_Delete(sub_ms_screen_class*) { +static void dMs_Delete(sub_ms_screen_class*) { /* Nonmatching */ } /* 801DF4C4-801DF684 .text dMs_Create__FP9msg_class */ -void dMs_Create(msg_class*) { +static void dMs_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_mesg.cpp b/src/d/d_mesg.cpp index 53918f011..08736d465 100644 --- a/src/d/d_mesg.cpp +++ b/src/d/d_mesg.cpp @@ -413,12 +413,12 @@ void dMesg_closeProc(sub_mesg_class*) { } /* 801E6E00-801E6E44 .text dMsg_Draw__FP14sub_mesg_class */ -void dMsg_Draw(sub_mesg_class*) { +static void dMsg_Draw(sub_mesg_class*) { /* Nonmatching */ } /* 801E6E44-801E6F34 .text dMsg_Execute__FP14sub_mesg_class */ -void dMsg_Execute(sub_mesg_class*) { +static void dMsg_Execute(sub_mesg_class*) { /* Nonmatching */ } @@ -428,17 +428,17 @@ void dMesg_screenData_c::move() { } /* 801E6F38-801E6F40 .text dMsg_IsDelete__FP14sub_mesg_class */ -void dMsg_IsDelete(sub_mesg_class*) { +static void dMsg_IsDelete(sub_mesg_class*) { /* Nonmatching */ } /* 801E6F40-801E7130 .text dMsg_Delete__FP14sub_mesg_class */ -void dMsg_Delete(sub_mesg_class*) { +static void dMsg_Delete(sub_mesg_class*) { /* Nonmatching */ } /* 801E7130-801E7290 .text dMsg_Create__FP9msg_class */ -void dMsg_Create(msg_class*) { +static void dMsg_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_message.cpp b/src/d/d_message.cpp index b9737efbc..e47545758 100644 --- a/src/d/d_message.cpp +++ b/src/d/d_message.cpp @@ -202,26 +202,26 @@ void dDlst_2DCopy_c::draw() { } /* 801EA0C8-801EA224 .text dMsg2_Draw__FP14sub_msg2_class */ -void dMsg2_Draw(sub_msg2_class*) { +static void dMsg2_Draw(sub_msg2_class*) { /* Nonmatching */ } /* 801EA224-801EA7C4 .text dMsg2_Execute__FP14sub_msg2_class */ -void dMsg2_Execute(sub_msg2_class*) { +static void dMsg2_Execute(sub_msg2_class*) { /* Nonmatching */ } /* 801EA7C4-801EA7CC .text dMsg2_IsDelete__FP14sub_msg2_class */ -void dMsg2_IsDelete(sub_msg2_class*) { +static void dMsg2_IsDelete(sub_msg2_class*) { /* Nonmatching */ } /* 801EA7CC-801EA97C .text dMsg2_Delete__FP14sub_msg2_class */ -void dMsg2_Delete(sub_msg2_class*) { +static void dMsg2_Delete(sub_msg2_class*) { /* Nonmatching */ } /* 801EA97C-801EAFC0 .text dMsg2_Create__FP9msg_class */ -void dMsg2_Create(msg_class*) { +static void dMsg2_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_message_paper.cpp b/src/d/d_message_paper.cpp index 2d9ed00a3..f674e44ee 100644 --- a/src/d/d_message_paper.cpp +++ b/src/d/d_message_paper.cpp @@ -232,26 +232,26 @@ void dDlst_2DMSG3_c::outFontDraw() { } /* 801EE104-801EE218 .text dMsg3_Draw__FP14sub_msg3_class */ -void dMsg3_Draw(sub_msg3_class*) { +static void dMsg3_Draw(sub_msg3_class*) { /* Nonmatching */ } /* 801EE218-801EE740 .text dMsg3_Execute__FP14sub_msg3_class */ -void dMsg3_Execute(sub_msg3_class*) { +static void dMsg3_Execute(sub_msg3_class*) { /* Nonmatching */ } /* 801EE740-801EE748 .text dMsg3_IsDelete__FP14sub_msg3_class */ -void dMsg3_IsDelete(sub_msg3_class*) { +static void dMsg3_IsDelete(sub_msg3_class*) { /* Nonmatching */ } /* 801EE748-801EE904 .text dMsg3_Delete__FP14sub_msg3_class */ -void dMsg3_Delete(sub_msg3_class*) { +static void dMsg3_Delete(sub_msg3_class*) { /* Nonmatching */ } /* 801EE904-801EEEFC .text dMsg3_Create__FP9msg_class */ -void dMsg3_Create(msg_class*) { +static void dMsg3_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp index b2a37e3a1..5cb9ce866 100644 --- a/src/d/d_meter.cpp +++ b/src/d/d_meter.cpp @@ -1718,12 +1718,12 @@ void dMeter_screenDataArrowSet(sub_meter_class* i_this) { } /* 80204404-80204820 .text dMeter_Draw__FP15sub_meter_class */ -BOOL dMeter_Draw(sub_meter_class* i_this) { +static BOOL dMeter_Draw(sub_meter_class* i_this) { /* Nonmatching */ } /* 80204820-80204C20 .text dMeter_Execute__FP15sub_meter_class */ -BOOL dMeter_Execute(sub_meter_class* i_this) { +static BOOL dMeter_Execute(sub_meter_class* i_this) { JKRHeap* oldHeap = mDoExt_setCurrentHeap(i_this->heap); i_this->field_0x3024 = 0; dMeter_statusCheck(i_this); @@ -1801,17 +1801,17 @@ BOOL dMeter_Execute(sub_meter_class* i_this) { } /* 80204C20-80204C28 .text dMeter_IsDelete__FP15sub_meter_class */ -BOOL dMeter_IsDelete(sub_meter_class* i_this) { +static BOOL dMeter_IsDelete(sub_meter_class* i_this) { return TRUE; } /* 80204C28-80205034 .text dMeter_Delete__FP15sub_meter_class */ -BOOL dMeter_Delete(sub_meter_class* i_this) { +static BOOL dMeter_Delete(sub_meter_class* i_this) { /* Nonmatching */ } /* 80205034-802057B8 .text dMeter_Create__FP9msg_class */ -s32 dMeter_Create(msg_class* i_this) { +static s32 dMeter_Create(msg_class* i_this) { /* Nonmatching */ mapAlpha = 0; menu_status = 0; diff --git a/src/d/d_minigame_starter.cpp b/src/d/d_minigame_starter.cpp index 82b006782..fa548867b 100644 --- a/src/d/d_minigame_starter.cpp +++ b/src/d/d_minigame_starter.cpp @@ -68,26 +68,26 @@ void dDlst_StarterScrnDraw_c::draw() { } /* 80206EDC-80206EFC .text dMinigame_Starter_Draw__FP19dMinigame_Starter_c */ -void dMinigame_Starter_Draw(dMinigame_Starter_c*) { +static void dMinigame_Starter_Draw(dMinigame_Starter_c*) { /* Nonmatching */ } /* 80206EFC-80206F1C .text dMinigame_Starter_Execute__FP19dMinigame_Starter_c */ -void dMinigame_Starter_Execute(dMinigame_Starter_c*) { +static void dMinigame_Starter_Execute(dMinigame_Starter_c*) { /* Nonmatching */ } /* 80206F1C-80206F24 .text dMinigame_Starter_IsDelete__FP19dMinigame_Starter_c */ -void dMinigame_Starter_IsDelete(dMinigame_Starter_c*) { +static void dMinigame_Starter_IsDelete(dMinigame_Starter_c*) { /* Nonmatching */ } /* 80206F24-80206F44 .text dMinigame_Starter_Delete__FP19dMinigame_Starter_c */ -void dMinigame_Starter_Delete(dMinigame_Starter_c*) { +static void dMinigame_Starter_Delete(dMinigame_Starter_c*) { /* Nonmatching */ } /* 80206F44-80206F64 .text dMinigame_Starter_Create__FP9msg_class */ -void dMinigame_Starter_Create(msg_class*) { +static void dMinigame_Starter_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_minigame_terminater.cpp b/src/d/d_minigame_terminater.cpp index 34c9f9278..d9cf8dca4 100644 --- a/src/d/d_minigame_terminater.cpp +++ b/src/d/d_minigame_terminater.cpp @@ -132,26 +132,26 @@ void dDlst_TerminaterScrnDraw_c::draw() { } /* 8020A53C-8020A55C .text dMinigame_Terminater_Draw__FP22dMinigame_Terminater_c */ -void dMinigame_Terminater_Draw(dMinigame_Terminater_c*) { +static void dMinigame_Terminater_Draw(dMinigame_Terminater_c*) { /* Nonmatching */ } /* 8020A55C-8020A57C .text dMinigame_Terminater_Execute__FP22dMinigame_Terminater_c */ -void dMinigame_Terminater_Execute(dMinigame_Terminater_c*) { +static void dMinigame_Terminater_Execute(dMinigame_Terminater_c*) { /* Nonmatching */ } /* 8020A57C-8020A584 .text dMinigame_Terminater_IsDelete__FP22dMinigame_Terminater_c */ -void dMinigame_Terminater_IsDelete(dMinigame_Terminater_c*) { +static void dMinigame_Terminater_IsDelete(dMinigame_Terminater_c*) { /* Nonmatching */ } /* 8020A584-8020A5A4 .text dMinigame_Terminater_Delete__FP22dMinigame_Terminater_c */ -void dMinigame_Terminater_Delete(dMinigame_Terminater_c*) { +static void dMinigame_Terminater_Delete(dMinigame_Terminater_c*) { /* Nonmatching */ } /* 8020A5A4-8020A5C4 .text dMinigame_Terminater_Create__FP9msg_class */ -void dMinigame_Terminater_Create(msg_class*) { +static void dMinigame_Terminater_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_msg.cpp b/src/d/d_msg.cpp index 84c1c9694..d7bb5dfaa 100644 --- a/src/d/d_msg.cpp +++ b/src/d/d_msg.cpp @@ -320,27 +320,27 @@ void dMsg_outnowProc(sub_msg_class*) { } /* 802143A8-80214560 .text dMsg_Draw__FP13sub_msg_class */ -void dMsg_Draw(sub_msg_class*) { +static void dMsg_Draw(sub_msg_class*) { /* Nonmatching */ } /* 80214560-802153B0 .text dMsg_Execute__FP13sub_msg_class */ -void dMsg_Execute(sub_msg_class*) { +static void dMsg_Execute(sub_msg_class*) { /* Nonmatching */ } /* 802153B0-802153B8 .text dMsg_IsDelete__FP13sub_msg_class */ -BOOL dMsg_IsDelete(sub_msg_class*) { +static BOOL dMsg_IsDelete(sub_msg_class*) { return TRUE; } /* 802153B8-80215698 .text dMsg_Delete__FP13sub_msg_class */ -void dMsg_Delete(sub_msg_class*) { +static void dMsg_Delete(sub_msg_class*) { /* Nonmatching */ } /* 80215698-80215CD0 .text dMsg_Create__FP9msg_class */ -void dMsg_Create(msg_class*) { +static void dMsg_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_operate_wind.cpp b/src/d/d_operate_wind.cpp index 90cc27d48..8f20b05f1 100644 --- a/src/d/d_operate_wind.cpp +++ b/src/d/d_operate_wind.cpp @@ -137,26 +137,26 @@ void dOw_c::_delete() { } /* 80221880-802218B4 .text dOw_Draw__FP5dOw_c */ -void dOw_Draw(dOw_c*) { +static void dOw_Draw(dOw_c*) { /* Nonmatching */ } /* 802218B4-802219A4 .text dOw_Execute__FP5dOw_c */ -void dOw_Execute(dOw_c*) { +static void dOw_Execute(dOw_c*) { /* Nonmatching */ } /* 802219A4-802219AC .text dOw_IsDelete__FP5dOw_c */ -void dOw_IsDelete(dOw_c*) { +static void dOw_IsDelete(dOw_c*) { /* Nonmatching */ } /* 802219AC-80221A04 .text dOw_Delete__FP5dOw_c */ -void dOw_Delete(dOw_c*) { +static void dOw_Delete(dOw_c*) { /* Nonmatching */ } /* 80221A04-80221AA0 .text dOw_Create__FP9msg_class */ -void dOw_Create(msg_class*) { +static void dOw_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp index 18f82ea5a..4b34d621c 100644 --- a/src/d/d_ovlp_fade.cpp +++ b/src/d/d_ovlp_fade.cpp @@ -18,7 +18,7 @@ public: BOOL (*dOvlpFd_execute_f)(overlap1_class*); /* 802235CC-802235D4 .text dOvlpFd_Draw__FP14overlap1_class */ -BOOL dOvlpFd_Draw(overlap1_class* i_this) { +static BOOL dOvlpFd_Draw(overlap1_class* i_this) { return TRUE; } @@ -71,23 +71,23 @@ BOOL dOvlpFd_FadeIn(overlap1_class* i_this) { } /* 802237A4-802237D0 .text dOvlpFd_Execute__FP14overlap1_class */ -BOOL dOvlpFd_Execute(overlap1_class* i_this) { +static BOOL dOvlpFd_Execute(overlap1_class* i_this) { dOvlpFd_execute_f(i_this); return TRUE; } /* 802237D0-802237D8 .text dOvlpFd_IsDelete__FP14overlap1_class */ -BOOL dOvlpFd_IsDelete(overlap1_class* i_this) { +static BOOL dOvlpFd_IsDelete(overlap1_class* i_this) { return TRUE; } /* 802237D8-802237E0 .text dOvlpFd_Delete__FP14overlap1_class */ -BOOL dOvlpFd_Delete(overlap1_class* i_this) { +static BOOL dOvlpFd_Delete(overlap1_class* i_this) { return TRUE; } /* 802237E0-802237F4 .text dOvlpFd_Create__FPv */ -BOOL dOvlpFd_Create(void* i_this) { +static BOOL dOvlpFd_Create(void* i_this) { dOvlpFd_execute_f = dOvlpFd_FadeIn; return cPhs_COMPLEATE_e; } diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index c20e4868e..5dbf366e2 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -42,28 +42,28 @@ void dOvlpFd2_c::execFadeIn() { } /* 802240F4-80224200 .text dOvlpFd2_Draw__FP10dOvlpFd2_c */ -void dOvlpFd2_Draw(dOvlpFd2_c*) { +static void dOvlpFd2_Draw(dOvlpFd2_c*) { /* Nonmatching */ } /* 80224200-8022422C .text dOvlpFd2_Execute__FP10dOvlpFd2_c */ -s32 dOvlpFd2_Execute(dOvlpFd2_c* i_this) { +static s32 dOvlpFd2_Execute(dOvlpFd2_c* i_this) { (i_this->*i_this->field_0xcc)(); return 1; } /* 8022422C-80224234 .text dOvlpFd2_IsDelete__FP10dOvlpFd2_c */ -s32 dOvlpFd2_IsDelete(dOvlpFd2_c*) { +static s32 dOvlpFd2_IsDelete(dOvlpFd2_c*) { return 1; } /* 80224234-8022423C .text dOvlpFd2_Delete__FP10dOvlpFd2_c */ -s32 dOvlpFd2_Delete(dOvlpFd2_c*) { +static s32 dOvlpFd2_Delete(dOvlpFd2_c*) { return 1; } /* 8022423C-80224268 .text dOvlpFd2_Create__FPv */ -s32 dOvlpFd2_Create(void* i_this) { +static s32 dOvlpFd2_Create(void* i_this) { new (i_this) dOvlpFd2_c(); return cPhs_COMPLEATE_e; } diff --git a/src/d/d_ovlp_fade4.cpp b/src/d/d_ovlp_fade4.cpp index 26f1eaaec..2410065c9 100644 --- a/src/d/d_ovlp_fade4.cpp +++ b/src/d/d_ovlp_fade4.cpp @@ -103,7 +103,7 @@ void dOvlpFd4_c::execFadeIn() { } /* 802255F4-80225658 .text dOvlpFd4_Draw__FP10dOvlpFd4_c */ -s32 dOvlpFd4_Draw(dOvlpFd4_c* i_this) { +static s32 dOvlpFd4_Draw(dOvlpFd4_c* i_this) { void (dOvlpFd4_c::*tmp)() = i_this->field_0xd8; if (tmp) { (i_this->*i_this->field_0xd8)(); @@ -112,23 +112,23 @@ s32 dOvlpFd4_Draw(dOvlpFd4_c* i_this) { } /* 80225658-80225684 .text dOvlpFd4_Execute__FP10dOvlpFd4_c */ -s32 dOvlpFd4_Execute(dOvlpFd4_c* i_this) { +static s32 dOvlpFd4_Execute(dOvlpFd4_c* i_this) { (i_this->*i_this->field_0xcc)(); return 1; } /* 80225684-8022568C .text dOvlpFd4_IsDelete__FP10dOvlpFd4_c */ -s32 dOvlpFd4_IsDelete(dOvlpFd4_c*) { +static s32 dOvlpFd4_IsDelete(dOvlpFd4_c*) { return 1; } /* 8022568C-80225694 .text dOvlpFd4_Delete__FP10dOvlpFd4_c */ -s32 dOvlpFd4_Delete(dOvlpFd4_c*) { +static s32 dOvlpFd4_Delete(dOvlpFd4_c*) { return 1; } /* 80225694-802256C0 .text dOvlpFd4_Create__FPv */ -s32 dOvlpFd4_Create(void* i_this) { +static s32 dOvlpFd4_Create(void* i_this) { new (i_this) dOvlpFd4_c(); return cPhs_COMPLEATE_e; } diff --git a/src/d/d_picture_box.cpp b/src/d/d_picture_box.cpp index 18b3bf34e..9d25150ee 100644 --- a/src/d/d_picture_box.cpp +++ b/src/d/d_picture_box.cpp @@ -262,26 +262,26 @@ void dJle_Pb_c::_delete(JKRExpHeap*) { } /* 8022BB3C-8022BB7C .text dPb_Draw__FP12sub_pb_class */ -void dPb_Draw(sub_pb_class*) { +static void dPb_Draw(sub_pb_class*) { /* Nonmatching */ } /* 8022BB7C-8022BC84 .text dPb_Execute__FP12sub_pb_class */ -void dPb_Execute(sub_pb_class*) { +static void dPb_Execute(sub_pb_class*) { /* Nonmatching */ } /* 8022BC84-8022BC8C .text dPb_IsDelete__FP12sub_pb_class */ -void dPb_IsDelete(sub_pb_class*) { +static void dPb_IsDelete(sub_pb_class*) { /* Nonmatching */ } /* 8022BC8C-8022BD8C .text dPb_Delete__FP12sub_pb_class */ -void dPb_Delete(sub_pb_class*) { +static void dPb_Delete(sub_pb_class*) { /* Nonmatching */ } /* 8022BD8C-8022C03C .text dPb_Create__FP9msg_class */ -void dPb_Create(msg_class*) { +static void dPb_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_place_name.cpp b/src/d/d_place_name.cpp index 743e1172d..85589be5f 100644 --- a/src/d/d_place_name.cpp +++ b/src/d/d_place_name.cpp @@ -235,27 +235,27 @@ BOOL dPn_c::_delete() { } /* 8016168C-801616AC .text dPn_Draw__FP5dPn_c */ -BOOL dPn_Draw(dPn_c* i_this) { +static BOOL dPn_Draw(dPn_c* i_this) { return i_this->_draw(); } /* 801616AC-801616CC .text dPn_Execute__FP5dPn_c */ -BOOL dPn_Execute(dPn_c* i_this) { +static BOOL dPn_Execute(dPn_c* i_this) { return i_this->_execute(); } /* 801616CC-801616D4 .text dPn_IsDelete__FP5dPn_c */ -BOOL dPn_IsDelete(dPn_c* i_this) { +static BOOL dPn_IsDelete(dPn_c* i_this) { return TRUE; } /* 801616D4-801616F4 .text dPn_Delete__FP5dPn_c */ -BOOL dPn_Delete(dPn_c* i_this) { +static BOOL dPn_Delete(dPn_c* i_this) { return i_this->_delete(); } /* 801616F4-80161714 .text dPn_Create__FP9msg_class */ -s32 dPn_Create(msg_class* i_msg) { +static s32 dPn_Create(msg_class* i_msg) { dPn_c * i_this = (dPn_c *)i_msg; return i_this->_create(); } diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index 7418012f7..7c74b9a7c 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -502,7 +502,7 @@ BOOL dvdWaitDraw(dScnLogo_c* i_this) { typedef BOOL(*drawFunc)(dScnLogo_c* i_this); /* 8022D18C-8022D1DC .text dScnLogo_Draw__FP10dScnLogo_c */ -BOOL dScnLogo_Draw(dScnLogo_c* i_this) { +static BOOL dScnLogo_Draw(dScnLogo_c* i_this) { static drawFunc l_execFunc[] = { nintendoInDraw, nintendoOutDraw, @@ -522,19 +522,19 @@ BOOL dScnLogo_Draw(dScnLogo_c* i_this) { } /* 8022D1DC-8022D21C .text dScnLogo_Execute__FP10dScnLogo_c */ -BOOL dScnLogo_Execute(dScnLogo_c* i_this) { +static BOOL dScnLogo_Execute(dScnLogo_c* i_this) { if (mDoRst::isReset()) fopScnM_ChangeReq(i_this, PROC_LOGO_SCENE, 0, 5); return TRUE; } /* 8022D21C-8022D224 .text dScnLogo_IsDelete__FP10dScnLogo_c */ -BOOL dScnLogo_IsDelete(dScnLogo_c* i_this) { +static BOOL dScnLogo_IsDelete(dScnLogo_c* i_this) { return TRUE; } /* 8022D224-8022D984 .text dScnLogo_Delete__FP10dScnLogo_c */ -BOOL dScnLogo_Delete(dScnLogo_c* i_this) { +static BOOL dScnLogo_Delete(dScnLogo_c* i_this) { if (mDoRst::isReset()) mDoRst_reset(0, 0x80000000, 0); @@ -952,7 +952,7 @@ s32 phase_2(dScnLogo_c* i_this) { } /* 8022E9B4-8022E9F4 .text dScnLogo_Create__FP11scene_class */ -s32 dScnLogo_Create(scene_class* i_scn) { +static s32 dScnLogo_Create(scene_class* i_scn) { static cPhs__Handler l_method[] = { (cPhs__Handler)phase_0, (cPhs__Handler)phase_1, diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 7bb7a4386..143a82f95 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -26,7 +26,7 @@ s8* l_groupPoint; u8 l_languageType; /* 8022E9F4-8022ED50 .text dScnMenu_Draw__FP19menu_of_scene_class */ -BOOL dScnMenu_Draw(menu_of_scene_class* i_this) { +static BOOL dScnMenu_Draw(menu_of_scene_class* i_this) { /* Nonmatching - regalloc */ JUTReport(300, 50, "メニュー"); if (i_this->field_0x1e0) { @@ -84,17 +84,17 @@ BOOL dScnMenu_Draw(menu_of_scene_class* i_this) { } /* 8022ED50-8022F318 .text dScnMenu_Execute__FP19menu_of_scene_class */ -void dScnMenu_Execute(menu_of_scene_class*) { +static void dScnMenu_Execute(menu_of_scene_class*) { /* Nonmatching */ } /* 8022F318-8022F320 .text dScnMenu_IsDelete__FP19menu_of_scene_class */ -BOOL dScnMenu_IsDelete(menu_of_scene_class*) { +static BOOL dScnMenu_IsDelete(menu_of_scene_class*) { return true; } /* 8022F320-8022F3C4 .text dScnMenu_Delete__FP19menu_of_scene_class */ -BOOL dScnMenu_Delete(menu_of_scene_class* i_this) { +static BOOL dScnMenu_Delete(menu_of_scene_class* i_this) { JUTDbPrint::getManager()->changeFont(JFWSystem::systemFont); delete i_this->field_0x1dc; JKRFree(i_this->info); @@ -151,7 +151,7 @@ s32 phase_2(menu_of_scene_class* i_this) { } /* 8022F70C-8022F748 .text dScnMenu_Create__FP11scene_class */ -s32 dScnMenu_Create(scene_class* i_scn) { +static s32 dScnMenu_Create(scene_class* i_scn) { static cPhs__Handler l_method[] = { (cPhs__Handler)phase_1, (cPhs__Handler)phase_2, diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 278c2913a..e5c086142 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -750,28 +750,28 @@ void dScnName_c::changeGameScene() { } /* 80232338-80232358 .text dScnName_Draw__FP10dScnName_c */ -s32 dScnName_Draw(dScnName_c* i_this) { +static s32 dScnName_Draw(dScnName_c* i_this) { return i_this->draw(); } /* 80232358-80232378 .text dScnName_Execute__FP10dScnName_c */ -s32 dScnName_Execute(dScnName_c* i_this) { +static s32 dScnName_Execute(dScnName_c* i_this) { return i_this->execute(); } /* 80232378-80232380 .text dScnName_IsDelete__FP10dScnName_c */ -s32 dScnName_IsDelete(dScnName_c*) { +static s32 dScnName_IsDelete(dScnName_c*) { return 1; } /* 80232380-802323A8 .text dScnName_Delete__FP10dScnName_c */ -s32 dScnName_Delete(dScnName_c* i_this) { +static s32 dScnName_Delete(dScnName_c* i_this) { i_this->~dScnName_c(); return 1; } /* 802323A8-802323F8 .text dScnName_Create__FP11scene_class */ -s32 dScnName_Create(scene_class* i_scn) { +static s32 dScnName_Create(scene_class* i_scn) { dScnName_c* i_this = new (i_scn) dScnName_c(); return i_this->create(); } diff --git a/src/d/d_s_open.cpp b/src/d/d_s_open.cpp index a04b9c5c8..48c03ebaa 100644 --- a/src/d/d_s_open.cpp +++ b/src/d/d_s_open.cpp @@ -97,28 +97,28 @@ void dScnOpen_c::changeGameScene() { } /* 80232E6C-80232E8C .text dScnOpen_Draw__FP10dScnOpen_c */ -BOOL dScnOpen_Draw(dScnOpen_c* i_this) { +static BOOL dScnOpen_Draw(dScnOpen_c* i_this) { return i_this->draw(); } /* 80232E8C-80232EAC .text dScnOpen_Execute__FP10dScnOpen_c */ -BOOL dScnOpen_Execute(dScnOpen_c* i_this) { +static BOOL dScnOpen_Execute(dScnOpen_c* i_this) { return i_this->execute(); } /* 80232EAC-80232EB4 .text dScnOpen_IsDelete__FP10dScnOpen_c */ -BOOL dScnOpen_IsDelete(dScnOpen_c* i_this) { +static BOOL dScnOpen_IsDelete(dScnOpen_c* i_this) { return TRUE; } /* 80232EB4-80232EDC .text dScnOpen_Delete__FP10dScnOpen_c */ -BOOL dScnOpen_Delete(dScnOpen_c* i_this) { +static BOOL dScnOpen_Delete(dScnOpen_c* i_this) { i_this->~dScnOpen_c(); return TRUE; } /* 80232EDC-80232EFC .text dScnOpen_Create__FP11scene_class */ -s32 dScnOpen_Create(scene_class* i_scn) { +static s32 dScnOpen_Create(scene_class* i_scn) { dScnOpen_c* i_this = (dScnOpen_c*)i_scn; return i_this->create(); } diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 44721754e..e91c61d02 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -285,7 +285,7 @@ static request_of_phase_process_class dylPhase[PRELOAD_DYL_MAX]; static dScnPly_preLoad_HIO_c g_preLoadHIO; /* 80234B9C-80234FD0 .text dScnPly_Draw__FP13dScnPly_ply_c */ -int dScnPly_Draw(dScnPly_ply_c* i_this) { +static int dScnPly_Draw(dScnPly_ply_c* i_this) { dComIfG_Ccsp()->Move(); dComIfG_Bgsp()->ClrMoveFlag(); @@ -1023,7 +1023,7 @@ const PreLoadInfoT_s PreLoadInfoT[] = { }; /* 80234FD0-802350B4 .text dScnPly_Execute__FP13dScnPly_ply_c */ -int dScnPly_Execute(dScnPly_ply_c* i_this) { +static int dScnPly_Execute(dScnPly_ply_c* i_this) { if (!fopOvlpM_IsPeek()) { if (mDoAud_zelAudio_c::isBgmSet()) { mDoAud_sceneBgmStart(); @@ -1054,7 +1054,7 @@ int dScnPly_Execute(dScnPly_ply_c* i_this) { } /* 802350B4-802350BC .text dScnPly_IsDelete__FP13dScnPly_ply_c */ -int dScnPly_IsDelete(dScnPly_ply_c* i_this) { +static int dScnPly_IsDelete(dScnPly_ply_c* i_this) { return 1; } @@ -1062,7 +1062,7 @@ static s8 preLoadNo = 0xFF; static bool doPreLoad = true; /* 802350BC-80235364 .text dScnPly_Delete__FP13dScnPly_ply_c */ -BOOL dScnPly_Delete(dScnPly_ply_c* i_this) { +static BOOL dScnPly_Delete(dScnPly_ply_c* i_this) { dComIfGp_getAttention().~dAttention_c(); dComIfGp_getVibration().dVibration_c::~dVibration_c(); dComIfG_Bgsp()->Dt(); @@ -1474,7 +1474,7 @@ int phase_compleate(void* i_this) { } /* 8023655C-8023658C .text dScnPly_Create__FP11scene_class */ -int dScnPly_Create(scene_class* i_this) { +static int dScnPly_Create(scene_class* i_this) { static request_of_phase_process_fn l_method[] = { (request_of_phase_process_fn)phase_00, (request_of_phase_process_fn)phase_01, (request_of_phase_process_fn)phase_0, (request_of_phase_process_fn)phase_1, diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 4fc1d2d4f..cad09f6c5 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -67,7 +67,7 @@ char* setArcName(room_of_scene_class* i_this) { } /* 80236A0C-80236A14 .text dScnRoom_Draw__FP19room_of_scene_class */ -BOOL dScnRoom_Draw(room_of_scene_class* i_this) { +static BOOL dScnRoom_Draw(room_of_scene_class* i_this) { return TRUE; } @@ -99,7 +99,7 @@ void objectSetCheck(room_of_scene_class* i_this) { } /* 80236B1C-80236BAC .text dScnRoom_Execute__FP19room_of_scene_class */ -BOOL dScnRoom_Execute(room_of_scene_class* i_this) { +static BOOL dScnRoom_Execute(room_of_scene_class* i_this) { u32 roomNo = fopScnM_GetParam(i_this); setMapImage(i_this); @@ -119,12 +119,12 @@ BOOL dScnRoom_Execute(room_of_scene_class* i_this) { } /* 80236BAC-80236BB4 .text dScnRoom_IsDelete__FP19room_of_scene_class */ -BOOL dScnRoom_IsDelete(room_of_scene_class* i_this) { +static BOOL dScnRoom_IsDelete(room_of_scene_class* i_this) { return TRUE; } /* 80236BB4-80236D24 .text dScnRoom_Delete__FP19room_of_scene_class */ -BOOL dScnRoom_Delete(room_of_scene_class* i_this) { +static BOOL dScnRoom_Delete(room_of_scene_class* i_this) { int roomNo = fopScnM_GetParam(i_this); deleteMapImage(i_this); const char * arcName = setArcName(i_this); @@ -285,7 +285,7 @@ s32 phase_4(room_of_scene_class* i_this) { } /* 802372C4-802372F4 .text dScnRoom_Create__FP11scene_class */ -s32 dScnRoom_Create(scene_class* i_scn) { +static s32 dScnRoom_Create(scene_class* i_scn) { static cPhs__Handler l_method[] = { (cPhs__Handler)phase_0, (cPhs__Handler)phase_1, diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index a447d3d53..1db6c8890 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -37,14 +37,14 @@ daMP_c* dScnTitle_c::mMp; #endif /* 802372F4-80237344 .text dScnTitle_Draw__FP20title_of_scene_class */ -BOOL dScnTitle_Draw(title_of_scene_class* i_this) { +static BOOL dScnTitle_Draw(title_of_scene_class* i_this) { for (create_tag_class* pTag = fopDwIt_Begin(); pTag != NULL; pTag = fopDwIt_Next(pTag)) fpcM_Draw(pTag->mpTagData); return TRUE; } /* 80237344-802374C8 .text dScnTitle_Execute__FP20title_of_scene_class */ -BOOL dScnTitle_Execute(title_of_scene_class* i_this) { +static BOOL dScnTitle_Execute(title_of_scene_class* i_this) { if (!fopOvlpM_IsPeek() && !dComIfG_resetToOpening(i_this)) { #if VERSION == VERSION_PAL daMP_c *movie = dScnTitle_c::mMp; @@ -89,12 +89,12 @@ BOOL dScnTitle_Execute(title_of_scene_class* i_this) { } /* 802374C8-802374D0 .text dScnTitle_IsDelete__FP20title_of_scene_class */ -BOOL dScnTitle_IsDelete(title_of_scene_class* i_this) { +static BOOL dScnTitle_IsDelete(title_of_scene_class* i_this) { return TRUE; } /* 802374D0-802374D8 .text dScnTitle_Delete__FP20title_of_scene_class */ -BOOL dScnTitle_Delete(title_of_scene_class* i_this) { +static BOOL dScnTitle_Delete(title_of_scene_class* i_this) { #if VERSION == VERSION_PAL dComIfGp_event_remove(); #endif @@ -102,7 +102,7 @@ BOOL dScnTitle_Delete(title_of_scene_class* i_this) { } /* 802374D8-80237568 .text dScnTitle_Create__FP11scene_class */ -s32 dScnTitle_Create(scene_class* i_scn) { +static s32 dScnTitle_Create(scene_class* i_scn) { title_of_scene_class * i_this = (title_of_scene_class*) i_scn; if (JAInter::BankWave::checkAllWaveLoadStatus()) diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index 5adb9fbdc..78851eb09 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -187,26 +187,26 @@ void dScp_closeDemoProc(sub_scp_class*) { } /* 8023AD20-8023AD60 .text dScp_Draw__FP13sub_scp_class */ -void dScp_Draw(sub_scp_class*) { +static void dScp_Draw(sub_scp_class*) { /* Nonmatching */ } /* 8023AD60-8023AEF4 .text dScp_Execute__FP13sub_scp_class */ -void dScp_Execute(sub_scp_class*) { +static void dScp_Execute(sub_scp_class*) { /* Nonmatching */ } /* 8023AEF4-8023AEFC .text dScp_IsDelete__FP13sub_scp_class */ -void dScp_IsDelete(sub_scp_class*) { +static void dScp_IsDelete(sub_scp_class*) { /* Nonmatching */ } /* 8023AEFC-8023B094 .text dScp_Delete__FP13sub_scp_class */ -void dScp_Delete(sub_scp_class*) { +static void dScp_Delete(sub_scp_class*) { /* Nonmatching */ } /* 8023B094-8023B49C .text dScp_Create__FP9msg_class */ -void dScp_Create(msg_class*) { +static void dScp_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp index 3aa3b4126..1e12b2d68 100644 --- a/src/d/d_throwstone.cpp +++ b/src/d/d_throwstone.cpp @@ -53,7 +53,7 @@ s32 daThrowstone_c::_create() { } /* 8023B5DC-8023B6DC .text daThrowstoneCreate__FPv */ -s32 daThrowstoneCreate(void* ptr) { +static s32 daThrowstoneCreate(void* ptr) { return ((daThrowstone_c*)ptr)->_create(); } @@ -63,7 +63,7 @@ BOOL daThrowstone_c::_delete() { } /* 8023B6DC-8023B708 .text daThrowstoneDelete__FPv */ -BOOL daThrowstoneDelete(void* ptr) { +static BOOL daThrowstoneDelete(void* ptr) { return ((daThrowstone_c*)ptr)->_delete(); } @@ -83,7 +83,7 @@ BOOL daThrowstone_c::_execute() { } /* 8023B708-8023B7C4 .text daThrowstoneExecute__FPv */ -BOOL daThrowstoneExecute(void* ptr) { +static BOOL daThrowstoneExecute(void* ptr) { return ((daThrowstone_c*)ptr)->_execute(); } @@ -99,16 +99,16 @@ bool daThrowstone_c::_draw() { } /* 8023B7C4-8023B858 .text daThrowstoneDraw__FPv */ -BOOL daThrowstoneDraw(void* ptr) { +static BOOL daThrowstoneDraw(void* ptr) { return ((daThrowstone_c*)ptr)->_draw(); } /* 8023B858-8023B860 .text daThrowstoneIsDelete__FPv */ -BOOL daThrowstoneIsDelete(void*) { +static BOOL daThrowstoneIsDelete(void*) { return TRUE; } -actor_method_class daThrowstoneMethodTable = { +static actor_method_class daThrowstoneMethodTable = { (process_method_func)daThrowstoneCreate, (process_method_func)daThrowstoneDelete, (process_method_func)daThrowstoneExecute, diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index c68839b8f..f9f963f9e 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -685,27 +685,27 @@ void dDlst_TimerScrnDraw_c::draw() { } /* 8023D9A0-8023D9C0 .text dTimer_Draw__FP8dTimer_c */ -BOOL dTimer_Draw(dTimer_c* i_this) { +static BOOL dTimer_Draw(dTimer_c* i_this) { return i_this->_draw(); } /* 8023D9C0-8023D9E0 .text dTimer_Execute__FP8dTimer_c */ -BOOL dTimer_Execute(dTimer_c* i_this) { +static BOOL dTimer_Execute(dTimer_c* i_this) { return i_this->_execute(); } /* 8023D9E0-8023D9E8 .text dTimer_IsDelete__FP8dTimer_c */ -BOOL dTimer_IsDelete(dTimer_c* i_this) { +static BOOL dTimer_IsDelete(dTimer_c* i_this) { return TRUE; } /* 8023D9E8-8023DA08 .text dTimer_Delete__FP8dTimer_c */ -BOOL dTimer_Delete(dTimer_c* i_this) { +static BOOL dTimer_Delete(dTimer_c* i_this) { return i_this->_delete(); } /* 8023DA08-8023DA28 .text dTimer_Create__FP9msg_class */ -s32 dTimer_Create(msg_class* i_this) { +static s32 dTimer_Create(msg_class* i_this) { return ((dTimer_c*)i_this)->_create(); } diff --git a/src/d/d_water_mark.cpp b/src/d/d_water_mark.cpp index 35b24811c..b6dea08f7 100644 --- a/src/d/d_water_mark.cpp +++ b/src/d/d_water_mark.cpp @@ -7,7 +7,7 @@ #include "f_op/f_op_kankyo.h" /* 8023DB48-8023DBF8 .text dWaterMark_Draw__FP12dWaterMark_c */ -void dWaterMark_Draw(dWaterMark_c*) { +static void dWaterMark_Draw(dWaterMark_c*) { /* Nonmatching */ } @@ -17,22 +17,22 @@ void dWaterMark_c::setMatrix() { } /* 8023DE2C-8023DF24 .text dWaterMark_Execute__FP12dWaterMark_c */ -void dWaterMark_Execute(dWaterMark_c*) { +static void dWaterMark_Execute(dWaterMark_c*) { /* Nonmatching */ } /* 8023DF24-8023DF2C .text dWaterMark_IsDelete__FP12dWaterMark_c */ -void dWaterMark_IsDelete(dWaterMark_c*) { +static void dWaterMark_IsDelete(dWaterMark_c*) { /* Nonmatching */ } /* 8023DF2C-8023DF80 .text dWaterMark_Delete__FP12dWaterMark_c */ -void dWaterMark_Delete(dWaterMark_c*) { +static void dWaterMark_Delete(dWaterMark_c*) { /* Nonmatching */ } /* 8023DF80-8023DFA0 .text dWaterMark_Create__FP12kankyo_class */ -void dWaterMark_Create(kankyo_class*) { +static void dWaterMark_Create(kankyo_class*) { /* Nonmatching */ } diff --git a/src/d/d_wind_arrow.cpp b/src/d/d_wind_arrow.cpp index ce13b9f13..ffe8a1bf1 100644 --- a/src/d/d_wind_arrow.cpp +++ b/src/d/d_wind_arrow.cpp @@ -17,7 +17,7 @@ void dWindArrow_c::adjustHeap() { } /* 8023E46C-8023E48C .text dWindArrow_Draw__FP12dWindArrow_c */ -void dWindArrow_Draw(dWindArrow_c*) { +static void dWindArrow_Draw(dWindArrow_c*) { /* Nonmatching */ } @@ -27,21 +27,21 @@ BOOL dWindArrow_c::draw() { } /* 8023E6F4-8023E738 .text dWindArrow_Execute__FP12dWindArrow_c */ -void dWindArrow_Execute(dWindArrow_c*) { +static void dWindArrow_Execute(dWindArrow_c*) { /* Nonmatching */ } /* 8023E738-8023E740 .text dWindArrow_IsDelete__FP12dWindArrow_c */ -void dWindArrow_IsDelete(dWindArrow_c*) { +static void dWindArrow_IsDelete(dWindArrow_c*) { /* Nonmatching */ } /* 8023E740-8023E7A8 .text dWindArrow_Delete__FP12dWindArrow_c */ -void dWindArrow_Delete(dWindArrow_c*) { +static void dWindArrow_Delete(dWindArrow_c*) { /* Nonmatching */ } /* 8023E7A8-8023E968 .text dWindArrow_Create__FP12kankyo_class */ -void dWindArrow_Create(kankyo_class*) { +static void dWindArrow_Create(kankyo_class*) { /* Nonmatching */ } diff --git a/src/d/d_wpillar.cpp b/src/d/d_wpillar.cpp index e94312281..663bf1f49 100644 --- a/src/d/d_wpillar.cpp +++ b/src/d/d_wpillar.cpp @@ -24,7 +24,7 @@ void dWpillar_c::draw() { } /* 8023ECF8-8023ED18 .text dWpillar_Draw__FP10dWpillar_c */ -void dWpillar_Draw(dWpillar_c*) { +static void dWpillar_Draw(dWpillar_c*) { /* Nonmatching */ } @@ -34,12 +34,12 @@ void dWpillar_c::execute() { } /* 8023EDB0-8023EDD0 .text dWpillar_Execute__FP10dWpillar_c */ -void dWpillar_Execute(dWpillar_c*) { +static void dWpillar_Execute(dWpillar_c*) { /* Nonmatching */ } /* 8023EDD0-8023EDD8 .text dWpillar_IsDelete__FP10dWpillar_c */ -void dWpillar_IsDelete(dWpillar_c*) { +static void dWpillar_IsDelete(dWpillar_c*) { /* Nonmatching */ } @@ -49,7 +49,7 @@ void dWpillar_c::wp_delete() { } /* 8023EE08-8023EE28 .text dWpillar_Delete__FP10dWpillar_c */ -void dWpillar_Delete(dWpillar_c*) { +static void dWpillar_Delete(dWpillar_c*) { /* Nonmatching */ } @@ -59,6 +59,6 @@ void dWpillar_c::create() { } /* 8023F5B0-8023F5D0 .text dWpillar_Create__FP12kankyo_class */ -void dWpillar_Create(kankyo_class*) { +static void dWpillar_Create(kankyo_class*) { /* Nonmatching */ } diff --git a/src/d/d_wpot_water.cpp b/src/d/d_wpot_water.cpp index af95c8aee..2986f59e7 100644 --- a/src/d/d_wpot_water.cpp +++ b/src/d/d_wpot_water.cpp @@ -12,26 +12,26 @@ void dWpotWater_EcallBack::draw(JPABaseEmitter*) { } /* 8023F64C-8023F688 .text dWpotWater_Draw__FP12dWpotWater_c */ -void dWpotWater_Draw(dWpotWater_c*) { +static void dWpotWater_Draw(dWpotWater_c*) { /* Nonmatching */ } /* 8023F688-8023F740 .text dWpotWater_Execute__FP12dWpotWater_c */ -void dWpotWater_Execute(dWpotWater_c*) { +static void dWpotWater_Execute(dWpotWater_c*) { /* Nonmatching */ } /* 8023F740-8023F748 .text dWpotWater_IsDelete__FP12dWpotWater_c */ -void dWpotWater_IsDelete(dWpotWater_c*) { +static void dWpotWater_IsDelete(dWpotWater_c*) { /* Nonmatching */ } /* 8023F748-8023F750 .text dWpotWater_Delete__FP12dWpotWater_c */ -void dWpotWater_Delete(dWpotWater_c*) { +static void dWpotWater_Delete(dWpotWater_c*) { /* Nonmatching */ } /* 8023F750-8023FFCC .text dWpotWater_Create__FP12kankyo_class */ -void dWpotWater_Create(kankyo_class*) { +static void dWpotWater_Create(kankyo_class*) { /* Nonmatching */ }