project cleanup (#2895)

* some wii OS fixes

* remove old dol2asm comments

* remove dol2asm.h

* remove function address comments

* normalize ATTRIBUTE_ALIGN usage

* DECL_WEAK macro

* fix gcc attribute weak macro

* wrap more mwcc specific things in ifdefs

* fixes

* fix revo sdk version flags

* fixes

1 files changed, 0 insertions, 59 deletions

diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp
index bb4b867004..400752c649 100644
--- a/src/d/actor/d_a_npc_yamit.cpp
+++ b/src/d/actor/d_a_npc_yamit.cpp
@@ -37,70 +37,58 @@ void daNpc_yamiT_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80B4CEBC-80B4CEC4 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {12, 1},
 };
 
-/* 80B4CEC4-80B4CED4 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"STOPPER", 1},
 };
 
-/* 80B4CED4-80B4CEDC -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "yamiT",
 };
 
-/* 80B4CEDC-80B4CEE0 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {1, -1};
 
-/* 80B4CEE0-80B4CEEC -00001 000C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[3] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80B4CEEC-80B4CF24 000050 0038+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = {
     {-1, 0, 0, 15, 2, 1, 1},
     {6, 0, 1, 15, 2, 1, 1},
 };
 
-/* 80B4CF24-80B4CF78 000088 0054+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[3] = {
     {9, 2, 1, -1, 0, 0, 0, 0},
     {8, 0, 1, -1, 0, 0, 0, 0},
     {7, 0, 1, -1, 0, 0, 0, 0},
 };
 
-/* 80B4CF78-80B4CF98 0000DC 0020+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = {
     {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B4CF98-80B4CFC8 0000FC 0030+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[12] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {0, -1, 0},
     {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B4CFC8-80B4CFD0 -00001 0008+00 1/1 0/0 0/0 .data            mCutNameList__13daNpc_yamiT_c */
 char* daNpc_yamiT_c::mCutNameList[2] = {
     "",
     "STOPPER",
 };
 
-/* 80B4CFDC-80B4CFF4 000140 0018+00 2/2 0/0 0/0 .data            mCutList__13daNpc_yamiT_c */
 daNpc_yamiT_c::cutFunc daNpc_yamiT_c::mCutList[2] = {
     NULL,
     &daNpc_yamiT_c::cutStopper,
 };
 
