Fix build errors from renaming IAs

SAT-R · Nov 19, 2023 · 5a75ea5 · 5a75ea5
1 parent 0a22a78
commit 5a75ea5
Show file tree

Hide file tree

Showing 11 changed files with 184 additions and 187 deletions.
diff --git a/data/maps/zone_6/act_1/entities/interactables.csv b/data/maps/zone_6/act_1/entities/interactables.csv
@@ -26,12 +26,12 @@ Adv2,INTERACTABLES,118,18,,,,,
 26,2,2,8,SPRING__BIG_DOWNLEFT,1,0,0,0
 31,2,4,20,GRIND_RAIL__END_ALTERNATE,-12,-3,24,3
 31,2,14,20,SPIKES__NORMAL_UP,0,0,0,0
-35,2,24,10,NOTE_BLOCK_2,0,0,0,0
-35,2,28,10,NOTE_BLOCK_2,0,0,0,0
-35,2,28,12,NOTE_BLOCK_2,0,0,0,0
-35,2,24,12,NOTE_BLOCK_2,0,0,0,0
-36,2,0,10,NOTE_BLOCK_2,0,0,0,0
-36,2,0,12,NOTE_BLOCK_2,0,0,0,0
+35,2,24,10,NOTE_BLOCK__2,0,0,0,0
+35,2,28,10,NOTE_BLOCK__2,0,0,0,0
+35,2,28,12,NOTE_BLOCK__2,0,0,0,0
+35,2,24,12,NOTE_BLOCK__2,0,0,0,0
+36,2,0,10,NOTE_BLOCK__2,0,0,0,0
+36,2,0,12,NOTE_BLOCK__2,0,0,0,0
 37,2,13,8,RAMP,1,0,0,0
 37,2,28,14,ARROW_PLATFORM__RIGHT,0,0,21,0
 42,2,9,14,RAMP,1,0,0,0
@@ -125,12 +125,12 @@ Adv2,INTERACTABLES,118,18,,,,,
 28,5,1,26,RAMP,1,0,0,0
 35,5,17,20,RAMP,1,0,0,0
 38,5,2,14,SPRING__UP,3,0,0,0
-42,5,17,28,NOTE_BLOCK_2,0,0,0,0
-42,5,21,28,NOTE_BLOCK_2,0,0,0,0
-42,5,13,28,NOTE_BLOCK_2,0,0,0,0
-42,5,13,30,NOTE_BLOCK_2,0,0,0,0
-42,5,17,30,NOTE_BLOCK_2,0,0,0,0
-42,5,21,30,NOTE_BLOCK_2,0,0,0,0
+42,5,17,28,NOTE_BLOCK__2,0,0,0,0
+42,5,21,28,NOTE_BLOCK__2,0,0,0,0
+42,5,13,28,NOTE_BLOCK__2,0,0,0,0
+42,5,13,30,NOTE_BLOCK__2,0,0,0,0
+42,5,17,30,NOTE_BLOCK__2,0,0,0,0
+42,5,21,30,NOTE_BLOCK__2,0,0,0,0
 48,5,0,22,SPRING__BIG_UPRIGHT,1,0,0,0
 49,5,4,22,SPRING__LEFT,0,0,0,0
 54,5,12,20,GRIND_RAIL__START_GROUND,-12,-3,24,3
@@ -140,8 +140,8 @@ Adv2,INTERACTABLES,118,18,,,,,
 60,5,0,4,SPRING__BIG_UPLEFT,1,0,0,0
 63,5,24,30,SPRING__RIGHT,1,0,0,0
 66,5,12,14,SPRING__BIG_UPLEFT,0,0,0,0
-68,5,14,30,NOTE_BLOCK_2,0,0,0,0
-68,5,18,30,NOTE_BLOCK_2,0,0,0,0
+68,5,14,30,NOTE_BLOCK__2,0,0,0,0
+68,5,18,30,NOTE_BLOCK__2,0,0,0,0
 106,5,7,20,TOGGLE__GOAL,0,0,0,0
 8,6,30,0,SPRING__UP,3,0,0,0
 9,6,22,24,SPRING__UP,1,0,0,0
