summaryrefslogtreecommitdiff
path: root/libs/JSystem
diff options
context:
space:
mode:
authorhatal175 <hatal175@users.noreply.github.com>2024-08-17 08:19:53 +0300
committerGitHub <noreply@github.com>2024-08-16 22:19:53 -0700
commit18f4489dd6e7996152bc385ec89a340dccaafe8a (patch)
tree5800d04bb9c99f47ecdf03cf0521df9a3e3772bc /libs/JSystem
parentedd2d30a337a69c6a0228a172108ce17d3253697 (diff)
d_particle almost finished (#2193)
* d_particle almost finished * Remove dolasm.h include from JKRDvdRipper
Diffstat (limited to 'libs/JSystem')
-rw-r--r--libs/JSystem/JKernel/JKRDvdRipper.cpp32
1 files changed, 3 insertions, 29 deletions
diff --git a/libs/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp
index a0e0e97d87..e7b95f3596 100644
--- a/libs/JSystem/JKernel/JKRDvdRipper.cpp
+++ b/libs/JSystem/JKernel/JKRDvdRipper.cpp
@@ -1,6 +1,5 @@
//
-// Generated By: dol2asm
-// Translation Unit: JKRDvdRipper
+// JKRDvdRipper
//
#include "JSystem/JKernel/JKRDvdRipper.h"
@@ -8,28 +7,15 @@
#include "JSystem/JKernel/JKRDecomp.h"
#include "JSystem/JUtility/JUTException.h"
#include "string.h"
-#include "dol2asm.h"
#include "dolphin/os/OSCache.h"
#include "dolphin/os/OSInterrupt.h"
#include "dolphin/vi.h"
-//
-// Forward References:
-//
-
static int JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*);
static int decompSZS_subroutine(u8*, u8*);
static u8* firstSrcData();
static u8* nextSrcData(u8*);
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
/* 802D9B98-802D9C54 2D44D8 00BC+00 0/0 1/1 0/0 .text
* loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl
*/
@@ -60,20 +46,8 @@ void* JKRDvdRipper::loadToMainRAM(s32 entryNumber, u8* dst, JKRExpandSwitch expa
pCompression, param_8);
}
-/* ############################################################################################## */
-/* 8039D290-8039D290 0298F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
-#pragma push
-#pragma force_active on
-SECTION_DEAD static char const* const stringBase_8039D290 = __FILE__;
-SECTION_DEAD static char const* const stringBase_8039D2A1 = "%s";
-SECTION_DEAD static char const* const stringBase_8039D2A4 = "Sorry, not applied for SZP archive.";
-SECTION_DEAD static char const* const stringBase_8039D2C8 = "Not support SZP with offset read";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_8039D2E9 = "\0\0\0\0\0\0";
-#pragma pop
-
/* 804508C8-804508CC 000348 0004+00 3/2 0/0 0/0 .sdata None */
-SECTION_SDATA static u8 errorRetry = 0x01;
+static u8 errorRetry = 0x01;
/* 802D9D10-802DA1E4 2D4650 04D4+00 2/2 0/0 0/0 .text
* loadToMainRAM__12JKRDvdRipperFP10JKRDvdFilePUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl
@@ -276,7 +250,7 @@ JSUList<JKRDMCommand> JKRDvdRipper::sDvdAsyncList;
static OSMutex decompMutex;
/* 804508CC-804508D0 00034C 0004+00 1/1 1/1 0/0 .sdata sSZSBufferSize__12JKRDvdRipper */
-SECTION_SDATA u32 JKRDvdRipper::sSZSBufferSize = 0x00000400;
+u32 JKRDvdRipper::sSZSBufferSize = 0x00000400;
/* 80451428-8045142C 000928 0004+00 3/3 0/0 0/0 .sbss szpBuf */
static u8* szpBuf;