From e84b9acc52ab880f285c3e7174b0353cbce072af Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@edt.zone>
Date: Wed, 18 Oct 2023 09:31:08 +0200
Subject: [PATCH] Improve SFX

---
 src/include/globals.asm     |   2 +
 src/level.asm               |  11 +
 src/res/sources/sfx.fur     | Bin 1178 -> 1572 bytes
 src/res/sources/sfx.vgm     | Bin 6219 -> 9994 bytes
 src/res/sources/sfxparse.py |   4 +-
 src/res/sources/sfxregs.txt | 711 ++++++++++++++++++++------------
 src/sfx.asm                 | 780 ++++++++++++++++++++++++++----------
 src/state_gameplay.asm      |   6 +-
 tools/Emulicious.ini        |  12 +-
 tools/projects/out.exp      |   2 +
 10 files changed, 1060 insertions(+), 468 deletions(-)

diff --git a/src/include/globals.asm b/src/include/globals.asm
index 360e68a..fde2665 100644
--- a/src/include/globals.asm
+++ b/src/include/globals.asm
@@ -119,6 +119,8 @@ DEF SFX_DROP            EQU 8
 DEF SFX_LOCK            EQU 9
 DEF SFX_BELL            EQU 10
 DEF SFX_MOVE            EQU 11
+DEF SFX_RANK_UP         EQU 12
+DEF SFX_LEVEL_UP        EQU 13
 DEF STACK_SIZE          EQU 64
 
 
diff --git a/src/level.asm b/src/level.asm
index b146a39..cc33d80 100644
--- a/src/level.asm
+++ b/src/level.asm
@@ -64,7 +64,18 @@ LevelUp::
     cp a, $09
     ret z
 
+    ; If we required a line clear, unset the flag and play the sfx.
+    ldh a, [hRequiresLineClear]
+    cp a, $FF
+    jr nz, .doit
+    ld a, SFX_LEVEL_UP
+    call SFXEnqueue
+    xor a, a
+    ldh [hRequiresLineClear], a
+
     ; Increment LSD.
+.doit
+    ld hl, wCLevel+3
     ld a, [hl]
     add a, e
     ld [hl], a
