mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-18 04:48:21 -04:00
Misc fixes (#2860)
* Misc matches * Remove more old dol2asm stuff * Remove dCcS::SetMass-related fakematches No longer necessary with the PCH for some reason. * Use attention types enum in more places * Remove more dol2asm stuff * Clean up matDL_dis.py
This commit is contained in:
@@ -596,5 +596,3 @@ void J2DTextBoxEx::setAnimation(J2DAnmVtxColor* param_0) {
|
||||
void J2DTextBoxEx::setAnimation(J2DAnmBase* anm) {
|
||||
J2DPane::setAnimation(anm);
|
||||
}
|
||||
|
||||
/* 803A1DF0-803A1DF0 02E450 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
@@ -116,5 +116,3 @@ void J3DClusterLoader_v15::readCluster(const J3DClusterBlock* block) {
|
||||
|
||||
DCStoreRange(arr, vtxPosSize);
|
||||
}
|
||||
|
||||
/* 803A2098-803A2098 02E6F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
@@ -341,5 +341,3 @@ u32 J3DModelLoader::calcSizeMaterialDL(const J3DMaterialDLBlock* block, u32 flag
|
||||
}
|
||||
return size;
|
||||
}
|
||||
|
||||
/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
@@ -172,5 +172,3 @@ static char const* const stringBase_8039A9B8 = " J3DUClipper::mNear = %f";
|
||||
|
||||
/* 8039A9D1-8039A9F0 027031 0018+07 0/0 0/0 0/0 .rodata None */
|
||||
static char const* const stringBase_8039A9D1 = " J3DUClipper::mFar = %f";
|
||||
|
||||
/* 8039A984-8039A984 026FE4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
@@ -364,5 +364,3 @@ void JASDriver::mixInterleaveTrack(s16* buffer, u32 param_1, MixCallback param_2
|
||||
u32 JASDriver::getSubFrameCounter() {
|
||||
return sSubFrameCounter;
|
||||
}
|
||||
|
||||
/* 8039B2F0-8039B2F0 027950 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
@@ -122,5 +122,3 @@ void JASAudioThread::DSPCallback(void*) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 8039B338-8039B338 027998 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
@@ -799,7 +799,7 @@ void JASTrack::TList::append(JASTrack* i_track) {
|
||||
}
|
||||
|
||||
/* 8029301C-802930DC 28D95C 00C0+00 1/1 0/0 0/0 .text seqMain__Q28JASTrack5TListFv */
|
||||
// NONMATCHING missing load instruction
|
||||
// NONMATCHING - missing load instruction (matches debug, equivalent)
|
||||
void JASTrack::TList::seqMain() {
|
||||
iterator it, it2;
|
||||
for (it = begin(); it != end(); it = it2) {
|
||||
|
||||
@@ -67,7 +67,6 @@ s32 JKRAramStream::readFromAram() {
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 8039D120-8039D120 029780 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) {
|
||||
u32 dstSize = command->mSize;
|
||||
u32 offset = command->mOffset;
|
||||
|
||||
@@ -108,7 +108,7 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) {
|
||||
JStudio::TControl::TTransform_position_direction aTStack_1b0;
|
||||
adaptor_getVariableValue_Vec(&VStack_198.position, sauVariableValue_3_POSITION_XYZ);
|
||||
switch (field_0x11c) {
|
||||
case 1:
|
||||
case 1: {
|
||||
f32 dVar10 = adaptor_getVariableValue(10)->getValue();
|
||||
f32 dVar11 = adaptor_getVariableValue(11)->getValue();
|
||||
f32 temp = MTXDegToRad(dVar11);
|
||||
@@ -119,6 +119,7 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) {
|
||||
VStack_198.direction.y = sinVal;
|
||||
VStack_198.direction.z = dVar12 * i_cosf(temp2);
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
Vec VStack_1c0;
|
||||
adaptor_getVariableValue_Vec(&VStack_1c0, sauVariableValue_3_TARGET_POSITION_XYZ);
|
||||
|
||||
@@ -468,5 +468,3 @@ int JUTResFont::convertSjis(int inChr, u16* inLead) const {
|
||||
|
||||
return tmp2 + (tmp - 0x88) * 0xbc + -0x5e + lead;
|
||||
}
|
||||
|
||||
/* 8039D45C-8039D45C 029ABC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
|
||||
|
||||
Reference in New Issue
Block a user