mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-02 18:18:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_cb almost matching (#2265)

Browse Source 
* d_a_obj_cb almost matching

* d_a_obj_bubblePillar OK

* Work on d_a_obj_fchain

* d_a_obj_gb OK

* daTimeFire_c OK

* d_a_obj_toaru_maki OK

* d_a_obj_ten OK
This commit is contained in:
hatal175
2024-12-17 01:16:19 +02:00
committed by GitHub
parent ee992eb80c
commit c5ab943cfc
23 changed files with 2329 additions and 2572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_timeFire.cpp
+155 -198
View File
@@ -4,68 +4,172 @@
*/
#include "d/actor/d_a_obj_timeFire.h"
#include "d/d_com_inf_game.h"
#include "dol2asm.h"
/* 80D0E8EC-80D0E910 0000EC 0024+00 1/1 0/0 0/0 .text __ct__16daTimeFire_HIO_cFv */
daTimeFire_HIO_c::daTimeFire_HIO_c() {
field_0x4 = 20;
}
/* 80D0E958-80D0E9B0 000158 0058+00 1/1 0/0 0/0 .text setBaseMtx__12daTimeFire_cFv */
void daTimeFire_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
}
//
// Forward References:
//
/* 80D0E9B0-80D0EACC 0001B0 011C+00 1/1 0/0 0/0 .text create__12daTimeFire_cFv */
int daTimeFire_c::create() {
fopAcM_SetupActor(this, daTimeFire_c);
setBaseMtx();
field_0x570 = current.pos;
lightInit();
mStartTime = getStartTime();
mEndTime = getEndTime();
int scaleParam = getScale();
f32 fVar1 = scaleParam / 10.0f;
mParticleScale.set(fVar1, fVar1, fVar1);
field_0x56c = fireCheck(1);
if (!field_0x56c) {
cutLight();
field_0x56d = false;
} else {
setLight();
field_0x56d = true;
}
field_0x568 = 0;
field_0x569 = 0;
return cPhs_COMPLEATE_e;
}
extern "C" void __ct__16daTimeFire_HIO_cFv();
extern "C" void __dt__14mDoHIO_entry_cFv();
extern "C" void setBaseMtx__12daTimeFire_cFv();
extern "C" void create__12daTimeFire_cFv();
extern "C" void lightInit__12daTimeFire_cFv();
extern "C" void setLight__12daTimeFire_cFv();
extern "C" void cutLight__12daTimeFire_cFv();
extern "C" void Execute__12daTimeFire_cFv();
extern "C" void fireCheck__12daTimeFire_cFUc();
extern "C" bool Draw__12daTimeFire_cFv();
extern "C" void Delete__12daTimeFire_cFv();
extern "C" static void daTimeFire_Draw__FP12daTimeFire_c();
extern "C" static void daTimeFire_Execute__FP12daTimeFire_c();
extern "C" static void daTimeFire_Delete__FP12daTimeFire_c();
extern "C" static void daTimeFire_Create__FP10fopAc_ac_c();
extern "C" void __dt__16daTimeFire_HIO_cFv();
extern "C" void __sinit_d_a_obj_timeFire_cpp();
/* 80D0EACC-80D0EB40 0002CC 0074+00 1/1 0/0 0/0 .text lightInit__12daTimeFire_cFv */
void daTimeFire_c::lightInit() {
field_0x594 = field_0x570;
field_0x594.y += 10.0f;
mLightInfluence.mPosition = field_0x594;
mLightInfluence.mColor.r = 0xbc;
mLightInfluence.mColor.g = 0x66;
mLightInfluence.mColor.b = 0x42;
mLightInfluence.mPow = 500.0f;
mLightInfluence.mFluctuation = 1.0f;
}
//
// External References:
//
/* 80D0EB40-80D0EB64 000340 0024+00 2/2 0/0 0/0 .text setLight__12daTimeFire_cFv */
void daTimeFire_c::setLight() {
dKy_plight_set(&mLightInfluence);
}
extern "C" void mDoMtx_ZXYrotM__FPA4_fsss();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void dComIfGp_getReverb__Fi();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void
set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf();
extern "C" void dKy_getdaytime_hour__Fv();
extern "C" void dKy_getdaytime_minute__Fv();
extern "C" void dKy_plight_set__FP15LIGHT_INFLUENCE();
extern "C" void dKy_plight_cut__FP15LIGHT_INFLUENCE();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void __dl__FPv();
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
extern "C" void __register_global_object();
/* 80D0EB64-80D0EB88 000364 0024+00 2/2 0/0 0/0 .text cutLight__12daTimeFire_cFv */
void daTimeFire_c::cutLight() {
dKy_plight_cut(&mLightInfluence);
}
//
// Declarations:
//
/* 80D0EB88-80D0ED68 000388 01E0+00 1/1 0/0 0/0 .text Execute__12daTimeFire_cFv */
int daTimeFire_c::Execute() {
bool prevFireCheck = field_0x56c;
field_0x56c = fireCheck(0);
if (prevFireCheck != field_0x56c) {
if (field_0x56c == 0) {
cutLight();
field_0x56d = false;
} else {
setLight();
field_0x56d = true;
}
}
if (field_0x56d) {
mParticleId1 = dComIfGp_particle_set(mParticleId1, 0x3ad, &field_0x570, NULL, &mParticleScale);
mParticleId2 = dComIfGp_particle_set(mParticleId2, 0x3af, &field_0x570, NULL, &mParticleScale);
mParticleId3 = dComIfGp_particle_set(mParticleId3, 0x3ae, &field_0x570, NULL, &mParticleScale);
s8 reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this));
mDoAud_seStartLevel(Z2SE_OBJ_FIRE_BURNING, &field_0x570, 0, reverb);
}
return 1;
}
/* 80D0ED68-80D0EF88 000568 0220+00 2/2 0/0 0/0 .text fireCheck__12daTimeFire_cFUc */
bool daTimeFire_c::fireCheck(u8 param_1) {
bool inTime = false;
BOOL isSw;
if (getSw() == 0xff) {
isSw = 1;
} else {
isSw = fopAcM_isSwitch(this, getSw()) & 0xff;
}
if (mStartTime > mEndTime) {
if (dKy_getdaytime_hour() >= mStartTime || dKy_getdaytime_hour() <= mEndTime) {
inTime = true;
}
} else {
if (dKy_getdaytime_hour() >= mStartTime && dKy_getdaytime_hour() <= mEndTime) {
inTime = true;
}
}
if (inTime && (isSw & 0xff) && dKy_getdaytime_hour() == mStartTime && dKy_getdaytime_minute() == 0 &&
field_0x569 == 0 && param_1 == 0)
{
s8 reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this));
mDoAud_seStart(Z2SE_OBJ_FIRE_IGNITION, &field_0x570, 0, reverb);
field_0x569 = 1;
}
if (inTime && (isSw & 0xff) && dKy_getdaytime_hour() == mEndTime && dKy_getdaytime_minute() == 0 &&
field_0x569 == 1 && param_1 == 0)
{
s8 reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this));
mDoAud_seStart(Z2SE_OBJ_FIRE_OFF, &field_0x570, 0, reverb);
field_0x569 = 2;
}
if (inTime && (isSw & 0xff)) {
return 1;
}
field_0x569 = 0;
return 0;
}
/* 80D0EF88-80D0EF90 000788 0008+00 1/1 0/0 0/0 .text Draw__12daTimeFire_cFv */
int daTimeFire_c::Draw() {
return 1;
}
/* 80D0EF90-80D0EFB8 000790 0028+00 1/1 0/0 0/0 .text Delete__12daTimeFire_cFv */
int daTimeFire_c::Delete() {
dKy_plight_cut(&mLightInfluence);
return 1;
}
/* 80D0EFB8-80D0EFD8 0007B8 0020+00 1/0 0/0 0/0 .text daTimeFire_Draw__FP12daTimeFire_c
*/
static int daTimeFire_Draw(daTimeFire_c* i_this) {
return i_this->Draw();
}
/* 80D0EFD8-80D0EFF8 0007D8 0020+00 1/0 0/0 0/0 .text daTimeFire_Execute__FP12daTimeFire_c */
static int daTimeFire_Execute(daTimeFire_c* i_this) {
return i_this->Execute();
}
/* 80D0EFF8-80D0F018 0007F8 0020+00 1/0 0/0 0/0 .text daTimeFire_Delete__FP12daTimeFire_c
*/
static int daTimeFire_Delete(daTimeFire_c* i_this) {
return i_this->Delete();
}
/* 80D0F018-80D0F038 000818 0020+00 1/0 0/0 0/0 .text daTimeFire_Create__FP10fopAc_ac_c
*/
static int daTimeFire_Create(fopAc_ac_c* i_this) {
return static_cast<daTimeFire_c*>(i_this)->create();
}
/* 80D0F17C-80D0F184 000014 0008+00 1/1 0/0 0/0 .bss l_HIO */
static daTimeFire_HIO_c l_HIO;
/* ############################################################################################## */
/* 80D0F100-80D0F120 -00001 0020+00 1/0 0/0 0/0 .data l_daTimeFire_Method */
static actor_method_class l_daTimeFire_Method = {
(process_method_func)daTimeFire_Create__FP10fopAc_ac_c,
(process_method_func)daTimeFire_Delete__FP12daTimeFire_c,
(process_method_func)daTimeFire_Execute__FP12daTimeFire_c,
0,
(process_method_func)daTimeFire_Draw__FP12daTimeFire_c,
(process_method_func)daTimeFire_Create,
(process_method_func)daTimeFire_Delete,
(process_method_func)daTimeFire_Execute,
NULL,
(process_method_func)daTimeFire_Draw,
};
/* 80D0F120-80D0F150 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_TimeFire */
@@ -85,150 +189,3 @@ extern actor_process_profile_definition g_profile_Obj_TimeFire = {
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 80D0F150-80D0F15C 000050 000C+00 2/2 0/0 0/0 .data __vt__16daTimeFire_HIO_c */
SECTION_DATA extern void* __vt__16daTimeFire_HIO_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__16daTimeFire_HIO_cFv,
};
/* 80D0F15C-80D0F168 00005C 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */
SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__14mDoHIO_entry_cFv,
};
/* 80D0E8EC-80D0E910 0000EC 0024+00 1/1 0/0 0/0 .text __ct__16daTimeFire_HIO_cFv */
daTimeFire_HIO_c::daTimeFire_HIO_c() {
// NONMATCHING
}
/* 80D0E910-80D0E958 000110 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */
// mDoHIO_entry_c::~mDoHIO_entry_c() {
extern "C" void __dt__14mDoHIO_entry_cFv() {
// NONMATCHING
}
/* 80D0E958-80D0E9B0 000158 0058+00 1/1 0/0 0/0 .text setBaseMtx__12daTimeFire_cFv */
void daTimeFire_c::setBaseMtx() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80D0F0E4-80D0F0EC 000000 0004+04 2/2 0/0 0/0 .rodata @3686 */
SECTION_RODATA static f32 const lit_3686[1 + 1 /* padding */] = {
10.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x80D0F0E4, &lit_3686);
/* 80D0F0EC-80D0F0F4 000008 0008+00 1/1 0/0 0/0 .rodata @3688 */
SECTION_RODATA static u8 const lit_3688[8] = {
0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80D0F0EC, &lit_3688);
/* 80D0E9B0-80D0EACC 0001B0 011C+00 1/1 0/0 0/0 .text create__12daTimeFire_cFv */
void daTimeFire_c::create() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80D0F0F4-80D0F0F8 000010 0004+00 0/1 0/0 0/0 .rodata @3707 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3707 = 500.0f;
COMPILER_STRIP_GATE(0x80D0F0F4, &lit_3707);
#pragma pop
/* 80D0F0F8-80D0F0FC 000014 0004+00 2/3 0/0 0/0 .rodata @3708 */
SECTION_RODATA static f32 const lit_3708 = 1.0f;
COMPILER_STRIP_GATE(0x80D0F0F8, &lit_3708);
/* 80D0EACC-80D0EB40 0002CC 0074+00 1/1 0/0 0/0 .text lightInit__12daTimeFire_cFv */
void daTimeFire_c::lightInit() {
// NONMATCHING
}
/* 80D0EB40-80D0EB64 000340 0024+00 2/2 0/0 0/0 .text setLight__12daTimeFire_cFv */
void daTimeFire_c::setLight() {
// NONMATCHING
}
/* 80D0EB64-80D0EB88 000364 0024+00 2/2 0/0 0/0 .text cutLight__12daTimeFire_cFv */
void daTimeFire_c::cutLight() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80D0F0FC-80D0F100 000018 0004+00 2/2 0/0 0/0 .rodata @3757 */
SECTION_RODATA static f32 const lit_3757 = -1.0f;
COMPILER_STRIP_GATE(0x80D0F0FC, &lit_3757);
/* 80D0EB88-80D0ED68 000388 01E0+00 1/1 0/0 0/0 .text Execute__12daTimeFire_cFv */
void daTimeFire_c::Execute() {
// NONMATCHING
}
/* 80D0ED68-80D0EF88 000568 0220+00 2/2 0/0 0/0 .text fireCheck__12daTimeFire_cFUc */
void daTimeFire_c::fireCheck(u8 param_0) {
// NONMATCHING
}
/* 80D0EF88-80D0EF90 000788 0008+00 1/1 0/0 0/0 .text Draw__12daTimeFire_cFv */
bool daTimeFire_c::Draw() {
return true;
}
/* 80D0EF90-80D0EFB8 000790 0028+00 1/1 0/0 0/0 .text Delete__12daTimeFire_cFv */
void daTimeFire_c::Delete() {
// NONMATCHING
}
/* 80D0EFB8-80D0EFD8 0007B8 0020+00 1/0 0/0 0/0 .text daTimeFire_Draw__FP12daTimeFire_c
*/
static void daTimeFire_Draw(daTimeFire_c* param_0) {
// NONMATCHING
}
/* 80D0EFD8-80D0EFF8 0007D8 0020+00 1/0 0/0 0/0 .text daTimeFire_Execute__FP12daTimeFire_c */
static void daTimeFire_Execute(daTimeFire_c* param_0) {
// NONMATCHING
}
/* 80D0EFF8-80D0F018 0007F8 0020+00 1/0 0/0 0/0 .text daTimeFire_Delete__FP12daTimeFire_c
*/
static void daTimeFire_Delete(daTimeFire_c* param_0) {
// NONMATCHING
}
/* 80D0F018-80D0F038 000818 0020+00 1/0 0/0 0/0 .text daTimeFire_Create__FP10fopAc_ac_c
*/
static void daTimeFire_Create(fopAc_ac_c* param_0) {
// NONMATCHING
}
/* 80D0F038-80D0F094 000838 005C+00 2/1 0/0 0/0 .text __dt__16daTimeFire_HIO_cFv */
daTimeFire_HIO_c::~daTimeFire_HIO_c() {
// NONMATCHING
}
/* ############################################################################################## */
/* 80D0F170-80D0F17C 000008 000C+00 1/1 0/0 0/0 .bss @3621 */
static u8 lit_3621[12];
/* 80D0F17C-80D0F184 000014 0008+00 1/1 0/0 0/0 .bss l_HIO */
static u8 l_HIO[8];
/* 80D0F094-80D0F0D0 000894 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_timeFire_cpp */
void __sinit_d_a_obj_timeFire_cpp() {
// NONMATCHING
}
#pragma push
#pragma force_active on
REGISTER_CTORS(0x80D0F094, __sinit_d_a_obj_timeFire_cpp);
#pragma pop