From 30caa1f819fe39d6c079fde4e1d8e70be88decd8 Mon Sep 17 00:00:00 2001
From: Marc Robledo <mark@tinet.org>
Date: Fri, 21 Feb 2020 19:21:09 +0100
Subject: [PATCH] added full support for PPF2, also fixed PPF patching when
 patch file had an embeded file_id.diz, this should fix all PPF files!

---
 _cache_service_worker.js |  2 +-
 index.html               |  2 +-
 ppf.js                   | 47 +++++++++++++++++++++++++++++-----------
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/_cache_service_worker.js b/_cache_service_worker.js
index ff8b164..54b7c34 100644
--- a/_cache_service_worker.js
+++ b/_cache_service_worker.js
@@ -30,7 +30,7 @@ caches.keys().then(function(cacheNames){
 });
 
 var PRECACHE_ID='rom-patcher-js';
-var PRECACHE_VERSION='v6';
+var PRECACHE_VERSION='v7';
 var PRECACHE_URLS=[
 	'/RomPatcher.js/','/RomPatcher.js/index.html',
 	'/RomPatcher.js/manifest.json',
diff --git a/index.html b/index.html
index bbbaa56..d33a217 100644
--- a/index.html
+++ b/index.html
@@ -146,7 +146,7 @@
 
 <!-- FOOTER -->
 <footer>
-	Rom Patcher JS <small>v2.0 RC2</small> by <a href="/">Marc Robledo</a>
+	Rom Patcher JS <small>v2.1</small> by <a href="/">Marc Robledo</a>
 	<br />
 	<i class="icon github"></i> <a href="https://github.com/marcrobledo/RomPatcher.js/" target="_blank">See on GitHub</a>
 	<i class="icon heart"></i> <a href="https://www.paypal.me/marcrobledo/5" target="_blank" rel="nofollow">Donate</a>
diff --git a/ppf.js b/ppf.js
index fc4c741..cf919d9 100644
--- a/ppf.js
+++ b/ppf.js
@@ -1,4 +1,4 @@
-/* PPF module for Rom Patcher JS v20190401 - Marc Robledo 2019 - http://www.marcrobledo.com/license */
+/* PPF module for Rom Patcher JS v20200221 - Marc Robledo 2019-2020 - http://www.marcrobledo.com/license */
 /* File format specification: https://www.romhacking.net/utilities/353/  */
 
 
@@ -6,6 +6,7 @@
 const PPF_MAGIC='PPF';
 const PPF_IMAGETYPE_BIN=0x00;
 const PPF_IMAGETYPE_GI=0x01;
+const PPF_BEGIN_FILE_ID_DIZ_MAGIC='@BEG';//@BEGIN_FILE_ID.DIZ
 
 function PPF(){
 	this.version=3;
@@ -28,6 +29,8 @@ PPF.prototype.toString=function(){
 	s+='\nImage type: '+this.imageType;
 	s+='\nBlock check: '+!!this.blockCheck;
 	s+='\nUndo data: '+this.undoData;
+	if(this.fileIdDiz)
+		s+='\nFILE_ID.DIZ: '+this.fileIdDiz;
 	return s
 }
 PPF.prototype.export=function(fileName){
@@ -44,6 +47,9 @@ PPF.prototype.export=function(fileName){
 	if(this.blockCheck){
 		patchFileSize+=1024;
 	}
+	if(this.fileIdDiz){
+		patchFileSize+=18+this.fileIdDiz.length+16+4;
+	}
 
 	tempFile=new MarcFile(patchFileSize);
 	tempFile.fileName=fileName+'.ppf';
@@ -60,11 +66,7 @@ PPF.prototype.export=function(fileName){
 		tempFile.writeU8(0x00); //dummy
 
 	}else if(this.version===2){
-		//unknown data?
-		tempFile.writeU8(0x00);
-		tempFile.writeU8(0x00);
-		tempFile.writeU8(0x00);
-		tempFile.writeU8(0x00);
+		tempFile.writeU32(this.inputFileSize);
 	}
 
 	if(this.blockCheck){
@@ -76,17 +78,26 @@ PPF.prototype.export=function(fileName){
 	tempFile.littleEndian=true;
 	for(var i=0; i<this.records.length; i++){
 		tempFile.writeU32(this.records[i].offset & 0xffffffff);
-		//tempFile.writeU32(0x00000000); //to-do: limited to 4GB right now
-		var offset2=this.records[i].offset;
-		for(var j=0; j<32; j++)
-			offset2=parseInt((offset2/2)>>>0);
-		tempFile.writeU32(offset2);
+
+		if(this.version===3){
+			var offset2=this.records[i].offset;
+			for(var j=0; j<32; j++)
+				offset2=parseInt((offset2/2)>>>0);
+			tempFile.writeU32(offset2);
+		}
 		tempFile.writeU8(this.records[i].data.length);
 		tempFile.writeBytes(this.records[i].data);
 		if(this.undoData)
 			tempFile.writeBytes(this.records[i].undoData);
 	}
 
+	if(this.fileIdDiz){
+		tempFile.writeString('@BEGIN_FILE_ID.DIZ');
+		tempFile.writeString(this.fileIdDiz);
+		tempFile.writeString('@END_FILE_ID.DIZ');
+		tempFile.writeU16(this.fileIdDiz.length);
+		tempFile.writeU16(0x00);
+	}
 
 
 
@@ -164,17 +175,27 @@ function parsePPFFile(patchFile){
 		patchFile.skip(1);
 	}else if(patch.version===2){
 		patch.blockCheck=true;
-		patchFile.skip(4);
+		patch.inputFileSize=patchFile.readU32();
 	}
 
 	if(patch.blockCheck){
-		patchFile.blockCheck=patchFile.readBytes(1024);
+		patch.blockCheck=patchFile.readBytes(1024);
 	}
 
 
 
 	patchFile.littleEndian=true;
 	while(!patchFile.isEOF()){
+
+		if(patchFile.readString(4)===PPF_BEGIN_FILE_ID_DIZ_MAGIC){
+			patchFile.skip(14);
+			//console.log('found file_id.diz begin');
+			patch.fileIdDiz=patchFile.readString(3072);
+			patch.fileIdDiz=patch.fileIdDiz.substr(0, patch.fileIdDiz.indexOf('@END_FILE_ID.DIZ'));
+			break;
+		}
+		patchFile.skip(-4);
+
 		var offset;
 		if(patch.version===3){
 			var u64_1=patchFile.readU32();