mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 04:31:37 -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 dee0667b5a
commit dfa8efa97b
2375 changed files with 24683 additions and 71069 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_mgate.cpp
-29
View File
@@ -11,19 +11,15 @@
#include "d/d_lib.h"
#include "d/d_procname.h"
/* ############################################################################################## */
/* 80593E48-80593E60 000000 0018+00 2/2 0/0 0/0 .rodata l_key_offset */
static Vec const l_key_offset[2] = {
{205.0f, 180.0f, 0.0f},
{230.0f, 180.0f, 0.0f},
};
/* 80593E60-80593E74 000018 0014+00 0/0 0/0 0/0 .rodata l_col_offsetX */
static f32 const l_col_offsetX[5] = {
80.0f, 160.0f, 240.0f, 320.0f, 400.0f,
};
/* 80593E74-80593EA4 00002C 0030+00 0/1 0/0 0/0 .rodata l_roll_crash_check_areaL */
static Vec const l_roll_crash_check_areaL[4] = {
{0.0f, 0.0f, -140.0f},
{410.0f, 0.0f, -140.0f},
@@ -31,7 +27,6 @@ static Vec const l_roll_crash_check_areaL[4] = {
{0.0f, 0.0f, 140.0f},
};
/* 80593EA4-80593ED4 00005C 0030+00 0/1 0/0 0/0 .rodata l_roll_crash_check_areaL2 */
static Vec const l_roll_crash_check_areaL2[4] = {
{0.0f, 0.0f, -140.0f},
{460.0f, 0.0f, -140.0f},
@@ -39,7 +34,6 @@ static Vec const l_roll_crash_check_areaL2[4] = {
{0.0f, 0.0f, 140.0f},
};
/* 805935B8-80593630 000078 0078+00 1/1 0/0 0/0 .text initBaseMtx__12daObjMGate_cFv */
void daObjMGate_c::initBaseMtx() {
if (mpKeyModel != NULL) {
mpKeyModel->setBaseScale(scale);
@@ -53,7 +47,6 @@ void daObjMGate_c::initBaseMtx() {
setBaseMtx();
}
/* 80593630-80593760 0000F0 0130+00 2/2 0/0 0/0 .text setBaseMtx__12daObjMGate_cFv */
void daObjMGate_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -73,7 +66,6 @@ void daObjMGate_c::setBaseMtx() {
}
}
/* 80593760-805937AC 000220 004C+00 1/0 0/0 0/0 .text Create__12daObjMGate_cFv */
int daObjMGate_c::Create() {
initBaseMtx();
@@ -82,31 +74,25 @@ int daObjMGate_c::Create() {
return 1;
}
/* 80593F88-80593F90 -00001 0008+00 1/3 0/0 0/0 .data l_arcName */
static char* l_arcName[] = {
"M_IGate",
"M_HGate",
};
/* 80593F90-80593F98 -00001 0008+00 0/1 0/0 0/0 .data l_bmdName */
static char* l_bmdName[] = {
"M_IzumiGate.bmd",
"M_HashiGate.bmd",
};
/* 80593F98-80593FA0 -00001 0008+00 0/1 0/0 0/0 .data l_dzbName */
static char* l_dzbName[] = {
"M_IzumiGate.dzb",
"M_HashiGate.dzb",
};
/* 80593FA0-80593FA4 -00001 0004+00 1/3 0/0 0/0 .data l_keyArcName */
static char* l_keyArcName = "M_GateKey";
/* 80593FA4-80593FA8 -00001 0004+00 0/1 0/0 0/0 .data l_keyBmdName */
static char* l_keyBmdName = "M_IGateKey.bmd";
/* 805937AC-8059388C 00026C 00E0+00 1/0 0/0 0/0 .text CreateHeap__12daObjMGate_cFv */
int daObjMGate_c::CreateHeap() {
J3DModelData* modelData =
(J3DModelData*)dComIfG_getObjectRes(l_arcName[mKind], l_bmdName[mKind]);
@@ -126,7 +112,6 @@ int daObjMGate_c::CreateHeap() {
return 1;
}
/* 8059388C-80593988 00034C 00FC+00 1/1 0/0 0/0 .text create1st__12daObjMGate_cFv */
int daObjMGate_c::create1st() {
mKind = getKind();
mType = getType();
@@ -150,8 +135,6 @@ int daObjMGate_c::create1st() {
return phase;
}
/* ############################################################################################## */
/* 80593ED8-80593EDC 000090 0004+00 0/0 0/0 0/0 .rodata @3752 */
// unused but still left in?
#pragma push
#pragma force_active on
@@ -163,8 +146,6 @@ static u8 const lit_3752[4] = {
};
#pragma pop
/* 80593988-80593C4C 000448 02C4+00 1/0 0/0 0/0 .text Execute__12daObjMGate_cFPPA3_A4_f
*/
int daObjMGate_c::Execute(Mtx** param_0) {
daPy_py_c* player_p = dComIfGp_getLinkPlayer();
mCounter++;
@@ -215,7 +196,6 @@ int daObjMGate_c::Execute(Mtx** param_0) {
return 1;
}
/* 80593C4C-80593D18 00070C 00CC+00 1/0 0/0 0/0 .text Draw__12daObjMGate_cFv */
int daObjMGate_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -232,44 +212,35 @@ int daObjMGate_c::Draw() {
return 1;
}
/* 80593D18-80593D74 0007D8 005C+00 1/0 0/0 0/0 .text Delete__12daObjMGate_cFv */
int daObjMGate_c::Delete() {
dComIfG_resDelete(&mPhase, l_arcName[mKind]);
dComIfG_resDelete(&mKeyPhase, l_keyArcName);
return 1;
}
/* 80593D74-80593DD4 000834 0060+00 1/0 0/0 0/0 .text daObjMGate_create1st__FP12daObjMGate_c */
static int daObjMGate_create1st(daObjMGate_c* i_this) {
fopAcM_ct(i_this, daObjMGate_c);
return i_this->create1st();
}
/* 80593DD4-80593DF4 000894 0020+00 1/0 0/0 0/0 .text daObjMGate_MoveBGDelete__FP12daObjMGate_c */
static int daObjMGate_MoveBGDelete(daObjMGate_c* i_this) {
return i_this->MoveBGDelete();
}
/* 80593DF4-80593E14 0008B4 0020+00 1/0 0/0 0/0 .text daObjMGate_MoveBGExecute__FP12daObjMGate_c
*/
static int daObjMGate_MoveBGExecute(daObjMGate_c* i_this) {
return i_this->MoveBGExecute();
}
/* 80593E14-80593E40 0008D4 002C+00 1/0 0/0 0/0 .text daObjMGate_MoveBGDraw__FP12daObjMGate_c */
static int daObjMGate_MoveBGDraw(daObjMGate_c* i_this) {
return i_this->MoveBGDraw();
}
/* ############################################################################################## */
/* 80593FA8-80593FC8 -00001 0020+00 1/0 0/0 0/0 .data daObjMGate_METHODS */
static actor_method_class daObjMGate_METHODS = {
(process_method_func)daObjMGate_create1st, (process_method_func)daObjMGate_MoveBGDelete,
(process_method_func)daObjMGate_MoveBGExecute, (process_method_func)NULL,
(process_method_func)daObjMGate_MoveBGDraw,
};
/* 80593FC8-80593FF8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_MGate */
extern actor_process_profile_definition g_profile_Obj_MGate = {
fpcLy_CURRENT_e,
3,