@@ -173,21 +173,21 @@ Adv2,INTERACTABLES,118,18,,,,,
 58,6,22,0,SPRING__UP,2,0,0,0
 61,6,2,24,SPIKES__NORMAL_UP,0,0,0,0
 65,6,20,2,SPRING__BIG_UPRIGHT,0,0,0,0
-66,6,20,28,NOTE_BLOCK_2,0,0,0,0
-66,6,24,26,NOTE_BLOCK_2,0,0,0,0
-66,6,20,26,NOTE_BLOCK_2,0,0,0,0
-66,6,24,28,NOTE_BLOCK_2,0,0,0,0
-66,6,28,26,NOTE_BLOCK_2,0,0,0,0
-66,6,28,28,NOTE_BLOCK_2,0,0,0,0
-67,6,16,26,NOTE_BLOCK_2,0,0,0,0
-67,6,20,26,NOTE_BLOCK_2,0,0,0,0
-67,6,16,24,NOTE_BLOCK_2,0,0,0,0
-67,6,20,24,NOTE_BLOCK_2,0,0,0,0
+66,6,20,28,NOTE_BLOCK__2,0,0,0,0
+66,6,24,26,NOTE_BLOCK__2,0,0,0,0
+66,6,20,26,NOTE_BLOCK__2,0,0,0,0
+66,6,24,28,NOTE_BLOCK__2,0,0,0,0
+66,6,28,26,NOTE_BLOCK__2,0,0,0,0
+66,6,28,28,NOTE_BLOCK__2,0,0,0,0
+67,6,16,26,NOTE_BLOCK__2,0,0,0,0
+67,6,20,26,NOTE_BLOCK__2,0,0,0,0
+67,6,16,24,NOTE_BLOCK__2,0,0,0,0
+67,6,20,24,NOTE_BLOCK__2,0,0,0,0
 67,6,28,6,GRIND_RAIL__START_AIR,-12,-3,24,3
-67,6,24,24,NOTE_BLOCK_2,0,0,0,0
-67,6,24,26,NOTE_BLOCK_2,0,0,0,0
-68,6,18,0,NOTE_BLOCK_2,0,0,0,0
-68,6,14,0,NOTE_BLOCK_2,0,0,0,0
+67,6,24,24,NOTE_BLOCK__2,0,0,0,0
+67,6,24,26,NOTE_BLOCK__2,0,0,0,0
+68,6,18,0,NOTE_BLOCK__2,0,0,0,0
+68,6,14,0,NOTE_BLOCK__2,0,0,0,0
 70,6,28,18,GRIND_RAIL__END_ALTERNATE,-12,-3,24,3
 74,6,6,24,SPRING__UP,1,0,0,0
 74,6,20,24,SPRING__BIG_DOWNRIGHT,1,0,0,0
@@ -205,14 +205,14 @@ Adv2,INTERACTABLES,118,18,,,,,
 16,7,22,17,GRIND_RAIL__END_GROUND,-3,-3,6,3
 17,7,8,14,SPRING__LEFT,2,0,0,0
 21,7,24,22,GRIND_RAIL__END_ALTERNATE,-12,-3,24,3
-22,7,13,25,NOTE_BLOCK_2,1,0,0,0
-22,7,9,25,NOTE_BLOCK_2,1,0,0,0
-22,7,9,23,NOTE_BLOCK_2,1,0,0,0
-22,7,13,23,NOTE_BLOCK_2,1,0,0,0
-22,7,17,23,NOTE_BLOCK_2,1,0,0,0
-22,7,17,25,NOTE_BLOCK_2,1,0,0,0
-22,7,21,23,NOTE_BLOCK_2,1,0,0,0
-22,7,21,25,NOTE_BLOCK_2,1,0,0,0
+22,7,13,25,NOTE_BLOCK__2,1,0,0,0
+22,7,9,25,NOTE_BLOCK__2,1,0,0,0
+22,7,9,23,NOTE_BLOCK__2,1,0,0,0
+22,7,13,23,NOTE_BLOCK__2,1,0,0,0
+22,7,17,23,NOTE_BLOCK__2,1,0,0,0
+22,7,17,25,NOTE_BLOCK__2,1,0,0,0
+22,7,21,23,NOTE_BLOCK__2,1,0,0,0
+22,7,21,25,NOTE_BLOCK__2,1,0,0,0
 23,7,8,10,GRIND_RAIL__START_AIR,-12,-3,24,3
 26,7,8,28,GRIND_RAIL__END_ALTERNATE,-3,-3,6,3
 26,7,14,28,BOOSTER,0,0,0,0
