From 9a2e9f8950e5f2893e7e27ee68687370dc1a0800 Mon Sep 17 00:00:00 2001
From: fudgepop01 <fudgepop01@gmail.com>
Date: Sat, 20 Jun 2020 22:53:36 -0400
Subject: [PATCH] added binary edit toggle for faster experimentation; fixed
 hex editor updating bug

---
 src/components/Hex.svelte            |  13 ++--
 src/components/Main.svelte           |  13 +++-
 src/components/Overview.svelte       |  82 +++++++++++++++++++++++--
 static/amiibo/regions.txt            |  88 +++++++++++++++++++++++++++
 static/amiibo/sample_files/CAP_2     | Bin 0 -> 540 bytes
 static/amiibo/sample_files/CAP_2_ENC | Bin 0 -> 540 bytes
 static/amiibo/sample_files/CAP_3     | Bin 0 -> 540 bytes
 7 files changed, 183 insertions(+), 13 deletions(-)
 create mode 100644 static/amiibo/sample_files/CAP_2
 create mode 100644 static/amiibo/sample_files/CAP_2_ENC
 create mode 100644 static/amiibo/sample_files/CAP_3

diff --git a/src/components/Hex.svelte b/src/components/Hex.svelte
index 13bab737..c7b3504a 100644
--- a/src/components/Hex.svelte
+++ b/src/components/Hex.svelte
@@ -5,6 +5,7 @@
   export let data;
   export let params;
   let editor;
+  let lastChange;
   let dispatch = createEventDispatcher();
 
   onMount(async () => {
@@ -30,16 +31,16 @@
           description: param.description
         })
       }
+
+      dispatch('updateEditorFn', (data) => {
+        editor.acceptFile(new File([new Blob([data])], 'amiibodata'));
+      });
     }, 100);
   })
 
   async function broadcastChange() {
-    dispatch('dataChanged', await editor.saveFile());
-  }
-
-  let binView = false;
-  const toggleBinView = () => {
-
+    lastChange = await editor.saveFile();
+    dispatch('dataChanged', lastChange);
   }
 
 </script>
diff --git a/src/components/Main.svelte b/src/components/Main.svelte
index 45cf5817..e9a61ad5 100644
--- a/src/components/Main.svelte
+++ b/src/components/Main.svelte
@@ -83,12 +83,14 @@
     return await card.init();
   }
 
+  let updateEditorFn = (data) => {};
   async function loadFile(method) {
     let paths = await remote.dialog.showOpenDialog({
       message: 'open amiibo bin'
     });
     if (method === 'encrypt') data = decrypt(await readFile(paths[0]), keys);
     else data = await readFile(paths[0]);
+    updateEditorFn(data);
   }
 
   async function saveFile(method) {
@@ -120,6 +122,7 @@
           data = await card.read();
           data = decrypt(data, keys);
           data[0xE3] |= 0b00000001;
+          updateEditorFn(data);
         }
       })
       .modal('show');
@@ -150,6 +153,8 @@
 
           targetCard = decrypt(targetCard, keys);
           data.copy(targetCard, 0xE0, 0xE0, 0x1B5);
+          // uncomment this to be able to set the nickname:
+          // targetCard.write(newStr, 0x39, newStr.length * 2, 'utf16le');
 
           sign(targetCard);
           let encrypted = encrypt(targetCard, keys);
@@ -258,6 +263,7 @@
   <div class="ui placeholder">
     <div class="square image"></div>
   </div>
+
   <div class="io">
     <div class="ui two mini buttons">
       <button class="ui labeled icon button" on:click={() => loadFile('encrypt')}>
@@ -312,6 +318,11 @@
   {#if page === 'overview'}
     <Overview {data} {params} {abilities} on:load={setTimeout(() => window['$']('.ui.dropdown').dropdown(), 100)}/>
   {:else if page === 'hex'}
-    <Hex on:dataChanged={(evt) => data = Buffer.from(evt.detail)} {data} {params}></Hex>
+    <Hex
+      on:dataChanged={(evt) => data = Buffer.from(evt.detail)}
+      on:updateEditorFn={(evt) => updateEditorFn = evt.detail}
+      {data}
+      {params}>
+    </Hex>
   {/if}
 </div>
\ No newline at end of file
diff --git a/src/components/Overview.svelte b/src/components/Overview.svelte
index 16971938..b860a490 100644
--- a/src/components/Overview.svelte
+++ b/src/components/Overview.svelte
@@ -114,16 +114,78 @@
   }
 
   let thing = false;
