mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-21 14:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Realmatch daIball_c::m_arcname

Browse Source
This commit is contained in:
LagoLunatic
2024-02-09 05:35:00 -05:00
parent d6c7644f25
commit cac8575a94
3 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_bita.h
-1
View File
@@ -11,7 +11,6 @@ class dBgW;
class bita_class : public fopAc_ac_c {
public:
/* Place member variables here */
/* 0x290 */ request_of_phase_process_class mPhs;
/* 0x298 */ J3DModel* mpModel;
/* 0x29C */ J3DModel* mpModelEf;
include/d/actor/d_a_ib.h
+1 -1
View File
@@ -42,7 +42,7 @@ public:
static u32 m_ib_actor[5];
static char m_arcname[];
static const char m_arcname[];
static dCcD_SrcCyl m_cyl_src;
public:
src/d/actor/d_a_ib.cpp
+35 -33
View File
@@ -320,39 +320,6 @@ void daIball_c::set_mtx() {
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
}
// TODO: This is a hack. I have no idea why this one variable needs to go in .data instead of .sdata.
SECTION_DATA char daIball_c::m_arcname[] = "Always";
dCcD_SrcCyl daIball_c::m_cyl_src = {
// dCcD_SrcGObjInf
{
/* Flags */ 0,
/* SrcObjAt Type */ 0,
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_LIGHT),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
/* SrcGObjAt Mtrl */ 0,
/* SrcGObjAt SPrm */ G_AT_SPRM_STOP_NO_CON_HIT,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
/* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
{
/* Center */ 0.0f, 0.0f, 0.0f,
/* Radius */ 30.0f,
/* Height */ 80.0f,
},
};
/* 800F42E8-800F441C .text CreateInit__9daIball_cFv */
void daIball_c::CreateInit() {
fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -512,6 +479,41 @@ static BOOL daIball_Execute(daIball_c* i_this) {
return i_this->_daIball_execute();
}
// This symbol needs to go in .data, but as it's only 7 bytes long, it would normally go in .sdata or .sdata2.
// But if the variable is only defined *after* it gets used in daIball_c::CreateHeap that forces it into .data.
// The size of the variable is ignored, and even whether it's const or not is ignored.
const char daIball_c::m_arcname[] = "Always";
dCcD_SrcCyl daIball_c::m_cyl_src = {
// dCcD_SrcGObjInf
{
/* Flags */ 0,
/* SrcObjAt Type */ 0,
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_LIGHT),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
/* SrcGObjAt Mtrl */ 0,
/* SrcGObjAt SPrm */ G_AT_SPRM_STOP_NO_CON_HIT,
/* SrcGObjTg Se */ 0,
/* SrcGObjTg HitMark */ 0,
/* SrcGObjTg Spl */ 0,
/* SrcGObjTg Mtrl */ 0,
/* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK,
/* SrcGObjCo SPrm */ 0,
},
// cM3dGCylS
{
/* Center */ 0.0f, 0.0f, 0.0f,
/* Radius */ 30.0f,
/* Height */ 80.0f,
},
};
actor_method_class l_daIball_Method = {
(process_method_func)daIball_Create,
(process_method_func)daIball_Delete,