save-rom: save the diffs on the OAM, such as the new position

brush/src/components/Map/OAMLayer/index.js

@@ -3,20 +3,27 @@ import PropTypes from 'prop-types'
 import { range } from 'ramda'
 import PointOam from '../Point/PointOam'
 
-const OAMLayer = ({ setSelectedPointInfos, totalStages, vision }) => {
+const OAMLayer = ({
+  setSelectedPointInfos,
+  totalStages,
+  updateOAMDiffMap,
+  vision,
+}) => {
   const { oam } = vision
 
   const oamList = oam
     .map(oamEntry => oamEntry.data)
-    .map(oamData =>
+    .map((oamData, oamIndex) =>
       range(1, totalStages + 1).map((i) => {
         const x = oamData[`xStage${i}`]
         const y = oamData[`yStage${i}`]
 
         return (
           <PointOam
+            onFinishDragAndDrop={updateOAMDiffMap}
             key={`${x} ${y} ${i}`}
             oamId={oamData.kind}
+            oamIndex={oamIndex}
             stage={i}
             showPointInfosHandle={setSelectedPointInfos}
             x={x}
@@ -35,6 +42,7 @@ const OAMLayer = ({ setSelectedPointInfos, totalStages, vision }) => {
 OAMLayer.propTypes = {
   setSelectedPointInfos: PropTypes.func,
   totalStages: PropTypes.number.isRequired,
+  updateOAMDiffMap: PropTypes.func,
   vision: PropTypes.shape({
     oam: PropTypes.arrayOf(PropTypes.shape({
       data: PropTypes.object.isRequired,
@@ -45,6 +53,7 @@ OAMLayer.propTypes = {
 
 OAMLayer.defaultProps = {
   setSelectedPointInfos: () => {},
+  updateOAMDiffMap: () => {},
 }
 
 export default OAMLayer

brush/src/components/Map/Point/PointOam.js

@@ -21,6 +21,8 @@ const oamIdToColor = {
 
 const PointOam = ({
   oamId,
+  oamIndex,
+  onFinishDragAndDrop,
   showPointInfosHandle,
   stage,
   x,
@@ -35,11 +37,17 @@ const PointOam = ({
     y,
   })
 
+  const saveNewOAMPosition = (newX, newY) => {
+    onFinishDragAndDrop(oamIndex, `xStage${stage}`, newX)
+    onFinishDragAndDrop(oamIndex, `yStage${stage}`, newY)
+  }
+
   return (<Point
     color={color}
     draggable
     hasStroke
     onHoverHandle={pipe(getInformations, showPointInfosHandle)}
+    onFinishDragAndDropHandle={saveNewOAMPosition}
     scale={8}
     x={x}
     y={y}
@@ -48,13 +56,16 @@ const PointOam = ({
 
 PointOam.propTypes = {
   oamId: PropTypes.number.isRequired,
+  oamIndex: PropTypes.number.isRequired,
+  onFinishDragAndDrop: PropTypes.func,
   showPointInfosHandle: PropTypes.func,
   stage: PropTypes.number.isRequired,
   x: PropTypes.number.isRequired,
   y: PropTypes.number.isRequired,
 }
 
 PointOam.defaultProps = {
+  onFinishDragAndDrop: () => {},
   showPointInfosHandle: () => {},
 }
 

brush/src/components/Map/Point/index.js

@@ -9,6 +9,7 @@ const Point = ({
   color,
   draggable,
   hasStroke,
+  onFinishDragAndDropHandle,
   onHoverHandle,
   scale,
   size,
@@ -25,7 +26,10 @@ const Point = ({
 
   const hoc = draggable ?
     withDraggable(
+      onFinishDragAndDropHandle,
       scale,
+      rawX,
+      rawY,
       setRawX,
       setRawY
     )

brush/src/components/Map/Point/withDraggable.js

@@ -2,7 +2,10 @@ import { useState } from 'react'
 import getScaledCoordinates, { SIZE } from './getScaledCoordinates'
 
 const withDraggable = (
+  onFinishDragAndDropHandle,
   scale,
+  x,
+  y,
   setX,
   setY
 ) => (Point) => {
@@ -34,6 +37,7 @@ const withDraggable = (
         setY(newY)
       },
       mouseupoutside: () => {
+        onFinishDragAndDropHandle(x, y)
         setDragging(false)
       },
     },

brush/src/components/Map/index.js

@@ -21,6 +21,7 @@ const Map = ({
 }) => {
   const {
     getTilemapPoint,
+    updateOAMDiffMap,
     updateTilemapPoint,
     vision,
   } = useContext(VisionContext)
@@ -79,6 +80,7 @@ const Map = ({
           width={width * 4}
         />
         {optShowOAM && <OAMLayer
+          updateOAMDiffMap={updateOAMDiffMap}
           setSelectedPointInfos={setSelectedPointInfos}
           totalStages={totalStages}
           vision={vision}

brush/src/components/MapActionsBar/SaveButton.js

@@ -4,8 +4,14 @@ import { saveVision } from 'scissors'
 import ROMContext from '../../context/ROMContext'
 import VisionContext from '../../context/VisionContext'
 
-const romDownload = (romBufferMemory, world, index, tilemap) => {
-  const newMemoryROM = saveVision(romBufferMemory, world, index, tilemap)
+const romDownload = (romBufferMemory, world, index, tilemap, oamDiffMap) => {
+  const newMemoryROM = saveVision(
+    romBufferMemory,
+    world,
+    index,
+    tilemap,
+    oamDiffMap
+  )
 
   const blob = new Blob([newMemoryROM])
 
@@ -24,6 +30,7 @@ const SaveButton = () => {
   const { romBufferMemory } = useContext(ROMContext)
   const {
     vision: {
+      oamDiffMap,
       state,
       tilemap,
     },
@@ -34,7 +41,13 @@ const SaveButton = () => {
   return (
     <Button
       onClick={() => {
-        romDownload(romBufferMemory, visionWorld, visionIndex, tilemap)
+        romDownload(
+          romBufferMemory,
+          visionWorld,
+          visionIndex,
+          tilemap,
+          oamDiffMap
+        )
       }}
       disabled={state === 'noSelected'}
     >

brush/src/providers/VisionProvider.js

@@ -10,6 +10,7 @@ const VisionProvider = (props) => {
   const emptyState = {
     infos: { index: 0, tilemap: { height: 0, scheme: [], width: 0 }, world: 0 },
     oam: [],
+    oamDiffMap: {},
     state: 'noSelected',
     tilemap: new Uint8Array(),
   }
@@ -26,6 +27,7 @@ const VisionProvider = (props) => {
     newVision.state = 'selected'
     newVision.infos.world = world
     newVision.infos.index = index
+    newVision.oamDiffMap = {}
     setVision(newVision)
   }
 
@@ -36,10 +38,19 @@ const VisionProvider = (props) => {
   const getTilemapPoint = (x, y) =>
     vision.tilemap[x + (y * vision.infos.tilemap.width)]
 
+  const updateOAMDiffMap = (index, key, value) => {
+    if (vision.oamDiffMap[index] === undefined) {
+      vision.oamDiffMap[index] = {}
+    }
+
+    vision.oamDiffMap[index][key] = value
+  }
+
   return (
     <VisionContext.Provider value={{
         getTilemapPoint,
         setEmptyState,
+        updateOAMDiffMap,
         updateTilemapPoint,
         updateVision,
         vision,

scissors/src/visionManager.js

@@ -2,12 +2,14 @@ import {
   filter,
   identical,
   map,
+  mapObjIndexed,
   not,
   pipe,
   prop,
   splitEvery,
 } from 'ramda'
 import binary from 'binary'
+import splitHexValueIntoBytesArray from './splitHexValueIntoBytesArray'
 import { huffmanDecode, huffmanEncode } from './huffman'
 import { lzssDecode, lzssEncode } from './lzss'
 import { loadVisionInfo } from './visions'
@@ -121,19 +123,52 @@ const getVision = (romBuffer, world, vision) => {
   }
 }
 
+const applyOAMDiff = (romBuffer, oamStartAddress, oamDiffs) => {
+  /* eslint-disable sort-keys */
+  const mapKeyToOffset = {
+    xStage1: 0,
+    yStage1: 2,
+    xStage2: 8,
+    yStage2: 10,
+    xStage3: 16,
+    yStage3: 18,
+    xStage4: 24,
+    yStage4: 26,
+    xStage5: 32,
+    yStage5: 34,
+  }
+  /* eslint-enable sort-keys */
+
+  const updateROM = (diffs, oamIndex) => {
+    const oamObjectMemoryAddressStart = oamStartAddress + (oamIndex * 44)
+
+    mapObjIndexed((value, key) => {
+      const offset = mapKeyToOffset[key]
+      const bytes = splitHexValueIntoBytesArray(value, 2)
+
+      romBuffer.set(bytes, oamObjectMemoryAddressStart + offset)
+    }, diffs)
+  }
+
+  mapObjIndexed(updateROM, oamDiffs)
+}
+
 const compressTilemap = buffer =>
   buffer
   |> prop('full')
   |> lzssEncode
   |> huffmanEncode
 
-const saveVision = (romBuffer, world, index, tilemap) => {
+const saveVision = (romBuffer, world, index, tilemap, oamDiffMap) => {
   const infos = loadVisionInfo(world, index)
   const [customTilemapStartAddress] = infos.rom.customTilemap
+  const [oamStartAddress] = infos.rom.oam
 
   const encoded = compressTilemap(tilemap)
   romBuffer.set(encoded, customTilemapStartAddress)
 
+  applyOAMDiff(romBuffer, oamStartAddress, oamDiffMap)
+
   setPatchCustomVisionLoader(romBuffer)
 
   setSign(romBuffer)