Merge branch 'main' of https://gitlab.sowgro.net/guitarheros/guitarhero

1 files changed, 591 insertions, 587 deletions

diff --git a/levels/Book Betrayal/Easy/notes.txt b/levels/Book Betrayal/Easy/notes.txt
index 32bc64d..ca290e9 100644
--- a/levels/Book Betrayal/Easy/notes.txt
+++ b/levels/Book Betrayal/Easy/notes.txt
@@ -1,640 +1,644 @@
-f5.5
-j5.5
-k9.1
-d9.2
-j10.6
-f10.6
-k12.3
+j5.8
+d7.2
+f9.2
+f10.3
+f11.2
 d12.3
-s17.2
-d17.2
-k17.2
-j21.4
-f21.4
-s21.4
+j13.2
+k14.2
+d15.4
+j17.3
+f18.8
+d21.3
+k21.3
+s21.3
+f23.4
+j23.4
+s23.4
+k25.3
 d25.3
-s25.4
-k25.4
-f26.9
-s26.9
 j26.9
-d29.4
-k29.4
-s29.4
-f32.3
-s32.4
-j32.4
-f37.5
-s37.5
+k28.4
+d29.3
+f31.0
+j32.6
+k34.3
 j37.5
-d38.5
-s38.5
+d37.5
 k38.5
-f39.5
-s39.5
-j39.5
+f38.6
+j39.6
 k40.5
-d40.5
-s40.5
-f41.6
-j41.6
-s41.7
-s43.0
-f43.0
-j43.0
-j45.4
-f47.1
+d41.5
+d43.0
+f45.6
+k47.1
 d48.7
 k48.7
-f50.1
-j50.1
-d53.6
-s53.6
-k53.6
-f57.7
-s57.7
-j57.7
-j59.3
-f59.3
-s59.3
-d60.7
-k60.7
-s60.7
-f61.8
-j61.8
+j50.2
+s51.7
+s52.7
+j53.6
+s54.7
+k55.7
+d56.9
+f57.8
+s58.9
+j59.8
+k60.8
 s61.8
-d65.9
+d62.8
+f63.8
+j64.3
+s65.4
 k65.9
-s65.9
-f67.3
-s67.3
-j67.3
-f70.1
-s70.1
-j70.1
-k74.0
-d74.0
-s74.0
-j75.5
-f75.5
-s75.5
-k77.9
+s69.8
+d69.8
+k69.8
+j71.9
+f71.9
+k73.8
+d75.3
+j77.0
+f77.0
 d77.9
-s77.9
-j82.0
-s82.0
-f82.0
-j83.5
-f83.5
-s83.5
-d86.0
-s86.1
-k86.1
-k90.2
-j90.2
-d91.2
-f91.2
+k77.9
+j78.9
+d82.0
+f83.6
+d85.1
+s86.2
+d87.1
+f88.0
+s89.3
+k90.1
+j91.2
 k92.2
-j92.2
-d93.2
-f93.3
-k94.2
-j94.2
-s98.2
-s99.6
-s101.4
-j102.3
-f103.2
+j93.2
+d94.2
+f95.3
+f96.3
+f97.3
+j98.3
+j99.4
+j100.4
+j101.4
+d102.4
+k102.4
+f103.3
+j103.3
 d104.3
-k105.3
-f106.4
-j106.4
-k106.5
-k107.8
-j107.9
-j109.4
-k109.4
-f110.4
-d111.8
-f113.4
-j115.0
-k116.5
-s118.5
-s122.6
-j126.6
-f128.6
-d130.6
-k132.4
-j134.4
-f134.4
-s134.4
-f135.7
+k104.3
+j104.8
+f104.9
+s106.4
+d107.4
+s110.4
+j111.5
+f112.5
+j113.4
+d114.4
+s115.5
+f116.5
+d117.4
+k118.5
+s122.5
+f126.6
+j128.6
+k130.7
+d130.7
+j132.8
+f132.8
+k134.3
+d134.3
+s134.3
+k135.7
 s135.7
-j135.7
-f136.8
-s136.8
-j136.8
-k142.4
-d142.4
+d135.8
+k136.7
+d136.7
+s136.7
+d142.2
+j142.3
 d143.9
-k143.9
+j143.9
 d144.9
-k144.9
-j150.4
-f150.4
-s150.4
-j151.9
-s151.9
-f151.9
-j152.9
-s153.0
-f153.0
-k158.5
-j158.5
-s158.5
-k160.0
-j160.1
+j144.9
+k150.5
+f150.5
+k151.9
+f152.0
+f152.9
+k152.9
+k158.6
+d158.6
+s158.6
+d160.1
+k160.1
 s160.1
-k161.1
-j161.1
-s161.1
+d161.0
+k161.0
+s161.0
 s167.1
