From: chaoskagami <chaos.kagami@gmail.com>
Date: Sat, 25 Apr 2015 02:18:58 +0000 (-0400)
Subject: Tweak to parse generic text with no specifiers as fallback. Not tested yet, though.
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=bcc46e98d6aa34e0070405507516e79c17436a93;p=misc%2FMaihanaTL.git

Tweak to parse generic text with no specifiers as fallback. Not tested yet, though.
---

diff --git a/build.sh b/build.sh
index d20aabf..9443ef1 100755
--- a/build.sh
+++ b/build.sh
@@ -10,6 +10,10 @@ if [ "$1" == "" ]; then
 	exit 0
 fi
 
+if [ ! -e tools/scetool ]; then
+	gcc -o tools/scetool tools/src/scetool.c
+fi
+
 cd scripts
 if [ -d $1 ] && [ -d ../data/Data/Sce ]; then
 	cd $1
@@ -20,7 +24,7 @@ if [ -d $1 ] && [ -d ../data/Data/Sce ]; then
 
 		if [ -e $CURRENT_VOL.txt ]; then
 			mv ../../data/Data/Sce/$CURRENT_VOL.vol{,.bak}
-			../../tools/scetool.$(uname -m) inject ../../data/Data/Sce/$CURRENT_VOL.vol.bak $CURRENT_VOL.txt ../../data/Data/Sce/$CURRENT_VOL.vol
+			../../tools/scetool inject ../../data/Data/Sce/$CURRENT_VOL.vol.bak $CURRENT_VOL.txt ../../data/Data/Sce/$CURRENT_VOL.vol
 		fi
 	done
 	
@@ -36,4 +40,4 @@ if [ -d $1 ] && [ -d ../data/Data/Sce ]; then
 	done
 else
 	echo "Not a valid translation or data not copied into data/ folder."
-fi
\ No newline at end of file
+fi
diff --git a/tools/scetool.i686 b/tools/scetool.i686
deleted file mode 100755
index 39287d0..0000000
Binary files a/tools/scetool.i686 and /dev/null differ
diff --git a/tools/scetool.x86_64 b/tools/scetool.x86_64
deleted file mode 100755
index b8244b1..0000000
Binary files a/tools/scetool.x86_64 and /dev/null differ
diff --git a/tools/src/scetool.c b/tools/src/scetool.c
index b57a896..98d758e 100644
--- a/tools/src/scetool.c
+++ b/tools/src/scetool.c
@@ -205,6 +205,9 @@ void inject (char* out, char* script) {
 								break;
 						}
 						break;
+					case 0x1D:
+						memcpy(((text_ent*)&buffer[offset])->TextData,str,256);
+						break;
 				}
 			}
 
@@ -362,6 +365,15 @@ void extract (char* out) {
 			}
 
 			free(c1);
+		} else if (buffer[i] == 0x1D) {
+			// Raw text block - no formatting. This is a fallback for when there's no real formatting.
+
+			text_ent* c1 = (text_ent*)calloc(sizeof(text_ent), 1);
+			memcpy(c1, &buffer[i], sizeof(text_ent));
+				
+			fprintf(export, "[1D 0x%08lX 00]\n%s\n", i, c1->TextData);
+
+			i += sizeof(text_ent) - 1;
 		}
 	}