mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 12:24:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

big d_a_alink pass (#214)

Browse Source 
* 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
This commit is contained in:
TakaRikka
2022-12-19 11:06:32 -08:00
committed by GitHub
parent 1114b13da8
commit ca71275bbe
727 changed files with 15610 additions and 33013 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/event/d_event.cpp
-7
View File
@@ -382,13 +382,6 @@ asm int dEvt_control_c::talkCheck(dEvt_order_c* param_0) {
#pragma pop
#endif
/* ############################################################################################## */
/* 80379D80-80379D80 0063E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80379DA3 = "DEFAULT_TALK_XY";
#pragma pop
/* 80041B58-80041C90 03C498 0138+00 1/1 0/0 0/0 .text
* talkXyCheck__14dEvt_control_cFP12dEvt_order_c */
int dEvt_control_c::talkXyCheck(dEvt_order_c* p_order) {
src/d/event/d_event_data.cpp
+12 -10
View File
@@ -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;
src/d/event/d_event_manager.cpp
+1 -1
View File
@@ -1044,7 +1044,7 @@ void dEvent_manager_c::cutEnd(int cutIndex) {
return;
} else if (cutIndex == -1) {
return;
} else if (field_0x1aa == -1) {
} else if (mCurrentEventCompositId == -1) {
return;
} else {
// instruction swap