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, 3 insertions, 59 deletions

diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp
index 74b8a49dec..7eaac1851b 100644
--- a/src/d/d_name.cpp
+++ b/src/d/d_name.cpp
@@ -1,22 +1,15 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_name
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_name.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_lib.h"
-#include "dol2asm.h"
 #include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "stdio.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "f_op/f_op_msg_mng.h"
 
-/* 803C1F5C-803C2060 -00001 0104+00 0/3 0/0 0/0 .data            l_mojiHira */
 static const char* l_mojiHira[65] = {
     "あ", "い", "う", "え", "お", "か", "き", "く", "け", "こ", "さ", "し", "す",
     "せ", "そ", "た", "ち", "つ", "て", "と", "な", "に", "ぬ", "ね", "の", "は",
@@ -25,7 +18,6 @@ static const char* l_mojiHira[65] = {
     "ぅ", "ぇ", "ぉ", "ゃ", "　", "ゅ", "　", "ょ", "っ", "　", "ー", "゛", "゜",
 };
 
-/* 803C2060-803C2164 -00001 0104+00 0/1 0/0 0/0 .data            l_mojiHira2 */
 static const char* l_mojiHira2[65] = {
     "￥", "￥", "￥", "￥", "￥", "が", "ぎ", "ぐ", "げ", "ご", "ざ", "じ", "ず",
     "ぜ", "ぞ", "だ", "ぢ", "づ", "で", "ど", "￥", "￥", "￥", "￥", "￥", "ば",
@@ -34,7 +26,6 @@ static const char* l_mojiHira2[65] = {
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
 };
 
-/* 803C2164-803C2268 -00001 0104+00 0/1 0/0 0/0 .data            l_mojiHira3 */
 static const char* l_mojiHira3[65] = {
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "ぱ",
@@ -43,7 +34,6 @@ static const char* l_mojiHira3[65] = {
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
 };
 
-/* 803C2268-803C236C -00001 0104+00 0/3 0/0 0/0 .data            l_mojikata */
 static const char* l_mojikata[65] = {
     "ア", "イ", "ウ", "エ", "オ", "カ", "キ", "ク", "ケ", "コ", "サ", "シ", "ス",
     "セ", "ソ", "タ", "チ", "ツ", "テ", "ト", "ナ", "ニ", "ヌ", "ネ", "ノ", "ハ",
@@ -52,7 +42,6 @@ static const char* l_mojikata[65] = {
     "ゥ", "ェ", "ォ", "ャ", "　", "ュ", "　", "ョ", "ッ", "　", "ー", "゛", "゜",
 };
 
-/* 803C236C-803C2470 -00001 0104+00 0/1 0/0 0/0 .data            l_mojikata2 */
 static const char* l_mojikata2[65] = {
     "￥", "￥", "ヴ", "￥", "￥", "ガ", "ギ", "グ", "ゲ", "ゴ", "ザ", "ジ", "ズ",
     "ゼ", "ゾ", "ダ", "ヂ", "ヅ", "デ", "ド", "￥", "￥", "￥", "￥", "￥", "バ",
@@ -61,7 +50,6 @@ static const char* l_mojikata2[65] = {
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
 };
 
-/* 803C2470-803C2574 -00001 0104+00 0/1 0/0 0/0 .data            l_mojikata3 */
 static const char* l_mojikata3[65] = {
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "パ",
@@ -70,7 +58,6 @@ static const char* l_mojikata3[65] = {
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
 };
 
-/* 803C2574-803C2678 -00001 0104+00 0/3 0/0 0/0 .data            l_mojiEisu */
 static const char* l_mojiEisu[65] = {
     "A", "N", "a", "n", "1", "B", "O", "b", "o", "2", "C", "P", "c", "p", "3", "D", "Q",
     "d", "q", "4", "E", "R", "e", "r", "5", "F", "S", "f", "s", "6", "G", "T", "g", "t",
@@ -94,31 +81,27 @@ static char* l_mojiEisuPal_2[65] = {
 };
 #endif
 
-/* 80430734-80430748 05D454 0014+00 9/9 0/0 0/0 .bss             g_nmHIO */
 static dNm_HIO_c g_nmHIO;
 
-/* 803C26E4-803C2750 01F804 006C+00 1/2 0/0 0/0 .data            SelProc */
 typedef void (dName_c::*selProcFunc)(void);
-SECTION_DATA static selProcFunc SelProc[9] = {
+static selProcFunc SelProc[9] = {
     &dName_c::MojiSelect,     &dName_c::MojiSelectAnm,  &dName_c::MojiSelectAnm2,
     &dName_c::MojiSelectAnm3, &dName_c::MenuSelect,     &dName_c::MenuSelectAnm,
-    &dName_c::MenuSelectAnm2, &dName_c::MenuSelectAnm3, &dName_c::Wait};
+    &dName_c::MenuSelectAnm2, &dName_c::MenuSelectAnm3, &dName_c::Wait
+};
 
-/* 8024E3E0-8024E408 248D20 0028+00 1/1 0/0 0/0 .text            __ct__9dNm_HIO_cFv */
 dNm_HIO_c::dNm_HIO_c() {
     mMenuScale = 1.3f;
     mSelCharScale = 1.4f;
     field_0x10 = 10;
 }
 
-/* 8024E408-8024E468 248D48 0060+00 0/0 1/1 0/0 .text            __ct__7dName_cFP7J2DPane */
 dName_c::dName_c(J2DPane* pane) {
     nameIn.field_0xc = pane;
     _create();
     init();
 }
 
-/* 8024E468-8024E62C 248DA8 01C4+00 1/0 0/0 0/0 .text            __dt__7dName_cFv */
 dName_c::~dName_c() {
     delete stick;
     delete nameIn.NameInScr;
@@ -144,7 +127,6 @@ dName_c::~dName_c() {
     archive->removeResourceAll();
 }
 
-/* 8024E62C-8024E6D4 248F6C 00A8+00 1/1 0/0 0/0 .text            _create__7dName_cFv */
 void dName_c::_create() {
     stick = new STControl(5, 2, 2, 1, 0.9f, 0.5f, 0, 0x800);
     stick->setFirstWaitTime(5);
@@ -157,7 +139,6 @@ void dName_c::_create() {
     displayInit();
 }
 
-/* 8024E6D4-8024E7A4 249014 00D0+00 1/1 0/0 0/0 .text            init__7dName_cFv */
 void dName_c::init() {
     mCurPos = 0;
     mLastCurPos = 0;
@@ -197,7 +178,6 @@ void dName_c::init() {
     mojiListChange();
 }
 
-/* 8024E7A4-8024E7EC 2490E4 0048+00 0/0 4/4 0/0 .text            initial__7dName_cFv */
 void dName_c::initial() {
     displayInit();
 
@@ -218,7 +198,6 @@ void dName_c::initial() {
     #endif
 }
 
-/* 8024E7EC-8024E9A0 24912C 01B4+00 0/0 2/2 0/0 .text            showIcon__7dName_cFv */
 void dName_c::showIcon() {
     Vec pos;
 
@@ -246,7 +225,6 @@ void dName_c::showIcon() {
     }
 }
 
-/* 8024E9A0-8024EC10 2492E0 0270+00 0/0 2/2 0/0 .text            _move__7dName_cFv */
 void dName_c::_move() {
     stick->checkTrigger();
     (this->*SelProc[mSelProc])();
@@ -345,7 +323,6 @@ void dName_c::_move() {
     cursorAnm();
 }
 
-/* 8024EC10-8024EC4C 249550 003C+00 3/3 0/0 0/0 .text            nameCheck__7dName_cFv */
 int dName_c::nameCheck() {
     for (int i = 8, len = 7; i > 0; i--) {
         #if REGION_JPN
@@ -362,7 +339,6 @@ int dName_c::nameCheck() {
     return 0;
 }
 
-/* 8024EC4C-8024EC84 24958C 0038+00 1/1 0/0 0/0 .text            playNameSet__7dName_cFi */
 void dName_c::playNameSet(int nameLength) {
     char* str = mInputStr;
 
@@ -384,7 +360,6 @@ void dName_c::playNameSet(int nameLength) {
     *str = 0;
 }
 
-/* 8024EC84-8024ED48 2495C4 00C4+00 1/1 0/0 0/0 .text            cursorAnm__7dName_cFv */
 void dName_c::cursorAnm() {
     mCurColAnmF += 2;
     if (mCurColAnmF >= mCursorColorKey->getFrameMax()) {
@@ -401,10 +376,8 @@ void dName_c::cursorAnm() {
     nameIn.NameInScr->animation();
 }
 
-/* 8024ED48-8024ED4C 249688 0004+00 1/0 0/0 0/0 .text            Wait__7dName_cFv */
 void dName_c::Wait() {}
 
-/* 8024ED4C-8024F034 24968C 02E8+00 1/0 0/0 0/0 .text            MojiSelect__7dName_cFv */
 void dName_c::MojiSelect() {
     if (mDoCPd_c::getTrigA(PAD_1)) {
         selectMojiSet();
@@ -463,7 +436,6 @@ void dName_c::MojiSelect() {
     }
 }
 
-/* 8024F034-8024F0E0 249974 00AC+00 2/2 0/0 0/0 .text            MojiSelectAnmInit__7dName_cFv */
 void dName_c::MojiSelectAnmInit() {
     mSelIcon->setAlphaRate(0.0f);
     mMojiIcon[mPrevRow + mPrevColumn * 5]->scaleAnimeStart(0);
@@ -471,7 +443,6 @@ void dName_c::MojiSelectAnmInit() {
         ->setWhite(JUtility::TColor(0x96, 0x96, 0x96, 0xFF));
 }
 
-/* 8024F0E0-8024F164 249A20 0084+00 1/0 0/0 0/0 .text            MojiSelectAnm__7dName_cFv */
 void dName_c::MojiSelectAnm() {
     if (mMojiIcon[mPrevRow + mPrevColumn * 5]->scaleAnime(mCursorDelay, g_nmHIO.mSelCharScale,
                                                           1.0f, 0) == 1)
@@ -482,7 +453,6 @@ void dName_c::MojiSelectAnm() {
     }
 }
 
-/* 8024F164-8024F1E8 249AA4 0084+00 1/0 0/0 0/0 .text            MojiSelectAnm2__7dName_cFv */
 void dName_c::MojiSelectAnm2() {
     if (mMojiIcon[mPrevRow + mPrevColumn * 5]->scaleAnime(mCursorDelay, g_nmHIO.mSelCharScale,
                                                           1.0f, 0) == 1)
@@ -493,10 +463,8 @@ void dName_c::MojiSelectAnm2() {
     }
 }
 
-/* 8024F1E8-8024F1EC 249B28 0004+00 1/0 0/0 0/0 .text            MojiSelectAnm3__7dName_cFv */
 void dName_c::MojiSelectAnm3() {}
 
-/* 8024F1EC-8024F55C 249B2C 0370+00 1/0 0/0 0/0 .text            mojiChange__7dName_cFUc */
 int dName_c::mojiChange(u8 idx) {
     if (mChrInfo[idx].field_0x3 == 0 || mChrInfo[idx].mMojiSet == MOJI_EIGO ||
         mChrInfo[idx].mCharacter == '　')
@@ -612,7 +580,6 @@ int dName_c::mojiChange(u8 idx) {
     return 1;
 }
 
-/* 8024F55C-8024F59C 249E9C 0040+00 1/1 0/0 0/0 .text            selectMojiSet__7dName_cFv */
 void dName_c::selectMojiSet() {
     #if REGION_JPN
     int moji = getMoji();
@@ -755,7 +722,6 @@ int dName_c::setDakuon(int param_1, u8 param_2) {
 }
 #endif
 
-/* 8024F59C-8024F634 249EDC 0098+00 1/1 0/0 0/0 .text            getMoji__7dName_cFv */
 int dName_c::getMoji() {
     int result = -1;
     const char* moji;
@@ -796,7 +762,6 @@ int dName_c::getMoji() {
     return result;
 }
 
-/* 8024F634-8024F88C 249F74 0258+00 1/1 0/0 0/0 .text            setMoji__7dName_cFi */
 void dName_c::setMoji(int moji) {
     if (mCurPos == 8 || nameCheck() == 8) {
         mDoAud_seStart(Z2SE_SYS_ERROR, NULL, 0, 0);
@@ -864,7 +829,6 @@ void dName_c::setMoji(int moji) {
 }
 
 
-/* 8024F88C-8024F914 24A1CC 0088+00 4/4 0/0 0/0 .text            setNameText__7dName_cFv */
 void dName_c::setNameText() {
     for (int i = 0; i < 8; i++) {
         //"\x1bCD\x1bCR\x1bCC[000000]\x1bGM[0]%c\x1bHM\x1bCC[ffffff]\x1bGM[0]%c"
@@ -906,7 +870,6 @@ void dName_c::setNameText() {
     }
 }
 
-/* 8024F914-8024F994 24A254 0080+00 5/5 0/0 0/0 .text            nameCursorMove__7dName_cFv */
 void dName_c::nameCursorMove() {
     if (mCurPos <= 8) {
         u8 position = mCurPos;
@@ -923,7 +886,6 @@ void dName_c::nameCursorMove() {
     }
 }
 
-/* 8024F994-8024FAF4 24A2D4 0160+00 3/3 0/0 0/0 .text            selectCursorMove__7dName_cFv */
 void dName_c::selectCursorMove() {
     int idx;
     #if REGION_PAL
@@ -961,7 +923,6 @@ void dName_c::selectCursorMove() {
     mSelIcon->setAlphaRate(1.0f);
 }
 
-/* 8024FAF4-8024FB08 24A434 0014+00 1/1 0/0 0/0 .text            menuCursorPosSet__7dName_cFv */
 void dName_c::menuCursorPosSet() {
     mPrevSelMenu = mSelMenu;
     #if REGION_PAL
@@ -994,7 +955,6 @@ void dName_c::menuCursorPosSet() {
     #endif
 }
 
-/* 8024FB08-8024FDA0 24A448 0298+00 1/0 0/0 0/0 .text            MenuSelect__7dName_cFv */
 void dName_c::MenuSelect() {
     #if REGION_PAL || REGION_JPN
     if (stick->checkRightTrigger()) {
@@ -1072,7 +1032,6 @@ void dName_c::MenuSelect() {
     }
 }
 
-/* 8024FDA0-8024FDF4 24A6E0 0054+00 2/2 0/0 0/0 .text            MenuSelectAnmInit__7dName_cFv */
 void dName_c::MenuSelectAnmInit() {
     mSelIcon->setAlphaRate(0.0f);
 
@@ -1080,7 +1039,6 @@ void dName_c::MenuSelectAnmInit() {
     mMenuIcon[prevMenu_i]->scaleAnimeStart(0);
 }
 
-/* 8024FDF4-8024FEB4 24A734 00C0+00 1/0 0/0 0/0 .text            MenuSelectAnm__7dName_cFv */
 void dName_c::MenuSelectAnm() {
     int prevMenu_i = getMenuPosIdx(mPrevSelMenu);
 
@@ -1092,7 +1050,6 @@ void dName_c::MenuSelectAnm() {
     }
 }
 
-/* 8024FEB4-8024FFA0 24A7F4 00EC+00 1/0 0/0 0/0 .text            MenuSelectAnm2__7dName_cFv */
 void dName_c::MenuSelectAnm2() {
     int prevMenu_i = getMenuPosIdx(mPrevSelMenu);
     int mojiSet_i = getMenuPosIdx(mMojiSet);
@@ -1116,10 +1073,8 @@ void dName_c::MenuSelectAnm2() {
     }
 }
 
-/* 8024FFA0-8024FFA4 24A8E0 0004+00 1/0 0/0 0/0 .text            MenuSelectAnm3__7dName_cFv */
 void dName_c::MenuSelectAnm3() {}
 
-/* 8024FFA4-80250074 24A8E4 00D0+00 1/1 0/0 0/0 .text            menuAbtnSelect__7dName_cFv */
 void dName_c::menuAbtnSelect() {
     switch (mSelMenu) {
     case MENU_HIRA:
@@ -1152,7 +1107,6 @@ void dName_c::menuAbtnSelect() {
     }
 }
 
-/* 80250074-802501B0 24A9B4 013C+00 1/1 0/0 0/0 .text            backSpace__7dName_cFv */
 void dName_c::backSpace() {
     if (mCurPos != 0) {
         mDoAud_seStart(Z2SE_SY_NAME_DELETE, NULL, 0, 0);
@@ -1204,7 +1158,6 @@ void dName_c::backSpace() {
     }
 }
 
-/* 802501B0-80250284 24AAF0 00D4+00 2/2 0/0 0/0 .text            mojiListChange__7dName_cFv */
 void dName_c::mojiListChange() {
     #if REGION_PAL
     char** mojiSet;
@@ -1266,7 +1219,6 @@ void dName_c::mojiListChange() {
     #endif
 }
 
-/* 80250284-80250380 24ABC4 00FC+00 1/1 0/0 0/0 .text            menuCursorMove__7dName_cFv */
 void dName_c::menuCursorMove() {
     int menu_i = getMenuPosIdx(mSelMenu);
     mMenuIcon[menu_i]->scale(g_nmHIO.mMenuScale, g_nmHIO.mMenuScale);
@@ -1277,7 +1229,6 @@ void dName_c::menuCursorMove() {
     mSelIcon->setAlphaRate(1.0f);
 }
 
-/* 80250380-802504A0 24ACC0 0120+00 1/1 0/0 0/0 .text            menuCursorMove2__7dName_cFv */
 void dName_c::menuCursorMove2() {
     int menu_i = getMenuPosIdx(mSelMenu);
     int mojiSet_i = getMenuPosIdx(mMojiSet);
@@ -1296,7 +1247,6 @@ void dName_c::menuCursorMove2() {
     mSelIcon->setAlphaRate(1.0f);
 }
 
-/* 802504A0-80250560 24ADE0 00C0+00 1/1 0/0 0/0 .text            selectCursorPosSet__7dName_cFi */
 void dName_c::selectCursorPosSet(int row) {
     if (field_0x30c[mSelMenu][2] == 1) {
         mCharColumn = field_0x30c[mSelMenu][0];
@@ -1330,13 +1280,11 @@ void dName_c::selectCursorPosSet(int row) {
     }
 }
 
-/* 80250560-802505CC 24AEA0 006C+00 0/0 1/1 0/0 .text            _draw__7dName_cFv */
 void dName_c::_draw() {
     dComIfGd_set2DOpa(&nameIn);
     dComIfGd_set2DOpa(mSelIcon);
 }
 
-/* 802505CC-80250CEC 24AF0C 0720+00 1/1 0/0 0/0 .text            screenSet__7dName_cFv */
 void dName_c::screenSet() {
     static u64 l_cur0TagName[8] = {
         's_00', 's_01', 's_02', 's_03', 's_04', 's_05', 's_06', 's_07',
@@ -1543,7 +1491,6 @@ void dName_c::screenSet() {
 }
 
 
-/* 80250CEC-80250E54 24B62C 0168+00 2/2 0/0 0/0 .text            displayInit__7dName_cFv */
 void dName_c::displayInit() {
     mSelIcon->setAlphaRate(0.0f);
     mCurColAnmF = 0;
@@ -1583,7 +1530,6 @@ void dName_c::displayInit() {
     mIsInputEnd = false;
 }
 
-/* 80250E54-80251048 24B794 01F4+00 1/1 0/0 0/0 .text            NameStrSet__7dName_cFv */
 void dName_c::NameStrSet() {
     char* moji = mNextNameStr;
 
@@ -1652,7 +1598,6 @@ void dName_c::NameStrSet() {
     nameCursorMove();
 }
 
-/* 80251048-80251094 24B988 004C+00 6/6 0/0 0/0 .text            getMenuPosIdx__7dName_cFUc */
 s32 dName_c::getMenuPosIdx(u8 selPos) {
     s32 result;
     switch (selPos) {
@@ -1679,7 +1624,6 @@ s32 dName_c::getMenuPosIdx(u8 selPos) {
     //!@bug UB: uninitialized default return
 }
 
-/* 80251094-8025115C 24B9D4 00C8+00 1/0 0/0 0/0 .text            draw__14dDlst_NameIN_cFv */
 void dDlst_NameIN_c::draw() {
     if (field_0xc != NULL) {
         Mtx m;