mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-10 04:54:14 -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_map.cpp
-75
View File
@@ -11,8 +11,6 @@
#include "SSystem/SComponent/c_math.h"
#include "d/d_com_inf_game.h"
/* 800284BC-800284D0 022DFC 0014+00 2/0 0/0 0/0 .text getIconSize__15renderingAmap_cCFUc
*/
f32 renderingAmap_c::getIconSize(u8 i_icon) const {
static f32 const l_iconSize[] = {
0.12f, 0.12f, 0.08f, 0.12f, 0.08f, 0.16f, 0.12f, 0.0f, 0.12f,
@@ -22,15 +20,12 @@ f32 renderingAmap_c::getIconSize(u8 i_icon) const {
return l_iconSize[i_icon];
}
/* 80450D80-80450D88 000280 0004+04 10/10 0/0 0/0 .sbss m_res__22dMap_HIO_prm_res_dst_s
*/
dMap_prm_res_s* dMap_HIO_prm_res_dst_s::m_res;
inline u8 twoValueLineInterpolation(u8 param_0, u8 param_1, f32 param_2) {
return ((f32)param_0 + (param_2 * ((f32)param_1 - (f32)param_0)));
}
/* 800284D0-800288C4 022E10 03F4+00 2/0 0/0 0/0 .text draw__15renderingAmap_cFv */
void renderingAmap_c::draw() {
f32 tmp = ((f32)(g_Counter.mCounter0 % dMap_HIO_prm_res_dst_s::m_res->field_0x1aa) /
(f32)dMap_HIO_prm_res_dst_s::m_res->field_0x1aa);
@@ -69,8 +64,6 @@ void renderingAmap_c::draw() {
renderingDAmap_c::draw();
}
/* 800288C4-80028960 023204 009C+00 7/6 0/0 0/0 .text getDispType__15renderingAmap_cCFv
*/
int renderingAmap_c::getDispType() const {
int disp_type;
@@ -105,8 +98,6 @@ int renderingAmap_c::getDispType() const {
return disp_type;
}
/* 80028960-800289D0 0232A0 0070+00 2/0 0/0 0/0 .text beforeDrawPath__15renderingAmap_cFv
*/
void renderingAmap_c::beforeDrawPath() {
if (isDrawOutSideTrim()) {
field_0x38 = 0;
@@ -120,25 +111,18 @@ void renderingAmap_c::beforeDrawPath() {
}
}
/* 800289D0-800289F0 023310 0020+00 2/0 0/0 0/0 .text afterDrawPath__15renderingAmap_cFv
*/
void renderingAmap_c::afterDrawPath() {
renderingPlusDoorAndCursor_c::afterDrawPath();
}
/* 800289F0-80028A10 023330 0020+00 2/0 0/0 0/0 .text
* rendering__15renderingAmap_cFPCQ211dDrawPath_c10room_class */
void renderingAmap_c::rendering(dDrawPath_c::room_class const* i_room) {
dDrawPath_c::rendering(i_room);
}
/* 80028A10-80028A30 023350 0020+00 2/0 0/0 0/0 .text drawPath__15renderingAmap_cFv */
void renderingAmap_c::drawPath() {
dDrawPath_c::drawPath();
}
/* 80028A30-80028B04 023370 00D4+00 2/0 0/0 0/0 .text
* rendering__15renderingAmap_cFPCQ211dDrawPath_c10line_class */
void renderingAmap_c::rendering(dDrawPath_c::line_class const* i_line) {
if (isDrawType(i_line->field_0x0)) {
if (isDrawOutSideTrim() && field_0x38 != 2) {
@@ -158,25 +142,20 @@ void renderingAmap_c::rendering(dDrawPath_c::line_class const* i_line) {
}
}
/* 80028B04-80028B10 023444 000C+00 2/0 0/0 0/0 .text getPlayerCursorSize__15renderingAmap_cFv */
f32 renderingAmap_c::getPlayerCursorSize() {
return dMap_HIO_prm_res_dst_s::m_res->cursor_size;
}
/* 80028B10-80028B3C 023450 002C+00 2/0 0/0 0/0 .text getRestartCursorSize__15renderingAmap_cFv */
f32 renderingAmap_c::getRestartCursorSize() {
return getPlayerCursorSize();
}
/* 80028B3C-80028BB4 02347C 0078+00 2/0 0/0 0/0 .text
* rendering__15renderingAmap_cFPCQ211dDrawPath_c10poly_class */
void renderingAmap_c::rendering(dDrawPath_c::poly_class const* i_poly) {
if (isDrawType(i_poly->field_0x0) && (!isDrawOutSideTrim() || field_0x38 == 2)) {
dDrawPath_c::rendering(i_poly);
}
}
/* 80028BB4-80028C4C 0234F4 0098+00 4/4 0/0 0/0 .text isDrawOutSideTrim__15renderingAmap_cFv */
bool renderingAmap_c::isDrawOutSideTrim() {
bool rt = false;
@@ -189,14 +168,11 @@ bool renderingAmap_c::isDrawOutSideTrim() {
return rt;
}
/* 80028C4C-80028C60 02358C 0014+00 1/1 0/0 0/0 .text
* getOutSideBlackLineNumber__15renderingAmap_cFv */
int renderingAmap_c::getOutSideBlackLineNumber() {
m_outSideBlackLineCnt = 0;
return dMap_HIO_prm_res_dst_s::m_res->field_0x1ae;
}
/* 80028C60-80028C90 0235A0 0030+00 1/1 0/0 0/0 .text isOutSideBlackLine__15renderingAmap_cFv */
bool renderingAmap_c::isOutSideBlackLine() {
bool rt = false;
m_outSideBlackLineCnt++;
@@ -208,7 +184,6 @@ bool renderingAmap_c::isOutSideBlackLine() {
return rt;
}
/* 80028C90-80028CF4 0235D0 0064+00 2/2 0/0 0/0 .text getLineWidthSub__15renderingAmap_cFi */
int renderingAmap_c::getLineWidthSub(int i_no) {
static const u8 l_lineWidthPatOff[] = {0x00, 0x00, 0x06, 0x00, 0x00};
static const u8 l_lineWidthPatOn[] = {0x06, 0x06, 0x06, 0x00, 0x00};
@@ -225,8 +200,6 @@ int renderingAmap_c::getLineWidthSub(int i_no) {
return pat[i_no];
}
/* 80028CF4-80028DD4 023634 00E0+00 2/0 0/0 0/0 .text getDecorationLineWidth__15renderingAmap_cFi
*/
s32 renderingAmap_c::getDecorationLineWidth(int param_0) {
int var_r31 = 0;
@@ -269,13 +242,10 @@ s32 renderingAmap_c::getDecorationLineWidth(int param_0) {
return var_r31;
}
/* 80028DD4-80028DF4 023714 0020+00 2/0 0/0 0/0 .text getLineWidth__15renderingAmap_cFi
*/
int renderingAmap_c::getLineWidth(int i_no) {
return getLineWidthSub(i_no);
}
/* 80028DF4-80028EE4 023734 00F0+00 1/0 0/0 0/0 .text getColor__6dMap_cFi */
const GXColor* dMap_c::getColor(int i_no) {
static GXColor const l_dungeon_offColor[] = {
{0x08, 0x00, 0x00, 0x00}, {0x0C, 0x00, 0x00, 0x00}, {0x10, 0x00, 0x00, 0x00},
@@ -318,8 +288,6 @@ const GXColor* dMap_c::getColor(int i_no) {
return &color_tbl[i_no];
}
/* 80028EE4-80028FB4 023824 00D0+00 2/0 0/0 0/0 .text getLineColor__15renderingAmap_cFii
*/
GXColor* renderingAmap_c::getLineColor(int param_0, int param_1) {
static GXColor backColor = {0x04, 0x00, 0x00, 0x00};
static const GXColor borderColor0 = {0xB4, 0x00, 0x00, 0x00};
@@ -346,7 +314,6 @@ GXColor* renderingAmap_c::getLineColor(int param_0, int param_1) {
return color;
}
/* 80028FB4-80029038 0238F4 0084+00 2/0 0/0 0/0 .text getDecoLineColor__15renderingAmap_cFii */
const GXColor* renderingAmap_c::getDecoLineColor(int param_0, int param_1) {
static GXColor const colorTable[] = {
{0xBC, 0x00, 0x00, 0x00},
@@ -366,65 +333,48 @@ const GXColor* renderingAmap_c::getDecoLineColor(int param_0, int param_1) {
return color;
}
/* 80029038-80029058 023978 0020+00 1/0 0/0 0/0 .text
* getIconPosition__6dMap_cCFPQ27dTres_c15typeGroupData_c */
const Vec* dMap_c::getIconPosition(dTres_c::typeGroupData_c* i_data) const {
return renderingPlusDoorAndCursor_c::getIconPosition(i_data);
}
/* 80029058-80029078 023998 0020+00 2/0 0/0 0/0 .text getIconGroupNumber__15renderingAmap_cCFUc */
int renderingAmap_c::getIconGroupNumber(u8 param_0) const {
return renderingDAmap_c::getIconGroupNumber(param_0);
}
/* 80029078-800290C0 0239B8 0048+00 2/0 0/0 0/0 .text hasMap__15renderingAmap_cCFv */
bool renderingAmap_c::hasMap() const {
int stay_type = getStayType();
return stay_type == 1 && dMapInfo_n::chkGetMap();
}
/* 800290C0-80029104 023A00 0044+00 2/0 0/0 0/0 .text isRendDoor__15renderingAmap_cCFv */
bool renderingAmap_c::isRendDoor() const {
int disp_type = getDispType();
return disp_type == 1 || disp_type == 2;
}
/* 80029104-8002910C 023A44 0008+00 2/0 0/0 0/0 .text isCheckFloor__15renderingAmap_cCFv
*/
bool renderingAmap_c::isCheckFloor() const {
return true;
}
/* 8002910C-80029114 023A4C 0008+00 2/0 0/0 0/0 .text isRendRestart__15renderingAmap_cCFv
*/
bool renderingAmap_c::isRendRestart() const {
return true;
}
/* 80029114-8002911C 023A54 0008+00 2/0 0/0 0/0 .text isRendCursor__15renderingAmap_cCFv
*/
bool renderingAmap_c::isRendCursor() const {
return true;
}
/* 8002911C-80029160 023A5C 0044+00 3/2 0/0 0/0 .text isRendAllRoom__15renderingAmap_cCFv
*/
bool renderingAmap_c::isRendAllRoom() const {
int disp_type = getDispType();
return disp_type != 2 && disp_type != 3 && disp_type != 5;
}
/* 80029160-80029190 023AA0 0030+00 7/7 0/0 0/0 .text getStayType__15renderingAmap_cCFv
*/
int renderingAmap_c::getStayType() const {
static int const l_stayType[] = {0, 1, 0, 0, 0, 0, 0};
return l_stayType[getDispType()];
}
/* 80029190-800296EC 023AD0 055C+00 3/0 0/0 0/0 .text
* isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi */
bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool param_1, bool param_2,
int param_3) const {
JUT_ASSERT(0, i_data != NULL);
@@ -600,12 +550,10 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para
return var_r31;
}
/* 800296EC-800296F8 02402C 000C+00 1/0 0/0 0/0 .text isDrawType__6dMap_cFi */
bool dMap_c::isDrawType(int param_0) {
return (param_0 & 0x80) == 0;
}
/* 800296F8-80029744 024038 004C+00 1/0 0/0 0/0 .text isRendAllRoom__6dMap_cCFv */
bool dMap_c::isRendAllRoom() const {
bool rt = renderingAmap_c::isRendAllRoom();
if (field_0x8e == 2 && field_0x8f >= 3 && field_0x8f <= 3) {
@@ -615,12 +563,10 @@ bool dMap_c::isRendAllRoom() const {
return rt;
}
/* 80029744-8002974C 024084 0008+00 1/0 0/0 0/0 .text isSpecialOutline__6dMap_cFv */
bool dMap_c::isSpecialOutline() {
return false;
}
/* 8002974C-800297A8 02408C 005C+00 1/1 0/0 0/0 .text copyPalette__6dMap_cFv */
void dMap_c::copyPalette() {
JUT_ASSERT(0, m_res != NULL);
@@ -630,7 +576,6 @@ void dMap_c::copyPalette() {
}
}
/* 800297A8-80029818 0240E8 0070+00 1/1 0/0 0/0 .text setMapPaletteColorAlphaPer__6dMap_cFiif */
void dMap_c::setMapPaletteColorAlphaPer(int param_0, int param_1, f32 param_2) {
int temp_r28 = (param_1 - param_0) + 1;
int temp_r30 = param_0;
@@ -641,7 +586,6 @@ void dMap_c::setMapPaletteColorAlphaPer(int param_0, int param_1, f32 param_2) {
}
}
/* 80029818-80029874 024158 005C+00 1/1 0/0 0/0 .text resCopy__6dMap_cFv */
void dMap_c::resCopy() {
cLib_memCpy(m_res, m_res_src, sizeof(dMap_prm_res_s));
if (getStayType() == 0) {
@@ -649,7 +593,6 @@ void dMap_c::resCopy() {
}
}
/* 80029874-80029A1C 0241B4 01A8+00 0/0 1/1 0/0 .text __ct__6dMap_cFiiii */
dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) {
m_res_src = NULL;
m_res = NULL;
@@ -707,7 +650,6 @@ dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) {
makeResTIMG(mResTIMG, mTexSizeX, mTexSizeY, mImage_p, (u8*)m_res, 0x33);
}
/* 80029A1C-80029A8C 02435C 0070+00 1/1 0/0 0/0 .text _remove__6dMap_cFv */
void dMap_c::_remove() {
if (mImage_p != NULL) {
delete[] mImage_p;
@@ -725,8 +667,6 @@ void dMap_c::_remove() {
}
}
/* 80029A8C-80029C10 0243CC 0184+00 3/3 0/0 0/0 .text getMapMinMaxXZ__6dMap_cFiPfPfPfPf
*/
void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param_3, f32* param_4) {
f32 var_f0 = 0.0f;
f32 var_f1 = 0.0f;
@@ -796,7 +736,6 @@ void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param
}
}
/* 80029C10-80029D78 024550 0168+00 1/1 0/0 0/0 .text getPack__6dMap_cFiPfPf */
void dMap_c::getPack(int param_0, f32* param_1, f32* param_2) {
f32 var_f31 = 0.0f;
f32 var_f30 = 0.0f;
@@ -837,7 +776,6 @@ void dMap_c::getPack(int param_0, f32* param_1, f32* param_2) {
}
}
/* 80029D78-80029E1C 0246B8 00A4+00 1/1 0/0 0/0 .text calcMapCenterXZ__6dMap_cFiPfPf */
void dMap_c::calcMapCenterXZ(int i_roomNo, f32* param_1, f32* param_2) {
f32 var_f31 = 0.0f;
f32 var_f30 = 0.0f;
@@ -864,7 +802,6 @@ void dMap_c::calcMapCenterXZ(int i_roomNo, f32* param_1, f32* param_2) {
}
}
/* 80029E1C-80029F84 02475C 0168+00 1/1 0/0 0/0 .text calcMapCmPerTexel__6dMap_cFiPf */
void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) {
JUT_ASSERT(0, i_roomNo >= 0);
JUT_ASSERT(0, ip_cmPerTexel != NULL);
@@ -941,7 +878,6 @@ inline void getRGBA_RGB5A3(const dMpath_RGB5A3_palDt_s& palette, u8& r, u8& g, u
a = t_a;
}
/* 80029F84-8002A064 0248C4 00E0+00 1/1 0/0 0/0 .text setMapPaletteColorAlphaPer__6dMap_cFif */
void dMap_c::setMapPaletteColorAlphaPer(int i_paletteNo, f32 param_1) {
JUT_ASSERT(0, i_paletteNo < renderingAmap_c::PALETTE_NUMBER);
@@ -969,7 +905,6 @@ void dMap_c::setMapPaletteColorAlphaPer(int i_paletteNo, f32 param_1) {
sizeof(dMpath_RGB5A3_palDt_s));
}
/* 8002A064-8002A148 0249A4 00E4+00 2/2 0/0 0/0 .text copyPalette__6dMap_cFiif */
void dMap_c::copyPalette(int i_dstPaletteNo, int i_srcPaletteNo, f32 param_2) {
JUT_ASSERT(0, i_dstPaletteNo < renderingAmap_c::PALETTE_NUMBER);
JUT_ASSERT(0, i_srcPaletteNo < renderingAmap_c::PALETTE_NUMBER);
@@ -998,7 +933,6 @@ void dMap_c::copyPalette(int i_dstPaletteNo, int i_srcPaletteNo, f32 param_2) {
sizeof(dMpath_RGB5A3_palDt_s));
}
/* 8002A148-8002A1BC 024A88 0074+00 1/0 0/0 0/0 .text setAmapPaletteColor__6dMap_cFiUcUcUcUc */
void dMap_c::setAmapPaletteColor(int i_paletteNo, u8 i_r, u8 i_g, u8 i_b, u8 i_scaledA) {
JUT_ASSERT(0, i_paletteNo < renderingAmap_c::PALETTE_NUMBER);
@@ -1019,12 +953,10 @@ void dMap_c::setAmapPaletteColor(int i_paletteNo, u8 i_r, u8 i_g, u8 i_b, u8 i_s
sizeof(dMpath_RGB5A3_palDt_s));
}
/* 8002A1BC-8002A1DC 024AFC 0020+00 2/2 0/0 0/0 .text getDispType__6dMap_cCFv */
int dMap_c::getDispType() const {
return renderingAmap_c::getDispType();
}
/* 8002A1DC-8002A254 024B1C 0078+00 1/0 0/0 0/0 .text isDrawRoom__6dMap_cCFii */
bool dMap_c::isDrawRoom(int param_0, int param_1) const {
if (field_0x8e == 2) {
if (field_0x8f >= 3 && field_0x8f <= 3) {
@@ -1037,7 +969,6 @@ bool dMap_c::isDrawRoom(int param_0, int param_1) const {
}
}
/* 8002A254-8002A294 024B94 0040+00 1/0 0/0 0/0 .text getRoomNoSingle__6dMap_cFv */
int dMap_c::getRoomNoSingle() {
if (field_0x8e == 2 && field_0x8f <= 6) {
return field_0x80;
@@ -1046,7 +977,6 @@ int dMap_c::getRoomNoSingle() {
}
}
/* 8002A294-8002A32C 024BD4 0098+00 1/0 0/0 0/0 .text isDrawRoomIcon__6dMap_cCFii */
bool dMap_c::isDrawRoomIcon(int param_0, int param_1) const {
bool var_r30 = hasMap() || param_0 == param_1;
if (renderingAmap_c::isRendAllRoom()) {
@@ -1056,7 +986,6 @@ bool dMap_c::isDrawRoomIcon(int param_0, int param_1) const {
return var_r30;
}
/* 8002A32C-8002AB54 024C6C 0828+00 1/0 1/1 0/0 .text _move__6dMap_cFffif */
void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) {
if (mStayRoomNo == -1) {
mStayRoomNo = i_roomNo;
@@ -1283,7 +1212,6 @@ void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) {
field_0x8d = 1;
}
/* 8002AB54-8002ABAC 025494 0058+00 0/0 1/1 0/0 .text _draw__6dMap_cFv */
void dMap_c::_draw() {
if (mStayRoomNo >= 0 && field_0x8d != 0) {
s8 floor_no = dMapInfo_c::getNowStayFloorNo();
@@ -1291,13 +1219,10 @@ void dMap_c::_draw() {
}
}
/* 8002ABAC-8002ABCC 0254EC 0020+00 1/0 0/0 0/0 .text getFirstData__6dMap_cFUc */
dTres_c::typeGroupData_c* dMap_c::getFirstData(u8 param_0) {
return renderingPlusDoorAndCursor_c::getFirstData(param_0);
}
/* 8002ABCC-8002ABEC 02550C 0020+00 1/0 0/0 0/0 .text
* getNextData__6dMap_cFPQ27dTres_c15typeGroupData_c */
dTres_c::typeGroupData_c* dMap_c::getNextData(dTres_c::typeGroupData_c* param_0) {
return renderingPlusDoorAndCursor_c::getNextData(param_0);
}