-/* 80B49BEC-80B49D24 0000EC 0138+00 1/0 0/0 0/0 .text            __dt__13daNpc_yamiT_cFv */
 daNpc_yamiT_c::~daNpc_yamiT_c() {
     if (heap != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -108,7 +96,6 @@ daNpc_yamiT_c::~daNpc_yamiT_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80B4CDA4-80B4CE30 000000 008C+00 7/7 0/0 0/0 .rodata          m__19daNpc_yamiT_Param_c */
 const daNpc_yamiT_HIOParam daNpc_yamiT_Param_c::m = {
     230.0f,  // attention_offset
     -3.0f,   // gravity
@@ -153,10 +140,8 @@ const daNpc_yamiT_HIOParam daNpc_yamiT_Param_c::m = {
     0.0f,    // box_offset
 };
 
-/* 80B4D204-80B4D208 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_YAMIT_HIO_CLASS l_HIO;
 
-/* 80B49D24-80B49FD8 000224 02B4+00 1/1 0/0 0/0 .text            create__13daNpc_yamiT_cFv */
 cPhs__Step daNpc_yamiT_c::create() {
     daNpcT_ct(this, daNpc_yamiT_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData,
               4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -210,7 +195,6 @@ cPhs__Step daNpc_yamiT_c::create() {
     return phase;
 }
 
-/* 80B49FD8-80B4A26C 0004D8 0294+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_yamiT_cFv */
 int daNpc_yamiT_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -250,20 +234,16 @@ int daNpc_yamiT_c::CreateHeap() {
     return 0;
 }
 
-/* 80B4A428-80B4A45C 000928 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_yamiT_cFv */
 int daNpc_yamiT_c::Delete() {
     fpc_ProcID reg_r30 = fopAcM_GetID(this);
     this->~daNpc_yamiT_c();
     return 1;
 }
 
-/* 80B4A45C-80B4A47C 00095C 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_yamiT_cFv */
 int daNpc_yamiT_c::Execute() {
     return execute();
 }
 
-/* 80B4A47C-80B4A4E0 00097C 0064+00 1/1 0/0 0/0 .text            _search_Tag__13daNpc_yamiT_cFPvPv
- */
 void* daNpc_yamiT_c::_search_Tag(void* i_actor, void* i_data) {
     if (!fopAcM_IsActor(i_actor)) {
         return NULL;
@@ -278,7 +258,6 @@ void* daNpc_yamiT_c::_search_Tag(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80B4A4E0-80B4A588 0009E0 00A8+00 1/1 0/0 0/0 .text            Draw__13daNpc_yamiT_cFv */
 int daNpc_yamiT_c::Draw() {
     if (is_vanish()) {
         return 0;
@@ -292,15 +271,11 @@ int daNpc_yamiT_c::Draw() {
     return draw(FALSE, FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE);
 }
 
-/* 80B4A588-80B4A5A8 000A88 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daNpc_yamiT_cFP10fopAc_ac_c            */
 int daNpc_yamiT_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_yamiT_c* a_this = (daNpc_yamiT_c*)i_this;
     return a_this->CreateHeap();
 }
 
-/* 80B4A5A8-80B4A600 000AA8 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__13daNpc_yamiT_cFP8J3DJointi               */
 int daNpc_yamiT_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -314,7 +289,6 @@ int daNpc_yamiT_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80B4A600-80B4A638 000B00 0038+00 1/1 0/0 0/0 .text            getType__13daNpc_yamiT_cFv */
 u8 daNpc_yamiT_c::getType() {
     u8 prm = fopAcM_GetParam(this);
     switch (prm & 0xFF) {
@@ -329,7 +303,6 @@ u8 daNpc_yamiT_c::getType() {
     }
 }
 
-/* 80B4A638-80B4A69C 000B38 0064+00 2/2 0/0 0/0 .text            getFlowNodeNo__13daNpc_yamiT_cFv */
 u32 daNpc_yamiT_c::getFlowNodeNo() {
     u32 rv = -1;
 
@@ -346,7 +319,6 @@ u32 daNpc_yamiT_c::getFlowNodeNo() {
     return rv;
 }
 
-/* 80B4A69C-80B4A724 000B9C 0088+00 1/1 0/0 0/0 .text            isDelete__13daNpc_yamiT_cFv */
 BOOL daNpc_yamiT_c::isDelete() {
     BOOL rv = FALSE;
 
@@ -365,7 +337,6 @@ BOOL daNpc_yamiT_c::isDelete() {
     return rv;
 }
 
-/* 80B4A724-80B4A914 000C24 01F0+00 1/1 0/0 0/0 .text            reset__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::reset() {
     initialize();
 
@@ -392,7 +363,6 @@ void daNpc_yamiT_c::reset() {
     setAction(&daNpc_yamiT_c::wait);
 }
 
-/* 80B4A914-80B4A9A0 000E14 008C+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_yamiT_cFi */
 void daNpc_yamiT_c::afterJntAnm(int param_1) {
     if (param_1 == 2) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -403,7 +373,6 @@ void daNpc_yamiT_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80B4A9A0-80B4AAD0 000EA0 0130+00 1/0 0/0 0/0 .text            setParam__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::setParam() {
     selectAction();
     srchActors();
@@ -438,7 +407,6 @@ void daNpc_yamiT_c::setParam() {
     mMorfFrames = mpHIO->m.common.morf_frame;
 }
 
-/* 80B4AAD0-80B4AB30 000FD0 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::setAfterTalkMotion() {
     int face = FACE_TALKE_A;
     mFaceMotionSeqMngr.getNo();
@@ -446,7 +414,6 @@ void daNpc_yamiT_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(face, -1.0f, FALSE, 0);
 }
 
-/* 80B4AB30-80B4ABA0 001030 0070+00 1/1 0/0 0/0 .text            srchActors__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::srchActors() {
     switch (mType) {
     case 1:
@@ -461,7 +428,6 @@ void daNpc_yamiT_c::srchActors() {
     }
 }
 
-/* 80B4ABA0-80B4AC84 0010A0 00E4+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_yamiT_cFv */
 BOOL daNpc_yamiT_c::evtTalk() {
     if (chkAction(&daNpc_yamiT_c::talk)) {
         (this->*mAction)(NULL);
@@ -472,7 +438,6 @@ BOOL daNpc_yamiT_c::evtTalk() {
     return TRUE;
 }
 
-/* 80B4AC84-80B4AD4C 001184 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_yamiT_cFv */
 BOOL daNpc_yamiT_c::evtCutProc() {
     int rv = FALSE;
 
@@ -490,7 +455,6 @@ BOOL daNpc_yamiT_c::evtCutProc() {
     return rv;
 }
 
-/* 80B4AD4C-80B4AE38 00124C 00EC+00 1/0 0/0 0/0 .text            action__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::action() {
     if (mStagger.checkRebirth()) {
         mStagger.initialize();
@@ -506,14 +470,12 @@ void daNpc_yamiT_c::action() {
     }
 }
 
-/* 80B4AE38-80B4AEB0 001338 0078+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80B4AEB0-80B4B0DC 0013B0 022C+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::setAttnPos() {
     cXyz work(-30.0f, 0.0f, 0.0f);
 
@@ -537,7 +499,6 @@ void daNpc_yamiT_c::setAttnPos() {
     attention_info.position.y += mpHIO->m.common.attention_offset;
 }
 
-/* 80B4B0DC-80B4B210 0015DC 0134+00 1/0 0/0 0/0 .text            setCollision__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::setCollision() {
     cXyz work;
     u32 tgType = 0xD8FBFDFF;
@@ -573,12 +534,10 @@ void daNpc_yamiT_c::setCollision() {
     field_0xe44.ClrTgHit();
 }
 
-/* 80B4B210-80B4B218 001710 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_yamiT_cFv */
 int daNpc_yamiT_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80B4B218-80B4B294 001718 007C+00 1/0 0/0 0/0 .text            evtEndProc__13daNpc_yamiT_cFv */
 BOOL daNpc_yamiT_c::evtEndProc() {
     if (mpTagYami) {
         mpTagYami->onMidnaTagSw();
@@ -589,7 +548,6 @@ BOOL daNpc_yamiT_c::evtEndProc() {
     return TRUE;
 }
 
-/* 80B4B294-80B4B300 001794 006C+00 1/0 0/0 0/0 .text            drawGhost__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::drawGhost() {
     J3DModel* model = mpMorf[0]->getModel();
     g_env_light.settingTevStruct(3, &current.pos, &tevStr);
@@ -597,21 +555,16 @@ void daNpc_yamiT_c::drawGhost() {
     mpMorf[0]->entryDL();
 }
 
-/* 80B4B300-80B4B348 001800 0048+00 1/1 0/0 0/0 .text            selectAction__13daNpc_yamiT_cFv */
 int daNpc_yamiT_c::selectAction() {
     mNextAction = NULL;
     mNextAction = &daNpc_yamiT_c::wait;
     return 1;
 }
 
-/* 80B4B348-80B4B374 001848 002C+00 1/1 0/0 0/0 .text
- * chkAction__13daNpc_yamiT_cFM13daNpc_yamiT_cFPCvPvPv_i        */
 BOOL daNpc_yamiT_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80B4B374-80B4B41C 001874 00A8+00 3/3 0/0 0/0 .text
- * setAction__13daNpc_yamiT_cFM13daNpc_yamiT_cFPCvPvPv_i        */
 int daNpc_yamiT_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -629,7 +582,6 @@ int daNpc_yamiT_c::setAction(actionFunc action) {
     return 1;
 }
 
-/* 80B4B41C-80B4B7D4 00191C 03B8+00 2/0 0/0 0/0 .text            wait__13daNpc_yamiT_cFPv */
 int daNpc_yamiT_c::wait(void* param_1) {
     switch (mMode) {
     case 0:
@@ -704,7 +656,6 @@ int daNpc_yamiT_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80B4B7D4-80B4B9E0 001CD4 020C+00 2/0 0/0 0/0 .text            talk__13daNpc_yamiT_cFPv */
 int daNpc_yamiT_c::talk(void* param_1) {
     switch (mMode) {
     case 0:
@@ -747,7 +698,6 @@ int daNpc_yamiT_c::talk(void* param_1) {
     return 0;
 }
 
-/* 80B4B9E0-80B4BA74 001EE0 0094+00 1/0 0/0 0/0 .text            cutStopper__13daNpc_yamiT_cFi */
 BOOL daNpc_yamiT_c::cutStopper(int i_cutIndex) {
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_cutIndex, "cutId");
     if (cutId == NULL) {
@@ -761,7 +711,6 @@ BOOL daNpc_yamiT_c::cutStopper(int i_cutIndex) {
     return _cutStopper_Main(*cutId);
 }
 
-/* 80B4BA74-80B4BAAC 001F74 0038+00 1/1 0/0 0/0 .text _cutStopper_Init__13daNpc_yamiT_cFRCi */
 BOOL daNpc_yamiT_c::_cutStopper_Init(int const& i_cutId) {
     switch (i_cutId) {
     case 10:
@@ -771,7 +720,6 @@ BOOL daNpc_yamiT_c::_cutStopper_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80B4BAAC-80B4BAC4 001FAC 0018+00 1/1 0/0 0/0 .text _cutStopper_Main__13daNpc_yamiT_cFRCi */
 BOOL daNpc_yamiT_c::_cutStopper_Main(int const& i_cutId) {
     BOOL rv = FALSE;
     if (i_cutId == 10) {
@@ -780,39 +728,32 @@ BOOL daNpc_yamiT_c::_cutStopper_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80B4BAC4-80B4BAE4 001FC4 0020+00 1/0 0/0 0/0 .text            daNpc_yamiT_Create__FPv */
 static int daNpc_yamiT_Create(void* i_this) {
     return ((daNpc_yamiT_c*)i_this)->create();
 }
 
-/* 80B4BAE4-80B4BB04 001FE4 0020+00 1/0 0/0 0/0 .text            daNpc_yamiT_Delete__FPv */
 static int daNpc_yamiT_Delete(void* i_this) {
     return ((daNpc_yamiT_c*)i_this)->Delete();
 }
 
-/* 80B4BB04-80B4BB24 002004 0020+00 1/0 0/0 0/0 .text            daNpc_yamiT_Execute__FPv */
 static int daNpc_yamiT_Execute(void* i_this) {
     return ((daNpc_yamiT_c*)i_this)->Execute();
 }
 
-/* 80B4BB24-80B4BB44 002024 0020+00 1/0 0/0 0/0 .text            daNpc_yamiT_Draw__FPv */
 static int daNpc_yamiT_Draw(void* i_this) {
     return ((daNpc_yamiT_c*)i_this)->Draw();
 }
 
-/* 80B4BB44-80B4BB4C 002044 0008+00 1/0 0/0 0/0 .text            daNpc_yamiT_IsDelete__FPv */
 static int daNpc_yamiT_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80B4D024-80B4D044 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_yamiT_MethodTable */
 static actor_method_class daNpc_yamiT_MethodTable = {
     (process_method_func)daNpc_yamiT_Create,  (process_method_func)daNpc_yamiT_Delete,
     (process_method_func)daNpc_yamiT_Execute, (process_method_func)daNpc_yamiT_IsDelete,
     (process_method_func)daNpc_yamiT_Draw,
 };
 
-/* 80B4D044-80B4D074 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_YAMIT */
 extern actor_process_profile_definition g_profile_NPC_YAMIT = {
     fpcLy_CURRENT_e,           // mLayerID
     7,                         // mListID