mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 20:27:36 -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_stairBlock.cpp
-22
View File
@@ -7,14 +7,12 @@
#include "d/actor/d_a_obj_stairBlock.h"
/* 80CE816C-80CE81AC 0000EC 0040+00 1/1 0/0 0/0 .text __ct__18daStairBlock_HIO_cFv */
daStairBlock_HIO_c::daStairBlock_HIO_c() {
for (int i = 0; i < 10; i++) {
collision_radius[i] = 0.0f;
}
}
/* 80CE81F4-80CE82A0 000174 00AC+00 1/1 0/0 0/0 .text setBaseMtx__14daStairBlock_cFv */
void daStairBlock_c::setBaseMtx() {
for (int i = 0; i < 10; i++) {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
@@ -24,7 +22,6 @@ void daStairBlock_c::setBaseMtx() {
}
}
/* 80CE8DC0-80CE8DF0 000004 0030+00 1/1 0/0 0/0 .rodata mCcDObjInfo__14daStairBlock_c */
const dCcD_SrcGObjInf daStairBlock_c::mCcDObjInfo = {
{0, {0, 0, 0, {0x0, 0x0}, {0x19}}},
{dCcD_SE_NONE, 0, 0, 0, 0x0},
@@ -32,17 +29,14 @@ const dCcD_SrcGObjInf daStairBlock_c::mCcDObjInfo = {
{0},
};
/* 80CE8DF0-80CE8E18 000034 0028+00 0/1 0/0 0/0 .rodata l_bmdIdx */
static const s32 l_bmdIdx[10] = {
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,
};
/* 80CE8E18-80CE8E40 00005C 0028+00 0/1 0/0 0/0 .rodata l_bckIdx */
static const s32 l_bckIdx[10] = {
0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
};
/* 80CE8E40-80CE8EB8 000084 0078+00 0/1 0/0 0/0 .rodata centerPos */
static const Vec centerPos[10] = {
{28214.64f, -2576.334f, 7412.408f}, {28217.744f, -2681.6169f, 7392.684f},
{28336.742f, -2641.343f, 7329.605f}, {27901.223f, -2526.949f, 7028.0098f},
@@ -51,7 +45,6 @@ static const Vec centerPos[10] = {
{27985.621f, -2644.115f, 6984.075f}, {27985.621f, -2644.115f, 6984.075f},
};
/* 80CE82A0-80CE83F0 000220 0150+00 1/0 0/0 0/0 .text CreateHeap__14daStairBlock_cFv */
int daStairBlock_c::CreateHeap() {
for (int i = 0; i < 10; i++) {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("StaBlock", l_bmdIdx[i]);
@@ -70,7 +63,6 @@ int daStairBlock_c::CreateHeap() {
return 1;
}
/* 80CE83F0-80CE85B0 000370 01C0+00 1/1 0/0 0/0 .text create__14daStairBlock_cFv */
int daStairBlock_c::create() {
fopAcM_ct(this, daStairBlock_c);
@@ -100,16 +92,12 @@ int daStairBlock_c::create() {
return phase;
}
/* 80CE8874-80CE88A0 0007F4 002C+00 1/1 0/0 0/0 .text
* createHeapCallBack__14daStairBlock_cFP10fopAc_ac_c */
int daStairBlock_c::createHeapCallBack(fopAc_ac_c* i_this) {
return static_cast<daStairBlock_c*>(i_this)->CreateHeap();
}
/* 80CE8FD4-80CE9000 000014 002C+00 2/2 0/0 0/0 .bss l_HIO */
static daStairBlock_HIO_c l_HIO;
/* 80CE88A0-80CE8B24 000820 0284+00 1/0 0/0 0/0 .text Execute__14daStairBlock_cFv */
int daStairBlock_c::Execute() {
for (int i = 0; i < 10; i++) {
if (mSpheres[i].ChkCoHit()) {
@@ -139,7 +127,6 @@ int daStairBlock_c::Execute() {
return 1;
}
/* 80CE8B24-80CE8C08 000AA4 00E4+00 1/0 0/0 0/0 .text Draw__14daStairBlock_cFv */
int daStairBlock_c::Draw() {
g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
dComIfGd_setListBG();
@@ -153,7 +140,6 @@ int daStairBlock_c::Draw() {
return 1;
}
/* 80CE8C08-80CE8C38 000B88 0030+00 1/0 0/0 0/0 .text Delete__14daStairBlock_cFv */
int daStairBlock_c::Delete() {
dComIfG_resDelete(&mPhaseReq, "StaBlock");
@@ -164,38 +150,30 @@ int daStairBlock_c::Delete() {
return 1;
}
/* 80CE8C38-80CE8C64 000BB8 002C+00 1/0 0/0 0/0 .text daStairBlock_Draw__FP14daStairBlock_c */
static int daStairBlock_Draw(daStairBlock_c* i_this) {
return i_this->Draw();
}
/* 80CE8C64-80CE8C90 000BE4 002C+00 1/0 0/0 0/0 .text daStairBlock_Execute__FP14daStairBlock_c */
static int daStairBlock_Execute(daStairBlock_c* i_this) {
return i_this->Execute();
}
/* 80CE8C90-80CE8CBC 000C10 002C+00 1/0 0/0 0/0 .text daStairBlock_Delete__FP14daStairBlock_c */
static int daStairBlock_Delete(daStairBlock_c* i_this) {
return i_this->Delete();
}
/* 80CE8CBC-80CE8CDC 000C3C 0020+00 1/0 0/0 0/0 .text daStairBlock_Create__FP10fopAc_ac_c
*/
static int daStairBlock_Create(fopAc_ac_c* i_this) {
return static_cast<daStairBlock_c*>(i_this)->create();
}
/* 80CE8ED8-80CE8F18 000000 0040+00 2/2 0/0 0/0 .data mCcDSph__14daStairBlock_c */
dCcD_SrcSph daStairBlock_c::mCcDSph = {daStairBlock_c::mCcDObjInfo, {{{0.0f, 0.0f, 0.0f}, 4.0f}}};
/* 80CE8F18-80CE8F38 -00001 0020+00 1/0 0/0 0/0 .data l_daStairBlock_Method */
static actor_method_class l_daStairBlock_Method = {
(process_method_func)daStairBlock_Create, (process_method_func)daStairBlock_Delete,
(process_method_func)daStairBlock_Execute, 0,
(process_method_func)daStairBlock_Draw,
};
/* 80CE8F38-80CE8F68 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_StairBlock */
extern actor_process_profile_definition g_profile_Obj_StairBlock = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID