mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-22 00:46:46 -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_menu_fmap_map.cpp
-67
View File
@@ -1,8 +1,3 @@
//
// Generated By: dol2asm
// Translation Unit: d/d_menu_fmap_map
//
#include "d/dolzel.h" // IWYU pragma: keep
#include "JSystem/JUtility/JUTTexture.h"
@@ -11,14 +6,10 @@
#include "d/d_menu_fmap_map.h"
#include "m_Do/m_Do_graphic.h"
/* 801CE068-801CE0CC 1C89A8 0064+00 1/1 0/0 0/0 .text twoValueLineInterpolation__FUcUcf
*/
static u8 twoValueLineInterpolation(u8 i_value1, u8 i_value2, f32 i_param) {
return (u8)((f32)i_value1 + i_param * ((f32)i_value2 - (f32)i_value1));
}
/* 801CE0CC-801CE15C 1C8A0C 0090+00 2/2 0/0 0/0 .text
* twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor */
static void twoColorLineInterporation(GXColor const& i_color1, GXColor const& i_color2,
f32 i_param, GXColor& o_color) {
o_color.r = twoValueLineInterpolation(i_color1.r, i_color2.r, i_param);
@@ -27,8 +18,6 @@ static void twoColorLineInterporation(GXColor const& i_color1, GXColor const& i_
o_color.a = twoValueLineInterpolation(i_color1.a, i_color2.a, i_param);
}
/* 801CE15C-801CE188 1C8A9C 002C+00 1/1 0/0 0/0 .text init__15renderingFmap_cFPUcUsUsUsUs
*/
void renderingFmap_c::init(u8* param_0, u16 i_texWidth, u16 i_texHeight, u16 param_3, u16 param_4) {
field_0x4 = param_0;
mTexWidth = i_texWidth;
@@ -40,8 +29,6 @@ void renderingFmap_c::init(u8* param_0, u16 i_texWidth, u16 i_texHeight, u16 par
mDrawEnable = false;
}
/* 801CE188-801CE224 1C8AC8 009C+00 1/1 0/0 0/0 .text
* entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff */
void renderingFmap_c::entry(dMenu_Fmap_world_data_c* i_worldData, int i_startStageNo,
f32 i_posX, f32 i_posY, f32 i_scale) {
mpWorldData = i_worldData;
@@ -54,13 +41,10 @@ void renderingFmap_c::entry(dMenu_Fmap_world_data_c* i_worldData, int i_startSta
dComIfGd_setCopy2D(this);
}
/* 801CE224-801CE288 1C8B64 0064+00 1/1 0/0 0/0 .text isSwitchSpecialOff__15renderingFmap_cFi */
bool renderingFmap_c::isSwitchSpecialOff(int i_swbit) {
return !strcmp(dComIfGp_getStartStageName(), "F_SP121") && i_swbit == 0xb2;
}
/* 801CE288-801CE3C0 1C8BC8 0138+00 2/0 0/0 0/0 .text
* isSwitch__15renderingFmap_cFPCQ211dDrawPath_c11group_class */
bool renderingFmap_c::isSwitch(dDrawPath_c::group_class const* i_group) {
if (i_group->mSwbit == 0xff) {
return true;
@@ -95,8 +79,6 @@ bool renderingFmap_c::isSwitch(dDrawPath_c::group_class const* i_group) {
}
}
/* 801CE3C0-801CE410 1C8D00 0050+00 0/0 3/3 0/0 .text
* getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi */
int renderingFmap_c::getPointStagePathInnerNo(dMenu_Fmap_region_data_c* i_regionData,
f32 i_offsetX, f32 i_offsetY, int i_stageNo,
int* o_stageNo, int* o_roomNo) {
@@ -105,7 +87,6 @@ int renderingFmap_c::getPointStagePathInnerNo(dMenu_Fmap_region_data_c* i_region
i_stageNo, o_stageNo, o_roomNo);
}
/* 801CE410-801CE4D4 1C8D50 00C4+00 2/0 0/0 0/0 .text preDrawPath__15renderingFmap_cFv */
void renderingFmap_c::preDrawPath() {
mEye.x = mPosX;
mEye.y = mPosZ;
@@ -125,34 +106,27 @@ void renderingFmap_c::preDrawPath() {
GXSetMisc(GX_MT_XF_FLUSH, 8);
}
/* 801CE4D4-801CE4DC 1C8E14 0008+00 2/0 0/0 0/0 .text isDrawPath__15renderingFmap_cFv */
bool renderingFmap_c::isDrawPath() {
return true;
}
/* 801CE4DC-801CE560 1C8E1C 0084+00 2/2 0/0 0/0 .text isDrawRoom__15renderingFmap_cFv */
bool renderingFmap_c::isDrawRoom() {
return (bool)((mRegionNo == dComIfGp_getNowLevel() && mStageNo == mStartStageNo
&& mRoomNo == dComIfGp_roomControl_getStayNo())
|| mpRoomData->isArrival());
}
/* 801CE560-801CE5B8 1C8EA0 0058+00 2/0 0/0 0/0 .text postDrawPath__15renderingFmap_cFv
*/
void renderingFmap_c::postDrawPath() {
GXSetMisc(GX_MT_XF_FLUSH, 0);
mDoMtx_lookAt(mViewMtx, &mEye, &mCenter, &mUp, 0);
GXLoadPosMtxImm(mViewMtx, GX_PNMTX0);
}
/* 801CE5B8-801CE5EC 1C8EF8 0034+00 2/0 0/0 0/0 .text postRenderingMap__15renderingFmap_cFv */
void renderingFmap_c::postRenderingMap() {
dRenderingFDAmap_c::postRenderingMap();
mDrawEnable = true;
}
/* 801CE5EC-801CE6A8 1C8F2C 00BC+00 2/2 0/0 0/0 .text roomSetteing__15renderingFmap_cFv
*/
void renderingFmap_c::roomSetteing() {
mRegionOffsetX = mpRegionData->getRegionOffsetX();
mRegionOffsetZ = mpRegionData->getRegionOffsetZ();
@@ -173,7 +147,6 @@ void renderingFmap_c::roomSetteing() {
GXLoadPosMtxImm(viewMtx, GX_PNMTX0);
}
/* 801CE6A8-801CE75C 1C8FE8 00B4+00 2/0 0/0 0/0 .text getFirstRoomPointer__15renderingFmap_cFv */
dDrawPath_c::room_class* renderingFmap_c::getFirstRoomPointer() {
dDrawPath_c::room_class* room = NULL;
getFirstRegion();
@@ -197,8 +170,6 @@ dDrawPath_c::room_class* renderingFmap_c::getFirstRoomPointer() {
return room;
}
/* 801CE75C-801CE7A8 1C909C 004C+00 1/1 0/0 0/0 .text getFirstRegion__15renderingFmap_cFv
*/
void renderingFmap_c::getFirstRegion() {
mpStageData = NULL;
mpRegionData = mpWorldData->getMenuFmapRegionTop();
@@ -209,8 +180,6 @@ void renderingFmap_c::getFirstRegion() {
}
}
/* 801CE7A8-801CE80C 1C90E8 0064+00 2/2 0/0 0/0 .text getFirstStage__15renderingFmap_cFv
*/
void renderingFmap_c::getFirstStage() {
mpRoomData = NULL;
mpStageData = mpRegionData->getMenuFmapStageDataTop();
@@ -223,8 +192,6 @@ void renderingFmap_c::getFirstStage() {
}
}
/* 801CE80C-801CE84C 1C914C 0040+00 2/2 0/0 0/0 .text getFirstRoom__15renderingFmap_cFv
*/
void renderingFmap_c::getFirstRoom() {
mpFmapData = NULL;
mpRoomData = mpStageData->getFmapRoomDataTop();
@@ -235,7 +202,6 @@ void renderingFmap_c::getFirstRoom() {
}
}
/* 801CE84C-801CE8B8 1C918C 006C+00 1/1 0/0 0/0 .text getNextRoom__15renderingFmap_cFv */
bool renderingFmap_c::getNextRoom() {
bool ret = false;
mpRoomData = mpRoomData->getNextData();
@@ -249,8 +215,6 @@ bool renderingFmap_c::getNextRoom() {
return ret;
}
/* 801CE8B8-801CE93C 1C91F8 0084+00 1/1 0/0 0/0 .text getNextStage__15renderingFmap_cFv
*/
bool renderingFmap_c::getNextStage() {
bool ret = false;
mpStageData = mpStageData->getNextData();
@@ -266,8 +230,6 @@ bool renderingFmap_c::getNextStage() {
return ret;
}
/* 801CE93C-801CE9A4 1C927C 0068+00 1/1 0/0 0/0 .text getNextRegion__15renderingFmap_cFv
*/
bool renderingFmap_c::getNextRegion() {
bool ret = false;
mpRegionData = mpRegionData->getNextData();
@@ -281,7 +243,6 @@ bool renderingFmap_c::getNextRegion() {
return ret;
}
/* 801CE9A4-801CEA38 1C92E4 0094+00 2/0 0/0 0/0 .text getNextRoomPointer__15renderingFmap_cFv */
dDrawPath_c::room_class* renderingFmap_c::getNextRoomPointer() {
room_class* room;
@@ -302,8 +263,6 @@ dDrawPath_c::room_class* renderingFmap_c::getNextRoomPointer() {
return room;
}
/* 801CEA38-801CEAAC 1C9378 0074+00 1/1 0/0 0/0 .text
* setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eUcUcUcUc */
void dMenu_FmapMap_c::setFmapPaletteColor(renderingFmap_c::palette_e i_palette, u8 i_r,
u8 i_g, u8 i_b, u8 i_a) {
int color;
@@ -321,14 +280,11 @@ void dMenu_FmapMap_c::setFmapPaletteColor(renderingFmap_c::palette_e i_palette,
DCStoreRange(&m_palette[i_palette], 8);
}
/* 801CEAAC-801CEAE0 1C93EC 0034+00 2/2 0/0 0/0 .text
* setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor */
void dMenu_FmapMap_c::setFmapPaletteColor(renderingFmap_c::palette_e i_palette,
GXColor const& i_color) {
setFmapPaletteColor(i_palette, i_color.r, i_color.g, i_color.b, i_color.a);
}
/* 801CEAE0-801CEB1C 1C9420 003C+00 1/1 0/0 0/0 .text isFlashRoomNoCheck__15dMenu_FmapMap_cCFi */
bool dMenu_FmapMap_c::isFlashRoomNoCheck(int i_roomNo) const {
bool ret = false;
u8* ptr = mFlashRooms;
@@ -341,8 +297,6 @@ bool dMenu_FmapMap_c::isFlashRoomNoCheck(int i_roomNo) const {
return ret;
}
/* 801CEB1C-801CEC24 1C945C 0108+00 1/1 0/0 0/0 .text setPointColor__15dMenu_FmapMap_cFf
*/
void dMenu_FmapMap_c::setPointColor(f32 i_param) {
static const palette_e palNo[8] = {
PALETTE_11,
@@ -369,7 +323,6 @@ void dMenu_FmapMap_c::setPointColor(f32 i_param) {
}
}
/* 801CEC24-801CED38 1C9564 0114+00 0/0 1/1 0/0 .text __ct__15dMenu_FmapMap_cFv */
dMenu_FmapMap_c::dMenu_FmapMap_c() {
mResTIMG = NULL;
mMapImage_p = NULL;
@@ -389,12 +342,10 @@ dMenu_FmapMap_c::dMenu_FmapMap_c() {
}
/* 801CED38-801CEDE8 1C9678 00B0+00 1/0 0/0 0/0 .text __dt__15dMenu_FmapMap_cFv */
dMenu_FmapMap_c::~dMenu_FmapMap_c() {
_delete();
}
/* 801CEDE8-801CEE3C 1C9728 0054+00 0/0 1/1 0/0 .text _create__15dMenu_FmapMap_cFUsUsUsUsPv */
void dMenu_FmapMap_c::_create(u16 i_texWidth, u16 i_texHeight, u16 param_2, u16 param_3, void* i_res) {
m_res = (dMfm_prm_res_s*)i_res;
m_palette = m_res->palette_data;
@@ -407,7 +358,6 @@ void dMenu_FmapMap_c::_create(u16 i_texWidth, u16 i_texHeight, u16 param_2, u16
setTexture(i_texWidth, i_texHeight, param_2, param_3);
}
/* 801CEE3C-801CEE94 1C977C 0058+00 1/1 1/1 0/0 .text _delete__15dMenu_FmapMap_cFv */
void dMenu_FmapMap_c::_delete() {
if (mResTIMG != NULL) {
delete mResTIMG;
@@ -419,11 +369,8 @@ void dMenu_FmapMap_c::_delete() {
}
}
/* 80454194-80454198 002794 0001+03 2/2 0/0 0/0 .sdata2 m_other__22dMfm_HIO_prm_res_src_s
*/
const dMfm_HIO_prm_res_src_s dMfm_HIO_prm_res_src_s::m_other = {30};
/* 801CEE94-801CF0B4 1C97D4 0220+00 1/0 0/0 0/0 .text draw__15dMenu_FmapMap_cFv */
void dMenu_FmapMap_c::draw() {
{ int unused; }
@@ -454,8 +401,6 @@ void dMenu_FmapMap_c::draw() {
renderingMap();
}
/* 801CF0B4-801CF12C 1C99F4 0078+00 1/0 0/0 0/0 .text
* rendering__15dMenu_FmapMap_cFPCQ211dDrawPath_c10line_class */
void dMenu_FmapMap_c::rendering(dDrawPath_c::line_class const* i_line) {
if (i_line->field_0x1 == 4) {
for (mLineNo = 0; mLineNo < 2; mLineNo++) {
@@ -466,8 +411,6 @@ void dMenu_FmapMap_c::rendering(dDrawPath_c::line_class const* i_line) {
}
}
/* 801CF12C-801CF1D4 1C9A6C 00A8+00 1/0 0/0 0/0 .text getLineWidth__15dMenu_FmapMap_cFi
*/
int dMenu_FmapMap_c::getLineWidth(int param_0) {
static u8 const l_lineWidthPatData[5] = {0, 6, 12, 0, 0};
static u8 const l_lineWidthPatData2[5] = {0, 0, 6, 0, 0};
@@ -492,12 +435,10 @@ int dMenu_FmapMap_c::getLineWidth(int param_0) {
}
}
/* 801CF1D4-801CF1E0 1C9B14 000C+00 1/0 0/0 0/0 .text isDrawType__15dMenu_FmapMap_cFi */
bool dMenu_FmapMap_c::isDrawType(int param_0) {
return (param_0 >> 6) & 1 ? false : true;
}
/* 801CF1E0-801CF208 1C9B20 0028+00 0/0 1/1 0/0 .text setFlashOn__15dMenu_FmapMap_cFiiPUci */
void dMenu_FmapMap_c::setFlashOn(int i_regionNo, int i_stageNo, u8* i_rooms, int i_roomCount) {
mLastFlash = mFlash;
mFlash = true;
@@ -507,8 +448,6 @@ void dMenu_FmapMap_c::setFlashOn(int i_regionNo, int i_stageNo, u8* i_rooms, int
mFlashRoomCount = i_roomCount;
}
/* 801CF208-801CF298 1C9B48 0090+00 1/0 0/0 0/0 .text getLineColor__15dMenu_FmapMap_cFii
*/
const GXColor* dMenu_FmapMap_c::getLineColor(int param_0, int param_1) {
static GXColor black = {0, 0, 0, 0};
static const GXColor borderColor0 = {0x64, 0, 0, 0};
@@ -529,14 +468,11 @@ const GXColor* dMenu_FmapMap_c::getLineColor(int param_0, int param_1) {
return color;
}
/* 801CF298-801CF2A0 1C9BD8 0008+00 1/0 0/0 0/0 .text getBackColor__15dMenu_FmapMap_cCFv
*/
const GXColor* dMenu_FmapMap_c::getBackColor() const {
static const GXColor l_mapBaseColor = {0, 0, 0, 0};
return &l_mapBaseColor;
}
/* 801CF2A0-801CF394 1C9BE0 00F4+00 1/0 0/0 0/0 .text getColor__15dMenu_FmapMap_cFi */
const GXColor* dMenu_FmapMap_c::getColor(int param_0) {
static const GXColor l_dungeon_onColor[9] = {
{0x04, 0, 0, 0},
@@ -590,7 +526,6 @@ const GXColor* dMenu_FmapMap_c::getColor(int param_0) {
return &list[param_0];
}
/* 801CF394-801CF450 1C9CD4 00BC+00 1/1 0/0 0/0 .text setTexture__15dMenu_FmapMap_cFUsUsUsUs */
void dMenu_FmapMap_c::setTexture(u16 i_width, u16 i_height, u16 param_2, u16 param_3) {
mMapImage_p = NULL;
mResTIMG = NULL;
@@ -601,8 +536,6 @@ void dMenu_FmapMap_c::setTexture(u16 i_width, u16 i_height, u16 param_2, u16 par
makeResTIMG(mResTIMG, i_width, i_height, mMapImage_p, (u8*)m_palette, 0x1b);
}
/* 801CF450-801CF4D0 1C9D90 0080+00 0/0 1/1 0/0 .text
* setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff */
void dMenu_FmapMap_c::setRendering(dMenu_Fmap_world_data_c* i_worldData, int i_startStageNo,
f32 i_posX, f32 i_posY, f32 i_scale, f32 i_zoomRate) {
mZoomRate = i_zoomRate;