mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-31 01:30:39 -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_spinner.cpp
-32
View File
@@ -7,19 +7,16 @@
#include "d/actor/d_a_spinner.h"
#include "d/actor/d_a_tag_sppath.h"
#include "dol2asm.h"
#include "d/actor/d_a_alink.h"
#include "d/actor/d_a_mirror.h"
#include "Z2AudioLib/Z2Instances.h"
#include "SSystem/SComponent/c_math.h"
#include "m_Do/m_Do_controller_pad.h"
/* 804D4D90-804D4D9C 000000 000C+00 9/9 0/0 0/0 .rodata @3768 */
static u8 const lit_3768[12] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
/* 804D198C-804D1A50 0000EC 00C4+00 1/1 0/0 0/0 .text createHeap__11daSpinner_cFv */
int daSpinner_c::createHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x21);
mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -35,12 +32,10 @@ int daSpinner_c::createHeap() {
return 1;
}
/* 804D1A50-804D1A70 0001B0 0020+00 1/1 0/0 0/0 .text daSpinner_createHeap__FP10fopAc_ac_c */
static int daSpinner_createHeap(fopAc_ac_c* i_this) {
return ((daSpinner_c*)i_this)->createHeap();
}
/* 804D4EA8-804D4EEC 000000 0044+00 1/1 0/0 0/0 .data l_cylSrc */
static dCcD_SrcCyl l_cylSrc = {
{
{0, {{AT_TYPE_SPINNER, 1, 0x12}, {0, 0}, 0x69}},
@@ -55,7 +50,6 @@ static dCcD_SrcCyl l_cylSrc = {
}
};
/* 804D1A70-804D1D60 0001D0 02F0+00 1/1 0/0 0/0 .text create__11daSpinner_cFv */
int daSpinner_c::create() {
fopAcM_ct(this, daSpinner_c);
@@ -103,26 +97,21 @@ int daSpinner_c::create() {
return cPhs_COMPLEATE_e;
}
/* 804D1FB0-804D1FD0 000710 0020+00 1/0 0/0 0/0 .text daSpinner_Create__FP10fopAc_ac_c */
static int daSpinner_Create(fopAc_ac_c* i_this) {
return ((daSpinner_c*)i_this)->create();
}
/* 804D1FD0-804D21B8 000730 01E8+00 1/1 0/0 0/0 .text __dt__11daSpinner_cFv */
daSpinner_c::~daSpinner_c() {
mSound.deleteObject();
clearSpreadEffect();
clearPathMove();
}
/* 804D21B8-804D21E0 000918 0028+00 1/0 0/0 0/0 .text daSpinner_Delete__FP11daSpinner_c
*/
static int daSpinner_Delete(daSpinner_c* i_this) {
i_this->~daSpinner_c();
return 1;
}
/* 804D21E0-804D2278 000940 0098+00 2/2 0/0 0/0 .text setRoomInfo__11daSpinner_cFv */
void daSpinner_c::setRoomInfo() {
int roomNo;
if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
@@ -138,7 +127,6 @@ void daSpinner_c::setRoomInfo() {
fopAcM_SetRoomNo(this, roomNo);
}
/* 804D2278-804D2320 0009D8 00A8+00 2/2 0/0 0/0 .text setMatrix__11daSpinner_cFv */
void daSpinner_c::setMatrix() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0xa84 + 90.0f, current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -149,7 +137,6 @@ void daSpinner_c::setMatrix() {
mpModel->calc();
}
/* 804D2320-804D25F4 000A80 02D4+00 1/1 0/0 0/0 .text setEffect__11daSpinner_cFv */
void daSpinner_c::setEffect() {
static JGeometry::TVec3<f32> effDirection(0.0f, 1.0f, 0.0f);
static cXyz particleScale(1.5f, 1.5f, 1.5f);
@@ -204,7 +191,6 @@ void daSpinner_c::setEffect() {
}
}
/* 804D25F4-804D3048 000D54 0A54+00 1/1 0/0 0/0 .text posMove__11daSpinner_cFv */
int daSpinner_c::posMove() {
daAlink_c* player = daAlink_getAlinkActorClass();
@@ -367,7 +353,6 @@ int daSpinner_c::posMove() {
return 1;
}
/* 804D3090-804D3174 0017F0 00E4+00 3/3 0/0 0/0 .text setReflectAngle__11daSpinner_cFv */
void daSpinner_c::setReflectAngle() {
if (mpPathMove != NULL) {
current.angle.y += 0x8000;
@@ -389,7 +374,6 @@ void daSpinner_c::setReflectAngle() {
}
}
/* 804D3174-804D3468 0018D4 02F4+00 1/1 0/0 0/0 .text setWallHit__11daSpinner_cFsUl */
void daSpinner_c::setWallHit(s16 param_0, u32 param_1) {
field_0xa80 = param_0;
setReflectAngle();
@@ -422,7 +406,6 @@ void daSpinner_c::setWallHit(s16 param_0, u32 param_1) {
}
}
/* 804D34B0-804D3618 001C10 0168+00 1/1 0/0 0/0 .text setAnm__11daSpinner_cFv */
void daSpinner_c::setAnm() {
if (mBck.isStop() && mTrigJump) {
mBck.init(mpSpoutBck, 1, -1, 1.0f, 0, -1, true);
@@ -449,7 +432,6 @@ void daSpinner_c::setAnm() {
}
}
/* 804D3618-804D3694 001D78 007C+00 2/2 0/0 0/0 .text setNextPathNum__11daSpinner_cFv */
int daSpinner_c::setNextPathNum() {
if (mPathNo == 0 && mPathDirection == -1) {
mPathNo = mpPathMove->m_num - 1;
@@ -463,7 +445,6 @@ int daSpinner_c::setNextPathNum() {
return 0;
}
/* 804D3694-804D36F4 001DF4 0060+00 1/1 0/0 0/0 .text getPathNextPos__11daSpinner_cFv */
Vec* daSpinner_c::getPathNextPos() {
int next_point_no = mPathNo + mPathDirection;
if (next_point_no < 0) {
@@ -477,8 +458,6 @@ Vec* daSpinner_c::getPathNextPos() {
return &mpPathMove->m_points[next_point_no].m_position;
}
/* 804D36F4-804D3774 001E54 0080+00 1/1 0/0 0/0 .text checkLineWallHit__11daSpinner_cFP4cXyzP4cXyz
*/
int daSpinner_c::checkLineWallHit(cXyz* i_start, cXyz* i_end) {
mLinChk.Set(i_start, i_end, this);
if (dComIfG_Bgsp().LineCross(&mLinChk)) {
@@ -490,7 +469,6 @@ int daSpinner_c::checkLineWallHit(cXyz* i_start, cXyz* i_end) {
return 0;
}
/* 804D3774-804D3D60 001ED4 05EC+00 1/1 0/0 0/0 .text checkPathMove__11daSpinner_cFv */
int daSpinner_c::checkPathMove() {
if (mpPathMove != NULL) {
return 1;
@@ -627,7 +605,6 @@ int daSpinner_c::checkPathMove() {
return 0;
}
/* 804D3D60-804D3F14 0024C0 01B4+00 1/1 0/0 0/0 .text setSpreadEffect__11daSpinner_cFv */
void daSpinner_c::setSpreadEffect() {
u32* emitter_id = mSpreadEmitterIDs;
@@ -653,8 +630,6 @@ void daSpinner_c::setSpreadEffect() {
}
}
/* 804D3F14-804D3F8C 002674 0078+00 2/2 0/0 0/0 .text clearSpreadEffect__11daSpinner_cFv
*/
void daSpinner_c::clearSpreadEffect() {
for (int i = 0; i < 2; i++) {
JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mSpreadEmitterIDs[i]);
@@ -664,7 +639,6 @@ void daSpinner_c::clearSpreadEffect() {
}
}
/* 804D3F8C-804D4B94 0026EC 0C08+00 1/1 0/0 0/0 .text execute__11daSpinner_cFv */
int daSpinner_c::execute() {
if (mDeleteFlg) {
clearSpreadEffect();
@@ -925,13 +899,10 @@ int daSpinner_c::execute() {
return 1;
}
/* 804D4B94-804D4BB4 0032F4 0020+00 1/0 0/0 0/0 .text daSpinner_Execute__FP11daSpinner_c
*/
static int daSpinner_Execute(daSpinner_c* i_this) {
return i_this->execute();
}
/* 804D4BB4-804D4D08 003314 0154+00 1/1 0/0 0/0 .text draw__11daSpinner_cFv */
int daSpinner_c::draw() {
g_env_light.settingTevStruct(0, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -951,12 +922,10 @@ int daSpinner_c::draw() {
return 1;
}
/* 804D4D08-804D4D28 003468 0020+00 1/0 0/0 0/0 .text daSpinner_Draw__FP11daSpinner_c */
static int daSpinner_Draw(daSpinner_c* i_this) {
return i_this->draw();
}
/* 804D4EEC-804D4F0C -00001 0020+00 1/0 0/0 0/0 .data l_daSpinner_Method */
static actor_method_class l_daSpinner_Method = {
(process_method_func)daSpinner_Create,
(process_method_func)daSpinner_Delete,
@@ -965,7 +934,6 @@ static actor_method_class l_daSpinner_Method = {
(process_method_func)daSpinner_Draw,
};
/* 804D4F0C-804D4F3C -00001 0030+00 0/0 0/0 1/0 .data g_profile_SPINNER */
extern actor_process_profile_definition g_profile_SPINNER = {
fpcLy_CURRENT_e, // mLayerID
4, // mListID