mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-04 10:26:16 -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_path_fmap.cpp
-43
View File
@@ -1,15 +1,8 @@
//
// Generated By: dol2asm
// Translation Unit: d/d_map_path_fmap
//
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/d_com_inf_game.h"
#include "d/d_map_path_fmap.h"
/* 8003D790-8003D818 0380D0 0088+00 1/1 0/0 0/0 .text
* addTypeGroupData__26fmpTresTypeGroupDataList_cFUcPCQ27dTres_c6data_s */
void fmpTresTypeGroupDataList_c::addTypeGroupData(u8 i_typeGroupNo,
dTres_c::data_s const* i_tresData) {
fmpTresTypeGroupData_c* next = mpNextData;
@@ -30,14 +23,11 @@ void fmpTresTypeGroupDataList_c::addTypeGroupData(u8 i_typeGroupNo,
mpNextData = fmpTresTypeGroupData_p;
}
/* 8003D818-8003D868 038158 0050+00 1/1 1/1 0/0 .text isArrival__22dMenu_Fmap_room_data_cFv */
bool dMenu_Fmap_room_data_c::isArrival() {
u8 table_no = mp_parentStage->getStageArc()->mVisitedRoomSaveTableNo;
return dComIfGs_isSaveVisitedRoom(table_no, m_roomNo) != false;
}
/* 8003D868-8003D92C 0381A8 00C4+00 1/1 0/0 0/0 .text
* buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii */
void dMenu_Fmap_room_data_c::buildTresTypeGroup(int i_stageNo, int i_roomIndex, int i_roomNo) {
dTres_c::list_class* tresure_p = mp_fmapData->getTresure();
if (tresure_p != NULL) {
@@ -57,8 +47,6 @@ void dMenu_Fmap_room_data_c::buildTresTypeGroup(int i_stageNo, int i_roomIndex,
}
}
/* 8003D92C-8003D95C 03826C 0030+00 1/1 0/0 0/0 .text
* buildFmapRoomData__22dMenu_Fmap_room_data_cFiiffff */
void dMenu_Fmap_room_data_c::buildFmapRoomData(int i_stageNo, int i_index, f32 i_regionOffsetX,
f32 i_regionOffsetZ, f32 i_stageOffsetX,
f32 i_stageOffsetZ) {
@@ -69,7 +57,6 @@ void dMenu_Fmap_room_data_c::buildFmapRoomData(int i_stageNo, int i_index, f32 i
}
}
/* 8003D95C-8003D9D8 03829C 007C+00 1/1 0/0 0/0 .text isArrival__23dMenu_Fmap_stage_data_cFv */
bool dMenu_Fmap_stage_data_c::isArrival() {
bool is_arrival = false;
dMenu_Fmap_room_data_c* room = mp_roomTop;
@@ -82,8 +69,6 @@ bool dMenu_Fmap_stage_data_c::isArrival() {
return is_arrival;
}
/* 8003D9D8-8003DB48 038318 0170+00 1/1 0/0 0/0 .text
* buildFmapStageData__23dMenu_Fmap_stage_data_cFiff */
int dMenu_Fmap_stage_data_c::buildFmapStageData(int i_stageNo, f32 i_regionOffsetX,
f32 i_regionOffsetZ) {
dMenu_Fmap_room_data_c* room = mp_roomTop;
@@ -133,8 +118,6 @@ int dMenu_Fmap_stage_data_c::buildFmapStageData(int i_stageNo, f32 i_regionOffse
return room_no;
}
/* 8003DB48-8003DB70 038488 0028+00 0/0 1/1 0/0 .text
* getMenuFmapStageData__24dMenu_Fmap_region_data_cFi */
dMenu_Fmap_stage_data_c* dMenu_Fmap_region_data_c::getMenuFmapStageData(int param_0) {
dMenu_Fmap_stage_data_c* stage = mpMenuFmapStageDataTop;
for (int i = 0; stage != NULL && i < param_0; i++) {
@@ -144,8 +127,6 @@ dMenu_Fmap_stage_data_c* dMenu_Fmap_region_data_c::getMenuFmapStageData(int para
return stage;
}
/* 8003DB70-8003DEE0 0384B0 0370+00 0/0 1/1 0/0 .text
* getPointStagePathInnerNo__24dMenu_Fmap_region_data_cFffiPiPi */
int dMenu_Fmap_region_data_c::getPointStagePathInnerNo(f32 i_pointX, f32 i_pointZ, int i_stageNo,
int* o_stageNo, int* o_roomNo) {
int line_num, group_num, floor_num;
@@ -261,8 +242,6 @@ int dMenu_Fmap_region_data_c::getPointStagePathInnerNo(f32 i_pointX, f32 i_point
return 1;
}
/* 8003DEE0-8003E028 038820 0148+00 0/0 1/1 0/0 .text
* buildFmapRegionData__24dMenu_Fmap_region_data_cFi */
int dMenu_Fmap_region_data_c::buildFmapRegionData(int param_0) {
f32 region_min_x = FLT_MAX;
f32 region_min_z = FLT_MAX;
@@ -308,15 +287,11 @@ int dMenu_Fmap_region_data_c::buildFmapRegionData(int param_0) {
return stage_no;
}
/* 8003E028-8003E04C 038968 0024+00 0/0 1/1 0/0 .text
* create__23dMenu_Fmap_world_data_cFP24dMenu_Fmap_region_data_c */
void dMenu_Fmap_world_data_c::create(dMenu_Fmap_region_data_c* i_regionData) {
mp_fmapRegionData = i_regionData;
buildFmapWorldData();
}
/* 8003E04C-8003E114 03898C 00C8+00 1/1 0/0 0/0 .text
* buildFmapWorldData__23dMenu_Fmap_world_data_cFv */
int dMenu_Fmap_world_data_c::buildFmapWorldData() {
f32 min_x = FLT_MAX;
f32 min_z = FLT_MAX;
@@ -361,8 +336,6 @@ int dMenu_Fmap_world_data_c::buildFmapWorldData() {
return region_no;
}
/* 8003E114-8003E1C0 038A54 00AC+00 0/0 3/3 0/0 .text
* init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii */
bool dMenuFmapIconPointer_c::init(dMenu_Fmap_region_data_c* i_regionData,
dMenu_Fmap_stage_data_c* i_stageData, u8 i_typeGroupNo,
int i_stayStageNo, int i_stayRoomNo) {
@@ -383,7 +356,6 @@ bool dMenuFmapIconPointer_c::init(dMenu_Fmap_region_data_c* i_regionData,
return true;
}
/* 8003E1C0-8003E2BC 038B00 00FC+00 2/2 0/0 0/0 .text getFirstData__22dMenuFmapIconPointer_cFv */
bool dMenuFmapIconPointer_c::getFirstData() {
bool ret = false;
if (!strcmp(mpStageData->getStageName(), dComIfGp_getStartStageName())) {
@@ -415,8 +387,6 @@ bool dMenuFmapIconPointer_c::getFirstData() {
return ret;
}
/* 8003E2BC-8003E350 038BFC 0094+00 1/1 0/0 0/0 .text getData__22dMenuFmapIconPointer_cFv
*/
bool dMenuFmapIconPointer_c::getData() {
bool ret = false;
if (!strcmp(mpStageData->getStageName(), dComIfGp_getStartStageName())) {
@@ -434,15 +404,11 @@ bool dMenuFmapIconPointer_c::getData() {
return ret;
}
/* 8003E350-8003E37C 038C90 002C+00 2/2 0/0 0/0 .text getFirstRoomData__22dMenuFmapIconPointer_cFv
*/
void dMenuFmapIconPointer_c::getFirstRoomData() {
mpRoomData = mpStageData->getFmapRoomDataTop();
getFirstData();
}
/* 8003E37C-8003E3A4 038CBC 0028+00 1/1 0/0 0/0 .text getNextRoomData__22dMenuFmapIconPointer_cFv
*/
bool dMenuFmapIconPointer_c::getNextRoomData() {
bool ret = false;
mpRoomData = mpRoomData->getNextData();
@@ -452,8 +418,6 @@ bool dMenuFmapIconPointer_c::getNextRoomData() {
return ret;
}
/* 8003E3A4-8003E3D8 038CE4 0034+00 1/1 0/0 0/0 .text getNextStageData__22dMenuFmapIconPointer_cFv
*/
bool dMenuFmapIconPointer_c::getNextStageData() {
bool ret = false;
mStageNo++;
@@ -464,7 +428,6 @@ bool dMenuFmapIconPointer_c::getNextStageData() {
return ret;
}
/* 8003E3D8-8003E490 038D18 00B8+00 1/1 0/0 0/0 .text getNextData__22dMenuFmapIconPointer_cFv */
bool dMenuFmapIconPointer_c::getNextData() {
bool ret = true;
if (!strcmp(mpStageData->getStageName(), dComIfGp_getStartStageName())) {
@@ -489,7 +452,6 @@ bool dMenuFmapIconPointer_c::getNextData() {
return ret;
}
/* 8003E490-8003E510 038DD0 0080+00 1/1 3/3 0/0 .text nextData__22dMenuFmapIconPointer_cFv */
bool dMenuFmapIconPointer_c::nextData() {
bool ret = false;
if (getNextData()) {
@@ -506,7 +468,6 @@ bool dMenuFmapIconPointer_c::nextData() {
return ret;
}
/* 8003E510-8003E578 038E50 0068+00 0/0 3/3 0/0 .text getValidData__22dMenuFmapIconPointer_cFv */
bool dMenuFmapIconPointer_c::getValidData() {
bool iVar1, iVar2 = false;
do {
@@ -518,8 +479,6 @@ bool dMenuFmapIconPointer_c::getValidData() {
return iVar2;
}
/* 8003E578-8003E6E8 038EB8 0170+00 0/0 3/3 0/0 .text
* getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s */
bool dMenuFmapIconDisp_c::getPosition(int* o_stageNo, int* o_roomNo, f32* o_posX, f32* o_posZ,
dTres_c::data_s const** o_tresData) {
f32 offset_x = mpRegionData->getRegionOffsetX() + mpStageData->getOffsetX();
@@ -567,8 +526,6 @@ bool dMenuFmapIconDisp_c::getPosition(int* o_stageNo, int* o_roomNo, f32* o_posX
return false;
}
/* 8003E6E8-8003EB10 039028 0428+00 2/0 3/3 0/0 .text isDrawDisp__19dMenuFmapIconDisp_cFv
*/
bool dMenuFmapIconDisp_c::isDrawDisp() {
dMenu_Fmap_stage_arc_data_c* stage_arc = mpStageData->getStageArc();
if (stage_arc == NULL) {