mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-17 13:00:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Get more JSystem TUs compiling

Browse Source
This commit is contained in:
LagoLunatic
2024-03-05 16:41:32 -05:00
parent 7f543cf441
commit 56107e697a
12 changed files with 363 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JGadget/binary.cpp
+54 -8
View File
@@ -3,21 +3,67 @@
// Translation Unit: binary.cpp
//
#include "binary.h"
#include "JSystem/JGadget/binary.h"
#include "dolphin/types.h"
namespace JGadget {
namespace binary {
/* 802BFA48-802BFAAC .text parseVariableUInt_16_32_following__Q27JGadget6binaryFPCvPUlPUlPQ37JGadget6binary5TEBit */
void JGadget::binary::parseVariableUInt_16_32_following(const void*, unsigned long*, unsigned long*, JGadget::binary::TEBit*) {
/* Nonmatching */
const void* parseVariableUInt_16_32_following(const void* buffer, u32* param_1, u32* param_2, TEBit* bit) {
JGadget::binary::TEBit temp;
if (bit == NULL) {
bit = &temp;
}
u32 uVar1 = *(u16*)buffer;
if ((uVar1 & 0x8000) == 0) {
bit->value = 0x10;
*param_1 = uVar1;
*param_2 = *(u16*)((u8*)buffer + 2);
return (u8*)buffer + 4;
}
bit->value = 0x20;
uVar1 <<= 16;
uVar1 &= 0x7fff0000;
uVar1 |= *(u16*)((u8*)buffer + 2);
*param_1 = uVar1;
*param_2 = *(u32*)((u8*)buffer + 4);
return (u8*)buffer + 8;
}
/* 802BFAAC-802BFAF4 .text __dt__Q37JGadget6binary19TParse_header_blockFv */
JGadget::binary::TParse_header_block::~TParse_header_block() {
/* Nonmatching */
}
TParse_header_block::~TParse_header_block() {}
/* 802BFAF4-802BFC00 .text parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl */
void JGadget::binary::TParse_header_block::parse_next(const void**, unsigned long) {
/* Nonmatching */
bool TParse_header_block::parse_next(const void** ptrLocation, u32 idx) {
u32 headerEnd, blockEnd;
if ((ptrLocation == NULL) || (*ptrLocation == NULL)) {
return false;
}
bool check, checkLastBlock;
checkLastBlock = check = false;
check = checkNext(ptrLocation, &headerEnd, idx);
checkLastBlock = check;
if (!(idx & 1) && (check == false)) {
return check;
}
while (headerEnd > 0) {
check = false;
if (parseBlock_next(ptrLocation, &blockEnd, idx) && checkLastBlock) {
check = true;
}
checkLastBlock = check;
if (((idx & 2) == 0) && (check == false)) {
return check;
}
headerEnd--;
}
return checkLastBlock;
}
} // namespace binary
} // namespace JGadget
src/JSystem/JGadget/std-vector.cpp
+27 -20
View File
@@ -3,46 +3,53 @@
// Translation Unit: std-vector.cpp
//
#include "std-vector.h"
#include "JSystem/JGadget/vector.h"
#include "dolphin/types.h"
namespace JGadget {
/* 802BFF14-802BFF1C .text extend_default__Q27JGadget6vectorFUlUlUl */
void JGadget::vector::extend_default(unsigned long, unsigned long, unsigned long) {
/* Nonmatching */
u32 vector::extend_default(u32, u32 param_2, u32) {
return param_2 * 2;
}
/* 802BFF1C-802BFF48 .text __ct__Q27JGadget20TVector_pointer_voidFRCQ27JGadget14TAllocator<Pv> */
JGadget::TVector_pointer_void::TVector_pointer_void(const JGadget::TAllocator<void*>&) {
/* Nonmatching */
TVector_pointer_void::TVector_pointer_void(const TAllocator<void*>& allocator) {
_00 = allocator._00;
mBegin = NULL;
mEnd = mBegin;
_0C = NULL;
mExtend = vector::extend_default;
}
/* 802BFF48-802BFFF0 .text __dt__Q27JGadget20TVector_pointer_voidFv */
JGadget::TVector_pointer_void::~TVector_pointer_void() {
TVector_pointer_void::~TVector_pointer_void() {
/* Nonmatching */
}
/* 802BFFF0-802C0010 .text insert__Q27JGadget20TVector_pointer_voidFPPvRCPv */
void JGadget::TVector_pointer_void::insert(void**, void* const&) {
void TVector_pointer_void::insert(void**, void* const&) {
/* Nonmatching */
}
/* 802C0010-802C0068 .text erase__Q27JGadget20TVector_pointer_voidFPPvPPv */
void JGadget::TVector_pointer_void::erase(void**, void**) {
void TVector_pointer_void::erase(void**, void**) {
/* Nonmatching */
}
/* 802C0068-802C00D8 .text insert__Q27JGadget38TVector<Pv,Q27JGadget14TAllocator<Pv>>FPPvUlRCPv */
void JGadget::TVector<void*, JGadget::TAllocator<void*>>::insert(void**, unsigned long, void* const&) {
/* Nonmatching */
}
// /* 802C0068-802C00D8 .text insert__Q27JGadget38TVector<Pv,Q27JGadget14TAllocator<Pv>>FPPvUlRCPv */
// void TVector<void*, TAllocator<void*>>::insert(void**, u32, void* const&) {
// /* Nonmatching */
// }
/* 802C00D8-802C037C .text Insert_raw__Q27JGadget38TVector<Pv,Q27JGadget14TAllocator<Pv>>FPPvUl */
void JGadget::TVector<void*, JGadget::TAllocator<void*>>::Insert_raw(void**, unsigned long) {
/* Nonmatching */
}
// /* 802C00D8-802C037C .text Insert_raw__Q27JGadget38TVector<Pv,Q27JGadget14TAllocator<Pv>>FPPvUl */
// void TVector<void*, TAllocator<void*>>::Insert_raw(void**, u32) {
// /* Nonmatching */
// }
/* 802C037C-802C03D4 .text insert__Q27JGadget38TVector<Pv,Q27JGadget14TAllocator<Pv>>FPPvRCPv */
void JGadget::TVector<void*, JGadget::TAllocator<void*>>::insert(void**, void* const&) {
/* Nonmatching */
}
// /* 802C037C-802C03D4 .text insert__Q27JGadget38TVector<Pv,Q27JGadget14TAllocator<Pv>>FPPvRCPv */
// void TVector<void*, TAllocator<void*>>::insert(void**, void* const&) {
// /* Nonmatching */
// }
} // namespace JGadget
src/JSystem/JStudio/JStudio/fvb.cpp
+2 -3
View File
@@ -49,7 +49,7 @@ void TObject::prepare(const data::TParse_TBlock& rBlock, TControl* pControl) {
} else {
JGadget::TVector_pointer<TFunctionValue*>& rCnt = pfvaRefer->refer_referContainer();
data::TParse_TParagraph::TData** pBegin =
(data::TParse_TParagraph::TData**)rCnt.pBegin_;
(data::TParse_TParagraph::TData**)rCnt.mBegin;
// todo: these definitely use a different struct
for (data::TParse_TParagraph::TData* i = *pBegin; i != NULL; i = *pBegin) {
TObject* pObject = pControl->getObject(pContent, i->u32Size);
@@ -75,7 +75,7 @@ void TObject::prepare(const data::TParse_TBlock& rBlock, TControl* pControl) {
} else {
JGadget::TVector_pointer<TFunctionValue*>& rCnt = pfvaRefer->refer_referContainer();
data::TParse_TParagraph::TData** pBegin =
(data::TParse_TParagraph::TData**)rCnt.pBegin_;
(data::TParse_TParagraph::TData**)rCnt.mBegin;
for (data::TParse_TParagraph::TData* i = *pBegin; i != NULL; i = *pBegin) {
TObject* pObject = pControl->getObject_index(u32Size);
if (pObject == NULL) {
@@ -198,7 +198,6 @@ TFunctionValue_composite::TData getCompositeData_multiply_(const void* arg1) {
/* 80273C18-80273C24 .text getCompositeData_divide___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv */
TFunctionValue_composite::TData getCompositeData_divide_(const void* arg1) {
/* Nonmatching */
return TFunctionValue_composite::TData(*(f32*)arg1);
}
src/JSystem/JStudio/JStudio_JAudio/control.cpp
+45 -6
View File
@@ -3,17 +3,56 @@
// Translation Unit: control.cpp
//
#include "control.h"
#include "JSystem/JStudio/JStudio_JAudio/control.h"
#include "dolphin/types.h"
namespace JStudio_JAudio {
namespace {
// Fake inline.
// TODO: supposed to use JStudio::TObject::createFromAdaptor instead of this somehow
inline JStudio::TObject_sound* sound_creator(const JStudio::stb::data::TParse_TBlock_object& data, JStudio_JAudio::TAdaptor_sound* adaptor)
{
JStudio::TObject_sound* object = new JStudio::TObject_sound(data, adaptor);
if (!object) {
return NULL;
}
if (object->mpAdaptor) {
object->mpAdaptor->adaptor_do_prepare(object);
}
return object;
}
/* 80278B98-80278C4C .text createObject_SOUND_JAI___Q214JStudio_JAudio21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectP8JAIBasic */
JStudio::TObject* createObject_SOUND_JAI_(const JStudio::stb::data::TParse_TBlock_object& parseBlock, JAIBasic* sound) {
TAdaptor_sound* adaptor = new TAdaptor_sound(sound);
if (!adaptor) {
return NULL;
}
return sound_creator(parseBlock, adaptor);
}
} // namespace
/* 80278C4C-80278CAC .text __dt__Q214JStudio_JAudio13TCreateObjectFv */
JStudio_JAudio::TCreateObject::~TCreateObject() {
/* Nonmatching */
}
TCreateObject::~TCreateObject() {}
/* 80278CAC-80278D20 .text create__Q214JStudio_JAudio13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object */
void JStudio_JAudio::TCreateObject::create(JStudio::TObject**, const JStudio::stb::data::TParse_TBlock_object&) {
/* Nonmatching */
bool TCreateObject::create(JStudio::TObject** object, const JStudio::stb::data::TParse_TBlock_object& data) {
JStudioAudioCreateFunc createFunc;
switch (data.get()->type) {
case 'JSND':
createFunc = createObject_SOUND_JAI_;
break;
default:
return false;
}
*object = createFunc(data, mSound);
return true;
}
} // namespace JStudio_JAudio
src/JSystem/JStudio/JStudio_JAudio/object-sound.cpp
+39 -48
View File
@@ -3,86 +3,77 @@
// Translation Unit: object-sound.cpp
//
#include "object-sound.h"
#include "JSystem/JStudio/JStudio_JAudio/object-sound.h"
#include "JSystem/JAudio/JAISound.h"
#include "math.h"
#include "dolphin/types.h"
namespace JStudio_JAudio {
/* 80278D20-80278DC0 .text __ct__Q214JStudio_JAudio14TAdaptor_soundFP8JAIBasic */
JStudio_JAudio::TAdaptor_sound::TAdaptor_sound(JAIBasic*) {
/* Nonmatching */
TAdaptor_sound::TAdaptor_sound(JAIBasic* basic) {
mpBasic = basic;
mpSound = NULL;
_F0 = -1;
_F4 = 0;
}
/* 80278DC0-80278E38 .text __dt__Q214JStudio_JAudio14TAdaptor_soundFv */
JStudio_JAudio::TAdaptor_sound::~TAdaptor_sound() {
/* Nonmatching */
TAdaptor_sound::~TAdaptor_sound() {
if (mpSound != NULL) {
mpSound->stop(0);
}
}
/* 80278E38-80278F40 .text adaptor_do_prepare__Q214JStudio_JAudio14TAdaptor_soundFPCQ27JStudio7TObject */
void JStudio_JAudio::TAdaptor_sound::adaptor_do_prepare(const JStudio::TObject*) {
/* Nonmatching */
void TAdaptor_sound::adaptor_do_prepare(const JStudio::TObject* param_1) {
static TSetVariableValue_immediate aoData[] = {
TSetVariableValue_immediate(0, 0.0f),
TSetVariableValue_immediate(1, 0.0f),
TSetVariableValue_immediate(2, 0.0f),
TSetVariableValue_immediate(0xFFFFFFFF, NAN),
};
adaptor_setVariableValue_immediate(aoData);
pValue_[3].setOutput(&TAdaptor_sound::soVVOOn_BEGIN_FADE_IN_);
pValue_[4].setOutput(&TAdaptor_sound::soVVOOn_END_FADE_OUT_);
for (TAdaptor_sound::TVVOSetValue_* value = TAdaptor_sound::saoVVOSetValue_; value->_04 != -1; value++) {
pValue_[value->_04].setOutput(value);
}
}
TAdaptor_sound::TVVOOn_BEGIN_FADE_IN_ TAdaptor_sound::soVVOOn_BEGIN_FADE_IN_;
TAdaptor_sound::TVVOOn_END_FADE_OUT_ TAdaptor_sound::soVVOOn_END_FADE_OUT_;
TAdaptor_sound::TVVOSetValue_ TAdaptor_sound::saoVVOSetValue_[6];
/* 80278F40-80278FB8 .text adaptor_do_update__Q214JStudio_JAudio14TAdaptor_soundFPCQ27JStudio7TObjectUl */
void JStudio_JAudio::TAdaptor_sound::adaptor_do_update(const JStudio::TObject*, unsigned long) {
void TAdaptor_sound::adaptor_do_update(const JStudio::TObject*, unsigned long) {
/* Nonmatching */
}
/* 80278FB8-80279064 .text adaptor_do_SOUND__Q214JStudio_JAudio14TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */
void JStudio_JAudio::TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperationData, const void*, unsigned long) {
void TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperationData, const void*, unsigned long) {
/* Nonmatching */
}
/* 80279064-8027908C .text adaptor_do_LOCATED__Q214JStudio_JAudio14TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */
void JStudio_JAudio::TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperationData, const void*, unsigned long) {
void TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperationData, const void*, unsigned long) {
/* Nonmatching */
}
/* 8027908C-8027915C .text __cl__Q314JStudio_JAudio14TAdaptor_sound21TVVOOn_BEGIN_FADE_IN_CFfPQ27JStudio8TAdaptor */
void JStudio_JAudio::TAdaptor_sound::TVVOOn_BEGIN_FADE_IN_::operator()(float, JStudio::TAdaptor*) const {
void TAdaptor_sound::TVVOOn_BEGIN_FADE_IN_::operator()(float, JStudio::TAdaptor*) const {
/* Nonmatching */
}
/* 8027915C-8027919C .text __cl__Q314JStudio_JAudio14TAdaptor_sound20TVVOOn_END_FADE_OUT_CFfPQ27JStudio8TAdaptor */
void JStudio_JAudio::TAdaptor_sound::TVVOOn_END_FADE_OUT_::operator()(float, JStudio::TAdaptor*) const {
void TAdaptor_sound::TVVOOn_END_FADE_OUT_::operator()(float, JStudio::TAdaptor*) const {
/* Nonmatching */
}
/* 8027919C-802791D8 .text __cl__Q314JStudio_JAudio14TAdaptor_sound13TVVOSetValue_CFfPQ27JStudio8TAdaptor */
void JStudio_JAudio::TAdaptor_sound::TVVOSetValue_::operator()(float, JStudio::TAdaptor*) const {
/* Nonmatching */
}
/* 802791D8-802791FC .text setDemoFxmix__8JAISoundFfUl */
void JAISound::setDemoFxmix(float, unsigned long) {
/* Nonmatching */
}
/* 802791FC-80279220 .text setDemoPitch__8JAISoundFfUl */
void JAISound::setDemoPitch(float, unsigned long) {
/* Nonmatching */
}
/* 80279220-80279244 .text setDemoPan__8JAISoundFfUl */
void JAISound::setDemoPan(float, unsigned long) {
/* Nonmatching */
}
/* 80279244-80279268 .text setDemoVolume__8JAISoundFfUl */
void JAISound::setDemoVolume(float, unsigned long) {
/* Nonmatching */
}
/* 80279268-802792C8 .text __dt__Q314JStudio_JAudio14TAdaptor_sound13TVVOSetValue_Fv */
JStudio_JAudio::TAdaptor_sound::TVVOSetValue_::~TVVOSetValue_() {
/* Nonmatching */
}
/* 802792C8-80279328 .text __dt__Q314JStudio_JAudio14TAdaptor_sound20TVVOOn_END_FADE_OUT_Fv */
JStudio_JAudio::TAdaptor_sound::TVVOOn_END_FADE_OUT_::~TVVOOn_END_FADE_OUT_() {
/* Nonmatching */
}
/* 80279328-80279388 .text __dt__Q314JStudio_JAudio14TAdaptor_sound21TVVOOn_BEGIN_FADE_IN_Fv */
JStudio_JAudio::TAdaptor_sound::TVVOOn_BEGIN_FADE_IN_::~TVVOOn_BEGIN_FADE_IN_() {
void TAdaptor_sound::TVVOSetValue_::operator()(float, JStudio::TAdaptor*) const {
/* Nonmatching */
}
}; // namespace JStudio_JAudio
src/d/actor/d_a_ikari.cpp
-1
View File
@@ -119,7 +119,6 @@ int daIkari_c::_create() {
if (!fopAcM_entrySolidHeap(this, createHeap_CB, 0xC20)) {
return cPhs_ERROR_e;
} else {
/* 00000524 00000618 4B FF FB E9 bl setMtx__9daIkari_cFv */
setMtx();
f32 mScaleX = mScale.x;