@@ -283,12 +283,12 @@ Adv2,INTERACTABLES,118,18,,,,,
 93,8,30,20,BOOSTER,0,0,0,0
 106,8,7,20,TOGGLE__GOAL,0,0,0,0
 5,9,14,18,SPRING__UP,0,0,0,0
-6,9,18,6,NOTE_BLOCK_2,0,0,0,0
-6,9,22,8,NOTE_BLOCK_2,0,0,0,0
-6,9,26,8,NOTE_BLOCK_2,0,0,0,0
-6,9,18,8,NOTE_BLOCK_2,0,0,0,0
-6,9,22,6,NOTE_BLOCK_2,0,0,0,0
-6,9,26,6,NOTE_BLOCK_2,0,0,0,0
+6,9,18,6,NOTE_BLOCK__2,0,0,0,0
+6,9,22,8,NOTE_BLOCK__2,0,0,0,0
+6,9,26,8,NOTE_BLOCK__2,0,0,0,0
+6,9,18,8,NOTE_BLOCK__2,0,0,0,0
+6,9,22,6,NOTE_BLOCK__2,0,0,0,0
+6,9,26,6,NOTE_BLOCK__2,0,0,0,0
 10,9,14,3,LIGHT_GLOBE,0,0,0,0
 19,9,14,0,SPRING__UP,1,0,0,0
 21,9,2,0,SPIKES__NORMAL_UP,0,0,0,0
@@ -303,10 +303,10 @@ Adv2,INTERACTABLES,118,18,,,,,
 42,9,11,12,KEYBOARD_VERTICAL,1,-12,2,24
 42,9,23,12,KEYBOARD_VERTICAL,-1,-12,2,24
 46,9,14,12,SPRING__UP,0,0,0,0
-47,9,10,1,NOTE_BLOCK_2,0,0,0,0
-47,9,6,1,NOTE_BLOCK_2,0,0,0,0
-47,9,10,3,NOTE_BLOCK_2,0,0,0,0
-47,9,6,3,NOTE_BLOCK_2,0,0,0,0
+47,9,10,1,NOTE_BLOCK__2,0,0,0,0
+47,9,6,1,NOTE_BLOCK__2,0,0,0,0
+47,9,10,3,NOTE_BLOCK__2,0,0,0,0
+47,9,6,3,NOTE_BLOCK__2,0,0,0,0
 50,9,29,13,LIGHT_BRIDGE,0,0,0,0
 51,9,24,10,SPRING__LEFT,3,0,0,0
 52,9,26,6,SPRING__UP,2,0,0,0
@@ -321,24 +321,24 @@ Adv2,INTERACTABLES,118,18,,,,,
 92,9,26,15,ARROW_PLATFORM__UP,0,-16,0,16
 93,9,12,12,ARROW_PLATFORM__RIGHT,0,0,21,0
 95,9,26,12,SPIKES__NORMAL_UP,0,0,0,0
