mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-29 09:40:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc matches (#2845)

Browse Source 
* Misc debug matches

* Fix d_map weak function order

* Remove old nonmatching comments

* d_menu_dmap and JASAudioThread OK, fix weak func order and rodata alignment

* More misc matches
This commit is contained in:
LagoLunatic
2025-11-21 18:52:16 -05:00
committed by GitHub
parent 3f6f4ae616
commit d161aec619
55 changed files with 341 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JStudio/JStudio/fvb.cpp
+9 -9
View File
@@ -17,8 +17,8 @@ TObject::~TObject() {
}
void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
JUT_ASSERT(35, pfv_!=0);
JUT_ASSERT(36, pControl!=0);
JUT_ASSERT(35, pfv_!=NULL);
JUT_ASSERT(36, pControl!=NULL);
TFunctionValueAttributeSet set = pfv_->getAttributeSet();
const void* pNext = (const void*)rBlock.getNext();
const void* pData = (const void*)rBlock.getContent();
@@ -37,7 +37,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
break;
case 0x10: {
JGADGET_ASSERTWARN(61, u32Size>=4);
JUT_ASSERT(62, pContent!=0);
JUT_ASSERT(62, pContent!=NULL);
TFunctionValueAttribute_refer* pfvaRefer = set.refer_get();
JGADGET_ASSERTWARN(64, pfvaRefer!=NULL);
if (pfvaRefer == NULL) {
@@ -63,7 +63,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
} break;
case 0x11: {
JGADGET_ASSERTWARN(93, u32Size>=4);
JUT_ASSERT(94, pContent!=0);
JUT_ASSERT(94, pContent!=NULL);
TFunctionValueAttribute_refer* pfvaRefer = set.refer_get();
JGADGET_ASSERTWARN(96, pfvaRefer!=NULL);
if (pfvaRefer == NULL) {
@@ -88,7 +88,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
} break;
case 0x12: {
JGADGET_ASSERTWARN(121, u32Size==8);
JUT_ASSERT(122, pContent!=0);
JUT_ASSERT(122, pContent!=NULL);
TFunctionValueAttribute_range* pfvaRange = set.range_get();
JGADGET_ASSERTWARN(124, pfvaRange!=NULL);
if (pfvaRange == NULL) {
@@ -100,7 +100,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
} break;
case 0x13: {
JGADGET_ASSERTWARN(138, u32Size==4);
JUT_ASSERT(139, pContent!=0);
JUT_ASSERT(139, pContent!=NULL);
TFunctionValueAttribute_range* pfvaRange = set.range_get();
JGADGET_ASSERTWARN(141, pfvaRange!=NULL);
if (pfvaRange == NULL) {
@@ -113,7 +113,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
} break;
case 0x14: {
JGADGET_ASSERTWARN(156, u32Size==4);
JUT_ASSERT(157, pContent!=0);
JUT_ASSERT(157, pContent!=NULL);
TFunctionValueAttribute_range* pfvaRange = set.range_get();
JGADGET_ASSERTWARN(159, pfvaRange!=NULL);
if (pfvaRange == NULL) {
@@ -126,7 +126,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
} break;
case 0x15: {
JGADGET_ASSERTWARN(174, u32Size==4);
JUT_ASSERT(175, pContent!=0);
JUT_ASSERT(175, pContent!=NULL);
TFunctionValueAttribute_range* pfvaRange = set.range_get();
JGADGET_ASSERTWARN(177, pfvaRange!=NULL);
if (pfvaRange == NULL) {
@@ -140,7 +140,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
} break;
case 0x16: {
JGADGET_ASSERTWARN(193, u32Size==4);
JUT_ASSERT(194, pContent!=0);
JUT_ASSERT(194, pContent!=NULL);
TFunctionValueAttribute_interpolate* pfvaInterpolate = set.interpolate_get();
JGADGET_ASSERTWARN(197, pfvaInterpolate!=NULL);
if (pfvaInterpolate == NULL) {
src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
+8 -1
View File
@@ -8,6 +8,9 @@
#include "JSystem/JStudio/JStudio_JAudio2/control.h"
#include "JSystem/JStudio/JStudio_JStage/control.h"
namespace JStudio_JAudio2 {
namespace {
/* 8028D728-8028D750 288068 0028+00 1/1 0/0 0/0 .text
* setValue_VOLUME___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf */
static void setValue_VOLUME_(JAISound *param_1, float param_2) {
@@ -41,6 +44,9 @@ static void setValue_ECHO_(JAISound *param_1, float param_2) {
param_1->getAuxiliary().moveFxMix(param_2, 0);
}
}; // namespace
}; // namespace JStudio_JAudio2
/* 8028D828-8028D8F4 288168 00CC+00 0/0 1/1 0/0 .text
* __ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject */
JStudio_JAudio2::TAdaptor_sound::TAdaptor_sound(JStudio_JAudio2::TCreateObject* param_1) :
@@ -139,10 +145,11 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_update(u32 param_1) {
field_0x130 = *pVVar2;
if (field_0x11d) {
switch(field_0x120) {
case 2:
case 2: {
JAISoundStarter* soundStarter = pCreateObject_->get_pJAISoundStarter_();
soundStarter->startLevelSound(field_0x124, &opJAISoundHandle_, field_0x12c);
break;
}
case 1:
field_0x120 = 2;
break;