cleanup

Author: kirjavascript

app/components/file/file-object.js

@@ -56,13 +56,11 @@ export const FileObject = observer(({ obj }) => {
         if (isASM) {
             const contents = await fs.readFile(path, 'utf8');
 
-            console.time(path);
             if (script.asm.basic) return await parseASMBasic(contents);
 
             const buffer = await assemble(script.asm.prelude + contents, {
                 filename: basename(path),
             });
-            console.timeEnd(path);
 
             return buffer;
         }
@@ -163,6 +161,7 @@ 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));

app/formats/scripts/parse-asm.js

@@ -20,7 +20,7 @@ const sizes = {
     l: 4,
 };
 
-// use with asm(({ basic }) => basic())
+// fallback JS assembler, use with asm(({ basic }) => basic())
 export function parseASMBasic(text) {
     const comment = regex(/^;.*$/m).map(() => [ignore]);
     const even = str('even').map(() => [ignore]);

app/formats/scripts/run-script.js

@@ -1,8 +1,8 @@
 import { loadScript, scriptDir } from './file';
-import fs from 'fs';
-import { join } from 'path';
 import { logger } from './debug';
 import { toJS } from 'mobx';
+import fs from 'fs';
+import { join } from 'path';
 
 const binary = Symbol('binary');
 const address = Symbol('address');
@@ -354,10 +354,21 @@ paddingSoFar		set paddingSoFar+1
             }
         }
 
+        function writeMappings(func) {
+            return func()
+        }
+
+        function writeDPLCs() {
+
+        }
+// export function writeASM(baseLabel, { sections }) {
+
         asmArgs[0]({
             basic,
             addScript,
             importScript,
+            writeMappings,
+            writeDPLCs,
         });
     }
 

scripts/Sonic 1.js

@@ -11,6 +11,7 @@ const {
     endFrame,
     skipFrame,
     signed,
+    asm,
 } = Flex2;
 
 mappings([

scripts/Sonic 2 Special.js

@@ -72,7 +72,7 @@ function getOffset(i) {
     if (i < 0x24) return 0x29E;
     if (i < 0x2B) return 0x2AE;
     if (i < 0x32) return 0x2E3;
-    return 0x31E;
+    return i;
 }
 
 dplcs([

scripts/Sonic 2.js

@@ -89,4 +89,13 @@ SonicMappingsVer := 2
 SonicDplcVer = 2
     `);
     importScript('MapMacros.asm');
+
+    // writeMappings(({ sprite }) => {
+
+    //     // write(dc.w, sprite.length);
+    //     // return ({ mapping }) => {
+    //     //     write(nybble, mapping.size - 1);
+    //     //     write(nybble * 3, mapping.art);
+    //     // };
+    // });
 });