@gaialabs/core 0.2.13 → 0.2.15

package/dist/index.cjs

@@ -937,7 +937,7 @@ var RomDataReader = class {
 	romData;
 	position;
 	offset;
-	constructor(romData, offset = 0) {
+	constructor(romData, offset) {
 		if (!romData) throw new Error("romData cannot be null");
 		this.romData = romData;
 		this.position = 0;
@@ -1099,7 +1099,7 @@ var RomProcessingConstants = class RomProcessingConstants {
 * BlockReader specific constants
 */
 var BlockReaderConstants = class {
-	static REF_SEARCH_MAX_RANGE = 416;
+	static REF_SEARCH_MAX_RANGE = 896;
 	static BANK_MASK_CHECK = 64;
 	static BYTE_DELIMITER_THRESHOLD = 256;
 	static BANK_HIGH_MEMORY_1 = 126;
@@ -1131,6 +1131,7 @@ let AddressType = /* @__PURE__ */ function(AddressType) {
 	AddressType["Relative"] = "Relative";
 	AddressType["WRelative"] = "WRelative";
 	AddressType["Location"] = "Location";
+	AddressType["OddLocation"] = "OddLocation";
 	return AddressType;
 }({});
 /**
@@ -1221,6 +1222,7 @@ var Address = class Address {
 			case "@": return AddressType.Address;
 			case "*": return AddressType.WBank;
 			case "%": return AddressType.Location;
+			case "!": return AddressType.OddLocation;
 			default: return AddressType.Unknown;
 		}
 	}
@@ -1231,6 +1233,7 @@ var Address = class Address {
 			case AddressType.Address: return "@";
 			case AddressType.WBank: return "*";
 			case AddressType.Location: return "%";
+			case AddressType.OddLocation: return "!";
 			default: return null;
 		}
 	}
@@ -1675,6 +1678,7 @@ var ChunkFile = class {
 	scene;
 	base;
 	referenceManager;
+	isFile;
 	constructor(type, name, size = 0, location = 0) {
 		this.type = type;
 		this.name = name;
@@ -1682,6 +1686,7 @@ var ChunkFile = class {
 		this.location = location;
 		this.mnemonics = {};
 		this.compressed = type.compressed;
+		this.isFile = !type.isBlock;
 	}
 	enrichWithRawDataFromDbFile(file, rom, compression) {
 		this.upper = file.upper ?? this.upper;
@@ -1690,7 +1695,8 @@ var ChunkFile = class {
 		this.base = file.base ?? this.type.base ?? this.base;
 		this.group = file.group ?? this.group;
 		this.scene = file.scene ?? this.scene;
-		this.compressed = file.compressed;
+		this.compressed = file.compressed ?? this.type.compressed ?? this.compressed;
+		this.isFile = true;
 		let start = this.location;
 		let header = null;
 		const fileType = this.type;
@@ -1716,6 +1722,8 @@ var ChunkFile = class {
 	enrichWithAsmBlocksFromDbBlock(block, memoryMode) {
 		this.group = block.group;
 		this.scene = block.scene;
+		this.base = block.base;
+		this.isFile = false;
 		this.parts = [];
 		this.size = 0;
 		if (!block.parts?.length) throw new Error(`Block ${block.name} has no parts`);
@@ -1926,20 +1934,30 @@ var ReferenceManager = class {
 	structTable = /* @__PURE__ */ new Map();
 	markerTable = /* @__PURE__ */ new Map();
 	nameTable = /* @__PURE__ */ new Map();
+	fileTable = /* @__PURE__ */ new Map();
 	root;
 	constructor(root) {
 		if (!root) throw new Error("root cannot be null");
 		this.root = root;
 	}
 	tryGetStruct(location) {
-		const chunkType = this.structTable.get(location);
+		let chunkType = this.structTable.get(location);
+		const found = chunkType !== void 0;
+		let isSoft;
+		if (chunkType) if (chunkType[0] === "~") {
+			isSoft = true;
+			chunkType = chunkType.substring(1);
+		} else isSoft = false;
 		return {
-			found: chunkType !== void 0,
-			chunkType
+			found,
+			chunkType,
+			isSoft
 		};
 	}
 	tryAddStruct(location, chunkType) {
-		if (this.structTable.has(location)) return false;
+		const existingStruct = this.tryGetStruct(location);
+		const isSoft = chunkType[0] === "~";
+		if (existingStruct.isSoft === false || existingStruct.found && isSoft) return false;
 		this.structTable.set(location, chunkType);
 		return true;
 	}
@@ -1947,14 +1965,23 @@ var ReferenceManager = class {
 		return this.structTable.has(location);
 	}
 	tryGetName(location) {
-		const referenceName = this.nameTable.get(location);
+		let referenceName = this.nameTable.get(location);
+		const found = referenceName !== void 0;
+		let isSoft;
+		if (referenceName) if (referenceName[0] === "~") {
+			isSoft = true;
+			referenceName = referenceName.substring(1);
+		} else isSoft = false;
 		return {
-			found: referenceName !== void 0,
-			referenceName
+			found,
+			referenceName,
+			isSoft
 		};
 	}
 	tryAddName(location, referenceName) {
-		if (this.nameTable.has(location)) return false;
+		const existingName = this.tryGetName(location);
+		const isSoft = referenceName[0] === "~";
+		if (existingName.isSoft === false || existingName.found && isSoft) return false;
 		this.nameTable.set(location, referenceName);
 		return true;
 	}
@@ -1975,6 +2002,7 @@ var ReferenceManager = class {
 	}
 	createTypeName(type, location) {
 		let name = type.toLowerCase();
+		if (type[0] === "~") name = name.substring(1);
 		if (name === "branch") name = "loc";
 		while (name.length > 0 && BlockReaderConstants.POINTER_CHARACTERS.includes(name[0])) name = name.substring(1) + "_list";
 		return `${name}_${location.toString(16).toUpperCase().padStart(6, "0")}`;
@@ -1996,7 +2024,7 @@ var ReferenceManager = class {
 	resolveName(location, type, isBranch) {
 		const prefix = Address.codeFromType(type);
 		let name;
-		let label = null;
+		let label;
 		let resolvedLocation = location;
 		const rewrite = this.root.rewrites[location];
 		if (rewrite !== void 0) {
@@ -2004,9 +2032,8 @@ var ReferenceManager = class {
 			resolvedLocation = result.location;
 			label = result.label;
 		}
-		const existingName = this.nameTable.get(resolvedLocation);
-		if (existingName) name = existingName;
-		else name = isBranch ? this.createBranchLabel(resolvedLocation) : this.findClosestReference(resolvedLocation) || this.createFallbackName(resolvedLocation);
+		name = this.tryGetName(resolvedLocation).referenceName;
+		if (!name) name = isBranch ? this.createBranchLabel(resolvedLocation) : this.findClosestReference(resolvedLocation) || this.createFallbackName(resolvedLocation);
 		return `${prefix || ""}${name}${label || ""}`;
 	}
 	findClosestReference(location) {
@@ -2028,8 +2055,8 @@ var ReferenceManager = class {
 		const offset = location - rewrite;
 		const cmd = offset < 0 ? "-" : "+";
 		const absOffset = Math.abs(offset);
-		let label = null;
-		if (this.structTable.get(rewrite) === BlockReaderConstants.WIDE_STRING_TYPE) {
+		let label;
+		if (this.tryGetStruct(rewrite).chunkType === BlockReaderConstants.WIDE_STRING_TYPE) {
 			this.markerTable.set(rewrite, absOffset);
 			this.markerTable.set(location, absOffset);
 			label = cmd === "-" ? BlockReaderConstants.NEGATIVE_MARKER_FORMAT : BlockReaderConstants.MARKER_FORMAT;
@@ -2042,7 +2069,7 @@ var ReferenceManager = class {
 	processClosestMatch(location, closestName, closestLocation, closestDistance) {
 		if (!closestName || closestLocation === null) return null;
 		let result = closestName;
-		if (this.structTable.get(closestLocation) === BlockReaderConstants.WIDE_STRING_TYPE) {
+		if (this.tryGetStruct(closestLocation).chunkType === BlockReaderConstants.WIDE_STRING_TYPE) {
 			this.markerTable.set(closestLocation, closestDistance);
 			this.markerTable.set(location, closestDistance);
 			result += BlockReaderConstants.MARKER_FORMAT;
@@ -2108,6 +2135,10 @@ var StackOperations = class {
 			case "XBA":
 				this.handleExchangeBytes();
 				break;
+			case "RTL":
+			case "RTS":
+				this._blockReader._referenceManager.tryAddStruct(this._blockReader._romDataReader.position, "~Code");
+				break;
 		}
 	}
 	handleAccumulatorPush() {
@@ -2157,7 +2188,16 @@ var CopCommandProcessor = class {
 	* Parses a COP command based on its definition
 	*/
 	parseCopCommand(copDef, operands) {
-		for (let partStr of copDef.parts) {
+		let parts = copDef.parts;
+		if (copDef.conditions) for (const condition of copDef.conditions) {
+			let value = this._romDataReader.romData[this._romDataReader.position + condition.offset];
+			if (condition.value >= 256) value |= this._romDataReader.romData[this._romDataReader.position + condition.offset + 1] << 8;
+			if (value === condition.value) {
+				parts = condition.parts;
+				break;
+			}
+		}
+		for (let partStr of parts) {
 			let bank = null;
 			const bankHintIx = partStr.indexOf("$");
 			if (bankHintIx > 0) {
@@ -2340,6 +2380,7 @@ var AddressingModeHandler = class {
 		if (address.isROM) {
 			const wrapper = new LocationWrapper(address.toLocation(), AddressType.Address);
 			if (this.isJumpInstruction(mnemonic)) this._blockReader.noteType(wrapper.location, "Code", false, reg);
+			if (mnemonic === "JML") this._blockReader._referenceManager.tryAddStruct(this._dataReader.position, "Code");
 			operands.push(wrapper);
 		} else operands.push(address);
 	}
@@ -2353,7 +2394,7 @@ var AddressingModeHandler = class {
 	}
 	handlePCRelativeMode(operands, nextAddress, reg, isLong) {
 		const relative = isLong ? nextAddress + this._dataReader.readShort() : nextAddress + this._dataReader.readSByte();
-		this._blockReader._referenceManager.tryAddStruct(relative, "Branch");
+		this._blockReader._referenceManager.tryAddStruct(relative, "~Branch");
 		this._blockReader.updateRegisterState(relative, reg);
 		operands.push(new LocationWrapper(relative, isLong ? AddressType.WRelative : AddressType.Relative));
 	}
@@ -2378,12 +2419,13 @@ var AddressingModeHandler = class {
 		const isPush = this.isPushInstruction(mnemonic);
 		if (isPush) refLoc++;
 		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);
+		const addr = new Address(xBank1 ?? (isJump ? Address.resolveBank(this._dataReader.position, registers.mode) : dataBank) ?? this._blockReader._root.config.defaultBank ?? 129, refLoc, registers.mode);
 		if (addr.isROM) {
 			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);
+				if (mnemonic === "JMP") this._blockReader._referenceManager.tryAddStruct(this._dataReader.position, "~Code");
 				if (isPush) {
 					operands.push(`&${name}-1`);
 					return;
@@ -3018,10 +3060,11 @@ var StringReader = class StringReader {
 	}
 	parseString(stringType, fixedSize) {
 		const commands = stringType.commandLookup;
-		stringType.dictionaries;
+		const dictionaries = stringType.dictionaries;
 		const builder = [];
 		const strLoc = this._romDataReader.position;
 		const terminator = stringType.terminator;
+		const modifiers = stringType.modifiers;
 		let currentLayer = stringType.layers[0];
 		do {
 			const c = this._romDataReader.readByte();
@@ -3029,23 +3072,35 @@ var StringReader = class StringReader {
 				if (stringType.greedyTerminator) while (this._romDataReader.peekByte() === terminator && this._blockReader.partCanContinue()) this._romDataReader.position++;
 				break;
 			}
-			const cmd = commands[c];
-			if (cmd) {
+			let cmd = void 0;
+			const mod = modifiers ? modifiers[c] : void 0;
+			if (mod) {
+				const next = mod[builder[builder.length - 1]];
+				if (next) builder[builder.length - 1] = next;
+				else builder.push(currentLayer.map[c - (currentLayer.base ?? 0)]);
+			} else if (cmd = commands[c]) {
 				this.resolveCommand(cmd, builder);
 				if (cmd.halt) break;
 			} else {
 				let found = false;
-				for (const layer of stringType.layers) if (layer.on !== void 0) {
-					if (c === layer.on) {
-						currentLayer = layer;
-						builder.push("[--]");
+				for (const dictionary of Object.values(dictionaries)) if (dictionary.base !== void 0 && c >= dictionary.base && c <= dictionary.base + dictionary.entries.length) {
+					builder.push(dictionary.entries[c - dictionary.base]);
+					found = true;
+					break;
+				}
+				if (!found) {
+					for (const layer of stringType.layers) if (layer.on !== void 0) {
+						if (c === layer.on) {
+							currentLayer = layer;
+							builder.push("[--]");
+							found = true;
+							break;
+						}
+					} else if (layer.base && c >= layer.base && c < layer.base + layer.map.length) {
+						builder.push(layer.map[c - layer.base]);
 						found = true;
 						break;
 					}
-				} else if (layer.base && c >= layer.base && c < layer.base + layer.map.length) {
-					builder.push(layer.map[c - layer.base]);
-					found = true;
-					break;
 				}
 				if (!found) {
 					let index = c - (currentLayer.base ?? 0);
@@ -3121,27 +3176,33 @@ var TypeParser = class {
 		this._stringReader = blockReader._stringReader;
 		this._stringTypes = blockReader._root.stringTypes;
 	}
-	parseType(typeName, reg, depth, bank) {
-		if (typeName[0] === "&") return this.parseLocation(this._romDataReader.readUShort(), bank, typeName.substring(1), AddressType.Offset);
-		if (typeName[0] === "@") return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), typeName.substring(1), AddressType.Address);
-		if (typeName[0] === "%") return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), typeName.substring(1), AddressType.Location);
-		const isFixed = typeName[typeName.length - 1] === ")";
-		let fixedTypeName = typeName;
-		let fixedSize = 0;
-		if (isFixed) {
-			const startIx = typeName.indexOf("(");
-			fixedTypeName = typeName.substring(0, startIx);
-			fixedSize = parseInt(typeName.substring(startIx + 1, typeName.length - 1), 10);
-		}
+	parseType(typeName, reg, depth, bank, single) {
+		const objects = [];
+		const arrayIx = typeName.indexOf("[");
+		const arrayCount = arrayIx !== -1 ? parseInt(typeName.substring(arrayIx + 1, typeName.length - 1), 16) : 0;
+		const arrayTypeName = arrayIx !== -1 ? typeName.substring(0, arrayIx) : typeName;
+		if (arrayCount > 0) {
+			for (let i = 0; i < arrayCount; i++) objects.push(this.parseType(arrayTypeName, reg, depth + 1, bank, true));
+			return objects;
+		}
+		const isSoft = arrayTypeName[0] === "~";
+		const realTypeName = isSoft ? arrayTypeName.substring(1) : arrayTypeName;
+		const fixedIx = realTypeName.indexOf("(");
+		const fixedSize = fixedIx !== -1 ? parseInt(realTypeName.substring(fixedIx + 1, realTypeName.length - 1), 16) : 0;
+		const fixedTypeName = fixedIx !== -1 ? realTypeName.substring(0, fixedIx) : realTypeName;
 		const stringType = this._stringTypes[fixedTypeName];
 		if (stringType) return this._stringReader.parseString(stringType, fixedSize);
+		if (fixedTypeName[0] === "&") return this.parseLocation(this._romDataReader.readUShort(), bank, fixedTypeName.substring(1), AddressType.Offset, isSoft);
+		if (fixedTypeName[0] === "@") return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), fixedTypeName.substring(1), AddressType.Address, isSoft);
+		if (fixedTypeName[0] === "%") return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), fixedTypeName.substring(1), AddressType.Location, isSoft);
+		if (fixedTypeName[0] === "!") return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), fixedTypeName.substring(1), AddressType.OddLocation, isSoft);
 		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.Offset: return this.parseLocation(this._romDataReader.readUShort(), bank, null, AddressType.Offset, isSoft);
+			case MemberType.Address: return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), null, AddressType.Address, isSoft);
+			case MemberType.Location: return this.parseLocation(this._romDataReader.readUShort(), this._romDataReader.readByte(), null, AddressType.Location, isSoft);
 			case MemberType.Binary: return this.parseBinary(fixedSize);
 			case MemberType.Code:
 			case MemberType.Branch: return this.parseCode(reg);
@@ -3151,29 +3212,52 @@ var TypeParser = class {
 		if (!parentType) throw new Error(`Unknown type: ${fixedTypeName}`);
 		const delimiter = parentType.delimiter;
 		const discOffset = parentType.discriminator;
-		const objects = [];
+		const discLogic = parentType.discriminatorLogic;
+		const discSize = parentType.discriminatorSize ?? 1;
+		const nullValue = parentType.null;
+		if (delimiter === void 0 && this._blockReader.delimiterReached(nullValue)) {
+			objects.push({
+				name: parentType.name,
+				parts: ["null"]
+			});
+			return objects;
+		}
 		let delReached;
 		while (!(delReached = this._blockReader.delimiterReached(delimiter))) {
 			const startPosition = this._romDataReader.position;
 			let targetType = parentType;
-			if (discOffset !== void 0) {
-				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 === fixedTypeName && x.discriminator === desc) || parentType;
-			}
-			const types = targetType.types;
-			if (types && types.length > 0) {
-				const memberCount = types.length;
-				const prevPosition = this._romDataReader.position;
-				const parts = new Array(memberCount);
-				const def = {
-					name: targetType.name,
-					parts
-				};
-				for (let i = 0; i < memberCount; i++) parts[i] = this.parseType(types[i], reg, depth + 1, bank);
-				if (discOffset !== void 0 && discOffset === this._romDataReader.position - prevPosition) this._romDataReader.position++;
-				objects.push(def);
+			if (this._blockReader.delimiterReached(nullValue)) objects.push({
+				name: parentType.name,
+				parts: ["null"]
+			});
+			else {
+				if (discOffset !== void 0) {
+					const discPosition = this._romDataReader.position + discOffset;
+					const disc = this._romDataReader.romData[discPosition];
+					const disc16 = this._romDataReader.romData[discPosition + 1] << 8 | disc;
+					const matchedStruct = Object.values(this._blockReader._root.structs).find((x) => x.parent === fixedTypeName && (discLogic === "&" ? ((x.discriminator ?? 0) & disc) !== 0 : (x.discriminator ?? 0) >= 256 ? x.discriminator === disc16 : x.discriminator === disc));
+					targetType = matchedStruct || parentType;
+					if (discOffset === 0 && parentType != targetType && discLogic === "=") {
+						this._romDataReader.position++;
+						if (discSize > 1 || (matchedStruct?.discriminator ?? 0) >= 256) this._romDataReader.position++;
+					}
+				}
+				const types = targetType.types;
+				if (types) {
+					const memberCount = types.length;
+					const prevPosition = this._romDataReader.position;
+					const parts = new Array(memberCount);
+					const def = {
+						name: targetType.name,
+						parts
+					};
+					for (let i = 0; i < memberCount; i++) parts[i] = this.parseType(types[i], reg, depth + 1, bank);
+					if (discOffset !== void 0 && discOffset === this._romDataReader.position - prevPosition && types?.length > 0) {
+						this._romDataReader.position++;
+						if (discSize > 1) this._romDataReader.position++;
+					}
+					objects.push(def);
+				} else this._romDataReader.position++;
 			}
 			let checkPosition = startPosition;
 			while (++checkPosition < this._romDataReader.position) {
@@ -3184,9 +3268,12 @@ var TypeParser = class {
 				}
 			}
 			if (!this._blockReader.partCanContinue()) break;
+			if (nullValue !== void 0) break;
+			if (single) break;
 		}
 		if (delReached && depth === 0) this._referenceManager.tryAddStruct(this._romDataReader.position, typeName);
-		return objects;
+		if (single) return objects[0];
+		else return objects;
 	}
 	tryParseMemberType(memberTypeName) {
 		const upperName = memberTypeName.toUpperCase();
@@ -3207,22 +3294,41 @@ var TypeParser = class {
 		for (let i = 0; i < len; i++) outBuffer[i] = this._romDataReader.romData[startPosition + i];
 		return outBuffer;
 	}
-	parseLocation(offset, bank, typeName, addrType) {
-		if ((bank === void 0 || bank === null) && offset === 0) return new Word(offset);
-		offset -= this._romDataReader.offset;
+	parseLocation(offset, bank, typeName, addrType, isSoft = false) {
+		if ((bank === void 0 || bank === null) && (offset === 0 || offset === 65535)) return new Word(offset);
+		const hasOffset = this._romDataReader.offset !== void 0;
+		if (hasOffset) offset -= this._romDataReader.offset;
 		let adrs;
 		let loc;
-		if (addrType === AddressType.Location || this._romDataReader.offset) loc = offset | bank << 16;
-		else {
+		if (addrType === AddressType.Location || hasOffset) {
+			loc = offset | bank << 16;
+			if (hasOffset && !this._blockReader._currentChunk.isFile) loc += this._blockReader._currentChunk.location;
+		} else {
+			if (addrType === AddressType.OddLocation) {
+				const bankFlag = this._blockReader._root.config.cpuMode === CpuMode.Fast ? 128 : 0;
+				const bankReal = this._romDataReader.position >> 16;
+				const isVeryOdd = !this._blockReader._root.config.oddLocationBase || bankReal < this._blockReader._root.config.oddLocationBase;
+				const bankBase = (isVeryOdd ? 64 : 0) + bankReal | bankFlag;
+				const bankMax = this._romDataReader.romData.length >> 16 | bankFlag;
+				const bankSpan = isVeryOdd ? 0 : (64 | bankFlag) - bankMax;
+				const hiOffset = offset >> 8 & 127;
+				const hiAdjust = (hiOffset ^ (offset >> 8 | bank << 8)) << 1 | 128 | hiOffset;
+				const hiBank = (hiAdjust >> 8) + bankBase;
+				offset = (hiAdjust & 255) << 8 | offset & 255;
+				bank = hiBank;
+				if (hiBank >= bankMax) {
+					bank += bankSpan;
+					offset &= 32767;
+				}
+			}
 			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.toLocation();
 		}
-		if (typeName && (this._romDataReader.offset || !this._blockReader._root.rewrites[loc])) {
-			const oldStruct = this._referenceManager.structTable.get(loc);
-			if (!oldStruct || oldStruct === "Branch") this._referenceManager.structTable.set(loc, typeName);
+		if (typeName && (hasOffset || !this._blockReader._root.rewrites[loc])) {
+			this._referenceManager.tryAddStruct(loc, isSoft ? "~" + typeName : typeName);
 			const referenceName = `${typeName.toLowerCase()}_${loc.toString(16).toUpperCase().padStart(6, "0")}`;
-			this._referenceManager.tryAddName(loc, referenceName);
+			this._referenceManager.tryAddName(loc, isSoft ? "~" + referenceName : referenceName);
 		}
 		return new LocationWrapper(loc, addrType);
 	}
@@ -3232,8 +3338,8 @@ var TypeParser = class {
 		while (this._romDataReader.position < this._blockReader._partEnd) {
 			if (first) first = false;
 			else {
-				const struct = this._referenceManager.structTable.get(this._romDataReader.position);
-				if (struct && struct !== "Branch") break;
+				const struct = this._referenceManager.tryGetStruct(this._romDataReader.position);
+				if (struct.found && struct.chunkType !== "Branch") break;
 			}
 			if (reg) this._blockReader.hydrateRegisters(reg);
 			const op = this._blockReader._asmReader.parseAsm(reg);
@@ -3436,9 +3542,6 @@ var BlockReader = class {
 	/**
 	* Processes predefined file references
 	*/
-	initializeFileReferences() {
-		for (const file of this._root.files) this._referenceManager.tryAddName(file.start, file.name);
-	}
 	/**
 	* Resolves mnemonic for a given address
 	*/
@@ -3476,13 +3579,13 @@ var BlockReader = class {
 	* Notes a type at a location and manages chunk references
 	*/
 	noteType(loc, type, silent = false, reg) {
-		const oldStruct = this._referenceManager.structTable.get(loc);
-		if (!oldStruct || oldStruct === "Branch") this._referenceManager.structTable.set(loc, type);
+		const isSoft = type[0] === "~";
+		this._referenceManager.tryAddStruct(loc, type);
 		const nameResult = this._referenceManager.tryGetName(loc);
 		let name;
 		if (!nameResult.found) {
 			name = this._referenceManager.createTypeName(type, loc);
-			this._referenceManager.tryAddName(loc, name);
+			this._referenceManager.tryAddName(loc, isSoft ? "~" + name : name);
 		} else name = nameResult.referenceName;
 		if (!silent && type === BlockReaderConstants.CODE_TYPE && reg) this.updateRegisterState(loc, reg);
 		return name;
@@ -3519,7 +3622,6 @@ var BlockReader = class {
 	analyzeAndResolve() {
 		console.log("analyzeAndResolve started");
 		this.initializeOverrides();
-		this.initializeFileReferences();
 		this.createChunkFilesFromDatabase();
 		this.initializeBlocksAndParts();
 		this.analyzeChunkFiles();
@@ -3535,9 +3637,12 @@ var BlockReader = class {
 	*/
 	initializeBlocksAndParts() {
 		console.log("initializeBlocksAndParts");
-		for (const block of this._enrichedChunks) for (const part of block.parts || []) {
-			if (part.structName) this._referenceManager.tryAddStruct(part.location, part.structName);
-			if (part.label) this._referenceManager.tryAddName(part.location, part.label);
+		for (const block of this._enrichedChunks) {
+			for (const part of block.parts || []) {
+				if (part.structName) this._referenceManager.tryAddStruct(part.location, part.structName);
+				if (part.label) this._referenceManager.tryAddName(part.location, part.label);
+			}
+			this._referenceManager.tryAddName(block.location, block.name);
 		}
 	}
 	/**
@@ -3582,7 +3687,7 @@ var BlockReader = class {
 	*/
 	processNewEntry(current, reg, bank, last) {
 		let res = this._typeParser.parseType(current, reg, 0, bank);
-		if (BlockReaderConstants.POINTER_CHARACTERS.includes(current[0]) && !Array.isArray(res)) res = [res];
+		if (current.indexOf("[") !== -1 || BlockReaderConstants.POINTER_CHARACTERS.includes(current[0]) && !Array.isArray(res)) res = [res];
 		last.object = res;
 	}
 	/**
@@ -3671,6 +3776,7 @@ var BlockReader = class {
 			if (!chunkFile.type.isBlock) continue;
 			chunkFile.referenceManager = this._referenceManager;
 			this._currentChunk = chunkFile;
+			this._romDataReader.offset = chunkFile.base;
 			for (const asmBlock of chunkFile.parts || []) {
 				this._currentAsmBlock = asmBlock;
 				this.processPart(asmBlock);
@@ -3686,7 +3792,7 @@ var BlockReader = class {
 			chunkFile.parts = [asmBlock];
 			this._currentAsmBlock = asmBlock;
 			this._referenceManager = chunkFile.referenceManager = new ReferenceManager(this._root);
-			this._romDataReader = new RomDataReader(chunkFile.rawData, chunkFile.base ?? 0);
+			this._romDataReader = new RomDataReader(chunkFile.rawData, chunkFile.base);
 			this._typeParser = new TypeParser(this);
 			this.processPart(asmBlock);
 		}
@@ -3996,7 +4102,7 @@ var BlockWriter = class {
 				objLines = [this._referenceManager.resolveName(obj.location, obj.type, isBranch)];
 				break;
 			case ObjectType.Address:
-				objLines = isArray ? [`$#${obj.offset.toString(16).toUpperCase().padStart(4, "0")}`] : [`$${obj.toString()}`];
+				objLines = isArray ? [`$#${obj.toString()}`] : [`$${obj.toString()}`];
 				break;
 			case ObjectType.ByteArray:
 				objLines = [`#${Array.from(obj).map((b) => b.toString(16).toUpperCase().padStart(2, "0")).join("")}`];
@@ -4056,14 +4162,14 @@ var BlockWriter = class {
 		this._isInline = true;
 		let first = true;
 		for (const op of opList) {
-			if (first) first = false;
-			else {
+			if (!first || depth > 0) {
 				const labelResult = this._referenceManager.tryGetName(op.location);
 				if (labelResult.found) {
 					lines.push("");
 					lines.push(`  ${labelResult.referenceName}:`);
 				}
 			}
+			first = false;
 			let opLine = `    ${op.mnem} `;
 			if (op.copDef) {
 				opLine += `[${op.copDef.name}]`;
@@ -4555,7 +4661,7 @@ var RomWriter = class RomWriter {
 			}
 		} else if (file.parts && file.parts.length > 0) {
 			if (file.parts[0].location !== file.location && (file.location || 0) !== 0) throw new Error("Assembly was not based properly");
-			RomWriter.parseAssembly(this.root, file.parts, fileLookup, file.includeLookup, this.outBuffer, void 0);
+			RomWriter.parseAssembly(this.root, file.parts, fileLookup, file.includeLookup, this.outBuffer, file.base);
 		}
 		return pos - start;
 	}
@@ -4570,6 +4676,7 @@ var RomWriter = class RomWriter {
 	static parseAssembly(root, blocks, fileLookup, includeLookup, outBuffer, addrOffset) {
 		if (!blocks) throw new Error("Assembly has not been parsed");
 		let bix = 0;
+		const rootLoc = blocks[0].location;
 		for (const block of blocks) {
 			let position = block.location;
 			const objList = block.objList;
@@ -4657,8 +4764,10 @@ var RomWriter = class RomWriter {
 							break;
 						} else markerOffset += RomProcessingConstants.getSize(part);
 					}
-					if (addrOffset !== void 0) loc += addrOffset;
-					else if (!isRelative && type !== AddressType.Location) loc = Address.fromLocation(loc, root.config.memoryMode, root.config.cpuMode).toInt();
+					if (addrOffset !== void 0) {
+						loc += addrOffset;
+						if (fileLookup?.size) loc -= rootLoc;
+					} else if (!isRelative && type !== AddressType.Location) loc = Address.fromLocation(loc, root.config.memoryMode, root.config.cpuMode).toInt();
 					switch (type) {
 						case AddressType.Offset:
 						case AddressType.WRelative:
@@ -4773,7 +4882,7 @@ var RomProcessor = class RomProcessor {
 				for (const b of file.parts) if (b.label) file.includeLookup.set(b.label.toUpperCase(), b);
 				file.rawData = void 0;
 				file.rawData = new Uint8Array(ChunkFileUtils.calculateSize(file));
-				RomWriter.parseAssembly(this.writer.root, file.parts, dummyMap, file.includeLookup, file.rawData, file.type.base ?? 0);
+				RomWriter.parseAssembly(this.writer.root, file.parts, dummyMap, file.includeLookup, file.rawData, file.type.base);
 			}
 		}
 		for (const file of allFiles) if (file.compressed === true && canCompress) if (this.writer.root.config.uncompress) file.compressed = false;
@@ -4830,7 +4939,7 @@ var RomProcessor = class RomProcessor {
 					ix++;
 					continue;
 				}
-				file.includes = file.includes || /* @__PURE__ */ new Set();
+				if (!file.includes) file.includes = /* @__PURE__ */ new Set();
 				file.includes.add(patch.name.toUpperCase());
 				patch.parts.splice(ix, 1);
 			}
@@ -5524,20 +5633,19 @@ var DbBlock = class {
 	transforms;
 	postProcess;
 	order;
+	base;
 	constructor(data) {
 		this.name = data.name ?? "";
 		this.movable = data.movable ?? false;
 		this.group = data.group ?? void 0;
 		this.scene = data.scene ?? void 0;
 		this.parts = (data.parts ?? []).sort((a, b) => {
-			const orderA = a.order ?? 0;
-			const orderB = b.order ?? 0;
-			if (orderA !== orderB) return orderA - orderB;
-			return a.start - b.start;
+			return (a.order ?? a.start ?? 0) - (b.order ?? b.start ?? 0);
 		});
 		this.transforms = data.transforms ?? [];
 		this.postProcess = data.postProcess ?? void 0;
 		this.order = data.order ?? void 0;
+		this.base = data.base ?? void 0;
 		if (!this.name) throw new Error("Name is required");
 	}
 };
@@ -5608,12 +5716,18 @@ var DbStruct = class {
 	parent;
 	delimiter;
 	discriminator;
+	discriminatorLogic;
+	discriminatorSize;
+	null;
 	constructor(data) {
 		this.name = data.name ?? "";
 		this.types = data.types ?? void 0;
 		this.parent = data.parent ?? void 0;
 		this.delimiter = data.delimiter ?? void 0;
 		this.discriminator = data.discriminator ?? void 0;
+		this.discriminatorLogic = data.discriminatorLogic ?? (this.discriminator !== void 0 ? "=" : void 0);
+		this.discriminatorSize = data.discriminatorSize ?? void 0;
+		this.null = data.null ?? void 0;
 		if (!this.name) throw new Error("Name is required");
 	}
 };
@@ -5668,14 +5782,16 @@ var DbStringCommand = class {
 	}
 };
 var DbStringDictionary = class {
+	base;
 	command;
 	commandName;
 	name;
 	entries;
 	constructor(data) {
-		if (typeof data.command !== "number") throw new Error("Command is required");
+		if (typeof data.command !== "number" && typeof data.base !== "number") throw new Error("Command or base is required");
 		if (!data.name) throw new Error("Name is required");
 		if (!data.entries || data.entries.length === 0) throw new Error("Entries is required");
+		this.base = data.base ?? void 0;
 		this.command = data.command ?? void 0;
 		this.commandName = data.commandName ?? void 0;
 		this.name = data.name;
@@ -5696,6 +5812,7 @@ var DbStringType = class {
 	greedyTerminator;
 	dictionaries;
 	dictionaryLookup;
+	modifiers;
 	constructor(data) {
 		if (!data.name) throw new Error("Name is required");
 		if (!data.delimiter) throw new Error("Delimiter is required");
@@ -5716,6 +5833,7 @@ var DbStringType = class {
 			text: z,
 			id: (y.command ?? 0) << 8 | ix
 		}))).sort((a, b) => b.text.length - a.text.length);
+		this.modifiers = data.modifiers;
 	}
 };
 
@@ -5731,6 +5849,7 @@ var CopDef = class {
 	size;
 	parts;
 	halt;
+	conditions;
 	constructor(data) {
 		if (!data.name) throw new Error("Name is required");
 		if (typeof data.id !== "number") throw new Error("ID is required");
@@ -5739,6 +5858,7 @@ var CopDef = class {
 		this.parts = data.parts ?? [];
 		this.halt = data.halt ?? false;
 		this.size = data.size ?? 0;
+		this.conditions = data.conditions ?? [];
 	}
 };