mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-20 07:31:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
LagoLunatic
2026-04-12 20:03:12 -04:00
parent c0205a02b5
commit 2d0dc6ea49
8 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+2 -2
View File
@@ -519,7 +519,7 @@ config.libs = [
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_event_data.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_event_manager.cpp"),
Object(Matching, "d/d_magma.cpp"),
Object(Matching, "d/d_boss_magma.cpp"),
Object(Matching, "d/d_boss_magma.cpp"),
Object(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d/d_grass.cpp"),
Object(NonMatching, "d/d_tree.cpp"),
Object(NonMatching, "d/d_particle.cpp"),
@@ -1531,7 +1531,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_npc_cb1"),
ActorRel(NonMatching, "d_a_npc_md"),
ActorRel(NonMatching, "d_a_npc_so"),
ActorRel(Matching, "d_a_nzg"),
ActorRel(Matching, "d_a_nzg"),
ActorRel(NonMatching, "d_a_obj_aygr"),
ActorRel(NonMatching, "d_a_obj_balancelift"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_barrier"),
include/d/d_magma.h
+1 -1
View File
@@ -41,7 +41,7 @@ private:
class dMagma_ballBoss_c : public dMagma_ball_c {
public:
dMagma_ballBoss_c() {}
virtual ~dMagma_ballBoss_c();
virtual ~dMagma_ballBoss_c() {}
virtual void calc(f32, u8, int);
virtual void update();
virtual void setup(f32, u8, int);
src/JSystem/JStudio/JStudio/jstudio-object.cpp
-1
View File
@@ -69,7 +69,6 @@ void JStudio::TVariableValue::update_functionValue_(JStudio::TVariableValue* par
/* 8026EA58-8026EAB8 .text __dt__Q37JStudio14TVariableValue13TOutput_none_Fv */
JStudio::TVariableValue::TOutput_none_::~TOutput_none_() {
/* Nonmatching */
}
/* 8026EAB8-8026EABC .text __cl__Q37JStudio14TVariableValue13TOutput_none_CFfPQ27JStudio8TAdaptor */
src/d/actor/d_a_auction.cpp
+4 -1
View File
@@ -61,7 +61,10 @@ static daAuction_c::ItemData l_item_dat2[] = {
{PRESIDENT_STATUE, 0x1D15, 40, dSv_event_flag_c::UNK_1004},
};
static s16 l_item_dat22[] = {0x002A, 0x00F9};
static s16 l_item_dat22[] = {
dItem_MAGIC_ARMOR_e,
dItem_COLLECT_MAP_06_e,
};
static NpcDatStruct l_npc_dat[7] = {
{2.0f, 2.1f, 0x0, 0x0, 1000},
src/d/actor/d_a_nzg.cpp
+34 -37
View File
@@ -39,8 +39,6 @@ static f32 dummy40(int arg1) {
/* 000000E4-00000348 .text nzg_00_move__FP9nzg_class */
void nzg_00_move(nzg_class* i_this) {
/* Nonmatching for Demo */
//fixes regswap issue in demo for the most part but introduces a misplaced instruction error
fopAc_ac_c* actor = &i_this->actor;
if (i_this->m2C2[0] != 0 || i_this->m2BE >= i_this->m2C0) {
@@ -162,45 +160,14 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
/* 00000620-00000864 .text daNZG_Create__FP10fopAc_ac_c */
static cPhs_State daNZG_Create(fopAc_ac_c* i_this) {
static dCcD_SrcCyl body_cyl_src = {
// dCcD_SrcGObjInf
{
/* Flags */ 0,
/* SrcObjAt Type */ 0,
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e | cCcD_CoSPrm_NoCrr_e,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e,
/* SrcGObjAt Spl */ dCcG_At_Spl_UNK0,
/* SrcGObjAt Mtrl */ 0,
/* SrcGObjAt SPrm */ 0,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0,
/* SrcGObjTg Mtrl */ 0,
/* SrcGObjTg SPrm */ 0,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
{{
/* Center */ {0.0f, 0.0f, 0.0f},
/* Radius */ 50.0f,
/* Height */ 20.0f,
}},
};
#if VERSION == VERSION_DEMO
nzg_class* nzg_this = (nzg_class*)i_this;
cPhs_State phase_state = dComIfG_resLoad(&nzg_this->mPhs, "NZG");
if (phase_state == cPhs_COMPLEATE_e) {
fopAcM_SetupActor(i_this, nzg_class);
#else
nzg_class* nzg_this = (nzg_class*)i_this;
#if VERSION > VERSION_DEMO
fopAcM_SetupActor(i_this, nzg_class);
#endif
cPhs_State phase_state = dComIfG_resLoad(&nzg_this->mPhs, "NZG");
if (phase_state == cPhs_COMPLEATE_e) {
#if VERSION == VERSION_DEMO
fopAcM_SetupActor(i_this, nzg_class);
#endif
if (!fopAcM_entrySolidHeap(&nzg_this->actor, useHeapInit, 0x680)) {
return cPhs_ERROR_e;
@@ -222,6 +189,36 @@ static cPhs_State daNZG_Create(fopAc_ac_c* i_this) {
if (nzg_this->m2BA > 2) {
nzg_this->m2BA = 0;
}
static dCcD_SrcCyl body_cyl_src = {
// dCcD_SrcGObjInf
{
/* Flags */ 0,
/* SrcObjAt Type */ 0,
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ cCcD_CoSPrm_Set_e | cCcD_CoSPrm_IsOther_e | cCcD_CoSPrm_VsGrpAll_e | cCcD_CoSPrm_NoCrr_e,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ dCcG_AtHitMark_None_e,
/* SrcGObjAt Spl */ dCcG_At_Spl_UNK0,
/* SrcGObjAt Mtrl */ 0,
/* SrcGObjAt SPrm */ 0,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ dCcG_Tg_Spl_UNK0,
/* SrcGObjTg Mtrl */ 0,
/* SrcGObjTg SPrm */ 0,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
{{
/* Center */ {0.0f, 0.0f, 0.0f},
/* Radius */ 50.0f,
/* Height */ 20.0f,
}},
};
nzg_this->mCyl.Set(body_cyl_src);
nzg_this->mCyl.SetStts(&nzg_this->mStts);
if (nzg_this->m2BA == 0) {
src/d/d_boss_magma.cpp
-5
View File
@@ -87,8 +87,3 @@ void dMagma_ballBoss_c::setup(f32 param_1, u8 param_2, int param_3) {
field_0x7C = (cM_rndF(100.0f) + 400.0f);
mWave = (cM_rndF(8.0f) * 4096.0f);
}
/* 80076FEC-80077048 .text __dt__17dMagma_ballBoss_cFv */
dMagma_ballBoss_c::~dMagma_ballBoss_c() {
/* Nonmatching */
}
src/d/d_cam_param.cpp
-1
View File
@@ -257,7 +257,6 @@ dCamSetup_c::dCamSetup_c() {
/* 800AFEE0-800AFF40 .text __dt__11dCamSetup_cFv */
dCamSetup_c::~dCamSetup_c() {
/* Nonmatching */
}
/* 800AFF40-800AFFB0 .text CheckLatitudeRange__11dCamSetup_cFPs */
src/d/d_s_open_sub.cpp
-1
View File
@@ -49,7 +49,6 @@ dScnOpen_message_c::dScnOpen_message_c(JKRExpHeap* heap) {
/* 80233620-80233698 .text __dt__18dScnOpen_message_cFv */
dScnOpen_message_c::~dScnOpen_message_c() {
/* Nonmatching */
mDoExt_removeMesgFont();
mDoExt_removeRubyFont();
JKRHeap* old_heap = mDoExt_setCurrentHeap(exp_heap);