scripts

Author: kirjavascript

app/formats/scripts/load.js

@@ -11,8 +11,9 @@ const {
     dc,
 } = Flex2;
 
+label('Sonic 1');
 info();
-offsetTable(dc.b);
+offsetTable(dc.w);
 mappingHeader(
     (_mappings) => read(dc.b),
     (mappings) => write(dc.b, mappings.length),

scripts/sonic1.js

@@ -1,6 +1,7 @@
-// Flex2 mapping definition - sonic 2 object sprites
+// Flex2 mapping definition
 
 const {
+    label,
     info,
     offsetTable,
     mapping,
@@ -11,6 +12,7 @@ const {
     dc,
 } = Flex2;
 
+label('Sonic 2');
 info();
 offsetTable(dc.w);
 mappingHeader(

scripts/sonic2.js

@@ -1,6 +1,7 @@
-// Flex2 mapping definition - sonic 2 object sprites
+// Flex2 mapping definition
 
 const {
+    label,
     info,
     offsetTable,
     mapping,
@@ -11,6 +12,7 @@ const {
     dc,
 } = Flex2;
 
+label('Sonic 3&K');
 info();
 offsetTable(dc.w);
 mappingHeader(
@@ -28,7 +30,6 @@ mappings(
         mapping.yflip = read(1);
         mapping.xflip = read(1);
         mapping.offset = read(1);
-        read(dc.w);
         mapping.left = read(dc.l);
     },
     (mapping) => {
@@ -44,12 +45,6 @@ mappings(
         write(1, mapping.yflip);
         write(1, mapping.xflip);
         write(11, mapping.offset);
-        // 2 player
-        write(1, mapping.priority);
-        write(2, mapping.palette);
-        write(1, mapping.yflip);
-        write(1, mapping.xflip);
-        write(11, Math.floor(mapping.offset / 2));
         // left
         write(dc.w, mapping.left);
     },

scripts/sonic3.js scripts/sonic3k.jsscripts/sonic3.js renamed to scripts/sonic3k.js

@@ -0,0 +1,65 @@
+// Flex2 mapping definition
+
+const {
+    label,
+    info,
+    offsetTable,
+    mapping,
+    mappingHeader,
+    write,
+    read,
+    nybble,
+    dc,
+} = Flex2;
+
+label('Sonic CD');
+info();
+offsetTable(dc.w);
+mappingHeader(
+    (_mappings) => read(dc.b),
+    (mappings) => write(dc.b, mappings.length),
+);
+mappings(
+    (mapping) => {
+        mapping.top = read(dc.b);
+        read(nybble);
+        mapping.width = read(2) + 1;
+        mapping.height = read(2) + 1;
+        mapping.priority = read(1);
+        mapping.palette = read(2);
+        mapping.yflip = read(1);
+        mapping.xflip = read(1);
+        mapping.offset = read(1);
+        mapping.left = read(dc.l);
+    },
+    (mapping) => {
+        // top
+        write(dc.b, mapping.top);
+        write(nybble, 0);
+        // size
+        write(2, mapping.width - 1);
+        write(2, mapping.height - 1);
+        // 1 player
+        write(1, mapping.priority);
+        write(2, mapping.palette);
+        write(1, mapping.yflip);
+        write(1, mapping.xflip);
+        write(11, mapping.offset);
+        // left
+        write(dc.w, mapping.left);
+    },
+);
+dplcHeader(
+    (_dplcs) => read(dc.w),
+    (dplcs) => write(dc.w, dplcs.length),
+);
+dplcs(
+    (dplc) => {
+        dplc.size = read(nybble);
+        dplc.offset = read(nybble * 3);
+    },
+    (dplc) => {
+        write(nybble, dplc.size);
+        write(nybblr * 3, dplc.offset);
+    },
+);