-96,9,22,12,NOTE_BLOCK_2,0,0,0,0
-96,9,18,12,NOTE_BLOCK_2,0,0,0,0
-96,9,14,12,NOTE_BLOCK_2,0,0,0,0
-96,9,22,10,NOTE_BLOCK_2,0,0,0,0
-96,9,18,10,NOTE_BLOCK_2,0,0,0,0
-96,9,14,10,NOTE_BLOCK_2,0,0,0,0
-96,9,30,6,NOTE_BLOCK_2,0,0,0,0
-96,9,30,8,NOTE_BLOCK_2,0,0,0,0
-96,9,26,6,NOTE_BLOCK_2,0,0,0,0
-96,9,26,8,NOTE_BLOCK_2,0,0,0,0
-97,9,14,2,NOTE_BLOCK_2,1,0,0,0
-97,9,14,4,NOTE_BLOCK_2,1,0,0,0
-97,9,10,2,NOTE_BLOCK_2,1,0,0,0
-97,9,10,4,NOTE_BLOCK_2,1,0,0,0
-97,9,6,4,NOTE_BLOCK_2,1,0,0,0
-97,9,6,2,NOTE_BLOCK_2,1,0,0,0
-97,9,2,8,NOTE_BLOCK_2,0,0,0,0
-97,9,2,6,NOTE_BLOCK_2,0,0,0,0
+96,9,22,12,NOTE_BLOCK__2,0,0,0,0
+96,9,18,12,NOTE_BLOCK__2,0,0,0,0
+96,9,14,12,NOTE_BLOCK__2,0,0,0,0
+96,9,22,10,NOTE_BLOCK__2,0,0,0,0
+96,9,18,10,NOTE_BLOCK__2,0,0,0,0
+96,9,14,10,NOTE_BLOCK__2,0,0,0,0
+96,9,30,6,NOTE_BLOCK__2,0,0,0,0
+96,9,30,8,NOTE_BLOCK__2,0,0,0,0
+96,9,26,6,NOTE_BLOCK__2,0,0,0,0
+96,9,26,8,NOTE_BLOCK__2,0,0,0,0
+97,9,14,2,NOTE_BLOCK__2,1,0,0,0
+97,9,14,4,NOTE_BLOCK__2,1,0,0,0
+97,9,10,2,NOTE_BLOCK__2,1,0,0,0
+97,9,10,4,NOTE_BLOCK__2,1,0,0,0
+97,9,6,4,NOTE_BLOCK__2,1,0,0,0
+97,9,6,2,NOTE_BLOCK__2,1,0,0,0
+97,9,2,8,NOTE_BLOCK__2,0,0,0,0
+97,9,2,6,NOTE_BLOCK__2,0,0,0,0
 98,9,8,0,GRIND_RAIL__END_ALTERNATE,-12,-3,24,3
 106,9,7,12,TOGGLE__GOAL,0,0,0,0
 5,10,22,4,SPIKES__NORMAL_UP,0,0,0,0
@@ -376,18 +376,18 @@ Adv2,INTERACTABLES,118,18,,,,,
 76,10,4,22,SPRING__BIG_UPLEFT,1,0,0,0
 82,10,16,16,SPRING__SMALL_UPRIGHT,2,0,0,0
 83,10,8,14,SPRING__LEFT,2,0,0,0
-84,10,16,4,NOTE_BLOCK_2,0,0,0,0
-84,10,12,2,NOTE_BLOCK_2,0,0,0,0
-84,10,12,4,NOTE_BLOCK_2,0,0,0,0
-84,10,16,2,NOTE_BLOCK_2,0,0,0,0
-84,10,20,2,NOTE_BLOCK_2,0,0,0,0
-84,10,20,4,NOTE_BLOCK_2,0,0,0,0
-85,10,10,0,NOTE_BLOCK_2,0,0,0,0
-85,10,14,0,NOTE_BLOCK_2,0,0,0,0
-85,10,18,0,NOTE_BLOCK_2,0,0,0,0
-85,10,10,2,NOTE_BLOCK_2,0,0,0,0
-85,10,14,2,NOTE_BLOCK_2,0,0,0,0
-85,10,18,2,NOTE_BLOCK_2,0,0,0,0
+84,10,16,4,NOTE_BLOCK__2,0,0,0,0
+84,10,12,2,NOTE_BLOCK__2,0,0,0,0
+84,10,12,4,NOTE_BLOCK__2,0,0,0,0
+84,10,16,2,NOTE_BLOCK__2,0,0,0,0
+84,10,20,2,NOTE_BLOCK__2,0,0,0,0
+84,10,20,4,NOTE_BLOCK__2,0,0,0,0
+85,10,10,0,NOTE_BLOCK__2,0,0,0,0
+85,10,14,0,NOTE_BLOCK__2,0,0,0,0
+85,10,18,0,NOTE_BLOCK__2,0,0,0,0
+85,10,10,2,NOTE_BLOCK__2,0,0,0,0
+85,10,14,2,NOTE_BLOCK__2,0,0,0,0
+85,10,18,2,NOTE_BLOCK__2,0,0,0,0
 90,10,0,2,SPRING__LEFT,3,0,0,0
 92,10,6,16,SPRING__UP,2,0,0,0
 95,10,18,16,SPRING__UP,3,0,0,0

