From e8506099f04b247c5a50f3db61c2541198d657f3 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Thu, 1 Feb 2024 22:26:39 -0500 Subject: [PATCH] Add return type and static keyword for more static funcs --- include/d/actor/d_a_npc_nz.h | 4 ++-- include/d/actor/d_a_obj_ftree.h | 8 ++++---- include/d/actor/d_a_obj_jump.h | 2 +- include/d/actor/d_a_obj_magmarock.h | 2 +- include/d/actor/d_a_obj_shmrgrd.h | 2 +- include/d/actor/d_a_obj_swhammer.h | 2 +- include/d/actor/d_a_obj_swlight.h | 2 +- include/d/actor/d_a_obj_swpush.h | 2 +- include/d/actor/d_a_obj_vyasi.h | 2 +- include/d/actor/d_a_stone.h | 2 +- include/d/actor/d_a_wind_tag.h | 2 +- src/JSystem/J3DGraphAnimator/J3DVisibility.cpp | 2 +- src/d/actor/d_a_dai.cpp | 4 ++-- src/d/actor/d_a_npc_auction.cpp | 4 ++-- src/d/actor/d_a_npc_bmcon1.cpp | 2 +- src/d/actor/d_a_npc_bs1.cpp | 2 +- src/d/actor/d_a_npc_btsw.cpp | 2 +- src/d/actor/d_a_npc_cb1.cpp | 4 ++-- src/d/actor/d_a_npc_ds1.cpp | 2 +- src/d/actor/d_a_npc_ho.cpp | 2 +- src/d/actor/d_a_npc_hr.cpp | 4 ++-- src/d/actor/d_a_npc_ji1.cpp | 2 +- src/d/actor/d_a_npc_mn.cpp | 2 +- src/d/actor/d_a_npc_mt.cpp | 2 +- src/d/actor/d_a_npc_nz.cpp | 8 ++++---- src/d/actor/d_a_npc_people.cpp | 4 ++-- src/d/actor/d_a_npc_photo.cpp | 4 ++-- src/d/actor/d_a_npc_roten.cpp | 2 +- src/d/actor/d_a_npc_so.cpp | 4 ++-- src/d/actor/d_a_npc_tt.cpp | 4 ++-- src/d/actor/d_a_obj_ftree.cpp | 8 ++++---- src/d/actor/d_a_obj_hsehi1.cpp | 4 ++-- src/d/actor/d_a_obj_jump.cpp | 2 +- src/d/actor/d_a_obj_magmarock.cpp | 2 +- src/d/actor/d_a_obj_shmrgrd.cpp | 2 +- src/d/actor/d_a_obj_swhammer.cpp | 2 +- src/d/actor/d_a_obj_swlight.cpp | 2 +- src/d/actor/d_a_obj_swpush.cpp | 2 +- src/d/actor/d_a_obj_vyasi.cpp | 2 +- src/d/actor/d_a_player_bow.inc | 2 +- src/d/actor/d_a_stone.cpp | 2 +- src/d/actor/d_a_wind_tag.cpp | 2 +- src/d/d_wpillar.cpp | 2 +- 43 files changed, 62 insertions(+), 62 deletions(-) diff --git a/include/d/actor/d_a_npc_nz.h b/include/d/actor/d_a_npc_nz.h index 797f022fa..72eaecf0c 100644 --- a/include/d/actor/d_a_npc_nz.h +++ b/include/d/actor/d_a_npc_nz.h @@ -13,8 +13,8 @@ public: void modeProcInit(int) {} - void NodeCallBack(J3DNode*, int); - void TailNodeCallBack(J3DNode*, int); + static BOOL NodeCallBack(J3DNode*, int); + static BOOL TailNodeCallBack(J3DNode*, int); void TailControl(); void _createHeap(); void XyEventCB(int); diff --git a/include/d/actor/d_a_obj_ftree.h b/include/d/actor/d_a_obj_ftree.h index 3a862d086..68e9d6e87 100644 --- a/include/d/actor/d_a_obj_ftree.h +++ b/include/d/actor/d_a_obj_ftree.h @@ -16,9 +16,9 @@ namespace daObjFtree { static void Ftree_checkXyEventCallBack(void*, int); static void Ftree_XyEventCallBack(void*, int); static void is_broughtID(int); - static void Ftree_NodeCallBack_Effect(J3DNode*, int); - static void Ftree_NodeCallBack_M(J3DNode*, int); - static void Ftree_NodeCallBack_L(J3DNode*, int); + static BOOL Ftree_NodeCallBack_Effect(J3DNode*, int); + static BOOL Ftree_NodeCallBack_M(J3DNode*, int); + static BOOL Ftree_NodeCallBack_L(J3DNode*, int); class Act_c : public fopAc_ac_c { public: @@ -85,7 +85,7 @@ namespace daObjFtree { void process_init(int, short); void process_main(); void solidHeapCB(fopAc_ac_c*); - void NodeCallBack_Effect(J3DNode*, int); + BOOL NodeCallBack_Effect(J3DNode*, int); void create_heap(); s32 _create(); BOOL _delete(); diff --git a/include/d/actor/d_a_obj_jump.h b/include/d/actor/d_a_obj_jump.h index 505c6b7f3..1524fdbad 100644 --- a/include/d/actor/d_a_obj_jump.h +++ b/include/d/actor/d_a_obj_jump.h @@ -31,7 +31,7 @@ namespace daObjJump { void clear_push_flag(); void calc_vib_pos(); void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - void jnodeCB_lower(J3DNode*, int); + static BOOL jnodeCB_lower(J3DNode*, int); void mode_wait_init(); void mode_wait(); void mode_w_l_init(); diff --git a/include/d/actor/d_a_obj_magmarock.h b/include/d/actor/d_a_obj_magmarock.h index 747aeacf2..d508e13e1 100644 --- a/include/d/actor/d_a_obj_magmarock.h +++ b/include/d/actor/d_a_obj_magmarock.h @@ -7,7 +7,7 @@ class dBgW; namespace daObjMagmarock { static void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - static void CheckCreateHeap(fopAc_ac_c*); + static BOOL CheckCreateHeap(fopAc_ac_c*); class Act_c : public fopAc_ac_c { public: diff --git a/include/d/actor/d_a_obj_shmrgrd.h b/include/d/actor/d_a_obj_shmrgrd.h index 518215408..44614bdb7 100644 --- a/include/d/actor/d_a_obj_shmrgrd.h +++ b/include/d/actor/d_a_obj_shmrgrd.h @@ -32,7 +32,7 @@ public: void crush_proc(); void eff_crush(); void calc_top_pos(); - void jnodeCB(J3DNode*, int); + static BOOL jnodeCB(J3DNode*, int); void mode_upper_init(); void mode_upper(); void mode_u_l_init(); diff --git a/include/d/actor/d_a_obj_swhammer.h b/include/d/actor/d_a_obj_swhammer.h index 2a2ecee25..90f098232 100644 --- a/include/d/actor/d_a_obj_swhammer.h +++ b/include/d/actor/d_a_obj_swhammer.h @@ -29,7 +29,7 @@ namespace daObjSwhammer { void crush_proc(); void eff_crush(); void calc_top_pos(); - void jnodeCB(J3DNode*, int); + static BOOL jnodeCB(J3DNode*, int); void mode_upper_init(); void mode_upper(); void mode_u_l_init(); diff --git a/include/d/actor/d_a_obj_swlight.h b/include/d/actor/d_a_obj_swlight.h index 95e81f905..78edc1877 100644 --- a/include/d/actor/d_a_obj_swlight.h +++ b/include/d/actor/d_a_obj_swlight.h @@ -25,7 +25,7 @@ namespace daObjSwlight { void create_heap(); s32 _create(); BOOL _delete(); - void jnodeCB_moon(J3DNode*, int); + static BOOL jnodeCB_moon(J3DNode*, int); void set_mtx(); void init_mtx(); void init_cc(); diff --git a/include/d/actor/d_a_obj_swpush.h b/include/d/actor/d_a_obj_swpush.h index 8f252eb58..da13338a4 100644 --- a/include/d/actor/d_a_obj_swpush.h +++ b/include/d/actor/d_a_obj_swpush.h @@ -32,7 +32,7 @@ namespace daObjSwpush { void init_mtx(); void set_btp_frame(); void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - void jnodeCB(J3DNode*, int); + static BOOL jnodeCB(J3DNode*, int); void calc_top_pos(); void top_bg_aim_req(float, short); void set_push_flag(); diff --git a/include/d/actor/d_a_obj_vyasi.h b/include/d/actor/d_a_obj_vyasi.h index 615963ced..92bd3f7d4 100644 --- a/include/d/actor/d_a_obj_vyasi.h +++ b/include/d/actor/d_a_obj_vyasi.h @@ -10,7 +10,7 @@ class mDoExt_McaMorf; class J3DNode; namespace daObjVyasi { - static void JointNodeCallBack(J3DNode*, int); + static BOOL JointNodeCallBack(J3DNode*, int); class Act_c : public fopAc_ac_c { public: diff --git a/include/d/actor/d_a_stone.h b/include/d/actor/d_a_stone.h index 90121bfd3..c80a332ab 100644 --- a/include/d/actor/d_a_stone.h +++ b/include/d/actor/d_a_stone.h @@ -4,7 +4,7 @@ #include "f_op/f_op_actor.h" namespace daStone { - void CreateHeapCB(fopAc_ac_c*); + static BOOL CreateHeapCB(fopAc_ac_c*); struct Data_c { diff --git a/include/d/actor/d_a_wind_tag.h b/include/d/actor/d_a_wind_tag.h index 562c97c2c..6a168dc99 100644 --- a/include/d/actor/d_a_wind_tag.h +++ b/include/d/actor/d_a_wind_tag.h @@ -4,7 +4,7 @@ #include "f_op/f_op_actor.h" namespace daWindTag { - static void CheckCreateHeap(fopAc_ac_c*); + static BOOL CheckCreateHeap(fopAc_ac_c*); class daWindTag_c : public fopAc_ac_c { public: diff --git a/src/JSystem/J3DGraphAnimator/J3DVisibility.cpp b/src/JSystem/J3DGraphAnimator/J3DVisibility.cpp index 7eab654f4..12af46008 100644 --- a/src/JSystem/J3DGraphAnimator/J3DVisibility.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DVisibility.cpp @@ -1,6 +1,6 @@ /** * J3DVisibility.cpp - * J3DU - Visibility + * J3DGraphAnimator - Visibility Manager */ #include "JSystem/J3DGraphAnimator/J3DModel.h" diff --git a/src/d/actor/d_a_dai.cpp b/src/d/actor/d_a_dai.cpp index 2b595e75e..1140c9ff2 100644 --- a/src/d/actor/d_a_dai.cpp +++ b/src/d/actor/d_a_dai.cpp @@ -47,7 +47,7 @@ void daDai_c::checkOrder() { } /* 00000AFC-00000B1C .text daDai_XyCheckCB__FPvi */ -void daDai_XyCheckCB(void*, int) { +static s16 daDai_XyCheckCB(void*, int) { /* Nonmatching */ } @@ -57,7 +57,7 @@ void daDai_c::XyCheckCB(int) { } /* 00000BA8-00000BC8 .text daDai_XyEventCB__FPvi */ -void daDai_XyEventCB(void*, int) { +static s16 daDai_XyEventCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_auction.cpp b/src/d/actor/d_a_npc_auction.cpp index 8861068ef..5553c1c64 100644 --- a/src/d/actor/d_a_npc_auction.cpp +++ b/src/d/actor/d_a_npc_auction.cpp @@ -42,12 +42,12 @@ void daNpcAuction_c::createHeap() { } /* 00000E74-00000E94 .text daNpcAuction_XyCheckCB__FPvi */ -void daNpcAuction_XyCheckCB(void*, int) { +static s16 daNpcAuction_XyCheckCB(void*, int) { /* Nonmatching */ } /* 00000E94-00000EB4 .text daNpcAuction_XyEventCB__FPvi */ -void daNpcAuction_XyEventCB(void*, int) { +static s16 daNpcAuction_XyEventCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bmcon1.cpp b/src/d/actor/d_a_npc_bmcon1.cpp index 9d8f17b66..962d3361f 100644 --- a/src/d/actor/d_a_npc_bmcon1.cpp +++ b/src/d/actor/d_a_npc_bmcon1.cpp @@ -52,7 +52,7 @@ void daNpcBmcon_c::createHeap() { } /* 0000105C-0000107C .text daNpcBmcon_XyCheckCB__FPvi */ -void daNpcBmcon_XyCheckCB(void*, int) { +static s16 daNpcBmcon_XyCheckCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index 92523616b..39c04322e 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -17,7 +17,7 @@ daNpc_Bs1_HIO_c::daNpc_Bs1_HIO_c() { } /* 000002C4-000002E4 .text daNpc_Bs1_XyEventCB__FPvi */ -void daNpc_Bs1_XyEventCB(void*, int) { +static s16 daNpc_Bs1_XyEventCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp index 89c7eeac3..32f7d11c0 100644 --- a/src/d/actor/d_a_npc_btsw.cpp +++ b/src/d/actor/d_a_npc_btsw.cpp @@ -67,7 +67,7 @@ void daNpc_Btsw_c::anmAtr(unsigned short) { } /* 00000F0C-00000F30 .text daNpc_Btsw_XyCheckCB__FPvi */ -void daNpc_Btsw_XyCheckCB(void*, int) { +static s16 daNpc_Btsw_XyCheckCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_cb1.cpp b/src/d/actor/d_a_npc_cb1.cpp index 862ad9ceb..e6f2ed191 100644 --- a/src/d/actor/d_a_npc_cb1.cpp +++ b/src/d/actor/d_a_npc_cb1.cpp @@ -427,12 +427,12 @@ void daNpc_Cb1_c::carryPlayerAction(void*) { } /* 0000707C-000070D0 .text daNpc_Cb1_XyCheckCB__FPvi */ -void daNpc_Cb1_XyCheckCB(void*, int) { +static s16 daNpc_Cb1_XyCheckCB(void*, int) { /* Nonmatching */ } /* 000070D0-000070D8 .text daNpc_Cb1_XyEventCB__FPvi */ -void daNpc_Cb1_XyEventCB(void*, int) { +static s16 daNpc_Cb1_XyEventCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ds1.cpp b/src/d/actor/d_a_npc_ds1.cpp index 631c3b772..efa582489 100644 --- a/src/d/actor/d_a_npc_ds1.cpp +++ b/src/d/actor/d_a_npc_ds1.cpp @@ -22,7 +22,7 @@ daNpc_Ds1_HIO_c::daNpc_Ds1_HIO_c() { } /* 000002F8-00000318 .text daNpc_Ds1_XyEventCB__FPvi */ -void daNpc_Ds1_XyEventCB(void*, int) { +static s16 daNpc_Ds1_XyEventCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ho.cpp b/src/d/actor/d_a_npc_ho.cpp index d4243cc91..c563afffd 100644 --- a/src/d/actor/d_a_npc_ho.cpp +++ b/src/d/actor/d_a_npc_ho.cpp @@ -12,7 +12,7 @@ static BOOL nodeCallBack_Ho(J3DNode*, int) { } /* 0000022C-0000024C .text daNpc_ho_XyCheckCB__FPvi */ -void daNpc_ho_XyCheckCB(void*, int) { +static s16 daNpc_ho_XyCheckCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_hr.cpp b/src/d/actor/d_a_npc_hr.cpp index 5c7bbdb01..9ea141d46 100644 --- a/src/d/actor/d_a_npc_hr.cpp +++ b/src/d/actor/d_a_npc_hr.cpp @@ -82,7 +82,7 @@ void daNpc_Hr_c::getSwbit() { } /* 00000818-00000838 .text daNpc_hr_XyCheckCB__FPvi */ -void daNpc_hr_XyCheckCB(void*, int) { +static s16 daNpc_hr_XyCheckCB(void*, int) { /* Nonmatching */ } @@ -92,7 +92,7 @@ void daNpc_Hr_c::XyCheckCB(int) { } /* 0000085C-000008AC .text daNpc_hr_XyEventCB__FPvi */ -void daNpc_hr_XyEventCB(void*, int) { +static s16 daNpc_hr_XyEventCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 8e02ba177..5edee54ae 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -12,7 +12,7 @@ daNpc_Ji1_HIO_c::daNpc_Ji1_HIO_c() { } /* 000003C0-000003E4 .text daNpc_Ji1_XyCheckCB__FPvi */ -void daNpc_Ji1_XyCheckCB(void*, int) { +static s16 daNpc_Ji1_XyCheckCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_mn.cpp b/src/d/actor/d_a_npc_mn.cpp index 2431b987c..0803a2409 100644 --- a/src/d/actor/d_a_npc_mn.cpp +++ b/src/d/actor/d_a_npc_mn.cpp @@ -42,7 +42,7 @@ void daNpcMn_c::createHeap() { } /* 00000BE0-00000C00 .text daNpcMn_XyCheckCB__FPvi */ -void daNpcMn_XyCheckCB(void*, int) { +static s16 daNpcMn_XyCheckCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_mt.cpp b/src/d/actor/d_a_npc_mt.cpp index 93c98c92f..7b53cdf38 100644 --- a/src/d/actor/d_a_npc_mt.cpp +++ b/src/d/actor/d_a_npc_mt.cpp @@ -42,7 +42,7 @@ void daNpcMt_c::createHeap() { } /* 00000B98-00000BB8 .text daNpcMt_XyCheckCB__FPvi */ -void daNpcMt_XyCheckCB(void*, int) { +static s16 daNpcMt_XyCheckCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index cede74397..934989a45 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/src/d/actor/d_a_npc_nz.cpp @@ -12,7 +12,7 @@ static BOOL daNpcNz_NodeCallBack(J3DNode*, int) { } /* 00000128-0000024C .text NodeCallBack__10daNpc_Nz_cFP7J3DNodei */ -void daNpc_Nz_c::NodeCallBack(J3DNode*, int) { +BOOL daNpc_Nz_c::NodeCallBack(J3DNode*, int) { /* Nonmatching */ } @@ -22,7 +22,7 @@ static BOOL daNpcNz_TailNodeCallBack(J3DNode*, int) { } /* 000002C4-000003A4 .text TailNodeCallBack__10daNpc_Nz_cFP7J3DNodei */ -void daNpc_Nz_c::TailNodeCallBack(J3DNode*, int) { +BOOL daNpc_Nz_c::TailNodeCallBack(J3DNode*, int) { /* Nonmatching */ } @@ -47,12 +47,12 @@ daNpc_Nz_HIO_c::daNpc_Nz_HIO_c() { } /* 00001010-000011A0 .text daNpc_Nz_XyCheckCB__FPvi */ -void daNpc_Nz_XyCheckCB(void*, int) { +static s16 daNpc_Nz_XyCheckCB(void*, int) { /* Nonmatching */ } /* 000011A0-000011C0 .text daNpc_Nz_XyEventCB__FPvi */ -void daNpc_Nz_XyEventCB(void*, int) { +static s16 daNpc_Nz_XyEventCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index b5cedec67..cb740d836 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -42,12 +42,12 @@ void daNpcPeople_c::createHeap() { } /* 00000E0C-00000E2C .text daNpcPeople_XyCheckCB__FPvi */ -void daNpcPeople_XyCheckCB(void*, int) { +static s16 daNpcPeople_XyCheckCB(void*, int) { /* Nonmatching */ } /* 00000E2C-00000E4C .text daNpcPeople_XyEventCB__FPvi */ -void daNpcPeople_XyEventCB(void*, int) { +static s16 daNpcPeople_XyEventCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp index d5cfcb4d6..0e9d95f58 100644 --- a/src/d/actor/d_a_npc_photo.cpp +++ b/src/d/actor/d_a_npc_photo.cpp @@ -42,12 +42,12 @@ void daNpcPhoto_c::createHeap() { } /* 00000CA0-00000CC0 .text daNpcPhoto_XyCheckCB__FPvi */ -void daNpcPhoto_XyCheckCB(void*, int) { +static s16 daNpcPhoto_XyCheckCB(void*, int) { /* Nonmatching */ } /* 00000CC0-00000CE0 .text daNpcPhoto_XyEventCB__FPvi */ -void daNpcPhoto_XyEventCB(void*, int) { +static s16 daNpcPhoto_XyEventCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index f7cc79c48..5951150e7 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -43,7 +43,7 @@ void daNpcRoten_c::createHeap() { } /* 00000E88-00000EA8 .text daNpcRoten_XyEventCB__FPvi */ -void daNpcRoten_XyEventCB(void*, int) { +static s16 daNpcRoten_XyEventCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_so.cpp b/src/d/actor/d_a_npc_so.cpp index e203e5068..0ce5975cc 100644 --- a/src/d/actor/d_a_npc_so.cpp +++ b/src/d/actor/d_a_npc_so.cpp @@ -52,7 +52,7 @@ void daNpc_So_c::_searchMinigameTagSo(fopAc_ac_c*) { } /* 000005C8-000005E8 .text daNpc_So_XyCheckCB__FPvi */ -void daNpc_So_XyCheckCB(void*, int) { +static s16 daNpc_So_XyCheckCB(void*, int) { /* Nonmatching */ } @@ -62,7 +62,7 @@ void daNpc_So_c::XyCheckCB(int) { } /* 00000680-000006A0 .text daNpc_So_XyEventCB__FPvi */ -void daNpc_So_XyEventCB(void*, int) { +static s16 daNpc_So_XyEventCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp index 7915ca307..bff1a2781 100644 --- a/src/d/actor/d_a_npc_tt.cpp +++ b/src/d/actor/d_a_npc_tt.cpp @@ -7,7 +7,7 @@ #include "m_Do/m_Do_ext.h" /* 00000078-00000098 .text daNpc_tt_XyCheckCB__FPvi */ -void daNpc_tt_XyCheckCB(void*, int) { +static s16 daNpc_tt_XyCheckCB(void*, int) { /* Nonmatching */ } @@ -17,7 +17,7 @@ void daNpc_Tt_c::XyCheckCB(int) { } /* 000000BC-00000108 .text daNpc_tt_XyEventCB__FPvi */ -void daNpc_tt_XyEventCB(void*, int) { +static s16 daNpc_tt_XyEventCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_ftree.cpp b/src/d/actor/d_a_obj_ftree.cpp index 006c1cc2e..7c10e75dd 100644 --- a/src/d/actor/d_a_obj_ftree.cpp +++ b/src/d/actor/d_a_obj_ftree.cpp @@ -297,22 +297,22 @@ void daObjFtree::Act_c::solidHeapCB(fopAc_ac_c*) { } /* 00002C14-00002D94 .text NodeCallBack_Effect__Q210daObjFtree5Act_cFP7J3DNodei */ -void daObjFtree::Act_c::NodeCallBack_Effect(J3DNode*, int) { +BOOL daObjFtree::Act_c::NodeCallBack_Effect(J3DNode*, int) { /* Nonmatching */ } /* 00002D94-00002DDC .text Ftree_NodeCallBack_Effect__10daObjFtreeFP7J3DNodei */ -void daObjFtree::Ftree_NodeCallBack_Effect(J3DNode*, int) { +BOOL daObjFtree::Ftree_NodeCallBack_Effect(J3DNode*, int) { /* Nonmatching */ } /* 00002DDC-00002E9C .text Ftree_NodeCallBack_M__10daObjFtreeFP7J3DNodei */ -void daObjFtree::Ftree_NodeCallBack_M(J3DNode*, int) { +BOOL daObjFtree::Ftree_NodeCallBack_M(J3DNode*, int) { /* Nonmatching */ } /* 00002E9C-00002F5C .text Ftree_NodeCallBack_L__10daObjFtreeFP7J3DNodei */ -void daObjFtree::Ftree_NodeCallBack_L(J3DNode*, int) { +BOOL daObjFtree::Ftree_NodeCallBack_L(J3DNode*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_hsehi1.cpp b/src/d/actor/d_a_obj_hsehi1.cpp index 55d64e37d..0b31ddf4f 100644 --- a/src/d/actor/d_a_obj_hsehi1.cpp +++ b/src/d/actor/d_a_obj_hsehi1.cpp @@ -17,7 +17,7 @@ daObj_hsh_c::~daObj_hsh_c() { } /* 000002A4-000002C4 .text daObj_hsh_XyCheckCB__FPvi */ -void daObj_hsh_XyCheckCB(void*, int) { +static s16 daObj_hsh_XyCheckCB(void*, int) { /* Nonmatching */ } @@ -27,7 +27,7 @@ void daObj_hsh_c::XyCheckCB(int) { } /* 000002E8-00000308 .text daObj_hsh_XyEventCB__FPvi */ -void daObj_hsh_XyEventCB(void*, int) { +static s16 daObj_hsh_XyEventCB(void*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_jump.cpp b/src/d/actor/d_a_obj_jump.cpp index 37dd95f1d..2f96bb02f 100644 --- a/src/d/actor/d_a_obj_jump.cpp +++ b/src/d/actor/d_a_obj_jump.cpp @@ -62,7 +62,7 @@ void daObjJump::Act_c::rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*) { } /* 00000E74-00000F48 .text jnodeCB_lower__Q29daObjJump5Act_cFP7J3DNodei */ -void daObjJump::Act_c::jnodeCB_lower(J3DNode*, int) { +BOOL daObjJump::Act_c::jnodeCB_lower(J3DNode*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_magmarock.cpp b/src/d/actor/d_a_obj_magmarock.cpp index 7872c37df..2717f3771 100644 --- a/src/d/actor/d_a_obj_magmarock.cpp +++ b/src/d/actor/d_a_obj_magmarock.cpp @@ -82,7 +82,7 @@ void daObjMagmarock::ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*) { } /* 00000AEC-00000B0C .text CheckCreateHeap__14daObjMagmarockFP10fopAc_ac_c */ -void daObjMagmarock::CheckCreateHeap(fopAc_ac_c*) { +BOOL daObjMagmarock::CheckCreateHeap(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_shmrgrd.cpp b/src/d/actor/d_a_obj_shmrgrd.cpp index 998582c1b..838e78c01 100644 --- a/src/d/actor/d_a_obj_shmrgrd.cpp +++ b/src/d/actor/d_a_obj_shmrgrd.cpp @@ -112,7 +112,7 @@ void daObjShmrgrd_c::calc_top_pos() { } /* 000013FC-0000151C .text jnodeCB__14daObjShmrgrd_cFP7J3DNodei */ -void daObjShmrgrd_c::jnodeCB(J3DNode*, int) { +BOOL daObjShmrgrd_c::jnodeCB(J3DNode*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_swhammer.cpp b/src/d/actor/d_a_obj_swhammer.cpp index 15bc677fa..c1baf339e 100644 --- a/src/d/actor/d_a_obj_swhammer.cpp +++ b/src/d/actor/d_a_obj_swhammer.cpp @@ -82,7 +82,7 @@ void daObjSwhammer::Act_c::calc_top_pos() { } /* 00000E74-00000F94 .text jnodeCB__Q213daObjSwhammer5Act_cFP7J3DNodei */ -void daObjSwhammer::Act_c::jnodeCB(J3DNode*, int) { +BOOL daObjSwhammer::Act_c::jnodeCB(J3DNode*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_swlight.cpp b/src/d/actor/d_a_obj_swlight.cpp index 30f965701..44324b375 100644 --- a/src/d/actor/d_a_obj_swlight.cpp +++ b/src/d/actor/d_a_obj_swlight.cpp @@ -32,7 +32,7 @@ BOOL daObjSwlight::Act_c::_delete() { } /* 00000CB8-00000CC0 .text jnodeCB_moon__Q212daObjSwlight5Act_cFP7J3DNodei */ -void daObjSwlight::Act_c::jnodeCB_moon(J3DNode*, int) { +BOOL daObjSwlight::Act_c::jnodeCB_moon(J3DNode*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index adcc414d5..0cf625f03 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -62,7 +62,7 @@ void daObjSwpush::Act_c::rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*) { } /* 00000FBC-0000105C .text jnodeCB__Q211daObjSwpush5Act_cFP7J3DNodei */ -void daObjSwpush::Act_c::jnodeCB(J3DNode*, int) { +BOOL daObjSwpush::Act_c::jnodeCB(J3DNode*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_vyasi.cpp b/src/d/actor/d_a_obj_vyasi.cpp index ea9978555..d930f3ba6 100644 --- a/src/d/actor/d_a_obj_vyasi.cpp +++ b/src/d/actor/d_a_obj_vyasi.cpp @@ -27,7 +27,7 @@ void daObjVyasi::Act_c::set_collision() { } /* 000005F4-000009B8 .text JointNodeCallBack__10daObjVyasiFP7J3DNodei */ -void daObjVyasi::JointNodeCallBack(J3DNode*, int) { +BOOL daObjVyasi::JointNodeCallBack(J3DNode*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_player_bow.inc b/src/d/actor/d_a_player_bow.inc index 4558dfdd9..f9d89fe12 100644 --- a/src/d/actor/d_a_player_bow.inc +++ b/src/d/actor/d_a_player_bow.inc @@ -18,7 +18,7 @@ void daPy_lk_c::bowJointCB(int) { } /* 80149F88-80149FD0 .text daPy_bowJointCB__FP7J3DNodei */ -void daPy_bowJointCB(J3DNode*, int) { +static BOOL daPy_bowJointCB(J3DNode*, int) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_stone.cpp b/src/d/actor/d_a_stone.cpp index 863e06a94..02d4a7f38 100644 --- a/src/d/actor/d_a_stone.cpp +++ b/src/d/actor/d_a_stone.cpp @@ -7,7 +7,7 @@ #include "dolphin/types.h" /* 000000EC-00000110 .text CreateHeapCB__7daStoneFP10fopAc_ac_c */ -void daStone::CreateHeapCB(fopAc_ac_c*) { +BOOL daStone::CreateHeapCB(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index 9e2831f6c..27204baa7 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -12,7 +12,7 @@ BOOL daWindTag::daWindTag_c::_delete() { } /* 000000F0-00000110 .text CheckCreateHeap__9daWindTagFP10fopAc_ac_c */ -void daWindTag::CheckCreateHeap(fopAc_ac_c*) { +BOOL daWindTag::CheckCreateHeap(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/d_wpillar.cpp b/src/d/d_wpillar.cpp index bcb71a16a..564a325b1 100644 --- a/src/d/d_wpillar.cpp +++ b/src/d/d_wpillar.cpp @@ -12,7 +12,7 @@ void dWpillar_c::jointCallBack(int) { } /* 8023E9E4-8023EA28 .text dWpillar_jointCallBack__FP7J3DNodei */ -void dWpillar_jointCallBack(J3DNode*, int) { +static BOOL dWpillar_jointCallBack(J3DNode*, int) { /* Nonmatching */ }