diff --git a/src/common/ecs/README.md b/src/common/ecs/README.md index 7e72edb6..b27db6c7 100644 --- a/src/common/ecs/README.md +++ b/src/common/ecs/README.md @@ -187,5 +187,5 @@ end Slice PNGs into sprites Maybe output decoder text - Action priorities - before, after +Generate C symbols diff --git a/src/ide/views/asseteditor.ts b/src/ide/views/asseteditor.ts index 73334e74..1cdf47c9 100644 --- a/src/ide/views/asseteditor.ts +++ b/src/ide/views/asseteditor.ts @@ -175,6 +175,12 @@ export class AssetEditorView implements ProjectView, pixed.EditorContext { var meta = {defs:metadefs,width:width*8,height:height*8}; result.push({fileid:id,label:ident,meta:meta}); } + // TODO: look for decode --- ... --- + /* + var re3 = /\bdecode\s+(\w+)\s*---(.+?)---/gims; + while (m = re3.exec(data)) { + } + */ return result; } diff --git a/src/platform/nes.ts b/src/platform/nes.ts index 87dc7441..fe7859bc 100644 --- a/src/platform/nes.ts +++ b/src/platform/nes.ts @@ -475,11 +475,12 @@ class JSNESPlatform extends Base6502Platform implements Platform, Probeable { } getMemoryMap = function() { return { main:[ - //{name:'Work RAM',start:0x0,size:0x800,type:'ram'}, + {name:'Zero Page RAM',start:0x0,size:0x100,type:'ram'}, {name:'OAM Buffer',start:0x200,size:0x100,type:'ram'}, + {name:'Work RAM',start:0x300,size:0x1000-0x300,type:'ram'}, {name:'PPU Registers',start:0x2000,last:0x2008,size:0x2000,type:'io'}, {name:'APU Registers',start:0x4000,last:0x4020,size:0x2000,type:'io'}, - {name:'Cartridge RAM',start:0x6000,size:0x2000,type:'ram'}, + {name:'Optional Cartridge RAM',start:0x6000,size:0x2000,type:'ram'}, ] } }; showHelp(tool:string, ident:string) {