mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-08 22:44:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

swap in memcpy for func_80003540, correct some minor issues in dvd.h and JKRDVDFile.h

Browse Source
This commit is contained in:
Pheenoh
2021-01-03 21:08:33 -05:00
parent da3a142828
commit 6f22d27503
61 changed files with 221 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m_Do/m_Do_main.cpp
+18 -20
View File
@@ -31,32 +31,26 @@ void HeapCheck::CheckHeap1(void) {
}
#ifdef NONMATCHING
extern u8 lbl_803A2EF4[0x4c];
extern u8 m_cpadInfo[0x100];
void CheckHeap(u32 param_1) {
HeapCheck* currentHeap;
s32 unk;
void CheckHeap(u32 controller_pad_no) {
mDoMch_HeapCheckAll();
OSCheckActiveThreads();
unk = 0;
bool unk = false;
if ((((m_cpadInfo + 0x30)[param_1 * 0x10] & 0xffffffef) == 0x60) &&
(((m_cpadInfo + 0x30)[param_1 * 0x10] & 0x10) != 0)) {
unk = 1;
// if L + R + Z is pressed...
if (((m_cpadInfo[controller_pad_no].mButtonFlags & ~0x10) == 0x60) && m_cpadInfo[controller_pad_no].mPressedButtonFlags & 0x10) {
unk = true;
}
for (int i = 0; i < 8; i++) {
((HeapCheck*)lbl_803A2EF4[i])->CheckHeap1();
HeapCheckTable[i]->CheckHeap1();
if (unk) {
currentHeap = (HeapCheck*)lbl_803A2EF4[i * 4];
s32 current_used_count = currentHeap->getUsedCount();
currentHeap->used_count = current_used_count;
s32 current_total_used_size = currentHeap->heap->getTotalUsedSize();
currentHeap->total_used_size = current_total_used_size;
HeapCheck* currentHeap = HeapCheckTable[i];
s32 used_count = currentHeap->getUsedCount();
currentHeap->getUsedCountRef() = used_count;
used_count = currentHeap->getHeap()->getTotalUsedSize();
currentHeap->getTotalUsedSizeRef() = used_count;
}
}
}
@@ -122,16 +116,20 @@ asm void Debug_console(u32) {
}
#ifdef NONMATCHING
extern u8 lbl_803739a0[0x310];
extern char lbl_803a2ee0[20];
extern void memcpy(void*,void*,int);
void LOAD_COPYDATE(void*) {
s32 dvd_status;
char buffer[32];
DVDFileInfo file_info;
dvd_status = DVDOpen(lbl_803739a0 + 0x283, &file_info);
dvd_status = DVDOpen((const char*)lbl_803739a0 + 0x283, &file_info);
if (dvd_status) {
DVDReadPrio(&file_info, buffer, 32, 0, 2);
memcpy(memcpy_string, buffer, 17);
memcpy(lbl_803a2ee0, buffer, 17);
DVDClose(&file_info);
}
return;