diff --git a/data/maps/zone_6/act_2/entities/interactables.csv b/data/maps/zone_6/act_2/entities/interactables.csv
@@ -75,12 +75,12 @@ Adv2,INTERACTABLES,84,12,,,,,
 60,3,0,18,SPRING__BIG_UPRIGHT,1,0,0,0
 64,3,16,24,GRIND_RAIL__END_ALTERNATE,-6,-4,12,4
 65,3,18,24,SPIKES__NORMAL_UP,0,0,0,0
-66,3,0,27,NOTE_BLOCK_2,0,0,0,0
-66,3,4,27,NOTE_BLOCK_2,0,0,0,0
-66,3,8,27,NOTE_BLOCK_2,0,0,0,0
-66,3,0,29,NOTE_BLOCK_2,0,0,0,0
-66,3,4,29,NOTE_BLOCK_2,0,0,0,0
-66,3,8,29,NOTE_BLOCK_2,0,0,0,0
+66,3,0,27,NOTE_BLOCK__2,0,0,0,0
+66,3,4,27,NOTE_BLOCK__2,0,0,0,0
+66,3,8,27,NOTE_BLOCK__2,0,0,0,0
+66,3,0,29,NOTE_BLOCK__2,0,0,0,0
+66,3,4,29,NOTE_BLOCK__2,0,0,0,0
+66,3,8,29,NOTE_BLOCK__2,0,0,0,0
 67,3,4,24,GRIND_RAIL__START_AIR,-12,-3,24,3
 72,3,15,24,TOGGLE__GOAL,0,0,0,0
 72,3,15,0,TOGGLE__GOAL,0,0,0,0
@@ -103,10 +103,10 @@ Adv2,INTERACTABLES,84,12,,,,,
 34,4,16,2,SPRING__RIGHT,1,0,0,0
 38,4,13,4,BOOSTER,0,0,0,0
 39,4,12,28,GRIND_RAIL__START_GROUND,-12,-3,24,3
-40,4,8,27,NOTE_BLOCK_2,0,0,0,0
-40,4,12,27,NOTE_BLOCK_2,0,0,0,0
-40,4,8,25,NOTE_BLOCK_2,0,0,0,0
-40,4,12,25,NOTE_BLOCK_2,0,0,0,0
+40,4,8,27,NOTE_BLOCK__2,0,0,0,0
+40,4,12,27,NOTE_BLOCK__2,0,0,0,0
+40,4,8,25,NOTE_BLOCK__2,0,0,0,0
+40,4,12,25,NOTE_BLOCK__2,0,0,0,0
 42,4,22,28,SPRING__UP,1,0,0,0
 42,4,12,4,BOOSTER,0,1,0,0
 43,4,13,4,ARROW_PLATFORM__LEFT,-27,0,27,0
@@ -131,12 +131,12 @@ Adv2,INTERACTABLES,84,12,,,,,
 15,5,12,6,SPRING__RIGHT,1,0,0,0
 20,5,2,20,SPRING__UP,1,0,0,0
 22,5,28,8,GRIND_RAIL__END_ALTERNATE,-12,-3,24,3