diff --git a/src/res/sources/sfx.fur b/src/res/sources/sfx.fur
index fc92a0f699356b14f22e6c0aaf598b567b9d4dce..be4508cdc06109946a6ef3687b6617ed4d3b02cb 100644
GIT binary patch
literal 1572
zcmV+<2HW{~oXwZpYaCS^$A7;$vpc)9o1JYNYudDKD6LRS(u)KtXicKMDUH$wD~Mod
zw(XM3ZugRAlWnq_5L=5a5u_H{hx!lHmlS<aK~O<`u=pnWFb_fz1%2=Wf~?<jc4l{G
zlQs!`@oYYG&YAPOo!|NG?4<KhAv-pBD%mlb9x99^JMR!t2Q}K!{zEUlDKOA9Cd%~n
zP>l5WdeU%fKhWvHt!IU{g8KiW{rFsM_e9L@J?7t#l^xjrYv3yQ0%!rEo!}(+9P9}a
z-2{JuLk7_`@H^-U5iNjU!Ok$zr{IK1bRB#MegayAXd5^Proc_`5%?0^1Al_{DA64F
z3j6}1EksX%BVZWZ0-u5JfDQB*(R#2S+yb}3$KY%51Na$O7SUF)3p@p00I!16U;(@j
zJ^-J9Z@~B99tg&XT0s}+1A`z9%HV2Trc4uhAZUa`W(09Mvru@Y89S}%P|DAedm{2r
zcMnICQ@VyvtsNd5O?LF9i%oiH+uWm68h5J<G$4Qu0w4$s5CUOff(VF$77zm#KzgBX
zL*ItJ4SgH>HuP=i+t9b6Z$saPz72gF`Zn}!=u2HU7%k{;bQ^W{EwDlF^GA<wQX!+Q
zCx4=1R(zcl2)hFKj<URAxHsh2`NY01^mnk>->Xyio*i_oH%cMWxLTE|(5i>~bh3I-
zkjHewy~M%(X03hQ&02gPtzC7kFb!l=gJWk#l8$PONvTrRud=(Y5~TigDktSPKwb~k
zTv230`}VHx15Ik(b+w3$ujBOKP-^VVvSIFC5@w>V9H19dr-o^HvB&FTQ95xpoy~XD
z0+iC*mPjW(5h2fwh@M776o;TdOjcDMWWA|K<-x|JK)@+ZPjeE@P0ohu&SGl&xsmjF
z=}~5Hf0IAcV~z#x_u?`B&mZ+9HBLtQ8hR*Sk1glx-@jMw>v-Llp^~__8%{c#oLJ2X
zly&U4ytFirc<M}AeiDYaug0*lCswq#cTM(qi9PSmWtLaHb6(5NrRCM`oL8}P73rGn
zE#3J*-QGH7@9bc9G(A>yOKgofxZh*Kq?3c=$xLBHJz*Y!QSl(<lfADTydqt6IIa?|
zORBvE;U``OroLVHDaLyeq9pa0rdF^Kw1LfF3wX?7i*v8dk!f{w;*O1|V>9IV&>f$$
z-8ZO*X^DsA<=%n*XX?gMc%jh5Fo{tTDRKsBHO3%AqClcZqC{evM43dzxFi;-Dvdm<
zEa3TP%!RBuT!g%6bG)dQcc^8gLR3sH@eEJmibc$$-nkOqsD$woD#lwl!#Ob?lby5L
zrdE;J_PlB7JkAp$AC;Z6-mcd1LML)2pW{W5i`2TP?375C62So_=3B61o+2&~7m2Z_
zLaaWroROooNonB+x?)sxi!bpNeuv-X_xL*BQ39<>AS@HfmUcJsI)}8oj&e|~p)Ne8
zP$|Y`-6C;WcbWBxM;!6mgBisoQt=9s#wlLpQIG+Jc}M3BC51P~#A(x_(xzcB0!G0Y
zNP`SG2eMR3<jg3Qw&p{)6oR;9bu8pS9uy#uHMQEEL_UsD+3|D0IcZ81IfQzdVsU{*
zk)6Se8e>pqG0);H7H_k-%3^_yl3~>gX0x&aGi{b;Oovf3(_tYm^_o#hVoga@L?yC(
zov^HvnHDZ^QOv|-=UYXch)G#;(_&Iq+O)SySXN2V<nt(xVx-nZWv4_sl?YBkl<}H7
zL42NMrOb<oSYv3pLtoIUNN(sMzTx@QiX^NALULDu#!++FIqEHHX3AyVxG0O`qVD1=
z4)zrX%i_q?ibE9zKq9#0D-M>$k#CX3Q3R7<3Y5SFFb!rv87E#*#W5?3V@?)FSr$hH
z%z`-xlvQ!yPGZ(u96{%MPM#V2W|}ioiO@t-A~fB*E%`s1k<)_mo7>!bbb>wyhHn<~
zxeH5o!n17pgx#E~e>XJb)R<fsE+dn&?2z0BZeD9<TU3!Y3<+NXgf9U?^UZ{B=I&lS
zPDMZ^M@HP}Ji_j_)jO%cw%bR9#W;zI8%$KKAO#{B5UGI2G~zZU1RDdwB3v}U9@C~b
WYXWHz3qj9v)E6{%U;PhZfX%J}-~JN-

literal 1178
zcmV;L1ZDepoXwQqYg|PX$IqFW-Fx>(dqW#)G{L)uT6}3D(M1u|{ID%0G!_#SK_6nf
z)=l%v{HWO)n_WZFT3U$^s?Y}^e?cEMuf<oPNM3vqh5IP@2lyoGcjnIB+(~Qt>g;~*
z&Y3yi`Eky<d;0A1!tCUwN@-^9^73@$^ez#VXuq8wJNxdiL`MiFnjapdBcwV!f<dnW
zMTfV+r?jWY{}=7|k@)sR%*hz@kBG{zpnwqcfeP3GKZC!)oea@G;I%B#64(MifnUH;
zkEkDvf)BxUa0}c6o=-Fkrobj>f(Z2Hh(^E!_ylZ%ZLk9#fQR4__yha}UdUq)@Fo}q
zAAu>b0ye=m*Z~i~L+}Xv2L1%1Ky(6>!3dZr=qn4UGFdO@=L^Ne@N<V6Y}<i=*59Ti
zn)<7fzzS1V_wb3^xyhMIX?U)7K!?_wq`@fmS_}k`K!FU%0uT5g2lAi*ir@%13Ic%e
zLLWgNK_5XMK_5XMK_5XMK_5XMK_5XMK_5XML9eyRVMNw#G==)8gDo)h&iVI_nj@om
zNjUYWpNw+s<t4U${l*9S@VkrHj14I&zx*Oy7%Gxaf?F+pebG8MtSA^H8o!_jW8s;x
zgQ|h@K^6aps=KYq(ZoV^a`wt}<$z0n+a*h5bJfKPmOhT9l^-unh2z~P`^s;%Tv@p-
zE9mo-KApT=oxSqJWA#6FtgtQ4&}jA2ReG}9skU2@#y^`|SSrN_)ZV?0_Xk7opSi08
zT(Y?f?XRHtKMgM_>Ac`&pd!$j>j1|<CpZDRz;mDnJa6f-V_nv#(`q{G8b!ONZ}(7k
zPu(sKO^j8OVhXDi1VUaVIYY8awlin?=**K`CRro7O7aHDI)x1i@_zc+WxnW(Jg1-J
zH4tmrq?X=rz`jQmuIml;f+W8{g|3rhaN9_f<s@KXgM&cIRhDZkue0u~vux^(m>(ZD
z;!Y#RYvEl}fj18pRlrR%_mY`IWWoh3tmG2QYwRuHg-LoG_pE=`_~WnESg#ukW8sF0
z;FqLBrDLVTMBcK#*S^7R!>;x$*%!3oHE^U`e3!rDZT_Br;N8^Gb2>#Fh`sP*_Qjra
z6yF{tUJB{<ZmWRgZI$q~<6f}tu~oEI)#io58vFVlEWct|W7}CXeRS$9H&}kd@(#;y
zS#EK-YHA?$w3V=GY9RF_Z#7j3ub2(7V^<)&8-xSf(7_OCgWE<TEyaI-S}GAXWa^Nt
zv(EY&GQJFI?W~_NbI7{4!a=M=Pqce>HS2xScq8XtjRI69PJ*6l_e9(?zHb;`MAxh9
zTdmkK)_2&zZpJrda>`8C1e=<;uYA6r`ouMnGY-BEKxRLeoU^&?F;-qrEAOVRg_|nD
zsRedwfs1KN|4pPUb}V5na}XiTPN`{Sr~8bBu!V~v2r}|>(cKh*gryuy7)v%qYK^S3
zq32k>vwhAKLTWniI6HR~&K;$5N9o*A3dfR;r5r2cSjoYU84CyRo|XaEx!FLao0+1S
s!6jrRBdc)+pD|-OU5}Ez2^kO`0&r^SeEQxJ7n57r)U>|azoBQi1wFq^>;M1&

diff --git a/src/res/sources/sfx.vgm b/src/res/sources/sfx.vgm
index d7a250d1ee6dcd5133f35500e54893ee837c18cd..cdd43e38f25aa33f941d3fcd470e73d08f12038b 100644
GIT binary patch
literal 9994
zcmeHNPi$007@vJ_+4r`zxVsd?aku>G@~5zgnv`f_gN<<GB!XV*Dp1paS|MsUutcT6
zMQ#!kJQx#d!bQG>5MwMRnlv%-;DO*ly_i5^NVdJe$@MpX-^_cnD77`k^rh*W&i9+|
z`{w&MZ)Upx$kA$Hkg>ON%sdx1Gxo>tRrB{VXcbw>{QZk+^|AY=Z{dxR1rHrv@W^Cf
zuWIJ;&aGuPT1O858S%F4r+`tuMG>Q7i+UNYX;GQc+7>ZJkAFn#I@JFT1#ODjl$+r{
zXopuQ{~;Al@t>$gaX%HOnoWy-*QF1o>4TI%V~rn8)0dk6%dY%`4=exg^q+M3H`DxY
zy7cpDdOzi-Ec<+xrtfm;U#98%T>4jOdefzU>(K90I3egWRG6XYKE=BvJ-9<bk%BS>
zangwHP*kL-Oi^qaO$u%$2s0+SWe}zT=&TPqYY?UZ=yf0Tx<Qx*pwm9+v_Y5#pcj46
ziw0pDfS&b1&l-ej06Ol0CZ-rS&};*P4|oPg2fWa|KImRAbl3+S_Co7EXx$54?}M)Q
zLSr8^_CTBBQFRC5CL<Cdreaaj7vs0ChB=nQL%CD@CqNFIL=K>+sVavo*vGSgd`Zxx
zaFp^9JxnglW@l}BAZ6BLsTg$>LZ%Ha+h|gBHrs1@py)ly7rG?UxWQ!`P-)tuQnWV<
zH9bv=Z&I;9QQdT98({3szc>puJy>d_n}*YF8a8h71h8?FM;~}vm=^~0hOV$1h#s}n
zG%*oRCKy%gX;te+RqrqrQ9fm~s@j`grL<O13+bbRnJ174<Hg7vFAtqg0SoZ(1Wvvh
z_^RT3Ch%p<={T6~sL76~VX={mpIn?86i+yd7d}q-T=~ky7cbED;-#!$QPi@ZKx=B9
zD`{yZcPUJ`sY!vJ(&nV24d{GIJZ$0&Ma|7+m6!u#mDdsndQHBlo!WmP3-Ra=KbdW9
z3U6B<E^UgX1)+dWNI>jwA3#t6&Ik=H$W@n%{CwnGf(Cb)O74a$4#v-j1H={wNJbnW
zwm3j6afk^)<o+?;i)zpR8#5grd6vhc<HKwWz7w96xd-RVgi2x>;UOc)AY^trh=P^B
z;Gydk1tp5?%(P{dva(99EFjXdfUso&k;p=12-?zD%;gm!+P|yVDm==+y<@r{!htfI
zj01VvP!FSOhiZ3e;0N091#O(7O^0anb2M0^dWE(;Nn7{Rws&d!Cp7dm?f8{;cKDDU
zY&gfL?<%d)6~e^PIX8~(p@>)`&Y2OsGzu*DlR#k$+Xs3fDJO~c4OjbyOnQrPMiq>(
zRl$gbsv?3nQ3bJQ8xpan4cW~q7-6e|5erjgdBxi@(ME@TffexRvSyaO^P(i366YOl
ziuHcp(1$=r4O4psAPVX;z##aJ-$8Ka@v>(Se9!M7^r?wK@LjuuQ0E5eRntCQXc%3T
za_DeHBg9?NK)9lTa76>5Ma!BjRYZi^qDyJf=x{}2fGZjZS2Pf=Xdtv`q`o-E;HfYB
zmLiyRWJD~&L*;oYJ<ESrMsY~iq{=#4%kavHS1?D>oc8IQ{&<vebDHAcc&#kQdaUw2
zaF?w3QaBSDAYXeh`TGZxfAo-T?(ms8Y|_GQ`p-W4Qkc3MPwj%372_C32yH4GBe#X|
zJ`hfsqsoiIDPe{3h>h?k%ELEd&VDJQx5StGX+3U_9Ooe2aeSo#87_DGANH?qlU(V~
zT0lF#$l_wLsB^DEm42CfIH%^hCtoTpKbNEvlJtUnJtbcl=Hdsa;=^-Rkm4g%e5{lP
z@|B&&^6k+E?qNN62<0oONtcoKTywpu%~AZZSk;nM3#I8lLfIx12O35$ul`yu8}+ES
zwQE+h)p)2}6Q!yqqP_K~PwwC9uZ`2odht*&PtiQ}j_Bx}cW<cXDV|gth$^ERqX9-6
z7;R*<iP7fAXs|=|4sGes)(&m!(Dn`ub!bPMc4CVncPS&(SEDr|9kl8esb7&qV2Z0N
z9+X-n|DLzTTjO@=aVqJ$tF3rU=mC5&as}~i56BT$&oaZHb<zSe@Y4}X0f(P}a>WIx
z3%^O1pS@?n936fF%J~UU7k>8lBJ|@sbdP@8=DxQux?sa)2?n+--;m|nr=z-$_2JQ*
zkQu)B=9jKdTbHVBiofF<2nyl0f<C%Vj#_cbZ!TDY6`#ix;#zi<@JECgF?_GOSaF^z
zPCp`wFW|<(#@g`&zT#t@LY%}vhqqH$e!i&}4`46x#e>4#0t-Jmd~drtyf3lXRzU~c
zemYn?2EkWe%gB2TK2ZmYYZ+UIE0Qnv(a`r`3Tt1wg0EOqD8yANbifTO_$GJYH{9*}
z4Rs7nAtntt=9;L1Pff8;QRmFKFBkW*UbBt42g+j<UzRH4>>PZ*vH6Zr_^B|PJc}7o
z`%<x|0v7rwIshvUqLmK7UXy&`e3$}0cd&dvs}IV775C3#7T^oz9jr`Yqk}l+7P9~r
z$|u;WFs9*K6;_=>NMIJw0h?+EE5k?f1y+R*W&yrX9#~oSRq-4U_B261AmWj8w}Xf~
z!c4&l+wL%4YsFC`uP=!4#o+l5MX$i%zXiB##cnHh;{~F7QZKIvIlSk!C#w7(vR+dE
ztHob?*emQPJH)DNH+zG<XHlMKC)gxA2KuXlUdMZ!z0Tfb$3ZzJ`i=v^=@a;Cl5G*A
F{{lnN=~@5)

literal 6219
zcmeHLO^6&t6n-<)neN`~hMnGxdhjq4fAXWN2lWsT47#|-oQy;-abgl>Nuo=FN)DNT
zx|oYM1wjuYh~ULM@F2n}=t+?1A>cthdJ61#i6__Z)nC`^X|l<<*|3menChwb)%&X6
zUsuhc6DPY1_Yl3_pwND~n`rTad&BQ1@s!ha`2D+knxcQg*!T|z#-2Jq_RMnPq<c)z
zH)iO&!HMJlrt)mZxk;Q1I3>;pJW0G`z#Zb50Tc0E@AJ+zo_&LxtDLTKV?{oAZhgtg
zJKR1mpLD?4Ea%Jpek8xD<#Sc}Zcg5f=FeB<w_5*;n*Z?4@~^l4C9S_-)qh3HFIMHV
zoGeH7`LrtEujOA=<p;I=o2tC8<=<O*>Eg@WS~QRqZm)29nX~;$#klf5nh%p{%`si&
z7*}30kY*sy07Nr$vNS74Wpx|Te1bKof#&zS%B^#-Dac_`vFa*k2bEQU5XUOSNa|ce
z=qSV$&Sk(QXSd4It+D{2S%A<iKxh^qGz)yA_X6+fy#S$EfY2;JXcizGi+IP$#6Na)
zBRo^5!+WbqO*AQQjq~!6IwwhhInjvSR6KHc1k-aPl21XEO!O%YdoCK!$9lw|5x^##
zjns<BmMg@OEx^#$)7oHKo4x_ywYl{;??f8TjcAa4v6z2U<Tt3bMTUZY8z1HR>r8+9
z$Gr1f)I#Itkkg@e+K^j+MRj_}nKOLw8W3@%2f~MHq~ns-Vc(UADG72T6C3-{+i#K0
zU4gfMLJ68bXN08rB(fdKW!na6us<^N2aRxv5F=tALWj$QfIzW}S&&Rs79e7lGTmYw
zF$)k?79>Q>f>Kvy0U~ArqPiC#Viq6*i^P(V-HO-Q=0?Q&Y(8eT(Ka-Bk4|=@cdDck
zPY`$4xObIz{lxcu!S^ro1IPHmXLxsy_Y}PMao%@`A9|A?{)p$k<wySDN7rP^1Wv$R
zp1Q<4@J2<8v|htoHiEntAYySN#MyZY!)=*2dBjgWU~}6~JyN3`kXSn)>uD#i9g*g@
zD{IFJM%E5UtlcisZLe<aX5)9hv;};~wW*C}&IsWybkV%G!;x;}tUm|23MHHQ{=kMB
zCbt2F5Qkx)yl=^UKq2%|3OeLOuMql9ff{D-9Cn=u3bzV(7Ijfll461;1wxYop-F+z
zq$pT1X()O=dNH7PiV2z&2u%uvCI!NgN)0sk8i{H<rk%JkzkDd9l%jFxZ=QZizKeNW
zn)_Vr<QYQOFkSUL5ueH~aQ3H^s!rzTy5kg16(5_JvZptP3ojdpzrMcs$LouKt`W!D
z;j?fM_2jYqw>tU88284sco$@pXIUoM*a?R=qymihwsFdki|36~S_LPFjn=Q6z&EW%
z+&QBU%zfp8pSNJ=DWsk!;RZ2WuE%fo*NtuY4oWQG9iLN{=ef_lf{R(3d-&f<a?f@y
zEkCoOvsUz+?Vhk5rfK{xF6!{23M_S^qE3}tf$g@E>%4&{XaY^HLuF0+9BD6m@s~#2
zc0R0}$5EO#2^AaF+@u1pRDZv&7`4@(y=%79b~NtvOsVRbXdi6#&Hdl?A76O+v9A21
z{et_mTe<~$iB8fn>eAD6n%;^e&(c|1qEnC`HS#^^U!hm&H97;yDKmBk2$3)1*AneD
Gv;PBUllQOy

diff --git a/src/res/sources/sfxparse.py b/src/res/sources/sfxparse.py
index e95ee2f..c6bc82d 100644
--- a/src/res/sources/sfxparse.py
+++ b/src/res/sources/sfxparse.py
@@ -160,7 +160,9 @@ sfx_names = [
     "sSFXDrop",
     "sSFXLock",
     "sSFXBell",
-    "sSFXMove"
+    "sSFXMove",
+    "sSFXRankUp",
+    "sSFXLevelUp",
 ]
 
 def chunks(lst, n):
diff --git a/src/res/sources/sfxregs.txt b/src/res/sources/sfxregs.txt
index b8ef726..12131e0 100644
--- a/src/res/sources/sfxregs.txt
+++ b/src/res/sources/sfxregs.txt
@@ -101,37 +101,85 @@ sSFXPieceI::
     db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $80
     db REG_NR23_CH2_FRQLO, $C1, REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $D0
-    db REG_NR13_CH1_FRQLO, $6B, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF
-    db REG_NR22_CH2_VOLEV, $D0, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $D0, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $D0
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F8, REG_NR13_CH1_FRQLO, $6B
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F8
     db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $D0, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $D0
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
-    db $FF, $FF
+    db REG_NR12_CH1_VOLEV, $E8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $E8
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $D8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $D8
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $C8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $C8
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $B8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $B8
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $00, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $00
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $A8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $A8
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
 
-    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $6B, REG_NR14_CH1_FRQHI, $87, REG_NR22_CH2_VOLEV, $08
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $98, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $98
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $88, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $88
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $68, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR12_CH1_VOLEV, $09
+    db REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $68, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db $FF
+
+    db REG_NR12_CH1_VOLEV, $58, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $58
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $48, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $48
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $38, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $38
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $28, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $28
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $18, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $18
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $6B
+    db REG_NR14_CH1_FRQHI, $87, REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
@@ -141,67 +189,114 @@ sSFXPieceI::
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FE
+    db $FF, $FF, $FF, $FF, $FE
 
 sSFXPieceIEnd::
 sSFXPieceZ::
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $7B
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F8, REG_NR13_CH1_FRQLO, $7B
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $4F
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F8, REG_NR23_CH2_FRQLO, $4F
+    db REG_NR24_CH2_FRQHI, $87, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $39
+    db REG_NR12_CH1_VOLEV, $E8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, $FF
+
+    db REG_NR13_CH1_FRQLO, $44, REG_NR14_CH1_FRQHI, $07, REG_NR22_CH2_VOLEV, $E8, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $D8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $C8
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $C8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR23_CH2_FRQLO, $2D
+    db REG_NR24_CH2_FRQHI, $07, REG_NR22_CH2_VOLEV, $A8, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR22_CH2_VOLEV, $88, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR13_CH1_FRQLO, $F7, REG_NR14_CH1_FRQHI, $06, REG_NR12_CH1_VOLEV, $B8, REG_NR12_CH1_VOLEV, $09
+    db REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11
+    db REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $68, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $A8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $48
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $06, REG_NR22_CH2_VOLEV, $28, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db $FF
+
+    db REG_NR12_CH1_VOLEV, $98, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $38, REG_NR13_CH1_FRQLO, $7B
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $2D
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $38, REG_NR23_CH2_FRQLO, $4F
+    db REG_NR24_CH2_FRQHI, $87, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $F7
-    db REG_NR14_CH1_FRQHI, $86, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $28, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $D6
-    db REG_NR24_CH2_FRQHI, $86, $FF, $FF
+    db REG_NR13_CH1_FRQLO, $44, REG_NR14_CH1_FRQHI, $07, REG_NR22_CH2_VOLEV, $28, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $7B
+    db REG_NR23_CH2_FRQLO, $2D, REG_NR24_CH2_FRQHI, $07, $FF
+
+    db REG_NR22_CH2_VOLEV, $18, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR13_CH1_FRQLO, $F7, REG_NR14_CH1_FRQHI, $06, $FF
+
+    db REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $06, $FF
+
+    db REG_NR12_CH1_VOLEV, $18, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $28, REG_NR13_CH1_FRQLO, $7B
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $4F
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $28, REG_NR23_CH2_FRQLO, $4F
+    db REG_NR24_CH2_FRQHI, $87, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $39
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $18, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $2D
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR13_CH1_FRQLO, $44, REG_NR14_CH1_FRQHI, $07, REG_NR22_CH2_VOLEV, $18, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $F7
-    db REG_NR14_CH1_FRQHI, $86, $FF, $FF
+    db REG_NR23_CH2_FRQLO, $2D, REG_NR24_CH2_FRQHI, $07, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $D6
-    db REG_NR24_CH2_FRQHI, $86, $FF, $FF
+    db REG_NR13_CH1_FRQLO, $F7, REG_NR14_CH1_FRQHI, $06, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $7B
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF
+    db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $06, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $4F
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $7B, REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $39
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF
-
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $2D
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $F7
-    db REG_NR14_CH1_FRQHI, $86, $FF, $FF
-
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $D6
-    db REG_NR24_CH2_FRQHI, $86, $FF, $FF
-
-    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $F7, REG_NR14_CH1_FRQHI, $86, $FF, $FF
-
-    db REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $86, $FF, $FF
+    db REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $4F, REG_NR24_CH2_FRQHI, $87, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
@@ -217,54 +312,53 @@ sSFXPieceZ::
 
 sSFXPieceZEnd::
 sSFXPieceS::
-    db REG_NR12_CH1_VOLEV, $F0, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0
-    db REG_NR13_CH1_FRQLO, $6B, REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0
+    db REG_NR13_CH1_FRQLO, $6B, REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $39
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $39
+    db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $59
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $59
+    db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $21
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $21
+    db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0
-    db REG_NR13_CH1_FRQLO, $39, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F
-    db REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $6B, REG_NR24_CH2_FRQHI, $87, $FF, $FF
-    db $FF
+    db REG_NR22_CH2_VOLEV, $30, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0
+    db REG_NR13_CH1_FRQLO, $39, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF
+    db REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $6B, REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $7B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $7B
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $30
+    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $7B, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F
-    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $59, REG_NR24_CH2_FRQHI, $87
-    db $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $7B, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF
+    db REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $59, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $21
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF
+    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $21
+    db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $10, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10
+    db REG_NR13_CH1_FRQLO, $6B, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF
+    db REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $39
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $7B, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $39
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $30
+    db REG_NR23_CH2_FRQLO, $7B, REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $59
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $59
     db REG_NR14_CH1_FRQHI, $87, REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $7B, REG_NR24_CH2_FRQHI, $87
-    db $FF, $FF, $FF
+    db $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $21
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $21
+    db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $39
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $39
+    db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $7B
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $7B
+    db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
     db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $7B, REG_NR14_CH1_FRQHI, $87, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
@@ -279,28 +373,39 @@ sSFXPieceS::
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FE
+    db $FF, $FF, $FE
 
 sSFXPieceSEnd::
 sSFXPieceJ::
-    db REG_NR12_CH1_VOLEV, $F1, REG_NR22_CH2_VOLEV, $F1, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
-    db REG_NR12_CH1_VOLEV, $F1, REG_NR13_CH1_FRQLO, $E7, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F
-    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F1, REG_NR23_CH2_FRQLO, $59, REG_NR24_CH2_FRQHI, $87
-    db $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $E7, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F
+    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $59, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F1, REG_NR13_CH1_FRQLO, $72
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F1
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $72
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
     db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $86, $FF, $FF, $FF, $FF
+    db $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F1, REG_NR13_CH1_FRQLO, $B2
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F1
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $B2
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
     db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db $FF
+
+    db REG_NR12_CH1_VOLEV, $30, REG_NR22_CH2_VOLEV, $30, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
+    db REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $E7, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F
+    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $59, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF, $FF, $FF, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $72
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30
+    db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $86, $FF, $FF, $FF, $FF
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $B2
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30
+    db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db $FF
 
     db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $B2, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
     db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
@@ -334,128 +439,43 @@ sSFXPieceJ::
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FE
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FE
 
 sSFXPieceJEnd::
 sSFXPieceL::
-    db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
-    db REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $9E, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F
-    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $C4, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF
+    db REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $87
     db $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $C4
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
-    db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $E7
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $E7
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0
     db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $9E
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $06
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR23_CH2_FRQLO, $4F, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $C4
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $10, REG_NR22_CH2_VOLEV, $10, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF
+    db REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $C4, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF
+    db REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $E7
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $E7
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
     db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $9E
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $06
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
+    db REG_NR23_CH2_FRQLO, $4F, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $C4
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $E7
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
-
-    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $E7, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FE
-
-sSFXPieceLEnd::
-sSFXPieceO::
-    db REG_NR22_CH2_VOLEV, $F0, REG_NR32_CH3_VOLUM, $20, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF
-    db REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00
-    db REG_WAVE_PATTERN_0, $FF, REG_WAVE_PATTERN_1, $ED, REG_WAVE_PATTERN_2, $CB, REG_WAVE_PATTERN_3, $A9
-    db REG_WAVE_PATTERN_4, $87, REG_WAVE_PATTERN_5, $65, REG_WAVE_PATTERN_6, $43, REG_WAVE_PATTERN_7, $21
-    db REG_WAVE_PATTERN_8, $12, REG_WAVE_PATTERN_9, $34, REG_WAVE_PATTERN_A, $56, REG_WAVE_PATTERN_B, $78
-    db REG_WAVE_PATTERN_C, $9A, REG_WAVE_PATTERN_D, $BC, REG_WAVE_PATTERN_E, $DE, REG_WAVE_PATTERN_F, $FF
-    db REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $B2
-    db REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF, $FF
-
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $F7
-    db REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $20
-    db REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF
-    db $FF
-
-    db REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00
-    db REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $06, $FF, $FF, $FF
-
-    db REG_NR32_CH3_VOLUM, $60, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $40
-    db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
-    db REG_NR32_CH3_VOLUM, $60, REG_NR33_CH3_FRQLO, $B2, REG_NR34_CH3_FRQHI, $86, $FF, $FF
-    db $FF, $FF, $FF
-
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $40, REG_NR23_CH2_FRQLO, $F7
-    db REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $60
-    db REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF
-    db $FF
-
-    db REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00
-    db REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $06, $FF, $FF, $FF
-
-    db REG_NR32_CH3_VOLUM, $00, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
-    db REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $B2, REG_NR34_CH3_FRQHI, $86, $FF, $FF
-    db $FF, $FF, $FF
-
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $F7
-    db REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $00
-    db REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF
-    db $FF
-
-    db REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00
-    db REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $06, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $06, REG_NR14_CH1_FRQHI, $87, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $4F, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
@@ -486,72 +506,167 @@ sSFXPieceO::
     db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
     db $FF, $FF, $FF, $FF, $FE
 
+sSFXPieceLEnd::
+sSFXPieceO::
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR32_CH3_VOLUM, $60, REG_NR11_CH1_LENDT, $BF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $B2, REG_NR14_CH1_FRQHI, $86
+    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $14
+    db REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_WAVE_PATTERN_0, $FF, REG_WAVE_PATTERN_1, $ED
+    db REG_WAVE_PATTERN_2, $CB, REG_WAVE_PATTERN_3, $A9, REG_WAVE_PATTERN_4, $87, REG_WAVE_PATTERN_5, $65
+    db REG_WAVE_PATTERN_6, $43, REG_WAVE_PATTERN_7, $21, REG_WAVE_PATTERN_8, $12, REG_WAVE_PATTERN_9, $34
+    db REG_WAVE_PATTERN_A, $56, REG_WAVE_PATTERN_B, $78, REG_WAVE_PATTERN_C, $9A, REG_WAVE_PATTERN_D, $BC
+    db REG_WAVE_PATTERN_E, $DE, REG_WAVE_PATTERN_F, $FF, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $60, REG_NR33_CH3_FRQLO, $B2, REG_NR34_CH3_FRQHI, $86, $FF, $FF
+    db $FF, $FF, $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $89
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $60, REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF, $FF
+    db $FF, $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $89, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $89
+    db REG_NR34_CH3_FRQHI, $06, $FF, $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $30, REG_NR22_CH2_VOLEV, $30, REG_NR32_CH3_VOLUM, $60, REG_NR11_CH1_LENDT, $BF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $B2, REG_NR14_CH1_FRQHI, $86
+    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $14
+    db REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $60
+    db REG_NR33_CH3_FRQLO, $B2, REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $89
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $30
+    db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $60, REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF, $FF
+    db $FF, $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $89, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $89
+    db REG_NR34_CH3_FRQHI, $06, $FF, $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $10, REG_NR22_CH2_VOLEV, $10, REG_NR32_CH3_VOLUM, $60, REG_NR11_CH1_LENDT, $BF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $B2, REG_NR14_CH1_FRQHI, $86
+    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $14
+    db REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $60
+    db REG_NR33_CH3_FRQLO, $B2, REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $89
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
+    db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $60, REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF, $FF
+    db $FF, $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $89, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $89
+    db REG_NR34_CH3_FRQHI, $06, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FE
+
 sSFXPieceOEnd::
 sSFXPieceT::
-    db REG_NR12_CH1_VOLEV, $F0, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0
-    db REG_NR13_CH1_FRQLO, $8A, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF
-    db REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $62, REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $8A, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F
+    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $62, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $2D
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $2D
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $06
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $06
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $D6
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $D6
     db REG_NR14_CH1_FRQHI, $86, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $F7
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $F7
     db REG_NR24_CH2_FRQHI, $86, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $14
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $14
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $2D
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $2D
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $62
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $62
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $8A
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $8A
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $D6
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $30, REG_NR22_CH2_VOLEV, $30, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
+    db REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $D6, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F
+    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $F7
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $F7
     db REG_NR24_CH2_FRQHI, $86, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $14
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $14
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $2D
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $2D
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $62
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $62
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $8A
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $8A
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $D6
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $10, REG_NR22_CH2_VOLEV, $10, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
+    db REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $D6, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F
+    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $F7
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $F7
     db REG_NR24_CH2_FRQHI, $86, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $14
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $14
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $2D
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $2D
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $62
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $62
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $8A
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $8A
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
     db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $62, REG_NR14_CH1_FRQHI, $87, REG_NR22_CH2_VOLEV, $08
@@ -869,3 +984,97 @@ sSFXMove::
     db $FF, $FF, $FE
 
 sSFXMoveEnd::
+sSFXRankUp::
+    db REG_NR12_CH1_VOLEV, $F2, REG_NR22_CH2_VOLEV, $F2, REG_NR32_CH3_VOLUM, $40, REG_NR11_CH1_LENDT, $7F
+    db REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F2, REG_NR13_CH1_FRQLO, $AC, REG_NR14_CH1_FRQHI, $85
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F2, REG_NR23_CH2_FRQLO, $72
+    db REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_WAVE_PATTERN_0, $00, REG_WAVE_PATTERN_1, $00
+    db REG_WAVE_PATTERN_2, $00, REG_WAVE_PATTERN_3, $00, REG_WAVE_PATTERN_4, $00, REG_WAVE_PATTERN_5, $00
+    db REG_WAVE_PATTERN_6, $0F, REG_WAVE_PATTERN_7, $FF, REG_WAVE_PATTERN_8, $FF, REG_WAVE_PATTERN_9, $FF
+    db REG_WAVE_PATTERN_A, $FF, REG_WAVE_PATTERN_B, $FF, REG_WAVE_PATTERN_C, $FF, REG_WAVE_PATTERN_D, $FF
+    db REG_WAVE_PATTERN_E, $F0, REG_WAVE_PATTERN_F, $00, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $21, REG_NR34_CH3_FRQHI, $87, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF
+
+    db REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $14
+    db REG_NR34_CH3_FRQHI, $87, $FF, $FF, $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $AC, REG_NR14_CH1_FRQHI, $85, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $72, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $21, REG_NR34_CH3_FRQHI, $87, $FF, $FF
+    db $FF, $FF
+
+    db REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $39
+    db REG_NR34_CH3_FRQHI, $87, $FF, $FF, $FF, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F2, REG_NR13_CH1_FRQLO, $AC
+    db REG_NR14_CH1_FRQHI, $85, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F2
+    db REG_NR23_CH2_FRQLO, $72, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $6B, REG_NR34_CH3_FRQHI, $87, $FF, $FF
+    db $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $AC, REG_NR14_CH1_FRQHI, $85, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $72, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $6B
+    db REG_NR34_CH3_FRQHI, $07, $FF, $FF, $FF, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F2, REG_NR13_CH1_FRQLO, $27
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F2
+    db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $6B, REG_NR34_CH3_FRQHI, $87, $FF, $FF
+    db $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $27, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $6B
+    db REG_NR34_CH3_FRQHI, $07, $FF, $FF, $FF, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F2, REG_NR13_CH1_FRQLO, $72
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F2
+    db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $6B, REG_NR34_CH3_FRQHI, $87, $FF, $FF
+    db $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $72, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $6B
+    db REG_NR34_CH3_FRQHI, $07, $FF, $FF, $FF, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F2, REG_NR13_CH1_FRQLO, $D6
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F2
+    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $6B, REG_NR34_CH3_FRQHI, $87, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $D6, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $6B
+    db REG_NR34_CH3_FRQHI, $07, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FE
+
+sSFXRankUpEnd::
+sSFXLevelUp::
+
+
+sSFXLevelUpEnd::
diff --git a/src/sfx.asm b/src/sfx.asm
index 86bb0fe..0f34019 100644
--- a/src/sfx.asm
+++ b/src/sfx.asm
@@ -44,7 +44,7 @@ DEF REG_WAVE_PATTERN_E EQU $3E
 DEF REG_WAVE_PATTERN_F EQU $3F
 
 
-SECTION "Sound Effect Data", ROM0
+SECTION "SFX Data", ROM0
 sSFXPieceI::
     db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF
     db REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $AC, REG_NR14_CH1_FRQHI, $85, REG_NR21_CH2_LENDT, $7F
@@ -107,309 +107,432 @@ sSFXPieceI::
     db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $80
     db REG_NR23_CH2_FRQLO, $C1, REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $D0
-    db REG_NR13_CH1_FRQLO, $6B, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF
-    db REG_NR22_CH2_VOLEV, $D0, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $D0, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $D0
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F8, REG_NR13_CH1_FRQLO, $6B
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F8
     db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $D0, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $D0
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $E8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $E8
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $D8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $D8
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $C8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $C8
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $B8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $B8
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $00, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $00
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $A8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $A8
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
 
-    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $6B, REG_NR14_CH1_FRQHI, $87, REG_NR22_CH2_VOLEV, $08
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FE
+    db REG_NR12_CH1_VOLEV, $98, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $98
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $88, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $88
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $68, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR12_CH1_VOLEV, $09
+    db REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $68, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db $FF
+
+    db REG_NR12_CH1_VOLEV, $58, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $58
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $48, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $48
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $38, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $38
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $28, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $28
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $18, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $18
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $6B
+    db REG_NR14_CH1_FRQHI, $87, REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87
+    db $FE
 sSFXPieceIEnd::
 sSFXPieceZ::
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $7B
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F8, REG_NR13_CH1_FRQLO, $7B
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $4F
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F8, REG_NR23_CH2_FRQLO, $4F
+    db REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR12_CH1_VOLEV, $E8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, $FF
+
+    db REG_NR13_CH1_FRQLO, $44, REG_NR14_CH1_FRQHI, $07, REG_NR22_CH2_VOLEV, $E8, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $D8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $C8
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $C8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR23_CH2_FRQLO, $2D
+    db REG_NR24_CH2_FRQHI, $07, REG_NR22_CH2_VOLEV, $A8, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR22_CH2_VOLEV, $88, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR13_CH1_FRQLO, $F7, REG_NR14_CH1_FRQHI, $06, REG_NR12_CH1_VOLEV, $B8, REG_NR12_CH1_VOLEV, $09
+    db REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11
+    db REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $68, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR12_CH1_VOLEV, $A8, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $48
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $06, REG_NR22_CH2_VOLEV, $28, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db $FF
+
+    db REG_NR12_CH1_VOLEV, $98, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $38, REG_NR13_CH1_FRQLO, $7B
+    db REG_NR14_CH1_FRQHI, $87, $FF, $FF
+
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $38, REG_NR23_CH2_FRQLO, $4F
+    db REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR12_CH1_VOLEV, $28, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, $FF
+
+    db REG_NR13_CH1_FRQLO, $44, REG_NR14_CH1_FRQHI, $07, REG_NR22_CH2_VOLEV, $28, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF, $FF
+
+    db REG_NR23_CH2_FRQLO, $2D, REG_NR24_CH2_FRQHI, $07, $FF
+
+    db REG_NR22_CH2_VOLEV, $18, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR13_CH1_FRQLO, $F7, REG_NR14_CH1_FRQHI, $06, $FF
+
+    db REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08
+    db REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, $FF
+
+    db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $06, $FF
+
+    db REG_NR12_CH1_VOLEV, $18, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $28, REG_NR13_CH1_FRQLO, $7B
+    db REG_NR14_CH1_FRQHI, $87, $FF, $FF
+
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $28, REG_NR23_CH2_FRQLO, $4F
+    db REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR12_CH1_VOLEV, $18, REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08
+    db REG_NR12_CH1_VOLEV, $09, REG_NR12_CH1_VOLEV, $11, REG_NR12_CH1_VOLEV, $08, $FF
+
+    db REG_NR13_CH1_FRQLO, $44, REG_NR14_CH1_FRQHI, $07, REG_NR22_CH2_VOLEV, $18, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF, $FF
+
+    db REG_NR23_CH2_FRQLO, $2D, REG_NR24_CH2_FRQHI, $07, $FF, $FF
+
+    db REG_NR13_CH1_FRQLO, $F7, REG_NR14_CH1_FRQHI, $06, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09
+    db REG_NR22_CH2_VOLEV, $11, REG_NR22_CH2_VOLEV, $08, REG_NR22_CH2_VOLEV, $09, REG_NR22_CH2_VOLEV, $11
+    db REG_NR22_CH2_VOLEV, $08, $FF, $FF
+
+    db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $06, $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $7B, REG_NR14_CH1_FRQHI, $87, $FF, $FF
+
+    db REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $4F, REG_NR24_CH2_FRQHI, $87, $FE
+sSFXPieceZEnd::
+sSFXPieceS::
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0
+    db REG_NR13_CH1_FRQLO, $6B, REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
     db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $39
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $2D
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $F7
-    db REG_NR14_CH1_FRQHI, $86, $FF, $FF
-
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $D6
-    db REG_NR24_CH2_FRQHI, $86, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $7B
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $59
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $4F
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $39
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $21
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $2D
+    db REG_NR22_CH2_VOLEV, $30, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0
+    db REG_NR13_CH1_FRQLO, $39, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF
+    db REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $6B, REG_NR24_CH2_FRQHI, $87, $FF, $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $7B
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $30
+    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $7B, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF
+    db REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $59, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF
+
+    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $21
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $F7
-    db REG_NR14_CH1_FRQHI, $86, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $10, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10
+    db REG_NR13_CH1_FRQLO, $6B, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF
+    db REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $D6
-    db REG_NR24_CH2_FRQHI, $86, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $39
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $30
+    db REG_NR23_CH2_FRQLO, $7B, REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $7B
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $59
+    db REG_NR14_CH1_FRQHI, $87, REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $7B, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $21
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $4F
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF
-
     db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $39
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $2D
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $F7
-    db REG_NR14_CH1_FRQHI, $86, $FF, $FF
-
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $D6
-    db REG_NR24_CH2_FRQHI, $86, $FF, $FF
-
-    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $F7, REG_NR14_CH1_FRQHI, $86, $FF, $FF
-
-    db REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $86, $FE
-sSFXPieceZEnd::
-sSFXPieceS::
-    db REG_NR12_CH1_VOLEV, $F0, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0
-    db REG_NR13_CH1_FRQLO, $6B, REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $39
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $59
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $21
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
-
-    db REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0
-    db REG_NR13_CH1_FRQLO, $39, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F
-    db REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $6B, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $7B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF
-
-    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $7B, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F
-    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $59, REG_NR24_CH2_FRQHI, $87
-    db $FF, $FF, $FF
-
-    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $21
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $6B
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $39
-    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $7B, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $59
-    db REG_NR14_CH1_FRQHI, $87, REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $7B, REG_NR24_CH2_FRQHI, $87
-    db $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $21
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $39
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $7B
-    db REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $7B
+    db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
     db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $7B, REG_NR14_CH1_FRQHI, $87, $FE
 sSFXPieceSEnd::
 sSFXPieceJ::
-    db REG_NR12_CH1_VOLEV, $F1, REG_NR22_CH2_VOLEV, $F1, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
-    db REG_NR12_CH1_VOLEV, $F1, REG_NR13_CH1_FRQLO, $E7, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F
-    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F1, REG_NR23_CH2_FRQLO, $59, REG_NR24_CH2_FRQHI, $87
-    db $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $E7, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F
+    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $59, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F1, REG_NR13_CH1_FRQLO, $72
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F1
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $72
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
     db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $86, $FF, $FF, $FF, $FF
+    db $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F1, REG_NR13_CH1_FRQLO, $B2
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F1
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $B2
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
     db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db $FF
+
+    db REG_NR12_CH1_VOLEV, $30, REG_NR22_CH2_VOLEV, $30, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
+    db REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $E7, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F
+    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $59, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF, $FF, $FF, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $72
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30
+    db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $86, $FF, $FF, $FF, $FF
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $B2
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30
+    db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db $FF
 
     db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $B2, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
     db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, $FE
 sSFXPieceJEnd::
 sSFXPieceL::
-    db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
-    db REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $9E, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F
-    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $C4, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF
+    db REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $87
     db $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $C4
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
-    db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $E7
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $E7
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0
     db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $9E
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $06
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR23_CH2_FRQLO, $4F, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $C4
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $10, REG_NR22_CH2_VOLEV, $10, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF
+    db REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $C4, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF
+    db REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $E7
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $20
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $E7
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
     db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $9E
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $06
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
+    db REG_NR23_CH2_FRQLO, $4F, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $C4
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $21, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
-
-    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $E7
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF
-
-    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $E7, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
-    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, $FE
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $06, REG_NR14_CH1_FRQHI, $87, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $4F, REG_NR24_CH2_FRQHI, $87, $FE
 sSFXPieceLEnd::
 sSFXPieceO::
-    db REG_NR22_CH2_VOLEV, $F0, REG_NR32_CH3_VOLUM, $20, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF
-    db REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00
-    db REG_WAVE_PATTERN_0, $FF, REG_WAVE_PATTERN_1, $ED, REG_WAVE_PATTERN_2, $CB, REG_WAVE_PATTERN_3, $A9
-    db REG_WAVE_PATTERN_4, $87, REG_WAVE_PATTERN_5, $65, REG_WAVE_PATTERN_6, $43, REG_WAVE_PATTERN_7, $21
-    db REG_WAVE_PATTERN_8, $12, REG_WAVE_PATTERN_9, $34, REG_WAVE_PATTERN_A, $56, REG_WAVE_PATTERN_B, $78
-    db REG_WAVE_PATTERN_C, $9A, REG_WAVE_PATTERN_D, $BC, REG_WAVE_PATTERN_E, $DE, REG_WAVE_PATTERN_F, $FF
-    db REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $20, REG_NR33_CH3_FRQLO, $B2
-    db REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR32_CH3_VOLUM, $60, REG_NR11_CH1_LENDT, $BF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $B2, REG_NR14_CH1_FRQHI, $86
+    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $14
+    db REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_WAVE_PATTERN_0, $FF, REG_WAVE_PATTERN_1, $ED
+    db REG_WAVE_PATTERN_2, $CB, REG_WAVE_PATTERN_3, $A9, REG_WAVE_PATTERN_4, $87, REG_WAVE_PATTERN_5, $65
+    db REG_WAVE_PATTERN_6, $43, REG_WAVE_PATTERN_7, $21, REG_WAVE_PATTERN_8, $12, REG_WAVE_PATTERN_9, $34
+    db REG_WAVE_PATTERN_A, $56, REG_WAVE_PATTERN_B, $78, REG_WAVE_PATTERN_C, $9A, REG_WAVE_PATTERN_D, $BC
+    db REG_WAVE_PATTERN_E, $DE, REG_WAVE_PATTERN_F, $FF, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $60, REG_NR33_CH3_FRQLO, $B2, REG_NR34_CH3_FRQHI, $86, $FF, $FF
+    db $FF, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $F7
-    db REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $20
-    db REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $89
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $60, REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF, $FF
+    db $FF, $FF, $FF
 
-    db REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00
-    db REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $06, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $89, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $89
+    db REG_NR34_CH3_FRQHI, $06, $FF, $FF, $FF
 
-    db REG_NR32_CH3_VOLUM, $60, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $40
-    db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
-    db REG_NR32_CH3_VOLUM, $60, REG_NR33_CH3_FRQLO, $B2, REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $30, REG_NR22_CH2_VOLEV, $30, REG_NR32_CH3_VOLUM, $60, REG_NR11_CH1_LENDT, $BF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $B2, REG_NR14_CH1_FRQHI, $86
+    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $14
+    db REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $60
+    db REG_NR33_CH3_FRQLO, $B2, REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF
+    db $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $40, REG_NR23_CH2_FRQLO, $F7
-    db REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $60
-    db REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $89
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $30
+    db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $60, REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF, $FF
+    db $FF, $FF, $FF
 
-    db REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00
-    db REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $06, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $89, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $89
+    db REG_NR34_CH3_FRQHI, $06, $FF, $FF, $FF
 
-    db REG_NR32_CH3_VOLUM, $00, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
-    db REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $B2, REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $10, REG_NR22_CH2_VOLEV, $10, REG_NR32_CH3_VOLUM, $60, REG_NR11_CH1_LENDT, $BF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $B2, REG_NR14_CH1_FRQHI, $86
+    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $14
+    db REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $60
+    db REG_NR33_CH3_FRQLO, $B2, REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF
+    db $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $F7
-    db REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $00
-    db REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF, $FF, $FF, $FF, $FF
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $89
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
+    db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $60, REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $86, $FF, $FF
+    db $FF, $FF, $FF
 
-    db REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00
-    db REG_NR33_CH3_FRQLO, $89, REG_NR34_CH3_FRQHI, $06, $FE
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $89, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $F7, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $89
+    db REG_NR34_CH3_FRQHI, $06, $FE
 sSFXPieceOEnd::
 sSFXPieceT::
-    db REG_NR12_CH1_VOLEV, $F0, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0
-    db REG_NR13_CH1_FRQLO, $8A, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF
-    db REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $62, REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $8A, REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F
+    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $62, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $2D
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $2D
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $06
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $06
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $D6
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $D6
     db REG_NR14_CH1_FRQHI, $86, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $F7
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $F7
     db REG_NR24_CH2_FRQHI, $86, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $14
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $14
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $2D
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $2D
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $62
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $62
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $8A
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $8A
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $D6
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20
-    db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $30, REG_NR22_CH2_VOLEV, $30, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
+    db REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $D6, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F
+    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $F7
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $F7
     db REG_NR24_CH2_FRQHI, $86, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $14
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $14
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $2D
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $2D
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $62
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $30, REG_NR13_CH1_FRQLO, $62
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20, REG_NR23_CH2_FRQLO, $8A
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $30, REG_NR23_CH2_FRQLO, $8A
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $D6
-    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10
-    db REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $10, REG_NR22_CH2_VOLEV, $10, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
+    db REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $D6, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F
+    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $06, REG_NR24_CH2_FRQHI, $87
+    db $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $F7
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $F7
     db REG_NR24_CH2_FRQHI, $86, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $14
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $14
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $2D
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $2D
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
-    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $62
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $10, REG_NR13_CH1_FRQLO, $62
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF
 
-    db REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $8A
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $10, REG_NR23_CH2_FRQLO, $8A
     db REG_NR24_CH2_FRQHI, $87, $FF, $FF
 
     db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $62, REG_NR14_CH1_FRQHI, $87, REG_NR22_CH2_VOLEV, $08
@@ -565,10 +688,12 @@ sSFXBell::
     db REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF, $FF
 
     db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F1, REG_NR23_CH2_FRQLO, $97
-    db REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
-    db $FF
+    db REG_NR24_CH2_FRQHI, $87, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF
 
-    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $A7, REG_NR14_CH1_FRQHI, $87, $FF, $FF, $FF, $FF
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $A7, REG_NR14_CH1_FRQHI, $87, $FF, $FF
+    db $FF, $FF
 
     db REG_NR22_CH2_VOLEV, $08, REG_NR23_CH2_FRQLO, $97, REG_NR24_CH2_FRQHI, $87, $FE
 sSFXBellEnd::
@@ -576,6 +701,225 @@ sSFXMove::
     db REG_NR42_CH4_VOLEV, $21, REG_NR41_CH4_LENGT, $3F, REG_NR42_CH4_VOLEV, $21, REG_NR43_CH4_FQRND, $00
     db REG_NR44_CH4_CNTRL, $80, $FE
 sSFXMoveEnd::
+sSFXRankUp::
+    db REG_NR12_CH1_VOLEV, $F2, REG_NR22_CH2_VOLEV, $F2, REG_NR32_CH3_VOLUM, $40, REG_NR11_CH1_LENDT, $7F
+    db REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F2, REG_NR13_CH1_FRQLO, $AC, REG_NR14_CH1_FRQHI, $85
+    db REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F2, REG_NR23_CH2_FRQLO, $72
+    db REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_WAVE_PATTERN_0, $00, REG_WAVE_PATTERN_1, $00
+    db REG_WAVE_PATTERN_2, $00, REG_WAVE_PATTERN_3, $00, REG_WAVE_PATTERN_4, $00, REG_WAVE_PATTERN_5, $00
+    db REG_WAVE_PATTERN_6, $0F, REG_WAVE_PATTERN_7, $FF, REG_WAVE_PATTERN_8, $FF, REG_WAVE_PATTERN_9, $FF
+    db REG_WAVE_PATTERN_A, $FF, REG_WAVE_PATTERN_B, $FF, REG_WAVE_PATTERN_C, $FF, REG_WAVE_PATTERN_D, $FF
+    db REG_WAVE_PATTERN_E, $F0, REG_WAVE_PATTERN_F, $00, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $21, REG_NR34_CH3_FRQHI, $87, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF
+
+    db REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $14
+    db REG_NR34_CH3_FRQHI, $87, $FF, $FF, $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $AC, REG_NR14_CH1_FRQHI, $85, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $72, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $21, REG_NR34_CH3_FRQHI, $87, $FF, $FF
+    db $FF, $FF
+
+    db REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80, REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $39
+    db REG_NR34_CH3_FRQHI, $87, $FF, $FF, $FF, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F2, REG_NR13_CH1_FRQLO, $AC
+    db REG_NR14_CH1_FRQHI, $85, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F2
+    db REG_NR23_CH2_FRQLO, $72, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $6B, REG_NR34_CH3_FRQHI, $87, $FF, $FF
+    db $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $AC, REG_NR14_CH1_FRQHI, $85, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $72, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $6B
+    db REG_NR34_CH3_FRQHI, $07, $FF, $FF, $FF, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F2, REG_NR13_CH1_FRQLO, $27
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F2
+    db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $86, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $6B, REG_NR34_CH3_FRQHI, $87, $FF, $FF
+    db $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $27, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $D6, REG_NR24_CH2_FRQHI, $86, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $6B
+    db REG_NR34_CH3_FRQHI, $07, $FF, $FF, $FF, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F2, REG_NR13_CH1_FRQLO, $72
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F2
+    db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $6B, REG_NR34_CH3_FRQHI, $87, $FF, $FF
+    db $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $72, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $87, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $6B
+    db REG_NR34_CH3_FRQHI, $07, $FF, $FF, $FF, $FF
+
+    db REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F, REG_NR12_CH1_VOLEV, $F2, REG_NR13_CH1_FRQLO, $D6
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F2
+    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, REG_NR30_CH3_DACEN, $00, REG_NR30_CH3_DACEN, $80
+    db REG_NR32_CH3_VOLUM, $40, REG_NR33_CH3_FRQLO, $6B, REG_NR34_CH3_FRQHI, $87, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
+    db $FF, $FF, $FF, $FF, $FF, $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $D6, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $87, REG_NR32_CH3_VOLUM, $00, REG_NR33_CH3_FRQLO, $6B
+    db REG_NR34_CH3_FRQHI, $07, $FE
+sSFXRankUpEnd::
+sSFXLevelUp::
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF
+    db REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $3B, REG_NR14_CH1_FRQHI, $85, REG_NR21_CH2_LENDT, $7F
+    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0, REG_NR23_CH2_FRQLO, $C4, REG_NR24_CH2_FRQHI, $86
+    db $FF
+
+    db REG_NR13_CH1_FRQLO, $27, REG_NR14_CH1_FRQHI, $06, REG_NR23_CH2_FRQLO, $2D, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $F7
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR23_CH2_FRQLO, $8A, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $ED, REG_NR14_CH1_FRQHI, $05, REG_NR23_CH2_FRQLO, $14, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $B2
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR23_CH2_FRQLO, $6B, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $06, REG_NR14_CH1_FRQHI, $07, REG_NR23_CH2_FRQLO, $90, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $27
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR23_CH2_FRQLO, $2D, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $C4, REG_NR14_CH1_FRQHI, $06, REG_NR23_CH2_FRQLO, $73, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $21
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR23_CH2_FRQLO, $9D, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $42, REG_NR14_CH1_FRQHI, $06, REG_NR23_CH2_FRQLO, $39, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $E7
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR23_CH2_FRQLO, $83, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $2D, REG_NR14_CH1_FRQHI, $07, REG_NR23_CH2_FRQLO, $A2, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $72
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR23_CH2_FRQLO, $4F, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $F7, REG_NR14_CH1_FRQHI, $06, REG_NR23_CH2_FRQLO, $8A, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $44
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR23_CH2_FRQLO, $AC, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $89, REG_NR14_CH1_FRQHI, $06, REG_NR23_CH2_FRQLO, $59, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $F0, REG_NR13_CH1_FRQLO, $14
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $7F, REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $F0
+    db REG_NR23_CH2_FRQLO, $97, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $4F, REG_NR14_CH1_FRQHI, $07, REG_NR23_CH2_FRQLO, $B1, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR22_CH2_VOLEV, $F0, REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $C0
+    db REG_NR13_CH1_FRQLO, $B2, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF
+    db REG_NR22_CH2_VOLEV, $C0, REG_NR23_CH2_FRQLO, $6B, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $21, REG_NR14_CH1_FRQHI, $07, REG_NR23_CH2_FRQLO, $9D, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $80, REG_NR13_CH1_FRQLO, $62
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $80
+    db REG_NR23_CH2_FRQLO, $BA, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $C4, REG_NR14_CH1_FRQHI, $06, REG_NR23_CH2_FRQLO, $73, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $60, REG_NR13_CH1_FRQLO, $39
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $60
+    db REG_NR23_CH2_FRQLO, $A7, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $6B, REG_NR14_CH1_FRQHI, $07, REG_NR23_CH2_FRQLO, $BE, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $40, REG_NR13_CH1_FRQLO, $9E
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $40
+    db REG_NR23_CH2_FRQLO, $62, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $14, REG_NR14_CH1_FRQHI, $07, REG_NR23_CH2_FRQLO, $97, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $40, REG_NR13_CH1_FRQLO, $59
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $40
+    db REG_NR23_CH2_FRQLO, $B6, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $B2, REG_NR14_CH1_FRQHI, $06, REG_NR23_CH2_FRQLO, $6B, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $40, REG_NR13_CH1_FRQLO, $2D
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $40
+    db REG_NR23_CH2_FRQLO, $A2, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $62, REG_NR14_CH1_FRQHI, $07, REG_NR23_CH2_FRQLO, $BA, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $40, REG_NR13_CH1_FRQLO, $D6
+    db REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $40
+    db REG_NR23_CH2_FRQLO, $7B, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $39, REG_NR14_CH1_FRQHI, $07, REG_NR23_CH2_FRQLO, $A7, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $4F
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20
+    db REG_NR23_CH2_FRQLO, $B1, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $9E, REG_NR14_CH1_FRQHI, $06, REG_NR23_CH2_FRQLO, $62, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR11_CH1_LENDT, $BF, REG_NR11_CH1_LENDT, $BF, REG_NR12_CH1_VOLEV, $20, REG_NR13_CH1_FRQLO, $21
+    db REG_NR14_CH1_FRQHI, $87, REG_NR21_CH2_LENDT, $BF, REG_NR21_CH2_LENDT, $BF, REG_NR22_CH2_VOLEV, $20
+    db REG_NR23_CH2_FRQLO, $9D, REG_NR24_CH2_FRQHI, $87, $FF
+
+    db REG_NR13_CH1_FRQLO, $59, REG_NR14_CH1_FRQHI, $07, REG_NR23_CH2_FRQLO, $B6, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR12_CH1_VOLEV, $F2, REG_NR22_CH2_VOLEV, $F2, REG_NR11_CH1_LENDT, $7F, REG_NR11_CH1_LENDT, $7F
+    db REG_NR12_CH1_VOLEV, $22, REG_NR13_CH1_FRQLO, $C4, REG_NR14_CH1_FRQHI, $86, REG_NR21_CH2_LENDT, $7F
+    db REG_NR21_CH2_LENDT, $7F, REG_NR22_CH2_VOLEV, $22, REG_NR23_CH2_FRQLO, $73, REG_NR24_CH2_FRQHI, $87
+    db $FF
+
+    db REG_NR13_CH1_FRQLO, $2D, REG_NR14_CH1_FRQHI, $07, REG_NR23_CH2_FRQLO, $A2, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR13_CH1_FRQLO, $62, REG_NR14_CH1_FRQHI, $07, REG_NR23_CH2_FRQLO, $BA, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR13_CH1_FRQLO, $C4, REG_NR14_CH1_FRQHI, $06, REG_NR23_CH2_FRQLO, $73, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR13_CH1_FRQLO, $2D, REG_NR14_CH1_FRQHI, $07, REG_NR23_CH2_FRQLO, $A2, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR13_CH1_FRQLO, $62, REG_NR14_CH1_FRQHI, $07, REG_NR23_CH2_FRQLO, $BA, REG_NR24_CH2_FRQHI, $07
+    db $FF
+
+    db REG_NR12_CH1_VOLEV, $08, REG_NR13_CH1_FRQLO, $C4, REG_NR14_CH1_FRQHI, $86, REG_NR22_CH2_VOLEV, $08
+    db REG_NR23_CH2_FRQLO, $73, REG_NR24_CH2_FRQHI, $87, $FE
+sSFXLevelUpEnd::
+
 
 
 SECTION "SFX Variables", HRAM
@@ -775,7 +1119,7 @@ SFXEnqueue::
     ret
 
 :   cp a, SFX_MOVE
-    ret nz
+    jr nz, :+
     ld a, LOW(sSFXMove)
     ldh [hPlayhead], a
     ld a, HIGH(sSFXMove)
@@ -783,6 +1127,24 @@ SFXEnqueue::
     call SFXPlay
     ret
 
+:   cp a, SFX_RANK_UP
+    jr nz, :+
+    ld a, LOW(sSFXRankUp)
+    ldh [hPlayhead], a
+    ld a, HIGH(sSFXRankUp)
+    ldh [hPlayhead+1], a
+    call SFXPlay
+    ret
+
+:   cp a, SFX_LEVEL_UP
+    ret nz
+    ld a, LOW(sSFXLevelUp)
+    ldh [hPlayhead], a
+    ld a, HIGH(sSFXLevelUp)
+    ldh [hPlayhead+1], a
+    call SFXPlay
+    ret
+
 
     ; This play routine must be called every frame.
 SFXPlay::
diff --git a/src/state_gameplay.asm b/src/state_gameplay.asm
index fb93043..9ca77cf 100644
--- a/src/state_gameplay.asm
+++ b/src/state_gameplay.asm
@@ -160,10 +160,14 @@ fetchPieceMode:
 spawnPieceMode:
     ; todo
 
+
+    ld a, [hEvenFrame]
+    cp a, 0
+    jr nz, :+
     ld e, 1
     call LevelUp
 
-    ld a, [hUpState]
+:   ld a, [hUpState]
     cp a, 1
     jr nz, :+
     ld a, MODE_FETCH_PIECE
diff --git a/tools/Emulicious.ini b/tools/Emulicious.ini
index 0be2437..67ff149 100644
--- a/tools/Emulicious.ini
+++ b/tools/Emulicious.ini
@@ -1,5 +1,5 @@
 #Emulicious settings file
-#Wed Oct 18 06:13:38 CEST 2023
+#Wed Oct 18 09:16:29 CEST 2023
 WindowEventViewerWindowHeight=1416
 WindowEventViewerWindowDivider=876
 WindowMemoryTracerWindowY=631
@@ -199,8 +199,8 @@ GameBoyErrorBreakpointMessage32=
 InterruptBreakpointCondition=
 Recent0=C\:\\workspace\\dmgtris\\bin\\out.gb
 GameBoyErrorBreakpointMessage20=
-WindowEmuliciousY=443
-WindowEmuliciousX=1109
+WindowEmuliciousY=350
+WindowEmuliciousX=1544
 GameBoyErrorBreakpointEnabled9=false
 GameBoyErrorBreakpointEnabled8=false
 GameBoyErrorBreakpointEnabled7=false
@@ -243,7 +243,7 @@ Gamepad1Key0=-1
 RomDir=C\:\\workspace\\dmgtris\\bin
 GameBoyErrorBreakpointCondition20=
 WindowVideoViewerHeight=1027
-WindowEventViewerWindowOpen=true
+WindowEventViewerWindowOpen=false
 WindowSpriteViewerY=512
 WindowSpriteViewerX=320
 CodeFontSize=13
@@ -264,8 +264,8 @@ Gamepad0Key3=-1
 Gamepad0Key2=-1
 Gamepad0Key1=-1
 Gamepad0Key0=-1
-WindowDebuggerY=350
-WindowDebuggerX=935
+WindowDebuggerY=287
+WindowDebuggerX=-1
 InterruptBreakpointSuspend=true
 SMSGamepadAKeyboard=false
 GameBoyErrorBreakpointSuspend32=true
diff --git a/tools/projects/out.exp b/tools/projects/out.exp
index e81807f..4380cf2 100644
--- a/tools/projects/out.exp
+++ b/tools/projects/out.exp
@@ -1 +1,3 @@
 wCLevel 4 Hexadecimal
+hPlayQueue 4 Hexadecimal
+hPlayhead 4 Hexadecimal