mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-27 08:27:42 -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_stick.cpp
-26
View File
@@ -7,17 +7,14 @@
#include "d/actor/d_a_obj_stick.h"
#include "d/d_com_inf_game.h"
#include "dol2asm.h"
#include "d/d_resorce.h"
#include "m_Do/m_Do_ext.h"
#include "d/actor/d_a_npc.h"
/* 80599E3C-80599E4C 000000 0010+00 3/3 0/0 0/0 .rodata m__19daObj_Stick_Param_c */
const daObj_Stick_Param_c::daObj_Stick_HIOParam daObj_Stick_Param_c::m = {
0.0f, -3.0f, 1.0f, 100.0f
};
/* 80599E70-80599EB0 000000 0040+00 2/2 0/0 0/0 .data mCcDSph__13daObj_Stick_c */
dCcD_SrcSph daObj_Stick_c::mCcDSph = {
daNpcT_c::mCcDObjData, // mObjInf
{
@@ -25,15 +22,12 @@ dCcD_SrcSph daObj_Stick_c::mCcDSph = {
} // mSphAttr
};
/* 80599EB0-80599EB4 -00001 0004+00 1/1 0/0 0/0 .data l_resName */
static char* l_resName = "Taro6";
/* 8059922C-805993E8 0000EC 01BC+00 1/0 0/0 0/0 .text __dt__13daObj_Stick_cFv */
daObj_Stick_c::~daObj_Stick_c() {
dComIfG_resDelete(&mPhase, getResName());
}
/* 805993E8-805996BC 0002A8 02D4+00 1/1 0/0 0/0 .text create__13daObj_Stick_cFv */
int daObj_Stick_c::create() {
fopAcM_ct(this, daObj_Stick_c);
@@ -78,7 +72,6 @@ int daObj_Stick_c::create() {
return phase_state;
}
/* 80599888-80599900 000748 0078+00 1/1 0/0 0/0 .text CreateHeap__13daObj_Stick_cFv */
int daObj_Stick_c::CreateHeap() {
J3DModelData* objectRes = (J3DModelData*)dComIfG_getObjectRes(getResName(), 3);
if (objectRes == NULL) {
@@ -93,14 +86,12 @@ int daObj_Stick_c::CreateHeap() {
return 1;
}
/* 80599900-80599934 0007C0 0034+00 1/1 0/0 0/0 .text Delete__13daObj_Stick_cFv */
int daObj_Stick_c::Delete() {
this->~daObj_Stick_c();
return 1;
}
/* 80599934-80599A78 0007F4 0144+00 2/2 0/0 0/0 .text Execute__13daObj_Stick_cFv */
int daObj_Stick_c::Execute() {
mAcch.CrrPos(dComIfG_Bgsp());
mGndChk = mAcch.m_gnd;
@@ -121,7 +112,6 @@ int daObj_Stick_c::Execute() {
return 1;
}
/* 80599A78-80599B3C 000938 00C4+00 1/1 0/0 0/0 .text Draw__13daObj_Stick_cFv */
int daObj_Stick_c::Draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -146,18 +136,14 @@ int daObj_Stick_c::Draw() {
return 1;
}
/* 80599B3C-80599B5C 0009FC 0020+00 1/1 0/0 0/0 .text
* createHeapCallBack__13daObj_Stick_cFP10fopAc_ac_c */
int daObj_Stick_c::createHeapCallBack(fopAc_ac_c* i_this) {
return static_cast<daObj_Stick_c*>(i_this)->CreateHeap();
}
/* 80599B5C-80599B6C 000A1C 0010+00 3/3 0/0 0/0 .text getResName__13daObj_Stick_cFv */
const char* daObj_Stick_c::getResName() {
return l_resName;
}
/* 80599B6C-80599B8C 000A2C 0020+00 1/1 0/0 0/0 .text isDelete__13daObj_Stick_cFv */
BOOL daObj_Stick_c::isDelete() {
switch(mType) {
case 0:
@@ -167,20 +153,16 @@ BOOL daObj_Stick_c::isDelete() {
}
}
/* 80599B8C-80599BE8 000A4C 005C+00 2/2 0/0 0/0 .text setEnvTevColor__13daObj_Stick_cFv
*/
void daObj_Stick_c::setEnvTevColor() {
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
}
/* 80599BE8-80599C28 000AA8 0040+00 2/2 0/0 0/0 .text setRoomNo__13daObj_Stick_cFv */
void daObj_Stick_c::setRoomNo() {
u32 roomId = dComIfG_Bgsp().GetRoomId(mGndChk);
fopAcM_SetRoomNo(this, roomId);
}
/* 80599C28-80599C8C 000AE8 0064+00 1/1 0/0 0/0 .text setMtx__13daObj_Stick_cFv */
void daObj_Stick_c::setMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -188,32 +170,26 @@ void daObj_Stick_c::setMtx() {
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 80599C8C-80599CAC 000B4C 0020+00 1/0 0/0 0/0 .text daObj_Stick_Create__FPv */
static u32 daObj_Stick_Create(void* i_this) {
return static_cast<daObj_Stick_c*>(i_this)->create();
}
/* 80599CAC-80599CCC 000B6C 0020+00 1/0 0/0 0/0 .text daObj_Stick_Delete__FPv */
static void daObj_Stick_Delete(void* param_0) {
static_cast<daObj_Stick_c*>(param_0)->Delete();
}
/* 80599CCC-80599CEC 000B8C 0020+00 1/0 0/0 0/0 .text daObj_Stick_Execute__FPv */
static void daObj_Stick_Execute(void* param_0) {
static_cast<daObj_Stick_c*>(param_0)->Execute();
}
/* 80599CEC-80599D0C 000BAC 0020+00 1/0 0/0 0/0 .text daObj_Stick_Draw__FPv */
static void daObj_Stick_Draw(void* param_0) {
static_cast<daObj_Stick_c*>(param_0)->Draw();
}
/* 80599D0C-80599D14 000BCC 0008+00 1/0 0/0 0/0 .text daObj_Stick_IsDelete__FPv */
static bool daObj_Stick_IsDelete(void* param_0) {
return true;
}
/* 80599EB4-80599ED4 -00001 0020+00 1/0 0/0 0/0 .data daObj_Stick_MethodTable */
static actor_method_class daObj_Stick_MethodTable = {
(process_method_func)daObj_Stick_Create,
(process_method_func)daObj_Stick_Delete,
@@ -222,7 +198,6 @@ static actor_method_class daObj_Stick_MethodTable = {
(process_method_func)daObj_Stick_Draw,
};
/* 80599ED4-80599F04 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_STICK */
extern actor_process_profile_definition g_profile_OBJ_STICK = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
@@ -240,5 +215,4 @@ extern actor_process_profile_definition g_profile_OBJ_STICK = {
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80599F94-80599F98 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */
static daObj_Stick_Param_c l_HIO;