diff --git a/public/audio/se/move/PERISH_SONG.wav b/public/audio/se/move/PERISH_SONG.wav deleted file mode 100644 index f23131168..000000000 Binary files a/public/audio/se/move/PERISH_SONG.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0001.wav b/public/audio/se/move/emerald_0001.wav deleted file mode 100644 index 5069c7257..000000000 Binary files a/public/audio/se/move/emerald_0001.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0002.wav b/public/audio/se/move/emerald_0002.wav deleted file mode 100644 index d2e8d360c..000000000 Binary files a/public/audio/se/move/emerald_0002.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0003.wav b/public/audio/se/move/emerald_0003.wav deleted file mode 100644 index dd0f1a4ed..000000000 Binary files a/public/audio/se/move/emerald_0003.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0004.wav b/public/audio/se/move/emerald_0004.wav deleted file mode 100644 index fe3dbbba2..000000000 Binary files a/public/audio/se/move/emerald_0004.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0005.wav b/public/audio/se/move/emerald_0005.wav deleted file mode 100644 index a15b58914..000000000 Binary files a/public/audio/se/move/emerald_0005.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0006.wav b/public/audio/se/move/emerald_0006.wav deleted file mode 100644 index b8ce050eb..000000000 Binary files a/public/audio/se/move/emerald_0006.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0007.wav b/public/audio/se/move/emerald_0007.wav deleted file mode 100644 index d514dabe6..000000000 Binary files a/public/audio/se/move/emerald_0007.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0008.wav b/public/audio/se/move/emerald_0008.wav deleted file mode 100644 index 410b80ff8..000000000 Binary files a/public/audio/se/move/emerald_0008.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0009.wav b/public/audio/se/move/emerald_0009.wav deleted file mode 100644 index 5f49c7d03..000000000 Binary files a/public/audio/se/move/emerald_0009.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_000D.wav b/public/audio/se/move/emerald_000D.wav deleted file mode 100644 index 73394acab..000000000 Binary files a/public/audio/se/move/emerald_000D.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_000E.wav b/public/audio/se/move/emerald_000E.wav deleted file mode 100644 index ca6da68f7..000000000 Binary files a/public/audio/se/move/emerald_000E.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_000F.wav b/public/audio/se/move/emerald_000F.wav deleted file mode 100644 index 988db8ed7..000000000 Binary files a/public/audio/se/move/emerald_000F.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0010.wav b/public/audio/se/move/emerald_0010.wav deleted file mode 100644 index 4769216a8..000000000 Binary files a/public/audio/se/move/emerald_0010.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0011.wav b/public/audio/se/move/emerald_0011.wav deleted file mode 100644 index 029bf97e5..000000000 Binary files a/public/audio/se/move/emerald_0011.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0012.wav b/public/audio/se/move/emerald_0012.wav deleted file mode 100644 index 3bb9df1d9..000000000 Binary files a/public/audio/se/move/emerald_0012.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0013.wav b/public/audio/se/move/emerald_0013.wav deleted file mode 100644 index c55dd7603..000000000 Binary files a/public/audio/se/move/emerald_0013.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0014.wav b/public/audio/se/move/emerald_0014.wav deleted file mode 100644 index 5cd233b4a..000000000 Binary files a/public/audio/se/move/emerald_0014.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0015.wav b/public/audio/se/move/emerald_0015.wav deleted file mode 100644 index 60742998c..000000000 Binary files a/public/audio/se/move/emerald_0015.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0016.wav b/public/audio/se/move/emerald_0016.wav deleted file mode 100644 index 1d9bca882..000000000 Binary files a/public/audio/se/move/emerald_0016.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0018.wav b/public/audio/se/move/emerald_0018.wav deleted file mode 100644 index de6c8ff6d..000000000 Binary files a/public/audio/se/move/emerald_0018.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_001F.wav b/public/audio/se/move/emerald_001F.wav deleted file mode 100644 index b13d40147..000000000 Binary files a/public/audio/se/move/emerald_001F.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0020.wav b/public/audio/se/move/emerald_0020.wav deleted file mode 100644 index 5466ef49f..000000000 Binary files a/public/audio/se/move/emerald_0020.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0021.wav b/public/audio/se/move/emerald_0021.wav deleted file mode 100644 index 489495abe..000000000 Binary files a/public/audio/se/move/emerald_0021.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0022.wav b/public/audio/se/move/emerald_0022.wav deleted file mode 100644 index 61a7cfff9..000000000 Binary files a/public/audio/se/move/emerald_0022.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0023.wav b/public/audio/se/move/emerald_0023.wav deleted file mode 100644 index a3cf1a745..000000000 Binary files a/public/audio/se/move/emerald_0023.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0024.wav b/public/audio/se/move/emerald_0024.wav deleted file mode 100644 index 0451fd6f4..000000000 Binary files a/public/audio/se/move/emerald_0024.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0025.wav b/public/audio/se/move/emerald_0025.wav deleted file mode 100644 index f9af7af38..000000000 Binary files a/public/audio/se/move/emerald_0025.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0026.wav b/public/audio/se/move/emerald_0026.wav deleted file mode 100644 index ff5d17342..000000000 Binary files a/public/audio/se/move/emerald_0026.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0027.wav b/public/audio/se/move/emerald_0027.wav deleted file mode 100644 index 23e752dee..000000000 Binary files a/public/audio/se/move/emerald_0027.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0028.wav b/public/audio/se/move/emerald_0028.wav deleted file mode 100644 index 7ad1fc892..000000000 Binary files a/public/audio/se/move/emerald_0028.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0029.wav b/public/audio/se/move/emerald_0029.wav deleted file mode 100644 index 8563a4370..000000000 Binary files a/public/audio/se/move/emerald_0029.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_002A.wav b/public/audio/se/move/emerald_002A.wav deleted file mode 100644 index 21d0db899..000000000 Binary files a/public/audio/se/move/emerald_002A.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_002B.wav b/public/audio/se/move/emerald_002B.wav deleted file mode 100644 index 64e1e636d..000000000 Binary files a/public/audio/se/move/emerald_002B.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_002C.wav b/public/audio/se/move/emerald_002C.wav deleted file mode 100644 index 71bf5a2e4..000000000 Binary files a/public/audio/se/move/emerald_002C.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_002D.wav b/public/audio/se/move/emerald_002D.wav deleted file mode 100644 index 30944a5f0..000000000 Binary files a/public/audio/se/move/emerald_002D.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_002E.wav b/public/audio/se/move/emerald_002E.wav deleted file mode 100644 index e941be9ee..000000000 Binary files a/public/audio/se/move/emerald_002E.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_002F.wav b/public/audio/se/move/emerald_002F.wav deleted file mode 100644 index bf885eab7..000000000 Binary files a/public/audio/se/move/emerald_002F.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0030.wav b/public/audio/se/move/emerald_0030.wav deleted file mode 100644 index 0d3aaf957..000000000 Binary files a/public/audio/se/move/emerald_0030.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0031.wav b/public/audio/se/move/emerald_0031.wav deleted file mode 100644 index e1fe0c802..000000000 Binary files a/public/audio/se/move/emerald_0031.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0032.wav b/public/audio/se/move/emerald_0032.wav deleted file mode 100644 index e9ff09591..000000000 Binary files a/public/audio/se/move/emerald_0032.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0033.wav b/public/audio/se/move/emerald_0033.wav deleted file mode 100644 index f60a59cd6..000000000 Binary files a/public/audio/se/move/emerald_0033.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0034.wav b/public/audio/se/move/emerald_0034.wav deleted file mode 100644 index eebb17f8b..000000000 Binary files a/public/audio/se/move/emerald_0034.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0035.wav b/public/audio/se/move/emerald_0035.wav deleted file mode 100644 index b4bdaec8a..000000000 Binary files a/public/audio/se/move/emerald_0035.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0036.wav b/public/audio/se/move/emerald_0036.wav deleted file mode 100644 index 1972a3d37..000000000 Binary files a/public/audio/se/move/emerald_0036.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0037.wav b/public/audio/se/move/emerald_0037.wav deleted file mode 100644 index 23509c146..000000000 Binary files a/public/audio/se/move/emerald_0037.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0038.wav b/public/audio/se/move/emerald_0038.wav deleted file mode 100644 index 2c2604be3..000000000 Binary files a/public/audio/se/move/emerald_0038.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0039.wav b/public/audio/se/move/emerald_0039.wav deleted file mode 100644 index 21393a339..000000000 Binary files a/public/audio/se/move/emerald_0039.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_003A.wav b/public/audio/se/move/emerald_003A.wav deleted file mode 100644 index 4f1a5f53e..000000000 Binary files a/public/audio/se/move/emerald_003A.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_003B.wav b/public/audio/se/move/emerald_003B.wav deleted file mode 100644 index 6c4bd41c1..000000000 Binary files a/public/audio/se/move/emerald_003B.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_003C.wav b/public/audio/se/move/emerald_003C.wav deleted file mode 100644 index 41b8a3cb7..000000000 Binary files a/public/audio/se/move/emerald_003C.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_003D.wav b/public/audio/se/move/emerald_003D.wav deleted file mode 100644 index 3c1b23c1c..000000000 Binary files a/public/audio/se/move/emerald_003D.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_003E.wav b/public/audio/se/move/emerald_003E.wav deleted file mode 100644 index e90529645..000000000 Binary files a/public/audio/se/move/emerald_003E.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_003F.wav b/public/audio/se/move/emerald_003F.wav deleted file mode 100644 index 79019d087..000000000 Binary files a/public/audio/se/move/emerald_003F.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0040.wav b/public/audio/se/move/emerald_0040.wav deleted file mode 100644 index 7127795af..000000000 Binary files a/public/audio/se/move/emerald_0040.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0041.wav b/public/audio/se/move/emerald_0041.wav deleted file mode 100644 index ec38edc63..000000000 Binary files a/public/audio/se/move/emerald_0041.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0042.wav b/public/audio/se/move/emerald_0042.wav deleted file mode 100644 index 4271946e2..000000000 Binary files a/public/audio/se/move/emerald_0042.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0043.wav b/public/audio/se/move/emerald_0043.wav deleted file mode 100644 index 2ce9f963c..000000000 Binary files a/public/audio/se/move/emerald_0043.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0044.wav b/public/audio/se/move/emerald_0044.wav deleted file mode 100644 index d4fd6608a..000000000 Binary files a/public/audio/se/move/emerald_0044.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0045.wav b/public/audio/se/move/emerald_0045.wav deleted file mode 100644 index cdcfdc42a..000000000 Binary files a/public/audio/se/move/emerald_0045.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0046.wav b/public/audio/se/move/emerald_0046.wav deleted file mode 100644 index 6ec1b33ee..000000000 Binary files a/public/audio/se/move/emerald_0046.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0047.wav b/public/audio/se/move/emerald_0047.wav deleted file mode 100644 index 22b7900ef..000000000 Binary files a/public/audio/se/move/emerald_0047.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0048.wav b/public/audio/se/move/emerald_0048.wav deleted file mode 100644 index 20d8ed377..000000000 Binary files a/public/audio/se/move/emerald_0048.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0049.wav b/public/audio/se/move/emerald_0049.wav deleted file mode 100644 index b11b63e01..000000000 Binary files a/public/audio/se/move/emerald_0049.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_004A.wav b/public/audio/se/move/emerald_004A.wav deleted file mode 100644 index fc474f6f1..000000000 Binary files a/public/audio/se/move/emerald_004A.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_004B.wav b/public/audio/se/move/emerald_004B.wav deleted file mode 100644 index 3e94e2de8..000000000 Binary files a/public/audio/se/move/emerald_004B.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_004C.wav b/public/audio/se/move/emerald_004C.wav deleted file mode 100644 index 53ff58cd6..000000000 Binary files a/public/audio/se/move/emerald_004C.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_004D.wav b/public/audio/se/move/emerald_004D.wav deleted file mode 100644 index cc7139638..000000000 Binary files a/public/audio/se/move/emerald_004D.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_004E.wav b/public/audio/se/move/emerald_004E.wav deleted file mode 100644 index 21dea6f6a..000000000 Binary files a/public/audio/se/move/emerald_004E.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_004F.wav b/public/audio/se/move/emerald_004F.wav deleted file mode 100644 index 4821187d1..000000000 Binary files a/public/audio/se/move/emerald_004F.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0050.wav b/public/audio/se/move/emerald_0050.wav deleted file mode 100644 index c8fbff3bd..000000000 Binary files a/public/audio/se/move/emerald_0050.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0051.wav b/public/audio/se/move/emerald_0051.wav deleted file mode 100644 index 9c5a0ada1..000000000 Binary files a/public/audio/se/move/emerald_0051.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0052.wav b/public/audio/se/move/emerald_0052.wav deleted file mode 100644 index b442850de..000000000 Binary files a/public/audio/se/move/emerald_0052.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0053.wav b/public/audio/se/move/emerald_0053.wav deleted file mode 100644 index cdddde7b0..000000000 Binary files a/public/audio/se/move/emerald_0053.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0054.wav b/public/audio/se/move/emerald_0054.wav deleted file mode 100644 index 9c61ba006..000000000 Binary files a/public/audio/se/move/emerald_0054.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0055.wav b/public/audio/se/move/emerald_0055.wav deleted file mode 100644 index edbc75736..000000000 Binary files a/public/audio/se/move/emerald_0055.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0056.wav b/public/audio/se/move/emerald_0056.wav deleted file mode 100644 index 08acd5c3e..000000000 Binary files a/public/audio/se/move/emerald_0056.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0057.wav b/public/audio/se/move/emerald_0057.wav deleted file mode 100644 index a47647762..000000000 Binary files a/public/audio/se/move/emerald_0057.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0058.wav b/public/audio/se/move/emerald_0058.wav deleted file mode 100644 index aedb921a7..000000000 Binary files a/public/audio/se/move/emerald_0058.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0059.wav b/public/audio/se/move/emerald_0059.wav deleted file mode 100644 index bb2776a07..000000000 Binary files a/public/audio/se/move/emerald_0059.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_005A.wav b/public/audio/se/move/emerald_005A.wav deleted file mode 100644 index c55ce1900..000000000 Binary files a/public/audio/se/move/emerald_005A.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_005B.wav b/public/audio/se/move/emerald_005B.wav deleted file mode 100644 index 220c486b8..000000000 Binary files a/public/audio/se/move/emerald_005B.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_005C.wav b/public/audio/se/move/emerald_005C.wav deleted file mode 100644 index ab70b8eba..000000000 Binary files a/public/audio/se/move/emerald_005C.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_005D.wav b/public/audio/se/move/emerald_005D.wav deleted file mode 100644 index 78770c3b2..000000000 Binary files a/public/audio/se/move/emerald_005D.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_005E.wav b/public/audio/se/move/emerald_005E.wav deleted file mode 100644 index c5411984b..000000000 Binary files a/public/audio/se/move/emerald_005E.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_005F.wav b/public/audio/se/move/emerald_005F.wav deleted file mode 100644 index edccd3854..000000000 Binary files a/public/audio/se/move/emerald_005F.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0060.wav b/public/audio/se/move/emerald_0060.wav deleted file mode 100644 index 8f5537153..000000000 Binary files a/public/audio/se/move/emerald_0060.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0061.wav b/public/audio/se/move/emerald_0061.wav deleted file mode 100644 index 68bf10569..000000000 Binary files a/public/audio/se/move/emerald_0061.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0062.wav b/public/audio/se/move/emerald_0062.wav deleted file mode 100644 index 268884c2e..000000000 Binary files a/public/audio/se/move/emerald_0062.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0063.wav b/public/audio/se/move/emerald_0063.wav deleted file mode 100644 index 0affcaec3..000000000 Binary files a/public/audio/se/move/emerald_0063.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0064.wav b/public/audio/se/move/emerald_0064.wav deleted file mode 100644 index 85578b0b9..000000000 Binary files a/public/audio/se/move/emerald_0064.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0065.wav b/public/audio/se/move/emerald_0065.wav deleted file mode 100644 index 8ebf4f03f..000000000 Binary files a/public/audio/se/move/emerald_0065.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0066.wav b/public/audio/se/move/emerald_0066.wav deleted file mode 100644 index 36a27381a..000000000 Binary files a/public/audio/se/move/emerald_0066.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0067.wav b/public/audio/se/move/emerald_0067.wav deleted file mode 100644 index fa5319522..000000000 Binary files a/public/audio/se/move/emerald_0067.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0068.wav b/public/audio/se/move/emerald_0068.wav deleted file mode 100644 index 341fb2b8b..000000000 Binary files a/public/audio/se/move/emerald_0068.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0069.wav b/public/audio/se/move/emerald_0069.wav deleted file mode 100644 index 9fc593e60..000000000 Binary files a/public/audio/se/move/emerald_0069.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_006A.wav b/public/audio/se/move/emerald_006A.wav deleted file mode 100644 index 7d433c916..000000000 Binary files a/public/audio/se/move/emerald_006A.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_006B.wav b/public/audio/se/move/emerald_006B.wav deleted file mode 100644 index 885a6d1b5..000000000 Binary files a/public/audio/se/move/emerald_006B.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_006C.wav b/public/audio/se/move/emerald_006C.wav deleted file mode 100644 index a64c8835f..000000000 Binary files a/public/audio/se/move/emerald_006C.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_006D.wav b/public/audio/se/move/emerald_006D.wav deleted file mode 100644 index dc3b2521e..000000000 Binary files a/public/audio/se/move/emerald_006D.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_006E.wav b/public/audio/se/move/emerald_006E.wav deleted file mode 100644 index 3e2b888db..000000000 Binary files a/public/audio/se/move/emerald_006E.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_006F.wav b/public/audio/se/move/emerald_006F.wav deleted file mode 100644 index d8c733aa1..000000000 Binary files a/public/audio/se/move/emerald_006F.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0070.wav b/public/audio/se/move/emerald_0070.wav deleted file mode 100644 index ae19572ab..000000000 Binary files a/public/audio/se/move/emerald_0070.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0071.wav b/public/audio/se/move/emerald_0071.wav deleted file mode 100644 index a1d287fd4..000000000 Binary files a/public/audio/se/move/emerald_0071.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0072.wav b/public/audio/se/move/emerald_0072.wav deleted file mode 100644 index 5cfdd4dd9..000000000 Binary files a/public/audio/se/move/emerald_0072.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0073.wav b/public/audio/se/move/emerald_0073.wav deleted file mode 100644 index 424de2b91..000000000 Binary files a/public/audio/se/move/emerald_0073.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0074.wav b/public/audio/se/move/emerald_0074.wav deleted file mode 100644 index ca14f42e6..000000000 Binary files a/public/audio/se/move/emerald_0074.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0075.wav b/public/audio/se/move/emerald_0075.wav deleted file mode 100644 index 22111331d..000000000 Binary files a/public/audio/se/move/emerald_0075.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0076.wav b/public/audio/se/move/emerald_0076.wav deleted file mode 100644 index 2763c0942..000000000 Binary files a/public/audio/se/move/emerald_0076.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0077.wav b/public/audio/se/move/emerald_0077.wav deleted file mode 100644 index 6d76166c8..000000000 Binary files a/public/audio/se/move/emerald_0077.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0078.wav b/public/audio/se/move/emerald_0078.wav deleted file mode 100644 index c9564a841..000000000 Binary files a/public/audio/se/move/emerald_0078.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0079.wav b/public/audio/se/move/emerald_0079.wav deleted file mode 100644 index c11b16d78..000000000 Binary files a/public/audio/se/move/emerald_0079.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_007A.wav b/public/audio/se/move/emerald_007A.wav deleted file mode 100644 index 2f3375c06..000000000 Binary files a/public/audio/se/move/emerald_007A.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_007B.wav b/public/audio/se/move/emerald_007B.wav deleted file mode 100644 index 591325391..000000000 Binary files a/public/audio/se/move/emerald_007B.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_007F.wav b/public/audio/se/move/emerald_007F.wav deleted file mode 100644 index 307489e55..000000000 Binary files a/public/audio/se/move/emerald_007F.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0080.wav b/public/audio/se/move/emerald_0080.wav deleted file mode 100644 index 86dbd3e79..000000000 Binary files a/public/audio/se/move/emerald_0080.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0081.wav b/public/audio/se/move/emerald_0081.wav deleted file mode 100644 index d1f282eec..000000000 Binary files a/public/audio/se/move/emerald_0081.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0082.wav b/public/audio/se/move/emerald_0082.wav deleted file mode 100644 index 99db53dc5..000000000 Binary files a/public/audio/se/move/emerald_0082.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0083.wav b/public/audio/se/move/emerald_0083.wav deleted file mode 100644 index 0e303147c..000000000 Binary files a/public/audio/se/move/emerald_0083.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0084.wav b/public/audio/se/move/emerald_0084.wav deleted file mode 100644 index cefc70c5e..000000000 Binary files a/public/audio/se/move/emerald_0084.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0085.wav b/public/audio/se/move/emerald_0085.wav deleted file mode 100644 index 0d0c3bffe..000000000 Binary files a/public/audio/se/move/emerald_0085.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0086.wav b/public/audio/se/move/emerald_0086.wav deleted file mode 100644 index c1006ee73..000000000 Binary files a/public/audio/se/move/emerald_0086.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0087.wav b/public/audio/se/move/emerald_0087.wav deleted file mode 100644 index 71ebb0330..000000000 Binary files a/public/audio/se/move/emerald_0087.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0088.wav b/public/audio/se/move/emerald_0088.wav deleted file mode 100644 index d5cb88b7f..000000000 Binary files a/public/audio/se/move/emerald_0088.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0089.wav b/public/audio/se/move/emerald_0089.wav deleted file mode 100644 index 3a2cdd20e..000000000 Binary files a/public/audio/se/move/emerald_0089.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_008A.wav b/public/audio/se/move/emerald_008A.wav deleted file mode 100644 index 3ad4d2bac..000000000 Binary files a/public/audio/se/move/emerald_008A.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_008B.wav b/public/audio/se/move/emerald_008B.wav deleted file mode 100644 index d60ef5d9e..000000000 Binary files a/public/audio/se/move/emerald_008B.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_008C.wav b/public/audio/se/move/emerald_008C.wav deleted file mode 100644 index c4fa97c6e..000000000 Binary files a/public/audio/se/move/emerald_008C.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_008D.wav b/public/audio/se/move/emerald_008D.wav deleted file mode 100644 index 08c1ecc38..000000000 Binary files a/public/audio/se/move/emerald_008D.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_008F.wav b/public/audio/se/move/emerald_008F.wav deleted file mode 100644 index 8cfe8e3c8..000000000 Binary files a/public/audio/se/move/emerald_008F.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0090.wav b/public/audio/se/move/emerald_0090.wav deleted file mode 100644 index fc1d447d5..000000000 Binary files a/public/audio/se/move/emerald_0090.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0091.wav b/public/audio/se/move/emerald_0091.wav deleted file mode 100644 index c63971643..000000000 Binary files a/public/audio/se/move/emerald_0091.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0092.wav b/public/audio/se/move/emerald_0092.wav deleted file mode 100644 index 8755960e0..000000000 Binary files a/public/audio/se/move/emerald_0092.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0093.wav b/public/audio/se/move/emerald_0093.wav deleted file mode 100644 index 150945cff..000000000 Binary files a/public/audio/se/move/emerald_0093.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0094.wav b/public/audio/se/move/emerald_0094.wav deleted file mode 100644 index bf009c4f2..000000000 Binary files a/public/audio/se/move/emerald_0094.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0095.wav b/public/audio/se/move/emerald_0095.wav deleted file mode 100644 index 53c40301d..000000000 Binary files a/public/audio/se/move/emerald_0095.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0096.wav b/public/audio/se/move/emerald_0096.wav deleted file mode 100644 index 6b803b702..000000000 Binary files a/public/audio/se/move/emerald_0096.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0097.wav b/public/audio/se/move/emerald_0097.wav deleted file mode 100644 index 1973afdfd..000000000 Binary files a/public/audio/se/move/emerald_0097.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0098.wav b/public/audio/se/move/emerald_0098.wav deleted file mode 100644 index fe7213180..000000000 Binary files a/public/audio/se/move/emerald_0098.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0099.wav b/public/audio/se/move/emerald_0099.wav deleted file mode 100644 index 8afb3bb41..000000000 Binary files a/public/audio/se/move/emerald_0099.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_009A.wav b/public/audio/se/move/emerald_009A.wav deleted file mode 100644 index c4db4256f..000000000 Binary files a/public/audio/se/move/emerald_009A.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_009B.wav b/public/audio/se/move/emerald_009B.wav deleted file mode 100644 index b6d89076a..000000000 Binary files a/public/audio/se/move/emerald_009B.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_009C.wav b/public/audio/se/move/emerald_009C.wav deleted file mode 100644 index ed06e8b56..000000000 Binary files a/public/audio/se/move/emerald_009C.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_009D.wav b/public/audio/se/move/emerald_009D.wav deleted file mode 100644 index 7a8cd351b..000000000 Binary files a/public/audio/se/move/emerald_009D.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_009E.wav b/public/audio/se/move/emerald_009E.wav deleted file mode 100644 index 2d879b055..000000000 Binary files a/public/audio/se/move/emerald_009E.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_009F.wav b/public/audio/se/move/emerald_009F.wav deleted file mode 100644 index 73588e5d3..000000000 Binary files a/public/audio/se/move/emerald_009F.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00A0.wav b/public/audio/se/move/emerald_00A0.wav deleted file mode 100644 index c24d6867a..000000000 Binary files a/public/audio/se/move/emerald_00A0.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00A1.wav b/public/audio/se/move/emerald_00A1.wav deleted file mode 100644 index 6adf298e3..000000000 Binary files a/public/audio/se/move/emerald_00A1.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00A2.wav b/public/audio/se/move/emerald_00A2.wav deleted file mode 100644 index a21d76159..000000000 Binary files a/public/audio/se/move/emerald_00A2.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00A3.wav b/public/audio/se/move/emerald_00A3.wav deleted file mode 100644 index e731b452d..000000000 Binary files a/public/audio/se/move/emerald_00A3.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00A4.wav b/public/audio/se/move/emerald_00A4.wav deleted file mode 100644 index 4b6e8290b..000000000 Binary files a/public/audio/se/move/emerald_00A4.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00A5.wav b/public/audio/se/move/emerald_00A5.wav deleted file mode 100644 index 5cb6b789a..000000000 Binary files a/public/audio/se/move/emerald_00A5.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00A6.wav b/public/audio/se/move/emerald_00A6.wav deleted file mode 100644 index 756e1ef1b..000000000 Binary files a/public/audio/se/move/emerald_00A6.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00A7.wav b/public/audio/se/move/emerald_00A7.wav deleted file mode 100644 index b96e5eee9..000000000 Binary files a/public/audio/se/move/emerald_00A7.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00A8.wav b/public/audio/se/move/emerald_00A8.wav deleted file mode 100644 index 88f7be351..000000000 Binary files a/public/audio/se/move/emerald_00A8.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00A9.wav b/public/audio/se/move/emerald_00A9.wav deleted file mode 100644 index 84f3a2826..000000000 Binary files a/public/audio/se/move/emerald_00A9.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00AA.wav b/public/audio/se/move/emerald_00AA.wav deleted file mode 100644 index 6a2aa0e36..000000000 Binary files a/public/audio/se/move/emerald_00AA.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00AB.wav b/public/audio/se/move/emerald_00AB.wav deleted file mode 100644 index 24dfec063..000000000 Binary files a/public/audio/se/move/emerald_00AB.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00AC.wav b/public/audio/se/move/emerald_00AC.wav deleted file mode 100644 index d6f8389d2..000000000 Binary files a/public/audio/se/move/emerald_00AC.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00AE.wav b/public/audio/se/move/emerald_00AE.wav deleted file mode 100644 index 3cdc20af6..000000000 Binary files a/public/audio/se/move/emerald_00AE.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00AF.wav b/public/audio/se/move/emerald_00AF.wav deleted file mode 100644 index 35fb24cb5..000000000 Binary files a/public/audio/se/move/emerald_00AF.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00B0.wav b/public/audio/se/move/emerald_00B0.wav deleted file mode 100644 index 092fcd2f5..000000000 Binary files a/public/audio/se/move/emerald_00B0.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00B1.wav b/public/audio/se/move/emerald_00B1.wav deleted file mode 100644 index 6a060bdfd..000000000 Binary files a/public/audio/se/move/emerald_00B1.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00B2.wav b/public/audio/se/move/emerald_00B2.wav deleted file mode 100644 index aeeb707cb..000000000 Binary files a/public/audio/se/move/emerald_00B2.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00B3.wav b/public/audio/se/move/emerald_00B3.wav deleted file mode 100644 index e15e767a0..000000000 Binary files a/public/audio/se/move/emerald_00B3.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00B4.wav b/public/audio/se/move/emerald_00B4.wav deleted file mode 100644 index 51bccaace..000000000 Binary files a/public/audio/se/move/emerald_00B4.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00B5.wav b/public/audio/se/move/emerald_00B5.wav deleted file mode 100644 index 763333e6f..000000000 Binary files a/public/audio/se/move/emerald_00B5.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00B6.wav b/public/audio/se/move/emerald_00B6.wav deleted file mode 100644 index 0b16d97df..000000000 Binary files a/public/audio/se/move/emerald_00B6.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00B7.wav b/public/audio/se/move/emerald_00B7.wav deleted file mode 100644 index f6fec5322..000000000 Binary files a/public/audio/se/move/emerald_00B7.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00B8.wav b/public/audio/se/move/emerald_00B8.wav deleted file mode 100644 index 529497552..000000000 Binary files a/public/audio/se/move/emerald_00B8.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00B9.wav b/public/audio/se/move/emerald_00B9.wav deleted file mode 100644 index c7792b706..000000000 Binary files a/public/audio/se/move/emerald_00B9.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00BA.wav b/public/audio/se/move/emerald_00BA.wav deleted file mode 100644 index fefe62a0b..000000000 Binary files a/public/audio/se/move/emerald_00BA.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00BB.wav b/public/audio/se/move/emerald_00BB.wav deleted file mode 100644 index 428af21e5..000000000 Binary files a/public/audio/se/move/emerald_00BB.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00BC.wav b/public/audio/se/move/emerald_00BC.wav deleted file mode 100644 index f48880015..000000000 Binary files a/public/audio/se/move/emerald_00BC.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00BD.wav b/public/audio/se/move/emerald_00BD.wav deleted file mode 100644 index ad198a789..000000000 Binary files a/public/audio/se/move/emerald_00BD.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00BE.wav b/public/audio/se/move/emerald_00BE.wav deleted file mode 100644 index 6d741aed4..000000000 Binary files a/public/audio/se/move/emerald_00BE.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00BF.wav b/public/audio/se/move/emerald_00BF.wav deleted file mode 100644 index 74086513b..000000000 Binary files a/public/audio/se/move/emerald_00BF.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00C0.wav b/public/audio/se/move/emerald_00C0.wav deleted file mode 100644 index efa1d53ea..000000000 Binary files a/public/audio/se/move/emerald_00C0.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00C1.wav b/public/audio/se/move/emerald_00C1.wav deleted file mode 100644 index 2c88789f7..000000000 Binary files a/public/audio/se/move/emerald_00C1.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00C2.wav b/public/audio/se/move/emerald_00C2.wav deleted file mode 100644 index 1351c8f70..000000000 Binary files a/public/audio/se/move/emerald_00C2.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00C3.wav b/public/audio/se/move/emerald_00C3.wav deleted file mode 100644 index 2830a29f8..000000000 Binary files a/public/audio/se/move/emerald_00C3.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00C4.wav b/public/audio/se/move/emerald_00C4.wav deleted file mode 100644 index 822b55e64..000000000 Binary files a/public/audio/se/move/emerald_00C4.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00C5.wav b/public/audio/se/move/emerald_00C5.wav deleted file mode 100644 index c74c4c6bb..000000000 Binary files a/public/audio/se/move/emerald_00C5.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00C6.wav b/public/audio/se/move/emerald_00C6.wav deleted file mode 100644 index 60db8d5d7..000000000 Binary files a/public/audio/se/move/emerald_00C6.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00C7.wav b/public/audio/se/move/emerald_00C7.wav deleted file mode 100644 index eac10fe9a..000000000 Binary files a/public/audio/se/move/emerald_00C7.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00C8.wav b/public/audio/se/move/emerald_00C8.wav deleted file mode 100644 index 68724528f..000000000 Binary files a/public/audio/se/move/emerald_00C8.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00C9.wav b/public/audio/se/move/emerald_00C9.wav deleted file mode 100644 index 0080a9640..000000000 Binary files a/public/audio/se/move/emerald_00C9.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00CA.wav b/public/audio/se/move/emerald_00CA.wav deleted file mode 100644 index 41c68c81b..000000000 Binary files a/public/audio/se/move/emerald_00CA.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00CB.wav b/public/audio/se/move/emerald_00CB.wav deleted file mode 100644 index 037f118a6..000000000 Binary files a/public/audio/se/move/emerald_00CB.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00CC.wav b/public/audio/se/move/emerald_00CC.wav deleted file mode 100644 index 8fdce0df5..000000000 Binary files a/public/audio/se/move/emerald_00CC.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00CD.wav b/public/audio/se/move/emerald_00CD.wav deleted file mode 100644 index afa9d8e1e..000000000 Binary files a/public/audio/se/move/emerald_00CD.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00CE.wav b/public/audio/se/move/emerald_00CE.wav deleted file mode 100644 index 3bf32aca6..000000000 Binary files a/public/audio/se/move/emerald_00CE.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00CF.wav b/public/audio/se/move/emerald_00CF.wav deleted file mode 100644 index 25c8a7ed4..000000000 Binary files a/public/audio/se/move/emerald_00CF.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00D0.wav b/public/audio/se/move/emerald_00D0.wav deleted file mode 100644 index a45f8cdf4..000000000 Binary files a/public/audio/se/move/emerald_00D0.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00D1.wav b/public/audio/se/move/emerald_00D1.wav deleted file mode 100644 index bfcb39d63..000000000 Binary files a/public/audio/se/move/emerald_00D1.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00D2.wav b/public/audio/se/move/emerald_00D2.wav deleted file mode 100644 index 3bdd23e7b..000000000 Binary files a/public/audio/se/move/emerald_00D2.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00D3.wav b/public/audio/se/move/emerald_00D3.wav deleted file mode 100644 index 2a52af3bb..000000000 Binary files a/public/audio/se/move/emerald_00D3.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00D4.wav b/public/audio/se/move/emerald_00D4.wav deleted file mode 100644 index 777ca2539..000000000 Binary files a/public/audio/se/move/emerald_00D4.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00D5.wav b/public/audio/se/move/emerald_00D5.wav deleted file mode 100644 index 0fa01daed..000000000 Binary files a/public/audio/se/move/emerald_00D5.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00D6.wav b/public/audio/se/move/emerald_00D6.wav deleted file mode 100644 index 9cc8448f8..000000000 Binary files a/public/audio/se/move/emerald_00D6.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00D7.wav b/public/audio/se/move/emerald_00D7.wav deleted file mode 100644 index 0f954aad0..000000000 Binary files a/public/audio/se/move/emerald_00D7.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00D8.wav b/public/audio/se/move/emerald_00D8.wav deleted file mode 100644 index f2cf3a43d..000000000 Binary files a/public/audio/se/move/emerald_00D8.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00D9.wav b/public/audio/se/move/emerald_00D9.wav deleted file mode 100644 index b04f5e6f7..000000000 Binary files a/public/audio/se/move/emerald_00D9.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00DA.wav b/public/audio/se/move/emerald_00DA.wav deleted file mode 100644 index 2bd772ee9..000000000 Binary files a/public/audio/se/move/emerald_00DA.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00DB.wav b/public/audio/se/move/emerald_00DB.wav deleted file mode 100644 index dc8b1e688..000000000 Binary files a/public/audio/se/move/emerald_00DB.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00DC.wav b/public/audio/se/move/emerald_00DC.wav deleted file mode 100644 index 8b59a4f0c..000000000 Binary files a/public/audio/se/move/emerald_00DC.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00DD.wav b/public/audio/se/move/emerald_00DD.wav deleted file mode 100644 index 8b66233fc..000000000 Binary files a/public/audio/se/move/emerald_00DD.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00DE.wav b/public/audio/se/move/emerald_00DE.wav deleted file mode 100644 index 0eb455e6d..000000000 Binary files a/public/audio/se/move/emerald_00DE.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00DF.wav b/public/audio/se/move/emerald_00DF.wav deleted file mode 100644 index f56fca3a1..000000000 Binary files a/public/audio/se/move/emerald_00DF.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00E0.wav b/public/audio/se/move/emerald_00E0.wav deleted file mode 100644 index 970fa9bc8..000000000 Binary files a/public/audio/se/move/emerald_00E0.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00E1.wav b/public/audio/se/move/emerald_00E1.wav deleted file mode 100644 index 9cd07e71a..000000000 Binary files a/public/audio/se/move/emerald_00E1.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00E2.wav b/public/audio/se/move/emerald_00E2.wav deleted file mode 100644 index f6bfecb8b..000000000 Binary files a/public/audio/se/move/emerald_00E2.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00E3.wav b/public/audio/se/move/emerald_00E3.wav deleted file mode 100644 index 02d62e9b2..000000000 Binary files a/public/audio/se/move/emerald_00E3.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00E4.wav b/public/audio/se/move/emerald_00E4.wav deleted file mode 100644 index cfa19a803..000000000 Binary files a/public/audio/se/move/emerald_00E4.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00E5.wav b/public/audio/se/move/emerald_00E5.wav deleted file mode 100644 index 12a622145..000000000 Binary files a/public/audio/se/move/emerald_00E5.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00E6.wav b/public/audio/se/move/emerald_00E6.wav deleted file mode 100644 index 8cab29e4e..000000000 Binary files a/public/audio/se/move/emerald_00E6.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00E7.wav b/public/audio/se/move/emerald_00E7.wav deleted file mode 100644 index 4c2f66697..000000000 Binary files a/public/audio/se/move/emerald_00E7.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00E8.wav b/public/audio/se/move/emerald_00E8.wav deleted file mode 100644 index f52d2c123..000000000 Binary files a/public/audio/se/move/emerald_00E8.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00E9.wav b/public/audio/se/move/emerald_00E9.wav deleted file mode 100644 index e1eef5389..000000000 Binary files a/public/audio/se/move/emerald_00E9.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00EA.wav b/public/audio/se/move/emerald_00EA.wav deleted file mode 100644 index f3bee6ef2..000000000 Binary files a/public/audio/se/move/emerald_00EA.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00EB.wav b/public/audio/se/move/emerald_00EB.wav deleted file mode 100644 index 4c3261e17..000000000 Binary files a/public/audio/se/move/emerald_00EB.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00EC.wav b/public/audio/se/move/emerald_00EC.wav deleted file mode 100644 index f417964ce..000000000 Binary files a/public/audio/se/move/emerald_00EC.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00ED.wav b/public/audio/se/move/emerald_00ED.wav deleted file mode 100644 index cc16fdc18..000000000 Binary files a/public/audio/se/move/emerald_00ED.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00EE.wav b/public/audio/se/move/emerald_00EE.wav deleted file mode 100644 index 20c920070..000000000 Binary files a/public/audio/se/move/emerald_00EE.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00EF.wav b/public/audio/se/move/emerald_00EF.wav deleted file mode 100644 index ef43c3ed1..000000000 Binary files a/public/audio/se/move/emerald_00EF.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00F0.wav b/public/audio/se/move/emerald_00F0.wav deleted file mode 100644 index e3c11af8a..000000000 Binary files a/public/audio/se/move/emerald_00F0.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00F1.wav b/public/audio/se/move/emerald_00F1.wav deleted file mode 100644 index 37d57e6ee..000000000 Binary files a/public/audio/se/move/emerald_00F1.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00F2.wav b/public/audio/se/move/emerald_00F2.wav deleted file mode 100644 index ae8fdf165..000000000 Binary files a/public/audio/se/move/emerald_00F2.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00F3.wav b/public/audio/se/move/emerald_00F3.wav deleted file mode 100644 index c02e234e9..000000000 Binary files a/public/audio/se/move/emerald_00F3.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00F4.wav b/public/audio/se/move/emerald_00F4.wav deleted file mode 100644 index ddf044636..000000000 Binary files a/public/audio/se/move/emerald_00F4.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00F5.wav b/public/audio/se/move/emerald_00F5.wav deleted file mode 100644 index 0a5d9be57..000000000 Binary files a/public/audio/se/move/emerald_00F5.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00F6.wav b/public/audio/se/move/emerald_00F6.wav deleted file mode 100644 index c9d4f0648..000000000 Binary files a/public/audio/se/move/emerald_00F6.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00F7.wav b/public/audio/se/move/emerald_00F7.wav deleted file mode 100644 index 8fb8f67db..000000000 Binary files a/public/audio/se/move/emerald_00F7.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00F8.wav b/public/audio/se/move/emerald_00F8.wav deleted file mode 100644 index 64481c578..000000000 Binary files a/public/audio/se/move/emerald_00F8.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00F9.wav b/public/audio/se/move/emerald_00F9.wav deleted file mode 100644 index 5b828792f..000000000 Binary files a/public/audio/se/move/emerald_00F9.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00FA.wav b/public/audio/se/move/emerald_00FA.wav deleted file mode 100644 index d63bf5232..000000000 Binary files a/public/audio/se/move/emerald_00FA.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00FB.wav b/public/audio/se/move/emerald_00FB.wav deleted file mode 100644 index e693cb207..000000000 Binary files a/public/audio/se/move/emerald_00FB.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00FC.wav b/public/audio/se/move/emerald_00FC.wav deleted file mode 100644 index c118150fc..000000000 Binary files a/public/audio/se/move/emerald_00FC.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00FD.wav b/public/audio/se/move/emerald_00FD.wav deleted file mode 100644 index 5a76dad6f..000000000 Binary files a/public/audio/se/move/emerald_00FD.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00FE.wav b/public/audio/se/move/emerald_00FE.wav deleted file mode 100644 index 4af8a918d..000000000 Binary files a/public/audio/se/move/emerald_00FE.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_00FF.wav b/public/audio/se/move/emerald_00FF.wav deleted file mode 100644 index 2eeb8b1d4..000000000 Binary files a/public/audio/se/move/emerald_00FF.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0100.wav b/public/audio/se/move/emerald_0100.wav deleted file mode 100644 index b67a390d3..000000000 Binary files a/public/audio/se/move/emerald_0100.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0101.wav b/public/audio/se/move/emerald_0101.wav deleted file mode 100644 index 7b8dcefa3..000000000 Binary files a/public/audio/se/move/emerald_0101.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0102.wav b/public/audio/se/move/emerald_0102.wav deleted file mode 100644 index bcc9c503f..000000000 Binary files a/public/audio/se/move/emerald_0102.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0103.wav b/public/audio/se/move/emerald_0103.wav deleted file mode 100644 index 5afcde414..000000000 Binary files a/public/audio/se/move/emerald_0103.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0104.wav b/public/audio/se/move/emerald_0104.wav deleted file mode 100644 index 693291758..000000000 Binary files a/public/audio/se/move/emerald_0104.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0107.wav b/public/audio/se/move/emerald_0107.wav deleted file mode 100644 index d95fdde6e..000000000 Binary files a/public/audio/se/move/emerald_0107.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0108.wav b/public/audio/se/move/emerald_0108.wav deleted file mode 100644 index f86aee523..000000000 Binary files a/public/audio/se/move/emerald_0108.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0109.wav b/public/audio/se/move/emerald_0109.wav deleted file mode 100644 index 5365638c3..000000000 Binary files a/public/audio/se/move/emerald_0109.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_010A.wav b/public/audio/se/move/emerald_010A.wav deleted file mode 100644 index 84430f179..000000000 Binary files a/public/audio/se/move/emerald_010A.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_010B.wav b/public/audio/se/move/emerald_010B.wav deleted file mode 100644 index 464ede68b..000000000 Binary files a/public/audio/se/move/emerald_010B.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_010C.wav b/public/audio/se/move/emerald_010C.wav deleted file mode 100644 index 339eb9948..000000000 Binary files a/public/audio/se/move/emerald_010C.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_010D.wav b/public/audio/se/move/emerald_010D.wav deleted file mode 100644 index c7fafed21..000000000 Binary files a/public/audio/se/move/emerald_010D.wav and /dev/null differ diff --git a/public/audio/se/move/emerald_0214.wav b/public/audio/se/move/emerald_0214.wav deleted file mode 100644 index c3649d0f0..000000000 Binary files a/public/audio/se/move/emerald_0214.wav and /dev/null differ diff --git a/src/battle-phases.ts b/src/battle-phases.ts index c02b1bf69..20b5a4992 100644 --- a/src/battle-phases.ts +++ b/src/battle-phases.ts @@ -979,7 +979,7 @@ export class CommandPhase extends FieldPhase { case Command.FIGHT: let useStruggle = false; if (cursor === -1 || playerPokemon.trySelectMove(cursor, args[0] as boolean) || (useStruggle = cursor > -1 && !playerPokemon.getMoveset().filter(m => m.isUsable(playerPokemon)).length)) { - const moveId = !useStruggle ? playerPokemon.moveset[cursor].moveId : Moves.STRUGGLE; + const moveId = !useStruggle ? playerPokemon.getMoveset()[cursor].moveId : Moves.STRUGGLE; const turnCommand: TurnCommand = { command: Command.FIGHT, cursor: cursor, move: cursor > -1 ? { move: moveId, targets: [] } : null, args: args }; const moveTargets: MoveTargetSet = args.length < 3 ? getMoveTargets(playerPokemon, cursor > -1 ? moveId : Moves.NONE) : args[2]; @@ -2757,9 +2757,9 @@ export class AttemptRunPhase extends PokemonPhase { const playerPokemon = this.getPokemon(); const enemyField = this.scene.getEnemyField(); - const enemySpeed = enemyField.reduce((total: integer, enemyPokemon: Pokemon) => total + enemyPokemon.stats[Stat.SPD], 0) / enemyField.length; + const enemySpeed = enemyField.reduce((total: integer, enemyPokemon: Pokemon) => total + enemyPokemon.getStat(Stat.SPD), 0) / enemyField.length; - const escapeChance = (((playerPokemon.stats[Stat.SPD] * 128) / enemySpeed) + (30 * this.scene.currentBattle.escapeAttempts++)) % 256; + const escapeChance = (((playerPokemon.getStat(Stat.SPD) * 128) / enemySpeed) + (30 * this.scene.currentBattle.escapeAttempts++)) % 256; if (Utils.randInt(256) < escapeChance) { this.scene.playSound('flee'); diff --git a/src/battle-scene.ts b/src/battle-scene.ts index a2a7b6e65..04e6cb7a6 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -320,6 +320,8 @@ export default class BattleScene extends Phaser.Scene { this.loadSe('pb_tray_ball'); this.loadSe('pb_tray_empty'); + this.loadSe('PRSFX- Transform', 'battle_anims'); + this.loadBgm('menu'); this.loadBgm('level_up_fanfare', 'bw/level_up_fanfare.mp3'); diff --git a/src/data/ability.ts b/src/data/ability.ts index a171252ae..cec369536 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -9,6 +9,7 @@ import { BattlerTag, BattlerTagType } from "./battler-tag"; import { StatusEffect, getStatusEffectDescriptor } from "./status-effect"; import { MoveFlags, Moves, RecoilAttr } from "./move"; import { ArenaTagType } from "./arena-tag"; +import { Stat } from "./pokemon-stat"; export class Ability { public id: Abilities; @@ -487,6 +488,35 @@ export class PostSummonWeatherChangeAbAttr extends PostSummonAbAttr { } } +export class PostSummonTransformAbAttr extends PostSummonAbAttr { + constructor() { + super(true); + } + + applyPostSummon(pokemon: Pokemon, args: any[]): boolean { + const targets = pokemon.getOpponents(); + let target: Pokemon; + if (targets.length > 1) + pokemon.scene.executeWithSeedOffset(() => target = Phaser.Math.RND.pick(targets), pokemon.scene.currentBattle.waveIndex); + else + target = targets[0]; + + pokemon.summonData.speciesForm = target.getSpeciesForm(); + pokemon.summonData.gender = target.getGender(); + pokemon.summonData.stats = [ pokemon.stats[Stat.HP] ].concat(target.stats.slice(1)); + pokemon.summonData.battleStats = target.summonData.battleStats.slice(0); + pokemon.summonData.moveset = target.getMoveset().map(m => new PokemonMove(m.moveId, m.ppUsed, m.ppUp)); + pokemon.summonData.types = target.getTypes(); + + pokemon.scene.playSound('PRSFX- Transform'); + pokemon.loadAssets().then(() => pokemon.playAnim()); + + pokemon.scene.queueMessage(getPokemonMessage(pokemon, ` transformed\ninto ${target.name}!`)); + + return true; + } +} + export class PreStatChangeAbAttr extends AbAttr { applyPreStatChange(pokemon: Pokemon, stat: BattleStat, cancelled: Utils.BooleanHolder, args: any[]): boolean { return false; @@ -1437,7 +1467,8 @@ export function initAbilities() { new Ability(Abilities.HEALER, "Healer (N)", "May heal an ally's status conditions.", 5), new Ability(Abilities.HEAVY_METAL, "Heavy Metal (N)", "Doubles the Pokémon's weight.", 5), new Ability(Abilities.ILLUSION, "Illusion (N)", "Enters battle disguised as the last Pokémon in the party.", 5), - new Ability(Abilities.IMPOSTER, "Imposter (N)", "It transforms itself into the Pokémon it is facing.", 5), + new Ability(Abilities.IMPOSTER, "Imposter", "It transforms itself into the Pokémon it is facing.", 5) + .attr(PostSummonTransformAbAttr), new Ability(Abilities.INFILTRATOR, "Infiltrator (N)", "Passes through the foe's barrier and strikes.", 5), new Ability(Abilities.IRON_BARBS, "Iron Barbs (N)", "Inflicts damage to the Pokémon on contact.", 5), new Ability(Abilities.JUSTIFIED, "Justified (N)", "Raises Attack when hit by a Dark-type move.", 5), diff --git a/src/data/move.ts b/src/data/move.ts index fbc84da17..81d7e03bb 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -2199,6 +2199,29 @@ export class SketchAttr extends MoveEffectAttr { } } +export class TransformAttr extends MoveEffectAttr { + apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise { + return new Promise(resolve => { + if (!super.apply(user, target, move, args)) + return resolve(false); + + user.summonData.speciesForm = target.getSpeciesForm(); + user.summonData.gender = target.getGender(); + user.summonData.stats = [ user.stats[Stat.HP] ].concat(target.stats.slice(1)); + user.summonData.battleStats = target.summonData.battleStats.slice(0); + user.summonData.moveset = target.getMoveset().map(m => new PokemonMove(m.moveId, m.ppUsed, m.ppUp)); + user.summonData.types = target.getTypes(); + + user.scene.queueMessage(getPokemonMessage(user, ` transformed\ninto ${target.name}!`)); + + user.loadAssets().then(() => { + user.playAnim(); + resolve(true); + }); + }); + } +} + const failOnGravityCondition = (user: Pokemon, target: Pokemon, move: Move) => !user.scene.arena.getTag(ArenaTagType.GRAVITY); export type MoveAttrFilter = (attr: MoveAttr) => boolean; @@ -2611,7 +2634,8 @@ export function initMoves() { .makesContact(false) .ignoresVirtual() .target(MoveTarget.OTHER), - new SelfStatusMove(Moves.TRANSFORM, "Transform (N)", Type.NORMAL, -1, 10, -1, "User takes on the form and attacks of the opponent.", -1, 0, 1), + new StatusMove(Moves.TRANSFORM, "Transform", Type.NORMAL, -1, 10, -1, "User takes on the form and attacks of the opponent.", -1, 0, 1) + .attr(TransformAttr), new AttackMove(Moves.BUBBLE, "Bubble", Type.WATER, MoveCategory.SPECIAL, 40, 100, 30, -1, "May lower opponent's Speed.", 10, 0, 1) .attr(StatChangeAttr, BattleStat.SPD, -1) .target(MoveTarget.ALL_NEAR_ENEMIES), diff --git a/src/pokemon.ts b/src/pokemon.ts index e6238302f..25a0ccfb9 100644 --- a/src/pokemon.ts +++ b/src/pokemon.ts @@ -158,7 +158,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.add(sprite); this.add(tintSprite); - this.getSpeciesForm().generateIconAnim(scene, this.gender === Gender.FEMALE, formIndex); + this.getSpeciesForm().generateIconAnim(scene, this.getGender() === Gender.FEMALE, formIndex); if (this.shiny) { const shinySparkle = this.scene.add.sprite(0, 0, 'shiny'); @@ -204,7 +204,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { Promise.allSettled(moveIds.map(m => initMoveAnim(m))) .then(() => { loadMoveAnimAssets(this.scene, moveIds); - this.getSpeciesForm().loadAssets(this.scene, this.gender === Gender.FEMALE, this.formIndex, this.shiny); + this.getSpeciesForm().loadAssets(this.scene, this.getGender() === Gender.FEMALE, this.formIndex, this.shiny); if (this.isPlayer()) this.scene.loadAtlas(this.getBattleSpriteKey(), 'pokemon', this.getBattleSpriteAtlasPath()); this.scene.load.once(Phaser.Loader.Events.COMPLETE, () => { @@ -232,43 +232,45 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { }); } - getSpriteAtlasPath(): string { - return this.getSpriteId().replace(/\_{2}/g, '/'); + getSpriteAtlasPath(ignoreOverride?: boolean): string { + return this.getSpriteId(ignoreOverride).replace(/\_{2}/g, '/'); } - getBattleSpriteAtlasPath(): string { - return this.getBattleSpriteId().replace(/\_{2}/g, '/'); + getBattleSpriteAtlasPath(ignoreOverride?: boolean): string { + return this.getBattleSpriteId(ignoreOverride).replace(/\_{2}/g, '/'); } - getSpriteId(): string { - return this.getSpeciesForm().getSpriteId(this.gender === Gender.FEMALE, this.formIndex, this.shiny); + getSpriteId(ignoreOverride?: boolean): string { + return this.getSpeciesForm(ignoreOverride).getSpriteId(this.getGender(ignoreOverride) === Gender.FEMALE, this.formIndex, this.shiny); } - getBattleSpriteId(): string { - return `${this.isPlayer() ? 'back__' : ''}${this.getSpriteId()}`; + getBattleSpriteId(ignoreOverride?: boolean): string { + return `${this.isPlayer() ? 'back__' : ''}${this.getSpriteId(ignoreOverride)}`; } - getSpriteKey(): string { - return this.getSpeciesForm().getSpriteKey(this.gender === Gender.FEMALE, this.formIndex, this.shiny); + getSpriteKey(ignoreOverride?: boolean): string { + return this.getSpeciesForm(ignoreOverride).getSpriteKey(this.getGender(ignoreOverride) === Gender.FEMALE, this.formIndex, this.shiny); } - getBattleSpriteKey(): string { - return `pkmn__${this.getBattleSpriteId()}`; + getBattleSpriteKey(ignoreOverride?: boolean): string { + return `pkmn__${this.getBattleSpriteId(ignoreOverride)}`; } - getIconAtlasKey(): string { - return this.getSpeciesForm().getIconAtlasKey(this.formIndex); + getIconAtlasKey(ignoreOverride?: boolean): string { + return this.getSpeciesForm(ignoreOverride).getIconAtlasKey(this.formIndex); } - getIconId(): string { - return this.getSpeciesForm().getIconId(this.gender === Gender.FEMALE, this.formIndex); + getIconId(ignoreOverride?: boolean): string { + return this.getSpeciesForm(ignoreOverride).getIconId(this.getGender(ignoreOverride) === Gender.FEMALE, this.formIndex); } - getIconKey(): string { - return `pkmn_icon__${this.getIconId()}`; + getIconKey(ignoreOverride?: boolean): string { + return `pkmn_icon__${this.getIconId(ignoreOverride)}`; } - getSpeciesForm(): PokemonSpeciesForm { + getSpeciesForm(ignoreOverride?: boolean): PokemonSpeciesForm { + if (!ignoreOverride && this.summonData?.speciesForm) + return this.summonData.speciesForm; if (!this.species.forms?.length) return this.species; return this.species.forms[this.formIndex]; @@ -335,14 +337,18 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { }); } + getStat(stat: Stat): integer { + return this.stats[stat]; + } + getBattleStat(stat: Stat): integer { if (stat === Stat.HP) - return this.stats[Stat.HP]; + return this.getStat(Stat.HP); const battleStat = (stat - 1) as BattleStat; const statLevel = new Utils.IntegerHolder(this.summonData.battleStats[battleStat]); if (this.isPlayer()) this.scene.applyModifiers(TempBattleStatBoosterModifier, this.isPlayer(), battleStat as integer as TempBattleStat, statLevel); - const statValue = new Utils.NumberHolder(this.stats[stat]); + const statValue = new Utils.NumberHolder(this.getStat(stat)); applyBattleStatMultiplierAbAttrs(BattleStatMultiplierAbAttr, this, battleStat, statValue); let ret = statValue.value * (Math.max(2, 2 + statLevel.value) / Math.max(2, 2 - statLevel.value)); if (stat === Stat.SPDEF && this.scene.arena.weather?.weatherType === WeatherType.SANDSTORM) @@ -380,7 +386,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } getMaxHp(): integer { - return this.stats[Stat.HP]; + return this.getStat(Stat.HP); } getInverseHp(): integer { @@ -391,16 +397,22 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { return Math.floor((this.hp / this.getMaxHp()) * 100) / 100; } - getMoveset(): PokemonMove[] { - if (this.summonData?.moveset) + getGender(ignoreOverride?: boolean): Gender { + if (!ignoreOverride && this.summonData?.gender !== undefined) + return this.summonData.gender; + return this.gender; + } + + getMoveset(ignoreOverride?: boolean): PokemonMove[] { + if (!ignoreOverride && this.summonData?.moveset) return this.summonData.moveset; return this.moveset; } - getTypes(): Type[] { + getTypes(ignoreOverride?: boolean): Type[] { const types = []; - if (this.summonData?.types) + if (!ignoreOverride && this.summonData?.types) this.summonData.types.forEach(t => types.push(t)); else { const speciesForm = this.getSpeciesForm(); @@ -1397,6 +1409,10 @@ export class PokemonSummonData { public disabledMove: Moves = Moves.NONE; public disabledTurns: integer = 0; public tags: BattlerTag[] = []; + + public speciesForm: PokemonSpeciesForm; + public gender: Gender; + public stats: integer[]; public moveset: PokemonMove[]; public types: Type[]; } diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 2cf590932..525bf843d 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -618,8 +618,8 @@ class PartySlot extends Phaser.GameObjects.Container { this.add(slotPb); - const pokemonIcon = this.scene.add.sprite(slotPb.x, slotPb.y, this.pokemon.getIconAtlasKey()); - pokemonIcon.play(this.pokemon.getIconKey()); + const pokemonIcon = this.scene.add.sprite(slotPb.x, slotPb.y, this.pokemon.getIconAtlasKey(true)); + pokemonIcon.play(this.pokemon.getIconKey(true)); this.add(pokemonIcon); @@ -640,12 +640,12 @@ class PartySlot extends Phaser.GameObjects.Container { slotInfoContainer.add([ slotName, slotLevelLabel, slotLevelText ]); - const genderSymbol = getGenderSymbol(this.pokemon.gender); + const genderSymbol = getGenderSymbol(this.pokemon.getGender(true)); if (genderSymbol) { const slotGenderText = addTextObject(this.scene, 0, 0, genderSymbol, TextStyle.PARTY); - slotGenderText.setColor(getGenderColor(this.pokemon.gender)); - slotGenderText.setShadowColor(getGenderColor(this.pokemon.gender, true)); + slotGenderText.setColor(getGenderColor(this.pokemon.getGender(true))); + slotGenderText.setShadowColor(getGenderColor(this.pokemon.getGender(true), true)); if (this.slotIndex >= battlerCount) slotGenderText.setPositionRelative(slotLevelLabel, 36, 0); else diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts index 8acd54ee2..c8e461bb2 100644 --- a/src/ui/summary-ui-handler.ts +++ b/src/ui/summary-ui-handler.ts @@ -196,15 +196,15 @@ export default class SummaryUiHandler extends UiHandler { this.numberText.setColor(getTextColor(!this.pokemon.shiny ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD)); this.numberText.setShadowColor(getTextColor(!this.pokemon.shiny ? TextStyle.SUMMARY : TextStyle.SUMMARY_GOLD, true)); - this.pokemonSprite.play(this.pokemon.getSpriteKey()); + this.pokemonSprite.play(this.pokemon.getSpriteKey(true)); this.pokemon.cry(); this.nameText.setText(this.pokemon.name); this.pokeball.setFrame(getPokeballAtlasKey(this.pokemon.pokeball)); this.levelText.setText(this.pokemon.level.toString()); - this.genderText.setText(getGenderSymbol(this.pokemon.gender)); - this.genderText.setColor(getGenderColor(this.pokemon.gender)); - this.genderText.setShadowColor(getGenderColor(this.pokemon.gender, true)); + this.genderText.setText(getGenderSymbol(this.pokemon.getGender(true))); + this.genderText.setColor(getGenderColor(this.pokemon.getGender(true))); + this.genderText.setShadowColor(getGenderColor(this.pokemon.getGender(true), true)); switch (this.summaryUiMode) { case SummaryUiMode.DEFAULT: