improved asm parsign

Author: kirjavascript

README.md

@@ -0,0 +1,27 @@
+##  Flex 2
+
+Flex 2 is a multi-purpose art and mapping editor for the Sega Megadrive. The original Flex was a web app, which gave it several limitations. A full rewrite for desktop opens up the ability to use real project files, as well as various other niceties.
+
+## UI
+
+## Controls
+
+### Inputs
+
+## Mapping Editor
+
+### Drawing Mode
+
+## Palettes
+
+## Sprites
+
+## Importing
+
+## DPLC Optimization
+
+## Mapping Formats
+
+## Download
+
+https://github.com/kirjavascript/Flex2/releases

flex2.idea

@@ -17,20 +17,18 @@ for_window [title="Flex 2"] floating enable border normal
 ==
 V2: sprite rotation http://forums.sonicretro.org/index.php?showtopic=8848&st=0&p=159754&#entry159754
 https://yarnpkg.com/en/package/node-vibrant
-change sprite scroll speed Set sprite offset based on scroll to increase speed
+change sprite scroll speed
 drawing mode fill !
 S - scroll to sprite
+s3k sonic mapping definition / conversion tools
 ==
 
 check version in documentation tab (move code)
-logo
 add flex.json to sonic 2 disassembly
-counts for commands (wrap all in doAction, remove doAction from others)
-real command modes
 search (filter)
-have default as logo?
-input type = color
-lil-g/gemini
+logo / have default as logo?
+counts for commands
+real command modes
 
 ====
 

modules/formats/asm.js

@@ -14,7 +14,8 @@ export function asmToBin(buffer) {
 
     // split into labels/data
     // double comment char used to indicate start of line
-    const sections = (asm
+    // add starting label to ensure all sections are accounted for
+    const sections = (('__flex2__internal: \n' + asm)
         .replace(/^\S/gm, (d) => `;;${d}`)
         .replace(/\n/gm, '') + ';')
         .match(/;.*?:.*?;/g)
@@ -53,12 +54,13 @@ export function asmToBin(buffer) {
                     if (~fragment.indexOf('-')) {
                         // if data is calculated from labels
                         const [lVal, rVal] = fragment.split('-');
-                        let pointer = (pointerMap[lVal] - pointerMap[rVal]);
+                        let pointer = (pointerMap[lVal]||0) - (pointerMap[rVal]||0);
                         let pointerBytes = [];
                         for (let i = 0; i < size; i++) {
                             pointerBytes.unshift(pointer & 0xFF);
                             pointer = pointer >> 8;
                         }
+
                         bytes.push(...pointerBytes);
                     }
                     else {
@@ -75,23 +77,21 @@ export function asmToBin(buffer) {
             }
         });
 
+
     return bytes;
 }
 
 export function stuffToAsm(frames, name, isMapping = false) {
     // get real mapping name
-    const startLabel = name.replace(/[^\w]/g, '');
+    const startLabel = name.replace(/[^\w]/g, '')
+        || 'DATA' + Math.random().toString(36).slice(2).toUpperCase();
 
     let output = `; ${'='.repeat(80)}
 ; Sprite ${isMapping?'Mappings' : 'DPLCs'} - generated by Flex 2 ${new Date()}
 ; ${'='.repeat(80)}
 
+${startLabel}:
 `;
-    if (startLabel) {
-        output += startLabel + ':\n';
-    }
-
-    let mainLabel = startLabel || 'DATA' + Math.random().toString(36).slice(2).toUpperCase();
 
     let dataOutput = '';
     let labels = [];
@@ -102,7 +102,7 @@ export function stuffToAsm(frames, name, isMapping = false) {
             label = 0;
         }
         else {
-            label = `${mainLabel}_${index.toString(16).toUpperCase()}`;
+            label = `${startLabel}_${index.toString(16).toUpperCase()}`;
             const [header, ...data] = arrays;
             // header
             dataOutput += `${label}: dc.b ${to68kByteStr(header)}\n`;
@@ -122,7 +122,7 @@ export function stuffToAsm(frames, name, isMapping = false) {
     chunk(labels, 2)
         .forEach((words) => {
             output += `\tdc.w ${words.map((word) => (
-                word == 0 ? '$0' : `${word}-${mainLabel}`
+                word == 0 ? '$0' : `${word}-${startLabel}`
             )).join`, `}\n`;
         });
 

modules/formats/dplc.js

@@ -26,7 +26,7 @@ export function bufferToDPLCs(buffer, format) {
         let sprites = [];
 
         // prevent crashes from incorrectly read header
-        if (dplcQty > 0xFF) return;
+        if (dplcQty > 100) return;
 
         for (let i = 0; i < dplcQty; i++) {
             // convert each line to a binary string to easily extract properties

modules/formats/mapping.js

@@ -27,7 +27,7 @@ export function bufferToMappings(buffer, format) {
 
         let sprites = [];
 
-        if (mappingQty > 0xFF) return; // prevent crashes
+        if (mappingQty > 100) return; // prevent crashes
 
         for (let i = 0; i < mappingQty; i++) {
             // convert each line to a binary string to easily extract properties