mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-10 04:53:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_dylink for the most part

Browse Source
This commit is contained in:
robojumper
2024-05-26 22:55:38 +02:00
parent 71f3416cb5
commit e6df362f88
10 changed files with 364 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m/m_dvd.cpp
+4 -4
View File
@@ -330,7 +330,7 @@ mDvd_callback_c::~mDvd_callback_c() {}
mDvd_callback_c::mDvd_callback_c(dvdReadCallback cb, void *cbData) {
mCallback = cb;
mCallbackData = cbData;
mSuccess = false;
mCallbackResult = 0;
}
/* 802ef5d0 */
@@ -343,7 +343,7 @@ mDvd_callback_c *mDvd_callback_c::create(dvdReadCallback cb, void *cbData) {
}
/** 802ef650 */
extern "C" mDvd_callback_c *fn_802EF650(dvdReadCallback cb, void *cbData) {
mDvd_callback_c *mDvd_callback_c::createOrFail(dvdReadCallback cb, void *cbData) {
mDvd_callback_c *cmd = mDvd_callback_c::create(cb, cbData);
while (!cmd) {}
return cmd;
@@ -351,9 +351,9 @@ extern "C" mDvd_callback_c *fn_802EF650(dvdReadCallback cb, void *cbData) {
/** 802ef680 */
u32 mDvd_callback_c::execute() {
mSuccess = (mCallback)(mCallbackData);
mCallbackResult = (mCallback)(mCallbackData);
waitDone();
return (bool)mSuccess;
return (bool)mCallbackResult;
}
/** 802ef6e0 */
src/m/m_heap.cpp
+2 -2
View File
@@ -11,7 +11,7 @@ EGG::Heap *mHeap::g_gameHeaps[4];
EGG::Heap *mHeap::s_SavedCurrentHeap;
EGG::Heap *mHeap::g_archiveHeap;
EGG::Heap *mHeap::g_commandHeap;
EGG::Heap *mHeap::g_dylinkHeap;
EGG::ExpHeap *mHeap::g_dylinkHeap;
EGG::AssertHeap *mHeap::g_assertHeap;
const char *const mHeap::s_GameHeapNames[4] = {
0,
@@ -144,7 +144,7 @@ mHeap::~mHeap() {
heap->becomeCurrentHeap();
}
EGG::Heap *mHeap::createHeap(size_t size, EGG::Heap *block, const char *name) {
EGG::ExpHeap *mHeap::createHeap(size_t size, EGG::Heap *block, const char *name) {
EGG::ExpHeap *heap = EGG::ExpHeap::create(size, block, 4);
if (heap != nullptr) {
heap->setGroupID(0);