-  function checkBoundsAndSet(evt, param) {
-    if (param.min <= evt.target.value && evt.target.value <= param.max) {
-      writeAdjustment(evt.target.value, param);
+  function checkBoundsAndSet(evt, param, isBin) {
+    let value;
+
+    if (isBin) {
+      value = parseInt(evt.target.value, 2);
+      if (param.min !== 0 && evt.target.value.startsWith('1')) {
+        value = param.min + parseInt(evt.target.value.substring(1), 2);
+      }
     } else {
-      evt.target.value = (evt.target.value > 0) ? param.max : param.min;
-      writeAdjustment(evt.target.value, param);
+      value = evt.target.value;
     }
 
+    if (param.min <= value && value <= param.max) {
+      writeAdjustment(value, param);
+    } else {
+      const v = (value > 0) ? param.max : param.min;
+      writeAdjustment(v, param);
+    }
     thing = !thing;
   }
+
+  function binEdit(evt, param) {
+    let selStart;
+    let selEnd;
+    switch (evt.key) {
+      case 'ArrowLeft':
+      case 'ArrowRight':
+        return;
+      case 'i':
+        evt.preventDefault();
+        selStart = evt.target.selectionStart;
+        selEnd = evt.target.selectionEnd;
+        let out = evt.target.value.substring(0, selStart);
+        for (const ch of evt.target.value.substring(selStart, selEnd)) {
+          out += (ch === '0') ? '1' : '0';
+        }
+        out += evt.target.value.substring(selEnd);
+        evt.target.value = out;
+        evt.target.setSelectionRange(selStart, selEnd);
+
+        checkBoundsAndSet(evt, param, true);
+        break;
+      case 'Backspace':
+        evt.preventDefault();
+        selStart = evt.target.selectionStart
+        evt.target.value =
+          evt.target.value.substring(0, selStart - 1)
+          + '0'
+          + evt.target.value.substring(selStart);
+
+        evt.target.setSelectionRange(selStart - 1, selStart - 1);
+
+        checkBoundsAndSet(evt, param, true);
+        break;
+      case '1':
+      case '0':
+        evt.preventDefault();
+        selStart = evt.target.selectionStart
+        evt.target.value =
+          evt.target.value.substring(0, selStart)
+          + evt.key
+          + evt.target.value.substring(selStart + 1);
+
+        evt.target.setSelectionRange(selStart + 1, selStart + 1);
+
+        checkBoundsAndSet(evt, param, true)
+        break;
+      default:
+        evt.preventDefault();
+    }
+  }
+
 </script>
 
 <style>
@@ -208,7 +270,15 @@
           <!-- forces update when value is changed -->
           <span style="display: none">{thing}</span>
           {#if displayBin}
-            ({(param.value !== undefined) ? (param.value >>> 0).toString(2).substr(-param.bitCount).padStart(param.bitCount, '0') : ''})
+            <br/>
+            <div class="ui transparent left icon input">
+              <input
+                value={(param.value >>> 0).toString(2).substr(-param.bitCount).padStart(param.bitCount, '0')}
+                on:keydown={(evt) => binEdit(evt, param)}
+                style="font-family: consolas;"
+                placeholder="value..."/>
+              <i class="angle double right icon"></i>
+            </div>
           {/if}
         {/if}
         </div>
diff --git a/static/amiibo/regions.txt b/static/amiibo/regions.txt
index 48f5de5f..30af8c86 100644
--- a/static/amiibo/regions.txt
+++ b/static/amiibo/regions.txt
@@ -72,12 +72,60 @@ aggression: u16
 behavior
 how aggressive the amiibo is (a value of 0 will prevent all attacks)
 
+attack bit 1: bits
+0x168b0
+0x168b1
+behavior
+will occasionally make the AI attack - it is in an odd position compared to the rest
+
+attack bit 2: bits
+0x169b0
+0x169b1
+behavior
+makes the AI attack on occasion
+
+double-jump bit: bits
+0x169b1
+0x169b2
+behavior
+makes the AI frequently double-jump
+
+attack bits 3: bits
+0x169b2
+0x169b8
+behavior
+controlls how often the AI attacks
+
 edgeguard: u16
 0x16A
 0x16C
 behavior
 the chance of the amiibo jumping after the opponent to edgeguard
 
+opposite-groundedness: bits
+0x16Ab0
+0x16Ab4
+behavior
+if the AI usually often jumps, increase this to lower that chance, and vice versa
+
+edg b4-8: bits
+0x16Ab4
+0x16Ab8
+behavior
+TEMPORARY REGION FOR EXPERIMENTATION
+
+edg b8-12: bits
+0x16Bb0
+0x16Bb4
+behavior
+TEMPORARY REGION FOR EXPERIMENTATION
+
+edg b12-16: bits
+0x16Bb4
+0x16Bb8
+behavior
+TEMPORARY REGION FOR EXPERIMENTATION
+
 anticipation: u16
 0x16C
 0x16E
@@ -103,6 +151,12 @@ grab: u8
 moveset
 the chance of the amiibo running the grab routine
 
+parry skill: u8
+0x178
+0x179
+behavior
+the chance of the amiibo going for a parry
+
 smashball collector: u16
 0x17b
 0x17d
@@ -157,6 +211,12 @@ down tilt: u8
 moveset
 the chance of the amiibo running the dTilt routine
 
+hard punish fsmash: bits
+0x18c b3
+0x18c b4
+moveset
+tells the amiibo to punish shieldbreak / rest with fsmash
+
 forward smash: u8
 0x18d
 0x18e
@@ -274,6 +334,34 @@ costume: u8
 misc
 the skin the amiibo has
 
+unknown 1: u8
+0x1A4
+0x1A5
+behavior
+has something to do with attack patterns.
+usually 0x08 or 0x09
+
+unknown 2a: u8
+0x1A5
+0x1A6
+behavior
+has something to do with attack patterns.
+usually 0xFC, 0xFD, or 0x00
+
+unknown 2b: u8
+0x1A6
+0x1A7
+behavior
+has something to do with attack patterns.
+usually 0xFC, 0xFD, or 0x00
+
+unknown 2c: u8
+0x1A7
+0x1A8
+behavior
+has something to do with attack patterns.
+usually 0xFC, 0xFD, or 0x00
+
 custom moves: u8
 0xff
 0x100
diff --git a/static/amiibo/sample_files/CAP_2 b/static/amiibo/sample_files/CAP_2
new file mode 100644
index 0000000000000000000000000000000000000000..c9d50518e0bfb308ada1b8e98437265f9dc21b6c
GIT binary patch
literal 540
zcmccP!T;c+!2fsOQx`w#`pk7{_L&dYHyx7g&U(8vuZ-o^-}t+H>8H;uJhGI5jlqC{
zfl=*^#ueWQi)|SS7|I#)7*ZLE7|a-;fSG~8;qVM5qgL6#op<<-L|STJ4fdG_l$1zg
zC}l`tNCzq}V8{nz0|rBe3N0oEZN}7WXAuPzH=!0jel;G30~$tN9sw}(Q0eSgMuw~g
z1F;7T3~VMpm_U+@HjKg?0$?VpS_X!tHBLbiaU9VgRp@fG<Dcb1GFt$N&Cr0%0kTPO
z6g!$$2C*~ozqtgt*PiJ4#Qc0id5-5|!S27Obh3ihEIo4V`+@x|>;ki!nqwN-KpKS@
zn0SR|FbDZ=K5h2&k=*C{h+_Fkxj$Kr+?PM&d?IZ<N9R<U2U{2;1OHy2YL<8;%K*1(
BUKs!Y

literal 0
HcmV?d00001

diff --git a/static/amiibo/sample_files/CAP_2_ENC b/static/amiibo/sample_files/CAP_2_ENC
new file mode 100644
index 0000000000000000000000000000000000000000..068c7192edae803c9a0902f7043d58abe45fa7e0
GIT binary patch
literal 540
zcmccP!T;c+!2fsiZCTcCof-Ba^gOpy>f;&DXY5bDdre`>E5(ib;saRxCog4SV=!P~
zU{rgfam9DSVq1m+hH{2HhE#?k1~UdIU}j)&I6Q;Ns8u#_=N-Nyk(Sz5gMH=!B_+}r
zN*PiZ(t*kg81jMGfWeTVLW_w(n=v)pSwum_O{j&BUyX<1fQFHmM*z$`R60ABks+(W
zK<ohn1DnYYCXghf4WlrJ09GrP);I-8#BoG}RDqPz2b|?XvPS@k&Cr0%0kTPO6g!$$
z2C*~ozqtgt*PiJ4#Qc0id5-5|!S27Obh3ihEIo4V`+@x|>;ki!nqwN-KpKS@n0SR|
xFbDZ=K5h2&k=*C{h+_Fkxj$Kr+?PM&d?IZ<N9R<U2U{2;1OHy2YL<8;%K$#CVvGO)

literal 0
HcmV?d00001

diff --git a/static/amiibo/sample_files/CAP_3 b/static/amiibo/sample_files/CAP_3
new file mode 100644
index 0000000000000000000000000000000000000000..d877879e373dbf9703559d1347dacc5504f0731b
GIT binary patch
literal 540
zcmccX!T;c+!2fsE(H&P_T+|jUatfWS)5q}NvN+SbSf63nxyU${jGM-jmNKv~7%(s}
zs=d*;;yYonEkglAIYS;pDnk*2F#{AZGcY)K#4bDGqj@y{Dr<<Dly$;ftvx_Vi8O{%
zh7^W$pz;ESd>}SpFl4CEVq(x{OwD!{QBZLcYT@Ho<6$_UVdUiz05cDjzC3}EA*;ba
z>;VG<i^&frkR+oGqcDd6n2D;Efx+0lsIF>Ow;4zkx*YBJXStBf7C>S%)H5h&A@fOa
z6g#p$5If#>@-oXCR~gR*c+5JrJ9_Jt9n)tRwwB6q+a6h7op*dSi}+T(rskLiHjrW=
z1}0vi8O%Yxn@^iPeI)m}KB8EDQtnSyBlqRcIG;#c&(S%R=D`-m$iTlBsG21nqz4KB
DkWg5r

literal 0
HcmV?d00001