mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-03 12:10:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

various constructors and other small functions

Browse Source
This commit is contained in:
Jcw87
2023-12-20 21:39:09 -08:00
parent fdc216a6f2
commit 46a937b489
10 changed files with 158 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_detect.h
+1 -1
View File
@@ -7,7 +7,7 @@ class dDetectPlace_c {
public:
dDetectPlace_c();
~dDetectPlace_c();
void chk_enable() const;
bool chk_enable() const;
/* 0x00 */ cXyz mPos;
/* 0x0C */ s16 mEnable;
include/d/d_event.h
+1 -1
View File
@@ -110,7 +110,7 @@ public:
/* 0xDA */ u8 mEventEndSound;
/* 0xDB */ u8 field_0xdb;
/* 0xDC */ u8 field_0xdc;
/* 0xDD */ u8 field_0xDD[0xDE - 0xDD];
/* 0xDD */ u8 field_0xdd;
/* 0xDE */ u8 field_0xde;
/* 0xDF */ u8 field_0xdf;
/* 0xE0 */ u8 mTalkButton;
include/d/d_vibration.h
+32 -4
View File
@@ -4,9 +4,39 @@
#include "SSystem/SComponent/c_xyz.h"
class dVibration_c {
public:
/* 0x00 */ int field_0x0;
/* 0x04 */ int field_0x4;
/* 0x08 */ s32 field_0x8;
/* 0x0C */ int field_0xc;
/* 0x10 */ int field_0x10;
/* 0x14 */ cXyz field_0x14;
/* 0x20 */ s32 field_0x20;
/* 0x24 */ int field_0x24;
/* 0x28 */ u32 field_0x28;
/* 0x2C */ s32 field_0x2c;
/* 0x30 */ int field_0x30;
/* 0x34 */ int field_0x34;
/* 0x38 */ cXyz field_0x38;
/* 0x44 */ s32 field_0x44;
/* 0x48 */ int field_0x48;
/* 0x4C */ int field_0x4c;
/* 0x50 */ s32 field_0x50;
/* 0x54 */ s32 field_0x54;
/* 0x58 */ s32 field_0x58;
/* 0x5C */ s32 field_0x5c;
/* 0x60 */ int field_0x60;
/* 0x64 */ u32 field_0x64;
/* 0x68 */ u32 field_0x68;
/* 0x6C */ s32 field_0x6c;
/* 0x70 */ s32 field_0x70;
/* 0x74 */ s32 field_0x74;
/* 0x78 */ s32 field_0x78;
/* 0x7C */ int field_0x7c;
public:
dVibration_c();
~dVibration_c();
virtual ~dVibration_c();
int Run();
bool StartShock(int i_strength, int, cXyz);
@@ -19,8 +49,6 @@ public:
void Init();
void Pause();
void Remove();
u8 temp[0x84];
}; // Size: 0x84
#endif /* D_D_VIBRATION_H */
#endif /* D_D_VIBRATION_H */
src/JAZelAudio/JAIZelInst.cpp
+13 -1
View File
@@ -8,7 +8,19 @@
/* 802AE04C-802AE0B4 .text __ct__10JAIZelInstFv */
JAIZelInst::JAIZelInst() {
/* Nonmatching */
field_0x0 = 0;
field_0xc = 0;
field_0x10 = -1;
field_0x14 = 0x2f;
mMelodyNum = 3;
field_0x20 = 0.6f;
field_0x24 = 3.0f;
field_0x28 = 60.f;
field_0x2c = 1.0f;
field_0x30 = field_0x2c * 30.0f;
field_0x1e = 0;
field_0x48 = 0;
field_0x34 = 0x37;
}
/* 802AE0B4-802AE1C0 .text reset__10JAIZelInstFv */
src/d/actor/d_a_sea.cpp
+1 -3
View File
@@ -218,9 +218,7 @@ void daSea_packet_c::CleanUp() {
}
/* 8015B7E4-8015B84C .text __ct__14daSea_packet_cFv */
daSea_packet_c::daSea_packet_c() {
/* Nonmatching */
}
daSea_packet_c::daSea_packet_c() {}
/* 8015B84C-8015B86C .text SetFlat__14daSea_packet_cFv */
void daSea_packet_c::SetFlat() {
src/d/d_detect.cpp
+7 -10
View File
@@ -8,28 +8,25 @@
/* 8009BFD4-8009BFFC .text __ct__14dDetectPlace_cFv */
dDetectPlace_c::dDetectPlace_c() {
/* Nonmatching */
mPos = cXyz::Zero;
mEnable = 0;
}
/* 8009BFFC-8009C038 .text __dt__14dDetectPlace_cFv */
dDetectPlace_c::~dDetectPlace_c() {
/* Nonmatching */
}
dDetectPlace_c::~dDetectPlace_c() {}
/* 8009C038-8009C048 .text chk_enable__14dDetectPlace_cCFv */
void dDetectPlace_c::chk_enable() const {
/* Nonmatching */
bool dDetectPlace_c::chk_enable() const {
return mEnable != 0;
}
/* 8009C048-8009C098 .text __ct__9dDetect_cFv */
dDetect_c::dDetect_c() {
/* Nonmatching */
mTimer = 0;
}
/* 8009C098-8009C0F8 .text __dt__9dDetect_cFv */
dDetect_c::~dDetect_c() {
/* Nonmatching */
}
dDetect_c::~dDetect_c() {}
/* 8009C0F8-8009C14C .text proc__9dDetect_cFv */
void dDetect_c::proc() {
src/d/d_event.cpp
+21 -5
View File
@@ -9,13 +9,11 @@
/* 8006FE04-8006FE54 .text __ct__14dEvt_control_cFv */
dEvt_control_c::dEvt_control_c() {
/* Nonmatching */
remove();
}
/* 8006FE54-8006FE58 .text __ct__12dEvt_order_cFv */
dEvt_order_c::dEvt_order_c() {
/* Nonmatching */
}
dEvt_order_c::dEvt_order_c() {}
/* 8006FE58-8006FEE8 .text orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv */
s32 dEvt_control_c::orderOld(u16, u16, u16, u16, void*, void*, const void*) {
@@ -145,6 +143,19 @@ BOOL dEvt_control_c::compulsory(void*, const char*, u16) {
/* 80071468-800714AC .text remove__14dEvt_control_cFv */
void dEvt_control_c::remove() {
/* Nonmatching */
mMode = 0;
mbEndProc = 0;
mOrderCount = 0;
field_0xdd = 0;
mEventEndSound = 0;
field_0xdb = 0;
mCullFarClipRatio = 0.0f;
field_0xde = 0xff;
field_0xdf = 0xff;
mTalkButton = 0;
mbInPhoto = 0;
mItemNo = 0xff;
mEventFlag = 0;
}
/* 800714AC-80071534 .text getStageEventDt__14dEvt_control_cFv */
@@ -179,7 +190,12 @@ void dEvt_control_c::getTactFreeCStick(int) {
/* 80071624-80071658 .text __ct__11dEvt_info_cFv */
dEvt_info_c::dEvt_info_c() {
/* Nonmatching */
mCommand = 0;
mCondition = 0;
mEventId = -1;
mMapToolId = 0xff;
mpEventCB = 0;
mpCheckCB = 0;
}
/* 80071658-800716AC .text setEventName__11dEvt_info_cFPc */
src/d/d_particle.cpp
+31 -9
View File
@@ -164,8 +164,11 @@ void dPa_modelControl_c::draw() {
}
/* 8007B158-8007B194 .text __ct__19dPa_followEcallBackFUcUc */
dPa_followEcallBack::dPa_followEcallBack(u8, u8) {
/* Nonmatching */
dPa_followEcallBack::dPa_followEcallBack(u8 param_1, u8 param_2) {
mRateOff = param_1;
field_0x12 = param_2;
field_0x13 = 0;
mpEmitter = NULL;
}
/* 8007B194-8007B288 .text execute__19dPa_followEcallBackFP14JPABaseEmitter */
@@ -189,18 +192,39 @@ void dPa_followEcallBack::end() {
}
/* 8007B3B0-8007B444 .text __ct__18dPa_smokeEcallBackFUc */
dPa_smokeEcallBack::dPa_smokeEcallBack(u8) {
dPa_smokeEcallBack::dPa_smokeEcallBack(u8 param_1) {
/* Nonmatching */
GXColor local_18 = {0xa0, 0xa0, 0x80, 0xff};
field_0x16 = local_18;
mRateOff = param_1;
field_0x12 = 0;
mTevstr = NULL;
field_0x14 = -1;
field_0x15 = 0;
}
/* 8007B4B0-8007B558 .text __ct__18dPa_smokeEcallBackFUcUcUcUc */
dPa_smokeEcallBack::dPa_smokeEcallBack(u8, u8, u8, u8) {
dPa_smokeEcallBack::dPa_smokeEcallBack(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
/* Nonmatching */
GXColor local_28 = {0xa0, 0xa0, 0x80, 0xff};
field_0x16 = local_28;
mRateOff = param_1;
field_0x12 = param_2;
field_0x13 = param_4;
mTevstr = NULL;
field_0x14 = -1;
mFlag = param_3;
field_0x15 = 0;
}
/* 8007B558-8007B5E8 .text __ct__18dPa_smokeEcallBackFRC8_GXColorP12dKy_tevstr_cUc */
dPa_smokeEcallBack::dPa_smokeEcallBack(const _GXColor&, dKy_tevstr_c*, u8) {
/* Nonmatching */
dPa_smokeEcallBack::dPa_smokeEcallBack(const _GXColor& param_1, dKy_tevstr_c* param_2, u8 param_3) {
field_0x16 = param_1;
mTevstr = param_2;
mRateOff = param_3;
field_0x12 = 0;
field_0x14 = -1;
}
/* 8007B5E8-8007B698 .text setup__18dPa_smokeEcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
@@ -259,9 +283,7 @@ dPa_simpleEcallBack::dPa_simpleEcallBack() {
}
/* 8007C45C-8007C460 .text __ct__16dPa_simpleData_cFv */
dPa_simpleData_c::dPa_simpleData_c() {
/* Nonmatching */
}
dPa_simpleData_c::dPa_simpleData_c() {}
/* 8007C460-8007C618 .text executeAfter__19dPa_simpleEcallBackFP14JPABaseEmitter */
void dPa_simpleEcallBack::executeAfter(JPABaseEmitter* param_1) {
src/d/d_snap.cpp
+16 -10
View File
@@ -33,7 +33,19 @@ void dSnap_GetFigRoomId(int) {
/* 800CD00C-800CD068 .text __ct__9dSnap_ObjFv */
dSnap_Obj::dSnap_Obj() {
/* Nonmatching */
mBsPcId = -1;
field_0x18 = 0;
field_0x19 = 4;
field_0x1a = -1;
field_0x1b = 0;
field_0x1c = 0x7fff;
field_0x1e = 0;
field_0x20 = 0;
field_0x24 = 0.0f;
field_0x28 = 0;
field_0x2a = 0;
field_0x2c = 0;
field_0x2e = 0;
}
/* 800CD068-800CD6D0 .text CalcArea2D__9dSnap_ObjFv */
@@ -248,16 +260,10 @@ void dSnap_DebugDraw() {
void dSnap_Delete() {}
/* 800CF058-800CF0DC .text __dt__12dSnap_packetFv */
dSnap_packet::~dSnap_packet() {
/* Nonmatching */
}
dSnap_packet::~dSnap_packet() {}
/* 800CF0DC-800CF138 .text __dt__18dSnap_RegistObjElmFv */
dSnap_RegistObjElm::~dSnap_RegistObjElm() {
/* Nonmatching */
}
dSnap_RegistObjElm::~dSnap_RegistObjElm() {}
/* 800CF2E0-800CF31C .text __ct__18dSnap_RegistObjElmFv */
dSnap_RegistObjElm::dSnap_RegistObjElm() {
/* Nonmatching */
}
dSnap_RegistObjElm::dSnap_RegistObjElm() {}
src/d/d_vibration.cpp
+35 -6
View File
@@ -4,6 +4,22 @@
//
#include "d/d_vibration.h"
#include "m_Do/m_Do_controller_pad.h"
namespace {
void makedata(u16*, u32, s32) {
/* Nonmatching */
}
void rollshift(u32, s32, s32) {
/* Nonmatching */
}
void makebits(u32, s32, s32) {
/* Nonmatching */
}
void randombit(s32, s32) {
/* Nonmatching */
}
};
/* 8009C73C-8009CCCC .text Run__12dVibration_cFv */
int dVibration_c::Run() {
@@ -32,22 +48,35 @@ int dVibration_c::StopQuake(int) {
/* 8009CFEC-8009D044 .text Kill__12dVibration_cFv */
void dVibration_c::Kill() {
/* Nonmatching */
g_mDoCPd_gamePad[0]->stopMotorWaveHard();
g_mDoCPd_gamePad[0]->stopMotorHard();
setDefault();
}
/* 8009D044-8009D06C .text CheckQuake__12dVibration_cFv */
bool dVibration_c::CheckQuake() {
/* Nonmatching */
return field_0x24 != -1 || field_0x60 != -1;
}
/* 8009D06C-8009D0AC .text setDefault__12dVibration_cFv */
void dVibration_c::setDefault() {
/* Nonmatching */
field_0x48 = -1;
field_0x0 = -1;
field_0x60 = -1;
field_0x24 = -1;
field_0x58 = -99;
field_0x20 = -99;
field_0x70 = -99;
field_0x44 = -99;
field_0x74 = -99;
field_0x5c = -99;
field_0x7c = 0;
field_0x78 = 0;
}
/* 8009D0AC-8009D0CC .text Init__12dVibration_cFv */
void dVibration_c::Init() {
/* Nonmatching */
setDefault();
}
/* 8009D0CC-8009D188 .text Pause__12dVibration_cFv */
@@ -57,10 +86,10 @@ void dVibration_c::Pause() {
/* 8009D188-8009D1C4 .text __ct__12dVibration_cFv */
dVibration_c::dVibration_c() {
/* Nonmatching */
setDefault();
}
/* 8009D1C4-8009D220 .text __dt__12dVibration_cFv */
dVibration_c::~dVibration_c() {
/* Nonmatching */
Kill();
}