diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-12-19 11:06:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 12:06:32 -0700 |
| commit | ca71275bbecc7db9a4eeca3a6ac4215b66de4318 (patch) | |
| tree | c2851f8cec211216fe0cb6a31a0260a62fc3bf53 /src/d/d_demo.cpp | |
| parent | 1114b13da81ab0b52fd4bb56a32f32331a21e581 (diff) | |
big d_a_alink pass (#214)
* d_a_alink pass1 wip
* more d_a_alink work
* remove asm
* more daalink work
* 20% dol code decompiled
* fixed some nonmatchings for building
* a few daalink functions and labeling some HIO data
Diffstat (limited to 'src/d/d_demo.cpp')
| -rw-r--r-- | src/d/d_demo.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 370e64da47..5d6bcdf13e 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -249,7 +249,7 @@ extern "C" extern void* __vt__Q214JStudio_JStage13TCreateObject[4]; extern "C" extern void* __vt__Q215JStudio_JAudio213TCreateObject[4]; extern "C" extern void* __vt__Q217JStudio_JParticle13TCreateObject[6]; extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 data_80450B74[4]; +extern "C" extern Z2SoundStarter* data_80450B74; extern "C" u8 mEmitterMng__13dPa_control_c[4]; // @@ -790,7 +790,7 @@ int dDemo_setDemoData(fopAc_ac_c* param_0, u8 param_1, mDoExt_McaMorf* param_2, } if (flags & 8) { - param_0->mCollisionRot = demo_actor->getRatate(); + param_0->shape_angle = demo_actor->getRatate(); } if (flags & 4) { @@ -1427,6 +1427,10 @@ bool dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorNa /* 80451DE0-80451DE8 0003E0 0008+00 1/1 0/0 0/0 .sdata2 @5123 */ SECTION_SDATA2 static f64 lit_5123 = 1.0 / 29.999998435378155; +inline Z2SoundStarter* Z2GetSoundStarter() { + return data_80450B74; +} + /* 80039678-80039910 033FB8 0298+00 0/0 1/1 0/0 .text create__7dDemo_cFv */ #ifdef NONMATCHING void dDemo_c::create() { @@ -1442,10 +1446,10 @@ void dDemo_c::create() { m_control->setSecondPerFrame(1.0 / 29.999998435378155); m_control->setFactory(m_factory); - m_control->appendCreateObject(m_stage); - m_control->appendCreateObject(m_audio); - m_control->appendCreateObject(m_particle); - m_control->appendCreateObject(m_message); + m_factory->appendCreateObject(m_stage); + m_factory->appendCreateObject(m_audio); + m_factory->appendCreateObject(m_particle); + m_factory->appendCreateObject(m_message); m_system->setObject(m_object); m_data = NULL; |