@gaialabs/core 0.2.1 → 0.2.2

package/dist/index.cjs

@@ -131,6 +131,148 @@ var RomDataReader = class {
 	}
 };
 
+//#endregion
+//#region src/types/constants.ts
+/**
+* ROM processing constants
+* Converted from GaiaLib/Types/RomProcessingConstants.cs
+*/
+var RomProcessingConstants = class RomProcessingConstants {
+	static PAGE_SIZE = 32768;
+	static SNES_HEADER_SIZE = 80;
+	static DICTIONARIES = ["dictionary_01EBA8", "dictionary_01F54D"];
+	static DICT_COMMANDS = [214, 215];
+	static END_CHARS = [
+		192,
+		202,
+		209
+	];
+	static WHITESPACE = [" ", "	"];
+	static OPERATORS = ["-", "+"];
+	static COMMA_SPACE = [
+		",",
+		" ",
+		"	"
+	];
+	static ADDRESS_SPACE = [
+		"@",
+		"&",
+		"^",
+		"#",
+		"$",
+		"%",
+		"*"
+	];
+	static SYMBOL_SPACE = [
+		",",
+		" ",
+		"	",
+		"<",
+		">",
+		"(",
+		")",
+		":",
+		"[",
+		"]",
+		"{",
+		"}",
+		"`",
+		"~",
+		"|"
+	];
+	static LABEL_SPACE = [
+		"[",
+		"{",
+		"#",
+		"`",
+		"~",
+		"|",
+		":"
+	];
+	static OBJECT_SPACE = ["<", "["];
+	static COP_SPLIT_CHARS = [
+		" ",
+		"	",
+		",",
+		"(",
+		")",
+		"[",
+		"]",
+		"$",
+		"#"
+	];
+	static WHITESPACE_REGEX = /[ \t]/;
+	static COMMA_SPACE_REGEX = /[, \t]/;
+	static SYMBOL_SPACE_REGEX = /[, \t<>()\:\[\]{}`~|]/;
+	static LABEL_SPACE_REGEX = /[\[{#`~|:]/;
+	static OBJECT_SPACE_REGEX = /[<\[]/;
+	static ADDRESS_SPACE_REGEX = /[@&^#$%*]/;
+	static COP_SPLIT_REGEX = /[ \t,()[\]$#]/;
+	static COMMA_SPACE_TRIM_REGEX = /^[, \t]+|[, \t]+$/g;
+	/**
+	* Gets the size of an object for processing purposes
+	* @param obj The object to get the size for
+	* @returns Size in bytes
+	* @throws Error when unable to determine size
+	*/
+	static getSize(obj) {
+		if (obj === void 0 || obj === null) return 0;
+		switch (typeof obj) {
+			case "object":
+				if (Array.isArray(obj)) return obj.reduce((acc, x) => acc + RomProcessingConstants.getSize(x), 0);
+				if ("size" in obj) return obj.size;
+				if ("length" in obj) return obj.length;
+				if ("_tag" in obj) switch (obj._tag) {
+					case "Byte": return 1;
+					case "Word": return 2;
+				}
+				break;
+			case "number":
+				if (obj <= 255) return 1;
+				if (obj <= 65535) return 2;
+				if (obj <= 16777215) return 3;
+				return 4;
+			case "string":
+				if (!obj.length) return 0;
+				switch (obj[0]) {
+					case "@":
+					case "%": return 3;
+					case "*":
+					case "&": return 2;
+					case "^": return 1;
+				}
+				switch (obj) {
+					case "Byte": return 1;
+					case "Word": return 2;
+					case "Offset": return 2;
+					case "Address": return 3;
+				}
+				return obj.length;
+		}
+		return 0;
+	}
+};
+/**
+* BlockReader specific constants
+*/
+var BlockReaderConstants = class {
+	static REF_SEARCH_MAX_RANGE = 416;
+	static BANK_MASK_CHECK = 64;
+	static BYTE_DELIMITER_THRESHOLD = 256;
+	static BANK_HIGH_MEMORY_1 = 126;
+	static BANK_HIGH_MEMORY_2 = 127;
+	static POINTER_CHARACTERS = ["&", "@"];
+	static WIDE_STRING_TYPE = "WideString";
+	static BINARY_TYPE = "Binary";
+	static CODE_TYPE = "Code";
+	static LOCATION_FORMAT = "loc_{0:X6}";
+	static TYPE_NAME_FORMAT = "{0}_{1:X6}";
+	static OFFSET_FORMAT = "+{0:X}";
+	static MARKER_FORMAT = "+M";
+	static NEGATIVE_OFFSET_FORMAT = "-{0:X}";
+	static NEGATIVE_MARKER_FORMAT = "-M";
+};
+
 //#endregion
 //#region src/types/addressing.ts
 /**
@@ -144,6 +286,7 @@ let AddressType = /* @__PURE__ */ function(AddressType) {
 	AddressType["Address"] = "Address";
 	AddressType["WBank"] = "WBank";
 	AddressType["Relative"] = "Relative";
+	AddressType["WRelative"] = "WRelative";
 	AddressType["Location"] = "Location";
 	return AddressType;
 }({});
@@ -165,6 +308,11 @@ let MemoryMapMode = /* @__PURE__ */ function(MemoryMapMode) {
 	MemoryMapMode["ExHi"] = "ExHi";
 	return MemoryMapMode;
 }({});
+let CpuMode = /* @__PURE__ */ function(CpuMode) {
+	CpuMode["Slow"] = "Slow";
+	CpuMode["Fast"] = "Fast";
+	return CpuMode;
+}({});
 /**
 * SNES address structure
 * Converted from GaiaLib/Types/Address.cs
@@ -193,14 +341,19 @@ var Address = class Address {
 	get isCodeBank() {
 		return (this.bank & Address.DATA_BANK_FLAG) === 0;
 	}
-	toInt() {
+	toLocation() {
 		if (this.mode === MemoryMapMode.Lo) return (this.bank & 63) << 15 | this.offset & 32767;
 		if (this.mode === MemoryMapMode.Hi || this.bank & Address.FAST_BANK_FLAG) return (this.bank & 63) << 16 | this.offset & 65535;
 		return this.bank === 62 ? this.offset + 20774912 : this.bank === 63 ? this.offset + 20840448 : ((this.bank & 63) << 16 | this.offset & 65535) + 16777216;
 	}
-	static fromInt(value, mode) {
-		if (mode === MemoryMapMode.Lo) return new Address(value >> 15 & 255, value & 32767 | 32768, mode);
-		if (mode === MemoryMapMode.Hi || value & Address.FAST_BANK_FLAG) return new Address(value >> 16 & 255, value & 65535, mode);
+	static fromLocation(value, mode, cpuMode) {
+		let bankFlag = cpuMode === CpuMode.Fast ? Address.FAST_BANK_FLAG : 0;
+		if (mode === MemoryMapMode.Lo) return new Address(value >> 15 & 127 | bankFlag, value & 32767 | 32768, mode);
+		if (mode === MemoryMapMode.Hi) {
+			if ((value & RomProcessingConstants.PAGE_SIZE) === 0) bankFlag = 192;
+			return new Address(value >> 16 & 127 | bankFlag, value & 65535, mode);
+		}
+		if (value & Address.FAST_BANK_FLAG) return new Address(value >> 16 & 255, value & 65535, mode);
 		if (value >= 20774912 && value < 20840448) return new Address(62, value - 20774912, mode);
 		if (value >= 20840448 && value < 20905984) return new Address(63, value - 20840448, mode);
 		return new Address(value >> 16 & 127, value & 65535, mode);
@@ -212,8 +365,11 @@ var Address = class Address {
 		if (value >= 20840448 && value < 20905984) return 63;
 		return value >> 16 & 127;
 	}
+	toInt() {
+		return this.bank << 16 | this.offset;
+	}
 	toString() {
-		return (this.bank << 16 | this.offset).toString(16).toUpperCase().padStart(6, "0");
+		return this.toInt().toString(16).toUpperCase().padStart(6, "0");
 	}
 	static typeFromCode(code) {
 		switch (code) {
@@ -346,12 +502,12 @@ let BinType = /* @__PURE__ */ function(BinType) {
 	BinType["Palette"] = "Palette";
 	BinType["Sound"] = "Sound";
 	BinType["Music"] = "Music";
-	BinType["Unknown"] = "Unknown";
 	BinType["Meta17"] = "Meta17";
 	BinType["Spritemap"] = "Spritemap";
 	BinType["Assembly"] = "Assembly";
 	BinType["Patch"] = "Patch";
 	BinType["Transform"] = "Transform";
+	BinType["Binary"] = "Binary";
 	return BinType;
 }({});
 
@@ -649,148 +805,6 @@ var CompressionRegistry = class {
 	}
 };
 
-//#endregion
-//#region src/types/constants.ts
-/**
-* ROM processing constants
-* Converted from GaiaLib/Types/RomProcessingConstants.cs
-*/
-var RomProcessingConstants = class RomProcessingConstants {
-	static PAGE_SIZE = 32768;
-	static SNES_HEADER_SIZE = 80;
-	static DICTIONARIES = ["dictionary_01EBA8", "dictionary_01F54D"];
-	static DICT_COMMANDS = [214, 215];
-	static END_CHARS = [
-		192,
-		202,
-		209
-	];
-	static WHITESPACE = [" ", "	"];
-	static OPERATORS = ["-", "+"];
-	static COMMA_SPACE = [
-		",",
-		" ",
-		"	"
-	];
-	static ADDRESS_SPACE = [
-		"@",
-		"&",
-		"^",
-		"#",
-		"$",
-		"%",
-		"*"
-	];
-	static SYMBOL_SPACE = [
-		",",
-		" ",
-		"	",
-		"<",
-		">",
-		"(",
-		")",
-		":",
-		"[",
-		"]",
-		"{",
-		"}",
-		"`",
-		"~",
-		"|"
-	];
-	static LABEL_SPACE = [
-		"[",
-		"{",
-		"#",
-		"`",
-		"~",
-		"|",
-		":"
-	];
-	static OBJECT_SPACE = ["<", "["];
-	static COP_SPLIT_CHARS = [
-		" ",
-		"	",
-		",",
-		"(",
-		")",
-		"[",
-		"]",
-		"$",
-		"#"
-	];
-	static WHITESPACE_REGEX = /[ \t]/;
-	static COMMA_SPACE_REGEX = /[, \t]/;
-	static SYMBOL_SPACE_REGEX = /[, \t<>()\:\[\]{}`~|]/;
-	static LABEL_SPACE_REGEX = /[\[{#`~|:]/;
-	static OBJECT_SPACE_REGEX = /[<\[]/;
-	static ADDRESS_SPACE_REGEX = /[@&^#$%*]/;
-	static COP_SPLIT_REGEX = /[ \t,()[\]$#]/;
-	static COMMA_SPACE_TRIM_REGEX = /^[, \t]+|[, \t]+$/g;
-	/**
-	* Gets the size of an object for processing purposes
-	* @param obj The object to get the size for
-	* @returns Size in bytes
-	* @throws Error when unable to determine size
-	*/
-	static getSize(obj) {
-		if (obj === void 0 || obj === null) return 0;
-		switch (typeof obj) {
-			case "object":
-				if (Array.isArray(obj)) return obj.reduce((acc, x) => acc + RomProcessingConstants.getSize(x), 0);
-				if ("size" in obj) return obj.size;
-				if ("length" in obj) return obj.length;
-				if ("_tag" in obj) switch (obj._tag) {
-					case "Byte": return 1;
-					case "Word": return 2;
-				}
-				break;
-			case "number":
-				if (obj <= 255) return 1;
-				if (obj <= 65535) return 2;
-				if (obj <= 16777215) return 3;
-				return 4;
-			case "string":
-				if (!obj.length) return 0;
-				switch (obj[0]) {
-					case "@":
-					case "%": return 3;
-					case "*":
-					case "&": return 2;
-					case "^": return 1;
-				}
-				switch (obj) {
-					case "Byte": return 1;
-					case "Word": return 2;
-					case "Offset": return 2;
-					case "Address": return 3;
-				}
-				return obj.length;
-		}
-		return 0;
-	}
-};
-/**
-* BlockReader specific constants
-*/
-var BlockReaderConstants = class {
-	static REF_SEARCH_MAX_RANGE = 416;
-	static BANK_MASK_CHECK = 64;
-	static BYTE_DELIMITER_THRESHOLD = 256;
-	static BANK_HIGH_MEMORY_1 = 126;
-	static BANK_HIGH_MEMORY_2 = 127;
-	static POINTER_CHARACTERS = ["&", "@"];
-	static WIDE_STRING_TYPE = "WideString";
-	static BINARY_TYPE = "Binary";
-	static CODE_TYPE = "Code";
-	static LOCATION_FORMAT = "loc_{0:X6}";
-	static TYPE_NAME_FORMAT = "{0}_{1:X6}";
-	static OFFSET_FORMAT = "+{0:X}";
-	static MARKER_FORMAT = "+M";
-	static NEGATIVE_OFFSET_FORMAT = "-{0:X}";
-	static NEGATIVE_MARKER_FORMAT = "-M";
-};
-
 //#endregion
 //#region src/types/files.ts
 /**
@@ -850,11 +864,11 @@ function createChunkFileFromDbFile(rom, compression, dbFile, fileType) {
 	enrichWithRawDataFromDbFile(rom, chunkFile, compression, dbFile, fileType);
 	return chunkFile;
 }
-function createChunkFileFromDbBlock(block, fileType) {
+function createChunkFileFromDbBlock(block, fileType, memoryMode) {
 	const chunkFile = new ChunkFile(block.name, 0, 0, fileType);
 	chunkFile.group = block.group;
 	chunkFile.scene = block.scene;
-	enrichWithPartsFromDbBlock(chunkFile, block);
+	enrichWithPartsFromDbBlock(chunkFile, block, memoryMode);
 	return chunkFile;
 }
 function combineHeader(data, position, length, header, type) {
@@ -899,12 +913,12 @@ function enrichWithRawDataFromDbFile(rom, chunkFile, compression, dbFile, fileTy
 /**
 * Enriches ChunkFile with AsmBlock parts from DbBlock
 */
-function enrichWithPartsFromDbBlock(chunkFile, block) {
+function enrichWithPartsFromDbBlock(chunkFile, block, memoryMode) {
 	chunkFile.parts = [];
 	chunkFile.size = 0;
 	if (!block.parts?.length) throw new Error(`Block ${block.name} has no parts`);
 	chunkFile.location = block.parts[0].start;
-	chunkFile.bank = block.movable ? void 0 : chunkFile.location >> 16;
+	chunkFile.bank = block.movable ? void 0 : memoryMode === MemoryMapMode.Lo ? chunkFile.location >> 15 : chunkFile.location >> 16;
 	chunkFile.transforms = block.transforms;
 	chunkFile.postProcess = block.postProcess;
 	for (const part of block.parts) {
@@ -936,8 +950,12 @@ var ChunkFileUtils = class {
 	*/
 	static calculateSize(chunkFile) {
 		if (!chunkFile.parts) {
-			if (typeof chunkFile.compressed === "boolean" || chunkFile.type.header === -2) chunkFile.size += 2;
-			return chunkFile.size;
+			let size$1 = chunkFile.rawData?.length ?? chunkFile.size;
+			if (chunkFile.type.header === -2 || chunkFile.compressed === false) {
+				size$1 += 2;
+				chunkFile.size = size$1;
+			}
+			return size$1;
 		}
 		let size = 0;
 		for (let x = 0; x < chunkFile.parts.length; x++) {
@@ -1367,7 +1385,7 @@ var CopCommandProcessor = class {
 		if (bank === null && offset === 0) return new Word(offset);
 		const addr = new Address(bank ?? Address.resolveBank(this._romDataReader.position, this._blockReader._root.config.memoryMode), offset, this._blockReader._root.config.memoryMode);
 		if (addr.isROM) {
-			const location = addr.toInt();
+			const location = addr.toLocation();
 			if (partStr !== "Address" && isPtr && !this._blockReader._root.rewrites[location]) this._blockReader.noteType(location, otherStr, true);
 			if (type === AddressType.Unknown) type = this.tryParseAddressType(partStr) ?? AddressType.Unknown;
 			return new LocationWrapper(location, type);
@@ -1501,7 +1519,7 @@ var AddressingModeHandler = class {
 		const refLoc = this._dataReader.readUShort();
 		const address = new Address(this._dataReader.readByte(), refLoc, reg.mode);
 		if (address.isROM) {
-			const wrapper = new LocationWrapper(address.toInt(), AddressType.Address);
+			const wrapper = new LocationWrapper(address.toLocation(), AddressType.Address);
 			if (this.isJumpInstruction(mnemonic)) this._blockReader.noteType(wrapper.location, "Code", false, reg);
 			operands.push(wrapper);
 		} else operands.push(address);
@@ -1517,7 +1535,7 @@ var AddressingModeHandler = class {
 	handlePCRelativeMode(operands, nextAddress, reg, isLong) {
 		const relative = isLong ? nextAddress + this._dataReader.readShort() : nextAddress + this._dataReader.readSByte();
 		this._blockReader.updateRegisterState(relative, reg);
-		operands.push(new LocationWrapper(relative, AddressType.Relative));
+		operands.push(new LocationWrapper(relative, isLong ? AddressType.WRelative : AddressType.Relative));
 	}
 	handleStackRelativeMode(operands) {
 		operands.push(new Byte(this._dataReader.readByte()));
@@ -1542,7 +1560,7 @@ var AddressingModeHandler = class {
 		const isJump = isPush || isIndexedIndirect || this.isJumpInstruction(mnemonic);
 		const addr = new Address(xBank1 ?? (isJump ? Address.resolveBank(this._dataReader.position, registers.mode) : dataBank) ?? 129, refLoc, registers.mode);
 		if (addr.isROM) {
-			const wrapper = new LocationWrapper(addr.toInt(), AddressType.Offset);
+			const wrapper = new LocationWrapper(addr.toLocation(), AddressType.Offset);
 			if (isJump) {
 				const type = isIndexedIndirect ? "&Code" : "Code";
 				const name = this._blockReader.noteType(wrapper.location, type, isPush, registers);
@@ -1607,16 +1625,7 @@ var TransformProcessor = class TransformProcessor {
 	}
 	applyDefaultTransform(operandIndex, operands, bank) {
 		const opnd = operands[operandIndex];
-		const adrs = new Address(bank ?? Address.resolveBank(this._romDataReader.position, this._blockReader._root.config.memoryMode), opnd && "value" in opnd ? opnd["value"] : opnd, this._blockReader._root.config.memoryMode);
-		const loc = adrs.toInt();
-		const nameResult = this._referenceManager.tryGetName(loc);
-		let referenceName;
-		if (!nameResult.found) {
-			referenceName = `loc_${adrs.toString()}`;
-			this._referenceManager.tryAddName(loc, referenceName);
-		} else referenceName = nameResult.referenceName;
-		this._blockReader.resolveInclude(loc, false);
-		operands[operandIndex] = `&${referenceName}`;
+		operands[operandIndex] = new LocationWrapper(new Address(bank ?? Address.resolveBank(this._romDataReader.position, this._blockReader._root.config.memoryMode), opnd && "value" in opnd ? opnd["value"] : opnd, this._blockReader._root.config.memoryMode).toLocation(), AddressType.Offset);
 	}
 	cleanTransformName(transform) {
 		let name = transform;
@@ -1790,7 +1799,6 @@ var DbStringDictionary = class {
 	range;
 	command;
 	name;
-	suffix;
 	entries;
 	constructor(data) {
 		this.base = data.base ?? void 0;
@@ -1798,7 +1806,6 @@ var DbStringDictionary = class {
 		this.command = data.command ?? void 0;
 		this.name = data.name ?? "";
 		this.entries = data.entries ?? void 0;
-		this.suffix = data.suffix ?? "";
 		if (this.base === void 0 && this.command === void 0) throw new Error("Base or command is required");
 		if (!this.name) throw new Error("Name is required");
 		if (!this.entries) throw new Error("Entries is required");
@@ -2624,13 +2631,13 @@ var QuintetLZ = class QuintetLZ {
 	* @param srcData Source data to compress
 	* @returns Compressed data
 	*/
-	compact(srcData) {
+	compact(srcData, srcPosition, srcLen) {
 		const dictionary = new Uint8Array(QuintetLZ.DICTIONARY_SIZE);
 		dictionary.fill(QuintetLZ.DICTIONARY_INIT);
 		let offset = QuintetLZ.DICTIONARY_OFFSET;
-		let srcIx = 0;
+		let srcIx = srcPosition ?? 0;
 		let dstIx = 0;
-		const srcLen = srcData.length;
+		if (!srcLen) srcLen = srcData.length - srcIx;
 		const outputBuffer = new Uint8Array(srcLen * 2);
 		outputBuffer[dstIx++] = srcLen & 255;
 		outputBuffer[dstIx++] = srcLen >> 8 & 255;
@@ -2897,7 +2904,7 @@ var BlockWriter = class {
 		if (typeof obj === "number") return ObjectType.Number;
 		return ObjectType.String;
 	}
-	writeObject(obj, depth, isBranch = false) {
+	writeObject(obj, depth, isBranch = false, isArray = false) {
 		const lines = [];
 		const objType = this.getObjectType(obj);
 		let objLines;
@@ -2915,7 +2922,7 @@ var BlockWriter = class {
 				objLines = [this._blockReader.resolveName(obj.location, obj.type, isBranch)];
 				break;
 			case ObjectType.Address:
-				objLines = [`$${obj.toString()}`];
+				objLines = isArray ? [`$#${obj.offset.toString(16).toUpperCase().padStart(4, "0")}`] : [`$${obj.toString()}`];
 				break;
 			case ObjectType.ByteArray:
 				objLines = [`#${Array.from(obj).map((b) => b.toString(16).toUpperCase().padStart(2, "0")).join("")}`];
@@ -3028,13 +3035,13 @@ var BlockWriter = class {
 				const hexStr = str.substring(ix + 1, ix + 7);
 				const rawAddr = parseInt(hexStr, 16);
 				const adrs = new Address(rawAddr >> 16 & 255, rawAddr & 65535, this._blockReader._root.config.memoryMode);
-				if (adrs.isROM) {
-					const addressType = char === "^" ? AddressType.Offset : AddressType.Address;
-					const location = adrs.toInt();
-					const name = this._blockReader.resolveName(location, addressType, false);
-					str = str.replace(str.substring(ix, ix + 7), name);
-				}
-				ix = str.indexOf(char, ix + 7);
+				const addressType = char === "^" ? AddressType.Offset : AddressType.Address;
+				let name = "";
+				if (adrs.isROM) name = this._blockReader.resolveName(adrs.toLocation(), addressType, false);
+				else if (addressType === AddressType.Offset) name = adrs.offset.toString(16).toUpperCase().padStart(4, "0");
+				else name = adrs.toString();
+				str = str.replace(str.substring(ix, ix + 7), name);
+				ix = str.indexOf(char);
 			}
 		}
 		const refChar = stringObj.type.delimiter;
@@ -3085,7 +3092,7 @@ var BlockWriter = class {
 		lines.push("[");
 		this._isInline = false;
 		for (let i = 0; i < arr.length; i++) {
-			const objLines = this.writeObject(arr[i], depth + 1);
+			const objLines = this.writeObject(arr[i], depth + 1, false, true);
 			for (const line of objLines) lines.push(indent + "  " + line);
 			lines[lines.length - 1] += `   ;${i.toString(16).toUpperCase().padStart(2, "0")}`;
 		}
@@ -3297,19 +3304,19 @@ var TypeParser = class {
 		}
 		const stringType = this._stringTypes[fixedTypeName];
 		if (stringType) return this._stringReader.parseString(stringType, fixedSize);
-		const mType = this.tryParseMemberType(typeName);
+		const mType = this.tryParseMemberType(fixedTypeName);
 		if (mType !== null) switch (mType) {
 			case MemberType.Byte: return new Byte(this._romDataReader.readByte());
 			case MemberType.Word: return new Word(this.parseWordSafe());
 			case MemberType.Offset: return this.parseLocation(this._romDataReader.readUShort(), bank, null, AddressType.Offset);
 			case MemberType.Address: return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), null, AddressType.Address);
 			case MemberType.Location: return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), null, AddressType.Location);
-			case MemberType.Binary: return this.parseBinary();
+			case MemberType.Binary: return this.parseBinary(fixedSize);
 			case MemberType.Code: return this.parseCode(reg);
 			default: throw new Error("Invalid member type");
 		}
-		const parentType = this._blockReader._root.structs[typeName];
-		if (!parentType) throw new Error(`Unknown type: ${typeName}`);
+		const parentType = this._blockReader._root.structs[fixedTypeName];
+		if (!parentType) throw new Error(`Unknown type: ${fixedTypeName}`);
 		const delimiter = parentType.delimiter;
 		const discOffset = parentType.discriminator;
 		const objects = [];
@@ -3321,7 +3328,7 @@ var TypeParser = class {
 				const discPosition = this._romDataReader.position + discOffset;
 				const desc = this._romDataReader.romData[discPosition];
 				if (discOffset === 0) this._romDataReader.position++;
-				targetType = Object.values(this._blockReader._root.structs).find((x) => x.parent === typeName && x.discriminator === desc) || parentType;
+				targetType = Object.values(this._blockReader._root.structs).find((x) => x.parent === fixedTypeName && x.discriminator === desc) || parentType;
 			}
 			const types = targetType.types;
 			if (types && types.length > 0) {
@@ -3354,12 +3361,13 @@ var TypeParser = class {
 	parseWordSafe() {
 		return this._referenceManager.containsStruct(this._romDataReader.position + 1) ? this._romDataReader.readByte() : this._romDataReader.readUShort();
 	}
-	parseBinary() {
+	parseBinary(size) {
 		const startPosition = this._romDataReader.position;
-		do
+		let len = 0;
+		do {
 			this._romDataReader.position++;
-		while (this._blockReader.partCanContinue());
-		const len = this._romDataReader.position - startPosition;
+			len++;
+		} while (len !== size && this._blockReader.partCanContinue());
 		const outBuffer = new Uint8Array(len);
 		for (let i = 0; i < len; i++) outBuffer[i] = this._romDataReader.romData[startPosition + i];
 		return outBuffer;
@@ -3372,7 +3380,7 @@ var TypeParser = class {
 		else {
 			adrs = new Address(bank ?? Address.resolveBank(this._romDataReader.position, this._blockReader._root.config.memoryMode), offset, this._blockReader._root.config.memoryMode);
 			if (!adrs.isROM) return adrs;
-			loc = adrs.toInt();
+			loc = adrs.toLocation();
 		}
 		if (typeName && !this._blockReader._root.rewrites[loc]) {
 			this._referenceManager.tryAddStruct(loc, typeName);
@@ -3617,26 +3625,40 @@ var BlockReader = class {
 	*/
 	createChunkFilesFromSfx() {
 		let pos = this._root.config.sfxLocation;
+		let offset = 0;
 		const count = this._root.config.sfxCount;
 		const romData = this._romDataReader.romData;
 		const fileType = Object.values(this._root.fileTypes).find((x) => x.type === BinType.Sound);
-		const getSize = () => romData[pos++] | romData[pos++] << 8;
-		for (let i = 0; i < count; i++) {
-			const size = getSize();
-			const startPos = pos;
-			let remaining = size;
-			let end = pos + remaining;
+		const getByte = this._root.config.sfxType === "Striped" ? () => {
+			const byte = romData[pos + offset++];
+			if (offset & RomProcessingConstants.PAGE_SIZE) offset += RomProcessingConstants.PAGE_SIZE;
+			return byte;
+		} : () => romData[pos + offset++];
+		const getSize = () => getByte() | getByte() << 8;
+		const getBytes = this._root.config.sfxType === "Striped" ? (size) => {
+			let end = offset + size;
 			let data;
 			if (end & RomProcessingConstants.PAGE_SIZE) {
 				const endLen = end & 32767;
-				remaining -= endLen;
-				data = romData.slice(pos, pos + remaining);
-				pos += remaining + RomProcessingConstants.PAGE_SIZE;
-				end = pos + endLen;
-				const data2 = romData.slice(pos, end);
+				size -= endLen;
+				data = romData.slice(pos + offset, pos + offset + size);
+				offset += size + RomProcessingConstants.PAGE_SIZE;
+				end = offset + endLen;
+				const data2 = romData.slice(pos + offset, pos + end);
 				data = new Uint8Array([...data, ...data2]);
-			} else data = romData.slice(pos, end);
-			pos = end;
+			} else data = romData.slice(pos + offset, pos + end);
+			offset = end;
+			return data;
+		} : (size) => {
+			const end = offset + size;
+			const data = romData.slice(pos + offset, pos + end);
+			offset = end;
+			return data;
+		};
+		for (let i = 0; i < count; i++) {
+			const size = getSize();
+			const startPos = pos + offset;
+			const data = getBytes(size);
 			const chunk = new ChunkFile(`sfx${i.toString(16).toUpperCase().padStart(2, "0")}`, size, startPos, fileType);
 			chunk.rawData = data;
 			chunk.group = "sfx";
@@ -3657,7 +3679,7 @@ var BlockReader = class {
 	*/
 	createChunkFilesFromDbBlocks() {
 		for (const block of this._root.blocks) {
-			const chunkFile = createChunkFileFromDbBlock(block, Object.values(this._root.fileTypes).find((x) => x.isBlock));
+			const chunkFile = createChunkFileFromDbBlock(block, Object.values(this._root.fileTypes).find((x) => x.isBlock), this._root.config.memoryMode);
 			this._enrichedChunks.push(chunkFile);
 		}
 	}
@@ -3763,8 +3785,18 @@ var RomLayout = class RomLayout {
 	bestDepth = 0;
 	bestOffset = 0;
 	bestRemain = 0;
-	constructor(files) {
-		this.unmatchedFiles = Array.from(files).filter((x) => (x.size || 0) > 0).sort((a, b) => {
+	root;
+	config;
+	sfxPackType;
+	sfxFiles = [];
+	constructor(files, root) {
+		this.root = root;
+		this.config = root.config;
+		this.sfxPackType = root.config.sfxPack ?? root.config.sfxType;
+		this.sfxFiles = this.sfxPackType !== "Individual" ? files.filter((x) => x.type.type === "Sound").sort((a, b) => {
+			return parseInt(a.name.substring(a.name.length - 2, a.name.length), 16) - parseInt(b.name.substring(b.name.length - 2, b.name.length), 16);
+		}) : [];
+		this.unmatchedFiles = files.filter((x) => (x.size || 0) > 0).filter((x) => this.sfxPackType === "Individual" || x.type.type !== "Sound").sort((a, b) => {
 			const aAsm = a.parts ? 0 : 1;
 			const bAsm = b.parts ? 0 : 1;
 			if (aAsm !== bAsm) return aAsm - bAsm;
@@ -3774,16 +3806,67 @@ var RomLayout = class RomLayout {
 		});
 	}
 	organize() {
-		for (let page = 0; page < 128; page++) {
+		let stripeSfx = false;
+		let page;
+		const maxPages = this.config.memoryMode === MemoryMapMode.Hi ? 128 : this.config.memoryMode === MemoryMapMode.ExHi ? 256 : 64;
+		for (page = 0; page < maxPages; page++) {
 			if (this.unmatchedFiles.length === 0) break;
+			let start = page << 15;
 			let remain = RomProcessingConstants.PAGE_SIZE;
-			if (page === 1) remain -= RomProcessingConstants.SNES_HEADER_SIZE;
-			this.currentUpper = (page & 1) !== 0;
-			this.currentBank = page >> 1;
+			if (start <= this.config.sfxLocation && start + remain > this.config.sfxLocation) {
+				this.config.sfxLocation - start;
+				if (this.sfxPackType === "Sequential") {
+					let offset = 0;
+					for (const file of this.sfxFiles) {
+						file.location = start + offset;
+						console.log(`  ${file.location.toString(16).toUpperCase().padStart(6, "0")}: ${file.name}`);
+						offset += file.size;
+						if (offset & RomProcessingConstants.PAGE_SIZE) {
+							offset &= 32767;
+							console.log(`Page ${start.toString(16).toUpperCase().padStart(6, "0")} matched with SFX files 0 remaining`);
+							start += RomProcessingConstants.PAGE_SIZE;
+							page++;
+						}
+					}
+					console.log(`Page ${start.toString(16).toUpperCase().padStart(6, "0")} matched with SFX files ${remain} remaining`);
+					start += offset;
+					remain = RomProcessingConstants.PAGE_SIZE - offset;
+				} else if (this.sfxPackType === "Striped") stripeSfx = true;
+			}
+			if (page === 0 && this.config.memoryMode === MemoryMapMode.Lo || page === 1 && this.config.memoryMode === MemoryMapMode.Hi) remain -= RomProcessingConstants.SNES_HEADER_SIZE;
+			if (stripeSfx) {
+				let offset = 0;
+				while (remain > 0 && this.sfxFiles.length) {
+					const file = this.sfxFiles.shift();
+					file.location = start + offset;
+					console.log(`  ${file.location.toString(16).toUpperCase().padStart(6, "0")}: ${file.name}`);
+					offset += file.size;
+					if (offset & RomProcessingConstants.PAGE_SIZE) {
+						offset &= 32767;
+						console.log(`Page ${start.toString(16).toUpperCase().padStart(6, "0")} matched with SFX files 0 remaining`);
+						start += RomProcessingConstants.PAGE_SIZE;
+						page++;
+						if (offset) {
+							const newFile = new ChunkFile(file.name + "_2", file.size, file.location, Object.values(this.root.fileTypes).find((x) => x.type === BinType.Binary));
+							const end = file.rawData.length - offset;
+							newFile.rawData = file.rawData.slice(end);
+							newFile.size = newFile.rawData.length;
+							this.sfxFiles.unshift(newFile);
+							file.rawData = file.rawData.slice(0, end);
+							file.size -= offset;
+						}
+						remain = 0;
+						break;
+					} else remain -= file.size;
+				}
+				start += offset;
+				if (!this.sfxFiles.length) stripeSfx = false;
+			}
+			this.currentUpper = this.config.memoryMode === MemoryMapMode.Lo || (page & 1) !== 0;
+			this.currentBank = this.config.memoryMode === MemoryMapMode.Lo ? page : page >> 1;
 			this.bestDepth = 0;
 			this.bestRemain = remain;
 			this.bestOffset = 0;
-			const start = page << 15;
 			this.testDepth(0, 0, remain, this.currentUpper);
 			if (this.currentUpper) {
 				this.bestOffset = this.bestDepth;
@@ -3794,7 +3877,7 @@ var RomLayout = class RomLayout {
 				const file = this.unmatchedFiles[this.bestResult[i++]];
 				file.location = position;
 				console.log(`  ${position.toString(16).toUpperCase().padStart(6, "0")}: ${file.name}`);
-				position += file.size || 0;
+				position += file.size;
 			}
 			console.log(`Page ${start.toString(16).toUpperCase().padStart(6, "0")} matched with ${this.bestDepth} files ${this.bestRemain} remaining`);
 			this.commitPage();
@@ -3803,6 +3886,7 @@ var RomLayout = class RomLayout {
 			const names = this.unmatchedFiles.map((x) => x.name).join("\r\n");
 			throw new Error(`Unable to match ${this.unmatchedFiles.length} files\r\n${names}`);
 		}
+		return page;
 	}
 	testDepth(startIndex, depth, remain, asmMode) {
 		for (let fileIndex = startIndex; fileIndex < this.unmatchedFiles.length; fileIndex++) {
@@ -3868,7 +3952,16 @@ var RomProcessor = class RomProcessor {
 		const asmFiles = [];
 		for (const file of allFiles) {
 			if (file.type.type === "Patch") patches.push(file);
-			else if (file.type.type !== "Assembly") continue;
+			else if (file.type.type !== "Assembly") {
+				if (file.compressed === true) if (this.writer.root.config.uncompress) file.compressed = false;
+				else {
+					let newData = this.writer.root.compression.compact(file.rawData, file.type.header);
+					if (file.type.header) newData = new Uint8Array([...file.rawData.slice(0, file.type.header), ...newData]);
+					file.rawData = newData;
+					file.size = newData.length;
+				}
+				continue;
+			}
 			asmFiles.push(file);
 			if (!file.parts) {
 				const { blocks, includes, reqBank } = new Assembler(this.writer.root, file.textData).parseAssembly();
@@ -3879,7 +3972,7 @@ var RomProcessor = class RomProcessor {
 		}
 		RomProcessor.applyPatches(asmFiles, patches);
 		for (const file of allFiles) ChunkFileUtils.calculateSize(file);
-		new RomLayout(allFiles).organize();
+		const pages = new RomLayout(allFiles, this.writer.root).organize();
 		for (const file of asmFiles) ChunkFileUtils.rebase(file);
 		for (const f of asmFiles) {
 			const includeBlocks = asmFiles.filter((x) => f.includes?.has(x.name.toUpperCase())).flatMap((x) => x.parts).filter((b) => !!b.label);
@@ -3889,6 +3982,7 @@ var RomProcessor = class RomProcessor {
 		}
 		const blockLookup = /* @__PURE__ */ new Map();
 		for (const f of allFiles) blockLookup.set(f.name.toUpperCase(), f.location);
+		this.writer.allocate(pages);
 		for (const file of allFiles) await this.writer.writeFile(file, blockLookup);
 	}
 	static applyPatches(asmFiles, patches) {
@@ -3934,6 +4028,7 @@ var RomProcessor = class RomProcessor {
 var RomWriter = class {
 	bpsPath;
 	outBuffer;
+	romSize;
 	cartName;
 	makerCode;
 	root;
@@ -3941,7 +4036,6 @@ var RomWriter = class {
 		this.cartName = cartName;
 		this.makerCode = makerCode;
 		this.root = root;
-		this.outBuffer = new Uint8Array(4194304);
 	}
 	async repack(files) {
 		await new RomProcessor(this).repack(files);
@@ -3950,35 +4044,47 @@ var RomWriter = class {
 		this.writeChecksum();
 		return this.outBuffer;
 	}
+	allocate(pages) {
+		const size = pages * RomProcessingConstants.PAGE_SIZE;
+		let bits = 0;
+		let target = 1024;
+		while (target < size) {
+			target <<= 1;
+			bits++;
+		}
+		this.romSize = bits;
+		this.outBuffer = new Uint8Array(target);
+	}
 	writeHeader() {
 		const buf = this.outBuffer;
-		let pos = 65456;
+		let pos = this.root.config.memoryMode === MemoryMapMode.Lo ? 32688 : 65456;
 		this.writeAscii(this.makerCode.padEnd(6, " "), pos);
 		pos += 6;
 		for (let i = 0; i < 10; i++) buf[pos++] = 0;
 		this.writeAscii(this.cartName.toUpperCase().padEnd(21, " "), pos);
 		pos += 21;
-		buf[pos++] = 49;
-		buf[pos++] = 2;
-		buf[pos++] = 12;
-		buf[pos++] = 3;
+		buf[pos++] = 32 | (this.root.config.cpuMode === CpuMode.Fast ? 16 : 0) | (this.root.config.memoryMode === MemoryMapMode.Hi ? 1 : this.root.config.memoryMode === MemoryMapMode.ExHi ? 5 : 0);
+		buf[pos++] = this.root.config.chipset;
+		buf[pos++] = this.romSize;
+		buf[pos++] = this.root.config.ramSize;
 		buf[pos++] = 1;
 		buf[pos++] = 51;
 		buf[pos++] = 0;
 	}
 	writeChecksum() {
 		const buf = this.outBuffer;
-		buf[65500] = 255;
-		buf[65501] = 255;
-		buf[65502] = 0;
-		buf[65503] = 0;
+		let pos = this.root.config.memoryMode === MemoryMapMode.Lo ? 32732 : 65500;
+		buf[pos] = 255;
+		buf[pos + 1] = 255;
+		buf[pos + 2] = 0;
+		buf[pos + 3] = 0;
 		let sum = 0;
 		for (let i = 0; i < buf.length; i++) sum += buf[i];
-		buf[65502] = sum & 255;
-		buf[65503] = sum >> 8 & 255;
+		buf[pos + 2] = sum & 255;
+		buf[pos + 3] = sum >> 8 & 255;
 		const comp = ~sum;
-		buf[65500] = comp & 255;
-		buf[65501] = comp >> 8 & 255;
+		buf[pos] = comp & 255;
+		buf[pos + 1] = comp >> 8 & 255;
 	}
 	writeEntryPoints(asmFiles) {
 		const buf = this.outBuffer;
@@ -3986,8 +4092,10 @@ var RomWriter = class {
 		for (const ep of this.root.config.entryPoints) {
 			const match = entryBlocks.find((b) => b.label === ep.name);
 			if (match) {
-				buf[ep.location] = match.location & 255;
-				buf[ep.location + 1] = match.location >> 8 & 255;
+				let location = match.location;
+				if (this.root.config.memoryMode === MemoryMapMode.Lo) location += RomProcessingConstants.PAGE_SIZE;
+				buf[ep.location] = location & 255;
+				buf[ep.location + 1] = location >> 8 & 255;
 			}
 		}
 	}
@@ -3999,19 +4107,21 @@ var RomWriter = class {
 			const data = file.rawData;
 			let remain = file.size;
 			let srcPos = 0;
-			if (file.type.header === -2) {
-				remain -= 2;
-				buf[pos++] = remain & 255;
-				buf[pos++] = remain >> 8 & 255;
-			} else if (file.type.header > 0) {
-				remain -= file.type.header;
-				for (let i = 0; i < file.type.header; i++) buf[pos++] = data[srcPos++];
+			if (file.compressed !== true) {
+				if (file.type.header === -2) {
+					remain -= 2;
+					buf[pos++] = remain & 255;
+					buf[pos++] = remain >> 8 & 255;
+				} else if (file.type.header > 0) {
+					remain -= file.type.header;
+					for (let i = 0; i < file.type.header; i++) buf[pos++] = data[srcPos++];
+				}
 			}
-			if (file.compressed !== void 0) {
+			if (file.compressed === false) {
 				remain -= 2;
-				const inverse = 0 - remain & 65535;
-				buf[pos++] = inverse & 255;
-				buf[pos++] = inverse >> 8 & 255;
+				const size = 0 - remain & 65535;
+				buf[pos++] = size & 255;
+				buf[pos++] = size >> 8 & 255;
 			}
 			while (remain > 0) {
 				buf[pos++] = data[srcPos++];
@@ -4105,7 +4215,7 @@ var RomWriter = class {
 							default: throw new Error(`Invalid operand '${label}'`);
 						}
 					}
-					let type = Address.typeFromCode(str[0]);
+					let type = isRelative ? parentOp?.size === 3 ? AddressType.WRelative : AddressType.Relative : Address.typeFromCode(str[0]);
 					if (type === AddressType.Unknown) type = parentOp?.size === 4 ? AddressType.Address : parentOp?.size === 2 ? AddressType.Unknown : AddressType.Offset;
 					if (isRelative) {
 						loc -= block.location + opos;
@@ -4119,22 +4229,24 @@ var RomWriter = class {
 							break;
 						} else markerOffset += RomProcessingConstants.getSize(part);
 					}
+					if (!isRelative && type !== AddressType.Location) loc = Address.fromLocation(loc, this.root.config.memoryMode, this.root.config.cpuMode).toInt();
 					switch (type) {
 						case AddressType.Offset:
+						case AddressType.WRelative:
 							currentObj = new Word(loc);
 							continue;
 						case AddressType.Bank:
-							currentObj = new Byte(loc >> 16 | ((loc & 65535) >= 32768 ? 128 : 192));
+							currentObj = new Byte(loc >> 16);
 							continue;
 						case AddressType.WBank:
-							currentObj = new Word(loc >> 16 | ((loc & 65535) >= 32768 ? 128 : 192));
+							currentObj = new Word(loc >> 16);
 							continue;
 						case AddressType.Address:
-							currentObj = new Long(loc | ((loc & 65535) >= 32768 ? 8388608 : 12582912));
-							continue;
 						case AddressType.Location:
 							currentObj = new Long(loc);
 							continue;
+						case AddressType.Unknown:
+						case AddressType.Relative:
 						default:
 							currentObj = new Byte(loc);
 							continue;
@@ -4549,7 +4661,7 @@ var StringReader = class StringReader {
 			} else {
 				let found = false;
 				for (const dictionary of Object.values(dictionaries)) if (c >= dictionary.base && c <= dictionary.range) {
-					builder.push(dictionary.entries[c - dictionary.base] + dictionary.suffix);
+					builder.push(dictionary.entries[c - dictionary.base]);
 					found = true;
 					break;
 				}
@@ -4668,24 +4780,38 @@ var StringProcessor = class {
 		}
 	}
 	processString(str, stringType) {
-		const dict = stringType.commands;
+		const cmdLookup = stringType.commands;
+		const dictLookup = stringType.dictionaries;
 		let lastCmd = null;
+		for (const dictionary of Object.values(dictLookup)) for (let ix = 0; ix < dictionary.entries.length; ix++) {
+			const entry = dictionary.entries[ix];
+			if (str.indexOf(entry) >= 0) if (dictionary.command !== void 0) str = str.replace(entry, `[${dictionary.command}:${(ix + dictionary.base).toString(16).toUpperCase()}]`);
+			else str = str.replace(entry, `[${(ix + dictionary.base).toString(16).toUpperCase()}]`);
+		}
 		for (let x = 0; x < str.length; x++) {
 			const c = str[x];
 			if (c === "[") {
 				const endIx = str.indexOf("]", x + 1);
-				const parts = str.substring(x + 1, endIx).split(/* @__PURE__ */ new RegExp(`[${[
+				const splitChars = [
 					":",
 					",",
 					" "
-				].join("")}]`)).filter((p) => p.length > 0);
+				];
+				const subStr = str.substring(x + 1, endIx);
+				let ix = subStr.length === 2 ? parseInt(subStr, 16) : NaN;
+				if (!isNaN(ix)) {
+					this.memBuffer.push(ix);
+					x = endIx;
+					continue;
+				}
+				const parts = str.substring(x + 1, endIx).split(/* @__PURE__ */ new RegExp(`[${splitChars.join("")}]`)).filter((p) => p.length > 0);
 				x = endIx;
 				if (parts.length === 0) {
 					this.flushBuffer(stringType, true);
 					this.context.currentBlock.objList.push({ offset: this.context.currentBlock.size });
 					continue;
 				}
-				const cmd = dict[parts[0]];
+				const cmd = cmdLookup[parts[0]];
 				if (cmd) {
 					lastCmd = cmd;
 					this.memBuffer.push(cmd.id);
@@ -6157,12 +6283,12 @@ var RomGenerator = class {
 		this.assembleCodeFromText(asmFiles);
 		RomProcessor.applyPatches(asmFiles, patchFiles);
 		for (const asm of chunkFiles) ChunkFileUtils.calculateSize(asm);
-		new RomLayout(chunkFiles).organize();
+		const pages = new RomLayout(chunkFiles, this.dbRoot).organize();
 		for (const file of asmFiles) ChunkFileUtils.rebase(file);
 		this.generateAsmIncludeLookups(asmFiles);
 		const blockLookup = /* @__PURE__ */ new Map();
 		for (const f of chunkFiles) blockLookup.set(f.name.toUpperCase(), f.location);
-		return await this.writeRom(blockLookup, chunkFiles, asmFiles);
+		return await this.writeRom(blockLookup, chunkFiles, asmFiles, pages);
 	}
 	applyProjectInit(chunkFiles, asmFiles, patchFiles) {
 		const moduleLookup = /* @__PURE__ */ new Map();
@@ -6207,8 +6333,9 @@ var RomGenerator = class {
 			existing.size = chunkFile.size;
 		} else chunkFiles.push(chunkFile);
 	}
-	async writeRom(blockLookup, chunkFiles, asmFiles) {
+	async writeRom(blockLookup, chunkFiles, asmFiles, pages) {
 		const romWriter = new RomWriter(this.dbRoot, "GAIALABS", "01JG  ");
+		romWriter.allocate(pages);
 		for (const file of chunkFiles) await romWriter.writeFile(file, blockLookup);
 		romWriter.writeHeader();
 		romWriter.writeEntryPoints(asmFiles);
@@ -6492,6 +6619,7 @@ exports.CompressionAlgorithms = CompressionAlgorithms;
 exports.CompressionRegistry = CompressionRegistry;
 exports.CopCommandProcessor = CopCommandProcessor;
 exports.CopDef = CopDef;
+exports.CpuMode = CpuMode;
 exports.DbAddressingMode = DbAddressingMode;
 exports.DbBlock = DbBlock;
 exports.DbFile = DbFile;