-s168.1
-s169.1
-s170.2
-s171.2
-s173.0
-s174.3
-s175.3
-s176.3
-s177.4
-s178.3
-f179.3
-s179.3
-s180.3
-d181.3
-s181.4
-s182.4
-s183.4
+s168.0
+j169.1
+d169.1
+k170.2
+f170.2
+j171.1
+k172.1
+d173.2
+f174.2
+j175.2
+k176.3
+k177.3
+j178.3
+k179.3
+k180.4
+j181.4
+d182.4
+f183.4
 s184.3
-s185.4
-s186.4
-s187.4
-s188.4
-s189.4
-s190.5
-s191.4
-s192.4
-s193.5
-s194.5
-s195.6
-s196.6
-d197.6
-s197.6
+s185.3
+j186.3
+f187.3
+d188.4
+f189.4
+j190.4
+s191.5
+s192.5
+j193.5
+k194.6
+f195.6
+d196.6
+j197.6
 s198.6
-f199.5
-s199.6
-s200.5
-s201.5
-s202.6
-d203.6
-s203.7
-s204.6
+k199.5
+d200.5
+j201.5
+f202.6
+k203.5
+s204.7
 s205.7
 s206.7
 j207.7
-s207.7
-s208.7
-s209.7
-s210.7
-k211.7
-d213.8
-f215.7
-j216.7
-k217.7
-d218.8
-f219.8
+d208.5
+k209.7
+f210.7
+j211.7
+j212.8
+f213.8
+f214.7
+k215.7
+d215.7
+d216.6
+k216.7
+f217.7
+j217.7
+k218.8
+k219.8
+s219.8
+d219.8
 j220.8
+f220.8
 k221.8
-d222.8
-f223.8
-j224.8
-k225.9
-s226.9
-j227.9
-k228.8
-d229.8
-f230.9
-d232.0
-k232.0
-j232.1
-d234.0
-f235.0
-f236.2
-f237.1
+j223.0
+f223.9
+d224.9
+f225.9
+d227.0
+k227.9
+k229.1
+j229.9
+k231.0
+j231.9
+s232.9
+d233.8
+f234.9
+s236.0
+s237.1
 j238.0
-k239.0
-d240.0
-d241.0
-d242.2
-d243.1
-k244.1
-k245.2
-k246.2
-k247.2
-j248.1
-j249.1
-j250.1
-j251.1
-s252.2
-s253.3
-s254.3
-s255.3
-d256.2
+f239.1
+f240.1
+j241.0
+d242.1
+k243.2
+s244.3
+d245.1
+f246.2
+j247.1
+k248.1
+s249.1
+k249.5
+k250.2
+j251.2
+f252.2
+d253.0
+k254.2
+j255.3
+s256.2
 d257.3
-d258.4
-d259.3
+f258.4
+k259.3
 s260.3
-s261.3
-s262.3
-s263.4
-j264.3
-j265.3
-k266.3
-d266.3
-s267.3
-s268.3
-s269.3
-s270.6
-s271.5
-d272.5
-j272.5
-s273.3
-s274.6
-s275.6
-k276.5
-d276.5
-s277.4
-s278.7
-s279.6
+j261.2
+d262.3
+k262.3
+f263.4
+s264.2
+s265.3
+j266.3
+d266.4
+f267.4
+d268.4
+k269.3
+f270.4
+j270.5
+d271.5
+k271.5
+s272.6
+s273.6
+d274.5
+k275.3
+j276.6
+f277.5
+s278.6
+d279.6
 j280.5
-f280.6
-s281.5
-s282.6
-s283.6
+f281.5
+k282.5
+d283.5
 j284.6
-f284.6
-s285.6
-s286.6
-s287.7
-j288.7
-f288.7
-s288.7
-s289.6
-s290.8
-s291.8
-k292.6
-s292.6
-s293.6
-s294.7
-s295.8
-j296.6
-s296.6
-s297.7
-s298.7
-s299.7
-s300.7
-k300.7
-s301.7
-s302.7
-s303.6
-s304.9
-s305.8
-k310.9
-s310.9
-d310.9
-f313.0
-j313.0
-k314.9
+k285.6
+j286.6
+k287.7
+d288.7
+k288.7
+f289.7
+j289.7
+d290.8
+k291.8
+f292.7
+k292.8
+d293.7
+j293.7
+k294.8
+d295.8
+j296.7
+f297.6
+s298.6
+d299.7
+s300.9
+k301.7
+j302.7
+d303.7
+k304.8
+f305.9
+j306.8
+k311.0
+s311.0
+d311.0
+j312.9
+f312.9
 d314.9
+k314.9
 j317.0
