mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 12:39:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_door_shutter OK (#2142)

Browse Source 
* a_d_door_shutter OK

* d_a_door_spiral OK
This commit is contained in:
hatal175
2024-05-01 03:08:21 +03:00
committed by GitHub
parent 025870a64c
commit 9995df3bc7
105 changed files with 2237 additions and 8682 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ void daDbDoor00_c::calcMtx() {
/* 8045D8F4-8045D9A8 0005F4 00B4+00 1/1 0/0 0/0 .text CreateInit__12daDbDoor00_cFv */
int daDbDoor00_c::CreateInit() {
s32 fRoomNo = door_param2_c::getFRoomNo(this);
u8 fRoomNo = door_param2_c::getFRoomNo(this);
if (fopAcM_GetRoomNo(this) == -1) {
fopAcM_SetRoomNo(this, fRoomNo);
tevStr.mRoomNo = current.roomNo;
rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp
+1 -1
View File
@@ -165,7 +165,7 @@ int daKnob20_c::CreateInit() {
field_0x5a0->Move();
eventInfo.setArchiveName(getEvArcName());
setEventId();
tevStr.field_0x364 = knob_param_c::getDoorLightInf(this);
tevStr.mLightInf = knob_param_c::getDoorLightInf(this);
return 1;
}
rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp
+1 -1
View File
@@ -1277,7 +1277,7 @@ int daMBdoorL1_c::CreateInit() {
} else {
lightInf = door_param2_c::getMBLightInf(this);
}
tevStr.field_0x364 = lightInf;
tevStr.mLightInf = lightInf;
return 1;
}
#else
rel/d/a/door/d_a_door_push/d_a_door_push.cpp
+1 -2
View File
@@ -7,7 +7,6 @@
#include "SSystem/SComponent/c_math.h"
#include "d/bg/d_bg_w.h"
#include "d/d_procname.h"
#include "dol2asm.h"
#include "f_op/f_op_actor_mng.h"
/* 80677DB8-80677DE0 000078 0028+00 1/1 0/0 0/0 .text
@@ -83,7 +82,7 @@ static u8 cNullVec__6Z2Calc[12] = {
/* 80678F5C-80678F70 00000C 0004+10 0/0 0/0 0/0 .data @1787 */
#pragma push
#pragma force_active on
SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = {
static u32 lit_1787[1 + 4 /* padding */] = {
0x02000201,
/* padding */
0x40080000,
rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp
+2006 -2108
View File
File diff suppressed because it is too large Load Diff
rel/d/a/door/d_a_door_spiral/d_a_door_spiral.cpp
+17 -26
View File
@@ -1,32 +1,23 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_door_spiral
// Door Spiral
//
#include "rel/d/a/door/d_a_door_spiral/d_a_door_spiral.h"
#include "dol2asm.h"
#include "f_op/f_op_actor.h"
//
// Forward References:
//
extern "C" extern void* g_profile_SPIRAL_DOOR[12];
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
//
// Declarations:
//
/* ############################################################################################## */
/* 804673E0-80467410 -00001 0030+00 0/0 0/0 1/0 .data g_profile_SPIRAL_DOOR */
SECTION_DATA extern void* g_profile_SPIRAL_DOOR[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD, (void*)0x022D0000, (void*)&g_fpcLf_Method,
(void*)0x000006B0, (void*)NULL, (void*)NULL, (void*)&g_fopAc_Method,
(void*)0x012D0000, (void*)NULL, (void*)0x00044000, (void*)0x00060000,
extern actor_process_profile_definition g_profile_SPIRAL_DOOR = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_SPIRAL_DOOR, // mProcName
&g_fpcLf_Method.mBase, // sub_method
0x6b0, // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
301, // mPriority
NULL, // sub_method
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_6_e, // cullType
};
rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp
+2 -79
View File
@@ -12,66 +12,6 @@
struct request_of_phase_process_class {};
struct csXyz {
/* 8026745C */ void operator+=(csXyz&);
};
struct cXyz {};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CD9C */ void transM(f32, f32, f32);
/* 8000CF0C */ void ZXYrotS(csXyz const&);
/* 8000CF44 */ void ZXYrotM(csXyz const&);
static u8 now[48];
};
struct J3DModelData {};
struct J3DAnmTransform {};
struct mDoExt_bckAnm {
/* 8000D7DC */ void init(J3DAnmTransform*, int, int, f32, s16, s16, bool);
/* 8000D9CC */ void entry(J3DModelData*, f32);
};
struct mDoExt_baseAnm {
/* 8000D428 */ void play();
};
struct fopAc_ac_c {
/* 80018B64 */ fopAc_ac_c();
};
struct daObjLv5Key_c {
/* 80B9B9B8 */ void CreateHeap();
/* 80B9BA94 */ void Init();
/* 80B9BB5C */ void setBgc();
/* 80B9BBCC */ void initCcSph();
/* 80B9BC2C */ void setCcSph();
/* 80B9BD30 */ void setAction(void (daObjLv5Key_c::*)(int), int);
/* 80B9BDD8 */ void Action();
/* 80B9BE24 */ void Wait(int);
/* 80B9BF08 */ void Open(int);
/* 80B9BFDC */ void Fall(int);
/* 80B9C17C */ void Land(int);
/* 80B9C268 */ void Shake(int);
/* 80B9C3B0 */ void TranslateByNowDirect(f32, f32, f32);
/* 80B9C410 */ void Execute();
/* 80B9C450 */ void Draw();
/* 80B9C500 */ void Delete();
/* 80B9C534 */ void setBaseMtx();
/* 80B9C5EC */ void create_1st();
};
struct dKy_tevstr_c {};
struct dScnKy_env_light_c {
/* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
/* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
};
struct dRes_info_c {};
struct dRes_control_c {
@@ -136,17 +76,6 @@ struct cCcS {
/* 80264BA8 */ void Set(cCcD_Obj*);
};
struct Z2SoundObjSimple {
/* 802BE844 */ Z2SoundObjSimple();
};
struct J3DModel {};
struct J3DFrameCtrl {
/* 803283FC */ void init(s16);
/* 80B9C898 */ ~J3DFrameCtrl();
};
//
// Forward References:
//
@@ -226,17 +155,12 @@ extern "C" void SetR__8cM3dGSphFf();
extern "C" void __ct__16Z2SoundObjSimpleFv();
extern "C" void __dl__FPv();
extern "C" void init__12J3DFrameCtrlFs();
extern "C" void PSMTXCopy();
extern "C" void PSMTXMultVec();
extern "C" void PSVECAdd();
extern "C" void __ptmf_test();
extern "C" void __ptmf_cmpr();
extern "C" void __ptmf_scall();
extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */];
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" extern void* __vt__8dCcD_Sph[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_SphAttr[25];
@@ -244,8 +168,6 @@ extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
extern "C" extern void* __vt__9cCcD_Stts[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_env_light[4880];
extern "C" extern u8 j3dSys[284];
//
// Declarations:
@@ -763,7 +685,8 @@ asm dBgS_ObjAcch::~dBgS_ObjAcch() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J3DFrameCtrl::~J3DFrameCtrl() {
asm void __dt__12J3DFrameCtrlFv() {
//asm J3DFrameCtrl::~J3DFrameCtrl() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key/__dt__12J3DFrameCtrlFv.s"
}
rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ int daObjWindow_c::Create() {
mCyl.Set(l_cyl_src);
mCyl.SetStts(&mStts);
}
tevStr.field_0x364 = getLightInf();
tevStr.mLightInf = getLightInf();
return 1;
}