mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-07 03:10:11 -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_nougu.cpp
-25
View File
@@ -9,7 +9,6 @@
#include "d/actor/d_a_npc.h"
#include "SSystem/SComponent/c_counter.h"
/* 80CA4A00-80CA4A40 000000 0040+00 2/2 0/0 0/0 .data mCcDSph__13daObj_Nougu_c */
dCcD_SrcSph daObj_Nougu_c::mCcDSph = {
daNpcT_c::mCcDObjData,
{
@@ -17,16 +16,13 @@ dCcD_SrcSph daObj_Nougu_c::mCcDSph = {
},
};
/* 80CA4A40-80CA4A44 -00001 0004+00 1/1 0/0 0/0 .data l_resName */
static char* l_resName = "Jagar4";
/* 80CA3C0C-80CA3D58 0000EC 014C+00 1/0 0/0 0/0 .text __dt__13daObj_Nougu_cFv */
daObj_Nougu_c::~daObj_Nougu_c() {
OS_REPORT("|%06d:%x|daObj_Nougu_c -> デストラクト\n", g_Counter.mCounter0, this);
dComIfG_resDelete(&mPhase, getResName());
}
/* 80CA49B8-80CA49C8 000000 0010+00 3/3 0/0 0/0 .rodata m__19daObj_Nougu_Param_c */
const daObj_Nougu_HIOParam daObj_Nougu_Param_c::m = {
0.0f,
-3.0f,
@@ -34,7 +30,6 @@ const daObj_Nougu_HIOParam daObj_Nougu_Param_c::m = {
200.0f
};
/* 80CA3E24-80CA40D8 000304 02B4+00 1/1 0/0 0/0 .text create__13daObj_Nougu_cFv */
int daObj_Nougu_c::create() {
fopAcM_ct(this, daObj_Nougu_c);
@@ -82,7 +77,6 @@ int daObj_Nougu_c::create() {
return phase_state;
}
/* 80CA4328-80CA43A0 000808 0078+00 1/1 0/0 0/0 .text CreateHeap__13daObj_Nougu_cFv */
int daObj_Nougu_c::CreateHeap() {
J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), 3);
if (mdlData_p == NULL) {
@@ -97,14 +91,12 @@ int daObj_Nougu_c::CreateHeap() {
return 1;
}
/* 80CA43A0-80CA43D4 000880 0034+00 1/1 0/0 0/0 .text Delete__13daObj_Nougu_cFv */
int daObj_Nougu_c::Delete() {
OS_REPORT("|%06d:%x|daObj_Nougu_c -> Delete\n", g_Counter.mCounter0, this);
this->~daObj_Nougu_c();
return 1;
}
/* 80CA43D4-80CA45F4 0008B4 0220+00 2/2 0/0 0/0 .text Execute__13daObj_Nougu_cFv */
int daObj_Nougu_c::Execute() {
cXyz sp14;
cXyz sp8;
@@ -142,7 +134,6 @@ int daObj_Nougu_c::Execute() {
return 1;
}
/* 80CA45F4-80CA46B8 000AD4 00C4+00 1/1 0/0 0/0 .text Draw__13daObj_Nougu_cFv */
int daObj_Nougu_c::Draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -155,18 +146,14 @@ int daObj_Nougu_c::Draw() {
return 1;
}
/* 80CA46B8-80CA46D8 000B98 0020+00 1/1 0/0 0/0 .text
* createHeapCallBack__13daObj_Nougu_cFP10fopAc_ac_c */
int daObj_Nougu_c::createHeapCallBack(fopAc_ac_c* i_this) {
return ((daObj_Nougu_c*)i_this)->CreateHeap();
}
/* 80CA46D8-80CA46E8 000BB8 0010+00 3/3 0/0 0/0 .text getResName__13daObj_Nougu_cFv */
const char* daObj_Nougu_c::getResName() {
return l_resName;
}
/* 80CA46E8-80CA4708 000BC8 0020+00 1/1 0/0 0/0 .text isDelete__13daObj_Nougu_cFv */
int daObj_Nougu_c::isDelete() {
switch (mType) {
case 0:
@@ -176,19 +163,15 @@ int daObj_Nougu_c::isDelete() {
return 0;
}
/* 80CA4708-80CA4764 000BE8 005C+00 2/2 0/0 0/0 .text setEnvTevColor__13daObj_Nougu_cFv
*/
void daObj_Nougu_c::setEnvTevColor() {
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
}
/* 80CA4764-80CA47A4 000C44 0040+00 2/2 0/0 0/0 .text setRoomNo__13daObj_Nougu_cFv */
void daObj_Nougu_c::setRoomNo() {
fopAcM_SetRoomNo(this, dComIfG_Bgsp().GetRoomId(mGndChk));
}
/* 80CA47A4-80CA4808 000C84 0064+00 1/1 0/0 0/0 .text setMtx__13daObj_Nougu_cFv */
void daObj_Nougu_c::setMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -196,35 +179,28 @@ void daObj_Nougu_c::setMtx() {
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
/* 80CA4808-80CA4828 000CE8 0020+00 1/0 0/0 0/0 .text daObj_Nougu_Create__FPv */
static int daObj_Nougu_Create(void* i_this) {
return ((daObj_Nougu_c*)i_this)->create();
}
/* 80CA4828-80CA4848 000D08 0020+00 1/0 0/0 0/0 .text daObj_Nougu_Delete__FPv */
static int daObj_Nougu_Delete(void* i_this) {
return ((daObj_Nougu_c*)i_this)->Delete();
}
/* 80CA4848-80CA4868 000D28 0020+00 1/0 0/0 0/0 .text daObj_Nougu_Execute__FPv */
static int daObj_Nougu_Execute(void* i_this) {
return ((daObj_Nougu_c*)i_this)->Execute();
}
/* 80CA4868-80CA4888 000D48 0020+00 1/0 0/0 0/0 .text daObj_Nougu_Draw__FPv */
static int daObj_Nougu_Draw(void* i_this) {
return ((daObj_Nougu_c*)i_this)->Draw();
}
/* 80CA4888-80CA4890 000D68 0008+00 1/0 0/0 0/0 .text daObj_Nougu_IsDelete__FPv */
static int daObj_Nougu_IsDelete(void* i_this) {
return 1;
}
/* 80CA4B24-80CA4B28 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */
static daObj_Nougu_Param_c l_HIO;
/* 80CA4A44-80CA4A64 -00001 0020+00 1/0 0/0 0/0 .data daObj_Nougu_MethodTable */
static actor_method_class daObj_Nougu_MethodTable = {
(process_method_func)daObj_Nougu_Create,
(process_method_func)daObj_Nougu_Delete,
@@ -233,7 +209,6 @@ static actor_method_class daObj_Nougu_MethodTable = {
(process_method_func)daObj_Nougu_Draw,
};
/* 80CA4A64-80CA4A94 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_NOUGU */
extern actor_process_profile_definition g_profile_OBJ_NOUGU = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID