mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-17 20:43:07 -04:00
project cleanup (#2895)
* 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:
@@ -10,23 +10,19 @@
|
||||
#include "d/d_item_data.h"
|
||||
#include "f_op/f_op_actor_mng.h"
|
||||
|
||||
/* 80144724-8014474C 13F064 0028+00 0/0 1/1 8/8 .text DeleteBase__12daItemBase_cFPCc */
|
||||
int daItemBase_c::DeleteBase(const char* i_resName) {
|
||||
dComIfG_resDelete(&mPhase, i_resName);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 8014474C-80144754 13F08C 0008+00 1/0 1/0 9/0 .text clothCreate__12daItemBase_cFv */
|
||||
int daItemBase_c::clothCreate() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80144754-8014475C 13F094 0008+00 1/0 1/0 3/0 .text __CreateHeap__12daItemBase_cFv */
|
||||
int daItemBase_c::__CreateHeap() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 8014475C-80144B94 13F09C 0438+00 0/0 3/3 0/0 .text CreateItemHeap__12daItemBase_cFPCcsssssss */
|
||||
int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btkName, s16 i_bpkName,
|
||||
s16 i_bckName, s16 i_bxaName, s16 i_brkName, s16 i_btpName) {
|
||||
JUT_ASSERT(0, 0 <= m_itemNo && m_itemNo <= 255);
|
||||
@@ -127,7 +123,6 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk
|
||||
return __CreateHeap() ? TRUE : FALSE;
|
||||
}
|
||||
|
||||
/* 80144B94-80144C30 13F4D4 009C+00 1/0 1/0 9/0 .text DrawBase__12daItemBase_cFv */
|
||||
int daItemBase_c::DrawBase() {
|
||||
setTevStr();
|
||||
animEntry();
|
||||
@@ -139,36 +134,29 @@ int daItemBase_c::DrawBase() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80144C30-80144C7C 13F570 004C+00 1/0 1/0 9/0 .text RotateYBase__12daItemBase_cFv */
|
||||
void daItemBase_c::RotateYBase() {
|
||||
shape_angle.y += (s16)(0xFFFF / getData().mRotateYSpeed);
|
||||
}
|
||||
|
||||
/* 80144C7C-80144CA0 13F5BC 0024+00 1/0 1/0 5/0 .text setListStart__12daItemBase_cFv */
|
||||
void daItemBase_c::setListStart() {
|
||||
dComIfGd_setListDark();
|
||||
}
|
||||
|
||||
/* 80144CA0-80144CC4 13F5E0 0024+00 1/1 0/0 0/0 .text setListEnd__12daItemBase_cFv */
|
||||
void daItemBase_c::setListEnd() {
|
||||
dComIfGd_setList();
|
||||
}
|
||||
|
||||
/* 80144CC4-80144D18 13F604 0054+00 1/0 1/0 9/0 .text settingBeforeDraw__12daItemBase_cFv
|
||||
*/
|
||||
void daItemBase_c::settingBeforeDraw() {
|
||||
if (chkFlag(4)) {
|
||||
fopAcM_setEffectMtx(this, mpModel->getModelData());
|
||||
}
|
||||
}
|
||||
|
||||
/* 80144D18-80144D70 13F658 0058+00 1/0 0/0 8/0 .text setTevStr__12daItemBase_cFv */
|
||||
void daItemBase_c::setTevStr() {
|
||||
g_env_light.settingTevStruct(0, ¤t.pos, &tevStr);
|
||||
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
|
||||
}
|
||||
|
||||
/* 80144D70-80144EDC 13F6B0 016C+00 1/0 1/0 9/1 .text setShadow__12daItemBase_cFv */
|
||||
void daItemBase_c::setShadow() {
|
||||
f32 size = scale.x * getShadowSize();
|
||||
|
||||
@@ -189,7 +177,6 @@ void daItemBase_c::setShadow() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 80144EDC-8014503C 13F81C 0160+00 1/0 1/0 9/0 .text animEntry__12daItemBase_cFv */
|
||||
void daItemBase_c::animEntry() {
|
||||
if (mpBrkAnm != NULL) {
|
||||
s8 tevFrm = getTevFrm();
|
||||
@@ -222,7 +209,6 @@ void daItemBase_c::animEntry() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 8014503C-80145144 13F97C 0108+00 0/0 2/2 4/4 .text animPlay__12daItemBase_cFffffff */
|
||||
void daItemBase_c::animPlay(f32 i_btkSpeed, f32 i_bpkSpeed, f32 i_bckSpeed, f32 param_3, f32 i_brkSpeed,
|
||||
f32 i_btpSpeed) {
|
||||
if (mpBrkAnm != NULL && getTevFrm() == -1) {
|
||||
@@ -251,32 +237,26 @@ void daItemBase_c::animPlay(f32 i_btkSpeed, f32 i_bpkSpeed, f32 i_bckSpeed, f32
|
||||
}
|
||||
}
|
||||
|
||||
/* 80145144-80145164 13FA84 0020+00 1/0 1/0 8/0 .text chkFlag__12daItemBase_cFi */
|
||||
BOOL daItemBase_c::chkFlag(int i_flag) {
|
||||
return dItem_data::chkFlag(m_itemNo, i_flag);
|
||||
}
|
||||
|
||||
/* 80145164-80145180 13FAA4 001C+00 1/0 1/0 8/0 .text getTevFrm__12daItemBase_cFv */
|
||||
s8 daItemBase_c::getTevFrm() {
|
||||
return dItem_data::getTevFrm(m_itemNo);
|
||||
}
|
||||
|
||||
/* 80145180-8014519C 13FAC0 001C+00 1/0 1/0 8/0 .text getBtpFrm__12daItemBase_cFv */
|
||||
s8 daItemBase_c::getBtpFrm() {
|
||||
return dItem_data::getBtpFrm(m_itemNo);
|
||||
}
|
||||
|
||||
/* 8014519C-801451B4 13FADC 0018+00 1/0 1/0 8/0 .text getShadowSize__12daItemBase_cFv */
|
||||
u8 daItemBase_c::getShadowSize() {
|
||||
return dItem_data::getShadowSize(m_itemNo);
|
||||
}
|
||||
|
||||
/* 801451B4-801451D0 13FAF4 001C+00 1/0 1/0 8/0 .text getCollisionH__12daItemBase_cFv */
|
||||
u8 daItemBase_c::getCollisionH() {
|
||||
return dItem_data::getH(m_itemNo);
|
||||
}
|
||||
|
||||
/* 801451D0-801451EC 13FB10 001C+00 1/0 1/0 8/0 .text getCollisionR__12daItemBase_cFv */
|
||||
u8 daItemBase_c::getCollisionR() {
|
||||
return dItem_data::getR(m_itemNo);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user