summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_obj_rgate.cpp
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2025-11-30 14:23:42 -0800
committerGitHub <noreply@github.com>2025-11-30 15:23:42 -0700
commita6e76c0841cae03cae0c0e6ac75c32f979043093 (patch)
tree76b5f590c59c6abdf2c80d0a3d5c0ccb31ebd0fe /src/d/actor/d_a_obj_rgate.cpp
parent434415337d268e405b09f6b72935a7e918e4cfe7 (diff)
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
Diffstat (limited to 'src/d/actor/d_a_obj_rgate.cpp')
-rw-r--r--src/d/actor/d_a_obj_rgate.cpp40
1 files changed, 0 insertions, 40 deletions
diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp
index 6022b51bff..58b762528e 100644
--- a/src/d/actor/d_a_obj_rgate.cpp
+++ b/src/d/actor/d_a_obj_rgate.cpp
@@ -34,7 +34,6 @@ enum {
AREA_CHECK_HORSE,
};
-/* 80CB9C98-80CB9CE8 000078 0050+00 3/3 0/0 0/0 .text search_coach__FPvPv */
static void* search_coach(void* i_actor, void* i_data) {
if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == PROC_NPC_COACH)
{
@@ -44,7 +43,6 @@ static void* search_coach(void* i_actor, void* i_data) {
return NULL;
}
-/* 80CB9CE8-80CB9DF8 0000C8 0110+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */
static int nodeCallBack(J3DJoint* i_joint, int param_1) {
if (param_1 == 0) {
int jnt_no = i_joint->getJntNo();
@@ -69,14 +67,11 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
return 1;
}
-/* ############################################################################################## */
-/* 80CBC368-80CBC380 000000 0018+00 7/7 0/0 0/0 .rodata l_cull_box */
static const Vec l_cull_box[2] = {
{-400.0f, 0.0f, -400.0f},
{400.0f, 450.0f, 400.0f},
};
-/* 80CBC380-80CBC3C4 000018 0044+00 0/0 0/0 0/0 .rodata l_cyl_src */
static const dCcD_SrcCyl l_cyl_src = {
{
{0x0, {{0x0, 0x0, 0x1e}, {0x20, 0x11}, 0x78}}, // mObj
@@ -91,7 +86,6 @@ static const dCcD_SrcCyl l_cyl_src = {
} // mCyl
};
-/* 80CB9DF8-80CB9F4C 0001D8 0154+00 1/1 0/0 0/0 .text initBaseMtx__12daObjRgate_cFv */
void daObjRgate_c::initBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(current.angle.y);
@@ -118,7 +112,6 @@ void daObjRgate_c::initBaseMtx() {
setBaseMtx();
}
-/* 80CB9F4C-80CBA468 00032C 051C+00 2/2 0/0 0/0 .text setBaseMtx__12daObjRgate_cFv */
void daObjRgate_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::YrotM(current.angle.y);
@@ -215,10 +208,8 @@ void daObjRgate_c::setBaseMtx() {
}
}
-/* 80CBC4C0-80CBC4C4 -00001 0004+00 4/4 0/0 0/0 .data l_arcName */
static char* l_arcName = "M_RGate00";
-/* 80CBA468-80CBA654 000848 01EC+00 1/0 0/0 0/0 .text Create__12daObjRgate_cFv */
int daObjRgate_c::Create() {
static char* l_evName = "RIDER_GATE_OPEN00";
@@ -267,7 +258,6 @@ int daObjRgate_c::Create() {
return 1;
}
-/* 80CBA654-80CBA828 000A34 01D4+00 1/0 0/0 0/0 .text CreateHeap__12daObjRgate_cFv */
int daObjRgate_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
JUT_ASSERT(472, modelData != NULL);
@@ -311,7 +301,6 @@ int daObjRgate_c::CreateHeap() {
return 1;
}
-/* 80CBA828-80CBA8A8 000C08 0080+00 1/1 0/0 0/0 .text create1st__12daObjRgate_cFv */
int daObjRgate_c::create1st() {
int phase_state = dComIfG_resLoad(&mPhase, l_arcName);
if (phase_state == cPhs_COMPLEATE_e) {
@@ -325,7 +314,6 @@ int daObjRgate_c::create1st() {
return phase_state;
}
-/* 80CBA8A8-80CBAC38 000C88 0390+00 1/1 0/0 0/0 .text checkAreaL__12daObjRgate_cFPC4cXyzPC4cXyz */
int daObjRgate_c::checkAreaL(cXyz const* unused1, cXyz const* unused2) {
daPy_py_c* player_p = daPy_getPlayerActorClass();
Mtx m;
@@ -401,7 +389,6 @@ int daObjRgate_c::checkAreaL(cXyz const* unused1, cXyz const* unused2) {
return 0;
}
-/* 80CBAC38-80CBAFC4 001018 038C+00 1/1 0/0 0/0 .text checkAreaR__12daObjRgate_cFPC4cXyzPC4cXyz */
int daObjRgate_c::checkAreaR(cXyz const* unused1, cXyz const* unused2) {
daPy_py_c* player_p = daPy_getPlayerActorClass();
Mtx m;
@@ -479,7 +466,6 @@ int daObjRgate_c::checkAreaR(cXyz const* unused1, cXyz const* unused2) {
return 0;
}
-/* 80CBAFC4-80CBB0F0 0013A4 012C+00 1/1 0/0 0/0 .text checkOpen__12daObjRgate_cFv */
BOOL daObjRgate_c::checkOpen() {
if (dComIfGs_getKeyNum() == 0) {
return false;
@@ -508,7 +494,6 @@ BOOL daObjRgate_c::checkOpen() {
return false;
}
-/* 80CBB0F0-80CBB180 0014D0 0090+00 1/1 0/0 0/0 .text checkDirL__12daObjRgate_cFP10fopAc_ac_c */
BOOL daObjRgate_c::checkDirL(fopAc_ac_c* i_actor) {
Mtx m;
mDoMtx_inverse(field_0xc30, m);
@@ -524,7 +509,6 @@ BOOL daObjRgate_c::checkDirL(fopAc_ac_c* i_actor) {
}
}
-/* 80CBB180-80CBB210 001560 0090+00 1/1 0/0 0/0 .text checkDirR__12daObjRgate_cFP10fopAc_ac_c */
BOOL daObjRgate_c::checkDirR(fopAc_ac_c* i_actor) {
Mtx m;
mDoMtx_inverse(field_0xc00, m);
@@ -540,17 +524,14 @@ BOOL daObjRgate_c::checkDirR(fopAc_ac_c* i_actor) {
}
}
-/* 80CBB210-80CBB28C 0015F0 007C+00 1/1 0/0 0/0 .text setAtkSE__12daObjRgate_cFv */
void daObjRgate_c::setAtkSE() {
fopAcM_seStart(this, Z2SE_OBJ_RIDER_GATE_ATK, 0);
}
-/* 80CBB28C-80CBB308 00166C 007C+00 1/1 0/0 0/0 .text setCrkSE__12daObjRgate_cFv */
void daObjRgate_c::setCrkSE() {
fopAcM_seStart(this, Z2SE_OBJ_RIDER_GATE_CRK, 0);
}
-/* 80CBB308-80CBB370 0016E8 0068+00 1/1 0/0 0/0 .text action__12daObjRgate_cFv */
void daObjRgate_c::action() {
/* dSv_event_flag_c::M_035 - Cutscene - [cutscene: 35] after carriage guarding event */
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) {
@@ -561,7 +542,6 @@ void daObjRgate_c::action() {
}
}
-/* 80CBB370-80CBBA10 001750 06A0+00 1/1 0/0 0/0 .text action_typeA__12daObjRgate_cFv */
void daObjRgate_c::action_typeA() {
u8 sw_no = getSwNo();
daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -747,8 +727,6 @@ void daObjRgate_c::action_typeA() {
}
}
-/* 80CBBA10-80CBBAF4 001DF0 00E4+00 1/0 0/0 0/0 .text actionWaitEvent__12daObjRgate_cFv
- */
void daObjRgate_c::actionWaitEvent() {
if (eventInfo.checkCommandDoor()) {
setAction(ACT_EVENT);
@@ -762,7 +740,6 @@ void daObjRgate_c::actionWaitEvent() {
}
}
-/* 80CBBAF4-80CBBB5C 001ED4 0068+00 1/0 0/0 0/0 .text actionEvent__12daObjRgate_cFv */
void daObjRgate_c::actionEvent() {
if (dComIfGp_evmng_endCheck(mEventID)) {
setAction(ACT_DEAD);
@@ -772,11 +749,8 @@ void daObjRgate_c::actionEvent() {
}
}
-/* 80CBBB5C-80CBBB60 001F3C 0004+00 1/0 0/0 0/0 .text actionDead__12daObjRgate_cFv */
void daObjRgate_c::actionDead() {}
-/* 80CBBB60-80CBBC04 001F40 00A4+00 1/1 0/0 0/0 .text event_proc_call__12daObjRgate_cFv
- */
void daObjRgate_c::event_proc_call() {
typedef void (daObjRgate_c::*func)();
static func l_func[] = {&daObjRgate_c::actionWaitEvent, &daObjRgate_c::actionEvent,
@@ -785,7 +759,6 @@ void daObjRgate_c::event_proc_call() {
(this->*l_func[mAction])();
}
-/* 80CBBC04-80CBBD68 001FE4 0164+00 1/1 0/0 0/0 .text demoProc__12daObjRgate_cFv */
void daObjRgate_c::demoProc() {
mStaffID = dComIfGp_evmng_getMyStaffId("K_GATE", NULL, 0);
int demo_action = getDemoAction();
@@ -828,15 +801,12 @@ void daObjRgate_c::demoProc() {
}
}
-/* 80CBBD68-80CBBDB0 002148 0048+00 1/1 0/0 0/0 .text getDemoAction__12daObjRgate_cFv */
int daObjRgate_c::getDemoAction() {
static char* action_table[] = {"WAIT", "ADJUSTMENT", "UNLOCK", "OPEN"};
return dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZEU(action_table), 0, 0);
}
-/* 80CBBDB0-80CBBE18 002190 0068+00 1/0 0/0 0/0 .text Execute__12daObjRgate_cFPPA3_A4_f
- */
int daObjRgate_c::Execute(Mtx** param_0) {
event_proc_call();
action();
@@ -848,7 +818,6 @@ int daObjRgate_c::Execute(Mtx** param_0) {
return 1;
}
-/* 80CBBE18-80CBBF34 0021F8 011C+00 1/0 0/0 0/0 .text Draw__12daObjRgate_cFv */
int daObjRgate_c::Draw() {
g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
g_env_light.setLightTevColorType_MAJI(mpGateModel, &tevStr);
@@ -874,7 +843,6 @@ int daObjRgate_c::Draw() {
return 1;
}
-/* 80CBBF34-80CBBFA0 002314 006C+00 1/0 0/0 0/0 .text Delete__12daObjRgate_cFv */
int daObjRgate_c::Delete() {
if (mpBgW != NULL && mpBgW->ChkUsed()) {
if (dComIfG_Bgsp().Release(mpBgW)) {
@@ -888,37 +856,29 @@ int daObjRgate_c::Delete() {
return 1;
}
-/* 80CBBFA0-80CBC054 002380 00B4+00 1/0 0/0 0/0 .text daObjRgate_create1st__FP12daObjRgate_c */
static int daObjRgate_create1st(daObjRgate_c* i_this) {
fopAcM_ct(i_this, daObjRgate_c);
return i_this->create1st();
}
-/* 80CBC290-80CBC2B0 002670 0020+00 1/0 0/0 0/0 .text daObjRgate_MoveBGDelete__FP12daObjRgate_c */
static int daObjRgate_MoveBGDelete(daObjRgate_c* i_this) {
return i_this->MoveBGDelete();
}
-/* 80CBC2B0-80CBC2D0 002690 0020+00 1/0 0/0 0/0 .text daObjRgate_MoveBGExecute__FP12daObjRgate_c
- */
static int daObjRgate_MoveBGExecute(daObjRgate_c* i_this) {
return i_this->MoveBGExecute();
}
-/* 80CBC2D0-80CBC2FC 0026B0 002C+00 1/0 0/0 0/0 .text daObjRgate_MoveBGDraw__FP12daObjRgate_c */
static int daObjRgate_MoveBGDraw(daObjRgate_c* i_this) {
return i_this->MoveBGDraw();
}
-/* ############################################################################################## */
-/* 80CBC51C-80CBC53C -00001 0020+00 1/0 0/0 0/0 .data daObjRgate_METHODS */
static actor_method_class daObjRgate_METHODS = {
(process_method_func)daObjRgate_create1st, (process_method_func)daObjRgate_MoveBGDelete,
(process_method_func)daObjRgate_MoveBGExecute, (process_method_func)NULL,
(process_method_func)daObjRgate_MoveBGDraw,
};
-/* 80CBC53C-80CBC56C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_RiderGate */
extern actor_process_profile_definition g_profile_Obj_RiderGate = {
fpcLy_CURRENT_e,
3,