From 725e43dd690968e66631c3e38c3f477c656fd271 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 19 May 2024 16:18:26 +0200 Subject: [PATCH] Names --- config/SOUE01/symbols.txt | 4 ++-- include/m/m_dvd.h | 4 +++- src/m/m_dvd.cpp | 10 +++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 187b3e97..71a0c2b2 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -17723,8 +17723,8 @@ __dt__Q24mDvd41TUncompressInfo_cFv = .text:0x802EEBE0; / __dt__Q24mDvd41TUncompressInfo_cFv = .text:0x802EEC20; // type:function size:0x40 __dt__Q24mDvd42TUncompressInfo_cFv = .text:0x802EEC60; // type:function size:0x40 __dt__Q24mDvd41TUncompressInfo_cFv = .text:0x802EECA0; // type:function size:0x40 -fn_802EECE0 = .text:0x802EECE0; // type:function size:0xC -fn_802EECF0 = .text:0x802EECF0; // type:function size:0x40 +unk_setDecompressorPtrs__4mDvdFPPQ24mDvd22TUncompressInfo_Base_cPPQ24mDvd22TUncompressInfo_Base_c = .text:0x802EECE0; // type:function size:0xC +unk_initDecompressors__4mDvdFv = .text:0x802EECF0; // type:function size:0x40 findUncompressInfo__4mDvdFUc = .text:0x802EED30; // type:function size:0x3C newUncompressObj__4mDvdFUc = .text:0x802EED70; // type:function size:0x40 deleteUncompressObj__4mDvdFUc = .text:0x802EEDB0; // type:function size:0x38 diff --git a/include/m/m_dvd.h b/include/m/m_dvd.h index a780afd6..dee59241 100644 --- a/include/m/m_dvd.h +++ b/include/m/m_dvd.h @@ -5,7 +5,7 @@ #include #include -// TODO onComplete -> doClear? +void unk_initDecompressors(); namespace mDvd { @@ -35,6 +35,8 @@ public: }; void create(int priority, EGG::Heap *commandHeap, EGG::Heap *archiveHeap, EGG::Heap *threadHeap); +int ConvertPathToEntrynum(const char *path); +u32 IsExistPath(const char *path); OSThread *getOSThread(); EGG::Heap *getArchiveHeap(); diff --git a/src/m/m_dvd.cpp b/src/m/m_dvd.cpp index 3719b92a..ef4819d2 100644 --- a/src/m/m_dvd.cpp +++ b/src/m/m_dvd.cpp @@ -49,14 +49,14 @@ EGG::Heap *l_ArchiveHeap; bool l_IsAutoStreamDecomp; /** 802eece0 */ -extern "C" void fn_802EECE0(TUncompressInfo_Base_c **ptr, TUncompressInfo_Base_c **last) { +static void unk_setDecompressorPtrs(TUncompressInfo_Base_c **ptr, TUncompressInfo_Base_c **last) { compressors_ptr = ptr; compressors_last = last; } /** 802eecf0 */ -extern "C" void fn_802EECF0() { - fn_802EECE0(decompressorPtrs, &decompressorPtrs[1]); +void unk_initDecompressors() { + unk_setDecompressorPtrs(decompressorPtrs, &decompressorPtrs[1]); somePtr = decompressor_alloc_space; someNumber = 0x24; } @@ -163,11 +163,11 @@ static void *loadToMainRAM(int entryNum, char *dst, EGG::Heap *heap, EGG::DvdRip return result; } -static int ConvertPathToEntrynum(const char *path) { +int ConvertPathToEntrynum(const char *path) { return ::ConvertPathToEntrynum(path, nullptr); } -static u32 IsExistPath(const char *path) { +u32 IsExistPath(const char *path) { u32 entry = ConvertPathToEntrynum(path); return entry != -1; }