LZ77 code in ITCM now works

Author: RocketRobz

arm9/source/lz77.c arm9/source/lz77.cpparm9/source/lz77.c renamed to arm9/source/lz77.cpp

@@ -1,22 +1,23 @@
 #include <nds.h>
+#include "tonccpy.h"
 
 #define __itcm __attribute__((section(".itcm")))
 
 void __itcm
-lzssDecompress(byte source[], byte destination[]) {
-	uint32 leng = (uint)(source[1] | (source[2] << 8) | (source[3] << 16));
+lzssDecompress(u8* source, u8* destination) {
+	u32 leng = (source[1] | (source[2] << 8) | (source[3] << 16));
 	int Offs = 4;
 	int dstoffs = 0;
 	while (true)
 	{
-		byte header = source[Offs++];
+		u8 header = source[Offs++];
 		for (int i = 0; i < 8; i++)
 		{
 			if ((header & 0x80) == 0) destination[dstoffs++] = source[Offs++];
 			else
 			{
-				byte a = source[Offs++];
-				byte b = source[Offs++];
+				u8 a = source[Offs++];
+				u8 b = source[Offs++];
 				int offs = (((a & 0xF) << 8) | b) + 1;
 				int length = (a >> 4) + 3;
 				for (int j = 0; j < length; j++)
@@ -25,7 +26,7 @@ lzssDecompress(byte source[], byte destination[]) {
 					dstoffs++;
 				}
 			}
-			if (dstoffs >= leng) break;
+			if (dstoffs >= (int)leng) return;
 			header <<= 1;
 		}
 	}

arm9/source/lz77.h

@@ -1,15 +1,6 @@
 #ifndef LZSS_H
 #define LZSS_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-void lzssDecompress(byte source[], byte destination[]);
-
-#ifdef __cplusplus
-}
-#endif
+void lzssDecompress(u8* source, u8* destination);
 
 #endif

arm9/source/main.cpp

@@ -370,7 +370,7 @@ int playRvid(const char* filename) {
 			fread(compressedFrameSizes, sizeof(u32), 128, rvidFrameSizeTable);
 			for (int i = 0; i < 14; i++) {
 				fread(compressedFrameBuffer, 1, compressedFrameSizes[i], rvid);
-				swiDecompressLZSSWram(compressedFrameBuffer, frameBuffer+(i*(0x200*rvidVRes)));
+				lzssDecompress(compressedFrameBuffer, frameBuffer+(i*(0x200*rvidVRes)));
 				loadedFrames++;
 			}
 		} else {
@@ -419,7 +419,7 @@ int playRvid(const char* filename) {
 							if (compressedFrameSizes[currentFrame+14 % 128] > 0
 							|| compressedFrameSizes[currentFrame+14 % 128] <= sizeof(compressedFrameBuffer)) {
 								fread(compressedFrameBuffer, 1, compressedFrameSizes[currentFrame+14 % 128], rvid);
-								swiDecompressLZSSWram(compressedFrameBuffer, frameBuffer+(i*(0x200*rvidVRes)));
+								lzssDecompress(compressedFrameBuffer, frameBuffer+(i*(0x200*rvidVRes)));
 							}
 						} else {
 							fread(frameBuffer+(i*(0x200*rvidVRes)), 1, 0x200*rvidVRes, rvid);
@@ -463,7 +463,7 @@ int playRvid(const char* filename) {
 							if (compressedFrameSizes[currentFrame+14 % 128] > 0
 							|| compressedFrameSizes[currentFrame+14 % 128] <= sizeof(compressedFrameBuffer)) {
 								fread(compressedFrameBuffer, 1, compressedFrameSizes[currentFrame+14 % 128], rvid);
-								swiDecompressLZSSWram(compressedFrameBuffer, frameBuffer+(i*(0x200*rvidVRes)));
+								lzssDecompress(compressedFrameBuffer, frameBuffer+(i*(0x200*rvidVRes)));
 							}
 						} else {
 							fread(frameBuffer+(i*(0x200*rvidVRes)), 1, 0x200*rvidVRes, rvid);
@@ -542,7 +542,7 @@ int playRvid(const char* filename) {
 					fread(compressedFrameSizes, sizeof(u32), 128, rvidFrameSizeTable);
 					for (int i = 0; i < 14; i++) {
 						fread(compressedFrameBuffer, 1, compressedFrameSizes[i], rvid);
-						swiDecompressLZSSWram(compressedFrameBuffer, frameBuffer+(i*(0x200*rvidVRes)));
+						lzssDecompress(compressedFrameBuffer, frameBuffer+(i*(0x200*rvidVRes)));
 						loadedFrames++;
 					}
 				} else {
@@ -757,7 +757,7 @@ int main(int argc, char **argv) {
 			if (file) {
 				// Start loading
 				fread(compressedFrameBuffer, 1, sizeof(compressedFrameBuffer), file);
-				swiDecompressLZSSWram(compressedFrameBuffer, frameBuffer);
+				lzssDecompress(compressedFrameBuffer, frameBuffer);
 				dmaCopyAsynch(frameBuffer, BG_GFX_SUB, 0x18000);
 			} else {
 				dmaFillHalfWords(0, BG_GFX_SUB, 0x18000);	// Clear top screen