-f317.0
-j318.0
-f318.0
-d319.0
-k319.0
-j320.0
-f320.0
-s321.0
-k322.0
-d322.0
-f323.1
-j323.1
-s324.0
-s325.0
-s326.1
-s327.1
-s328.1
-j329.0
-f329.0
-j337.2
-k337.3
-s337.3
-f339.4
-d339.4
-s339.4
-j341.3
+d318.0
+f319.1
+s319.9
+k321.1
+j322.0
+s323.1
+j324.1
+k325.1
+j326.1
+d327.0
+f328.0
+s329.0
+f330.0
+j331.0
+d332.0
+s333.2
+j334.2
+k335.1
+j336.2
+k337.2
+j338.2
+d339.3
+f340.3
+s341.3
 j342.3
-j343.4
-j344.4
-f345.2
+f343.3
+d344.4
+k345.2
+k346.3
+d346.3
+j347.4
 f347.4
-f349.3
-f350.4
-f351.4
-f352.5
-j353.4
-k353.4
-f353.5
-f354.6
-f355.6
-f356.5
-d357.5
-d358.5
+s348.4
+s349.4
+d350.3
+k351.3
+f352.4
+j353.5
+d354.4
+s355.5
+f356.6
+j357.5
+k358.5
 d359.5
-d360.5
-s361.5
-s362.6
-s363.6
-s364.5
+s360.5
+j361.5
+f362.4
+k363.5
+d364.5
 s365.6
-s366.5
-s367.6
-s368.7
-j369.6
-d370.6
+d366.7
+f367.8
+k368.7
+j369.7
+s370.7
 k371.7
-f372.8
-j373.8
-k374.7
-f375.7
-j376.6
-d377.6
-k377.7
-s378.6
-s379.7
-s380.8
-s381.6
-d381.6
-k381.6
-s382.7
-s383.8
-s384.9
+d372.6
+j373.6
+f374.7
+k375.7
+s376.9
+j377.7
+f378.7
+k379.7
+d380.6
+j381.8
+f382.8
+k383.8
+d384.9
 s385.8
-f385.9
-j385.9
-s387.0
-s388.0
-s388.8
-s390.0
-s390.9
-s391.8
-s392.8
-d393.8
-f394.8
-j395.9
+f386.9
+j387.9
+k389.0
+d389.8
+f390.9
+j392.0
+k393.0
+k393.9
+j394.9
+k395.9
 k396.3
-d397.9
-f399.4
-j401.0
-s401.9
-s403.0
-s404.1
-s405.1
-s406.1
-s407.3
+j398.0
+f399.0
+d400.0
+k401.1
+f402.1
+j403.0
+d403.7
+k404.5
+f405.1
+j406.1
+d406.6
+k407.6
 s408.2
-s409.1
-d410.1
+s409.2
+j410.1
 f411.1
-j412.2
-k413.1
-f414.2
-d415.0
-j416.1
-k417.2
-f418.4
+k412.1
+d413.1
+j414.0
+s415.1
+k416.2
+s417.3
+j418.2
 d419.2
-k420.1
-j420.6
-k421.6
-j422.1
-f423.1
-d423.6
-k424.7
-j425.0
-s426.1
-s427.2
-d428.3
-k428.3
+f420.2
+k421.3
+j422.2
 s428.3
-s429.9
-s431.3
-s432.5
-s433.4
-s434.5
-s435.5
-s436.4
-d436.4
-j436.5
-s437.6
-s438.4
-f438.8
-s441.4
-s442.5
-d442.5
-k442.5
-s444.5
-f444.5
+k428.3
+d428.3
+f429.8
+j429.8
+f435.4
+f436.4
+k437.5
+f438.3
+d439.7
+d440.7
+d441.6
+f442.5
+k442.6
 j444.6
-s445.7
-s446.6
-s447.5
+d444.6
+s446.2
+s447.6
 s448.6
-s449.5
-s450.6
-d450.6
-k450.6
-s451.7
-s452.5
-f452.5
-j452.6
-s453.6
-s454.6
-s455.5
-s456.7
-s457.6
-s458.6
-s459.6
-s460.6
-k460.7
-d460.7
-s461.7
-s462.2
-f462.3
-j462.4
-s463.3
-s464.6
-s468.7
-d468.8
-k468.8
-j470.3
-f470.3
-s470.3
-s474.8
-d474.8
-k474.9
-j476.8
-f476.8
-d482.8
-s482.9
-k482.9
-f484.8
-s484.8
-j484.8
-s498.8
-d498.8
-k498.8
-j507.2
-s507.2
-f507.2
+s449.7
+d450.5
+f451.6
+j452.8
+k453.8
+d454.8
+f455.7
+j456.7
+k457.7
+j458.7
+k459.6
+j460.7
+d460.8
+f462.2
+k462.2
+d463.7
+f464.7
+j465.8
+s466.8
+s467.8
+j468.8
+k469.8
+j471.0
+k472.0
+j472.9
+k473.9
+d474.9
+f475.9
+j476.9
+s478.1
+s479.0
+j479.9
+f480.9
+k482.1
+k483.1
+j484.0
+d485.1
+f486.0
+s487.2
+s488.3
+j489.1
+d490.3
+f491.1
+k492.0
+s493.2
+k494.1
+s495.3
+d496.5
+f497.1
+s498.1
+s499.1
+d499.1
+k499.1
+f500.2
+f501.3
+j502.3
+k503.3
+j504.2
+d505.2
+k505.3
+s505.3
+f506.3
+j507.3
+j508.3
+d509.2
+k509.3
+f510.4
+j510.4
+d511.3
 k511.4