-23,5,30,13,NOTE_BLOCK_2,0,0,0,0
-23,5,30,11,NOTE_BLOCK_2,0,0,0,0
-24,5,2,13,NOTE_BLOCK_2,0,0,0,0
-24,5,2,11,NOTE_BLOCK_2,0,0,0,0
-24,5,6,13,NOTE_BLOCK_2,0,0,0,0
-24,5,6,11,NOTE_BLOCK_2,0,0,0,0
+23,5,30,13,NOTE_BLOCK__2,0,0,0,0
+23,5,30,11,NOTE_BLOCK__2,0,0,0,0
+24,5,2,13,NOTE_BLOCK__2,0,0,0,0
+24,5,2,11,NOTE_BLOCK__2,0,0,0,0
+24,5,6,13,NOTE_BLOCK__2,0,0,0,0
+24,5,6,11,NOTE_BLOCK__2,0,0,0,0
 31,5,28,16,TOGGLE_PLAYER_LAYER__BACKGROUND,0,0,24,4
 31,5,4,16,TOGGLE_PLAYER_LAYER__BACKGROUND,0,0,24,4
 32,5,20,20,TOGGLE_PLAYER_LAYER__FOREGROUND,0,0,4,12
@@ -146,10 +146,10 @@ Adv2,INTERACTABLES,84,12,,,,,
 37,5,6,20,BOUNCY_SPRING,0,0,0,0
 41,5,26,20,SPRING__UP,0,0,0,0
 41,5,8,8,GRIND_RAIL__END_AIR,-12,-3,24,3
-42,5,4,10,NOTE_BLOCK_2,0,0,0,0
-42,5,8,10,NOTE_BLOCK_2,0,0,0,0
-42,5,4,8,NOTE_BLOCK_2,0,0,0,0
-42,5,8,8,NOTE_BLOCK_2,0,0,0,0
+42,5,4,10,NOTE_BLOCK__2,0,0,0,0
+42,5,8,10,NOTE_BLOCK__2,0,0,0,0
+42,5,4,8,NOTE_BLOCK__2,0,0,0,0
+42,5,8,8,NOTE_BLOCK__2,0,0,0,0
 45,5,24,20,IA044__A,0,0,6,16
 46,5,26,20,SPIKES__NORMAL_DOWN,0,0,0,0
 46,5,21,26,DASH_RING,4,0,0,0
@@ -169,12 +169,12 @@ Adv2,INTERACTABLES,84,12,,,,,
 17,6,31,0,KEYBOARD_VERTICAL,-1,-12,2,24
 17,6,31,18,KEYBOARD_VERTICAL,-1,-6,2,12
 17,6,19,15,KEYBOARD_VERTICAL,1,-3,2,6
-22,6,10,24,NOTE_BLOCK_2,1,0,0,0
-22,6,14,24,NOTE_BLOCK_2,1,0,0,0
-22,6,10,26,NOTE_BLOCK_2,1,0,0,0
-22,6,14,26,NOTE_BLOCK_2,1,0,0,0
-22,6,18,24,NOTE_BLOCK_2,1,0,0,0
-22,6,18,26,NOTE_BLOCK_2,1,0,0,0
+22,6,10,24,NOTE_BLOCK__2,1,0,0,0
+22,6,14,24,NOTE_BLOCK__2,1,0,0,0
+22,6,10,26,NOTE_BLOCK__2,1,0,0,0
+22,6,14,26,NOTE_BLOCK__2,1,0,0,0
+22,6,18,24,NOTE_BLOCK__2,1,0,0,0
+22,6,18,26,NOTE_BLOCK__2,1,0,0,0
 28,6,4,12,BOOSTER,0,0,0,0
 30,6,20,12,TOGGLE_PLAYER_LAYER__BACKGROUND,0,0,4,24
 33,6,24,6,GRIND_RAIL__START_AIR,-12,-3,24,3
@@ -243,32 +243,32 @@ Adv2,INTERACTABLES,84,12,,,,,
 31,8,3,14,KEYBOARD_VERTICAL,-1,-6,2,12
 33,8,14,20,SPRING__UP,3,0,0,0
 36,8,15,9,LIGHT_BRIDGE,0,0,0,0
