mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-28 15:07:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

re-generate with bug fixes

Browse Source
This commit is contained in:
Julgodis
2021-03-30 01:58:08 +02:00
parent b27bb6b262
commit 2404fb33c7
3631 changed files with 20347 additions and 42325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/map/d_map.cpp
+13 -39
View File
@@ -31,6 +31,8 @@ struct renderingPlusDoorAndCursor_c {
/* 80040ADC */ void getIconPosition(dTres_c::typeGroupData_c*) const;
};
struct Vec {};
struct dDrawPath_c {
struct room_class {};
@@ -49,8 +51,6 @@ struct dDrawPath_c {
/* 8003CCC4 */ void drawPath();
};
struct Vec {};
struct renderingDAmap_c {
/* 8002B150 */ ~renderingDAmap_c();
/* 8003FCC8 */ void init(u8*, u16, u16, u16, u16);
@@ -197,11 +197,6 @@ struct dDlst_base_c {
// Forward References:
//
extern "C" extern char const* const d_map_d_map__stringBase0;
extern "C" extern void* __vt__12dDlst_base_c[3];
extern "C" extern void* __vt__28dDrawPathWithNormalPattern_c[16];
extern "C" extern void* __vt__15dRenderingMap_c[23];
extern "C" void getIconSize__15renderingAmap_cCFUc();
extern "C" void draw__15renderingAmap_cFv();
extern "C" void getDispType__15renderingAmap_cCFv();
@@ -284,23 +279,6 @@ void* operator new(u32, int);
void* operator new[](u32, int);
void operator delete(void*);
void operator delete[](void*);
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__18dRenderingFDAmap_c[26];
extern "C" extern void* __vt__11dDrawPath_c[16];
extern "C" extern void* __vt__19renderingPlusDoor_c[41];
extern "C" extern void* __vt__28renderingPlusDoorAndCursor_c[47];
extern "C" extern void* __vt__16renderingDAmap_c[38];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_Counter[12 + 4 /* padding */];
extern "C" extern u8 sincosTable___5JMath[65536];
extern "C" extern u32 mNextRoomNo__10dMapInfo_c;
extern "C" extern u8 data_80450E58[4];
extern "C" extern u8 data_80450E60[4];
extern "C" extern u8 mMinX__8dMpath_c[4];
extern "C" extern u8 mMaxX__8dMpath_c[4];
extern "C" extern u8 mMinZ__8dMpath_c[4];
extern "C" extern u8 mMaxZ__8dMpath_c[4];
extern "C" void dComIfGp_isLightDropMapVisible__Fv();
extern "C" void isTbox__12dSv_memBit_cCFi();
@@ -408,10 +386,10 @@ asm void renderingAmap_c::getIconSize(u8 param_0) const {
static u8 m_res__22dMap_HIO_prm_res_dst_s[4 + 4 /* padding */];
/* 80451CA0-80451CA4 0004+00 s=4 e=0 z=0 None .sdata2 @3745 */
SECTION_SDATA2 static u32 lit_3745 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3745 = 0.5f;
/* 80451CA4-80451CA8 0004+00 s=1 e=0 z=0 None .sdata2 @3746 */
SECTION_SDATA2 static u32 lit_3746 = 0x47800000;
SECTION_SDATA2 static f32 lit_3746 = 65536.0f;
/* 80451CA8-80451CB0 0004+04 s=1 e=0 z=0 None .sdata2 @3747 */
SECTION_SDATA2 static f32 lit_3747[1 + 1 /* padding */] = {
@@ -421,14 +399,10 @@ SECTION_SDATA2 static f32 lit_3747[1 + 1 /* padding */] = {
};
/* 80451CB0-80451CB8 0008+00 s=5 e=0 z=0 None .sdata2 @3749 */
SECTION_SDATA2 static u8 lit_3749[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3749 = 4503599627370496.0 /* cast u32 to float */;
/* 80451CB8-80451CC0 0008+00 s=4 e=0 z=0 None .sdata2 @3751 */
SECTION_SDATA2 static u8 lit_3751[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3751 = 4503601774854144.0 /* cast s32 to float */;
/* 800284D0-800288C4 03F4+00 s=2 e=0 z=0 None .text draw__15renderingAmap_cFv */
#pragma push
@@ -883,7 +857,7 @@ bool dMap_c::isSpecialOutline() {
/* ############################################################################################## */
/* 80451CE0-80451CE4 0004+00 s=4 e=0 z=0 None .sdata2 @4284 */
SECTION_SDATA2 static u32 lit_4284 = 0x3F800000;
SECTION_SDATA2 static f32 lit_4284 = 1.0f;
/* 8002974C-800297A8 005C+00 s=1 e=0 z=0 None .text copyPalette__6dMap_cFv */
#pragma push
@@ -1102,7 +1076,7 @@ asm void dMap_c::calcMapCenterXZ(int param_0, f32* param_1, f32* param_2) {
/* ############################################################################################## */
/* 80451CE8-80451CEC 0004+00 s=1 e=0 z=0 None .sdata2 @4503 */
SECTION_SDATA2 static u32 lit_4503 = 0x4628C000;
SECTION_SDATA2 static f32 lit_4503 = 10800.0f;
/* 80029E1C-80029F84 0168+00 s=1 e=0 z=0 None .text calcMapCmPerTexel__6dMap_cFiPf */
#pragma push
@@ -1186,19 +1160,19 @@ asm void dMap_c::isDrawRoomIcon(int param_0, int param_1) const {
/* ############################################################################################## */
/* 80451CEC-80451CF0 0004+00 s=1 e=0 z=0 None .sdata2 @4688 */
SECTION_SDATA2 static u32 lit_4688 = 0xC567E000;
SECTION_SDATA2 static f32 lit_4688 = -3710.0f;
/* 80451CF0-80451CF4 0004+00 s=1 e=0 z=0 None .sdata2 @4689 */
SECTION_SDATA2 static u32 lit_4689 = 0xC6AEFA00;
SECTION_SDATA2 static f32 lit_4689 = -22397.0f;
/* 80451CF4-80451CF8 0004+00 s=1 e=0 z=0 None .sdata2 @4690 */
SECTION_SDATA2 static u32 lit_4690 = 0x42700000;
SECTION_SDATA2 static f32 lit_4690 = 60.0f;
/* 80451CF8-80451CFC 0004+00 s=1 e=0 z=0 None .sdata2 @4691 */
SECTION_SDATA2 static u32 lit_4691 = 0x40A00000;
SECTION_SDATA2 static f32 lit_4691 = 5.0f;
/* 80451CFC-80451D00 0004+00 s=1 e=0 z=0 None .sdata2 @4692 */
SECTION_SDATA2 static u32 lit_4692 = 0x41A00000;
SECTION_SDATA2 static f32 lit_4692 = 20.0f;
/* 8002A32C-8002AB54 0828+00 s=1 e=1 z=0 None .text _move__6dMap_cFffif */
#pragma push
src/d/map/d_map_path.cpp
+4 -14
View File
@@ -78,11 +78,6 @@ struct _GXTexObj {};
// Forward References:
//
extern "C" extern char const* const d_map_d_map_path__stringBase0;
extern "C" extern void* __vt__18dRenderingFDAmap_c[26];
extern "C" extern void* __vt__11dDrawPath_c[16];
extern "C" extern u8 m_texObjAgg__8dMpath_n[28];
extern "C" void create__Q28dMpath_n18dTexObjAggregate_cFv();
extern "C" void remove__Q28dMpath_n18dTexObjAggregate_cFv();
extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class();
@@ -115,9 +110,6 @@ extern "C" extern u8 m_texObjAgg__8dMpath_n[28];
void mDoLib_setResTimgObj(ResTIMG const*, _GXTexObj*, u32, _GXTlutObj*);
void* operator new(u32);
void operator delete(void*);
extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_clearColor[4];
extern "C" void mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj();
extern "C" void draw__12dDlst_base_cFv();
@@ -351,18 +343,16 @@ asm void dRenderingFDAmap_c::drawBack() const {
/* ############################################################################################## */
/* 80451E0C-80451E10 0004+00 s=1 e=0 z=0 None .sdata2 @3846 */
SECTION_SDATA2 static u32 lit_3846 = 0x3F800000;
SECTION_SDATA2 static f32 lit_3846 = 1.0f;
/* 80451E10-80451E14 0004+00 s=1 e=0 z=0 None .sdata2 @3847 */
SECTION_SDATA2 static u32 lit_3847 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3847 = 0.5f;
/* 80451E14-80451E18 0004+00 s=1 e=0 z=0 None .sdata2 @3848 */
SECTION_SDATA2 static u32 lit_3848 = 0x461C4000;
SECTION_SDATA2 static f32 lit_3848 = 10000.0f;
/* 80451E18-80451E20 0008+00 s=1 e=0 z=0 None .sdata2 @3850 */
SECTION_SDATA2 static u8 lit_3850[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3850 = 4503599627370496.0 /* cast u32 to float */;
/* 8003D188-8003D320 0198+00 s=1 e=8 z=0 None .text preRenderingMap__18dRenderingFDAmap_cFv */
#pragma push
src/d/map/d_map_path_dmap.cpp
+8 -36
View File
@@ -174,22 +174,6 @@ struct dDlst_list_c {
// Forward References:
//
extern "C" extern void* __vt__19renderingPlusDoor_c[41];
extern "C" extern void* __vt__28renderingPlusDoorAndCursor_c[47];
extern "C" extern void* __vt__16renderingDAmap_c[38];
extern "C" extern u32 mNextRoomNo__10dMapInfo_c;
extern "C" extern u8 data_80450E58[4];
extern "C" extern u8 data_80450E60[4];
extern "C" extern u8 mLayerList__8dMpath_c[4];
extern "C" extern u8 mMinX__8dMpath_c[4];
extern "C" extern u8 mMaxX__8dMpath_c[4];
extern "C" extern u8 mMinZ__8dMpath_c[4];
extern "C" extern u8 mMaxZ__8dMpath_c[4];
extern "C" extern f32 mAllCenterX__8dMpath_c;
extern "C" extern f32 mAllCenterZ__8dMpath_c;
extern "C" extern f32 mAllSizeX__8dMpath_c;
extern "C" extern f32 mAllSizeZ__8dMpath_c;
extern "C" void chkGetCompass__10dMapInfo_nFv();
extern "C" void chkGetMap__10dMapInfo_nFv();
extern "C" void isVisitedRoom__10dMapInfo_nFi();
@@ -285,14 +269,6 @@ void dStage_GetKeepDoorInfo();
void dStage_GetRoomKeepDoorInfo();
void dComIfGs_isVisitedRoom(int);
void* operator new(u32);
extern "C" extern u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 mStatus__20dStage_roomControl_c[65792];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 m_texObjAgg__8dMpath_n[28];
extern "C" extern u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */];
extern "C" extern u8 g_fmapHIO[1188];
extern "C" extern u32 __float_max;
extern "C" extern u8 struct_80450D64[4];
extern "C" void mDoMtx_YrotS__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
@@ -493,7 +469,7 @@ asm void dMapInfo_n::getMapRestartAngleY() {
/* ############################################################################################## */
/* 80451E2C-80451E30 0004+00 s=4 e=0 z=0 None .sdata2 @3887 */
SECTION_SDATA2 static u32 lit_3887 = 0x3F000000;
SECTION_SDATA2 static f32 lit_3887 = 0.5f;
/* 8003F19C-8003F1F4 0058+00 s=0 e=1 z=0 None .text getRoomCenter__10dMapInfo_nFiPfPf */
#pragma push
@@ -518,9 +494,7 @@ asm void dMapInfo_n::getRoomMinMaxXZ(int param_0, f32* param_1, f32* param_2, f3
/* ############################################################################################## */
/* 80451E30-80451E38 0008+00 s=1 e=0 z=0 None .sdata2 @3957 */
SECTION_SDATA2 static u8 lit_3957[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_3957 = 4503601774854144.0 /* cast s32 to float */;
/* 8003F24C-8003F40C 01C0+00 s=2 e=0 z=0 None .text getFloorParameter__10dMapInfo_nFfPScPfPfPfPf
*/
@@ -767,9 +741,7 @@ asm void renderingDAmap_c::init(u8* param_0, u16 param_1, u16 param_2, u16 param
/* ############################################################################################## */
/* 80451E40-80451E48 0008+00 s=2 e=0 z=0 None .sdata2 @4211 */
SECTION_SDATA2 static u8 lit_4211[8] = {
0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
SECTION_SDATA2 static f64 lit_4211 = 4503599627370496.0 /* cast u32 to float */;
/* 8003FD08-8003FD9C 0094+00 s=0 e=2 z=0 None .text entry__16renderingDAmap_cFfffiSc */
#pragma push
@@ -849,13 +821,13 @@ asm void renderingDAmap_c::isDrawRoom(int param_0, int param_1) const {
/* ############################################################################################## */
/* 80451E4C-80451E50 0004+00 s=1 e=0 z=0 None .sdata2 @4264 */
SECTION_SDATA2 static u32 lit_4264 = 0xC59C4000;
SECTION_SDATA2 static f32 lit_4264 = -5000.0f;
/* 80451E50-80451E54 0004+00 s=1 e=0 z=0 None .sdata2 @4265 */
SECTION_SDATA2 static u32 lit_4265 = 0x459C4000;
SECTION_SDATA2 static f32 lit_4265 = 5000.0f;
/* 80451E54-80451E58 0004+00 s=1 e=0 z=0 None .sdata2 @4266 */
SECTION_SDATA2 static u32 lit_4266 = 0xBF800000;
SECTION_SDATA2 static f32 lit_4266 = -1.0f;
/* 8003FF14-8003FFC4 00B0+00 s=3 e=3 z=0 None .text preDrawPath__16renderingDAmap_cFv */
#pragma push
@@ -1048,7 +1020,7 @@ SECTION_RODATA static u8 const l_100x100BoxVertexList[48] = {
};
/* 80451E70-80451E74 0004+00 s=1 e=0 z=0 None .sdata2 @4484 */
SECTION_SDATA2 static u32 lit_4484 = 0x40C00000;
SECTION_SDATA2 static f32 lit_4484 = 6.0f;
/* 80040838-800409B4 017C+00 s=1 e=0 z=0 None .text
* drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib */
@@ -1194,7 +1166,7 @@ SECTION_SDATA2 static u8 tboxNotStayColor_4542[4] = {
};
/* 80451EA8-80451EAC 0004+00 s=2 e=0 z=0 None .sdata2 @4600 */
SECTION_SDATA2 static u32 lit_4600 = 0x40000000;
SECTION_SDATA2 static f32 lit_4600 = 2.0f;
/* 80040B00-80040E84 0384+00 s=1 e=0 z=0 None .text
* drawTreasure__28renderingPlusDoorAndCursor_cFv */
src/d/map/d_map_path_fmap.cpp
+3 -14
View File
@@ -95,8 +95,6 @@ struct dMenuFmapIconDisp_c {
// Forward References:
//
extern "C" extern void* __vt__19dMenuFmapIconDisp_c[3];
extern "C" void addTypeGroupData__26fmpTresTypeGroupDataList_cFUcPCQ27dTres_c6data_s();
extern "C" void isArrival__22dMenu_Fmap_room_data_cFv();
extern "C" void buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii();
@@ -134,9 +132,6 @@ void dComIfGs_isStageSwitch(int, int);
void dComIfGp_isLightDropMapVisible();
void* operator new(u32);
void operator delete(void*);
extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u32 __float_max;
extern "C" void dComIfGs_isStageTbox__Fii();
extern "C" void dComIfGs_isStageSwitch__Fii();
@@ -231,16 +226,10 @@ asm void dMenu_Fmap_stage_data_c::isArrival() {
/* ############################################################################################## */
/* 80451E20-80451E28 0004+04 s=5 e=0 z=0 None .sdata2 @3894 */
SECTION_SDATA2 static u8 lit_3894[4 + 4 /* padding */] = {
0x00,
0x00,
0x00,
0x00,
SECTION_SDATA2 static f32 lit_3894[1 + 1 /* padding */] = {
0.0f,
/* padding */
0x00,
0x00,
0x00,
0x00,
0.0f,
};
/* 8003D9D8-8003DB48 0170+00 s=1 e=0 z=0 None .text