mapmacros custom asm output

Author: kirjavascript

TODO

@@ -22,6 +22,7 @@ redo tile rendering
 remove rotsprite
 
 ROADMAP
+
 drawing mode bugs
     disable mapping editing
 improve undo/redo when drawing pixels / moving things
@@ -32,9 +33,6 @@ animation editor
 BUGS
 
 TODO: load / save / load broken in sonic CD
-
-saving 0 tile as nemesis crashes
-saving ArtC42 at all crashes
 pink surrounding tiles sometimes breaks
 
 FEATURES
@@ -45,8 +43,6 @@ select multiple sprites at once to reorder
 copy / paste mappings
 time travel for undo/redo
 import palette from spritesheet https://yarnpkg.com/en/package/node-vibrant
-==
-Speaking of Flex2, will there be a way for sprite sheets to not load already compressed tiles? It seems like every time I add new sprites, it makes duplicates of the same tiles leading me to manually remove it myself or overlap the mappings.
 
 
 22:04 <+dIRCord> <M​ainMemory> > Art is easy ␤> Each byte encodes one pixel, both nybbles have the color index ␤> And then each column is stored all in one go, no breaking into tiles ␤> In other words, it's pretty much a headerless 8bpp bitmap ␤> I think the color index is duplicated over both nybbles for speed, but I never looked at the algorithm

app/components/file/file-object.js

@@ -161,13 +161,18 @@ export const FileObject = observer(({ obj }) => {
     function saveMappings(e) {
         ioWrap(obj.mappings.path, setMappingError, e, async (path) => {
             const mappings = script.writeMappings(environment.mappings);
-            console.log(mappings);
             if (mappings.error) throw mappings.error;
             if (!mappingsASM) {
                 await fs.writeFile(path, writeBIN(mappings));
             } else {
                 const label = obj.mappings.label || 'Map_' + uuid().slice(0, 4);
-                await fs.writeFile(path, writeASM(label, mappings));
+                const asmOutput = script.generateMappingsASM({
+                    label,
+                    listing: mappings,
+                    sprites: environment.sprites,
+                });
+
+                await fs.writeFile(path, asmOutput);
             }
         });
     }

app/components/ui/input/index.js

@@ -72,7 +72,7 @@ export const Input = observer(class Input extends Component {
             </span>}
             <input
                 style={color && {color: SVARS[color]}}
-                value={store[accessor] || ''}
+                value={store[accessor] ?? ''}
                 onChange={this.onChange}
                 onKeyDown={this.onKeyDown}
                 ref={this.inputRef}

app/formats/scripts/run-script.js

@@ -1,4 +1,5 @@
 import { loadScript, scriptDir } from './file';
+import { writeASM } from '#formats/scripts';
 import { logger } from './debug';
 import { toJS } from 'mobx';
 import fs from 'fs';
@@ -26,7 +27,6 @@ export const constants = {
     endSection,
 };
 
-
 function useDef() {
     let def = [];
     return [
@@ -243,6 +243,8 @@ export default catchFunc((file) => {
     };
 
     const createWriter = (sectionList = []) => catchFunc((mappings) => {
+        // mapping output format is [type, size, data]
+
         const global = { cleanup: [] };
         const sections = sectionList.map(([, writeFrame]) => {
             const spriteList = toJS(mappings);
@@ -326,6 +328,7 @@ export default catchFunc((file) => {
         });
     }
 
+
     const asm = {
         basic: false,
         prelude: `
@@ -339,6 +342,9 @@ paddingSoFar		set paddingSoFar+1
     };
 
     if (asmArgs[0]) {
+        const [writeMappingsArgs, writeMappingsFunc] = useDef();
+        const [writeDPLCsArgs, writeDPLCsFunc] = useDef();
+
         function basic() {
             asm.basic = true;
         }
@@ -354,25 +360,52 @@ paddingSoFar		set paddingSoFar+1
             }
         }
 
-        function writeMappings(func) {
-            return func()
-        }
-
-        function writeDPLCs() {
-
-        }
-// export function writeASM(baseLabel, { sections }) {
-
         asmArgs[0]({
             basic,
             addScript,
             importScript,
-            writeMappings,
-            writeDPLCs,
+            writeMappings: writeMappingsFunc,
+            writeDPLCs: writeDPLCsFunc,
         });
+
+        if (writeMappingsArgs[0]) {
+            asm.writeMappings = writeMappingsArgs[0];
+        }
+
+        if (writeDPLCsArgs[0]) {
+            asm.writeDPLCs = writeDPLCs[0];
+        }
     }
 
     exports.asm = asm;
 
+    const renderHex = num => {
+        let out = '';
+        if (num < 0) out += '-';
+        num = Math.abs(num);
+        if (num > 9) out += '$';
+        out += num.toString(16).toUpperCase();
+        return out;
+    };
+
+    exports.generateMappingsASM = function({
+        label,
+        sprites,
+        listing,
+    }) {
+        if (!asm.writeMappings) {
+            return writeASM(label, listing);
+        }
+
+        return asm.writeMappings({
+            label, sprites, listing,
+            renderHex,
+        });
+    };
+
+    exports.generateDPLCsASM = function() {
+
+    };
+
     return exports;
 });

scripts/Sonic 2.js

@@ -83,19 +83,47 @@ dplcs([
     ],
 ]);
 
-asm(({ addScript, importScript }) => {
+asm(({ addScript, importScript, writeMappings }) => {
     addScript(`
 SonicMappingsVer := 2
 SonicDplcVer = 2
     `);
     importScript('MapMacros.asm');
 
-    // writeMappings(({ sprite }) => {
+    writeMappings(({ label, sprites, renderHex }) => {
+        const list = [];
 
-    //     // write(dc.w, sprite.length);
-    //     // return ({ mapping }) => {
-    //     //     write(nybble, mapping.size - 1);
-    //     //     write(nybble * 3, mapping.art);
-    //     // };
-    // });
+        list.push(`${label}: mappingsTable`);
+        sprites.forEach((_, i) => {
+	        list.push(`\tmappingsTableEntry.w\tMap_Sonic_${i}`);
+        });
+        list.push('');
+
+        sprites.forEach((sprite, i) => {
+            list.push(`${label}_${i}:\tspriteHeader`);
+
+            sprite.mappings.forEach(mapping => {
+                const pieceInfo = [
+                    mapping.left,
+                    mapping.top,
+                    mapping.width,
+                    mapping.height,
+                    mapping.art,
+                    mapping.hflip,
+                    mapping.vflip,
+                    mapping.palette,
+                    mapping.priority,
+                ].map(renderHex).join(', ');
+
+                list.push(` spritePiece ${pieceInfo}`);
+            });
+
+            list.push(`${label}_${i}_End`);
+            list.push('');
+        });
+
+        list.push('\teven');
+
+        return list.join('\n');
+    });
 });