mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-14 14:28: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_menu_fmap2D.cpp
-152
View File
@@ -1,8 +1,3 @@
//
// Generated By: dol2asm
// Translation Unit: d/d_menu_fmap2D
//
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/d_menu_fmap2D.h"
@@ -23,7 +18,6 @@
#include "m_Do/m_Do_graphic.h"
#include "d/actor/d_a_midna.h"
/* 801CF56C-801CFCDC 1C9EAC 0770+00 0/0 1/1 0/0 .text __ct__18dMenu_Fmap2DBack_cFv */
dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() {
dMeter2Info_setMapDrugFlag(0);
@@ -228,7 +222,6 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() {
setDebugData(NULL, NULL, 0);
}
/* 801CFCDC-801CFF34 1CA61C 0258+00 2/1 0/0 0/0 .text __dt__18dMenu_Fmap2DBack_cFv */
dMenu_Fmap2DBack_c::~dMenu_Fmap2DBack_c() {
delete mpBackScreen;
mpBackScreen = NULL;
@@ -271,7 +264,6 @@ dMenu_Fmap2DBack_c::~dMenu_Fmap2DBack_c() {
dMeter2Info_setMapDrugFlag(0);
}
/* 801CFF34-801D0804 1CA874 08D0+00 1/0 0/0 0/0 .text draw__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::draw() {
calcBlink();
@@ -433,8 +425,6 @@ void dMenu_Fmap2DBack_c::draw() {
mDoGph_gInf_c::getHeightF(), false, false, false);
}
/* 801D0804-801D0AC8 1CB144 02C4+00 0/0 1/1 0/0 .text
* setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff */
void dMenu_Fmap2DBack_c::setRegionTexData(u8 i_regionNo, ResTIMG* i_timg, f32 i_originX,
f32 i_originZ, f32 i_posX, f32 i_posZ, f32 i_scale,
f32 i_scrollMinX, f32 i_scrollMinZ, f32 i_scrollMaxX,
@@ -510,7 +500,6 @@ void dMenu_Fmap2DBack_c::setRegionTexData(u8 i_regionNo, ResTIMG* i_timg, f32 i_
}
}
/* 801D0AC8-801D0BF8 1CB408 0130+00 1/1 1/1 0/0 .text calcAllMapPos__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::calcAllMapPos() {
bool set = false;
calcAllMapScaleRate();
@@ -541,8 +530,6 @@ void dMenu_Fmap2DBack_c::calcAllMapPos() {
}
}
/* 801D0BF8-801D0C6C 1CB538 0074+00 1/1 0/0 0/0 .text calcAllMapScaleRate__18dMenu_Fmap2DBack_cFv
*/
f32 dMenu_Fmap2DBack_c::calcAllMapScaleRate() {
f32 width = mTexMaxX - mTexMinX;
f32 height = mTexMaxZ - mTexMinZ;
@@ -557,8 +544,6 @@ f32 dMenu_Fmap2DBack_c::calcAllMapScaleRate() {
return mAllMapScaleRate;
}
/* 801D0C6C-801D0D18 1CB5AC 00AC+00 1/1 0/0 0/0 .text
* calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf */
void dMenu_Fmap2DBack_c::calcAllMapPos2DFirst(f32 i_texPosX, f32 i_texPosZ, f32* o_posX,
f32* o_posY) {
f32 pos_x = (mAllMapScaleRate * (i_texPosX - (mTexMaxX + mTexMinX) * 0.5f));
@@ -568,15 +553,11 @@ void dMenu_Fmap2DBack_c::calcAllMapPos2DFirst(f32 i_texPosX, f32 i_texPosZ, f32*
*o_posY = pos_y + getMapAreaGlobalCenterPosY();
}
/* 801D0D18-801D0D50 1CB658 0038+00 13/13 1/1 0/0 .text
* calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf */
void dMenu_Fmap2DBack_c::calcAllMapPos2D(f32 param_0, f32 param_1, f32* o_posX, f32* o_posY) {
calcAllMapPos2D(param_0, param_1, o_posX, o_posY, field_0xf0c[mRegionCursor],
field_0xf2c[mRegionCursor], mZoom);
}
/* 801D0D50-801D0E00 1CB690 00B0+00 0/0 1/1 0/0 .text
* calcAllMapPos2D__18dMenu_Fmap2DBack_cFPCcffPfPf */
void dMenu_Fmap2DBack_c::calcAllMapPos2D(char const* param_0, f32 param_1, f32 param_2,
f32* o_posX, f32* o_posY) {
f32 tmp1, tmp2;
@@ -585,8 +566,6 @@ void dMenu_Fmap2DBack_c::calcAllMapPos2D(char const* param_0, f32 param_1, f32 p
field_0xf2c[mRegionCursor], mZoom);
}
/* 801D0E00-801D0F7C 1CB740 017C+00 3/3 0/0 0/0 .text
* calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff */
void dMenu_Fmap2DBack_c::calcAllMapPos2D(f32 param_0, f32 param_1, f32* param_2, f32* param_3,
f32 param_4, f32 param_5, f32 i_zoom) {
getMapAreaSizeX();
@@ -605,8 +584,6 @@ void dMenu_Fmap2DBack_c::calcAllMapPos2D(f32 param_0, f32 param_1, f32* param_2,
*param_3 = tmp5 + tmp4;
}
/* 801D0F7C-801D1094 1CB8BC 0118+00 8/8 3/3 0/0 .text
* calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf */
void dMenu_Fmap2DBack_c::calcAllMapPosWorld(f32 param_0, f32 param_1, f32* param_2, f32* param_3) {
f32 tmp1 = (mRegionTexData[mRegionCursor].mMinX + mRegionTexData[mRegionCursor].mMaxX) * 0.5f;
f32 tmp2 = (mRegionTexData[mRegionCursor].mMinZ + mRegionTexData[mRegionCursor].mMaxZ) * 0.5f;
@@ -621,8 +598,6 @@ void dMenu_Fmap2DBack_c::calcAllMapPosWorld(f32 param_0, f32 param_1, f32* param
*param_3 = tmp2 + (tmp4 * tmp5);
}
/* 801D1094-801D10F4 1CB9D4 0060+00 0/0 1/1 0/0 .text setSpotPane__18dMenu_Fmap2DBack_cFP7ResTIMG
*/
void dMenu_Fmap2DBack_c::setSpotPane(ResTIMG* i_timg) {
if (mpSpotTexture == NULL) {
mpSpotTexture = new J2DPicture(i_timg);
@@ -630,7 +605,6 @@ void dMenu_Fmap2DBack_c::setSpotPane(ResTIMG* i_timg) {
}
}
/* 801D10F4-801D1148 1CBA34 0054+00 1/1 1/1 0/0 .text deleteSpotPane__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::deleteSpotPane() {
if (mpSpotTexture != NULL) {
delete mpSpotTexture;
@@ -638,8 +612,6 @@ void dMenu_Fmap2DBack_c::deleteSpotPane() {
}
}
/* 801D1148-801D1478 1CBA88 0330+00 0/0 8/8 0/0 .text zoomMapCalc__18dMenu_Fmap2DBack_cFf
*/
void dMenu_Fmap2DBack_c::zoomMapCalc(f32 i_zoom) {
mMapZoomRate = i_zoom;
field_0xfa8 = i_zoom;
@@ -702,7 +674,6 @@ void dMenu_Fmap2DBack_c::zoomMapCalc(f32 i_zoom) {
getMapAreaSizeX());
}
/* 801D1478-801D1858 1CBDB8 03E0+00 0/0 10/10 0/0 .text zoomMapCalc2__18dMenu_Fmap2DBack_cFf */
void dMenu_Fmap2DBack_c::zoomMapCalc2(f32 param_0) {
f32 spotZoomRate = getSpotMapZoomRate();
f32 regionZoomRate = getRegionMapZoomRate(mRegionCursor);
@@ -782,7 +753,6 @@ void dMenu_Fmap2DBack_c::zoomMapCalc2(f32 param_0) {
}
}
/* 801D1858-801D1AA4 1CC198 024C+00 0/0 1/1 0/0 .text zoomMapCalcHIO__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::zoomMapCalcHIO() {
if (mZoom != getSpotMapZoomRate()) {
f32 spotZoomRate = getSpotMapZoomRate();
@@ -829,8 +799,6 @@ void dMenu_Fmap2DBack_c::zoomMapCalcHIO() {
}
}
/* 801D1AA4-801D1D50 1CC3E4 02AC+00 2/2 0/0 0/0 .text scrollCalc__18dMenu_Fmap2DBack_cFf
*/
void dMenu_Fmap2DBack_c::scrollCalc(f32 param_0) {
f32 tmp1, tmp2;
calcAllMapPos2D(mArrowPos3DX + control_xpos, mArrowPos3DZ + control_ypos, &tmp1, &tmp2,
@@ -892,8 +860,6 @@ void dMenu_Fmap2DBack_c::scrollCalc(f32 param_0) {
calcRenderingPos();
}
/* 801D1D50-801D1D74 1CC690 0024+00 0/0 1/1 0/0 .text mapBlink__18dMenu_Fmap2DBack_cFPs
*/
void dMenu_Fmap2DBack_c::mapBlink(s16* param_0) {
*param_0 += 1;
if (*param_0 >= 30) {
@@ -901,7 +867,6 @@ void dMenu_Fmap2DBack_c::mapBlink(s16* param_0) {
}
}
/* 801D1D74-801D1DC4 1CC6B4 0050+00 1/1 5/5 0/0 .text setSpotCursor__18dMenu_Fmap2DBack_cFUc */
void dMenu_Fmap2DBack_c::setSpotCursor(u8 param_0) {
this->mSpotCursor = param_0;
@@ -910,8 +875,6 @@ void dMenu_Fmap2DBack_c::setSpotCursor(u8 param_0) {
calcAllMapPos2D(tmp1, tmp2, &field_0x1184, &field_0x1188);
}
/* 801D1DC4-801D2100 1CC704 033C+00 0/0 1/1 0/0 .text
* allmap_move2__18dMenu_Fmap2DBack_cFP9STControl */
void dMenu_Fmap2DBack_c::allmap_move2(STControl* param_0) {
f32 tmp1, tmp2;
calcAllMapPosWorld(getMapScissorAreaLX(), getMapScissorAreaLY(), &tmp1, &tmp2);
@@ -986,8 +949,6 @@ void dMenu_Fmap2DBack_c::allmap_move2(STControl* param_0) {
}
}
/* 801D2100-801D241C 1CCA40 031C+00 1/1 3/3 0/0 .text setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb
*/
void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, f32 param_1, f32 param_2, f32 param_3, u8 param_4,
bool param_5) {
f32 local_68, local_6c;
@@ -1043,15 +1004,11 @@ void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, f32 param_1, f32 param_2, f32
}
}
/* 801D241C-801D2454 1CCD5C 0038+00 0/0 2/2 0/0 .text
* setIcon2DPos__18dMenu_Fmap2DBack_cFUcPCcfffUcb */
void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, char const* param_1, f32 param_2, f32 param_3,
f32 param_4, u8 param_5, bool param_6) {
setIcon2DPos(param_0, mRegionCursor, param_1, param_2, param_3, param_4, param_5, param_6);
}
/* 801D2454-801D2508 1CCD94 00B4+00 1/1 0/0 0/0 .text
* setIcon2DPos__18dMenu_Fmap2DBack_cFUcUcPCcfffUcb */
void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, u8 param_1, char const* param_2, f32 param_3,
f32 param_4, f32 param_5, u8 param_6, bool param_7) {
f32 tmp1, tmp2;
@@ -1060,7 +1017,6 @@ void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, u8 param_1, char const* param_
setIcon2DPos(param_0, param_3 + tmp1, param_4 + tmp2, param_5, param_6, param_7);
}
/* 801D2508-801D2658 1CCE48 0150+00 1/1 1/1 0/0 .text isShowRegion__18dMenu_Fmap2DBack_cFi */
int dMenu_Fmap2DBack_c::isShowRegion(int param_0) {
if (param_0 == 7) {
return 1;
@@ -1094,58 +1050,42 @@ int dMenu_Fmap2DBack_c::isShowRegion(int param_0) {
return 0;
}
/* 801D2658-801D2668 1CCF98 0010+00 2/2 0/0 0/0 .text getMapAreaGlobalPosX__18dMenu_Fmap2DBack_cFv
*/
f32 dMenu_Fmap2DBack_c::getMapAreaGlobalPosX() {
return g_fmapHIO.mMapTopLeftPosX;
}
/* 801D2668-801D2678 1CCFA8 0010+00 2/2 0/0 0/0 .text getMapAreaGlobalPosY__18dMenu_Fmap2DBack_cFv
*/
f32 dMenu_Fmap2DBack_c::getMapAreaGlobalPosY() {
return g_fmapHIO.mMapTopLeftPosY;
}
/* 801D2678-801D26C8 1CCFB8 0050+00 7/7 1/1 0/0 .text
* getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv */
f32 dMenu_Fmap2DBack_c::getMapAreaGlobalCenterPosX() {
return getMapAreaGlobalPosX() + (getMapAreaSizeX() / 2.0f);
}
/* 801D26C8-801D2718 1CD008 0050+00 7/7 1/1 0/0 .text
* getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv */
f32 dMenu_Fmap2DBack_c::getMapAreaGlobalCenterPosY() {
return getMapAreaGlobalPosY() + (getMapAreaSizeY() / 2.0f);
}
/* 801D2718-801D2728 1CD058 0010+00 8/8 0/0 0/0 .text getMapAreaSizeX__18dMenu_Fmap2DBack_cFv */
f32 dMenu_Fmap2DBack_c::getMapAreaSizeX() {
return g_fmapHIO.mMapScale;
}
/* 801D2728-801D2738 1CD068 0010+00 6/6 0/0 0/0 .text getMapAreaSizeY__18dMenu_Fmap2DBack_cFv */
f32 dMenu_Fmap2DBack_c::getMapAreaSizeY() {
return g_fmapHIO.mMapScale;
}
/* 801D2738-801D2790 1CD078 0058+00 10/10 0/0 0/0 .text
* getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv */
f32 dMenu_Fmap2DBack_c::getMapScissorAreaLX() {
Mtx mtx;
Vec vec = mpMapArea->getGlobalVtx(mpMapArea->getPanePtr(), &mtx, 0, false, 0);
return vec.x;
}
/* 801D2790-801D27E8 1CD0D0 0058+00 9/9 0/0 0/0 .text getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv
*/
f32 dMenu_Fmap2DBack_c::getMapScissorAreaLY() {
Mtx mtx;
Vec vec = mpMapArea->getGlobalVtx(mpMapArea->getPanePtr(), &mtx, 0, false, 0);
return vec.y;
}
/* 801D27E8-801D2860 1CD128 0078+00 2/2 0/0 0/0 .text
* getMapScissorAreaSizeX__18dMenu_Fmap2DBack_cFv */
f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeX() {
f32 scale = mpMapArea->getScaleX();
@@ -1158,26 +1098,18 @@ f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeX() {
return scale * mpMapArea->getSizeX();
}
/* 801D2860-801D2880 1CD1A0 0020+00 8/8 0/0 0/0 .text
* getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv */
f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeRealX() {
return getMapScissorAreaSizeX();
}
/* 801D2880-801D28D0 1CD1C0 0050+00 3/3 0/0 0/0 .text
* getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv */
f32 dMenu_Fmap2DBack_c::getMapScissorAreaCenterPosX() {
return getMapScissorAreaLX() + (getMapScissorAreaSizeRealX() / 2.0f);
}
/* 801D28D0-801D2920 1CD210 0050+00 3/3 0/0 0/0 .text
* getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv */
f32 dMenu_Fmap2DBack_c::getMapScissorAreaCenterPosY() {
return getMapScissorAreaLY() + (getMapScissorAreaSizeRealY() / 2.0f);
}
/* 801D2920-801D2998 1CD260 0078+00 2/2 0/0 0/0 .text
* getMapScissorAreaSizeY__18dMenu_Fmap2DBack_cFv */
f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeY() {
f32 scale = mpMapArea->getScaleY();
@@ -1190,13 +1122,10 @@ f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeY() {
return scale * mpMapArea->getSizeY();
}
/* 801D2998-801D29B8 1CD2D8 0020+00 11/11 0/0 0/0 .text
* getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv */
f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeRealY() {
return getMapScissorAreaSizeY();
}
/* 801D29B8-801D2A34 1CD2F8 007C+00 6/6 0/0 0/0 .text calcRenderingPos__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::calcRenderingPos() {
calcAllMapPosWorld(getMapScissorAreaCenterPosX(), getMapScissorAreaCenterPosY(), &mRenderingPosX,
&mRenderingPosZ);
@@ -1205,8 +1134,6 @@ void dMenu_Fmap2DBack_c::calcRenderingPos() {
mRenderingPosZ += mStageTransZ;
}
/* 801D2A34-801D2AC8 1CD374 0094+00 7/7 0/0 0/0 .text calcRenderingScale__18dMenu_Fmap2DBack_cFv
*/
void dMenu_Fmap2DBack_c::calcRenderingScale() {
f32 xScale = (mTexMaxX - mTexMinX) / getMapAreaSizeX();
f32 yScale = (mTexMaxZ - mTexMinZ) / getMapAreaSizeY();
@@ -1220,7 +1147,6 @@ void dMenu_Fmap2DBack_c::calcRenderingScale() {
field_0xf98 = mRenderingScale * getMapScissorAreaSizeRealY();
}
/* 801D2AC8-801D2B5C 1CD408 0094+00 1/1 0/0 0/0 .text getPathScale__18dMenu_Fmap2DBack_cFf */
f32 dMenu_Fmap2DBack_c::getPathScale(f32 i_zoom) {
JUT_ASSERT(2204, i_zoom != 0.0f);
@@ -1235,13 +1161,10 @@ f32 dMenu_Fmap2DBack_c::getPathScale(f32 i_zoom) {
return (scale * getMapScissorAreaSizeRealY()) / i_zoom;
}
/* 801D2B5C-801D2B64 1CD49C 0008+00 6/6 0/0 0/0 .text getAllMapZoomRate__18dMenu_Fmap2DBack_cFv */
f32 dMenu_Fmap2DBack_c::getAllMapZoomRate() {
return 1.0f;
}
/* 801D2B64-801D2C4C 1CD4A4 00E8+00 6/6 0/0 0/0 .text getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi
*/
f32 dMenu_Fmap2DBack_c::getRegionMapZoomRate(int i_regionNo) {
f32 tmp1, tmp2;
@@ -1265,8 +1188,6 @@ f32 dMenu_Fmap2DBack_c::getRegionMapZoomRate(int i_regionNo) {
return tmp2;
}
/* 801D2C4C-801D2C88 1CD58C 003C+00 4/4 0/0 0/0 .text getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv
*/
f32 dMenu_Fmap2DBack_c::getSpotMapZoomRate() {
f32 tmp1 = mTexMaxX - mTexMinX;
f32 tmp2 = mTexMaxZ - mTexMinZ;
@@ -1279,8 +1200,6 @@ f32 dMenu_Fmap2DBack_c::getSpotMapZoomRate() {
return tmp3 / g_fmapHIO.mRegionZoomRange;
}
/* 801D2C88-801D2CC8 1CD5C8 0040+00 1/1 0/0 0/0 .text
* getStageOriginPath__18dMenu_Fmap2DBack_cFUcPfPf */
void dMenu_Fmap2DBack_c::getStageOriginPath(u8 param_0, f32* param_1, f32* param_2) {
for (int i = 0; i < 20; i++) {
if (i == param_0) {
@@ -1291,8 +1210,6 @@ void dMenu_Fmap2DBack_c::getStageOriginPath(u8 param_0, f32* param_1, f32* param
}
}
/* 801D2CC8-801D2DA8 1CD608 00E0+00 4/4 0/0 0/0 .text calcOffset__18dMenu_Fmap2DBack_cFUcPCcPfPf
*/
void dMenu_Fmap2DBack_c::calcOffset(u8 i_regionNo, char const* i_stageName,
f32* o_offsetX, f32* o_offsetZ) {
if (mpStages != NULL) {
@@ -1310,7 +1227,6 @@ void dMenu_Fmap2DBack_c::calcOffset(u8 i_regionNo, char const* i_stageName,
*o_offsetZ = mRegionOriginZ[i_regionNo];
}
/* 801D2DA8-801D3094 1CD6E8 02EC+00 1/1 0/0 0/0 .text regionTextureDraw__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::regionTextureDraw() {
f32 local_84, local_88;
calcAllMapPosWorld(getMapScissorAreaCenterPosX(), getMapScissorAreaCenterPosY(), &local_84,
@@ -1372,7 +1288,6 @@ void dMenu_Fmap2DBack_c::regionTextureDraw() {
}
}
/* 801D3094-801D31D0 1CD9D4 013C+00 1/1 0/0 0/0 .text stageTextureDraw__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::stageTextureDraw() {
if (mAllPathShowFlag) {
mpSpotTexture->setAlpha(mAlphaRate * 255.0f * mSpotTextureFadeAlpha);
@@ -1386,7 +1301,6 @@ void dMenu_Fmap2DBack_c::stageTextureDraw() {
false);
}
/* 801D31D0-801D34DC 1CDB10 030C+00 1/1 0/0 0/0 .text worldGridDraw__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::worldGridDraw() {
f32 local_74, local_78;
@@ -1456,7 +1370,6 @@ void dMenu_Fmap2DBack_c::worldGridDraw() {
}
}
/* 801D34DC-801D382C 1CDE1C 0350+00 1/1 0/0 0/0 .text regionGridDraw__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::regionGridDraw() {
f32 local_74, local_78;
@@ -1531,7 +1444,6 @@ static f32 dummy(int param_0) {
return param_0;
}
/* 801D382C-801D38FC 1CE16C 00D0+00 1/1 0/0 0/0 .text worldOriginDraw__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::worldOriginDraw() {
f32 local_44, local_48;
calcAllMapPos2D(-mStageTransX, -mStageTransZ, &local_44, &local_48);
@@ -1547,7 +1459,6 @@ void dMenu_Fmap2DBack_c::worldOriginDraw() {
JUtility::TColor(0, 255, 0, 255), 6);
}
/* 801D38FC-801D3AF8 1CE23C 01FC+00 1/1 0/0 0/0 .text scrollAreaDraw__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::scrollAreaDraw() {
for (int i = 0; i < 8; i++) {
if (mMapZoomRate != 0.0f && i != mRegionCursor) {
@@ -1582,7 +1493,6 @@ void dMenu_Fmap2DBack_c::scrollAreaDraw() {
}
}
/* 801D3AF8-801D3BBC 1CE438 00C4+00 1/1 0/0 0/0 .text regionOriginDraw__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::regionOriginDraw() {
for (int i = 0; i < 8; i++) {
if (!mpAreaTex[i]) {
@@ -1596,7 +1506,6 @@ void dMenu_Fmap2DBack_c::regionOriginDraw() {
}
}
/* 801D3BBC-801D3CB8 1CE4FC 00FC+00 1/1 0/0 0/0 .text stageOriginDraw__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::stageOriginDraw() {
if (!mpStages) {
return;
@@ -1618,8 +1527,6 @@ void dMenu_Fmap2DBack_c::stageOriginDraw() {
}
}
/* 801D3CB8-801D4928 1CE5F8 0C70+00 1/1 0/0 0/0 .text calcBlink__18dMenu_Fmap2DBack_cFv
*/
void dMenu_Fmap2DBack_c::calcBlink() {
f32 t;
int i;
@@ -1782,7 +1689,6 @@ void dMenu_Fmap2DBack_c::calcBlink() {
field_0x1214 = unselected_min + t_unselected * (unselected_max - unselected_min);
}
/* 801D4928-801D49E0 1CF268 00B8+00 0/0 1/1 0/0 .text calcBackAlpha__18dMenu_Fmap2DBack_cFb */
void dMenu_Fmap2DBack_c::calcBackAlpha(bool param_0) {
if (param_0) {
if (mBackAlpha != 1.0f) {
@@ -1801,7 +1707,6 @@ void dMenu_Fmap2DBack_c::calcBackAlpha(bool param_0) {
}
}
/* 801D49E0-801D4AFC 1CF320 011C+00 0/0 1/1 0/0 .text btkAnimeLoop__18dMenu_Fmap2DBack_cFf */
void dMenu_Fmap2DBack_c::btkAnimeLoop(f32 i_step) {
if (mpBaseAnm) {
mAnmFrame += i_step;
@@ -1818,13 +1723,10 @@ void dMenu_Fmap2DBack_c::btkAnimeLoop(f32 i_step) {
mpBaseScreen->animation();
}
/* 801D4AFC-801D4B2C 1CF43C 0030+00 0/0 1/1 0/0 .text setBaseBackAlpha__18dMenu_Fmap2DBack_cFUc */
void dMenu_Fmap2DBack_c::setBaseBackAlpha(u8 param_0) {
mpMapBlack->setAlpha(param_0);
}
/* 801D4B2C-801D4E80 1CF46C 0354+00 0/0 3/3 0/0 .text
* regionMapMove__18dMenu_Fmap2DBack_cFP9STControl */
void dMenu_Fmap2DBack_c::regionMapMove(STControl* i_stick) {
f32 min_x, min_y, max_x, max_y;
calcAllMapPosWorld(getMapScissorAreaLX(), getMapScissorAreaLY(), &min_x, &min_y);
@@ -1887,8 +1789,6 @@ void dMenu_Fmap2DBack_c::regionMapMove(STControl* i_stick) {
}
}
/* 801D4E80-801D5334 1CF7C0 04B4+00 0/0 1/1 0/0 .text
* stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb */
void dMenu_Fmap2DBack_c::stageMapMove(STControl* i_stick, u8 param_1, bool param_2) {
f32 min_x, min_y, max_x, max_y, center_x, center_y;
@@ -1979,7 +1879,6 @@ void dMenu_Fmap2DBack_c::stageMapMove(STControl* i_stick, u8 param_1, bool param
mpMeterHaihai->_execute(0);
}
/* 801D5334-801D5388 1CFC74 0054+00 0/0 2/2 0/0 .text setAllAlphaRate__18dMenu_Fmap2DBack_cFfb */
void dMenu_Fmap2DBack_c::setAllAlphaRate(f32 i_rate, bool i_init) {
mAlphaRate = i_rate;
if (i_init) {
@@ -1988,8 +1887,6 @@ void dMenu_Fmap2DBack_c::setAllAlphaRate(f32 i_rate, bool i_init) {
mpBaseRoot->setAlphaMorfRate(i_rate);
}
/* 801D5388-801D564C 1CFCC8 02C4+00 1/1 0/0 0/0 .text drawDebugStageArea__18dMenu_Fmap2DBack_cFv
*/
void dMenu_Fmap2DBack_c::drawDebugStageArea() {
JUtility::TColor colors[6] = {
JUtility::TColor(255, 255, 0, 50),
@@ -2018,8 +1915,6 @@ void dMenu_Fmap2DBack_c::drawDebugStageArea() {
}
}
/* 801D564C-801D58F8 1CFF8C 02AC+00 1/1 0/0 0/0 .text drawDebugRegionArea__18dMenu_Fmap2DBack_cFv
*/
void dMenu_Fmap2DBack_c::drawDebugRegionArea() {
getAllMapZoomRate();
@@ -2055,8 +1950,6 @@ void dMenu_Fmap2DBack_c::drawDebugRegionArea() {
}
}
/* 801D58F8-801D59C0 1D0238 00C8+00 0/0 2/2 0/0 .text setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff
*/
void dMenu_Fmap2DBack_c::setArrowPos3D(u8 i_regionNo, char const* i_stageName, f32 i_posX,
f32 i_posZ) {
f32 offset_x = 0.0f;
@@ -2075,8 +1968,6 @@ void dMenu_Fmap2DBack_c::setArrowPos3D(u8 i_regionNo, char const* i_stageName, f
control_ypos = 0.0f;
}
/* 801D59C0-801D5AC4 1D0300 0104+00 0/0 1/1 0/0 .text
* setArrowPos3DOffset__18dMenu_Fmap2DBack_cFUcPCcfff */
void dMenu_Fmap2DBack_c::setArrowPos3DOffset(u8 i_regionNo, char const* i_stageName, f32 i_posX,
f32 i_posZ, f32 param_4) {
f32 offset_x, offset_z, pos2d_x, pos2d_y;
@@ -2098,7 +1989,6 @@ void dMenu_Fmap2DBack_c::setArrowPos3DOffset(u8 i_regionNo, char const* i_stageN
control_ypos = 0.0f;
}
/* 801D5AC4-801D5BB8 1D0404 00F4+00 0/0 2/2 0/0 .text calcDrawPriority__18dMenu_Fmap2DBack_cFv */
void dMenu_Fmap2DBack_c::calcDrawPriority() {
u8 region;
u8 dVar2 = mRegionCursor;
@@ -2147,7 +2037,6 @@ void dMenu_Fmap2DBack_c::calcDrawPriority() {
}
}
/* 801D5BB8-801D5BD0 1D04F8 0018+00 0/0 3/3 0/0 .text setArrowPosAxis__18dMenu_Fmap2DBack_cFff */
void dMenu_Fmap2DBack_c::setArrowPosAxis(f32 i_posX, f32 i_posZ) {
mArrowPos3DX = i_posX;
mArrowPos3DZ = i_posZ;
@@ -2155,8 +2044,6 @@ void dMenu_Fmap2DBack_c::setArrowPosAxis(f32 i_posX, f32 i_posZ) {
control_ypos = 0.0f;
}
/* 801D5BD0-801D6700 1D0510 0B30+00 0/0 1/1 0/0 .text
* __ct__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl */
dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
mpHeap = i_heap;
mTransX = 0.0f;
@@ -2347,7 +2234,6 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
setHIO(true);
}
/* 801D6700-801D6A44 1D1040 0344+00 1/0 0/0 0/0 .text __dt__17dMenu_Fmap2DTop_cFv */
dMenu_Fmap2DTop_c::~dMenu_Fmap2DTop_c() {
deleteExplain();
delete mpTitleScreen;
@@ -2399,7 +2285,6 @@ dMenu_Fmap2DTop_c::~dMenu_Fmap2DTop_c() {
mpAnm = NULL;
}
/* 801D6A44-801D6C44 1D1384 0200+00 0/0 1/1 0/0 .text _execute__17dMenu_Fmap2DTop_cFv */
void dMenu_Fmap2DTop_c::_execute() {
switch (mAlphaButtonA) {
case ALPHA_MIN:
@@ -2474,7 +2359,6 @@ void dMenu_Fmap2DTop_c::_execute() {
setHIO(false);
}
/* 801D6C44-801D6C98 1D1584 0054+00 0/0 2/2 0/0 .text setAllAlphaRate__17dMenu_Fmap2DTop_cFfb */
void dMenu_Fmap2DTop_c::setAllAlphaRate(f32 i_rate, bool i_init) {
mAlphaRate = i_rate;
if (i_init) {
@@ -2483,7 +2367,6 @@ void dMenu_Fmap2DTop_c::setAllAlphaRate(f32 i_rate, bool i_init) {
mpTitleRoot->setAlphaMorfRate(i_rate);
}
/* 801D6C98-801D6DF8 1D15D8 0160+00 1/0 0/0 0/0 .text draw__17dMenu_Fmap2DTop_cFv */
void dMenu_Fmap2DTop_c::draw() {
u32 scissor_left, scissor_top, scissor_width, scissor_height;
J2DOrthoGraph* ctx = static_cast<J2DOrthoGraph*>(dComIfGp_getCurrentGrafPort());
@@ -2499,8 +2382,6 @@ void dMenu_Fmap2DTop_c::draw() {
}
}
/* 801D6DF8-801D6EDC 1D1738 00E4+00 0/0 1/1 0/0 .text
* btkAnimeLoop__17dMenu_Fmap2DTop_cFP19J2DAnmTextureSRTKeyf */
void dMenu_Fmap2DTop_c::btkAnimeLoop(J2DAnmTextureSRTKey* i_anm, f32 i_delta) {
if (i_anm) {
mAnmFrame += i_delta;
@@ -2516,13 +2397,10 @@ void dMenu_Fmap2DTop_c::btkAnimeLoop(J2DAnmTextureSRTKey* i_anm, f32 i_delta) {
mpTitleScreen->animation();
}
/* 801D6EDC-801D6F38 1D181C 005C+00 0/0 1/1 0/0 .text setMoyaAlpha__17dMenu_Fmap2DTop_cFUc */
void dMenu_Fmap2DTop_c::setMoyaAlpha(u8 i_alpha) {
mpTitleScreen->search('spot_0')->setAlpha(i_alpha);
}
/* 801D6F38-801D7010 1D1878 00D8+00 1/1 1/1 0/0 .text setTitleNameString__17dMenu_Fmap2DTop_cFUl
*/
void dMenu_Fmap2DTop_c::setTitleNameString(u32 param_0) {
#if VERSION == VERSION_GCN_JPN
static const u64 sfont_name[7] = {
@@ -2546,7 +2424,6 @@ void dMenu_Fmap2DTop_c::setTitleNameString(u32 param_0) {
}
}
/* 801D7010-801D70E8 1D1950 00D8+00 0/0 2/2 0/0 .text setAreaNameString__17dMenu_Fmap2DTop_cFUl */
void dMenu_Fmap2DTop_c::setAreaNameString(u32 param_0) {
#if VERSION == VERSION_GCN_JPN
static const u64 iarea_name[3] = {'i_name_s', 'i_name', 'i_name1'};
@@ -2566,8 +2443,6 @@ void dMenu_Fmap2DTop_c::setAreaNameString(u32 param_0) {
}
}
/* 801D70E8-801D7210 1D1A28 0128+00 1/1 12/12 0/0 .text setZButtonString__17dMenu_Fmap2DTop_cFUlUc
*/
void dMenu_Fmap2DTop_c::setZButtonString(u32 param_0, u8 i_alpha) {
if (param_0 == 0x529 && ((daMidna_c*)daPy_py_c::getMidnaActor())->checkPortalObjRide()) {
param_0 = 0x533;
@@ -2600,8 +2475,6 @@ void dMenu_Fmap2DTop_c::setZButtonString(u32 param_0, u8 i_alpha) {
}
}
/* 801D7210-801D72D4 1D1B50 00C4+00 1/1 9/9 0/0 .text setBButtonString__17dMenu_Fmap2DTop_cFUlUc
*/
void dMenu_Fmap2DTop_c::setBButtonString(u32 param_0, u8 i_alpha) {
#if VERSION == VERSION_GCN_JPN
static const u64 cont_bt[5] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt'};
@@ -2626,8 +2499,6 @@ void dMenu_Fmap2DTop_c::setBButtonString(u32 param_0, u8 i_alpha) {
}
}
/* 801D72D4-801D7398 1D1C14 00C4+00 1/1 14/14 0/0 .text setAButtonString__17dMenu_Fmap2DTop_cFUlUc
*/
void dMenu_Fmap2DTop_c::setAButtonString(u32 param_0, u8 i_alpha) {
#if VERSION == VERSION_GCN_JPN
static const u64 cont_at[5] = {'cont_at', 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4'};
@@ -2652,7 +2523,6 @@ void dMenu_Fmap2DTop_c::setAButtonString(u32 param_0, u8 i_alpha) {
}
}
/* 801D7398-801D74EC 1D1CD8 0154+00 1/1 8/8 0/0 .text setCrossLRString__17dMenu_Fmap2DTop_cFUl */
void dMenu_Fmap2DTop_c::setCrossLRString(u32 param_0) {
#if VERSION == VERSION_GCN_JPN
static const u64 juji_c[5] = {'juji_c00', 'juji_c01', 'juji_c02', 'juji_c03', 'juji_c04'};
@@ -2676,8 +2546,6 @@ void dMenu_Fmap2DTop_c::setCrossLRString(u32 param_0) {
}
}
/* 801D74EC-801D7640 1D1E2C 0154+00 1/1 10/10 0/0 .text set3DStickString__17dMenu_Fmap2DTop_cFUl
*/
void dMenu_Fmap2DTop_c::set3DStickString(u32 param_0) {
#if VERSION == VERSION_GCN_JPN
static const u64 ast_c[5] = {'ast_00', 'ast_01', 'ast_02', 'ast_03', 'ast_04'};
@@ -2701,8 +2569,6 @@ void dMenu_Fmap2DTop_c::set3DStickString(u32 param_0) {
}
}
/* 801D7640-801D76C0 1D1F80 0080+00 0/0 5/5 0/0 .text
* createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl */
void dMenu_Fmap2DTop_c::createExplain(JKRExpHeap* i_heap, STControl* i_stick) {
if (!mpScrnExplain) {
JKRHeap* heap = mDoExt_setCurrentHeap(i_heap);
@@ -2711,7 +2577,6 @@ void dMenu_Fmap2DTop_c::createExplain(JKRExpHeap* i_heap, STControl* i_stick) {
}
}
/* 801D76C0-801D7714 1D2000 0054+00 1/1 2/2 0/0 .text deleteExplain__17dMenu_Fmap2DTop_cFv */
void dMenu_Fmap2DTop_c::deleteExplain() {
if (mpScrnExplain) {
delete mpScrnExplain;
@@ -2719,8 +2584,6 @@ void dMenu_Fmap2DTop_c::deleteExplain() {
}
}
/* 801D7714-801D77C4 1D2054 00B0+00 0/0 12/12 0/0 .text
* setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf */
void dMenu_Fmap2DTop_c::setArrowAlphaRatio(u8 i_mask, f32 i_rate) {
if (i_mask & ARROW_LEFT) {
for (int i = 0; i < 2; i++) {
@@ -2739,8 +2602,6 @@ void dMenu_Fmap2DTop_c::setArrowAlphaRatio(u8 i_mask, f32 i_rate) {
}
}
/* 801D77C4-801D7858 1D2104 0094+00 1/1 0/0 0/0 .text
* setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha */
void dMenu_Fmap2DTop_c::setAlphaAnimeMin(CPaneMgrAlpha* i_pane) {
s16 timer = i_pane->getAlphaTimer();
if (timer > 0 || i_pane->getAlphaRate() != 0.0f) {
@@ -2753,8 +2614,6 @@ void dMenu_Fmap2DTop_c::setAlphaAnimeMin(CPaneMgrAlpha* i_pane) {
}
}
/* 801D7858-801D78FC 1D2198 00A4+00 1/1 0/0 0/0 .text
* setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha */
void dMenu_Fmap2DTop_c::setAlphaAnimeMid(CPaneMgrAlpha* i_pane) {
s16 timer = i_pane->getAlphaTimer();
if (timer != 3 || i_pane->getAlphaRate() != 0.25f) {
@@ -2768,8 +2627,6 @@ void dMenu_Fmap2DTop_c::setAlphaAnimeMid(CPaneMgrAlpha* i_pane) {
}
}
/* 801D78FC-801D7994 1D223C 0098+00 1/1 0/0 0/0 .text
* setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha */
void dMenu_Fmap2DTop_c::setAlphaAnimeMax(CPaneMgrAlpha* i_pane) {
s16 timer = i_pane->getAlphaTimer();
if (timer < 5 || i_pane->getAlphaRate() != 1.0f) {
@@ -2782,8 +2639,6 @@ void dMenu_Fmap2DTop_c::setAlphaAnimeMax(CPaneMgrAlpha* i_pane) {
}
}
/* 801D7994-801D7A08 1D22D4 0074+00 1/1 3/3 0/0 .text checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv
*/
bool dMenu_Fmap2DTop_c::checkPlayerWarpAccept() {
bool ret;
if (!checkWarpAcceptCannon()) {
@@ -2796,8 +2651,6 @@ bool dMenu_Fmap2DTop_c::checkPlayerWarpAccept() {
return ret;
}
/* 801D7A08-801D7AB4 1D2348 00AC+00 1/1 0/0 0/0 .text checkWarpAcceptRegion__17dMenu_Fmap2DTop_cFi
*/
bool dMenu_Fmap2DTop_c::checkWarpAcceptRegion(int i_region) {
if (g_fmapHIO.mAllRegionsUnlocked) {
return true;
@@ -2818,8 +2671,6 @@ bool dMenu_Fmap2DTop_c::checkWarpAcceptRegion(int i_region) {
return false;
}
/* 801D7AB4-801D7B58 1D23F4 00A4+00 1/1 3/3 0/0 .text
* checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv */
bool dMenu_Fmap2DTop_c::checkWarpAcceptRegion4() {
if (dComIfGp_getNowLevel() == 4 && !checkWarpAcceptRegion(3)) {
return false;
@@ -2836,7 +2687,6 @@ bool dMenu_Fmap2DTop_c::checkWarpAcceptRegion4() {
return true;
}
/* 801D7B58-801D7BCC 1D2498 0074+00 1/1 3/3 0/0 .text checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv */
bool dMenu_Fmap2DTop_c::checkWarpAcceptCannon() {
/* dSv_event_flag_c::F_0786 - Kakariko Village - Forced conversation with Shad when he sees the sky cannon */
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[786])
@@ -2849,7 +2699,6 @@ bool dMenu_Fmap2DTop_c::checkWarpAcceptCannon() {
return true;
}
/* 801D7BCC-801D8088 1D250C 04BC+00 2/2 0/0 0/0 .text setHIO__17dMenu_Fmap2DTop_cFb */
void dMenu_Fmap2DTop_c::setHIO(bool param_0) {
if (mTitlePosX != g_fmapHIO.mTitlePosX || mTitlePosY != g_fmapHIO.mTitlePosY) {
mTitlePosX = g_fmapHIO.mTitlePosX;
@@ -2928,7 +2777,6 @@ void dMenu_Fmap2DTop_c::setHIO(bool param_0) {
}
}
/* 801D8088-801D810C 1D29C8 0084+00 1/1 3/3 0/0 .text isWarpAccept__17dMenu_Fmap2DTop_cFv */
bool dMenu_Fmap2DTop_c::isWarpAccept() {
/* dSv_event_flag_c::M_021 - Main Event - First portal warp */
if ((dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[54])