some s3k stuff

Author: kirjavascript

TODO

@@ -17,6 +17,7 @@ BUFFER
 // autozoom based on sprite size for sprites tab
 
 // reverse endianness
+// new mapping screen always show
 
 // other
 

app/formats/scripts/debug.js

@@ -49,26 +49,11 @@ Object.defineProperty(window, 'log', {
 const Debug = observer(function () {
     return (
         log.enabled && (
-            <div
-                style={{
-                    border: '1px solid limegreen',
-                    borderRadius: 5,
-                    padding: 5,
-                    margin: 5,
-                    height: '100%',
-                    width: 500,
-                    overflowY: 'scroll',
-                    color: 'limegreen',
-                    backgroundColor: 'black',
-                    fontWeight: 'bold',
+            <>
+                <div style={{
                     position: 'absolute',
-                    top: 0,
-                    left: 0,
-                    zIndex: 10,
-                    resize: 'both',
-                }}
-            >
-                <div>
+                    zIndex: 11,
+                }}>
                     <Button
                         color="red"
                         onClick={() => {
@@ -111,8 +96,29 @@ const Debug = observer(function () {
                         clear storage
                     </Button>
                 </div>
-                <pre>{log.output}</pre>
-            </div>
+                <div
+                    style={{
+                        border: '1px solid limegreen',
+                        borderRadius: 5,
+                        padding: 5,
+                        margin: 5,
+                        maxHeight: '100vh',
+                        width: 500,
+                        color: 'limegreen',
+                        backgroundColor: 'black',
+                        fontWeight: 'bold',
+                        position: 'absolute',
+                        top: 20,
+                        left: 0,
+                        bottom: 0,
+                        zIndex: 10,
+                        resize: 'both',
+                        overflowY: 'scroll',
+                    }}
+                >
+                    <pre>{log.output}</pre>
+                </div>
+            </>
         )
     );
 });

app/formats/scripts/run-script.js

@@ -49,19 +49,32 @@ function catchFunc(func) {
 }
 
 function makeOffsetTable({ read, write }) {
-    return (size = constants.dc.w) => [
-        () => ({ ref }) => {
-            let a = 0x7FFF;
+    return (size = constants.dc.w, { items } = {}) => [
+        ({ getCursor }) => ({ ref }) => {
+            const cursor = getCursor();
+            if (!ref.global.a) {
+                ref.global.a = 0x7FFF;
+            }
             const headers = [];
-            for (let i = 0; i < 1e5 && i < a; i += 2) {
-                const header = read(size) & 0x7FFF;
+            for (let i = cursor; i < 1e5 && i < ref.global.a; i = getCursor()) {
+                const header = (read(size) & 0x7FFF) + cursor;
                 headers.push(header);
-                if (header < a && !(header === 0)) {
-                    a = header;
+                logger('= HEADER =', header);
+                // logger(a, header < a, header, cursor);
+                if (header < ref.global.a && !(header === 0)) {
+                    ref.global.a = header;
                 }
+                // logger('HEADER LIMIT', i, a, cursor, a - cursor);
+                if (items && headers.length >= items) break;
+            }
+            if (!ref.global.firstHeader) {
+                ref.global.firstHeader = true;
+                ref.global.cleanup.push(({ sprites }) => {
+                    sprites.splice(0, sprites.length);
+                    // sprites.push([]);
+                });
             }
             ref.global.cleanup.push(({ sprites, spritesAddr }) => {
-                sprites.splice(0, sprites.length);
                 headers.forEach(header => {
                     if (header === 0) {
                         sprites.push([]); // handle zero header optimization
@@ -157,21 +170,22 @@ export default catchFunc((file) => {
             return value;
         });
 
+        const getCursor = () => cursor;
         const global = { cleanup: [] };
         const sprites = [];
         const spritesAddr = {};
         sectionList.forEach(([readFrame], i) => {
-            logger(`|> section `, i);
+            logger(`====== SECTION ======`, i);
             read: for (let spriteIndex = 0; spriteIndex < readLimit; spriteIndex++) {
-                logger(`| sprite ${spriteIndex.toString(16)} `);
+                logger(`== SPRITE == ${spriteIndex.toString(16)} `);
                 const sprite = [];
                 const ref = { global };
                 spritesAddr[cursor] = sprite;
-                const readMapping = readFrame(spriteIndex);
+                const readMapping = readFrame({ getCursor }, spriteIndex);
                 if (readMapping) {
                     logger('read mapping');
                     for (let frameIndex = 0; frameIndex < readLimit; frameIndex++) {
-                        logger(`.frame ${frameIndex.toString(16)} `);
+                        logger(`= FRAME = ${frameIndex.toString(16)} `);
                         const mapping = {};
                         const param = {
                             mapping,

scripts/Sonic 3&K Player.js

@@ -1,4 +1,4 @@
-// Flex2 Mapping Definition - Sonic 3 Player
+// Flex2 Mapping Definition - Sonic 3&K Player
 
 const {
     mappings,

scripts/Sonic 3&K Sonic.js

@@ -0,0 +1,78 @@
+// Flex2 Mapping Definition - Sonic 3&K Sonic
+
+const {
+    mappings,
+    dplcs,
+    offsetTable,
+    write,
+    read,
+    dc,
+    nybble,
+    endFrame,
+    skipFrame,
+    signed,
+} = Flex2;
+
+mappings([
+    offsetTable(dc.w, { items: 251 }),
+    offsetTable(dc.w),
+    [
+        () => {
+            const quantity = read(dc.w);
+            return quantity > 0 && (({ mapping }, frameIndex) => {
+                mapping.top = read(dc.b, signed);
+                read(nybble);
+                mapping.width = read(2) + 1;
+                mapping.height = read(2) + 1;
+                mapping.priority = read(1);
+                mapping.palette = read(2);
+                mapping.vflip = read(1);
+                mapping.hflip = read(1);
+                mapping.art = read(11);
+                mapping.left = read(dc.w, signed);
+                if (frameIndex === quantity - 1) return endFrame;
+            });
+        },
+        ({ sprite }) => {
+            write(dc.w, sprite.length);
+            return ({ 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.vflip);
+                write(1, mapping.hflip);
+                write(11, mapping.art);
+                // left
+                write(dc.w, mapping.left);
+            };
+        },
+    ],
+]);
+
+dplcs([
+    offsetTable(dc.w, { items: 251 }),
+    offsetTable(dc.w),
+    [
+        () => {
+            const quantity = read(dc.w);
+            return quantity > 0 && (({ mapping }, frameIndex) => {
+                mapping.size = read(nybble) + 1;
+                mapping.art = read(nybble * 3);
+                if (frameIndex + 1 === quantity) return endFrame;
+            });
+        },
+        ({ sprite }) => {
+            write(dc.w, sprite.length);
+            return ({ mapping }) => {
+                write(nybble, mapping.size - 1);
+                write(nybble * 3, mapping.art);
+            };
+        },
+    ],
+]);