-k512.3
-k513.4
-s517.3
-s519.5
-s520.4
-s521.4
-s522.4
+j512.3
+f513.3
+s514.4
+j517.4
+d517.4
+k519.6
+s519.6
+d519.6
+d520.5
+s520.5
+k520.5
+f521.5
+j521.5
+f522.3
+j522.4
 d523.4
-s524.4
-s525.5
-s526.5
-s527.6
-s528.6
+k523.4
+j525.0
+d525.5
+k526.5
+d527.6
+d528.6
 s529.6
-s530.6
-s531.7
-s532.7
-s533.7
-s534.7
-s535.6
-s536.8
-s537.8
-s538.8
+j530.6
+f531.6
+k532.6
+d533.6
+f534.7
+j535.7
+k536.8
+s537.7
+j538.8
 d539.6
-s539.7
-s540.6
-s541.6
-f541.7
-s542.6
-s543.7
-s544.7
-s545.8
-s546.8
-j547.7
-s547.8
-s548.8
-k549.4
-s550.0
-s550.9
-s552.0
-s553.0
-s553.9
-s554.9
-d555.8
+k540.7
+f541.6
+j542.8
+k543.8
+s544.8
+j545.7
+d546.8
+j547.8
+f548.9
+k549.7
+s551.0
+d551.9
+j552.8
+f553.9
+k554.9
 s555.8
-s556.8
-s557.9
-s559.0
-f559.8
-s560.0
-s560.9
-s562.0
+d556.9
+f557.8
+j558.9
+k560.0
+j561.0
+k562.0
 s563.0
-d564.0
-s564.0
-s565.0
-s566.1
-s567.2
-d568.1
-s568.2
-s569.1
-s570.1
-s571.0
-f572.1
-s572.1
-s573.0
-s574.1
-s575.2
-j576.1
-s576.1
-s577.1
-s578.2
-s579.1
-s580.2
-k580.2
-s581.3
-s582.2
-s583.3
-k584.2
-j584.2
-s584.3
-s585.1
-s586.3
-s587.3
+s564.2
+s565.1
+j566.0
+d567.0
+k568.0
+d569.1
+j570.2
+f571.1
+k572.0
+d572.0
+s572.0
+f573.1
+j573.1
+k574.1
+d575.1
+j576.2
+f577.1
+k578.1
+j579.2
+j580.1
+d580.1
+f581.6
+k581.7
+s584.2
+j585.3
+d585.3
+k586.3
+f586.4
+j587.4
 d588.2
-k588.3
-j588.3
-s589.4
-s590.3
-s591.4
-s592.3
-s593.5
-s594.5
-s595.4
+k589.2
+f590.2
+j591.3
+d592.3
+k592.4
+f593.4
+j593.4
+d594.3
+k594.3
+s595.2
+d595.3
+k595.3
 j596.4
-s596.4
-s597.3
-s598.4
-s599.5
-s600.4
-s601.5
-s602.5
-s603.5
-k604.4
-s604.5
-s605.4
-s606.5
-s607.4
-s608.5
-s609.6
-s610.5
-s611.6
-s612.5
-d612.5
-s613.5
-s614.6
-s615.5
-s616.5
-s617.5
-s618.5
-s619.5
-k629.5
-j630.3
-k631.1
-j632.0
-k633.0
-j633.9
-k635.1
-j636.0
+f596.4
+k597.5
+d597.5
+j598.5
+k599.5
+j600.4
+j601.4
+k601.4
+d602.5
+f602.5
+s603.4
+k604.5
+d604.5
+j605.4
+f606.6
+k607.5
+d608.5
+j609.5
+f610.5
+k611.6
+s612.6
+d612.6
+f613.5
+k614.6
+j615.7
+d616.5
+d617.5
+d618.6
+d619.6
+s620.5
+j621.6
+f622.5
+k623.7
+d625.0
+f626.2
+j627.0
+k628.1
+s629.3
+s630.3
+s632.7
+s634.2
+s636.4
+s638.3