-38,8,30,25,NOTE_BLOCK_2,0,0,0,0
-38,8,30,23,NOTE_BLOCK_2,0,0,0,0
-38,8,26,25,NOTE_BLOCK_2,0,0,0,0
-38,8,26,23,NOTE_BLOCK_2,0,0,0,0
-39,8,30,16,NOTE_BLOCK_2,0,0,0,0
-39,8,30,18,NOTE_BLOCK_2,0,0,0,0
-39,8,2,25,NOTE_BLOCK_2,0,0,0,0
-39,8,2,23,NOTE_BLOCK_2,0,0,0,0
-40,8,2,16,NOTE_BLOCK_2,0,0,0,0
-40,8,2,18,NOTE_BLOCK_2,0,0,0,0
-40,8,6,18,NOTE_BLOCK_2,0,0,0,0
-40,8,6,16,NOTE_BLOCK_2,0,0,0,0
+38,8,30,25,NOTE_BLOCK__2,0,0,0,0
+38,8,30,23,NOTE_BLOCK__2,0,0,0,0
+38,8,26,25,NOTE_BLOCK__2,0,0,0,0
+38,8,26,23,NOTE_BLOCK__2,0,0,0,0
+39,8,30,16,NOTE_BLOCK__2,0,0,0,0
+39,8,30,18,NOTE_BLOCK__2,0,0,0,0
+39,8,2,25,NOTE_BLOCK__2,0,0,0,0
+39,8,2,23,NOTE_BLOCK__2,0,0,0,0
+40,8,2,16,NOTE_BLOCK__2,0,0,0,0
+40,8,2,18,NOTE_BLOCK__2,0,0,0,0
+40,8,6,18,NOTE_BLOCK__2,0,0,0,0
+40,8,6,16,NOTE_BLOCK__2,0,0,0,0
 41,8,2,20,BOOSTER,0,0,0,0
 49,8,16,2,GRIND_RAIL__END_ALTERNATE,-12,-3,24,3
-50,8,22,4,NOTE_BLOCK_2,0,0,0,0
-50,8,26,4,NOTE_BLOCK_2,0,0,0,0
-50,8,22,6,NOTE_BLOCK_2,0,0,0,0
-50,8,26,6,NOTE_BLOCK_2,0,0,0,0
-50,8,30,4,NOTE_BLOCK_2,0,0,0,0
-50,8,30,6,NOTE_BLOCK_2,0,0,0,0
-51,8,26,2,NOTE_BLOCK_2,0,0,0,0
-51,8,26,0,NOTE_BLOCK_2,0,0,0,0
-51,8,30,0,NOTE_BLOCK_2,0,0,0,0
-51,8,30,2,NOTE_BLOCK_2,0,0,0,0
-52,8,2,0,NOTE_BLOCK_2,0,0,0,0
-52,8,2,2,NOTE_BLOCK_2,0,0,0,0
+50,8,22,4,NOTE_BLOCK__2,0,0,0,0
+50,8,26,4,NOTE_BLOCK__2,0,0,0,0
+50,8,22,6,NOTE_BLOCK__2,0,0,0,0
+50,8,26,6,NOTE_BLOCK__2,0,0,0,0
+50,8,30,4,NOTE_BLOCK__2,0,0,0,0
+50,8,30,6,NOTE_BLOCK__2,0,0,0,0
+51,8,26,2,NOTE_BLOCK__2,0,0,0,0
+51,8,26,0,NOTE_BLOCK__2,0,0,0,0
+51,8,30,0,NOTE_BLOCK__2,0,0,0,0
+51,8,30,2,NOTE_BLOCK__2,0,0,0,0
+52,8,2,0,NOTE_BLOCK__2,0,0,0,0
+52,8,2,2,NOTE_BLOCK__2,0,0,0,0
 53,8,18,8,SPIKES__NORMAL_UP,0,0,0,0
 57,8,24,14,SPRING__BIG_UPRIGHT,1,0,0,0
 60,8,8,25,SPECIAL_RING,0,0,0,0