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, 65 deletions

diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp
index 277570ec79..3267f1c09a 100644
--- a/src/d/d_menu_letter.cpp
+++ b/src/d/d_menu_letter.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_menu_letter
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_menu_letter.h"
@@ -15,7 +10,6 @@
 #include "d/d_meter2_info.h"
 #include "d/d_meter_HIO.h"
 #include "d/d_msg_string.h"
-#include "dol2asm.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
@@ -52,8 +46,6 @@ static moveFunc map_move_process[] = {
     &dMenu_Letter_c::read_close_move,
 };
 
-/* 801DCDC0-801DCF34 1D7700 0174+00 0/0 2/2 0/0 .text
- * __ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl */
 dMenu_Letter_c::dMenu_Letter_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i_cstick) {
     mpHeap = i_heap;
     mpMount = NULL;
@@ -84,7 +76,6 @@ dMenu_Letter_c::dMenu_Letter_c(JKRExpHeap* i_heap, STControl* i_stick, CSTContro
 }
 
 
-/* 801DCF34-801DD36C 1D7874 0438+00 1/0 0/0 0/0 .text            __dt__14dMenu_Letter_cFv */
 dMenu_Letter_c::~dMenu_Letter_c() {
     delete mpDrawCursor;
     mpDrawCursor = NULL;
@@ -170,7 +161,6 @@ dMenu_Letter_c::~dMenu_Letter_c() {
     dComIfGp_getMsgArchive(0)->removeResourceAll();
 }
 
-/* 801DD36C-801DD474 1D7CAC 0108+00 1/1 0/0 0/0 .text            _create__14dMenu_Letter_cFv */
 void dMenu_Letter_c::_create() {
     mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL);
     JUT_ASSERT(231, mpDrawCursor != NULL);
@@ -199,7 +189,6 @@ void dMenu_Letter_c::_create() {
 }
 
 
-/* 801DD474-801DD50C 1D7DB4 0098+00 0/0 2/2 0/0 .text            _move__14dMenu_Letter_cFv */
 void dMenu_Letter_c::_move() {
     JKRHeap* heap = mDoExt_setCurrentHeap((JKRHeap*)mpHeap);
     u8 process = mProcess;
@@ -211,7 +200,6 @@ void dMenu_Letter_c::_move() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801DD50C-801DD934 1D7E4C 0428+00 1/1 1/1 0/0 .text            _draw__14dMenu_Letter_cFv */
 void dMenu_Letter_c::_draw() {
     if (mpArchive == NULL) {
         return;
@@ -279,7 +267,6 @@ void dMenu_Letter_c::_draw() {
     mpIconScreen->draw(0.0f, 0.0f, grafContext);
 }
 
-/* 801DD934-801DD95C 1D8274 0028+00 0/0 2/2 0/0 .text            isSync__14dMenu_Letter_cFv */
 bool dMenu_Letter_c::isSync() {
     if (mpMount != NULL && mpMount->sync() == false) {
         return 0;
@@ -287,7 +274,6 @@ bool dMenu_Letter_c::isSync() {
     return 1;
 }
 
-/* 801DD95C-801DDA20 1D829C 00C4+00 1/1 0/0 0/0 .text letter_init_calc__14dMenu_Letter_cFv */
 void dMenu_Letter_c::letter_init_calc() {
     m_letter_num = getLetterNum();
     for (int i = 0; i < 54; i++) {
@@ -309,14 +295,12 @@ void dMenu_Letter_c::letter_init_calc() {
     }
 }
 
-/* 801DDA20-801DDA74 1D8360 0054+00 1/1 0/0 0/0 .text            init__14dMenu_Letter_cFv */
 void dMenu_Letter_c::init() {
     setPageText();
     changeActiveColor();
     (this->*map_init_process[mProcess])();
 }
 
-/* 801DDA74-801DDC98 1D83B4 0224+00 0/0 2/2 0/0 .text            _open__14dMenu_Letter_cFv */
 int dMenu_Letter_c::_open() {
     if (mpMount == NULL) {
         mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/letres.arc", 0, NULL);
@@ -366,7 +350,6 @@ int dMenu_Letter_c::_open() {
     }
 }
 
-/* 801DDC98-801DDE18 1D85D8 0180+00 0/0 1/1 0/0 .text            _close__14dMenu_Letter_cFv */
 int dMenu_Letter_c::_close() {
     s16 closeWindowFrame =
         g_drawHIO.mLetterSelectScreen.mCloseFrame[dMeter_drawLetterHIO_c::WINDOW_FRAME];
@@ -396,13 +379,11 @@ int dMenu_Letter_c::_close() {
     }
 }
 
-/* 801DDE18-801DDE54 1D8758 003C+00 1/0 0/0 0/0 .text            wait_init__14dMenu_Letter_cFv */
 void dMenu_Letter_c::wait_init() {
     setAButtonString(0x40c);
     setBButtonString(0x3f9);
 }
 
-/* 801DDE54-801DE164 1D8794 0310+00 1/0 0/0 0/0 .text            wait_move__14dMenu_Letter_cFv */
 void dMenu_Letter_c::wait_move() {
     u8 oldIndex = mIndex;
     if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
@@ -462,7 +443,6 @@ void dMenu_Letter_c::wait_move() {
 }
 
 
-/* 801DE164-801DE1E8 1D8AA4 0084+00 1/0 0/0 0/0 .text slide_right_init__14dMenu_Letter_cFv */
 void dMenu_Letter_c::slide_right_init() {
     field_0x358 = -field_0x1ec->getWidth() * mDoGph_gInf_c::getInvScale();
     field_0x35c = field_0x1ec->getWidth() * mDoGph_gInf_c::getInvScale();
@@ -472,7 +452,6 @@ void dMenu_Letter_c::slide_right_init() {
     setBButtonString(0);
 }
 
-/* 801DE1E8-801DE24C 1D8B28 0064+00 1/0 0/0 0/0 .text slide_right_move__14dMenu_Letter_cFv */
 void dMenu_Letter_c::slide_right_move() {
     cLib_addCalc2(&field_0x358, 0.0f, 0.5f, 50.0f);
     if (fabsf(field_0x358) < 0.1f) {
@@ -481,8 +460,6 @@ void dMenu_Letter_c::slide_right_move() {
     }
 }
 
-/* 801DE24C-801DE2D0 1D8B8C 0084+00 1/0 0/0 0/0 .text            slide_left_init__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::slide_left_init() {
     field_0x358 = field_0x1ec->getWidth() * mDoGph_gInf_c::getInvScale();
     field_0x35c = -field_0x1ec->getWidth() * mDoGph_gInf_c::getInvScale();
@@ -492,8 +469,6 @@ void dMenu_Letter_c::slide_left_init() {
     setBButtonString(0);
 }
 
-/* 801DE2D0-801DE334 1D8C10 0064+00 1/0 0/0 0/0 .text            slide_left_move__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::slide_left_move() {
     cLib_addCalc2(&field_0x358, 0.0f, 0.5f, 50.0f);
     if (fabsf(field_0x358) < 0.1f) {
@@ -502,8 +477,6 @@ void dMenu_Letter_c::slide_left_move() {
     }
 }
 
-/* 801DE334-801DE564 1D8C74 0230+00 1/0 0/0 0/0 .text            read_open_init__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_open_init() {
     field_0x36a = 0;
     u8 idx = field_0x3ac[field_0x36f * 6 + mIndex] - 1;
@@ -541,8 +514,6 @@ void dMenu_Letter_c::read_open_init() {
     mpBlackTex->setAlpha(0);
 }
 
-/* 801DE564-801DE70C 1D8EA4 01A8+00 1/0 0/0 0/0 .text            read_open_move__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_open_move() {
     s16 openLetterFrame =
         g_drawHIO.mLetterSelectScreen.mOpenFrame[dMeter_drawLetterHIO_c::LETTER_FRAME];
@@ -566,8 +537,6 @@ void dMenu_Letter_c::read_open_move() {
     }
 }
 
-/* 801DE70C-801DE824 1D904C 0118+00 1/0 0/0 0/0 .text            read_move_init__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_move_init() {
     mpArrow->arwAnimeInit();
     mpArrow->dotAnimeInit();
@@ -589,8 +558,6 @@ void dMenu_Letter_c::read_move_init() {
     }
 }
 
-/* 801DE824-801DEA48 1D9164 0224+00 1/0 0/0 0/0 .text            read_move_move__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_move_move() {
     if (mDoCPd_c::getTrigA(PAD_1) != 0) {
         if (field_0x3e3 == field_0x3e2) {
@@ -629,16 +596,12 @@ void dMenu_Letter_c::read_move_move() {
     }
 }
 
-/* 801DEA48-801DEA94 1D9388 004C+00 1/0 0/0 0/0 .text read_next_fadeout_init__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_next_fadeout_init() {
     field_0x36a = g_drawHIO.mLetterSelectScreen.mCloseFrame[dMeter_drawLetterHIO_c::LETTER_FRAME];
     setAButtonString(0);
     setBButtonString(0);
 }
 
-/* 801DEA94-801DEBD8 1D93D4 0144+00 1/0 0/0 0/0 .text read_next_fadeout_move__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_next_fadeout_move() {
     s16 closeWindowFrame =
         g_drawHIO.mLetterSelectScreen.mCloseFrame[dMeter_drawLetterHIO_c::WINDOW_FRAME];
@@ -668,7 +631,6 @@ void dMenu_Letter_c::read_next_fadeout_move() {
     }
 }
 
-/* 801DEBD8-801DED04 1D9518 012C+00 1/0 0/0 0/0 .text read_next_fadein_init__14dMenu_Letter_cFv */
 void dMenu_Letter_c::read_next_fadein_init() {
     field_0x36a = 0;
     u8 idx = field_0x3ac[field_0x36f * 6 + mIndex] - 1;
@@ -688,7 +650,6 @@ void dMenu_Letter_c::read_next_fadein_init() {
     }
 }
 
-/* 801DED04-801DEE20 1D9644 011C+00 1/0 0/0 0/0 .text read_next_fadein_move__14dMenu_Letter_cFv */
 void dMenu_Letter_c::read_next_fadein_move() {
     s16 openLetterFrame =
         g_drawHIO.mLetterSelectScreen.mOpenFrame[dMeter_drawLetterHIO_c::LETTER_FRAME];
@@ -712,16 +673,12 @@ void dMenu_Letter_c::read_next_fadein_move() {
     }
 }
 
-/* 801DEE20-801DEE6C 1D9760 004C+00 1/0 0/0 0/0 .text            read_close_init__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_close_init() {
     field_0x36a = g_drawHIO.mLetterSelectScreen.mCloseFrame[dMeter_drawLetterHIO_c::LETTER_FRAME];
     setAButtonString(0);
     setBButtonString(0);
 }
 
-/* 801DEE6C-801DF010 1D97AC 01A4+00 1/0 0/0 0/0 .text            read_close_move__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_close_move() {
     s16 closeLetterFrame =
         g_drawHIO.mLetterSelectScreen.mCloseFrame[dMeter_drawLetterHIO_c::LETTER_FRAME];
@@ -744,8 +701,6 @@ void dMenu_Letter_c::read_close_move() {
     }
 }
 
-/* 801DF010-801DFA28 1D9950 0A18+00 1/1 0/0 0/0 .text            screenSetMenu__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::screenSetMenu() {
     static const u64 tag_sub0[6] = {
         'menu_t0s', 'menu_t1s', 'menu_t2s', 'menu_t3s', 'menu_t4s', 'menu_t5s',
@@ -908,8 +863,6 @@ void dMenu_Letter_c::screenSetMenu() {
     }
 }
 
-/* 801DFA58-801E0330 1DA398 08D8+00 1/1 0/0 0/0 .text            screenSetBase__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::screenSetBase() {
     static const u64 tag_pip[9] = {
         'pi_00_n', 'pi_01_n', 'pi_02_n', 'pi_03_n', 'pi_04_n',
@@ -1011,8 +964,6 @@ void dMenu_Letter_c::screenSetBase() {
     }
 }
 
-/* 801E0330-801E03D8 1DAC70 00A8+00 1/1 0/0 0/0 .text            screenSetShadow__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::screenSetShadow() {
     mpSdwScreen = new J2DScreen();
     mpSdwScreen->setPriority("zelda_letter_select_shadow.blo", 0x20000, mpArchive);
@@ -1021,8 +972,6 @@ void dMenu_Letter_c::screenSetShadow() {
     mpParent[2]->setAlphaRate(0.0f);
 }
 
-/* 801E03D8-801E09A8 1DAD18 05D0+00 1/1 0/0 0/0 .text            screenSetLetter__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::screenSetLetter() {
     mpLetterScreen[0] = new J2DScreen();
     JUT_ASSERT(1507, mpLetterScreen[0] != NULL);
@@ -1159,8 +1108,6 @@ void dMenu_Letter_c::screenSetLetter() {
     mpBlackTex->setAlpha(0);
 }
 
-/* 801E09A8-801E0B24 1DB2E8 017C+00 1/1 0/0 0/0 .text            screenSetDoIcon__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::screenSetDoIcon() {
     static const u64 text_a_tag[5] = {
         'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
@@ -1187,13 +1134,11 @@ void dMenu_Letter_c::screenSetDoIcon() {
 }
 
 
-/* 801E0B24-801E0BB0 1DB464 008C+00 3/3 0/0 0/0 .text            setCursorPos__14dMenu_Letter_cFv */
 void dMenu_Letter_c::setCursorPos() {
     Vec pos = mpLetterParent[mIndex]->getGlobalVtxCenter(mpLetterParent[mIndex]->mPane, false, 0);
     mpDrawCursor->setPos(pos.x, pos.y, mpLetterParent[mIndex]->getPanePtr(), false);
 }
 
-/* 801E0BB0-801E0E34 1DB4F0 0284+00 3/3 0/0 0/0 .text changeActiveColor__14dMenu_Letter_cFv */
 void dMenu_Letter_c::changeActiveColor() {
     setCursorPos();
     for (int i = 0; (int)i < 6; i++) {
@@ -1215,8 +1160,6 @@ void dMenu_Letter_c::changeActiveColor() {
     }
 }
 
-/* 801E0E34-801E0E84 1DB774 0050+00 2/2 0/0 0/0 .text            changePageLight__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::changePageLight() {
     for (int i = 0; i < 9; i++) {
         if (i == field_0x36f) {
@@ -1227,7 +1170,6 @@ void dMenu_Letter_c::changePageLight() {
     }
 }
 
-/* 801E0E84-801E1038 1DB7C4 01B4+00 2/2 0/0 0/0 .text            setPageText__14dMenu_Letter_cFv */
 void dMenu_Letter_c::setPageText() {
     int dVar1 = field_0x36f * 6;
     for (int i = 0; i < field_0x373; i++) {
@@ -1251,8 +1193,6 @@ void dMenu_Letter_c::setPageText() {
     }
 }
 
-/* 801E1038-801E11EC 1DB978 01B4+00 1/1 0/0 0/0 .text            setDMYPageText__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::setDMYPageText() {
     int dVar1 = field_0x372 * 6;
     for (int i = 0; i < field_0x373; i++) {
@@ -1276,7 +1216,6 @@ void dMenu_Letter_c::setDMYPageText() {
     }
 }
 
-/* 801E11EC-801E1518 1DBB2C 032C+00 2/2 0/0 0/0 .text            copyDMYMenu__14dMenu_Letter_cFv */
 void dMenu_Letter_c::copyDMYMenu() {
     setDMYPageText();
     for (int i = 0; i < 6; i++) {
@@ -1319,7 +1258,6 @@ void dMenu_Letter_c::copyDMYMenu() {
     }
 }
 
-/* 801E1518-801E15C8 1DBE58 00B0+00 7/7 0/0 0/0 .text setAButtonString__14dMenu_Letter_cFUs */
 void dMenu_Letter_c::setAButtonString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 5; i++) {
@@ -1333,7 +1271,6 @@ void dMenu_Letter_c::setAButtonString(u16 i_stringID) {
 }
 
 
-/* 801E15C8-801E1678 1DBF08 00B0+00 7/7 0/0 0/0 .text setBButtonString__14dMenu_Letter_cFUs */
 void dMenu_Letter_c::setBButtonString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 5; i++) {
@@ -1347,7 +1284,6 @@ void dMenu_Letter_c::setBButtonString(u16 i_stringID) {
 }
 
 
-/* 801E1678-801E1748 1DBFB8 00D0+00 1/1 0/0 0/0 .text            getLetterNum__14dMenu_Letter_cFv */
 u8 dMenu_Letter_c::getLetterNum() {
     u8 letterNum = 0;
     if (g_drawHIO.mLetterSelectScreen.mLetterNum > 0) {
@@ -1366,7 +1302,6 @@ u8 dMenu_Letter_c::getLetterNum() {
     return letterNum;
 }
 
-/* 801E1748-801E1D10 1DC088 05C8+00 2/2 0/0 0/0 .text            setHIO__14dMenu_Letter_cFb */
 void dMenu_Letter_c::setHIO(bool i_useHIO) {
     if (i_useHIO || g_drawHIO.mLetterSelectScreen.mDebugON) {
         for (int i = 0; i < 3; i++) {