Compare commits
3 Commits
cleanup/ao
...
cleanup/me
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
302504e198 | ||
|
|
9f4a70db74 | ||
|
|
e305e6047c |
@@ -4290,7 +4290,7 @@ __dt__Q43ipl5scene10MemoryBase9AnmButtonFv = .text:0x813CCF34; // type:function
|
||||
__dt__Q43ipl5scene10MemoryBase6ButtonFv = .text:0x813CCF74; // type:function size:0x40
|
||||
__dt__Q43ipl5scene10MemoryBase3AnmFv = .text:0x813CCFB4; // type:function size:0x40
|
||||
__dt__Q33ipl5scene15MemoryBaseEventFv = .text:0x813CCFF4; // type:function size:0x40
|
||||
iplMemoryCardManager_813CD034 = .text:0x813CD034; // type:function size:0x78
|
||||
compareMemoryCardSortEntries = .text:0x813CD034; // type:function size:0x78
|
||||
calc__Q33ipl5scene17MemoryCardManagerFv = .text:0x813CD0AC; // type:function size:0x4C
|
||||
isSlotReady__Q33ipl5scene17MemoryCardManagerFUc = .text:0x813CD0F8; // type:function size:0x44
|
||||
isSlotNoCard__Q33ipl5scene17MemoryCardManagerFUc = .text:0x813CD13C; // type:function size:0x40
|
||||
@@ -6670,19 +6670,19 @@ CHANSVmStrCpyToU16FromU8 = .text:0x8144B058; // type:function size:0x34
|
||||
CHANSVmStrCpyToU8FromU16 = .text:0x8144B08C; // type:function size:0x44
|
||||
CHANSVmStrCpyToU8FromStringObject = .text:0x8144B0D0; // type:function size:0xB4
|
||||
VmIsNan = .text:0x8144B184; // type:function size:0x54 scope:local
|
||||
CHANSVm_8144B1D8 = .text:0x8144B1D8; // type:function size:0x20 scope:local
|
||||
CHANSVmFloatSign = .text:0x8144B1D8; // type:function size:0x20 scope:local
|
||||
VmIntToFloat = .text:0x8144B1F8; // type:function size:0x50 scope:local
|
||||
CHANSVmParseInt = .text:0x8144B248; // type:function size:0xC4 scope:local
|
||||
CHANSVm_8144B30C = .text:0x8144B30C; // type:function size:0xAC scope:local
|
||||
CHANSVmConvertToIntFromFloat = .text:0x8144B30C; // type:function size:0xAC scope:local
|
||||
CHANSVmConvertToIntFromStr = .text:0x8144B3B8; // type:function size:0x70
|
||||
CHANSVmConvertToIntFromArray = .text:0x8144B428; // type:function size:0x8
|
||||
CHANSVm_8144B430 = .text:0x8144B430; // type:function size:0x40
|
||||
CHANSVm_8144B470 = .text:0x8144B470; // type:function size:0x64
|
||||
CHANSVm_8144B4D4 = .text:0x8144B4D4; // type:function size:0x14C
|
||||
CHANSVmConvertToFloatFromUndefined = .text:0x8144B430; // type:function size:0x40
|
||||
CHANSVmConvertToFloatFromInt = .text:0x8144B470; // type:function size:0x64
|
||||
CHANSVmConvertToFloatFromStr = .text:0x8144B4D4; // type:function size:0x14C
|
||||
CHANSVmConvertToStrFromUndefined = .text:0x8144B620; // type:function size:0xC
|
||||
CHANSVm_8144B62C = .text:0x8144B62C; // type:function size:0x58 scope:local
|
||||
CHANSVmFloatToWString = .text:0x8144B62C; // type:function size:0x58 scope:local
|
||||
CHANSVmConvertToStrFromInt = .text:0x8144B684; // type:function size:0xB0
|
||||
CHANSVm_8144B734 = .text:0x8144B734; // type:function size:0xDC
|
||||
CHANSVmConvertToStrFromFloat = .text:0x8144B734; // type:function size:0xDC
|
||||
CHANSVmConvertToStrFromArray = .text:0x8144B810; // type:function size:0x10
|
||||
CHANSVmConvertObjectTypeError = .text:0x8144B820; // type:function size:0x50
|
||||
CHANSVmGetEnumedType = .text:0x8144B870; // type:function size:0x6C scope:local
|
||||
|
||||
@@ -1282,11 +1282,13 @@ s32 PFFAT_GetSectorSpecified(PFFAT_FFD* file, u32 fileSectorIndex,
|
||||
|
||||
error = PFFAT_GetSector(file, fileSectorIndex, clusterIndex != 0, 0,
|
||||
sector);
|
||||
if (error != 0) {
|
||||
goto done;
|
||||
switch (error) {
|
||||
case 0:
|
||||
error = 0;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
error = 0;
|
||||
done:
|
||||
return error;
|
||||
}
|
||||
|
||||
|
||||
@@ -604,7 +604,7 @@ vmBoolInt VmIsNan(vmFloat value) {
|
||||
return isnan(value) || value == VM_NAN;
|
||||
}
|
||||
|
||||
double CHANSVm_8144B1D8(double value) {
|
||||
double CHANSVmFloatSign(double value) {
|
||||
// Clamp to -1.0~1.0
|
||||
return value < 0.0 ? -1.0 : value > 0.0 ? 1.0 : value;
|
||||
}
|
||||
@@ -650,14 +650,14 @@ static s32 CHANSVmParseInt(CHANSVmObjHdr* obj, s32 base, u64* out) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B30C(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToIntFromFloat(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
// Convert to int from float
|
||||
CHANSVmObjHdr* newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_INTEGER, 0);
|
||||
if (newObj != vmNull) {
|
||||
if (VmIsNan(object->value.float_v)) {
|
||||
newObj->value.int_v = 0;
|
||||
} else {
|
||||
newObj->value.int_v = (u64)(CHANSVm_8144B1D8(object->value.float_v) * floor(fabs(object->value.float_v)));
|
||||
newObj->value.int_v = (u64)(CHANSVmFloatSign(object->value.float_v) * floor(fabs(object->value.float_v)));
|
||||
}
|
||||
}
|
||||
return newObj;
|
||||
@@ -675,7 +675,7 @@ CHANSVmObjHdr* CHANSVmConvertToIntFromArray(CHANSVm* vm, CHANSVmObjType type, CH
|
||||
return vmNull;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B430(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToFloatFromUndefined(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
CHANSVmObjHdr* result = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
|
||||
if (result != vmNull) {
|
||||
result->value.float_v = VM_NAN;
|
||||
@@ -683,7 +683,7 @@ CHANSVmObjHdr* CHANSVm_8144B430(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr*
|
||||
return result;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B470(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* intObj) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToFloatFromInt(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* intObj) {
|
||||
CHANSVmObjHdr* result = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
|
||||
if (result != vmNull) {
|
||||
result->value.float_v = VmIntToFloat(intObj->value.int_v);
|
||||
@@ -771,7 +771,7 @@ static inline s32 CHANSVmParseFloat(CHANSVmObjHdr* obj, f64* out) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B4D4(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToFloatFromStr(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* object) {
|
||||
// Convert string keyword into float value
|
||||
CHANSVmObjHdr* newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_FLOAT, 0);
|
||||
|
||||
@@ -785,7 +785,7 @@ CHANSVmObjHdr* CHANSVmConvertToStrFromUndefined(CHANSVm* vm, CHANSVmObjType type
|
||||
return (CHANSVmObjHdr*)CHANSVmConstStringObjectUndefined_;
|
||||
}
|
||||
|
||||
s32 CHANSVm_8144B62C(vmWString buf, u32 len, vmFloat val) NO_INLINE {
|
||||
s32 CHANSVmFloatToWString(vmWString buf, u32 len, vmFloat val) NO_INLINE {
|
||||
s32 result = snprintf((char*)buf, len / 2, scFloatPrintfFmt, val);
|
||||
CHANSVmStrCpyToU16FromU8(buf, (vmString)buf, result);
|
||||
return VM_STR_LENGTH(result);
|
||||
@@ -815,7 +815,7 @@ error:
|
||||
return vmNull;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8144B734(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* value) {
|
||||
CHANSVmObjHdr* CHANSVmConvertToStrFromFloat(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr* value) {
|
||||
const CHANSVmObjHdr* base;
|
||||
CHANSVmObjHdr* newObj;
|
||||
s32 result;
|
||||
@@ -835,7 +835,7 @@ CHANSVmObjHdr* CHANSVm_8144B734(CHANSVm* vm, CHANSVmObjType type, CHANSVmObjHdr*
|
||||
|
||||
newObj = CHANSVmNewObject(vm, vmFalse, vmNull, CHANS_VM_OBJ_TYPE_STRING, VM_STRING_SIZE);
|
||||
if (newObj != vmNull) {
|
||||
result = CHANSVm_8144B62C(newObj->value.wstring_v->spData, VM_STRING_SIZE, value->value.float_v);
|
||||
result = CHANSVmFloatToWString(newObj->value.wstring_v->spData, VM_STRING_SIZE, value->value.float_v);
|
||||
newObj->value.wstring_v->len = result;
|
||||
if (newObj->value.wstring_v->len == 0) {
|
||||
goto error;
|
||||
@@ -904,9 +904,9 @@ char scVmGetResultType[] = "VmGetResultType";
|
||||
// clang-format off
|
||||
const VmConvertEntry VmTypeConvertFuncTbl[] = {
|
||||
{vmNull, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertObjectTypeError, vmNull, CHANSVm_8144B30C, CHANSVmConvertToIntFromStr, CHANSVmConvertToIntFromArray, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVm_8144B430, CHANSVm_8144B470, vmNull, CHANSVm_8144B4D4, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertToStrFromUndefined, CHANSVmConvertToStrFromInt, CHANSVm_8144B734, vmNull, CHANSVmConvertToStrFromArray, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertObjectTypeError, vmNull, CHANSVmConvertToIntFromFloat, CHANSVmConvertToIntFromStr, CHANSVmConvertToIntFromArray, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertToFloatFromUndefined, CHANSVmConvertToFloatFromInt, vmNull, CHANSVmConvertToFloatFromStr, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertToStrFromUndefined, CHANSVmConvertToStrFromInt, CHANSVmConvertToStrFromFloat, vmNull, CHANSVmConvertToStrFromArray, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, vmNull, CHANSVmConvertObjectTypeError},
|
||||
{CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, CHANSVmConvertObjectTypeError, vmNull},
|
||||
};
|
||||
@@ -2183,7 +2183,7 @@ static u32 VmArrayJoinSub(CHANSVmObjHdr* obj, CHANSVmObjHdr* array, wchar_t* sep
|
||||
if (offset + 0x80 > bufSize) {
|
||||
goto error;
|
||||
}
|
||||
elemLen = CHANSVm_8144B62C((vmWString)((u8*)(*obj->value.ptr_v) + offset), 0x80, chunk->elements[countInChunk].value.float_v);
|
||||
elemLen = CHANSVmFloatToWString((vmWString)((u8*)(*obj->value.ptr_v) + offset), 0x80, chunk->elements[countInChunk].value.float_v);
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_TYPE_ARRAY: {
|
||||
@@ -7602,7 +7602,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_OBJ_TYPE_FLOAT: {
|
||||
invertedVal = (s64)(CHANSVm_8144B1D8(pAcc->value.float_v) * floor(fabs(pAcc->value.float_v)));
|
||||
invertedVal = (s64)(CHANSVmFloatSign(pAcc->value.float_v) * floor(fabs(pAcc->value.float_v)));
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_OBJ_TYPE_STRING: {
|
||||
|
||||
@@ -11,7 +11,7 @@ struct MemoryCardSortEntry {
|
||||
s64 key;
|
||||
};
|
||||
|
||||
extern "C" int iplMemoryCardManager_813CD034(const void* first, const void* second) {
|
||||
extern "C" int compareMemoryCardSortEntries(const void* first, const void* second) {
|
||||
const MemoryCardSortEntry* a = static_cast<const MemoryCardSortEntry*>(first);
|
||||
const MemoryCardSortEntry* b = static_cast<const MemoryCardSortEntry*>(second);
|
||||
s64 bKey = b->key;
|
||||
@@ -92,7 +92,7 @@ void MemoryCardManager::sort_file_array(u8 slot) {
|
||||
mFile[slot][file].unk_0x08 = 0;
|
||||
}
|
||||
}
|
||||
qsort(mFile[slot], 0x7f, sizeof(MCFile), iplMemoryCardManager_813CD034);
|
||||
qsort(mFile[slot], 0x7f, sizeof(MCFile), compareMemoryCardSortEntries);
|
||||
}
|
||||
|
||||
void MemoryCardManager::sendCardCmdMove(u8 slot, s16 index) {
|
||||
|
||||
Reference in New Issue
Block a user