mirror of
https://github.com/zeldaret/tp
synced 2026-08-28 00:41:50 -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:
@@ -8,26 +8,22 @@
|
||||
#include "d/actor/d_a_obj_vground.h"
|
||||
#include "d/d_procname.h"
|
||||
|
||||
/* 80D213D8-80D213F8 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<daObjVGnd_c*>(i_this)->CreateHeap();
|
||||
}
|
||||
|
||||
/* 80D213F8-80D21448 000098 0050+00 1/1 0/0 0/0 .text initBaseMtx__11daObjVGnd_cFv */
|
||||
void daObjVGnd_c::initBaseMtx() {
|
||||
current.pos.y += 5.0f;
|
||||
mpModel->setBaseScale(scale);
|
||||
setBaseMtx();
|
||||
}
|
||||
|
||||
/* 80D21448-80D214AC 0000E8 0064+00 2/2 0/0 0/0 .text setBaseMtx__11daObjVGnd_cFv */
|
||||
void daObjVGnd_c::setBaseMtx() {
|
||||
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
|
||||
mDoMtx_stack_c::YrotM(shape_angle.y);
|
||||
MTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
|
||||
}
|
||||
|
||||
/* 80D214AC-80D21500 00014C 0054+00 1/1 0/0 0/0 .text Create__11daObjVGnd_cFv */
|
||||
int daObjVGnd_c::Create() {
|
||||
initBaseMtx();
|
||||
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
|
||||
@@ -36,10 +32,8 @@ int daObjVGnd_c::Create() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D21A24-80D21A28 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */
|
||||
static char* l_arcName = "M_VolcGnd";
|
||||
|
||||
/* 80D21500-80D216AC 0001A0 01AC+00 1/1 0/0 0/0 .text CreateHeap__11daObjVGnd_cFv */
|
||||
int daObjVGnd_c::CreateHeap() {
|
||||
J3DModelData* mpObjectRes = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
|
||||
mpModel = mDoExt_J3DModel__create(mpObjectRes, 0x80000, 0x11000284);
|
||||
@@ -63,7 +57,6 @@ int daObjVGnd_c::CreateHeap() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D216F4-80D217A8 000394 00B4+00 1/1 0/0 0/0 .text create__11daObjVGnd_cFv */
|
||||
int daObjVGnd_c::create() {
|
||||
fopAcM_ct(this, daObjVGnd_c);
|
||||
int phase = dComIfG_resLoad(&mPhaseReq, l_arcName);
|
||||
@@ -77,7 +70,6 @@ int daObjVGnd_c::create() {
|
||||
return phase;
|
||||
}
|
||||
|
||||
/* 80D217A8-80D21878 000448 00D0+00 2/2 0/0 0/0 .text execute__11daObjVGnd_cFv */
|
||||
int daObjVGnd_c::execute() {
|
||||
/* dSv_event_flag_c::M_032 - Main Event - Melted Zora river ice with magma rock */
|
||||
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[65])) {
|
||||
@@ -96,7 +88,6 @@ int daObjVGnd_c::execute() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D21878-80D2194C 000518 00D4+00 1/1 0/0 0/0 .text draw__11daObjVGnd_cFv */
|
||||
int daObjVGnd_c::draw() {
|
||||
g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr);
|
||||
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
|
||||
@@ -108,42 +99,33 @@ int daObjVGnd_c::draw() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D2194C-80D21980 0005EC 0034+00 1/1 0/0 0/0 .text _delete__11daObjVGnd_cFv */
|
||||
int daObjVGnd_c::_delete() {
|
||||
dComIfG_resDelete(&mPhaseReq, l_arcName);
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80D21980-80D219A0 000620 0020+00 1/0 0/0 0/0 .text daObjVGnd_Draw__FP11daObjVGnd_c */
|
||||
static int daObjVGnd_Draw(daObjVGnd_c* i_this) {
|
||||
return i_this->draw();
|
||||
}
|
||||
|
||||
/* 80D219A0-80D219C0 000640 0020+00 1/0 0/0 0/0 .text daObjVGnd_Execute__FP11daObjVGnd_c
|
||||
*/
|
||||
static int daObjVGnd_Execute(daObjVGnd_c* i_this) {
|
||||
return i_this->execute();
|
||||
}
|
||||
|
||||
/* 80D219C0-80D219E0 000660 0020+00 1/0 0/0 0/0 .text daObjVGnd_Delete__FP11daObjVGnd_c
|
||||
*/
|
||||
static int daObjVGnd_Delete(daObjVGnd_c* i_this) {
|
||||
return i_this->_delete();
|
||||
}
|
||||
|
||||
/* 80D219E0-80D21A00 000680 0020+00 1/0 0/0 0/0 .text daObjVGnd_Create__FP10fopAc_ac_c */
|
||||
static int daObjVGnd_Create(fopAc_ac_c* i_this) {
|
||||
return static_cast<daObjVGnd_c*>(i_this)->create();
|
||||
}
|
||||
|
||||
/* 80D21A28-80D21A48 -00001 0020+00 1/0 0/0 0/0 .data l_daObjVGnd_Method */
|
||||
static actor_method_class l_daObjVGnd_Method = {
|
||||
(process_method_func)daObjVGnd_Create, (process_method_func)daObjVGnd_Delete,
|
||||
(process_method_func)daObjVGnd_Execute, (process_method_func)NULL,
|
||||
(process_method_func)daObjVGnd_Draw,
|
||||
};
|
||||
|
||||
/* 80D21A48-80D21A78 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_VolcGnd */
|
||||
extern actor_process_profile_definition g_profile_Obj_VolcGnd = {
|
||||
fpcLy_CURRENT_e,
|
||||
3,
|
||||
|
||||
Reference in New Issue
Block a user