added //#resource "file.bin"

.gitattributes

@@ -0,0 +1,6 @@
+*.pal binary
+*.chr binary
+*.rle binary
+*.lz4 binary
+*.bin binary
+*.nam binary

doc/notes.txt

@@ -102,6 +102,7 @@ TODO:
   - throw errors when bad/no refs
   - per-View keyboard shortcuts
   - parse labels
+  - parse .incbin directives?
 - crt0.s compiled each time?
 - debug highlight doesn't go away when debugging -> running
   - show breakpoint of PC or highest address on stack

src/platform/nes.ts

@@ -19,7 +19,6 @@ const JSNES_PRESETS = [
   {id:'rletitle.c', name:'Title Screen RLE'},
   {id:'statusbar.c', name:'Split Status Bar'},
   {id:'horizmask.c', name:'Offscreen Scrolling'},
-  {id:'attributes.c', name:'Attribute Table + Pixels'},
   {id:'monobitmap.c', name:'Monochrome Bitmap'},
   {id:'aputest.c', name:'Sound Tester'},
   {id:'music.c', name:'Music Player'},

src/project.ts

@@ -73,43 +73,48 @@ export class CodeProject {
   }
 
   parseIncludeDependencies(text:string):string[] {
-    var files = [];
+    let files = [];
-    var m;
+    let m;
     if (this.platform_id.startsWith('verilog')) {
       // include verilog includes
-      var re1 = /^\s*(`include|[.]include)\s+"(.+?)"/gmi;
+      let re1 = /^\s*(`include|[.]include)\s+"(.+?)"/gmi;
       while (m = re1.exec(text)) {
         this.pushAllFiles(files, m[2]);
       }
       // include .arch (json) statements
-      var re2 = /^\s*([.]arch)\s+(\w+)/gmi;
+      let re2 = /^\s*([.]arch)\s+(\w+)/gmi;
       while (m = re2.exec(text)) {
         this.pushAllFiles(files, m[2]+".json");
       }
       // include $readmem[bh] (TODO)
-      var re3 = /\b\$readmem[bh]\("(.+?)"/gmi;
+      let re3 = /\b\$readmem[bh]\("(.+?)"/gmi;
       while (m = re3.exec(text)) {
         this.pushAllFiles(files, m[2]);
       }
     } else {
       // for .asm -- [.]include "file"
       // for .c -- #include "file"
-      var re2 = /^\s*[.#]?(include|incbin)\s+"(.+?)"/gmi;
+      let re2 = /^\s*[.#]?(include|incbin)\s+"(.+?)"/gmi;
       while (m = re2.exec(text)) {
         this.pushAllFiles(files, m[2]);
       }
+      // for .c -- //#link "file" (or ;link or #link)
+      let re3 = /^\s*([;#]|[/][/][#])resource\s+"(.+?)"/gm;
+      while (m = re3.exec(text)) {
+        this.pushAllFiles(files, m[2]);
+      }
     }
     return files;
   }
 
   parseLinkDependencies(text:string):string[] {
-    var files = [];
+    let files = [];
-    var m;
+    let m;
     if (this.platform_id.startsWith('verilog')) {
       //
     } else {
       // for .c -- //#link "file" (or ;link or #link)
-      var re = /^\s*([;#]|[/][/][#])link\s+"(.+?)"/gm;
+      let re = /^\s*([;#]|[/][/][#])link\s+"(.+?)"/gm;
       while (m = re.exec(text)) {
         this.pushAllFiles(files, m[2]);
       }
@@ -118,14 +123,16 @@ export class CodeProject {
   }
 
   loadFileDependencies(text:string, callback:LoadFilesCallback) {
-    var includes = this.parseIncludeDependencies(text);
+    let includes = this.parseIncludeDependencies(text);
-    var linkfiles = this.parseLinkDependencies(text);
+    let linkfiles = this.parseLinkDependencies(text);
-    var allfiles = includes.concat(linkfiles);
+    let allfiles = includes.concat(linkfiles);
     this.loadFiles(allfiles, (err:string, result?:Dependency[]) => {
       // set 'link' property on files that are link dependencies (must match filename)
-      if (result)
+      if (result) {
-        for (var dep of result)
+        for (let dep of result) {
           dep.link = linkfiles.indexOf(dep.path) >= 0;
+        }
+      }
       callback(err, result);
     });
   }

src/util.ts

@@ -320,8 +320,10 @@ export function isProbablyBinary(path:string, data?:number[] | Uint8Array) : boo
   // check extensions
   if (path) {
     path = path.toUpperCase();
-    if (path.endsWith('.CHR') || path.endsWith('.BIN'))
+    const BINEXTS = ['.CHR','.BIN','.PAL','.NAM','.RLE','.LZ4'];
-      score++;
+    for (var ext of BINEXTS) {
+      if (path.endsWith(ext)) score++;
+    }
   }
   // decode as UTF-8
   for (var i = 0; i < (data?data.length:0);) {

src/views.ts

@@ -1171,13 +1171,20 @@ export class AssetEditorView implements ProjectView, pixed.EditorContext {
     // TODO: check fmt w/h/etc limits
     // TODO: defer editor creation
     // TODO: only refresh when needed
-    if (fileid.endsWith('.chr') && data instanceof Uint8Array) {
+    if (platform_id.startsWith('nes') && fileid.endsWith('.chr') && data instanceof Uint8Array) {
       // is this a NES CHR?
       let node = new pixed.FileDataNode(projectWindows, fileid);
       const neschrfmt = {w:8,h:8,bpp:1,count:(data.length>>4),brev:true,np:2,pofs:8,remap:[0,1,2,4,5,6,7,8,9,10,11,12]}; // TODO
       this.addPixelEditor(this.ensureFileDiv(fileid), node, neschrfmt);
       this.registerAsset("charmap", node, true);
       nassets++;
+    } else if (platform_id.startsWith('nes') && fileid.endsWith('.pal') && data instanceof Uint8Array) {
+      // is this a NES PAL?
+      let node = new pixed.FileDataNode(projectWindows, fileid);
+      const nespalfmt = {pal:"nes",layout:"nes"};
+      this.addPaletteEditor(this.ensureFileDiv(fileid), node, nespalfmt);
+      this.registerAsset("palette", node, false);
+      nassets++;
     } else if (typeof data === 'string') {
       let textfrags = this.scanFileTextForAssets(fileid, data);
       for (let frag of textfrags) {