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/event/d_event_data.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/event/d_event_data.cpp')
| -rw-r--r-- | src/d/event/d_event_data.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp index 91faacfcba..982b3d06d9 100644 --- a/src/d/event/d_event_data.cpp +++ b/src/d/event/d_event_data.cpp @@ -805,6 +805,8 @@ SECTION_SDATA2 static f32 lit_4669 = -1.0f; #ifdef NONMATCHING // matches besides floats void dEvDtStaff_c::specialProcSound() { + SoundData* data = (SoundData*)&mData; + int staffId = i_dComIfGp_evmng_getMyStaffId("SOUND", NULL, 0); if (staffId == -1) { return; @@ -843,7 +845,7 @@ void dEvDtStaff_c::specialProcSound() { specialProc_WaitProc(staffId); break; case 'NOMS': - if (mSoundWait <= dDemo_c::getFrameNoMsg()) { + if (data->timer <= dDemo_c::getFrameNoMsg()) { dComIfGp_evmng_cutEnd(staffId); } break; @@ -876,9 +878,9 @@ SECTION_DEAD static char const* const stringBase_80379E65 = "SCALE"; /* 80044CB8-80044EE4 03F5F8 022C+00 1/1 0/0 0/0 .text specialProcCreate__12dEvDtStaff_cFv */ +// matches with literals #ifdef NONMATCHING void dEvDtStaff_c::specialProcCreate() { - // regalloc char* name; u32 arg; cXyz pos; @@ -1097,12 +1099,12 @@ void dEvDtStaff_c::specialProcDirector() { dStage_MapEvent_dt_c* mapEvent = dEvt_control_c::searchMapEventData(data->unk); if (mapEvent != NULL) { if (mapEvent->mType == 0) { - data->mSoundWait = mapEvent->field_0x14; + data->unk2 = mapEvent->field_0x14; } else { - data->mSoundWait = -1; + data->unk2 = -1; } } else { - data->mSoundWait = 0; + data->unk2 = 0; } break; case 'CAST': @@ -1176,9 +1178,9 @@ void dEvDtStaff_c::specialProcDirector() { case 'NEXT': break; case 'VIBR': - if (data->mSoundWait > 0) { - data->mSoundWait--; - if (data->mSoundWait == 0) { + if (data->unk2 > 0) { + data->unk2--; + if (data->unk2 == 0) { dComIfGp_getVibration().StopQuake(0x1F); } } else { @@ -1197,8 +1199,8 @@ void dEvDtStaff_c::specialProcDirector() { } break; case 'MAPT': - data->mSoundWait--; - if (data->mSoundWait <= 0) { + data->unk2--; + if (data->unk2 <= 0) { dComIfGp_evmng_cutEnd(staffId); } break; |
