mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-03 02:03:55 -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/actor/d_a_obj_ganonwall.cpp
-24
View File
@@ -9,8 +9,6 @@
#include "d/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
/* ############################################################################################## */
/* 80BF55EC-80BF564C 000000 0060+00 1/1 0/0 0/0 .rodata l_idx */
static u8 const l_idx[24][4] = {
{0x17, 0x05, 0x06, 0x01}, {0x17, 0x05, 0x06, 0x02}, {0x17, 0x05, 0x06, 0x03},
{0x17, 0x05, 0x06, 0x04}, {0x17, 0x05, 0x06, 0x05}, {0x05, 0x06, 0x01, 0x00},
@@ -22,7 +20,6 @@ static u8 const l_idx[24][4] = {
{0x13, 0x17, 0x04, 0x02}, {0x13, 0x17, 0x04, 0x03}, {0x17, 0x05, 0x06, 0x00},
};
/* 80BF564C-80BF56AC 000060 0060+00 0/1 0/0 0/0 .rodata l_color */
static const GXColor l_color[24] = {
{0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF},
{0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0x96, 0xFF},
@@ -34,31 +31,25 @@ static const GXColor l_color[24] = {
{0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0xB4, 0xB4, 0xB4, 0xFF},
};
/* 80BF56E4-80BF56E8 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
static char* l_arcName = "Y_gwall";
/* 80BF56E8-80BF56EC -00001 0004+00 1/1 0/0 0/0 .data l_matName */
static char* l_matName = "mat00";
/* 80BF4CF8-80BF4D18 000078 0020+00 1/1 0/0 0/0 .text CheckCreateHeap__FP10fopAc_ac_c */
static int CheckCreateHeap(fopAc_ac_c* i_this) {
return static_cast<daObjGWall_c*>(i_this)->CreateHeap();
}
/* 80BF4D18-80BF4D54 000098 003C+00 1/1 0/0 0/0 .text initBaseMtx__12daObjGWall_cFv */
void daObjGWall_c::initBaseMtx() {
mpModel->setBaseScale(scale);
setBaseMtx();
}
/* 80BF4D54-80BF4DA8 0000D4 0054+00 1/1 0/0 0/0 .text setBaseMtx__12daObjGWall_cFv */
void daObjGWall_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(this->shape_angle.y);
MTXCopy(mDoMtx_stack_c::get(), mpModel->mBaseTransformMtx);
}
/* 80BF4DA8-80BF4E8C 000128 00E4+00 1/1 0/0 0/0 .text Create__12daObjGWall_cFv */
int daObjGWall_c::Create() {
mEventBit1 = getEventBit1();
mEventBit2 = getEventBit2();
@@ -77,7 +68,6 @@ int daObjGWall_c::Create() {
return 1;
}
/* 80BF4E8C-80BF4FA8 00020C 011C+00 1/1 0/0 0/0 .text CreateHeap__12daObjGWall_cFv */
int daObjGWall_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11000284);
@@ -94,7 +84,6 @@ int daObjGWall_c::CreateHeap() {
return 1;
}
/* 80BF4FF0-80BF50A4 000370 00B4+00 1/1 0/0 0/0 .text create__12daObjGWall_cFv */
int daObjGWall_c::create() {
fopAcM_ct(this, daObjGWall_c);
cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName);
@@ -109,13 +98,11 @@ int daObjGWall_c::create() {
return phase;
}
/* 80BF50A4-80BF50CC 000424 0028+00 2/2 0/0 0/0 .text execute__12daObjGWall_cFv */
int daObjGWall_c::execute() {
mpBtkAnm->play();
return 1;
}
/* 80BF50CC-80BF5168 00044C 009C+00 1/1 0/0 0/0 .text checkDraw__12daObjGWall_cFv */
int daObjGWall_c::checkDraw() {
if (mEventBit2 != 0x3ff && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit2]) ||
mEventBit1 != 0x3ff && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit1]))
@@ -125,7 +112,6 @@ int daObjGWall_c::checkDraw() {
return 1;
}
/* 80BF5168-80BF5530 0004E8 03C8+00 1/1 0/0 0/0 .text draw__12daObjGWall_cFv */
int daObjGWall_c::draw() {
if (!checkDraw()) {
return 1;
@@ -172,36 +158,27 @@ int daObjGWall_c::draw() {
return 1;
}
/* 80BF5530-80BF5564 0008B0 0034+00 1/1 0/0 0/0 .text _delete__12daObjGWall_cFv */
int daObjGWall_c::_delete() {
dComIfG_resDelete(&mPhaseReq, l_arcName);
return 1;
}
/* 80BF5564-80BF5584 0008E4 0020+00 1/0 0/0 0/0 .text daObjGWall_Draw__FP12daObjGWall_c
*/
static int daObjGWall_Draw(daObjGWall_c* i_this) {
return i_this->draw();
}
/* 80BF5584-80BF55A4 000904 0020+00 1/0 0/0 0/0 .text daObjGWall_Execute__FP12daObjGWall_c */
static int daObjGWall_Execute(daObjGWall_c* i_this) {
return i_this->execute();
}
/* 80BF55A4-80BF55C4 000924 0020+00 1/0 0/0 0/0 .text daObjGWall_Delete__FP12daObjGWall_c
*/
static int daObjGWall_Delete(daObjGWall_c* i_this) {
return i_this->_delete();
}
/* 80BF55C4-80BF55E4 000944 0020+00 1/0 0/0 0/0 .text daObjGWall_Create__FP12daObjGWall_c
*/
static int daObjGWall_Create(daObjGWall_c* i_this) {
return i_this->create();
}
/* 80BF56EC-80BF570C -00001 0020+00 1/0 0/0 0/0 .data l_daObjGWall_Method */
static actor_method_class l_daObjGWall_Method = {
(process_method_func)daObjGWall_Create,
(process_method_func)daObjGWall_Delete,
@@ -210,7 +187,6 @@ static actor_method_class l_daObjGWall_Method = {
(process_method_func)daObjGWall_Draw,
};
/* 80BF570C-80BF573C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_GanonWall */
extern actor_process_profile_definition g_profile_Obj_GanonWall = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID