mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-01 16:29:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

project cleanup (#2895)

Browse Source 
* 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
This commit is contained in:
TakaRikka
2025-11-30 14:23:42 -08:00
committed by GitHub
parent 434415337d
commit a6e76c0841
2375 changed files with 24683 additions and 71069 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_pane_class.cpp
-41
View File
@@ -1,8 +1,3 @@
//
// Generated By: dol2asm
// Translation Unit: d/d_pane_class
//
#include "d/dolzel.h" // IWYU pragma: keep
#include "JSystem/J2DGraph/J2DOrthoGraph.h"
@@ -18,21 +13,17 @@
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_graphic.h"
/* 80253930-80253984 24E270 0054+00 0/0 11/11 0/0 .text __ct__8CPaneMgrFv */
CPaneMgr::CPaneMgr() {
mpFirstStackAlpha = NULL;
mpFirstStackSize = NULL;
}
/* 80253984-80253A18 24E2C4 0094+00 0/0 58/58 2/2 .text
* __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap */
CPaneMgr::CPaneMgr(J2DScreen* p_scrn, u64 tag, u8 flags, JKRExpHeap* p_heap) {
J2DPane* pane = p_scrn->search(tag);
mFlags = flags;
initiate(pane, p_heap);
}
/* 80253A18-80253AB4 24E358 009C+00 1/0 11/11 0/0 .text __dt__8CPaneMgrFv */
CPaneMgr::~CPaneMgr() {
if (mpFirstStackSize) {
heap->free(mpFirstStackSize);
@@ -44,7 +35,6 @@ CPaneMgr::~CPaneMgr() {
}
}
/* 80253AB4-80253B2C 24E3F4 0078+00 1/0 0/0 0/0 .text setAlpha__8CPaneMgrFUc */
void CPaneMgr::setAlpha(u8 alpha) {
if (mFlags & 2) {
field_0x10 = (u8*)mpFirstStackAlpha;
@@ -54,7 +44,6 @@ void CPaneMgr::setAlpha(u8 alpha) {
getPanePtr()->setAlpha(alpha);
}
/* 80253B2C-80253C08 24E46C 00DC+00 0/0 3/3 0/0 .text reinit__8CPaneMgrFv */
void CPaneMgr::reinit() {
mInitPos.x = getPanePtr()->getBounds().i.x;
mInitPos.y = getPanePtr()->getBounds().i.y;
@@ -76,8 +65,6 @@ void CPaneMgr::reinit() {
mRotateOffset.y = getPanePtr()->getRotOffsetY();
}
/* 80253C08-80254000 24E548 03F8+00 1/1 0/0 0/0 .text initiate__8CPaneMgrFP7J2DPaneP10JKRExpHeap
*/
void CPaneMgr::initiate(J2DPane* p_pane, JKRExpHeap* p_heap) {
mPane = p_pane;
@@ -161,17 +148,14 @@ void CPaneMgr::initiate(J2DPane* p_pane, JKRExpHeap* p_heap) {
mInitBlack.set(0, 0, 0, 0);
}
/* 80254000-8025400C 24E940 000C+00 0/0 1/0 0/0 .text getBlack__9J2DWindowCFv */
JUtility::TColor J2DWindow::getBlack() const {
return mBlack;
}
/* 8025400C-80254018 24E94C 000C+00 0/0 1/0 0/0 .text getWhite__9J2DWindowCFv */
JUtility::TColor J2DWindow::getWhite() const {
return mWhite;
}
/* 80254018-80254134 24E958 011C+00 1/1 0/0 0/0 .text childPaneGetSize__8CPaneMgrFP7J2DPane */
void CPaneMgr::childPaneGetSize(J2DPane* p_pane) {
if (p_pane != NULL) {
field_0x20[0] = p_pane->getBounds().i.x;
@@ -187,7 +171,6 @@ void CPaneMgr::childPaneGetSize(J2DPane* p_pane) {
}
}
/* 80254134-802542E8 24EA74 01B4+00 1/1 0/0 0/0 .text childPaneSetSize__8CPaneMgrFP7J2DPaneff */
void CPaneMgr::childPaneSetSize(J2DPane* p_pane, f32 param_1, f32 param_2) {
if (p_pane != NULL) {
p_pane->move(field_0x20[0] * param_1, field_0x20[1] * param_2);
@@ -204,7 +187,6 @@ void CPaneMgr::childPaneSetSize(J2DPane* p_pane, f32 param_1, f32 param_2) {
}
}
/* 802542E8-80254364 24EC28 007C+00 2/2 18/18 0/0 .text getGlobalPosX__8CPaneMgrFv */
f32 CPaneMgr::getGlobalPosX() {
f32 posX = getPosX();
for (J2DPane* pane = getPanePtr()->getParentPane(); pane != NULL;
@@ -214,7 +196,6 @@ f32 CPaneMgr::getGlobalPosX() {
return posX;
}
/* 80254364-802543E0 24ECA4 007C+00 2/2 15/15 0/0 .text getGlobalPosY__8CPaneMgrFv */
f32 CPaneMgr::getGlobalPosY() {
f32 posY = getPosY();
for (J2DPane* pane = getPanePtr()->getParentPane(); pane != NULL;
@@ -224,26 +205,21 @@ f32 CPaneMgr::getGlobalPosY() {
return posY;
}
/* 802543E0-80254408 24ED20 0028+00 0/0 1/0 0/0 .text setWhite__9J2DWindowFQ28JUtility6TColor */
bool J2DWindow::setWhite(JUtility::TColor white) {
mWhite = white;
return true;
}
/* 80254408-80254430 24ED48 0028+00 0/0 1/0 0/0 .text setBlack__10J2DTextBoxFQ28JUtility6TColor */
bool J2DTextBox::setBlack(JUtility::TColor black) {
mBlackColor = black;
return true;
}
/* 80254430-80254458 24ED70 0028+00 0/0 1/0 0/0 .text setBlack__9J2DWindowFQ28JUtility6TColor */
bool J2DWindow::setBlack(JUtility::TColor black) {
mBlack = black;
return true;
}
/* 80254458-80254568 24ED98 0110+00 1/1 7/7 0/0 .text
* setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor */
void CPaneMgr::setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
switch (mPane->getKind()) {
case 'WIN1':
@@ -261,22 +237,18 @@ void CPaneMgr::setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
}
}
/* 80254568-802545B0 24EEA8 0048+00 0/0 1/0 0/0 .text
* setBlackWhite__9J2DWindowFQ28JUtility6TColorQ28JUtility6TColor */
bool J2DWindow::setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
mBlack = black;
mWhite = white;
return true;
}
/* 802545B0-80254638 24EEF0 0088+00 0/0 51/51 3/3 .text paneTrans__8CPaneMgrFff */
void CPaneMgr::paneTrans(f32 x, f32 y) {
f32 moveX = x + getInitCenterPosX() - getSizeX() * 0.5f;
f32 moveY = y + getInitCenterPosY() - getSizeY() * 0.5f;
getPanePtr()->move(moveX, moveY);
}
/* 80254638-802547CC 24EF78 0194+00 0/0 5/5 0/0 .text paneScale__8CPaneMgrFff */
void CPaneMgr::paneScale(f32 x, f32 y) {
f32 moveX = getPosX() + getSizeX() * 0.5f;
f32 moveY = getPosY() + getSizeY() * 0.5f;
@@ -297,7 +269,6 @@ void CPaneMgr::paneScale(f32 x, f32 y) {
}
}
/* 802547CC-802548BC 24F10C 00F0+00 0/0 10/10 0/0 .text scaleAnime__8CPaneMgrFsffUc */
bool CPaneMgr::scaleAnime(s16 param_0, f32 param_1, f32 param_2, u8 param_3) {
if (mScaleAnime < param_0 - 1) {
mScaleAnime++;
@@ -383,8 +354,6 @@ bool CPaneMgr::colorAnime(s16 anmTimer, JUtility::TColor startBlack, JUtility::T
return false;
}
/* 80254C90-80254EBC 24F5D0 022C+00 1/1 9/9 0/0 .text
* getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs */
Vec CPaneMgr::getGlobalVtx(J2DPane* p_pane, Mtx* param_1, u8 param_2, bool param_3,
s16 param_4) {
Mtx m;
@@ -423,8 +392,6 @@ Vec CPaneMgr::getGlobalVtx(J2DPane* p_pane, Mtx* param_1, u8 param_2, bool param
}
}
/* 80254EBC-80254FB8 24F7FC 00FC+00 0/0 56/56 1/1 .text tCenter__8CPaneMgrFP7J2DPanebs
*/
Vec CPaneMgr::getGlobalVtxCenter(J2DPane* p_pane, bool param_1, s16) {
Mtx m;
Vec vtxCenter;
@@ -438,11 +405,8 @@ Vec CPaneMgr::getGlobalVtxCenter(J2DPane* p_pane, bool param_1, s16) {
return vtxCenter;
}
/* ############################################################################################## */
/* 80430748-80430758 05D468 0010+00 2/2 0/0 0/0 .bss static_mBounds */
static JGeometry::TBox2<f32> static_mBounds(0.0f, 0.0f, 0.0f, 0.0f);
/* 80254FB8-802550E8 24F8F8 0130+00 1/1 0/0 0/0 .text getBounds__8CPaneMgrFP7J2DPane */
JGeometry::TBox2<f32>* CPaneMgr::getBounds(J2DPane* p_pane) {
JGeometry::TBox2<f32> bounds(p_pane->getBounds());
@@ -464,15 +428,12 @@ JGeometry::TBox2<f32>* CPaneMgr::getBounds(J2DPane* p_pane) {
return &static_mBounds;
}
/* 802550E8-8025512C 24FA28 0044+00 0/0 54/54 3/3 .text dPaneClass_showNullPane__FP9J2DScreen */
void dPaneClass_showNullPane(J2DScreen* p_scrn) {
if (p_scrn) {
dPaneClass_showNullPane(p_scrn->search('ROOT'));
}
}
/* 8025512C-80255184 24FA6C 0058+00 1/1 0/0 0/0 .text dPaneClass_showNullPane__FP7J2DPane
*/
void dPaneClass_showNullPane(J2DPane* p_pane) {
if (p_pane) {
if (!p_pane->isVisible()) {
@@ -483,8 +444,6 @@ void dPaneClass_showNullPane(J2DPane* p_pane) {
}
}
/* 80255184-802552B8 24FAC4 0134+00 0/0 1/1 0/0 .text
* dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive */
bool dPaneClass_setPriority(void** i_data, JKRHeap* p_heap, J2DScreen* p_screen,
char const* resName, u32 param_4, JKRArchive* p_archive) {
if (p_archive == NULL) {